feat: implement alternate buffer toggling and unit tests

.gemini/settings.json

@@ -1,9 +1,9 @@
 {
   "experimental": {
+    "plan": true,
     "extensionReloading": true,
     "modelSteering": true,
-    "memoryManager": false,
-    "topicUpdateNarration": true
+    "memoryManager": true
   },
   "general": {
     "devtools": true

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

@@ -175,9 +175,7 @@ runs:
           --dry-run="${INPUTS_DRY_RUN}" \
           --workspace="${INPUTS_CORE_PACKAGE_NAME}" \
           --no-tag
-        if [[ "${INPUTS_DRY_RUN}" == "false" ]]; then
-          npm dist-tag rm ${INPUTS_CORE_PACKAGE_NAME} false
-        fi
+        npm dist-tag rm ${INPUTS_CORE_PACKAGE_NAME} false
 
     - name: '🔗 Install latest core package'
       working-directory: '${{ inputs.working-directory }}'
@@ -195,7 +193,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/'"
+      if: "inputs.npm-registry-url != 'https://npm.pkg.github.com/' && inputs.npm-tag != 'latest'"
       working-directory: '${{ inputs.working-directory }}'
       shell: 'bash'
       run: |
@@ -250,9 +248,7 @@ runs:
           --dry-run="${INPUTS_DRY_RUN}" \
           --workspace="${INPUTS_A2A_PACKAGE_NAME}" \
           --no-tag
-          if [[ "${INPUTS_DRY_RUN}" == "false" ]]; then
-            npm dist-tag rm ${INPUTS_A2A_PACKAGE_NAME} false
-          fi
+        npm dist-tag rm ${INPUTS_A2A_PACKAGE_NAME} false
 
     - name: '🔬 Verify NPM release by version'
       uses: './.github/actions/verify-release'
@@ -291,25 +287,8 @@ runs:
         INPUTS_PREVIOUS_TAG: '${{ inputs.previous-tag }}'
       shell: 'bash'
       run: |
-        rm -f gemini-cli-bundle.zip
-        (cd bundle && chmod +x gemini.js && zip -r ../gemini-cli-bundle.zip .)
-
-        echo "Testing the generated bundle archive..."
-        rm -rf test-bundle
-        mkdir -p test-bundle
-        unzip -q gemini-cli-bundle.zip -d test-bundle
-
-        # Verify it runs and outputs a version
-        BUNDLE_VERSION=$(node test-bundle/gemini.js --version | xargs)
-        echo "Bundle version output: ${BUNDLE_VERSION}"
-        if [[ -z "${BUNDLE_VERSION}" ]]; then
-          echo "Error: Bundle failed to execute or return version."
-          exit 1
-        fi
-        rm -rf test-bundle
-
         gh release create "${INPUTS_RELEASE_TAG}" \
-          gemini-cli-bundle.zip \
+          bundle/gemini.js \
           --target "${STEPS_RELEASE_BRANCH_OUTPUTS_BRANCH_NAME}" \
           --title "Release ${INPUTS_RELEASE_TAG}" \
           --notes-start-tag "${INPUTS_PREVIOUS_TAG}" \

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

@@ -18,13 +18,6 @@ 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 }}'

CONTRIBUTING.md

@@ -346,11 +346,9 @@ npm run lint
 
 - Please adhere to the coding style, patterns, and conventions used throughout
   the existing codebase.
