refactor(cli): simplify command completion orchestration and fix shell cache race

- Simplified `useCommandCompletion.tsx` by moving shell-specific tokenization into `useShellCompletion.ts`.
- Reverted most changes to the `useCommandCompletion` `useMemo` block to keep it clean and consistent with other modes.
- Fixed a potential race condition in `useShellCompletion.ts` where `scanPathExecutables` could be called multiple times if it was slow. It now caches the Promise itself.
- Updated tests to match the refined hook interfaces.

.github/actions/push-sandbox/action.yml

@@ -77,14 +77,6 @@ runs:
           --image google/gemini-cli-sandbox:${{ steps.image_tag.outputs.FINAL_TAG }} \
           --output-file final_image_uri.txt
         echo "uri=$(cat final_image_uri.txt)" >> $GITHUB_OUTPUT
-    - name: 'verify'
-      shell: 'bash'
-      run: |-
-        docker run --rm --entrypoint sh "${{ steps.docker_build.outputs.uri }}" -lc '
-          set -e
-          node -e "const fs=require(\"node:fs\"); JSON.parse(fs.readFileSync(\"/usr/local/share/npm-global/lib/node_modules/@google/gemini-cli/package.json\",\"utf8\")); JSON.parse(fs.readFileSync(\"/usr/local/share/npm-global/lib/node_modules/@google/gemini-cli-core/package.json\",\"utf8\"));"
-          /usr/local/share/npm-global/bin/gemini --version >/dev/null
-        '
     - name: 'publish'
       shell: 'bash'
       if: "${{ inputs.dry-run != 'true' }}"

.github/scripts/pr-triage.sh

@@ -22,7 +22,7 @@ get_issue_labels() {
     # Check cache
     case "${ISSUE_LABELS_CACHE_FLAT}" in
         *"|${ISSUE_NUM}:"*) 
-            local suffix="${ISSUE_LABELS_CACHE_FLAT#*|"${ISSUE_NUM}":}"
+            local suffix="${ISSUE_LABELS_CACHE_FLAT#*|${ISSUE_NUM}:}"
             echo "${suffix%%|*}"
             return
             ;; 

.github/workflows/chained_e2e.yml

@@ -224,6 +224,8 @@ jobs:
     if: |
       always() && (needs.merge_queue_skipper.result !='success' || needs.merge_queue_skipper.outputs.skip != 'true')
     runs-on: 'gemini-cli-windows-16-core'
+    continue-on-error: true
+
     steps:
       - name: 'Checkout'
         uses: 'actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955' # ratchet:actions/checkout@v5
@@ -313,7 +315,6 @@ jobs:
     needs:
       - 'e2e_linux'
       - 'e2e_mac'
-      - 'e2e_windows'
       - 'evals'
       - 'merge_queue_skipper'
     runs-on: 'gemini-cli-ubuntu-16-core'
@@ -322,7 +323,6 @@ jobs:
         run: |
           if [[ ${{ needs.e2e_linux.result }} != 'success' || \
                ${{ needs.e2e_mac.result }} != 'success' || \
-               ${{ needs.e2e_windows.result }} != 'success' || \
                ${{ needs.evals.result }} != 'success' ]]; then
             echo "One or more E2E jobs failed."
             exit 1

.github/workflows/ci.yml

@@ -360,6 +360,7 @@ jobs:
     runs-on: 'gemini-cli-windows-16-core'
     needs: 'merge_queue_skipper'
     if: "${{needs.merge_queue_skipper.outputs.skip == 'false'}}"
+    continue-on-error: true
     timeout-minutes: 60
     strategy:
       matrix:
@@ -457,7 +458,6 @@ jobs:
       - 'link_checker'
       - 'test_linux'
       - 'test_mac'
-      - 'test_windows'
       - 'codeql'
       - 'bundle_size'
     runs-on: 'gemini-cli-ubuntu-16-core'
@@ -468,7 +468,6 @@ jobs:
                (${{ needs.link_checker.result }} != 'success' && ${{ needs.link_checker.result }} != 'skipped') || \
                (${{ needs.test_linux.result }} != 'success' && ${{ needs.test_linux.result }} != 'skipped') || \
                (${{ needs.test_mac.result }} != 'success' && ${{ needs.test_mac.result }} != 'skipped') || \
-               (${{ needs.test_windows.result }} != 'success' && ${{ needs.test_windows.result }} != 'skipped') || \
                (${{ needs.codeql.result }} != 'success' && ${{ needs.codeql.result }} != 'skipped') || \
                (${{ needs.bundle_size.result }} != 'success' && ${{ needs.bundle_size.result }} != 'skipped') ]]; then
             echo "One or more CI jobs failed."

.github/workflows/evals-nightly.yml

@@ -27,7 +27,6 @@ jobs:
       fail-fast: false
       matrix:
         model:
-          - 'gemini-3.1-pro-preview-customtools'
           - 'gemini-3-pro-preview'
           - 'gemini-3-flash-preview'
           - 'gemini-2.5-pro'

.github/workflows/pr-rate-limiter.yaml

@@ -1,29 +0,0 @@
-# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
-
-name: 'PR rate limiter'
-
-permissions: {}
-
-on:
-  pull_request_target:
-    types:
-      - 'opened'
-      - 'reopened'
-
-jobs:
-  limit:
-    runs-on: 'gemini-cli-ubuntu-16-core'
-    permissions:
-      contents: 'read'
-      pull-requests: 'write'
-    steps:
-      - name: 'Limit open pull requests per user'
-        uses: 'Homebrew/actions/limit-pull-requests@9ceb7934560eb61d131dde205a6c2d77b2e1529d' # master
-        with:
-          except-author-associations: 'MEMBER,OWNER,COLLABORATOR'
-          comment-limit: 8
-          comment: >
-            You already have 7 pull requests open. Please work on getting
-            existing PRs merged before opening more.
-          close-limit: 8
-          close: true

CONTRIBUTING.md

@@ -372,7 +372,8 @@ specific debug settings.
 
 ### React DevTools
 
-To debug the CLI's React-based UI, you can use React DevTools.
+To debug the CLI's React-based UI, you can use React DevTools. Ink, the library
+used for the CLI's interface, is compatible with React DevTools version 4.x.
 
 1.  **Start the Gemini CLI in development mode:**
 
@@ -380,20 +381,20 @@ To debug the CLI's React-based UI, you can use React DevTools.
     DEV=true npm start
     ```
 
-2.  **Install and run React DevTools version 6 (which matches the CLI's
-    `react-devtools-core`):**
+2.  **Install and run React DevTools version 4.28.5 (or the latest compatible
+    4.x version):**
 
     You can either install it globally:
 
     ```bash
-    npm install -g react-devtools@6
+    npm install -g react-devtools@4.28.5
     react-devtools
     ```
 
     Or run it directly using npx:
 
     ```bash
-    npx react-devtools@6
+    npx react-devtools@4.28.5
     ```
 
     Your running CLI application should then connect to React DevTools.

Dockerfile

@@ -42,10 +42,7 @@ USER node
 # install gemini-cli and clean up
 COPY packages/cli/dist/google-gemini-cli-*.tgz /tmp/gemini-cli.tgz
 COPY packages/core/dist/google-gemini-cli-core-*.tgz /tmp/gemini-core.tgz
-RUN npm install -g /tmp/gemini-core.tgz \
-  && npm install -g /tmp/gemini-cli.tgz \
-  && node -e "const fs=require('node:fs'); JSON.parse(fs.readFileSync('/usr/local/share/npm-global/lib/node_modules/@google/gemini-cli/package.json','utf8')); JSON.parse(fs.readFileSync('/usr/local/share/npm-global/lib/node_modules/@google/gemini-cli-core/package.json','utf8'));" \
-  && gemini --version > /dev/null \
+RUN npm install -g /tmp/gemini-cli.tgz /tmp/gemini-core.tgz \
   && npm cache clean --force \
   && rm -f /tmp/gemini-{cli,core}.tgz
 

docs/changelogs/preview.md

@@ -1,6 +1,6 @@
-# Preview release: v0.30.0-preview.5
+# Preview release: v0.30.0-preview.3
 
-Released: February 24, 2026
+Released: February 19, 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).
@@ -25,10 +25,6 @@ npm install -g @google/gemini-cli@preview
 
 ## What's Changed
 
-- fix(patch): cherry-pick 2c1d6f8 to release/v0.30.0-preview.4-pr-19369 to patch
-  version v0.30.0-preview.4 and create version 0.30.0-preview.5 by
-  @gemini-cli-robot in
-  [#20086](https://github.com/google-gemini/gemini-cli/pull/20086)
 - fix(patch): cherry-pick 261788c to release/v0.30.0-preview.0-pr-19453 to patch
   version v0.30.0-preview.0 and create version 0.30.0-preview.1 by
   @gemini-cli-robot in
@@ -315,4 +311,4 @@ npm install -g @google/gemini-cli@preview
   [#19008](https://github.com/google-gemini/gemini-cli/pull/19008)
 
 **Full changelog**:
-https://github.com/google-gemini/gemini-cli/compare/v0.29.0-preview.5...v0.30.0-preview.5
+https://github.com/google-gemini/gemini-cli/compare/v0.29.0-preview.5...v0.30.0-preview.3

docs/cli/plan-mode.md

@@ -143,27 +143,13 @@ based on the task description.
 
 ### Customizing Policies
 
-Plan Mode's default tool restrictions are managed by the [policy engine] and
-defined in the built-in [`plan.toml`] file. The built-in policy (Tier 1)
-enforces the read-only state, but you can customize these rules by creating your
-own policies in your `~/.gemini/policies/` directory (Tier 2).
+Plan Mode is designed to be read-only by default to ensure safety during the
+research phase. However, you may occasionally need to allow specific tools to
+assist in your planning.
 
-#### Example: Automatically approve read-only MCP tools
-
-By default, read-only MCP tools require user confirmation in Plan Mode. You can
-use `toolAnnotations` and the `mcpName` wildcard to customize this behavior for
-your specific environment.
-
-`~/.gemini/policies/mcp-read-only.toml`
-
-```toml
-[[rule]]
-mcpName = "*"
-toolAnnotations = { readOnlyHint = true }
-decision = "allow"
-priority = 100
-modes = ["plan"]
-```
+Because user policies (Tier 2) have a higher base priority than built-in
+policies (Tier 1), you can override Plan Mode's default restrictions by creating
+a rule in your `~/.gemini/policies/` directory.
 
 #### Example: Allow git commands in Plan Mode
 
@@ -257,5 +243,3 @@ argsPattern = "\"file_path\":\"[^\"]+[\\\\/]+\\.gemini[\\\\/]+plans[\\\\/]+[\\w-
 [`exit_plan_mode`]: /docs/tools/planning.md#2-exit_plan_mode-exitplanmode
 [`ask_user`]: /docs/tools/ask-user.md
 [YOLO mode]: /docs/reference/configuration.md#command-line-arguments
-[`plan.toml`]:
-  https://github.com/google-gemini/gemini-cli/blob/main/packages/core/src/policy/policies/plan.toml

docs/cli/settings.md

@@ -29,7 +29,6 @@ they appear in the UI.
 | Enable Auto Update      | `general.enableAutoUpdate`         | Enable automatic updates.                                                                                                                                                      | `true`      |
 | Enable Notifications    | `general.enableNotifications`      | Enable run-event notifications for action-required prompts and session completion. Currently macOS only.                                                                       | `false`     |
 | Plan Directory          | `general.plan.directory`           | The directory where planning artifacts are stored. If not specified, defaults to the system temporary directory.                                                               | `undefined` |
-| Max Chat Model Attempts | `general.maxAttempts`              | Maximum number of attempts for requests to the main chat model. Cannot exceed 10.                                                                                              | `10`        |
 | Debug Keystroke Logging | `general.debugKeystrokeLogging`    | Enable debug logging of keystrokes to the console.                                                                                                                             | `false`     |
 | Enable Session Cleanup  | `general.sessionRetention.enabled` | Enable automatic session cleanup                                                                                                                                               | `false`     |
 | Keep chat history       | `general.sessionRetention.maxAge`  | Automatically delete chats older than this time period (e.g., "30d", "7d", "24h", "1w")                                                                                        | `undefined` |
@@ -112,15 +111,14 @@ they appear in the UI.
 
 ### Security
 
-| UI Label                              | Setting                                         | Description                                                                                                                                                                                                                          | Default |
-| ------------------------------------- | ----------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------- |
-| Disable YOLO Mode                     | `security.disableYoloMode`                      | Disable YOLO mode, even if enabled by a flag.                                                                                                                                                                                        | `false` |
-| Allow Permanent Tool Approval         | `security.enablePermanentToolApproval`          | Enable the "Allow for all future sessions" option in tool confirmation dialogs.                                                                                                                                                      | `false` |
-| Blocks extensions from Git            | `security.blockGitExtensions`                   | Blocks installing and loading extensions from Git.                                                                                                                                                                                   | `false` |
-| Extension Source Regex Allowlist      | `security.allowedExtensions`                    | List of Regex patterns for allowed extensions. If nonempty, only extensions that match the patterns in this list are allowed. Overrides the blockGitExtensions setting.                                                              | `[]`    |
-| Folder Trust                          | `security.folderTrust.enabled`                  | Setting to track whether Folder trust is enabled.                                                                                                                                                                                    | `true`  |
-| Enable Environment Variable Redaction | `security.environmentVariableRedaction.enabled` | Enable redaction of environment variables that may contain secrets.                                                                                                                                                                  | `false` |
-| Enable Context-Aware Security         | `security.enableConseca`                        | Enable the context-aware security checker. This feature uses an LLM to dynamically generate and enforce security policies for tool use based on your prompt, providing an additional layer of protection against unintended actions. | `false` |
+| UI Label                              | Setting                                         | Description                                                                                                                                                             | Default |
+| ------------------------------------- | ----------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| Disable YOLO Mode                     | `security.disableYoloMode`                      | Disable YOLO mode, even if enabled by a flag.                                                                                                                           | `false` |
+| Allow Permanent Tool Approval         | `security.enablePermanentToolApproval`          | Enable the "Allow for all future sessions" option in tool confirmation dialogs.                                                                                         | `false` |
+| Blocks extensions from Git            | `security.blockGitExtensions`                   | Blocks installing and loading extensions from Git.                                                                                                                      | `false` |
+| Extension Source Regex Allowlist      | `security.allowedExtensions`                    | List of Regex patterns for allowed extensions. If nonempty, only extensions that match the patterns in this list are allowed. Overrides the blockGitExtensions setting. | `[]`    |
+| Folder Trust                          | `security.folderTrust.enabled`                  | Setting to track whether Folder trust is enabled.                                                                                                                       | `true`  |
+| Enable Environment Variable Redaction | `security.environmentVariableRedaction.enabled` | Enable redaction of environment variables that may contain secrets.                                                                                                     | `false` |
 
 ### Advanced
 
@@ -137,7 +135,6 @@ they appear in the UI.
 | 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 planning features (Plan Mode and tools).                                                                                                           | `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` |
 
 ### Skills
 

docs/core/subagents.md

@@ -80,122 +80,6 @@ Gemini CLI comes with the following built-in subagents:
   invoked by the user.
 - **Configuration:** Enabled by default. No specific configuration options.
 
-### Browser Agent (experimental)
-
-- **Name:** `browser_agent`
-- **Purpose:** Automate web browser tasks — navigating websites, filling forms,
-  clicking buttons, and extracting information from web pages — using the
-  accessibility tree.
-- **When to use:** "Go to example.com and fill out the contact form," "Extract
-  the pricing table from this page," "Click the login button and enter my
-  credentials."
-
-> **Note:** This is a preview feature currently under active development.
-
-#### Prerequisites
-
-The browser agent requires:
-
-- **Chrome** version 144 or later (any recent stable release will work).
-- **Node.js** with `npx` available (used to launch the
-  [`chrome-devtools-mcp`](https://www.npmjs.com/package/chrome-devtools-mcp)
-  server).
-
-#### Enabling the browser agent
-
-The browser agent is disabled by default. Enable it in your `settings.json`:
-
-```json
-{
-  "agents": {
-    "overrides": {
-      "browser_agent": {
-        "enabled": true
-      }
-    }
-  }
-}
-```
-
-#### Session modes
-
-The `sessionMode` setting controls how Chrome is launched and managed. Set it
-under `agents.browser`:
-
-```json
-{
-  "agents": {
-    "overrides": {
-      "browser_agent": {
-        "enabled": true
-      }
-    },
-    "browser": {
-      "sessionMode": "persistent"
-    }
-  }
-}
-```
-
-The available modes are:
-
-| Mode         | Description                                                                                                                                                                                 |
-| :----------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `persistent` | **(Default)** Launches Chrome with a persistent profile stored at `~/.gemini/cli-browser-profile/`. Cookies, history, and settings are preserved between sessions.                          |
-| `isolated`   | Launches Chrome with a temporary profile that is deleted after each session. Use this for clean-state automation.                                                                           |
-| `existing`   | Attaches to an already-running Chrome instance. You must enable remote debugging first by navigating to `chrome://inspect/#remote-debugging` in Chrome. No new browser process is launched. |
-
-#### Configuration reference
-
-All browser-specific settings go under `agents.browser` in your `settings.json`.
-
-| Setting       | Type      | Default        | Description                                                                                     |
-| :------------ | :-------- | :------------- | :---------------------------------------------------------------------------------------------- |
-| `sessionMode` | `string`  | `"persistent"` | How Chrome is managed: `"persistent"`, `"isolated"`, or `"existing"`.                           |
-| `headless`    | `boolean` | `false`        | Run Chrome in headless mode (no visible window).                                                |
-| `profilePath` | `string`  | —              | Custom path to a browser profile directory.                                                     |
-| `visualModel` | `string`  | —              | Model override for the visual agent (for example, `"gemini-2.5-computer-use-preview-10-2025"`). |
-
-#### Security
-
-The browser agent enforces the following security restrictions:
-
-- **Blocked URL patterns:** `file://`, `javascript:`, `data:text/html`,
-  `chrome://extensions`, and `chrome://settings/passwords` are always blocked.
-- **Sensitive action confirmation:** Actions like form filling, file uploads,
-  and form submissions require user confirmation through the standard policy
-  engine.
-
-#### Visual agent
-
-By default, the browser agent interacts with pages through the accessibility
-tree using element `uid` values. For tasks that require visual identification
-(for example, "click the yellow button" or "find the red error message"), you
-can enable the visual agent by setting a `visualModel`:
-
-```json
-{
-  "agents": {
-    "overrides": {
-      "browser_agent": {
-        "enabled": true
-      }
-    },
-    "browser": {
-      "visualModel": "gemini-2.5-computer-use-preview-10-2025"
-    }
-  }
-}
-```
-
-When enabled, the agent gains access to the `analyze_screenshot` tool, which
-captures a screenshot and sends it to the vision model for analysis. The model
-returns coordinates and element descriptions that the browser agent uses with
-the `click_at` tool for precise, coordinate-based interactions.
-
-> **Note:** The visual agent requires API key or Vertex AI authentication. It is
-> not available when using Google Login.
-
 ## Creating custom subagents
 
 You can create your own subagents to automate specific workflows or enforce

docs/extensions/reference.md

@@ -116,9 +116,7 @@ The manifest file defines the extension's behavior and configuration.
   "description": "My awesome extension",
   "mcpServers": {
     "my-server": {
-      "command": "node",
-      "args": ["${extensionPath}/my-server.js"],
-      "cwd": "${extensionPath}"
+      "command": "node my-server.js"
     }
   },
   "contextFileName": "GEMINI.md",
@@ -126,41 +124,19 @@ The manifest file defines the extension's behavior and configuration.
 }
 ```
 
-- `name`: The name of the extension. This is used to uniquely identify the
-  extension and for conflict resolution when extension commands have the same
-  name as user or project commands. The name should be lowercase or numbers and
-  use dashes instead of underscores or spaces. This is how users will refer to
-  your extension in the CLI. Note that we expect this name to match the
-  extension directory name.
-- `version`: The version of the extension.
-- `description`: A short description of the extension. This will be displayed on
-  [geminicli.com/extensions](https://geminicli.com/extensions).
-- `mcpServers`: A map of MCP servers to settings. The key is the name of the
-  server, and the value is the server configuration. These servers will be
-  loaded on startup just like MCP servers defined in a
-  [`settings.json` file](../reference/configuration.md). If both an extension
-  and a `settings.json` file define an MCP server with the same name, the server
-  defined in the `settings.json` file takes precedence.
-  - Note that all MCP server configuration options are supported except for
-    `trust`.
-  - For portability, you should use `${extensionPath}` to refer to files within
-    your extension directory.
-  - Separate your executable and its arguments using `command` and `args`
-    instead of putting them both in `command`.
-- `contextFileName`: The name of the file that contains the context for the
-  extension. This will be used to load the context from the extension directory.
-  If this property is not used but a `GEMINI.md` file is present in your
-  extension directory, then that file will be loaded.
-- `excludeTools`: An array of tool names to exclude from the model. You can also
-  specify command-specific restrictions for tools that support it, like the
-  `run_shell_command` tool. For example,
-  `"excludeTools": ["run_shell_command(rm -rf)"]` will block the `rm -rf`
-  command. Note that this differs from the MCP server `excludeTools`
-  functionality, which can be listed in the MCP server config.
-
-When Gemini CLI starts, it loads all the extensions and merges their
-configurations. If there are any conflicts, the workspace configuration takes
-precedence.
+- `name`: A unique identifier for the extension. Use lowercase letters, numbers,
+  and dashes. This name must match the extension's directory name.
+- `version`: The current version of the extension.
+- `description`: A short summary shown in the extension gallery.
+- <a id="mcp-servers"></a>`mcpServers`: A map of Model Context Protocol (MCP)
+  servers. Extension servers follow the same format as standard
+  [CLI configuration](../reference/configuration.md).
+- `contextFileName`: The name of the context file (defaults to `GEMINI.md`). Can
+  also be an array of strings to load multiple context files.
+- `excludeTools`: An array of tools to block from the model. You can restrict
+  specific arguments, such as `run_shell_command(rm -rf)`.
+- `themes`: An optional list of themes provided by the extension. See
+  [Themes](../cli/themes.md) for more information.
 
 ### Extension settings
 

docs/hooks/reference.md

@@ -98,8 +98,6 @@ and parameter rewriting.
   - `tool_name`: (`string`) The name of the tool being called.
   - `tool_input`: (`object`) The raw arguments generated by the model.
   - `mcp_context`: (`object`) Optional metadata for MCP-based tools.
-  - `original_request_name`: (`string`) The original name of the tool being
-    called, if this is a tail tool call.
 - **Relevant Output Fields**:
   - `decision`: Set to `"deny"` (or `"block"`) to prevent the tool from
     executing.
@@ -122,18 +120,12 @@ hiding sensitive output from the agent.
   - `tool_response`: (`object`) The result containing `llmContent`,
     `returnDisplay`, and optional `error`.
   - `mcp_context`: (`object`)
-  - `original_request_name`: (`string`) The original name of the tool being
-    called, if this is a tail tool call.
 - **Relevant Output Fields**:
   - `decision`: Set to `"deny"` to hide the real tool output from the agent.
   - `reason`: Required if denied. This text **replaces** the tool result sent
     back to the model.
   - `hookSpecificOutput.additionalContext`: Text that is **appended** to the
     tool result for the agent.
-  - `hookSpecificOutput.tailToolCallRequest`: (`{ name: string, args: object }`)
-    A request to execute another tool immediately after this one. The result of
-    this "tail call" will replace the original tool's response. Ideal for
-    programmatic tool routing.
   - `continue`: Set to `false` to **kill the entire agent loop** immediately.
 - **Exit Code 2 (Block Result)**: Hides the tool result. Uses `stderr` as the
   replacement content sent to the agent. **The turn continues.**

docs/ide-integration/index.md

@@ -170,20 +170,6 @@ messages and how to resolve them.
   - **Solution:** Run `/ide enable` to try and reconnect. If the issue
     continues, open a new terminal window or restart your IDE.
 
-### Manual PID override
-
-If automatic IDE detection fails, or if you are running Gemini CLI in a
-standalone terminal and want to manually associate it with a specific IDE
-instance, you can set the `GEMINI_CLI_IDE_PID` environment variable to the
-process ID (PID) of your IDE.
-
-```bash
-export GEMINI_CLI_IDE_PID=12345
-```
-
-When this variable is set, Gemini CLI will skip automatic detection and attempt
-to connect using the provided PID.
-
 ### Configuration errors
 
 - **Message:**

docs/reference/configuration.md

@@ -142,11 +142,6 @@ their corresponding top-level category object in your `settings.json` file.
     request" errors.
   - **Default:** `false`
 
-- **`general.maxAttempts`** (number):
-  - **Description:** Maximum number of attempts for requests to the main chat
-    model. Cannot exceed 10.
-  - **Default:** `10`
-
 - **`general.debugKeystrokeLogging`** (boolean):
   - **Description:** Enable debug logging of keystrokes to the console.
   - **Default:** `false`
@@ -646,27 +641,6 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `{}`
   - **Requires restart:** Yes
 
-- **`agents.browser.sessionMode`** (enum):
-  - **Description:** Session mode: 'persistent', 'isolated', or 'existing'.
-  - **Default:** `"persistent"`
-  - **Values:** `"persistent"`, `"isolated"`, `"existing"`
-  - **Requires restart:** Yes
-
-- **`agents.browser.headless`** (boolean):
-  - **Description:** Run browser in headless mode.
-  - **Default:** `false`
-  - **Requires restart:** Yes
-
-- **`agents.browser.profilePath`** (string):
-  - **Description:** Path to browser profile directory for session persistence.
-  - **Default:** `undefined`
-  - **Requires restart:** Yes
-
-- **`agents.browser.visualModel`** (string):
-  - **Description:** Model override for the visual agent.
-  - **Default:** `undefined`
-  - **Requires restart:** Yes
-
 #### `context`
 
 - **`context.fileName`** (string | string[]):
@@ -894,14 +868,6 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `undefined`
   - **Requires restart:** Yes
 
-- **`security.enableConseca`** (boolean):
-  - **Description:** Enable the context-aware security checker. This feature
-    uses an LLM to dynamically generate and enforce security policies for tool
-    use based on your prompt, providing an additional layer of protection
-    against unintended actions.
-  - **Default:** `false`
-  - **Requires restart:** Yes
-
 #### `advanced`
 
 - **`advanced.autoConfigureMemory`** (boolean):
@@ -1003,11 +969,6 @@ their corresponding top-level category object in your `settings.json` file.
     during tool execution.
   - **Default:** `false`
 
-- **`experimental.directWebFetch`** (boolean):
-  - **Description:** Enable web fetch behavior that bypasses LLM summarization.
-  - **Default:** `false`
-  - **Requires restart:** Yes
-
 #### `skills`
 
 - **`skills.enabled`** (boolean):
@@ -1295,11 +1256,6 @@ the `advanced.excludedEnvVars` setting in your `settings.json` file.
   - Specifies the default Gemini model to use.
   - Overrides the hardcoded default
   - Example: `export GEMINI_MODEL="gemini-3-flash-preview"`
-- **`GEMINI_CLI_IDE_PID`**:
-  - Manually specifies the PID of the IDE process to use for integration. This
-    is useful when running Gemini CLI in a standalone terminal while still
-    wanting to associate it with a specific IDE instance.
-  - Overrides the automatic IDE detection logic.
 - **`GEMINI_CLI_HOME`**:
   - Specifies the root directory for Gemini CLI's user-level configuration and
     storage.

docs/reference/policy-engine.md

@@ -64,11 +64,9 @@ primary conditions are the tool's name and its arguments.
 
 The `toolName` in the rule must match the name of the tool being called.
 
-- **Wildcards**: You can use wildcards to match multiple tools.
-  - `*`: Matches **any tool** (built-in or MCP).
-  - `server__*`: Matches any tool from a specific MCP server.
-  - `*__toolName`: Matches a specific tool name across **all** MCP servers.
-  - `*__*`: Matches **any tool from any MCP server**.
+- **Wildcards**: For Model-hosting-protocol (MCP) servers, you can use a
+  wildcard. A `toolName` of `my-server__*` will match any tool from the
+  `my-server` MCP.
 
 #### Arguments pattern
 
@@ -146,9 +144,9 @@ A rule matches a tool call if all of its conditions are met:
 
 1.  **Tool name**: The `toolName` in the rule must match the name of the tool
     being called.
-    - **Wildcards**: You can use wildcards like `*`, `server__*`, or
-      `*__toolName` to match multiple tools. See [Tool Name](#tool-name) for
-      details.
+    - **Wildcards**: For Model-hosting-protocol (MCP) servers, you can use a
+      wildcard. A `toolName` of `my-server__*` will match any tool from the
+      `my-server` MCP.
 2.  **Arguments pattern**: If `argsPattern` is specified, the tool's arguments
     are converted to a stable JSON string, which is then tested against the
     provided regular expression. If the arguments don't match the pattern, the
@@ -205,10 +203,6 @@ toolName = "run_shell_command"
 # to form a composite name like "mcpName__toolName".
 mcpName = "my-custom-server"
 
-# (Optional) Metadata hints provided by the tool. A rule matches if all
-# key-value pairs provided here are present in the tool's annotations.
-toolAnnotations = { readOnlyHint = true }
-
 # (Optional) A regex to match against the tool's arguments.
 argsPattern = '"command":"(git|npm)'
 
@@ -278,12 +272,13 @@ priority = 100
 
 ### Special syntax for MCP tools
 
-You can create rules that target tools from Model Context Protocol (MCP) servers
-using the `mcpName` field or composite wildcard patterns.
+You can create rules that target tools from Model-hosting-protocol (MCP) servers
+using the `mcpName` field or a wildcard pattern.
 
-**1. Targeting a specific tool on a server**
+**1. Using `mcpName`**
 
-Combine `mcpName` and `toolName` to target a single operation.
+To target a specific tool from a specific server, combine `mcpName` and
+`toolName`.
 
 ```toml
 # Allows the `search` tool on the `my-jira-server` MCP
