diff --git a/packages/cli/src/config/settings.ts b/packages/cli/src/config/settings.ts
index c42736528e..291df99139 100644
--- a/packages/cli/src/config/settings.ts
+++ b/packages/cli/src/config/settings.ts
@@ -40,6 +40,8 @@ const MIGRATION_MAP: Record<string, string> = {
   disableAutoUpdate: 'general.disableAutoUpdate',
   disableUpdateNag: 'general.disableUpdateNag',
   checkpointing: 'general.checkpointing',
+  enablePromptCompletion: 'general.enablePromptCompletion',
+  debugKeystrokeLogging: 'general.debugKeystrokeLogging',
   theme: 'ui.theme',
   customThemes: 'ui.customThemes',
   hideWindowTitle: 'ui.hideWindowTitle',
@@ -69,8 +71,10 @@ const MIGRATION_MAP: Record<string, string> = {
   includeDirectories: 'context.includeDirectories',
   loadMemoryFromIncludeDirectories: 'context.loadFromIncludeDirectories',
   fileFiltering: 'context.fileFiltering',
+  useRipgrep: 'tools.useRipgrep',
   sandbox: 'tools.sandbox',
   shouldUseNodePtyShell: 'tools.usePty',
+  autoAccept: 'tools.autoAccept',
   allowedTools: 'tools.allowed',
   coreTools: 'tools.core',
   excludeTools: 'tools.exclude',
@@ -86,6 +90,8 @@ const MIGRATION_MAP: Record<string, string> = {
   dnsResolutionOrder: 'advanced.dnsResolutionOrder',
   excludedProjectEnvVars: 'advanced.excludedEnvVars',
   bugCommand: 'advanced.bugCommand',
+  extensionManagement: 'experimental.extensionManagement',
+  extensions: 'extensions',
 };
 
 export function getSystemSettingsPath(): string {
diff --git a/packages/cli/src/config/settingsSchema.ts b/packages/cli/src/config/settingsSchema.ts
index e1a01f0d92..1708ddcaa3 100644
--- a/packages/cli/src/config/settingsSchema.ts
+++ b/packages/cli/src/config/settingsSchema.ts
@@ -574,6 +574,16 @@ export const SETTINGS_SCHEMA = {
           'Use node-pty for shell command execution. Fallback to child_process still applies.',
         showInDialog: true,
       },
+      autoAccept: {
+        type: 'boolean',
+        label: 'Auto Accept',
+        category: 'Tools',
+        requiresRestart: false,
+        default: false,
+        description:
+          'Automatically accept and execute tool calls that are considered safe (e.g., read-only operations).',
+        showInDialog: true,
+      },
       core: {
         type: 'array',
         label: 'Core Tools',