refactor(cli): address code review feedback for visual journey testing

- Replace 'any' with 'TestableDOMNode' for Ink tree traversal in AppRig and custom matchers
- Rename 'toVisuallyContain' to 'toContainComponent' for clarity
- Remove SVG audit trail (component injection) to prevent snapshot churn

.gemini/settings.json

@@ -1,6 +1,5 @@
 {
   "experimental": {
-    "plan": true,
     "extensionReloading": true,
     "modelSteering": true,
     "memoryManager": true,
@@ -8,8 +7,5 @@
   },
   "general": {
     "devtools": true
-  },
-  "security": {
-    "toolSandboxing": true
   }
 }

.github/actions/publish-release/action.yml

@@ -175,7 +175,9 @@ runs:
           --dry-run="${INPUTS_DRY_RUN}" \
           --workspace="${INPUTS_CORE_PACKAGE_NAME}" \
           --no-tag
-        npm dist-tag rm ${INPUTS_CORE_PACKAGE_NAME} false
+        if [[ "${INPUTS_DRY_RUN}" == "false" ]]; then
+          npm dist-tag rm ${INPUTS_CORE_PACKAGE_NAME} false
+        fi
 
     - name: '🔗 Install latest core package'
       working-directory: '${{ inputs.working-directory }}'
@@ -193,7 +195,7 @@ runs:
         INPUTS_A2A_PACKAGE_NAME: '${{ inputs.a2a-package-name }}'
 
     - name: '📦 Prepare bundled CLI for npm release'
-      if: "inputs.npm-registry-url != 'https://npm.pkg.github.com/' && inputs.npm-tag != 'latest'"
+      if: "inputs.npm-registry-url != 'https://npm.pkg.github.com/'"
       working-directory: '${{ inputs.working-directory }}'
       shell: 'bash'
       run: |
@@ -248,7 +250,9 @@ runs:
           --dry-run="${INPUTS_DRY_RUN}" \
           --workspace="${INPUTS_A2A_PACKAGE_NAME}" \
           --no-tag
-        npm dist-tag rm ${INPUTS_A2A_PACKAGE_NAME} false
+          if [[ "${INPUTS_DRY_RUN}" == "false" ]]; then
+            npm dist-tag rm ${INPUTS_A2A_PACKAGE_NAME} false
+          fi
 
     - name: '🔬 Verify NPM release by version'
       uses: './.github/actions/verify-release'

.github/actions/run-tests/action.yml

@@ -18,6 +18,13 @@ runs:
       env:
         JSON_INPUTS: '${{ toJSON(inputs) }}'
       run: 'echo "$JSON_INPUTS"'
+    - name: 'Install system dependencies'
+      if: "runner.os == 'Linux'"
+      run: |
+        sudo apt-get update -qq && sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -qq bubblewrap
+        # Ubuntu 24.04+ requires this to allow bwrap to function in CI
+        sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0 || true
+      shell: 'bash'
     - name: 'Run Tests'
       env:
         GEMINI_API_KEY: '${{ inputs.gemini_api_key }}'

docs/cli/cli-reference.md

@@ -52,7 +52,7 @@ These commands are available within the interactive REPL.
 | `--prompt-interactive`           | `-i`  | string  | -         | Execute prompt and continue in interactive mode                                                                                                                        |
 | `--worktree`                     | `-w`  | string  | -         | Start Gemini in a new git worktree. If no name is provided, one is generated automatically. Requires `experimental.worktrees: true` in settings.                       |
 | `--sandbox`                      | `-s`  | boolean | `false`   | Run in a sandboxed environment for safer execution                                                                                                                     |
-| `--approval-mode`                | -     | string  | `default` | Approval mode for tool execution. Choices: `default`, `auto_edit`, `yolo`                                                                                              |
+| `--approval-mode`                | -     | string  | `default` | Approval mode for tool execution. Choices: `default`, `auto_edit`, `yolo`, `plan`                                                                                      |
 | `--yolo`                         | `-y`  | boolean | `false`   | **Deprecated.** Auto-approve all actions. Use `--approval-mode=yolo` instead.                                                                                          |
 | `--experimental-acp`             | -     | boolean | -         | Start in ACP (Agent Code Pilot) mode. **Experimental feature.**                                                                                                        |
 | `--experimental-zed-integration` | -     | boolean | -         | Run in Zed editor integration mode. **Experimental feature.**                                                                                                          |

docs/cli/settings.md

@@ -30,6 +30,7 @@ they appear in the UI.
 | Default Approval Mode   | `general.defaultApprovalMode`      | The default approval mode for tool execution. 'default' prompts for approval, 'auto_edit' auto-approves edit tools, and 'plan' is read-only mode. YOLO mode (auto-approve all actions) can only be enabled via command line (--yolo or --approval-mode=yolo). | `"default"` |
 | Enable Auto Update      | `general.enableAutoUpdate`         | Enable automatic updates.                                                                                                                                                                                                                                     | `true`      |
 | Enable Notifications    | `general.enableNotifications`      | Enable run-event notifications for action-required prompts and session completion.                                                                                                                                                                            | `false`     |
+| Enable Plan Mode        | `general.plan.enabled`             | Enable Plan Mode for read-only safety during planning.                                                                                                                                                                                                        | `true`      |
 | Plan Directory          | `general.plan.directory`           | The directory where planning artifacts are stored. If not specified, defaults to the system temporary directory. A custom directory requires a policy to allow write access in Plan Mode.                                                                     | `undefined` |
 | Plan Model Routing      | `general.plan.modelRouting`        | Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pro for the planning phase and Flash for the implementation phase.                                                                                                          | `true`      |
 | Retry Fetch Errors      | `general.retryFetchErrors`         | Retry on "exception TypeError: fetch failed sending request" errors.                                                                                                                                                                                          | `true`      |
@@ -162,7 +163,6 @@ they appear in the UI.
 | Enable Git Worktrees       | `experimental.worktrees`                 | Enable automated Git worktree management for parallel work.                                                                                               | `false` |
 | Use OSC 52 Paste           | `experimental.useOSC52Paste`             | Use OSC 52 for pasting. This may be more robust than the default system when using remote terminal sessions (if your terminal is configured to allow it). | `false` |
 | Use OSC 52 Copy            | `experimental.useOSC52Copy`              | Use OSC 52 for copying. This may be more robust than the default system when using remote terminal sessions (if your terminal is configured to allow it). | `false` |
-| Plan                       | `experimental.plan`                      | Enable Plan Mode.                                                                                                                                         | `true`  |
 | Model Steering             | `experimental.modelSteering`             | Enable model steering (user hints) to guide the model during tool execution.                                                                              | `false` |
 | Direct Web Fetch           | `experimental.directWebFetch`            | Enable web fetch behavior that bypasses LLM summarization.                                                                                                | `false` |
 | Memory Manager Agent       | `experimental.memoryManager`             | Replace the built-in save_memory tool with a memory manager subagent that supports adding, removing, de-duplicating, and organizing memories.             | `false` |

docs/core/index.md

@@ -7,8 +7,8 @@ requests sent from `packages/cli`. For a general overview of Gemini CLI, see the
 
 ## Navigating this section
 
-- **[Sub-agents (experimental)](./subagents.md):** Learn how to create and use
-  specialized sub-agents for complex tasks.
+- **[Sub-agents](./subagents.md):** Learn how to create and use specialized
+  sub-agents for complex tasks.
 - **[Core tools reference](../reference/tools.md):** Information on how tools
   are defined, registered, and used by the core.
 - **[Memory Import Processor](../reference/memport.md):** Documentation for the

docs/core/subagents.md

@@ -1,20 +1,16 @@
-# Subagents (experimental)
+# Subagents
 
 Subagents are specialized agents that operate within your main Gemini CLI
 session. They are designed to handle specific, complex tasks—like deep codebase
 analysis, documentation lookup, or domain-specific reasoning—without cluttering
 the main agent's context or toolset.
 
-<!-- prettier-ignore -->
-> [!NOTE]
-> Subagents are currently an experimental feature.
-> 
-To use custom subagents, you must ensure they are enabled in your
-`settings.json` (enabled by default):
+Subagents are enabled by default. To disable them, set `enableAgents` to `false`
+in your `settings.json`:
 
 ```json
 {
-  "experimental": { "enableAgents": true }
+  "experimental": { "enableAgents": false }
 }
 ```
 
@@ -229,16 +225,7 @@ the `click_at` tool for precise, coordinate-based interactions.
 ## Creating custom subagents
 
 You can create your own subagents to automate specific workflows or enforce
-specific personas. To use custom subagents, you must enable them in your
-`settings.json`:
-
-```json
-{
-  "experimental": {
-    "enableAgents": true
-  }
-}
-```
+specific personas.
 
 ### Agent definition files
 
@@ -406,15 +393,11 @@ If you need to further tune your subagent, you can do so by selecting the model
 to optimize for with `/model` and then asking the model why it does not think
 that your subagent was called with a specific prompt and the given description.
 
-## Remote subagents (Agent2Agent) (experimental)
+## Remote subagents (Agent2Agent)
 
 Gemini CLI can also delegate tasks to remote subagents using the Agent-to-Agent
 (A2A) protocol.
 
-<!-- prettier-ignore -->
-> [!NOTE]
-> Remote subagents are currently an experimental feature.
-
 See the [Remote Subagents documentation](remote-agents) for detailed
 configuration, authentication, and usage instructions.
 

docs/reference/commands.md

@@ -17,8 +17,6 @@ Slash commands provide meta-level control over the CLI itself.
 ### `/agents`
 
 - **Description:** Manage local and remote subagents.
-- **Note:** This command is experimental and requires
-  `experimental.enableAgents: true` in your `settings.json`.
 - **Sub-commands:**
   - **`list`**:
     - **Description:** Lists all discovered agents, including built-in, local,
@@ -305,7 +303,7 @@ Slash commands provide meta-level control over the CLI itself.
 - **Description:** Switch to Plan Mode (read-only) and view the current plan if
   one has been generated.
   - **Note:** This feature is enabled by default. It can be disabled via the
-    `experimental.plan` setting in your configuration.
+    `general.plan.enabled` setting in your configuration.
 - **Sub-commands:**
   - **`copy`**:
     - **Description:** Copy the currently approved plan to your clipboard.

docs/reference/configuration.md

@@ -141,6 +141,11 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `false`
   - **Requires restart:** Yes
 
+- **`general.plan.enabled`** (boolean):
+  - **Description:** Enable Plan Mode for read-only safety during planning.
+  - **Default:** `true`
+  - **Requires restart:** Yes
+
 - **`general.plan.directory`** (string):
   - **Description:** The directory where planning artifacts are stored. If not
     specified, defaults to the system temporary directory. A custom directory
@@ -1642,7 +1647,7 @@ their corresponding top-level category object in your `settings.json` file.
 
 - **`experimental.jitContext`** (boolean):
   - **Description:** Enable Just-In-Time (JIT) context loading.
-  - **Default:** `true`
+  - **Default:** `false`
   - **Requires restart:** Yes
 
 - **`experimental.useOSC52Paste`** (boolean):
@@ -1657,11 +1662,6 @@ their corresponding top-level category object in your `settings.json` file.
     configured to allow it).
   - **Default:** `false`
 
-- **`experimental.plan`** (boolean):
-  - **Description:** Enable Plan Mode.
-  - **Default:** `true`
-  - **Requires restart:** Yes
-
 - **`experimental.taskTracker`** (boolean):
   - **Description:** Enable task tracker tools.
   - **Default:** `false`

docs/reference/keyboard-shortcuts.md

@@ -127,6 +127,13 @@ available combinations.
 | `background.unfocusList`    | Move focus from background shell list to Gemini.                   | `Tab`       |
 | `background.unfocusWarning` | Show warning when trying to move focus away from background shell. | `Tab`       |
 
+#### Extension Controls
+
+| Command            | Action                                      | Keys |
+| ------------------ | ------------------------------------------- | ---- |
+| `extension.update` | Update the current extension if available.  | `I`  |
+| `extension.link`   | Link the current extension to a local path. | `L`  |
+
 <!-- KEYBINDINGS-AUTOGEN:END -->
 
 ## Customizing Keybindings

docs/sidebar.json

@@ -138,12 +138,10 @@
           { "label": "Plan mode", "slug": "docs/cli/plan-mode" },
           {
             "label": "Subagents",
-            "badge": "🔬",
             "slug": "docs/core/subagents"
           },
           {
             "label": "Remote subagents",
-            "badge": "🔬",
             "slug": "docs/core/remote-agents"
           },
           { "label": "Rewind", "slug": "docs/cli/rewind" },

evals/plan_mode.eval.ts

