Merge branch 'main' into test-workflow-validation

.github/workflows/gemini-scheduled-stale-pr-closer.yml

@@ -43,23 +43,19 @@ jobs:
 
             // 1. Fetch maintainers for verification
             let maintainerLogins = new Set();
-            let teamFetchSucceeded = false;
             try {
               const members = await github.paginate(github.rest.teams.listMembersInOrg, {
                 org: context.repo.owner,
                 team_slug: 'gemini-cli-maintainers'
               });
-              maintainerLogins = new Set(members.map(m => m.login.toLowerCase()));
-              teamFetchSucceeded = true;
-              core.info(`Successfully fetched ${maintainerLogins.size} team members from gemini-cli-maintainers`);
+              maintainerLogins = new Set(members.map(m => m.login));
             } catch (e) {
-              core.warning(`Failed to fetch team members from gemini-cli-maintainers: ${e.message}. Falling back to author_association only.`);
+              core.warning('Failed to fetch team members');
             }
 
             const isMaintainer = (login, assoc) => {
-              const isTeamMember = maintainerLogins.has(login.toLowerCase());
-              const isRepoMaintainer = ['OWNER', 'MEMBER', 'COLLABORATOR'].includes(assoc);
-              return isTeamMember || isRepoMaintainer;
+              if (maintainerLogins.size > 0) return maintainerLogins.has(login);
+              return ['OWNER', 'MEMBER', 'COLLABORATOR'].includes(assoc);
             };
 
             // 2. Determine which PRs to check
@@ -157,17 +153,7 @@ jobs:
                 const labels = pr.labels.map(l => l.name.toLowerCase());
                 if (labels.includes('help wanted') || labels.includes('🔒 maintainer only')) continue;
 
-                // Skip PRs that were created less than 30 days ago - they cannot be stale yet
-                const prCreatedAt = new Date(pr.created_at);
-                if (prCreatedAt > thirtyDaysAgo) {
-                  const daysOld = Math.floor((Date.now() - prCreatedAt.getTime()) / (1000 * 60 * 60 * 24));
-                  core.info(`PR #${pr.number} was created ${daysOld} days ago. Skipping staleness check.`);
-                  continue;
-                }
-
-                // Initialize lastActivity to PR creation date (not epoch) as a safety baseline.
-                // This ensures we never incorrectly mark a PR as stale due to failed activity lookups.
-                let lastActivity = new Date(pr.created_at);
+                let lastActivity = new Date(0);
                 try {
                   const reviews = await github.paginate(github.rest.pulls.listReviews, {
                     owner: context.repo.owner,
@@ -191,12 +177,8 @@ jobs:
                       if (d > lastActivity) lastActivity = d;
                     }
                   }
-                } catch (e) {
-                  core.warning(`Failed to fetch reviews/comments for PR #${pr.number}: ${e.message}`);
-                }
+                } catch (e) {}
 
