chore: cleanup branch, remove discontinued subagent settings and docs

packages/cli/src/config/config.ts

@@ -804,10 +804,6 @@ export async function loadCliConfig(
     output: {
       format: (argv.outputFormat ?? settings.output?.format) as OutputFormat,
     },
-    codebaseInvestigatorSettings:
-      settings.experimental?.codebaseInvestigatorSettings,
-    introspectionAgentSettings:
-      settings.experimental?.introspectionAgentSettings,
     adaptiveThinking: settings.experimental?.adaptiveThinking,
     fakeResponses: argv.fakeResponses,
     recordResponses: argv.recordResponses,

packages/cli/src/config/settings.test.ts

@@ -2154,64 +2154,9 @@ describe('Settings Loading and Merging', () => {
       );
     });
 
-    it('should migrate experimental agent settings in system scope in memory but not save', () => {
-      const systemSettingsContent = {
-        experimental: {
-          codebaseInvestigatorSettings: {
-            enabled: true,
-          },
-        },
-      };
-
-      vi.mocked(fs.existsSync).mockReturnValue(true);
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === getSystemSettingsPath()) {
-            return JSON.stringify(systemSettingsContent);
-          }
-          return '{}';
-        },
-      );
-
-      const feedbackSpy = mockCoreEvents.emitFeedback;
-      const settings = loadSettings(MOCK_WORKSPACE_DIR);
-
-      // Verify it was migrated in memory
-      expect(settings.system.settings.agents?.overrides).toMatchObject({
-        codebase_investigator: {
-          enabled: true,
-        },
-      });
-
-      // Verify it was NOT saved back to disk
-      expect(updateSettingsFilePreservingFormat).not.toHaveBeenCalledWith(
-        getSystemSettingsPath(),
-        expect.anything(),
-      );
-
-      // Verify warnings were shown
-      expect(feedbackSpy).toHaveBeenCalledWith(
-        'warning',
-        expect.stringContaining(
-          'The system configuration contains deprecated settings: [experimental.codebaseInvestigatorSettings]',
-        ),
-      );
-    });
-
-    it('should migrate experimental agent settings to agents overrides', () => {
+    it('should not throw if experimental settings are missing', () => {
       const userSettingsContent = {
-        experimental: {
-          codebaseInvestigatorSettings: {
-            enabled: true,
-            maxNumTurns: 15,
-            maxTimeMinutes: 5,
-            thinkingBudget: 16384,
-            model: 'gemini-1.5-pro',
-          },
-          cliHelpAgentSettings: {
-            enabled: false,
-          },
-        },
+        experimental: {},
       };
 
       vi.mocked(fs.existsSync).mockReturnValue(true);
@@ -2223,29 +2168,7 @@ describe('Settings Loading and Merging', () => {
         },
       );
 
-      const settings = loadSettings(MOCK_WORKSPACE_DIR);
-
-      // Verify migration to agents.overrides
-      expect(settings.user.settings.agents?.overrides).toMatchObject({
-        codebase_investigator: {
-          enabled: true,
-          runConfig: {
-            maxTurns: 15,
-            maxTimeMinutes: 5,
-          },
-          modelConfig: {
-            model: 'gemini-1.5-pro',
-            generateContentConfig: {
-              thinkingConfig: {
-                thinkingBudget: 16384,
-              },
-            },
-          },
-        },
-        cli_help: {
-          enabled: false,
-        },
-      });
+      expect(() => loadSettings(MOCK_WORKSPACE_DIR)).not.toThrow();
     });
   });
 

packages/cli/src/config/settings.ts

@@ -904,21 +904,6 @@ export function migrateDeprecatedSettings(
       }
     }
 
-    // Migrate experimental agent settings
-    const experimentalModified = migrateExperimentalSettings(
-      settings,
-      loadedSettings,
-      scope,
-      removeDeprecated,
-      foundDeprecated,
-    );
-
-    if (experimentalModified) {
-      if (!settingsFile.readOnly) {
-        anyModified = true;
-      }
-    }
-
     if (settingsFile.readOnly && foundDeprecated.length > 0) {
       systemWarnings.set(scope, foundDeprecated);
     }
@@ -983,105 +968,3 @@ export function saveModelChange(
     );
   }
 }
