From 8a075a1ed93a461ebf55b6d90b2409e8357d167b Mon Sep 17 00:00:00 2001
From: Christian Gunderman <gundermanc@google.com>
Date: Mon, 16 Feb 2026 12:37:40 -0800
Subject: [PATCH] Agents enabled.

---
 packages/cli/src/config/settingsSchema.ts |  2 +-
 packages/core/src/config/config.ts        | 23 +++++++++++++++--------
 packages/core/src/core/prompts.test.ts    |  4 ++--
 schemas/settings.schema.json              |  4 ++--
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/packages/cli/src/config/settingsSchema.ts b/packages/cli/src/config/settingsSchema.ts
index b486956211..41d9c520f7 100644
--- a/packages/cli/src/config/settingsSchema.ts
+++ b/packages/cli/src/config/settingsSchema.ts
@@ -1535,7 +1535,7 @@ const SETTINGS_SCHEMA = {
         label: 'Enable Agents',
         category: 'Experimental',
         requiresRestart: true,
-        default: false,
+        default: true,
         description:
           'Enable local and remote subagents. Warning: Experimental feature, uses YOLO mode for subagents',
         showInDialog: false,
diff --git a/packages/core/src/config/config.ts b/packages/core/src/config/config.ts
index 6242082d68..813f48daed 100644
--- a/packages/core/src/config/config.ts
+++ b/packages/core/src/config/config.ts
@@ -751,7 +751,7 @@ export class Config {
     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 ?? false;
@@ -2357,6 +2357,7 @@ export class Config {
     const maybeRegister = (
       toolClass: { name: string; Name?: string },
       registerFn: () => void,
+      defaultEnabled = true,
     ) => {
       const className = toolClass.name;
       const toolName = toolClass.Name || className;
@@ -2364,7 +2365,7 @@ export class Config {
       // On some platforms, the className can be minified to _ClassName.
       const normalizedClassName = className.replace(/^_+/, '');
 
-      let isEnabled = true; // Enabled by default if coreTools is not set.
+      let isEnabled = defaultEnabled; // Use provided default if coreTools is not set.
       if (coreTools) {
         isEnabled = coreTools.some(
           (tool) =>
@@ -2396,18 +2397,24 @@ export class Config {
         errorString = String(error);
       }
       if (useRipgrep) {
-        maybeRegister(RipGrepTool, () =>
-          registry.registerTool(new RipGrepTool(this, this.messageBus)),
+        maybeRegister(
+          RipGrepTool,
+          () => registry.registerTool(new RipGrepTool(this, this.messageBus)),
+          false,
         );
       } else {
         logRipgrepFallback(this, new RipgrepFallbackEvent(errorString));
-        maybeRegister(GrepTool, () =>
-          registry.registerTool(new GrepTool(this, this.messageBus)),
+        maybeRegister(
+          GrepTool,
+          () => registry.registerTool(new GrepTool(this, this.messageBus)),
+          false,
         );
       }
     } else {
-      maybeRegister(GrepTool, () =>
-        registry.registerTool(new GrepTool(this, this.messageBus)),
+      maybeRegister(
+        GrepTool,
+        () => registry.registerTool(new GrepTool(this, this.messageBus)),
+        false,
       );
     }
 
diff --git a/packages/core/src/core/prompts.test.ts b/packages/core/src/core/prompts.test.ts
index 54f8250fc7..ca92ee63a5 100644
--- a/packages/core/src/core/prompts.test.ts
+++ b/packages/core/src/core/prompts.test.ts
@@ -95,7 +95,7 @@ describe('Core System Prompt (prompts.ts)', () => {
       },
       isInteractive: vi.fn().mockReturnValue(true),
       isInteractiveShellEnabled: vi.fn().mockReturnValue(true),
-      isAgentsEnabled: vi.fn().mockReturnValue(false),
+      isAgentsEnabled: vi.fn().mockReturnValue(true),
       getPreviewFeatures: vi.fn().mockReturnValue(true),
       getModel: vi.fn().mockReturnValue(DEFAULT_GEMINI_MODEL_AUTO),
       getActiveModel: vi.fn().mockReturnValue(DEFAULT_GEMINI_MODEL),
@@ -375,7 +375,7 @@ describe('Core System Prompt (prompts.ts)', () => {
         },
         isInteractive: vi.fn().mockReturnValue(false),
         isInteractiveShellEnabled: vi.fn().mockReturnValue(false),
-        isAgentsEnabled: vi.fn().mockReturnValue(false),
+        isAgentsEnabled: vi.fn().mockReturnValue(true),
         getModel: vi.fn().mockReturnValue('auto'),
         getActiveModel: vi.fn().mockReturnValue(PREVIEW_GEMINI_MODEL),
         getPreviewFeatures: vi.fn().mockReturnValue(true),
diff --git a/schemas/settings.schema.json b/schemas/settings.schema.json
index c965c0f339..e83d47ab76 100644
--- a/schemas/settings.schema.json
+++ b/schemas/settings.schema.json
@@ -1492,8 +1492,8 @@
         "enableAgents": {
           "title": "Enable Agents",
           "description": "Enable local and remote subagents. Warning: Experimental feature, uses YOLO mode for subagents",
-          "markdownDescription": "Enable local and remote subagents. Warning: Experimental feature, uses YOLO mode for subagents\n\n- Category: `Experimental`\n- Requires restart: `yes`\n- Default: `false`",
-          "default": false,
+          "markdownDescription": "Enable local and remote subagents. Warning: Experimental feature, uses YOLO mode for subagents\n\n- Category: `Experimental`\n- Requires restart: `yes`\n- Default: `true`",
+          "default": true,
           "type": "boolean"
         },
         "extensionManagement": {