fix(plan): update persistent approval mode setting (#18638)

Co-authored-by: Sandy Tao <sandytao520@icloud.com>
2026-04-27 13:34:15 -07:00 · 2026-02-10 08:07:04 -05:00
parent e6b43cb846
commit e151b4890b
10 changed files with 150 additions and 85 deletions
@@ -911,6 +911,36 @@ export function migrateDeprecatedSettings(
      }
    }

+    // Migrate tools settings
+    const toolsSettings = settings.tools as Record<string, unknown> | undefined;
+    if (toolsSettings) {
+      if (toolsSettings['approvalMode'] !== undefined) {
+        foundDeprecated.push('tools.approvalMode');
+
+        const generalSettings =
+          (settings.general as Record<string, unknown> | undefined) || {};
+        const newGeneral = { ...generalSettings };
+
+        // Only set defaultApprovalMode if it's not already set
+        if (newGeneral['defaultApprovalMode'] === undefined) {
+          newGeneral['defaultApprovalMode'] = toolsSettings['approvalMode'];
+          loadedSettings.setValue(scope, 'general', newGeneral);
+          if (!settingsFile.readOnly) {
+            anyModified = true;
+          }
+        }
+
+        if (removeDeprecated) {
+          const newTools = { ...toolsSettings };
+          delete newTools['approvalMode'];
+          loadedSettings.setValue(scope, 'tools', newTools);
+          if (!settingsFile.readOnly) {
+            anyModified = true;
+          }
+        }
+      }
+    }
+
    // Migrate experimental agent settings
    const experimentalModified = migrateExperimentalSettings(
      settings,