@@ -15,7 +15,9 @@ import {
 describe('plan_mode', () => {
   const TEST_PREFIX = 'Plan Mode: ';
   const settings = {
-    experimental: { plan: true },
+    general: {
+      plan: { enabled: true },
+    },
   };
 
   const getWriteTargets = (logs: any[]) =>

integration-tests/file-system.test.ts

@@ -133,7 +133,7 @@ describe('file-system', () => {
     ).toBeTruthy();
 
     const newFileContent = rig.readFile(fileName);
-    expect(newFileContent.trim()).toBe('hello');
+    expect(newFileContent).toBe('hello');
   });
 
   it('should perform a read-then-write sequence', async () => {

integration-tests/plan-mode.test.ts

@@ -23,7 +23,9 @@ describe('Plan Mode', () => {
       'should allow read-only tools but deny write tools in plan mode',
       {
         settings: {
-          experimental: { plan: true },
+          general: {
+            plan: { enabled: true },
+          },
           tools: {
             core: [
               'run_shell_command',
@@ -67,15 +69,12 @@ describe('Plan Mode', () => {
 
     await rig.setup(testName, {
       settings: {
-        experimental: { plan: true },
         tools: {
           core: ['write_file', 'read_file', 'list_directory'],
         },
         general: {
+          plan: { enabled: true, directory: plansDir },
           defaultApprovalMode: 'plan',
-          plan: {
-            directory: plansDir,
-          },
         },
       },
     });
@@ -120,15 +119,12 @@ describe('Plan Mode', () => {
 
     await rig.setup(testName, {
       settings: {
-        experimental: { plan: true },
         tools: {
           core: ['write_file', 'read_file', 'list_directory'],
         },
         general: {
+          plan: { enabled: true, directory: plansDir },
           defaultApprovalMode: 'plan',
-          plan: {
-            directory: plansDir,
-          },
         },
       },
     });
@@ -156,7 +152,9 @@ describe('Plan Mode', () => {
   it('should be able to enter plan mode from default mode', async () => {
     await rig.setup('should be able to enter plan mode from default mode', {
       settings: {
-        experimental: { plan: true },
+        general: {
+          plan: { enabled: true },
+        },
         tools: {
           core: ['enter_plan_mode'],
           allowed: ['enter_plan_mode'],
@@ -184,15 +182,12 @@ describe('Plan Mode', () => {
 
     await rig.setup(testName, {
       settings: {
-        experimental: { plan: true },
         tools: {
           core: ['write_file', 'read_file', 'list_directory'],
         },
         general: {
+          plan: { enabled: true, directory: plansDir },
           defaultApprovalMode: 'plan',
-          plan: {
-            directory: plansDir,
-          },
         },
       },
     });

package-lock.json

@@ -17551,7 +17551,7 @@
         "fzf": "^0.5.2",
         "glob": "^12.0.0",
         "highlight.js": "^11.11.1",
-        "ink": "npm:@jrichman/ink@6.5.0",
+        "ink": "npm:@jrichman/ink@6.6.2",
         "ink-gradient": "^3.0.0",
         "ink-spinner": "^5.0.0",
         "latest-version": "^9.0.0",

packages/cli/package.json

@@ -49,7 +49,7 @@
     "fzf": "^0.5.2",
     "glob": "^12.0.0",
     "highlight.js": "^11.11.1",
-    "ink": "npm:@jrichman/ink@6.5.0",
+    "ink": "npm:@jrichman/ink@6.6.2",
     "ink-gradient": "^3.0.0",
     "ink-spinner": "^5.0.0",
     "latest-version": "^9.0.0",

packages/cli/src/config/config.test.ts

@@ -1364,8 +1364,8 @@ describe('Approval mode tool exclusion logic', () => {
       'test',
     ];
     const settings = createTestMergedSettings({
-      experimental: {
-        plan: true,
+      general: {
+        plan: { enabled: true },
       },
     });
     const argv = await parseArguments(createTestMergedSettings());
@@ -1479,9 +1479,7 @@ describe('Approval mode tool exclusion logic', () => {
     const settings = createTestMergedSettings({
       general: {
         defaultApprovalMode: 'plan',
-      },
-      experimental: {
-        plan: false,
+        plan: { enabled: false },
       },
     });
     const argv = await parseArguments(settings);
@@ -1489,14 +1487,12 @@ describe('Approval mode tool exclusion logic', () => {
     expect(config.getApprovalMode()).toBe(ApprovalMode.DEFAULT);
   });
 
-  it('should allow plan approval mode if experimental plan is enabled', async () => {
+  it('should allow plan approval mode if plan is enabled', async () => {
     process.argv = ['node', 'script.js'];
     const settings = createTestMergedSettings({
       general: {
         defaultApprovalMode: 'plan',
-      },
-      experimental: {
-        plan: true,
+        plan: { enabled: true },
       },
     });
     const argv = await parseArguments(settings);
@@ -2742,12 +2738,12 @@ describe('loadCliConfig approval mode', () => {
     expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.YOLO);
   });
 
-  it('should set Plan approval mode when --approval-mode=plan is used and experimental.plan is enabled', async () => {
+  it('should set Plan approval mode when --approval-mode=plan is used and plan is enabled', async () => {
     process.argv = ['node', 'script.js', '--approval-mode', 'plan'];
     const argv = await parseArguments(createTestMergedSettings());
     const settings = createTestMergedSettings({
-      experimental: {
-        plan: true,
+      general: {
+        plan: { enabled: true },
       },
     });
     const config = await loadCliConfig(settings, 'test-session', argv);
@@ -2767,12 +2763,12 @@ describe('loadCliConfig approval mode', () => {
     expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.DEFAULT);
   });
 
-  it('should throw error when --approval-mode=plan is used but experimental.plan is disabled', async () => {
+  it('should throw error when --approval-mode=plan is used but plan is disabled', async () => {
     process.argv = ['node', 'script.js', '--approval-mode', 'plan'];
     const argv = await parseArguments(createTestMergedSettings());
     const settings = createTestMergedSettings({
-      experimental: {
-        plan: false,
+      general: {
+        plan: { enabled: false },
       },
     });
 
@@ -2893,22 +2889,26 @@ describe('loadCliConfig approval mode', () => {
       expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.YOLO);
     });
 
-    it('should respect plan mode from settings when experimental.plan is enabled', async () => {
+    it('should respect plan mode from settings when plan is enabled', async () => {
       process.argv = ['node', 'script.js'];
       const settings = createTestMergedSettings({
-        general: { defaultApprovalMode: 'plan' },
-        experimental: { plan: true },
+        general: {
+          defaultApprovalMode: 'plan',
+          plan: { enabled: true },
+        },
       });
       const argv = await parseArguments(settings);
       const config = await loadCliConfig(settings, 'test-session', argv);
       expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.PLAN);
     });
 
-    it('should throw error if plan mode is in settings but experimental.plan is disabled', async () => {
+    it('should fall back to default if plan mode is in settings but disabled', async () => {
       process.argv = ['node', 'script.js'];
       const settings = createTestMergedSettings({
-        general: { defaultApprovalMode: 'plan' },
-        experimental: { plan: false },
+        general: {
+          defaultApprovalMode: 'plan',
+          plan: { enabled: false },
+        },
       });
       const argv = await parseArguments(settings);
       const config = await loadCliConfig(settings, 'test-session', argv);
@@ -3696,7 +3696,9 @@ describe('loadCliConfig mcpEnabled', () => {
     it('should use plan directory from active extension when user has not specified one', async () => {
       process.argv = ['node', 'script.js'];
       const settings = createTestMergedSettings({
-        experimental: { plan: true },
+        general: {
+          plan: { enabled: true },
+        },
       });
       const argv = await parseArguments(settings);
 
@@ -3715,9 +3717,11 @@ describe('loadCliConfig mcpEnabled', () => {
     it('should NOT use plan directory from active extension when user has specified one', async () => {
       process.argv = ['node', 'script.js'];
       const settings = createTestMergedSettings({
-        experimental: { plan: true },
         general: {
-          plan: { directory: 'user-plans-dir' },
+          plan: {
+            enabled: true,
+            directory: 'user-plans-dir',
+          },
         },
       });
       const argv = await parseArguments(settings);
@@ -3738,7 +3742,9 @@ describe('loadCliConfig mcpEnabled', () => {
     it('should NOT use plan directory from inactive extension', async () => {
       process.argv = ['node', 'script.js'];
       const settings = createTestMergedSettings({
-        experimental: { plan: true },
+        general: {
+          plan: { enabled: true },
+        },
       });
       const argv = await parseArguments(settings);
 
@@ -3759,7 +3765,9 @@ describe('loadCliConfig mcpEnabled', () => {
     it('should use default path if neither user nor extension settings provide a plan directory', async () => {
       process.argv = ['node', 'script.js'];
       const settings = createTestMergedSettings({
-        experimental: { plan: true },
+        general: {
+          plan: { enabled: true },
+        },
       });
       const argv = await parseArguments(settings);
 

packages/cli/src/config/config.ts

@@ -669,9 +669,9 @@ export async function loadCliConfig(
         approvalMode = ApprovalMode.AUTO_EDIT;
         break;
       case 'plan':
-        if (!(settings.experimental?.plan ?? false)) {
+        if (!(settings.general?.plan?.enabled ?? true)) {
           debugLogger.warn(
-            'Approval mode "plan" is only available when experimental.plan is enabled. Falling back to "default".',
+            'Approval mode "plan" is disabled in your settings. Falling back to "default".',
           );
           approvalMode = ApprovalMode.DEFAULT;
         } else {
@@ -966,7 +966,7 @@ export async function loadCliConfig(
     extensionRegistryURI,
     enableExtensionReloading: settings.experimental?.extensionReloading,
     enableAgents: settings.experimental?.enableAgents,
-    plan: settings.experimental?.plan,
+    plan: settings.general?.plan?.enabled ?? true,
     tracker: settings.experimental?.taskTracker,
     directWebFetch: settings.experimental?.directWebFetch,
     planSettings: settings.general?.plan?.directory

packages/cli/src/config/footerItems.test.ts

@@ -5,87 +5,153 @@
  */
 
 import { describe, it, expect } from 'vitest';
-import { deriveItemsFromLegacySettings } from './footerItems.js';
+import {
+  deriveItemsFromLegacySettings,
+  resolveFooterState,
+} from './footerItems.js';
 import { createMockSettings } from '../test-utils/settings.js';
 
-describe('deriveItemsFromLegacySettings', () => {
-  it('returns defaults when no legacy settings are customized', () => {
-    const settings = createMockSettings({
-      ui: { footer: { hideContextPercentage: true } },
-    }).merged;
-    const items = deriveItemsFromLegacySettings(settings);
-    expect(items).toEqual([
-      'workspace',
-      'git-branch',
-      'sandbox',
-      'model-name',
-      'quota',
-    ]);
-  });
+describe('footerItems', () => {
+  describe('deriveItemsFromLegacySettings', () => {
+    it('returns defaults when no legacy settings are customized', () => {
+      const settings = createMockSettings({
+        ui: { footer: { hideContextPercentage: true } },
+      }).merged;
+      const items = deriveItemsFromLegacySettings(settings);
+      expect(items).toEqual([
+        'workspace',
+        'git-branch',
+        'sandbox',
+        'model-name',
+        'quota',
+      ]);
+    });
 
-  it('removes workspace when hideCWD is true', () => {
-    const settings = createMockSettings({
-      ui: { footer: { hideCWD: true, hideContextPercentage: true } },
-    }).merged;
-    const items = deriveItemsFromLegacySettings(settings);
-    expect(items).not.toContain('workspace');
-  });
+    it('removes workspace when hideCWD is true', () => {
+      const settings = createMockSettings({
+        ui: { footer: { hideCWD: true, hideContextPercentage: true } },
+      }).merged;
+      const items = deriveItemsFromLegacySettings(settings);
+      expect(items).not.toContain('workspace');
+    });
 
-  it('removes sandbox when hideSandboxStatus is true', () => {
-    const settings = createMockSettings({
-      ui: { footer: { hideSandboxStatus: true, hideContextPercentage: true } },
-    }).merged;
-    const items = deriveItemsFromLegacySettings(settings);
-    expect(items).not.toContain('sandbox');
-  });
-
-  it('removes model-name, context-used, and quota when hideModelInfo is true', () => {
-    const settings = createMockSettings({
-      ui: { footer: { hideModelInfo: true, hideContextPercentage: true } },
-    }).merged;
-    const items = deriveItemsFromLegacySettings(settings);
-    expect(items).not.toContain('model-name');
-    expect(items).not.toContain('context-used');
-    expect(items).not.toContain('quota');
-  });
-
-  it('includes context-used when hideContextPercentage is false', () => {
-    const settings = createMockSettings({
-      ui: { footer: { hideContextPercentage: false } },
-    }).merged;
-    const items = deriveItemsFromLegacySettings(settings);
-    expect(items).toContain('context-used');
-    // Should be after model-name
-    const modelIdx = items.indexOf('model-name');
-    const contextIdx = items.indexOf('context-used');
-    expect(contextIdx).toBe(modelIdx + 1);
-  });
-
-  it('includes memory-usage when showMemoryUsage is true', () => {
-    const settings = createMockSettings({
-      ui: { showMemoryUsage: true, footer: { hideContextPercentage: true } },
-    }).merged;
-    const items = deriveItemsFromLegacySettings(settings);
-    expect(items).toContain('memory-usage');
-  });
-
-  it('handles combination of settings', () => {
-    const settings = createMockSettings({
-      ui: {
-        showMemoryUsage: true,
-        footer: {
-          hideCWD: true,
-          hideModelInfo: true,
-          hideContextPercentage: false,
+    it('removes sandbox when hideSandboxStatus is true', () => {
+      const settings = createMockSettings({
+        ui: {
+          footer: { hideSandboxStatus: true, hideContextPercentage: true },
         },
-      },
-    }).merged;
-    const items = deriveItemsFromLegacySettings(settings);
-    expect(items).toEqual([
-      'git-branch',
-      'sandbox',
-      'context-used',
-      'memory-usage',
-    ]);
+      }).merged;
+      const items = deriveItemsFromLegacySettings(settings);
+      expect(items).not.toContain('sandbox');
+    });
+
+    it('removes model-name, context-used, and quota when hideModelInfo is true', () => {
+      const settings = createMockSettings({
+        ui: { footer: { hideModelInfo: true, hideContextPercentage: true } },
+      }).merged;
+      const items = deriveItemsFromLegacySettings(settings);
+      expect(items).not.toContain('model-name');
+      expect(items).not.toContain('context-used');
+      expect(items).not.toContain('quota');
+    });
+
+    it('includes context-used when hideContextPercentage is false', () => {
+      const settings = createMockSettings({
+        ui: { footer: { hideContextPercentage: false } },
+      }).merged;
+      const items = deriveItemsFromLegacySettings(settings);
+      expect(items).toContain('context-used');
+      // Should be after model-name
+      const modelIdx = items.indexOf('model-name');
+      const contextIdx = items.indexOf('context-used');
+      expect(contextIdx).toBe(modelIdx + 1);
+    });
+
+    it('includes memory-usage when showMemoryUsage is true', () => {
+      const settings = createMockSettings({
+        ui: { showMemoryUsage: true, footer: { hideContextPercentage: true } },
+      }).merged;
+      const items = deriveItemsFromLegacySettings(settings);
+      expect(items).toContain('memory-usage');
+    });
+
+    it('handles combination of settings', () => {
+      const settings = createMockSettings({
+        ui: {
+          showMemoryUsage: true,
+          footer: {
+            hideCWD: true,
+            hideModelInfo: true,
+            hideContextPercentage: false,
+          },
+        },
+      }).merged;
+      const items = deriveItemsFromLegacySettings(settings);
+      expect(items).toEqual([
+        'git-branch',
+        'sandbox',
+        'context-used',
+        'memory-usage',
+      ]);
+    });
+  });
+
+  describe('resolveFooterState', () => {
+    it('filters out auth item when showUserIdentity is false', () => {
+      const settings = createMockSettings({
+        ui: {
+          showUserIdentity: false,
+          footer: {
+            items: ['workspace', 'auth', 'model-name'],
+          },
+        },
+      }).merged;
+
+      const state = resolveFooterState(settings);
+      expect(state.orderedIds).not.toContain('auth');
+      expect(state.selectedIds.has('auth')).toBe(false);
+      // It should also not be in the 'others' part of orderedIds
+      expect(state.orderedIds).toEqual([
+        'workspace',
+        'model-name',
+        'git-branch',
+        'sandbox',
+        'context-used',
+        'quota',
+        'memory-usage',
+        'session-id',
+        'code-changes',
+        'token-count',
+      ]);
+    });
+
+    it('includes auth item when showUserIdentity is true', () => {
+      const settings = createMockSettings({
+        ui: {
+          showUserIdentity: true,
+          footer: {
+            items: ['workspace', 'auth', 'model-name'],
+          },
+        },
+      }).merged;
+
+      const state = resolveFooterState(settings);
+      expect(state.orderedIds).toContain('auth');
+      expect(state.selectedIds.has('auth')).toBe(true);
+    });
+
+    it('includes auth item by default when showUserIdentity is undefined (defaults to true)', () => {
+      const settings = createMockSettings({
+        ui: {
+          footer: {
+            items: ['workspace', 'auth', 'model-name'],
+          },
+        },
+      }).merged;
+
+      const state = resolveFooterState(settings);
+      expect(state.orderedIds).toContain('auth');
+      expect(state.selectedIds.has('auth')).toBe(true);
+    });
   });
 });

packages/cli/src/config/footerItems.ts

@@ -47,6 +47,11 @@ export const ALL_ITEMS = [
     header: 'session',
     description: 'Unique identifier for the current session',
   },
+  {
+    id: 'auth',
+    header: '/auth',
+    description: 'Current authentication info',
+  },
   {
     id: 'code-changes',
     header: 'diff',
@@ -70,6 +75,7 @@ export const DEFAULT_ORDER = [
   'quota',
   'memory-usage',
   'session-id',
+  'auth',
   'code-changes',
   'token-count',
 ];
@@ -121,10 +127,19 @@ export function resolveFooterState(settings: MergedSettings): {
   orderedIds: string[];
   selectedIds: Set<string>;
 } {
+  const showUserIdentity = settings.ui?.showUserIdentity !== false;
+  const filteredValidIds = showUserIdentity
+    ? VALID_IDS
+    : new Set([...VALID_IDS].filter((id) => id !== 'auth'));
+
   const source = (
     settings.ui?.footer?.items ?? deriveItemsFromLegacySettings(settings)
-  ).filter((id: string) => VALID_IDS.has(id));
-  const others = DEFAULT_ORDER.filter((id) => !source.includes(id));
+  ).filter((id: string) => filteredValidIds.has(id));
+
+  const others = DEFAULT_ORDER.filter(
+    (id) => !source.includes(id) && filteredValidIds.has(id),
+  );
+
   return {
     orderedIds: [...source, ...others],
     selectedIds: new Set(source),

packages/cli/src/config/settings.ts

@@ -1124,15 +1124,15 @@ function migrateExperimentalSettings(
     };
     let modified = false;
 
-    const migrateExperimental = (
+    const migrateExperimental = <T = Record<string, unknown>>(
       oldKey: string,
-      migrateFn: (oldValue: Record<string, unknown>) => void,
+      migrateFn: (oldValue: T) => void,
     ) => {
       const old = experimentalSettings[oldKey];
-      if (old) {
+      if (old !== undefined) {
         foundDeprecated?.push(`experimental.${oldKey}`);
         // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-        migrateFn(old as Record<string, unknown>);
+        migrateFn(old as T);
         modified = true;
       }
     };
@@ -1197,6 +1197,24 @@ function migrateExperimentalSettings(
       agentsOverrides['cli_help'] = override;
     });
 
+    // Migrate experimental.plan -> general.plan.enabled
+    migrateExperimental<boolean>('plan', (planValue) => {
+      const generalSettings =
+        (settings.general as Record<string, unknown> | undefined) || {};
+      const newGeneral = { ...generalSettings };
+      const planSettings =
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+        (newGeneral['plan'] as Record<string, unknown> | undefined) || {};
+      const newPlan = { ...planSettings };
+
+      if (newPlan['enabled'] === undefined) {
+        newPlan['enabled'] = planValue;
+        newGeneral['plan'] = newPlan;
+        loadedSettings.setValue(scope, 'general', newGeneral);
+        modified = true;
+      }
+    });
+
     if (modified) {
       agentsSettings['overrides'] = agentsOverrides;
       loadedSettings.setValue(scope, 'agents', agentsSettings);
@@ -1205,6 +1223,7 @@ function migrateExperimentalSettings(
         const newExperimental = { ...experimentalSettings };
         delete newExperimental['codebaseInvestigatorSettings'];
         delete newExperimental['cliHelpAgentSettings'];
+        delete newExperimental['plan'];
         loadedSettings.setValue(scope, 'experimental', newExperimental);
       }
       return true;

packages/cli/src/config/settingsSchema.test.ts

@@ -418,14 +418,17 @@ describe('SettingsSchema', () => {
     });
 
     it('should have plan setting in schema', () => {
-      const setting = getSettingsSchema().experimental.properties.plan;
+      const setting =
+        getSettingsSchema().general.properties.plan.properties.enabled;
       expect(setting).toBeDefined();
       expect(setting.type).toBe('boolean');
-      expect(setting.category).toBe('Experimental');
+      expect(setting.category).toBe('General');
       expect(setting.default).toBe(true);
       expect(setting.requiresRestart).toBe(true);
       expect(setting.showInDialog).toBe(true);
-      expect(setting.description).toBe('Enable Plan Mode.');
+      expect(setting.description).toBe(
+        'Enable Plan Mode for read-only safety during planning.',
+      );
     });
 
     it('should have hooksConfig.notifications setting in schema', () => {

packages/cli/src/config/settingsSchema.ts

@@ -293,6 +293,16 @@ const SETTINGS_SCHEMA = {
         description: 'Planning features configuration.',
         showInDialog: false,
         properties: {
+          enabled: {
+            type: 'boolean',
+            label: 'Enable Plan Mode',
+            category: 'General',
+            requiresRestart: true,
+            default: true,
+            description:
+              'Enable Plan Mode for read-only safety during planning.',
+            showInDialog: true,
+          },
           directory: {
             type: 'string',
             label: 'Plan Directory',
@@ -2046,7 +2056,7 @@ const SETTINGS_SCHEMA = {
         label: 'JIT Context Loading',
         category: 'Experimental',
         requiresRestart: true,
-        default: true,
+        default: false,
         description: 'Enable Just-In-Time (JIT) context loading.',
         showInDialog: false,
       },
@@ -2070,15 +2080,6 @@ const SETTINGS_SCHEMA = {
           'Use OSC 52 for copying. This may be more robust than the default system when using remote terminal sessions (if your terminal is configured to allow it).',
         showInDialog: true,
       },
-      plan: {
-        type: 'boolean',
-        label: 'Plan',
-        category: 'Experimental',
-        requiresRestart: true,
-        default: true,
-        description: 'Enable Plan Mode.',
-        showInDialog: true,
-      },
       taskTracker: {
         type: 'boolean',
         label: 'Task Tracker',

packages/cli/src/test-utils/AppRig.tsx

@@ -705,6 +705,10 @@ export class AppRig {
     return stripAnsi(this.renderResult.stdout.lastFrame() || '');
   }
 
+  generateSvg(): string {
+    return this.renderResult?.generateSvg() ?? '';
+  }
+
   async waitForOutput(pattern: string | RegExp, timeout = 30000) {
     await this.waitUntil(
       () => {
@@ -720,6 +724,58 @@ export class AppRig {
     );
   }
 
+  async waitForComponent(componentName: string, timeout = 30000) {
+    await this.waitUntil(
+      () => {
+        const rootNode = this.renderResult?.rootNode;
+        if (!rootNode) return false;
+
+        type TestableDOMNode = import('ink').DOMNode & {
+          internal_componentName?: string;
+          internal_testId?: string;
+          attributes?: {
+            internal_componentName?: string;
+            internal_testId?: string;
+          };
+          style?: {
+            internal_componentName?: string;
+            internal_testId?: string;
+          };
+        };
+
+        const find = (node: TestableDOMNode): boolean => {
+          if (
+            node.internal_componentName === componentName ||
+            node.internal_testId === componentName ||
+            node.attributes?.internal_testId === componentName ||
+            node.attributes?.internal_componentName === componentName ||
+            node.style?.internal_testId === componentName ||
+            node.style?.internal_componentName === componentName
+          ) {
+            return true;
+          }
+          if ('childNodes' in node && node.childNodes) {
+            for (const child of node.childNodes) {
+              if (
+                child.nodeName !== '#text' &&
+                find(child as TestableDOMNode)
+              ) {
+                return true;
+              }
+            }
+          }
+          return false;
+        };
+
+        return find(rootNode as TestableDOMNode);
+      },
+      {
+        timeout,
+        message: `Timed out waiting for component: ${componentName}\nLast frame:\n${this.lastFrame}`,
+      },
+    );
+  }
+
   async waitForIdle(timeout = 20000) {
     await this.waitForOutput('Type your message', timeout);
   }

packages/cli/src/test-utils/customMatchers.ts

@@ -10,11 +10,87 @@ import { expect, type Assertion } from 'vitest';
 import path from 'node:path';
 import stripAnsi from 'strip-ansi';
 import type { TextBuffer } from '../ui/components/shared/text-buffer.js';
+import { type DOMElement as _DOMElement, type DOMNode } from 'ink';
+
+export interface CustomMatchers<R = unknown> {
+  toMatchSvgSnapshot(options?: {
+    allowEmpty?: boolean;
+    name?: string;
+  }): Promise<R>;
+  toContainComponent(componentName: string): R;
+  toHaveOnlyValidCharacters(): R;
+}
 
 // RegExp to detect invalid characters: backspace, and ANSI escape codes
 // eslint-disable-next-line no-control-regex
 const invalidCharsRegex = /[\b\x1b]/;
 
+type TestableDOMNode = DOMNode & {
+  internal_componentName?: string;
+  internal_testId?: string;
+  attributes?: {
+    internal_componentName?: string;
+    internal_testId?: string;
+  };
+  style?: {
+    internal_componentName?: string;
+    internal_testId?: string;
+  };
+};
+
+/**
+ * Traverses the Ink tree to find a node matching a predicate.
+ */
+function findInTree(
+  node: TestableDOMNode,
+  predicate: (node: TestableDOMNode) => boolean,
+): TestableDOMNode | undefined {
+  if (predicate(node)) return node;
+  if ('childNodes' in node && node.childNodes) {
+    for (const child of node.childNodes) {
+      const found = findInTree(child as TestableDOMNode, predicate);
+      if (found) return found;
+    }
+  }
+  return undefined;
+}
+
+/**
+ * Checks if the Ink DOM tree contains a specific component by name or testId.
+ */
+export function toContainComponent(
+  this: Assertion,
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  received: any,
+  componentName: string,
+) {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const { isNot } = this as any;
+
+  const rootNode = received.rootNode || received.renderResult?.rootNode;
+
+  // Check logical tree presence (Automatic via Ink Root)
+  const pass = rootNode
+    ? !!findInTree(rootNode as TestableDOMNode, (node) => {
+        if (node.nodeName === '#text') return false;
+        const match =
+          node.internal_componentName === componentName ||
+          node.internal_testId === componentName ||
+          node.attributes?.internal_componentName === componentName ||
+          node.attributes?.internal_testId === componentName ||
+          node.style?.internal_componentName === componentName ||
+          node.style?.internal_testId === componentName;
+        return match;
+      })
+    : false;
+
+  return {
+    pass,
+    message: () =>
+      `Expected component "${componentName}" ${isNot ? 'NOT ' : ''}to be present in the Ink tree.`,
+  };
+}
+
 const callCountByTest = new Map<string, number>();
 
 export async function toMatchSvgSnapshot(
@@ -37,11 +113,17 @@ export async function toMatchSvgSnapshot(
 
   let textContent: string;
   if (renderInstance.lastFrameRaw) {
-    textContent = renderInstance.lastFrameRaw({
-      allowEmpty: options?.allowEmpty,
-    });
+    textContent =
+      typeof renderInstance.lastFrameRaw === 'function'
+        ? renderInstance.lastFrameRaw({
+            allowEmpty: options?.allowEmpty,
+          })
+        : renderInstance.lastFrameRaw;
   } else if (renderInstance.lastFrame) {
-    textContent = renderInstance.lastFrame({ allowEmpty: options?.allowEmpty });
+    textContent =
+      typeof renderInstance.lastFrame === 'function'
+        ? renderInstance.lastFrame({ allowEmpty: options?.allowEmpty })
+        : renderInstance.lastFrame;
   } else {
     throw new Error(
       'toMatchSvgSnapshot requires a renderInstance with either lastFrameRaw or lastFrame',
@@ -101,7 +183,7 @@ function toHaveOnlyValidCharacters(this: Assertion, buffer: TextBuffer) {
     pass,
     message: () =>
       `Expected buffer ${isNot ? 'not ' : ''}to have only valid characters, but found invalid characters in lines:\n${invalidLines
-        .map((l) => `  [${l.line}]: "${l.content}"`) /* This line was changed */
+        .map((l) => `  [${l.line}]: "${l.content}"`)
         .join('\n')}`,
     actual: buffer.lines,
     expected: 'Lines with no line breaks, backspaces, or escape codes.',
@@ -111,6 +193,7 @@ function toHaveOnlyValidCharacters(this: Assertion, buffer: TextBuffer) {
 expect.extend({
   toHaveOnlyValidCharacters,
   toMatchSvgSnapshot,
+  toContainComponent,
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
 } as any);
 
@@ -127,5 +210,6 @@ declare module 'vitest' {
       allowEmpty?: boolean;
       name?: string;
     }): Promise<void>;
+    toContainComponent(componentName: string): T;
   }
 }

packages/cli/src/test-utils/render.tsx

@@ -8,6 +8,7 @@ import {
   render as inkRenderDirect,
   type Instance as InkInstance,
   type RenderOptions,
+  type DOMElement,
 } from 'ink';
 import { EventEmitter } from 'node:events';
 import { Box } from 'ink';
@@ -374,6 +375,7 @@ export type RenderInstance = {
   waitUntilReady: () => Promise<void>;
   capturedOverflowState: OverflowState | undefined;
   capturedOverflowActions: OverflowActions | undefined;
+  rootNode: DOMElement;
 };
 
 export type RenderWithProvidersInstance = RenderInstance & {
@@ -464,8 +466,13 @@ export const render = async (
     lastFrameRaw: stdout.lastFrameRaw,
     generateSvg: stdout.generateSvg,
     terminal: state.terminal,
+    get rootNode() {
+      return (instance as InkInstance & { rootNode: DOMElement }).rootNode;
+    },
     waitUntilReady: () => stdout.waitUntilReady(),
-  };
+    capturedOverflowState: undefined,
+    capturedOverflowActions: undefined,
+  } as RenderInstance;
 };
 
 export const cleanup = () => {

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

@@ -8,7 +8,11 @@ import { describe, it, expect, vi, afterEach, beforeEach } from 'vitest';
 import { renderWithProviders } from '../../test-utils/render.js';
 import { Footer } from './Footer.js';
 import { createMockSettings } from '../../test-utils/settings.js';
-import { type Config } from '@google/gemini-cli-core';
+import {
+  type Config,
+  UserAccountManager,
+  AuthType,
+} from '@google/gemini-cli-core';
 import path from 'node:path';
 
 // Normalize paths to POSIX slashes for stable cross-platform snapshots.
@@ -69,14 +73,17 @@ const defaultProps = {
   branchName: 'main',
 };
 
-const mockConfig = {
+const mockConfigPlain = {
   getTargetDir: () => defaultProps.targetDir,
   getDebugMode: () => false,
   getModel: () => defaultProps.model,
   getIdeMode: () => false,
   isTrustedFolder: () => true,
   getExtensionRegistryURI: () => undefined,
-} as unknown as Config;
+  getContentGeneratorConfig: () => ({ authType: undefined }),
+};
+
+const mockConfig = mockConfigPlain as unknown as Config;
 
 const mockSessionStats = {
   sessionId: 'test-session-id',
@@ -434,6 +441,7 @@ describe('<Footer />', () => {
 
     it('renders footer with all optional sections hidden (minimal footer)', async () => {
       const { lastFrame, unmount } = await renderWithProviders(<Footer />, {
+        config: mockConfig,
         width: 120,
         uiState: { sessionStats: mockSessionStats },
         settings: createMockSettings({
@@ -551,6 +559,7 @@ describe('<Footer />', () => {
   describe('Footer Token Formatting', () => {
     const renderWithTokens = async (tokens: number) => {
       const result = await renderWithProviders(<Footer />, {
+        config: mockConfig,
         width: 120,
         uiState: {
           sessionStats: {
@@ -675,6 +684,75 @@ describe('<Footer />', () => {
   });
 
   describe('Footer Custom Items', () => {
+    it('renders auth item with email', async () => {
+      const authConfig = {
+        ...mockConfigPlain,
+        getContentGeneratorConfig: () => ({
+          authType: AuthType.LOGIN_WITH_GOOGLE,
+        }),
+      } as unknown as Config;
+      const getCachedAccountSpy = vi
+        .spyOn(UserAccountManager.prototype, 'getCachedGoogleAccount')
+        .mockReturnValue('test@example.com');
+
+      const { lastFrame, unmount } = await renderWithProviders(<Footer />, {
+        config: authConfig,
+        width: 120,
+        uiState: {
+          currentModel: 'gemini-pro',
+          sessionStats: mockSessionStats,
+        },
+        settings: createMockSettings({
+          ui: {
+            footer: {
+              items: ['auth'],
+            },
+          },
+        }),
+      });
+
+      expect(lastFrame()).toContain('auth');
+      expect(lastFrame()).toContain('test@example.com');
+      unmount();
+      getCachedAccountSpy.mockRestore();
+    });
+
+    it('does NOT render auth item when showUserIdentity is false', async () => {
+      const authConfig = {
+        ...mockConfigPlain,
+        getContentGeneratorConfig: () => ({
+          authType: AuthType.LOGIN_WITH_GOOGLE,
+        }),
+      } as unknown as Config;
+      const getCachedAccountSpy = vi
+        .spyOn(UserAccountManager.prototype, 'getCachedGoogleAccount')
+        .mockReturnValue('test@example.com');
+
+      const { lastFrame, unmount } = await renderWithProviders(<Footer />, {
+        config: authConfig,
+        width: 120,
+        uiState: {
+          currentModel: 'gemini-pro',
+          sessionStats: mockSessionStats,
+        },
+        settings: createMockSettings({
+          ui: {
+            showUserIdentity: false,
+            footer: {
+              items: ['workspace', 'auth'],
+            },
+          },
+        }),
+      });
+
+      const output = lastFrame();
+      expect(output).toContain('workspace');
+      expect(output).not.toContain('auth');
+      expect(output).not.toContain('test@example.com');
+      unmount();
+      getCachedAccountSpy.mockRestore();
+    });
+
     it('renders items in the specified order', async () => {
       const { lastFrame, unmount } = await renderWithProviders(<Footer />, {
         config: mockConfig,
@@ -734,6 +812,7 @@ describe('<Footer />', () => {
 
     it('handles empty items array', async () => {
       const { lastFrame, unmount } = await renderWithProviders(<Footer />, {
+        config: mockConfig,
         width: 120,
         uiState: { sessionStats: mockSessionStats },
         settings: createMockSettings({

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

@@ -5,6 +5,7 @@
  */
 
 import type React from 'react';
+import { useState, useEffect } from 'react';
 import { Box, Text } from 'ink';
 import { theme } from '../semantic-colors.js';
 import {
@@ -12,6 +13,8 @@ import {
   tildeifyPath,
   getDisplayString,
   checkExhaustive,
+  AuthType,
+  UserAccountManager,
 } from '@google/gemini-cli-core';
 import { ConsoleSummaryDisplay } from './ConsoleSummaryDisplay.js';
 import process from 'node:process';
@@ -183,6 +186,18 @@ export const Footer: React.FC<{ copyModeEnabled?: boolean }> = ({
   const settings = useSettings();
   const { vimEnabled, vimMode } = useVimMode();
 
+  const authType = config.getContentGeneratorConfig()?.authType;
+  const [email, setEmail] = useState<string | undefined>();
+
+  useEffect(() => {
+    if (authType) {
+      const userAccountManager = new UserAccountManager();
+      setEmail(userAccountManager.getCachedGoogleAccount() ?? undefined);
+    } else {
+      setEmail(undefined);
+    }
+  }, [authType]);
+
   if (copyModeEnabled) {
     return <Box height={1} />;
   }
@@ -221,6 +236,7 @@ export const Footer: React.FC<{ copyModeEnabled?: boolean }> = ({
     errorCount > 0 &&
     (isFullErrorVerbosity || debugMode || isDevelopment);
   const displayVimMode = vimEnabled ? vimMode : undefined;
+
   const items =
     settings.merged.ui.footer.items ??
     deriveItemsFromLegacySettings(settings.merged);
@@ -385,6 +401,25 @@ export const Footer: React.FC<{ copyModeEnabled?: boolean }> = ({
         );
         break;
       }
+      case 'auth': {
+        if (!settings.merged.ui.showUserIdentity) break;
+        if (!authType) break;
+        const displayStr =
+          authType === AuthType.LOGIN_WITH_GOOGLE
+            ? (email ?? 'google')
+            : authType;
+        addCol(
+          id,
+          header,
+          () => (
+            <Text color={itemColor} wrap="truncate-end">
+              {displayStr}
+            </Text>
+          ),
+          displayStr.length,
+        );
+        break;
+      }
       case 'code-changes': {
         const added = uiState.sessionStats.metrics.files.totalLinesAdded;
         const removed = uiState.sessionStats.metrics.files.totalLinesRemoved;

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

@@ -116,7 +116,7 @@ describe('<FooterConfigDialog />', () => {
     expect(lastFrame()).toContain('~/project/path');
 
     // Move focus down to 'code-changes' (which has colored elements)
-    for (let i = 0; i < 8; i++) {
+    for (let i = 0; i < 9; i++) {
       act(() => {
         stdin.write('\u001b[B'); // Down arrow
       });

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

@@ -255,6 +255,7 @@ export const FooterConfigDialog: React.FC<FooterConfigDialogProps> = ({
           <Text color={getColor('code-changes', theme.status.error)}>-4</Text>
         </Box>
       ),
+      auth: <Text color={getColor('auth', itemColor)}>test@example.com</Text>,
       'token-count': (
         <Text color={getColor('token-count', itemColor)}>1.5k tokens</Text>
       ),

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

@@ -80,7 +80,13 @@ export function SuggestionsDisplay({
     mode === 'slash' ? Math.min(maxLabelLength, Math.floor(width * 0.5)) : 0;
 
   return (
-    <Box flexDirection="column" paddingX={1} width={width}>
+    <Box
+      flexDirection="column"
+      paddingX={1}
+      width={width}
+      // @ts-expect-error - internal_testId is used for testing component presence
+      internal_testId={SuggestionsDisplay.name}
+    >
       {scrollOffset > 0 && <Text color={theme.text.primary}>▲</Text>}
 
       {visibleSuggestions.map((suggestion, index) => {

packages/cli/src/ui/components/SuggestionsDisplay.ux.test.tsx

@@ -0,0 +1,58 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { AppRig } from '../../test-utils/AppRig.js';
+import { SuggestionsDisplay } from './SuggestionsDisplay.js';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+describe('SuggestionsDisplay UX Journey', () => {
+  let rig: AppRig;
+
+  beforeEach(async () => {
+    const fakeResponsesPath = path.join(
+      __dirname,
+      '..',
+      '..',
+      'test-utils',
+      'fixtures',
+      'simple.responses',
+    );
+    rig = new AppRig({ fakeResponsesPath });
+    await rig.initialize();
+    await rig.render();
+    await rig.waitForIdle();
+    // Allow async command loading to settle
+    await new Promise((resolve) => setTimeout(resolve, 500));
+  });
+
+  afterEach(async () => {
+    await rig.unmount();
+  });
+
+  it('should visually show the suggestions display when / is typed', async () => {
+    // Initially should not have suggestions
+    expect(rig).not.toContainComponent(SuggestionsDisplay.name);
+
+    // Type '/' to trigger suggestions
+    await rig.type('/');
+
+    // Wait for SuggestionsDisplay to appear (Automatic lookup!)
+    await rig.waitForComponent(SuggestionsDisplay.name);
+
+    // Assert that the component is now present in the tree
+    expect(rig).toContainComponent(SuggestionsDisplay.name);
+
+    // Also verify text for sanity
+    expect(rig.lastFrame).toContain('about');
+
+    // Capture the state for manual inspection if needed
+    await expect(rig).toMatchSvgSnapshot({ name: 'suggestions-opened' });
+  });
+});

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

@@ -5,7 +5,7 @@
  */
 
 import type React from 'react';
-import { useMemo } from 'react';
+import { useMemo, useState, useEffect } from 'react';
 import { Box, Text } from 'ink';
 import { theme } from '../semantic-colors.js';
 import {
@@ -21,12 +21,15 @@ interface UserIdentityProps {
 
 export const UserIdentity: React.FC<UserIdentityProps> = ({ config }) => {
   const authType = config.getContentGeneratorConfig()?.authType;
-  const email = useMemo(() => {
+  const [email, setEmail] = useState<string | undefined>();
+
+  useEffect(() => {
     if (authType) {
       const userAccountManager = new UserAccountManager();
-      return userAccountManager.getCachedGoogleAccount() ?? undefined;
+      setEmail(userAccountManager.getCachedGoogleAccount() ?? undefined);
+    } else {
+      setEmail(undefined);
     }
-    return undefined;
   }, [authType]);
 
   const tierName = useMemo(

packages/cli/src/ui/components/__snapshots__/FooterConfigDialog--FooterConfigDialog-highlights-the-active-item-in-the-preview.snap.svg

@@ -1,8 +1,8 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="920" height="700" viewBox="0 0 920 700">
+<svg xmlns="http://www.w3.org/2000/svg" width="920" height="734" viewBox="0 0 920 734">
   <style>
     text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
   </style>
-  <rect width="920" height="700" fill="#000000" />
+  <rect width="920" height="734" fill="#000000" />
   <g transform="translate(10, 10)">
     <text x="0" y="2" fill="#333333" textLength="900" lengthAdjust="spacingAndGlyphs">╭──────────────────────────────────────────────────────────────────────────────────────────────────╮</text>
     <text x="0" y="19" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
@@ -74,85 +74,92 @@
     <text x="45" y="359" fill="#afafaf" textLength="378" lengthAdjust="spacingAndGlyphs"> Unique identifier for the current session</text>
     <text x="891" y="359" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="376" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <rect x="27" y="374" width="9" height="17" fill="#001a00" />
-    <text x="27" y="376" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">&gt;</text>
-    <rect x="36" y="374" width="9" height="17" fill="#001a00" />
-    <rect x="45" y="374" width="27" height="17" fill="#001a00" />
-    <text x="45" y="376" fill="#d7ffd7" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
-    <rect x="72" y="374" width="117" height="17" fill="#001a00" />
-    <text x="72" y="376" fill="#00cd00" textLength="117" lengthAdjust="spacingAndGlyphs"> code-changes</text>
-    <rect x="189" y="374" width="684" height="17" fill="#001a00" />
+    <text x="45" y="376" fill="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
+    <text x="72" y="376" fill="#ffffff" textLength="45" lengthAdjust="spacingAndGlyphs"> auth</text>
     <text x="891" y="376" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="393" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <rect x="27" y="391" width="18" height="17" fill="#001a00" />
-    <rect x="45" y="391" width="513" height="17" fill="#001a00" />
-    <text x="45" y="393" fill="#afafaf" textLength="513" lengthAdjust="spacingAndGlyphs"> Lines added/removed in the session (not shown when zero)</text>
-    <rect x="558" y="391" width="315" height="17" fill="#001a00" />
+    <text x="45" y="393" fill="#afafaf" textLength="252" lengthAdjust="spacingAndGlyphs"> Current authentication info</text>
     <text x="891" y="393" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="410" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="410" fill="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
-    <text x="72" y="410" fill="#ffffff" textLength="108" lengthAdjust="spacingAndGlyphs"> token-count</text>
+    <rect x="27" y="408" width="9" height="17" fill="#001a00" />
+    <text x="27" y="410" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">&gt;</text>
+    <rect x="36" y="408" width="9" height="17" fill="#001a00" />
+    <rect x="45" y="408" width="27" height="17" fill="#001a00" />
+    <text x="45" y="410" fill="#d7ffd7" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
+    <rect x="72" y="408" width="117" height="17" fill="#001a00" />
+    <text x="72" y="410" fill="#00cd00" textLength="117" lengthAdjust="spacingAndGlyphs"> code-changes</text>
+    <rect x="189" y="408" width="684" height="17" fill="#001a00" />
     <text x="891" y="410" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="427" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="427" fill="#afafaf" textLength="495" lengthAdjust="spacingAndGlyphs"> Total tokens used in the session (not shown when zero)</text>
+    <rect x="27" y="425" width="18" height="17" fill="#001a00" />
+    <rect x="45" y="425" width="513" height="17" fill="#001a00" />
+    <text x="45" y="427" fill="#afafaf" textLength="513" lengthAdjust="spacingAndGlyphs"> Lines added/removed in the session (not shown when zero)</text>
+    <rect x="558" y="425" width="315" height="17" fill="#001a00" />
     <text x="891" y="427" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="444" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="444" fill="#d7ffd7" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
-    <text x="72" y="444" fill="#ffffff" textLength="171" lengthAdjust="spacingAndGlyphs"> Show footer labels</text>
+    <text x="45" y="444" fill="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
+    <text x="72" y="444" fill="#ffffff" textLength="108" lengthAdjust="spacingAndGlyphs"> token-count</text>
     <text x="891" y="444" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="461" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="461" fill="#afafaf" textLength="495" lengthAdjust="spacingAndGlyphs"> Total tokens used in the session (not shown when zero)</text>
     <text x="891" y="461" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="478" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="478" fill="#ffffff" textLength="207" lengthAdjust="spacingAndGlyphs">Reset to default footer</text>
+    <text x="45" y="478" fill="#d7ffd7" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
+    <text x="72" y="478" fill="#ffffff" textLength="171" lengthAdjust="spacingAndGlyphs"> Show footer labels</text>
     <text x="891" y="478" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="495" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="495" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="512" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="512" fill="#ffffff" textLength="207" lengthAdjust="spacingAndGlyphs">Reset to default footer</text>
     <text x="891" y="512" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="529" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="27" y="529" fill="#afafaf" textLength="585" lengthAdjust="spacingAndGlyphs">Enter to select · ↑/↓ to navigate · ←/→ to reorder · Esc to close</text>
     <text x="891" y="529" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="546" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="546" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="563" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="27" y="563" fill="#333333" textLength="846" lengthAdjust="spacingAndGlyphs">┌────────────────────────────────────────────────────────────────────────────────────────────┐</text>
+    <text x="27" y="563" fill="#afafaf" textLength="585" lengthAdjust="spacingAndGlyphs">Enter to select · ↑/↓ to navigate · ←/→ to reorder · Esc to close</text>
     <text x="891" y="563" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="580" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="27" y="580" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="580" fill="#ffffff" textLength="72" lengthAdjust="spacingAndGlyphs" font-weight="bold">Preview:</text>
-    <text x="864" y="580" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="580" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="597" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="27" y="597" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="597" fill="#afafaf" textLength="198" lengthAdjust="spacingAndGlyphs">workspace (/directory)</text>
-    <text x="297" y="597" fill="#afafaf" textLength="54" lengthAdjust="spacingAndGlyphs">branch</text>
-    <text x="405" y="597" fill="#afafaf" textLength="63" lengthAdjust="spacingAndGlyphs">sandbox</text>
-    <text x="513" y="597" fill="#afafaf" textLength="54" lengthAdjust="spacingAndGlyphs">/model</text>
-    <text x="693" y="597" fill="#afafaf" textLength="54" lengthAdjust="spacingAndGlyphs">/stats</text>
-    <rect x="801" y="595" width="36" height="17" fill="#001a00" />
-    <text x="801" y="597" fill="#ffffff" textLength="36" lengthAdjust="spacingAndGlyphs">diff</text>
-    <rect x="837" y="595" width="18" height="17" fill="#001a00" />
-    <text x="864" y="597" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="27" y="597" fill="#333333" textLength="846" lengthAdjust="spacingAndGlyphs">┌────────────────────────────────────────────────────────────────────────────────────────────┐</text>
     <text x="891" y="597" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="614" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="27" y="614" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="614" fill="#ffffff" textLength="126" lengthAdjust="spacingAndGlyphs">~/project/path</text>
-    <text x="297" y="614" fill="#ffffff" textLength="36" lengthAdjust="spacingAndGlyphs">main</text>
-    <text x="405" y="614" fill="#00cd00" textLength="54" lengthAdjust="spacingAndGlyphs">docker</text>
-    <text x="513" y="614" fill="#ffffff" textLength="126" lengthAdjust="spacingAndGlyphs">gemini-2.5-pro</text>
-    <text x="693" y="614" fill="#ffffff" textLength="27" lengthAdjust="spacingAndGlyphs">97%</text>
-    <rect x="801" y="612" width="27" height="17" fill="#001a00" />
-    <text x="801" y="614" fill="#d7ffd7" textLength="27" lengthAdjust="spacingAndGlyphs">+12</text>
-    <rect x="828" y="612" width="9" height="17" fill="#001a00" />
-    <rect x="837" y="612" width="18" height="17" fill="#001a00" />
-    <text x="837" y="614" fill="#ff87af" textLength="18" lengthAdjust="spacingAndGlyphs">-4</text>
+    <text x="45" y="614" fill="#ffffff" textLength="72" lengthAdjust="spacingAndGlyphs" font-weight="bold">Preview:</text>
     <text x="864" y="614" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="614" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="631" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="27" y="631" fill="#333333" textLength="846" lengthAdjust="spacingAndGlyphs">└────────────────────────────────────────────────────────────────────────────────────────────┘</text>
+    <text x="27" y="631" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="631" fill="#afafaf" textLength="198" lengthAdjust="spacingAndGlyphs">workspace (/directory)</text>
+    <text x="297" y="631" fill="#afafaf" textLength="54" lengthAdjust="spacingAndGlyphs">branch</text>
+    <text x="405" y="631" fill="#afafaf" textLength="63" lengthAdjust="spacingAndGlyphs">sandbox</text>
+    <text x="513" y="631" fill="#afafaf" textLength="54" lengthAdjust="spacingAndGlyphs">/model</text>
+    <text x="693" y="631" fill="#afafaf" textLength="54" lengthAdjust="spacingAndGlyphs">/stats</text>
+    <rect x="801" y="629" width="36" height="17" fill="#001a00" />
+    <text x="801" y="631" fill="#ffffff" textLength="36" lengthAdjust="spacingAndGlyphs">diff</text>
+    <rect x="837" y="629" width="18" height="17" fill="#001a00" />
+    <text x="864" y="631" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="631" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="648" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="27" y="648" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="648" fill="#ffffff" textLength="126" lengthAdjust="spacingAndGlyphs">~/project/path</text>
+    <text x="297" y="648" fill="#ffffff" textLength="36" lengthAdjust="spacingAndGlyphs">main</text>
+    <text x="405" y="648" fill="#00cd00" textLength="54" lengthAdjust="spacingAndGlyphs">docker</text>
+    <text x="513" y="648" fill="#ffffff" textLength="126" lengthAdjust="spacingAndGlyphs">gemini-2.5-pro</text>
+    <text x="693" y="648" fill="#ffffff" textLength="27" lengthAdjust="spacingAndGlyphs">97%</text>
+    <rect x="801" y="646" width="27" height="17" fill="#001a00" />
+    <text x="801" y="648" fill="#d7ffd7" textLength="27" lengthAdjust="spacingAndGlyphs">+12</text>
+    <rect x="828" y="646" width="9" height="17" fill="#001a00" />
+    <rect x="837" y="646" width="18" height="17" fill="#001a00" />
+    <text x="837" y="648" fill="#ff87af" textLength="18" lengthAdjust="spacingAndGlyphs">-4</text>
+    <text x="864" y="648" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="648" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="665" fill="#333333" textLength="900" lengthAdjust="spacingAndGlyphs">╰──────────────────────────────────────────────────────────────────────────────────────────────────╯</text>
+    <text x="0" y="665" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="27" y="665" fill="#333333" textLength="846" lengthAdjust="spacingAndGlyphs">└────────────────────────────────────────────────────────────────────────────────────────────┘</text>
+    <text x="891" y="665" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="682" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="891" y="682" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="699" fill="#333333" textLength="900" lengthAdjust="spacingAndGlyphs">╰──────────────────────────────────────────────────────────────────────────────────────────────────╯</text>
   </g>
 </svg>

packages/cli/src/ui/components/__snapshots__/FooterConfigDialog--FooterConfigDialog-renders-correctly-with-default-settings.snap.svg

@@ -1,8 +1,8 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="920" height="700" viewBox="0 0 920 700">
+<svg xmlns="http://www.w3.org/2000/svg" width="920" height="734" viewBox="0 0 920 734">
   <style>
     text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
   </style>
-  <rect width="920" height="700" fill="#000000" />
+  <rect width="920" height="734" fill="#000000" />
   <g transform="translate(10, 10)">
     <text x="0" y="2" fill="#333333" textLength="900" lengthAdjust="spacingAndGlyphs">╭──────────────────────────────────────────────────────────────────────────────────────────────────╮</text>
     <text x="0" y="19" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
@@ -84,70 +84,77 @@
     <text x="891" y="359" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="376" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="376" fill="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
-    <text x="72" y="376" fill="#ffffff" textLength="117" lengthAdjust="spacingAndGlyphs"> code-changes</text>
+    <text x="72" y="376" fill="#ffffff" textLength="45" lengthAdjust="spacingAndGlyphs"> auth</text>
     <text x="891" y="376" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="393" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="393" fill="#afafaf" textLength="513" lengthAdjust="spacingAndGlyphs"> Lines added/removed in the session (not shown when zero)</text>
+    <text x="45" y="393" fill="#afafaf" textLength="252" lengthAdjust="spacingAndGlyphs"> Current authentication info</text>
     <text x="891" y="393" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="410" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="410" fill="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
-    <text x="72" y="410" fill="#ffffff" textLength="108" lengthAdjust="spacingAndGlyphs"> token-count</text>
+    <text x="72" y="410" fill="#ffffff" textLength="117" lengthAdjust="spacingAndGlyphs"> code-changes</text>
     <text x="891" y="410" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="427" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="427" fill="#afafaf" textLength="495" lengthAdjust="spacingAndGlyphs"> Total tokens used in the session (not shown when zero)</text>
+    <text x="45" y="427" fill="#afafaf" textLength="513" lengthAdjust="spacingAndGlyphs"> Lines added/removed in the session (not shown when zero)</text>
     <text x="891" y="427" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="444" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="444" fill="#d7ffd7" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
-    <text x="72" y="444" fill="#ffffff" textLength="171" lengthAdjust="spacingAndGlyphs"> Show footer labels</text>
+    <text x="45" y="444" fill="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
+    <text x="72" y="444" fill="#ffffff" textLength="108" lengthAdjust="spacingAndGlyphs"> token-count</text>
     <text x="891" y="444" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="461" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="461" fill="#afafaf" textLength="495" lengthAdjust="spacingAndGlyphs"> Total tokens used in the session (not shown when zero)</text>
     <text x="891" y="461" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="478" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="478" fill="#ffffff" textLength="207" lengthAdjust="spacingAndGlyphs">Reset to default footer</text>
+    <text x="45" y="478" fill="#d7ffd7" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
+    <text x="72" y="478" fill="#ffffff" textLength="171" lengthAdjust="spacingAndGlyphs"> Show footer labels</text>
     <text x="891" y="478" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="495" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="495" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="512" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="512" fill="#ffffff" textLength="207" lengthAdjust="spacingAndGlyphs">Reset to default footer</text>
     <text x="891" y="512" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="529" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="27" y="529" fill="#afafaf" textLength="585" lengthAdjust="spacingAndGlyphs">Enter to select · ↑/↓ to navigate · ←/→ to reorder · Esc to close</text>
     <text x="891" y="529" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="546" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="546" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="563" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="27" y="563" fill="#333333" textLength="846" lengthAdjust="spacingAndGlyphs">┌────────────────────────────────────────────────────────────────────────────────────────────┐</text>
+    <text x="27" y="563" fill="#afafaf" textLength="585" lengthAdjust="spacingAndGlyphs">Enter to select · ↑/↓ to navigate · ←/→ to reorder · Esc to close</text>
     <text x="891" y="563" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="580" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="27" y="580" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="580" fill="#ffffff" textLength="72" lengthAdjust="spacingAndGlyphs" font-weight="bold">Preview:</text>
-    <text x="864" y="580" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="580" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="597" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="27" y="597" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <rect x="45" y="595" width="198" height="17" fill="#001a00" />
-    <text x="45" y="597" fill="#ffffff" textLength="198" lengthAdjust="spacingAndGlyphs">workspace (/directory)</text>
-    <text x="324" y="597" fill="#afafaf" textLength="54" lengthAdjust="spacingAndGlyphs">branch</text>
-    <text x="459" y="597" fill="#afafaf" textLength="63" lengthAdjust="spacingAndGlyphs">sandbox</text>
-    <text x="594" y="597" fill="#afafaf" textLength="54" lengthAdjust="spacingAndGlyphs">/model</text>
-    <text x="801" y="597" fill="#afafaf" textLength="54" lengthAdjust="spacingAndGlyphs">/stats</text>
-    <text x="864" y="597" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="27" y="597" fill="#333333" textLength="846" lengthAdjust="spacingAndGlyphs">┌────────────────────────────────────────────────────────────────────────────────────────────┐</text>
     <text x="891" y="597" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="614" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="27" y="614" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <rect x="45" y="612" width="126" height="17" fill="#001a00" />
-    <text x="45" y="614" fill="#ffffff" textLength="126" lengthAdjust="spacingAndGlyphs">~/project/path</text>
-    <rect x="171" y="612" width="72" height="17" fill="#001a00" />
-    <text x="324" y="614" fill="#ffffff" textLength="36" lengthAdjust="spacingAndGlyphs">main</text>
-    <text x="459" y="614" fill="#00cd00" textLength="54" lengthAdjust="spacingAndGlyphs">docker</text>
-    <text x="594" y="614" fill="#ffffff" textLength="126" lengthAdjust="spacingAndGlyphs">gemini-2.5-pro</text>
-    <text x="801" y="614" fill="#ffffff" textLength="27" lengthAdjust="spacingAndGlyphs">97%</text>
+    <text x="45" y="614" fill="#ffffff" textLength="72" lengthAdjust="spacingAndGlyphs" font-weight="bold">Preview:</text>
     <text x="864" y="614" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="614" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="631" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="27" y="631" fill="#333333" textLength="846" lengthAdjust="spacingAndGlyphs">└────────────────────────────────────────────────────────────────────────────────────────────┘</text>
+    <text x="27" y="631" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <rect x="45" y="629" width="198" height="17" fill="#001a00" />
+    <text x="45" y="631" fill="#ffffff" textLength="198" lengthAdjust="spacingAndGlyphs">workspace (/directory)</text>
+    <text x="324" y="631" fill="#afafaf" textLength="54" lengthAdjust="spacingAndGlyphs">branch</text>
+    <text x="459" y="631" fill="#afafaf" textLength="63" lengthAdjust="spacingAndGlyphs">sandbox</text>
+    <text x="594" y="631" fill="#afafaf" textLength="54" lengthAdjust="spacingAndGlyphs">/model</text>
+    <text x="801" y="631" fill="#afafaf" textLength="54" lengthAdjust="spacingAndGlyphs">/stats</text>
+    <text x="864" y="631" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="631" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="648" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="27" y="648" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <rect x="45" y="646" width="126" height="17" fill="#001a00" />
+    <text x="45" y="648" fill="#ffffff" textLength="126" lengthAdjust="spacingAndGlyphs">~/project/path</text>
+    <rect x="171" y="646" width="72" height="17" fill="#001a00" />
+    <text x="324" y="648" fill="#ffffff" textLength="36" lengthAdjust="spacingAndGlyphs">main</text>
+    <text x="459" y="648" fill="#00cd00" textLength="54" lengthAdjust="spacingAndGlyphs">docker</text>
+    <text x="594" y="648" fill="#ffffff" textLength="126" lengthAdjust="spacingAndGlyphs">gemini-2.5-pro</text>
+    <text x="801" y="648" fill="#ffffff" textLength="27" lengthAdjust="spacingAndGlyphs">97%</text>
+    <text x="864" y="648" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="648" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="665" fill="#333333" textLength="900" lengthAdjust="spacingAndGlyphs">╰──────────────────────────────────────────────────────────────────────────────────────────────────╯</text>
+    <text x="0" y="665" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="27" y="665" fill="#333333" textLength="846" lengthAdjust="spacingAndGlyphs">└────────────────────────────────────────────────────────────────────────────────────────────┘</text>
+    <text x="891" y="665" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="682" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="891" y="682" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="699" fill="#333333" textLength="900" lengthAdjust="spacingAndGlyphs">╰──────────────────────────────────────────────────────────────────────────────────────────────────╯</text>
   </g>
 </svg>

packages/cli/src/ui/components/__snapshots__/FooterConfigDialog--FooterConfigDialog-updates-the-preview-when-Show-footer-labels-is-toggled-off.snap.svg

@@ -1,8 +1,8 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="920" height="683" viewBox="0 0 920 683">
+<svg xmlns="http://www.w3.org/2000/svg" width="920" height="717" viewBox="0 0 920 717">
   <style>
     text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
   </style>
-  <rect width="920" height="683" fill="#000000" />
+  <rect width="920" height="717" fill="#000000" />
   <g transform="translate(10, 10)">
     <text x="0" y="2" fill="#333333" textLength="900" lengthAdjust="spacingAndGlyphs">╭──────────────────────────────────────────────────────────────────────────────────────────────────╮</text>
     <text x="0" y="19" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
@@ -75,69 +75,76 @@
     <text x="891" y="359" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="376" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="376" fill="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
-    <text x="72" y="376" fill="#ffffff" textLength="117" lengthAdjust="spacingAndGlyphs"> code-changes</text>
+    <text x="72" y="376" fill="#ffffff" textLength="45" lengthAdjust="spacingAndGlyphs"> auth</text>
     <text x="891" y="376" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="393" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="393" fill="#afafaf" textLength="513" lengthAdjust="spacingAndGlyphs"> Lines added/removed in the session (not shown when zero)</text>
+    <text x="45" y="393" fill="#afafaf" textLength="252" lengthAdjust="spacingAndGlyphs"> Current authentication info</text>
     <text x="891" y="393" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="410" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="410" fill="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
-    <text x="72" y="410" fill="#ffffff" textLength="108" lengthAdjust="spacingAndGlyphs"> token-count</text>
+    <text x="72" y="410" fill="#ffffff" textLength="117" lengthAdjust="spacingAndGlyphs"> code-changes</text>
     <text x="891" y="410" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="427" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="427" fill="#afafaf" textLength="495" lengthAdjust="spacingAndGlyphs"> Total tokens used in the session (not shown when zero)</text>
+    <text x="45" y="427" fill="#afafaf" textLength="513" lengthAdjust="spacingAndGlyphs"> Lines added/removed in the session (not shown when zero)</text>
     <text x="891" y="427" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="444" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <rect x="27" y="442" width="9" height="17" fill="#001a00" />
-    <text x="27" y="444" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">&gt;</text>
-    <rect x="36" y="442" width="9" height="17" fill="#001a00" />
-    <rect x="45" y="442" width="27" height="17" fill="#001a00" />
     <text x="45" y="444" fill="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
-    <rect x="72" y="442" width="171" height="17" fill="#001a00" />
-    <text x="72" y="444" fill="#00cd00" textLength="171" lengthAdjust="spacingAndGlyphs"> Show footer labels</text>
-    <rect x="243" y="442" width="630" height="17" fill="#001a00" />
+    <text x="72" y="444" fill="#ffffff" textLength="108" lengthAdjust="spacingAndGlyphs"> token-count</text>
     <text x="891" y="444" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="461" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <rect x="27" y="459" width="846" height="17" fill="#001a00" />
+    <text x="45" y="461" fill="#afafaf" textLength="495" lengthAdjust="spacingAndGlyphs"> Total tokens used in the session (not shown when zero)</text>
     <text x="891" y="461" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="478" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="478" fill="#ffffff" textLength="207" lengthAdjust="spacingAndGlyphs">Reset to default footer</text>
+    <rect x="27" y="476" width="9" height="17" fill="#001a00" />
+    <text x="27" y="478" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">&gt;</text>
+    <rect x="36" y="476" width="9" height="17" fill="#001a00" />
+    <rect x="45" y="476" width="27" height="17" fill="#001a00" />
+    <text x="45" y="478" fill="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
+    <rect x="72" y="476" width="171" height="17" fill="#001a00" />
+    <text x="72" y="478" fill="#00cd00" textLength="171" lengthAdjust="spacingAndGlyphs"> Show footer labels</text>
+    <rect x="243" y="476" width="630" height="17" fill="#001a00" />
     <text x="891" y="478" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="495" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <rect x="27" y="493" width="846" height="17" fill="#001a00" />
     <text x="891" y="495" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="512" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="512" fill="#ffffff" textLength="207" lengthAdjust="spacingAndGlyphs">Reset to default footer</text>
     <text x="891" y="512" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="529" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="27" y="529" fill="#afafaf" textLength="585" lengthAdjust="spacingAndGlyphs">Enter to select · ↑/↓ to navigate · ←/→ to reorder · Esc to close</text>
     <text x="891" y="529" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="546" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="546" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="563" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="27" y="563" fill="#333333" textLength="846" lengthAdjust="spacingAndGlyphs">┌────────────────────────────────────────────────────────────────────────────────────────────┐</text>
+    <text x="27" y="563" fill="#afafaf" textLength="585" lengthAdjust="spacingAndGlyphs">Enter to select · ↑/↓ to navigate · ←/→ to reorder · Esc to close</text>
     <text x="891" y="563" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="580" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="27" y="580" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="580" fill="#ffffff" textLength="72" lengthAdjust="spacingAndGlyphs" font-weight="bold">Preview:</text>
-    <text x="864" y="580" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="580" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="597" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="27" y="597" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="597" fill="#afafaf" textLength="126" lengthAdjust="spacingAndGlyphs">~/project/path</text>
-    <text x="207" y="597" fill="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs"> · </text>
-    <text x="279" y="597" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">main</text>
-    <text x="351" y="597" fill="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs"> · </text>
-    <text x="432" y="597" fill="#00cd00" textLength="54" lengthAdjust="spacingAndGlyphs">docker</text>
-    <text x="522" y="597" fill="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs"> · </text>
-    <text x="594" y="597" fill="#afafaf" textLength="126" lengthAdjust="spacingAndGlyphs">gemini-2.5-pro</text>
-    <text x="756" y="597" fill="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs"> · </text>
-    <text x="828" y="597" fill="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs">97%</text>
-    <text x="864" y="597" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="27" y="597" fill="#333333" textLength="846" lengthAdjust="spacingAndGlyphs">┌────────────────────────────────────────────────────────────────────────────────────────────┐</text>
     <text x="891" y="597" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="614" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="27" y="614" fill="#333333" textLength="846" lengthAdjust="spacingAndGlyphs">└────────────────────────────────────────────────────────────────────────────────────────────┘</text>
+    <text x="27" y="614" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="614" fill="#ffffff" textLength="72" lengthAdjust="spacingAndGlyphs" font-weight="bold">Preview:</text>
+    <text x="864" y="614" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="614" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="631" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="27" y="631" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="631" fill="#afafaf" textLength="126" lengthAdjust="spacingAndGlyphs">~/project/path</text>
+    <text x="207" y="631" fill="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs"> · </text>
+    <text x="279" y="631" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">main</text>
+    <text x="351" y="631" fill="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs"> · </text>
+    <text x="432" y="631" fill="#00cd00" textLength="54" lengthAdjust="spacingAndGlyphs">docker</text>
+    <text x="522" y="631" fill="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs"> · </text>
+    <text x="594" y="631" fill="#afafaf" textLength="126" lengthAdjust="spacingAndGlyphs">gemini-2.5-pro</text>
+    <text x="756" y="631" fill="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs"> · </text>
+    <text x="828" y="631" fill="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs">97%</text>
+    <text x="864" y="631" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="631" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="648" fill="#333333" textLength="900" lengthAdjust="spacingAndGlyphs">╰──────────────────────────────────────────────────────────────────────────────────────────────────╯</text>
+    <text x="0" y="648" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="27" y="648" fill="#333333" textLength="846" lengthAdjust="spacingAndGlyphs">└────────────────────────────────────────────────────────────────────────────────────────────┘</text>
+    <text x="891" y="648" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="665" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="891" y="665" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="682" fill="#333333" textLength="900" lengthAdjust="spacingAndGlyphs">╰──────────────────────────────────────────────────────────────────────────────────────────────────╯</text>
   </g>
 </svg>

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

@@ -23,6 +23,8 @@ exports[`<FooterConfigDialog /> > highlights the active item in the preview 1`]
 │     Memory used by the application                                                               │
 │    [ ] session-id                                                                                │
 │     Unique identifier for the current session                                                    │
+│    [ ] auth                                                                                      │
+│     Current authentication info                                                                  │
 │  > [✓] code-changes                                                                              │
 │     Lines added/removed in the session (not shown when zero)                                     │
 │    [ ] token-count                                                                               │
@@ -66,6 +68,8 @@ exports[`<FooterConfigDialog /> > renders correctly with default settings 1`] =
 │     Memory used by the application                                                               │
 │    [ ] session-id                                                                                │
 │     Unique identifier for the current session                                                    │
+│    [ ] auth                                                                                      │
+│     Current authentication info                                                                  │
 │    [ ] code-changes                                                                              │
 │     Lines added/removed in the session (not shown when zero)                                     │
 │    [ ] token-count                                                                               │
@@ -110,6 +114,8 @@ exports[`<FooterConfigDialog /> > renders correctly with default settings 2`] =
 │     Memory used by the application                                                               │
 │    [ ] session-id                                                                                │
 │     Unique identifier for the current session                                                    │
+│    [ ] auth                                                                                      │
+│     Current authentication info                                                                  │
 │    [ ] code-changes                                                                              │
 │     Lines added/removed in the session (not shown when zero)                                     │
 │    [ ] token-count                                                                               │
@@ -153,6 +159,8 @@ exports[`<FooterConfigDialog /> > updates the preview when Show footer labels is
 │     Memory used by the application                                                               │
 │    [ ] session-id                                                                                │
 │     Unique identifier for the current session                                                    │
+│    [ ] auth                                                                                      │
+│     Current authentication info                                                                  │
 │    [ ] code-changes                                                                              │
 │     Lines added/removed in the session (not shown when zero)                                     │
 │    [ ] token-count                                                                               │

packages/cli/src/ui/components/__snapshots__/SettingsDialog-SettingsDialog-Initial-Rendering-should-render-settings-list-with-visual-indicators.snap.svg

@@ -76,38 +76,38 @@
     <text x="0" y="342" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="342" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="359" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="359" fill="#ffffff" textLength="126" lengthAdjust="spacingAndGlyphs">Plan Directory</text>
-    <text x="792" y="359" fill="#afafaf" textLength="81" lengthAdjust="spacingAndGlyphs">undefined</text>
+    <text x="45" y="359" fill="#ffffff" textLength="144" lengthAdjust="spacingAndGlyphs">Enable Plan Mode</text>
+    <text x="837" y="359" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
     <text x="891" y="359" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="376" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="376" fill="#afafaf" textLength="720" lengthAdjust="spacingAndGlyphs">The directory where planning artifacts are stored. If not specified, defaults t…</text>
+    <text x="45" y="376" fill="#afafaf" textLength="486" lengthAdjust="spacingAndGlyphs">Enable Plan Mode for read-only safety during planning.</text>
     <text x="891" y="376" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="393" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="393" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="410" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="410" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Plan Model Routing</text>
-    <text x="837" y="410" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
+    <text x="45" y="410" fill="#ffffff" textLength="126" lengthAdjust="spacingAndGlyphs">Plan Directory</text>
+    <text x="792" y="410" fill="#afafaf" textLength="81" lengthAdjust="spacingAndGlyphs">undefined</text>
     <text x="891" y="410" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="427" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="427" fill="#afafaf" textLength="765" lengthAdjust="spacingAndGlyphs">Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr…</text>
+    <text x="45" y="427" fill="#afafaf" textLength="720" lengthAdjust="spacingAndGlyphs">The directory where planning artifacts are stored. If not specified, defaults t…</text>
     <text x="891" y="427" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="444" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="444" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="461" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="461" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</text>
+    <text x="45" y="461" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Plan Model Routing</text>
     <text x="837" y="461" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
     <text x="891" y="461" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="478" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="478" fill="#afafaf" textLength="612" lengthAdjust="spacingAndGlyphs">Retry on &quot;exception TypeError: fetch failed sending request&quot; errors.</text>
+    <text x="45" y="478" fill="#afafaf" textLength="765" lengthAdjust="spacingAndGlyphs">Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr…</text>
     <text x="891" y="478" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="495" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="495" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="512" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="512" fill="#ffffff" textLength="207" lengthAdjust="spacingAndGlyphs">Max Chat Model Attempts</text>
-    <text x="855" y="512" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">10</text>
+    <text x="45" y="512" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</text>
+    <text x="837" y="512" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
     <text x="891" y="512" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="529" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="529" fill="#afafaf" textLength="729" lengthAdjust="spacingAndGlyphs">Maximum number of attempts for requests to the main chat model. Cannot exceed 10.</text>
+    <text x="45" y="529" fill="#afafaf" textLength="612" lengthAdjust="spacingAndGlyphs">Retry on &quot;exception TypeError: fetch failed sending request&quot; errors.</text>
     <text x="891" y="529" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="546" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="546" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>

packages/cli/src/ui/components/__snapshots__/SettingsDialog-SettingsDialog-Snapshot-Tests-should-render-accessibility-settings-enabled-correctly.snap.svg

@@ -76,38 +76,38 @@
     <text x="0" y="342" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="342" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="359" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="359" fill="#ffffff" textLength="126" lengthAdjust="spacingAndGlyphs">Plan Directory</text>
-    <text x="792" y="359" fill="#afafaf" textLength="81" lengthAdjust="spacingAndGlyphs">undefined</text>
+    <text x="45" y="359" fill="#ffffff" textLength="144" lengthAdjust="spacingAndGlyphs">Enable Plan Mode</text>
+    <text x="837" y="359" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
     <text x="891" y="359" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="376" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="376" fill="#afafaf" textLength="720" lengthAdjust="spacingAndGlyphs">The directory where planning artifacts are stored. If not specified, defaults t…</text>
+    <text x="45" y="376" fill="#afafaf" textLength="486" lengthAdjust="spacingAndGlyphs">Enable Plan Mode for read-only safety during planning.</text>
     <text x="891" y="376" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="393" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="393" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="410" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="410" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Plan Model Routing</text>
-    <text x="837" y="410" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
+    <text x="45" y="410" fill="#ffffff" textLength="126" lengthAdjust="spacingAndGlyphs">Plan Directory</text>
+    <text x="792" y="410" fill="#afafaf" textLength="81" lengthAdjust="spacingAndGlyphs">undefined</text>
     <text x="891" y="410" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="427" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="427" fill="#afafaf" textLength="765" lengthAdjust="spacingAndGlyphs">Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr…</text>
+    <text x="45" y="427" fill="#afafaf" textLength="720" lengthAdjust="spacingAndGlyphs">The directory where planning artifacts are stored. If not specified, defaults t…</text>
     <text x="891" y="427" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="444" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="444" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="461" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="461" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</text>
+    <text x="45" y="461" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Plan Model Routing</text>
     <text x="837" y="461" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
     <text x="891" y="461" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="478" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="478" fill="#afafaf" textLength="612" lengthAdjust="spacingAndGlyphs">Retry on &quot;exception TypeError: fetch failed sending request&quot; errors.</text>
+    <text x="45" y="478" fill="#afafaf" textLength="765" lengthAdjust="spacingAndGlyphs">Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr…</text>
     <text x="891" y="478" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="495" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="495" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="512" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="512" fill="#ffffff" textLength="207" lengthAdjust="spacingAndGlyphs">Max Chat Model Attempts</text>
-    <text x="855" y="512" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">10</text>
+    <text x="45" y="512" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</text>
+    <text x="837" y="512" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
     <text x="891" y="512" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="529" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="529" fill="#afafaf" textLength="729" lengthAdjust="spacingAndGlyphs">Maximum number of attempts for requests to the main chat model. Cannot exceed 10.</text>
+    <text x="45" y="529" fill="#afafaf" textLength="612" lengthAdjust="spacingAndGlyphs">Retry on &quot;exception TypeError: fetch failed sending request&quot; errors.</text>
     <text x="891" y="529" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="546" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="546" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>

packages/cli/src/ui/components/__snapshots__/SettingsDialog-SettingsDialog-Snapshot-Tests-should-render-all-boolean-settings-disabled-correctly.snap.svg

@@ -76,38 +76,38 @@
     <text x="0" y="342" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="342" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="359" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="359" fill="#ffffff" textLength="126" lengthAdjust="spacingAndGlyphs">Plan Directory</text>
-    <text x="792" y="359" fill="#afafaf" textLength="81" lengthAdjust="spacingAndGlyphs">undefined</text>
+    <text x="45" y="359" fill="#ffffff" textLength="144" lengthAdjust="spacingAndGlyphs">Enable Plan Mode</text>
+    <text x="837" y="359" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
     <text x="891" y="359" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="376" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="376" fill="#afafaf" textLength="720" lengthAdjust="spacingAndGlyphs">The directory where planning artifacts are stored. If not specified, defaults t…</text>
+    <text x="45" y="376" fill="#afafaf" textLength="486" lengthAdjust="spacingAndGlyphs">Enable Plan Mode for read-only safety during planning.</text>
     <text x="891" y="376" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="393" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="393" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="410" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="410" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Plan Model Routing</text>
-    <text x="837" y="410" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
+    <text x="45" y="410" fill="#ffffff" textLength="126" lengthAdjust="spacingAndGlyphs">Plan Directory</text>
+    <text x="792" y="410" fill="#afafaf" textLength="81" lengthAdjust="spacingAndGlyphs">undefined</text>
     <text x="891" y="410" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="427" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="427" fill="#afafaf" textLength="765" lengthAdjust="spacingAndGlyphs">Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr…</text>
+    <text x="45" y="427" fill="#afafaf" textLength="720" lengthAdjust="spacingAndGlyphs">The directory where planning artifacts are stored. If not specified, defaults t…</text>
     <text x="891" y="427" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="444" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="444" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="461" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="461" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</text>
+    <text x="45" y="461" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Plan Model Routing</text>
     <text x="837" y="461" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
     <text x="891" y="461" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="478" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="478" fill="#afafaf" textLength="612" lengthAdjust="spacingAndGlyphs">Retry on &quot;exception TypeError: fetch failed sending request&quot; errors.</text>
+    <text x="45" y="478" fill="#afafaf" textLength="765" lengthAdjust="spacingAndGlyphs">Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr…</text>
     <text x="891" y="478" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="495" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="495" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="512" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="512" fill="#ffffff" textLength="207" lengthAdjust="spacingAndGlyphs">Max Chat Model Attempts</text>
-    <text x="855" y="512" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">10</text>
+    <text x="45" y="512" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</text>
+    <text x="837" y="512" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
     <text x="891" y="512" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="529" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="529" fill="#afafaf" textLength="729" lengthAdjust="spacingAndGlyphs">Maximum number of attempts for requests to the main chat model. Cannot exceed 10.</text>
+    <text x="45" y="529" fill="#afafaf" textLength="612" lengthAdjust="spacingAndGlyphs">Retry on &quot;exception TypeError: fetch failed sending request&quot; errors.</text>
     <text x="891" y="529" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="546" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="546" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>

packages/cli/src/ui/components/__snapshots__/SettingsDialog-SettingsDialog-Snapshot-Tests-should-render-default-state-correctly.snap.svg

@@ -76,38 +76,38 @@
     <text x="0" y="342" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="342" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="359" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="359" fill="#ffffff" textLength="126" lengthAdjust="spacingAndGlyphs">Plan Directory</text>
-    <text x="792" y="359" fill="#afafaf" textLength="81" lengthAdjust="spacingAndGlyphs">undefined</text>
+    <text x="45" y="359" fill="#ffffff" textLength="144" lengthAdjust="spacingAndGlyphs">Enable Plan Mode</text>
+    <text x="837" y="359" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
     <text x="891" y="359" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="376" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="376" fill="#afafaf" textLength="720" lengthAdjust="spacingAndGlyphs">The directory where planning artifacts are stored. If not specified, defaults t…</text>
+    <text x="45" y="376" fill="#afafaf" textLength="486" lengthAdjust="spacingAndGlyphs">Enable Plan Mode for read-only safety during planning.</text>
     <text x="891" y="376" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="393" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="393" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="410" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="410" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Plan Model Routing</text>
-    <text x="837" y="410" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
+    <text x="45" y="410" fill="#ffffff" textLength="126" lengthAdjust="spacingAndGlyphs">Plan Directory</text>
+    <text x="792" y="410" fill="#afafaf" textLength="81" lengthAdjust="spacingAndGlyphs">undefined</text>
     <text x="891" y="410" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="427" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="427" fill="#afafaf" textLength="765" lengthAdjust="spacingAndGlyphs">Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr…</text>
+    <text x="45" y="427" fill="#afafaf" textLength="720" lengthAdjust="spacingAndGlyphs">The directory where planning artifacts are stored. If not specified, defaults t…</text>
     <text x="891" y="427" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="444" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="444" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="461" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="461" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</text>
+    <text x="45" y="461" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Plan Model Routing</text>
     <text x="837" y="461" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
     <text x="891" y="461" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="478" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="478" fill="#afafaf" textLength="612" lengthAdjust="spacingAndGlyphs">Retry on &quot;exception TypeError: fetch failed sending request&quot; errors.</text>
+    <text x="45" y="478" fill="#afafaf" textLength="765" lengthAdjust="spacingAndGlyphs">Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr…</text>
     <text x="891" y="478" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="495" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="495" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="512" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="512" fill="#ffffff" textLength="207" lengthAdjust="spacingAndGlyphs">Max Chat Model Attempts</text>
-    <text x="855" y="512" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">10</text>
+    <text x="45" y="512" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</text>
+    <text x="837" y="512" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
     <text x="891" y="512" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="529" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="529" fill="#afafaf" textLength="729" lengthAdjust="spacingAndGlyphs">Maximum number of attempts for requests to the main chat model. Cannot exceed 10.</text>
+    <text x="45" y="529" fill="#afafaf" textLength="612" lengthAdjust="spacingAndGlyphs">Retry on &quot;exception TypeError: fetch failed sending request&quot; errors.</text>
     <text x="891" y="529" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="546" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="546" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>

packages/cli/src/ui/components/__snapshots__/SettingsDialog-SettingsDialog-Snapshot-Tests-should-render-file-filtering-settings-configured-correctly.snap.svg

@@ -76,38 +76,38 @@
     <text x="0" y="342" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="342" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="359" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="359" fill="#ffffff" textLength="126" lengthAdjust="spacingAndGlyphs">Plan Directory</text>
-    <text x="792" y="359" fill="#afafaf" textLength="81" lengthAdjust="spacingAndGlyphs">undefined</text>
+    <text x="45" y="359" fill="#ffffff" textLength="144" lengthAdjust="spacingAndGlyphs">Enable Plan Mode</text>
+    <text x="837" y="359" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
     <text x="891" y="359" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="376" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="376" fill="#afafaf" textLength="720" lengthAdjust="spacingAndGlyphs">The directory where planning artifacts are stored. If not specified, defaults t…</text>
+    <text x="45" y="376" fill="#afafaf" textLength="486" lengthAdjust="spacingAndGlyphs">Enable Plan Mode for read-only safety during planning.</text>
     <text x="891" y="376" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="393" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="393" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="410" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="410" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Plan Model Routing</text>
-    <text x="837" y="410" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
+    <text x="45" y="410" fill="#ffffff" textLength="126" lengthAdjust="spacingAndGlyphs">Plan Directory</text>
+    <text x="792" y="410" fill="#afafaf" textLength="81" lengthAdjust="spacingAndGlyphs">undefined</text>
     <text x="891" y="410" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="427" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="427" fill="#afafaf" textLength="765" lengthAdjust="spacingAndGlyphs">Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr…</text>
+    <text x="45" y="427" fill="#afafaf" textLength="720" lengthAdjust="spacingAndGlyphs">The directory where planning artifacts are stored. If not specified, defaults t…</text>
     <text x="891" y="427" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="444" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="444" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="461" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="461" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</text>
+    <text x="45" y="461" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Plan Model Routing</text>
     <text x="837" y="461" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
     <text x="891" y="461" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="478" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="478" fill="#afafaf" textLength="612" lengthAdjust="spacingAndGlyphs">Retry on &quot;exception TypeError: fetch failed sending request&quot; errors.</text>
+    <text x="45" y="478" fill="#afafaf" textLength="765" lengthAdjust="spacingAndGlyphs">Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr…</text>
     <text x="891" y="478" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="495" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="495" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="512" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="512" fill="#ffffff" textLength="207" lengthAdjust="spacingAndGlyphs">Max Chat Model Attempts</text>
-    <text x="855" y="512" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">10</text>
+    <text x="45" y="512" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</text>
+    <text x="837" y="512" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
     <text x="891" y="512" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="529" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="529" fill="#afafaf" textLength="729" lengthAdjust="spacingAndGlyphs">Maximum number of attempts for requests to the main chat model. Cannot exceed 10.</text>
+    <text x="45" y="529" fill="#afafaf" textLength="612" lengthAdjust="spacingAndGlyphs">Retry on &quot;exception TypeError: fetch failed sending request&quot; errors.</text>
     <text x="891" y="529" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="546" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="546" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>

packages/cli/src/ui/components/__snapshots__/SettingsDialog-SettingsDialog-Snapshot-Tests-should-render-focused-on-scope-selector-correctly.snap.svg

@@ -65,38 +65,38 @@
     <text x="0" y="342" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="342" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="359" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="359" fill="#ffffff" textLength="126" lengthAdjust="spacingAndGlyphs">Plan Directory</text>
-    <text x="792" y="359" fill="#afafaf" textLength="81" lengthAdjust="spacingAndGlyphs">undefined</text>
+    <text x="45" y="359" fill="#ffffff" textLength="144" lengthAdjust="spacingAndGlyphs">Enable Plan Mode</text>
+    <text x="837" y="359" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
     <text x="891" y="359" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="376" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="376" fill="#afafaf" textLength="720" lengthAdjust="spacingAndGlyphs">The directory where planning artifacts are stored. If not specified, defaults t…</text>
+    <text x="45" y="376" fill="#afafaf" textLength="486" lengthAdjust="spacingAndGlyphs">Enable Plan Mode for read-only safety during planning.</text>
     <text x="891" y="376" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="393" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="393" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="410" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="410" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Plan Model Routing</text>
-    <text x="837" y="410" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
+    <text x="45" y="410" fill="#ffffff" textLength="126" lengthAdjust="spacingAndGlyphs">Plan Directory</text>
+    <text x="792" y="410" fill="#afafaf" textLength="81" lengthAdjust="spacingAndGlyphs">undefined</text>
     <text x="891" y="410" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="427" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="427" fill="#afafaf" textLength="765" lengthAdjust="spacingAndGlyphs">Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr…</text>
+    <text x="45" y="427" fill="#afafaf" textLength="720" lengthAdjust="spacingAndGlyphs">The directory where planning artifacts are stored. If not specified, defaults t…</text>
     <text x="891" y="427" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="444" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="444" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="461" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="461" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</text>
+    <text x="45" y="461" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Plan Model Routing</text>
     <text x="837" y="461" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
     <text x="891" y="461" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="478" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="478" fill="#afafaf" textLength="612" lengthAdjust="spacingAndGlyphs">Retry on &quot;exception TypeError: fetch failed sending request&quot; errors.</text>
+    <text x="45" y="478" fill="#afafaf" textLength="765" lengthAdjust="spacingAndGlyphs">Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr…</text>
     <text x="891" y="478" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="495" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="495" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="512" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="512" fill="#ffffff" textLength="207" lengthAdjust="spacingAndGlyphs">Max Chat Model Attempts</text>
-    <text x="855" y="512" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">10</text>
+    <text x="45" y="512" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</text>
+    <text x="837" y="512" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
     <text x="891" y="512" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="529" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="529" fill="#afafaf" textLength="729" lengthAdjust="spacingAndGlyphs">Maximum number of attempts for requests to the main chat model. Cannot exceed 10.</text>
+    <text x="45" y="529" fill="#afafaf" textLength="612" lengthAdjust="spacingAndGlyphs">Retry on &quot;exception TypeError: fetch failed sending request&quot; errors.</text>
     <text x="891" y="529" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="546" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="546" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>

packages/cli/src/ui/components/__snapshots__/SettingsDialog-SettingsDialog-Snapshot-Tests-should-render-mixed-boolean-and-number-settings-correctly.snap.svg

@@ -76,38 +76,38 @@
     <text x="0" y="342" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="342" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="359" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="359" fill="#ffffff" textLength="126" lengthAdjust="spacingAndGlyphs">Plan Directory</text>
-    <text x="792" y="359" fill="#afafaf" textLength="81" lengthAdjust="spacingAndGlyphs">undefined</text>
+    <text x="45" y="359" fill="#ffffff" textLength="144" lengthAdjust="spacingAndGlyphs">Enable Plan Mode</text>
+    <text x="837" y="359" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
     <text x="891" y="359" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="376" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="376" fill="#afafaf" textLength="720" lengthAdjust="spacingAndGlyphs">The directory where planning artifacts are stored. If not specified, defaults t…</text>
+    <text x="45" y="376" fill="#afafaf" textLength="486" lengthAdjust="spacingAndGlyphs">Enable Plan Mode for read-only safety during planning.</text>
     <text x="891" y="376" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="393" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="393" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="410" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="410" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Plan Model Routing</text>
-    <text x="837" y="410" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
+    <text x="45" y="410" fill="#ffffff" textLength="126" lengthAdjust="spacingAndGlyphs">Plan Directory</text>
+    <text x="792" y="410" fill="#afafaf" textLength="81" lengthAdjust="spacingAndGlyphs">undefined</text>
     <text x="891" y="410" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="427" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="427" fill="#afafaf" textLength="765" lengthAdjust="spacingAndGlyphs">Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr…</text>
+    <text x="45" y="427" fill="#afafaf" textLength="720" lengthAdjust="spacingAndGlyphs">The directory where planning artifacts are stored. If not specified, defaults t…</text>
     <text x="891" y="427" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="444" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="444" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="461" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="461" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</text>
+    <text x="45" y="461" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Plan Model Routing</text>
     <text x="837" y="461" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
     <text x="891" y="461" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="478" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="478" fill="#afafaf" textLength="612" lengthAdjust="spacingAndGlyphs">Retry on &quot;exception TypeError: fetch failed sending request&quot; errors.</text>
+    <text x="45" y="478" fill="#afafaf" textLength="765" lengthAdjust="spacingAndGlyphs">Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr…</text>
     <text x="891" y="478" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="495" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="495" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="512" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="512" fill="#ffffff" textLength="207" lengthAdjust="spacingAndGlyphs">Max Chat Model Attempts</text>
-    <text x="855" y="512" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">10</text>
+    <text x="45" y="512" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</text>
+    <text x="837" y="512" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
     <text x="891" y="512" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="529" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="529" fill="#afafaf" textLength="729" lengthAdjust="spacingAndGlyphs">Maximum number of attempts for requests to the main chat model. Cannot exceed 10.</text>
+    <text x="45" y="529" fill="#afafaf" textLength="612" lengthAdjust="spacingAndGlyphs">Retry on &quot;exception TypeError: fetch failed sending request&quot; errors.</text>
     <text x="891" y="529" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="546" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="546" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>

packages/cli/src/ui/components/__snapshots__/SettingsDialog-SettingsDialog-Snapshot-Tests-should-render-tools-and-security-settings-correctly.snap.svg

@@ -76,38 +76,38 @@
     <text x="0" y="342" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="342" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="359" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="359" fill="#ffffff" textLength="126" lengthAdjust="spacingAndGlyphs">Plan Directory</text>
-    <text x="792" y="359" fill="#afafaf" textLength="81" lengthAdjust="spacingAndGlyphs">undefined</text>
+    <text x="45" y="359" fill="#ffffff" textLength="144" lengthAdjust="spacingAndGlyphs">Enable Plan Mode</text>
+    <text x="837" y="359" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
     <text x="891" y="359" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="376" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="376" fill="#afafaf" textLength="720" lengthAdjust="spacingAndGlyphs">The directory where planning artifacts are stored. If not specified, defaults t…</text>
+    <text x="45" y="376" fill="#afafaf" textLength="486" lengthAdjust="spacingAndGlyphs">Enable Plan Mode for read-only safety during planning.</text>
     <text x="891" y="376" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="393" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="393" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="410" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="410" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Plan Model Routing</text>
-    <text x="837" y="410" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
+    <text x="45" y="410" fill="#ffffff" textLength="126" lengthAdjust="spacingAndGlyphs">Plan Directory</text>
+    <text x="792" y="410" fill="#afafaf" textLength="81" lengthAdjust="spacingAndGlyphs">undefined</text>
     <text x="891" y="410" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="427" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="427" fill="#afafaf" textLength="765" lengthAdjust="spacingAndGlyphs">Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr…</text>
+    <text x="45" y="427" fill="#afafaf" textLength="720" lengthAdjust="spacingAndGlyphs">The directory where planning artifacts are stored. If not specified, defaults t…</text>
     <text x="891" y="427" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="444" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="444" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="461" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="461" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</text>
+    <text x="45" y="461" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Plan Model Routing</text>
     <text x="837" y="461" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
     <text x="891" y="461" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="478" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="478" fill="#afafaf" textLength="612" lengthAdjust="spacingAndGlyphs">Retry on &quot;exception TypeError: fetch failed sending request&quot; errors.</text>
+    <text x="45" y="478" fill="#afafaf" textLength="765" lengthAdjust="spacingAndGlyphs">Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr…</text>
     <text x="891" y="478" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="495" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="495" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="512" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="512" fill="#ffffff" textLength="207" lengthAdjust="spacingAndGlyphs">Max Chat Model Attempts</text>
-    <text x="855" y="512" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">10</text>
+    <text x="45" y="512" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</text>
+    <text x="837" y="512" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
     <text x="891" y="512" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="529" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="529" fill="#afafaf" textLength="729" lengthAdjust="spacingAndGlyphs">Maximum number of attempts for requests to the main chat model. Cannot exceed 10.</text>
+    <text x="45" y="529" fill="#afafaf" textLength="612" lengthAdjust="spacingAndGlyphs">Retry on &quot;exception TypeError: fetch failed sending request&quot; errors.</text>
     <text x="891" y="529" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="546" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="546" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>

packages/cli/src/ui/components/__snapshots__/SettingsDialog-SettingsDialog-Snapshot-Tests-should-render-various-boolean-settings-enabled-correctly.snap.svg

@@ -76,38 +76,38 @@
     <text x="0" y="342" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="342" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="359" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="359" fill="#ffffff" textLength="126" lengthAdjust="spacingAndGlyphs">Plan Directory</text>
-    <text x="792" y="359" fill="#afafaf" textLength="81" lengthAdjust="spacingAndGlyphs">undefined</text>
+    <text x="45" y="359" fill="#ffffff" textLength="144" lengthAdjust="spacingAndGlyphs">Enable Plan Mode</text>
+    <text x="837" y="359" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
     <text x="891" y="359" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="376" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="376" fill="#afafaf" textLength="720" lengthAdjust="spacingAndGlyphs">The directory where planning artifacts are stored. If not specified, defaults t…</text>
+    <text x="45" y="376" fill="#afafaf" textLength="486" lengthAdjust="spacingAndGlyphs">Enable Plan Mode for read-only safety during planning.</text>
     <text x="891" y="376" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="393" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="393" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="410" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="410" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Plan Model Routing</text>
-    <text x="837" y="410" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
+    <text x="45" y="410" fill="#ffffff" textLength="126" lengthAdjust="spacingAndGlyphs">Plan Directory</text>
+    <text x="792" y="410" fill="#afafaf" textLength="81" lengthAdjust="spacingAndGlyphs">undefined</text>
     <text x="891" y="410" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="427" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="427" fill="#afafaf" textLength="765" lengthAdjust="spacingAndGlyphs">Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr…</text>
+    <text x="45" y="427" fill="#afafaf" textLength="720" lengthAdjust="spacingAndGlyphs">The directory where planning artifacts are stored. If not specified, defaults t…</text>
     <text x="891" y="427" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="444" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="444" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="461" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="461" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</text>
+    <text x="45" y="461" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Plan Model Routing</text>
     <text x="837" y="461" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
     <text x="891" y="461" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="478" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="478" fill="#afafaf" textLength="612" lengthAdjust="spacingAndGlyphs">Retry on &quot;exception TypeError: fetch failed sending request&quot; errors.</text>
+    <text x="45" y="478" fill="#afafaf" textLength="765" lengthAdjust="spacingAndGlyphs">Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr…</text>
     <text x="891" y="478" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="495" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="495" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="512" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="512" fill="#ffffff" textLength="207" lengthAdjust="spacingAndGlyphs">Max Chat Model Attempts</text>
-    <text x="855" y="512" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">10</text>
+    <text x="45" y="512" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</text>
+    <text x="837" y="512" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
     <text x="891" y="512" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="529" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="529" fill="#afafaf" textLength="729" lengthAdjust="spacingAndGlyphs">Maximum number of attempts for requests to the main chat model. Cannot exceed 10.</text>
+    <text x="45" y="529" fill="#afafaf" textLength="612" lengthAdjust="spacingAndGlyphs">Retry on &quot;exception TypeError: fetch failed sending request&quot; errors.</text>
     <text x="891" y="529" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="546" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="546" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>

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

@@ -22,6 +22,9 @@ exports[`SettingsDialog > Initial Rendering > should render settings list with v
 │    Enable Notifications                                                                   false  │
 │    Enable run-event notifications for action-required prompts and session completion.            │
 │                                                                                                  │
+│    Enable Plan Mode                                                                        true  │
+│    Enable Plan Mode for read-only safety during planning.                                        │
+│                                                                                                  │
 │    Plan Directory                                                                     undefined  │
 │    The directory where planning artifacts are stored. If not specified, defaults t…              │
 │                                                                                                  │
@@ -31,9 +34,6 @@ exports[`SettingsDialog > Initial Rendering > should render settings list with v
 │    Retry Fetch Errors                                                                      true  │
 │    Retry on "exception TypeError: fetch failed sending request" errors.                          │
 │                                                                                                  │
-│    Max Chat Model Attempts                                                                   10  │
-│    Maximum number of attempts for requests to the main chat model. Cannot exceed 10.             │
-│                                                                                                  │
 │  ▼                                                                                               │
 │                                                                                                  │
 │    Apply To                                                                                      │
@@ -68,6 +68,9 @@ exports[`SettingsDialog > Snapshot Tests > should render 'accessibility settings
 │    Enable Notifications                                                                   false  │
 │    Enable run-event notifications for action-required prompts and session completion.            │
 │                                                                                                  │
+│    Enable Plan Mode                                                                        true  │
+│    Enable Plan Mode for read-only safety during planning.                                        │
+│                                                                                                  │
 │    Plan Directory                                                                     undefined  │
 │    The directory where planning artifacts are stored. If not specified, defaults t…              │
 │                                                                                                  │
@@ -77,9 +80,6 @@ exports[`SettingsDialog > Snapshot Tests > should render 'accessibility settings
 │    Retry Fetch Errors                                                                      true  │
 │    Retry on "exception TypeError: fetch failed sending request" errors.                          │
 │                                                                                                  │
-│    Max Chat Model Attempts                                                                   10  │
-│    Maximum number of attempts for requests to the main chat model. Cannot exceed 10.             │
-│                                                                                                  │
 │  ▼                                                                                               │
 │                                                                                                  │
 │    Apply To                                                                                      │
@@ -114,6 +114,9 @@ exports[`SettingsDialog > Snapshot Tests > should render 'all boolean settings d
 │    Enable Notifications                                                                   false  │
 │    Enable run-event notifications for action-required prompts and session completion.            │
 │                                                                                                  │
+│    Enable Plan Mode                                                                        true  │
+│    Enable Plan Mode for read-only safety during planning.                                        │
+│                                                                                                  │
 │    Plan Directory                                                                     undefined  │
 │    The directory where planning artifacts are stored. If not specified, defaults t…              │
 │                                                                                                  │
@@ -123,9 +126,6 @@ exports[`SettingsDialog > Snapshot Tests > should render 'all boolean settings d
 │    Retry Fetch Errors                                                                      true  │
 │    Retry on "exception TypeError: fetch failed sending request" errors.                          │
 │                                                                                                  │
-│    Max Chat Model Attempts                                                                   10  │
-│    Maximum number of attempts for requests to the main chat model. Cannot exceed 10.             │
-│                                                                                                  │
 │  ▼                                                                                               │
 │                                                                                                  │
 │    Apply To                                                                                      │
@@ -160,6 +160,9 @@ exports[`SettingsDialog > Snapshot Tests > should render 'default state' correct
 │    Enable Notifications                                                                   false  │
 │    Enable run-event notifications for action-required prompts and session completion.            │
 │                                                                                                  │
+│    Enable Plan Mode                                                                        true  │
+│    Enable Plan Mode for read-only safety during planning.                                        │
+│                                                                                                  │
 │    Plan Directory                                                                     undefined  │
 │    The directory where planning artifacts are stored. If not specified, defaults t…              │
 │                                                                                                  │
@@ -169,9 +172,6 @@ exports[`SettingsDialog > Snapshot Tests > should render 'default state' correct
 │    Retry Fetch Errors                                                                      true  │
 │    Retry on "exception TypeError: fetch failed sending request" errors.                          │
 │                                                                                                  │
-│    Max Chat Model Attempts                                                                   10  │
-│    Maximum number of attempts for requests to the main chat model. Cannot exceed 10.             │
-│                                                                                                  │
 │  ▼                                                                                               │
 │                                                                                                  │
 │    Apply To                                                                                      │
@@ -206,6 +206,9 @@ exports[`SettingsDialog > Snapshot Tests > should render 'file filtering setting
 │    Enable Notifications                                                                   false  │
 │    Enable run-event notifications for action-required prompts and session completion.            │
 │                                                                                                  │
+│    Enable Plan Mode                                                                        true  │
+│    Enable Plan Mode for read-only safety during planning.                                        │
+│                                                                                                  │
 │    Plan Directory                                                                     undefined  │
 │    The directory where planning artifacts are stored. If not specified, defaults t…              │
 │                                                                                                  │
@@ -215,9 +218,6 @@ exports[`SettingsDialog > Snapshot Tests > should render 'file filtering setting
 │    Retry Fetch Errors                                                                      true  │
 │    Retry on "exception TypeError: fetch failed sending request" errors.                          │
 │                                                                                                  │
-│    Max Chat Model Attempts                                                                   10  │
-│    Maximum number of attempts for requests to the main chat model. Cannot exceed 10.             │
-│                                                                                                  │
 │  ▼                                                                                               │
 │                                                                                                  │
 │    Apply To                                                                                      │
@@ -252,6 +252,9 @@ exports[`SettingsDialog > Snapshot Tests > should render 'focused on scope selec
 │    Enable Notifications                                                                   false  │
 │    Enable run-event notifications for action-required prompts and session completion.            │
 │                                                                                                  │
+│    Enable Plan Mode                                                                        true  │
+│    Enable Plan Mode for read-only safety during planning.                                        │
+│                                                                                                  │
 │    Plan Directory                                                                     undefined  │
 │    The directory where planning artifacts are stored. If not specified, defaults t…              │
 │                                                                                                  │
@@ -261,9 +264,6 @@ exports[`SettingsDialog > Snapshot Tests > should render 'focused on scope selec
 │    Retry Fetch Errors                                                                      true  │
 │    Retry on "exception TypeError: fetch failed sending request" errors.                          │
 │                                                                                                  │
-│    Max Chat Model Attempts                                                                   10  │
-│    Maximum number of attempts for requests to the main chat model. Cannot exceed 10.             │
-│                                                                                                  │
 │  ▼                                                                                               │
 │                                                                                                  │
 │  > Apply To                                                                                      │
@@ -298,6 +298,9 @@ exports[`SettingsDialog > Snapshot Tests > should render 'mixed boolean and numb
 │    Enable Notifications                                                                   false  │
 │    Enable run-event notifications for action-required prompts and session completion.            │
 │                                                                                                  │
+│    Enable Plan Mode                                                                        true  │
+│    Enable Plan Mode for read-only safety during planning.                                        │
+│                                                                                                  │
 │    Plan Directory                                                                     undefined  │
 │    The directory where planning artifacts are stored. If not specified, defaults t…              │
 │                                                                                                  │
@@ -307,9 +310,6 @@ exports[`SettingsDialog > Snapshot Tests > should render 'mixed boolean and numb
 │    Retry Fetch Errors                                                                      true  │
 │    Retry on "exception TypeError: fetch failed sending request" errors.                          │
 │                                                                                                  │
-│    Max Chat Model Attempts                                                                   10  │
-│    Maximum number of attempts for requests to the main chat model. Cannot exceed 10.             │
-│                                                                                                  │
 │  ▼                                                                                               │
 │                                                                                                  │
 │    Apply To                                                                                      │
@@ -344,6 +344,9 @@ exports[`SettingsDialog > Snapshot Tests > should render 'tools and security set
 │    Enable Notifications                                                                   false  │
 │    Enable run-event notifications for action-required prompts and session completion.            │
 │                                                                                                  │
+│    Enable Plan Mode                                                                        true  │
+│    Enable Plan Mode for read-only safety during planning.                                        │
+│                                                                                                  │
 │    Plan Directory                                                                     undefined  │
 │    The directory where planning artifacts are stored. If not specified, defaults t…              │
 │                                                                                                  │
@@ -353,9 +356,6 @@ exports[`SettingsDialog > Snapshot Tests > should render 'tools and security set
 │    Retry Fetch Errors                                                                      true  │
 │    Retry on "exception TypeError: fetch failed sending request" errors.                          │
 │                                                                                                  │
-│    Max Chat Model Attempts                                                                   10  │
-│    Maximum number of attempts for requests to the main chat model. Cannot exceed 10.             │
-│                                                                                                  │
 │  ▼                                                                                               │
 │                                                                                                  │
 │    Apply To                                                                                      │
@@ -390,6 +390,9 @@ exports[`SettingsDialog > Snapshot Tests > should render 'various boolean settin
 │    Enable Notifications                                                                   false  │
 │    Enable run-event notifications for action-required prompts and session completion.            │
 │                                                                                                  │
+│    Enable Plan Mode                                                                        true  │
+│    Enable Plan Mode for read-only safety during planning.                                        │
+│                                                                                                  │
 │    Plan Directory                                                                     undefined  │
 │    The directory where planning artifacts are stored. If not specified, defaults t…              │
 │                                                                                                  │
@@ -399,9 +402,6 @@ exports[`SettingsDialog > Snapshot Tests > should render 'various boolean settin
 │    Retry Fetch Errors                                                                      true  │
 │    Retry on "exception TypeError: fetch failed sending request" errors.                          │
 │                                                                                                  │
-│    Max Chat Model Attempts                                                                   10  │
-│    Maximum number of attempts for requests to the main chat model. Cannot exceed 10.             │
-│                                                                                                  │
 │  ▼                                                                                               │
 │                                                                                                  │
 │    Apply To                                                                                      │

packages/cli/src/ui/components/__snapshots__/SuggestionsDisplay-ux-suggestions-opened.snap.svg

@@ -0,0 +1,44 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1100" height="581" viewBox="0 0 1100 581">
+  <style>
+    text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
+  </style>
+  <rect width="1100" height="581" fill="#000000" />
+  <g transform="translate(10, 10)">
+    <text x="9" y="19" fill="#4796e4" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
+    <text x="18" y="19" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▜</text>
+    <text x="27" y="19" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▄</text>
+    <text x="54" y="19" fill="#ffffff" textLength="1026" lengthAdjust="spacingAndGlyphs">   Gemini CLI vtest-version                                                                                       </text>
+    <text x="27" y="36" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
+    <text x="36" y="36" fill="#a471a7" textLength="9" lengthAdjust="spacingAndGlyphs">▜</text>
+    <text x="45" y="36" fill="#c3677f" textLength="9" lengthAdjust="spacingAndGlyphs">▄</text>
+    <text x="18" y="53" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▗</text>
+    <text x="27" y="53" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▟</text>
+    <text x="36" y="53" fill="#a471a7" textLength="9" lengthAdjust="spacingAndGlyphs">▀</text>
+    <text x="54" y="53" fill="#ffffff" textLength="1026" lengthAdjust="spacingAndGlyphs">   Authenticated with gemini-api-key /auth                                                                        </text>
+    <text x="9" y="70" fill="#4796e4" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
+    <text x="18" y="70" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▀</text>
+    <text x="0" y="121" fill="#ffffff" textLength="1080" lengthAdjust="spacingAndGlyphs">Tips for getting started:                                                                                               </text>
+    <text x="0" y="138" fill="#ffffff" textLength="1080" lengthAdjust="spacingAndGlyphs">1. Create GEMINI.md files to customize your interactions                                                                </text>
+    <text x="0" y="155" fill="#ffffff" textLength="1080" lengthAdjust="spacingAndGlyphs">2. /help for more information                                                                                           </text>
+    <text x="0" y="172" fill="#ffffff" textLength="1080" lengthAdjust="spacingAndGlyphs">3. Ask coding questions, edit code or run commands                                                                      </text>
+    <text x="0" y="189" fill="#ffffff" textLength="1080" lengthAdjust="spacingAndGlyphs">4. Be specific for the best results                                                                                     </text>
+    <text x="0" y="257" fill="#ffffff" textLength="1080" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────                                                            </text>
+    <text x="0" y="274" fill="#ffffff" textLength="1080" lengthAdjust="spacingAndGlyphs"> Shift+Tab to accept edits                                                                                              </text>
+    <text x="0" y="308" fill="#ffffff" textLength="1080" lengthAdjust="spacingAndGlyphs">▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀                                                            </text>
+    <text x="0" y="325" fill="#ffffff" textLength="36" lengthAdjust="spacingAndGlyphs"> &gt; /</text>
+    <rect x="36" y="323" width="9" height="17" fill="#ffffff" />
+    <text x="0" y="342" fill="#ffffff" textLength="1080" lengthAdjust="spacingAndGlyphs">▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄                                                            </text>
+    <text x="0" y="359" fill="#ffffff" textLength="1080" lengthAdjust="spacingAndGlyphs"> compress         Compresses the context by replacing it…                                                               </text>
+    <text x="0" y="376" fill="#ffffff" textLength="1080" lengthAdjust="spacingAndGlyphs"> directory        Manage workspace directories                                                                          </text>
+    <text x="0" y="393" fill="#ffffff" textLength="1080" lengthAdjust="spacingAndGlyphs"> footer           Configure which items appear in the fo…                                                               </text>
+    <text x="0" y="410" fill="#ffffff" textLength="1080" lengthAdjust="spacingAndGlyphs"> quit             Exit the cli                                                                                          </text>
+    <text x="0" y="427" fill="#ffffff" textLength="1080" lengthAdjust="spacingAndGlyphs"> stats            Check session stats. Usage: /stats [se…                                                               </text>
+    <text x="0" y="444" fill="#ffffff" textLength="1080" lengthAdjust="spacingAndGlyphs"> tasks            Toggle background tasks view                                                                          </text>
+    <text x="0" y="461" fill="#ffffff" textLength="1080" lengthAdjust="spacingAndGlyphs"> about            Show version info                                                                                     </text>
+    <text x="0" y="478" fill="#ffffff" textLength="1080" lengthAdjust="spacingAndGlyphs"> agents           Manage agents                                                                                         </text>
+    <text x="0" y="495" fill="#ffffff" textLength="1080" lengthAdjust="spacingAndGlyphs"> ▼                                                                                                                      </text>
+    <text x="0" y="512" fill="#ffffff" textLength="1080" lengthAdjust="spacingAndGlyphs"> (1/38)                                                                                                                 </text>
+    <text x="0" y="529" fill="#ffffff" textLength="1080" lengthAdjust="spacingAndGlyphs"> workspace (/directory)        sandbox               /model                                                             </text>
+    <text x="0" y="546" fill="#ffffff" textLength="1080" lengthAdjust="spacingAndGlyphs"> ~                             no sandbox        test-model                                                             </text>
+  </g>
+</svg>

packages/cli/src/ui/components/__snapshots__/SuggestionsDisplay.ux.test.tsx.snap

@@ -0,0 +1,38 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`SuggestionsDisplay UX Journey > should visually show the suggestions display when / is typed 1`] = `
+"
+ ▝▜▄     Gemini CLI vtest-version
+   ▝▜▄
+  ▗▟▀    Authenticated with gemini-api-key /auth
+ ▝▀    
+
+
+Tips for getting started:
+1. Create GEMINI.md files to customize your interactions
+2. /help for more information
+3. Ask coding questions, edit code or run commands
+4. Be specific for the best results
+
+
+
+────────────────────────────────────────────────────────────
+ Shift+Tab to accept edits
+
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+ > / 
+▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+ compress         Compresses the context by replacing it…
+ directory        Manage workspace directories
+ footer           Configure which items appear in the fo…
+ quit             Exit the cli
+ stats            Check session stats. Usage: /stats [se…
+ tasks            Toggle background tasks view
+ about            Show version info
+ agents           Manage agents
+ ▼
+ (1/38)
+ workspace (/directory)        sandbox               /model
+ ~                             no sandbox        test-model
+"
+`;

packages/cli/src/ui/components/views/ExtensionDetails.test.tsx

@@ -10,6 +10,7 @@ import { waitFor } from '../../../test-utils/async.js';
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { ExtensionDetails } from './ExtensionDetails.js';
 import { type RegistryExtension } from '../../../config/extensionRegistryClient.js';
+import { ExtensionUpdateState } from '../../state/extensions.js';
 
 const mockExtension: RegistryExtension = {
   id: 'ext1',
@@ -48,7 +49,11 @@ describe('ExtensionDetails', () => {
     mockOnLink = vi.fn();
   });
 
-  const renderDetails = async (isInstalled = false) =>
+  const renderDetails = async (
+    isInstalled = false,
+    updateState?: ExtensionUpdateState,
+    onUpdate = vi.fn(),
+  ) =>
     renderWithProviders(
       <ExtensionDetails
         extension={mockExtension}
@@ -56,6 +61,8 @@ describe('ExtensionDetails', () => {
         onInstall={mockOnInstall}
         onLink={mockOnLink}
         isInstalled={isInstalled}
+        updateState={updateState}
+        onUpdate={onUpdate}
       />,
     );
 
@@ -165,4 +172,40 @@ describe('ExtensionDetails', () => {
       expect(lastFrame()).toContain('[L] Link');
     });
   });
+
+  it('should show update button when update is available', async () => {
+    const { lastFrame } = await renderDetails(
+      true,
+      ExtensionUpdateState.UPDATE_AVAILABLE,
+    );
+    await waitFor(() => {
+      expect(lastFrame()).toContain('[I] Update');
+    });
+  });
+
+  it('should call onUpdate when "i" is pressed', async () => {
+    const mockOnUpdate = vi.fn();
+    const { stdin } = await renderDetails(
+      true,
+      ExtensionUpdateState.UPDATE_AVAILABLE,
+      mockOnUpdate,
+    );
+    await React.act(async () => {
+      stdin.write('i');
+    });
+    await waitFor(() => {
+      expect(mockOnUpdate).toHaveBeenCalled();
+    });
+  });
+
+  it('should show [Updating...] and hide "Already Installed" when update is in progress', async () => {
+    const { lastFrame } = await renderDetails(
+      true,
+      ExtensionUpdateState.UPDATING,
+    );
+    await waitFor(() => {
+      expect(lastFrame()).toContain('[Updating...]');
+      expect(lastFrame()).not.toContain('Already Installed');
+    });
+  });
 });

packages/cli/src/ui/components/views/ExtensionDetails.tsx

@@ -12,6 +12,7 @@ import { useKeypress } from '../../hooks/useKeypress.js';
 import { Command } from '../../key/keyMatchers.js';
 import { useKeyMatchers } from '../../hooks/useKeyMatchers.js';
 import { theme } from '../../semantic-colors.js';
+import { ExtensionUpdateState } from '../../state/extensions.js';
 
 export interface ExtensionDetailsProps {
   extension: RegistryExtension;
@@ -23,6 +24,8 @@ export interface ExtensionDetailsProps {
     requestConsentOverride: (consent: string) => Promise<boolean>,
   ) => void | Promise<void>;
   isInstalled: boolean;
+  updateState?: ExtensionUpdateState;
+  onUpdate?: () => void | Promise<void>;
 }
 
 export function ExtensionDetails({
@@ -31,6 +34,8 @@ export function ExtensionDetails({
   onInstall,
   onLink,
   isInstalled,
+  updateState,
+  onUpdate,
 }: ExtensionDetailsProps): React.JSX.Element {
   const keyMatchers = useKeyMatchers();
   const [consentRequest, setConsentRequest] = useState<{
@@ -76,7 +81,12 @@ export function ExtensionDetails({
         );
         return true;
       }
-      if (key.name === 'l' && isLinkable && !isInstalled && !isInstalling) {
+      if (
+        keyMatchers[Command.LINK_EXTENSION](key) &&
+        isLinkable &&
+        !isInstalled &&
+        !isInstalling
+      ) {
         setIsInstalling(true);
         void onLink(
           (prompt: string) =>
@@ -86,6 +96,14 @@ export function ExtensionDetails({
         );
         return true;
       }
+      if (
+        keyMatchers[Command.UPDATE_EXTENSION](key) &&
+        updateState === ExtensionUpdateState.UPDATE_AVAILABLE &&
+        !isInstalling
+      ) {
+        void onUpdate?.();
+        return true;
+      }
       return false;
     },
     { isActive: true, priority: true },
@@ -150,6 +168,16 @@ export function ExtensionDetails({
           <Text color={theme.text.primary} bold>
             {extension.extensionName}
           </Text>
+          {updateState === ExtensionUpdateState.UPDATE_AVAILABLE && (
+            <Box marginLeft={1}>
+              <Text color={theme.status.warning}>[I] Update</Text>
+            </Box>
+          )}
+          {updateState === ExtensionUpdateState.UPDATING && (
+            <Box marginLeft={1}>
+              <Text color={theme.text.secondary}>[Updating...]</Text>
+            </Box>
+          )}
         </Box>
         <Box flexDirection="row">
           <Text color={theme.text.secondary}>
@@ -258,7 +286,7 @@ export function ExtensionDetails({
           </Box>
         </Box>
       )}
-      {isInstalled && (
+      {isInstalled && updateState !== ExtensionUpdateState.UPDATING && (
         <Box flexDirection="row" marginTop={1} justifyContent="center">
           <Text color={theme.status.success}>Already Installed</Text>
         </Box>

packages/cli/src/ui/components/views/ExtensionRegistryView.test.tsx

@@ -21,6 +21,8 @@ import {
   type GenericListItem,
 } from '../shared/SearchableList.js';
 import { type TextBuffer } from '../shared/text-buffer.js';
+import { type UseHistoryManagerReturn } from '../../hooks/useHistoryManager.js';
+import { ExtensionUpdateState } from '../../state/extensions.js';
 
 // Mocks
 vi.mock('../../hooks/useExtensionRegistry.js');
@@ -97,6 +99,7 @@ describe('ExtensionRegistryView', () => {
 
     vi.mocked(useExtensionUpdates).mockReturnValue({
       extensionsUpdateState: new Map(),
+      dispatchExtensionStateUpdate: vi.fn(),
     } as unknown as ReturnType<typeof useExtensionUpdates>);
 
     // Mock useRegistrySearch implementation
@@ -134,6 +137,9 @@ describe('ExtensionRegistryView', () => {
         uiState: {
           staticExtraHeight: 5,
           terminalHeight: 40,
+          historyManager: {
+            addItem: vi.fn(),
+          } as unknown as UseHistoryManagerReturn,
         } as Partial<UIState>,
       },
     );
@@ -226,4 +232,42 @@ describe('ExtensionRegistryView', () => {
       );
     });
   });
+
+  it('should show [Update available] and hide [Installed] when update is available', async () => {
+    mockExtensionManager.getExtensions = vi
+      .fn()
+      .mockReturnValue([{ name: 'Test Extension 1' }]);
+    vi.mocked(useExtensionUpdates).mockReturnValue({
+      extensionsUpdateState: new Map([
+        ['Test Extension 1', ExtensionUpdateState.UPDATE_AVAILABLE],
+      ]),
+      dispatchExtensionStateUpdate: vi.fn(),
+    } as unknown as ReturnType<typeof useExtensionUpdates>);
+
+    const { lastFrame } = await renderView();
+
+    await waitFor(() => {
+      expect(lastFrame()).toContain('[Update available]');
+      expect(lastFrame()).not.toContain('[Installed]');
+    });
+  });
+
+  it('should show [Updating...] and hide [Installed] when update is in progress', async () => {
+    mockExtensionManager.getExtensions = vi
+      .fn()
+      .mockReturnValue([{ name: 'Test Extension 1' }]);
+    vi.mocked(useExtensionUpdates).mockReturnValue({
+      extensionsUpdateState: new Map([
+        ['Test Extension 1', ExtensionUpdateState.UPDATING],
+      ]),
+      dispatchExtensionStateUpdate: vi.fn(),
+    } as unknown as ReturnType<typeof useExtensionUpdates>);
+
+    const { lastFrame } = await renderView();
+
+    await waitFor(() => {
+      expect(lastFrame()).toContain('[Updating...]');
+      expect(lastFrame()).not.toContain('[Installed]');
+    });
+  });
 });

packages/cli/src/ui/components/views/ExtensionRegistryView.tsx

@@ -52,15 +52,16 @@ export function ExtensionRegistryView({
     '',
     config.getExtensionRegistryURI(),
   );
-  const { terminalHeight, staticExtraHeight } = useUIState();
+  const { terminalHeight, staticExtraHeight, historyManager } = useUIState();
   const [selectedExtension, setSelectedExtension] =
     useState<RegistryExtension | null>(null);
 
-  const { extensionsUpdateState } = useExtensionUpdates(
-    extensionManager,
-    () => 0,
-    config.getEnableExtensionReloading(),
-  );
+  const { extensionsUpdateState, dispatchExtensionStateUpdate } =
+    useExtensionUpdates(
+      extensionManager,
+      historyManager.addItem,
+      config.getEnableExtensionReloading(),
+    );
 
   const [installedExtensions, setInstalledExtensions] = useState(() =>
     extensionManager.getExtensions(),
@@ -117,6 +118,23 @@ export function ExtensionRegistryView({
     [onLink, extensionManager],
   );
 
+  const handleUpdate = useCallback(
+    async (extension: RegistryExtension) => {
+      dispatchExtensionStateUpdate({
+        type: 'SCHEDULE_UPDATE',
+        payload: {
+          all: false,
+          names: [extension.extensionName],
+          onComplete: () => {
+            // Refresh installed extensions list if needed
+            setInstalledExtensions(extensionManager.getExtensions());
+          },
+        },
+      });
+    },
+    [dispatchExtensionStateUpdate, extensionManager],
+  );
+
   const renderItem = useCallback(
     (item: ExtensionItem, isActive: boolean, _labelWidth: number) => {
       const isInstalled = installedExtensions.some(
@@ -125,7 +143,6 @@ export function ExtensionRegistryView({
       const updateState = extensionsUpdateState.get(
         item.extension.extensionName,
       );
-      const hasUpdate = updateState === ExtensionUpdateState.UPDATE_AVAILABLE;
 
       return (
         <Box flexDirection="row" width="100%" justifyContent="space-between">
@@ -148,15 +165,20 @@ export function ExtensionRegistryView({
             <Box flexShrink={0} marginX={1}>
               <Text color={theme.text.secondary}>|</Text>
             </Box>
-            {isInstalled && (
-              <Box marginRight={1} flexShrink={0}>
-                <Text color={theme.status.success}>[Installed]</Text>
-              </Box>
-            )}
-            {hasUpdate && (
+            {updateState === ExtensionUpdateState.UPDATE_AVAILABLE ? (
               <Box marginRight={1} flexShrink={0}>
                 <Text color={theme.status.warning}>[Update available]</Text>
               </Box>
+            ) : updateState === ExtensionUpdateState.UPDATING ? (
+              <Box marginRight={1} flexShrink={0}>
+                <Text color={theme.text.secondary}>[Updating...]</Text>
+              </Box>
+            ) : (
+              isInstalled && (
+                <Box marginRight={1} flexShrink={0}>
+                  <Text color={theme.status.success}>[Installed]</Text>
+                </Box>
+              )
             )}
             <Box flexShrink={1} minWidth={0}>
               <Text color={theme.text.secondary} wrap="truncate-end">
@@ -287,6 +309,12 @@ export function ExtensionRegistryView({
           isInstalled={installedExtensions.some(
             (e) => e.name === selectedExtension.extensionName,
           )}
+          updateState={extensionsUpdateState.get(
+            selectedExtension.extensionName,
+          )}
+          onUpdate={async () => {
+            await handleUpdate(selectedExtension);
+          }}
         />
       )}
     </>

packages/cli/src/ui/hooks/useReverseSearchCompletion.tsx

@@ -9,13 +9,14 @@ import { useCompletion } from './useCompletion.js';
 import type { TextBuffer } from '../components/shared/text-buffer.js';
 import type { Suggestion } from '../components/SuggestionsDisplay.js';
 
-function useDebouncedValue<T>(value: T, delay = 200): T {
+function useDebouncedValue<T>(value: T, delay = 200, enabled = true): T {
   const [debounced, setDebounced] = useState(value);
   useEffect(() => {
+    if (!enabled) return;
     const handle = setTimeout(() => setDebounced(value), delay);
     return () => clearTimeout(handle);
-  }, [value, delay]);
-  return debounced;
+  }, [value, delay, enabled]);
+  return enabled ? debounced : value;
 }
 
 export interface UseReverseSearchCompletionReturn {
@@ -48,7 +49,11 @@ export function useReverseSearchCompletion(
     setVisibleStartIndex,
   } = useCompletion();
 
-  const debouncedQuery = useDebouncedValue(buffer.text, 100);
+  const debouncedQuery = useDebouncedValue(
+    buffer.text,
+    100,
+    reverseSearchActive,
+  );
 
   // incremental search
   const prevQueryRef = useRef<string>('');

packages/cli/src/ui/key/keyBindings.ts

@@ -105,6 +105,10 @@ export enum Command {
   UNFOCUS_BACKGROUND_SHELL = 'background.unfocus',
   UNFOCUS_BACKGROUND_SHELL_LIST = 'background.unfocusList',
   SHOW_BACKGROUND_SHELL_UNFOCUS_WARNING = 'background.unfocusWarning',
+
+  // Extension Controls
+  UPDATE_EXTENSION = 'extension.update',
+  LINK_EXTENSION = 'extension.link',
 }
 
 /**
@@ -402,6 +406,10 @@ export const defaultKeyBindingConfig: KeyBindingConfig = new Map([
   [Command.UNFOCUS_BACKGROUND_SHELL, [new KeyBinding('shift+tab')]],
   [Command.UNFOCUS_BACKGROUND_SHELL_LIST, [new KeyBinding('tab')]],
   [Command.SHOW_BACKGROUND_SHELL_UNFOCUS_WARNING, [new KeyBinding('tab')]],
+
+  // Extension Controls
+  [Command.UPDATE_EXTENSION, [new KeyBinding('i')]],
+  [Command.LINK_EXTENSION, [new KeyBinding('l')]],
 ]);
 
 interface CommandCategory {
@@ -529,6 +537,10 @@ export const commandCategories: readonly CommandCategory[] = [
       Command.SHOW_BACKGROUND_SHELL_UNFOCUS_WARNING,
     ],
   },
+  {
+    title: 'Extension Controls',
+    commands: [Command.UPDATE_EXTENSION, Command.LINK_EXTENSION],
+  },
 ];
 
 /**
@@ -638,6 +650,10 @@ export const commandDescriptions: Readonly<Record<Command, string>> = {
     'Move focus from background shell list to Gemini.',
   [Command.SHOW_BACKGROUND_SHELL_UNFOCUS_WARNING]:
     'Show warning when trying to move focus away from background shell.',
+
+  // Extension Controls
+  [Command.UPDATE_EXTENSION]: 'Update the current extension if available.',
+  [Command.LINK_EXTENSION]: 'Link the current extension to a local path.',
 };
 
 const keybindingsSchema = z.array(

packages/cli/test-setup.ts

@@ -72,7 +72,9 @@ beforeEach(() => {
 
       if (
         relevantStack.includes('OverflowContext.tsx') ||
-        relevantStack.includes('useTimedMessage.ts')
+        relevantStack.includes('useTimedMessage.ts') ||
+        relevantStack.includes('useSlashCompletion.ts') ||
+        relevantStack.includes('slashCommandProcessor.ts')
       ) {
         return;
       }

packages/core/src/agents/browser/automationOverlay.ts

@@ -94,6 +94,7 @@ export async function injectAutomationOverlay(
       'evaluate_script',
       { function: buildInjectionScript() },
       signal,
+      true,
     );
 
     if (result.isError) {
@@ -120,6 +121,7 @@ export async function removeAutomationOverlay(
       'evaluate_script',
       { function: buildRemovalScript() },
       signal,
+      true,
     );
 
     if (result.isError) {

packages/core/src/agents/browser/browserAgentDefinition.ts

@@ -73,7 +73,7 @@ export function buildBrowserSystemPrompt(
           .map((d) => `- ${d}`)
           .join(
             '\n',
-          )}\nDo NOT attempt to navigate to any other domains using new_page or navigate_page, as it will be rejected. This is a hard security constraint.\nDo NOT use proxy services (e.g. Google Translate, Google AMP, or any URL translation/caching service) to access content from domains outside this list. Embedding a blocked URL as a parameter of an allowed-domain service is a direct violation of this security restriction.`
+          )}\nDo NOT attempt to navigate to any other domains using new_page or navigate_page, as it will be rejected. This is a hard security constraint.\nDo NOT use proxy services (e.g. Google Translate, Google AMP, or any URL translation/caching service) to access content from domains outside this list. Embedding a blocked URL as a parameter of an allowed-domain service is a direct violation of this security restriction.\nCRITICAL: If the user's task requires visiting a website or domain that is NOT in this allowed list, you MUST call complete_task IMMEDIATELY with success=false. Explain that the required domain is not in the allowed list and cannot be accessed. Do NOT attempt to accomplish the task by searching for the target content on allowed domains — this defeats the purpose of domain restrictions. The allowed domains list is a security policy, not a hint about which sites to use as alternatives.`
       : '';
 
   return `You are an expert browser automation agent (Orchestrator). Your goal is to completely fulfill the user's request.${allowedDomainsInstruction}
@@ -109,8 +109,9 @@ Many web apps (Google Sheets/Docs, Notion, Figma, etc.) use custom rendering rat
 
 TERMINAL FAILURES — STOP IMMEDIATELY:
 Some errors are unrecoverable and retrying will never help. When you see ANY of these, call complete_task immediately with success=false and include the EXACT error message (including any remediation steps it contains) in your summary:
-- "Could not connect to Chrome" or "Failed to connect to Chrome" or "Timed out connecting to Chrome" — Include the full error message with its remediation steps in your summary verbatim. Do NOT paraphrase or omit instructions.
+- "Could not connect to Chrome" or "Failed to connect to Chrome" or "Timed out connecting to Chrome" or "The browser is already running" — Include the full error message with its remediation steps in your summary verbatim. Do NOT paraphrase or omit instructions.
 - "Browser closed" or "Target closed" or "Session closed" — The browser process has terminated. Include the error and tell the user to try again.
+- "Domain not allowed:" — The target domain is blocked by the allowedDomains security policy. Do NOT retry with a different URL or try to find the content on an allowed domain.
 - "net::ERR_" network errors on the SAME URL after 2 retries — the site is unreachable. Report the URL and error.
 - "reached maximum action limit" — You have performed too many actions in this task. Stop immediately and report this limit to the user.
 - Any error that appears IDENTICALLY 3+ times in a row — it will not resolve by retrying.

packages/core/src/agents/browser/browserManager.test.ts

@@ -5,7 +5,7 @@
  */
 
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { BrowserManager } from './browserManager.js';
+import { BrowserManager, DomainNotAllowedError } from './browserManager.js';
 import { makeFakeConfig } from '../../test-utils/config.js';
 import type { Config } from '../../config/config.js';
 import { injectAutomationOverlay } from './automationOverlay.js';
@@ -79,6 +79,7 @@ import * as fs from 'node:fs';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
 import { getBrowserConsentIfNeeded } from '../../utils/browserConsent.js';
+import { debugLogger } from '../../utils/debugLogger.js';
 
 describe('BrowserManager', () => {
   let mockConfig: Config;
@@ -125,6 +126,16 @@ describe('BrowserManager', () => {
           }),
         }) as unknown as InstanceType<typeof Client>,
     );
+
+    vi.mocked(StdioClientTransport).mockImplementation(
+      () =>
+        ({
+          close: vi.fn().mockResolvedValue(undefined),
+          stderr: {
+            on: vi.fn(),
+          },
+        }) as unknown as InstanceType<typeof StdioClientTransport>,
+    );
   });
 
   afterEach(async () => {
@@ -224,12 +235,9 @@ describe('BrowserManager', () => {
         },
       });
       const manager = new BrowserManager(restrictedConfig);
-      const result = await manager.callTool('navigate_page', {
-        url: 'https://evil.com',
-      });
-
-      expect(result.isError).toBe(true);
-      expect((result.content || [])[0]?.text).toContain('not permitted');
+      await expect(
+        manager.callTool('navigate_page', { url: 'https://evil.com' }),
+      ).rejects.toThrow(DomainNotAllowedError);
       expect(Client).not.toHaveBeenCalled();
     });
 
@@ -276,12 +284,9 @@ describe('BrowserManager', () => {
         },
       });
       const manager = new BrowserManager(restrictedConfig);
-      const result = await manager.callTool('new_page', {
-        url: 'https://evil.com',
-      });
-
-      expect(result.isError).toBe(true);
-      expect((result.content || [])[0]?.text).toContain('not permitted');
+      await expect(
+        manager.callTool('new_page', { url: 'https://evil.com' }),
+      ).rejects.toThrow(DomainNotAllowedError);
     });
 
     it('should block proxy URL with embedded disallowed domain in query params', async () => {
@@ -293,14 +298,11 @@ describe('BrowserManager', () => {
         },
       });
       const manager = new BrowserManager(restrictedConfig);
-      const result = await manager.callTool('new_page', {
-        url: 'https://translate.google.com/translate?sl=en&tl=en&u=https://blocked.org/page',
-      });
-
-      expect(result.isError).toBe(true);
-      expect((result.content || [])[0]?.text).toContain(
-        'an embedded URL targets a disallowed domain',
-      );
+      await expect(
+        manager.callTool('new_page', {
+          url: 'https://translate.google.com/translate?sl=en&tl=en&u=https://blocked.org/page',
+        }),
+      ).rejects.toThrow(DomainNotAllowedError);
     });
 
     it('should block proxy URL with embedded disallowed domain in URL fragment (hash)', async () => {
@@ -312,14 +314,11 @@ describe('BrowserManager', () => {
         },
       });
       const manager = new BrowserManager(restrictedConfig);
-      const result = await manager.callTool('new_page', {
-        url: 'https://translate.google.com/#view=home&op=translate&sl=en&tl=zh-CN&u=https://blocked.org',
-      });
-
-      expect(result.isError).toBe(true);
-      expect((result.content || [])[0]?.text).toContain(
-        'an embedded URL targets a disallowed domain',
-      );
+      await expect(
+        manager.callTool('new_page', {
+          url: 'https://translate.google.com/#view=home&op=translate&sl=en&tl=zh-CN&u=https://blocked.org',
+        }),
+      ).rejects.toThrow(DomainNotAllowedError);
     });
 
     it('should allow proxy URL when embedded domain is also allowed', async () => {
@@ -397,7 +396,7 @@ describe('BrowserManager', () => {
       const args = vi.mocked(StdioClientTransport).mock.calls[0]?.[0]
         ?.args as string[];
       expect(args).toContain(
-        '--chromeArg="--host-rules=MAP * 127.0.0.1, EXCLUDE google.com, EXCLUDE *.openai.com, EXCLUDE 127.0.0.1"',
+        '--chromeArg="--host-rules=MAP * ~NOTFOUND, EXCLUDE google.com, EXCLUDE *.openai.com"',
       );
     });
 
@@ -694,11 +693,29 @@ describe('BrowserManager', () => {
   describe('close', () => {
     it('should close MCP connections', async () => {
       const manager = new BrowserManager(mockConfig);
-      const client = await manager.getRawMcpClient();
+      await manager.getRawMcpClient();
+
+      await manager.close();
+      expect(manager.isConnected()).toBe(false);
+    });
+
+    it('should NOT log error when transport closes during intentional close()', async () => {
+      const manager = new BrowserManager(mockConfig);
+      await manager.ensureConnection();
+
+      const transportInstance =
+        vi.mocked(StdioClientTransport).mock.results[0]?.value;
+
+      // Trigger onclose during close()
+      vi.spyOn(transportInstance, 'close').mockImplementation(async () => {
+        transportInstance.onclose?.();
+      });
 
       await manager.close();
 
-      expect(client.close).toHaveBeenCalled();
+      expect(debugLogger.error).not.toHaveBeenCalledWith(
+        expect.stringContaining('transport closed unexpectedly'),
+      );
     });
   });
 
@@ -777,6 +794,25 @@ describe('BrowserManager', () => {
       // Should not throw
       await expect(BrowserManager.resetAll()).resolves.toBeUndefined();
     });
+
+    it('should NOT log error when transport closes during resetAll()', async () => {
+      const instance = BrowserManager.getInstance(mockConfig);
+      await instance.ensureConnection();
+
+      const transportInstance =
+        vi.mocked(StdioClientTransport).mock.results[0]?.value;
+
+      // Trigger onclose during close() which is called by resetAll()
+      vi.spyOn(transportInstance, 'close').mockImplementation(async () => {
+        transportInstance.onclose?.();
+      });
+
+      await BrowserManager.resetAll();
+
+      expect(debugLogger.error).not.toHaveBeenCalledWith(
+        expect.stringContaining('transport closed unexpectedly'),
+      );
+    });
   });
 
   describe('isConnected', () => {
@@ -800,7 +836,7 @@ describe('BrowserManager', () => {
   });
 
   describe('reconnection', () => {
-    it('should reconnect after unexpected disconnect', async () => {
+    it('should reconnect after unexpected disconnect and log error', async () => {
       const manager = new BrowserManager(mockConfig);
       await manager.ensureConnection();
 
@@ -811,6 +847,10 @@ describe('BrowserManager', () => {
         transportInstance.onclose();
       }
 
+      expect(debugLogger.error).toHaveBeenCalledWith(
+        expect.stringContaining('transport closed unexpectedly'),
+      );
+
       // Manager should recognize disconnection
       expect(manager.isConnected()).toBe(false);
 
@@ -980,5 +1020,29 @@ describe('BrowserManager', () => {
         /maximum action limit \(3\)/,
       );
     });
+
+    it('should NOT increment action counter when shouldCount is false', async () => {
+      const limitedConfig = makeFakeConfig({
+        agents: {
+          browser: {
+            maxActionsPerTask: 1,
+          },
+        },
+      });
+      const manager = new BrowserManager(limitedConfig);
+
+      // Multiple calls with isInternal: true should NOT exhaust the limit
+      await manager.callTool('evaluate_script', {}, undefined, true);
+      await manager.callTool('evaluate_script', {}, undefined, true);
+      await manager.callTool('evaluate_script', {}, undefined, true);
+
+      // This should still work
+      await manager.callTool('take_snapshot', {});
+
+      // Next one should throw (limit 1 allows exactly 1 call with >= check)
+      await expect(manager.callTool('take_snapshot', {})).rejects.toThrow(
+        /maximum action limit \(1\)/,
+      );
+    });
   });
 });

packages/core/src/agents/browser/browserManager.ts

@@ -37,6 +37,18 @@ const __dirname = path.dirname(__filename);
 // Default browser profile directory name within ~/.gemini/
 const BROWSER_PROFILE_DIR = 'cli-browser-profile';
 
+/**
+ * Typed error for domain restriction violations.
+ * Thrown when a navigation tool targets a domain not in allowedDomains.
+ * Caught by mcpToolWrapper to terminate the agent immediately.
+ */
+export class DomainNotAllowedError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = 'DomainNotAllowedError';
+  }
+}
+
 // Default timeout for MCP operations
 const MCP_TIMEOUT_MS = 60_000;
 
@@ -164,6 +176,7 @@ export class BrowserManager {
   private mcpTransport: StdioClientTransport | undefined;
   private discoveredTools: McpTool[] = [];
   private disconnected = false;
+  private isClosing = false;
   private connectionPromise: Promise<void> | undefined;
 
   /** State for action rate limiting */
@@ -215,38 +228,34 @@ export class BrowserManager {
    * @param toolName The name of the tool to call
    * @param args Arguments to pass to the tool
    * @param signal Optional AbortSignal to cancel the call
+   * @param isInternal Determine if the tool is for internal execution
    * @returns The result from the MCP server
    */
   async callTool(
     toolName: string,
     args: Record<string, unknown>,
     signal?: AbortSignal,
+    isInternal: boolean = false,
   ): Promise<McpToolCallResult> {
     if (signal?.aborted) {
       throw signal.reason ?? new Error('Operation cancelled');
     }
 
     // Hard enforcement of per-action rate limit
-    if (this.actionCounter > this.maxActionsPerTask) {
-      const error = new Error(
-        `Browser agent reached maximum action limit (${this.maxActionsPerTask}). ` +
-          `Task terminated to prevent runaway execution. To config the limit, use maxActionsPerTask in the settings.`,
-      );
-      throw error;
+    if (!isInternal) {
+      if (this.actionCounter >= this.maxActionsPerTask) {
+        const error = new Error(
+          `Browser agent reached maximum action limit (${this.maxActionsPerTask}). ` +
+            `Task terminated to prevent runaway execution. To config the limit, use maxActionsPerTask in the settings.`,
+        );
+        throw error;
+      }
+      this.actionCounter++;
     }
-    this.actionCounter++;
 
     const errorMessage = this.checkNavigationRestrictions(toolName, args);
     if (errorMessage) {
-      return {
-        content: [
-          {
-            type: 'text',
-            text: errorMessage,
-          },
-        ],
-        isError: true,
-      };
+      throw new DomainNotAllowedError(errorMessage);
     }
 
     const client = await this.getRawMcpClient();
@@ -352,7 +361,7 @@ export class BrowserManager {
    */
   async ensureConnection(): Promise<void> {
     // Already connected and healthy — nothing to do
-    if (this.rawMcpClient && !this.disconnected) {
+    if (this.isConnected()) {
       return;
     }
 
@@ -416,6 +425,7 @@ export class BrowserManager {
    * the transport will terminate the browser.
    */
   async close(): Promise<void> {
+    this.isClosing = true;
     // Close MCP client first
     if (this.rawMcpClient) {
       try {
@@ -455,6 +465,7 @@ export class BrowserManager {
    * BrowserManager instance.
    */
   private async connectMcp(): Promise<void> {
+    this.isClosing = false;
     debugLogger.log('Connecting isolated MCP client to chrome-devtools-mcp...');
 
     // Create raw MCP SDK Client (not the wrapper McpClient)
@@ -522,7 +533,7 @@ export class BrowserManager {
         })
         .join(', ');
       mcpArgs.push(
-        `--chromeArg="--host-rules=MAP * 127.0.0.1, ${exclusionRules}, EXCLUDE 127.0.0.1"`,
+        `--chromeArg="--host-rules=MAP * ~NOTFOUND, ${exclusionRules}"`,
       );
     }
 
@@ -563,11 +574,14 @@ export class BrowserManager {
     }
 
     this.mcpTransport.onclose = () => {
+      this.disconnected = true;
+      if (this.isClosing) {
+        return;
+      }
       debugLogger.error(
         'chrome-devtools-mcp transport closed unexpectedly. ' +
           'The MCP server process may have crashed.',
       );
-      this.disconnected = true;
     };
     this.mcpTransport.onerror = (error: Error) => {
       debugLogger.error(
@@ -588,6 +602,8 @@ export class BrowserManager {
           debugLogger.log('MCP client connected to chrome-devtools-mcp');
           await this.discoverTools();
           this.registerInputBlockerHandler();
+          // clear the action counter for each connection
+          this.actionCounter = 0;
         })(),
         new Promise<never>((_, reject) => {
           timeoutId = setTimeout(
@@ -733,8 +749,7 @@ export class BrowserManager {
       const urlHostname = parsedUrl.hostname;
 
       if (!this.isDomainAllowed(urlHostname, allowedDomains)) {
-        // If none matched, then deny
-        return `Tool '${toolName}' is not permitted for the requested URL/domain based on your current browser settings.`;
+        return 'Domain not allowed: The requested domain is not in the allowed list.';
       }
 
       // Check query parameters for embedded URLs that could bypass domain
@@ -753,7 +768,7 @@ export class BrowserManager {
           ) {
             const embeddedHostname = embeddedUrl.hostname.replace(/\.$/, '');
             if (!this.isDomainAllowed(embeddedHostname, allowedDomains)) {
-              return `Tool '${toolName}' is not permitted: an embedded URL targets a disallowed domain.`;
+              return 'Domain not allowed: Embedded URL targets a disallowed domain.';
             }
           }
         } catch {

packages/core/src/agents/browser/inputBlocker.test.ts

@@ -34,6 +34,7 @@ describe('inputBlocker', () => {
           function: expect.stringContaining('__gemini_input_blocker'),
         },
         undefined,
+        true,
       );
     });
 
@@ -96,6 +97,7 @@ describe('inputBlocker', () => {
           function: expect.stringContaining('__gemini_input_blocker'),
         }),
         undefined,
+        true,
       );
       expect(mockBrowserManager.callTool).toHaveBeenNthCalledWith(
         2,
@@ -104,6 +106,7 @@ describe('inputBlocker', () => {
           function: expect.stringContaining('__gemini_input_blocker'),
         }),
         undefined,
+        true,
       );
     });
   });
@@ -118,6 +121,7 @@ describe('inputBlocker', () => {
           function: expect.stringContaining('__gemini_input_blocker'),
         },
         undefined,
+        true,
       );
     });
 
@@ -163,6 +167,7 @@ describe('inputBlocker', () => {
           function: expect.stringContaining('__gemini_input_blocker'),
         }),
         undefined,
+        true,
       );
       expect(mockBrowserManager.callTool).toHaveBeenNthCalledWith(
         2,
@@ -171,6 +176,7 @@ describe('inputBlocker', () => {
           function: expect.stringContaining('__gemini_input_blocker'),
         }),
         undefined,
+        true,
       );
     });
   });

packages/core/src/agents/browser/inputBlocker.ts

@@ -205,6 +205,7 @@ export async function injectInputBlocker(
       'evaluate_script',
       { function: INPUT_BLOCKER_FUNCTION },
       signal,
+      true,
     );
     debugLogger.log('Input blocker injected successfully');
   } catch (error) {
@@ -232,6 +233,7 @@ export async function removeInputBlocker(
       'evaluate_script',
       { function: REMOVE_BLOCKER_FUNCTION },
       signal,
+      true,
     );
     debugLogger.log('Input blocker removed successfully');
   } catch (error) {
@@ -257,6 +259,7 @@ export async function suspendInputBlocker(
       'evaluate_script',
       { function: SUSPEND_BLOCKER_FUNCTION },
       signal,
+      true,
     );
   } catch {
     // Non-critical — tool call will still attempt to proceed
@@ -276,6 +279,7 @@ export async function resumeInputBlocker(
       'evaluate_script',
       { function: RESUME_BLOCKER_FUNCTION },
       signal,
+      true,
     );
   } catch {
     // Non-critical

packages/core/src/agents/browser/mcpToolWrapper.test.ts

@@ -225,6 +225,7 @@ describe('mcpToolWrapper', () => {
           function: expect.stringContaining('__gemini_input_blocker'),
         }),
         expect.any(AbortSignal),
+        true,
       );
 
       // Second call: click
@@ -243,6 +244,7 @@ describe('mcpToolWrapper', () => {
           function: expect.stringContaining('__gemini_input_blocker'),
         }),
         expect.any(AbortSignal),
+        true,
       );
     });
 

packages/core/src/agents/browser/mcpToolWrapper.ts

@@ -28,7 +28,11 @@ import {
   type PolicyUpdateOptions,
 } from '../../tools/tools.js';
 import type { MessageBus } from '../../confirmation-bus/message-bus.js';
-import type { BrowserManager, McpToolCallResult } from './browserManager.js';
+import {
+  type BrowserManager,
+  type McpToolCallResult,
+  DomainNotAllowedError,
+} from './browserManager.js';
 import { debugLogger } from '../../utils/debugLogger.js';
 import { suspendInputBlocker, resumeInputBlocker } from './inputBlocker.js';
 import { MCP_TOOL_PREFIX } from '../../tools/mcp-tool.js';
@@ -173,9 +177,13 @@ class McpToolInvocation extends BaseToolInvocation<
     } catch (error) {
       const errorMsg = error instanceof Error ? error.message : String(error);
 
-      // Chrome connection errors are fatal — re-throw to terminate the agent
-      // immediately instead of returning a result the LLM would retry.
-      if (errorMsg.includes('Could not connect to Chrome')) {
+      // Domain restriction and Chrome connection errors are fatal — re-throw
+      // to terminate the agent immediately instead of returning a result
+      // the LLM would retry or work around.
+      if (
+        error instanceof DomainNotAllowedError ||
+        errorMsg.includes('Could not connect to Chrome')
+      ) {
         throw error;
       }
 

packages/core/src/config/config.ts

@@ -186,6 +186,7 @@ export interface SummarizeToolOutputSettings {
 }
 
 export interface PlanSettings {
+  enabled?: boolean;
   directory?: string;
   modelRouting?: boolean;
 }
@@ -1150,7 +1151,7 @@ export class Config implements McpContext, AgentLoopContext {
       modelConfigServiceConfig ?? DEFAULT_MODEL_CONFIGS,
     );
 
-    this.experimentalJitContext = params.experimentalJitContext ?? true;
+    this.experimentalJitContext = params.experimentalJitContext ?? false;
     this.experimentalMemoryManager = params.experimentalMemoryManager ?? false;
     this.memoryBoundaryMarkers = params.memoryBoundaryMarkers ?? ['.git'];
     this.contextManagement = {

packages/core/src/core/geminiChat.ts

@@ -163,90 +163,34 @@ function extractCuratedHistory(comprehensiveHistory: Content[]): Content[] {
     return [];
   }
   const curatedHistory: Content[] = [];
-
-  for (const entry of comprehensiveHistory) {
-    const role = entry.role;
-    const rawParts = entry.parts || [];
-
-    // Filter out invalid/empty parts
-    const validParts = rawParts.filter((part) => {
-      if (part === undefined || Object.keys(part).length === 0) {
-        return false;
-      }
-      // Thought parts must be non-empty strings
-      if (part.thought !== undefined) {
-        return (
-          typeof part.thought === 'string' &&
-          (part.thought as string).trim() !== ''
-        );
-      }
-      // Text parts must be non-empty strings
-      if (part.text !== undefined) {
-        return typeof part.text === 'string' && part.text.trim() !== '';
-      }
-      // Keep other parts (functionCall, functionResponse, etc.)
-      return true;
-    });
-
-    if (validParts.length === 0) {
-      continue;
-    }
-
-    let lastEntry = curatedHistory[curatedHistory.length - 1];
-    if (!lastEntry || lastEntry.role !== role) {
-      // Create new entry
-      lastEntry = {
-        role,
-        parts: [],
-      };
-      curatedHistory.push(lastEntry);
-    }
-
-    const lastEntryParts = lastEntry.parts || [];
-    for (const part of validParts) {
-      if (part.text !== undefined) {
-        // Coalesce text into the last text part of this turn
-        const existingTextPart = lastEntryParts.find(
-          (p) => p.text !== undefined,
-        );
-        if (existingTextPart) {
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-          const lastText = existingTextPart.text as string;
-          const separator = lastText.endsWith('\n') ? '' : '\n';
-
-          existingTextPart.text = lastText + separator + part.text;
-        } else {
-          lastEntryParts.push({ ...part });
+  const length = comprehensiveHistory.length;
+  let i = 0;
+  while (i < length) {
+    if (comprehensiveHistory[i].role === 'user') {
+      curatedHistory.push(comprehensiveHistory[i]);
+      i++;
+    } else {
+      const modelOutput: Content[] = [];
+      let isValid = true;
+      while (i < length && comprehensiveHistory[i].role === 'model') {
+        modelOutput.push(comprehensiveHistory[i]);
+        if (isValid && !isValidContent(comprehensiveHistory[i])) {
+          isValid = false;
         }
-      } else if (part.thought !== undefined) {
-        // Coalesce thought into the last thought part of this turn
-        const existingThoughtPart = lastEntryParts.find(
-          (p) => p.thought !== undefined,
-        );
-        if (existingThoughtPart) {
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-          const lastThought = existingThoughtPart.thought as unknown as string;
-          const separator = lastThought.endsWith('\n') ? '' : '\n';
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-          existingThoughtPart.thought = (lastThought +
-            separator +
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-            (part.thought as unknown as string)) as unknown as boolean;
-        } else {
-          // Insert thought at the beginning for model consistency
-          lastEntryParts.unshift({ ...part });
-        }
-      } else {
-        // Add as is (functionCall, functionResponse)
-        lastEntryParts.push({ ...part });
+        i++;
+      }
+      if (isValid) {
+        curatedHistory.push(...modelOutput);
       }
     }
-    lastEntry.parts = lastEntryParts;
   }
-
   return curatedHistory;
 }
 
+/**
+ * Custom error to signal that a stream completed with invalid content,
+ * which should trigger a retry.
+ */
 export class InvalidStreamError extends Error {
   readonly type:
     | 'NO_FINISH_REASON'
@@ -398,17 +342,7 @@ export class GeminiChat {
     }
 
     // Add user content to history ONCE before any attempts.
-    if (
-      this.history.length > 0 &&
-      this.history[this.history.length - 1].role === 'user'
-    ) {
-      const lastUser = this.history[this.history.length - 1];
-      const lastUserParts = lastUser.parts || [];
-      const currentUserParts = userContent.parts || [];
-      lastUser.parts = [...lastUserParts, ...currentUserParts];
-    } else {
-      this.history.push(userContent);
-    }
+    this.history.push(userContent);
     const requestContents = this.getHistory(true);
 
     const streamWithRetries = async function* (
@@ -1001,8 +935,7 @@ export class GeminiChat {
         isValidNonThoughtTextPart(lastPart) &&
         isValidNonThoughtTextPart(part)
       ) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-        (lastPart as { text: string }).text += part.text as string;
+        lastPart.text += part.text;
       } else {
         consolidatedParts.push(part);
       }
@@ -1010,8 +943,7 @@ export class GeminiChat {
 
     const responseText = consolidatedParts
       .filter((part) => part.text)
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-      .map((part) => part.text as string)
+      .map((part) => part.text)
       .join('')
       .trim();
 
@@ -1117,6 +1049,7 @@ export class GeminiChat {
 
     const thoughtPart = content.parts[0];
     if (thoughtPart.text) {
+      // Extract subject and description using the same logic as turn.ts
       const rawText = thoughtPart.text;
       const subjectStringMatches = rawText.match(/\*\*(.*?)\*\*/s);
       const subject = subjectStringMatches

packages/core/src/core/turn.test.ts

@@ -274,7 +274,7 @@ describe('Turn', () => {
       expect(reportError).toHaveBeenCalledWith(
         error,
         'Error when talking to Gemini API',
-        [...historyContent],
+        [...historyContent, { role: 'user', parts: reqParts }],
         'Turn.run-sendMessageStream',
       );
     });

packages/core/src/core/turn.ts

@@ -5,6 +5,7 @@
  */
 
 import {
+  createUserContent,
   type PartListUnion,
   type GenerateContentResponse,
   type FunctionCall,
@@ -374,7 +375,10 @@ export class Turn {
         throw error;
       }
 
-      const contextForReport = [...this.chat.getHistory(/*curated*/ true)];
+      const contextForReport = [
+        ...this.chat.getHistory(/*curated*/ true),
+        createUserContent(req),
+      ];
       await reportError(
         error,
         'Error when talking to Gemini API',

packages/core/src/sandbox/linux/LinuxSandboxManager.test.ts

@@ -317,7 +317,7 @@ describe('LinuxSandboxManager', () => {
         );
       });
 
-      it('should not grant read-write access to allowedPaths inside the workspace when readonly mode is active', async () => {
+      it('should grant read-write access to allowedPaths inside the workspace even when readonly mode is active', async () => {
         const manager = new LinuxSandboxManager({
           workspace,
           modeConfig: { readonly: true },
@@ -333,7 +333,7 @@ describe('LinuxSandboxManager', () => {
         });
         const bwrapArgs = result.args;
         const bindIndex = bwrapArgs.indexOf(workspace + '/subdirectory');
-        expect(bwrapArgs[bindIndex - 1]).toBe('--ro-bind-try');
+        expect(bwrapArgs[bindIndex - 1]).toBe('--bind-try');
       });
 
       it('should not bind the workspace twice even if it has a trailing slash in allowedPaths', async () => {

packages/core/src/sandbox/linux/LinuxSandboxManager.ts

@@ -40,6 +40,7 @@ import {
   isDangerousCommand,
 } from '../utils/commandSafety.js';
 import { parsePosixSandboxDenials } from '../utils/sandboxDenialUtils.js';
+import { handleReadWriteCommands } from '../utils/sandboxReadWriteUtils.js';
 
 let cachedBpfPath: string | undefined;
 
@@ -211,6 +212,13 @@ export class LinuxSandboxManager implements SandboxManager {
         false,
     };
 
+    const { command: finalCommand, args: finalArgs } = handleReadWriteCommands(
+      req,
+      mergedAdditional,
+      this.options.workspace,
+      req.policy?.allowedPaths,
+    );
+
     const sanitizationConfig = getSecureSanitizationConfig(
       req.policy?.sanitizationConfig,
     );
@@ -279,14 +287,7 @@ export class LinuxSandboxManager implements SandboxManager {
       if (!fs.existsSync(resolved)) continue;
       const normalizedAllowedPath = normalize(resolved).replace(/\/$/, '');
       if (normalizedAllowedPath !== normalizedWorkspace) {
-        if (
-          !workspaceWrite &&
-          normalizedAllowedPath.startsWith(normalizedWorkspace + '/')
-        ) {
-          bwrapArgs.push('--ro-bind-try', resolved, resolved);
-        } else {
-          bwrapArgs.push('--bind-try', resolved, resolved);
-        }
+        bwrapArgs.push('--bind-try', resolved, resolved);
       }
     }
 
@@ -362,7 +363,7 @@ export class LinuxSandboxManager implements SandboxManager {
     const bpfPath = getSeccompBpfPath();
 
     bwrapArgs.push('--seccomp', '9');
-    bwrapArgs.push('--', req.command, ...req.args);
+    bwrapArgs.push('--', finalCommand, ...finalArgs);
 
     const shArgs = [
       '-c',

packages/core/src/sandbox/macos/MacOsSandboxManager.test.ts

@@ -17,7 +17,7 @@ describe('MacOsSandboxManager', () => {
   const mockNetworkAccess = true;
 
   let mockPolicy: ExecutionPolicy;
-  let manager: MacOsSandboxManager;
+  let manager: MacOsSandboxManager | undefined;
 
   beforeEach(() => {
     mockWorkspace = fs.mkdtempSync(
@@ -35,18 +35,10 @@ describe('MacOsSandboxManager', () => {
       networkAccess: mockNetworkAccess,
     };
 
-    manager = new MacOsSandboxManager({
-      workspace: mockWorkspace,
-      forbiddenPaths: [],
-    });
-
     // Mock the seatbelt args builder to isolate manager tests
-    vi.spyOn(seatbeltArgsBuilder, 'buildSeatbeltArgs').mockReturnValue([
-      '-p',
+    vi.spyOn(seatbeltArgsBuilder, 'buildSeatbeltProfile').mockReturnValue(
       '(mock profile)',
-      '-D',
-      'MOCK_VAR=value',
-    ]);
+    );
   });
 
   afterEach(() => {
@@ -59,6 +51,7 @@ describe('MacOsSandboxManager', () => {
 
   describe('prepareCommand', () => {
     it('should correctly format the base command and args', async () => {
+      manager = new MacOsSandboxManager({ workspace: mockWorkspace });
       const result = await manager.prepareCommand({
         command: 'echo',
         args: ['hello'],
@@ -67,11 +60,11 @@ describe('MacOsSandboxManager', () => {
         policy: mockPolicy,
       });
 
-      expect(seatbeltArgsBuilder.buildSeatbeltArgs).toHaveBeenCalledWith({
+      expect(seatbeltArgsBuilder.buildSeatbeltProfile).toHaveBeenCalledWith({
         workspace: mockWorkspace,
         allowedPaths: mockAllowedPaths,
-        networkAccess: mockNetworkAccess,
-        forbiddenPaths: [],
+        forbiddenPaths: undefined,
+        networkAccess: true,
         workspaceWrite: true,
         additionalPermissions: {
           fileSystem: {
@@ -83,18 +76,23 @@ describe('MacOsSandboxManager', () => {
       });
 
       expect(result.program).toBe('/usr/bin/sandbox-exec');
-      expect(result.args).toEqual([
-        '-p',
-        '(mock profile)',
-        '-D',
-        'MOCK_VAR=value',
-        '--',
-        'echo',
-        'hello',
-      ]);
+      expect(result.args[0]).toBe('-f');
+      expect(result.args[1]).toMatch(/gemini-cli-seatbelt-.*\.sb$/);
+      expect(result.args.slice(2)).toEqual(['--', 'echo', 'hello']);
+
+      // Verify temp file was written
+      const tempFile = result.args[1];
+      expect(fs.existsSync(tempFile)).toBe(true);
+      expect(fs.readFileSync(tempFile, 'utf8')).toBe('(mock profile)');
+
+      // Verify cleanup callback deletes the file
+      expect(result.cleanup).toBeDefined();
+      result.cleanup!();
+      expect(fs.existsSync(tempFile)).toBe(false);
     });
 
     it('should correctly pass through the cwd to the resulting command', async () => {
+      manager = new MacOsSandboxManager({ workspace: mockWorkspace });
       const result = await manager.prepareCommand({
         command: 'echo',
         args: ['hello'],
@@ -107,6 +105,7 @@ describe('MacOsSandboxManager', () => {
     });
 
     it('should apply environment sanitization via the default mechanisms', async () => {
+      manager = new MacOsSandboxManager({ workspace: mockWorkspace });
       const result = await manager.prepareCommand({
         command: 'echo',
         args: ['hello'],
@@ -126,6 +125,7 @@ describe('MacOsSandboxManager', () => {
     });
 
     it('should allow network when networkAccess is true', async () => {
+      manager = new MacOsSandboxManager({ workspace: mockWorkspace });
       await manager.prepareCommand({
         command: 'echo',
         args: ['hello'],
@@ -134,13 +134,14 @@ describe('MacOsSandboxManager', () => {
         policy: { ...mockPolicy, networkAccess: true },
       });
 
-      expect(seatbeltArgsBuilder.buildSeatbeltArgs).toHaveBeenCalledWith(
+      expect(seatbeltArgsBuilder.buildSeatbeltProfile).toHaveBeenCalledWith(
         expect.objectContaining({ networkAccess: true }),
       );
     });
 
     describe('governance files', () => {
       it('should ensure governance files exist', async () => {
+        manager = new MacOsSandboxManager({ workspace: mockWorkspace });
         await manager.prepareCommand({
           command: 'echo',
           args: [],
@@ -151,7 +152,7 @@ describe('MacOsSandboxManager', () => {
 
         // The seatbelt builder internally handles governance files, so we simply verify
         // it is invoked correctly with the right workspace.
-        expect(seatbeltArgsBuilder.buildSeatbeltArgs).toHaveBeenCalledWith(
+        expect(seatbeltArgsBuilder.buildSeatbeltProfile).toHaveBeenCalledWith(
           expect.objectContaining({ workspace: mockWorkspace }),
         );
       });
@@ -159,6 +160,7 @@ describe('MacOsSandboxManager', () => {
 
     describe('allowedPaths', () => {
       it('should parameterize allowed paths and normalize them', async () => {
+        manager = new MacOsSandboxManager({ workspace: mockWorkspace });
         await manager.prepareCommand({
           command: 'echo',
           args: [],
@@ -170,7 +172,7 @@ describe('MacOsSandboxManager', () => {
           },
         });
 
-        expect(seatbeltArgsBuilder.buildSeatbeltArgs).toHaveBeenCalledWith(
+        expect(seatbeltArgsBuilder.buildSeatbeltProfile).toHaveBeenCalledWith(
           expect.objectContaining({
             allowedPaths: ['/tmp/allowed1', '/tmp/allowed2'],
           }),
@@ -180,11 +182,11 @@ describe('MacOsSandboxManager', () => {
 
     describe('forbiddenPaths', () => {
       it('should parameterize forbidden paths and explicitly deny them', async () => {
-        const managerWithForbidden = new MacOsSandboxManager({
+        manager = new MacOsSandboxManager({
           workspace: mockWorkspace,
           forbiddenPaths: ['/tmp/forbidden1'],
         });
-        await managerWithForbidden.prepareCommand({
+        await manager.prepareCommand({
           command: 'echo',
           args: [],
           cwd: mockWorkspace,
@@ -192,7 +194,7 @@ describe('MacOsSandboxManager', () => {
           policy: mockPolicy,
         });
 
-        expect(seatbeltArgsBuilder.buildSeatbeltArgs).toHaveBeenCalledWith(
+        expect(seatbeltArgsBuilder.buildSeatbeltProfile).toHaveBeenCalledWith(
           expect.objectContaining({
             forbiddenPaths: ['/tmp/forbidden1'],
           }),
@@ -200,11 +202,11 @@ describe('MacOsSandboxManager', () => {
       });
 
       it('explicitly denies non-existent forbidden paths to prevent creation', async () => {
-        const managerWithForbidden = new MacOsSandboxManager({
+        manager = new MacOsSandboxManager({
           workspace: mockWorkspace,
           forbiddenPaths: ['/tmp/does-not-exist'],
         });
-        await managerWithForbidden.prepareCommand({
+        await manager.prepareCommand({
           command: 'echo',
           args: [],
           cwd: mockWorkspace,
@@ -212,7 +214,7 @@ describe('MacOsSandboxManager', () => {
           policy: mockPolicy,
         });
 
-        expect(seatbeltArgsBuilder.buildSeatbeltArgs).toHaveBeenCalledWith(
+        expect(seatbeltArgsBuilder.buildSeatbeltProfile).toHaveBeenCalledWith(
           expect.objectContaining({
             forbiddenPaths: ['/tmp/does-not-exist'],
           }),
@@ -220,11 +222,11 @@ describe('MacOsSandboxManager', () => {
       });
 
       it('should override allowed paths if a path is also in forbidden paths', async () => {
-        const managerWithForbidden = new MacOsSandboxManager({
+        manager = new MacOsSandboxManager({
           workspace: mockWorkspace,
           forbiddenPaths: ['/tmp/conflict'],
         });
-        await managerWithForbidden.prepareCommand({
+        await manager.prepareCommand({
           command: 'echo',
           args: [],
           cwd: mockWorkspace,
@@ -235,7 +237,7 @@ describe('MacOsSandboxManager', () => {
           },
         });
 
-        expect(seatbeltArgsBuilder.buildSeatbeltArgs).toHaveBeenCalledWith(
+        expect(seatbeltArgsBuilder.buildSeatbeltProfile).toHaveBeenCalledWith(
           expect.objectContaining({
             allowedPaths: ['/tmp/conflict'],
             forbiddenPaths: ['/tmp/conflict'],

packages/core/src/sandbox/macos/MacOsSandboxManager.ts

@@ -4,6 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
 import {
   type SandboxManager,
   type SandboxRequest,
@@ -17,7 +20,7 @@ import {
   sanitizeEnvironment,
   getSecureSanitizationConfig,
 } from '../../services/environmentSanitization.js';
-import { buildSeatbeltArgs } from './seatbeltArgsBuilder.js';
+import { buildSeatbeltProfile } from './seatbeltArgsBuilder.js';
 import {
   initializeShellParsers,
   getCommandName,
@@ -29,10 +32,8 @@ import {
 } from '../utils/commandSafety.js';
 import { verifySandboxOverrides } from '../utils/commandUtils.js';
 import { parsePosixSandboxDenials } from '../utils/sandboxDenialUtils.js';
+import { handleReadWriteCommands } from '../utils/sandboxReadWriteUtils.js';
 
-/**
- * A SandboxManager implementation for macOS that uses Seatbelt.
- */
 export class MacOsSandboxManager implements SandboxManager {
   constructor(private readonly options: GlobalSandboxOptions) {}
 
@@ -105,7 +106,14 @@ export class MacOsSandboxManager implements SandboxManager {
         false,
     };
 
-    const sandboxArgs = buildSeatbeltArgs({
+    const { command: finalCommand, args: finalArgs } = handleReadWriteCommands(
+      req,
+      mergedAdditional,
+      this.options.workspace,
+      req.policy?.allowedPaths,
+    );
+
+    const sandboxArgs = buildSeatbeltProfile({
       workspace: this.options.workspace,
       allowedPaths: [...(req.policy?.allowedPaths || [])],
       forbiddenPaths: this.options.forbiddenPaths,
@@ -114,11 +122,29 @@ export class MacOsSandboxManager implements SandboxManager {
       additionalPermissions: mergedAdditional,
     });
 
+    const tempFile = this.writeProfileToTempFile(sandboxArgs);
+
     return {
       program: '/usr/bin/sandbox-exec',
-      args: [...sandboxArgs, '--', req.command, ...req.args],
+      args: ['-f', tempFile, '--', finalCommand, ...finalArgs],
       env: sanitizedEnv,
       cwd: req.cwd,
+      cleanup: () => {
+        try {
+          fs.unlinkSync(tempFile);
+        } catch {
+          // Ignore cleanup errors
+        }
+      },
     };
   }
+
+  private writeProfileToTempFile(profile: string): string {
+    const tempFile = path.join(
+      os.tmpdir(),
+      `gemini-cli-seatbelt-${Date.now()}-${Math.random().toString(36).slice(2)}.sb`,
+    );
+    fs.writeFileSync(tempFile, profile, { mode: 0o600 });
+    return tempFile;
+  }
 }

packages/core/src/sandbox/macos/baseProfile.ts

@@ -134,12 +134,6 @@ export const BASE_SEATBELT_PROFILE = `(version 1)
   (literal "/dev/zero")
   (subpath "/tmp")
   (subpath "/private/tmp")
-  (subpath (param "TMPDIR"))
-)
-
-; Workspace access using parameterized paths
-(allow file-read*
-  (subpath (param "WORKSPACE"))
 )
 
 `;

packages/core/src/sandbox/macos/seatbeltArgsBuilder.test.ts

@@ -4,10 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { describe, it, expect, vi, afterEach } from 'vitest';
-import { buildSeatbeltArgs } from './seatbeltArgsBuilder.js';
+import {
+  buildSeatbeltProfile,
+  escapeSchemeString,
+} from './seatbeltArgsBuilder.js';
 import * as fsUtils from '../utils/fsUtils.js';
 import fs from 'node:fs';
-import os from 'node:os';
 
 vi.mock('../utils/fsUtils.js', async () => {
   const actual = await vi.importActual('../utils/fsUtils.js');
@@ -23,34 +25,34 @@ describe('seatbeltArgsBuilder', () => {
     vi.restoreAllMocks();
   });
 
-  describe('buildSeatbeltArgs', () => {
-    it('should build a strict allowlist profile allowing the workspace via param', () => {
+  describe('escapeSchemeString', () => {
+    it('escapes quotes and backslashes', () => {
+      expect(escapeSchemeString('path/to/"file"')).toBe('path/to/\\"file\\"');
+      expect(escapeSchemeString('path\\to\\file')).toBe('path\\\\to\\\\file');
+    });
+  });
+
+  describe('buildSeatbeltProfile', () => {
+    it('should build a strict allowlist profile allowing the workspace', () => {
       vi.mocked(fsUtils.tryRealpath).mockImplementation((p) => p);
 
-      const args = buildSeatbeltArgs({
+      const profile = buildSeatbeltProfile({
         workspace: '/Users/test/workspace',
       });
 
-      expect(args[0]).toBe('-p');
-      const profile = args[1];
       expect(profile).toContain('(version 1)');
       expect(profile).toContain('(deny default)');
       expect(profile).toContain('(allow process-exec)');
-      expect(profile).toContain('(subpath (param "WORKSPACE"))');
+      expect(profile).toContain(`(subpath "/Users/test/workspace")`);
       expect(profile).not.toContain('(allow network*)');
-
-      expect(args).toContain('-D');
-      expect(args).toContain('WORKSPACE=/Users/test/workspace');
-      expect(args).toContain(`TMPDIR=${os.tmpdir()}`);
     });
 
     it('should allow network when networkAccess is true', () => {
       vi.mocked(fsUtils.tryRealpath).mockImplementation((p) => p);
-      const args = buildSeatbeltArgs({
+      const profile = buildSeatbeltProfile({
         workspace: '/test',
         networkAccess: true,
       });
-      const profile = args[1];
       expect(profile).toContain('(allow network-outbound)');
     });
 
@@ -66,20 +68,16 @@ describe('seatbeltArgsBuilder', () => {
             }) as unknown as fs.Stats,
         );
 
-        const args = buildSeatbeltArgs({
+        const profile = buildSeatbeltProfile({
           workspace: '/test/workspace',
         });
-        const profile = args[1];
 
-        expect(args).toContain('-D');
-        expect(args).toContain('GOVERNANCE_FILE_0=/test/workspace/.gitignore');
         expect(profile).toContain(
-          '(deny file-write* (literal (param "GOVERNANCE_FILE_0")))',
+          `(deny file-write* (literal "/test/workspace/.gitignore"))`,
         );
 
-        expect(args).toContain('GOVERNANCE_FILE_2=/test/workspace/.git');
         expect(profile).toContain(
-          '(deny file-write* (subpath (param "GOVERNANCE_FILE_2")))',
+          `(deny file-write* (subpath "/test/workspace/.git"))`,
         );
       });
 
@@ -98,58 +96,45 @@ describe('seatbeltArgsBuilder', () => {
             }) as unknown as fs.Stats,
         );
 
-        const args = buildSeatbeltArgs({ workspace: '/test/workspace' });
-        const profile = args[1];
+        const profile = buildSeatbeltProfile({ workspace: '/test/workspace' });
 
-        expect(args).toContain('GOVERNANCE_FILE_0=/test/workspace/.gitignore');
-        expect(args).toContain('REAL_GOVERNANCE_FILE_0=/test/real/.gitignore');
         expect(profile).toContain(
-          '(deny file-write* (literal (param "GOVERNANCE_FILE_0")))',
+          `(deny file-write* (literal "/test/workspace/.gitignore"))`,
         );
         expect(profile).toContain(
-          '(deny file-write* (literal (param "REAL_GOVERNANCE_FILE_0")))',
+          `(deny file-write* (literal "/test/real/.gitignore"))`,
         );
       });
     });
 
     describe('allowedPaths', () => {
-      it('should parameterize allowed paths and normalize them', () => {
+      it('should embed allowed paths and normalize them', () => {
         vi.mocked(fsUtils.tryRealpath).mockImplementation((p) => {
           if (p === '/test/symlink') return '/test/real_path';
           return p;
         });
 
-        const args = buildSeatbeltArgs({
+        const profile = buildSeatbeltProfile({
           workspace: '/test',
           allowedPaths: ['/custom/path1', '/test/symlink'],
         });
 
-        const profile = args[1];
-        expect(profile).toContain('(subpath (param "ALLOWED_PATH_0"))');
-        expect(profile).toContain('(subpath (param "ALLOWED_PATH_1"))');
-
-        expect(args).toContain('-D');
-        expect(args).toContain('ALLOWED_PATH_0=/custom/path1');
-        expect(args).toContain('ALLOWED_PATH_1=/test/real_path');
+        expect(profile).toContain(`(subpath "/custom/path1")`);
+        expect(profile).toContain(`(subpath "/test/real_path")`);
       });
     });
 
     describe('forbiddenPaths', () => {
-      it('should parameterize forbidden paths and explicitly deny them', () => {
+      it('should explicitly deny forbidden paths', () => {
         vi.mocked(fsUtils.tryRealpath).mockImplementation((p) => p);
 
-        const args = buildSeatbeltArgs({
+        const profile = buildSeatbeltProfile({
           workspace: '/test',
           forbiddenPaths: ['/secret/path'],
         });
 
-        const profile = args[1];
-
-        expect(args).toContain('-D');
-        expect(args).toContain('FORBIDDEN_PATH_0=/secret/path');
-
         expect(profile).toContain(
-          '(deny file-read* file-write* (subpath (param "FORBIDDEN_PATH_0")))',
+          `(deny file-read* file-write* (subpath "/secret/path"))`,
         );
       });
 
@@ -161,54 +146,40 @@ describe('seatbeltArgsBuilder', () => {
           return p;
         });
 
-        const args = buildSeatbeltArgs({
+        const profile = buildSeatbeltProfile({
           workspace: '/test',
           forbiddenPaths: ['/test/symlink'],
         });
 
-        const profile = args[1];
-
-        expect(args).toContain('-D');
-        expect(args).toContain('FORBIDDEN_PATH_0=/test/real_path');
         expect(profile).toContain(
-          '(deny file-read* file-write* (subpath (param "FORBIDDEN_PATH_0")))',
+          `(deny file-read* file-write* (subpath "/test/real_path"))`,
         );
       });
 
       it('explicitly denies non-existent forbidden paths to prevent creation', () => {
         vi.mocked(fsUtils.tryRealpath).mockImplementation((p) => p);
 
-        const args = buildSeatbeltArgs({
+        const profile = buildSeatbeltProfile({
           workspace: '/test',
           forbiddenPaths: ['/test/missing-dir/missing-file.txt'],
         });
 
-        const profile = args[1];
-
-        expect(args).toContain('-D');
-        expect(args).toContain(
-          'FORBIDDEN_PATH_0=/test/missing-dir/missing-file.txt',
-        );
         expect(profile).toContain(
-          '(deny file-read* file-write* (subpath (param "FORBIDDEN_PATH_0")))',
+          `(deny file-read* file-write* (subpath "/test/missing-dir/missing-file.txt"))`,
         );
       });
 
       it('should override allowed paths if a path is also in forbidden paths', () => {
         vi.mocked(fsUtils.tryRealpath).mockImplementation((p) => p);
 
-        const args = buildSeatbeltArgs({
+        const profile = buildSeatbeltProfile({
           workspace: '/test',
           allowedPaths: ['/custom/path1'],
           forbiddenPaths: ['/custom/path1'],
         });
 
-        const profile = args[1];
-
-        const allowString =
-          '(allow file-read* file-write* (subpath (param "ALLOWED_PATH_0")))';
-        const denyString =
-          '(deny file-read* file-write* (subpath (param "FORBIDDEN_PATH_0")))';
+        const allowString = `(allow file-read* file-write* (subpath "/custom/path1"))`;
+        const denyString = `(deny file-read* file-write* (subpath "/custom/path1"))`;
 
         expect(profile).toContain(allowString);
         expect(profile).toContain(denyString);

packages/core/src/sandbox/macos/seatbeltArgsBuilder.ts

@@ -20,7 +20,7 @@ import {
 import { tryRealpath, resolveGitWorktreePaths } from '../utils/fsUtils.js';
 
 /**
- * Options for building macOS Seatbelt arguments.
+ * Options for building macOS Seatbelt profile.
  */
 export interface SeatbeltArgsOptions {
   /** The primary workspace path to allow access to. */
@@ -38,28 +38,29 @@ export interface SeatbeltArgsOptions {
 }
 
 /**
- * Builds the arguments array for sandbox-exec using a strict allowlist profile.
- * It relies on parameters passed to sandbox-exec via the -D flag to avoid
- * string interpolation vulnerabilities, and normalizes paths against symlink escapes.
- *
- * Returns arguments up to the end of sandbox-exec configuration (e.g. ['-p', '<profile>', '-D', ...])
- * Does not include the final '--' separator or the command to run.
+ * Escapes a string for use within a Scheme string literal "..."
  */
-export function buildSeatbeltArgs(options: SeatbeltArgsOptions): string[] {
+export function escapeSchemeString(str: string): string {
+  return str.replace(/[\\"]/g, '\\$&');
+}
+
+/**
+ * Builds a complete macOS Seatbelt profile string using a strict allowlist.
+ * It embeds paths directly into the profile, properly escaped for Scheme.
+ */
+export function buildSeatbeltProfile(options: SeatbeltArgsOptions): string {
   let profile = BASE_SEATBELT_PROFILE + '\n';
-  const args: string[] = [];
 
   const workspacePath = tryRealpath(options.workspace);
-  args.push('-D', `WORKSPACE=${workspacePath}`);
-  args.push('-D', `WORKSPACE_RAW=${options.workspace}`);
-  profile += `(allow file-read* (subpath (param "WORKSPACE_RAW")))\n`;
+  profile += `(allow file-read* (subpath "${escapeSchemeString(options.workspace)}"))\n`;
+  profile += `(allow file-read* (subpath "${escapeSchemeString(workspacePath)}"))\n`;
   if (options.workspaceWrite) {
-    profile += `(allow file-write* (subpath (param "WORKSPACE_RAW")))\n`;
+    profile += `(allow file-write* (subpath "${escapeSchemeString(options.workspace)}"))\n`;
+    profile += `(allow file-write* (subpath "${escapeSchemeString(workspacePath)}"))\n`;
   }
 
-  if (options.workspaceWrite) {
-    profile += `(allow file-write* (subpath (param "WORKSPACE")))\n`;
-  }
+  const tmpPath = tryRealpath(os.tmpdir());
+  profile += `(allow file-read* file-write* (subpath "${escapeSchemeString(tmpPath)}"))\n`;
 
   // Add explicit deny rules for governance files in the workspace.
   // These are added after the workspace allow rule to ensure they take precedence
@@ -81,12 +82,10 @@ export function buildSeatbeltArgs(options: SeatbeltArgsOptions): string[] {
 
     const ruleType = isDirectory ? 'subpath' : 'literal';
 
-    args.push('-D', `GOVERNANCE_FILE_${i}=${governanceFile}`);
-    profile += `(deny file-write* (${ruleType} (param "GOVERNANCE_FILE_${i}")))\n`;
+    profile += `(deny file-write* (${ruleType} "${escapeSchemeString(governanceFile)}"))\n`;
 
     if (realGovernanceFile !== governanceFile) {
-      args.push('-D', `REAL_GOVERNANCE_FILE_${i}=${realGovernanceFile}`);
-      profile += `(deny file-write* (${ruleType} (param "REAL_GOVERNANCE_FILE_${i}")))\n`;
+      profile += `(deny file-write* (${ruleType} "${escapeSchemeString(realGovernanceFile)}"))\n`;
     }
   }
 
@@ -121,27 +120,20 @@ export function buildSeatbeltArgs(options: SeatbeltArgsOptions): string[] {
   // Auto-detect and support git worktrees by granting read and write access to the underlying git directory
   const { worktreeGitDir, mainGitDir } = resolveGitWorktreePaths(workspacePath);
   if (worktreeGitDir) {
-    args.push('-D', `WORKTREE_GIT_DIR=${worktreeGitDir}`);
-    profile += `(allow file-read* file-write* (subpath (param "WORKTREE_GIT_DIR")))\n`;
+    profile += `(allow file-read* file-write* (subpath "${escapeSchemeString(worktreeGitDir)}"))\n`;
   }
   if (mainGitDir) {
-    args.push('-D', `MAIN_GIT_DIR=${mainGitDir}`);
-    profile += `(allow file-read* file-write* (subpath (param "MAIN_GIT_DIR")))\n`;
+    profile += `(allow file-read* file-write* (subpath "${escapeSchemeString(mainGitDir)}"))\n`;
   }
 
-  const tmpPath = tryRealpath(os.tmpdir());
-  args.push('-D', `TMPDIR=${tmpPath}`);
-
   const nodeRootPath = tryRealpath(
     path.dirname(path.dirname(process.execPath)),
   );
-  args.push('-D', `NODE_ROOT=${nodeRootPath}`);
-  profile += `(allow file-read* (subpath (param "NODE_ROOT")))\n`;
+  profile += `(allow file-read* (subpath "${escapeSchemeString(nodeRootPath)}"))\n`;
 
   // Add PATH directories as read-only to support nvm, homebrew, etc.
   if (process.env['PATH']) {
     const paths = process.env['PATH'].split(':');
-    let pathIndex = 0;
     const addedPaths = new Set();
 
     for (const p of paths) {
@@ -158,9 +150,7 @@ export function buildSeatbeltArgs(options: SeatbeltArgsOptions): string[] {
 
         if (!addedPaths.has(resolved)) {
           addedPaths.add(resolved);
-          args.push('-D', `SYS_PATH_${pathIndex}=${resolved}`);
-          profile += `(allow file-read* (subpath (param "SYS_PATH_${pathIndex}")))\n`;
-          pathIndex++;
+          profile += `(allow file-read* (subpath "${escapeSchemeString(resolved)}"))\n`;
         }
       } catch (_e) {
         // Ignore paths that do not exist or are inaccessible
@@ -170,12 +160,9 @@ export function buildSeatbeltArgs(options: SeatbeltArgsOptions): string[] {
 
   // Handle allowedPaths
   const allowedPaths = sanitizePaths(options.allowedPaths) || [];
-  const resolvedAllowedPaths: string[] = [];
   for (let i = 0; i < allowedPaths.length; i++) {
     const allowedPath = tryRealpath(allowedPaths[i]);
-    resolvedAllowedPaths.push(allowedPath);
-    args.push('-D', `ALLOWED_PATH_${i}=${allowedPath}`);
-    profile += `(allow file-read* file-write* (subpath (param "ALLOWED_PATH_${i}")))\n`;
+    profile += `(allow file-read* file-write* (subpath "${escapeSchemeString(allowedPath)}"))\n`;
   }
 
   // Handle granular additional permissions
@@ -184,8 +171,6 @@ export function buildSeatbeltArgs(options: SeatbeltArgsOptions): string[] {
     if (read) {
       for (let i = 0; i < read.length; i++) {
         const resolved = tryRealpath(read[i]);
-        const paramName = `ADDITIONAL_READ_${i}`;
-        args.push('-D', `${paramName}=${resolved}`);
         let isFile = false;
         try {
           isFile = fs.statSync(resolved).isFile();
@@ -193,17 +178,15 @@ export function buildSeatbeltArgs(options: SeatbeltArgsOptions): string[] {
           // Ignore error
         }
         if (isFile) {
-          profile += `(allow file-read* (literal (param "${paramName}")))\n`;
+          profile += `(allow file-read* (literal "${escapeSchemeString(resolved)}"))\n`;
         } else {
-          profile += `(allow file-read* (subpath (param "${paramName}")))\n`;
+          profile += `(allow file-read* (subpath "${escapeSchemeString(resolved)}"))\n`;
         }
       }
     }
     if (write) {
       for (let i = 0; i < write.length; i++) {
         const resolved = tryRealpath(write[i]);
-        const paramName = `ADDITIONAL_WRITE_${i}`;
-        args.push('-D', `${paramName}=${resolved}`);
         let isFile = false;
         try {
           isFile = fs.statSync(resolved).isFile();
@@ -211,9 +194,9 @@ export function buildSeatbeltArgs(options: SeatbeltArgsOptions): string[] {
           // Ignore error
         }
         if (isFile) {
-          profile += `(allow file-read* file-write* (literal (param "${paramName}")))\n`;
+          profile += `(allow file-read* file-write* (literal "${escapeSchemeString(resolved)}"))\n`;
         } else {
-          profile += `(allow file-read* file-write* (subpath (param "${paramName}")))\n`;
+          profile += `(allow file-read* file-write* (subpath "${escapeSchemeString(resolved)}"))\n`;
         }
       }
     }
@@ -223,17 +206,14 @@ export function buildSeatbeltArgs(options: SeatbeltArgsOptions): string[] {
   const forbiddenPaths = sanitizePaths(options.forbiddenPaths) || [];
   for (let i = 0; i < forbiddenPaths.length; i++) {
     const forbiddenPath = tryRealpath(forbiddenPaths[i]);
-    args.push('-D', `FORBIDDEN_PATH_${i}=${forbiddenPath}`);
-    profile += `(deny file-read* file-write* (subpath (param "FORBIDDEN_PATH_${i}")))\n`;
+    profile += `(deny file-read* file-write* (subpath "${escapeSchemeString(forbiddenPath)}"))\n`;
   }
 
   if (options.networkAccess || options.additionalPermissions?.network) {
     profile += NETWORK_SEATBELT_PROFILE;
   }
 
-  args.unshift('-p', profile);
-
-  return args;
+  return profile;
 }
 
 /**

packages/core/src/sandbox/utils/commandSafety.ts

@@ -130,6 +130,8 @@ function isSafeToCallWithExec(args: string[]): boolean {
   const cmd = args[0];
 
   const safeCommands = new Set([
+    '__read',
+    '__write',
     'cat',
     'cd',
     'cut',

packages/core/src/sandbox/utils/sandboxReadWriteUtils.ts

@@ -0,0 +1,81 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as path from 'node:path';
+import {
+  type SandboxPermissions,
+  type SandboxRequest,
+} from '../../services/sandboxManager.js';
+
+/**
+ * Validates if the requested paths are within the allowed workspace or allowed paths.
+ */
+function validatePaths(
+  paths: string[],
+  workspace: string,
+  allowedPaths: string[],
+): boolean {
+  for (const p of paths) {
+    const resolvedPath = path.resolve(p);
+    const resolvedWorkspace = path.resolve(workspace);
+    const isInsideWorkspace =
+      resolvedPath.startsWith(resolvedWorkspace + path.sep) ||
+      resolvedPath === resolvedWorkspace;
+
+    let isInsideAllowed = false;
+    for (const allowed of allowedPaths) {
+      const resolvedAllowed = path.resolve(allowed);
+      if (
+        resolvedPath.startsWith(resolvedAllowed + path.sep) ||
+        resolvedPath === resolvedAllowed
+      ) {
+        isInsideAllowed = true;
+        break;
+      }
+    }
+
+    if (!isInsideWorkspace && !isInsideAllowed) {
+      return false; // Path traversal or unauthorized access attempt
+    }
+  }
+  return true;
+}
+
+export function handleReadWriteCommands(
+  req: SandboxRequest,
+  mergedAdditional: SandboxPermissions,
+  workspace: string,
+  allowedPaths: string[] = [],
+): { command: string; args: string[] } {
+  let finalCommand = req.command;
+  let finalArgs = req.args;
+
+  if (req.command === '__read') {
+    finalCommand = '/bin/cat';
+    if (req.args.length > 0) {
+      if (validatePaths(req.args, workspace, allowedPaths)) {
+        mergedAdditional.fileSystem!.read!.push(...req.args);
+      } else {
+        throw new Error(
+          `Sandbox Error: Path traversal or unauthorized access attempt detected in __read: ${req.args.join(', ')}`,
+        );
+      }
+    }
+  } else if (req.command === '__write') {
+    finalCommand = '/bin/sh';
+    finalArgs = ['-c', 'tee -- "$@" > /dev/null', '_', ...req.args];
+    if (req.args.length > 0) {
+      if (validatePaths(req.args, workspace, allowedPaths)) {
+        mergedAdditional.fileSystem!.write!.push(...req.args);
+      } else {
+        throw new Error(
+          `Sandbox Error: Path traversal or unauthorized access attempt detected in __write: ${req.args.join(', ')}`,
+        );
+      }
+    }
+  }
+
+  return { command: finalCommand, args: finalArgs };
+}

packages/core/src/sandbox/windows/WindowsSandboxManager.ts

@@ -236,6 +236,12 @@ export class WindowsSandboxManager implements SandboxManager {
         false,
     };
 
+    if (req.command === '__read' && req.args[0]) {
+      mergedAdditional.fileSystem!.read!.push(req.args[0]);
+    } else if (req.command === '__write' && req.args[0]) {
+      mergedAdditional.fileSystem!.write!.push(req.args[0]);
+    }
+
     const defaultNetwork =
       this.options.modeConfig?.network || req.policy?.networkAccess || false;
     const networkAccess = defaultNetwork || mergedAdditional.network;

packages/core/src/sandbox/windows/commandSafety.ts

@@ -72,6 +72,8 @@ export function isKnownSafeCommand(args: string[]): boolean {
 
   // Native Windows/PowerShell safe commands
   const safeCommands = new Set([
+    '__read',
+    '__write',
     'dir',
     'type',
     'echo',

packages/core/src/services/modelConfigService.ts

@@ -488,14 +488,6 @@ export class ModelConfigService {
       );
     }
 
-    // Automatically strip thinkingConfig if the model does not support thinking.
-    const modelDefinition = this.getModelDefinition(resolved.model);
-    if (modelDefinition && modelDefinition.features?.thinking === false) {
-      if (resolved.generateContentConfig.thinkingConfig) {
-        delete resolved.generateContentConfig.thinkingConfig;
-      }
-    }
-
     // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     return {
       model: resolved.model,

packages/core/src/services/sandboxManager.ts

@@ -104,6 +104,8 @@ export interface SandboxedCommand {
   env: NodeJS.ProcessEnv;
   /** The working directory. */
   cwd?: string;
+  /** An optional cleanup function to be called after the command terminates. */
+  cleanup?: () => void;
 }
 
 /**

packages/core/src/services/shellExecutionService.ts

@@ -367,8 +367,9 @@ export class ShellExecutionService {
   ): Promise<{
     program: string;
     args: string[];
-    env: Record<string, string | undefined>;
+    env: NodeJS.ProcessEnv;
     cwd: string;
+    cleanup?: () => void;
   }> {
     const sandboxManager =
       shellExecutionConfig.sandboxManager ?? new NoopSandboxManager();
@@ -474,6 +475,7 @@ export class ShellExecutionService {
       args: sandboxedCommand.args,
       env: sandboxedCommand.env,
       cwd: sandboxedCommand.cwd ?? cwd,
+      cleanup: sandboxedCommand.cleanup,
     };
   }
 
@@ -493,6 +495,7 @@ export class ShellExecutionService {
         args: finalArgs,
         env: finalEnv,
         cwd: finalCwd,
+        cleanup: cmdCleanup,
       } = await this.prepareExecution(
         commandToExecute,
         cwd,
@@ -661,6 +664,7 @@ export class ShellExecutionService {
         signal: NodeJS.Signals | null,
       ) => {
         cleanup();
+        cmdCleanup?.();
 
         let combinedOutput = state.output;
         if (state.truncated) {
@@ -810,6 +814,7 @@ export class ShellExecutionService {
         args: finalArgs,
         env: finalEnv,
         cwd: finalCwd,
+        cleanup: cmdCleanup,
       } = await this.prepareExecution(
         commandToExecute,
         cwd,
@@ -1104,6 +1109,7 @@ export class ShellExecutionService {
 
           const finalize = () => {
             render(true);
+            cmdCleanup?.();
 
             const event: ShellOutputEvent = {
               type: 'exit',

packages/test-utils/src/test-rig.ts

@@ -11,10 +11,7 @@ import { join, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { env } from 'node:process';
 import { setTimeout as sleep } from 'node:timers/promises';
-import {
-  PREVIEW_GEMINI_FLASH_MODEL,
-  GEMINI_DIR,
-} from '@google/gemini-cli-core';
+import { PREVIEW_GEMINI_MODEL, GEMINI_DIR } from '@google/gemini-cli-core';
 export { GEMINI_DIR };
 import * as pty from '@lydell/node-pty';
 import stripAnsi from 'strip-ansi';
@@ -460,7 +457,7 @@ export class TestRig {
         ...(env['GEMINI_TEST_TYPE'] === 'integration'
           ? {
               model: {
-                name: PREVIEW_GEMINI_FLASH_MODEL,
+                name: PREVIEW_GEMINI_MODEL,
               },
             }
           : {}),

packages/vscode-ide-companion/package.json

@@ -108,7 +108,7 @@
   "scripts": {
     "prepackage": "npm run generate:notices && npm run check-types && npm run lint && npm run build:prod",
     "build": "npm run build:dev",
-    "build:dev": "npm run check-types && npm run lint && node esbuild.js",
+    "build:dev": "node esbuild.js",
     "build:prod": "node esbuild.js --production",
     "generate:notices": "node ./scripts/generate-notices.js",
     "prepare": "npm run generate:notices",

schemas/settings.schema.json

@@ -122,6 +122,13 @@
           "default": {},
           "type": "object",
           "properties": {
+            "enabled": {
+              "title": "Enable Plan Mode",
+              "description": "Enable Plan Mode for read-only safety during planning.",
+              "markdownDescription": "Enable Plan Mode for read-only safety during planning.\n\n- Category: `General`\n- Requires restart: `yes`\n- Default: `true`",
+              "default": true,
+              "type": "boolean"
+            },
             "directory": {
               "title": "Plan Directory",
               "description": "The directory where planning artifacts are stored. If not specified, defaults to the system temporary directory. A custom directory requires a policy to allow write access in Plan Mode.",
@@ -2831,8 +2838,8 @@
         "jitContext": {
           "title": "JIT Context Loading",
           "description": "Enable Just-In-Time (JIT) context loading.",
-          "markdownDescription": "Enable Just-In-Time (JIT) context loading.\n\n- Category: `Experimental`\n- Requires restart: `yes`\n- Default: `true`",
-          "default": true,
+          "markdownDescription": "Enable Just-In-Time (JIT) context loading.\n\n- Category: `Experimental`\n- Requires restart: `yes`\n- Default: `false`",
+          "default": false,
           "type": "boolean"
         },
         "useOSC52Paste": {
@@ -2849,13 +2856,6 @@
           "default": false,
           "type": "boolean"
         },
-        "plan": {
-          "title": "Plan",
-          "description": "Enable Plan Mode.",
-          "markdownDescription": "Enable Plan Mode.\n\n- Category: `Experimental`\n- Requires restart: `yes`\n- Default: `true`",
-          "default": true,
-          "type": "boolean"
-        },
         "taskTracker": {
           "title": "Task Tracker",
           "description": "Enable task tracker tools.",

scripts/build.js

@@ -32,7 +32,32 @@ if (!existsSync(join(root, 'node_modules'))) {
 
 // build all workspaces/packages
 execSync('npm run generate', { stdio: 'inherit', cwd: root });
-execSync('npm run build --workspaces', { stdio: 'inherit', cwd: root });
+
+if (process.env.CI) {
+  console.log('CI environment detected. Building workspaces sequentially...');
+  execSync('npm run build --workspaces', { stdio: 'inherit', cwd: root });
+} else {
+  // Build core first because everyone depends on it
+  console.log('Building @google/gemini-cli-core...');
+  execSync('npm run build -w @google/gemini-cli-core', {
+    stdio: 'inherit',
+    cwd: root,
+  });
+
+  // Build the rest in parallel
+  console.log('Building other workspaces in parallel...');
+  const workspaceInfo = JSON.parse(
+    execSync('npm query .workspace --json', { cwd: root, encoding: 'utf-8' }),
+  );
+  const parallelWorkspaces = workspaceInfo
+    .map((w) => w.name)
+    .filter((name) => name !== '@google/gemini-cli-core');
+
+  execSync(
+    `npx npm-run-all --parallel ${parallelWorkspaces.map((w) => `"build -w ${w}"`).join(' ')}`,
+    { stdio: 'inherit', cwd: root },
+  );
+}
 
 // also build container image if sandboxing is enabled
 // skip (-s) npm install + build since we did that above