@@ -294,10 +289,10 @@ decision = "allow"
 priority = 200
 ```
 
-**2. Targeting all tools on a specific server**
+**2. Using a wildcard**
 
-Specify only the `mcpName` to apply a rule to every tool provided by that
-server.
+To create a rule that applies to _all_ tools on a specific MCP server, specify
+only the `mcpName`.
 
 ```toml
 # Denies all tools from the `untrusted-server` MCP
@@ -308,33 +303,6 @@ priority = 500
 deny_message = "This server is not trusted by the admin."
 ```
 
-**3. Targeting all MCP servers**
-
-Use `mcpName = "*"` to create a rule that applies to **all** tools from **any**
-registered MCP server. This is useful for setting category-wide defaults.
-
-```toml
-# Ask user for any tool call from any MCP server
-[[rule]]
-mcpName = "*"
-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/tools/file-system.md

@@ -105,11 +105,10 @@ lines containing matches, along with their file paths and line numbers.
 
 ## 6. `replace` (Edit)
 
-`replace` replaces text within a file. By default, the tool expects to find and
-replace exactly ONE occurrence of `old_string`. If you want to replace multiple
-occurrences of the exact same string, set `allow_multiple` to `true`. This tool
-is designed for precise, targeted changes and requires significant context
-around the `old_string` to ensure it modifies the correct location.
+`replace` replaces text within a file. By default, replaces a single occurrence,
+but can replace multiple occurrences when `expected_replacements` is specified.
+This tool is designed for precise, targeted changes and requires significant
+context around the `old_string` to ensure it modifies the correct location.
 
 - **Tool name:** `replace`
 - **Arguments:**
@@ -117,8 +116,6 @@ around the `old_string` to ensure it modifies the correct location.
   - `instruction` (string, required): Semantic description of the change.
   - `old_string` (string, required): Exact literal text to find.
   - `new_string` (string, required): Exact literal text to replace with.
-  - `allow_multiple` (boolean, optional): If `true`, replaces all occurrences.
-    If `false` (default), only succeeds if exactly one occurrence is found.
 - **Confirmation:** Requires manual user approval.
 
 ## Next steps

docs/tools/index.md

@@ -52,9 +52,6 @@ These tools help the model manage its plan and interact with you.
   complex plans.
 - **[Agent Skills](../cli/skills.md) (`activate_skill`):** Loads specialized
   procedural expertise when needed.
-- **[Browser agent](../core/subagents.md#browser-agent-experimental)
-  (`browser_agent`):** Automates web browser tasks through the accessibility
-  tree.
 - **Internal docs (`get_internal_docs`):** Accesses Gemini CLI's own
   documentation to help answer your questions.
 

docs/tools/mcp-server.md

@@ -163,8 +163,7 @@ Each server configuration supports the following properties:
 - **`args`** (string[]): Command-line arguments for Stdio transport
 - **`headers`** (object): Custom HTTP headers when using `url` or `httpUrl`
 - **`env`** (object): Environment variables for the server process. Values can
-  reference environment variables using `$VAR_NAME` or `${VAR_NAME}` syntax (all
-  platforms), or `%VAR_NAME%` (Windows only).
+  reference environment variables using `$VAR_NAME` or `${VAR_NAME}` syntax
 - **`cwd`** (string): Working directory for Stdio transport
 - **`timeout`** (number): Request timeout in milliseconds (default: 600,000ms =
   10 minutes)
@@ -185,63 +184,6 @@ Each server configuration supports the following properties:
   Service Account to impersonate. Used with
   `authProviderType: 'service_account_impersonation'`.
 
-### Environment variable expansion
-
-Gemini CLI automatically expands environment variables in the `env` block of
-your MCP server configuration. This allows you to securely reference variables
-defined in your shell or environment without hardcoding sensitive information
-directly in your `settings.json` file.
-
-The expansion utility supports:
-
-- **POSIX/Bash syntax:** `$VARIABLE_NAME` or `${VARIABLE_NAME}` (supported on
-  all platforms)
-- **Windows syntax:** `%VARIABLE_NAME%` (supported only when running on Windows)
-
-If a variable is not defined in the current environment, it resolves to an empty
-string.
-
-**Example:**
-
-```json
-"env": {
-  "API_KEY": "$MY_EXTERNAL_TOKEN",
-  "LOG_LEVEL": "$LOG_LEVEL",
-  "TEMP_DIR": "%TEMP%"
-}
-```
-
-### Security and environment sanitization
-
-To protect your credentials, Gemini CLI performs environment sanitization when
-spawning MCP server processes.
-
-#### Automatic redaction
-
-By default, the CLI redacts sensitive environment variables from the base
-environment (inherited from the host process) to prevent unintended exposure to
-third-party MCP servers. This includes:
-
-- Core project keys: `GEMINI_API_KEY`, `GOOGLE_API_KEY`, etc.
-- Variables matching sensitive patterns: `*TOKEN*`, `*SECRET*`, `*PASSWORD*`,
-  `*KEY*`, `*AUTH*`, `*CREDENTIAL*`.
-- Certificates and private key patterns.
-
-#### Explicit overrides
-
-If an environment variable must be passed to an MCP server, you must explicitly
-state it in the `env` property of the server configuration in `settings.json`.
-Explicitly defined variables (including those from extensions) are trusted and
-are **not** subjected to the automatic redaction process.
-
-This follows the security principle that if a variable is explicitly configured
-by the user for a specific server, it constitutes informed consent to share that
-specific data with that server.
-
-> **Note:** Even when explicitly defined, you should avoid hardcoding secrets.
-> Instead, use environment variable expansion (e.g., `"MY_KEY": "$MY_KEY"`) to
-> securely pull the value from your host environment at runtime.
-
 ### OAuth support for remote MCP servers
 
 The Gemini CLI supports OAuth 2.0 authentication for remote MCP servers using
@@ -796,9 +738,7 @@ The MCP integration tracks several states:
 - **Trust settings:** The `trust` option bypasses all confirmation dialogs. Use
   cautiously and only for servers you completely control
 - **Access tokens:** Be security-aware when configuring environment variables
-  containing API keys or tokens. See
-  [Security and environment sanitization](#security-and-environment-sanitization)
-  for details on how Gemini CLI protects your credentials.
+  containing API keys or tokens
 - **Sandbox compatibility:** When using sandboxing, ensure MCP servers are
   available within the sandbox environment
 - **Private data:** Using broadly scoped personal access tokens can lead to

evals/frugalReads.eval.ts

@@ -78,23 +78,22 @@ describe('Frugal reads eval', () => {
       ).toBe(true);
 
       let totalLinesRead = 0;
-      const readRanges: { start_line: number; end_line: number }[] = [];
+      const readRanges: { offset: number; limit: number }[] = [];
 
       for (const call of targetFileReads) {
         const args = JSON.parse(call.toolRequest.args);
 
         expect(
-          args.end_line,
-          'Agent read the entire file (missing end_line) instead of using ranged read',
+          args.limit,
+          'Agent read the entire file (missing limit) instead of using ranged read',
         ).toBeDefined();
 
-        const end_line = args.end_line;
-        const start_line = args.start_line ?? 1;
-        const linesRead = end_line - start_line + 1;
-        totalLinesRead += linesRead;
-        readRanges.push({ start_line, end_line });
+        const limit = args.limit;
+        const offset = args.offset ?? 0;
+        totalLinesRead += limit;
+        readRanges.push({ offset, limit });
 
-        expect(linesRead, 'Agent read too many lines at once').toBeLessThan(
+        expect(args.limit, 'Agent read too many lines at once').toBeLessThan(
           1001,
         );
       }
@@ -109,7 +108,7 @@ describe('Frugal reads eval', () => {
       const errorLines = [500, 510, 520];
       for (const line of errorLines) {
         const covered = readRanges.some(
-          (range) => line >= range.start_line && line <= range.end_line,
+          (range) => line >= range.offset && line < range.offset + range.limit,
         );
         expect(covered, `Agent should have read around line ${line}`).toBe(
           true,
@@ -192,8 +191,8 @@ describe('Frugal reads eval', () => {
       for (const call of targetFileReads) {
         const args = JSON.parse(call.toolRequest.args);
         expect(
-          args.end_line,
-          'Agent should have used ranged read (end_line) to save tokens',
+          args.limit,
+          'Agent should have used ranged read (limit) to save tokens',
         ).toBeDefined();
       }
     },
@@ -254,7 +253,7 @@ describe('Frugal reads eval', () => {
       // and just read the whole file to be efficient with tool calls.
       const readEntireFile = targetFileReads.some((call) => {
         const args = JSON.parse(call.toolRequest.args);
-        return args.end_line === undefined;
+        return args.limit === undefined;
       });
 
       expect(

evals/frugalSearch.eval.ts

@@ -68,7 +68,7 @@ describe('Frugal Search', () => {
         const args = getParams(call);
         return (
           args.file_path === 'src/legacy_processor.ts' &&
-          (args.end_line === undefined || args.end_line === null)
+          (args.limit === undefined || args.limit === null)
         );
       });
 
@@ -87,7 +87,7 @@ describe('Frugal Search', () => {
         if (
           call.toolRequest.name === 'read_file' &&
           args.file_path === 'src/legacy_processor.ts' &&
-          args.end_line !== undefined
+          args.limit !== undefined
         ) {
           return true;
         }

evals/interactive-hang.eval.ts

@@ -56,7 +56,7 @@ describe('interactive_commands', () => {
       const scaffoldCall = logs.find(
         (l) =>
           l.toolRequest.name === 'run_shell_command' &&
-          /npm (init|create)|npx (.*)?create-|yarn create|pnpm create/.test(
+          /npm (init|create)|npx create-|yarn create|pnpm create/.test(
             l.toolRequest.args,
           ),
       );

integration-tests/hooks-system.tail-tool-call.responses

@@ -1,2 +0,0 @@
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"read_file","args":{"file_path":"original.txt"}}}],"role":"model"},"finishReason":"STOP","index":0}]}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"Tail call completed successfully."}],"role":"model"},"finishReason":"STOP","index":0}]}]}

integration-tests/hooks-system.test.ts

@@ -286,113 +286,6 @@ describe('Hooks System Integration', () => {
     });
   });
 
