Revert "feat: Introduce an AI-driven interactive shell mode with new"

This reverts commit 651ad63.

Author: gsquared94

packages/cli/src/config/config.ts

@@ -1009,7 +1009,6 @@ export async function loadCliConfig(
     enableInteractiveShell: settings.tools?.shell?.enableInteractiveShell,
     shellBackgroundCompletionBehavior: settings.tools?.shell
       ?.backgroundCompletionBehavior as string | undefined,
-    interactiveShellMode: settings.tools?.shell?.interactiveShellMode,
     shellToolInactivityTimeout: settings.tools?.shell?.inactivityTimeout,
     enableShellOutputEfficiency:
       settings.tools?.shell?.enableShellOutputEfficiency ?? true,

packages/cli/src/config/settingsSchema.ts

@@ -1512,26 +1512,6 @@ const SETTINGS_SCHEMA = {
               { label: 'Notify', value: 'notify' },
             ],
           },
-          interactiveShellMode: {
-            type: 'enum',
-            label: 'Interactive Shell Mode',
-            category: 'Tools',
-            requiresRestart: true,
-            default: undefined as 'human' | 'ai' | 'off' | undefined,
-            description: oneLine`
-              Controls who can interact with backgrounded shell processes.
-              "human": user can Tab-focus and type into shells (default).
-              "ai": model gets write_to_shell/read_shell tools for TUI interaction.
-              "off": no interactive shell.
-              When set, overrides enableInteractiveShell.
-            `,
-            showInDialog: true,
-            options: [
-              { value: 'human', label: 'Human (Tab to focus)' },
-              { value: 'ai', label: 'AI (model-driven tools)' },
-              { value: 'off', label: 'Off' },
-            ],
-          },
           pager: {
             type: 'string',
             label: 'Pager',

packages/cli/src/ui/hooks/shellReducer.ts

@@ -92,23 +92,7 @@ export function shellReducer(
         nextTasks.delete(action.pid);
       }
       nextTasks.set(action.pid, updatedTask);
-
-      // Auto-hide panel when all tasks have exited
-      let nextVisible = state.isBackgroundTaskVisible;
-      if (action.update.status === 'exited') {
-        const hasRunning = Array.from(nextTasks.values()).some(
-          (s) => s.status === 'running',
-        );
-        if (!hasRunning) {
-          nextVisible = false;
-        }
-      }
-
-      return {
-        ...state,
-        backgroundTasks: nextTasks,
-        isBackgroundTaskVisible: nextVisible,
-      };
+      return { ...state, backgroundTasks: nextTasks };
     }
     case 'APPEND_TASK_OUTPUT': {
       const task = state.backgroundTasks.get(action.pid);

packages/cli/src/ui/hooks/useBackgroundShellManager.ts

@@ -661,18 +661,13 @@ export const useExecutionLifecycle = (
     (s: BackgroundTask) => s.status === 'running',
   ).length;
 
-  const showBackgroundShell = useCallback(() => {
-    dispatch({ type: 'SET_VISIBILITY', visible: true });
-  }, [dispatch]);
-
   return {
     handleShellCommand,
     activeShellPtyId: state.activeShellPtyId,
     lastShellOutputTime: state.lastShellOutputTime,
     backgroundTaskCount,
     isBackgroundTaskVisible: state.isBackgroundTaskVisible,
     toggleBackgroundTasks,
-    showBackgroundShell,
     backgroundCurrentExecution,
     registerBackgroundTask,
     dismissBackgroundTask,

packages/cli/src/ui/hooks/useExecutionLifecycle.ts

@@ -390,7 +390,6 @@ export const useGeminiStream = (
     backgroundTaskCount,
     isBackgroundTaskVisible,
     toggleBackgroundTasks,
-    showBackgroundShell,
     backgroundCurrentExecution,
     registerBackgroundTask,
     dismissBackgroundTask,
@@ -1918,7 +1917,6 @@ export const useGeminiStream = (
             backgroundedTool.command,
             backgroundedTool.initialOutput,
           );
-          showBackgroundShell();
         }
       }
 
@@ -2058,7 +2056,6 @@ export const useGeminiStream = (
       modelSwitchedFromQuotaError,
       addItem,
       registerBackgroundTask,
-      showBackgroundShell,
       consumeUserHint,
       isLowErrorVerbosity,
       maybeAddSuppressedToolErrorNote,

packages/cli/src/ui/hooks/useGeminiStream.ts

@@ -36,8 +36,6 @@ import { GlobTool } from '../tools/glob.js';
 import { ActivateSkillTool } from '../tools/activate-skill.js';
 import { EditTool } from '../tools/edit.js';
 import { ShellTool } from '../tools/shell.js';
-import { WriteToShellTool } from '../tools/write-to-shell.js';
-import { ReadShellTool } from '../tools/read-shell.js';
 import { WriteFileTool } from '../tools/write-file.js';
 import { WebFetchTool } from '../tools/web-fetch.js';
 import { MemoryTool, setGeminiMdFilename } from '../tools/memoryTool.js';
@@ -658,7 +656,6 @@ export interface ConfigParameters {
   useRipgrep?: boolean;
   enableInteractiveShell?: boolean;
   shellBackgroundCompletionBehavior?: string;
-  interactiveShellMode?: 'human' | 'ai' | 'off';
   skipNextSpeakerCheck?: boolean;
   shellExecutionConfig?: ShellExecutionConfig;
   extensionManagement?: boolean;
@@ -871,7 +868,6 @@ export class Config implements McpContext, AgentLoopContext {
     | 'inject'
     | 'notify'
     | 'silent';
-  private readonly interactiveShellMode: 'human' | 'ai' | 'off';
   private readonly skipNextSpeakerCheck: boolean;
   private readonly useBackgroundColor: boolean;
   private readonly useAlternateBuffer: boolean;
@@ -1239,14 +1235,6 @@ export class Config implements McpContext, AgentLoopContext {
       this.shellBackgroundCompletionBehavior = 'silent';
     }
 
-    // interactiveShellMode takes precedence over enableInteractiveShell.
-    // If not set, derive from enableInteractiveShell for backward compat.
-    if (params.interactiveShellMode) {
-      this.interactiveShellMode = params.interactiveShellMode;
-    } else {
-      this.interactiveShellMode = this.enableInteractiveShell ? 'human' : 'off';
-    }
-
     this.skipNextSpeakerCheck = params.skipNextSpeakerCheck ?? true;
     this.shellExecutionConfig = {
       terminalWidth: params.shellExecutionConfig?.terminalWidth ?? 80,
@@ -3223,14 +3211,10 @@ export class Config implements McpContext, AgentLoopContext {
     return (
       this.interactive &&
       this.ptyInfo !== 'child_process' &&
-      this.interactiveShellMode !== 'off'
+      this.enableInteractiveShell
     );
   }
 
-  getInteractiveShellMode(): 'human' | 'ai' | 'off' {
-    return this.interactiveShellMode;
-  }
-
   isSkillsSupportEnabled(): boolean {
     return this.skillsSupport;
   }
@@ -3591,15 +3575,6 @@ export class Config implements McpContext, AgentLoopContext {
         new ReadBackgroundOutputTool(this, this.messageBus),
       ),
     );
-    // Register AI-driven interactive shell tools when mode is 'ai'
-    if (this.getInteractiveShellMode() === 'ai') {
-      maybeRegister(WriteToShellTool, () =>
-        registry.registerTool(new WriteToShellTool(this.messageBus)),
-      );
-      maybeRegister(ReadShellTool, () =>
-        registry.registerTool(new ReadShellTool(this.messageBus)),
-      );
-    }
     if (!this.isMemoryManagerEnabled()) {
       maybeRegister(MemoryTool, () =>
         registry.registerTool(new MemoryTool(this.messageBus, this.storage)),

packages/core/src/config/config.ts

@@ -200,7 +200,6 @@ export class PromptProvider {
             enableShellEfficiency:
               context.config.getEnableShellOutputEfficiency(),
             interactiveShellEnabled: context.config.isInteractiveShellEnabled(),
-            interactiveShellMode: context.config.getInteractiveShellMode(),
             topicUpdateNarration:
               context.config.isTopicUpdateNarrationEnabled(),
             memoryManagerEnabled: context.config.isMemoryManagerEnabled(),

packages/core/src/prompts/promptProvider.ts

@@ -18,8 +18,6 @@ import {
   MEMORY_TOOL_NAME,
   READ_FILE_TOOL_NAME,
   SHELL_TOOL_NAME,
-  WRITE_TO_SHELL_TOOL_NAME,
-  READ_SHELL_TOOL_NAME,
   WRITE_FILE_TOOL_NAME,
   WRITE_TODOS_TOOL_NAME,
   GREP_PARAM_TOTAL_MAX_MATCHES,
@@ -83,7 +81,6 @@ export interface PrimaryWorkflowsOptions {
 export interface OperationalGuidelinesOptions {
   interactive: boolean;
   interactiveShellEnabled: boolean;
-  interactiveShellMode?: 'human' | 'ai' | 'off';
   topicUpdateNarration: boolean;
   memoryManagerEnabled: boolean;
 }
@@ -394,7 +391,7 @@ export function renderOperationalGuidelines(
 - **Command Execution:** Use the ${formatToolName(SHELL_TOOL_NAME)} tool for running shell commands, remembering the safety rule to explain modifying commands first.${toolUsageInteractive(
     options.interactive,
     options.interactiveShellEnabled,
-  )}${toolUsageRememberingFacts(options)}${toolUsageAiShell(options)}
+  )}${toolUsageRememberingFacts(options)}
 - **Confirmation Protocol:** If a tool call is declined or cancelled, respect the decision immediately. Do not re-attempt the action or "negotiate" for the same tool call unless the user explicitly directs you to. Offer an alternative technical path if possible.
 
 ## Interaction Details
@@ -803,17 +800,6 @@ function toolUsageInteractive(
 - **Interactive Commands:** Always prefer non-interactive commands (e.g., using 'run once' or 'CI' flags for test runners to avoid persistent watch modes or 'git --no-pager') unless a persistent process is specifically required; however, some commands are only interactive and expect user input during their execution (e.g. ssh, vim).`;
 }
 
-function toolUsageAiShell(options: OperationalGuidelinesOptions): string {
-  if (options.interactiveShellMode !== 'ai') return '';
-  return `
-- **AI-Driven Interactive Shell:** Commands using \`wait_for_output_seconds\` auto-promote to background when they stall. Once promoted, use ${formatToolName(READ_SHELL_TOOL_NAME)} to see the terminal screen, then ${formatToolName(WRITE_TO_SHELL_TOOL_NAME)} to send text input and/or special keys (arrows, Enter, Ctrl-C, etc.).
-  - Set \`wait_for_output_seconds\` **low (2-5)** for commands that prompt for input (npx, installers, REPLs). Set **high (60+)** for long builds. Omit for instant commands.
-  - **Always read the screen before writing input.** The screen state tells you what the process is waiting for.
-  - When waiting for a command to finish (e.g. npm install), use ${formatToolName(READ_SHELL_TOOL_NAME)} with \`wait_seconds\` to delay before reading. Do NOT poll in a tight loop.
-  - **Clean up when done:** when your task is complete, kill background processes with ${formatToolName(WRITE_TO_SHELL_TOOL_NAME)} sending Ctrl-C, or note the PID for the user to clean up.
-  - You are the sole operator of promoted shells — the user cannot type into them.`;
-}
-
 function toolUsageRememberingFacts(
   options: OperationalGuidelinesOptions,
 ): string {