-                // For maintainer PRs, the PR creation itself counts as maintainer activity.
-                // (Now redundant since we initialize to pr.created_at, but kept for clarity)
                 if (maintainerPr) {
                   const d = new Date(pr.created_at);
                   if (d > lastActivity) lastActivity = d;

docs/cli/settings.md

@@ -97,6 +97,7 @@ they appear in the UI.
 | -------------------------------- | ------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ----------- |
 | Enable Interactive Shell         | `tools.shell.enableInteractiveShell` | Use node-pty for an interactive shell experience. Fallback to child_process still applies.                                                                                     | `true`      |
 | Show Color                       | `tools.shell.showColor`              | Show color in shell output.                                                                                                                                                    | `false`     |
+| Auto Accept                      | `tools.autoAccept`                   | Automatically accept and execute tool calls that are considered safe (e.g., read-only operations).                                                                             | `false`     |
 | Approval Mode                    | `tools.approvalMode`                 | The default approval mode for tool execution. 'default' prompts for approval, 'auto_edit' auto-approves edit tools, and 'plan' is read-only mode. 'yolo' is not supported yet. | `"default"` |
 | Use Ripgrep                      | `tools.useRipgrep`                   | Use ripgrep for file content search instead of the fallback implementation. Provides faster search performance.                                                                | `true`      |
 | Enable Tool Output Truncation    | `tools.enableToolOutputTruncation`   | Enable truncation of large tool outputs.                                                                                                                                       | `true`      |

docs/cli/skills.md

@@ -15,7 +15,7 @@ as security auditing, cloud deployments, or codebase migrations—without
 cluttering the model's immediate context window.
 
 Gemini autonomously decides when to employ a skill based on your request and the
-skill's description. When a relevant skill is identifieddd, the model "pulls in"
+skill's description. When a relevant skill is identified, the model "pulls in"
 the full instructions and resources required to complete the task using the
 `activate_skill` tool.
 
@@ -108,5 +108,5 @@ gemini skills disable my-expertise --scope workspace
 
 ## Creating your own skills
 
-To create your own skills, see see the
-[Create Agent Skills](./creating-skills.md) guide.
+To create your own skills, see the [Create Agent Skills](./creating-skills.md)
+guide.

docs/extensions/writing-extensions.md

@@ -264,7 +264,7 @@ primary ways of releasing extensions are via a Git repository or through GitHub
 Releases. Using a public Git repository is the simplest method.
 
 For detailed instructions on both methods, please refer to the
-[Extension Releasing Guide](./broken-link/releasing.md).
+[Extension Releasing Guide](./releasing.md).
 
 ## Conclusion
 

docs/get-started/configuration-v1.md

@@ -215,6 +215,14 @@ a few things you can try in order of recommendation:
     MCP servers of their own. This should not be used as an airtight security
     mechanism.
 
+- **`autoAccept`** (boolean):
+  - **Description:** Controls whether the CLI automatically accepts and executes
+    tool calls that are considered safe (e.g., read-only operations) without
+    explicit user confirmation. If set to `true`, the CLI will bypass the
+    confirmation prompt for tools deemed safe.
+  - **Default:** `false`
+  - **Example:** `"autoAccept": true`
+
 - **`theme`** (string):
   - **Description:** Sets the visual [theme](../cli/themes.md) for Gemini CLI.
   - **Default:** `"Default"`

docs/get-started/configuration.md

@@ -661,6 +661,11 @@ their corresponding top-level category object in your `settings.json` file.
     performance.
   - **Default:** `true`
 
+- **`tools.autoAccept`** (boolean):
+  - **Description:** Automatically accept and execute tool calls that are
+    considered safe (e.g., read-only operations).
+  - **Default:** `false`
+
 - **`tools.approvalMode`** (enum):
   - **Description:** The default approval mode for tool execution. 'default'
     prompts for approval, 'auto_edit' auto-approves edit tools, and 'plan' is

docs/index.md

@@ -147,3 +147,5 @@ This documentation is organized into the following sections:
   the terms of service and privacy notices applicable to your use of Gemini CLI.
 
 We hope this documentation helps you make the most of Gemini CLI!
+
+<!-- workflow validation test -->

integration-tests/run_shell_command.test.ts

@@ -564,17 +564,11 @@ describe('run_shell_command', () => {
 
   it('rejects invalid shell expressions', async () => {
     await rig.setup('rejects invalid shell expressions', {
-      settings: {
-        tools: {
-          core: ['run_shell_command'],
-          allowed: ['run_shell_command(echo)'], // Specifically allow echo
-        },
-      },
+      settings: { tools: { core: ['run_shell_command'] } },
     });
     const invalidCommand = getInvalidCommand();
     const result = await rig.run({
       args: `I am testing the error handling of the run_shell_command tool. Please attempt to run the following command, which I know has invalid syntax: \`${invalidCommand}\`. If the command fails as expected, please return the word FAIL, otherwise return the word SUCCESS.`,
-      approvalMode: 'default', // Use default mode so safety fallback triggers confirmation
     });
     expect(result).toContain('FAIL');
 

packages/cli/src/config/policy-engine.integration.test.ts

@@ -164,6 +164,7 @@ describe('Policy Engine Integration Tests', () => {
     it('should handle complex mixed configurations', async () => {
       const settings: Settings = {
         tools: {
+          autoAccept: true, // Allows read-only tools
           allowed: ['custom-tool', 'my-server__special-tool'],
           exclude: ['glob', 'dangerous-tool'],
         },
@@ -437,6 +438,7 @@ describe('Policy Engine Integration Tests', () => {
     it('should verify priority ordering works correctly in practice', async () => {
       const settings: Settings = {
         tools: {
+          autoAccept: true, // Priority 50
           allowed: ['specific-tool'], // Priority 100
           exclude: ['blocked-tool'], // Priority 200
         },
@@ -612,6 +614,7 @@ describe('Policy Engine Integration Tests', () => {
     it('should verify rules are created with correct priorities', async () => {
       const settings: Settings = {
         tools: {
+          autoAccept: true,
           allowed: ['tool1', 'tool2'],
           exclude: ['tool3'],
         },

packages/cli/src/config/settings-validation.test.ts

@@ -124,6 +124,7 @@ describe('settings-validation', () => {
         },
         tools: {
           sandbox: 'inherit',
+          autoAccept: false,
         },
       };
 

packages/cli/src/config/settingsSchema.ts

@@ -1041,6 +1041,17 @@ const SETTINGS_SCHEMA = {
           },
         },
       },
+      autoAccept: {
+        type: 'boolean',
+        label: 'Auto Accept',
+        category: 'Tools',
+        requiresRestart: false,
+        default: false,
+        description: oneLine`
+          Automatically accept and execute tool calls that are considered safe (e.g., read-only operations).
+        `,
+        showInDialog: true,
+      },
       approvalMode: {
         type: 'enum',
         label: 'Approval Mode',

packages/cli/src/ui/AppContainer.test.tsx

@@ -371,9 +371,7 @@ describe('AppContainer State Management', () => {
     mockedUseTextBuffer.mockReturnValue({
       text: '',
       setText: vi.fn(),
-      lines: [''],
-      cursor: [0, 0],
-      handleInput: vi.fn().mockReturnValue(false),
+      // Add other properties if AppContainer uses them
     });
     mockedUseLogger.mockReturnValue({
       getPreviousUserMessages: vi.fn().mockResolvedValue([]),
@@ -1902,7 +1900,7 @@ describe('AppContainer State Management', () => {
   });
 
   describe('Keyboard Input Handling (CTRL+C / CTRL+D)', () => {
-    let handleGlobalKeypress: (key: Key) => boolean;
+    let handleGlobalKeypress: (key: Key) => void;
     let mockHandleSlashCommand: Mock;
     let mockCancelOngoingRequest: Mock;
     let rerender: () => void;
@@ -1937,11 +1935,9 @@ describe('AppContainer State Management', () => {
 
     beforeEach(() => {
       // Capture the keypress handler from the AppContainer
-      mockedUseKeypress.mockImplementation(
-        (callback: (key: Key) => boolean) => {
-          handleGlobalKeypress = callback;
-        },
-      );
+      mockedUseKeypress.mockImplementation((callback: (key: Key) => void) => {
+        handleGlobalKeypress = callback;
+      });
 
       // Mock slash command handler
       mockHandleSlashCommand = vi.fn();
@@ -1965,9 +1961,6 @@ describe('AppContainer State Management', () => {
       mockedUseTextBuffer.mockReturnValue({
         text: '',
         setText: vi.fn(),
-        lines: [''],
-        cursor: [0, 0],
-        handleInput: vi.fn().mockReturnValue(false),
       });
 
       vi.useFakeTimers();
@@ -2027,6 +2020,19 @@ describe('AppContainer State Management', () => {
     });
 
     describe('CTRL+D', () => {
+      it('should do nothing if text buffer is not empty', async () => {
+        mockedUseTextBuffer.mockReturnValue({
+          text: 'some text',
+          setText: vi.fn(),
+        });
+        await setupKeypressTest();
+
+        pressKey({ name: 'd', ctrl: true }, 2);
+
+        expect(mockHandleSlashCommand).not.toHaveBeenCalled();
+        unmount();
+      });
+
       it('should quit on second press if buffer is empty', async () => {
         await setupKeypressTest();
 
@@ -2041,50 +2047,6 @@ describe('AppContainer State Management', () => {
         unmount();
       });
 
-      it('should NOT quit if buffer is not empty (bubbles from InputPrompt)', async () => {
-        mockedUseTextBuffer.mockReturnValue({
-          text: 'some text',
-          setText: vi.fn(),
-          lines: ['some text'],
-          cursor: [0, 9], // At the end
-          handleInput: vi.fn().mockReturnValue(false),
-        });
-        await setupKeypressTest();
-
-        // Capture return value
-        let result = true;
-        const originalPressKey = (key: Partial<Key>) => {
-          act(() => {
-            result = handleGlobalKeypress({
-              name: 'd',
-              shift: false,
-              alt: false,
-              ctrl: true,
-              cmd: false,
-              ...key,
-            } as Key);
-          });
-          rerender();
-        };
-
-        originalPressKey({ name: 'd', ctrl: true });
-
-        // AppContainer's handler should return true if it reaches it
-        expect(result).toBe(true);
-        // But it should only be called once, so count is 1, not quitting yet.
-        expect(mockHandleSlashCommand).not.toHaveBeenCalled();
-
-        originalPressKey({ name: 'd', ctrl: true });
-        // Now count is 2, it should quit.
-        expect(mockHandleSlashCommand).toHaveBeenCalledWith(
-          '/quit',
-          undefined,
-          undefined,
-          false,
-        );
-        unmount();
-      });
-
       it('should reset press count after a timeout', async () => {
         await setupKeypressTest();
 
@@ -2104,7 +2066,7 @@ describe('AppContainer State Management', () => {
   });
 
   describe('Copy Mode (CTRL+S)', () => {
-    let handleGlobalKeypress: (key: Key) => boolean;
+    let handleGlobalKeypress: (key: Key) => void;
     let rerender: () => void;
     let unmount: () => void;
 
@@ -2134,11 +2096,9 @@ describe('AppContainer State Management', () => {
 
     beforeEach(() => {
       mocks.mockStdout.write.mockClear();
-      mockedUseKeypress.mockImplementation(
-        (callback: (key: Key) => boolean) => {
-          handleGlobalKeypress = callback;
-        },
-      );
+      mockedUseKeypress.mockImplementation((callback: (key: Key) => void) => {
+        handleGlobalKeypress = callback;
+      });
       vi.useFakeTimers();
     });
 

packages/cli/src/ui/AppContainer.tsx

@@ -532,14 +532,6 @@ export const AppContainer = (props: AppContainerProps) => {
     shellModeActive,
     getPreferredEditor,
   });
-  const bufferRef = useRef(buffer);
-  useEffect(() => {
-    bufferRef.current = buffer;
-  }, [buffer]);
-
-  const stableSetText = useCallback((text: string) => {
-    bufferRef.current.setText(text);
-  }, []);
 
   // Initialize input history from logger (past sessions)
   useEffect(() => {
@@ -834,7 +826,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
           }
         }
       },
-      setText: stableSetText,
+      setText: (text: string) => buffer.setText(text),
     }),
     [
       setAuthState,
@@ -852,7 +844,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       openPermissionsDialog,
       addConfirmUpdateExtensionRequest,
       toggleDebugProfiler,
-      stableSetText,
+      buffer,
     ],
   );
 
@@ -1413,7 +1405,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
     if (ctrlCPressCount > 1) {
       // eslint-disable-next-line @typescript-eslint/no-floating-promises
       handleSlashCommand('/quit', undefined, undefined, false);
-    } else if (ctrlCPressCount > 0) {
+    } else {
       ctrlCTimerRef.current = setTimeout(() => {
         setCtrlCPressCount(0);
         ctrlCTimerRef.current = null;
@@ -1432,7 +1424,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
     if (ctrlDPressCount > 1) {
       // eslint-disable-next-line @typescript-eslint/no-floating-promises
       handleSlashCommand('/quit', undefined, undefined, false);
-    } else if (ctrlDPressCount > 0) {
+    } else {
       ctrlDTimerRef.current = setTimeout(() => {
         setCtrlDPressCount(0);
         ctrlDTimerRef.current = null;
@@ -1473,7 +1465,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
   });
 
   const handleGlobalKeypress = useCallback(
-    (key: Key): boolean => {
+    (key: Key) => {
       if (copyModeEnabled) {
         setCopyModeEnabled(false);
         enableMouseEvents();
@@ -1500,6 +1492,9 @@ Logging in with Google... Restarting Gemini CLI to continue.
         setCtrlCPressCount((prev) => prev + 1);
         return true;
       } else if (keyMatchers[Command.EXIT](key)) {
+        if (buffer.text.length > 0) {
+          return false;
+        }
         setCtrlDPressCount((prev) => prev + 1);
         return true;
       }
@@ -1543,7 +1538,9 @@ Logging in with Google... Restarting Gemini CLI to continue.
         return true;
       } else if (
         keyMatchers[Command.FOCUS_SHELL_INPUT](key) &&
-        (activePtyId || (isBackgroundShellVisible && backgroundShells.size > 0))
+        (activePtyId ||
+          (isBackgroundShellVisible && backgroundShells.size > 0)) &&
+        buffer.text.length === 0
       ) {
         if (key.name === 'tab' && key.shift) {
           // Always change focus
@@ -1628,6 +1625,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       config,
       ideContextState,
       setCtrlCPressCount,
+      buffer.text.length,
       setCtrlDPressCount,
       handleSlashCommand,
       cancelOngoingRequest,
@@ -1649,7 +1647,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
     ],
   );
 
-  useKeypress(handleGlobalKeypress, { isActive: true });
+  useKeypress(handleGlobalKeypress, { isActive: true, priority: true });
 
   useEffect(() => {
     // Respect hideWindowTitle settings

packages/cli/src/ui/components/AskUserDialog.test.tsx

@@ -10,7 +10,6 @@ import { renderWithProviders } from '../../test-utils/render.js';
 import { waitFor } from '../../test-utils/async.js';
 import { AskUserDialog } from './AskUserDialog.js';
 import { QuestionType, type Question } from '@google/gemini-cli-core';
-import { UIStateContext, type UIState } from '../contexts/UIStateContext.js';
 
 // Helper to write to stdin with proper act() wrapping
 const writeKey = (stdin: { write: (data: string) => void }, key: string) => {
@@ -43,6 +42,7 @@ describe('AskUserDialog', () => {
         onSubmit={vi.fn()}
         onCancel={vi.fn()}
         width={120}
+        availableHeight={20}
       />,
       { width: 120 },
     );
@@ -108,6 +108,7 @@ describe('AskUserDialog', () => {
           onSubmit={onSubmit}
           onCancel={vi.fn()}
           width={120}
+          availableHeight={20}
         />,
         { width: 120 },
       );
@@ -128,6 +129,7 @@ describe('AskUserDialog', () => {
         onSubmit={onSubmit}
         onCancel={vi.fn()}
         width={120}
+        availableHeight={20}
       />,
       { width: 120 },
     );
@@ -157,49 +159,33 @@ describe('AskUserDialog', () => {
     });
   });
 
-  describe.each([
-    { useAlternateBuffer: true, expectedArrows: false },
-    { useAlternateBuffer: false, expectedArrows: true },
-  ])(
-    'Scroll Arrows (useAlternateBuffer: $useAlternateBuffer)',
-    ({ useAlternateBuffer, expectedArrows }) => {
-      it(`shows scroll arrows correctly when useAlternateBuffer is ${useAlternateBuffer}`, async () => {
-        const questions: Question[] = [
-          {
-            question: 'Choose an option',
-            header: 'Scroll Test',
-            options: Array.from({ length: 15 }, (_, i) => ({
-              label: `Option ${i + 1}`,
-              description: `Description ${i + 1}`,
-            })),
-            multiSelect: false,
-          },
-        ];
+  it('shows scroll arrows when options exceed available height', async () => {
+    const questions: Question[] = [
+      {
+        question: 'Choose an option',
+        header: 'Scroll Test',
+        options: Array.from({ length: 15 }, (_, i) => ({
+          label: `Option ${i + 1}`,
+          description: `Description ${i + 1}`,
+        })),
+        multiSelect: false,
+      },
+    ];
 
-        const { lastFrame } = renderWithProviders(
-          <AskUserDialog
-            questions={questions}
-            onSubmit={vi.fn()}
-            onCancel={vi.fn()}
-            width={80}
-            availableHeight={10} // Small height to force scrolling
-          />,
-          { useAlternateBuffer },
-        );
+    const { lastFrame } = renderWithProviders(
+      <AskUserDialog
+        questions={questions}
+        onSubmit={vi.fn()}
+        onCancel={vi.fn()}
+        width={80}
+        availableHeight={10} // Small height to force scrolling
+      />,
+    );
 
-        await waitFor(() => {
-          if (expectedArrows) {
-            expect(lastFrame()).toContain('▲');
-            expect(lastFrame()).toContain('▼');
-          } else {
-            expect(lastFrame()).not.toContain('▲');
-            expect(lastFrame()).not.toContain('▼');
-          }
-          expect(lastFrame()).toMatchSnapshot();
-        });
-      });
-    },
-  );
+    await waitFor(() => {
+      expect(lastFrame()).toMatchSnapshot();
+    });
+  });
 
   it('navigates to custom option when typing unbound characters (Type-to-Jump)', async () => {
     const { stdin, lastFrame } = renderWithProviders(
@@ -208,6 +194,7 @@ describe('AskUserDialog', () => {
         onSubmit={vi.fn()}
         onCancel={vi.fn()}
         width={120}
+        availableHeight={20}
       />,
       { width: 120 },
     );
@@ -259,6 +246,7 @@ describe('AskUserDialog', () => {
         onSubmit={vi.fn()}
         onCancel={vi.fn()}
         width={120}
+        availableHeight={20}
       />,
       { width: 120 },
     );
@@ -273,6 +261,7 @@ describe('AskUserDialog', () => {
         onSubmit={vi.fn()}
         onCancel={vi.fn()}
         width={120}
+        availableHeight={20}
       />,
       { width: 120 },
     );
@@ -287,6 +276,7 @@ describe('AskUserDialog', () => {
         onSubmit={vi.fn()}
         onCancel={vi.fn()}
         width={120}
+        availableHeight={20}
       />,
       { width: 120 },
     );
@@ -318,6 +308,7 @@ describe('AskUserDialog', () => {
         onSubmit={vi.fn()}
         onCancel={vi.fn()}
         width={120}
+        availableHeight={20}
       />,
       { width: 120 },
     );
@@ -360,6 +351,7 @@ describe('AskUserDialog', () => {
         onSubmit={onSubmit}
         onCancel={vi.fn()}
         width={120}
+        availableHeight={20}
       />,
       { width: 120 },
     );
@@ -428,6 +420,7 @@ describe('AskUserDialog', () => {
         onSubmit={vi.fn()}
         onCancel={vi.fn()}
         width={120}
+        availableHeight={20}
       />,
       { width: 120 },
     );
@@ -457,6 +450,7 @@ describe('AskUserDialog', () => {
         onSubmit={vi.fn()}
         onCancel={vi.fn()}
         width={120}
+        availableHeight={20}
       />,
       { width: 120 },
     );
@@ -502,6 +496,7 @@ describe('AskUserDialog', () => {
         onSubmit={vi.fn()}
         onCancel={vi.fn()}
         width={120}
+        availableHeight={20}
       />,
       { width: 120 },
     );
@@ -538,6 +533,7 @@ describe('AskUserDialog', () => {
         onSubmit={onSubmit}
         onCancel={vi.fn()}
         width={120}
+        availableHeight={20}
       />,
       { width: 120 },
     );
@@ -571,6 +567,7 @@ describe('AskUserDialog', () => {
           onSubmit={vi.fn()}
           onCancel={vi.fn()}
           width={120}
+          availableHeight={20}
         />,
         { width: 120 },
       );
@@ -593,6 +590,7 @@ describe('AskUserDialog', () => {
           onSubmit={vi.fn()}
           onCancel={vi.fn()}
           width={120}
+          availableHeight={20}
         />,
         { width: 120 },
       );
@@ -615,6 +613,7 @@ describe('AskUserDialog', () => {
           onSubmit={vi.fn()}
           onCancel={vi.fn()}
           width={120}
+          availableHeight={20}
         />,
         { width: 120 },
       );
@@ -650,6 +649,7 @@ describe('AskUserDialog', () => {
           onSubmit={vi.fn()}
           onCancel={vi.fn()}
           width={120}
+          availableHeight={20}
         />,
         { width: 120 },
       );
@@ -681,6 +681,7 @@ describe('AskUserDialog', () => {
           onSubmit={vi.fn()}
           onCancel={vi.fn()}
           width={120}
+          availableHeight={20}
         />,
         { width: 120 },
       );
@@ -728,6 +729,7 @@ describe('AskUserDialog', () => {
           onSubmit={onSubmit}
           onCancel={vi.fn()}
           width={120}
+          availableHeight={20}
         />,
         { width: 120 },
       );
@@ -778,6 +780,7 @@ describe('AskUserDialog', () => {
           onSubmit={onSubmit}
           onCancel={vi.fn()}
           width={120}
+          availableHeight={20}
         />,
         { width: 120 },
       );
@@ -804,6 +807,7 @@ describe('AskUserDialog', () => {
           onSubmit={vi.fn()}
           onCancel={onCancel}
           width={120}
+          availableHeight={20}
         />,
         { width: 120 },
       );
@@ -850,6 +854,7 @@ describe('AskUserDialog', () => {
           onSubmit={vi.fn()}
           onCancel={vi.fn()}
           width={120}
+          availableHeight={20}
         />,
         { width: 120 },
       );
@@ -909,6 +914,7 @@ describe('AskUserDialog', () => {
           onSubmit={onSubmit}
           onCancel={vi.fn()}
           width={120}
+          availableHeight={20}
         />,
         { width: 120 },
       );
@@ -940,72 +946,4 @@ describe('AskUserDialog', () => {
       });
     });
   });
-
-  it('uses availableTerminalHeight from UIStateContext if availableHeight prop is missing', () => {
-    const questions: Question[] = [
-      {
-        question: 'Choose an option',
-        header: 'Context Test',
-        options: Array.from({ length: 10 }, (_, i) => ({
-          label: `Option ${i + 1}`,
-          description: `Description ${i + 1}`,
-        })),
-        multiSelect: false,
-      },
-    ];
-
-    const mockUIState = {
-      availableTerminalHeight: 5, // Small height to force scroll arrows
-    } as UIState;
-
-    const { lastFrame } = renderWithProviders(
-      <UIStateContext.Provider value={mockUIState}>
-        <AskUserDialog
-          questions={questions}
-          onSubmit={vi.fn()}
-          onCancel={vi.fn()}
-          width={80}
-        />
-      </UIStateContext.Provider>,
-      { useAlternateBuffer: false },
-    );
-
-    // With height 5 and alternate buffer disabled, it should show scroll arrows (▲)
-    expect(lastFrame()).toContain('▲');
-    expect(lastFrame()).toContain('▼');
-  });
-
-  it('does NOT truncate the question when in alternate buffer mode even with small height', () => {
-    const longQuestion =
-      'This is a very long question ' + 'with many words '.repeat(10);
-    const questions: Question[] = [
-      {
-        question: longQuestion,
-        header: 'Alternate Buffer Test',
-        options: [{ label: 'Option 1', description: 'Desc 1' }],
-        multiSelect: false,
-      },
-    ];
-
-    const mockUIState = {
-      availableTerminalHeight: 5,
-    } as UIState;
-
-    const { lastFrame } = renderWithProviders(
-      <UIStateContext.Provider value={mockUIState}>
-        <AskUserDialog
-          questions={questions}
-          onSubmit={vi.fn()}
-          onCancel={vi.fn()}
-          width={40} // Small width to force wrapping
-        />
-      </UIStateContext.Provider>,
-      { useAlternateBuffer: true },
-    );
-
-    // Should NOT contain the truncation message
-    expect(lastFrame()).not.toContain('hidden ...');
-    // Should contain the full long question (or at least its parts)
-    expect(lastFrame()).toContain('This is a very long question');
-  });
 });

packages/cli/src/ui/components/AskUserDialog.tsx

@@ -5,14 +5,7 @@
  */
 
 import type React from 'react';
-import {
-  useCallback,
-  useMemo,
-  useRef,
-  useEffect,
-  useReducer,
-  useContext,
-} from 'react';
+import { useCallback, useMemo, useRef, useEffect, useReducer } from 'react';
 import { Box, Text } from 'ink';
 import { theme } from '../semantic-colors.js';
 import type { Question } from '@google/gemini-cli-core';
@@ -28,8 +21,6 @@ import { getCachedStringWidth } from '../utils/textUtils.js';
 import { useTabbedNavigation } from '../hooks/useTabbedNavigation.js';
 import { DialogFooter } from './shared/DialogFooter.js';
 import { MaxSizedBox } from './shared/MaxSizedBox.js';
-import { UIStateContext } from '../contexts/UIStateContext.js';
-import { useAlternateBuffer } from '../hooks/useAlternateBuffer.js';
 
 interface AskUserDialogState {
   answers: { [key: string]: string };
@@ -130,7 +121,7 @@ interface AskUserDialogProps {
   /**
    * Height constraint for scrollable content.
    */
-  availableHeight?: number;
+  availableHeight: number;
 }
 
 interface ReviewViewProps {
@@ -208,7 +199,7 @@ interface TextQuestionViewProps {
   onSelectionChange?: (answer: string) => void;
   onEditingCustomOption?: (editing: boolean) => void;
   availableWidth: number;
-  availableHeight?: number;
+  availableHeight: number;
   initialAnswer?: string;
   progressHeader?: React.ReactNode;
   keyboardHints?: React.ReactNode;
@@ -225,7 +216,6 @@ const TextQuestionView: React.FC<TextQuestionViewProps> = ({
   progressHeader,
   keyboardHints,
 }) => {
-  const isAlternateBuffer = useAlternateBuffer();
   const prefix = '> ';
   const horizontalPadding = 1; // 1 for cursor
   const bufferWidth =
@@ -289,20 +279,13 @@ const TextQuestionView: React.FC<TextQuestionViewProps> = ({
   const INPUT_HEIGHT = 2; // TextInput + margin
   const FOOTER_HEIGHT = 2; // DialogFooter + margin
   const overhead = HEADER_HEIGHT + INPUT_HEIGHT + FOOTER_HEIGHT;
-  const questionHeight =
-    availableHeight && !isAlternateBuffer
-      ? Math.max(1, availableHeight - overhead)
-      : undefined;
+  const questionHeight = Math.max(1, availableHeight - overhead);
 
   return (
     <Box flexDirection="column">
       {progressHeader}
       <Box marginBottom={1}>
-        <MaxSizedBox
-          maxHeight={questionHeight}
-          maxWidth={availableWidth}
-          overflowDirection="bottom"
-        >
+        <MaxSizedBox maxHeight={questionHeight} maxWidth={availableWidth}>
           <Text bold color={theme.text.primary}>
             {question.question}
           </Text>
@@ -406,7 +389,7 @@ interface ChoiceQuestionViewProps {
   onSelectionChange?: (answer: string) => void;
   onEditingCustomOption?: (editing: boolean) => void;
   availableWidth: number;
-  availableHeight?: number;
+  availableHeight: number;
   initialAnswer?: string;
   progressHeader?: React.ReactNode;
   keyboardHints?: React.ReactNode;
@@ -423,7 +406,6 @@ const ChoiceQuestionView: React.FC<ChoiceQuestionViewProps> = ({
   progressHeader,
   keyboardHints,
 }) => {
-  const isAlternateBuffer = useAlternateBuffer();
   const numOptions =
     (question.options?.length ?? 0) + (question.type !== 'yesno' ? 1 : 0);
   const numLen = String(numOptions).length;
@@ -729,27 +711,18 @@ const ChoiceQuestionView: React.FC<ChoiceQuestionViewProps> = ({
   const TITLE_MARGIN = 1;
   const FOOTER_HEIGHT = 2; // DialogFooter + margin
   const overhead = HEADER_HEIGHT + TITLE_MARGIN + FOOTER_HEIGHT;
-  const listHeight = availableHeight
-    ? Math.max(1, availableHeight - overhead)
-    : undefined;
-  const questionHeight =
-    listHeight && !isAlternateBuffer
-      ? Math.min(15, Math.max(1, listHeight - 4))
-      : undefined;
-  const maxItemsToShow =
-    listHeight && questionHeight
-      ? Math.max(1, Math.floor((listHeight - questionHeight) / 2))
-      : selectionItems.length;
+  const listHeight = Math.max(1, availableHeight - overhead);
+  const questionHeight = Math.min(3, Math.max(1, listHeight - 4));
+  const maxItemsToShow = Math.max(
+    1,
+    Math.floor((listHeight - questionHeight) / 2),
+  );
 
   return (
     <Box flexDirection="column">
       {progressHeader}
       <Box marginBottom={TITLE_MARGIN}>
-        <MaxSizedBox
-          maxHeight={questionHeight}
-          maxWidth={availableWidth}
-          overflowDirection="bottom"
-        >
+        <MaxSizedBox maxHeight={questionHeight} maxWidth={availableWidth}>
           <Text bold color={theme.text.primary}>
             {question.question}
             {question.multiSelect && (
@@ -851,15 +824,8 @@ export const AskUserDialog: React.FC<AskUserDialogProps> = ({
   onCancel,
   onActiveTextInputChange,
   width,
-  availableHeight: availableHeightProp,
+  availableHeight,
 }) => {
-  const uiState = useContext(UIStateContext);
-  const availableHeight =
-    availableHeightProp ??
-    (uiState?.constrainHeight !== false
-      ? uiState?.availableTerminalHeight
-      : undefined);
-
   const [state, dispatch] = useReducer(askUserDialogReducerLogic, initialState);
   const { answers, isEditingCustomOption, submitted } = state;
 

packages/cli/src/ui/components/InputPrompt.test.tsx

@@ -45,8 +45,6 @@ import { StreamingState } from '../types.js';
 import { terminalCapabilityManager } from '../utils/terminalCapabilityManager.js';
 import type { UIState } from '../contexts/UIStateContext.js';
 import { isLowColorDepth } from '../utils/terminalUtils.js';
-import { keyMatchers, Command } from '../keyMatchers.js';
-import type { Key } from '../hooks/useKeypress.js';
 
 vi.mock('../hooks/useShellHistory.js');
 vi.mock('../hooks/useCommandCompletion.js');
@@ -171,16 +169,7 @@ describe('InputPrompt', () => {
       allVisualLines: [''],
       visualCursor: [0, 0],
       visualScrollRow: 0,
-      handleInput: vi.fn((key: Key) => {
-        if (keyMatchers[Command.CLEAR_INPUT](key)) {
-          if (mockBuffer.text.length > 0) {
-            mockBuffer.setText('');
-            return true;
-          }
-          return false;
-        }
-        return false;
-      }),
+      handleInput: vi.fn(),
       move: vi.fn(),
       moveToOffset: vi.fn((offset: number) => {
         mockBuffer.cursor = [0, offset];
@@ -510,23 +499,6 @@ describe('InputPrompt', () => {
     unmount();
   });
 
-  it('should clear the buffer and reset completion on Ctrl+C', async () => {
-    mockBuffer.text = 'some text';
-    const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />, {
-      uiActions,
-    });
-
-    await act(async () => {
-      stdin.write('\u0003'); // Ctrl+C
-    });
-
-    await waitFor(() => {
-      expect(mockBuffer.setText).toHaveBeenCalledWith('');
-      expect(mockCommandCompletion.resetCompletionState).toHaveBeenCalled();
-    });
-    unmount();
-  });
-
   describe('clipboard image paste', () => {
     beforeEach(() => {
       vi.mocked(clipboardUtils.clipboardHasImage).mockResolvedValue(false);

packages/cli/src/ui/components/InputPrompt.tsx

@@ -482,14 +482,6 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         return false;
       }
 
-      if (
-        key.name === 'escape' &&
-        (streamingState === StreamingState.Responding ||
-          streamingState === StreamingState.WaitingForConfirmation)
-      ) {
-        return false;
-      }
-
       if (key.name === 'paste') {
         // Record paste time to prevent accidental auto-submission
         if (!isTerminalPasteTrusted(kittyProtocol.enabled)) {
@@ -612,12 +604,6 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         return true;
       }
 
-      if (keyMatchers[Command.CLEAR_SCREEN](key)) {
-        setBannerVisible(false);
-        onClearScreen();
-        return true;
-      }
-
       if (shellModeActive && keyMatchers[Command.REVERSE_SEARCH](key)) {
         setReverseSearchActive(true);
         setTextBeforeReverseSearch(buffer.text);
@@ -625,6 +611,12 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         return true;
       }
 
+      if (keyMatchers[Command.CLEAR_SCREEN](key)) {
+        setBannerVisible(false);
+        onClearScreen();
+        return true;
+      }
+
       if (reverseSearchActive || commandSearchActive) {
         const isCommandSearch = commandSearchActive;
 
@@ -889,6 +881,14 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         buffer.move('end');
         return true;
       }
+      // Ctrl+C (Clear input)
+      if (keyMatchers[Command.CLEAR_INPUT](key)) {
+        if (buffer.text.length > 0) {
+          buffer.setText('');
+          resetCompletionState();
+        }
+        return false;
+      }
 
       // Kill line commands
       if (keyMatchers[Command.KILL_LINE_RIGHT](key)) {
@@ -933,23 +933,17 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
       // Fall back to the text buffer's default input handling for all other keys
       const handled = buffer.handleInput(key);
 
-      if (handled) {
-        if (keyMatchers[Command.CLEAR_INPUT](key)) {
-          resetCompletionState();
-        }
-
-        // Clear ghost text when user types regular characters (not navigation/control keys)
-        if (
-          completion.promptCompletion.text &&
-          key.sequence &&
-          key.sequence.length === 1 &&
-          !key.alt &&
-          !key.ctrl &&
-          !key.cmd
-        ) {
-          completion.promptCompletion.clear();
-          setExpandedSuggestionIndex(-1);
-        }
+      // Clear ghost text when user types regular characters (not navigation/control keys)
+      if (
+        completion.promptCompletion.text &&
+        key.sequence &&
+        key.sequence.length === 1 &&
+        !key.alt &&
+        !key.ctrl &&
+        !key.cmd
+      ) {
+        completion.promptCompletion.clear();
+        setExpandedSuggestionIndex(-1);
       }
       return handled;
     },
@@ -985,14 +979,10 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
       backgroundShells.size,
       backgroundShellHeight,
       history,
-      streamingState,
     ],
   );
 
-  useKeypress(handleInput, {
-    isActive: !isEmbeddedShellFocused,
-    priority: true,
-  });
+  useKeypress(handleInput, { isActive: !isEmbeddedShellFocused });
 
   const linesToRender = buffer.viewportVisualLines;
   const [cursorVisualRowAbsolute, cursorVisualColAbsolute] =

packages/cli/src/ui/components/SettingsDialog.test.tsx

@@ -1391,6 +1391,7 @@ describe('SettingsDialog', () => {
           },
           tools: {
             enableInteractiveShell: true,
+            autoAccept: true,
             useRipgrep: true,
           },
           security: {
@@ -1483,6 +1484,7 @@ describe('SettingsDialog', () => {
         userSettings: {
           tools: {
             enableInteractiveShell: true,
+            autoAccept: false,
             useRipgrep: true,
             truncateToolOutputThreshold: 25000,
             truncateToolOutputLines: 500,
@@ -1535,6 +1537,7 @@ describe('SettingsDialog', () => {
           },
           tools: {
             enableInteractiveShell: false,
+            autoAccept: false,
             useRipgrep: false,
           },
           security: {

packages/cli/src/ui/components/__snapshots__/AskUserDialog.test.tsx.snap

@@ -1,56 +1,5 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`AskUserDialog > Scroll Arrows (useAlternateBuffer: false) > shows scroll arrows correctly when useAlternateBuffer is false 1`] = `
-"Choose an option
-
-▲
-●  1.  Option 1
-       Description 1
-   2.  Option 2
-       Description 2
-▼
-
-Enter to select · ↑/↓ to navigate · Esc to cancel"
-`;
-
-exports[`AskUserDialog > Scroll Arrows (useAlternateBuffer: true) > shows scroll arrows correctly when useAlternateBuffer is true 1`] = `
-"Choose an option
-
-●  1.  Option 1
-       Description 1
-   2.  Option 2
-       Description 2
-   3.  Option 3
-       Description 3
-   4.  Option 4
-       Description 4
-   5.  Option 5
-       Description 5
-   6.  Option 6
-       Description 6
-   7.  Option 7
-       Description 7
-   8.  Option 8
-       Description 8
-   9.  Option 9
-       Description 9
-  10.  Option 10
-       Description 10
-  11.  Option 11
-       Description 11
-  12.  Option 12
-       Description 12
-  13.  Option 13
-       Description 13
-  14.  Option 14
-       Description 14
-  15.  Option 15
-       Description 15
-  16.  Enter a custom value
-
-Enter to select · ↑/↓ to navigate · Esc to cancel"
-`;
-
 exports[`AskUserDialog > Text type questions > renders text input for type: "text" 1`] = `
 "What should we name this component?
 
@@ -155,6 +104,19 @@ Which database should we use?
 Enter to select · ←/→ to switch questions · Esc to cancel"
 `;
 
+exports[`AskUserDialog > shows scroll arrows when options exceed available height 1`] = `
+"Choose an option
+
+▲
+●  1.  Option 1
+       Description 1
+   2.  Option 2
+       Description 2
+▼
+
+Enter to select · ↑/↓ to navigate · Esc to cancel"
+`;
+
 exports[`AskUserDialog > shows warning for unanswered questions on Review tab 1`] = `
 "← □ License │ □ README │ ≡ Review →
 

packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx

@@ -271,7 +271,7 @@ export const ToolConfirmationMessage: React.FC<
             handleConfirm(ToolConfirmationOutcome.Cancel);
           }}
           width={terminalWidth}
-          availableHeight={availableBodyContentHeight()}
+          availableHeight={availableBodyContentHeight() ?? 10}
         />
       );
       return { question: '', bodyContent, options: [] };

packages/cli/src/ui/components/shared/text-buffer.test.ts

@@ -1515,50 +1515,6 @@ describe('useTextBuffer', () => {
       expect(getBufferState(result).text).toBe('');
     });
 
-    it('should handle CLEAR_INPUT (Ctrl+C)', () => {
-      const { result } = renderHook(() =>
-        useTextBuffer({
-          initialText: 'hello',
-          viewport,
-          isValidPath: () => false,
-        }),
-      );
-      expect(getBufferState(result).text).toBe('hello');
-      let handled = false;
-      act(() => {
-        handled = result.current.handleInput({
-          name: 'c',
-          shift: false,
-          alt: false,
-          ctrl: true,
-          cmd: false,
-          insertable: false,
-          sequence: '\u0003',
-        });
-      });
-      expect(handled).toBe(true);
-      expect(getBufferState(result).text).toBe('');
-    });
-
-    it('should NOT handle CLEAR_INPUT if buffer is empty', () => {
-      const { result } = renderHook(() =>
-        useTextBuffer({ viewport, isValidPath: () => false }),
-      );
-      let handled = true;
-      act(() => {
-        handled = result.current.handleInput({
-          name: 'c',
-          shift: false,
-          alt: false,
-          ctrl: true,
-          cmd: false,
-          insertable: false,
-          sequence: '\u0003',
-        });
-      });
-      expect(handled).toBe(false);
-    });
-
     it('should handle "Backspace" key', () => {
       const { result } = renderHook(() =>
         useTextBuffer({

packages/cli/src/ui/components/shared/text-buffer.ts

@@ -2930,13 +2930,6 @@ export function useTextBuffer({
         move('end');
         return true;
       }
-      if (keyMatchers[Command.CLEAR_INPUT](key)) {
-        if (text.length > 0) {
-          setText('');
-          return true;
-        }
-        return false;
-      }
       if (keyMatchers[Command.DELETE_WORD_BACKWARD](key)) {
         deleteWordLeft();
         return true;
@@ -2950,13 +2943,6 @@ export function useTextBuffer({
         return true;
       }
       if (keyMatchers[Command.DELETE_CHAR_RIGHT](key)) {
-        const lastLineIdx = lines.length - 1;
-        if (
-          cursorRow === lastLineIdx &&
-          cursorCol === cpLen(lines[lastLineIdx] ?? '')
-        ) {
-          return false;
-        }
         del();
         return true;
       }
@@ -2988,8 +2974,6 @@ export function useTextBuffer({
       cursorCol,
       lines,
       singleLine,
-      setText,
-      text,
     ],
   );
 

packages/cli/src/ui/hooks/useSessionBrowser.test.ts

@@ -24,14 +24,7 @@ import { coreEvents } from '@google/gemini-cli-core';
 // Mock modules
 vi.mock('fs/promises');
 vi.mock('path');
-vi.mock('../../utils/sessionUtils.js', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('../../utils/sessionUtils.js')>();
-  return {
-    ...actual,
-    getSessionFiles: vi.fn(),
-  };
-});
+vi.mock('../../utils/sessionUtils.js');
 
 const MOCKED_PROJECT_TEMP_DIR = '/test/project/temp';
 const MOCKED_CHATS_DIR = '/test/project/temp/chats';

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

@@ -13,12 +13,11 @@ import type {
   ConversationRecord,
   ResumedSessionData,
 } from '@google/gemini-cli-core';
-import { coreEvents } from '@google/gemini-cli-core';
-import type { SessionInfo } from '../../utils/sessionUtils.js';
-import { convertSessionToHistoryFormats } from '../../utils/sessionUtils.js';
 import type { Part } from '@google/genai';
-
-export { convertSessionToHistoryFormats };
+import { partListUnionToString, coreEvents } from '@google/gemini-cli-core';
+import { checkExhaustive } from '../../utils/checks.js';
+import type { SessionInfo } from '../../utils/sessionUtils.js';
+import { MessageType, ToolCallStatus } from '../types.js';
 
 export const useSessionBrowser = (
   config: Config,
@@ -113,3 +112,190 @@ export const useSessionBrowser = (
     ),
   };
 };
+
+/**
+ * Converts session/conversation data into UI history and Gemini client history formats.
+ */
+export function convertSessionToHistoryFormats(
+  messages: ConversationRecord['messages'],
+): {
+  uiHistory: HistoryItemWithoutId[];
+  clientHistory: Array<{ role: 'user' | 'model'; parts: Part[] }>;
+} {
+  const uiHistory: HistoryItemWithoutId[] = [];
+
+  for (const msg of messages) {
+    // Add the message only if it has content
+    const displayContentString = msg.displayContent
+      ? partListUnionToString(msg.displayContent)
+      : undefined;
+    const contentString = partListUnionToString(msg.content);
+    const uiText = displayContentString || contentString;
+
+    if (uiText.trim()) {
+      let messageType: MessageType;
+      switch (msg.type) {
+        case 'user':
+          messageType = MessageType.USER;
+          break;
+        case 'info':
+          messageType = MessageType.INFO;
+          break;
+        case 'error':
+          messageType = MessageType.ERROR;
+          break;
+        case 'warning':
+          messageType = MessageType.WARNING;
+          break;
+        case 'gemini':
+          messageType = MessageType.GEMINI;
+          break;
+        default:
+          checkExhaustive(msg);
+          messageType = MessageType.GEMINI;
+          break;
+      }
+
+      uiHistory.push({
+        type: messageType,
+        text: uiText,
+      });
+    }
+
+    // Add tool calls if present
+    if (
+      msg.type !== 'user' &&
+      'toolCalls' in msg &&
+      msg.toolCalls &&
+      msg.toolCalls.length > 0
+    ) {
+      uiHistory.push({
+        type: 'tool_group',
+        tools: msg.toolCalls.map((tool) => ({
+          callId: tool.id,
+          name: tool.displayName || tool.name,
+          description: tool.description || '',
+          renderOutputAsMarkdown: tool.renderOutputAsMarkdown ?? true,
+          status:
+            tool.status === 'success'
+              ? ToolCallStatus.Success
+              : ToolCallStatus.Error,
+          resultDisplay: tool.resultDisplay,
+          confirmationDetails: undefined,
+        })),
+      });
+    }
+  }
+
+  // Convert to Gemini client history format
+  const clientHistory: Array<{ role: 'user' | 'model'; parts: Part[] }> = [];
+
+  for (const msg of messages) {
+    // Skip system/error messages and user slash commands
+    if (msg.type === 'info' || msg.type === 'error' || msg.type === 'warning') {
+      continue;
+    }
+
+    if (msg.type === 'user') {
+      // Skip user slash commands
+      const contentString = partListUnionToString(msg.content);
+      if (
+        contentString.trim().startsWith('/') ||
+        contentString.trim().startsWith('?')
+      ) {
+        continue;
+      }
+
+      // Add regular user message
+      clientHistory.push({
+        role: 'user',
+        parts: Array.isArray(msg.content)
+          ? (msg.content as Part[])
+          : [{ text: contentString }],
+      });
+    } else if (msg.type === 'gemini') {
+      // Handle Gemini messages with potential tool calls
+      const hasToolCalls = msg.toolCalls && msg.toolCalls.length > 0;
+
+      if (hasToolCalls) {
+        // Create model message with function calls
+        const modelParts: Part[] = [];
+
+        // Add text content if present
+        const contentString = partListUnionToString(msg.content);
+        if (msg.content && contentString.trim()) {
+          modelParts.push({ text: contentString });
+        }
+
+        // Add function calls
+        for (const toolCall of msg.toolCalls!) {
+          modelParts.push({
+            functionCall: {
+              name: toolCall.name,
+              args: toolCall.args,
+              ...(toolCall.id && { id: toolCall.id }),
+            },
+          });
+        }
+
+        clientHistory.push({
+          role: 'model',
+          parts: modelParts,
+        });
+
+        // Create single function response message with all tool call responses
+        const functionResponseParts: Part[] = [];
+        for (const toolCall of msg.toolCalls!) {
+          if (toolCall.result) {
+            // Convert PartListUnion result to function response format
+            let responseData: Part;
+
+            if (typeof toolCall.result === 'string') {
+              responseData = {
+                functionResponse: {
+                  id: toolCall.id,
+                  name: toolCall.name,
+                  response: {
+                    output: toolCall.result,
+                  },
+                },
+              };
+            } else if (Array.isArray(toolCall.result)) {
+              // toolCall.result is an array containing properly formatted
+              // function responses
+              functionResponseParts.push(...(toolCall.result as Part[]));
+              continue;
+            } else {
+              // Fallback for non-array results
+              responseData = toolCall.result;
+            }
+
+            functionResponseParts.push(responseData);
+          }
+        }
+
+        // Only add user message if we have function responses
+        if (functionResponseParts.length > 0) {
+          clientHistory.push({
+            role: 'user',
+            parts: functionResponseParts,
+          });
+        }
+      } else {
+        // Regular Gemini message without tool calls
+        const contentString = partListUnionToString(msg.content);
+        if (msg.content && contentString.trim()) {
+          clientHistory.push({
+            role: 'model',
+            parts: [{ text: contentString }],
+          });
+        }
+      }
+    }
+  }
+
+  return {
+    uiHistory,
+    clientHistory,
+  };
+}

packages/cli/src/utils/sessionUtils.ts

@@ -16,13 +16,6 @@ import {
 import * as fs from 'node:fs/promises';
 import path from 'node:path';
 import { stripUnsafeCharacters } from '../ui/utils/textUtils.js';
-import type { Part } from '@google/genai';
-import { checkExhaustive } from './checks.js';
-import {
-  MessageType,
-  ToolCallStatus,
-  type HistoryItemWithoutId,
-} from '../ui/types.js';
 
 /**
  * Constant for the resume "latest" identifier.
@@ -521,190 +514,3 @@ export class SessionSelector {
     }
   }
 }
-
-/**
- * Converts session/conversation data into UI history and Gemini client history formats.
- */
-export function convertSessionToHistoryFormats(
-  messages: ConversationRecord['messages'],
-): {
-  uiHistory: HistoryItemWithoutId[];
-  clientHistory: Array<{ role: 'user' | 'model'; parts: Part[] }>;
-} {
-  const uiHistory: HistoryItemWithoutId[] = [];
-
-  for (const msg of messages) {
-    // Add the message only if it has content
-    const displayContentString = msg.displayContent
-      ? partListUnionToString(msg.displayContent)
-      : undefined;
-    const contentString = partListUnionToString(msg.content);
-    const uiText = displayContentString || contentString;
-
-    if (uiText.trim()) {
-      let messageType: MessageType;
-      switch (msg.type) {
-        case 'user':
-          messageType = MessageType.USER;
-          break;
-        case 'info':
-          messageType = MessageType.INFO;
-          break;
-        case 'error':
-          messageType = MessageType.ERROR;
-          break;
-        case 'warning':
-          messageType = MessageType.WARNING;
-          break;
-        case 'gemini':
-          messageType = MessageType.GEMINI;
-          break;
-        default:
-          checkExhaustive(msg);
-          messageType = MessageType.GEMINI;
-          break;
-      }
-
-      uiHistory.push({
-        type: messageType,
-        text: uiText,
-      });
-    }
-
-    // Add tool calls if present
-    if (
-      msg.type !== 'user' &&
-      'toolCalls' in msg &&
-      msg.toolCalls &&
-      msg.toolCalls.length > 0
-    ) {
-      uiHistory.push({
-        type: 'tool_group',
-        tools: msg.toolCalls.map((tool) => ({
-          callId: tool.id,
-          name: tool.displayName || tool.name,
-          description: tool.description || '',
-          renderOutputAsMarkdown: tool.renderOutputAsMarkdown ?? true,
-          status:
-            tool.status === 'success'
-              ? ToolCallStatus.Success
-              : ToolCallStatus.Error,
-          resultDisplay: tool.resultDisplay,
-          confirmationDetails: undefined,
-        })),
-      });
-    }
-  }
-
-  // Convert to Gemini client history format
-  const clientHistory: Array<{ role: 'user' | 'model'; parts: Part[] }> = [];
-
-  for (const msg of messages) {
-    // Skip system/error messages and user slash commands
-    if (msg.type === 'info' || msg.type === 'error' || msg.type === 'warning') {
-      continue;
-    }
-
-    if (msg.type === 'user') {
-      // Skip user slash commands
-      const contentString = partListUnionToString(msg.content);
-      if (
-        contentString.trim().startsWith('/') ||
-        contentString.trim().startsWith('?')
-      ) {
-        continue;
-      }
-
-      // Add regular user message
-      clientHistory.push({
-        role: 'user',
-        parts: Array.isArray(msg.content)
-          ? (msg.content as Part[])
-          : [{ text: contentString }],
-      });
-    } else if (msg.type === 'gemini') {
-      // Handle Gemini messages with potential tool calls
-      const hasToolCalls = msg.toolCalls && msg.toolCalls.length > 0;
-
-      if (hasToolCalls) {
-        // Create model message with function calls
-        const modelParts: Part[] = [];
-
-        // Add text content if present
-        const contentString = partListUnionToString(msg.content);
-        if (msg.content && contentString.trim()) {
-          modelParts.push({ text: contentString });
-        }
-
-        // Add function calls
-        for (const toolCall of msg.toolCalls!) {
-          modelParts.push({
-            functionCall: {
-              name: toolCall.name,
-              args: toolCall.args,
-              ...(toolCall.id && { id: toolCall.id }),
-            },
-          });
-        }
-
-        clientHistory.push({
-          role: 'model',
-          parts: modelParts,
-        });
-
-        // Create single function response message with all tool call responses
-        const functionResponseParts: Part[] = [];
-        for (const toolCall of msg.toolCalls!) {
-          if (toolCall.result) {
-            // Convert PartListUnion result to function response format
-            let responseData: Part;
-
-            if (typeof toolCall.result === 'string') {
-              responseData = {
-                functionResponse: {
-                  id: toolCall.id,
-                  name: toolCall.name,
-                  response: {
-                    output: toolCall.result,
-                  },
-                },
-              };
-            } else if (Array.isArray(toolCall.result)) {
-              // toolCall.result is an array containing properly formatted
-              // function responses
-              functionResponseParts.push(...(toolCall.result as Part[]));
-              continue;
-            } else {
-              // Fallback for non-array results
-              responseData = toolCall.result;
-            }
-
-            functionResponseParts.push(responseData);
-          }
-        }
-
-        // Only add user message if we have function responses
-        if (functionResponseParts.length > 0) {
-          clientHistory.push({
-            role: 'user',
-            parts: functionResponseParts,
-          });
-        }
-      } else {
-        // Regular Gemini message without tool calls
-        const contentString = partListUnionToString(msg.content);
-        if (msg.content && contentString.trim()) {
-          clientHistory.push({
-            role: 'model',
-            parts: [{ text: contentString }],
-          });
-        }
-      }
-    }
-  }
-
-  return {
-    uiHistory,
-    clientHistory,
-  };
-}

packages/cli/src/zed-integration/acpResume.test.ts

@@ -1,224 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  type Mocked,
-  type Mock,
-} from 'vitest';
-import { GeminiAgent } from './zedIntegration.js';
-import * as acp from '@agentclientprotocol/sdk';
-import { AuthType, type Config } from '@google/gemini-cli-core';
-import { loadCliConfig, type CliArgs } from '../config/config.js';
-import {
-  SessionSelector,
-  convertSessionToHistoryFormats,
-} from '../utils/sessionUtils.js';
-import type { LoadedSettings } from '../config/settings.js';
-
-vi.mock('../config/config.js', () => ({
-  loadCliConfig: vi.fn(),
-}));
-
-vi.mock('../utils/sessionUtils.js', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('../utils/sessionUtils.js')>();
-  return {
-    ...actual,
-    SessionSelector: vi.fn(),
-    convertSessionToHistoryFormats: vi.fn(),
-  };
-});
-
-describe('GeminiAgent Session Resume', () => {
-  let mockConfig: Mocked<Config>;
-  let mockSettings: Mocked<LoadedSettings>;
-  let mockArgv: CliArgs;
-  let mockConnection: Mocked<acp.AgentSideConnection>;
-  let agent: GeminiAgent;
-
-  beforeEach(() => {
-    mockConfig = {
-      refreshAuth: vi.fn().mockResolvedValue(undefined),
-      initialize: vi.fn().mockResolvedValue(undefined),
-      getFileSystemService: vi.fn(),
-      setFileSystemService: vi.fn(),
-      getGeminiClient: vi.fn().mockReturnValue({
-        initialize: vi.fn().mockResolvedValue(undefined),
-        resumeChat: vi.fn().mockResolvedValue(undefined),
-        getChat: vi.fn().mockReturnValue({}),
-      }),
-      storage: {
-        getProjectTempDir: vi.fn().mockReturnValue('/tmp/project'),
-      },
-    } as unknown as Mocked<Config>;
-    mockSettings = {
-      merged: {
-        security: { auth: { selectedType: AuthType.LOGIN_WITH_GOOGLE } },
-        mcpServers: {},
-      },
-      setValue: vi.fn(),
-    } as unknown as Mocked<LoadedSettings>;
-    mockArgv = {} as unknown as CliArgs;
-    mockConnection = {
-      sessionUpdate: vi.fn().mockResolvedValue(undefined),
-    } as unknown as Mocked<acp.AgentSideConnection>;
-
-    (loadCliConfig as Mock).mockResolvedValue(mockConfig);
-
-    agent = new GeminiAgent(mockConfig, mockSettings, mockArgv, mockConnection);
-  });
-
-  it('should advertise loadSession capability', async () => {
-    const response = await agent.initialize({
-      protocolVersion: acp.PROTOCOL_VERSION,
-    });
-    expect(response.agentCapabilities?.loadSession).toBe(true);
-  });
-
-  it('should load a session, resume chat, and stream all message types', async () => {
-    const sessionId = 'existing-session-id';
-    const sessionData = {
-      sessionId,
-      messages: [
-        { type: 'user', content: [{ text: 'Hello' }] },
-        {
-          type: 'gemini',
-          content: [{ text: 'Hi there' }],
-          thoughts: [{ subject: 'Thinking', description: 'about greeting' }],
-          toolCalls: [
-            {
-              id: 'call-1',
-              name: 'test_tool',
-              displayName: 'Test Tool',
-              status: 'success',
-              resultDisplay: 'Tool output',
-            },
-          ],
-        },
-        {
-          type: 'gemini',
-          content: [{ text: 'Trying a write' }],
-          toolCalls: [
-            {
-              id: 'call-2',
-              name: 'write_file',
-              displayName: 'Write File',
-              status: 'error',
-              resultDisplay: 'Permission denied',
-            },
-          ],
-        },
-      ],
-    };
-
-    mockConfig.getToolRegistry = vi.fn().mockReturnValue({
-      getTool: vi.fn().mockReturnValue({ kind: 'read' }),
-    });
-
-    (SessionSelector as unknown as Mock).mockImplementation(() => ({
-      resolveSession: vi.fn().mockResolvedValue({
-        sessionData,
-        sessionPath: '/path/to/session.json',
-      }),
-    }));
-
-    const mockClientHistory = [
-      { role: 'user', parts: [{ text: 'Hello' }] },
-      { role: 'model', parts: [{ text: 'Hi there' }] },
-    ];
-    (convertSessionToHistoryFormats as unknown as Mock).mockReturnValue({
-      clientHistory: mockClientHistory,
-      uiHistory: [],
-    });
-
-    const response = await agent.loadSession({
-      sessionId,
-      cwd: '/tmp',
-      mcpServers: [],
-    });
-
-    expect(response).toEqual({});
-
-    // Verify resumeChat received the correct arguments
-    expect(mockConfig.getGeminiClient().resumeChat).toHaveBeenCalledWith(
-      mockClientHistory,
-      expect.objectContaining({
-        conversation: sessionData,
-        filePath: '/path/to/session.json',
-      }),
-    );
-
-    await vi.waitFor(() => {
-      // User message
-      expect(mockConnection.sessionUpdate).toHaveBeenCalledWith(
-        expect.objectContaining({
-          update: expect.objectContaining({
-            sessionUpdate: 'user_message_chunk',
-            content: expect.objectContaining({ text: 'Hello' }),
-          }),
-        }),
-      );
-
-      // Agent thought
-      expect(mockConnection.sessionUpdate).toHaveBeenCalledWith(
-        expect.objectContaining({
-          update: expect.objectContaining({
-            sessionUpdate: 'agent_thought_chunk',
-            content: expect.objectContaining({
-              text: '**Thinking**\nabout greeting',
-            }),
-          }),
-        }),
-      );
-
-      // Agent message
-      expect(mockConnection.sessionUpdate).toHaveBeenCalledWith(
-        expect.objectContaining({
-          update: expect.objectContaining({
-            sessionUpdate: 'agent_message_chunk',
-            content: expect.objectContaining({ text: 'Hi there' }),
-          }),
-        }),
-      );
-
-      // Successful tool call → 'completed'
-      expect(mockConnection.sessionUpdate).toHaveBeenCalledWith(
-        expect.objectContaining({
-          update: expect.objectContaining({
-            sessionUpdate: 'tool_call',
-            toolCallId: 'call-1',
-            status: 'completed',
-            title: 'Test Tool',
-            kind: 'read',
-            content: [
-              {
-                type: 'content',
-                content: { type: 'text', text: 'Tool output' },
-              },
-            ],
-          }),
-        }),
-      );
-
-      // Failed tool call → 'failed'
-      expect(mockConnection.sessionUpdate).toHaveBeenCalledWith(
-        expect.objectContaining({
-          update: expect.objectContaining({
-            sessionUpdate: 'tool_call',
-            toolCallId: 'call-2',
-            status: 'failed',
-            title: 'Write File',
-          }),
-        }),
-      );
-    });
-  });
-});

packages/cli/src/zed-integration/zedIntegration.test.ts

@@ -129,7 +129,7 @@ describe('GeminiAgent', () => {
 
     expect(response.protocolVersion).toBe(acp.PROTOCOL_VERSION);
     expect(response.authMethods).toHaveLength(3);
-    expect(response.agentCapabilities?.loadSession).toBe(true);
+    expect(response.agentCapabilities?.loadSession).toBe(false);
   });
 
   it('should authenticate correctly', async () => {
@@ -273,7 +273,6 @@ describe('Session', () => {
     mockChat = {
       sendMessageStream: vi.fn(),
       addHistory: vi.fn(),
-      recordCompletedToolCalls: vi.fn(),
     } as unknown as Mocked<GeminiChat>;
     mockTool = {
       kind: 'native',
@@ -294,7 +293,6 @@ describe('Session', () => {
     } as unknown as Mocked<MessageBus>;
     mockConfig = {
       getModel: vi.fn().mockReturnValue('gemini-pro'),
-      getActiveModel: vi.fn().mockReturnValue('gemini-pro'),
       getPreviewFeatures: vi.fn().mockReturnValue({}),
       getToolRegistry: vi.fn().mockReturnValue(mockToolRegistry),
       getFileService: vi.fn().mockReturnValue({

packages/cli/src/zed-integration/zedIntegration.ts

@@ -10,7 +10,6 @@ import type {
   ToolResult,
   ToolCallConfirmationDetails,
   FilterFilesOptions,
-  ConversationRecord,
 } from '@google/gemini-cli-core';
 import {
   AuthType,
@@ -33,7 +32,6 @@ import {
   createWorkingStdio,
   startupProfiler,
   Kind,
-  partListUnionToString,
 } from '@google/gemini-cli-core';
 import * as acp from '@agentclientprotocol/sdk';
 import { AcpFileSystemService } from './fileSystemService.js';
@@ -49,10 +47,6 @@ import { randomUUID } from 'node:crypto';
 import type { CliArgs } from '../config/config.js';
 import { loadCliConfig } from '../config/config.js';
 import { runExitCleanup } from '../utils/cleanup.js';
-import {
-  SessionSelector,
-  convertSessionToHistoryFormats,
-} from '../utils/sessionUtils.js';
 
 export async function runZedIntegration(
   config: Config,
@@ -113,7 +107,7 @@ export class GeminiAgent {
       protocolVersion: acp.PROTOCOL_VERSION,
       authMethods,
       agentCapabilities: {
-        loadSession: true,
+        loadSession: false,
         promptCapabilities: {
           image: true,
           audio: true,
@@ -152,11 +146,23 @@ export class GeminiAgent {
     mcpServers,
   }: acp.NewSessionRequest): Promise<acp.NewSessionResponse> {
     const sessionId = randomUUID();
-    const config = await this.initializeSessionConfig(
-      sessionId,
-      cwd,
-      mcpServers,
-    );
+    const config = await this.newSessionConfig(sessionId, cwd, mcpServers);
+
+    let isAuthenticated = false;
+    if (this.settings.merged.security.auth.selectedType) {
+      try {
+        await config.refreshAuth(
+          this.settings.merged.security.auth.selectedType,
+        );
+        isAuthenticated = true;
+      } catch (e) {
+        debugLogger.error(`Authentication failed: ${e}`);
+      }
+    }
+
+    if (!isAuthenticated) {
+      throw acp.RequestError.authRequired();
+    }
 
     if (this.clientCapabilities?.fs) {
       const acpFileSystemService = new AcpFileSystemService(
@@ -178,88 +184,6 @@ export class GeminiAgent {
     };
   }
 
-  async loadSession({
-    sessionId,
-    cwd,
-    mcpServers,
-  }: acp.LoadSessionRequest): Promise<acp.LoadSessionResponse> {
-    const config = await this.initializeSessionConfig(
-      sessionId,
-      cwd,
-      mcpServers,
-    );
-
-    const sessionSelector = new SessionSelector(config);
-    const { sessionData, sessionPath } =
-      await sessionSelector.resolveSession(sessionId);
-
-    if (this.clientCapabilities?.fs) {
-      const acpFileSystemService = new AcpFileSystemService(
-        this.connection,
-        sessionId,
-        this.clientCapabilities.fs,
-        config.getFileSystemService(),
-      );
-      config.setFileSystemService(acpFileSystemService);
-    }
-
-    const { clientHistory } = convertSessionToHistoryFormats(
-      sessionData.messages,
-    );
-
-    const geminiClient = config.getGeminiClient();
-    await geminiClient.initialize();
-    await geminiClient.resumeChat(clientHistory, {
-      conversation: sessionData,
-      filePath: sessionPath,
-    });
-
-    const session = new Session(
-      sessionId,
-      geminiClient.getChat(),
-      config,
-      this.connection,
-    );
-    this.sessions.set(sessionId, session);
-
-    // Stream history back to client
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    session.streamHistory(sessionData.messages);
-
-    return {};
-  }
-
-  private async initializeSessionConfig(
-    sessionId: string,
-    cwd: string,
-    mcpServers: acp.McpServer[],
-  ): Promise<Config> {
-    const selectedAuthType = this.settings.merged.security.auth.selectedType;
-    if (!selectedAuthType) {
-      throw acp.RequestError.authRequired();
-    }
-
-    // 1. Create config WITHOUT initializing it (no MCP servers started yet)
-    const config = await this.newSessionConfig(sessionId, cwd, mcpServers);
-
-    // 2. Authenticate BEFORE initializing configuration or starting MCP servers.
-    // This satisfies the security requirement to verify the user before executing
-    // potentially unsafe server definitions.
-    try {
-      await config.refreshAuth(selectedAuthType);
-    } catch (e) {
-      debugLogger.error(`Authentication failed: ${e}`);
-      throw acp.RequestError.authRequired();
-    }
-
-    // 3. Now that we are authenticated, it is safe to initialize the config
-    // which starts the MCP servers and other heavy resources.
-    await config.initialize();
-    startupProfiler.flush(config);
-
-    return config;
-  }
-
   async newSessionConfig(
     sessionId: string,
     cwd: string,
@@ -304,6 +228,8 @@ export class GeminiAgent {
 
     const config = await loadCliConfig(settings, sessionId, this.argv, { cwd });
 
+    await config.initialize();
+    startupProfiler.flush(config);
     return config;
   }
 
@@ -343,73 +269,6 @@ export class Session {
     this.pendingPrompt = null;
   }
 
-  async streamHistory(messages: ConversationRecord['messages']): Promise<void> {
-    for (const msg of messages) {
-      const contentString = partListUnionToString(msg.content);
-
-      if (msg.type === 'user') {
-        if (contentString.trim()) {
-          await this.sendUpdate({
-            sessionUpdate: 'user_message_chunk',
-            content: { type: 'text', text: contentString },
-          });
-        }
-      } else if (msg.type === 'gemini') {
-        // Thoughts
-        if (msg.thoughts) {
-          for (const thought of msg.thoughts) {
-            const thoughtText = `**${thought.subject}**\n${thought.description}`;
-            await this.sendUpdate({
-              sessionUpdate: 'agent_thought_chunk',
-              content: { type: 'text', text: thoughtText },
-            });
-          }
-        }
-
-        // Message text
-        if (contentString.trim()) {
-          await this.sendUpdate({
-            sessionUpdate: 'agent_message_chunk',
-            content: { type: 'text', text: contentString },
-          });
-        }
-
-        // Tool calls
-        if (msg.toolCalls) {
-          for (const toolCall of msg.toolCalls) {
-            const toolCallContent: acp.ToolCallContent[] = [];
-            if (toolCall.resultDisplay) {
-              if (typeof toolCall.resultDisplay === 'string') {
-                toolCallContent.push({
-                  type: 'content',
-                  content: { type: 'text', text: toolCall.resultDisplay },
-                });
-              } else if ('fileName' in toolCall.resultDisplay) {
-                toolCallContent.push({
-                  type: 'diff',
-                  path: toolCall.resultDisplay.fileName,
-                  oldText: toolCall.resultDisplay.originalContent,
-                  newText: toolCall.resultDisplay.newContent,
-                });
-              }
-            }
-
-            const tool = this.config.getToolRegistry().getTool(toolCall.name);
-
-            await this.sendUpdate({
-              sessionUpdate: 'tool_call',
-              toolCallId: toolCall.id,
-              status: toolCall.status === 'success' ? 'completed' : 'failed',
-              title: toolCall.displayName || toolCall.name,
-              content: toolCallContent,
-              kind: tool ? toAcpToolKind(tool.kind) : 'other',
-            });
-          }
-        }
-      }
-    }
-  }
-
   async prompt(params: acp.PromptRequest): Promise<acp.PromptResponse> {
     this.pendingPrompt?.abort();
     const pendingSend = new AbortController();
@@ -674,33 +533,6 @@ export class Session {
         ),
       );
 
-      this.chat.recordCompletedToolCalls(this.config.getActiveModel(), [
-        {
-          status: 'success',
-          request: {
-            callId,
-            name: fc.name,
-            args,
-            isClientInitiated: false,
-            prompt_id: promptId,
-          },
-          tool,
-          invocation,
-          response: {
-            callId,
-            responseParts: convertToFunctionResponse(
-              fc.name,
-              callId,
-              toolResult.llmContent,
-              this.config.getActiveModel(),
-            ),
-            resultDisplay: toolResult.returnDisplay,
-            error: undefined,
-            errorType: undefined,
-          },
-        },
-      ]);
-
       return convertToFunctionResponse(
         fc.name,
         callId,
@@ -719,35 +551,6 @@ export class Session {
         ],
       });
 
-      this.chat.recordCompletedToolCalls(this.config.getActiveModel(), [
-        {
-          status: 'error',
-          request: {
-            callId,
-            name: fc.name,
-            args,
-            isClientInitiated: false,
-            prompt_id: promptId,
-          },
-          tool,
-          response: {
-            callId,
-            responseParts: [
-              {
-                functionResponse: {
-                  id: callId,
-                  name: fc.name ?? '',
-                  response: { error: error.message },
-                },
-              },
-            ],
-            resultDisplay: error.message,
-            error,
-            errorType: undefined,
-          },
-        },
-      ]);
-
       return errorResponse(error);
     }
   }

packages/core/src/policy/policy-engine.test.ts

@@ -1398,100 +1398,6 @@ describe('PolicyEngine', () => {
     });
   });
 
-  describe('shell command parsing failure', () => {
-    it('should return ALLOW in YOLO mode even if shell command parsing fails', async () => {
-      const { splitCommands } = await import('../utils/shell-utils.js');
-      const rules: PolicyRule[] = [
-        {
-          decision: PolicyDecision.ALLOW,
-          priority: 999,
-          modes: [ApprovalMode.YOLO],
-        },
-        {
-          toolName: 'run_shell_command',
-          decision: PolicyDecision.ASK_USER,
-          priority: 10,
-        },
-      ];
-
-      engine = new PolicyEngine({
-        rules,
-        approvalMode: ApprovalMode.YOLO,
-      });
-
-      // Simulate parsing failure (splitCommands returning empty array)
-      vi.mocked(splitCommands).mockReturnValueOnce([]);
-
-      const result = await engine.check(
-        { name: 'run_shell_command', args: { command: 'complex command' } },
-        undefined,
-      );
-
-      expect(result.decision).toBe(PolicyDecision.ALLOW);
-      expect(result.rule).toBeDefined();
-      expect(result.rule?.priority).toBe(999);
-    });
-
-    it('should return DENY in YOLO mode if shell command parsing fails and a higher priority rule says DENY', async () => {
-      const { splitCommands } = await import('../utils/shell-utils.js');
-      const rules: PolicyRule[] = [
-        {
-          toolName: 'run_shell_command',
-          decision: PolicyDecision.DENY,
-          priority: 2000, // Very high priority DENY (e.g. Admin)
-        },
-        {
-          decision: PolicyDecision.ALLOW,
-          priority: 999,
-          modes: [ApprovalMode.YOLO],
-        },
-      ];
-
-      engine = new PolicyEngine({
-        rules,
-        approvalMode: ApprovalMode.YOLO,
-      });
-
-      // Simulate parsing failure
-      vi.mocked(splitCommands).mockReturnValueOnce([]);
-
-      const result = await engine.check(
-        { name: 'run_shell_command', args: { command: 'complex command' } },
-        undefined,
-      );
-
-      expect(result.decision).toBe(PolicyDecision.DENY);
-    });
-
-    it('should return ASK_USER in non-YOLO mode if shell command parsing fails', async () => {
-      const { splitCommands } = await import('../utils/shell-utils.js');
-      const rules: PolicyRule[] = [
-        {
-          toolName: 'run_shell_command',
-          decision: PolicyDecision.ALLOW,
-          priority: 20,
-        },
-      ];
-
-      engine = new PolicyEngine({
-        rules,
-        approvalMode: ApprovalMode.DEFAULT,
-      });
-
-      // Simulate parsing failure
-      vi.mocked(splitCommands).mockReturnValueOnce([]);
-
-      const result = await engine.check(
-        { name: 'run_shell_command', args: { command: 'complex command' } },
-        undefined,
-      );
-
-      expect(result.decision).toBe(PolicyDecision.ASK_USER);
-      expect(result.rule).toBeDefined();
-      expect(result.rule?.priority).toBe(20);
-    });
-  });
-
   describe('safety checker integration', () => {
     it('should call checker when rule allows and has safety_checker', async () => {
       const rules: PolicyRule[] = [

packages/core/src/policy/policy-engine.ts

@@ -152,28 +152,14 @@ export class PolicyEngine {
     const subCommands = splitCommands(command);
 
     if (subCommands.length === 0) {
-      // If the matched rule says DENY, we should respect it immediately even if parsing fails.
-      if (ruleDecision === PolicyDecision.DENY) {
-        return { decision: PolicyDecision.DENY, rule };
-      }
-
-      // In YOLO mode, we should proceed anyway even if we can't parse the command.
-      if (this.approvalMode === ApprovalMode.YOLO) {
-        return {
-          decision: PolicyDecision.ALLOW,
-          rule,
-        };
-      }
-
       debugLogger.debug(
         `[PolicyEngine.check] Command parsing failed for: ${command}. Falling back to ASK_USER.`,
       );
-
       // Parsing logic failed, we can't trust it. Force ASK_USER (or DENY).
-      // We return the rule that matched so the evaluation loop terminates.
+      // We don't blame a specific rule here, unless the input rule was stricter.
       return {
         decision: this.applyNonInteractiveMode(PolicyDecision.ASK_USER),
-        rule,
+        rule: undefined,
       };
     }
 

packages/core/src/utils/retry.test.ts

@@ -101,33 +101,33 @@ describe('retryWithBackoff', () => {
     expect(mockFn).toHaveBeenCalledTimes(3);
   });
 
-  it('should default to 3 maxAttempts if no options are provided', async () => {
-    // This function will fail more than 3 times to ensure all retries are used.
-    const mockFn = createFailingFunction(5);
+  it('should default to 10 maxAttempts if no options are provided', async () => {
+    // This function will fail more than 10 times to ensure all retries are used.
+    const mockFn = createFailingFunction(15);
 
     const promise = retryWithBackoff(mockFn);
 
     await Promise.all([
-      expect(promise).rejects.toThrow('Simulated error attempt 3'),
+      expect(promise).rejects.toThrow('Simulated error attempt 10'),
       vi.runAllTimersAsync(),
     ]);
 
-    expect(mockFn).toHaveBeenCalledTimes(3);
+    expect(mockFn).toHaveBeenCalledTimes(10);
   });
 
-  it('should default to 3 maxAttempts if options.maxAttempts is undefined', async () => {
-    // This function will fail more than 3 times to ensure all retries are used.
-    const mockFn = createFailingFunction(5);
+  it('should default to 10 maxAttempts if options.maxAttempts is undefined', async () => {
+    // This function will fail more than 10 times to ensure all retries are used.
+    const mockFn = createFailingFunction(15);
 
     const promise = retryWithBackoff(mockFn, { maxAttempts: undefined });
 
-    // Expect it to fail with the error from the 3rd attempt.
+    // Expect it to fail with the error from the 10th attempt.
     await Promise.all([
-      expect(promise).rejects.toThrow('Simulated error attempt 3'),
+      expect(promise).rejects.toThrow('Simulated error attempt 10'),
       vi.runAllTimersAsync(),
     ]);
 
-    expect(mockFn).toHaveBeenCalledTimes(3);
+    expect(mockFn).toHaveBeenCalledTimes(10);
   });
 
   it('should not retry if shouldRetry returns false', async () => {

packages/core/src/utils/retry.ts

@@ -40,7 +40,7 @@ export interface RetryOptions {
 }
 
 const DEFAULT_RETRY_OPTIONS: RetryOptions = {
-  maxAttempts: 3,
+  maxAttempts: 10,
   initialDelayMs: 5000,
   maxDelayMs: 30000, // 30 seconds
   shouldRetryOnError: isRetryableError,

schemas/settings.schema.json

@@ -1112,6 +1112,13 @@
           },
           "additionalProperties": false
         },
+        "autoAccept": {
+          "title": "Auto Accept",
+          "description": "Automatically accept and execute tool calls that are considered safe (e.g., read-only operations).",
+          "markdownDescription": "Automatically accept and execute tool calls that are considered safe (e.g., read-only operations).\n\n- Category: `Tools`\n- Requires restart: `no`\n- Default: `false`",
+          "default": false,
+          "type": "boolean"
+        },
         "approvalMode": {
           "title": "Approval Mode",
           "description": "The default approval mode for tool execution. 'default' prompts for approval, 'auto_edit' auto-approves edit tools, and 'plan' is read-only mode. 'yolo' is not supported yet.",