From 430a52fc2716ae37be5dfc3b10f569f66ebe1de8 Mon Sep 17 00:00:00 2001
From: Michael Bleigh <bleigh@google.com>
Date: Fri, 3 Apr 2026 13:45:59 -0700
Subject: [PATCH] fix: use agentSessionInteractiveEnabled

---
 docs/reference/configuration.md           |  6 ++++++
 packages/cli/src/config/settingsSchema.ts | 10 ++++++++++
 packages/core/src/config/config.ts        | 12 ++++++------
 schemas/settings.schema.json              |  7 +++++++
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/docs/reference/configuration.md b/docs/reference/configuration.md
index 2e8e3f374c..860177cf1e 100644
--- a/docs/reference/configuration.md
+++ b/docs/reference/configuration.md
@@ -1605,6 +1605,12 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `false`
   - **Requires restart:** Yes
 
+- **`experimental.adk.agentSessionInteractiveEnabled`** (boolean):
+  - **Description:** Enable the agent session implementation for the interactive
+    CLI.
+  - **Default:** `false`
+  - **Requires restart:** Yes
+
 - **`experimental.enableAgents`** (boolean):
   - **Description:** Enable local and remote subagents.
   - **Default:** `true`
diff --git a/packages/cli/src/config/settingsSchema.ts b/packages/cli/src/config/settingsSchema.ts
index 01e248e797..165ab1a7e2 100644
--- a/packages/cli/src/config/settingsSchema.ts
+++ b/packages/cli/src/config/settingsSchema.ts
@@ -1970,6 +1970,16 @@ const SETTINGS_SCHEMA = {
             description: 'Enable non-interactive agent sessions.',
             showInDialog: false,
           },
+          agentSessionInteractiveEnabled: {
+            type: 'boolean',
+            label: 'Interactive Agent Session Enabled',
+            category: 'Experimental',
+            requiresRestart: true,
+            default: false,
+            description:
+              'Enable the agent session implementation for the interactive CLI.',
+            showInDialog: false,
+          },
         },
       },
       enableAgents: {
diff --git a/packages/core/src/config/config.ts b/packages/core/src/config/config.ts
index bec6d3eef9..4b17b38849 100644
--- a/packages/core/src/config/config.ts
+++ b/packages/core/src/config/config.ts
@@ -225,7 +225,7 @@ export interface GemmaModelRouterSettings {
 
 export interface ADKSettings {
   agentSessionNoninteractiveEnabled?: boolean;
-  interactiveAgentSessionEnabled?: boolean;
+  agentSessionInteractiveEnabled?: boolean;
 }
 
 export interface ExtensionSetting {
@@ -893,7 +893,7 @@ export class Config implements McpContext, AgentLoopContext {
 
   private readonly gemmaModelRouter: GemmaModelRouterSettings;
   private readonly agentSessionNoninteractiveEnabled: boolean;
-  private readonly interactiveAgentSessionEnabled: boolean;
+  private readonly agentSessionInteractiveEnabled: boolean;
 
   private readonly continueOnFailedApiCall: boolean;
   private readonly retryFetchErrors: boolean;
@@ -1316,8 +1316,8 @@ export class Config implements McpContext, AgentLoopContext {
 
     this.agentSessionNoninteractiveEnabled =
       params.adk?.agentSessionNoninteractiveEnabled ?? false;
-    this.interactiveAgentSessionEnabled =
-      params.adk?.interactiveAgentSessionEnabled ?? false;
+    this.agentSessionInteractiveEnabled =
+      params.adk?.agentSessionInteractiveEnabled ?? false;
     this.retryFetchErrors = params.retryFetchErrors ?? true;
     this.maxAttempts = Math.min(
       params.maxAttempts ?? DEFAULT_MAX_ATTEMPTS,
@@ -3381,8 +3381,8 @@ export class Config implements McpContext, AgentLoopContext {
     return this.agentSessionNoninteractiveEnabled;
   }
 
-  getInteractiveAgentSessionEnabled(): boolean {
-    return this.interactiveAgentSessionEnabled;
+  getAgentSessionInteractiveEnabled(): boolean {
+    return this.agentSessionInteractiveEnabled;
   }
 
   /**
diff --git a/schemas/settings.schema.json b/schemas/settings.schema.json
index 1ca78621af..d67aed23dd 100644
--- a/schemas/settings.schema.json
+++ b/schemas/settings.schema.json
@@ -2775,6 +2775,13 @@
               "markdownDescription": "Enable non-interactive agent sessions.\n\n- Category: `Experimental`\n- Requires restart: `yes`\n- Default: `false`",
               "default": false,
               "type": "boolean"
+            },
+            "agentSessionInteractiveEnabled": {
+              "title": "Interactive Agent Session Enabled",
+              "description": "Enable the agent session implementation for the interactive CLI.",
+              "markdownDescription": "Enable the agent session implementation for the interactive CLI.\n\n- Category: `Experimental`\n- Requires restart: `yes`\n- Default: `false`",
+              "default": false,
+              "type": "boolean"
             }
           },
           "additionalProperties": false