From 1aa35c879605ef14027f8fa80a3b34ece495520d Mon Sep 17 00:00:00 2001
From: Tommaso Sciortino <sciortino@gmail.com>
Date: Wed, 7 Jan 2026 15:43:12 -0800
Subject: [PATCH] enable cli_help agent by default (#16100)

---
 docs/cli/settings.md                      | 1 +
 docs/get-started/configuration.md         | 2 +-
 packages/cli/src/config/settingsSchema.ts | 2 +-
 packages/core/src/agents/registry.test.ts | 7 +++----
 packages/core/src/config/config.test.ts   | 1 +
 packages/core/src/config/config.ts        | 5 +++--
 schemas/settings.schema.json              | 4 ++--
 7 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/docs/cli/settings.md b/docs/cli/settings.md
index f281ec8da0..3aaeffdf9e 100644
--- a/docs/cli/settings.md
+++ b/docs/cli/settings.md
@@ -111,4 +111,5 @@ they appear in the UI.
 | ----------------------------------- | ------------------------------------------------------- | ------------------------------------------------------------ | ------- |
 | Enable Codebase Investigator        | `experimental.codebaseInvestigatorSettings.enabled`     | Enable the Codebase Investigator agent.                      | `true`  |
 | Codebase Investigator Max Num Turns | `experimental.codebaseInvestigatorSettings.maxNumTurns` | Maximum number of turns for the Codebase Investigator agent. | `10`    |
+| Enable CLI Help Agent               | `experimental.cliHelpAgentSettings.enabled`             | Enable the CLI Help Agent.                                   | `true`  |
 | Agent Skills                        | `experimental.skills`                                   | Enable Agent Skills (experimental).                          | `false` |
diff --git a/docs/get-started/configuration.md b/docs/get-started/configuration.md
index c01240dcb9..1777d22f5f 100644
--- a/docs/get-started/configuration.md
+++ b/docs/get-started/configuration.md
@@ -853,7 +853,7 @@ their corresponding top-level category object in your `settings.json` file.
 
 - **`experimental.cliHelpAgentSettings.enabled`** (boolean):
   - **Description:** Enable the CLI Help Agent.
-  - **Default:** `false`
+  - **Default:** `true`
   - **Requires restart:** Yes
 
 #### `skills`
diff --git a/packages/cli/src/config/settingsSchema.ts b/packages/cli/src/config/settingsSchema.ts
index 38d075b207..4dea5d0a99 100644
--- a/packages/cli/src/config/settingsSchema.ts
+++ b/packages/cli/src/config/settingsSchema.ts
@@ -1467,7 +1467,7 @@ const SETTINGS_SCHEMA = {
             label: 'Enable CLI Help Agent',
             category: 'Experimental',
             requiresRestart: true,
-            default: false,
+            default: true,
             description: 'Enable the CLI Help Agent.',
             showInDialog: true,
           },
diff --git a/packages/core/src/agents/registry.test.ts b/packages/core/src/agents/registry.test.ts
index 5517909045..4864566bc0 100644
--- a/packages/core/src/agents/registry.test.ts
+++ b/packages/core/src/agents/registry.test.ts
@@ -209,6 +209,7 @@ describe('AgentRegistry', () => {
       const disabledConfig = makeFakeConfig({
         enableAgents: false,
         codebaseInvestigatorSettings: { enabled: false },
+        cliHelpAgentSettings: { enabled: false },
       });
       const disabledRegistry = new TestableAgentRegistry(disabledConfig);
 
@@ -220,10 +221,8 @@ describe('AgentRegistry', () => {
       ).not.toHaveBeenCalled();
     });
 
-    it('should register CLI help agent if enabled', async () => {
-      const config = makeFakeConfig({
-        cliHelpAgentSettings: { enabled: true },
-      });
+    it('should register CLI help agent by default', async () => {
+      const config = makeFakeConfig();
       const registry = new TestableAgentRegistry(config);
 
       await registry.initialize();
diff --git a/packages/core/src/config/config.test.ts b/packages/core/src/config/config.test.ts
index e16ef982fc..265785a891 100644
--- a/packages/core/src/config/config.test.ts
+++ b/packages/core/src/config/config.test.ts
@@ -941,6 +941,7 @@ describe('Server Config (config.ts)', () => {
       const params: ConfigParameters = {
         ...baseParams,
         codebaseInvestigatorSettings: { enabled: false },
+        cliHelpAgentSettings: { enabled: false },
       };
       const config = new Config(params);
 
diff --git a/packages/core/src/config/config.ts b/packages/core/src/config/config.ts
index 2021576643..8e7a8e42cb 100644
--- a/packages/core/src/config/config.ts
+++ b/packages/core/src/config/config.ts
@@ -622,7 +622,7 @@ export class Config {
       model: params.codebaseInvestigatorSettings?.model,
     };
     this.cliHelpAgentSettings = {
-      enabled: params.cliHelpAgentSettings?.enabled ?? false,
+      enabled: params.cliHelpAgentSettings?.enabled ?? true,
     };
     this.continueOnFailedApiCall = params.continueOnFailedApiCall ?? true;
     this.enableShellOutputEfficiency =
@@ -1754,7 +1754,8 @@ export class Config {
     // Register DelegateToAgentTool if agents are enabled
     if (
       this.isAgentsEnabled() ||
-      this.getCodebaseInvestigatorSettings().enabled
+      this.getCodebaseInvestigatorSettings().enabled ||
+      this.getCliHelpAgentSettings().enabled
     ) {
       // Check if the delegate tool itself is allowed (if allowedTools is set)
       const allowedTools = this.getAllowedTools();
diff --git a/schemas/settings.schema.json b/schemas/settings.schema.json
index e7473ea395..83429aecca 100644
--- a/schemas/settings.schema.json
+++ b/schemas/settings.schema.json
@@ -1435,8 +1435,8 @@
             "enabled": {
               "title": "Enable CLI Help Agent",
               "description": "Enable the CLI Help Agent.",
-              "markdownDescription": "Enable the CLI Help Agent.\n\n- Category: `Experimental`\n- Requires restart: `yes`\n- Default: `false`",
-              "default": false,
+              "markdownDescription": "Enable the CLI Help Agent.\n\n- Category: `Experimental`\n- Requires restart: `yes`\n- Default: `true`",
+              "default": true,
               "type": "boolean"
             }
           },