-
-function migrateExperimentalSettings(
-  settings: Settings,
-  loadedSettings: LoadedSettings,
-  scope: LoadableSettingScope,
-  removeDeprecated: boolean,
-  foundDeprecated?: string[],
-): boolean {
-  const experimentalSettings = settings.experimental as
-    | Record<string, unknown>
-    | undefined;
-
-  if (experimentalSettings) {
-    const agentsSettings = {
-      ...(settings.agents as Record<string, unknown> | undefined),
-    };
-    const agentsOverrides = {
-      ...((agentsSettings['overrides'] as Record<string, unknown>) || {}),
-    };
-    let modified = false;
-
-    const migrateExperimental = (
-      oldKey: string,
-      migrateFn: (oldValue: Record<string, unknown>) => void,
-    ) => {
-      const old = experimentalSettings[oldKey];
-      if (old) {
-        foundDeprecated?.push(`experimental.${oldKey}`);
-        migrateFn(old as Record<string, unknown>);
-        modified = true;
-      }
-    };
-
-    // Migrate codebaseInvestigatorSettings -> agents.overrides.codebase_investigator
-    migrateExperimental('codebaseInvestigatorSettings', (old) => {
-      const override = {
-        ...(agentsOverrides['codebase_investigator'] as
-          | Record<string, unknown>
-          | undefined),
-      };
-
-      if (old['enabled'] !== undefined) override['enabled'] = old['enabled'];
-
-      const runConfig = {
-        ...(override['runConfig'] as Record<string, unknown> | undefined),
-      };
-      if (old['maxNumTurns'] !== undefined)
-        runConfig['maxTurns'] = old['maxNumTurns'];
-      if (old['maxTimeMinutes'] !== undefined)
-        runConfig['maxTimeMinutes'] = old['maxTimeMinutes'];
-      if (Object.keys(runConfig).length > 0) override['runConfig'] = runConfig;
-
-      if (old['model'] !== undefined || old['thinkingBudget'] !== undefined) {
-        const modelConfig = {
-          ...(override['modelConfig'] as Record<string, unknown> | undefined),
-        };
-        if (old['model'] !== undefined) modelConfig['model'] = old['model'];
-        if (old['thinkingBudget'] !== undefined) {
-          const generateContentConfig = {
-            ...(modelConfig['generateContentConfig'] as
-              | Record<string, unknown>
-              | undefined),
-          };
-          const thinkingConfig = {
-            ...(generateContentConfig['thinkingConfig'] as
-              | Record<string, unknown>
-              | undefined),
-          };
-          thinkingConfig['thinkingBudget'] = old['thinkingBudget'];
-          generateContentConfig['thinkingConfig'] = thinkingConfig;
-          modelConfig['generateContentConfig'] = generateContentConfig;
-        }
-        override['modelConfig'] = modelConfig;
-      }
-
-      agentsOverrides['codebase_investigator'] = override;
-    });
-
-    // Migrate cliHelpAgentSettings -> agents.overrides.cli_help
-    migrateExperimental('cliHelpAgentSettings', (old) => {
-      const override = {
-        ...(agentsOverrides['cli_help'] as Record<string, unknown> | undefined),
-      };
-      if (old['enabled'] !== undefined) override['enabled'] = old['enabled'];
-      agentsOverrides['cli_help'] = override;
-    });
-
-    if (modified) {
-      agentsSettings['overrides'] = agentsOverrides;
-      loadedSettings.setValue(scope, 'agents', agentsSettings);
-
-      if (removeDeprecated) {
-        const newExperimental = { ...experimentalSettings };
-        delete newExperimental['codebaseInvestigatorSettings'];
-        delete newExperimental['cliHelpAgentSettings'];
-        loadedSettings.setValue(scope, 'experimental', newExperimental);
-      }
-      return true;
-    }
-  }
-  return false;
-}

packages/cli/src/config/settingsSchema.ts

@@ -1552,82 +1552,6 @@ const SETTINGS_SCHEMA = {
         description: 'Enable planning features (Plan Mode and tools).',
         showInDialog: true,
       },
-      codebaseInvestigatorSettings: {
-        type: 'object',
-        label: 'Codebase Investigator Settings',
-        category: 'Experimental',
-        requiresRestart: true,
-        default: {},
-        description: 'Configuration for Codebase Investigator subagent.',
-        showInDialog: false,
-        properties: {
-          enabled: {
-            type: 'boolean',
-            label: 'Enable Codebase Investigator',
-            category: 'Experimental',
-            requiresRestart: true,
-            default: true,
-            description: 'Enable the Codebase Investigator subagent.',
-            showInDialog: true,
-          },
-          maxNumTurns: {
-            type: 'number',
-            label: 'Max Turns',
-            category: 'Experimental',
-            requiresRestart: true,
-            default: 10,
-            description: 'Maximum number of conversational turns.',
-            showInDialog: true,
-          },
-          maxTimeMinutes: {
-            type: 'number',
-            label: 'Max Time (Minutes)',
-            category: 'Experimental',
-            requiresRestart: true,
-            default: 3,
-            description: 'Maximum execution time in minutes.',
-            showInDialog: true,
-          },
-          thinkingBudget: {
-            type: 'number',
-            label: 'Thinking Budget',
-            category: 'Experimental',
-            requiresRestart: true,
-            default: 8192,
-            description: 'The thinking budget for the model.',
-            showInDialog: true,
-          },
-          model: {
-            type: 'string',
-            label: 'Model',
-            category: 'Experimental',
-            requiresRestart: true,
-            default: undefined as string | undefined,
-            description: 'The model to use for the subagent.',
-            showInDialog: true,
-          },
-        },
-      },
-      introspectionAgentSettings: {
-        type: 'object',
-        label: 'Introspection Agent Settings',
-        category: 'Experimental',
-        requiresRestart: true,
-        default: {},
-        description: 'Configuration for Introspection Agent.',
-        showInDialog: false,
-        properties: {
-          enabled: {
-            type: 'boolean',
-            label: 'Enable Introspection Agent',
-            category: 'Experimental',
-            requiresRestart: true,
-            default: false,
-            description: 'Enable the Introspection Agent.',
-            showInDialog: true,
-          },
-        },
-      },
       adaptiveThinking: {
         type: 'object',
         label: 'Adaptive Thinking Settings',