-- Consult
-  [GEMINI.md](https://github.com/google-gemini/gemini-cli/blob/main/GEMINI.md)
-  (typically found in the project root) for specific instructions related to
-  AI-assisted development, including conventions for React, comments, and Git
-  usage.
+- Consult [GEMINI.md](../GEMINI.md) (typically found in the project root) for
+  specific instructions related to AI-assisted development, including
+  conventions for React, comments, and Git usage.
 - **Imports:** Pay special attention to import paths. The project uses ESLint to
   enforce restrictions on relative imports between packages.
 
@@ -507,9 +505,8 @@ code.
 
 ### Documentation structure
 
-Our documentation is organized using
-[sidebar.json](https://github.com/google-gemini/gemini-cli/blob/main/docs/sidebar.json)
-as the table of contents. When adding new documentation:
+Our documentation is organized using [sidebar.json](/docs/sidebar.json) as the
+table of contents. When adding new documentation:
 
 1. Create your markdown file **in the appropriate directory** under `/docs`.
 2. Add an entry to `sidebar.json` in the relevant section.

docs/changelogs/latest.md

@@ -1,6 +1,6 @@
-# Latest stable release: v0.35.3
+# Latest stable release: v0.35.2
 
-Released: March 28, 2026
+Released: March 26, 2026
 
 For most users, our latest stable release is the recommended release. Install
 the latest stable version with:
@@ -29,9 +29,6 @@ npm install -g @google/gemini-cli
 
 ## What's Changed
 
-- fix(patch): cherry-pick 765fb67 to release/v0.35.2-pr-24055 [CONFLICTS] by
-  @gemini-cli-robot in
-  [#24063](https://github.com/google-gemini/gemini-cli/pull/24063)
 - fix(core): allow disabling environment variable redaction by @galz10 in
   [#23927](https://github.com/google-gemini/gemini-cli/pull/23927)
 - fix(a2a-server): A2A server should execute ask policies in interactive mode by
@@ -388,4 +385,4 @@ npm install -g @google/gemini-cli
   [#23585](https://github.com/google-gemini/gemini-cli/pull/23585)
 
 **Full Changelog**:
-https://github.com/google-gemini/gemini-cli/compare/v0.34.0...v0.35.3
+https://github.com/google-gemini/gemini-cli/compare/v0.34.0...v0.35.2

docs/changelogs/preview.md

@@ -1,6 +1,6 @@
-# Preview release: v0.36.0-preview.7
+# Preview release: v0.36.0-preview.5
 
-Released: March 31, 2026
+Released: March 27, 2026
 
 Our preview release includes the latest, new, and experimental features. This
 release may not be as stable as our [latest weekly release](latest.md).
@@ -31,10 +31,6 @@ npm install -g @google/gemini-cli@preview
 
 ## What's Changed
 
-- fix(patch): cherry-pick 765fb67 to release/v0.36.0-preview.5-pr-24055 to patch
-  version v0.36.0-preview.5 and create version 0.36.0-preview.6 by
-  @gemini-cli-robot in
-  [#24061](https://github.com/google-gemini/gemini-cli/pull/24061)
 - fix(a2a-server): A2A server should execute ask policies in interactive mode by
   @kschaab in [#23831](https://github.com/google-gemini/gemini-cli/pull/23831)
 - docs(core): document agent_card_json string literal options for remote agents
@@ -390,4 +386,4 @@ npm install -g @google/gemini-cli@preview
   [#23666](https://github.com/google-gemini/gemini-cli/pull/23666)
 
 **Full Changelog**:
-https://github.com/google-gemini/gemini-cli/compare/v0.35.0-preview.5...v0.36.0-preview.7
+https://github.com/google-gemini/gemini-cli/compare/v0.35.0-preview.5...v0.36.0-preview.5

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`, `plan`                                                                                      |
+| `--approval-mode`                | -     | string  | `default` | Approval mode for tool execution. Choices: `default`, `auto_edit`, `yolo`                                                                                              |
 | `--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/plan-mode.md

@@ -56,21 +56,19 @@ Gemini CLI takes action.
 
 1.  **Provide a goal:** Start by describing what you want to achieve. Gemini CLI
     will then enter Plan Mode (if it's not already) to research the task.
-2.  **Discuss and agree on strategy:** As Gemini CLI analyzes your codebase, it
-    will discuss its findings and proposed strategy with you to ensure
-    alignment. It may ask you questions or present different implementation
-    options using [`ask_user`](../tools/ask-user.md). **Gemini CLI will stop and
-    wait for your confirmation** before drafting the formal plan. You should
-    reach an informal agreement on the approach before proceeding.
-3.  **Review the plan:** Once you've agreed on the strategy, Gemini CLI creates
-    a detailed implementation plan as a Markdown file in your plans directory.
+2.  **Review research and provide input:** As Gemini CLI analyzes your codebase,
+    it may ask you questions or present different implementation options using
+    [`ask_user`](../tools/ask-user.md). Provide your preferences to help guide
+    the design.
+3.  **Review the plan:** Once Gemini CLI has a proposed strategy, it creates a
+    detailed implementation plan as a Markdown file in your plans directory.
     - **View:** You can open and read this file to understand the proposed
       changes.
     - **Edit:** Press `Ctrl+X` to open the plan directly in your configured
       external editor.
 
 4.  **Approve or iterate:** Gemini CLI will present the finalized plan for your
-    formal approval.
+    approval.
     - **Approve:** If you're satisfied with the plan, approve it to start the
       implementation immediately: **Yes, automatically accept edits** or **Yes,
       manually accept edits**.
@@ -180,16 +178,9 @@ As described in the
 rule that does not explicitly specify `modes` is considered "always active" and
 will apply to Plan Mode as well.
 
-To maintain the integrity of Plan Mode as a safe research environment,
-persistent tool approvals are context-aware. Approvals granted in modes like
-Default or Auto-Edit do not apply to Plan Mode, ensuring that tools trusted for
-implementation don't automatically execute while you're researching. However,
-approvals granted while in Plan Mode are treated as intentional choices for
-global trust and apply to all modes.
-
-If you want to manually restrict a rule to other modes but _not_ to Plan Mode,
-you must explicitly specify the target modes. For example, to allow `npm test`
-in default and Auto-Edit modes but not in Plan Mode:
+If you want a rule to apply to other modes but _not_ to Plan Mode, you must
+explicitly specify the target modes. For example, to allow `npm test` in default
+and Auto-Edit modes but not in Plan Mode:
 
 ```toml
 [[rule]]

docs/cli/settings.md

@@ -30,7 +30,6 @@ 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`      |
@@ -47,39 +46,38 @@ they appear in the UI.
 
 ### UI
 
-| UI Label                             | Setting                                | Description                                                                                                                                                       | Default |
-| ------------------------------------ | -------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
-| Auto Theme Switching                 | `ui.autoThemeSwitching`                | Automatically switch between default light and dark themes based on terminal background color.                                                                    | `true`  |
-| Terminal Background Polling Interval | `ui.terminalBackgroundPollingInterval` | Interval in seconds to poll the terminal background color.                                                                                                        | `60`    |
-| Hide Window Title                    | `ui.hideWindowTitle`                   | Hide the window title bar                                                                                                                                         | `false` |
-| Inline Thinking                      | `ui.inlineThinkingMode`                | Display model thinking inline: off or full.                                                                                                                       | `"off"` |
-| Show Thoughts in Title               | `ui.showStatusInTitle`                 | Show Gemini CLI model thoughts in the terminal window title during the working phase                                                                              | `false` |
-| Dynamic Window Title                 | `ui.dynamicWindowTitle`                | Update the terminal window title with current status icons (Ready: ◇, Action Required: ✋, Working: ✦)                                                            | `true`  |
-| Show Home Directory Warning          | `ui.showHomeDirectoryWarning`          | Show a warning when running Gemini CLI in the home directory.                                                                                                     | `true`  |
-| Show Compatibility Warnings          | `ui.showCompatibilityWarnings`         | Show warnings about terminal or OS compatibility issues.                                                                                                          | `true`  |
-| Hide Tips                            | `ui.hideTips`                          | Hide helpful tips in the UI                                                                                                                                       | `false` |
-| Escape Pasted @ Symbols              | `ui.escapePastedAtSymbols`             | When enabled, @ symbols in pasted text are escaped to prevent unintended @path expansion.                                                                         | `false` |
-| Show Shortcuts Hint                  | `ui.showShortcutsHint`                 | Show the "? for shortcuts" hint above the input.                                                                                                                  | `true`  |
-| Compact Tool Output                  | `ui.compactToolOutput`                 | Display tool outputs (like directory listings and file reads) in a compact, structured format.                                                                    | `false` |
-| Hide Banner                          | `ui.hideBanner`                        | Hide the application banner                                                                                                                                       | `false` |
-| Hide Context Summary                 | `ui.hideContextSummary`                | Hide the context summary (GEMINI.md, MCP servers) above the input.                                                                                                | `false` |
-| Hide CWD                             | `ui.footer.hideCWD`                    | Hide the current working directory in the footer.                                                                                                                 | `false` |
-| Hide Sandbox Status                  | `ui.footer.hideSandboxStatus`          | Hide the sandbox status indicator in the footer.                                                                                                                  | `false` |
-| Hide Model Info                      | `ui.footer.hideModelInfo`              | Hide the model name and context usage in the footer.                                                                                                              | `false` |
-| Hide Context Window Percentage       | `ui.footer.hideContextPercentage`      | Hides the context window usage percentage.                                                                                                                        | `true`  |
-| Hide Footer                          | `ui.hideFooter`                        | Hide the footer from the UI                                                                                                                                       | `false` |
-| Show Memory Usage                    | `ui.showMemoryUsage`                   | Display memory usage information in the UI                                                                                                                        | `false` |
-| Show Line Numbers                    | `ui.showLineNumbers`                   | Show line numbers in the chat.                                                                                                                                    | `true`  |
-| Show Citations                       | `ui.showCitations`                     | Show citations for generated text in the chat.                                                                                                                    | `false` |
-| Show Model Info In Chat              | `ui.showModelInfoInChat`               | Show the model name in the chat for each model turn.                                                                                                              | `false` |
-| Show User Identity                   | `ui.showUserIdentity`                  | Show the signed-in user's identity (e.g. email) in the UI.                                                                                                        | `true`  |
-| Use Alternate Screen Buffer          | `ui.useAlternateBuffer`                | Use an alternate screen buffer for the UI, preserving shell history.                                                                                              | `false` |
-| Use Background Color                 | `ui.useBackgroundColor`                | Whether to use background colors in the UI.                                                                                                                       | `true`  |
-| Incremental Rendering                | `ui.incrementalRendering`              | Enable incremental rendering for the UI. This option will reduce flickering but may cause rendering artifacts. Only supported when useAlternateBuffer is enabled. | `true`  |
-| Show Spinner                         | `ui.showSpinner`                       | Show the spinner during operations.                                                                                                                               | `true`  |
-| Loading Phrases                      | `ui.loadingPhrases`                    | What to show while the model is working: tips, witty comments, all, or off.                                                                                       | `"off"` |
-| Error Verbosity                      | `ui.errorVerbosity`                    | Controls whether recoverable errors are hidden (low) or fully shown (full).                                                                                       | `"low"` |
-| Screen Reader Mode                   | `ui.accessibility.screenReader`        | Render output in plain-text to be more screen reader accessible                                                                                                   | `false` |
+| UI Label                             | Setting                                | Description                                                                                                                                                       | Default  |
+| ------------------------------------ | -------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- |
+| Auto Theme Switching                 | `ui.autoThemeSwitching`                | Automatically switch between default light and dark themes based on terminal background color.                                                                    | `true`   |
+| Terminal Background Polling Interval | `ui.terminalBackgroundPollingInterval` | Interval in seconds to poll the terminal background color.                                                                                                        | `60`     |
+| Hide Window Title                    | `ui.hideWindowTitle`                   | Hide the window title bar                                                                                                                                         | `false`  |
+| Inline Thinking                      | `ui.inlineThinkingMode`                | Display model thinking inline: off or full.                                                                                                                       | `"off"`  |
+| Show Thoughts in Title               | `ui.showStatusInTitle`                 | Show Gemini CLI model thoughts in the terminal window title during the working phase                                                                              | `false`  |
+| Dynamic Window Title                 | `ui.dynamicWindowTitle`                | Update the terminal window title with current status icons (Ready: ◇, Action Required: ✋, Working: ✦)                                                            | `true`   |
+| Show Home Directory Warning          | `ui.showHomeDirectoryWarning`          | Show a warning when running Gemini CLI in the home directory.                                                                                                     | `true`   |
+| Show Compatibility Warnings          | `ui.showCompatibilityWarnings`         | Show warnings about terminal or OS compatibility issues.                                                                                                          | `true`   |
+| Hide Tips                            | `ui.hideTips`                          | Hide helpful tips in the UI                                                                                                                                       | `false`  |
+| Escape Pasted @ Symbols              | `ui.escapePastedAtSymbols`             | When enabled, @ symbols in pasted text are escaped to prevent unintended @path expansion.                                                                         | `false`  |
+| Show Shortcuts Hint                  | `ui.showShortcutsHint`                 | Show the "? for shortcuts" hint above the input.                                                                                                                  | `true`   |
+| Hide Banner                          | `ui.hideBanner`                        | Hide the application banner                                                                                                                                       | `false`  |
+| Hide Context Summary                 | `ui.hideContextSummary`                | Hide the context summary (GEMINI.md, MCP servers) above the input.                                                                                                | `false`  |
+| Hide CWD                             | `ui.footer.hideCWD`                    | Hide the current working directory in the footer.                                                                                                                 | `false`  |
+| Hide Sandbox Status                  | `ui.footer.hideSandboxStatus`          | Hide the sandbox status indicator in the footer.                                                                                                                  | `false`  |
+| Hide Model Info                      | `ui.footer.hideModelInfo`              | Hide the model name and context usage in the footer.                                                                                                              | `false`  |
+| Hide Context Window Percentage       | `ui.footer.hideContextPercentage`      | Hides the context window usage percentage.                                                                                                                        | `true`   |
+| Hide Footer                          | `ui.hideFooter`                        | Hide the footer from the UI                                                                                                                                       | `false`  |
+| Show Memory Usage                    | `ui.showMemoryUsage`                   | Display memory usage information in the UI                                                                                                                        | `false`  |
+| Show Line Numbers                    | `ui.showLineNumbers`                   | Show line numbers in the chat.                                                                                                                                    | `true`   |
+| Show Citations                       | `ui.showCitations`                     | Show citations for generated text in the chat.                                                                                                                    | `false`  |
+| Show Model Info In Chat              | `ui.showModelInfoInChat`               | Show the model name in the chat for each model turn.                                                                                                              | `false`  |
+| Show User Identity                   | `ui.showUserIdentity`                  | Show the signed-in user's identity (e.g. email) in the UI.                                                                                                        | `true`   |
+| Use Alternate Screen Buffer          | `ui.useAlternateBuffer`                | Use an alternate screen buffer for the UI, preserving shell history.                                                                                              | `false`  |
+| Use Background Color                 | `ui.useBackgroundColor`                | Whether to use background colors in the UI.                                                                                                                       | `true`   |
+| Incremental Rendering                | `ui.incrementalRendering`              | Enable incremental rendering for the UI. This option will reduce flickering but may cause rendering artifacts. Only supported when useAlternateBuffer is enabled. | `true`   |
+| Show Spinner                         | `ui.showSpinner`                       | Show the spinner during operations.                                                                                                                               | `true`   |
+| Loading Phrases                      | `ui.loadingPhrases`                    | What to show while the model is working: tips, witty comments, both, or nothing.                                                                                  | `"tips"` |
+| Error Verbosity                      | `ui.errorVerbosity`                    | Controls whether recoverable errors are hidden (low) or fully shown (full).                                                                                       | `"low"`  |
+| Screen Reader Mode                   | `ui.accessibility.screenReader`        | Render output in plain-text to be more screen reader accessible                                                                                                   | `false`  |
 
 ### IDE
 
@@ -157,16 +155,21 @@ they appear in the UI.
 
 ### Experimental
 
-| UI Label                  | Setting                             | Description                                                                                                                                               | Default |
-| ------------------------- | ----------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
-| 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` |
-| 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` |
-| Enable Context Management | `experimental.contextManagement`    | Enable logic for context management.                                                                                                                      | `false` |
-| Topic & Update Narration  | `experimental.topicUpdateNarration` | Enable the experimental Topic & Update communication model for reduced chattiness and structured progress reporting.                                      | `false` |
+| UI Label                           | Setting                                        | Description                                                                                                                                               | Default |
+| ---------------------------------- | ---------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| Enable Tool Output Masking         | `experimental.toolOutputMasking.enabled`       | Enables tool output masking to save tokens.                                                                                                               | `true`  |
+| 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` |
+| Agent History Truncation           | `experimental.agentHistoryTruncation`          | Enable truncation window logic for the Agent History Provider.                                                                                            | `false` |
+| Agent History Truncation Threshold | `experimental.agentHistoryTruncationThreshold` | The maximum number of messages before history is truncated.                                                                                               | `30`    |
+| Agent History Retained Messages    | `experimental.agentHistoryRetainedMessages`    | The number of recent messages to retain after truncation.                                                                                                 | `15`    |
+| Agent History Summarization        | `experimental.agentHistorySummarization`       | Enable summarization of truncated content via a small model for the Agent History Provider.                                                               | `false` |
+| Topic & Update Narration           | `experimental.topicUpdateNarration`            | Enable the experimental Topic & Update communication model for reduced chattiness and structured progress reporting.                                      | `false` |
 
 ### Skills
 

docs/cli/themes.md

@@ -19,7 +19,6 @@ using the `/theme` command within Gemini CLI:
   - `Holiday`
   - `Shades Of Purple`
   - `Solarized Dark`
-  - `Tokyo Night`
 - **Light themes:**
   - `ANSI Light`
   - `Ayu Light`
@@ -253,10 +252,6 @@ identify their source, for example: `shades-of-green (green-extension)`.
 
 <img src="/docs/assets/theme-solarized-dark.png" alt="Solarized Dark theme" width="600">
 
-### Tokyo Night
-
-<img src="/docs/assets/theme-tokyonight-dark.png" alt="Tokyo Night theme" width="600">
-
 ## Light themes
 
 ### ANSI Light

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](./subagents.md):** Learn how to create and use specialized
-  sub-agents for complex tasks.
+- **[Sub-agents (experimental)](./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,16 +1,20 @@
-# Subagents
+# Subagents (experimental)
 
 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.
 
-Subagents are enabled by default. To disable them, set `enableAgents` to `false`
-in your `settings.json`:
+<!-- 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):
 
 ```json
 {
-  "experimental": { "enableAgents": false }
+  "experimental": { "enableAgents": true }
 }
 ```
 
@@ -222,65 +226,19 @@ the `click_at` tool for precise, coordinate-based interactions.
 > The visual agent requires API key or Vertex AI authentication. It is
 > not available when using "Sign in with Google".
 
-#### Sandbox support
-
-The browser agent adjusts its behavior automatically when running inside a
-sandbox.
-
-##### macOS seatbelt (`sandbox-exec`)
-
-When the CLI runs under the macOS seatbelt sandbox, `persistent` and `isolated`
-session modes are forced to `isolated` with `headless` enabled. This avoids
-permission errors caused by seatbelt file-system restrictions on persistent
-browser profiles. If `sessionMode` is set to `existing`, no override is applied.
-
-##### Container sandboxes (Docker / Podman)
-
-Chrome is not available inside the container, so the browser agent is
-**disabled** unless `sessionMode` is set to `"existing"`. When enabled with
-`existing` mode, the agent automatically connects to Chrome on the host via the
-resolved IP of `host.docker.internal:9222` instead of using local pipe
-discovery. Port `9222` is currently hardcoded and cannot be customized.
-
-To use the browser agent in a Docker sandbox:
-
-1. Start Chrome on the host with remote debugging enabled:
-
-   ```bash
-   # Option A: Launch Chrome from the command line
-   google-chrome --remote-debugging-port=9222
-
-   # Option B: Enable in Chrome settings
-   # Navigate to chrome://inspect/#remote-debugging and enable
-   ```
-
-2. Configure `sessionMode` and allowed domains in your project's
-   `.gemini/settings.json`:
-
-   ```json
-   {
-     "agents": {
-       "overrides": {
-         "browser_agent": { "enabled": true }
-       },
-       "browser": {
-         "sessionMode": "existing",
-         "allowedDomains": ["example.com"]
-       }
-     }
-   }
-   ```
-
-3. Launch the CLI with port forwarding:
-
-   ```bash
-   GEMINI_SANDBOX=docker SANDBOX_PORTS=9222 gemini
-   ```
-
 ## Creating custom subagents
 
 You can create your own subagents to automate specific workflows or enforce
-specific personas.
+specific personas. To use custom subagents, you must enable them in your
+`settings.json`:
+
+```json
+{
+  "experimental": {
+    "enableAgents": true
+  }
+}
+```
 
 ### Agent definition files
 
@@ -332,7 +290,6 @@ it yourself; just report it.
 | `description`  | string | Yes      | Short description of what the agent does. This is visible to the main agent to help it decide when to call this subagent.                                                                                     |
 | `kind`         | string | No       | `local` (default) or `remote`.                                                                                                                                                                                |
 | `tools`        | array  | No       | List of tool names this agent can use. Supports wildcards: `*` (all tools), `mcp_*` (all MCP tools), `mcp_server_*` (all tools from a server). **If omitted, it inherits all tools from the parent session.** |
-| `mcpServers`   | object | No       | Configuration for inline Model Context Protocol (MCP) servers isolated to this specific agent.                                                                                                                |
 | `model`        | string | No       | Specific model to use (e.g., `gemini-3-preview`). Defaults to `inherit` (uses the main session model).                                                                                                        |
 | `temperature`  | number | No       | Model temperature (0.0 - 2.0). Defaults to `1`.                                                                                                                                                               |
 | `max_turns`    | number | No       | Maximum number of conversation turns allowed for this agent before it must return. Defaults to `30`.                                                                                                          |
@@ -360,78 +317,6 @@ Each subagent runs in its own isolated context loop. This means:
   subagents **cannot** call other subagents. If a subagent is granted the `*`
   tool wildcard, it will still be unable to see or invoke other agents.
 
-## Subagent tool isolation
-
-Subagent tool isolation moves Gemini CLI away from a single global tool
-registry. By providing isolated execution environments, you can ensure that
-subagents only interact with the parts of the system they are designed for. This
-prevents unintended side effects, improves reliability by avoiding state
-contamination, and enables fine-grained permission control.
-
-With this feature, you can:
-
-- **Specify tool access:** Define exactly which tools an agent can access using
-  a `tools` list in the agent definition.
-- **Define inline MCP servers:** Configure Model Context Protocol (MCP) servers
-  (which provide a standardized way to connect AI models to external tools and
-  data sources) directly in the subagent's markdown frontmatter, isolating them
-  to that specific agent.
-- **Maintain state isolation:** Ensure that subagents only interact with their
-  own set of tools and servers, preventing side effects and state contamination.
-- **Apply subagent-specific policies:** Enforce granular rules in your
-  [Policy Engine](../reference/policy-engine.md) TOML configuration based on the
-  executing subagent's name.
-
-### Configuring isolated tools and servers
-
-You can configure tool isolation for a subagent by updating its markdown
-frontmatter. This allows you to explicitly state which tools the subagent can
-use, rather than relying on the global registry.
-
-Add an `mcpServers` object to define inline MCP servers that are unique to the
-agent.
-
-**Example:**
-
-```yaml
----
-name: my-isolated-agent
-tools:
-  - grep_search
-  - read_file
-mcpServers:
-  my-custom-server:
-    command: 'node'
-    args: ['path/to/server.js']
----
-```
-
-### Subagent-specific policies
-
-You can enforce fine-grained control over subagents using the
-[Policy Engine's](../reference/policy-engine.md) TOML configuration. This allows
-you to grant or restrict permissions specifically for an agent, without
-affecting the rest of your CLI session.
-
-To restrict a policy rule to a specific subagent, add the `subagent` property to
-the `[[rules]]` block in your `policy.toml` file.
-
-**Example:**
-
-```toml
-[[rules]]
-name = "Allow pr-creator to push code"
-subagent = "pr-creator"
-description = "Permit pr-creator to push branches automatically."
-action = "allow"
-toolName = "run_shell_command"
-commandPrefix = "git push"
-```
-
-In this configuration, the policy rule only triggers if the executing subagent's
-name matches `pr-creator`. Rules without the `subagent` property apply
-universally to all agents.
-
 ## Managing subagents
 
 You can manage subagents interactively using the `/agents` command or
@@ -521,11 +406,15 @@ 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)
+## Remote subagents (Agent2Agent) (experimental)
 
 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,6 +17,8 @@ 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,
@@ -303,7 +305,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
-    `general.plan.enabled` setting in your configuration.
+    `experimental.plan` setting in your configuration.
 - **Sub-commands:**
   - **`copy`**:
     - **Description:** Copy the currently approved plan to your clipboard.

docs/reference/configuration.md

@@ -141,11 +141,6 @@ 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
@@ -262,11 +257,6 @@ their corresponding top-level category object in your `settings.json` file.
   - **Description:** Show the "? for shortcuts" hint above the input.
   - **Default:** `true`
 
-- **`ui.compactToolOutput`** (boolean):
-  - **Description:** Display tool outputs (like directory listings and file
-    reads) in a compact, structured format.
-  - **Default:** `false`
-
 - **`ui.hideBanner`** (boolean):
   - **Description:** Hide the application banner
   - **Default:** `false`
@@ -354,8 +344,8 @@ their corresponding top-level category object in your `settings.json` file.
 
 - **`ui.loadingPhrases`** (enum):
   - **Description:** What to show while the model is working: tips, witty
-    comments, all, or off.
-  - **Default:** `"off"`
+    comments, both, or nothing.
+  - **Default:** `"tips"`
   - **Values:** `"tips"`, `"witty"`, `"all"`, `"off"`
 
 - **`ui.errorVerbosity`** (enum):
@@ -1587,6 +1577,28 @@ their corresponding top-level category object in your `settings.json` file.
 
 #### `experimental`
 
+- **`experimental.toolOutputMasking.enabled`** (boolean):
+  - **Description:** Enables tool output masking to save tokens.
+  - **Default:** `true`
+  - **Requires restart:** Yes
+
+- **`experimental.toolOutputMasking.toolProtectionThreshold`** (number):
+  - **Description:** Minimum number of tokens to protect from masking (most
+    recent tool outputs).
+  - **Default:** `50000`
+  - **Requires restart:** Yes
+
+- **`experimental.toolOutputMasking.minPrunableTokensThreshold`** (number):
+  - **Description:** Minimum prunable tokens required to trigger a masking pass.
+  - **Default:** `30000`
+  - **Requires restart:** Yes
+
+- **`experimental.toolOutputMasking.protectLatestTurn`** (boolean):
+  - **Description:** Ensures the absolute latest turn is never masked,
+    regardless of token count.
+  - **Default:** `true`
+  - **Requires restart:** Yes
+
 - **`experimental.enableAgents`** (boolean):
   - **Description:** Enable local and remote subagents.
   - **Default:** `true`
@@ -1625,7 +1637,7 @@ their corresponding top-level category object in your `settings.json` file.
 
 - **`experimental.jitContext`** (boolean):
   - **Description:** Enable Just-In-Time (JIT) context loading.
-  - **Default:** `false`
+  - **Default:** `true`
   - **Requires restart:** Yes
 
 - **`experimental.useOSC52Paste`** (boolean):
@@ -1640,6 +1652,11 @@ 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`
@@ -1685,8 +1702,25 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `false`
   - **Requires restart:** Yes
 
-- **`experimental.contextManagement`** (boolean):
-  - **Description:** Enable logic for context management.
+- **`experimental.agentHistoryTruncation`** (boolean):
+  - **Description:** Enable truncation window logic for the Agent History
+    Provider.
+  - **Default:** `false`
+  - **Requires restart:** Yes
+
+- **`experimental.agentHistoryTruncationThreshold`** (number):
+  - **Description:** The maximum number of messages before history is truncated.
+  - **Default:** `30`
+  - **Requires restart:** Yes
+
+- **`experimental.agentHistoryRetainedMessages`** (number):
+  - **Description:** The number of recent messages to retain after truncation.
+  - **Default:** `15`
+  - **Requires restart:** Yes
+
+- **`experimental.agentHistorySummarization`** (boolean):
+  - **Description:** Enable summarization of truncated content via a small model
+    for the Agent History Provider.
   - **Default:** `false`
   - **Requires restart:** Yes
 
@@ -1781,69 +1815,6 @@ their corresponding top-level category object in your `settings.json` file.
     prioritize available tools dynamically.
   - **Default:** `[]`
 
-#### `contextManagement`
-
-- **`contextManagement.historyWindow.maxTokens`** (number):
-  - **Description:** The number of tokens to allow before triggering
-    compression.
-  - **Default:** `150000`
-  - **Requires restart:** Yes
-
-- **`contextManagement.historyWindow.retainedTokens`** (number):
-  - **Description:** The number of tokens to always retain.
-  - **Default:** `40000`
-  - **Requires restart:** Yes
-
-- **`contextManagement.messageLimits.normalMaxTokens`** (number):
-  - **Description:** The target number of tokens to budget for a normal
-    conversation turn.
-  - **Default:** `2500`
-  - **Requires restart:** Yes
-
-- **`contextManagement.messageLimits.retainedMaxTokens`** (number):
-  - **Description:** The maximum number of tokens a single conversation turn can
-    consume before truncation.
-  - **Default:** `12000`
-  - **Requires restart:** Yes
-
-- **`contextManagement.messageLimits.normalizationHeadRatio`** (number):
-  - **Description:** The ratio of tokens to retain from the beginning of a
-    truncated message (0.0 to 1.0).
-  - **Default:** `0.25`
-  - **Requires restart:** Yes
-
-- **`contextManagement.tools.distillation.maxOutputTokens`** (number):
-  - **Description:** Maximum tokens to show to the model when truncating large
-    tool outputs.
-  - **Default:** `10000`
-  - **Requires restart:** Yes
-
-- **`contextManagement.tools.distillation.summarizationThresholdTokens`**
-  (number):
-  - **Description:** Threshold above which truncated tool outputs will be
-    summarized by an LLM.
-  - **Default:** `20000`
-  - **Requires restart:** Yes
-
-- **`contextManagement.tools.outputMasking.protectionThresholdTokens`**
-  (number):
-  - **Description:** Minimum number of tokens to protect from masking (most
-    recent tool outputs).
-  - **Default:** `50000`
-  - **Requires restart:** Yes
-
-- **`contextManagement.tools.outputMasking.minPrunableThresholdTokens`**
-  (number):
-  - **Description:** Minimum prunable tokens required to trigger a masking pass.
-  - **Default:** `30000`
-  - **Requires restart:** Yes
-
-- **`contextManagement.tools.outputMasking.protectLatestTurn`** (boolean):
-  - **Description:** Ensures the absolute latest turn is never masked,
-    regardless of token count.
-  - **Default:** `true`
-  - **Requires restart:** Yes
-
 #### `admin`
 
 - **`admin.secureModeEnabled`** (boolean):

docs/reference/keyboard-shortcuts.md

@@ -127,13 +127,6 @@ 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/reference/policy-engine.md

@@ -29,12 +29,13 @@ To create your first policy:
     ```toml
     [[rule]]
     toolName = "run_shell_command"
-    commandPrefix = "rm -rf"
-    decision = "deny"
+    commandPrefix = "git status"
+    decision = "allow"
     priority = 100
     ```
 3.  **Run a command** that triggers the policy (e.g., ask Gemini CLI to
-    `rm -rf /`). The tool will now be blocked automatically.
+    `git status`). The tool will now execute automatically without prompting for
+    confirmation.
 
 ## Core concepts
 
@@ -142,26 +143,25 @@ engine transforms this into a final priority using the following formula:
 
 This system guarantees that:
 
-- Admin policies always override User, Workspace, and Default policies (defined
-  in policy TOML files).
+- Admin policies always override User, Workspace, and Default policies.
 - User policies override Workspace and Default policies.
 - Workspace policies override Default policies.
 - You can still order rules within a single tier with fine-grained control.
 
 For example:
 
-- A `priority: 50` rule in a Default policy TOML becomes `1.050`.
-- A `priority: 10` rule in a Workspace policy TOML becomes `2.010`.
-- A `priority: 100` rule in a User policy TOML becomes `3.100`.
-- A `priority: 20` rule in an Admin policy TOML becomes `4.020`.
+- A `priority: 50` rule in a Default policy file becomes `1.050`.
+- A `priority: 10` rule in a Workspace policy policy file becomes `2.010`.
+- A `priority: 100` rule in a User policy file becomes `3.100`.
+- A `priority: 20` rule in an Admin policy file becomes `4.020`.
 
 ### Approval modes
 
 Approval modes allow the policy engine to apply different sets of rules based on
-the CLI's operational mode. A rule in a TOML policy file can be associated with
-one or more modes (e.g., `yolo`, `autoEdit`, `plan`). The rule will only be
-active if the CLI is running in one of its specified modes. If a rule has no
-modes specified, it is always active.
+the CLI's operational mode. A rule can be associated with one or more modes
+(e.g., `yolo`, `autoEdit`, `plan`). The rule will only be active if the CLI is
+running in one of its specified modes. If a rule has no modes specified, it is
+always active.
 
 - `default`: The standard interactive mode where most write tools require
   confirmation.
@@ -171,24 +171,6 @@ modes specified, it is always active.
   [Customizing Plan Mode Policies](../cli/plan-mode.md#customizing-policies).
 - `yolo`: A mode where all tools are auto-approved (use with extreme caution).
 
-To maintain the integrity of Plan Mode as a safe research environment,
-persistent tool approvals are context-aware. When you select **"Allow for all
-future sessions"**, the policy engine explicitly includes the current mode and
-all more permissive modes in the hierarchy (`plan` < `default` < `autoEdit` <
-`yolo`).
-
-- **Approvals in `plan` mode**: These represent an intentional choice to trust a
-  tool globally. The resulting rule explicitly includes all modes (`plan`,
-  `default`, `autoEdit`, and `yolo`).
-- **Approvals in other modes**: These only apply to the current mode and those
-  more permissive. For example:
-  - An approval granted in **`default`** mode applies to `default`, `autoEdit`,
-    and `yolo`.
-  - An approval granted in **`autoEdit`** mode applies to `autoEdit` and `yolo`.
-  - An approval granted in **`yolo`** mode applies only to `yolo`. This ensures
-    that trust flows correctly to more permissive environments while maintaining
-    the safety of more restricted modes like `plan`.
-
 ## Rule matching
 
 When a tool call is made, the engine checks it against all active rules,
@@ -197,8 +179,8 @@ outcome.
 
 A rule matches a tool call if all of its conditions are met:
 
-1.  **Tool name**: The `toolName` in the TOML rule must match the name of the
-    tool being called.
+1.  **Tool name**: The `toolName` in the rule must match the name of the tool
+    being called.
     - **Wildcards**: You can use wildcards like `*`, `mcp_server_*`, or
       `mcp_*_toolName` to match multiple tools. See [Tool Name](#tool-name) for
       details.
@@ -282,7 +264,7 @@ toolName = "run_shell_command"
 
 # (Optional) The name of a subagent. If provided, the rule only applies to tool
 # calls made by this specific subagent.
-subagent = "codebase_investigator"
+subagent = "generalist"
 
 # (Optional) The name of an MCP server. Can be combined with toolName
 # to form a composite FQN internally like "mcp_mcpName_toolName".
@@ -322,8 +304,7 @@ priority = 10
 denyMessage = "Deletion is permanent"
 
 # (Optional) An array of approval modes where this rule is active.
-# If omitted or empty, the rule applies to all modes.
-modes = ["default", "autoEdit", "yolo"]
+modes = ["autoEdit"]
 
 # (Optional) A boolean to restrict the rule to interactive (true) or
 # non-interactive (false) environments.
@@ -438,6 +419,20 @@ decision = "ask_user"
 priority = 10
 ```
 
+**4. Targeting a tool name across all servers**
+
+Use `mcpName = "*"` with a specific `toolName` to target that operation
+regardless of which server provides it.
+
+```toml
+# Allow the `search` tool across all connected MCP servers
+[[rule]]
+mcpName = "*"
+toolName = "search"
+decision = "allow"
+priority = 50
+```
+
 ## Default policies
 
 The Gemini CLI ships with a set of default policies to provide a safe

docs/sidebar.json

@@ -138,10 +138,12 @@
           { "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" },

docs/tools/planning.md

@@ -32,9 +32,7 @@ and planning.
 ## 2. `exit_plan_mode` (ExitPlanMode)
 
 `exit_plan_mode` signals that the planning phase is complete. It presents the
-finalized plan to the user and requests formal approval to start the
-implementation. The agent MUST reach an informal agreement with the user in the
-chat regarding the proposed strategy BEFORE calling this tool.
+finalized plan to the user and requests approval to start the implementation.
 
 - **Tool name:** `exit_plan_mode`
 - **Display name:** Exit Plan Mode
@@ -46,7 +44,7 @@ chat regarding the proposed strategy BEFORE calling this tool.
 - **Behavior:**
   - Validates that the `plan_path` is within the allowed directory and that the
     file exists and has content.
-  - Presents the plan to the user for formal review.
+  - Presents the plan to the user for review.
   - If the user approves the plan:
     - Switches the CLI's approval mode to the user's chosen approval mode (
       `DEFAULT` or `AUTO_EDIT`).
@@ -58,5 +56,5 @@ chat regarding the proposed strategy BEFORE calling this tool.
   - On approval: A message indicating the plan was approved and the new approval
     mode.
   - On rejection: A message containing the user's feedback.
-- **Confirmation:** Yes. Shows the finalized plan and asks for user formal
-  approval to proceed with implementation.
+- **Confirmation:** Yes. Shows the finalized plan and asks for user approval to
+  proceed with implementation.

evals/plan_mode.eval.ts

@@ -15,9 +15,7 @@ import {
 describe('plan_mode', () => {
   const TEST_PREFIX = 'Plan Mode: ';
   const settings = {
-    general: {
-      plan: { enabled: true },
-    },
+    experimental: { plan: true },
   };
 
   const getWriteTargets = (logs: any[]) =>
@@ -174,8 +172,7 @@ describe('plan_mode', () => {
     params: {
       settings,
     },
-    prompt:
-      'I agree with the strategy to use a JWT-based login. Create a plan for a new login feature.',
+    prompt: 'Create a plan for a new login feature.',
     assert: async (rig, result) => {
       await rig.waitForTelemetryReady();
       const toolLogs = rig.readToolLogs();
@@ -212,7 +209,7 @@ describe('plan_mode', () => {
         'import { sum } from "./mathUtils";\nconsole.log(sum(1, 2));',
     },
     prompt:
-      'I want to refactor our math utilities. I agree with the strategy to move the `sum` function from `src/mathUtils.ts` to a new file `src/basicMath.ts` and update `src/main.ts`. Please create a detailed implementation plan first, then execute it.',
+      'I want to refactor our math utilities. Move the `sum` function from `src/mathUtils.ts` to a new file `src/basicMath.ts` and update `src/main.ts` to use the new file. Please create a detailed implementation plan first, then execute it.',
     assert: async (rig, result) => {
       const enterPlanCalled = await rig.waitForToolCall('enter_plan_mode');
       expect(
@@ -284,80 +281,4 @@ describe('plan_mode', () => {
       assertModelHasOutput(result);
     },
   });
-
-  evalTest('ALWAYS_PASSES', {
-    name: 'should transition from plan mode to normal execution and create a plan file from scratch',
-    params: {
-      settings,
-    },
-    prompt:
-      'Enter plan mode and plan to create a new module called foo. The plan should be saved as foo-plan.md. Then, exit plan mode.',
-    assert: async (rig, result) => {
-      const enterPlanCalled = await rig.waitForToolCall('enter_plan_mode');
-      expect(
-        enterPlanCalled,
-        'Expected enter_plan_mode tool to be called',
-      ).toBe(true);
-
-      const exitPlanCalled = await rig.waitForToolCall('exit_plan_mode');
-      expect(exitPlanCalled, 'Expected exit_plan_mode tool to be called').toBe(
-        true,
-      );
-
-      await rig.waitForTelemetryReady();
-      const toolLogs = rig.readToolLogs();
-
-      // Check if the plan file was written successfully
-      const planWrite = toolLogs.find(
-        (log) =>
-          log.toolRequest.name === 'write_file' &&
-          log.toolRequest.args.includes('foo-plan.md'),
-      );
-
-      expect(
-        planWrite,
-        'Expected write_file to be called for foo-plan.md',
-      ).toBeDefined();
-
-      expect(
-        planWrite?.toolRequest.success,
-        `Expected write_file to succeed, but got error: ${planWrite?.toolRequest.error}`,
-      ).toBe(true);
-
-      assertModelHasOutput(result);
-    },
-  });
-
-  evalTest('USUALLY_PASSES', {
-    name: 'should not exit plan mode or draft before informal agreement',
-    approvalMode: ApprovalMode.PLAN,
-    params: {
-      settings,
-    },
-    prompt: 'I need to build a new login feature. Please plan it.',
-    assert: async (rig, result) => {
-      await rig.waitForTelemetryReady();
-      const toolLogs = rig.readToolLogs();
-
-      const exitPlanCall = toolLogs.find(
-        (log) => log.toolRequest.name === 'exit_plan_mode',
-      );
-      expect(
-        exitPlanCall,
-        'Should NOT call exit_plan_mode before informal agreement',
-      ).toBeUndefined();
-
-      const planWrite = toolLogs.find(
-        (log) =>
-          log.toolRequest.name === 'write_file' &&
-          log.toolRequest.args.includes('/plans/'),
-      );
-      expect(
-        planWrite,
-        'Should NOT draft the plan file before informal agreement',
-      ).toBeUndefined();
-
-      assertModelHasOutput(result);
-    },
-  });
 });

evals/tracker.eval.ts

@@ -113,21 +113,4 @@ describe('tracker_mode', () => {
       assertModelHasOutput(result);
     },
   });
-
-  evalTest('USUALLY_PASSES', {
-    name: 'should correctly identify the task tracker storage location from the system prompt',
-    params: {
-      settings: { experimental: { taskTracker: true } },
-    },
-    prompt:
-      'Where is my task tracker storage located? Please provide the absolute path in your response.',
-    assert: async (rig, result) => {
-      // The rig sets GEMINI_CLI_HOME to rig.homeDir
-      const homeDir = rig.homeDir!;
-      // The response should contain the dynamic path which includes the home directory
-      // and follows the .gemini/tmp/.../tracker structure.
-      expect(result).toContain(homeDir);
-      expect(result).toMatch(/\.gemini\/tmp\/.*\/tracker/);
-    },
-  });
 });

evals/update_topic.eval.ts

@@ -1,116 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, expect } from 'vitest';
-import { evalTest } from './test-helper.js';
-
-describe('update_topic_behavior', () => {
-  // Constants for tool names and params for robustness
-  const UPDATE_TOPIC_TOOL_NAME = 'update_topic';
-
-  /**
-   * Verifies the desired behavior of the update_topic tool. update_topic is used by the
-   * agent to share periodic, concise updates about what the agent is working on, independent
-   * of the regular model output and/or thoughts. This tool is expected to be called at least
-   * at the start and end of the session, and typically at least once in the middle, but no
-   * more than 1/4 turns.
-   */
-  evalTest('USUALLY_PASSES', {
-    name: 'update_topic should be used at start, end and middle for complex tasks',
-    prompt: `Create a simple users REST API using Express. 
-1. Initialize a new npm project and install express.
-2. Create src/app.ts as the main entry point.
-3. Create src/routes/userRoutes.ts for user routes.
-4. Create src/controllers/userController.ts for user logic.
-5. Implement GET /users, POST /users, and GET /users/:id using an in-memory array.
-6. Add a 'start' script to package.json.
-7. Finally, run a quick grep to verify the routes are in src/app.ts.`,
-    files: {
-      'package.json': JSON.stringify(
-        {
-          name: 'users-api',
-          version: '1.0.0',
-          private: true,
-        },
-        null,
-        2,
-      ),
-      '.gemini/settings.json': JSON.stringify({
-        experimental: {
-          topicUpdateNarration: true,
-        },
-      }),
-    },
-    assert: async (rig, result) => {
-      const toolLogs = rig.readToolLogs();
-      const topicCalls = toolLogs.filter(
-        (l) => l.toolRequest.name === UPDATE_TOPIC_TOOL_NAME,
-      );
-
-      // 1. Assert that update_topic is called at least 3 times (start, middle, end)
-      expect(
-        topicCalls.length,
-        `Expected at least 3 update_topic calls, but found ${topicCalls.length}`,
-      ).toBeGreaterThanOrEqual(3);
-
-      // 2. Assert update_topic is called at the very beginning (first tool call)
-      expect(
-        toolLogs[0].toolRequest.name,
-        'First tool call should be update_topic',
-      ).toBe(UPDATE_TOPIC_TOOL_NAME);
-
-      // 3. Assert update_topic is called near the end
-      const lastTopicCallIndex = toolLogs
-        .map((l) => l.toolRequest.name)
-        .lastIndexOf(UPDATE_TOPIC_TOOL_NAME);
-      expect(
-        lastTopicCallIndex,
-        'Expected update_topic to be used near the end of the task',
-      ).toBeGreaterThanOrEqual(toolLogs.length * 0.7);
-
-      // 4. Assert there is at least one update_topic call in the middle (between start and end phases)
-      const middleTopicCalls = topicCalls.slice(1, -1);
-
-      expect(
-        middleTopicCalls.length,
-        'Expected at least one update_topic call in the middle of the task',
-      ).toBeGreaterThanOrEqual(1);
-
-      // 5. Turn Ratio Assertion: update_topic should be <= 1/2 of total turns.
-      // We only enforce this for tasks that take more than 5 turns, as shorter tasks
-      // naturally have a higher ratio when following the "start, middle, end" rule.
-      const uniquePromptIds = new Set(
-        toolLogs
-          .map((l) => l.toolRequest.prompt_id)
-          .filter((id) => id !== undefined),
-      );
-      const totalTurns = uniquePromptIds.size;
-
-      if (totalTurns > 5) {
-        const topicTurns = new Set(
-          topicCalls
-            .map((l) => l.toolRequest.prompt_id)
-            .filter((id) => id !== undefined),
-        );
-        const topicTurnCount = topicTurns.size;
-
-        const ratio = topicTurnCount / totalTurns;
-
-        expect(
-          ratio,
-          `update_topic was used in ${topicTurnCount} out of ${totalTurns} turns (${(ratio * 100).toFixed(1)}%). Expected <= 50%.`,
-        ).toBeLessThanOrEqual(0.5);
-
-        // Ideal ratio is closer to 1/5 (20%). We log high usage as a warning.
-        if (ratio > 0.25) {
-          console.warn(
-            `[Efficiency Warning] update_topic usage is high: ${(ratio * 100).toFixed(1)}% (Goal: ~20%)`,
-          );
-        }
-      }
-    },
-  });
-});

integration-tests/api-resilience.responses

@@ -1 +1 @@
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"Part 1. "}],"role":"model"},"index":0}]},{"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":10,"totalTokenCount":110}},{"candidates":[{"content":{"parts":[{"text":"Part 2."}],"role":"model"},"index":0,"finishReason":"STOP"}]}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"Part 1. "}],"role":"model"},"index":0}]},{"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":10,"totalTokenCount":110}},{"candidates":[{"content":{"parts":[{"text":"Part 2."}],"role":"model"},"index":0}],"finishReason":"STOP"}]}

integration-tests/browser-policy.test.ts

@@ -10,13 +10,8 @@ import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { execSync } from 'node:child_process';
 import { existsSync, writeFileSync, readFileSync, mkdirSync } from 'node:fs';
-import { env } from 'node:process';
 import stripAnsi from 'strip-ansi';
 
-// Browser agent Chrome DevTools MCP connection is flaky in Docker sandbox.
-// See: https://github.com/google-gemini/gemini-cli/issues/24382
-const isDockerSandbox = env['GEMINI_SANDBOX'] === 'docker';
-
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
@@ -64,146 +59,122 @@ describe.skipIf(!chromeAvailable)('browser-policy', () => {
     await rig.cleanup();
   });
 
-  it.skipIf(isDockerSandbox)(
-    'should skip confirmation when "Allow all server tools for this session" is chosen',
-    async () => {
-      rig.setup('browser-policy-skip-confirmation', {
-        fakeResponsesPath: join(__dirname, 'browser-policy.responses'),
-        settings: {
-          agents: {
-            overrides: {
-              browser_agent: {
-                enabled: true,
-              },
-            },
-            browser: {
-              headless: true,
-              sessionMode: 'isolated',
-              allowedDomains: ['example.com'],
+  it('should skip confirmation when "Allow all server tools for this session" is chosen', async () => {
+    rig.setup('browser-policy-skip-confirmation', {
+      fakeResponsesPath: join(__dirname, 'browser-policy.responses'),
+      settings: {
+        agents: {
+          overrides: {
+            browser_agent: {
+              enabled: true,
             },
           },
+          browser: {
+            headless: true,
+            sessionMode: 'isolated',
+            allowedDomains: ['example.com'],
+          },
         },
-      });
+      },
+    });
 
-      // Manually trust the folder to avoid the dialog and enable option 3
-      const geminiDir = join(rig.homeDir!, '.gemini');
-      mkdirSync(geminiDir, { recursive: true });
+    // Manually trust the folder to avoid the dialog and enable option 3
+    const geminiDir = join(rig.homeDir!, '.gemini');
+    mkdirSync(geminiDir, { recursive: true });
 
-      // Write to trustedFolders.json
-      const trustedFoldersPath = join(geminiDir, 'trustedFolders.json');
-      const trustedFolders = {
-        [rig.testDir!]: 'TRUST_FOLDER',
-      };
-      writeFileSync(
-        trustedFoldersPath,
-        JSON.stringify(trustedFolders, null, 2),
-      );
+    // Write to trustedFolders.json
+    const trustedFoldersPath = join(geminiDir, 'trustedFolders.json');
+    const trustedFolders = {
+      [rig.testDir!]: 'TRUST_FOLDER',
+    };
+    writeFileSync(trustedFoldersPath, JSON.stringify(trustedFolders, null, 2));
 
-      // Force confirmation for browser agent.
-      // NOTE: We don't force confirm browser tools here because "Allow all server tools"
-      // adds a rule with ALWAYS_ALLOW_PRIORITY (3.9x) which would be overshadowed by
-      // a rule in the user tier (4.x) like the one from this TOML.
-      // By removing the explicit mcp rule, the first MCP tool will still prompt
-      // due to default approvalMode = 'default', and then "Allow all" will correctly
-      // bypass subsequent tools.
-      const policyFile = join(rig.testDir!, 'force-confirm.toml');
-      writeFileSync(
-        policyFile,
-        `
+    // Force confirmation for browser agent.
+    // NOTE: We don't force confirm browser tools here because "Allow all server tools"
+    // adds a rule with ALWAYS_ALLOW_PRIORITY (3.9x) which would be overshadowed by
+    // a rule in the user tier (4.x) like the one from this TOML.
+    // By removing the explicit mcp rule, the first MCP tool will still prompt
+    // due to default approvalMode = 'default', and then "Allow all" will correctly
+    // bypass subsequent tools.
+    const policyFile = join(rig.testDir!, 'force-confirm.toml');
+    writeFileSync(
+      policyFile,
+      `
 [[rule]]
 name = "Force confirm browser_agent"
 toolName = "browser_agent"
 decision = "ask_user"
 priority = 200
 `,
-      );
+    );
 
-      // Update settings.json in both project and home directories to point to the policy file
-      for (const baseDir of [rig.testDir!, rig.homeDir!]) {
-        const settingsPath = join(baseDir, '.gemini', 'settings.json');
-        if (existsSync(settingsPath)) {
-          const settings = JSON.parse(readFileSync(settingsPath, 'utf-8'));
-          settings.policyPaths = [policyFile];
-          // Ensure folder trust is enabled
-          settings.security = settings.security || {};
-          settings.security.folderTrust = settings.security.folderTrust || {};
-          settings.security.folderTrust.enabled = true;
-          writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
-        }
+    // Update settings.json in both project and home directories to point to the policy file
+    for (const baseDir of [rig.testDir!, rig.homeDir!]) {
+      const settingsPath = join(baseDir, '.gemini', 'settings.json');
+      if (existsSync(settingsPath)) {
+        const settings = JSON.parse(readFileSync(settingsPath, 'utf-8'));
+        settings.policyPaths = [policyFile];
+        // Ensure folder trust is enabled
+        settings.security = settings.security || {};
+        settings.security.folderTrust = settings.security.folderTrust || {};
+        settings.security.folderTrust.enabled = true;
+        writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
       }
+    }
 
-      const run = await rig.runInteractive({
-        approvalMode: 'default',
-        env: {
-          GEMINI_CLI_INTEGRATION_TEST: 'true',
-        },
-      });
+    const run = await rig.runInteractive({
+      approvalMode: 'default',
+      env: {
+        GEMINI_CLI_INTEGRATION_TEST: 'true',
+      },
+    });
 
-      await run.sendKeys(
-        'Open https://example.com and check if there is a heading\r',
-      );
-      await run.sendKeys('\r');
+    await run.sendKeys(
+      'Open https://example.com and check if there is a heading\r',
+    );
+    await run.sendKeys('\r');
 
-      // Handle confirmations.
-      // 1. Initial browser_agent delegation (likely only 3 options, so use option 1: Allow once)
-      await poll(
-        () => stripAnsi(run.output).toLowerCase().includes('action required'),
-        60000,
-        1000,
-      );
-      await run.sendKeys('1\r');
-      await new Promise((r) => setTimeout(r, 2000));
+    // Handle confirmations.
+    // 1. Initial browser_agent delegation (likely only 3 options, so use option 1: Allow once)
+    await poll(
+      () => stripAnsi(run.output).toLowerCase().includes('action required'),
+      60000,
+      1000,
+    );
+    await run.sendKeys('1\r');
+    await new Promise((r) => setTimeout(r, 2000));
 
-      // Handle privacy notice
-      await poll(
-        () => stripAnsi(run.output).toLowerCase().includes('privacy notice'),
-        5000,
-        100,
-      );
-      await run.sendKeys('1\r');
-      await new Promise((r) => setTimeout(r, 5000));
+    // Handle privacy notice
+    await poll(
+      () => stripAnsi(run.output).toLowerCase().includes('privacy notice'),
+      5000,
+      100,
+    );
+    await run.sendKeys('1\r');
+    await new Promise((r) => setTimeout(r, 5000));
 
-      // new_page (MCP tool, should have 4 options, use option 3: Allow all server tools)
-      await poll(
-        () => {
-          const stripped = stripAnsi(run.output).toLowerCase();
-          return (
-            stripped.includes('new_page') &&
-            stripped.includes('allow all server tools for this session')
-          );
-        },
-        60000,
-        1000,
-      );
+    // new_page (MCP tool, should have 4 options, use option 3: Allow all server tools)
+    await poll(
+      () => {
+        const stripped = stripAnsi(run.output).toLowerCase();
+        return (
+          stripped.includes('new_page') &&
+          stripped.includes('allow all server tools for this session')
+        );
+      },
+      60000,
+      1000,
+    );
 
-      // Select "Allow all server tools for this session" (option 3)
-      await run.sendKeys('3\r');
+    // Select "Allow all server tools for this session" (option 3)
+    await run.sendKeys('3\r');
+    await new Promise((r) => setTimeout(r, 30000));
 
-      // Wait for the browser agent to finish (success or failure)
-      await poll(
-        () => {
-          const stripped = stripAnsi(run.output).toLowerCase();
-          return (
-            stripped.includes('completed successfully') ||
-            stripped.includes('agent error')
-          );
-        },
-        120000,
-        1000,
-      );
+    const output = stripAnsi(run.output).toLowerCase();
 
-      const output = stripAnsi(run.output).toLowerCase();
-
-      expect(output).toContain('browser_agent');
-      // The test validates that "Allow all server tools" skips subsequent
-      // tool confirmations — the browser agent may still fail due to
-      // Chrome/MCP issues in CI, which is acceptable for this policy test.
-      expect(
-        output.includes('completed successfully') ||
-          output.includes('agent error'),
-      ).toBe(true);
-    },
-  );
+    expect(output).toContain('browser_agent');
+    expect(output).toContain('completed successfully');
+  });
 
   it('should show the visible warning when browser agent starts in existing session mode', async () => {
     rig.setup('browser-session-warning', {

integration-tests/file-system.test.ts

@@ -121,7 +121,6 @@ describe('file-system', () => {
 
     const result = await rig.run({
       args: `write "hello" to "${fileName}" and then stop. Do not perform any other actions.`,
-      timeout: 600000, // 10 min — real LLM can be slow in Docker sandbox
     });
 
     const foundToolCall = await rig.waitForToolCall('write_file');

integration-tests/plan-mode.test.ts

@@ -23,9 +23,7 @@ describe('Plan Mode', () => {
       'should allow read-only tools but deny write tools in plan mode',
       {
         settings: {
-          general: {
-            plan: { enabled: true },
-          },
+          experimental: { plan: true },
           tools: {
             core: [
               'run_shell_command',
@@ -69,12 +67,15 @@ 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,
+          },
         },
       },
     });
@@ -119,19 +120,22 @@ 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,
+          },
         },
       },
     });
 
     await rig.run({
       approvalMode: 'plan',
-      args: 'Attempt to create a file named "hello.txt" in the current directory. Do not create a plan file, try to write hello.txt directly.',
+      args: 'Create a file called hello.txt in the current directory.',
     });
 
     const toolLogs = rig.readToolLogs();
@@ -152,9 +156,7 @@ 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: {
-        general: {
-          plan: { enabled: true },
-        },
+        experimental: { plan: true },
         tools: {
           core: ['enter_plan_mode'],
           allowed: ['enter_plan_mode'],
@@ -182,12 +184,15 @@ 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

@@ -1,17 +1,17 @@
 {
   "name": "@google/gemini-cli",
-  "version": "0.37.1",
+  "version": "0.36.0-nightly.20260317.2f90b4653",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@google/gemini-cli",
-      "version": "0.37.1",
+      "version": "0.36.0-nightly.20260317.2f90b4653",
       "workspaces": [
         "packages/*"
       ],
       "dependencies": {
-        "ink": "npm:@jrichman/ink@6.6.3",
+        "ink": "npm:@jrichman/ink@6.5.0",
         "latest-version": "^9.0.0",
         "node-fetch-native": "^1.6.7",
         "proper-lockfile": "^4.1.2",
@@ -92,6 +92,46 @@
         "zod": "^3.25.0 || ^4.0.0"
       }
     },
+    "node_modules/@alcalzone/ansi-tokenize": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/@alcalzone/ansi-tokenize/-/ansi-tokenize-0.2.2.tgz",
+      "integrity": "sha512-mkOh+Wwawzuf5wa30bvc4nA+Qb6DIrGWgBhRR/Pw4T9nsgYait8izvXkNyU78D6Wcu3Z+KUdwCmLCxlWjEotYA==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^6.2.1",
+        "is-fullwidth-code-point": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@alcalzone/ansi-tokenize/node_modules/ansi-styles": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@alcalzone/ansi-tokenize/node_modules/is-fullwidth-code-point": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.1.0.tgz",
+      "integrity": "sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "get-east-asian-width": "^1.3.1"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/@ampproject/remapping": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
@@ -10049,13 +10089,14 @@
     },
     "node_modules/ink": {
       "name": "@jrichman/ink",
-      "version": "6.6.3",
-      "resolved": "https://registry.npmjs.org/@jrichman/ink/-/ink-6.6.3.tgz",
-      "integrity": "sha512-0v4S7TbbF2tpQrfqH1btwLgTgH+K0vY2BJbokTE5Lk1KBr4TqZ+Pyo+geSD5F+zytX6G2ajGHBQyHk8yGK4C7A==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@jrichman/ink/-/ink-6.5.0.tgz",
+      "integrity": "sha512-S4g/ng7fPZmFwclO82iWkOce8vDLy/FIDgHIfkCWGOehqHe6dexHsmq3kNQD21okh198pA5SAQTCqNQJb/svRQ==",
       "license": "MIT",
       "dependencies": {
+        "@alcalzone/ansi-tokenize": "^0.2.1",
         "ansi-escapes": "^7.0.0",
-        "ansi-styles": "^6.2.3",
+        "ansi-styles": "^6.2.1",
         "auto-bind": "^5.0.1",
         "chalk": "^5.6.0",
         "cli-boxes": "^3.0.0",
@@ -10064,7 +10105,6 @@
         "code-excerpt": "^4.0.0",
         "es-toolkit": "^1.39.10",
         "indent-string": "^5.0.0",
-        "is-fullwidth-code-point": "^5.0.0",
         "is-in-ci": "^2.0.0",
         "mnemonist": "^0.40.3",
         "patch-console": "^2.0.0",
@@ -10134,9 +10174,9 @@
       }
     },
     "node_modules/ink/node_modules/ansi-styles": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
-      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -10157,21 +10197,6 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/ink/node_modules/is-fullwidth-code-point": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.1.0.tgz",
-      "integrity": "sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==",
-      "license": "MIT",
-      "dependencies": {
-        "get-east-asian-width": "^1.3.1"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/ink/node_modules/is-in-ci": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-in-ci/-/is-in-ci-2.0.0.tgz",
@@ -17389,7 +17414,7 @@
     },
     "packages/a2a-server": {
       "name": "@google/gemini-cli-a2a-server",
-      "version": "0.37.1",
+      "version": "0.36.0-nightly.20260317.2f90b4653",
       "dependencies": {
         "@a2a-js/sdk": "0.3.11",
         "@google-cloud/storage": "^7.16.0",
@@ -17504,7 +17529,7 @@
     },
     "packages/cli": {
       "name": "@google/gemini-cli",
-      "version": "0.37.1",
+      "version": "0.36.0-nightly.20260317.2f90b4653",
       "license": "Apache-2.0",
       "dependencies": {
         "@agentclientprotocol/sdk": "^0.16.1",
@@ -17526,7 +17551,7 @@
         "fzf": "^0.5.2",
         "glob": "^12.0.0",
         "highlight.js": "^11.11.1",
-        "ink": "npm:@jrichman/ink@6.6.3",
+        "ink": "npm:@jrichman/ink@6.5.0",
         "ink-gradient": "^3.0.0",
         "ink-spinner": "^5.0.0",
         "latest-version": "^9.0.0",
@@ -17676,7 +17701,7 @@
     },
     "packages/core": {
       "name": "@google/gemini-cli-core",
-      "version": "0.37.1",
+      "version": "0.36.0-nightly.20260317.2f90b4653",
       "license": "Apache-2.0",
       "dependencies": {
         "@a2a-js/sdk": "0.3.11",
@@ -17942,7 +17967,7 @@
     },
     "packages/devtools": {
       "name": "@google/gemini-cli-devtools",
-      "version": "0.37.1",
+      "version": "0.36.0-nightly.20260317.2f90b4653",
       "license": "Apache-2.0",
       "dependencies": {
         "ws": "^8.16.0"
@@ -17957,7 +17982,7 @@
     },
     "packages/sdk": {
       "name": "@google/gemini-cli-sdk",
-      "version": "0.37.1",
+      "version": "0.36.0-nightly.20260317.2f90b4653",
       "license": "Apache-2.0",
       "dependencies": {
         "@google/gemini-cli-core": "file:../core",
@@ -17974,7 +17999,7 @@
     },
     "packages/test-utils": {
       "name": "@google/gemini-cli-test-utils",
-      "version": "0.37.1",
+      "version": "0.36.0-nightly.20260317.2f90b4653",
       "license": "Apache-2.0",
       "dependencies": {
         "@google/gemini-cli-core": "file:../core",
@@ -17991,7 +18016,7 @@
     },
     "packages/vscode-ide-companion": {
       "name": "gemini-cli-vscode-ide-companion",
-      "version": "0.37.1",
+      "version": "0.36.0-nightly.20260317.2f90b4653",
       "license": "LICENSE",
       "dependencies": {
         "@modelcontextprotocol/sdk": "^1.23.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/gemini-cli",
-  "version": "0.37.1",
+  "version": "0.36.0-nightly.20260317.2f90b4653",
   "engines": {
     "node": ">=20.0.0"
   },
@@ -14,7 +14,7 @@
     "url": "git+https://github.com/google-gemini/gemini-cli.git"
   },
   "config": {
-    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.37.1"
+    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.36.0-nightly.20260317.2f90b4653"
   },
   "scripts": {
     "start": "cross-env NODE_ENV=development node scripts/start.js",
@@ -38,7 +38,7 @@
     "build:packages": "npm run build --workspaces",
     "build:sandbox": "node scripts/build_sandbox.js",
     "build:binary": "node scripts/build_binary.js",
-    "bundle": "npm run generate && npm run build --workspace=@google/gemini-cli-devtools && npm run bundle:browser-mcp -w @google/gemini-cli-core && node esbuild.config.js && node scripts/copy_bundle_assets.js",
+    "bundle": "npm run generate && npm run build --workspace=@google/gemini-cli-devtools && node esbuild.config.js && node scripts/copy_bundle_assets.js",
     "test": "npm run test --workspaces --if-present && npm run test:sea-launch",
     "test:ci": "npm run test:ci --workspaces --if-present && npm run test:scripts && npm run test:sea-launch",
     "test:scripts": "vitest run --config ./scripts/tests/vitest.config.ts",
@@ -68,7 +68,7 @@
     "pre-commit": "node scripts/pre-commit.js"
   },
   "overrides": {
-    "ink": "npm:@jrichman/ink@6.6.3",
+    "ink": "npm:@jrichman/ink@6.5.0",
     "wrap-ansi": "9.0.2",
     "cliui": {
       "wrap-ansi": "7.0.0"
@@ -136,7 +136,7 @@
     "yargs": "^17.7.2"
   },
   "dependencies": {
-    "ink": "npm:@jrichman/ink@6.6.3",
+    "ink": "npm:@jrichman/ink@6.5.0",
     "latest-version": "^9.0.0",
     "node-fetch-native": "^1.6.7",
     "proper-lockfile": "^4.1.2",

packages/a2a-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/gemini-cli-a2a-server",
-  "version": "0.37.1",
+  "version": "0.36.0-nightly.20260317.2f90b4653",
   "description": "Gemini CLI A2A Server",
   "repository": {
     "type": "git",

packages/a2a-server/src/utils/testing_utils.ts

@@ -109,8 +109,12 @@ export function createMockConfig(
         enableEnvironmentVariableRedaction: false,
       },
     }),
-    isAutoDistillationEnabled: vi.fn().mockReturnValue(false),
-    getContextManagementConfig: vi.fn().mockReturnValue({ enabled: false }),
+    isExperimentalAgentHistoryTruncationEnabled: vi.fn().mockReturnValue(false),
+    getExperimentalAgentHistoryTruncationThreshold: vi.fn().mockReturnValue(50),
+    getExperimentalAgentHistoryRetainedMessages: vi.fn().mockReturnValue(30),
+    isExperimentalAgentHistorySummarizationEnabled: vi
+      .fn()
+      .mockReturnValue(false),
     ...overrides,
   } as unknown as Config;
 

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/gemini-cli",
-  "version": "0.37.1",
+  "version": "0.36.0-nightly.20260317.2f90b4653",
   "description": "Gemini CLI",
   "license": "Apache-2.0",
   "repository": {
@@ -27,7 +27,7 @@
     "dist"
   ],
   "config": {
-    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.37.1"
+    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.36.0-nightly.20260317.2f90b4653"
   },
   "dependencies": {
     "@agentclientprotocol/sdk": "^0.16.1",
@@ -49,7 +49,7 @@
     "fzf": "^0.5.2",
     "glob": "^12.0.0",
     "highlight.js": "^11.11.1",
-    "ink": "npm:@jrichman/ink@6.6.3",
+    "ink": "npm:@jrichman/ink@6.5.0",
     "ink-gradient": "^3.0.0",
     "ink-spinner": "^5.0.0",
     "latest-version": "^9.0.0",

packages/cli/src/acp/acpClient.test.ts

@@ -27,7 +27,6 @@ import {
   type MessageBus,
   LlmRole,
   type GitService,
-  type ModelRouterService,
   processSingleFileContent,
   InvalidStreamError,
 } from '@google/gemini-cli-core';
@@ -103,7 +102,17 @@ vi.mock(
       ...actual,
       updatePolicy: vi.fn(),
       createPolicyUpdater: vi.fn(),
-      ReadManyFilesTool: vi.fn(),
+      ReadManyFilesTool: vi.fn().mockImplementation(() => ({
+        name: 'read_many_files',
+        kind: 'read',
+        build: vi.fn().mockReturnValue({
+          getDescription: () => 'Read files',
+          toolLocations: () => [],
+          execute: vi.fn().mockResolvedValue({
+            llmContent: ['--- file.txt ---\n\nFile content\n\n'],
+          }),
+        }),
+      })),
       logToolCall: vi.fn(),
       LlmRole: {
         MAIN: 'main',
@@ -412,26 +421,6 @@ describe('GeminiAgent', () => {
     );
   });
 
-  it('should include gemini-3.1-flash-lite when useGemini31FlashLite is true', async () => {
-    mockConfig.getHasAccessToPreviewModel = vi.fn().mockReturnValue(true);
-    mockConfig.getGemini31LaunchedSync = vi.fn().mockReturnValue(true);
-    mockConfig.getGemini31FlashLiteLaunchedSync = vi.fn().mockReturnValue(true);
-
-    const response = await agent.newSession({
-      cwd: '/tmp',
-      mcpServers: [],
-    });
-
-    expect(response.models?.availableModels).toEqual(
-      expect.arrayContaining([
-        expect.objectContaining({
-          modelId: 'gemini-3.1-flash-lite-preview',
-          name: 'gemini-3.1-flash-lite-preview',
-        }),
-      ]),
-    );
-  });
-
   it('should return modes with plan mode when plan is enabled', async () => {
     mockConfig.getContentGeneratorConfig = vi.fn().mockReturnValue({
       apiKey: 'test-key',
@@ -657,7 +646,6 @@ describe('Session', () => {
       sendMessageStream: vi.fn(),
       addHistory: vi.fn(),
       recordCompletedToolCalls: vi.fn(),
-      getHistory: vi.fn().mockReturnValue([]),
     } as unknown as Mocked<GeminiChat>;
     mockTool = {
       kind: 'read',
@@ -679,9 +667,6 @@ describe('Session', () => {
     mockConfig = {
       getModel: vi.fn().mockReturnValue('gemini-pro'),
       getActiveModel: vi.fn().mockReturnValue('gemini-pro'),
-      getModelRouterService: vi.fn().mockReturnValue({
-        route: vi.fn().mockResolvedValue({ model: 'resolved-model' }),
-      }),
       getToolRegistry: vi.fn().mockReturnValue(mockToolRegistry),
       getMcpServers: vi.fn(),
       getFileService: vi.fn().mockReturnValue({
@@ -728,22 +713,10 @@ describe('Session', () => {
       },
       errors: [],
     } as unknown as LoadedSettings);
-
-    (ReadManyFilesTool as unknown as Mock).mockImplementation(() => ({
-      name: 'read_many_files',
-      kind: 'read',
-      build: vi.fn().mockReturnValue({
-        getDescription: () => 'Read files',
-        toolLocations: () => [],
-        execute: vi.fn().mockResolvedValue({
-          llmContent: ['--- file.txt ---\n\nFile content\n\n'],
-        }),
-      }),
-    }));
   });
 
   afterEach(() => {
-    vi.restoreAllMocks();
+    vi.clearAllMocks();
   });
 
   it('should send available commands', async () => {
@@ -813,42 +786,6 @@ describe('Session', () => {
     expect(result).toMatchObject({ stopReason: 'end_turn' });
   });
 
-  it('should use model router to determine model', async () => {
-    const mockRouter = {
-      route: vi.fn().mockResolvedValue({ model: 'routed-model' }),
-    } as unknown as ModelRouterService;
-    mockConfig.getModelRouterService.mockReturnValue(mockRouter);
-
-    const stream = createMockStream([
-      {
-        type: StreamEventType.CHUNK,
-        value: {
-          candidates: [{ content: { parts: [{ text: 'Hello' }] } }],
-        },
-      },
-    ]);
-    mockChat.sendMessageStream.mockResolvedValue(stream);
-
-    await session.prompt({
-      sessionId: 'session-1',
-      prompt: [{ type: 'text', text: 'Hi' }],
-    });
-
-    expect(mockRouter.route).toHaveBeenCalledWith(
-      expect.objectContaining({
-        requestedModel: 'gemini-pro',
-        request: [{ text: 'Hi' }],
-      }),
-    );
-    expect(mockChat.sendMessageStream).toHaveBeenCalledWith(
-      expect.objectContaining({ model: 'routed-model' }),
-      expect.any(Array),
-      expect.any(String),
-      expect.any(Object),
-      expect.any(String),
-    );
-  });
-
   it('should handle prompt with empty response (InvalidStreamError)', async () => {
     mockChat.sendMessageStream.mockRejectedValue(
       new InvalidStreamError('Empty response', 'NO_RESPONSE_TEXT'),
@@ -875,32 +812,6 @@ describe('Session', () => {
     expect(result).toMatchObject({ stopReason: 'end_turn' });
   });
 
-  it('should handle prompt with no finish reason (InvalidStreamError)', async () => {
-    mockChat.sendMessageStream.mockRejectedValue(
-      new InvalidStreamError('No finish reason', 'NO_FINISH_REASON'),
-    );
-
-    const result = await session.prompt({
-      sessionId: 'session-1',
-      prompt: [{ type: 'text', text: 'Hi' }],
-    });
-
-    expect(mockChat.sendMessageStream).toHaveBeenCalled();
-    expect(result).toMatchObject({ stopReason: 'end_turn' });
-  });
-
-  it('should handle prompt with no finish reason (NO_FINISH_REASON anomaly)', async () => {
-    mockChat.sendMessageStream.mockRejectedValue({ type: 'NO_FINISH_REASON' });
-
-    const result = await session.prompt({
-      sessionId: 'session-1',
-      prompt: [{ type: 'text', text: 'Hi' }],
-    });
-
-    expect(mockChat.sendMessageStream).toHaveBeenCalled();
-    expect(result).toMatchObject({ stopReason: 'end_turn' });
-  });
-
   it('should handle /memory command', async () => {
     const handleCommandSpy = vi
       .spyOn(

packages/cli/src/acp/acpClient.ts

@@ -28,7 +28,7 @@ import {
   debugLogger,
   ReadManyFilesTool,
   REFERENCE_CONTENT_START,
-  type RoutingContext,
+  resolveModel,
   createWorkingStdio,
   startupProfiler,
   Kind,
@@ -42,7 +42,6 @@ import {
   DEFAULT_GEMINI_FLASH_LITE_MODEL,
   PREVIEW_GEMINI_MODEL,
   PREVIEW_GEMINI_3_1_MODEL,
-  PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL,
   PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL,
   PREVIEW_GEMINI_FLASH_MODEL,
   DEFAULT_GEMINI_MODEL_AUTO,
@@ -759,15 +758,10 @@ export class Session {
       const functionCalls: FunctionCall[] = [];
 
       try {
-        const routingContext: RoutingContext = {
-          history: chat.getHistory(/*curated=*/ true),
-          request: nextMessage?.parts ?? [],
-          signal: pendingSend.signal,
-          requestedModel: this.context.config.getModel(),
-        };
-
-        const router = this.context.config.getModelRouterService();
-        const { model } = await router.route(routingContext);
+        const model = resolveModel(
+          this.context.config.getModel(),
+          (await this.context.config.getGemini31Launched?.()) ?? false,
+        );
         const responseStream = await chat.sendMessageStream(
           { model },
           nextMessage?.parts ?? [],
@@ -863,10 +857,7 @@ export class Session {
           (error &&
             typeof error === 'object' &&
             'type' in error &&
-            (error.type === 'NO_RESPONSE_TEXT' ||
-              error.type === 'NO_FINISH_REASON' ||
-              error.type === 'MALFORMED_FUNCTION_CALL' ||
-              error.type === 'UNEXPECTED_TOOL_CALL'))
+            error.type === 'NO_RESPONSE_TEXT')
         ) {
           // The stream ended with an empty response or malformed tool call.
           // Treat this as a graceful end to the model's turn rather than a crash.
@@ -2018,31 +2009,10 @@ function buildAvailableModels(
   const preferredModel = config.getModel() || DEFAULT_GEMINI_MODEL_AUTO;
   const shouldShowPreviewModels = config.getHasAccessToPreviewModel();
   const useGemini31 = config.getGemini31LaunchedSync?.() ?? false;
-  const useGemini31FlashLite =
-    config.getGemini31FlashLiteLaunchedSync?.() ?? false;
   const selectedAuthType = settings.merged.security.auth.selectedType;
   const useCustomToolModel =
     useGemini31 && selectedAuthType === AuthType.USE_GEMINI;
 
-  // --- DYNAMIC PATH ---
-  if (
-    config.getExperimentalDynamicModelConfiguration?.() === true &&
-    config.getModelConfigService
-  ) {
-    const options = config.getModelConfigService().getAvailableModelOptions({
-      useGemini3_1: useGemini31,
-      useGemini3_1FlashLite: useGemini31FlashLite,
-      useCustomTools: useCustomToolModel,
-      hasAccessToPreview: shouldShowPreviewModels,
-    });
-
-    return {
-      availableModels: options,
-      currentModelId: preferredModel,
-    };
-  }
-
-  // --- LEGACY PATH ---
   const mainOptions = [
     {
       value: DEFAULT_GEMINI_MODEL_AUTO,
@@ -2086,7 +2056,7 @@ function buildAvailableModels(
       ? PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL
       : previewProModel;
 
-    const previewOptions = [
+    manualOptions.unshift(
       {
         value: previewProValue,
         title: getDisplayString(previewProModel),
@@ -2095,16 +2065,7 @@ function buildAvailableModels(
         value: PREVIEW_GEMINI_FLASH_MODEL,
         title: getDisplayString(PREVIEW_GEMINI_FLASH_MODEL),
       },
-    ];
-
-    if (useGemini31FlashLite) {
-      previewOptions.push({
-        value: PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL,
-        title: getDisplayString(PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL),
-      });
-    }
-
-    manualOptions.unshift(...previewOptions);
+    );
   }
 
   const scaleOptions = (

packages/cli/src/acp/commandHandler.test.ts

@@ -26,11 +26,5 @@ describe('CommandHandler', () => {
 
     const init = parse('/init');
     expect(init.commandToExecute?.name).toBe('init');
-
-    const about = parse('/about');
-    expect(about.commandToExecute?.name).toBe('about');
-
-    const help = parse('/help');
-    expect(help.commandToExecute?.name).toBe('help');
   });
 });

packages/cli/src/acp/commandHandler.ts

@@ -10,8 +10,6 @@ import { MemoryCommand } from './commands/memory.js';
 import { ExtensionsCommand } from './commands/extensions.js';
 import { InitCommand } from './commands/init.js';
 import { RestoreCommand } from './commands/restore.js';
-import { AboutCommand } from './commands/about.js';
-import { HelpCommand } from './commands/help.js';
 
 export class CommandHandler {
   private registry: CommandRegistry;
@@ -26,8 +24,6 @@ export class CommandHandler {
     registry.register(new ExtensionsCommand());
     registry.register(new InitCommand());
     registry.register(new RestoreCommand());
-    registry.register(new AboutCommand());
-    registry.register(new HelpCommand(registry));
     return registry;
   }
 

packages/cli/src/acp/commands/about.ts

@@ -1,74 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import {
-  IdeClient,
-  UserAccountManager,
-  getVersion,
-} from '@google/gemini-cli-core';
-import type {
-  Command,
-  CommandContext,
-  CommandExecutionResponse,
-} from './types.js';
-import process from 'node:process';
-
-export class AboutCommand implements Command {
-  readonly name = 'about';
-  readonly description = 'Show version and environment info';
-
-  async execute(
-    context: CommandContext,
-    _args: string[] = [],
-  ): Promise<CommandExecutionResponse> {
-    const osVersion = process.platform;
-    let sandboxEnv = 'no sandbox';
-    if (process.env['SANDBOX'] && process.env['SANDBOX'] !== 'sandbox-exec') {
-      sandboxEnv = process.env['SANDBOX'];
-    } else if (process.env['SANDBOX'] === 'sandbox-exec') {
-      sandboxEnv = `sandbox-exec (${
-        process.env['SEATBELT_PROFILE'] || 'unknown'
-      })`;
-    }
-    const modelVersion = context.agentContext.config.getModel() || 'Unknown';
-    const cliVersion = await getVersion();
-    const selectedAuthType =
-      context.settings.merged?.security?.auth?.selectedType ?? '';
-    const gcpProject = process.env['GOOGLE_CLOUD_PROJECT'] || '';
-    const ideClient = await getIdeClientName(context);
-
-    const userAccountManager = new UserAccountManager();
-    const cachedAccount = userAccountManager.getCachedGoogleAccount();
-    const userEmail = cachedAccount ?? 'Unknown';
-
-    const tier = context.agentContext.config.getUserTierName() || 'Unknown';
-
-    const info = [
-      `- Version: ${cliVersion}`,
-      `- OS: ${osVersion}`,
-      `- Sandbox: ${sandboxEnv}`,
-      `- Model: ${modelVersion}`,
-      `- Auth Type: ${selectedAuthType}`,
-      `- GCP Project: ${gcpProject}`,
-      `- IDE Client: ${ideClient}`,
-      `- User Email: ${userEmail}`,
-      `- Tier: ${tier}`,
-    ].join('\n');
-
-    return {
-      name: this.name,
-      data: `Gemini CLI Info:\n${info}`,
-    };
-  }
-}
-
-async function getIdeClientName(context: CommandContext) {
-  if (!context.agentContext.config.getIdeMode()) {
-    return '';
-  }
-  const ideClient = await IdeClient.getInstance();
-  return ideClient?.getDetectedIdeDisplayName() ?? '';
-}

packages/cli/src/acp/commands/help.test.ts

@@ -1,53 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect } from 'vitest';
-import { HelpCommand } from './help.js';
-import { CommandRegistry } from './commandRegistry.js';
-import type { Command, CommandContext } from './types.js';
-
-describe('HelpCommand', () => {
-  it('returns formatted help text with sorted commands', async () => {
-    const registry = new CommandRegistry();
-
-    const cmdB: Command = {
-      name: 'bravo',
-      description: 'Bravo command',
-      execute: async () => ({ name: 'bravo', data: '' }),
-    };
-
-    const cmdA: Command = {
-      name: 'alpha',
-      description: 'Alpha command',
-      execute: async () => ({ name: 'alpha', data: '' }),
-    };
-
-    registry.register(cmdB);
-    registry.register(cmdA);
-
-    const helpCommand = new HelpCommand(registry);
-
-    const context = {} as CommandContext;
-
-    const response = await helpCommand.execute(context, []);
-
-    expect(response.name).toBe('help');
-
-    const data = response.data as string;
-
-    expect(data).toContain('Gemini CLI Help:');
-    expect(data).toContain('### Basics');
-    expect(data).toContain('### Commands');
-
-    const lines = data.split('\n');
-    const alphaIndex = lines.findIndex((l) => l.includes('/alpha'));
-    const bravoIndex = lines.findIndex((l) => l.includes('/bravo'));
-
-    expect(alphaIndex).toBeLessThan(bravoIndex);
-    expect(alphaIndex).not.toBe(-1);
-    expect(bravoIndex).not.toBe(-1);
-  });
-});

packages/cli/src/acp/commands/help.ts

@@ -1,50 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import type {
-  Command,
-  CommandContext,
-  CommandExecutionResponse,
-} from './types.js';
-import type { CommandRegistry } from './commandRegistry.js';
-
-export class HelpCommand implements Command {
-  readonly name = 'help';
-  readonly description = 'Show available commands';
-
-  constructor(private registry: CommandRegistry) {}
-
-  async execute(
-    _context: CommandContext,
-    _args: string[] = [],
-  ): Promise<CommandExecutionResponse> {
-    const commands = this.registry
-      .getAllCommands()
-      .sort((a, b) => a.name.localeCompare(b.name));
-
-    const lines: string[] = [];
-
-    lines.push('Gemini CLI Help:');
-    lines.push('');
-    lines.push('### Basics');
-    lines.push(
-      '- **Add context**: Use `@` to specify files for context (e.g., `@src/myFile.ts`) to target specific files or folders.',
-    );
-    lines.push('');
-
-    lines.push('### Commands');
-    for (const cmd of commands) {
-      if (cmd.description) {
-        lines.push(`- **/${cmd.name}** - ${cmd.description}`);
-      }
-    }
-
-    return {
-      name: this.name,
-      data: lines.join('\n'),
-    };
-  }
-}

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

@@ -1364,8 +1364,8 @@ describe('Approval mode tool exclusion logic', () => {
       'test',
     ];
     const settings = createTestMergedSettings({
-      general: {
-        plan: { enabled: true },
+      experimental: {
+        plan: true,
       },
     });
     const argv = await parseArguments(createTestMergedSettings());
@@ -1479,7 +1479,9 @@ describe('Approval mode tool exclusion logic', () => {
     const settings = createTestMergedSettings({
       general: {
         defaultApprovalMode: 'plan',
-        plan: { enabled: false },
+      },
+      experimental: {
+        plan: false,
       },
     });
     const argv = await parseArguments(settings);
@@ -1487,12 +1489,14 @@ describe('Approval mode tool exclusion logic', () => {
     expect(config.getApprovalMode()).toBe(ApprovalMode.DEFAULT);
   });
 
-  it('should allow plan approval mode if plan is enabled', async () => {
+  it('should allow plan approval mode if experimental plan is enabled', async () => {
     process.argv = ['node', 'script.js'];
     const settings = createTestMergedSettings({
       general: {
         defaultApprovalMode: 'plan',
-        plan: { enabled: true },
+      },
+      experimental: {
+        plan: true,
       },
     });
     const argv = await parseArguments(settings);
@@ -2738,12 +2742,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 plan is enabled', async () => {
+  it('should set Plan approval mode when --approval-mode=plan is used and experimental.plan is enabled', async () => {
     process.argv = ['node', 'script.js', '--approval-mode', 'plan'];
     const argv = await parseArguments(createTestMergedSettings());
     const settings = createTestMergedSettings({
-      general: {
-        plan: { enabled: true },
+      experimental: {
+        plan: true,
       },
     });
     const config = await loadCliConfig(settings, 'test-session', argv);
@@ -2763,12 +2767,12 @@ describe('loadCliConfig approval mode', () => {
     expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.DEFAULT);
   });
 
-  it('should throw error when --approval-mode=plan is used but plan is disabled', async () => {
+  it('should throw error when --approval-mode=plan is used but experimental.plan is disabled', async () => {
     process.argv = ['node', 'script.js', '--approval-mode', 'plan'];
     const argv = await parseArguments(createTestMergedSettings());
     const settings = createTestMergedSettings({
-      general: {
-        plan: { enabled: false },
+      experimental: {
+        plan: false,
       },
     });
 
@@ -2889,26 +2893,22 @@ describe('loadCliConfig approval mode', () => {
       expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.YOLO);
     });
 
-    it('should respect plan mode from settings when plan is enabled', async () => {
+    it('should respect plan mode from settings when experimental.plan is enabled', async () => {
       process.argv = ['node', 'script.js'];
       const settings = createTestMergedSettings({
-        general: {
-          defaultApprovalMode: 'plan',
-          plan: { enabled: true },
-        },
+        general: { defaultApprovalMode: 'plan' },
+        experimental: { plan: true },
       });
       const argv = await parseArguments(settings);
       const config = await loadCliConfig(settings, 'test-session', argv);
       expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.PLAN);
     });
 
-    it('should fall back to default if plan mode is in settings but disabled', async () => {
+    it('should throw error if plan mode is in settings but experimental.plan is disabled', async () => {
       process.argv = ['node', 'script.js'];
       const settings = createTestMergedSettings({
-        general: {
-          defaultApprovalMode: 'plan',
-          plan: { enabled: false },
-        },
+        general: { defaultApprovalMode: 'plan' },
+        experimental: { plan: false },
       });
       const argv = await parseArguments(settings);
       const config = await loadCliConfig(settings, 'test-session', argv);
@@ -3696,9 +3696,7 @@ 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({
-        general: {
-          plan: { enabled: true },
-        },
+        experimental: { plan: true },
       });
       const argv = await parseArguments(settings);
 
@@ -3717,11 +3715,9 @@ 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: {
-            enabled: true,
-            directory: 'user-plans-dir',
-          },
+          plan: { directory: 'user-plans-dir' },
         },
       });
       const argv = await parseArguments(settings);
@@ -3742,9 +3738,7 @@ describe('loadCliConfig mcpEnabled', () => {
     it('should NOT use plan directory from inactive extension', async () => {
       process.argv = ['node', 'script.js'];
       const settings = createTestMergedSettings({
-        general: {
-          plan: { enabled: true },
-        },
+        experimental: { plan: true },
       });
       const argv = await parseArguments(settings);
 
@@ -3765,9 +3759,7 @@ 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({
-        general: {
-          plan: { enabled: true },
-        },
+        experimental: { plan: 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.general?.plan?.enabled ?? true)) {
+        if (!(settings.experimental?.plan ?? false)) {
           debugLogger.warn(
-            'Approval mode "plan" is disabled in your settings. Falling back to "default".',
+            'Approval mode "plan" is only available when experimental.plan is enabled. 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.general?.plan?.enabled ?? true,
+    plan: settings.experimental?.plan,
     tracker: settings.experimental?.taskTracker,
     directWebFetch: settings.experimental?.directWebFetch,
     planSettings: settings.general?.plan?.directory
@@ -977,12 +977,17 @@ export async function loadCliConfig(
     disabledSkills: settings.skills?.disabled,
     experimentalJitContext: settings.experimental?.jitContext,
     experimentalMemoryManager: settings.experimental?.memoryManager,
-    contextManagement: {
-      enabled: settings.experimental?.contextManagement,
-      ...settings?.contextManagement,
-    },
+    experimentalAgentHistoryTruncation:
+      settings.experimental?.agentHistoryTruncation,
+    experimentalAgentHistoryTruncationThreshold:
+      settings.experimental?.agentHistoryTruncationThreshold,
+    experimentalAgentHistoryRetainedMessages:
+      settings.experimental?.agentHistoryRetainedMessages,
+    experimentalAgentHistorySummarization:
+      settings.experimental?.agentHistorySummarization,
     modelSteering: settings.experimental?.modelSteering,
     topicUpdateNarration: settings.experimental?.topicUpdateNarration,
+    toolOutputMasking: settings.experimental?.toolOutputMasking,
     noBrowser: !!process.env['NO_BROWSER'],
     summarizeToolOutput: settings.model?.summarizeToolOutput,
     ideMode,

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

@@ -5,153 +5,87 @@
  */
 
 import { describe, it, expect } from 'vitest';
-import {
-  deriveItemsFromLegacySettings,
-  resolveFooterState,
-} from './footerItems.js';
+import { deriveItemsFromLegacySettings } from './footerItems.js';
 import { createMockSettings } from '../test-utils/settings.js';
 
-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 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,
-          },
-        },
-      }).merged;
-      const items = deriveItemsFromLegacySettings(settings);
-      expect(items).toEqual([
-        'git-branch',
-        'sandbox',
-        'context-used',
-        'memory-usage',
-      ]);
-    });
+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('resolveFooterState', () => {
-    it('filters out auth item when showUserIdentity is false', () => {
-      const settings = createMockSettings({
-        ui: {
-          showUserIdentity: false,
-          footer: {
-            items: ['workspace', 'auth', 'model-name'],
-          },
+  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,
         },
-      }).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);
-    });
+      },
+    }).merged;
+    const items = deriveItemsFromLegacySettings(settings);
+    expect(items).toEqual([
+      'git-branch',
+      'sandbox',
+      'context-used',
+      'memory-usage',
+    ]);
   });
 });

packages/cli/src/config/footerItems.ts

@@ -47,11 +47,6 @@ 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',
@@ -75,7 +70,6 @@ export const DEFAULT_ORDER = [
   'quota',
   'memory-usage',
   'session-id',
-  'auth',
   'code-changes',
   'token-count',
 ];
@@ -127,19 +121,10 @@ 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) => filteredValidIds.has(id));
-
-  const others = DEFAULT_ORDER.filter(
-    (id) => !source.includes(id) && filteredValidIds.has(id),
-  );
-
+  ).filter((id: string) => VALID_IDS.has(id));
+  const others = DEFAULT_ORDER.filter((id) => !source.includes(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 = <T = Record<string, unknown>>(
+    const migrateExperimental = (
       oldKey: string,
-      migrateFn: (oldValue: T) => void,
+      migrateFn: (oldValue: Record<string, unknown>) => void,
     ) => {
       const old = experimentalSettings[oldKey];
-      if (old !== undefined) {
+      if (old) {
         foundDeprecated?.push(`experimental.${oldKey}`);
         // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-        migrateFn(old as T);
+        migrateFn(old as Record<string, unknown>);
         modified = true;
       }
     };
@@ -1197,24 +1197,6 @@ 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);
@@ -1223,7 +1205,6 @@ 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

@@ -87,7 +87,7 @@ describe('SettingsSchema', () => {
       const definition = getSettingsSchema().ui?.properties?.loadingPhrases;
       expect(definition).toBeDefined();
       expect(definition?.type).toBe('enum');
-      expect(definition?.default).toBe('off');
+      expect(definition?.default).toBe('tips');
       expect(definition?.options?.map((o) => o.value)).toEqual([
         'tips',
         'witty',
@@ -418,17 +418,14 @@ describe('SettingsSchema', () => {
     });
 
     it('should have plan setting in schema', () => {
-      const setting =
-        getSettingsSchema().general.properties.plan.properties.enabled;
+      const setting = getSettingsSchema().experimental.properties.plan;
       expect(setting).toBeDefined();
       expect(setting.type).toBe('boolean');
-      expect(setting.category).toBe('General');
+      expect(setting.category).toBe('Experimental');
       expect(setting.default).toBe(true);
       expect(setting.requiresRestart).toBe(true);
       expect(setting.showInDialog).toBe(true);
-      expect(setting.description).toBe(
-        'Enable Plan Mode for read-only safety during planning.',
-      );
+      expect(setting.description).toBe('Enable Plan Mode.');
     });
 
     it('should have hooksConfig.notifications setting in schema', () => {

packages/cli/src/config/settingsSchema.ts

@@ -293,16 +293,6 @@ 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',
@@ -571,16 +561,6 @@ const SETTINGS_SCHEMA = {
         description: 'Show the "? for shortcuts" hint above the input.',
         showInDialog: true,
       },
-      compactToolOutput: {
-        type: 'boolean',
-        label: 'Compact Tool Output',
-        category: 'UI',
-        requiresRestart: false,
-        default: false,
-        description:
-          'Display tool outputs (like directory listings and file reads) in a compact, structured format.',
-        showInDialog: true,
-      },
       hideBanner: {
         type: 'boolean',
         label: 'Hide Banner',
@@ -776,9 +756,9 @@ const SETTINGS_SCHEMA = {
         label: 'Loading Phrases',
         category: 'UI',
         requiresRestart: false,
-        default: 'off',
+        default: 'tips',
         description:
-          'What to show while the model is working: tips, witty comments, all, or off.',
+          'What to show while the model is working: tips, witty comments, both, or nothing.',
         showInDialog: true,
         options: [
           { value: 'tips', label: 'Tips' },
@@ -1933,6 +1913,58 @@ const SETTINGS_SCHEMA = {
     description: 'Setting to enable experimental features',
     showInDialog: false,
     properties: {
+      toolOutputMasking: {
+        type: 'object',
+        label: 'Tool Output Masking',
+        category: 'Experimental',
+        requiresRestart: true,
+        ignoreInDocs: false,
+        default: {},
+        description:
+          'Advanced settings for tool output masking to manage context window efficiency.',
+        showInDialog: false,
+        properties: {
+          enabled: {
+            type: 'boolean',
+            label: 'Enable Tool Output Masking',
+            category: 'Experimental',
+            requiresRestart: true,
+            default: true,
+            description: 'Enables tool output masking to save tokens.',
+            showInDialog: true,
+          },
+          toolProtectionThreshold: {
+            type: 'number',
+            label: 'Tool Protection Threshold',
+            category: 'Experimental',
+            requiresRestart: true,
+            default: 50000,
+            description:
+              'Minimum number of tokens to protect from masking (most recent tool outputs).',
+            showInDialog: false,
+          },
+          minPrunableTokensThreshold: {
+            type: 'number',
+            label: 'Min Prunable Tokens Threshold',
+            category: 'Experimental',
+            requiresRestart: true,
+            default: 30000,
+            description:
+              'Minimum prunable tokens required to trigger a masking pass.',
+            showInDialog: false,
+          },
+          protectLatestTurn: {
+            type: 'boolean',
+            label: 'Protect Latest Turn',
+            category: 'Experimental',
+            requiresRestart: true,
+            default: true,
+            description:
+              'Ensures the absolute latest turn is never masked, regardless of token count.',
+            showInDialog: false,
+          },
+        },
+      },
       enableAgents: {
         type: 'boolean',
         label: 'Enable Agents',
@@ -2004,7 +2036,7 @@ const SETTINGS_SCHEMA = {
         label: 'JIT Context Loading',
         category: 'Experimental',
         requiresRestart: true,
-        default: false,
+        default: true,
         description: 'Enable Just-In-Time (JIT) context loading.',
         showInDialog: false,
       },
@@ -2028,6 +2060,15 @@ 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',
@@ -2128,13 +2169,44 @@ const SETTINGS_SCHEMA = {
           'Replace the built-in save_memory tool with a memory manager subagent that supports adding, removing, de-duplicating, and organizing memories.',
         showInDialog: true,
       },
-      contextManagement: {
+      agentHistoryTruncation: {
         type: 'boolean',
-        label: 'Enable Context Management',
+        label: 'Agent History Truncation',
         category: 'Experimental',
         requiresRestart: true,
         default: false,
-        description: 'Enable logic for context management.',
+        description:
+          'Enable truncation window logic for the Agent History Provider.',
+        showInDialog: true,
+      },
+      agentHistoryTruncationThreshold: {
+        type: 'number',
+        label: 'Agent History Truncation Threshold',
+        category: 'Experimental',
+        requiresRestart: true,
+        default: 30,
+        description:
+          'The maximum number of messages before history is truncated.',
+        showInDialog: true,
+      },
+      agentHistoryRetainedMessages: {
+        type: 'number',
+        label: 'Agent History Retained Messages',
+        category: 'Experimental',
+        requiresRestart: true,
+        default: 15,
+        description:
+          'The number of recent messages to retain after truncation.',
+        showInDialog: true,
+      },
+      agentHistorySummarization: {
+        type: 'boolean',
+        label: 'Agent History Summarization',
+        category: 'Experimental',
+        requiresRestart: true,
+        default: false,
+        description:
+          'Enable summarization of truncated content via a small model for the Agent History Provider.',
         showInDialog: true,
       },
       topicUpdateNarration: {
@@ -2413,171 +2485,6 @@ const SETTINGS_SCHEMA = {
     },
   },
 
-  contextManagement: {
-    type: 'object',
-    label: 'Context Management',
-    category: 'Experimental',
-    requiresRestart: true,
-    default: {},
-    description:
-      'Settings for agent history and tool distillation context management.',
-    showInDialog: false,
-    properties: {
-      historyWindow: {
-        type: 'object',
-        label: 'History Window Settings',
-        category: 'Context Management',
-        requiresRestart: true,
-        default: {},
-        showInDialog: false,
-        properties: {
-          maxTokens: {
-            type: 'number',
-            label: 'Max Tokens',
-            category: 'Context Management',
-            requiresRestart: true,
-            default: 150_000,
-            description:
-              'The number of tokens to allow before triggering compression.',
-            showInDialog: false,
-          },
-          retainedTokens: {
-            type: 'number',
-            label: 'Retained Tokens',
-            category: 'Context Management',
-            requiresRestart: true,
-            default: 40_000,
-            description: 'The number of tokens to always retain.',
-            showInDialog: false,
-          },
-        },
-      },
-      messageLimits: {
-        type: 'object',
-        label: 'Message Limits',
-        category: 'Context Management',
-        requiresRestart: true,
-        default: {},
-        showInDialog: false,
-        properties: {
-          normalMaxTokens: {
-            type: 'number',
-            label: 'Normal Maximum Tokens',
-            category: 'Context Management',
-            requiresRestart: true,
-            default: 2500,
-            description:
-              'The target number of tokens to budget for a normal conversation turn.',
-            showInDialog: false,
-          },
-          retainedMaxTokens: {
-            type: 'number',
-            label: 'Retained Maximum Tokens',
-            category: 'Context Management',
-            requiresRestart: true,
-            default: 12000,
-            description:
-              'The maximum number of tokens a single conversation turn can consume before truncation.',
-            showInDialog: false,
-          },
-          normalizationHeadRatio: {
-            type: 'number',
-            label: 'Normalization Head Ratio',
-            category: 'Context Management',
-            requiresRestart: true,
-            default: 0.25,
-            description:
-              'The ratio of tokens to retain from the beginning of a truncated message (0.0 to 1.0).',
-            showInDialog: false,
-          },
-        },
-      },
-      tools: {
-        type: 'object',
-        label: 'Context Management Tools',
-        category: 'Context Management',
-        requiresRestart: true,
-        default: {},
-        showInDialog: false,
-        properties: {
-          distillation: {
-            type: 'object',
-            label: 'Tool Distillation',
-            category: 'Context Management',
-            requiresRestart: true,
-            default: {},
-            showInDialog: false,
-            properties: {
-              maxOutputTokens: {
-                type: 'number',
-                label: 'Max Output Tokens',
-                category: 'Context Management',
-                requiresRestart: true,
-                default: 10_000,
-                description:
-                  'Maximum tokens to show to the model when truncating large tool outputs.',
-                showInDialog: false,
-              },
-              summarizationThresholdTokens: {
-                type: 'number',
-                label: 'Tool Summarization Threshold',
-                category: 'Context Management',
-                requiresRestart: true,
-                default: 20_000,
-                description:
-                  'Threshold above which truncated tool outputs will be summarized by an LLM.',
-                showInDialog: false,
-              },
-            },
-          },
-          outputMasking: {
-            type: 'object',
-            label: 'Tool Output Masking',
-            category: 'Context Management',
-            requiresRestart: true,
-            ignoreInDocs: false,
-            default: {},
-            description:
-              'Advanced settings for tool output masking to manage context window efficiency.',
-            showInDialog: false,
-            properties: {
-              protectionThresholdTokens: {
-                type: 'number',
-                label: 'Tool Protection Threshold (Tokens)',
-                category: 'Context Management',
-                requiresRestart: true,
-                default: 50_000,
-                description:
-                  'Minimum number of tokens to protect from masking (most recent tool outputs).',
-                showInDialog: false,
-              },
-              minPrunableThresholdTokens: {
-                type: 'number',
-                label: 'Min Prunable Tokens Threshold',
-                category: 'Context Management',
-                requiresRestart: true,
-                default: 30_000,
-                description:
-                  'Minimum prunable tokens required to trigger a masking pass.',
-                showInDialog: false,
-              },
-              protectLatestTurn: {
-                type: 'boolean',
-                label: 'Protect Latest Turn',
-                category: 'Context Management',
-                requiresRestart: true,
-                default: true,
-                description:
-                  'Ensures the absolute latest turn is never masked, regardless of token count.',
-                showInDialog: false,
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-
   admin: {
     type: 'object',
     label: 'Admin',

packages/cli/src/interactiveCli.tsx

@@ -46,7 +46,6 @@ import { TerminalProvider } from './ui/contexts/TerminalContext.js';
 import { isAlternateBufferEnabled } from './ui/hooks/useAlternateBuffer.js';
 import { OverflowProvider } from './ui/contexts/OverflowContext.js';
 import { profiler } from './ui/components/DebugProfiler.js';
-import { initializeConsoleStore } from './ui/hooks/useConsoleMessages.js';
 
 const SLOW_RENDER_MS = 200;
 
@@ -58,7 +57,6 @@ export async function startInteractiveUI(
   resumedSessionData: ResumedSessionData | undefined,
   initializationResult: InitializationResult,
 ) {
-  initializeConsoleStore();
   // Never enter Ink alternate buffer mode when screen reader mode is enabled
   // as there is no benefit of alternate buffer mode when using a screen reader
   // and the Ink alternate buffer mode requires line wrapping harmful to

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

@@ -194,17 +194,6 @@ export function createMockSettings(
     user: { settings: {} },
     workspace: { settings: {} },
     errors: [],
-    subscribe: vi.fn().mockReturnValue(() => {}),
-    getSnapshot: vi.fn().mockReturnValue({
-      system: { settings: {} },
-      systemDefaults: { settings: {} },
-      user: { settings: {} },
-      workspace: { settings: {} },
-      isTrusted: true,
-      errors: [],
-      merged,
-    }),
-    setValue: vi.fn(),
     ...overrides,
     merged,
   } as unknown as LoadedSettings;

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

@@ -42,7 +42,6 @@ import {
   type OverflowState,
 } from '../ui/contexts/OverflowContext.js';
 
-import { makeFakeConfig } from '@google/gemini-cli-core';
 import { type Config } from '@google/gemini-cli-core';
 import { FakePersistentState } from './persistentStateFake.js';
 import { AppContext, type AppState } from '../ui/contexts/AppContext.js';
@@ -52,6 +51,7 @@ import { themeManager, DEFAULT_THEME } from '../ui/themes/theme-manager.js';
 import { DefaultLight } from '../ui/themes/builtin/light/default-light.js';
 import { pickDefaultThemeName } from '../ui/themes/theme.js';
 import { generateSvgForTerminal } from './svg.js';
+import { loadCliConfig, type CliArgs } from '../config/config.js';
 
 export const persistentStateMock = new FakePersistentState();
 
@@ -534,6 +534,7 @@ export const mockAppState: AppState = {
 };
 
 const mockUIActions: UIActions = {
+  toggleAlternateBuffer: vi.fn(),
   handleThemeSelect: vi.fn(),
   closeThemeDialog: vi.fn(),
   handleThemeHighlight: vi.fn(),
@@ -613,7 +614,6 @@ export const renderWithProviders = async (
     mouseEventsEnabled = false,
     config,
     uiActions,
-    toolActions,
     persistentState,
     appState = mockAppState,
   }: {
@@ -624,11 +624,6 @@ export const renderWithProviders = async (
     mouseEventsEnabled?: boolean;
     config?: Config;
     uiActions?: Partial<UIActions>;
-    toolActions?: Partial<{
-      isExpanded: (callId: string) => boolean;
-      toggleExpansion: (callId: string) => void;
-      toggleAllExpansion: (callIds: string[]) => void;
-    }>;
     persistentState?: {
       get?: typeof persistentStateMock.get;
       set?: typeof persistentStateMock.set;
@@ -666,11 +661,12 @@ export const renderWithProviders = async (
   const terminalWidth = width ?? baseState.terminalWidth;
 
   if (!config) {
-    config = makeFakeConfig({
-      useAlternateBuffer: settings.merged.ui?.useAlternateBuffer,
-      showMemoryUsage: settings.merged.ui?.showMemoryUsage,
-      accessibility: settings.merged.ui?.accessibility,
-    });
+    config = await loadCliConfig(
+      settings.merged,
+      'random-session-id',
+      {} as unknown as CliArgs,
+      { cwd: '/' },
+    );
   }
 
   const mainAreaWidth = providedUiState?.mainAreaWidth ?? terminalWidth;
@@ -715,16 +711,6 @@ export const renderWithProviders = async (
                         <ToolActionsProvider
                           config={config}
                           toolCalls={allToolCalls}
-                          isExpanded={
-                            toolActions?.isExpanded ??
-                            vi.fn().mockReturnValue(false)
-                          }
-                          toggleExpansion={
-                            toolActions?.toggleExpansion ?? vi.fn()
-                          }
-                          toggleAllExpansion={
-                            toolActions?.toggleAllExpansion ?? vi.fn()
-                          }
                         >
                           <AskUserActionsProvider
                             request={null}

packages/cli/src/ui/AppContainer.tsx

@@ -68,8 +68,10 @@ import {
   writeToStdout,
   disableMouseEvents,
   enterAlternateScreen,
+  exitAlternateScreen,
   enableMouseEvents,
   disableLineWrapping,
+  enableLineWrapping,
   shouldEnterAlternateScreen,
   startupProfiler,
   SessionStartSource,
@@ -168,7 +170,6 @@ import { useSuspend } from './hooks/useSuspend.js';
 import { useRunEventNotifications } from './hooks/useRunEventNotifications.js';
 import { isNotificationsEnabled } from '../utils/terminalNotifications.js';
 import {
-  getLastTurnToolCallIds,
   isToolExecuting,
   isToolAwaitingConfirmation,
   getAllToolCalls,
@@ -214,7 +215,7 @@ export const AppContainer = (props: AppContainerProps) => {
   });
 
   useMemoryMonitor(historyManager);
-  const isAlternateBuffer = config.getUseAlternateBuffer();
+  const [isAlternateBuffer, setIsAlternateBuffer] = useState(config.getUseAlternateBuffer());
   const [corgiMode, setCorgiMode] = useState(false);
   const [forceRerenderKey, setForceRerenderKey] = useState(0);
   const [debugMessage, setDebugMessage] = useState<string>('');
@@ -239,39 +240,6 @@ export const AppContainer = (props: AppContainerProps) => {
 
   const [adminSettingsChanged, setAdminSettingsChanged] = useState(false);
 
-  const [expandedTools, setExpandedTools] = useState<Set<string>>(new Set());
-
-  const toggleExpansion = useCallback((callId: string) => {
-    setExpandedTools((prev) => {
-      const next = new Set(prev);
-      if (next.has(callId)) {
-        next.delete(callId);
-      } else {
-        next.add(callId);
-      }
-      return next;
-    });
-  }, []);
-
-  const toggleAllExpansion = useCallback((callIds: string[]) => {
-    setExpandedTools((prev) => {
-      const next = new Set(prev);
-      const anyCollapsed = callIds.some((id) => !next.has(id));
-
-      if (anyCollapsed) {
-        callIds.forEach((id) => next.add(id));
-      } else {
-        callIds.forEach((id) => next.delete(id));
-      }
-      return next;
-    });
-  }, []);
-
-  const isExpanded = useCallback(
-    (callId: string) => expandedTools.has(callId),
-    [expandedTools],
-  );
-
   const [shellModeActive, setShellModeActive] = useState(false);
   const [modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError] =
     useState<boolean>(false);
@@ -1027,7 +995,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
 
       if (config.isJitContextEnabled()) {
         await config.getContextManager()?.refresh();
-        config.updateSystemInstructionIfInitialized();
         flattenedMemory = flattenMemory(config.getUserMemory());
         fileCount = config.getGeminiMdFileCount();
       } else {
@@ -1172,6 +1139,11 @@ Logging in with Google... Restarting Gemini CLI to continue.
     [pendingSlashCommandHistoryItems, pendingGeminiHistoryItems],
   );
 
+  const hasPendingToolConfirmation = useMemo(
+    () => isToolAwaitingConfirmation(pendingHistoryItems),
+    [pendingHistoryItems],
+  );
+
   toggleBackgroundTasksRef.current = toggleBackgroundTasks;
   isBackgroundTaskVisibleRef.current = isBackgroundTaskVisible;
   backgroundTasksRef.current = backgroundTasks;
@@ -1580,6 +1552,23 @@ Logging in with Google... Restarting Gemini CLI to continue.
     type: TransientMessageType;
   }>(WARNING_PROMPT_DURATION_MS);
 
+  const [shownBufferToggleHint, setShownBufferToggleHint] = useState(false);
+
+  useEffect(() => {
+    if (isAlternateBuffer) return;
+
+    const isLongHistory = historyManager.history.length > 15;
+    const isComplexPrompt = buffer.text.length > 200 || buffer.text.includes('\n');
+
+    if ((isLongHistory || isComplexPrompt) && !shownBufferToggleHint) {
+      showTransientMessage({ 
+        text: 'Tip: Press Alt+T to toggle full-screen mode for better scrolling/editing', 
+        type: TransientMessageType.Hint 
+      });
+      setShownBufferToggleHint(true);
+    }
+  }, [historyManager.history.length, buffer.text, isAlternateBuffer, shownBufferToggleHint, showTransientMessage]);
+
   const {
     isFolderTrustDialogOpen,
     discoveryResults: folderDiscoveryResults,
@@ -1730,6 +1719,11 @@ Logging in with Google... Restarting Gemini CLI to continue.
         return true;
       }
 
+      if (keyMatchers[Command.TOGGLE_BUFFER_MODE](key)) {
+        toggleAlternateBuffer();
+        return true;
+      }
+
       if (keyMatchers[Command.QUIT](key)) {
         // If the user presses Ctrl+C, we want to cancel any ongoing requests.
         // This should happen regardless of the count.
@@ -1757,25 +1751,13 @@ Logging in with Google... Restarting Gemini CLI to continue.
         return true;
       }
 
-      const toggleLastTurnTools = () => {
-        triggerExpandHint(true);
-
-        const targetToolCallIds = getLastTurnToolCallIds(
-          historyManager.history,
-          pendingHistoryItems,
-        );
-
-        if (targetToolCallIds.length > 0) {
-          toggleAllExpansion(targetToolCallIds);
-        }
-      };
-
       let enteringConstrainHeightMode = false;
       if (!constrainHeight) {
         enteringConstrainHeightMode = true;
         setConstrainHeight(true);
         if (keyMatchers[Command.SHOW_MORE_LINES](key)) {
-          toggleLastTurnTools();
+          // If the user manually collapses the view, show the hint and reset the x-second timer.
+          triggerExpandHint(true);
         }
         if (!isAlternateBuffer) {
           refreshStatic();
@@ -1823,8 +1805,11 @@ Logging in with Google... Restarting Gemini CLI to continue.
         !enteringConstrainHeightMode
       ) {
         setConstrainHeight(false);
-        toggleLastTurnTools();
-        refreshStatic();
+        // If the user manually expands the view, show the hint and reset the x-second timer.
+        triggerExpandHint(true);
+        if (!isAlternateBuffer) {
+          refreshStatic();
+        }
         return true;
       } else if (
         (keyMatchers[Command.FOCUS_SHELL_INPUT](key) ||
@@ -1929,9 +1914,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
       triggerExpandHint,
       keyMatchers,
       isHelpDismissKey,
-      historyManager.history,
-      pendingHistoryItems,
-      toggleAllExpansion,
     ],
   );
 
@@ -2075,11 +2057,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
     authState === AuthState.AwaitingApiKeyInput ||
     !!newAgents;
 
-  const hasPendingToolConfirmation = useMemo(
-    () => isToolAwaitingConfirmation(pendingHistoryItems),
-    [pendingHistoryItems],
-  );
-
   const hasConfirmUpdateExtensionRequests =
     confirmUpdateExtensionRequests.length > 0;
   const hasLoopDetectionConfirmationRequest =
@@ -2251,8 +2228,11 @@ Logging in with Google... Restarting Gemini CLI to continue.
     };
   }, [config, refreshStatic]);
 
+  const showIsAlternateBufferHint = (historyManager.history.length > 15 || buffer.text.length > 200 || buffer.text.includes('\n')) && !isAlternateBuffer;
+
   const uiState: UIState = useMemo(
     () => ({
+      isAlternateBuffer,
       history: historyManager.history,
       historyManager,
       isThemeDialogOpen,
@@ -2378,6 +2358,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       adminSettingsChanged,
       newAgents,
       showIsExpandableHint,
+      showIsAlternateBufferHint,
       hintMode:
         config.isModelSteeringEnabled() && isToolExecuting(pendingHistoryItems),
       hintBuffer: '',
@@ -2504,6 +2485,8 @@ Logging in with Google... Restarting Gemini CLI to continue.
       adminSettingsChanged,
       newAgents,
       showIsExpandableHint,
+      showIsAlternateBufferHint,
+      isAlternateBuffer,
     ],
   );
 
@@ -2512,6 +2495,31 @@ Logging in with Google... Restarting Gemini CLI to continue.
     [setShowPrivacyNotice],
   );
 
+  const toggleAlternateBuffer = useCallback(() => {
+    setIsAlternateBuffer(prev => {
+      const next = !prev;
+      if (next) {
+        enterAlternateScreen();
+        enableMouseEvents();
+        disableLineWrapping();
+      } else {
+        exitAlternateScreen();
+        disableMouseEvents();
+        enableLineWrapping();
+        writeToStdout('\x1b[2J\x1b[H');
+      }
+      process.stdout.emit('resize');
+
+      // Give a tick for resize to process, then trigger remount to force full redraw
+      setImmediate(() => {
+        refreshStatic();
+        setForceRerenderKey((prev) => prev + 1);
+      });
+
+      return next;
+    });
+  }, [setIsAlternateBuffer, refreshStatic, setForceRerenderKey]);
+
   const uiActions: UIActions = useMemo(
     () => ({
       handleThemeSelect,
@@ -2523,6 +2531,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       handleEditorSelect,
       exitEditorDialog,
       exitPrivacyNotice,
+      toggleAlternateBuffer,
       closeSettingsDialog,
       closeModelDialog,
       openAgentConfigDialog,
@@ -2661,6 +2670,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       config,
       historyManager,
       getPreferredEditor,
+      toggleAlternateBuffer,
     ],
   );
 
@@ -2686,13 +2696,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
               startupWarnings: props.startupWarnings || [],
             }}
           >
-            <ToolActionsProvider
-              config={config}
-              toolCalls={allToolCalls}
-              isExpanded={isExpanded}
-              toggleExpansion={toggleExpansion}
-              toggleAllExpansion={toggleAllExpansion}
-            >
+            <ToolActionsProvider config={config} toolCalls={allToolCalls}>
               <ShellFocusContext.Provider value={isFocused}>
                 <App key={`app-${forceRerenderKey}`} />
               </ShellFocusContext.Provider>

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

@@ -35,7 +35,10 @@ vi.mock('./shared/ScrollableList.js', () => ({
 
 describe('DetailedMessagesDisplay', () => {
   beforeEach(() => {
-    vi.mocked(useConsoleMessages).mockReturnValue([]);
+    vi.mocked(useConsoleMessages).mockReturnValue({
+      consoleMessages: [],
+      clearConsoleMessages: vi.fn(),
+    });
   });
   it('renders nothing when messages are empty', async () => {
     const { lastFrame, unmount } = await renderWithProviders(
@@ -55,7 +58,10 @@ describe('DetailedMessagesDisplay', () => {
       { type: 'error', content: 'Error message', count: 1 },
       { type: 'debug', content: 'Debug message', count: 1 },
     ];
-    vi.mocked(useConsoleMessages).mockReturnValue(messages);
+    vi.mocked(useConsoleMessages).mockReturnValue({
+      consoleMessages: messages,
+      clearConsoleMessages: vi.fn(),
+    });
 
     const { lastFrame, unmount } = await renderWithProviders(
       <DetailedMessagesDisplay maxHeight={20} width={80} hasFocus={true} />,
@@ -73,7 +79,10 @@ describe('DetailedMessagesDisplay', () => {
     const messages: ConsoleMessageItem[] = [
       { type: 'error', content: 'Error message', count: 1 },
     ];
-    vi.mocked(useConsoleMessages).mockReturnValue(messages);
+    vi.mocked(useConsoleMessages).mockReturnValue({
+      consoleMessages: messages,
+      clearConsoleMessages: vi.fn(),
+    });
 
     const { lastFrame, unmount } = await renderWithProviders(
       <DetailedMessagesDisplay maxHeight={20} width={80} hasFocus={true} />,
@@ -89,7 +98,10 @@ describe('DetailedMessagesDisplay', () => {
     const messages: ConsoleMessageItem[] = [
       { type: 'error', content: 'Error message', count: 1 },
     ];
-    vi.mocked(useConsoleMessages).mockReturnValue(messages);
+    vi.mocked(useConsoleMessages).mockReturnValue({
+      consoleMessages: messages,
+      clearConsoleMessages: vi.fn(),
+    });
 
     const { lastFrame, unmount } = await renderWithProviders(
       <DetailedMessagesDisplay maxHeight={20} width={80} hasFocus={true} />,
@@ -105,7 +117,10 @@ describe('DetailedMessagesDisplay', () => {
     const messages: ConsoleMessageItem[] = [
       { type: 'log', content: 'Repeated message', count: 5 },
     ];
-    vi.mocked(useConsoleMessages).mockReturnValue(messages);
+    vi.mocked(useConsoleMessages).mockReturnValue({
+      consoleMessages: messages,
+      clearConsoleMessages: vi.fn(),
+    });
 
     const { lastFrame, unmount } = await renderWithProviders(
       <DetailedMessagesDisplay maxHeight={10} width={80} hasFocus={false} />,

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

@@ -29,7 +29,7 @@ export const DetailedMessagesDisplay: React.FC<
 > = ({ maxHeight, width, hasFocus }) => {
   const scrollableListRef = useRef<ScrollableListRef<ConsoleMessageItem>>(null);
 
-  const consoleMessages = useConsoleMessages();
+  const { consoleMessages } = useConsoleMessages();
   const config = useConfig();
 
   const messages = useMemo(() => {

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

@@ -8,11 +8,7 @@ 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,
-  UserAccountManager,
-  AuthType,
-} from '@google/gemini-cli-core';
+import { type Config } from '@google/gemini-cli-core';
 import path from 'node:path';
 
 // Normalize paths to POSIX slashes for stable cross-platform snapshots.
@@ -73,17 +69,14 @@ const defaultProps = {
   branchName: 'main',
 };
 
-const mockConfigPlain = {
+const mockConfig = {
   getTargetDir: () => defaultProps.targetDir,
   getDebugMode: () => false,
   getModel: () => defaultProps.model,
   getIdeMode: () => false,
   isTrustedFolder: () => true,
   getExtensionRegistryURI: () => undefined,
-  getContentGeneratorConfig: () => ({ authType: undefined }),
-};
-
-const mockConfig = mockConfigPlain as unknown as Config;
+} as unknown as Config;
 
 const mockSessionStats = {
   sessionId: 'test-session-id',
@@ -441,7 +434,6 @@ 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({
@@ -559,7 +551,6 @@ describe('<Footer />', () => {
   describe('Footer Token Formatting', () => {
     const renderWithTokens = async (tokens: number) => {
       const result = await renderWithProviders(<Footer />, {
-        config: mockConfig,
         width: 120,
         uiState: {
           sessionStats: {
@@ -684,75 +675,6 @@ 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,
@@ -812,7 +734,6 @@ 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,7 +5,6 @@
  */
 
 import type React from 'react';
-import { useState, useEffect } from 'react';
 import { Box, Text } from 'ink';
 import { theme } from '../semantic-colors.js';
 import {
@@ -13,8 +12,6 @@ import {
   tildeifyPath,
   getDisplayString,
   checkExhaustive,
-  AuthType,
-  UserAccountManager,
 } from '@google/gemini-cli-core';
 import { ConsoleSummaryDisplay } from './ConsoleSummaryDisplay.js';
 import process from 'node:process';
@@ -186,18 +183,6 @@ 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} />;
   }
@@ -236,7 +221,6 @@ 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);
@@ -401,25 +385,6 @@ 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 < 9; i++) {
+    for (let i = 0; i < 8; i++) {
       act(() => {
         stdin.write('\u001b[B'); // Down arrow
       });

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

@@ -255,7 +255,6 @@ 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/HistoryItemDisplay.tsx

@@ -17,7 +17,6 @@ import { ToolGroupMessage } from './messages/ToolGroupMessage.js';
 import { GeminiMessageContent } from './messages/GeminiMessageContent.js';
 import { CompressionMessage } from './messages/CompressionMessage.js';
 import { WarningMessage } from './messages/WarningMessage.js';
-import { SubagentHistoryMessage } from './messages/SubagentHistoryMessage.js';
 import { Box } from 'ink';
 import { AboutBox } from './AboutBox.js';
 import { StatsDisplay } from './StatsDisplay.js';
@@ -216,12 +215,6 @@ export const HistoryItemDisplay: React.FC<HistoryItemDisplayProps> = ({
           isExpandable={isExpandable}
         />
       )}
-      {itemForDisplay.type === 'subagent' && (
-        <SubagentHistoryMessage
-          item={itemForDisplay}
-          terminalWidth={terminalWidth}
-        />
-      )}
       {itemForDisplay.type === 'compression' && (
         <CompressionMessage compression={itemForDisplay.compression} />
       )}

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

@@ -2222,67 +2222,85 @@ describe('InputPrompt', () => {
           name: 'mid-word',
           text: 'hello world',
           visualCursor: [0, 3],
+          expected: `hel${chalk.inverse('l')}o world`,
         },
         {
           name: 'at the beginning of the line',
           text: 'hello',
           visualCursor: [0, 0],
+          expected: `${chalk.inverse('h')}ello`,
         },
         {
           name: 'at the end of the line',
           text: 'hello',
           visualCursor: [0, 5],
+          expected: `hello${chalk.inverse(' ')}`,
         },
         {
           name: 'on a highlighted token',
           text: 'run @path/to/file',
           visualCursor: [0, 9],
+          expected: `@path/${chalk.inverse('t')}o/file`,
         },
         {
           name: 'for multi-byte unicode characters',
           text: 'hello 👍 world',
           visualCursor: [0, 6],
+          expected: `hello ${chalk.inverse('👍')} world`,
         },
         {
           name: 'after multi-byte unicode characters',
           text: '👍A',
           visualCursor: [0, 1],
+          expected: `👍${chalk.inverse('A')}`,
         },
         {
           name: 'at the end of a line with unicode characters',
           text: 'hello 👍',
           visualCursor: [0, 8],
+          expected: `hello 👍`, // skip checking inverse ansi due to ink truncation bug
         },
         {
           name: 'at the end of a short line with unicode characters',
           text: '👍',
           visualCursor: [0, 1],
+          expected: `👍${chalk.inverse(' ')}`,
         },
         {
           name: 'on an empty line',
           text: '',
           visualCursor: [0, 0],
+          expected: chalk.inverse(' '),
         },
         {
           name: 'on a space between words',
           text: 'hello world',
           visualCursor: [0, 5],
+          expected: `hello${chalk.inverse(' ')}world`,
         },
       ])(
         'should display cursor correctly $name',
-        async ({ text, visualCursor }) => {
+        async ({ name, text, visualCursor, expected }) => {
           mockBuffer.text = text;
           mockBuffer.lines = [text];
           mockBuffer.viewportVisualLines = [text];
           mockBuffer.visualCursor = visualCursor as [number, number];
           props.config.getUseBackgroundColor = () => false;
 
-          const renderResult = await renderWithProviders(
+          const { stdout, unmount } = await renderWithProviders(
             <InputPrompt {...props} />,
           );
-          await renderResult.waitUntilReady();
-          await expect(renderResult).toMatchSvgSnapshot();
-          renderResult.unmount();
+          await waitFor(() => {
+            const frame = stdout.lastFrameRaw();
+            expect(stripAnsi(frame)).toContain(stripAnsi(expected));
+            if (
+              name !== 'at the end of a line with unicode characters' &&
+              name !== 'on a highlighted token'
+            ) {
+              expect(frame).toContain('\u001b[7m');
+            }
+          });
+          unmount();
         },
       );
     });
@@ -2298,6 +2316,7 @@ describe('InputPrompt', () => {
             [1, 0],
             [2, 0],
           ],
+          expected: `sec${chalk.inverse('o')}nd line`,
         },
         {
           name: 'at the beginning of a line',
@@ -2307,6 +2326,7 @@ describe('InputPrompt', () => {
             [0, 0],
             [1, 0],
           ],
+          expected: `${chalk.inverse('s')}econd line`,
         },
         {
           name: 'at the end of a line',
@@ -2316,10 +2336,11 @@ describe('InputPrompt', () => {
             [0, 0],
             [1, 0],
           ],
+          expected: `first line${chalk.inverse(' ')}`,
         },
       ])(
         'should display cursor correctly $name in a multiline block',
-        async ({ text, visualCursor, visualToLogicalMap }) => {
+        async ({ name, text, visualCursor, expected, visualToLogicalMap }) => {
           mockBuffer.text = text;
           mockBuffer.lines = text.split('\n');
           mockBuffer.viewportVisualLines = text.split('\n');
@@ -2329,12 +2350,20 @@ describe('InputPrompt', () => {
           >;
           props.config.getUseBackgroundColor = () => false;
 
-          const renderResult = await renderWithProviders(
+          const { stdout, unmount } = await renderWithProviders(
             <InputPrompt {...props} />,
           );
-          await renderResult.waitUntilReady();
-          await expect(renderResult).toMatchSvgSnapshot();
-          renderResult.unmount();
+          await waitFor(() => {
+            const frame = stdout.lastFrameRaw();
+            expect(stripAnsi(frame)).toContain(stripAnsi(expected));
+            if (
+              name !== 'at the end of a line with unicode characters' &&
+              name !== 'on a highlighted token'
+            ) {
+              expect(frame).toContain('\u001b[7m');
+            }
+          });
+          unmount();
         },
       );
 
@@ -2351,12 +2380,18 @@ describe('InputPrompt', () => {
         ];
         props.config.getUseBackgroundColor = () => false;
 
-        const renderResult = await renderWithProviders(
+        const { stdout, unmount } = await renderWithProviders(
           <InputPrompt {...props} />,
         );
-        await renderResult.waitUntilReady();
-        await expect(renderResult).toMatchSvgSnapshot();
-        renderResult.unmount();
+        await waitFor(() => {
+          const frame = stdout.lastFrameRaw();
+          const lines = frame.split('\n');
+          // The line with the cursor should just be an inverted space inside the box border
+          expect(
+            lines.find((l) => l.includes(chalk.inverse(' '))),
+          ).not.toBeUndefined();
+        });
+        unmount();
       });
     });
   });
@@ -2377,14 +2412,22 @@ describe('InputPrompt', () => {
       ];
       props.config.getUseBackgroundColor = () => false;
 
-      const renderResult = await renderWithProviders(
+      const { stdout, unmount } = await renderWithProviders(
         <InputPrompt {...props} />,
       );
+      await waitFor(() => {
+        const frame = stdout.lastFrameRaw();
+        // Check that all lines, including the empty one, are rendered.
+        // This implicitly tests that the Box wrapper provides height for the empty line.
+        expect(frame).toContain('hello');
+        expect(frame).toContain('world');
+        expect(frame).toContain(chalk.inverse(' '));
 
-      await renderResult.waitUntilReady();
-      await expect(renderResult).toMatchSvgSnapshot();
-
-      renderResult.unmount();
+        const outputLines = frame.trim().split('\n');
+        // The number of lines should be 2 for the border plus 3 for the content.
+        expect(outputLines.length).toBe(5);
+      });
+      unmount();
     });
   });
 
@@ -4045,12 +4088,14 @@ describe('InputPrompt', () => {
     it('should not show inverted cursor when shell is focused', async () => {
       props.isEmbeddedShellFocused = true;
       props.focus = false;
-      const renderResult = await renderWithProviders(
+      const { stdout, unmount } = await renderWithProviders(
         <InputPrompt {...props} />,
       );
-      await renderResult.waitUntilReady();
-      await expect(renderResult).toMatchSvgSnapshot();
-      renderResult.unmount();
+      await waitFor(() => {
+        expect(stdout.lastFrame()).not.toContain(`{chalk.inverse(' ')}`);
+      });
+      expect(stdout.lastFrame()).toMatchSnapshot();
+      unmount();
     });
   });
 

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

@@ -27,10 +27,6 @@ import {
 } from '../hooks/useConfirmingTool.js';
 
 // Mock dependencies
-vi.mock('ink-spinner', () => ({
-  default: () => <Text>⠋</Text>,
-}));
-
 const mockUseSettings = vi.fn().mockReturnValue({
   merged: {
     ui: {

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

@@ -21,6 +21,7 @@ import {
   PREVIEW_GEMINI_FLASH_MODEL,
   PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL,
   AuthType,
+  UserTierId,
 } from '@google/gemini-cli-core';
 import type { Config, ModelSlashCommandEvent } from '@google/gemini-cli-core';
 
@@ -55,6 +56,7 @@ describe('<ModelDialog />', () => {
   const mockGetGemini31FlashLiteLaunchedSync = vi.fn();
   const mockGetProModelNoAccess = vi.fn();
   const mockGetProModelNoAccessSync = vi.fn();
+  const mockGetUserTier = vi.fn();
 
   interface MockConfig extends Partial<Config> {
     setModel: (model: string, isTemporary?: boolean) => void;
@@ -65,6 +67,7 @@ describe('<ModelDialog />', () => {
     getGemini31FlashLiteLaunchedSync: () => boolean;
     getProModelNoAccess: () => Promise<boolean>;
     getProModelNoAccessSync: () => boolean;
+    getUserTier: () => UserTierId | undefined;
   }
 
   const mockConfig: MockConfig = {
@@ -76,6 +79,7 @@ describe('<ModelDialog />', () => {
     getGemini31FlashLiteLaunchedSync: mockGetGemini31FlashLiteLaunchedSync,
     getProModelNoAccess: mockGetProModelNoAccess,
     getProModelNoAccessSync: mockGetProModelNoAccessSync,
+    getUserTier: mockGetUserTier,
   };
 
   beforeEach(() => {
@@ -86,6 +90,7 @@ describe('<ModelDialog />', () => {
     mockGetGemini31FlashLiteLaunchedSync.mockReturnValue(false);
     mockGetProModelNoAccess.mockResolvedValue(false);
     mockGetProModelNoAccessSync.mockReturnValue(false);
+    mockGetUserTier.mockReturnValue(UserTierId.STANDARD);
 
     // Default implementation for getDisplayString
     mockGetDisplayString.mockImplementation((val: string) => {
@@ -131,6 +136,7 @@ describe('<ModelDialog />', () => {
     mockGetProModelNoAccess.mockResolvedValue(true);
     mockGetHasAccessToPreviewModel.mockReturnValue(true);
     mockGetGemini31FlashLiteLaunchedSync.mockReturnValue(true);
+    mockGetUserTier.mockReturnValue(UserTierId.FREE);
     mockGetDisplayString.mockImplementation((val: string) => val);
 
     const { lastFrame, unmount } = await renderComponent();
@@ -436,11 +442,34 @@ describe('<ModelDialog />', () => {
       unmount();
     });
 
-    it('shows Flash Lite Preview model regardless of tier when flag is enabled', async () => {
+    it('hides Flash Lite Preview model for users with pro access', async () => {
+      mockGetProModelNoAccessSync.mockReturnValue(false);
+      mockGetProModelNoAccess.mockResolvedValue(false);
+      mockGetHasAccessToPreviewModel.mockReturnValue(true);
+      const { lastFrame, stdin, waitUntilReady, unmount } =
+        await renderComponent();
+
+      // Go to manual view
+      await act(async () => {
+        stdin.write('\u001B[B'); // Manual
+      });
+      await waitUntilReady();
+      await act(async () => {
+        stdin.write('\r');
+      });
+      await waitUntilReady();
+
+      const output = lastFrame();
+      expect(output).not.toContain(PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL);
+      unmount();
+    });
+
+    it('shows Flash Lite Preview model for free tier users', async () => {
       mockGetProModelNoAccessSync.mockReturnValue(false);
       mockGetProModelNoAccess.mockResolvedValue(false);
       mockGetHasAccessToPreviewModel.mockReturnValue(true);
       mockGetGemini31FlashLiteLaunchedSync.mockReturnValue(true);
+      mockGetUserTier.mockReturnValue(UserTierId.FREE);
       const { lastFrame, stdin, waitUntilReady, unmount } =
         await renderComponent();
 

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

@@ -23,6 +23,7 @@ import {
   AuthType,
   PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL,
   isProModel,
+  UserTierId,
 } from '@google/gemini-cli-core';
 import { useKeypress } from '../hooks/useKeypress.js';
 import { theme } from '../semantic-colors.js';
@@ -71,11 +72,9 @@ export function ModelDialog({ onClose }: ModelDialogProps): React.JSX.Element {
   const manualModelSelected = useMemo(() => {
     if (
       config?.getExperimentalDynamicModelConfiguration?.() === true &&
-      config.getModelConfigService
+      config.modelConfigService
     ) {
-      const def = config
-        .getModelConfigService()
-        .getModelDefinition(preferredModel);
+      const def = config.modelConfigService.getModelDefinition(preferredModel);
       // Only treat as manual selection if it's a visible, non-auto model.
       return def && def.tier !== 'auto' && def.isVisible === true
         ? preferredModel
@@ -121,25 +120,30 @@ export function ModelDialog({ onClose }: ModelDialogProps): React.JSX.Element {
     // --- DYNAMIC PATH ---
     if (
       config?.getExperimentalDynamicModelConfiguration?.() === true &&
-      config.getModelConfigService
+      config.modelConfigService
     ) {
-      const allOptions = config
-        .getModelConfigService()
-        .getAvailableModelOptions({
-          useGemini3_1: useGemini31,
-          useGemini3_1FlashLite: useGemini31FlashLite,
-          useCustomTools: useCustomToolModel,
-          hasAccessToPreview: shouldShowPreviewModels,
-          hasAccessToProModel,
-        });
-
-      const list = allOptions
-        .filter((o) => o.tier === 'auto')
-        .map((o) => ({
-          value: o.modelId,
-          title: o.name,
-          description: o.description,
-          key: o.modelId,
+      const list = Object.entries(
+        config.modelConfigService.getModelDefinitions?.() ?? {},
+      )
+        .filter(([_, m]) => {
+          // Basic visibility and Preview access
+          if (m.isVisible !== true) return false;
+          if (m.isPreview && !shouldShowPreviewModels) return false;
+          // Only auto models are shown on the main menu
+          if (m.tier !== 'auto') return false;
+          return true;
+        })
+        .map(([id, m]) => ({
+          value: id,
+          title: m.displayName ?? getDisplayString(id, config ?? undefined),
+          description:
+            id === 'auto-gemini-3' && useGemini31
+              ? (m.dialogDescription ?? '').replace(
+                  'gemini-3-pro',
+                  'gemini-3.1-pro',
+                )
+              : (m.dialogDescription ?? ''),
+          key: id,
         }));
 
       list.push({
@@ -183,39 +187,68 @@ export function ModelDialog({ onClose }: ModelDialogProps): React.JSX.Element {
       });
     }
     return list;
-  }, [
-    config,
-    shouldShowPreviewModels,
-    manualModelSelected,
-    useGemini31,
-    useGemini31FlashLite,
-    useCustomToolModel,
-    hasAccessToProModel,
-  ]);
+  }, [config, shouldShowPreviewModels, manualModelSelected, useGemini31]);
 
   const manualOptions = useMemo(() => {
+    const isFreeTier = config?.getUserTier() === UserTierId.FREE;
     // --- DYNAMIC PATH ---
     if (
       config?.getExperimentalDynamicModelConfiguration?.() === true &&
-      config.getModelConfigService
+      config.modelConfigService
     ) {
-      const allOptions = config
-        .getModelConfigService()
-        .getAvailableModelOptions({
-          useGemini3_1: useGemini31,
-          useGemini3_1FlashLite: useGemini31FlashLite,
-          useCustomTools: useCustomToolModel,
-          hasAccessToPreview: shouldShowPreviewModels,
-          hasAccessToProModel,
+      const list = Object.entries(
+        config.modelConfigService.getModelDefinitions?.() ?? {},
+      )
+        .filter(([id, m]) => {
+          // Basic visibility and Preview access
+          if (m.isVisible !== true) return false;
+          if (m.isPreview && !shouldShowPreviewModels) return false;
+          // Auto models are for main menu only
+          if (m.tier === 'auto') return false;
+          // Pro models are shown for users with pro access
+          if (!hasAccessToProModel && m.tier === 'pro') return false;
+          // 3.1 Preview Flash-lite is only available on free tier
+          if (m.tier === 'flash-lite' && m.isPreview && !isFreeTier)
+            return false;
+
+          // Flag Guard: Versioned models only show if their flag is active.
+          if (id === PREVIEW_GEMINI_3_1_MODEL && !useGemini31) return false;
+          if (
+            id === PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL &&
+            !useGemini31FlashLite
+          )
+            return false;
+
+          return true;
+        })
+        .map(([id, m]) => {
+          const resolvedId = config.modelConfigService.resolveModelId(id, {
+            useGemini3_1: useGemini31,
+            useGemini3_1FlashLite: useGemini31FlashLite,
+            useCustomTools: useCustomToolModel,
+          });
+          // Title ID is the resolved ID without custom tools flag
+          const titleId = config.modelConfigService.resolveModelId(id, {
+            useGemini3_1: useGemini31,
+            useGemini3_1FlashLite: useGemini31FlashLite,
+          });
+          return {
+            value: resolvedId,
+            title:
+              m.displayName ?? getDisplayString(titleId, config ?? undefined),
+            key: id,
+          };
         });
 
-      return allOptions
-        .filter((o) => o.tier !== 'auto')
-        .map((o) => ({
-          value: o.modelId,
-          title: o.name,
-          key: o.modelId,
-        }));
+      // Deduplicate: only show one entry per unique resolved model value.
+      // This is needed because 3 pro and 3.1 pro models can resolve to the same
+      // value, depending on the useGemini31 flag.
+      const seen = new Set<string>();
+      return list.filter((option) => {
+        if (seen.has(option.value)) return false;
+        seen.add(option.value);
+        return true;
+      });
     }
 
     // --- LEGACY PATH ---
@@ -259,7 +292,7 @@ export function ModelDialog({ onClose }: ModelDialogProps): React.JSX.Element {
         },
       ];
 
-      if (useGemini31FlashLite) {
+      if (isFreeTier && useGemini31FlashLite) {
         previewOptions.push({
           value: PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL,
           title: getDisplayString(PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL),

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

@@ -142,4 +142,38 @@ describe('<StatusRow />', () => {
     await waitUntilReady();
     expect(lastFrame()).toContain('Tip: Test Tip');
   });
+
+  it('renders buffer toggle hint when showIsAlternateBufferHint is true', async () => {
+    (useComposerStatus as Mock).mockReturnValue({
+      isInteractiveShellWaiting: false,
+      showLoadingIndicator: false,
+      showTips: false,
+      showWit: false,
+      modeContentObj: null,
+      showMinimalContext: false,
+    });
+
+    const uiState: Partial<UIState> = {
+      ...defaultUiState,
+      showIsAlternateBufferHint: true,
+    };
+
+    const { lastFrame, waitUntilReady } = await renderWithProviders(
+      <StatusRow
+        showUiDetails={false}
+        isNarrow={false}
+        terminalWidth={100}
+        hideContextSummary={false}
+        hideUiDetailsForSuggestions={false}
+        hasPendingActionRequired={false}
+      />,
+      {
+        width: 100,
+        uiState,
+      },
+    );
+
+    await waitUntilReady();
+    expect(lastFrame()).toContain('[Alt+T] Switch to Full Screen');
+  });
 });

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

@@ -206,7 +206,12 @@ export const StatusRow: React.FC<StatusRowProps> = ({
       return uiState.currentTip;
     }
 
-    // 2. Shortcut Hint (Fallback)
+    // 2. Buffer Toggle Hint
+    if (uiState.showIsAlternateBufferHint) {
+      return '[Alt+T] Switch to Full Screen';
+    }
+
+    // 3. Shortcut Hint (Fallback)
     if (
       settings.merged.ui.showShortcutsHint &&
       !hideUiDetailsForSuggestions &&

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

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

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

@@ -43,12 +43,10 @@ Tips for getting started:
 │ ✓  tool1 Description for tool 1                                          │
 │                                                                          │
 ╰──────────────────────────────────────────────────────────────────────────╯
-
 ╭──────────────────────────────────────────────────────────────────────────╮
 │ ✓  tool2 Description for tool 2                                          │
 │                                                                          │
 ╰──────────────────────────────────────────────────────────────────────────╯
-
 ╭──────────────────────────────────────────────────────────────────────────╮
 │ o  tool3 Description for tool 3                                          │
 │                                                                          │
@@ -95,7 +93,6 @@ Tips for getting started:
 │ ✓  tool1 Description for tool 1                                          │
 │                                                                          │
 ╰──────────────────────────────────────────────────────────────────────────╯
-
 ╭──────────────────────────────────────────────────────────────────────────╮
 │ ✓  tool2 Description for tool 2                                          │
 │                                                                          │

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="734" viewBox="0 0 920 734">
+<svg xmlns="http://www.w3.org/2000/svg" width="920" height="700" viewBox="0 0 920 700">
   <style>
     text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
   </style>
-  <rect width="920" height="734" fill="#000000" />
+  <rect width="920" height="700" 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,92 +74,85 @@
     <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>
-    <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>
+    <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="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="252" lengthAdjust="spacingAndGlyphs"> Current authentication info</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="891" y="393" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="410" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</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="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="891" y="410" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="427" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</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="45" y="427" fill="#afafaf" textLength="495" lengthAdjust="spacingAndGlyphs"> Total tokens used 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="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
-    <text x="72" y="444" fill="#ffffff" textLength="108" lengthAdjust="spacingAndGlyphs"> token-count</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="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="#d7ffd7" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
-    <text x="72" y="478" fill="#ffffff" textLength="171" lengthAdjust="spacingAndGlyphs"> Show footer labels</text>
+    <text x="45" y="478" fill="#ffffff" textLength="207" lengthAdjust="spacingAndGlyphs">Reset to default footer</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="#afafaf" textLength="585" lengthAdjust="spacingAndGlyphs">Enter to select · ↑/↓ to navigate · ←/→ to reorder · Esc to close</text>
+    <text x="27" y="563" fill="#333333" textLength="846" lengthAdjust="spacingAndGlyphs">┌────────────────────────────────────────────────────────────────────────────────────────────┐</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="846" 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="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="72" lengthAdjust="spacingAndGlyphs" font-weight="bold">Preview:</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="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="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="27" y="631" fill="#333333" textLength="846" 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="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>
+    <text x="0" y="665" 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="734" viewBox="0 0 920 734">
+<svg xmlns="http://www.w3.org/2000/svg" width="920" height="700" viewBox="0 0 920 700">
   <style>
     text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
   </style>
-  <rect width="920" height="734" fill="#000000" />
+  <rect width="920" height="700" 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,77 +84,70 @@
     <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="45" lengthAdjust="spacingAndGlyphs"> auth</text>
+    <text x="72" y="376" fill="#ffffff" textLength="117" lengthAdjust="spacingAndGlyphs"> code-changes</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="252" lengthAdjust="spacingAndGlyphs"> Current authentication info</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="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="117" lengthAdjust="spacingAndGlyphs"> code-changes</text>
+    <text x="72" y="410" fill="#ffffff" textLength="108" lengthAdjust="spacingAndGlyphs"> token-count</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="513" lengthAdjust="spacingAndGlyphs"> Lines added/removed in the session (not shown when zero)</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="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="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
-    <text x="72" y="444" fill="#ffffff" textLength="108" lengthAdjust="spacingAndGlyphs"> token-count</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="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="#d7ffd7" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
-    <text x="72" y="478" fill="#ffffff" textLength="171" lengthAdjust="spacingAndGlyphs"> Show footer labels</text>
+    <text x="45" y="478" fill="#ffffff" textLength="207" lengthAdjust="spacingAndGlyphs">Reset to default footer</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="#afafaf" textLength="585" lengthAdjust="spacingAndGlyphs">Enter to select · ↑/↓ to navigate · ←/→ to reorder · Esc to close</text>
+    <text x="27" y="563" fill="#333333" textLength="846" lengthAdjust="spacingAndGlyphs">┌────────────────────────────────────────────────────────────────────────────────────────────┐</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="846" 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="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="72" lengthAdjust="spacingAndGlyphs" font-weight="bold">Preview:</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="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>
-    <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="27" y="631" fill="#333333" textLength="846" 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="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>
+    <text x="0" y="665" 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="717" viewBox="0 0 920 717">
+<svg xmlns="http://www.w3.org/2000/svg" width="920" height="683" viewBox="0 0 920 683">
   <style>
     text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
   </style>
-  <rect width="920" height="717" fill="#000000" />
+  <rect width="920" height="683" 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,76 +75,69 @@
     <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="45" lengthAdjust="spacingAndGlyphs"> auth</text>
+    <text x="72" y="376" fill="#ffffff" textLength="117" lengthAdjust="spacingAndGlyphs"> code-changes</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="252" lengthAdjust="spacingAndGlyphs"> Current authentication info</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="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="117" lengthAdjust="spacingAndGlyphs"> code-changes</text>
+    <text x="72" y="410" fill="#ffffff" textLength="108" lengthAdjust="spacingAndGlyphs"> token-count</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="513" lengthAdjust="spacingAndGlyphs"> Lines added/removed in the session (not shown when zero)</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="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>
-    <text x="72" y="444" fill="#ffffff" textLength="108" lengthAdjust="spacingAndGlyphs"> token-count</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="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>
+    <rect x="27" y="459" width="846" height="17" fill="#001a00" />
     <text x="891" y="461" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="478" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</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="45" y="478" fill="#ffffff" textLength="207" lengthAdjust="spacingAndGlyphs">Reset to default footer</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>
-    <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="#afafaf" textLength="585" lengthAdjust="spacingAndGlyphs">Enter to select · ↑/↓ to navigate · ←/→ to reorder · Esc to close</text>
+    <text x="27" y="563" fill="#333333" textLength="846" lengthAdjust="spacingAndGlyphs">┌────────────────────────────────────────────────────────────────────────────────────────────┐</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="846" 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="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="72" lengthAdjust="spacingAndGlyphs" font-weight="bold">Preview:</text>
-    <text x="864" y="614" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="27" y="614" fill="#333333" textLength="846" 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="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>
+    <text x="0" y="648" fill="#333333" textLength="900" lengthAdjust="spacingAndGlyphs">╰──────────────────────────────────────────────────────────────────────────────────────────────────╯</text>
   </g>
 </svg>

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

@@ -23,8 +23,6 @@ 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                                                                               │
@@ -68,8 +66,6 @@ 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                                                                               │
@@ -114,8 +110,6 @@ 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                                                                               │
@@ -159,8 +153,6 @@ 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__/InputPrompt-InputPrompt-Highlighting-and-Cursor-Display-multi-line-scenarios-should-display-cursor-correctly-at-the-beginning-of-a-line-in-a-multiline-block.snap.svg

@@ -1,19 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="920" height="88" viewBox="0 0 920 88">
-  <style>
-    text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
-  </style>
-  <rect width="920" height="88" fill="#000000" />
-  <g transform="translate(10, 10)">
-    <text x="0" y="2" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-    <text x="0" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <text x="36" y="19" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs">first line</text>
-    <text x="891" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="36" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <rect x="36" y="34" width="9" height="17" fill="#ffffff" />
-    <text x="36" y="36" fill="#000000" textLength="9" lengthAdjust="spacingAndGlyphs">s</text>
-    <text x="45" y="36" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs">econd line</text>
-    <text x="891" y="36" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="53" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-  </g>
-</svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-Highlighting-and-Cursor-Display-multi-line-scenarios-should-display-cursor-correctly-at-the-end-of-a-line-in-a-multiline-block.snap.svg

@@ -1,18 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="920" height="88" viewBox="0 0 920 88">
-  <style>
-    text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
-  </style>
-  <rect width="920" height="88" fill="#000000" />
-  <g transform="translate(10, 10)">
-    <text x="0" y="2" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-    <text x="0" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <text x="36" y="19" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs">first line</text>
-    <rect x="126" y="17" width="9" height="17" fill="#ffffff" />
-    <text x="891" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="36" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="36" y="36" fill="#ffffff" textLength="99" lengthAdjust="spacingAndGlyphs">second line</text>
-    <text x="891" y="36" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="53" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-  </g>
-</svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-Highlighting-and-Cursor-Display-multi-line-scenarios-should-display-cursor-correctly-in-the-middle-of-a-line-in-a-multiline-block.snap.svg

@@ -1,23 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="920" height="105" viewBox="0 0 920 105">
-  <style>
-    text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
-  </style>
-  <rect width="920" height="105" fill="#000000" />
-  <g transform="translate(10, 10)">
-    <text x="0" y="2" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-    <text x="0" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <text x="36" y="19" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs">first line</text>
-    <text x="891" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="36" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="36" y="36" fill="#ffffff" textLength="27" lengthAdjust="spacingAndGlyphs">sec</text>
-    <rect x="63" y="34" width="9" height="17" fill="#ffffff" />
-    <text x="63" y="36" fill="#000000" textLength="9" lengthAdjust="spacingAndGlyphs">o</text>
-    <text x="72" y="36" fill="#ffffff" textLength="63" lengthAdjust="spacingAndGlyphs">nd line</text>
-    <text x="891" y="36" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="53" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="36" y="53" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs">third line</text>
-    <text x="891" y="53" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="70" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-  </g>
-</svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-Highlighting-and-Cursor-Display-multi-line-scenarios-should-display-cursor-on-a-blank-line-in-a-multiline-block.snap.svg

@@ -1,20 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="920" height="105" viewBox="0 0 920 105">
-  <style>
-    text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
-  </style>
-  <rect width="920" height="105" fill="#000000" />
-  <g transform="translate(10, 10)">
-    <text x="0" y="2" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-    <text x="0" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <text x="36" y="19" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs">first line</text>
-    <text x="891" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="36" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <rect x="36" y="34" width="9" height="17" fill="#ffffff" />
-    <text x="891" y="36" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="53" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="36" y="53" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs">third line</text>
-    <text x="891" y="53" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="70" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-  </g>
-</svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-Highlighting-and-Cursor-Display-single-line-scenarios-should-display-cursor-correctly-after-multi-byte-unicode-characters-.snap.svg

@@ -1,16 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="920" height="71" viewBox="0 0 920 71">
-  <style>
-    text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
-  </style>
-  <rect width="920" height="71" fill="#000000" />
-  <g transform="translate(10, 10)">
-    <text x="0" y="2" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-    <text x="0" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <text x="36" y="19" fill="#ffffff" textLength="9" lengthAdjust="spacingAndGlyphs">👍</text>
-    <rect x="45" y="17" width="9" height="17" fill="#ffffff" />
-    <text x="45" y="19" fill="#000000" textLength="9" lengthAdjust="spacingAndGlyphs">A</text>
-    <text x="882" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="36" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-  </g>
-</svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-Highlighting-and-Cursor-Display-single-line-scenarios-should-display-cursor-correctly-at-the-beginning-of-the-line-.snap.svg

@@ -1,16 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="920" height="71" viewBox="0 0 920 71">
-  <style>
-    text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
-  </style>
-  <rect width="920" height="71" fill="#000000" />
-  <g transform="translate(10, 10)">
-    <text x="0" y="2" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-    <text x="0" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <rect x="36" y="17" width="9" height="17" fill="#ffffff" />
-    <text x="36" y="19" fill="#000000" textLength="9" lengthAdjust="spacingAndGlyphs">h</text>
-    <text x="45" y="19" fill="#ffffff" textLength="36" lengthAdjust="spacingAndGlyphs">ello</text>
-    <text x="891" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="36" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-  </g>
-</svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-Highlighting-and-Cursor-Display-single-line-scenarios-should-display-cursor-correctly-at-the-end-of-a-line-with-unicode-cha-.snap.svg

@@ -1,14 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="920" height="71" viewBox="0 0 920 71">
-  <style>
-    text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
-  </style>
-  <rect width="920" height="71" fill="#000000" />
-  <g transform="translate(10, 10)">
-    <text x="0" y="2" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-    <text x="0" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <text x="36" y="19" fill="#ffffff" textLength="63" lengthAdjust="spacingAndGlyphs">hello 👍</text>
-    <text x="882" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="36" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-  </g>
-</svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-Highlighting-and-Cursor-Display-single-line-scenarios-should-display-cursor-correctly-at-the-end-of-a-short-line-with-unico-.snap.svg

@@ -1,15 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="920" height="71" viewBox="0 0 920 71">
-  <style>
-    text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
-  </style>
-  <rect width="920" height="71" fill="#000000" />
-  <g transform="translate(10, 10)">
-    <text x="0" y="2" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-    <text x="0" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <text x="36" y="19" fill="#ffffff" textLength="9" lengthAdjust="spacingAndGlyphs">👍</text>
-    <rect x="45" y="17" width="9" height="17" fill="#ffffff" />
-    <text x="882" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="36" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-  </g>
-</svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-Highlighting-and-Cursor-Display-single-line-scenarios-should-display-cursor-correctly-at-the-end-of-the-line-.snap.svg

@@ -1,15 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="920" height="71" viewBox="0 0 920 71">
-  <style>
-    text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
-  </style>
-  <rect width="920" height="71" fill="#000000" />
-  <g transform="translate(10, 10)">
-    <text x="0" y="2" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-    <text x="0" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <text x="36" y="19" fill="#ffffff" textLength="45" lengthAdjust="spacingAndGlyphs">hello</text>
-    <rect x="81" y="17" width="9" height="17" fill="#ffffff" />
-    <text x="891" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="36" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-  </g>
-</svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-Highlighting-and-Cursor-Display-single-line-scenarios-should-display-cursor-correctly-for-multi-byte-unicode-characters-.snap.svg

@@ -1,17 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="920" height="71" viewBox="0 0 920 71">
-  <style>
-    text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
-  </style>
-  <rect width="920" height="71" fill="#000000" />
-  <g transform="translate(10, 10)">
-    <text x="0" y="2" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-    <text x="0" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <text x="36" y="19" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">hello </text>
-    <rect x="90" y="17" width="9" height="17" fill="#ffffff" />
-    <text x="90" y="19" fill="#000000" textLength="9" lengthAdjust="spacingAndGlyphs">👍</text>
-    <text x="99" y="19" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs"> world</text>
-    <text x="882" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="36" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-  </g>
-</svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-Highlighting-and-Cursor-Display-single-line-scenarios-should-display-cursor-correctly-mid-word-.snap.svg

@@ -1,17 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="920" height="71" viewBox="0 0 920 71">
-  <style>
-    text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
-  </style>
-  <rect width="920" height="71" fill="#000000" />
-  <g transform="translate(10, 10)">
-    <text x="0" y="2" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-    <text x="0" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <text x="36" y="19" fill="#ffffff" textLength="27" lengthAdjust="spacingAndGlyphs">hel</text>
-    <rect x="63" y="17" width="9" height="17" fill="#ffffff" />
-    <text x="63" y="19" fill="#000000" textLength="9" lengthAdjust="spacingAndGlyphs">l</text>
-    <text x="72" y="19" fill="#ffffff" textLength="63" lengthAdjust="spacingAndGlyphs">o world</text>
-    <text x="891" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="36" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-  </g>
-</svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-Highlighting-and-Cursor-Display-single-line-scenarios-should-display-cursor-correctly-on-a-highlighted-token-.snap.svg

@@ -1,18 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="920" height="71" viewBox="0 0 920 71">
-  <style>
-    text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
-  </style>
-  <rect width="920" height="71" fill="#000000" />
-  <g transform="translate(10, 10)">
-    <text x="0" y="2" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-    <text x="0" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <text x="36" y="19" fill="#ffffff" textLength="36" lengthAdjust="spacingAndGlyphs">run </text>
-    <text x="72" y="19" fill="#d7afff" textLength="45" lengthAdjust="spacingAndGlyphs">@path</text>
-    <rect x="117" y="17" width="9" height="17" fill="#d7afff" />
-    <text x="117" y="19" fill="#000000" textLength="9" lengthAdjust="spacingAndGlyphs">/</text>
-    <text x="126" y="19" fill="#d7afff" textLength="63" lengthAdjust="spacingAndGlyphs">to/file</text>
-    <text x="891" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="36" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-  </g>
-</svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-Highlighting-and-Cursor-Display-single-line-scenarios-should-display-cursor-correctly-on-a-space-between-words-.snap.svg

@@ -1,16 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="920" height="71" viewBox="0 0 920 71">
-  <style>
-    text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
-  </style>
-  <rect width="920" height="71" fill="#000000" />
-  <g transform="translate(10, 10)">
-    <text x="0" y="2" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-    <text x="0" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <text x="36" y="19" fill="#ffffff" textLength="45" lengthAdjust="spacingAndGlyphs">hello</text>
-    <rect x="81" y="17" width="9" height="17" fill="#ffffff" />
-    <text x="90" y="19" fill="#ffffff" textLength="45" lengthAdjust="spacingAndGlyphs">world</text>
-    <text x="891" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="36" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-  </g>
-</svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-Highlighting-and-Cursor-Display-single-line-scenarios-should-display-cursor-correctly-on-an-empty-line-.snap.svg

@@ -1,15 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="920" height="71" viewBox="0 0 920 71">
-  <style>
-    text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
-  </style>
-  <rect width="920" height="71" fill="#000000" />
-  <g transform="translate(10, 10)">
-    <text x="0" y="2" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-    <text x="0" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <rect x="36" y="17" width="9" height="17" fill="#ffffff" />
-    <text x="45" y="19" fill="#afafaf" textLength="315" lengthAdjust="spacingAndGlyphs"> Type your message or @path/to/file</text>
-    <text x="891" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="36" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-  </g>
-</svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-multiline-rendering-should-correctly-render-multiline-input-including-blank-lines.snap.svg

@@ -1,20 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="920" height="105" viewBox="0 0 920 105">
-  <style>
-    text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
-  </style>
-  <rect width="920" height="105" fill="#000000" />
-  <g transform="translate(10, 10)">
-    <text x="0" y="2" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-    <text x="0" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <text x="36" y="19" fill="#ffffff" textLength="45" lengthAdjust="spacingAndGlyphs">hello</text>
-    <text x="891" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="36" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="891" y="36" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="53" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="36" y="53" fill="#ffffff" textLength="45" lengthAdjust="spacingAndGlyphs">world</text>
-    <rect x="81" y="51" width="9" height="17" fill="#ffffff" />
-    <text x="891" y="53" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="70" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-  </g>
-</svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-snapshots-should-not-show-inverted-cursor-when-shell-is-focused.snap.svg

@@ -1,18 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="920" height="71" viewBox="0 0 920 71">
-  <style>
-    text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
-  </style>
-  <rect width="920" height="71" fill="#000000" />
-  <g transform="translate(10, 10)">
-    <rect x="0" y="0" width="900" height="17" fill="#1f1f1f" />
-    <text x="0" y="2" fill="#000000" textLength="900" lengthAdjust="spacingAndGlyphs">▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀</text>
-    <rect x="0" y="17" width="9" height="17" fill="#1f1f1f" />
-    <rect x="9" y="17" width="18" height="17" fill="#1f1f1f" />
-    <text x="9" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <rect x="27" y="17" width="324" height="17" fill="#1f1f1f" />
-    <text x="27" y="19" fill="#afafaf" textLength="324" lengthAdjust="spacingAndGlyphs">  Type your message or @path/to/file</text>
-    <rect x="351" y="17" width="549" height="17" fill="#1f1f1f" />
-    <rect x="0" y="34" width="900" height="17" fill="#1f1f1f" />
-    <text x="0" y="36" fill="#000000" textLength="900" lengthAdjust="spacingAndGlyphs">▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄</text>
-  </g>
-</svg>

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

@@ -1,95 +1,5 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`InputPrompt > Highlighting and Cursor Display > multi-line scenarios > should display cursor correctly 'at the beginning of a line' in a multiline block 1`] = `
-"────────────────────────────────────────────────────────────────────────────────────────────────────
-│ > first line                                                                                     │
-│   second line                                                                                    │
-────────────────────────────────────────────────────────────────────────────────────────────────────"
-`;
-
-exports[`InputPrompt > Highlighting and Cursor Display > multi-line scenarios > should display cursor correctly 'at the end of a line' in a multiline block 1`] = `
-"────────────────────────────────────────────────────────────────────────────────────────────────────
-│ > first line                                                                                     │
-│   second line                                                                                    │
-────────────────────────────────────────────────────────────────────────────────────────────────────"
-`;
-
-exports[`InputPrompt > Highlighting and Cursor Display > multi-line scenarios > should display cursor correctly 'in the middle of a line' in a multiline block 1`] = `
-"────────────────────────────────────────────────────────────────────────────────────────────────────
-│ > first line                                                                                     │
-│   second line                                                                                    │
-│   third line                                                                                     │
-────────────────────────────────────────────────────────────────────────────────────────────────────"
-`;
-
-exports[`InputPrompt > Highlighting and Cursor Display > multi-line scenarios > should display cursor on a blank line in a multiline block 1`] = `
-"────────────────────────────────────────────────────────────────────────────────────────────────────
-│ > first line                                                                                     │
-│                                                                                                  │
-│   third line                                                                                     │
-────────────────────────────────────────────────────────────────────────────────────────────────────"
-`;
-
-exports[`InputPrompt > Highlighting and Cursor Display > single-line scenarios > should display cursor correctly 'after multi-byte unicode characters' 1`] = `
-"────────────────────────────────────────────────────────────────────────────────────────────────────
-│ > 👍A                                                                                            │
-────────────────────────────────────────────────────────────────────────────────────────────────────"
-`;
-
-exports[`InputPrompt > Highlighting and Cursor Display > single-line scenarios > should display cursor correctly 'at the beginning of the line' 1`] = `
-"────────────────────────────────────────────────────────────────────────────────────────────────────
-│ > hello                                                                                          │
-────────────────────────────────────────────────────────────────────────────────────────────────────"
-`;
-
-exports[`InputPrompt > Highlighting and Cursor Display > single-line scenarios > should display cursor correctly 'at the end of a line with unicode cha…' 1`] = `
-"────────────────────────────────────────────────────────────────────────────────────────────────────
-│ > hello 👍                                                                                       │
-────────────────────────────────────────────────────────────────────────────────────────────────────"
-`;
-
-exports[`InputPrompt > Highlighting and Cursor Display > single-line scenarios > should display cursor correctly 'at the end of a short line with unico…' 1`] = `
-"────────────────────────────────────────────────────────────────────────────────────────────────────
-│ > 👍                                                                                             │
-────────────────────────────────────────────────────────────────────────────────────────────────────"
-`;
-
-exports[`InputPrompt > Highlighting and Cursor Display > single-line scenarios > should display cursor correctly 'at the end of the line' 1`] = `
-"────────────────────────────────────────────────────────────────────────────────────────────────────
-│ > hello                                                                                          │
-────────────────────────────────────────────────────────────────────────────────────────────────────"
-`;
-
-exports[`InputPrompt > Highlighting and Cursor Display > single-line scenarios > should display cursor correctly 'for multi-byte unicode characters' 1`] = `
-"────────────────────────────────────────────────────────────────────────────────────────────────────
-│ > hello 👍 world                                                                                 │
-────────────────────────────────────────────────────────────────────────────────────────────────────"
-`;
-
-exports[`InputPrompt > Highlighting and Cursor Display > single-line scenarios > should display cursor correctly 'mid-word' 1`] = `
-"────────────────────────────────────────────────────────────────────────────────────────────────────
-│ > hello world                                                                                    │
-────────────────────────────────────────────────────────────────────────────────────────────────────"
-`;
-
-exports[`InputPrompt > Highlighting and Cursor Display > single-line scenarios > should display cursor correctly 'on a highlighted token' 1`] = `
-"────────────────────────────────────────────────────────────────────────────────────────────────────
-│ > run @path/to/file                                                                              │
-────────────────────────────────────────────────────────────────────────────────────────────────────"
-`;
-
-exports[`InputPrompt > Highlighting and Cursor Display > single-line scenarios > should display cursor correctly 'on a space between words' 1`] = `
-"────────────────────────────────────────────────────────────────────────────────────────────────────
-│ > hello world                                                                                    │
-────────────────────────────────────────────────────────────────────────────────────────────────────"
-`;
-
-exports[`InputPrompt > Highlighting and Cursor Display > single-line scenarios > should display cursor correctly 'on an empty line' 1`] = `
-"────────────────────────────────────────────────────────────────────────────────────────────────────
-│ >   Type your message or @path/to/file                                                           │
-────────────────────────────────────────────────────────────────────────────────────────────────────"
-`;
-
 exports[`InputPrompt > History Navigation and Completion Suppression > should not render suggestions during history navigation 1`] = `
 "▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
  > second message                                                                                   
@@ -168,18 +78,11 @@ exports[`InputPrompt > mouse interaction > should toggle paste expansion on doub
 "
 `;
 
-exports[`InputPrompt > multiline rendering > should correctly render multiline input including blank lines 1`] = `
-"────────────────────────────────────────────────────────────────────────────────────────────────────
-│ > hello                                                                                          │
-│                                                                                                  │
-│   world                                                                                          │
-────────────────────────────────────────────────────────────────────────────────────────────────────"
-`;
-
 exports[`InputPrompt > snapshots > should not show inverted cursor when shell is focused 1`] = `
 "▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
  >   Type your message or @path/to/file                                                             
-▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄"
+▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+"
 `;
 
 exports[`InputPrompt > snapshots > should render correctly in shell mode 1`] = `

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

@@ -4,13 +4,14 @@ exports[`MainContent > MainContent Tool Output Height Logic > 'ASB mode - Focuse
 "ScrollableList
 AppHeader(full)
 ╭──────────────────────────────────────────────────────────────────────────────────────────────╮
-│ ⠋  Shell Command Running a long command...                                                   │
+│ ⊶  Shell Command Running a long command...                                                   │
 │                                                                                              │
+│ Line 10                                                                                      │
 │ Line 11                                                                                      │
 │ Line 12                                                                                      │
 │ Line 13                                                                                      │
 │ Line 14                                                                                      │
-│ Line 15                                                                                      │
+│ Line 15                                                                                    █ │
 │ Line 16                                                                                    █ │
 │ Line 17                                                                                    █ │
 │ Line 18                                                                                    █ │
@@ -24,13 +25,14 @@ exports[`MainContent > MainContent Tool Output Height Logic > 'ASB mode - Unfocu
 "ScrollableList
 AppHeader(full)
 ╭──────────────────────────────────────────────────────────────────────────────────────────────╮
-│ ⠋  Shell Command Running a long command...                                                   │
+│ ⊶  Shell Command Running a long command...                                                   │
 │                                                                                              │
+│ Line 10                                                                                      │
 │ Line 11                                                                                      │
 │ Line 12                                                                                      │
 │ Line 13                                                                                      │
 │ Line 14                                                                                      │
-│ Line 15                                                                                      │
+│ Line 15                                                                                    █ │
 │ Line 16                                                                                    █ │
 │ Line 17                                                                                    █ │
 │ Line 18                                                                                    █ │
@@ -43,9 +45,10 @@ AppHeader(full)
 exports[`MainContent > MainContent Tool Output Height Logic > 'Normal mode - Constrained height' 1`] = `
 "AppHeader(full)
 ╭──────────────────────────────────────────────────────────────────────────────────────────────╮
-│ ⠋  Shell Command Running a long command...                                                   │
+│ ⊶  Shell Command Running a long command...                                                   │
 │                                                                                              │
-│ ... first 11 lines hidden (Ctrl+O to show) ...                                               │
+│ ... first 10 lines hidden (Ctrl+O to show) ...                                               │
+│ Line 11                                                                                      │
 │ Line 12                                                                                      │
 │ Line 13                                                                                      │
 │ Line 14                                                                                      │
@@ -62,7 +65,7 @@ exports[`MainContent > MainContent Tool Output Height Logic > 'Normal mode - Con
 exports[`MainContent > MainContent Tool Output Height Logic > 'Normal mode - Unconstrained height' 1`] = `
 "AppHeader(full)
 ╭──────────────────────────────────────────────────────────────────────────────────────────────╮
-│ ⠋  Shell Command Running a long command...                                                   │
+│ ⊶  Shell Command Running a long command...                                                   │
 │                                                                                              │
 │ Line 1                                                                                       │
 │ Line 2                                                                                       │

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="144" lengthAdjust="spacingAndGlyphs">Enable Plan Mode</text>
-    <text x="837" y="359" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</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="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="486" lengthAdjust="spacingAndGlyphs">Enable Plan Mode for read-only safety during planning.</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="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="126" lengthAdjust="spacingAndGlyphs">Plan Directory</text>
-    <text x="792" y="410" fill="#afafaf" textLength="81" lengthAdjust="spacingAndGlyphs">undefined</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="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="720" lengthAdjust="spacingAndGlyphs">The directory where planning artifacts are stored. If not specified, defaults t…</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="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">Plan Model Routing</text>
+    <text x="45" y="461" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</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="765" lengthAdjust="spacingAndGlyphs">Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr…</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="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="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</text>
-    <text x="837" y="512" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</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="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="612" lengthAdjust="spacingAndGlyphs">Retry on &quot;exception TypeError: fetch failed sending request&quot; errors.</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="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="144" lengthAdjust="spacingAndGlyphs">Enable Plan Mode</text>
-    <text x="837" y="359" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</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="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="486" lengthAdjust="spacingAndGlyphs">Enable Plan Mode for read-only safety during planning.</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="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="126" lengthAdjust="spacingAndGlyphs">Plan Directory</text>
-    <text x="792" y="410" fill="#afafaf" textLength="81" lengthAdjust="spacingAndGlyphs">undefined</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="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="720" lengthAdjust="spacingAndGlyphs">The directory where planning artifacts are stored. If not specified, defaults t…</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="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">Plan Model Routing</text>
+    <text x="45" y="461" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</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="765" lengthAdjust="spacingAndGlyphs">Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr…</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="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="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</text>
-    <text x="837" y="512" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</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="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="612" lengthAdjust="spacingAndGlyphs">Retry on &quot;exception TypeError: fetch failed sending request&quot; errors.</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="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="144" lengthAdjust="spacingAndGlyphs">Enable Plan Mode</text>
-    <text x="837" y="359" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</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="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="486" lengthAdjust="spacingAndGlyphs">Enable Plan Mode for read-only safety during planning.</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="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="126" lengthAdjust="spacingAndGlyphs">Plan Directory</text>
-    <text x="792" y="410" fill="#afafaf" textLength="81" lengthAdjust="spacingAndGlyphs">undefined</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="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="720" lengthAdjust="spacingAndGlyphs">The directory where planning artifacts are stored. If not specified, defaults t…</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="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">Plan Model Routing</text>
+    <text x="45" y="461" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</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="765" lengthAdjust="spacingAndGlyphs">Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr…</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="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="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</text>
-    <text x="837" y="512" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</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="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="612" lengthAdjust="spacingAndGlyphs">Retry on &quot;exception TypeError: fetch failed sending request&quot; errors.</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="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="144" lengthAdjust="spacingAndGlyphs">Enable Plan Mode</text>
-    <text x="837" y="359" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</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="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="486" lengthAdjust="spacingAndGlyphs">Enable Plan Mode for read-only safety during planning.</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="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="126" lengthAdjust="spacingAndGlyphs">Plan Directory</text>
-    <text x="792" y="410" fill="#afafaf" textLength="81" lengthAdjust="spacingAndGlyphs">undefined</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="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="720" lengthAdjust="spacingAndGlyphs">The directory where planning artifacts are stored. If not specified, defaults t…</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="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">Plan Model Routing</text>
+    <text x="45" y="461" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</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="765" lengthAdjust="spacingAndGlyphs">Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr…</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="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="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</text>
-    <text x="837" y="512" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</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="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="612" lengthAdjust="spacingAndGlyphs">Retry on &quot;exception TypeError: fetch failed sending request&quot; errors.</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="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="144" lengthAdjust="spacingAndGlyphs">Enable Plan Mode</text>
-    <text x="837" y="359" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</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="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="486" lengthAdjust="spacingAndGlyphs">Enable Plan Mode for read-only safety during planning.</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="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="126" lengthAdjust="spacingAndGlyphs">Plan Directory</text>
-    <text x="792" y="410" fill="#afafaf" textLength="81" lengthAdjust="spacingAndGlyphs">undefined</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="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="720" lengthAdjust="spacingAndGlyphs">The directory where planning artifacts are stored. If not specified, defaults t…</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="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">Plan Model Routing</text>
+    <text x="45" y="461" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</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="765" lengthAdjust="spacingAndGlyphs">Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr…</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="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="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</text>
-    <text x="837" y="512" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</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="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="612" lengthAdjust="spacingAndGlyphs">Retry on &quot;exception TypeError: fetch failed sending request&quot; errors.</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="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="144" lengthAdjust="spacingAndGlyphs">Enable Plan Mode</text>
-    <text x="837" y="359" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</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="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="486" lengthAdjust="spacingAndGlyphs">Enable Plan Mode for read-only safety during planning.</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="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="126" lengthAdjust="spacingAndGlyphs">Plan Directory</text>
-    <text x="792" y="410" fill="#afafaf" textLength="81" lengthAdjust="spacingAndGlyphs">undefined</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="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="720" lengthAdjust="spacingAndGlyphs">The directory where planning artifacts are stored. If not specified, defaults t…</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="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">Plan Model Routing</text>
+    <text x="45" y="461" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</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="765" lengthAdjust="spacingAndGlyphs">Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr…</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="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="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</text>
-    <text x="837" y="512" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</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="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="612" lengthAdjust="spacingAndGlyphs">Retry on &quot;exception TypeError: fetch failed sending request&quot; errors.</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="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="144" lengthAdjust="spacingAndGlyphs">Enable Plan Mode</text>
-    <text x="837" y="359" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</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="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="486" lengthAdjust="spacingAndGlyphs">Enable Plan Mode for read-only safety during planning.</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="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="126" lengthAdjust="spacingAndGlyphs">Plan Directory</text>
-    <text x="792" y="410" fill="#afafaf" textLength="81" lengthAdjust="spacingAndGlyphs">undefined</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="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="720" lengthAdjust="spacingAndGlyphs">The directory where planning artifacts are stored. If not specified, defaults t…</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="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">Plan Model Routing</text>
+    <text x="45" y="461" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</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="765" lengthAdjust="spacingAndGlyphs">Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr…</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="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="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</text>
-    <text x="837" y="512" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</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="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="612" lengthAdjust="spacingAndGlyphs">Retry on &quot;exception TypeError: fetch failed sending request&quot; errors.</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="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="144" lengthAdjust="spacingAndGlyphs">Enable Plan Mode</text>
-    <text x="837" y="359" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</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="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="486" lengthAdjust="spacingAndGlyphs">Enable Plan Mode for read-only safety during planning.</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="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="126" lengthAdjust="spacingAndGlyphs">Plan Directory</text>
-    <text x="792" y="410" fill="#afafaf" textLength="81" lengthAdjust="spacingAndGlyphs">undefined</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="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="720" lengthAdjust="spacingAndGlyphs">The directory where planning artifacts are stored. If not specified, defaults t…</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="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">Plan Model Routing</text>
+    <text x="45" y="461" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</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="765" lengthAdjust="spacingAndGlyphs">Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr…</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="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="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</text>
-    <text x="837" y="512" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</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="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="612" lengthAdjust="spacingAndGlyphs">Retry on &quot;exception TypeError: fetch failed sending request&quot; errors.</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="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="144" lengthAdjust="spacingAndGlyphs">Enable Plan Mode</text>
-    <text x="837" y="359" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</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="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="486" lengthAdjust="spacingAndGlyphs">Enable Plan Mode for read-only safety during planning.</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="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="126" lengthAdjust="spacingAndGlyphs">Plan Directory</text>
-    <text x="792" y="410" fill="#afafaf" textLength="81" lengthAdjust="spacingAndGlyphs">undefined</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="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="720" lengthAdjust="spacingAndGlyphs">The directory where planning artifacts are stored. If not specified, defaults t…</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="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">Plan Model Routing</text>
+    <text x="45" y="461" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</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="765" lengthAdjust="spacingAndGlyphs">Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr…</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="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="162" lengthAdjust="spacingAndGlyphs">Retry Fetch Errors</text>
-    <text x="837" y="512" fill="#afafaf" textLength="36" lengthAdjust="spacingAndGlyphs">true</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="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="612" lengthAdjust="spacingAndGlyphs">Retry on &quot;exception TypeError: fetch failed sending request&quot; errors.</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="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,9 +22,6 @@ 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…              │
 │                                                                                                  │
@@ -34,6 +31,9 @@ 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,9 +68,6 @@ 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…              │
 │                                                                                                  │
@@ -80,6 +77,9 @@ 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,9 +114,6 @@ 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…              │
 │                                                                                                  │
@@ -126,6 +123,9 @@ 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,9 +160,6 @@ 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…              │
 │                                                                                                  │
@@ -172,6 +169,9 @@ 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,9 +206,6 @@ 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…              │
 │                                                                                                  │
@@ -218,6 +215,9 @@ 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,9 +252,6 @@ 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…              │
 │                                                                                                  │
@@ -264,6 +261,9 @@ 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,9 +298,6 @@ 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…              │
 │                                                                                                  │
@@ -310,6 +307,9 @@ 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,9 +344,6 @@ 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…              │
 │                                                                                                  │
@@ -356,6 +353,9 @@ 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,9 +390,6 @@ 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…              │
 │                                                                                                  │
@@ -402,6 +399,9 @@ 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__/ThemeDialog.test.tsx.snap

@@ -14,9 +14,9 @@ exports[`Initial Theme Selection > should default to a dark theme when terminal
 │    7. Holiday Dark                           │ 6     return a                                  │ │
 │    8. Shades Of Purple Dark                  │                                                 │ │
 │    9. Solarized Dark                         │ 1 - print("Hello, " + name)                     │ │
-│   10. Tokyo Night Dark                       │ 1 + print(f"Hello, {name}!")                    │ │
-│   11. ANSI Light                             │                                                 │ │
-│   12. Ayu Light                              └─────────────────────────────────────────────────┘ │
+│   10. ANSI Light                             │ 1 + print(f"Hello, {name}!")                    │ │
+│   11. Ayu Light                              │                                                 │ │
+│   12. Default Light                          └─────────────────────────────────────────────────┘ │
 │ ▼                                                                                                │
 │                                                                                                  │
 │ (Use Enter to select, Tab to configure scope, Esc to close)                                      │
@@ -64,9 +64,9 @@ exports[`Initial Theme Selection > should use the theme from settings even if te
 │    7. Holiday Dark                           │ 6     return a                                  │ │
 │    8. Shades Of Purple Dark                  │                                                 │ │
 │    9. Solarized Dark                         │ 1 - print("Hello, " + name)                     │ │
-│   10. Tokyo Night Dark                       │ 1 + print(f"Hello, {name}!")                    │ │
-│   11. ANSI Light                             │                                                 │ │
-│   12. Ayu Light                              └─────────────────────────────────────────────────┘ │
+│   10. ANSI Light                             │ 1 + print(f"Hello, {name}!")                    │ │
+│   11. Ayu Light                              │                                                 │ │
+│   12. Default Light                          └─────────────────────────────────────────────────┘ │
 │ ▼                                                                                                │
 │                                                                                                  │
 │ (Use Enter to select, Tab to configure scope, Esc to close)                                      │
@@ -103,9 +103,9 @@ exports[`ThemeDialog Snapshots > should render correctly in theme selection mode
 │    7. Holiday Dark                           │ 6     return a                                  │ │
 │    8. Shades Of Purple Dark                  │                                                 │ │
 │    9. Solarized Dark                         │ 1 - print("Hello, " + name)                     │ │
-│   10. Tokyo Night Dark                       │ 1 + print(f"Hello, {name}!")                    │ │
-│   11. ANSI Light                             │                                                 │ │
-│   12. Ayu Light                              └─────────────────────────────────────────────────┘ │
+│   10. ANSI Light                             │ 1 + print(f"Hello, {name}!")                    │ │
+│   11. Ayu Light                              │                                                 │ │
+│   12. Default Light                          └─────────────────────────────────────────────────┘ │
 │ ▼                                                                                                │
 │                                                                                                  │
 │ (Use Enter to select, Tab to configure scope, Esc to close)                                      │
@@ -128,9 +128,9 @@ exports[`ThemeDialog Snapshots > should render correctly in theme selection mode
 │    7. Holiday Dark                           │ 6     return a                                  │ │
 │    8. Shades Of Purple Dark                  │                                                 │ │
 │    9. Solarized Dark                         │ 1 - print("Hello, " + name)                     │ │
-│   10. Tokyo Night Dark                       │ 1 + print(f"Hello, {name}!")                    │ │
-│   11. ANSI Light                             │                                                 │ │
-│   12. Ayu Light                              └─────────────────────────────────────────────────┘ │
+│   10. ANSI Light                             │ 1 + print(f"Hello, {name}!")                    │ │
+│   11. Ayu Light                              │                                                 │ │
+│   12. Default Light                          └─────────────────────────────────────────────────┘ │
 │ ▼                                                                                                │
 │                                              ╭─────────────────────────────────────────────────╮ │
 │                                              │ DEVELOPER TOOLS (Not visible to users)          │ │

packages/cli/src/ui/components/messages/DenseToolMessage.test.tsx

@@ -1,577 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect } from 'vitest';
-import { renderWithProviders } from '../../../test-utils/render.js';
-import { DenseToolMessage } from './DenseToolMessage.js';
-import {
-  CoreToolCallStatus,
-  type DiffStat,
-  type FileDiff,
-  type GrepResult,
-  type ListDirectoryResult,
-  type ReadManyFilesResult,
-  makeFakeConfig,
-} from '@google/gemini-cli-core';
-import type {
-  SerializableConfirmationDetails,
-  ToolResultDisplay,
-} from '../../types.js';
-
-import { createMockSettings } from '../../../test-utils/settings.js';
-
-describe('DenseToolMessage', () => {
-  const defaultProps = {
-    callId: 'call-1',
-    name: 'test-tool',
-    description: 'Test description',
-    status: CoreToolCallStatus.Success,
-    resultDisplay: 'Success result' as ToolResultDisplay,
-    confirmationDetails: undefined,
-    terminalWidth: 80,
-  };
-
-  it('renders correctly for a successful string result', async () => {
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage {...defaultProps} />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('test-tool');
-    expect(output).toContain('Test description');
-    expect(output).toContain('→ Success result');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('truncates long string results', async () => {
-    const longResult = 'A'.repeat(200);
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        resultDisplay={longResult as ToolResultDisplay}
-      />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('…');
-    expect(lastFrame()).toMatchSnapshot();
-  });
-
-  it('flattens newlines in string results', async () => {
-    const multilineResult = 'Line 1\nLine 2';
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        resultDisplay={multilineResult as ToolResultDisplay}
-      />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('→ Line 1 Line 2');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('renders correctly for file diff results with stats', async () => {
-    const diffResult: FileDiff = {
-      fileDiff: '@@ -1,1 +1,1 @@\n-old line\n+diff content',
-      fileName: 'test.ts',
-      filePath: '/path/to/test.ts',
-      originalContent: 'old content',
-      newContent: 'new content',
-      diffStat: {
-        user_added_lines: 5,
-        user_removed_lines: 2,
-        user_added_chars: 50,
-        user_removed_chars: 20,
-        model_added_lines: 10,
-        model_removed_lines: 4,
-        model_added_chars: 100,
-        model_removed_chars: 40,
-      },
-    };
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        resultDisplay={diffResult as ToolResultDisplay}
-      />,
-      {},
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('test.ts → Accepted (+15, -6)');
-    expect(output).toContain('diff content');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('renders correctly for Edit tool using confirmationDetails', async () => {
-    const confirmationDetails = {
-      type: 'edit' as const,
-      title: 'Confirm Edit',
-      fileName: 'styles.scss',
-      filePath: '/path/to/styles.scss',
-      fileDiff:
-        '@@ -1,1 +1,1 @@\n-body { color: blue; }\n+body { color: red; }',
-      originalContent: 'body { color: blue; }',
-      newContent: 'body { color: red; }',
-    };
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        name="Edit"
-        status={CoreToolCallStatus.AwaitingApproval}
-        resultDisplay={undefined}
-        confirmationDetails={
-          confirmationDetails as SerializableConfirmationDetails
-        }
-      />,
-      {},
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('Edit');
-    expect(output).toContain('styles.scss');
-    expect(output).toContain('→ Confirming');
-    expect(output).toContain('body { color: red; }');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('renders correctly for Rejected Edit tool', async () => {
-    const diffResult: FileDiff = {
-      fileDiff: '@@ -1,1 +1,1 @@\n-old line\n+new line',
-      fileName: 'styles.scss',
-      filePath: '/path/to/styles.scss',
-      originalContent: 'old line',
-      newContent: 'new line',
-      diffStat: {
-        user_added_lines: 1,
-        user_removed_lines: 1,
-        user_added_chars: 0,
-        user_removed_chars: 0,
-        model_added_lines: 0,
-        model_removed_lines: 0,
-        model_added_chars: 0,
-        model_removed_chars: 0,
-      },
-    };
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        name="Edit"
-        status={CoreToolCallStatus.Cancelled}
-        resultDisplay={diffResult as ToolResultDisplay}
-      />,
-      {},
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('Edit');
-    expect(output).toContain('styles.scss → Rejected (+1, -1)');
-    expect(output).toContain('- old line');
-    expect(output).toContain('+ new line');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('renders correctly for Rejected Edit tool with confirmationDetails and diffStat', async () => {
-    const confirmationDetails = {
-      type: 'edit' as const,
-      title: 'Confirm Edit',
-      fileName: 'styles.scss',
-      filePath: '/path/to/styles.scss',
-      fileDiff:
-        '@@ -1,1 +1,1 @@\n-body { color: blue; }\n+body { color: red; }',
-      originalContent: 'body { color: blue; }',
-      newContent: 'body { color: red; }',
-      diffStat: {
-        user_added_lines: 1,
-        user_removed_lines: 1,
-        user_added_chars: 0,
-        user_removed_chars: 0,
-        model_added_lines: 0,
-        model_removed_lines: 0,
-        model_added_chars: 0,
-        model_removed_chars: 0,
-      } as DiffStat,
-    };
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        name="Edit"
-        status={CoreToolCallStatus.Cancelled}
-        resultDisplay={undefined}
-        confirmationDetails={
-          confirmationDetails as unknown as SerializableConfirmationDetails
-        }
-      />,
-      {},
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('Edit');
-    expect(output).toContain('styles.scss → Rejected (+1, -1)');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('renders correctly for WriteFile tool', async () => {
-    const diffResult: FileDiff = {
-      fileDiff: '@@ -1,1 +1,1 @@\n-old content\n+new content',
-      fileName: 'config.json',
-      filePath: '/path/to/config.json',
-      originalContent: 'old content',
-      newContent: 'new content',
-      diffStat: {
-        user_added_lines: 1,
-        user_removed_lines: 1,
-        user_added_chars: 0,
-        user_removed_chars: 0,
-        model_added_lines: 0,
-        model_removed_lines: 0,
-        model_added_chars: 0,
-        model_removed_chars: 0,
-      },
-    };
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        name="WriteFile"
-        status={CoreToolCallStatus.Success}
-        resultDisplay={diffResult as ToolResultDisplay}
-      />,
-      {},
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('WriteFile');
-    expect(output).toContain('config.json → Accepted (+1, -1)');
-    expect(output).toContain('+ new content');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('renders correctly for Rejected WriteFile tool', async () => {
-    const diffResult: FileDiff = {
-      fileDiff: '@@ -1,1 +1,1 @@\n-old content\n+new content',
-      fileName: 'config.json',
-      filePath: '/path/to/config.json',
-      originalContent: 'old content',
-      newContent: 'new content',
-    };
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        name="WriteFile"
-        status={CoreToolCallStatus.Cancelled}
-        resultDisplay={diffResult as ToolResultDisplay}
-      />,
-      {},
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('WriteFile');
-    expect(output).toContain('config.json');
-    expect(output).toContain('→ Rejected');
-    expect(output).toContain('- old content');
-    expect(output).toContain('+ new content');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('renders correctly for Errored Edit tool', async () => {
-    const diffResult: FileDiff = {
-      fileDiff: '@@ -1,1 +1,1 @@\n-old line\n+new line',
-      fileName: 'styles.scss',
-      filePath: '/path/to/styles.scss',
-      originalContent: 'old line',
-      newContent: 'new line',
-      diffStat: {
-        user_added_lines: 1,
-        user_removed_lines: 1,
-        user_added_chars: 0,
-        user_removed_chars: 0,
-        model_added_lines: 0,
-        model_removed_lines: 0,
-        model_added_chars: 0,
-        model_removed_chars: 0,
-      },
-    };
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        name="Edit"
-        status={CoreToolCallStatus.Error}
-        resultDisplay={diffResult as ToolResultDisplay}
-      />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('Edit');
-    expect(output).toContain('styles.scss → Failed (+1, -1)');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('renders correctly for grep results', async () => {
-    const grepResult: GrepResult = {
-      summary: 'Found 2 matches',
-      matches: [
-        {
-          filePath: 'file1.ts',
-          absolutePath: '/file1.ts',
-          lineNumber: 10,
-          line: 'match 1',
-        },
-        {
-          filePath: 'file2.ts',
-          absolutePath: '/file2.ts',
-          lineNumber: 20,
-          line: 'match 2',
-        },
-      ],
-    };
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        resultDisplay={grepResult as unknown as ToolResultDisplay}
-      />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('→ Found 2 matches');
-    // Matches are rendered in a secondary list for high-signal summaries
-    expect(output).toContain('file1.ts:10: match 1');
-    expect(output).toContain('file2.ts:20: match 2');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('renders correctly for ls results', async () => {
-    const lsResult: ListDirectoryResult = {
-      summary: 'Listed 2 files. (1 ignored)',
-      files: ['file1.ts', 'dir1'],
-    };
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        resultDisplay={lsResult as unknown as ToolResultDisplay}
-      />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('→ Listed 2 files. (1 ignored)');
-    // Directory listings should not have a payload in dense mode
-    expect(output).not.toContain('file1.ts');
-    expect(output).not.toContain('dir1');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('renders correctly for ReadManyFiles results', async () => {
-    const rmfResult: ReadManyFilesResult = {
-      summary: 'Read 3 file(s)',
-      files: ['file1.ts', 'file2.ts', 'file3.ts'],
-      include: ['**/*.ts'],
-      skipped: [{ path: 'skipped.bin', reason: 'binary' }],
-    };
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        resultDisplay={rmfResult as unknown as ToolResultDisplay}
-      />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('Attempting to read files from **/*.ts');
-    expect(output).toContain('→ Read 3 file(s) (1 ignored)');
-    expect(output).toContain('file1.ts');
-    expect(output).toContain('file2.ts');
-    expect(output).toContain('file3.ts');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('renders correctly for todo updates', async () => {
-    const todoResult = {
-      todos: [],
-    };
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        resultDisplay={todoResult as ToolResultDisplay}
-      />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('→ Todos updated');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('renders generic output message for unknown object results', async () => {
-    const genericResult = {
-      some: 'data',
-    } as unknown as ToolResultDisplay;
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage {...defaultProps} resultDisplay={genericResult} />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('→ Returned (possible empty result)');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('renders correctly for error status with string message', async () => {
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        status={CoreToolCallStatus.Error}
-        resultDisplay={'Error occurred' as ToolResultDisplay}
-      />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('→ Error occurred');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('renders generic failure message for error status without string message', async () => {
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        status={CoreToolCallStatus.Error}
-        resultDisplay={undefined}
-      />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('→ Failed');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('does not render result arrow if resultDisplay is missing', async () => {
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        status={CoreToolCallStatus.Scheduled}
-        resultDisplay={undefined}
-      />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).not.toContain('→');
-    expect(output).toMatchSnapshot();
-  });
-
-  describe('Toggleable Diff View (Alternate Buffer)', () => {
-    const diffResult: FileDiff = {
-      fileDiff: '@@ -1,1 +1,1 @@\n-old line\n+new line',
-      fileName: 'test.ts',
-      filePath: '/path/to/test.ts',
-      originalContent: 'old content',
-      newContent: 'new content',
-    };
-
-    it('hides diff content by default when in alternate buffer mode', async () => {
-      const { lastFrame, waitUntilReady } = await renderWithProviders(
-        <DenseToolMessage
-          {...defaultProps}
-          resultDisplay={diffResult as ToolResultDisplay}
-          status={CoreToolCallStatus.Success}
-        />,
-        {
-          config: makeFakeConfig({ useAlternateBuffer: true }),
-          settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
-        },
-      );
-      await waitUntilReady();
-      const output = lastFrame();
-      expect(output).toContain('Accepted');
-      expect(output).not.toContain('new line');
-      expect(output).toMatchSnapshot();
-    });
-
-    it('shows diff content by default when NOT in alternate buffer mode', async () => {
-      const { lastFrame, waitUntilReady } = await renderWithProviders(
-        <DenseToolMessage
-          {...defaultProps}
-          resultDisplay={diffResult as ToolResultDisplay}
-          status={CoreToolCallStatus.Success}
-        />,
-        {
-          config: makeFakeConfig({ useAlternateBuffer: false }),
-          settings: createMockSettings({ ui: { useAlternateBuffer: false } }),
-        },
-      );
-      await waitUntilReady();
-      const output = lastFrame();
-      expect(output).toContain('Accepted');
-      expect(output).toContain('new line');
-      expect(output).toMatchSnapshot();
-    });
-
-    it('shows diff content when expanded via ToolActionsContext', async () => {
-      const { lastFrame, waitUntilReady } = await renderWithProviders(
-        <DenseToolMessage
-          {...defaultProps}
-          resultDisplay={diffResult as ToolResultDisplay}
-          status={CoreToolCallStatus.Success}
-        />,
-        {
-          config: makeFakeConfig({ useAlternateBuffer: true }),
-          settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
-          toolActions: {
-            isExpanded: () => true,
-          },
-        },
-      );
-      await waitUntilReady();
-
-      // Verify it shows the diff when expanded
-      expect(lastFrame()).toContain('new line');
-    });
-  });
-
-  describe('Visual Regression', () => {
-    it('matches SVG snapshot for an Accepted file edit with diff stats', async () => {
-      const diffResult: FileDiff = {
-        fileName: 'test.ts',
-        filePath: '/mock/test.ts',
-        fileDiff: '--- a/test.ts\n+++ b/test.ts\n@@ -1 +1 @@\n-old\n+new',
-        originalContent: 'old',
-        newContent: 'new',
-        diffStat: {
-          model_added_lines: 1,
-          model_removed_lines: 1,
-          model_added_chars: 3,
-          model_removed_chars: 3,
-          user_added_lines: 0,
-          user_removed_lines: 0,
-          user_added_chars: 0,
-          user_removed_chars: 0,
-        },
-      };
-
-      const renderResult = await renderWithProviders(
-        <DenseToolMessage
-          {...defaultProps}
-          name="edit"
-          description="Editing test.ts"
-          resultDisplay={diffResult as ToolResultDisplay}
-          status={CoreToolCallStatus.Success}
-        />,
-      );
-
-      await renderResult.waitUntilReady();
-      await expect(renderResult).toMatchSvgSnapshot();
-    });
-
-    it('matches SVG snapshot for a Rejected tool call', async () => {
-      const renderResult = await renderWithProviders(
-        <DenseToolMessage
-          {...defaultProps}
-          name="read_file"
-          description="Reading important.txt"
-          resultDisplay="Rejected by user"
-          status={CoreToolCallStatus.Cancelled}
-        />,
-      );
-
-      await renderResult.waitUntilReady();
-      await expect(renderResult).toMatchSvgSnapshot();
-    });
-  });
-});

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

@@ -1,563 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import type React from 'react';
-import { useMemo, useState, useRef } from 'react';
-import { Box, Text, type DOMElement } from 'ink';
-import {
-  CoreToolCallStatus,
-  type FileDiff,
-  type ListDirectoryResult,
-  type ReadManyFilesResult,
-  isFileDiff,
-  hasSummary,
-  isGrepResult,
-  isListResult,
-  isReadManyFilesResult,
-} from '@google/gemini-cli-core';
-import {
-  type IndividualToolCallDisplay,
-  type ToolResultDisplay,
-  isTodoList,
-} from '../../types.js';
-import { useAlternateBuffer } from '../../hooks/useAlternateBuffer.js';
-import { ToolStatusIndicator } from './ToolShared.js';
-import { theme } from '../../semantic-colors.js';
-import {
-  DiffRenderer,
-  renderDiffLines,
-  isNewFile,
-  parseDiffWithLineNumbers,
-} from './DiffRenderer.js';
-import { useMouseClick } from '../../hooks/useMouseClick.js';
-import { ScrollableList } from '../shared/ScrollableList.js';
-import { COMPACT_TOOL_SUBVIEW_MAX_LINES } from '../../constants.js';
-import { useSettings } from '../../contexts/SettingsContext.js';
-import { colorizeCode } from '../../utils/CodeColorizer.js';
-import { useToolActions } from '../../contexts/ToolActionsContext.js';
-import { getFileExtension } from '../../utils/fileUtils.js';
-
-const PAYLOAD_MARGIN_LEFT = 6;
-const PAYLOAD_BORDER_CHROME_WIDTH = 4; // paddingX=1 (2 cols) + borders (2 cols)
-const PAYLOAD_SCROLL_GUTTER = 4;
-const PAYLOAD_MAX_WIDTH = 120 + PAYLOAD_SCROLL_GUTTER;
-
-interface DenseToolMessageProps extends IndividualToolCallDisplay {
-  terminalWidth: number;
-  availableTerminalHeight?: number;
-}
-
-interface ViewParts {
-  // brief description of action
-  description?: React.ReactNode;
-  // result summary or status text
-  summary?: React.ReactNode;
-  // detailed output, e.g. diff or command output
-  payload?: React.ReactNode;
-}
-
-interface PayloadResult {
-  summary: string;
-  payload: string;
-}
-
-const hasPayload = (res: unknown): res is PayloadResult => {
-  if (!hasSummary(res)) return false;
-  if (!('payload' in res)) return false;
-
-  const value = (res as { payload?: unknown }).payload;
-  return typeof value === 'string';
-};
-
-const RenderItemsList: React.FC<{
-  items?: string[];
-  maxVisible?: number;
-}> = ({ items, maxVisible = 20 }) => {
-  if (!items || items.length === 0) return null;
-  return (
-    <Box flexDirection="column">
-      {items.slice(0, maxVisible).map((item, i) => (
-        <Text key={i} color={theme.text.secondary}>
-          {item}
-        </Text>
-      ))}
-      {items.length > maxVisible && (
-        <Text color={theme.text.secondary}>
-          ... and {items.length - maxVisible} more
-        </Text>
-      )}
-    </Box>
-  );
-};
-
-function getFileOpData(
-  diff: FileDiff,
-  status: CoreToolCallStatus,
-  resultDisplay: ToolResultDisplay | undefined,
-  terminalWidth: number,
-  availableTerminalHeight: number | undefined,
-  isClickable: boolean,
-): ViewParts {
-  const added =
-    (diff.diffStat?.model_added_lines ?? 0) +
-    (diff.diffStat?.user_added_lines ?? 0);
-  const removed =
-    (diff.diffStat?.model_removed_lines ?? 0) +
-    (diff.diffStat?.user_removed_lines ?? 0);
-
-  const isAcceptedOrConfirming =
-    status === CoreToolCallStatus.Success ||
-    status === CoreToolCallStatus.Executing ||
-    status === CoreToolCallStatus.AwaitingApproval;
-
-  const addColor = isAcceptedOrConfirming
-    ? theme.status.success
-    : theme.text.secondary;
-  const removeColor = isAcceptedOrConfirming
-    ? theme.status.error
-    : theme.text.secondary;
-
-  // Always show diff stats if available, using neutral colors for rejected
-  const showDiffStat = !!diff.diffStat;
-
-  const description = (
-    <Box flexDirection="row">
-      <Text color={theme.text.secondary} wrap="truncate-end">
-        {diff.fileName}
-      </Text>
-    </Box>
-  );
-  let resultSummary = '';
-  let resultColor = theme.text.secondary;
-
-  if (status === CoreToolCallStatus.AwaitingApproval) {
-    resultSummary = 'Confirming';
-  } else if (
-    status === CoreToolCallStatus.Success ||
-    status === CoreToolCallStatus.Executing
-  ) {
-    resultSummary = 'Accepted';
-    resultColor = theme.text.accent;
-  } else if (status === CoreToolCallStatus.Cancelled) {
-    resultSummary = 'Rejected';
-    resultColor = theme.status.error;
-  } else if (status === CoreToolCallStatus.Error) {
-    resultSummary =
-      typeof resultDisplay === 'string' ? resultDisplay : 'Failed';
-    resultColor = theme.status.error;
-  }
-
-  const summary = (
-    <Box flexDirection="row">
-      {resultSummary && (
-        <Text color={resultColor} wrap="truncate-end">
-          →{' '}
-          <Text underline={isClickable}>
-            {resultSummary.replace(/\n/g, ' ')}
-          </Text>
-        </Text>
-      )}
-      {showDiffStat && (
-        <Box marginLeft={1} marginRight={2}>
-          <Text color={theme.text.secondary}>
-            {'('}
-            <Text color={addColor}>+{added}</Text>
-            {', '}
-            <Text color={removeColor}>-{removed}</Text>
-            {')'}
-          </Text>
-        </Box>
-      )}
-    </Box>
-  );
-
-  const payload = (
-    <DiffRenderer
-      diffContent={diff.fileDiff}
-      filename={diff.fileName}
-      terminalWidth={terminalWidth - PAYLOAD_MARGIN_LEFT}
-      availableTerminalHeight={availableTerminalHeight}
-      disableColor={status === CoreToolCallStatus.Cancelled}
-    />
-  );
-
-  return { description, summary, payload };
-}
-
-function getReadManyFilesData(result: ReadManyFilesResult): ViewParts {
-  const items = result.files ?? [];
-  const maxVisible = 10;
-  const includePatterns = result.include?.join(', ') ?? '';
-  const description = (
-    <Text color={theme.text.secondary} wrap="truncate-end">
-      Attempting to read files from {includePatterns}
-    </Text>
-  );
-
-  const skippedCount = result.skipped?.length ?? 0;
-  const summaryStr = `Read ${items.length} file(s)${
-    skippedCount > 0 ? ` (${skippedCount} ignored)` : ''
-  }`;
-  const summary = <Text color={theme.text.accent}>→ {summaryStr}</Text>;
-  const hasItems = items.length > 0;
-  const payload = hasItems ? (
-    <Box flexDirection="column" marginLeft={2}>
-      {hasItems && <RenderItemsList items={items} maxVisible={maxVisible} />}
-    </Box>
-  ) : undefined;
-
-  return { description, summary, payload };
-}
-
-function getListDirectoryData(
-  result: ListDirectoryResult,
-  originalDescription?: string,
-): ViewParts {
-  const description = originalDescription ? (
-    <Text color={theme.text.secondary} wrap="truncate-end">
-      {originalDescription}
-    </Text>
-  ) : undefined;
-  const summary = <Text color={theme.text.accent}>→ {result.summary}</Text>;
-
-  // For directory listings, we want NO payload in dense mode
-  return { description, summary, payload: undefined };
-}
-
-function getListResultData(
-  result: ListDirectoryResult | ReadManyFilesResult,
-  originalDescription?: string,
-): ViewParts {
-  if (isReadManyFilesResult(result)) {
-    return getReadManyFilesData(result);
-  }
-  return getListDirectoryData(result, originalDescription);
-}
-
-function getGenericSuccessData(
-  resultDisplay: unknown,
-  originalDescription?: string,
-): ViewParts {
-  let summary: React.ReactNode;
-  let payload: React.ReactNode;
-
-  const description = originalDescription ? (
-    <Text color={theme.text.secondary} wrap="truncate-end">
-      {originalDescription}
-    </Text>
-  ) : undefined;
-
-  if (typeof resultDisplay === 'string') {
-    const flattened = resultDisplay.replace(/\n/g, ' ').trim();
-    summary = (
-      <Text color={theme.text.accent} wrap="truncate-end">
-        → {flattened}
-      </Text>
-    );
-  } else if (isGrepResult(resultDisplay)) {
-    summary = <Text color={theme.text.accent}>→ {resultDisplay.summary}</Text>;
-    const matches = resultDisplay.matches;
-    if (matches.length > 0) {
-      payload = (
-        <Box flexDirection="column" marginLeft={2}>
-          <RenderItemsList
-            items={matches.map(
-              (m) => `${m.filePath}:${m.lineNumber}: ${m.line.trim()}`,
-            )}
-            maxVisible={10}
-          />
-        </Box>
-      );
-    }
-  } else if (isTodoList(resultDisplay)) {
-    summary = (
-      <Text color={theme.text.accent} wrap="wrap">
-        → Todos updated
-      </Text>
-    );
-  } else if (hasPayload(resultDisplay)) {
-    summary = <Text color={theme.text.accent}>→ {resultDisplay.summary}</Text>;
-    payload = (
-      <Box marginLeft={2}>
-        <Text color={theme.text.secondary}>{resultDisplay.payload}</Text>
-      </Box>
-    );
-  } else {
-    summary = (
-      <Text color={theme.text.accent} wrap="wrap">
-        → Returned (possible empty result)
-      </Text>
-    );
-  }
-
-  return { description, summary, payload };
-}
-
-export const DenseToolMessage: React.FC<DenseToolMessageProps> = (props) => {
-  const {
-    callId,
-    name,
-    status,
-    resultDisplay,
-    confirmationDetails,
-    outputFile,
-    terminalWidth,
-    availableTerminalHeight,
-    description: originalDescription,
-  } = props;
-
-  const settings = useSettings();
-  const isAlternateBuffer = useAlternateBuffer();
-  const { isExpanded: isExpandedInContext, toggleExpansion } = useToolActions();
-
-  // Handle optional context members
-  const [localIsExpanded, setLocalIsExpanded] = useState(false);
-  const isExpanded = isExpandedInContext
-    ? isExpandedInContext(callId)
-    : localIsExpanded;
-
-  const [isFocused, setIsFocused] = useState(false);
-  const toggleRef = useRef<DOMElement>(null);
-
-  // Unified File Data Extraction (Safely bridge resultDisplay and confirmationDetails)
-  const diff = useMemo((): FileDiff | undefined => {
-    if (isFileDiff(resultDisplay)) return resultDisplay;
-    if (confirmationDetails?.type === 'edit') {
-      const details = confirmationDetails;
-      return {
-        fileName: details.fileName,
-        fileDiff: details.fileDiff,
-        filePath: details.filePath,
-        originalContent: details.originalContent,
-        newContent: details.newContent,
-        diffStat: details.diffStat,
-      };
-    }
-    return undefined;
-  }, [resultDisplay, confirmationDetails]);
-
-  const handleToggle = () => {
-    const next = !isExpanded;
-    if (!next) {
-      setIsFocused(false);
-    } else {
-      setIsFocused(true);
-    }
-
-    if (toggleExpansion) {
-      toggleExpansion(callId);
-    } else {
-      setLocalIsExpanded(next);
-    }
-  };
-
-  useMouseClick(toggleRef, handleToggle, {
-    isActive: isAlternateBuffer && !!diff,
-  });
-
-  // State-to-View Coordination
-  const viewParts = useMemo((): ViewParts => {
-    if (diff) {
-      return getFileOpData(
-        diff,
-        status,
-        resultDisplay,
-        terminalWidth,
-        availableTerminalHeight,
-        isAlternateBuffer,
-      );
-    }
-    if (isListResult(resultDisplay)) {
-      return getListResultData(resultDisplay, originalDescription);
-    }
-
-    if (isGrepResult(resultDisplay)) {
-      return getGenericSuccessData(resultDisplay, originalDescription);
-    }
-
-    if (status === CoreToolCallStatus.Success && resultDisplay) {
-      return getGenericSuccessData(resultDisplay, originalDescription);
-    }
-    if (status === CoreToolCallStatus.Error) {
-      const text =
-        typeof resultDisplay === 'string'
-          ? resultDisplay.replace(/\n/g, ' ')
-          : 'Failed';
-      const errorSummary = (
-        <Text color={theme.status.error} wrap="truncate-end">
-          → {text}
-        </Text>
-      );
-      const descriptionText = originalDescription ? (
-        <Text color={theme.text.secondary} wrap="truncate-end">
-          {originalDescription}
-        </Text>
-      ) : undefined;
-      return {
-        description: descriptionText,
-        summary: errorSummary,
-        payload: undefined,
-      };
-    }
-
-    const descriptionText = originalDescription ? (
-      <Text color={theme.text.secondary} wrap="truncate-end">
-        {originalDescription}
-      </Text>
-    ) : undefined;
-    return {
-      description: descriptionText,
-      summary: undefined,
-      payload: undefined,
-    };
-  }, [
-    diff,
-    status,
-    resultDisplay,
-    terminalWidth,
-    availableTerminalHeight,
-    originalDescription,
-    isAlternateBuffer,
-  ]);
-
-  const { description, summary } = viewParts;
-
-  const diffLines = useMemo(() => {
-    if (!diff || !isExpanded || !isAlternateBuffer) return [];
-
-    const parsedLines = parseDiffWithLineNumbers(diff.fileDiff);
-    const isNewFileResult = isNewFile(parsedLines);
-
-    if (isNewFileResult) {
-      const addedContent = parsedLines
-        .filter((line) => line.type === 'add')
-        .map((line) => line.content)
-        .join('\n');
-
-      const fileExtension = getFileExtension(diff.fileName);
-
-      return colorizeCode({
-        code: addedContent,
-        language: fileExtension,
-        maxWidth: terminalWidth - PAYLOAD_MARGIN_LEFT,
-        settings,
-        disableColor: status === CoreToolCallStatus.Cancelled,
-        returnLines: true,
-      });
-    } else {
-      return renderDiffLines({
-        parsedLines,
-        filename: diff.fileName,
-        terminalWidth: terminalWidth - PAYLOAD_MARGIN_LEFT,
-        disableColor: status === CoreToolCallStatus.Cancelled,
-      });
-    }
-  }, [diff, isExpanded, isAlternateBuffer, terminalWidth, settings, status]);
-
-  const showPayload = useMemo(() => {
-    const policy = !isAlternateBuffer || !diff || isExpanded;
-    if (!policy) return false;
-
-    if (diff) {
-      if (isAlternateBuffer) {
-        return isExpanded && diffLines.length > 0;
-      }
-      // In non-alternate buffer mode, we always show the diff.
-      return true;
-    }
-
-    return !!(viewParts.payload || outputFile);
-  }, [
-    isAlternateBuffer,
-    diff,
-    isExpanded,
-    diffLines.length,
-    viewParts.payload,
-    outputFile,
-  ]);
-
-  const keyExtractor = (_item: React.ReactNode, index: number) =>
-    `diff-line-${index}`;
-  const renderItem = ({ item }: { item: React.ReactNode }) => (
-    <Box minHeight={1}>{item}</Box>
-  );
-
-  return (
-    <Box flexDirection="column">
-      <Box marginLeft={2} flexDirection="row" flexWrap="wrap">
-        <ToolStatusIndicator status={status} name={name} />
-        <Box maxWidth={25} flexShrink={1} flexGrow={0}>
-          <Text color={theme.text.primary} bold wrap="truncate-end">
-            {name}{' '}
-          </Text>
-        </Box>
-        <Box marginLeft={1} flexShrink={1} flexGrow={0}>
-          {description}
-        </Box>
-        {summary && (
-          <Box
-            key="tool-summary"
-            ref={isAlternateBuffer && diff ? toggleRef : undefined}
-            marginLeft={1}
-            flexGrow={0}
-          >
-            {summary}
-          </Box>
-        )}
-      </Box>
-
-      {showPayload && isAlternateBuffer && diffLines.length > 0 && (
-        <Box
-          marginLeft={PAYLOAD_MARGIN_LEFT}
-          marginTop={1}
-          marginBottom={1}
-          paddingX={1}
-          flexDirection="column"
-          height={
-            Math.min(diffLines.length, COMPACT_TOOL_SUBVIEW_MAX_LINES) + 2
-          }
-          maxHeight={COMPACT_TOOL_SUBVIEW_MAX_LINES + 2}
-          borderStyle="round"
-          borderColor={theme.border.default}
-          borderDimColor={true}
-          maxWidth={Math.min(
-            PAYLOAD_MAX_WIDTH,
-            terminalWidth - PAYLOAD_MARGIN_LEFT,
-          )}
-        >
-          <ScrollableList
-            data={diffLines}
-            renderItem={renderItem}
-            keyExtractor={keyExtractor}
-            estimatedItemHeight={() => 1}
-            hasFocus={isFocused}
-            width={Math.min(
-              PAYLOAD_MAX_WIDTH,
-              terminalWidth -
-                PAYLOAD_MARGIN_LEFT -
-                PAYLOAD_BORDER_CHROME_WIDTH -
-                PAYLOAD_SCROLL_GUTTER,
-            )}
-          />
-        </Box>
-      )}
-
-      {showPayload && (!isAlternateBuffer || !diff) && viewParts.payload && (
-        <Box marginLeft={PAYLOAD_MARGIN_LEFT} marginTop={1} marginBottom={1}>
-          {viewParts.payload}
-        </Box>
-      )}
-
-      {showPayload && outputFile && (
-        <Box marginLeft={PAYLOAD_MARGIN_LEFT} marginTop={1} marginBottom={1}>
-          <Text color={theme.text.secondary}>
-            (Output saved to: {outputFile})
-          </Text>
-        </Box>
-      )}
-    </Box>
-  );
-};

packages/cli/src/ui/components/messages/DiffRenderer.test.tsx

@@ -55,7 +55,6 @@ index 0000000..e69de29
             maxWidth: 80,
             theme: undefined,
             settings: expect.anything(),
-            disableColor: false,
           }),
         );
       });
@@ -90,7 +89,6 @@ index 0000000..e69de29
             maxWidth: 80,
             theme: undefined,
             settings: expect.anything(),
-            disableColor: false,
           }),
         );
       });
@@ -121,7 +119,6 @@ index 0000000..e69de29
             maxWidth: 80,
             theme: undefined,
             settings: expect.anything(),
-            disableColor: false,
           }),
         );
       });