diff --git a/core/config/migrateSharedConfig.ts b/core/config/migrateSharedConfig.ts
index e1e66000df..67dfeeffd5 100644
--- a/core/config/migrateSharedConfig.ts
+++ b/core/config/migrateSharedConfig.ts
@@ -173,6 +173,13 @@ export function migrateJsonSharedConfig(filepath: string, ide: IDE): void {
         effected = true;
       }
 
+      const { autoAcceptEditToolDiffs, ...withoutAutoApply } = migratedUI;
+      if (autoAcceptEditToolDiffs !== undefined) {
+        shareConfigUpdates.autoAcceptEditToolDiffs = autoAcceptEditToolDiffs;
+        migratedUI = withoutAutoApply;
+        effected = true;
+      }
+
       const { showChatScrollbar, ...withoutShowChatScrollbar } = migratedUI;
       if (showChatScrollbar !== undefined) {
         shareConfigUpdates.showChatScrollbar = showChatScrollbar;
diff --git a/core/config/sharedConfig.ts b/core/config/sharedConfig.ts
index b8ac205841..ad8b81341c 100644
--- a/core/config/sharedConfig.ts
+++ b/core/config/sharedConfig.ts
@@ -26,6 +26,7 @@ export const sharedConfigSchema = z
     codeWrap: z.boolean(),
     displayRawMarkdown: z.boolean(),
     showChatScrollbar: z.boolean(),
+    autoAcceptEditToolDiffs: z.boolean(),
 
     // `tabAutocompleteOptions` in `ContinueConfig`
     useAutocompleteCache: z.boolean(),
@@ -106,8 +107,7 @@ export function modifyAnyConfigWithSharedConfig<
       sharedConfig.disableAutocompleteInFiles;
   }
   if (sharedConfig.modelTimeout !== undefined) {
-    configCopy.tabAutocompleteOptions.modelTimeout =
-      sharedConfig.modelTimeout;
+    configCopy.tabAutocompleteOptions.modelTimeout = sharedConfig.modelTimeout;
   }
   if (sharedConfig.debounceDelay !== undefined) {
     configCopy.tabAutocompleteOptions.debounceDelay =
@@ -134,6 +134,10 @@ export function modifyAnyConfigWithSharedConfig<
   if (sharedConfig.showChatScrollbar !== undefined) {
     configCopy.ui.showChatScrollbar = sharedConfig.showChatScrollbar;
   }
+  if (sharedConfig.autoAcceptEditToolDiffs !== undefined) {
+    configCopy.ui.autoAcceptEditToolDiffs =
+      sharedConfig.autoAcceptEditToolDiffs;
+  }
 
   if (sharedConfig.allowAnonymousTelemetry !== undefined) {
     configCopy.allowAnonymousTelemetry = sharedConfig.allowAnonymousTelemetry;
diff --git a/core/index.d.ts b/core/index.d.ts
index d15c73b50a..a9f003a50a 100644
--- a/core/index.d.ts
+++ b/core/index.d.ts
@@ -1192,6 +1192,7 @@ export interface ContinueUIConfig {
   showChatScrollbar?: boolean;
   codeWrap?: boolean;
   showSessionTabs?: boolean;
+  autoAcceptEditToolDiffs?: boolean;
 }
 
 export interface ContextMenuConfig {
diff --git a/docs/docs/customize/deep-dives/settings.md b/docs/docs/customize/deep-dives/settings.md
index 0d3b57127e..82af98c15e 100644
--- a/docs/docs/customize/deep-dives/settings.md
+++ b/docs/docs/customize/deep-dives/settings.md
@@ -6,11 +6,11 @@ keywords: [config, settings, configuration, customize, customization, sidebar]
 
 # The User Settings Page
 
-The **User Settings page** can be accessed by clicking the gear icon in the header of the Continue sidebar.
+The **User Settings page** can be accessed by clicking the gear icon in the header of the Continue sidebar and then selecting the "Settings" tab.
 
-![slash-commands](/img/header-buttons.png)
+![settings](/img/settings-header.png)
 
-Which takes you to this page:
+Which takes you to this page (select the "Settings" tab):
 
 ![User Settings Page](/img/settings-page.png)
 
@@ -26,7 +26,15 @@ Below that, the following settings which are not part of a configuration file ar
 - `Enable Indexing`: Enables indexing of the codebase for the @codebase and @code context providers. **On** by default.
 - `Font Size`: Specifies base font size for UI elements
 - `Multiline Autocompletions`: Controls multiline completions for autocomplete. Can be set to `always`, `never`, or `auto`. Defaults to `auto`
-- `Disable autocomplete in files`: List of comma-separated glob pattern to disable autocomplete in matching files. E.g., "\_/.md, \*/.txt"
+- `Autocomplete timeout`: Maximum time in milliseconds for autocomplete request/retreival. Defaults to 150
+- `Autocomplete debounce`: Minimum time in milliseconds to trigger an autocomplete request after a change. Defaults to 250
+- `Disable autocomplete in files`: List of comma-separated glob pattern to disable autocomplete in matching files. E.g., `**/*.{txt,md}`
+
+### Experimental settings
+
+At the bottom of the User Settings page there is an "Experimental Settings" section which contains new or otherwise experimental settings, including:
+
+- `Auto-Accept Agent Edits`: **CAUTION: Be very careful with this setting. When turned on, Agent mode's edit tool can make changes to files with no manual review or guaranteed stopping point. If on, diffs generated by the edit tool are automatically accepted and Agent proceeds with the next conversational turn.** Off by default.
 
 <!-- - `Use autocomplete cache`: If on, caches completions. -->
 <!-- - `Use Chromium for Docs Crawling`: Use Chromium to crawl docs locally. Useful if the default Cheerio crawler fails on sites that require JavaScript rendering. Downloads and installs Chromium to ~/.continue/.utils. Off by default -->
diff --git a/docs/static/img/header-buttons.png b/docs/static/img/header-buttons.png
deleted file mode 100644
index 6824043cf7..0000000000
Binary files a/docs/static/img/header-buttons.png and /dev/null differ
diff --git a/docs/static/img/settings-header.png b/docs/static/img/settings-header.png
new file mode 100644
index 0000000000..9b241b164b
Binary files /dev/null and b/docs/static/img/settings-header.png differ
diff --git a/gui/src/components/gui/NumberInput.tsx b/gui/src/components/gui/NumberInput.tsx
index 60693571e9..fa622d5e5e 100644
--- a/gui/src/components/gui/NumberInput.tsx
+++ b/gui/src/components/gui/NumberInput.tsx
@@ -34,7 +34,7 @@ const NumberInput: React.FC<NumberInputProps> = ({
   const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     const newInputValue = e.target.value;
     setInputValue(newInputValue);
-    
+
     // Only update the actual value if it's a valid number
     const numValue = parseInt(newInputValue, 10);
     if (!isNaN(numValue)) {
@@ -63,10 +63,12 @@ const NumberInput: React.FC<NumberInputProps> = ({
           WebkitAppearance: "none",
           MozAppearance: "none",
         }}
+        min={min}
+        max={max}
       />
       <div className="flex flex-col">
         <button
-          style={{ fontSize: "10px" }}
+          style={{ fontSize: "9px" }}
           onClick={handleIncrement}
           disabled={value >= max}
           className="text-vsc-foreground m-0 mb-0.5 cursor-pointer border-none bg-inherit px-1.5 py-0 hover:opacity-80"
@@ -74,7 +76,7 @@ const NumberInput: React.FC<NumberInputProps> = ({
           ▲
         </button>
         <button
-          style={{ fontSize: "10px" }}
+          style={{ fontSize: "9px" }}
           className="text-vsc-foreground m-0 mb-0.5 cursor-pointer border-none bg-inherit px-1.5 py-0 hover:opacity-80"
           onClick={handleDecrement}
           disabled={value <= min}
diff --git a/gui/src/components/gui/Switch.tsx b/gui/src/components/gui/Switch.tsx
index 3b98338d38..7004ae9d82 100644
--- a/gui/src/components/gui/Switch.tsx
+++ b/gui/src/components/gui/Switch.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { ReactNode } from "react";
 import { vscButtonBackground } from "..";
 
 type ToggleSwitchProps = {
@@ -6,6 +6,7 @@ type ToggleSwitchProps = {
   onToggle: () => void;
   text: string;
   size?: number;
+  showIfToggled?: ReactNode;
 };
 
 const ToggleSwitch: React.FC<ToggleSwitchProps> = ({
@@ -13,11 +14,13 @@ const ToggleSwitch: React.FC<ToggleSwitchProps> = ({
   onToggle,
   text,
   size = 16,
+  showIfToggled,
 }) => {
   return (
     <div className="flex cursor-pointer select-none items-center justify-between gap-3">
       <span className="truncate-right">{text}</span>
-      <div>
+      <div className="flex flex-row items-center gap-1">
+        {isToggled && !!showIfToggled && showIfToggled}
         <div
           className={`border-vsc-input-border bg-vsc-input-background flex items-center rounded-full border border-solid`}
           onClick={onToggle}
diff --git a/gui/src/pages/config/UserSettingsForm.tsx b/gui/src/pages/config/UserSettingsForm.tsx
index 06f2ce32c3..d116e34992 100644
--- a/gui/src/pages/config/UserSettingsForm.tsx
+++ b/gui/src/pages/config/UserSettingsForm.tsx
@@ -1,4 +1,9 @@
-import { CheckIcon, XMarkIcon } from "@heroicons/react/24/outline";
+import {
+  CheckIcon,
+  ChevronRightIcon,
+  ExclamationTriangleIcon,
+  XMarkIcon,
+} from "@heroicons/react/24/outline";
 import {
   SharedConfigSchema,
   modifyAnyConfigWithSharedConfig,
@@ -8,16 +13,19 @@ import { Input } from "../../components";
 import NumberInput from "../../components/gui/NumberInput";
 import { Select } from "../../components/gui/Select";
 import ToggleSwitch from "../../components/gui/Switch";
+import { ToolTip } from "../../components/gui/Tooltip";
+import { useFontSize } from "../../components/ui/font";
 import { IdeMessengerContext } from "../../context/IdeMessenger";
 import { useAppDispatch, useAppSelector } from "../../redux/hooks";
 import { updateConfig } from "../../redux/slices/configSlice";
-import { getFontSize } from "../../util";
+import { setLocalStorage } from "../../util/localStorage";
 
 export function UserSettingsForm() {
   /////// User settings section //////
   const dispatch = useAppDispatch();
   const ideMessenger = useContext(IdeMessengerContext);
   const config = useAppSelector((state) => state.config.config);
+  const [showExperimental, setShowExperimental] = useState(false);
 
   function handleUpdate(sharedConfig: SharedConfigSchema) {
     // Optimistic update
@@ -65,6 +73,7 @@ export function UserSettingsForm() {
   const codeWrap = config.ui?.codeWrap ?? false;
   const showChatScrollbar = config.ui?.showChatScrollbar ?? false;
   const readResponseTTS = config.experimental?.readResponseTTS ?? false;
+  const autoAcceptEditToolDiffs = config.ui?.autoAcceptEditToolDiffs ?? false;
   const displayRawMarkdown = config.ui?.displayRawMarkdown ?? false;
   const disableSessionTitles = config.disableSessionTitles ?? false;
 
@@ -79,7 +88,7 @@ export function UserSettingsForm() {
     config.tabAutocompleteOptions?.multilineCompletions ?? "auto";
   const modelTimeout = config.tabAutocompleteOptions?.modelTimeout ?? 150;
   const debounceDelay = config.tabAutocompleteOptions?.debounceDelay ?? 250;
-  const fontSize = getFontSize();
+  const fontSize = useFontSize();
 
   const cancelChangeDisableAutocomplete = () => {
     setFormDisableAutocomplete(disableAutocompleteInFiles);
@@ -162,7 +171,6 @@ export function UserSettingsForm() {
               }
               text="Text-to-Speech Output"
             />
-
             {/* <ToggleSwitch
                     isToggled={useChromiumForDocsCrawling}
                     onToggle={() =>
@@ -225,11 +233,12 @@ export function UserSettingsForm() {
               <span className="text-left">Font Size</span>
               <NumberInput
                 value={fontSize}
-                onChange={(val) =>
+                onChange={(val) => {
+                  setLocalStorage("fontSize", val);
                   handleUpdate({
                     fontSize: val,
-                  })
-                }
+                  });
+                }}
                 min={7}
                 max={50}
               />
@@ -255,7 +264,7 @@ export function UserSettingsForm() {
               </Select>
             </label>
             <label className="flex items-center justify-between gap-3">
-              <span className="text-left">Model Timeout (ms)</span>
+              <span className="text-left">Autocomplete Timeout (ms)</span>
               <NumberInput
                 value={modelTimeout}
                 onChange={(val) =>
@@ -268,7 +277,7 @@ export function UserSettingsForm() {
               />
             </label>
             <label className="flex items-center justify-between gap-3">
-              <span className="text-left">Model Debounce (ms)</span>
+              <span className="text-left">Autocomplete Debounce (ms)</span>
               <NumberInput
                 value={debounceDelay}
                 onChange={(val) =>
@@ -326,6 +335,48 @@ export function UserSettingsForm() {
               </span>
             </form>
           </div>
+
+          <div className="flex flex-col gap-2">
+            <div
+              className="flex cursor-pointer items-center gap-2 text-left text-sm font-semibold"
+              onClick={() => setShowExperimental(!showExperimental)}
+            >
+              <ChevronRightIcon
+                className={`h-4 w-4 transition-transform ${
+                  showExperimental ? "rotate-90" : ""
+                }`}
+              />
+              <span>Experimental Settings</span>
+            </div>
+            <div
+              className={`duration-400 overflow-hidden transition-all ease-in-out ${
+                showExperimental ? "max-h-40" : "max-h-0"
+              }`}
+            >
+              <div className="flex flex-col gap-1 pl-6">
+                <ToggleSwitch
+                  isToggled={autoAcceptEditToolDiffs}
+                  onToggle={() =>
+                    handleUpdate({
+                      autoAcceptEditToolDiffs: !autoAcceptEditToolDiffs,
+                    })
+                  }
+                  text="Auto-Accept Agent Edits"
+                  showIfToggled={
+                    <>
+                      <ExclamationTriangleIcon
+                        data-tooltip-id={`auto-accept-diffs-warning-tooltip`}
+                        className="h-3 w-3 text-yellow-500"
+                      />
+                      <ToolTip id={`auto-accept-diffs-warning-tooltip`}>
+                        {`Be very careful with this setting. When turned on, Agent mode's edit tool can make changes to files with no manual review or guaranteed stopping point`}
+                      </ToolTip>
+                    </>
+                  }
+                />
+              </div>
+            </div>
+          </div>
         </div>
       ) : null}
     </div>
diff --git a/gui/src/util/clientTools/editImpl.ts b/gui/src/util/clientTools/editImpl.ts
index d1f80f25ac..29aa5466cc 100644
--- a/gui/src/util/clientTools/editImpl.ts
+++ b/gui/src/util/clientTools/editImpl.ts
@@ -25,7 +25,21 @@ export const editToolImpl: ClientToolImpl = async (
   if (apply.status === "error") {
     throw new Error(apply.error);
   }
-
+  const state = extras.getState();
+  const autoAccept = !!state.config.config.ui?.autoAcceptEditToolDiffs;
+  if (autoAccept) {
+    const out = await extras.ideMessenger.request("acceptDiff", {
+      streamId: extras.streamId,
+      filepath: firstUriMatch,
+    });
+    if (out.status === "error") {
+      throw new Error(out.error);
+    }
+    return {
+      respondImmediately: true,
+      output: undefined, // TODO - feed edit results back to model (also in parallel listeners)
+    };
+  }
   return {
     respondImmediately: false,
     output: undefined, // No immediate output.