-  describe('Command Hooks - Tail Tool Calls', () => {
-    it('should execute a tail tool call from AfterTool hooks and replace original response', async () => {
-      // Create a script that acts as the hook.
-      // It will trigger on "read_file" and issue a tail call to "write_file".
-      rig.setup('should execute a tail tool call from AfterTool hooks', {
-        fakeResponsesPath: join(
-          import.meta.dirname,
-          'hooks-system.tail-tool-call.responses',
-        ),
-      });
-
-      const hookOutput = {
-        decision: 'allow',
-        hookSpecificOutput: {
-          hookEventName: 'AfterTool',
-          tailToolCallRequest: {
-            name: 'write_file',
-            args: {
-              file_path: 'tail-called-file.txt',
-              content: 'Content from tail call',
-            },
-          },
-        },
-      };
-
-      const hookScript = `console.log(JSON.stringify(${JSON.stringify(
-        hookOutput,
-      )})); process.exit(0);`;
-
-      const scriptPath = join(rig.testDir!, 'tail_call_hook.js');
-      writeFileSync(scriptPath, hookScript);
-      const commandPath = scriptPath.replace(/\\/g, '/');
-
-      rig.setup('should execute a tail tool call from AfterTool hooks', {
-        fakeResponsesPath: join(
-          import.meta.dirname,
-          'hooks-system.tail-tool-call.responses',
-        ),
-        settings: {
-          hooksConfig: {
-            enabled: true,
-          },
-          hooks: {
-            AfterTool: [
-              {
-                matcher: 'read_file',
-                hooks: [
-                  {
-                    type: 'command',
-                    command: `node "${commandPath}"`,
-                    timeout: 5000,
-                  },
-                ],
-              },
-            ],
-          },
-        },
-      });
-
-      // Create a test file to trigger the read_file tool
-      rig.createFile('original.txt', 'Original content');
-
-      const cliOutput = await rig.run({
-        args: 'Read original.txt', // Fake responses should trigger read_file on this
-      });
-
-      // 1. Verify that write_file was called (as a tail call replacing read_file)
-      // Since read_file was replaced before finalizing, it will not appear in the tool logs.
-      const foundWriteFile = await rig.waitForToolCall('write_file');
-      expect(foundWriteFile).toBeTruthy();
-
-      // Ensure hook logs are flushed and the final LLM response is received.
-      // The mock LLM is configured to respond with "Tail call completed successfully."
-      expect(cliOutput).toContain('Tail call completed successfully.');
-
-      // Ensure telemetry is written to disk
-      await rig.waitForTelemetryReady();
-
-      // Read hook logs to debug
-      const hookLogs = rig.readHookLogs();
-      const relevantHookLog = hookLogs.find(
-        (l) => l.hookCall.hook_event_name === 'AfterTool',
-      );
-
-      expect(relevantHookLog).toBeDefined();
-
-      // 2. Verify write_file was executed.
-      // In non-interactive mode, the CLI deduplicates tool execution logs by callId.
-      // Since a tail call reuses the original callId, "Tool: write_file" is not printed.
-      // Instead, we verify the side-effect (file creation) and the telemetry log.
-
-      // 3. Verify the tail-called tool actually wrote the file
-      const modifiedContent = rig.readFile('tail-called-file.txt');
-      expect(modifiedContent).toBe('Content from tail call');
-
-      // 4. Verify telemetry for the final tool call.
-      // The original 'read_file' call is replaced, so only 'write_file' is finalized and logged.
-      const toolLogs = rig.readToolLogs();
-      const successfulTools = toolLogs.filter((t) => t.toolRequest.success);
-      expect(
-        successfulTools.some((t) => t.toolRequest.name === 'write_file'),
-      ).toBeTruthy();
-      // The original request name should be preserved in the log payload if possible,
-      // but the executed tool name is 'write_file'.
-    });
-  });
-
   describe('BeforeModel Hooks - LLM Request Modification', () => {
     it('should modify LLM requests with BeforeModel hooks', async () => {
       // Create a hook script that replaces the LLM request with a modified version

package.json

@@ -70,8 +70,7 @@
       "wrap-ansi": "7.0.0"
     },
     "glob": "^12.0.0",
-    "node-domexception": "npm:empty@^0.10.1",
-    "prebuild-install": "npm:nop@1.0.0"
+    "node-domexception": "^1.0.0"
   },
   "bin": {
     "gemini": "bundle/gemini.js"
@@ -98,7 +97,6 @@
     "@vitest/eslint-plugin": "^1.3.4",
     "cross-env": "^7.0.3",
     "depcheck": "^1.4.7",
-    "domexception": "^4.0.0",
     "esbuild": "^0.25.0",
     "esbuild-plugin-wasm": "^1.1.0",
     "eslint": "^9.24.0",
@@ -132,7 +130,6 @@
   "dependencies": {
     "ink": "npm:@jrichman/ink@6.4.11",
     "latest-version": "^9.0.0",
-    "node-fetch-native": "^1.6.7",
     "proper-lockfile": "^4.1.2",
     "punycode": "^2.3.1",
     "simple-git": "^3.28.0"

packages/a2a-server/src/agent/executor.ts

@@ -29,8 +29,6 @@ import {
   CoderAgentEvent,
   getPersistedState,
   setPersistedState,
-  getContextIdFromMetadata,
-  getAgentSettingsFromMetadata,
 } from '../types.js';
 import { loadConfig, loadEnvironment, setTargetDir } from '../config/config.js';
 import { loadSettings } from '../config/settings.js';
@@ -119,7 +117,8 @@ export class CoderAgentExecutor implements AgentExecutor {
     const agentSettings = persistedState._agentSettings;
     const config = await this.getConfig(agentSettings, sdkTask.id);
     const contextId: string =
-      getContextIdFromMetadata(metadata) || sdkTask.contextId;
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+      (metadata['_contextId'] as string) || sdkTask.contextId;
     const runtimeTask = await Task.create(
       sdkTask.id,
       contextId,
@@ -142,10 +141,8 @@ export class CoderAgentExecutor implements AgentExecutor {
     agentSettingsInput?: AgentSettings,
     eventBus?: ExecutionEventBus,
   ): Promise<TaskWrapper> {
-    const agentSettings: AgentSettings = agentSettingsInput || {
-      kind: CoderAgentEvent.StateAgentSettingsEvent,
-      workspacePath: process.cwd(),
-    };
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+    const agentSettings = agentSettingsInput || ({} as AgentSettings);
     const config = await this.getConfig(agentSettings, taskId);
     const runtimeTask = await Task.create(
       taskId,
@@ -295,7 +292,8 @@ export class CoderAgentExecutor implements AgentExecutor {
     const contextId: string =
       userMessage.contextId ||
       sdkTask?.contextId ||
-      getContextIdFromMetadata(sdkTask?.metadata) ||
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+      (sdkTask?.metadata?.['_contextId'] as string) ||
       uuidv4();
 
     logger.info(
@@ -390,7 +388,10 @@ export class CoderAgentExecutor implements AgentExecutor {
       }
     } else {
       logger.info(`[CoderAgentExecutor] Creating new task ${taskId}.`);
-      const agentSettings = getAgentSettingsFromMetadata(userMessage.metadata);
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+      const agentSettings = userMessage.metadata?.[
+        'coderAgent'
+      ] as AgentSettings;
       try {
         wrapper = await this.createTask(
           taskId,

packages/a2a-server/src/agent/task.test.ts

@@ -513,10 +513,7 @@ describe('Task', () => {
           {
             request: { callId: '1' },
             status: 'awaiting_approval',
-            confirmationDetails: {
-              type: 'edit',
-              onConfirm: onConfirmSpy,
-            },
+            confirmationDetails: { onConfirm: onConfirmSpy },
           },
         ] as unknown as ToolCall[];
 
@@ -536,10 +533,7 @@ describe('Task', () => {
           {
             request: { callId: '1' },
             status: 'awaiting_approval',
-            confirmationDetails: {
-              type: 'edit',
-              onConfirm: onConfirmSpy,
-            },
+            confirmationDetails: { onConfirm: onConfirmSpy },
           },
         ] as unknown as ToolCall[];
 

packages/a2a-server/src/agent/task.ts

@@ -59,33 +59,6 @@ import type { PartUnion, Part as genAiPart } from '@google/genai';
 
 type UnionKeys<T> = T extends T ? keyof T : never;
 
-type ConfirmationType = ToolCallConfirmationDetails['type'];
-
-const VALID_CONFIRMATION_TYPES: readonly ConfirmationType[] = [
-  'edit',
-  'exec',
-  'mcp',
-  'info',
-  'ask_user',
-  'exit_plan_mode',
-] as const;
-
-function isToolCallConfirmationDetails(
-  value: unknown,
-): value is ToolCallConfirmationDetails {
-  if (
-    typeof value !== 'object' ||
-    value === null ||
-    !('onConfirm' in value) ||
-    typeof value.onConfirm !== 'function' ||
-    !('type' in value) ||
-    typeof value.type !== 'string'
-  ) {
-    return false;
-  }
-  return (VALID_CONFIRMATION_TYPES as readonly string[]).includes(value.type);
-}
-
 export class Task {
   id: string;
   contextId: string;
@@ -403,10 +376,11 @@ export class Task {
       }
 
       if (tc.status === 'awaiting_approval' && tc.confirmationDetails) {
-        const details = tc.confirmationDetails;
-        if (isToolCallConfirmationDetails(details)) {
-          this.pendingToolConfirmationDetails.set(tc.request.callId, details);
-        }
+        this.pendingToolConfirmationDetails.set(
+          tc.request.callId,
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+          tc.confirmationDetails as ToolCallConfirmationDetails,
+        );
       }
 
       // Only send an update if the status has actually changed.
@@ -438,12 +412,11 @@ export class Task {
       );
       toolCalls.forEach((tc: ToolCall) => {
         if (tc.status === 'awaiting_approval' && tc.confirmationDetails) {
-          const details = tc.confirmationDetails;
-          if (isToolCallConfirmationDetails(details)) {
-            // eslint-disable-next-line @typescript-eslint/no-floating-promises
-            details.onConfirm(ToolConfirmationOutcome.ProceedOnce);
-            this.pendingToolConfirmationDetails.delete(tc.request.callId);
-          }
+          // eslint-disable-next-line @typescript-eslint/no-floating-promises, @typescript-eslint/no-unsafe-type-assertion
+          (tc.confirmationDetails as ToolCallConfirmationDetails).onConfirm(
+            ToolConfirmationOutcome.ProceedOnce,
+          );
+          this.pendingToolConfirmationDetails.delete(tc.request.callId);
         }
       });
       return;
@@ -493,13 +466,15 @@ export class Task {
     T extends ToolCall | AnyDeclarativeTool,
     K extends UnionKeys<T>,
   >(from: T, ...fields: K[]): Partial<T> {
-    const ret: Partial<T> = {};
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+    const ret = {} as Pick<T, K>;
     for (const field of fields) {
-      if (field in from && from[field] !== undefined) {
+      if (field in from) {
         ret[field] = from[field];
       }
     }
-    return ret;
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+    return ret as Partial<T>;
   }
 
   private toolStatusMessage(
@@ -510,11 +485,8 @@ export class Task {
     const messageParts: Part[] = [];
 
     // Create a serializable version of the ToolCall (pick necessary
-    // properties/avoid methods causing circular reference errors).
-    // Type allows tool to be Partial<AnyDeclarativeTool> for serialization.
-    const serializableToolCall: Partial<Omit<ToolCall, 'tool'>> & {
-      tool?: Partial<AnyDeclarativeTool>;
-    } = this._pickFields(
+    // properties/avoid methods causing circular reference errors)
+    const serializableToolCall: Partial<ToolCall> = this._pickFields(
       tc,
       'request',
       'status',
@@ -524,7 +496,8 @@ export class Task {
     );
 
     if (tc.tool) {
-      const toolFields = this._pickFields(
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+      serializableToolCall.tool = this._pickFields(
         tc.tool,
         'name',
         'displayName',
@@ -534,8 +507,7 @@ export class Task {
         'canUpdateOutput',
         'schema',
         'parameterSchema',
-      );
-      serializableToolCall.tool = toolFields;
+      ) as AnyDeclarativeTool;
     }
 
     messageParts.push({
@@ -558,15 +530,8 @@ export class Task {
     old_string: string,
     new_string: string,
   ): Promise<string> {
-    // Validate path to prevent path traversal vulnerabilities
-    const resolvedPath = path.resolve(this.config.getTargetDir(), file_path);
-    const pathError = this.config.validatePathAccess(resolvedPath, 'read');
-    if (pathError) {
-      throw new Error(`Path validation failed: ${pathError}`);
-    }
-
     try {
-      const currentContent = await fs.readFile(resolvedPath, 'utf8');
+      const currentContent = await fs.readFile(file_path, 'utf8');
       return this._applyReplacement(
         currentContent,
         old_string,
@@ -660,32 +625,15 @@ export class Task {
           request.args['old_string'] &&
           request.args['new_string']
         ) {
-          const filePath = request.args['file_path'];
-          const oldString = request.args['old_string'];
-          const newString = request.args['new_string'];
-          if (
-            typeof filePath === 'string' &&
-            typeof oldString === 'string' &&
-            typeof newString === 'string'
-          ) {
-            // Resolve and validate path to prevent path traversal (user-controlled file_path).
-            const resolvedPath = path.resolve(
-              this.config.getTargetDir(),
-              filePath,
-            );
-            const pathError = this.config.validatePathAccess(
-              resolvedPath,
-              'read',
-            );
-            if (!pathError) {
-              const newContent = await this.getProposedContent(
-                resolvedPath,
-                oldString,
-                newString,
-              );
-              return { ...request, args: { ...request.args, newContent } };
-            }
-          }
+          const newContent = await this.getProposedContent(
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+            request.args['file_path'] as string,
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+            request.args['old_string'] as string,
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+            request.args['new_string'] as string,
+          );
+          return { ...request, args: { ...request.args, newContent } };
         }
         return request;
       }),
@@ -777,17 +725,10 @@ export class Task {
         break;
       case GeminiEventType.Error:
       default: {
-        // Use type guard instead of unsafe type assertion
-        let errorEvent: ServerGeminiErrorEvent | undefined;
-        if (
-          event.type === GeminiEventType.Error &&
-          event.value &&
-          typeof event.value === 'object' &&
-          'error' in event.value
-        ) {
-          errorEvent = event;
-        }
-        const errorMessage = errorEvent?.value?.error
+        // Block scope for lexical declaration
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+        const errorEvent = event as ServerGeminiErrorEvent; // Type assertion
+        const errorMessage = errorEvent.value?.error
           ? getErrorMessage(errorEvent.value.error)
           : 'Unknown error from LLM stream';
         logger.error(
@@ -796,7 +737,7 @@ export class Task {
         );
 
         let errMessage = `Unknown error from LLM stream: ${JSON.stringify(event)}`;
-        if (errorEvent?.value?.error) {
+        if (errorEvent.value?.error) {
           errMessage = parseAndFormatApiError(errorEvent.value.error);
         }
         this.cancelPendingTools(`LLM stream error: ${errorMessage}`);
@@ -873,11 +814,12 @@ export class Task {
 
         // If `edit` tool call, pass updated payload if presesent
         if (confirmationDetails.type === 'edit') {
-          const newContent = part.data['newContent'];
-          const payload =
-            typeof newContent === 'string'
-              ? ({ newContent } as ToolConfirmationPayload)
-              : undefined;
+          const payload = part.data['newContent']
+            ? ({
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+                newContent: part.data['newContent'] as string,
+              } as ToolConfirmationPayload)
+            : undefined;
           this.skipFinalTrueAfterInlineEdit = !!payload;
           try {
             await confirmationDetails.onConfirm(confirmationOutcome, payload);

packages/a2a-server/src/config/config.test.ts

@@ -267,47 +267,4 @@ describe('loadConfig', () => {
       customIgnoreFilePaths: [testPath],
     });
   });
-
-  describe('tool configuration', () => {
-    it('should pass V1 allowedTools to Config properly', async () => {
-      const settings: Settings = {
-        allowedTools: ['shell', 'edit'],
-      };
-      await loadConfig(settings, mockExtensionLoader, taskId);
-      expect(Config).toHaveBeenCalledWith(
-        expect.objectContaining({
-          allowedTools: ['shell', 'edit'],
-        }),
-      );
-    });
-
-    it('should pass V2 tools.allowed to Config properly', async () => {
-      const settings: Settings = {
-        tools: {
-          allowed: ['shell', 'fetch'],
-        },
-      };
-      await loadConfig(settings, mockExtensionLoader, taskId);
-      expect(Config).toHaveBeenCalledWith(
-        expect.objectContaining({
-          allowedTools: ['shell', 'fetch'],
-        }),
-      );
-    });
-
-    it('should prefer V1 allowedTools over V2 tools.allowed if both present', async () => {
-      const settings: Settings = {
-        allowedTools: ['v1-tool'],
-        tools: {
-          allowed: ['v2-tool'],
-        },
-      };
-      await loadConfig(settings, mockExtensionLoader, taskId);
-      expect(Config).toHaveBeenCalledWith(
-        expect.objectContaining({
-          allowedTools: ['v1-tool'],
-        }),
-      );
-    });
-  });
 });

packages/a2a-server/src/config/config.ts

@@ -68,9 +68,8 @@ export async function loadConfig(
     debugMode: process.env['DEBUG'] === 'true' || false,
     question: '', // Not used in server mode directly like CLI
 
-    coreTools: settings.coreTools || settings.tools?.core || undefined,
-    excludeTools: settings.excludeTools || settings.tools?.exclude || undefined,
-    allowedTools: settings.allowedTools || settings.tools?.allowed || undefined,
+    coreTools: settings.coreTools || undefined,
+    excludeTools: settings.excludeTools || undefined,
     showMemoryUsage: settings.showMemoryUsage || false,
     approvalMode:
       process.env['GEMINI_YOLO_MODE'] === 'true'

packages/a2a-server/src/config/settings.ts

@@ -27,12 +27,6 @@ export interface Settings {
   mcpServers?: Record<string, MCPServerConfig>;
   coreTools?: string[];
   excludeTools?: string[];
-  allowedTools?: string[];
-  tools?: {
-    allowed?: string[];
-    exclude?: string[];
-    core?: string[];
-  };
   telemetry?: TelemetrySettings;
   showMemoryUsage?: boolean;
   checkpointing?: CheckpointingSettings;

packages/a2a-server/src/http/server.ts

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S node --no-warnings=DEP0040
+#!/usr/bin/env node
 
 /**
  * @license

packages/a2a-server/src/types.ts

@@ -122,60 +122,11 @@ export type PersistedTaskMetadata = { [k: string]: unknown };
 
 export const METADATA_KEY = '__persistedState';
 
-function isAgentSettings(value: unknown): value is AgentSettings {
-  return (
-    typeof value === 'object' &&
-    value !== null &&
-    'kind' in value &&
-    value.kind === CoderAgentEvent.StateAgentSettingsEvent &&
-    'workspacePath' in value &&
-    typeof value.workspacePath === 'string'
-  );
-}
-
-function isPersistedStateMetadata(
-  value: unknown,
-): value is PersistedStateMetadata {
-  return (
-    typeof value === 'object' &&
-    value !== null &&
-    '_agentSettings' in value &&
-    '_taskState' in value &&
-    isAgentSettings(value._agentSettings)
-  );
-}
-
 export function getPersistedState(
   metadata: PersistedTaskMetadata,
 ): PersistedStateMetadata | undefined {
-  const state = metadata?.[METADATA_KEY];
-  if (isPersistedStateMetadata(state)) {
-    return state;
-  }
-  return undefined;
-}
-
-export function getContextIdFromMetadata(
-  metadata: PersistedTaskMetadata | undefined,
-): string | undefined {
-  if (!metadata) {
-    return undefined;
-  }
-  const contextId = metadata['_contextId'];
-  return typeof contextId === 'string' ? contextId : undefined;
-}
-
-export function getAgentSettingsFromMetadata(
-  metadata: PersistedTaskMetadata | undefined,
-): AgentSettings | undefined {
-  if (!metadata) {
-    return undefined;
-  }
-  const coderAgent = metadata['coderAgent'];
-  if (isAgentSettings(coderAgent)) {
-    return coderAgent;
-  }
-  return undefined;
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+  return metadata?.[METADATA_KEY] as PersistedStateMetadata | undefined;
 }
 
 export function setPersistedState(

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

@@ -71,7 +71,6 @@ export function createMockConfig(
       getMcpServers: vi.fn().mockReturnValue({}),
     }),
     getGitService: vi.fn(),
-    validatePathAccess: vi.fn().mockReturnValue(undefined),
     ...overrides,
   } as unknown as Config;
   mockConfig.getMessageBus = vi.fn().mockReturnValue(createMockMessageBus());

packages/cli/index.ts

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S node --no-warnings=DEP0040
+#!/usr/bin/env node
 
 /**
  * @license

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

@@ -2016,40 +2016,6 @@ describe('loadCliConfig useRipgrep', () => {
   });
 });
 
-describe('loadCliConfig directWebFetch', () => {
-  beforeEach(() => {
-    vi.resetAllMocks();
-    vi.mocked(os.homedir).mockReturnValue('/mock/home/user');
-    vi.stubEnv('GEMINI_API_KEY', 'test-api-key');
-    vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([]);
-  });
-
-  afterEach(() => {
-    vi.unstubAllEnvs();
-    vi.restoreAllMocks();
-  });
-
-  it('should be false by default when directWebFetch is not set in settings', async () => {
-    process.argv = ['node', 'script.js'];
-    const argv = await parseArguments(createTestMergedSettings());
-    const settings = createTestMergedSettings();
-    const config = await loadCliConfig(settings, 'test-session', argv);
-    expect(config.getDirectWebFetch()).toBe(false);
-  });
-
-  it('should be true when directWebFetch is set to true in settings', async () => {
-    process.argv = ['node', 'script.js'];
-    const argv = await parseArguments(createTestMergedSettings());
-    const settings = createTestMergedSettings({
-      experimental: {
-        directWebFetch: true,
-      },
-    });
-    const config = await loadCliConfig(settings, 'test-session', argv);
-    expect(config.getDirectWebFetch()).toBe(true);
-  });
-});
-
 describe('screenReader configuration', () => {
   beforeEach(() => {
     vi.resetAllMocks();

packages/cli/src/config/config.ts

@@ -826,8 +826,7 @@ export async function loadCliConfig(
     enableExtensionReloading: settings.experimental?.extensionReloading,
     enableAgents: settings.experimental?.enableAgents,
     plan: settings.experimental?.plan,
-    directWebFetch: settings.experimental?.directWebFetch,
-    planSettings: settings.general?.plan,
+    planSettings: settings.general.plan,
     enableEventDrivenScheduler: true,
     skillsSupport: settings.skills?.enabled ?? true,
     disabledSkills: settings.skills?.disabled,
@@ -878,7 +877,6 @@ export async function loadCliConfig(
         agents: refreshedSettings.merged.agents,
       };
     },
-    enableConseca: settings.security?.enableConseca,
   });
 }
 

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

@@ -590,29 +590,6 @@ describe('extensionSettings', () => {
         SENSITIVE_VAR: 'workspace-secret',
       });
     });
-
-    it('should ignore .env if it is a directory', async () => {
-      const workspaceEnvPath = path.join(
-        tempWorkspaceDir,
-        EXTENSION_SETTINGS_FILENAME,
-      );
-      fs.mkdirSync(workspaceEnvPath);
-      const workspaceKeychain = new KeychainTokenStorage(
-        `Gemini CLI Extensions test-ext 12345 ${tempWorkspaceDir}`,
-      );
-      await workspaceKeychain.setSecret('SENSITIVE_VAR', 'workspace-secret');
-
-      const contents = await getScopedEnvContents(
-        config,
-        extensionId,
-        ExtensionSettingScope.WORKSPACE,
-        tempWorkspaceDir,
-      );
-
-      expect(contents).toEqual({
-        SENSITIVE_VAR: 'workspace-secret',
-      });
-    });
   });
 
   describe('getEnvContents (merged)', () => {
@@ -719,26 +696,6 @@ describe('extensionSettings', () => {
       expect(actualContent).toContain('VAR1=new-workspace-value');
     });
 
-    it('should throw an error when trying to write to a workspace with a .env directory', async () => {
-      const workspaceEnvPath = path.join(tempWorkspaceDir, '.env');
-      fs.mkdirSync(workspaceEnvPath);
-
-      mockRequestSetting.mockResolvedValue('new-workspace-value');
-
-      await expect(
-        updateSetting(
-          config,
-          '12345',
-          'VAR1',
-          mockRequestSetting,
-          ExtensionSettingScope.WORKSPACE,
-          tempWorkspaceDir,
-        ),
-      ).rejects.toThrow(
-        /Cannot write extension settings to .* because it is a directory./,
-      );
-    });
-
     it('should update a sensitive setting in USER scope', async () => {
       mockRequestSetting.mockResolvedValue('new-value2');
 

packages/cli/src/config/extensions/extensionSettings.ts

@@ -124,15 +124,6 @@ export async function maybePromptForSettings(
 
   const envContent = formatEnvContent(nonSensitiveSettings);
 
-  if (fsSync.existsSync(envFilePath)) {
-    const stat = fsSync.statSync(envFilePath);
-    if (stat.isDirectory()) {
-      throw new Error(
-        `Cannot write extension settings to ${envFilePath} because it is a directory.`,
-      );
-    }
-  }
-
   await fs.writeFile(envFilePath, envContent);
 }
 
@@ -182,11 +173,8 @@ export async function getScopedEnvContents(
   const envFilePath = getEnvFilePath(extensionName, scope, workspaceDir);
   let customEnv: Record<string, string> = {};
   if (fsSync.existsSync(envFilePath)) {
-    const stat = fsSync.statSync(envFilePath);
-    if (!stat.isDirectory()) {
-      const envFile = fsSync.readFileSync(envFilePath, 'utf-8');
-      customEnv = dotenv.parse(envFile);
-    }
+    const envFile = fsSync.readFileSync(envFilePath, 'utf-8');
+    customEnv = dotenv.parse(envFile);
   }
 
   if (extensionConfig.settings) {
@@ -272,12 +260,6 @@ export async function updateSetting(
   const envFilePath = getEnvFilePath(extensionName, scope, workspaceDir);
   let envContent = '';
   if (fsSync.existsSync(envFilePath)) {
-    const stat = fsSync.statSync(envFilePath);
-    if (stat.isDirectory()) {
-      throw new Error(
-        `Cannot write extension settings to ${envFilePath} because it is a directory.`,
-      );
-    }
     envContent = await fs.readFile(envFilePath, 'utf-8');
   }
 
@@ -342,10 +324,7 @@ async function clearSettings(
   keychain: KeychainTokenStorage,
 ) {
   if (fsSync.existsSync(envFilePath)) {
-    const stat = fsSync.statSync(envFilePath);
-    if (!stat.isDirectory()) {
-      await fs.writeFile(envFilePath, '');
-    }
+    await fs.writeFile(envFilePath, '');
   }
   if (!(await keychain.isAvailable())) {
     return;

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

@@ -132,35 +132,6 @@ describe('Policy Engine Integration Tests', () => {
       ).toBe(PolicyDecision.ASK_USER);
     });
 
-    it('should handle global MCP wildcard (*) in settings', async () => {
-      const settings: Settings = {
-        mcp: {
-          allowed: ['*'],
-        },
-      };
-
-      const config = await createPolicyEngineConfig(
-        settings,
-        ApprovalMode.DEFAULT,
-      );
-      const engine = new PolicyEngine(config);
-
-      // ANY tool with a server name should be allowed
-      expect(
-        (await engine.check({ name: 'mcp-server__tool' }, 'mcp-server'))
-          .decision,
-      ).toBe(PolicyDecision.ALLOW);
-      expect(
-        (await engine.check({ name: 'another-server__tool' }, 'another-server'))
-          .decision,
-      ).toBe(PolicyDecision.ALLOW);
-
-      // Built-in tools should NOT be allowed by the MCP wildcard
-      expect(
-        (await engine.check({ name: 'run_shell_command' }, undefined)).decision,
-      ).toBe(PolicyDecision.ASK_USER);
-    });
-
     it('should correctly prioritize specific tool excludes over MCP server wildcards', async () => {
       const settings: Settings = {
         mcp: {
@@ -352,38 +323,6 @@ describe('Policy Engine Integration Tests', () => {
       ).toBe(PolicyDecision.DENY);
     });
 
-    it('should correctly match tool annotations', async () => {
-      const settings: Settings = {};
-
-      const config = await createPolicyEngineConfig(
-        settings,
-        ApprovalMode.DEFAULT,
-      );
-
-      // Add a manual rule with annotations to the config
-      config.rules = config.rules || [];
-      config.rules.push({
-        toolAnnotations: { readOnlyHint: true },
-        decision: PolicyDecision.ALLOW,
-        priority: 10,
-      });
-
-      const engine = new PolicyEngine(config);
-
-      // A tool with readOnlyHint=true should be ALLOWED
-      const roCall = { name: 'some_tool', args: {} };
-      const roMeta = { readOnlyHint: true };
-      expect((await engine.check(roCall, undefined, roMeta)).decision).toBe(
-        PolicyDecision.ALLOW,
-      );
-
-      // A tool without the hint (or with false) should follow default decision (ASK_USER)
-      const rwMeta = { readOnlyHint: false };
-      expect((await engine.check(roCall, undefined, rwMeta)).decision).toBe(
-        PolicyDecision.ASK_USER,
-      );
-    });
-
     describe.each(['write_file', 'replace'])(
       'Plan Mode policy for %s',
       (toolName) => {

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

@@ -142,48 +142,4 @@ describe('resolveWorkspacePolicyState', () => {
       expect.stringContaining('Automatically accepting and loading'),
     );
   });
-
-  it('should not return workspace policies if cwd is the home directory', async () => {
-    const policiesDir = path.join(tempDir, '.gemini', 'policies');
-    fs.mkdirSync(policiesDir, { recursive: true });
-    fs.writeFileSync(path.join(policiesDir, 'policy.toml'), 'rules = []');
-
-    // Run from HOME directory (tempDir is mocked as HOME in beforeEach)
-    const result = await resolveWorkspacePolicyState({
-      cwd: tempDir,
-      trustedFolder: true,
-      interactive: true,
-    });
-
-    expect(result.workspacePoliciesDir).toBeUndefined();
-    expect(result.policyUpdateConfirmationRequest).toBeUndefined();
-  });
-
-  it('should not return workspace policies if cwd is a symlink to the home directory', async () => {
-    const policiesDir = path.join(tempDir, '.gemini', 'policies');
-    fs.mkdirSync(policiesDir, { recursive: true });
-    fs.writeFileSync(path.join(policiesDir, 'policy.toml'), 'rules = []');
-
-    // Create a symlink to the home directory
-    const symlinkDir = path.join(
-      os.tmpdir(),
-      `gemini-cli-symlink-${Date.now()}`,
-    );
-    fs.symlinkSync(tempDir, symlinkDir, 'dir');
-
-    try {
-      // Run from symlink to HOME directory
-      const result = await resolveWorkspacePolicyState({
-        cwd: symlinkDir,
-        trustedFolder: true,
-        interactive: true,
-      });
-
-      expect(result.workspacePoliciesDir).toBeUndefined();
-      expect(result.policyUpdateConfirmationRequest).toBeUndefined();
-    } finally {
-      // Clean up symlink
-      fs.unlinkSync(symlinkDir);
-    }
-  });
 });

packages/cli/src/config/policy.ts

@@ -67,15 +67,9 @@ export async function resolveWorkspacePolicyState(options: {
     | undefined;
 
   if (trustedFolder) {
-    const storage = new Storage(cwd);
-
-    // If we are in the home directory (or rather, our target Gemini dir is the global one),
-    // don't treat it as a workspace to avoid loading global policies twice.
-    if (storage.isWorkspaceHomeDir()) {
-      return { workspacePoliciesDir: undefined };
-    }
-
-    const potentialWorkspacePoliciesDir = storage.getWorkspacePoliciesDir();
+    const potentialWorkspacePoliciesDir = new Storage(
+      cwd,
+    ).getWorkspacePoliciesDir();
     const integrityManager = new PolicyIntegrityManager();
     const integrityResult = await integrityManager.checkIntegrity(
       'workspace',

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

@@ -79,7 +79,6 @@ import {
 import {
   FatalConfigError,
   GEMINI_DIR,
-  Storage,
   type MCPServerConfig,
 } from '@google/gemini-cli-core';
 import { updateSettingsFilePreservingFormat } from '../utils/commentJson.js';
@@ -127,30 +126,6 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
   const actual =
     await importOriginal<typeof import('@google/gemini-cli-core')>();
   const os = await import('node:os');
-  const pathMod = await import('node:path');
-  const fsMod = await import('node:fs');
-
-  // Helper to resolve paths using the test's mocked environment
-  const testResolve = (p: string | undefined) => {
-    if (!p) return '';
-    try {
-      // Use the mocked fs.realpathSync if available, otherwise fallback
-      return fsMod.realpathSync(pathMod.resolve(p));
-    } catch {
-      return pathMod.resolve(p);
-    }
-  };
-
-  // Create a smarter mock for isWorkspaceHomeDir
-  vi.spyOn(actual.Storage.prototype, 'isWorkspaceHomeDir').mockImplementation(
-    function (this: Storage) {
-      const target = testResolve(pathMod.dirname(this.getGeminiDir()));
-      // Pick up the mocked home directory specifically from the 'os' mock
-      const home = testResolve(os.homedir());
-      return actual.normalizePath(target) === actual.normalizePath(home);
-    },
-  );
-
   return {
     ...actual,
     coreEvents: mockCoreEvents,
@@ -1516,29 +1491,20 @@ describe('Settings Loading and Merging', () => {
         return pStr;
       });
 
-      // Force the storage check to return true for this specific test
-      const isWorkspaceHomeDirSpy = vi
-        .spyOn(Storage.prototype, 'isWorkspaceHomeDir')
-        .mockReturnValue(true);
-
       (mockFsExistsSync as Mock).mockImplementation(
         (p: string) =>
           // Only return true for workspace settings path to see if it gets loaded
           p === mockWorkspaceSettingsPath,
       );
 
-      try {
-        const settings = loadSettings(mockSymlinkDir);
+      const settings = loadSettings(mockSymlinkDir);
 
-        // Verify that even though the file exists, it was NOT loaded because realpath matched home
-        expect(fs.readFileSync).not.toHaveBeenCalledWith(
-          mockWorkspaceSettingsPath,
-          'utf-8',
-        );
-        expect(settings.workspace.settings).toEqual({});
-      } finally {
-        isWorkspaceHomeDirSpy.mockRestore();
-      }
+      // Verify that even though the file exists, it was NOT loaded because realpath matched home
+      expect(fs.readFileSync).not.toHaveBeenCalledWith(
+        mockWorkspaceSettingsPath,
+        'utf-8',
+      );
+      expect(settings.workspace.settings).toEqual({});
     });
   });
 

packages/cli/src/config/settings.ts

@@ -637,8 +637,24 @@ export function loadSettings(
   const systemSettingsPath = getSystemSettingsPath();
   const systemDefaultsPath = getSystemDefaultsPath();
 
-  const storage = new Storage(workspaceDir);
-  const workspaceSettingsPath = storage.getWorkspaceSettingsPath();
+  // Resolve paths to their canonical representation to handle symlinks
+  const resolvedWorkspaceDir = path.resolve(workspaceDir);
+  const resolvedHomeDir = path.resolve(homedir());
+
+  let realWorkspaceDir = resolvedWorkspaceDir;
+  try {
+    // fs.realpathSync gets the "true" path, resolving any symlinks
+    realWorkspaceDir = fs.realpathSync(resolvedWorkspaceDir);
+  } catch (_e) {
+    // This is okay. The path might not exist yet, and that's a valid state.
+  }
+
+  // We expect homedir to always exist and be resolvable.
+  const realHomeDir = fs.realpathSync(resolvedHomeDir);
+
+  const workspaceSettingsPath = new Storage(
+    workspaceDir,
+  ).getWorkspaceSettingsPath();
 
   const load = (filePath: string): { settings: Settings; rawJson?: string } => {
     try {
@@ -696,7 +712,7 @@ export function loadSettings(
     settings: {} as Settings,
     rawJson: undefined,
   };
-  if (!storage.isWorkspaceHomeDir()) {
+  if (realWorkspaceDir !== realHomeDir) {
     workspaceResult = load(workspaceSettingsPath);
   }
 
@@ -784,11 +800,11 @@ export function loadSettings(
       readOnly: false,
     },
     {
-      path: storage.isWorkspaceHomeDir() ? '' : workspaceSettingsPath,
+      path: realWorkspaceDir === realHomeDir ? '' : workspaceSettingsPath,
       settings: workspaceSettings,
       originalSettings: workspaceOriginalSettings,
       rawJson: workspaceResult.rawJson,
-      readOnly: storage.isWorkspaceHomeDir(),
+      readOnly: realWorkspaceDir === realHomeDir,
     },
     isTrusted,
     settingsErrors,

packages/cli/src/config/settingsSchema.ts

@@ -297,16 +297,6 @@ const SETTINGS_SCHEMA = {
           'Retry on "exception TypeError: fetch failed sending request" errors.',
         showInDialog: false,
       },
-      maxAttempts: {
-        type: 'number',
-        label: 'Max Chat Model Attempts',
-        category: 'General',
-        requiresRestart: false,
-        default: 10,
-        description:
-          'Maximum number of attempts for requests to the main chat model. Cannot exceed 10.',
-        showInDialog: true,
-      },
       debugKeystrokeLogging: {
         type: 'boolean',
         label: 'Debug Keystroke Logging',
@@ -974,60 +964,6 @@ const SETTINGS_SCHEMA = {
           ref: 'AgentOverride',
         },
       },
-      browser: {
-        type: 'object',
-        label: 'Browser Agent',
-        category: 'Advanced',
-        requiresRestart: true,
-        default: {},
-        description: 'Settings specific to the browser agent.',
-        showInDialog: false,
-        properties: {
-          sessionMode: {
-            type: 'enum',
-            label: 'Browser Session Mode',
-            category: 'Advanced',
-            requiresRestart: true,
-            default: 'persistent',
-            description:
-              "Session mode: 'persistent', 'isolated', or 'existing'.",
-            showInDialog: false,
-            options: [
-              { value: 'persistent', label: 'Persistent' },
-              { value: 'isolated', label: 'Isolated' },
-              { value: 'existing', label: 'Existing' },
-            ],
-          },
-          headless: {
-            type: 'boolean',
-            label: 'Browser Headless',
-            category: 'Advanced',
-            requiresRestart: true,
-            default: false,
-            description: 'Run browser in headless mode.',
-            showInDialog: false,
-          },
-          profilePath: {
-            type: 'string',
-            label: 'Browser Profile Path',
-            category: 'Advanced',
-            requiresRestart: true,
-            default: undefined as string | undefined,
-            description:
-              'Path to browser profile directory for session persistence.',
-            showInDialog: false,
-          },
-          visualModel: {
-            type: 'string',
-            label: 'Browser Visual Model',
-            category: 'Advanced',
-            requiresRestart: true,
-            default: undefined as string | undefined,
-            description: 'Model override for the visual agent.',
-            showInDialog: false,
-          },
-        },
-      },
     },
   },
 
@@ -1547,16 +1483,6 @@ const SETTINGS_SCHEMA = {
           },
         },
       },
-      enableConseca: {
-        type: 'boolean',
-        label: 'Enable Context-Aware Security',
-        category: 'Security',
-        requiresRestart: true,
-        default: false,
-        description:
-          'Enable the context-aware security checker. This feature uses an LLM to dynamically generate and enforce security policies for tool use based on your prompt, providing an additional layer of protection against unintended actions.',
-        showInDialog: true,
-      },
     },
   },
 
@@ -1767,16 +1693,6 @@ const SETTINGS_SCHEMA = {
           'Enable model steering (user hints) to guide the model during tool execution.',
         showInDialog: true,
       },
-      directWebFetch: {
-        type: 'boolean',
-        label: 'Direct Web Fetch',
-        category: 'Experimental',
-        requiresRestart: true,
-        default: false,
-        description:
-          'Enable web fetch behavior that bypasses LLM summarization.',
-        showInDialog: true,
-      },
     },
   },
 

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

@@ -393,11 +393,9 @@ export const render = (
       exitOnCtrlC: false,
       patchConsole: false,
       onRender: (metrics: RenderMetrics) => {
-        const output = isInkRenderMetrics(metrics) ? metrics.output : '...';
-        const staticOutput = isInkRenderMetrics(metrics)
-          ? (metrics.staticOutput ?? '')
-          : '';
-        stdout.onRender(staticOutput, output);
+        if (isInkRenderMetrics(metrics)) {
+          stdout.onRender(metrics.staticOutput ?? '', metrics.output);
+        }
       },
     });
   });

packages/cli/src/ui/colors.ts

@@ -53,12 +53,6 @@ export const Colors: ColorsTheme = {
   get DarkGray() {
     return themeManager.getColors().DarkGray;
   },
-  get InputBackground() {
-    return themeManager.getColors().InputBackground;
-  },
-  get MessageBackground() {
-    return themeManager.getColors().MessageBackground;
-  },
   get GradientColors() {
     return themeManager.getActiveTheme().colors.GradientColors;
   },

packages/cli/src/ui/commands/policiesCommand.test.ts

@@ -9,11 +9,7 @@ import { policiesCommand } from './policiesCommand.js';
 import { CommandKind } from './types.js';
 import { MessageType } from '../types.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import {
-  type Config,
-  PolicyDecision,
-  ApprovalMode,
-} from '@google/gemini-cli-core';
+import { type Config, PolicyDecision } from '@google/gemini-cli-core';
 
 describe('policiesCommand', () => {
   let mockContext: ReturnType<typeof createMockCommandContext>;
@@ -110,7 +106,6 @@ describe('policiesCommand', () => {
       expect(content).toContain(
         '### Yolo Mode Policies (combined with normal mode policies)',
       );
-      expect(content).toContain('### Plan Mode Policies');
       expect(content).toContain(
         '**DENY** tool: `dangerousTool` [Priority: 10]',
       );
@@ -119,45 +114,5 @@ describe('policiesCommand', () => {
       );
       expect(content).toContain('**ASK_USER** all tools');
     });
-
-    it('should show plan-only rules in plan mode section', async () => {
-      const mockRules = [
-        {
-          decision: PolicyDecision.ALLOW,
-          toolName: 'glob',
-          priority: 70,
-          modes: [ApprovalMode.PLAN],
-        },
-        {
-          decision: PolicyDecision.DENY,
-          priority: 60,
-          modes: [ApprovalMode.PLAN],
-        },
-        {
-          decision: PolicyDecision.ALLOW,
-          toolName: 'shell',
-          priority: 50,
-        },
-      ];
-      const mockPolicyEngine = {
-        getRules: vi.fn().mockReturnValue(mockRules),
-      };
-      mockContext.services.config = {
-        getPolicyEngine: vi.fn().mockReturnValue(mockPolicyEngine),
-      } as unknown as Config;
-
-      const listCommand = policiesCommand.subCommands![0];
-      await listCommand.action!(mockContext, '');
-
-      const call = vi.mocked(mockContext.ui.addItem).mock.calls[0];
-      const content = (call[0] as { text: string }).text;
-
-      // Plan-only rules appear under Plan Mode section
-      expect(content).toContain('### Plan Mode Policies');
-      // glob ALLOW is plan-only, should appear in plan section
-      expect(content).toContain('**ALLOW** tool: `glob` [Priority: 70]');
-      // shell ALLOW has no modes (applies to all), appears in normal section
-      expect(content).toContain('**ALLOW** tool: `shell` [Priority: 50]');
-    });
   });
 });

packages/cli/src/ui/commands/policiesCommand.ts

@@ -12,7 +12,6 @@ interface CategorizedRules {
   normal: PolicyRule[];
   autoEdit: PolicyRule[];
   yolo: PolicyRule[];
-  plan: PolicyRule[];
 }
 
 const categorizeRulesByMode = (
@@ -22,7 +21,6 @@ const categorizeRulesByMode = (
     normal: [],
     autoEdit: [],
     yolo: [],
-    plan: [],
   };
   const ALL_MODES = Object.values(ApprovalMode);
   rules.forEach((rule) => {
@@ -31,7 +29,6 @@ const categorizeRulesByMode = (
     if (modeSet.has(ApprovalMode.DEFAULT)) result.normal.push(rule);
     if (modeSet.has(ApprovalMode.AUTO_EDIT)) result.autoEdit.push(rule);
     if (modeSet.has(ApprovalMode.YOLO)) result.yolo.push(rule);
-    if (modeSet.has(ApprovalMode.PLAN)) result.plan.push(rule);
   });
   return result;
 };
@@ -85,9 +82,6 @@ const listPoliciesCommand: SlashCommand = {
     const uniqueYolo = categorized.yolo.filter(
       (rule) => !normalRulesSet.has(rule),
     );
-    const uniquePlan = categorized.plan.filter(
-      (rule) => !normalRulesSet.has(rule),
-    );
 
     let content = '**Active Policies**\n\n';
     content += formatSection('Normal Mode Policies', categorized.normal);
@@ -99,7 +93,6 @@ const listPoliciesCommand: SlashCommand = {
       'Yolo Mode Policies (combined with normal mode policies)',
       uniqueYolo,
     );
-    content += formatSection('Plan Mode Policies', uniquePlan);
 
     context.ui.addItem(
       {

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

@@ -96,8 +96,6 @@ describe('<Header />', () => {
       },
       background: {
         primary: '',
-        message: '',
-        input: '',
         diff: { added: '', removed: '' },
       },
       border: {

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

@@ -411,6 +411,73 @@ describe('InputPrompt', () => {
     unmount();
   });
 
+  it('should submit command in shell mode when Enter pressed with suggestions visible but no arrow navigation', async () => {
+    props.shellModeActive = true;
+    props.buffer.setText('ls ');
+
+    mockedUseCommandCompletion.mockReturnValue({
+      ...mockCommandCompletion,
+      showSuggestions: true,
+      suggestions: [
+        { label: 'dir1', value: 'dir1' },
+        { label: 'dir2', value: 'dir2' },
+      ],
+      activeSuggestionIndex: 0,
+    });
+
+    const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />, {
+      uiActions,
+    });
+
+    // Press Enter without navigating — should dismiss suggestions and fall
+    // through to the main submit handler.
+    await act(async () => {
+      stdin.write('\r');
+    });
+    await waitFor(() => {
+      expect(mockCommandCompletion.resetCompletionState).toHaveBeenCalled();
+      expect(props.onSubmit).toHaveBeenCalledWith('ls'); // Assert fall-through (text is trimmed)
+    });
+    expect(mockCommandCompletion.handleAutocomplete).not.toHaveBeenCalled();
+    unmount();
+  });
+
+  it('should accept suggestion in shell mode when Enter pressed after arrow navigation', async () => {
+    props.shellModeActive = true;
+    props.buffer.setText('ls ');
+
+    mockedUseCommandCompletion.mockReturnValue({
+      ...mockCommandCompletion,
+      showSuggestions: true,
+      suggestions: [
+        { label: 'dir1', value: 'dir1' },
+        { label: 'dir2', value: 'dir2' },
+      ],
+      activeSuggestionIndex: 1,
+    });
+
+    const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />, {
+      uiActions,
+    });
+
+    // Press ArrowDown to navigate, then Enter to accept
+    await act(async () => {
+      stdin.write('\u001B[B'); // ArrowDown — sets hasUserNavigatedSuggestions
+    });
+    await waitFor(() =>
+      expect(mockCommandCompletion.navigateDown).toHaveBeenCalled(),
+    );
+
+    await act(async () => {
+      stdin.write('\r'); // Enter — should accept navigated suggestion
+    });
+    await waitFor(() => {
+      expect(mockCommandCompletion.handleAutocomplete).toHaveBeenCalledWith(1);
+    });
+    expect(props.onSubmit).not.toHaveBeenCalled();
+    unmount();
+  });
+
   it('should NOT call shell history methods when not in shell mode', async () => {
     props.buffer.setText('some text');
     const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />, {

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

@@ -56,6 +56,10 @@ import {
 } from '../utils/commandUtils.js';
 import * as path from 'node:path';
 import { SCREEN_READER_USER_PREFIX } from '../textConstants.js';
+import {
+  DEFAULT_BACKGROUND_OPACITY,
+  DEFAULT_INPUT_BACKGROUND_OPACITY,
+} from '../constants.js';
 import { getSafeLowColorBackground } from '../themes/color-utils.js';
 import { isLowColorDepth } from '../utils/terminalUtils.js';
 import { useShellFocusState } from '../contexts/ShellFocusContext.js';
@@ -222,6 +226,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
     backgroundShells,
     backgroundShellHeight,
     shortcutsHelpVisible,
+    hintMode,
   } = useUIState();
   const [suppressCompletion, setSuppressCompletion] = useState(false);
   const { handlePress: registerPlainTabPress, resetCount: resetPlainTabPress } =
@@ -254,6 +259,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
   >(null);
   const pasteTimeoutRef = useRef<NodeJS.Timeout | null>(null);
   const innerBoxRef = useRef<DOMElement>(null);
+  const hasUserNavigatedSuggestions = useRef(false);
 
   const [reverseSearchActive, setReverseSearchActive] = useState(false);
   const [commandSearchActive, setCommandSearchActive] = useState(false);
@@ -610,6 +616,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         setSuppressCompletion(
           isHistoryNav || isCursorMovement || keyMatchers[Command.ESCAPE](key),
         );
+        hasUserNavigatedSuggestions.current = false;
       }
 
       // TODO(jacobr): this special case is likely not needed anymore.
@@ -643,7 +650,13 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         Boolean(completion.promptCompletion.text) ||
         reverseSearchActive ||
         commandSearchActive;
-      if (isPlainTab) {
+
+      if (isPlainTab && shellModeActive) {
+        resetPlainTabPress();
+        if (!completion.showSuggestions) {
+          setSuppressCompletion(false);
+        }
+      } else if (isPlainTab) {
         if (!hasTabCompletionInteraction) {
           if (registerPlainTabPress() === 2) {
             toggleCleanUiDetailsVisible();
@@ -887,7 +900,9 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         completion.isPerfectMatch &&
         keyMatchers[Command.SUBMIT](key) &&
         recentUnsafePasteTime === null &&
-        (!completion.showSuggestions || completion.activeSuggestionIndex <= 0)
+        (!completion.showSuggestions ||
+          (completion.activeSuggestionIndex <= 0 &&
+            !hasUserNavigatedSuggestions.current))
       ) {
         handleSubmit(buffer.text);
         return true;
@@ -903,11 +918,13 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         if (completion.suggestions.length > 1) {
           if (keyMatchers[Command.COMPLETION_UP](key)) {
             completion.navigateUp();
+            hasUserNavigatedSuggestions.current = true;
             setExpandedSuggestionIndex(-1); // Reset expansion when navigating
             return true;
           }
           if (keyMatchers[Command.COMPLETION_DOWN](key)) {
             completion.navigateDown();
+            hasUserNavigatedSuggestions.current = true;
             setExpandedSuggestionIndex(-1); // Reset expansion when navigating
             return true;
           }
@@ -925,6 +942,24 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
 
               const isEnterKey = key.name === 'return' && !key.ctrl;
 
+              if (isEnterKey && shellModeActive) {
+                if (hasUserNavigatedSuggestions.current) {
+                  completion.handleAutocomplete(
+                    completion.activeSuggestionIndex,
+                  );
+                  setExpandedSuggestionIndex(-1);
+                  hasUserNavigatedSuggestions.current = false;
+                  return true;
+                }
+                completion.resetCompletionState();
+                setExpandedSuggestionIndex(-1);
+                hasUserNavigatedSuggestions.current = false;
+                if (buffer.text.trim()) {
+                  handleSubmit(buffer.text);
+                }
+                return true;
+              }
+
               if (isEnterKey && buffer.text.startsWith('/')) {
                 const { isArgumentCompletion, leafCommand } =
                   completion.slashCompletionRange;
@@ -1381,7 +1416,8 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         scrollOffset={activeCompletion.visibleStartIndex}
         userInput={buffer.text}
         mode={
-          completion.completionMode === CompletionMode.AT
+          completion.completionMode === CompletionMode.AT ||
+          completion.completionMode === CompletionMode.SHELL
             ? 'reverse'
             : buffer.text.startsWith('/') &&
                 !reverseSearchActive &&
@@ -1417,8 +1453,14 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         />
       ) : null}
       <HalfLinePaddedBox
-        backgroundBaseColor={theme.background.input}
-        backgroundOpacity={1}
+        backgroundBaseColor={
+          hintMode ? theme.text.accent : theme.text.secondary
+        }
+        backgroundOpacity={
+          showCursor
+            ? DEFAULT_INPUT_BACKGROUND_OPACITY
+            : DEFAULT_BACKGROUND_OPACITY
+        }
         useBackgroundColor={useBackgroundColor}
       >
         <Box

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

@@ -67,7 +67,7 @@ export const ShortcutsHelp: React.FC = () => {
 
   return (
     <Box flexDirection="column" width="100%">
-      <SectionHeader title=" Shortcuts" subtitle=" See /help for more" />
+      <SectionHeader title="Shortcuts (for more, see /help)" />
       <Box flexDirection="row" flexWrap="wrap" paddingLeft={1} paddingRight={2}>
         {itemsForDisplay.map((item, index) => (
           <Box

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

@@ -25,15 +25,15 @@ exports[`SettingsDialog > Initial Rendering > should render settings list with v
 │    Plan Directory                                                                     undefined  │
 │    The directory where planning artifacts are stored. If not specified, defaults t…              │
 │                                                                                                  │
-│    Max Chat Model Attempts                                                                   10  │
-│    Maximum number of attempts for requests to the main chat model. Cannot exceed 10.             │
-│                                                                                                  │
 │    Debug Keystroke Logging                                                                false  │
 │    Enable debug logging of keystrokes to the console.                                            │
 │                                                                                                  │
 │    Enable Session Cleanup                                                                 false  │
 │    Enable automatic session cleanup                                                              │
 │                                                                                                  │
+│    Keep chat history                                                                  undefined  │
+│    Automatically delete chats older than this time period (e.g., "30d", "7d", "24h…              │
+│                                                                                                  │
 │  ▼                                                                                               │
 │                                                                                                  │
 │    Apply To                                                                                      │
@@ -72,15 +72,15 @@ exports[`SettingsDialog > Snapshot Tests > should render 'accessibility settings
 │    Plan Directory                                                                     undefined  │
 │    The directory where planning artifacts are stored. If not specified, defaults t…              │
 │                                                                                                  │
-│    Max Chat Model Attempts                                                                   10  │
-│    Maximum number of attempts for requests to the main chat model. Cannot exceed 10.             │
-│                                                                                                  │
 │    Debug Keystroke Logging                                                                false  │
 │    Enable debug logging of keystrokes to the console.                                            │
 │                                                                                                  │
 │    Enable Session Cleanup                                                                 false  │
 │    Enable automatic session cleanup                                                              │
 │                                                                                                  │
+│    Keep chat history                                                                  undefined  │
+│    Automatically delete chats older than this time period (e.g., "30d", "7d", "24h…              │
+│                                                                                                  │
 │  ▼                                                                                               │
 │                                                                                                  │
 │    Apply To                                                                                      │
@@ -119,15 +119,15 @@ exports[`SettingsDialog > Snapshot Tests > should render 'all boolean settings d
 │    Plan Directory                                                                     undefined  │
 │    The directory where planning artifacts are stored. If not specified, defaults t…              │
 │                                                                                                  │
-│    Max Chat Model Attempts                                                                   10  │
-│    Maximum number of attempts for requests to the main chat model. Cannot exceed 10.             │
-│                                                                                                  │
 │    Debug Keystroke Logging                                                               false*  │
 │    Enable debug logging of keystrokes to the console.                                            │
 │                                                                                                  │
 │    Enable Session Cleanup                                                                 false  │
 │    Enable automatic session cleanup                                                              │
 │                                                                                                  │
+│    Keep chat history                                                                  undefined  │
+│    Automatically delete chats older than this time period (e.g., "30d", "7d", "24h…              │
+│                                                                                                  │
 │  ▼                                                                                               │
 │                                                                                                  │
 │    Apply To                                                                                      │
@@ -166,15 +166,15 @@ exports[`SettingsDialog > Snapshot Tests > should render 'default state' correct
 │    Plan Directory                                                                     undefined  │
 │    The directory where planning artifacts are stored. If not specified, defaults t…              │
 │                                                                                                  │
-│    Max Chat Model Attempts                                                                   10  │
-│    Maximum number of attempts for requests to the main chat model. Cannot exceed 10.             │
-│                                                                                                  │
 │    Debug Keystroke Logging                                                                false  │
 │    Enable debug logging of keystrokes to the console.                                            │
 │                                                                                                  │
 │    Enable Session Cleanup                                                                 false  │
 │    Enable automatic session cleanup                                                              │
 │                                                                                                  │
+│    Keep chat history                                                                  undefined  │
+│    Automatically delete chats older than this time period (e.g., "30d", "7d", "24h…              │
+│                                                                                                  │
 │  ▼                                                                                               │
 │                                                                                                  │
 │    Apply To                                                                                      │
@@ -213,15 +213,15 @@ exports[`SettingsDialog > Snapshot Tests > should render 'file filtering setting
 │    Plan Directory                                                                     undefined  │
 │    The directory where planning artifacts are stored. If not specified, defaults t…              │
 │                                                                                                  │
-│    Max Chat Model Attempts                                                                   10  │
-│    Maximum number of attempts for requests to the main chat model. Cannot exceed 10.             │
-│                                                                                                  │
 │    Debug Keystroke Logging                                                                false  │
 │    Enable debug logging of keystrokes to the console.                                            │
 │                                                                                                  │
 │    Enable Session Cleanup                                                                 false  │
 │    Enable automatic session cleanup                                                              │
 │                                                                                                  │
+│    Keep chat history                                                                  undefined  │
+│    Automatically delete chats older than this time period (e.g., "30d", "7d", "24h…              │
+│                                                                                                  │
 │  ▼                                                                                               │
 │                                                                                                  │
 │    Apply To                                                                                      │
@@ -260,15 +260,15 @@ exports[`SettingsDialog > Snapshot Tests > should render 'focused on scope selec
 │    Plan Directory                                                                     undefined  │
 │    The directory where planning artifacts are stored. If not specified, defaults t…              │
 │                                                                                                  │
-│    Max Chat Model Attempts                                                                   10  │
-│    Maximum number of attempts for requests to the main chat model. Cannot exceed 10.             │
-│                                                                                                  │
 │    Debug Keystroke Logging                                                                false  │
 │    Enable debug logging of keystrokes to the console.                                            │
 │                                                                                                  │
 │    Enable Session Cleanup                                                                 false  │
 │    Enable automatic session cleanup                                                              │
 │                                                                                                  │
+│    Keep chat history                                                                  undefined  │
+│    Automatically delete chats older than this time period (e.g., "30d", "7d", "24h…              │
+│                                                                                                  │
 │  ▼                                                                                               │
 │                                                                                                  │
 │  > Apply To                                                                                      │
@@ -307,15 +307,15 @@ exports[`SettingsDialog > Snapshot Tests > should render 'mixed boolean and numb
 │    Plan Directory                                                                     undefined  │
 │    The directory where planning artifacts are stored. If not specified, defaults t…              │
 │                                                                                                  │
-│    Max Chat Model Attempts                                                                   10  │
-│    Maximum number of attempts for requests to the main chat model. Cannot exceed 10.             │
-│                                                                                                  │
 │    Debug Keystroke Logging                                                                false  │
 │    Enable debug logging of keystrokes to the console.                                            │
 │                                                                                                  │
 │    Enable Session Cleanup                                                                 false  │
 │    Enable automatic session cleanup                                                              │
 │                                                                                                  │
+│    Keep chat history                                                                  undefined  │
+│    Automatically delete chats older than this time period (e.g., "30d", "7d", "24h…              │
+│                                                                                                  │
 │  ▼                                                                                               │
 │                                                                                                  │
 │    Apply To                                                                                      │
@@ -354,15 +354,15 @@ exports[`SettingsDialog > Snapshot Tests > should render 'tools and security set
 │    Plan Directory                                                                     undefined  │
 │    The directory where planning artifacts are stored. If not specified, defaults t…              │
 │                                                                                                  │
-│    Max Chat Model Attempts                                                                   10  │
-│    Maximum number of attempts for requests to the main chat model. Cannot exceed 10.             │
-│                                                                                                  │
 │    Debug Keystroke Logging                                                                false  │
 │    Enable debug logging of keystrokes to the console.                                            │
 │                                                                                                  │
 │    Enable Session Cleanup                                                                 false  │
 │    Enable automatic session cleanup                                                              │
 │                                                                                                  │
+│    Keep chat history                                                                  undefined  │
+│    Automatically delete chats older than this time period (e.g., "30d", "7d", "24h…              │
+│                                                                                                  │
 │  ▼                                                                                               │
 │                                                                                                  │
 │    Apply To                                                                                      │
@@ -401,15 +401,15 @@ exports[`SettingsDialog > Snapshot Tests > should render 'various boolean settin
 │    Plan Directory                                                                     undefined  │
 │    The directory where planning artifacts are stored. If not specified, defaults t…              │
 │                                                                                                  │
-│    Max Chat Model Attempts                                                                   10  │
-│    Maximum number of attempts for requests to the main chat model. Cannot exceed 10.             │
-│                                                                                                  │
 │    Debug Keystroke Logging                                                                true*  │
 │    Enable debug logging of keystrokes to the console.                                            │
 │                                                                                                  │
 │    Enable Session Cleanup                                                                 false  │
 │    Enable automatic session cleanup                                                              │
 │                                                                                                  │
+│    Keep chat history                                                                  undefined  │
+│    Automatically delete chats older than this time period (e.g., "30d", "7d", "24h…              │
+│                                                                                                  │
 │  ▼                                                                                               │
 │                                                                                                  │
 │    Apply To                                                                                      │

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

@@ -1,8 +1,7 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`ShortcutsHelp > renders correctly in 'narrow' mode on 'linux' 1`] = `
-"────────────────────────────────────────
- Shortcuts See /help for more
+"── Shortcuts (for more, see /help) ─────
  ! shell mode
  @ select file or folder
  Esc Esc clear & rewind
@@ -17,8 +16,7 @@ exports[`ShortcutsHelp > renders correctly in 'narrow' mode on 'linux' 1`] = `
 `;
 
 exports[`ShortcutsHelp > renders correctly in 'narrow' mode on 'mac' 1`] = `
-"────────────────────────────────────────
- Shortcuts See /help for more
+"── Shortcuts (for more, see /help) ─────
  ! shell mode
  @ select file or folder
  Esc Esc clear & rewind
@@ -33,8 +31,7 @@ exports[`ShortcutsHelp > renders correctly in 'narrow' mode on 'mac' 1`] = `
 `;
 
 exports[`ShortcutsHelp > renders correctly in 'wide' mode on 'linux' 1`] = `
-"────────────────────────────────────────────────────────────────────────────────────────────────────
- Shortcuts See /help for more
+"── Shortcuts (for more, see /help) ─────────────────────────────────────────────────────────────────
  ! shell mode                    Shift+Tab cycle mode            Ctrl+V paste images
  @ select file or folder         Ctrl+Y YOLO mode                Alt+M raw markdown mode
  Esc Esc clear & rewind          Ctrl+R reverse-search history   Ctrl+X open external editor
@@ -43,8 +40,7 @@ exports[`ShortcutsHelp > renders correctly in 'wide' mode on 'linux' 1`] = `
 `;
 
 exports[`ShortcutsHelp > renders correctly in 'wide' mode on 'mac' 1`] = `
-"────────────────────────────────────────────────────────────────────────────────────────────────────
- Shortcuts See /help for more
+"── Shortcuts (for more, see /help) ─────────────────────────────────────────────────────────────────
  ! shell mode                    Shift+Tab cycle mode            Ctrl+V paste images
  @ select file or folder         Ctrl+Y YOLO mode                Option+M raw markdown mode
  Esc Esc clear & rewind          Ctrl+R reverse-search history   Ctrl+X open external editor

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

@@ -58,10 +58,7 @@ export const ShellToolMessage: React.FC<ShellToolMessageProps> = ({
   borderColor,
 
   borderDimColor,
-
   isExpandable,
-
-  originalRequestName,
 }) => {
   const {
     activePtyId: activeShellPtyId,
@@ -132,7 +129,6 @@ export const ShellToolMessage: React.FC<ShellToolMessageProps> = ({
           status={status}
           description={description}
           emphasis={emphasis}
-          originalRequestName={originalRequestName}
         />
 
         <FocusHint

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

@@ -520,77 +520,4 @@ describe('ToolConfirmationMessage', () => {
     expect(output).toMatchSnapshot();
     unmount();
   });
-
-  it('should show MCP tool details expand hint for MCP confirmations', async () => {
-    const confirmationDetails: ToolCallConfirmationDetails = {
-      type: 'mcp',
-      title: 'Confirm MCP Tool',
-      serverName: 'test-server',
-      toolName: 'test-tool',
-      toolDisplayName: 'Test Tool',
-      toolArgs: {
-        url: 'https://www.google.co.jp',
-      },
-      toolDescription: 'Navigates browser to a URL.',
-      toolParameterSchema: {
-        type: 'object',
-        properties: {
-          url: {
-            type: 'string',
-            description: 'Destination URL',
-          },
-        },
-        required: ['url'],
-      },
-      onConfirm: vi.fn(),
-    };
-
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
-      <ToolConfirmationMessage
-        callId="test-call-id"
-        confirmationDetails={confirmationDetails}
-        config={mockConfig}
-        availableTerminalHeight={30}
-        terminalWidth={80}
-      />,
-    );
-    await waitUntilReady();
-
-    const output = lastFrame();
-    expect(output).toContain('MCP Tool Details:');
-    expect(output).toContain('(press Ctrl+O to expand MCP tool details)');
-    expect(output).not.toContain('https://www.google.co.jp');
-    expect(output).not.toContain('Navigates browser to a URL.');
-    unmount();
-  });
-
-  it('should omit empty MCP invocation arguments from details', async () => {
-    const confirmationDetails: ToolCallConfirmationDetails = {
-      type: 'mcp',
-      title: 'Confirm MCP Tool',
-      serverName: 'test-server',
-      toolName: 'test-tool',
-      toolDisplayName: 'Test Tool',
-      toolArgs: {},
-      toolDescription: 'No arguments required.',
-      onConfirm: vi.fn(),
-    };
-
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
-      <ToolConfirmationMessage
-        callId="test-call-id"
-        confirmationDetails={confirmationDetails}
-        config={mockConfig}
-        availableTerminalHeight={30}
-        terminalWidth={80}
-      />,
-    );
-    await waitUntilReady();
-
-    const output = lastFrame();
-    expect(output).toContain('MCP Tool Details:');
-    expect(output).toContain('(press Ctrl+O to expand MCP tool details)');
-    expect(output).not.toContain('Invocation Arguments:');
-    unmount();
-  });
 });

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

@@ -5,7 +5,7 @@
  */
 
 import type React from 'react';
-import { useMemo, useCallback, useState } from 'react';
+import { useMemo, useCallback } from 'react';
 import { Box, Text } from 'ink';
 import { DiffRenderer } from './DiffRenderer.js';
 import { RenderInline } from '../../utils/InlineMarkdownRenderer.js';
@@ -29,7 +29,6 @@ import { useKeypress } from '../../hooks/useKeypress.js';
 import { theme } from '../../semantic-colors.js';
 import { useSettings } from '../../contexts/SettingsContext.js';
 import { keyMatchers, Command } from '../../keyMatchers.js';
-import { formatCommand } from '../../utils/keybindingUtils.js';
 import {
   REDIRECTION_WARNING_NOTE_LABEL,
   REDIRECTION_WARNING_NOTE_TEXT,
@@ -65,17 +64,6 @@ export const ToolConfirmationMessage: React.FC<
   terminalWidth,
 }) => {
   const { confirm, isDiffingEnabled } = useToolActions();
-  const [mcpDetailsExpansionState, setMcpDetailsExpansionState] = useState<{
-    callId: string;
-    expanded: boolean;
-  }>({
-    callId,
-    expanded: false,
-  });
-  const isMcpToolDetailsExpanded =
-    mcpDetailsExpansionState.callId === callId
-      ? mcpDetailsExpansionState.expanded
-      : false;
 
   const settings = useSettings();
   const allowPermanentApproval =
@@ -98,81 +86,9 @@ export const ToolConfirmationMessage: React.FC<
     [confirm, callId],
   );
 
-  const mcpToolDetailsText = useMemo(() => {
-    if (confirmationDetails.type !== 'mcp') {
-      return null;
-    }
-
-    const detailsLines: string[] = [];
-    const hasNonEmptyToolArgs =
-      confirmationDetails.toolArgs !== undefined &&
-      !(
-        typeof confirmationDetails.toolArgs === 'object' &&
-        confirmationDetails.toolArgs !== null &&
-        Object.keys(confirmationDetails.toolArgs).length === 0
-      );
-    if (hasNonEmptyToolArgs) {
-      let argsText: string;
-      try {
-        argsText = stripUnsafeCharacters(
-          JSON.stringify(confirmationDetails.toolArgs, null, 2),
-        );
-      } catch {
-        argsText = '[unserializable arguments]';
-      }
-      detailsLines.push('Invocation Arguments:');
-      detailsLines.push(argsText);
-    }
-
-    const description = confirmationDetails.toolDescription?.trim();
-    if (description) {
-      if (detailsLines.length > 0) {
-        detailsLines.push('');
-      }
-      detailsLines.push('Description:');
-      detailsLines.push(stripUnsafeCharacters(description));
-    }
-
-    if (confirmationDetails.toolParameterSchema !== undefined) {
-      let schemaText: string;
-      try {
-        schemaText = stripUnsafeCharacters(
-          JSON.stringify(confirmationDetails.toolParameterSchema, null, 2),
-        );
-      } catch {
-        schemaText = '[unserializable schema]';
-      }
-      if (detailsLines.length > 0) {
-        detailsLines.push('');
-      }
-      detailsLines.push('Input Schema:');
-      detailsLines.push(schemaText);
-    }
-
-    if (detailsLines.length === 0) {
-      return null;
-    }
-
-    return detailsLines.join('\n');
-  }, [confirmationDetails]);
-
-  const hasMcpToolDetails = !!mcpToolDetailsText;
-  const expandDetailsHintKey = formatCommand(Command.SHOW_MORE_LINES);
-
   useKeypress(
     (key) => {
       if (!isFocused) return false;
-      if (
-        confirmationDetails.type === 'mcp' &&
-        hasMcpToolDetails &&
-        keyMatchers[Command.SHOW_MORE_LINES](key)
-      ) {
-        setMcpDetailsExpansionState({
-          callId,
-          expanded: !isMcpToolDetailsExpanded,
-        });
-        return true;
-      }
       if (keyMatchers[Command.ESCAPE](key)) {
         handleConfirm(ToolConfirmationOutcome.Cancel);
         return true;
@@ -184,7 +100,7 @@ export const ToolConfirmationMessage: React.FC<
       }
       return false;
     },
-    { isActive: isFocused, priority: true },
+    { isActive: isFocused },
   );
 
   const handleSelect = useCallback(
@@ -588,31 +504,12 @@ export const ToolConfirmationMessage: React.FC<
 
       bodyContent = (
         <Box flexDirection="column">
-          <>
-            <Text color={theme.text.link}>
-              MCP Server: {sanitizeForDisplay(mcpProps.serverName)}
-            </Text>
-            <Text color={theme.text.link}>
-              Tool: {sanitizeForDisplay(mcpProps.toolName)}
-            </Text>
-          </>
-          {hasMcpToolDetails && (
-            <Box flexDirection="column" marginTop={1}>
-              <Text color={theme.text.primary}>MCP Tool Details:</Text>
-              {isMcpToolDetailsExpanded ? (
-                <>
-                  <Text color={theme.text.secondary}>
-                    (press {expandDetailsHintKey} to collapse MCP tool details)
-                  </Text>
-                  <Text color={theme.text.link}>{mcpToolDetailsText}</Text>
-                </>
-              ) : (
-                <Text color={theme.text.secondary}>
-                  (press {expandDetailsHintKey} to expand MCP tool details)
-                </Text>
-              )}
-            </Box>
-          )}
+          <Text color={theme.text.link}>
+            MCP Server: {sanitizeForDisplay(mcpProps.serverName)}
+          </Text>
+          <Text color={theme.text.link}>
+            Tool: {sanitizeForDisplay(mcpProps.toolName)}
+          </Text>
         </Box>
       );
     }
@@ -625,17 +522,8 @@ export const ToolConfirmationMessage: React.FC<
     terminalWidth,
     handleConfirm,
     deceptiveUrlWarningText,
-    isMcpToolDetailsExpanded,
-    hasMcpToolDetails,
-    mcpToolDetailsText,
-    expandDetailsHintKey,
   ]);
 
-  const bodyOverflowDirection: 'top' | 'bottom' =
-    confirmationDetails.type === 'mcp' && isMcpToolDetailsExpanded
-      ? 'bottom'
-      : 'top';
-
   if (confirmationDetails.type === 'edit') {
     if (confirmationDetails.isModifying) {
       return (
@@ -671,7 +559,7 @@ export const ToolConfirmationMessage: React.FC<
             <MaxSizedBox
               maxHeight={availableBodyContentHeight()}
               maxWidth={terminalWidth}
-              overflowDirection={bodyOverflowDirection}
+              overflowDirection="top"
             >
               {bodyContent}
             </MaxSizedBox>

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

@@ -375,25 +375,20 @@ describe('<ToolMessage />', () => {
     unmount();
   });
 
-  it('renders McpProgressIndicator with percentage and message for executing tools', async () => {
+  it('renders progress information appended to description for executing tools', async () => {
     const { lastFrame, waitUntilReady, unmount } = renderWithContext(
       <ToolMessage
         {...baseProps}
         status={CoreToolCallStatus.Executing}
-        progress={42}
-        progressTotal={100}
         progressMessage="Working on it..."
+        progressPercent={42}
       />,
       StreamingState.Responding,
     );
     await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('42%');
-    expect(output).toContain('Working on it...');
-    expect(output).toContain('\u2588');
-    expect(output).toContain('\u2591');
-    expect(output).not.toContain('A tool for testing (Working on it... - 42%)');
-    expect(output).toMatchSnapshot();
+    expect(lastFrame()).toContain(
+      'A tool for testing (Working on it... - 42%)',
+    );
     unmount();
   });
 
@@ -402,37 +397,12 @@ describe('<ToolMessage />', () => {
       <ToolMessage
         {...baseProps}
         status={CoreToolCallStatus.Executing}
-        progress={75}
-        progressTotal={100}
+        progressPercent={75}
       />,
       StreamingState.Responding,
     );
     await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('75%');
-    expect(output).toContain('\u2588');
-    expect(output).toContain('\u2591');
-    expect(output).not.toContain('A tool for testing (75%)');
-    expect(output).toMatchSnapshot();
-    unmount();
-  });
-
-  it('renders indeterminate progress when total is missing', async () => {
-    const { lastFrame, waitUntilReady, unmount } = renderWithContext(
-      <ToolMessage
-        {...baseProps}
-        status={CoreToolCallStatus.Executing}
-        progress={7}
-      />,
-      StreamingState.Responding,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('7');
-    expect(output).toContain('\u2588');
-    expect(output).toContain('\u2591');
-    expect(output).not.toContain('%');
-    expect(output).toMatchSnapshot();
+    expect(lastFrame()).toContain('A tool for testing (75%)');
     unmount();
   });
 });

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

@@ -13,7 +13,6 @@ import {
   ToolStatusIndicator,
   ToolInfo,
   TrailingIndicator,
-  McpProgressIndicator,
   type TextEmphasis,
   STATUS_INDICATOR_WIDTH,
   isThisShellFocusable as checkIsShellFocusable,
@@ -21,7 +20,7 @@ import {
   useFocusHint,
   FocusHint,
 } from './ToolShared.js';
-import { type Config, CoreToolCallStatus } from '@google/gemini-cli-core';
+import { type Config } from '@google/gemini-cli-core';
 import { ShellInputPrompt } from '../ShellInputPrompt.js';
 
 export type { TextEmphasis };
@@ -57,9 +56,7 @@ export const ToolMessage: React.FC<ToolMessageProps> = ({
   ptyId,
   config,
   progressMessage,
-  originalRequestName,
-  progress,
-  progressTotal,
+  progressPercent,
 }) => {
   const isThisShellFocused = checkIsShellFocused(
     name,
@@ -94,7 +91,8 @@ export const ToolMessage: React.FC<ToolMessageProps> = ({
           status={status}
           description={description}
           emphasis={emphasis}
-          originalRequestName={originalRequestName}
+          progressMessage={progressMessage}
+          progressPercent={progressPercent}
         />
         <FocusHint
           shouldShowFocusHint={shouldShowFocusHint}
@@ -114,14 +112,6 @@ export const ToolMessage: React.FC<ToolMessageProps> = ({
         paddingX={1}
         flexDirection="column"
       >
-        {status === CoreToolCallStatus.Executing && progress !== undefined && (
-          <McpProgressIndicator
-            progress={progress}
-            total={progressTotal}
-            message={progressMessage}
-            barWidth={20}
-          />
-        )}
         <ToolResultDisplay
           resultDisplay={resultDisplay}
           availableTerminalHeight={availableTerminalHeight}

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

@@ -1,72 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect, vi } from 'vitest';
-import { render } from '../../../test-utils/render.js';
-import { Text } from 'ink';
-import { McpProgressIndicator } from './ToolShared.js';
-
-vi.mock('../GeminiRespondingSpinner.js', () => ({
-  GeminiRespondingSpinner: () => <Text>MockSpinner</Text>,
-}));
-
-describe('McpProgressIndicator', () => {
-  it('renders determinate progress at 50%', async () => {
-    const { lastFrame, waitUntilReady } = render(
-      <McpProgressIndicator progress={50} total={100} barWidth={20} />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toMatchSnapshot();
-    expect(output).toContain('50%');
-  });
-
-  it('renders complete progress at 100%', async () => {
-    const { lastFrame, waitUntilReady } = render(
-      <McpProgressIndicator progress={100} total={100} barWidth={20} />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toMatchSnapshot();
-    expect(output).toContain('100%');
-  });
-
-  it('renders indeterminate progress with raw count', async () => {
-    const { lastFrame, waitUntilReady } = render(
-      <McpProgressIndicator progress={7} barWidth={20} />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toMatchSnapshot();
-    expect(output).toContain('7');
-    expect(output).not.toContain('%');
-  });
-
-  it('renders progress with a message', async () => {
-    const { lastFrame, waitUntilReady } = render(
-      <McpProgressIndicator
-        progress={30}
-        total={100}
-        message="Downloading..."
-        barWidth={20}
-      />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toMatchSnapshot();
-    expect(output).toContain('Downloading...');
-  });
-
-  it('clamps progress exceeding total to 100%', async () => {
-    const { lastFrame, waitUntilReady } = render(
-      <McpProgressIndicator progress={150} total={100} barWidth={20} />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('100%');
-    expect(output).not.toContain('150%');
-  });
-});

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

@@ -187,7 +187,8 @@ type ToolInfoProps = {
   description: string;
   status: CoreToolCallStatus;
   emphasis: TextEmphasis;
-  originalRequestName?: string;
+  progressMessage?: string;
+  progressPercent?: number;
 };
 
 export const ToolInfo: React.FC<ToolInfoProps> = ({
@@ -195,7 +196,8 @@ export const ToolInfo: React.FC<ToolInfoProps> = ({
   description,
   status: coreStatus,
   emphasis,
-  originalRequestName,
+  progressMessage,
+  progressPercent,
 }) => {
   const status = mapCoreStatusToDisplayStatus(coreStatus);
   const nameColor = React.useMemo<string>(() => {
@@ -216,22 +218,34 @@ export const ToolInfo: React.FC<ToolInfoProps> = ({
   // Hide description for completed Ask User tools (the result display speaks for itself)
   const isCompletedAskUser = isCompletedAskUserTool(name, status);
 
+  let displayDescription = description;
+  if (status === ToolCallStatus.Executing) {
+    const parts: string[] = [];
+    if (progressMessage) {
+      parts.push(progressMessage);
+    }
+    if (progressPercent !== undefined) {
+      parts.push(`${Math.round(progressPercent)}%`);
+    }
+
+    if (parts.length > 0) {
+      const progressInfo = parts.join(' - ');
+      displayDescription = description
+        ? `${description} (${progressInfo})`
+        : progressInfo;
+    }
+  }
+
   return (
     <Box overflow="hidden" height={1} flexGrow={1} flexShrink={1}>
       <Text strikethrough={status === ToolCallStatus.Canceled} wrap="truncate">
         <Text color={nameColor} bold>
           {name}
         </Text>
-        {originalRequestName && originalRequestName !== name && (
-          <Text color={theme.text.secondary} italic>
-            {' '}
-            (redirection from {originalRequestName})
-          </Text>
-        )}
         {!isCompletedAskUser && (
           <>
             {' '}
-            <Text color={theme.text.secondary}>{description}</Text>
+            <Text color={theme.text.secondary}>{displayDescription}</Text>
           </>
         )}
       </Text>
@@ -239,54 +253,6 @@ export const ToolInfo: React.FC<ToolInfoProps> = ({
   );
 };
 
-export interface McpProgressIndicatorProps {
-  progress: number;
-  total?: number;
-  message?: string;
-  barWidth: number;
-}
-
-export const McpProgressIndicator: React.FC<McpProgressIndicatorProps> = ({
-  progress,
-  total,
-  message,
-  barWidth,
-}) => {
-  const percentage =
-    total && total > 0
-      ? Math.min(100, Math.round((progress / total) * 100))
-      : null;
-
-  let rawFilled: number;
-  if (total && total > 0) {
-    rawFilled = Math.round((progress / total) * barWidth);
-  } else {
-    rawFilled = Math.floor(progress) % (barWidth + 1);
-  }
-
-  const filled = Math.max(
-    0,
-    Math.min(Number.isFinite(rawFilled) ? rawFilled : 0, barWidth),
-  );
-  const empty = Math.max(0, barWidth - filled);
-  const progressBar = '\u2588'.repeat(filled) + '\u2591'.repeat(empty);
-
-  return (
-    <Box flexDirection="column">
-      <Box>
-        <Text color={theme.text.accent}>
-          {progressBar} {percentage !== null ? `${percentage}%` : `${progress}`}
-        </Text>
-      </Box>
-      {message && (
-        <Text color={theme.text.secondary} wrap="truncate">
-          {message}
-        </Text>
-      )}
-    </Box>
-  );
-};
-
 export const TrailingIndicator: React.FC = () => (
   <Text color={theme.text.primary} wrap="truncate">
     {' '}

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

@@ -15,6 +15,7 @@ import {
   calculateTransformedLine,
 } from '../shared/text-buffer.js';
 import { HalfLinePaddedBox } from '../shared/HalfLinePaddedBox.js';
+import { DEFAULT_BACKGROUND_OPACITY } from '../../constants.js';
 import { useConfig } from '../../contexts/ConfigContext.js';
 
 interface UserMessageProps {
@@ -51,8 +52,8 @@ export const UserMessage: React.FC<UserMessageProps> = ({ text, width }) => {
 
   return (
     <HalfLinePaddedBox
-      backgroundBaseColor={theme.background.message}
-      backgroundOpacity={1}
+      backgroundBaseColor={theme.text.secondary}
+      backgroundOpacity={DEFAULT_BACKGROUND_OPACITY}
       useBackgroundColor={useBackgroundColor}
     >
       <Box

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

@@ -8,6 +8,7 @@ import type React from 'react';
 import { Box, Text } from 'ink';
 import { theme } from '../../semantic-colors.js';
 import { HalfLinePaddedBox } from '../shared/HalfLinePaddedBox.js';
+import { DEFAULT_BACKGROUND_OPACITY } from '../../constants.js';
 import { useConfig } from '../../contexts/ConfigContext.js';
 
 interface UserShellMessageProps {
@@ -27,8 +28,8 @@ export const UserShellMessage: React.FC<UserShellMessageProps> = ({
 
   return (
     <HalfLinePaddedBox
-      backgroundBaseColor={theme.background.message}
-      backgroundOpacity={1}
+      backgroundBaseColor={theme.text.secondary}
+      backgroundOpacity={DEFAULT_BACKGROUND_OPACITY}
       useBackgroundColor={useBackgroundColor}
     >
       <Box

packages/cli/src/ui/components/messages/__snapshots__/ToolMessage.test.tsx.snap

@@ -92,16 +92,6 @@ exports[`<ToolMessage /> > renders DiffRenderer for diff results 1`] = `
 "
 `;
 
-exports[`<ToolMessage /> > renders McpProgressIndicator with percentage and message for executing tools 1`] = `
-"╭──────────────────────────────────────────────────────────────────────────────╮
-│ MockRespondingSpinnertest-tool A tool for testing                            │
-│                                                                              │
-│ ████████░░░░░░░░░░░░ 42%                                                     │
-│ Working on it...                                                             │
-│ Test result                                                                  │
-"
-`;
-
 exports[`<ToolMessage /> > renders basic tool information 1`] = `
 "╭──────────────────────────────────────────────────────────────────────────────╮
 │ ✓  test-tool A tool for testing                                              │
@@ -125,21 +115,3 @@ exports[`<ToolMessage /> > renders emphasis correctly 2`] = `
 │ Test result                                                                  │
 "
 `;
-
-exports[`<ToolMessage /> > renders indeterminate progress when total is missing 1`] = `
-"╭──────────────────────────────────────────────────────────────────────────────╮
-│ MockRespondingSpinnertest-tool A tool for testing                            │
-│                                                                              │
-│ ███████░░░░░░░░░░░░░ 7                                                       │
-│ Test result                                                                  │
-"
-`;
-
-exports[`<ToolMessage /> > renders only percentage when progressMessage is missing 1`] = `
-"╭──────────────────────────────────────────────────────────────────────────────╮
-│ MockRespondingSpinnertest-tool A tool for testing                            │
-│                                                                              │
-│ ███████████████░░░░░ 75%                                                     │
-│ Test result                                                                  │
-"
-`;

packages/cli/src/ui/components/messages/__snapshots__/ToolShared.test.tsx.snap

@@ -1,22 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`McpProgressIndicator > renders complete progress at 100% 1`] = `
-"████████████████████ 100%
-"
-`;
-
-exports[`McpProgressIndicator > renders determinate progress at 50% 1`] = `
-"██████████░░░░░░░░░░ 50%
-"
-`;
-
-exports[`McpProgressIndicator > renders indeterminate progress with raw count 1`] = `
-"███████░░░░░░░░░░░░░ 7
-"
-`;
-
-exports[`McpProgressIndicator > renders progress with a message 1`] = `
-"██████░░░░░░░░░░░░░░ 30%
-Downloading...
-"
-`;

packages/cli/src/ui/components/shared/SectionHeader.test.tsx

@@ -30,15 +30,9 @@ describe('<SectionHeader />', () => {
       title: 'Narrow Container',
       width: 25,
     },
-    {
-      description: 'renders correctly with a subtitle',
-      title: 'Shortcuts',
-      subtitle: ' See /help for more',
-      width: 40,
-    },
-  ])('$description', async ({ title, subtitle, width }) => {
+  ])('$description', async ({ title, width }) => {
     const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
-      <SectionHeader title={title} subtitle={subtitle} />,
+      <SectionHeader title={title} />,
       { width },
     );
     await waitUntilReady();

packages/cli/src/ui/components/shared/SectionHeader.tsx

@@ -8,13 +8,16 @@ import type React from 'react';
 import { Box, Text } from 'ink';
 import { theme } from '../../semantic-colors.js';
 
-export const SectionHeader: React.FC<{ title: string; subtitle?: string }> = ({
-  title,
-  subtitle,
-}) => (
-  <Box width="100%" flexDirection="column" overflow="hidden">
+export const SectionHeader: React.FC<{ title: string }> = ({ title }) => (
+  <Box width="100%" flexDirection="row" overflow="hidden">
+    <Text color={theme.text.secondary} wrap="truncate-end">
+      {`── ${title}`}
+    </Text>
     <Box
-      width="100%"
+      flexGrow={1}
+      flexShrink={0}
+      minWidth={2}
+      marginLeft={1}
       borderStyle="single"
       borderTop
       borderBottom={false}
@@ -22,15 +25,5 @@ export const SectionHeader: React.FC<{ title: string; subtitle?: string }> = ({
       borderRight={false}
       borderColor={theme.text.secondary}
     />
-    <Box flexDirection="row">
-      <Text color={theme.text.primary} bold wrap="truncate-end">
-        {title}
-      </Text>
-      {subtitle && (
-        <Text color={theme.text.secondary} wrap="truncate-end">
-          {subtitle}
-        </Text>
-      )}
-    </Box>
   </Box>
 );

packages/cli/src/ui/components/shared/__snapshots__/SectionHeader.test.tsx.snap

@@ -1,25 +1,16 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`<SectionHeader /> > 'renders correctly in a narrow contain…' 1`] = `
-"─────────────────────────
-Narrow Container
+"── Narrow Container ─────
 "
 `;
 
 exports[`<SectionHeader /> > 'renders correctly when title is trunc…' 1`] = `
-"────────────────────
-Very Long Header Ti…
+"── Very Long Hea… ──
 "
 `;
 
 exports[`<SectionHeader /> > 'renders correctly with a standard tit…' 1`] = `
-"────────────────────────────────────────
-My Header
-"
-`;
-
-exports[`<SectionHeader /> > 'renders correctly with a subtitle' 1`] = `
-"────────────────────────────────────────
-Shortcuts See /help for more
+"── My Header ───────────────────────────
 "
 `;

packages/cli/src/ui/constants.ts

@@ -37,7 +37,7 @@ export const EXPAND_HINT_DURATION_MS = 5000;
 
 export const DEFAULT_BACKGROUND_OPACITY = 0.16;
 export const DEFAULT_INPUT_BACKGROUND_OPACITY = 0.24;
-export const DEFAULT_BORDER_OPACITY = 0.4;
+export const DEFAULT_BORDER_OPACITY = 0.2;
 
 export const KEYBOARD_SHORTCUTS_URL =
   'https://geminicli.com/docs/cli/keyboard-shortcuts/';

packages/cli/src/ui/hooks/shell-completions/gitProvider.test.ts

@@ -0,0 +1,131 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { gitProvider } from './gitProvider.js';
+import * as childProcess from 'node:child_process';
+
+vi.mock('node:child_process', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('node:child_process')>();
+  return {
+    ...actual,
+    execFile: vi.fn(),
+  };
+});
+
+describe('gitProvider', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('suggests git subcommands for cursorIndex 1', async () => {
+    const result = await gitProvider.getCompletions(['git', 'ch'], 1, '/tmp');
+
+    expect(result.exclusive).toBe(true);
+    expect(result.suggestions).toEqual(
+      expect.arrayContaining([expect.objectContaining({ value: 'checkout' })]),
+    );
+    expect(
+      result.suggestions.find((s) => s.value === 'commit'),
+    ).toBeUndefined();
+  });
+
+  it('suggests branch names for checkout at cursorIndex 2', async () => {
+    vi.mocked(childProcess.execFile).mockImplementation(
+      (_cmd, _args, _opts, cb: unknown) => {
+        const callback = (typeof _opts === 'function' ? _opts : cb) as (
+          error: Error | null,
+          result: { stdout: string },
+        ) => void;
+        callback(null, {
+          stdout: 'main\nfeature-branch\nfix/bug\nbranch(with)special\n',
+        });
+        return {} as ReturnType<typeof childProcess.execFile>;
+      },
+    );
+
+    const result = await gitProvider.getCompletions(
+      ['git', 'checkout', 'feat'],
+      2,
+      '/tmp',
+    );
+
+    expect(result.exclusive).toBe(true);
+    expect(result.suggestions).toHaveLength(1);
+    expect(result.suggestions[0].label).toBe('feature-branch');
+    expect(result.suggestions[0].value).toBe('feature-branch');
+    expect(childProcess.execFile).toHaveBeenCalledWith(
+      'git',
+      ['branch', '--format=%(refname:short)'],
+      expect.any(Object),
+      expect.any(Function),
+    );
+  });
+
+  it('escapes branch names with shell metacharacters', async () => {
+    vi.mocked(childProcess.execFile).mockImplementation(
+      (_cmd, _args, _opts, cb: unknown) => {
+        const callback = (typeof _opts === 'function' ? _opts : cb) as (
+          error: Error | null,
+          result: { stdout: string },
+        ) => void;
+        callback(null, { stdout: 'main\nbranch(with)special\n' });
+        return {} as ReturnType<typeof childProcess.execFile>;
+      },
+    );
+
+    const result = await gitProvider.getCompletions(
+      ['git', 'checkout', 'branch('],
+      2,
+      '/tmp',
+    );
+
+    expect(result.exclusive).toBe(true);
+    expect(result.suggestions).toHaveLength(1);
+    expect(result.suggestions[0].label).toBe('branch(with)special');
+
+    // On Windows, space escape is not done. But since UNIX_SHELL_SPECIAL_CHARS is mostly tested,
+    // we can use a matcher that checks if escaping was applied (it differs per platform but that's handled by escapeShellPath).
+    // Let's match the value against either unescaped (win) or escaped (unix).
+    const isWin = process.platform === 'win32';
+    expect(result.suggestions[0].value).toBe(
+      isWin ? 'branch(with)special' : 'branch\\(with\\)special',
+    );
+  });
+
+  it('returns empty results if git branch fails', async () => {
+    vi.mocked(childProcess.execFile).mockImplementation(
+      (_cmd, _args, _opts, cb: unknown) => {
+        const callback = (typeof _opts === 'function' ? _opts : cb) as (
+          error: Error,
+          stdout?: string,
+        ) => void;
+        callback(new Error('Not a git repository'));
+        return {} as ReturnType<typeof childProcess.execFile>;
+      },
+    );
+
+    const result = await gitProvider.getCompletions(
+      ['git', 'checkout', ''],
+      2,
+      '/tmp',
+    );
+
+    expect(result.exclusive).toBe(true);
+    expect(result.suggestions).toHaveLength(0);
+  });
+
+  it('returns non-exclusive for unrecognized position', async () => {
+    const result = await gitProvider.getCompletions(
+      ['git', 'commit', '-m', 'some message'],
+      3,
+      '/tmp',
+    );
+
+    expect(result.exclusive).toBe(false);
+    expect(result.suggestions).toHaveLength(0);
+  });
+});

packages/cli/src/ui/hooks/shell-completions/gitProvider.ts

@@ -0,0 +1,93 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { execFile } from 'node:child_process';
+import { promisify } from 'node:util';
+import type { ShellCompletionProvider, CompletionResult } from './types.js';
+import { escapeShellPath } from '../useShellCompletion.js';
+
+const execFileAsync = promisify(execFile);
+
+const GIT_SUBCOMMANDS = [
+  'add',
+  'branch',
+  'checkout',
+  'commit',
+  'diff',
+  'merge',
+  'pull',
+  'push',
+  'rebase',
+  'status',
+  'switch',
+];
+
+export const gitProvider: ShellCompletionProvider = {
+  command: 'git',
+  async getCompletions(
+    tokens: string[],
+    cursorIndex: number,
+    cwd: string,
+    signal?: AbortSignal,
+  ): Promise<CompletionResult> {
+    // We are completing the first argument (subcommand)
+    if (cursorIndex === 1) {
+      const partial = tokens[1] || '';
+      return {
+        suggestions: GIT_SUBCOMMANDS.filter((cmd) =>
+          cmd.startsWith(partial),
+        ).map((cmd) => ({
+          label: cmd,
+          value: cmd,
+          description: 'git command',
+        })),
+        exclusive: true,
+      };
+    }
+
+    // We are completing the second argument (e.g. branch name)
+    if (cursorIndex === 2) {
+      const subcommand = tokens[1];
+      if (
+        subcommand === 'checkout' ||
+        subcommand === 'switch' ||
+        subcommand === 'merge' ||
+        subcommand === 'branch'
+      ) {
+        const partial = tokens[2] || '';
+        try {
+          const { stdout } = await execFileAsync(
+            'git',
+            ['branch', '--format=%(refname:short)'],
+            { cwd, signal },
+          );
+
+          const branches = stdout
+            .split('\n')
+            .map((b) => b.trim())
+            .filter(Boolean);
+
+          return {
+            suggestions: branches
+              .filter((b) => b.startsWith(partial))
+              .map((b) => ({
+                label: b,
+                value: escapeShellPath(b),
+                description: 'branch',
+              })),
+            exclusive: true,
+          };
+        } catch {
+          // If git fails (e.g. not a git repo), return nothing
+          return { suggestions: [], exclusive: true };
+        }
+      }
+    }
+
+    // Unhandled git argument, fallback to default file completions
+    return { suggestions: [], exclusive: false };
+  },
+};

packages/cli/src/ui/hooks/shell-completions/index.ts

@@ -0,0 +1,25 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import type { ShellCompletionProvider, CompletionResult } from './types.js';
+import { gitProvider } from './gitProvider.js';
+import { npmProvider } from './npmProvider.js';
+
+const providers: ShellCompletionProvider[] = [gitProvider, npmProvider];
+
+export async function getArgumentCompletions(
+  commandToken: string,
+  tokens: string[],
+  cursorIndex: number,
+  cwd: string,
+  signal?: AbortSignal,
+): Promise<CompletionResult | null> {
+  const provider = providers.find((p) => p.command === commandToken);
+  if (!provider) {
+    return null;
+  }
+  return provider.getCompletions(tokens, cursorIndex, cwd, signal);
+}

packages/cli/src/ui/hooks/shell-completions/npmProvider.test.ts

@@ -0,0 +1,106 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { npmProvider } from './npmProvider.js';
+import * as fs from 'node:fs/promises';
+
+vi.mock('node:fs/promises', () => ({
+  readFile: vi.fn(),
+}));
+
+describe('npmProvider', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('suggests npm subcommands for cursorIndex 1', async () => {
+    const result = await npmProvider.getCompletions(['npm', 'ru'], 1, '/tmp');
+
+    expect(result.exclusive).toBe(true);
+    expect(result.suggestions).toEqual([
+      expect.objectContaining({ value: 'run' }),
+    ]);
+  });
+
+  it('suggests package.json scripts for npm run at cursorIndex 2', async () => {
+    const mockPackageJson = {
+      scripts: {
+        start: 'node index.js',
+        build: 'tsc',
+        'build:dev': 'tsc --watch',
+      },
+    };
+    vi.mocked(fs.readFile).mockResolvedValue(JSON.stringify(mockPackageJson));
+
+    const result = await npmProvider.getCompletions(
+      ['npm', 'run', 'bu'],
+      2,
+      '/tmp',
+    );
+
+    expect(result.exclusive).toBe(true);
+    expect(result.suggestions).toHaveLength(2);
+    expect(result.suggestions[0].label).toBe('build');
+    expect(result.suggestions[0].value).toBe('build');
+    expect(result.suggestions[1].label).toBe('build:dev');
+    expect(result.suggestions[1].value).toBe('build:dev');
+    expect(fs.readFile).toHaveBeenCalledWith(
+      expect.stringContaining('package.json'),
+      'utf8',
+    );
+  });
+
+  it('escapes script names with shell metacharacters', async () => {
+    const mockPackageJson = {
+      scripts: {
+        'build(prod)': 'tsc',
+        'test:watch': 'vitest',
+      },
+    };
+    vi.mocked(fs.readFile).mockResolvedValue(JSON.stringify(mockPackageJson));
+
+    const result = await npmProvider.getCompletions(
+      ['npm', 'run', 'bu'],
+      2,
+      '/tmp',
+    );
+
+    expect(result.exclusive).toBe(true);
+    expect(result.suggestions).toHaveLength(1);
+    expect(result.suggestions[0].label).toBe('build(prod)');
+
+    // Windows does not escape spaces/parens in cmds by default in our function, but Unix does.
+    const isWin = process.platform === 'win32';
+    expect(result.suggestions[0].value).toBe(
+      isWin ? 'build(prod)' : 'build\\(prod\\)',
+    );
+  });
+
+  it('handles missing package.json gracefully', async () => {
+    vi.mocked(fs.readFile).mockRejectedValue(new Error('ENOENT'));
+
+    const result = await npmProvider.getCompletions(
+      ['npm', 'run', ''],
+      2,
+      '/tmp',
+    );
+
+    expect(result.exclusive).toBe(true);
+    expect(result.suggestions).toHaveLength(0);
+  });
+
+  it('returns non-exclusive for unrecognized position', async () => {
+    const result = await npmProvider.getCompletions(
+      ['npm', 'install', 'react'],
+      2,
+      '/tmp',
+    );
+
+    expect(result.exclusive).toBe(false);
+    expect(result.suggestions).toHaveLength(0);
+  });
+});

packages/cli/src/ui/hooks/shell-completions/npmProvider.ts

@@ -0,0 +1,81 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
+import type { ShellCompletionProvider, CompletionResult } from './types.js';
+import { escapeShellPath } from '../useShellCompletion.js';
+
+const NPM_SUBCOMMANDS = [
+  'build',
+  'ci',
+  'dev',
+  'install',
+  'publish',
+  'run',
+  'start',
+  'test',
+];
+
+export const npmProvider: ShellCompletionProvider = {
+  command: 'npm',
+  async getCompletions(
+    tokens: string[],
+    cursorIndex: number,
+    cwd: string,
+    signal?: AbortSignal,
+  ): Promise<CompletionResult> {
+    if (cursorIndex === 1) {
+      const partial = tokens[1] || '';
+      return {
+        suggestions: NPM_SUBCOMMANDS.filter((cmd) =>
+          cmd.startsWith(partial),
+        ).map((cmd) => ({
+          label: cmd,
+          value: cmd,
+          description: 'npm command',
+        })),
+        exclusive: true,
+      };
+    }
+
+    if (cursorIndex === 2 && tokens[1] === 'run') {
+      const partial = tokens[2] || '';
+      try {
+        if (signal?.aborted) return { suggestions: [], exclusive: true };
+
+        const pkgJsonPath = path.join(cwd, 'package.json');
+        const content = await fs.readFile(pkgJsonPath, 'utf8');
+        const pkg = JSON.parse(content) as unknown;
+
+        const scripts =
+          pkg &&
+          typeof pkg === 'object' &&
+          'scripts' in pkg &&
+          pkg.scripts &&
+          typeof pkg.scripts === 'object'
+            ? Object.keys(pkg.scripts)
+            : [];
+
+        return {
+          suggestions: scripts
+            .filter((s) => s.startsWith(partial))
+            .map((s) => ({
+              label: s,
+              value: escapeShellPath(s),
+              description: 'npm script',
+            })),
+          exclusive: true,
+        };
+      } catch {
+        // No package.json or invalid JSON
+        return { suggestions: [], exclusive: true };
+      }
+    }
+
+    return { suggestions: [], exclusive: false };
+  },
+};

packages/cli/src/ui/hooks/shell-completions/types.ts

@@ -0,0 +1,24 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import type { Suggestion } from '../../components/SuggestionsDisplay.js';
+
+export interface CompletionResult {
+  suggestions: Suggestion[];
+  // If true, this prevents the shell from appending generic file/path completions
+  // to this list. Use this when the tool expects ONLY specific values (e.g. branches).
+  exclusive?: boolean;
+}
+
+export interface ShellCompletionProvider {
+  command: string; // The command trigger, e.g., 'git' or 'npm'
+  getCompletions(
+    tokens: string[], // List of arguments parsed from the input
+    cursorIndex: number, // Which token index the cursor is currently on
+    cwd: string,
+    signal?: AbortSignal,
+  ): Promise<CompletionResult>;
+}

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

@@ -263,41 +263,6 @@ describe('toolMapping', () => {
       expect(result.borderBottom).toBe(false);
     });
 
-    it('maps raw progress and progressTotal from Executing calls', () => {
-      const toolCall: ExecutingToolCall = {
-        status: CoreToolCallStatus.Executing,
-        request: mockRequest,
-        tool: mockTool,
-        invocation: mockInvocation,
-        progressMessage: 'Downloading...',
-        progress: 5,
-        progressTotal: 10,
-      };
-
-      const result = mapToDisplay(toolCall);
-      const displayTool = result.tools[0];
-
-      expect(displayTool.progress).toBe(5);
-      expect(displayTool.progressTotal).toBe(10);
-      expect(displayTool.progressMessage).toBe('Downloading...');
-    });
-
-    it('leaves progress fields undefined for non-Executing calls', () => {
-      const toolCall: SuccessfulToolCall = {
-        status: CoreToolCallStatus.Success,
-        request: mockRequest,
-        tool: mockTool,
-        invocation: mockInvocation,
-        response: mockResponse,
-      };
-
-      const result = mapToDisplay(toolCall);
-      const displayTool = result.tools[0];
-
-      expect(displayTool.progress).toBeUndefined();
-      expect(displayTool.progressTotal).toBeUndefined();
-    });
-
     it('sets resultDisplay to undefined for pre-execution statuses', () => {
       const toolCall: ScheduledToolCall = {
         status: CoreToolCallStatus.Scheduled,
@@ -310,20 +275,5 @@ describe('toolMapping', () => {
       expect(result.tools[0].resultDisplay).toBeUndefined();
       expect(result.tools[0].status).toBe(CoreToolCallStatus.Scheduled);
     });
-
-    it('propagates originalRequestName correctly', () => {
-      const toolCall: ScheduledToolCall = {
-        status: CoreToolCallStatus.Scheduled,
-        request: {
-          ...mockRequest,
-          originalRequestName: 'original_tool',
-        },
-        tool: mockTool,
-        invocation: mockInvocation,
-      };
-
-      const result = mapToDisplay(toolCall);
-      expect(result.tools[0].originalRequestName).toBe('original_tool');
-    });
   });
 });

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

@@ -60,8 +60,7 @@ export function mapToDisplay(
     let ptyId: number | undefined = undefined;
     let correlationId: string | undefined = undefined;
     let progressMessage: string | undefined = undefined;
-    let progress: number | undefined = undefined;
-    let progressTotal: number | undefined = undefined;
+    let progressPercent: number | undefined = undefined;
 
     switch (call.status) {
       case CoreToolCallStatus.Success:
@@ -81,8 +80,7 @@ export function mapToDisplay(
         resultDisplay = call.liveOutput;
         ptyId = call.pid;
         progressMessage = call.progressMessage;
-        progress = call.progress;
-        progressTotal = call.progressTotal;
+        progressPercent = call.progressPercent;
         break;
       case CoreToolCallStatus.Scheduled:
       case CoreToolCallStatus.Validating:
@@ -107,10 +105,8 @@ export function mapToDisplay(
       ptyId,
       correlationId,
       progressMessage,
-      progress,
-      progressTotal,
+      progressPercent,
       approvalMode: call.approvalMode,
-      originalRequestName: call.request.originalRequestName,
     };
   });
 

packages/cli/src/ui/hooks/useCommandCompletion.test.tsx

@@ -28,6 +28,7 @@ import type { UseAtCompletionProps } from './useAtCompletion.js';
 import { useAtCompletion } from './useAtCompletion.js';
 import type { UseSlashCompletionProps } from './useSlashCompletion.js';
 import { useSlashCompletion } from './useSlashCompletion.js';
+import { useShellCompletion } from './useShellCompletion.js';
 
 vi.mock('./useAtCompletion', () => ({
   useAtCompletion: vi.fn(),
@@ -40,19 +41,35 @@ vi.mock('./useSlashCompletion', () => ({
   })),
 }));
 
+vi.mock('./useShellCompletion', () => ({
+  useShellCompletion: vi.fn(() => ({
+    completionStart: 0,
+    completionEnd: 0,
+    query: '',
+  })),
+}));
+
 // Helper to set up mocks in a consistent way for both child hooks
 const setupMocks = ({
   atSuggestions = [],
   slashSuggestions = [],
+  shellSuggestions = [],
   isLoading = false,
   isPerfectMatch = false,
   slashCompletionRange = { completionStart: 0, completionEnd: 0 },
+  shellCompletionRange = { completionStart: 0, completionEnd: 0, query: '' },
 }: {
   atSuggestions?: Suggestion[];
   slashSuggestions?: Suggestion[];
+  shellSuggestions?: Suggestion[];
   isLoading?: boolean;
   isPerfectMatch?: boolean;
   slashCompletionRange?: { completionStart: number; completionEnd: number };
+  shellCompletionRange?: {
+    completionStart: number;
+    completionEnd: number;
+    query: string;
+  };
 }) => {
   // Mock for @-completions
   (useAtCompletion as Mock).mockImplementation(
@@ -89,11 +106,25 @@ const setupMocks = ({
       return slashCompletionRange;
     },
   );
+
+  // Mock for shell completions
+  (useShellCompletion as Mock).mockImplementation(
+    ({ enabled, setSuggestions, setIsLoadingSuggestions }) => {
+      useEffect(() => {
+        if (enabled) {
+          setIsLoadingSuggestions(isLoading);
+          setSuggestions(shellSuggestions);
+        }
+      }, [enabled, setSuggestions, setIsLoadingSuggestions]);
+      return shellCompletionRange;
+    },
+  );
 };
 
 describe('useCommandCompletion', () => {
   const mockCommandContext = {} as CommandContext;
   const mockConfig = {
+    getEnablePromptCompletion: () => false,
     getGeminiClient: vi.fn(),
   } as unknown as Config;
   const testRootDir = '/';
@@ -498,6 +529,7 @@ describe('useCommandCompletion', () => {
   describe('prompt completion filtering', () => {
     it('should not trigger prompt completion for line comments', async () => {
       const mockConfig = {
+        getEnablePromptCompletion: () => true,
         getGeminiClient: vi.fn(),
       } as unknown as Config;
 
@@ -530,6 +562,7 @@ describe('useCommandCompletion', () => {
 
     it('should not trigger prompt completion for block comments', async () => {
       const mockConfig = {
+        getEnablePromptCompletion: () => true,
         getGeminiClient: vi.fn(),
       } as unknown as Config;
 
@@ -564,6 +597,7 @@ describe('useCommandCompletion', () => {
 
     it('should trigger prompt completion for regular text when enabled', async () => {
       const mockConfig = {
+        getEnablePromptCompletion: () => true,
         getGeminiClient: vi.fn(),
       } as unknown as Config;
 

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

@@ -13,6 +13,7 @@ import { isSlashCommand } from '../utils/commandUtils.js';
 import { toCodePoints } from '../utils/textUtils.js';
 import { useAtCompletion } from './useAtCompletion.js';
 import { useSlashCompletion } from './useSlashCompletion.js';
+import { useShellCompletion } from './useShellCompletion.js';
 import type { PromptCompletion } from './usePromptCompletion.js';
 import {
   usePromptCompletion,
@@ -26,6 +27,7 @@ export enum CompletionMode {
   AT = 'AT',
   SLASH = 'SLASH',
   PROMPT = 'PROMPT',
+  SHELL = 'SHELL',
 }
 
 export interface UseCommandCompletionReturn {
@@ -99,89 +101,105 @@ export function useCommandCompletion({
   const cursorRow = buffer.cursor[0];
   const cursorCol = buffer.cursor[1];
 
-  const { completionMode, query, completionStart, completionEnd } =
-    useMemo(() => {
-      const currentLine = buffer.lines[cursorRow] || '';
-      const codePoints = toCodePoints(currentLine);
-
-      // FIRST: Check for @ completion (scan backwards from cursor)
-      // This must happen before slash command check so that `/cmd @file`
-      // triggers file completion, not just slash command completion.
-      for (let i = cursorCol - 1; i >= 0; i--) {
-        const char = codePoints[i];
-
-        if (char === ' ') {
-          let backslashCount = 0;
-          for (let j = i - 1; j >= 0 && codePoints[j] === '\\'; j--) {
-            backslashCount++;
-          }
-          if (backslashCount % 2 === 0) {
-            break;
-          }
-        } else if (char === '@') {
-          let end = codePoints.length;
-          for (let i = cursorCol; i < codePoints.length; i++) {
-            if (codePoints[i] === ' ') {
-              let backslashCount = 0;
-              for (let j = i - 1; j >= 0 && codePoints[j] === '\\'; j--) {
-                backslashCount++;
-              }
-
-              if (backslashCount % 2 === 0) {
-                end = i;
-                break;
-              }
-            }
-          }
-          const pathStart = i + 1;
-          const partialPath = currentLine.substring(pathStart, end);
-          return {
-            completionMode: CompletionMode.AT,
-            query: partialPath,
-            completionStart: pathStart,
-            completionEnd: end,
-          };
-        }
-      }
-
-      // THEN: Check for slash command (only if no @ completion is active)
-      if (cursorRow === 0 && isSlashCommand(currentLine.trim())) {
-        return {
-          completionMode: CompletionMode.SLASH,
-          query: currentLine,
-          completionStart: 0,
-          completionEnd: currentLine.length,
-        };
-      }
-
-      // Check for prompt completion - only if enabled
-      const trimmedText = buffer.text.trim();
-      const isPromptCompletionEnabled = false;
-      if (
-        isPromptCompletionEnabled &&
-        trimmedText.length >= PROMPT_COMPLETION_MIN_LENGTH &&
-        !isSlashCommand(trimmedText) &&
-        !trimmedText.includes('@')
-      ) {
-        return {
-          completionMode: CompletionMode.PROMPT,
-          query: trimmedText,
-          completionStart: 0,
-          completionEnd: trimmedText.length,
-        };
-      }
+  const {
+    completionMode,
+    query: memoQuery,
+    completionStart,
+    completionEnd,
+  } = useMemo(() => {
+    const currentLine = buffer.lines[cursorRow] || '';
+    const codePoints = toCodePoints(currentLine);
 
+    if (shellModeActive) {
       return {
-        completionMode: CompletionMode.IDLE,
-        query: null,
+        completionMode:
+          currentLine.trim().length === 0
+            ? CompletionMode.IDLE
+            : CompletionMode.SHELL,
+        query: '',
         completionStart: -1,
         completionEnd: -1,
       };
-    }, [cursorRow, cursorCol, buffer.lines, buffer.text]);
+    }
+
+    // FIRST: Check for @ completion (scan backwards from cursor)
+    // This must happen before slash command check so that `/cmd @file`
+    // triggers file completion, not just slash command completion.
+    for (let i = cursorCol - 1; i >= 0; i--) {
+      const char = codePoints[i];
+
+      if (char === ' ') {
+        let backslashCount = 0;
+        for (let j = i - 1; j >= 0 && codePoints[j] === '\\'; j--) {
+          backslashCount++;
+        }
+        if (backslashCount % 2 === 0) {
+          break;
+        }
+      } else if (char === '@') {
+        let end = codePoints.length;
+        for (let i = cursorCol; i < codePoints.length; i++) {
+          if (codePoints[i] === ' ') {
+            let backslashCount = 0;
+            for (let j = i - 1; j >= 0 && codePoints[j] === '\\'; j--) {
+              backslashCount++;
+            }
+
+            if (backslashCount % 2 === 0) {
+              end = i;
+              break;
+            }
+          }
+        }
+        const pathStart = i + 1;
+        const partialPath = currentLine.substring(pathStart, end);
+        return {
+          completionMode: CompletionMode.AT,
+          query: partialPath,
+          completionStart: pathStart,
+          completionEnd: end,
+        };
+      }
+    }
+
+    // THEN: Check for slash command (only if no @ completion is active)
+    if (cursorRow === 0 && isSlashCommand(currentLine.trim())) {
+      return {
+        completionMode: CompletionMode.SLASH,
+        query: currentLine,
+        completionStart: 0,
+        completionEnd: currentLine.length,
+      };
+    }
+
+    // Check for prompt completion - only if enabled
+    const trimmedText = buffer.text.trim();
+    const isPromptCompletionEnabled = false;
+    if (
+      isPromptCompletionEnabled &&
+      trimmedText.length >= PROMPT_COMPLETION_MIN_LENGTH &&
+      !isSlashCommand(trimmedText) &&
+      !trimmedText.includes('@')
+    ) {
+      return {
+        completionMode: CompletionMode.PROMPT,
+        query: trimmedText,
+        completionStart: 0,
+        completionEnd: trimmedText.length,
+      };
+    }
+
+    return {
+      completionMode: CompletionMode.IDLE,
+      query: null,
+      completionStart: -1,
+      completionEnd: -1,
+    };
+  }, [cursorRow, cursorCol, buffer.lines, buffer.text, shellModeActive]);
 
   useAtCompletion({
     enabled: active && completionMode === CompletionMode.AT,
-    pattern: query || '',
+    pattern: memoQuery || '',
     config,
     cwd,
     setSuggestions,
@@ -191,7 +209,7 @@ export function useCommandCompletion({
   const slashCompletionRange = useSlashCompletion({
     enabled:
       active && completionMode === CompletionMode.SLASH && !shellModeActive,
-    query,
+    query: memoQuery,
     slashCommands,
     commandContext,
     setSuggestions,
@@ -199,9 +217,22 @@ export function useCommandCompletion({
     setIsPerfectMatch,
   });
 
+  const shellCompletionRange = useShellCompletion({
+    enabled: active && completionMode === CompletionMode.SHELL,
+    line: buffer.lines[cursorRow] || '',
+    cursorCol,
+    cwd,
+    setSuggestions,
+    setIsLoadingSuggestions,
+  });
+
+  const query =
+    completionMode === CompletionMode.SHELL
+      ? shellCompletionRange.query
+      : memoQuery;
+
   const promptCompletion = usePromptCompletion({
     buffer,
-    config,
   });
 
   useEffect(() => {
@@ -258,6 +289,9 @@ export function useCommandCompletion({
       if (completionMode === CompletionMode.SLASH) {
         start = slashCompletionRange.completionStart;
         end = slashCompletionRange.completionEnd;
+      } else if (completionMode === CompletionMode.SHELL) {
+        start = shellCompletionRange.completionStart;
+        end = shellCompletionRange.completionEnd;
       }
 
       if (start === -1 || end === -1) {
@@ -287,6 +321,7 @@ export function useCommandCompletion({
       completionStart,
       completionEnd,
       slashCompletionRange,
+      shellCompletionRange,
     ],
   );
 
@@ -307,6 +342,9 @@ export function useCommandCompletion({
       if (completionMode === CompletionMode.SLASH) {
         start = slashCompletionRange.completionStart;
         end = slashCompletionRange.completionEnd;
+      } else if (completionMode === CompletionMode.SHELL) {
+        start = shellCompletionRange.completionStart;
+        end = shellCompletionRange.completionEnd;
       }
 
       // Add space padding for Tab completion (auto-execute gets padding from getCompletedText)
@@ -345,6 +383,7 @@ export function useCommandCompletion({
       completionStart,
       completionEnd,
       slashCompletionRange,
+      shellCompletionRange,
       getCompletedText,
     ],
   );

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

@@ -0,0 +1,382 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe, it, expect, afterEach, vi } from 'vitest';
+import {
+  getTokenAtCursor,
+  escapeShellPath,
+  resolvePathCompletions,
+  scanPathExecutables,
+} from './useShellCompletion.js';
+import type { FileSystemStructure } from '@google/gemini-cli-test-utils';
+import { createTmpDir, cleanupTmpDir } from '@google/gemini-cli-test-utils';
+
+describe('useShellCompletion utilities', () => {
+  describe('getTokenAtCursor', () => {
+    it('should return empty token struct for empty line', () => {
+      expect(getTokenAtCursor('', 0)).toEqual({
+        token: '',
+        start: 0,
+        end: 0,
+        isFirstToken: true,
+        tokens: [''],
+        cursorIndex: 0,
+        commandToken: '',
+      });
+    });
+
+    it('should extract the first token at cursor position 0', () => {
+      const result = getTokenAtCursor('git status', 3);
+      expect(result).toEqual({
+        token: 'git',
+        start: 0,
+        end: 3,
+        isFirstToken: true,
+        tokens: ['git', 'status'],
+        cursorIndex: 0,
+        commandToken: 'git',
+      });
+    });
+
+    it('should extract the second token when cursor is on it', () => {
+      const result = getTokenAtCursor('git status', 7);
+      expect(result).toEqual({
+        token: 'status',
+        start: 4,
+        end: 10,
+        isFirstToken: false,
+        tokens: ['git', 'status'],
+        cursorIndex: 1,
+        commandToken: 'git',
+      });
+    });
+
+    it('should handle cursor at start of second token', () => {
+      const result = getTokenAtCursor('git status', 4);
+      expect(result).toEqual({
+        token: 'status',
+        start: 4,
+        end: 10,
+        isFirstToken: false,
+        tokens: ['git', 'status'],
+        cursorIndex: 1,
+        commandToken: 'git',
+      });
+    });
+
+    it('should handle escaped spaces', () => {
+      const result = getTokenAtCursor('cat my\\ file.txt', 16);
+      expect(result).toEqual({
+        token: 'my file.txt',
+        start: 4,
+        end: 16,
+        isFirstToken: false,
+        tokens: ['cat', 'my file.txt'],
+        cursorIndex: 1,
+        commandToken: 'cat',
+      });
+    });
+
+    it('should handle single-quoted strings', () => {
+      const result = getTokenAtCursor("cat 'my file.txt'", 17);
+      expect(result).toEqual({
+        token: 'my file.txt',
+        start: 4,
+        end: 17,
+        isFirstToken: false,
+        tokens: ['cat', 'my file.txt'],
+        cursorIndex: 1,
+        commandToken: 'cat',
+      });
+    });
+
+    it('should handle double-quoted strings', () => {
+      const result = getTokenAtCursor('cat "my file.txt"', 17);
+      expect(result).toEqual({
+        token: 'my file.txt',
+        start: 4,
+        end: 17,
+        isFirstToken: false,
+        tokens: ['cat', 'my file.txt'],
+        cursorIndex: 1,
+        commandToken: 'cat',
+      });
+    });
+
+    it('should handle cursor past all tokens (trailing space)', () => {
+      const result = getTokenAtCursor('git ', 4);
+      expect(result).toEqual({
+        token: '',
+        start: 4,
+        end: 4,
+        isFirstToken: false,
+        tokens: ['git', ''],
+        cursorIndex: 1,
+        commandToken: 'git',
+      });
+    });
+
+    it('should handle cursor in the middle of a word', () => {
+      const result = getTokenAtCursor('git checkout main', 7);
+      expect(result).toEqual({
+        token: 'checkout',
+        start: 4,
+        end: 12,
+        isFirstToken: false,
+        tokens: ['git', 'checkout', 'main'],
+        cursorIndex: 1,
+        commandToken: 'git',
+      });
+    });
+
+    it('should mark isFirstToken correctly for first word', () => {
+      const result = getTokenAtCursor('gi', 2);
+      expect(result?.isFirstToken).toBe(true);
+    });
+
+    it('should mark isFirstToken correctly for second word', () => {
+      const result = getTokenAtCursor('git sta', 7);
+      expect(result?.isFirstToken).toBe(false);
+    });
+  });
+
+  describe('escapeShellPath', () => {
+    it('should escape spaces', () => {
+      expect(escapeShellPath('my file.txt')).toBe('my\\ file.txt');
+    });
+
+    it('should escape parentheses', () => {
+      expect(escapeShellPath('file (copy).txt')).toBe('file\\ \\(copy\\).txt');
+    });
+
+    it('should not escape normal characters', () => {
+      expect(escapeShellPath('normal-file.txt')).toBe('normal-file.txt');
+    });
+
+    it('should escape tabs, newlines, carriage returns, and backslashes', () => {
+      expect(escapeShellPath('a\tb')).toBe('a\\\tb');
+      expect(escapeShellPath('a\nb')).toBe('a\\\nb');
+      expect(escapeShellPath('a\rb')).toBe('a\\\rb');
+      expect(escapeShellPath('a\\b')).toBe('a\\\\b');
+    });
+
+    it('should handle empty string', () => {
+      expect(escapeShellPath('')).toBe('');
+    });
+  });
+
+  describe('resolvePathCompletions', () => {
+    let tmpDir: string;
+
+    afterEach(async () => {
+      if (tmpDir) {
+        await cleanupTmpDir(tmpDir);
+      }
+    });
+
+    it('should list directory contents for empty partial', async () => {
+      const structure: FileSystemStructure = {
+        'file.txt': '',
+        subdir: {},
+      };
+      tmpDir = await createTmpDir(structure);
+
+      const results = await resolvePathCompletions('', tmpDir);
+      const values = results.map((s) => s.label);
+      expect(values).toContain('subdir/');
+      expect(values).toContain('file.txt');
+    });
+
+    it('should filter by prefix', async () => {
+      const structure: FileSystemStructure = {
+        'abc.txt': '',
+        'def.txt': '',
+      };
+      tmpDir = await createTmpDir(structure);
+
+      const results = await resolvePathCompletions('a', tmpDir);
+      expect(results).toHaveLength(1);
+      expect(results[0].label).toBe('abc.txt');
+    });
+
+    it('should match case-insensitively', async () => {
+      const structure: FileSystemStructure = {
+        Desktop: {},
+      };
+      tmpDir = await createTmpDir(structure);
+
+      const results = await resolvePathCompletions('desk', tmpDir);
+      expect(results).toHaveLength(1);
+      expect(results[0].label).toBe('Desktop/');
+    });
+
+    it('should append trailing slash to directories', async () => {
+      const structure: FileSystemStructure = {
+        mydir: {},
+        'myfile.txt': '',
+      };
+      tmpDir = await createTmpDir(structure);
+
+      const results = await resolvePathCompletions('my', tmpDir);
+      const dirSuggestion = results.find((s) => s.label.startsWith('mydir'));
+      expect(dirSuggestion?.label).toBe('mydir/');
+      expect(dirSuggestion?.description).toBe('directory');
+    });
+
+    it('should hide dotfiles by default', async () => {
+      const structure: FileSystemStructure = {
+        '.hidden': '',
+        visible: '',
+      };
+      tmpDir = await createTmpDir(structure);
+
+      const results = await resolvePathCompletions('', tmpDir);
+      const labels = results.map((s) => s.label);
+      expect(labels).not.toContain('.hidden');
+      expect(labels).toContain('visible');
+    });
+
+    it('should show dotfiles when query starts with a dot', async () => {
+      const structure: FileSystemStructure = {
+        '.hidden': '',
+        '.bashrc': '',
+        visible: '',
+      };
+      tmpDir = await createTmpDir(structure);
+
+      const results = await resolvePathCompletions('.h', tmpDir);
+      const labels = results.map((s) => s.label);
+      expect(labels).toContain('.hidden');
+    });
+
+    it('should show dotfiles in the current directory when query is exactly "."', async () => {
+      const structure: FileSystemStructure = {
+        '.hidden': '',
+        '.bashrc': '',
+        visible: '',
+      };
+      tmpDir = await createTmpDir(structure);
+
+      const results = await resolvePathCompletions('.', tmpDir);
+      const labels = results.map((s) => s.label);
+      expect(labels).toContain('.hidden');
+      expect(labels).toContain('.bashrc');
+      expect(labels).not.toContain('visible');
+    });
+
+    it('should handle dotfile completions within a subdirectory', async () => {
+      const structure: FileSystemStructure = {
+        subdir: {
+          '.secret': '',
+          'public.txt': '',
+        },
+      };
+      tmpDir = await createTmpDir(structure);
+
+      const results = await resolvePathCompletions('subdir/.', tmpDir);
+      const labels = results.map((s) => s.label);
+      expect(labels).toContain('.secret');
+      expect(labels).not.toContain('public.txt');
+    });
+
+    it('should strip leading quotes to resolve inner directory contents', async () => {
+      const structure: FileSystemStructure = {
+        src: {
+          'index.ts': '',
+        },
+      };
+      tmpDir = await createTmpDir(structure);
+
+      const results = await resolvePathCompletions('"src/', tmpDir);
+      expect(results).toHaveLength(1);
+      expect(results[0].label).toBe('index.ts');
+
+      const resultsSingleQuote = await resolvePathCompletions("'src/", tmpDir);
+      expect(resultsSingleQuote).toHaveLength(1);
+      expect(resultsSingleQuote[0].label).toBe('index.ts');
+    });
+
+    it('should properly escape resolutions with spaces inside stripped quote queries', async () => {
+      const structure: FileSystemStructure = {
+        'Folder With Spaces': {},
+      };
+      tmpDir = await createTmpDir(structure);
+
+      const results = await resolvePathCompletions('"Fo', tmpDir);
+      expect(results).toHaveLength(1);
+      expect(results[0].label).toBe('Folder With Spaces/');
+      expect(results[0].value).toBe(escapeShellPath('Folder With Spaces/'));
+    });
+
+    it('should return empty array for non-existent directory', async () => {
+      const results = await resolvePathCompletions(
+        '/nonexistent/path/foo',
+        '/tmp',
+      );
+      expect(results).toEqual([]);
+    });
+
+    it('should handle tilde expansion', async () => {
+      // Just ensure ~ doesn't throw
+      const results = await resolvePathCompletions('~/', '/tmp');
+      // We can't assert specific files since it depends on the test runner's home
+      expect(Array.isArray(results)).toBe(true);
+    });
+
+    it('should escape special characters in results', async () => {
+      const structure: FileSystemStructure = {
+        'my file.txt': '',
+      };
+      tmpDir = await createTmpDir(structure);
+
+      const results = await resolvePathCompletions('my', tmpDir);
+      expect(results).toHaveLength(1);
+      expect(results[0].value).toBe('my\\ file.txt');
+    });
+
+    it('should sort directories before files', async () => {
+      const structure: FileSystemStructure = {
+        'b-file.txt': '',
+        'a-dir': {},
+      };
+      tmpDir = await createTmpDir(structure);
+
+      const results = await resolvePathCompletions('', tmpDir);
+      expect(results[0].description).toBe('directory');
+      expect(results[1].description).toBe('file');
+    });
+  });
+
+  describe('scanPathExecutables', () => {
+    it('should return an array of executables', async () => {
+      const results = await scanPathExecutables();
+      expect(Array.isArray(results)).toBe(true);
+      // Very basic sanity check: common commands should be found
+      if (process.platform !== 'win32') {
+        expect(results).toContain('ls');
+      } else {
+        expect(results).toContain('dir');
+        expect(results).toContain('cls');
+        expect(results).toContain('copy');
+      }
+    });
+
+    it('should support abort signal', async () => {
+      const controller = new AbortController();
+      controller.abort();
+      const results = await scanPathExecutables(controller.signal);
+      // May return empty or partial depending on timing
+      expect(Array.isArray(results)).toBe(true);
+    });
+
+    it('should handle empty PATH', async () => {
+      vi.stubEnv('PATH', '');
+      const results = await scanPathExecutables();
+      expect(results).toEqual([]);
+      vi.unstubAllEnvs();
+    });
+  });
+});

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

@@ -0,0 +1,620 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { useEffect, useRef, useCallback, useMemo } from 'react';
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
+import * as os from 'node:os';
+import type { Suggestion } from '../components/SuggestionsDisplay.js';
+import { debugLogger } from '@google/gemini-cli-core';
+import { getArgumentCompletions } from './shell-completions/index.js';
+
+/**
+ * Maximum number of suggestions to return to avoid freezing the React Ink UI.
+ */
+const MAX_SHELL_SUGGESTIONS = 100;
+
+/**
+ * Debounce interval (ms) for file system completions.
+ */
+const FS_COMPLETION_DEBOUNCE_MS = 50;
+
+// Backslash-quote shell metacharacters on non-Windows platforms.
+
+// On Unix, backslash-quote shell metacharacters (spaces, parens, etc.).
+// On Windows, cmd.exe doesn't use backslash-quoting and `\` is the path
+// separator, so we leave the path as-is.
+const UNIX_SHELL_SPECIAL_CHARS = /[ \t\n\r'"()&|;<>!#$`{}[\]*?\\]/g;
+
+/**
+ * Escapes special shell characters in a path segment.
+ */
+export function escapeShellPath(segment: string): string {
+  if (process.platform === 'win32') {
+    return segment;
+  }
+  return segment.replace(UNIX_SHELL_SPECIAL_CHARS, '\\$&');
+}
+
+export interface TokenInfo {
+  /** The raw token text (without surrounding quotes but with internal escapes). */
+  token: string;
+  /** Offset in the original line where this token begins. */
+  start: number;
+  /** Offset in the original line where this token ends (exclusive). */
+  end: number;
+  /** Whether this is the first token (command position). */
+  isFirstToken: boolean;
+  /** The fully built list of tokens parsing the string. */
+  tokens: string[];
+  /** The index in the tokens list where the cursor lies. */
+  cursorIndex: number;
+  /** The command token (always tokens[0] if length > 0, otherwise empty string) */
+  commandToken: string;
+}
+
+export function getTokenAtCursor(
+  line: string,
+  cursorCol: number,
+): TokenInfo | null {
+  const tokensInfo: Array<{ token: string; start: number; end: number }> = [];
+  let i = 0;
+
+  while (i < line.length) {
+    // Skip whitespace
+    if (line[i] === ' ' || line[i] === '\t') {
+      i++;
+      continue;
+    }
+
+    const tokenStart = i;
+    let token = '';
+
+    while (i < line.length) {
+      const ch = line[i];
+
+      // Backslash escape: consume the next char literally
+      if (ch === '\\' && i + 1 < line.length) {
+        token += line[i + 1];
+        i += 2;
+        continue;
+      }
+
+      // Single-quoted string
+      if (ch === "'") {
+        i++; // skip opening quote
+        while (i < line.length && line[i] !== "'") {
+          token += line[i];
+          i++;
+        }
+        if (i < line.length) i++; // skip closing quote
+        continue;
+      }
+
+      // Double-quoted string
+      if (ch === '"') {
+        i++; // skip opening quote
+        while (i < line.length && line[i] !== '"') {
+          if (line[i] === '\\' && i + 1 < line.length) {
+            token += line[i + 1];
+            i += 2;
+          } else {
+            token += line[i];
+            i++;
+          }
+        }
+        if (i < line.length) i++; // skip closing quote
+        continue;
+      }
+
+      // Unquoted whitespace ends the token
+      if (ch === ' ' || ch === '\t') {
+        break;
+      }
+
+      token += ch;
+      i++;
+    }
+
+    tokensInfo.push({ token, start: tokenStart, end: i });
+  }
+
+  const rawTokens = tokensInfo.map((t) => t.token);
+  const commandToken = rawTokens.length > 0 ? rawTokens[0] : '';
+
+  if (tokensInfo.length === 0) {
+    return {
+      token: '',
+      start: cursorCol,
+      end: cursorCol,
+      isFirstToken: true,
+      tokens: [''],
+      cursorIndex: 0,
+      commandToken: '',
+    };
+  }
+
+  // Find the token that contains or is immediately adjacent to the cursor
+  for (let idx = 0; idx < tokensInfo.length; idx++) {
+    const t = tokensInfo[idx];
+    if (cursorCol >= t.start && cursorCol <= t.end) {
+      return {
+        token: t.token,
+        start: t.start,
+        end: t.end,
+        isFirstToken: idx === 0,
+        tokens: rawTokens,
+        cursorIndex: idx,
+        commandToken,
+      };
+    }
+  }
+
+  // Cursor is past all tokens — treat as starting a new token at cursor position
+  // (useful when the user types a space and then presses Tab)
+  return {
+    token: '',
+    start: cursorCol,
+    end: cursorCol,
+    isFirstToken: tokensInfo.length === 0,
+    tokens: [...rawTokens, ''],
+    cursorIndex: rawTokens.length,
+    commandToken,
+  };
+}
+
+export async function scanPathExecutables(
+  signal?: AbortSignal,
+): Promise<string[]> {
+  const pathEnv = process.env['PATH'] ?? '';
+  const dirs = pathEnv.split(path.delimiter).filter(Boolean);
+  const isWindows = process.platform === 'win32';
+  const pathExtList = isWindows
+    ? (process.env['PATHEXT'] ?? '.EXE;.CMD;.BAT;.COM')
+        .split(';')
+        .filter(Boolean)
+        .map((e) => e.toLowerCase())
+    : [];
+
+  const seen = new Set<string>();
+  const executables: string[] = [];
+
+  // Add Windows shell built-ins
+  if (isWindows) {
+    const builtins = [
+      'assoc',
+      'break',
+      'call',
+      'cd',
+      'chcp',
+      'chdir',
+      'cls',
+      'color',
+      'copy',
+      'date',
+      'del',
+      'dir',
+      'echo',
+      'endlocal',
+      'erase',
+      'exit',
+      'for',
+      'ftype',
+      'goto',
+      'if',
+      'md',
+      'mkdir',
+      'mklink',
+      'move',
+      'path',
+      'pause',
+      'popd',
+      'prompt',
+      'pushd',
+      'rd',
+      'rem',
+      'ren',
+      'rename',
+      'rmdir',
+      'set',
+      'setlocal',
+      'shift',
+      'start',
+      'time',
+      'title',
+      'type',
+      'ver',
+      'verify',
+      'vol',
+    ];
+    for (const builtin of builtins) {
+      seen.add(builtin);
+      executables.push(builtin);
+    }
+  }
+
+  const dirResults = await Promise.all(
+    dirs.map(async (dir) => {
+      if (signal?.aborted) return [];
+      try {
+        const entries = await fs.readdir(dir, { withFileTypes: true });
+        const validEntries: string[] = [];
+
+        // Check executability in parallel (batched per directory)
+        await Promise.all(
+          entries.map(async (entry) => {
+            if (signal?.aborted) return;
+            if (!entry.isFile() && !entry.isSymbolicLink()) return;
+
+            const name = entry.name;
+            if (isWindows) {
+              const ext = path.extname(name).toLowerCase();
+              if (pathExtList.length > 0 && !pathExtList.includes(ext)) return;
+            }
+
+            try {
+              await fs.access(
+                path.join(dir, name),
+                fs.constants.R_OK | fs.constants.X_OK,
+              );
+              validEntries.push(name);
+            } catch {
+              // Not executable — skip
+            }
+          }),
+        );
+
+        return validEntries;
+      } catch {
+        // EACCES, ENOENT, etc. — skip this directory
+        return [];
+      }
+    }),
+  );
+
+  for (const names of dirResults) {
+    for (const name of names) {
+      if (!seen.has(name)) {
+        seen.add(name);
+        executables.push(name);
+      }
+    }
+  }
+
+  executables.sort();
+  return executables;
+}
+
+function expandTilde(inputPath: string): [string, boolean] {
+  if (
+    inputPath === '~' ||
+    inputPath.startsWith('~/') ||
+    inputPath.startsWith('~' + path.sep)
+  ) {
+    return [path.join(os.homedir(), inputPath.slice(1)), true];
+  }
+  return [inputPath, false];
+}
+
+export async function resolvePathCompletions(
+  partial: string,
+  cwd: string,
+  signal?: AbortSignal,
+): Promise<Suggestion[]> {
+  if (partial == null) return [];
+
+  // Input Sanitization
+  let strippedPartial = partial;
+  if (strippedPartial.startsWith('"') || strippedPartial.startsWith("'")) {
+    strippedPartial = strippedPartial.slice(1);
+  }
+  if (strippedPartial.endsWith('"') || strippedPartial.endsWith("'")) {
+    strippedPartial = strippedPartial.slice(0, -1);
+  }
+
+  // Normalize separators \ to /
+  const normalizedPartial = strippedPartial.replace(/\\/g, '/');
+
+  const [expandedPartial, didExpandTilde] = expandTilde(normalizedPartial);
+
+  // Directory Detection
+  const endsWithSep =
+    normalizedPartial.endsWith('/') || normalizedPartial === '';
+  const dirToRead = endsWithSep
+    ? path.resolve(cwd, expandedPartial)
+    : path.resolve(cwd, path.dirname(expandedPartial));
+
+  const prefix = endsWithSep ? '' : path.basename(expandedPartial);
+  const prefixLower = prefix.toLowerCase();
+
+  const showDotfiles = prefix.startsWith('.');
+
+  let entries: Array<import('node:fs').Dirent>;
+  try {
+    if (signal?.aborted) return [];
+    entries = await fs.readdir(dirToRead, { withFileTypes: true });
+  } catch {
+    // EACCES, ENOENT, etc.
+    return [];
+  }
+
+  if (signal?.aborted) return [];
+
+  const suggestions: Suggestion[] = [];
+  for (const entry of entries) {
+    if (signal?.aborted) break;
+
+    const name = entry.name;
+
+    // Hide dotfiles unless query starts with '.'
+    if (name.startsWith('.') && !showDotfiles) continue;
+
+    // Case-insensitive matching
+    if (!name.toLowerCase().startsWith(prefixLower)) continue;
+
+    const isDir = entry.isDirectory();
+    const displayName = isDir ? name + '/' : name;
+
+    // Build the completion value relative to what the user typed
+    let completionValue: string;
+    if (endsWithSep) {
+      completionValue = normalizedPartial + displayName;
+    } else {
+      const parentPart = normalizedPartial.slice(
+        0,
+        normalizedPartial.length - path.basename(normalizedPartial).length,
+      );
+      completionValue = parentPart + displayName;
+    }
+
+    // Restore tilde if we expanded it
+    if (didExpandTilde) {
+      const homeDir = os.homedir().replace(/\\/g, '/');
+      if (completionValue.startsWith(homeDir)) {
+        completionValue = '~' + completionValue.slice(homeDir.length);
+      }
+    }
+
+    // Output formatting: Escape special characters in the completion value
+    // Since normalizedPartial stripped quotes, we escape the value directly.
+    const escapedValue = escapeShellPath(completionValue);
+
+    suggestions.push({
+      label: displayName,
+      value: escapedValue,
+      description: isDir ? 'directory' : 'file',
+    });
+
+    if (suggestions.length >= MAX_SHELL_SUGGESTIONS) break;
+  }
+
+  // Sort: directories first, then alphabetically
+  suggestions.sort((a, b) => {
+    const aIsDir = a.description === 'directory';
+    const bIsDir = b.description === 'directory';
+    if (aIsDir !== bIsDir) return aIsDir ? -1 : 1;
+    return a.label.localeCompare(b.label);
+  });
+
+  return suggestions;
+}
+
+export interface UseShellCompletionProps {
+  /** Whether shell completion is active. */
+  enabled: boolean;
+  /** The current line text. */
+  line: string;
+  /** The current cursor column. */
+  cursorCol: number;
+  /** The current working directory for path resolution. */
+  cwd: string;
+  /** Callback to set suggestions on the parent state. */
+  setSuggestions: (suggestions: Suggestion[]) => void;
+  /** Callback to set loading state on the parent. */
+  setIsLoadingSuggestions: (isLoading: boolean) => void;
+}
+
+export interface UseShellCompletionReturn {
+  completionStart: number;
+  completionEnd: number;
+  query: string;
+}
+
+export function useShellCompletion({
+  enabled,
+  line,
+  cursorCol,
+  cwd,
+  setSuggestions,
+  setIsLoadingSuggestions,
+}: UseShellCompletionProps): UseShellCompletionReturn {
+  const pathCachePromiseRef = useRef<Promise<string[]> | null>(null);
+  const pathEnvRef = useRef<string>(process.env['PATH'] ?? '');
+  const abortRef = useRef<AbortController | null>(null);
+  const debounceRef = useRef<NodeJS.Timeout | null>(null);
+
+  const tokenInfo = useMemo(
+    () => (enabled ? getTokenAtCursor(line, cursorCol) : null),
+    [enabled, line, cursorCol],
+  );
+
+  const {
+    token: query = '',
+    start: completionStart = -1,
+    end: completionEnd = -1,
+    isFirstToken: isCommandPosition = false,
+    tokens = [],
+    cursorIndex = -1,
+    commandToken = '',
+  } = tokenInfo || {};
+
+  // Invalidate PATH cache when $PATH changes
+  useEffect(() => {
+    const currentPath = process.env['PATH'] ?? '';
+    if (currentPath !== pathEnvRef.current) {
+      pathCachePromiseRef.current = null;
+      pathEnvRef.current = currentPath;
+    }
+  });
+
+  const performCompletion = useCallback(async () => {
+    if (!enabled || !tokenInfo) {
+      setSuggestions([]);
+      return;
+    }
+
+    // Skip flags
+    if (query.startsWith('-')) {
+      setSuggestions([]);
+      return;
+    }
+
+    // Cancel any in-flight request
+    if (abortRef.current) {
+      abortRef.current.abort();
+    }
+    const controller = new AbortController();
+    abortRef.current = controller;
+    const { signal } = controller;
+
+    try {
+      let results: Suggestion[];
+
+      if (isCommandPosition) {
+        setIsLoadingSuggestions(true);
+
+        if (!pathCachePromiseRef.current) {
+          // We don't pass the signal here because we want the cache to finish
+          // even if this specific completion request is aborted.
+          pathCachePromiseRef.current = scanPathExecutables();
+        }
+
+        const executables = await pathCachePromiseRef.current;
+        if (signal.aborted) return;
+
+        const queryLower = query.toLowerCase();
+        results = executables
+          .filter((cmd) => cmd.toLowerCase().startsWith(queryLower))
+          .sort((a, b) => {
+            // Prioritize shorter commands as they are likely common built-ins
+            if (a.length !== b.length) {
+              return a.length - b.length;
+            }
+            return a.localeCompare(b);
+          })
+          .slice(0, MAX_SHELL_SUGGESTIONS)
+          .map((cmd) => ({
+            label: cmd,
+            value: escapeShellPath(cmd),
+            description: 'command',
+          }));
+      } else {
+        const argumentCompletions = await getArgumentCompletions(
+          commandToken,
+          tokens,
+          cursorIndex,
+          cwd,
+          signal,
+        );
+
+        if (signal.aborted) return;
+
+        if (argumentCompletions?.exclusive) {
+          results = argumentCompletions.suggestions;
+        } else {
+          const pathSuggestions = await resolvePathCompletions(
+            query,
+            cwd,
+            signal,
+          );
+          if (signal.aborted) return;
+
+          results = [
+            ...(argumentCompletions?.suggestions ?? []),
+            ...pathSuggestions,
+          ].slice(0, MAX_SHELL_SUGGESTIONS);
+        }
+      }
+
+      if (signal.aborted) return;
+
+      setSuggestions(results);
+    } catch (error) {
+      if (
+        !(
+          signal.aborted ||
+          (error instanceof Error && error.name === 'AbortError')
+        )
+      ) {
+        debugLogger.warn(
+          `[WARN] shell completion failed: ${error instanceof Error ? error.message : String(error)}`,
+        );
+      }
+      if (!signal.aborted) {
+        setSuggestions([]);
+      }
+    } finally {
+      if (!signal.aborted) {
+        setIsLoadingSuggestions(false);
+      }
+    }
+  }, [
+    enabled,
+    tokenInfo,
+    query,
+    isCommandPosition,
+    tokens,
+    cursorIndex,
+    commandToken,
+    cwd,
+    setSuggestions,
+    setIsLoadingSuggestions,
+  ]);
+
+  useEffect(() => {
+    if (!enabled) {
+      setSuggestions([]);
+      setIsLoadingSuggestions(false);
+    }
+  }, [enabled, setSuggestions, setIsLoadingSuggestions]);
+
+  // Debounced effect to trigger completion
+  useEffect(() => {
+    if (!enabled) return;
+
+    if (debounceRef.current) {
+      clearTimeout(debounceRef.current);
+    }
+
+    debounceRef.current = setTimeout(() => {
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      performCompletion();
+    }, FS_COMPLETION_DEBOUNCE_MS);
+
+    return () => {
+      if (debounceRef.current) {
+        clearTimeout(debounceRef.current);
+      }
+    };
+  }, [enabled, performCompletion]);
+
+  // Cleanup on unmount
+  useEffect(
+    () => () => {
+      abortRef.current?.abort();
+      if (debounceRef.current) {
+        clearTimeout(debounceRef.current);
+      }
+    },
+    [],
+  );
+
+  return {
+    completionStart,
+    completionEnd,
+    query,
+  };
+}

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

@@ -13,7 +13,6 @@ import {
   Scheduler,
   type Config,
   type MessageBus,
-  type ExecutingToolCall,
   type CompletedToolCall,
   type ToolCallsUpdateMessage,
   type AnyDeclarativeTool,
@@ -111,7 +110,7 @@ describe('useToolScheduler', () => {
       tool: createMockTool(),
       invocation: createMockInvocation(),
       liveOutput: 'Loading...',
-    } as ExecutingToolCall;
+    };
 
     act(() => {
       void mockMessageBus.publish({
@@ -406,62 +405,4 @@ describe('useToolScheduler', () => {
       toolCalls.find((t) => t.request.callId === 'call-sub')?.schedulerId,
     ).toBe('subagent-1');
   });
-
-  it('adapts success/error status to executing when a tail call is present', () => {
-    vi.useFakeTimers();
-    const { result } = renderHook(() =>
-      useToolScheduler(
-        vi.fn().mockResolvedValue(undefined),
-        mockConfig,
-        () => undefined,
-      ),
-    );
-
-    const startTime = Date.now();
-    vi.advanceTimersByTime(1000);
-
-    const mockToolCall = {
-      status: CoreToolCallStatus.Success as const,
-      request: {
-        callId: 'call-1',
-        name: 'test_tool',
-        args: {},
-        isClientInitiated: false,
-        prompt_id: 'p1',
-      },
-      tool: createMockTool(),
-      invocation: createMockInvocation(),
-      response: {
-        callId: 'call-1',
-        resultDisplay: 'OK',
-        responseParts: [],
-        error: undefined,
-        errorType: undefined,
-      },
-      tailToolCallRequest: {
-        name: 'tail_tool',
-        args: {},
-        isClientInitiated: false,
-        prompt_id: '123',
-      },
-    };
-
-    act(() => {
-      void mockMessageBus.publish({
-        type: MessageBusType.TOOL_CALLS_UPDATE,
-        toolCalls: [mockToolCall],
-        schedulerId: ROOT_SCHEDULER_ID,
-      } as ToolCallsUpdateMessage);
-    });
-
-    const [toolCalls, , , , , lastOutputTime] = result.current;
-
-    // Check if status has been adapted to 'executing'
-    expect(toolCalls[0].status).toBe(CoreToolCallStatus.Executing);
-
-    // Check if lastOutputTime was updated due to the transitional state
-    expect(lastOutputTime).toBeGreaterThan(startTime);
-
-    vi.useRealTimers();
-  });
 });

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

@@ -14,7 +14,6 @@ import {
   Scheduler,
   type EditorType,
   type ToolCallsUpdateMessage,
-  CoreToolCallStatus,
 } from '@google/gemini-cli-core';
 import { useCallback, useState, useMemo, useEffect, useRef } from 'react';
 
@@ -116,16 +115,7 @@ export function useToolScheduler(
   useEffect(() => {
     const handler = (event: ToolCallsUpdateMessage) => {
       // Update output timer for UI spinners (Side Effect)
-      const hasExecuting = event.toolCalls.some(
-        (tc) =>
-          tc.status === CoreToolCallStatus.Executing ||
-          ((tc.status === CoreToolCallStatus.Success ||
-            tc.status === CoreToolCallStatus.Error) &&
-            'tailToolCallRequest' in tc &&
-            tc.tailToolCallRequest != null),
-      );
-
-      if (hasExecuting) {
+      if (event.toolCalls.some((tc) => tc.status === 'executing')) {
         setLastToolOutputTime(Date.now());
       }
 
@@ -248,23 +238,9 @@ function adaptToolCalls(
     const prev = prevMap.get(coreCall.request.callId);
     const responseSubmittedToGemini = prev?.responseSubmittedToGemini ?? false;
 
-    let status = coreCall.status;
-    // If a tool call has completed but scheduled a tail call, it is in a transitional
-    // state. Force the UI to render it as "executing".
-    if (
-      (status === CoreToolCallStatus.Success ||
-        status === CoreToolCallStatus.Error) &&
-      'tailToolCallRequest' in coreCall &&
-      coreCall.tailToolCallRequest != null
-    ) {
-      status = CoreToolCallStatus.Executing;
-    }
-
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     return {
       ...coreCall,
-      status,
       responseSubmittedToGemini,
-    } as TrackedToolCall;
+    };
   });
 }

packages/cli/src/ui/keyMatchers.test.ts

@@ -352,6 +352,7 @@ describe('keyMatchers', () => {
         createKey('l', { ctrl: true }),
       ],
     },
+
     // Shell commands
     {
       command: Command.REVERSE_SEARCH,

packages/cli/src/ui/themes/no-color.ts

@@ -24,8 +24,6 @@ const noColorColorsTheme: ColorsTheme = {
   Comment: '',
   Gray: '',
   DarkGray: '',
-  InputBackground: '',
-  MessageBackground: '',
 };
 
 const noColorSemanticColors: SemanticColors = {
@@ -38,8 +36,6 @@ const noColorSemanticColors: SemanticColors = {
   },
   background: {
     primary: '',
-    message: '',
-    input: '',
     diff: {
       added: '',
       removed: '',

packages/cli/src/ui/themes/semantic-tokens.ts

@@ -16,8 +16,6 @@ export interface SemanticColors {
   };
   background: {
     primary: string;
-    message: string;
-    input: string;
     diff: {
       added: string;
       removed: string;
@@ -50,15 +48,13 @@ export const lightSemanticColors: SemanticColors = {
   },
   background: {
     primary: lightTheme.Background,
-    message: lightTheme.MessageBackground!,
-    input: lightTheme.InputBackground!,
     diff: {
       added: lightTheme.DiffAdded,
       removed: lightTheme.DiffRemoved,
     },
   },
   border: {
-    default: lightTheme.DarkGray,
+    default: lightTheme.Gray,
     focused: lightTheme.AccentBlue,
   },
   ui: {
@@ -84,15 +80,13 @@ export const darkSemanticColors: SemanticColors = {
   },
   background: {
     primary: darkTheme.Background,
-    message: darkTheme.MessageBackground!,
-    input: darkTheme.InputBackground!,
     diff: {
       added: darkTheme.DiffAdded,
       removed: darkTheme.DiffRemoved,
     },
   },
   border: {
-    default: darkTheme.DarkGray,
+    default: darkTheme.Gray,
     focused: darkTheme.AccentBlue,
   },
   ui: {

packages/cli/src/ui/themes/solarized-dark.ts

@@ -36,8 +36,6 @@ const semanticColors: SemanticColors = {
   },
   background: {
     primary: '#002b36',
-    message: '#073642',
-    input: '#073642',
     diff: {
       added: '#00382f',
       removed: '#3d0115',

packages/cli/src/ui/themes/solarized-light.ts

@@ -36,8 +36,6 @@ const semanticColors: SemanticColors = {
   },
   background: {
     primary: '#fdf6e3',
-    message: '#eee8d5',
-    input: '#eee8d5',
     diff: {
       added: '#d7f2d7',
       removed: '#f2d7d7',

packages/cli/src/ui/themes/theme-manager.ts

@@ -29,11 +29,7 @@ import {
   getThemeTypeFromBackgroundColor,
   resolveColor,
 } from './color-utils.js';
-import {
-  DEFAULT_BACKGROUND_OPACITY,
-  DEFAULT_INPUT_BACKGROUND_OPACITY,
-  DEFAULT_BORDER_OPACITY,
-} from '../constants.js';
+import { DEFAULT_BORDER_OPACITY } from '../constants.js';
 import { ANSI } from './ansi.js';
 import { ANSILight } from './ansi-light.js';
 import { NoColorTheme } from './no-color.js';
@@ -314,21 +310,7 @@ class ThemeManager {
       this.cachedColors = {
         ...colors,
         Background: this.terminalBackground,
-        DarkGray: interpolateColor(
-          this.terminalBackground,
-          colors.Gray,
-          DEFAULT_BORDER_OPACITY,
-        ),
-        InputBackground: interpolateColor(
-          this.terminalBackground,
-          colors.Gray,
-          DEFAULT_INPUT_BACKGROUND_OPACITY,
-        ),
-        MessageBackground: interpolateColor(
-          this.terminalBackground,
-          colors.Gray,
-          DEFAULT_BACKGROUND_OPACITY,
-        ),
+        DarkGray: interpolateColor(colors.Gray, this.terminalBackground, 0.5),
       };
     } else {
       this.cachedColors = colors;
@@ -354,22 +336,27 @@ class ThemeManager {
       this.terminalBackground &&
       this.isThemeCompatible(activeTheme, this.terminalBackground)
     ) {
-      const colors = this.getColors();
       this.cachedSemanticColors = {
         ...semanticColors,
         background: {
           ...semanticColors.background,
           primary: this.terminalBackground,
-          message: colors.MessageBackground!,
-          input: colors.InputBackground!,
         },
         border: {
           ...semanticColors.border,
-          default: colors.DarkGray,
+          default: interpolateColor(
+            this.terminalBackground,
+            activeTheme.colors.Gray,
+            DEFAULT_BORDER_OPACITY,
+          ),
         },
         ui: {
           ...semanticColors.ui,
-          dark: colors.DarkGray,
+          dark: interpolateColor(
+            activeTheme.colors.Gray,
+            this.terminalBackground,
+            0.5,
+          ),
         },
       };
     } else {

packages/cli/src/ui/themes/theme.test.ts

@@ -37,11 +37,11 @@ describe('createCustomTheme', () => {
 
   it('should interpolate DarkGray when not provided', () => {
     const theme = createCustomTheme(baseTheme);
-    // Interpolate between Background (#000000) and Gray (#cccccc) at 0.4
+    // Interpolate between Gray (#cccccc) and Background (#000000) at 0.5
     // #cccccc is RGB(204, 204, 204)
     // #000000 is RGB(0, 0, 0)
-    // Result is RGB(82, 82, 82) which is #525252
-    expect(theme.colors.DarkGray).toBe('#525252');
+    // Midpoint is RGB(102, 102, 102) which is #666666
+    expect(theme.colors.DarkGray).toBe('#666666');
   });
 
   it('should use provided DarkGray', () => {
@@ -64,8 +64,8 @@ describe('createCustomTheme', () => {
       },
     };
     const theme = createCustomTheme(customTheme);
-    // Should be interpolated between #000000 and #cccccc at 0.4 -> #525252
-    expect(theme.colors.DarkGray).toBe('#525252');
+    // Should be interpolated between #cccccc and #000000 at 0.5 -> #666666
+    expect(theme.colors.DarkGray).toBe('#666666');
   });
 
   it('should prefer text.secondary over Gray for interpolation', () => {
@@ -81,8 +81,8 @@ describe('createCustomTheme', () => {
       },
     };
     const theme = createCustomTheme(customTheme);
-    // Interpolate between #000000 and #cccccc -> #525252
-    expect(theme.colors.DarkGray).toBe('#525252');
+    // Interpolate between #cccccc and #000000 -> #666666
+    expect(theme.colors.DarkGray).toBe('#666666');
   });
 });
 

packages/cli/src/ui/themes/theme.ts

@@ -15,11 +15,7 @@ import {
 } from './color-utils.js';
 
 import type { CustomTheme } from '@google/gemini-cli-core';
-import {
-  DEFAULT_BACKGROUND_OPACITY,
-  DEFAULT_INPUT_BACKGROUND_OPACITY,
-  DEFAULT_BORDER_OPACITY,
-} from '../constants.js';
+import { DEFAULT_BORDER_OPACITY } from '../constants.js';
 
 export type { CustomTheme };
 
@@ -41,8 +37,6 @@ export interface ColorsTheme {
   Comment: string;
   Gray: string;
   DarkGray: string;
-  InputBackground?: string;
-  MessageBackground?: string;
   GradientColors?: string[];
 }
 
@@ -61,17 +55,7 @@ export const lightTheme: ColorsTheme = {
   DiffRemoved: '#FFCCCC',
   Comment: '#008000',
   Gray: '#97a0b0',
-  DarkGray: interpolateColor('#FAFAFA', '#97a0b0', DEFAULT_BORDER_OPACITY),
-  InputBackground: interpolateColor(
-    '#FAFAFA',
-    '#97a0b0',
-    DEFAULT_INPUT_BACKGROUND_OPACITY,
-  ),
-  MessageBackground: interpolateColor(
-    '#FAFAFA',
-    '#97a0b0',
-    DEFAULT_BACKGROUND_OPACITY,
-  ),
+  DarkGray: interpolateColor('#97a0b0', '#FAFAFA', 0.5),
   GradientColors: ['#4796E4', '#847ACE', '#C3677F'],
 };
 
@@ -90,17 +74,7 @@ export const darkTheme: ColorsTheme = {
   DiffRemoved: '#430000',
   Comment: '#6C7086',
   Gray: '#6C7086',
-  DarkGray: interpolateColor('#1E1E2E', '#6C7086', DEFAULT_BORDER_OPACITY),
-  InputBackground: interpolateColor(
-    '#1E1E2E',
-    '#6C7086',
-    DEFAULT_INPUT_BACKGROUND_OPACITY,
-  ),
-  MessageBackground: interpolateColor(
-    '#1E1E2E',
-    '#6C7086',
-    DEFAULT_BACKGROUND_OPACITY,
-  ),
+  DarkGray: interpolateColor('#6C7086', '#1E1E2E', 0.5),
   GradientColors: ['#4796E4', '#847ACE', '#C3677F'],
 };
 
@@ -120,8 +94,6 @@ export const ansiTheme: ColorsTheme = {
   Comment: 'gray',
   Gray: 'gray',
   DarkGray: 'gray',
-  InputBackground: 'black',
-  MessageBackground: 'black',
 };
 
 export class Theme {
@@ -159,27 +131,17 @@ export class Theme {
       },
       background: {
         primary: this.colors.Background,
-        message:
-          this.colors.MessageBackground ??
-          interpolateColor(
-            this.colors.Background,
-            this.colors.Gray,
-            DEFAULT_BACKGROUND_OPACITY,
-          ),
-        input:
-          this.colors.InputBackground ??
-          interpolateColor(
-            this.colors.Background,
-            this.colors.Gray,
-            DEFAULT_INPUT_BACKGROUND_OPACITY,
-          ),
         diff: {
           added: this.colors.DiffAdded,
           removed: this.colors.DiffRemoved,
         },
       },
       border: {
-        default: this.colors.DarkGray,
+        default: interpolateColor(
+          this.colors.Background,
+          this.colors.Gray,
+          DEFAULT_BORDER_OPACITY,
+        ),
         focused: this.colors.AccentBlue,
       },
       ui: {
@@ -280,20 +242,10 @@ export function createCustomTheme(customTheme: CustomTheme): Theme {
     DarkGray:
       customTheme.DarkGray ??
       interpolateColor(
-        customTheme.background?.primary ?? customTheme.Background ?? '',
         customTheme.text?.secondary ?? customTheme.Gray ?? '',
-        DEFAULT_BORDER_OPACITY,
+        customTheme.background?.primary ?? customTheme.Background ?? '',
+        0.5,
       ),
-    InputBackground: interpolateColor(
-      customTheme.background?.primary ?? customTheme.Background ?? '',
-      customTheme.text?.secondary ?? customTheme.Gray ?? '',
-      DEFAULT_INPUT_BACKGROUND_OPACITY,
-    ),
-    MessageBackground: interpolateColor(
-      customTheme.background?.primary ?? customTheme.Background ?? '',
-      customTheme.text?.secondary ?? customTheme.Gray ?? '',
-      DEFAULT_BACKGROUND_OPACITY,
-    ),
     GradientColors: customTheme.ui?.gradient ?? customTheme.GradientColors,
   };
 
@@ -448,15 +400,19 @@ export function createCustomTheme(customTheme: CustomTheme): Theme {
     },
     background: {
       primary: customTheme.background?.primary ?? colors.Background,
-      message: colors.MessageBackground!,
-      input: colors.InputBackground!,
       diff: {
         added: customTheme.background?.diff?.added ?? colors.DiffAdded,
         removed: customTheme.background?.diff?.removed ?? colors.DiffRemoved,
       },
     },
     border: {
-      default: colors.DarkGray,
+      default:
+        customTheme.border?.default ??
+        interpolateColor(
+          colors.Background,
+          colors.Gray,
+          DEFAULT_BORDER_OPACITY,
+        ),
       focused: customTheme.border?.focused ?? colors.AccentBlue,
     },
     ui: {

packages/cli/src/ui/types.ts

@@ -109,9 +109,7 @@ export interface IndividualToolCallDisplay {
   correlationId?: string;
   approvalMode?: ApprovalMode;
   progressMessage?: string;
-  originalRequestName?: string;
-  progress?: number;
-  progressTotal?: number;
+  progressPercent?: number;
 }
 
 export interface CompressionProps {

packages/cli/src/utils/activityLogger.ts

@@ -22,82 +22,13 @@ import WebSocket from 'ws';
 const ACTIVITY_ID_HEADER = 'x-activity-request-id';
 const MAX_BUFFER_SIZE = 100;
 
+/** Type guard: Array.isArray doesn't narrow readonly arrays in TS 5.8 */
 function isHeaderRecord(
   h: http.OutgoingHttpHeaders | readonly string[],
 ): h is http.OutgoingHttpHeaders {
   return !Array.isArray(h);
 }
 
-function isRequestOptions(value: unknown): value is http.RequestOptions {
-  return (
-    typeof value === 'object' &&
-    value !== null &&
-    !(value instanceof URL) &&
-    !Array.isArray(value)
-  );
-}
-
-function isIncomingMessageCallback(
-  value: unknown,
-): value is (res: http.IncomingMessage) => void {
-  return typeof value === 'function';
-}
-
-type HttpRequestArgs =
-  | []
-  | [
-      url: string | URL | http.RequestOptions,
-      options?: http.RequestOptions | ((res: http.IncomingMessage) => void),
-      callback?: (res: http.IncomingMessage) => void,
-    ];
-
-function callHttpRequest(
-  originalFn: typeof http.request,
-  args: HttpRequestArgs,
-): http.ClientRequest {
-  if (args.length === 0) {
-    return originalFn({});
-  }
-  if (args.length === 1) {
-    const first = args[0];
-    if (typeof first === 'string' || first instanceof URL) {
-      return originalFn(first);
-    }
-    if (isRequestOptions(first)) {
-      return originalFn(first);
-    }
-    return originalFn({});
-  }
-  if (args.length === 2) {
-    const first = args[0];
-    const second = args[1];
-    if (typeof first === 'string' || first instanceof URL) {
-      if (isIncomingMessageCallback(second)) {
-        return originalFn(first, second);
-      }
-      if (isRequestOptions(second)) {
-        return originalFn(first, second);
-      }
-    }
-    if (isRequestOptions(first) && isIncomingMessageCallback(second)) {
-      return originalFn(first, second);
-    }
-  }
-  if (args.length === 3) {
-    const first = args[0];
-    const second = args[1];
-    const third = args[2];
-    if (
-      (typeof first === 'string' || first instanceof URL) &&
-      isRequestOptions(second) &&
-      isIncomingMessageCallback(third)
-    ) {
-      return originalFn(first, second, third);
-    }
-  }
-  return originalFn({});
-}
-
 export interface NetworkLog {
   id: string;
   timestamp: number;
@@ -433,7 +364,7 @@ export class ActivityLogger extends EventEmitter {
 
     const wrapRequest = (
       originalFn: typeof http.request,
-      args: HttpRequestArgs,
+      args: unknown[],
       protocol: string,
     ) => {
       const firstArg = args[0];
@@ -442,10 +373,8 @@ export class ActivityLogger extends EventEmitter {
         options = firstArg;
       } else if (firstArg instanceof URL) {
         options = firstArg;
-      } else if (firstArg && typeof firstArg === 'object') {
-        options = isRequestOptions(firstArg) ? firstArg : {};
       } else {
-        options = {};
+        options = (firstArg ?? {}) as http.RequestOptions;
       }
 
       let url = '';
@@ -464,9 +393,9 @@ export class ActivityLogger extends EventEmitter {
           `${protocol}//${options.hostname || options.host || 'localhost'}${options.path || '/'}`;
       }
 
-      if (url.includes('127.0.0.1') || url.includes('localhost')) {
-        return callHttpRequest(originalFn, args);
-      }
+      if (url.includes('127.0.0.1') || url.includes('localhost'))
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-type-assertion
+        return originalFn.apply(http, args as any);
 
       const rawHeaders =
         typeof options === 'object' &&
@@ -481,23 +410,24 @@ export class ActivityLogger extends EventEmitter {
 
       if (headers[ACTIVITY_ID_HEADER]) {
         delete headers[ACTIVITY_ID_HEADER];
-        return callHttpRequest(originalFn, args);
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-type-assertion
+        return originalFn.apply(http, args as any);
       }
 
       const id = Math.random().toString(36).substring(7);
       this.requestStartTimes.set(id, Date.now());
-      const req = callHttpRequest(originalFn, args);
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-type-assertion
+      const req = originalFn.apply(http, args as any);
       const requestChunks: Buffer[] = [];
 
       const oldWrite = req.write;
       const oldEnd = req.end;
 
-      req.write = function (chunk: string | Uint8Array, ...etc: unknown[]) {
+      req.write = function (chunk: unknown, ...etc: unknown[]) {
         if (chunk) {
           const encoding =
-            typeof etc[0] === 'string' && Buffer.isEncoding(etc[0])
-              ? etc[0]
-              : undefined;
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+            typeof etc[0] === 'string' ? (etc[0] as BufferEncoding) : undefined;
           requestChunks.push(
             Buffer.isBuffer(chunk)
               ? chunk
@@ -508,21 +438,19 @@ export class ActivityLogger extends EventEmitter {
                   ),
           );
         }
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-type-assertion, @typescript-eslint/no-unsafe-return
-        return (oldWrite as any).apply(this, [chunk, ...etc]);
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-type-assertion
+        return oldWrite.apply(this, [chunk, ...etc] as any);
       };
 
       req.end = function (
         this: http.ClientRequest,
-        chunkOrCb?: string | Uint8Array | (() => void),
+        chunk: unknown,
         ...etc: unknown[]
       ) {
-        const chunk = typeof chunkOrCb === 'function' ? undefined : chunkOrCb;
-        if (chunk) {
+        if (chunk && typeof chunk !== 'function') {
           const encoding =
-            typeof etc[0] === 'string' && Buffer.isEncoding(etc[0])
-              ? etc[0]
-              : undefined;
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+            typeof etc[0] === 'string' ? (etc[0] as BufferEncoding) : undefined;
           requestChunks.push(
             Buffer.isBuffer(chunk)
               ? chunk
@@ -545,7 +473,7 @@ export class ActivityLogger extends EventEmitter {
           pending: true,
         });
         // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-type-assertion, @typescript-eslint/no-unsafe-return
-        return (oldEnd as any).apply(this, [chunkOrCb, ...etc]);
+        return (oldEnd as any).apply(this, [chunk, ...etc]);
       };
 
       req.on('response', (res: http.IncomingMessage) => {
@@ -617,44 +545,12 @@ export class ActivityLogger extends EventEmitter {
       return req;
     };
 
-    Object.defineProperty(http, 'request', {
-      value: (
-        url: string | URL | http.RequestOptions,
-        options?: http.RequestOptions | ((res: http.IncomingMessage) => void),
-        callback?: (res: http.IncomingMessage) => void,
-      ): http.ClientRequest => {
-        const args: HttpRequestArgs =
-          callback !== undefined
-            ? [url, options, callback]
-            : options !== undefined
-              ? [url, options]
-              : [url];
-        return wrapRequest(originalRequest, args, 'http:');
-      },
-      writable: true,
-      configurable: true,
-    });
-    Object.defineProperty(https, 'request', {
-      value: (
-        url: string | URL | http.RequestOptions,
-        options?: http.RequestOptions | ((res: http.IncomingMessage) => void),
-        callback?: (res: http.IncomingMessage) => void,
-      ): http.ClientRequest => {
-        const args: HttpRequestArgs =
-          callback !== undefined
-            ? [url, options, callback]
-            : options !== undefined
-              ? [url, options]
-              : [url];
-        return wrapRequest(
-          originalHttpsRequest as typeof http.request,
-          args,
-          'https:',
-        );
-      },
-      writable: true,
-      configurable: true,
-    });
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-type-assertion
+    (http as any).request = (...args: unknown[]) =>
+      wrapRequest(originalRequest, args, 'http:');
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-type-assertion
+    (https as any).request = (...args: unknown[]) =>
+      wrapRequest(originalHttpsRequest as typeof http.request, args, 'https:');
   }
 
   logConsole(payload: ConsoleLogPayload) {

packages/core/package.json

@@ -53,8 +53,6 @@
     "ajv-formats": "^3.0.0",
     "chardet": "^2.1.0",
     "diff": "^8.0.3",
-    "dotenv": "^17.2.4",
-    "dotenv-expand": "^12.0.3",
     "fast-levenshtein": "^2.0.6",
     "fdir": "^6.4.6",
     "fzf": "^0.5.2",

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

@@ -1,247 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { createAnalyzeScreenshotTool } from './analyzeScreenshot.js';
-import type { BrowserManager, McpToolCallResult } from './browserManager.js';
-import type { Config } from '../../config/config.js';
-import type { MessageBus } from '../../confirmation-bus/message-bus.js';
-
-const mockMessageBus = {
-  waitForConfirmation: vi.fn().mockResolvedValue({ approved: true }),
-} as unknown as MessageBus;
-
-function createMockBrowserManager(
-  callToolResult?: McpToolCallResult,
-): BrowserManager {
-  return {
-    callTool: vi.fn().mockResolvedValue(
-      callToolResult ?? {
-        content: [
-          { type: 'text', text: 'Screenshot captured' },
-          {
-            type: 'image',
-            data: 'base64encodeddata',
-            mimeType: 'image/png',
-          },
-        ],
-      },
-    ),
-  } as unknown as BrowserManager;
-}
-
-function createMockConfig(
-  generateContentResult?: unknown,
-  generateContentError?: Error,
-): Config {
-  const generateContent = generateContentError
-    ? vi.fn().mockRejectedValue(generateContentError)
-    : vi.fn().mockResolvedValue(
-        generateContentResult ?? {
-          candidates: [
-            {
-              content: {
-                parts: [
-                  {
-                    text: 'The blue submit button is at coordinates (250, 400).',
-                  },
-                ],
-              },
-            },
-          ],
-        },
-      );
-
-  return {
-    getBrowserAgentConfig: vi.fn().mockReturnValue({
-      customConfig: { visualModel: 'test-visual-model' },
-    }),
-    getContentGenerator: vi.fn().mockReturnValue({
-      generateContent,
-    }),
-  } as unknown as Config;
-}
-
-describe('analyzeScreenshot', () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-  });
-
-  describe('createAnalyzeScreenshotTool', () => {
-    it('creates a tool with the correct name and schema', () => {
-      const browserManager = createMockBrowserManager();
-      const config = createMockConfig();
-      const tool = createAnalyzeScreenshotTool(
-        browserManager,
-        config,
-        mockMessageBus,
-      );
-
-      expect(tool.name).toBe('analyze_screenshot');
-    });
-  });
-
-  describe('AnalyzeScreenshotInvocation', () => {
-    it('captures a screenshot and returns visual analysis', async () => {
-      const browserManager = createMockBrowserManager();
-      const config = createMockConfig();
-      const tool = createAnalyzeScreenshotTool(
-        browserManager,
-        config,
-        mockMessageBus,
-      );
-
-      const invocation = tool.build({
-        instruction: 'Find the blue submit button',
-      });
-      const result = await invocation.execute(new AbortController().signal);
-
-      // Verify screenshot was captured
-      expect(browserManager.callTool).toHaveBeenCalledWith(
-        'take_screenshot',
-        {},
-      );
-
-      // Verify the visual model was called
-      const contentGenerator = config.getContentGenerator();
-      expect(contentGenerator.generateContent).toHaveBeenCalledWith(
-        expect.objectContaining({
-          model: 'test-visual-model',
-          contents: expect.arrayContaining([
-            expect.objectContaining({
-              role: 'user',
-              parts: expect.arrayContaining([
-                expect.objectContaining({
-                  inlineData: {
-                    mimeType: 'image/png',
-                    data: 'base64encodeddata',
-                  },
-                }),
-              ]),
-            }),
-          ]),
-        }),
-        'visual-analysis',
-        'utility_tool',
-      );
-
-      // Verify result
-      expect(result.llmContent).toContain('Visual Analysis Result');
-      expect(result.llmContent).toContain(
-        'The blue submit button is at coordinates (250, 400).',
-      );
-      expect(result.error).toBeUndefined();
-    });
-
-    it('returns an error when screenshot capture fails (no image)', async () => {
-      const browserManager = createMockBrowserManager({
-        content: [{ type: 'text', text: 'No screenshot available' }],
-      });
-      const config = createMockConfig();
-      const tool = createAnalyzeScreenshotTool(
-        browserManager,
-        config,
-        mockMessageBus,
-      );
-
-      const invocation = tool.build({
-        instruction: 'Find the button',
-      });
-      const result = await invocation.execute(new AbortController().signal);
-
-      expect(result.error).toBeDefined();
-      expect(result.llmContent).toContain('Failed to capture screenshot');
-      // Should NOT call the visual model
-      const contentGenerator = config.getContentGenerator();
-      expect(contentGenerator.generateContent).not.toHaveBeenCalled();
-    });
-
-    it('returns an error when visual model returns empty response', async () => {
-      const browserManager = createMockBrowserManager();
-      const config = createMockConfig({
-        candidates: [{ content: { parts: [] } }],
-      });
-      const tool = createAnalyzeScreenshotTool(
-        browserManager,
-        config,
-        mockMessageBus,
-      );
-
-      const invocation = tool.build({
-        instruction: 'Check the layout',
-      });
-      const result = await invocation.execute(new AbortController().signal);
-
-      expect(result.error).toBeDefined();
-      expect(result.llmContent).toContain('Visual model returned no analysis');
-    });
-
-    it('returns a model-unavailability fallback for 404 errors', async () => {
-      const browserManager = createMockBrowserManager();
-      const config = createMockConfig(
-        undefined,
-        new Error('Model not found: 404'),
-      );
-      const tool = createAnalyzeScreenshotTool(
-        browserManager,
-        config,
-        mockMessageBus,
-      );
-
-      const invocation = tool.build({
-        instruction: 'Find the red error',
-      });
-      const result = await invocation.execute(new AbortController().signal);
-
-      expect(result.error).toBeDefined();
-      expect(result.llmContent).toContain(
-        'Visual analysis model is not available',
-      );
-    });
-
-    it('returns a model-unavailability fallback for 403 errors', async () => {
-      const browserManager = createMockBrowserManager();
-      const config = createMockConfig(
-        undefined,
-        new Error('permission denied: 403'),
-      );
-      const tool = createAnalyzeScreenshotTool(
-        browserManager,
-        config,
-        mockMessageBus,
-      );
-
-      const invocation = tool.build({
-        instruction: 'Identify the element',
-      });
-      const result = await invocation.execute(new AbortController().signal);
-
-      expect(result.error).toBeDefined();
-      expect(result.llmContent).toContain(
-        'Visual analysis model is not available',
-      );
-    });
-
-    it('returns a generic error for non-model errors', async () => {
-      const browserManager = createMockBrowserManager();
-      const config = createMockConfig(undefined, new Error('Network timeout'));
-      const tool = createAnalyzeScreenshotTool(
-        browserManager,
-        config,
-        mockMessageBus,
-      );
-
-      const invocation = tool.build({
-        instruction: 'Find something',
-      });
-      const result = await invocation.execute(new AbortController().signal);
-
-      expect(result.error).toBeDefined();
-      expect(result.llmContent).toContain('Visual analysis failed');
-      expect(result.llmContent).toContain('Network timeout');
-    });
-  });
-});

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

@@ -1,250 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Tool for visual identification via a single model call.
- *
- * The semantic browser agent uses this tool when it needs to identify
- * elements by visual attributes not present in the accessibility tree
- * (e.g., color, layout, precise coordinates).
- *
- * Unlike the semantic agent which works with the accessibility tree,
- * this tool sends a screenshot to a computer-use model for visual analysis.
- * It returns the model's analysis (coordinates, element descriptions) back
- * to the browser agent, which retains full control of subsequent actions.
- */
-
-import {
-  DeclarativeTool,
-  BaseToolInvocation,
-  Kind,
-  type ToolResult,
-  type ToolInvocation,
-} from '../../tools/tools.js';
-import type { MessageBus } from '../../confirmation-bus/message-bus.js';
-import type { BrowserManager } from './browserManager.js';
-import type { Config } from '../../config/config.js';
-import { getVisualAgentModel } from './modelAvailability.js';
-import { debugLogger } from '../../utils/debugLogger.js';
-import { LlmRole } from '../../telemetry/llmRole.js';
-
-/**
- * System prompt for the visual analysis model call.
- */
-const VISUAL_SYSTEM_PROMPT = `You are a Visual Analysis Agent. You receive a screenshot of a browser page and an instruction.
-
-Your job is to ANALYZE the screenshot and provide precise information that a browser automation agent can act on.
-
-COORDINATE SYSTEM:
-- Coordinates are pixel-based relative to the viewport
-- (0,0) is top-left of the visible area
-- Estimate element positions from the screenshot
-
-RESPONSE FORMAT:
-- For coordinate identification: provide exact (x, y) pixel coordinates
-- For element identification: describe the element's visual location and appearance
-- For layout analysis: describe the spatial relationships between elements
-- Be concise and actionable — the browser agent will use your response to decide what action to take
-
-IMPORTANT:
-- You are NOT performing actions — you are only providing visual analysis
-- Include coordinates when possible so the caller can use click_at(x, y)
-- If the element is not visible in the screenshot, say so explicitly`;
-
-/**
- * Invocation for the analyze_screenshot tool.
- * Makes a single generateContent call with a screenshot.
- */
-class AnalyzeScreenshotInvocation extends BaseToolInvocation<
-  Record<string, unknown>,
-  ToolResult
-> {
-  constructor(
-    private readonly browserManager: BrowserManager,
-    private readonly config: Config,
-    params: Record<string, unknown>,
-    messageBus: MessageBus,
-  ) {
-    super(params, messageBus, 'analyze_screenshot', 'Analyze Screenshot');
-  }
-
-  getDescription(): string {
-    const instruction = String(this.params['instruction'] ?? '');
-    return `Visual analysis: "${instruction}"`;
-  }
-
-  async execute(signal: AbortSignal): Promise<ToolResult> {
-    try {
-      const instruction = String(this.params['instruction'] ?? '');
-
-      debugLogger.log(`Visual analysis requested: ${instruction}`);
-
-      // Capture screenshot via MCP tool
-      const screenshotResult = await this.browserManager.callTool(
-        'take_screenshot',
-        {},
-      );
-
-      // Extract base64 image data from MCP response.
-      // Search ALL content items for image type — MCP returns [text, image]
-      // where content[0] is a text description and content[1] is the actual PNG.
-      let screenshotBase64 = '';
-      let mimeType = 'image/png';
-      if (screenshotResult.content && Array.isArray(screenshotResult.content)) {
-        for (const item of screenshotResult.content) {
-          if (item.type === 'image' && item.data) {
-            screenshotBase64 = item.data;
-            mimeType = item.mimeType ?? 'image/png';
-            break;
-          }
-        }
-      }
-
-      if (!screenshotBase64) {
-        return {
-          llmContent:
-            'Failed to capture screenshot for visual analysis. Use accessibility tree elements instead.',
-          returnDisplay: 'Screenshot capture failed',
-          error: { message: 'Screenshot capture failed' },
-        };
-      }
-
-      // Make a single generateContent call with the visual model
-      const visualModel = getVisualAgentModel(this.config);
-      const contentGenerator = this.config.getContentGenerator();
-
-      const response = await contentGenerator.generateContent(
-        {
-          model: visualModel,
-          config: {
-            temperature: 0,
-            topP: 0.95,
-            systemInstruction: VISUAL_SYSTEM_PROMPT,
-            abortSignal: signal,
-          },
-          contents: [
-            {
-              role: 'user',
-              parts: [
-                {
-                  text: `Analyze this screenshot and respond to the following instruction:\n\n${instruction}`,
-                },
-                {
-                  inlineData: {
-                    mimeType,
-                    data: screenshotBase64,
-                  },
-                },
-              ],
-            },
-          ],
-        },
-        'visual-analysis',
-        LlmRole.UTILITY_TOOL,
-      );
-
-      // Extract text from response
-      const responseText =
-        response.candidates?.[0]?.content?.parts
-          ?.filter((p) => p.text)
-          .map((p) => p.text)
-          .join('\n') ?? '';
-
-      if (!responseText) {
-        return {
-          llmContent:
-            'Visual model returned no analysis. Use accessibility tree elements instead.',
-          returnDisplay: 'Visual analysis returned empty response',
-          error: { message: 'Empty visual analysis response' },
-        };
-      }
-
-      debugLogger.log(`Visual analysis complete: ${responseText}`);
-
-      return {
-        llmContent: `Visual Analysis Result:\n${responseText}`,
-        returnDisplay: `Visual Analysis Result:\n${responseText}`,
-      };
-    } catch (error) {
-      const errorMsg = error instanceof Error ? error.message : String(error);
-      debugLogger.error(`Visual analysis failed: ${errorMsg}`);
-
-      // Provide a graceful fallback message for model unavailability
-      const isModelError =
-        errorMsg.includes('404') ||
-        errorMsg.includes('403') ||
-        errorMsg.includes('not found') ||
-        errorMsg.includes('permission');
-
-      const fallbackMsg = isModelError
-        ? 'Visual analysis model is not available. Use accessibility tree elements (uids from take_snapshot) for all interactions instead.'
-        : `Visual analysis failed: ${errorMsg}. Use accessibility tree elements instead.`;
-
-      return {
-        llmContent: fallbackMsg,
-        returnDisplay: fallbackMsg,
-        error: { message: errorMsg },
-      };
-    }
-  }
-}
-
-/**
- * DeclarativeTool for screenshot-based visual analysis.
- */
-class AnalyzeScreenshotTool extends DeclarativeTool<
-  Record<string, unknown>,
-  ToolResult
-> {
-  constructor(
-    private readonly browserManager: BrowserManager,
-    private readonly config: Config,
-    messageBus: MessageBus,
-  ) {
-    super(
-      'analyze_screenshot',
-      'analyze_screenshot',
-      'Analyze the current page visually using a screenshot. Use when you need to identify elements by visual attributes (color, layout, position) not available in the accessibility tree, or when you need precise pixel coordinates for click_at. Returns visual analysis — you perform the actions yourself.',
-      Kind.Other,
-      {
-        type: 'object',
-        properties: {
-          instruction: {
-            type: 'string',
-            description:
-              'What to identify or analyze visually (e.g., "Find the coordinates of the blue submit button", "What is the layout of the navigation menu?").',
-          },
-        },
-        required: ['instruction'],
-      },
-      messageBus,
-      true, // isOutputMarkdown
-      false, // canUpdateOutput
-    );
-  }
-
-  build(
-    params: Record<string, unknown>,
-  ): ToolInvocation<Record<string, unknown>, ToolResult> {
-    return new AnalyzeScreenshotInvocation(
-      this.browserManager,
-      this.config,
-      params,
-      this.messageBus,
-    );
-  }
-}
-
-/**
- * Creates the analyze_screenshot tool for the browser agent.
- */
-export function createAnalyzeScreenshotTool(
-  browserManager: BrowserManager,
-  config: Config,
-  messageBus: MessageBus,
-): AnalyzeScreenshotTool {
-  return new AnalyzeScreenshotTool(browserManager, config, messageBus);
-}

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

@@ -1,172 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Browser Agent definition following the LocalAgentDefinition pattern.
- *
- * This agent uses LocalAgentExecutor for its reAct loop, like CodebaseInvestigatorAgent.
- * It is available ONLY via delegate_to_agent, NOT as a direct tool.
- *
- * Tools are configured dynamically at invocation time via browserAgentFactory.
- */
-
-import type { LocalAgentDefinition } from '../types.js';
-import type { Config } from '../../config/config.js';
-import { z } from 'zod';
-import {
-  isPreviewModel,
-  PREVIEW_GEMINI_FLASH_MODEL,
-  DEFAULT_GEMINI_FLASH_MODEL,
-} from '../../config/models.js';
-
-/** Canonical agent name — used for routing and configuration lookup. */
-export const BROWSER_AGENT_NAME = 'browser_agent';
-
-/**
- * Output schema for browser agent results.
- */
-export const BrowserTaskResultSchema = z.object({
-  success: z.boolean().describe('Whether the task was completed successfully'),
-  summary: z
-    .string()
-    .describe('A summary of what was accomplished or what went wrong'),
-  data: z
-    .unknown()
-    .optional()
-    .describe('Optional extracted data from the task'),
-});
-
-const VISUAL_SECTION = `
-VISUAL IDENTIFICATION (analyze_screenshot):
-When you need to identify elements by visual attributes not in the AX tree (e.g., "click the yellow button", "find the red error message"), or need precise pixel coordinates:
-1. Call analyze_screenshot with a clear instruction describing what to find
-2. It returns visual analysis with coordinates/descriptions — it does NOT perform actions
-3. Use the returned coordinates with click_at(x, y) or other tools yourself
-4. If the analysis is insufficient, call it again with a more specific instruction
-`;
-
-/**
- * System prompt for the semantic browser agent.
- * Extracted from prototype (computer_use_subagent_cdt branch).
- *
- * @param visionEnabled Whether visual tools (analyze_screenshot, click_at) are available.
- */
-export function buildBrowserSystemPrompt(visionEnabled: boolean): string {
-  return `You are an expert browser automation agent (Orchestrator). Your goal is to completely fulfill the user's request.
-
-IMPORTANT: You will receive an accessibility tree snapshot showing elements with uid values (e.g., uid=87_4 button "Login"). 
-Use these uid values directly with your tools:
-- click(uid="87_4") to click the Login button
-- fill(uid="87_2", value="john") to fill a text field
-- fill_form(elements=[{uid: "87_2", value: "john"}, {uid: "87_3", value: "pass"}]) to fill multiple fields at once
-
-PARALLEL TOOL CALLS - CRITICAL:
-- Do NOT make parallel calls for actions that change page state (click, fill, press_key, etc.)
-- Each action changes the DOM and invalidates UIDs from the current snapshot
-- Make state-changing actions ONE AT A TIME, then observe the results
-
-OVERLAY/POPUP HANDLING:
-Before interacting with page content, scan the accessibility tree for blocking overlays:
-- Tooltips, popups, modals, cookie banners, newsletter prompts, promo dialogs
-- These often have: close buttons (×, X, Close, Dismiss), "Got it", "Accept", "No thanks" buttons
-- Common patterns: elements with role="dialog", role="tooltip", role="alertdialog", or aria-modal="true"
-- If you see such elements, DISMISS THEM FIRST by clicking close/dismiss buttons before proceeding
-- If a click seems to have no effect, check if an overlay appeared or is blocking the target
-${visionEnabled ? VISUAL_SECTION : ''}
-
-COMPLEX WEB APPS (spreadsheets, rich editors, canvas apps):
-Many web apps (Google Sheets/Docs, Notion, Figma, etc.) use custom rendering rather than standard HTML inputs.
-- fill does NOT work on these apps. Instead, click the target element, then use type_text to enter the value.
-- type_text supports a submitKey parameter to press a key after typing (e.g., submitKey="Enter" to submit, submitKey="Tab" to move to the next field). This is much faster than separate press_key calls.
-- Navigate cells/fields using keyboard shortcuts (Tab, Enter, ArrowDown) — more reliable than clicking UIDs.
-- Use the Name Box (cell reference input, usually showing "A1") to jump to specific cells.
-
-TERMINAL FAILURES — STOP IMMEDIATELY:
-Some errors are unrecoverable and retrying will never help. When you see ANY of these, call complete_task immediately with success=false and include the EXACT error message (including any remediation steps it contains) in your summary:
-- "Could not connect to Chrome" or "Failed to connect to Chrome" or "Timed out connecting to Chrome" — Include the full error message with its remediation steps in your summary verbatim. Do NOT paraphrase or omit instructions.
-- "Browser closed" or "Target closed" or "Session closed" — The browser process has terminated. Include the error and tell the user to try again.
-- "net::ERR_" network errors on the SAME URL after 2 retries — the site is unreachable. Report the URL and error.
-- Any error that appears IDENTICALLY 3+ times in a row — it will not resolve by retrying.
-Do NOT keep retrying terminal errors. Report them with actionable remediation steps and exit immediately.
-
-CRITICAL: When you have fully completed the user's task, you MUST call the complete_task tool with a summary of what you accomplished. Do NOT just return text - you must explicitly call complete_task to exit the loop.`;
-}
-
-/**
- * Browser Agent Definition Factory.
- *
- * Following the CodebaseInvestigatorAgent pattern:
- * - Returns a factory function that takes Config for dynamic model selection
- * - kind: 'local' for LocalAgentExecutor
- * - toolConfig is set dynamically by browserAgentFactory
- */
-export const BrowserAgentDefinition = (
-  config: Config,
-  visionEnabled = false,
-): LocalAgentDefinition<typeof BrowserTaskResultSchema> => {
-  // Use Preview Flash model if the main model is any of the preview models.
-  // If the main model is not a preview model, use the default flash model.
-  const model = isPreviewModel(config.getModel())
-    ? PREVIEW_GEMINI_FLASH_MODEL
-    : DEFAULT_GEMINI_FLASH_MODEL;
-
-  return {
-    name: BROWSER_AGENT_NAME,
-    kind: 'local',
-    experimental: true,
-    displayName: 'Browser Agent',
-    description: `Specialized autonomous agent for end-to-end web browser automation and objective-driven problem solving. Delegate complete, high-level tasks to this agent — it independently plans, executes multi-step interactions, interprets dynamic page feedback (e.g., game states, form validation errors, search results), and iterates until the goal is achieved. It perceives page structure through the Accessibility Tree, handles overlays and popups, and supports complex web apps.`,
-
-    inputConfig: {
-      inputSchema: {
-        type: 'object',
-        properties: {
-          task: {
-            type: 'string',
-            description: 'The task to perform in the browser.',
-          },
-        },
-        required: ['task'],
-      },
-    },
-
-    outputConfig: {
-      outputName: 'result',
-      description: 'The result of the browser task.',
-      schema: BrowserTaskResultSchema,
-    },
-
-    processOutput: (output) => JSON.stringify(output, null, 2),
-
-    modelConfig: {
-      // Dynamic model based on whether user is using preview models
-      model,
-      generateContentConfig: {
-        temperature: 0.1,
-        topP: 0.95,
-      },
-    },
-
-    runConfig: {
-      maxTimeMinutes: 10,
-      maxTurns: 50,
-    },
-
-    // Tools are set dynamically by browserAgentFactory after MCP connection
-    // This is undefined here and will be set at invocation time
-    toolConfig: undefined,
-
-    promptConfig: {
-      query: `Your task is:
-<task>
-\${task}
-</task>
-
-First, use new_page to open the relevant URL. Then call take_snapshot to see the page and proceed with your task.`,
-      systemPrompt: buildBrowserSystemPrompt(visionEnabled),
-    },
-  };
-};