From 055ff92276cffb57988cecf0f3ca3951413609b9 Mon Sep 17 00:00:00 2001 From: Abhi <43648792+abhipatel12@users.noreply.github.com> Date: Tue, 24 Mar 2026 16:14:48 -0400 Subject: [PATCH] revert: chore(config): disable agents by default (#23672) --- docs/reference/configuration.md | 2 +- integration-tests/browser-policy.test.ts | 6 ------ packages/a2a-server/src/config/config.test.ts | 5 +++-- packages/a2a-server/src/config/config.ts | 2 +- packages/cli/src/config/settingsSchema.test.ts | 2 +- packages/cli/src/config/settingsSchema.ts | 2 +- packages/core/src/config/config.ts | 2 +- packages/core/src/index.ts | 6 +++++- schemas/settings.schema.json | 4 ++-- 9 files changed, 15 insertions(+), 16 deletions(-) diff --git a/docs/reference/configuration.md b/docs/reference/configuration.md index a5533e199c..89f7502502 100644 --- a/docs/reference/configuration.md +++ b/docs/reference/configuration.md @@ -1540,7 +1540,7 @@ their corresponding top-level category object in your `settings.json` file. - **`experimental.enableAgents`** (boolean): - **Description:** Enable local and remote subagents. - - **Default:** `false` + - **Default:** `true` - **Requires restart:** Yes - **`experimental.worktrees`** (boolean): diff --git a/integration-tests/browser-policy.test.ts b/integration-tests/browser-policy.test.ts index bb66b10aab..f533cb3f5e 100644 --- a/integration-tests/browser-policy.test.ts +++ b/integration-tests/browser-policy.test.ts @@ -63,9 +63,6 @@ describe.skipIf(!chromeAvailable)('browser-policy', () => { rig.setup('browser-policy-skip-confirmation', { fakeResponsesPath: join(__dirname, 'browser-policy.responses'), settings: { - experimental: { - enableAgents: true, - }, agents: { overrides: { browser_agent: { @@ -183,9 +180,6 @@ priority = 200 rig.setup('browser-session-warning', { fakeResponsesPath: join(__dirname, 'browser-agent.cleanup.responses'), settings: { - experimental: { - enableAgents: true, - }, general: { enableAutoUpdateNotification: false, }, diff --git a/packages/a2a-server/src/config/config.test.ts b/packages/a2a-server/src/config/config.test.ts index 370c859944..007f1d5f06 100644 --- a/packages/a2a-server/src/config/config.test.ts +++ b/packages/a2a-server/src/config/config.test.ts @@ -29,6 +29,7 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => { await importOriginal(); return { ...actual, + PRIORITY_YOLO_ALLOW_ALL: 998, Config: vi.fn().mockImplementation((params) => { const mockConfig = { ...params, @@ -341,11 +342,11 @@ describe('loadConfig', () => { ); }); - it('should default enableAgents to false when not provided', async () => { + it('should default enableAgents to true when not provided', async () => { await loadConfig(mockSettings, mockExtensionLoader, taskId); expect(Config).toHaveBeenCalledWith( expect.objectContaining({ - enableAgents: false, + enableAgents: true, }), ); }); diff --git a/packages/a2a-server/src/config/config.ts b/packages/a2a-server/src/config/config.ts index 1fe55258fc..c3561629b6 100644 --- a/packages/a2a-server/src/config/config.ts +++ b/packages/a2a-server/src/config/config.ts @@ -128,7 +128,7 @@ export async function loadConfig( interactive: !isHeadlessMode(), enableInteractiveShell: !isHeadlessMode(), ptyInfo: 'auto', - enableAgents: settings.experimental?.enableAgents ?? false, + enableAgents: settings.experimental?.enableAgents ?? true, }; const fileService = new FileDiscoveryService(workspaceDir, { diff --git a/packages/cli/src/config/settingsSchema.test.ts b/packages/cli/src/config/settingsSchema.test.ts index 9b643396ae..c358cd65aa 100644 --- a/packages/cli/src/config/settingsSchema.test.ts +++ b/packages/cli/src/config/settingsSchema.test.ts @@ -400,7 +400,7 @@ describe('SettingsSchema', () => { expect(setting).toBeDefined(); expect(setting.type).toBe('boolean'); expect(setting.category).toBe('Experimental'); - expect(setting.default).toBe(false); + expect(setting.default).toBe(true); expect(setting.requiresRestart).toBe(true); expect(setting.showInDialog).toBe(false); expect(setting.description).toBe('Enable local and remote subagents.'); diff --git a/packages/cli/src/config/settingsSchema.ts b/packages/cli/src/config/settingsSchema.ts index b886dfccf3..0d0672a227 100644 --- a/packages/cli/src/config/settingsSchema.ts +++ b/packages/cli/src/config/settingsSchema.ts @@ -1932,7 +1932,7 @@ const SETTINGS_SCHEMA = { label: 'Enable Agents', category: 'Experimental', requiresRestart: true, - default: false, + default: true, description: 'Enable local and remote subagents.', showInDialog: false, }, diff --git a/packages/core/src/config/config.ts b/packages/core/src/config/config.ts index e32205d070..f4f186ff8f 100644 --- a/packages/core/src/config/config.ts +++ b/packages/core/src/config/config.ts @@ -1027,7 +1027,7 @@ export class Config implements McpContext, AgentLoopContext { this.model = params.model; this.disableLoopDetection = params.disableLoopDetection ?? false; this._activeModel = params.model; - this.enableAgents = params.enableAgents ?? false; + this.enableAgents = params.enableAgents ?? true; this.agents = params.agents ?? {}; this.disableLLMCorrection = params.disableLLMCorrection ?? true; this.planEnabled = params.plan ?? true; diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index e607775345..2d48eeffe9 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -88,7 +88,11 @@ export * from './utils/approvalModeUtils.js'; export * from './utils/fileDiffUtils.js'; export * from './utils/retry.js'; export * from './utils/shell-utils.js'; -export { PolicyDecision, ApprovalMode } from './policy/types.js'; +export { + PolicyDecision, + ApprovalMode, + PRIORITY_YOLO_ALLOW_ALL, +} from './policy/types.js'; export * from './utils/tool-utils.js'; export * from './utils/terminalSerializer.js'; export * from './utils/systemEncoding.js'; diff --git a/schemas/settings.schema.json b/schemas/settings.schema.json index 3789b64d52..287d2b3f76 100644 --- a/schemas/settings.schema.json +++ b/schemas/settings.schema.json @@ -2680,8 +2680,8 @@ "enableAgents": { "title": "Enable Agents", "description": "Enable local and remote subagents.", - "markdownDescription": "Enable local and remote subagents.\n\n- Category: `Experimental`\n- Requires restart: `yes`\n- Default: `false`", - "default": false, + "markdownDescription": "Enable local and remote subagents.\n\n- Category: `Experimental`\n- Requires restart: `yes`\n- Default: `true`", + "default": true, "type": "boolean" }, "worktrees": {