Merge branch 'main' into feat/enhance-command

This commit addresses feedback by setting autoExecute to false for the enhance command, filtering out 'thought' parts from model responses, and sanitizing the output to prevent prompt injection.

.gemini/commands/strict-development-rules.md

@@ -53,27 +53,11 @@ Gemini CLI project.
   overriding values. Refer to `text-buffer.ts` for a canonical example.
 - **Logging**: Do not leave `console.log`, `console.warn`, or `console.error` in
   the code.
-- **State**: Ensure state initialization is explicit (e.g., use `undefined`
-  rather than `true` as a default if the state is truly unknown). Prefer a
-  reducer whenever practical. NEVER disable `react-hooks/exhaustive-deps`; fix
-  the code to correctly declare dependencies instead. Evaluate all the React
-  states in a component and ensure that the `useState` calls are necessary and
-  not cases where values could be derived on render. Ensure there are no stale
-  closures that are relying on a value from a previous render. React Components
-  that modify Settings should effectively use the `useSettingsStore` pattern.
-  Components that configure application Settings (e.g settings.json) are the
-  only reasonable case for unsaved changes to drive UX; in these cases, the
-  Settings store should only be written to on save. If the user experience does
-  not utilize unsaved changes because there is no option to exit without saving
-  or reverting the unsaved changes, then the component should directly read from
-  and write to the Settings store without holding pending changes in component
-  level UI state.
-- **Effect**: `useEffect` should not be used to synchronize React states, it
-  should only be used for genuine side effects that occur outside of React.
-  Contributors should be able to strongly justify the need for an effect.
-  Consider whether the effect should instead be inside an event handler, or
-  whether it is better off being computed on render. Carefully manage
-  `useEffect` dependencies.
+- **State & Effects**: Ensure state initialization is explicit (e.g., use
+  `undefined` rather than `true` as a default if the state is truly unknown).
+  Carefully manage `useEffect` dependencies. Prefer a reducer whenever
+  practical. NEVER disable `react-hooks/exhaustive-deps`; fix the code to
+  correctly declare dependencies instead.
 - **Context & Props**: Avoid excessive property drilling. Leverage existing
   providers, extend them, or propose a new one if necessary. Only use providers
   for properties that are consistent across the entire application.

.gemini/settings.json

@@ -3,11 +3,19 @@
     "extensionReloading": true,
     "modelSteering": true,
     "autoMemory": true,
+    "gemma": true,
     "memoryManager": true,
     "topicUpdateNarration": true,
-    "voiceMode": true
+    "voiceMode": true,
+    "enhanceCommand": true
   },
   "general": {
-    "devtools": true
+    "devtools": true,
+    "plan": {
+      "enabled": true
+    }
+  },
+  "agents": {
+    "overrides": {}
   }
 }

.github/workflows/build-unsigned-mac-binaries.yml

@@ -1,56 +0,0 @@
-name: 'Build Unsigned Mac Binaries'
-
-on:
-  workflow_dispatch:
-
-permissions:
-  contents: 'read'
-
-defaults:
-  run:
-    shell: 'bash'
-
-jobs:
-  build-mac:
-    name: 'Build Unsigned (${{ matrix.arch }})'
-    runs-on: 'macos-latest'
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: ['x64', 'arm64']
-
-    steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5' # ratchet:actions/checkout@v4
-
-      - name: 'Set up Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          architecture: '${{ matrix.arch }}'
-          cache: 'npm'
-
-      - name: 'Install dependencies'
-        run: 'npm ci'
-
-      - name: 'Build Binary'
-        env:
-          SKIP_SIGNING: 'true'
-        run: 'npm run build:binary'
-
-      - name: 'Verify Output Exists'
-        run: |
-          if [ -f "dist/darwin-${{ matrix.arch }}/gemini" ]; then
-            echo "Binary found at dist/darwin-${{ matrix.arch }}/gemini"
-          else
-            echo "Error: Binary not found in dist/darwin-${{ matrix.arch }}/"
-            ls -R dist/
-            exit 1
-          fi
-
-      - name: 'Upload Artifact'
-        uses: 'actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02' # ratchet:actions/upload-artifact@v4
-        with:
-          name: 'gemini-darwin-${{ matrix.arch }}-unsigned'
-          path: 'dist/darwin-${{ matrix.arch }}/'
-          retention-days: 5

.github/workflows/docs-audit.yml

@@ -28,8 +28,6 @@ jobs:
       - name: 'Run Docs Audit with Gemini'
         id: 'run_gemini'
         uses: 'google-github-actions/run-gemini-cli@a3bf79042542528e91937b3a3a6fbc4967ee3c31'
-        env:
-          GEMINI_CLI_TRUST_WORKSPACE: true
         with:
           gemini_api_key: '${{ secrets.GEMINI_API_KEY }}'
           prompt: |

.github/workflows/gemini-cli-bot-brain.yml

@@ -3,22 +3,8 @@ name: '🧠 Gemini CLI Bot: Brain'
 on:
   schedule:
     - cron: '0 0 * * *' # Every 24 hours
-  issue_comment:
-    types: ['created']
   workflow_dispatch:
     inputs:
-      run_interactive:
-        description: 'Run interactive flow (requires issue_number)'
-        type: 'boolean'
-        default: false
-      issue_number:
-        description: 'Issue/PR number to simulate context from'
-        type: 'string'
-        required: false
-      comment_id:
-        description: 'Specific comment ID to simulate'
-        type: 'string'
-        required: false
       clear_memory:
         description: 'Clear memory (drops learnings from previous runs)'
         type: 'boolean'
@@ -29,21 +15,14 @@ on:
         default: false
 
 concurrency:
-  group: '${{ github.workflow }}-${{ github.event.issue.number || github.event.pull_request.number || github.event.inputs.issue_number || github.ref }}'
+  group: '${{ github.workflow }}-${{ github.ref }}'
   cancel-in-progress: true
 
 jobs:
   reasoning:
     name: 'Brain (Reasoning Layer)'
     runs-on: 'ubuntu-latest'
-    if: |
-      github.repository == 'google-gemini/gemini-cli' && (
-        github.event_name == 'schedule' ||
-        (github.event_name == 'workflow_dispatch' && github.event.inputs.run_interactive != 'true') ||
-        (github.event_name == 'workflow_dispatch' && github.event.inputs.run_interactive == 'true') ||
-        (github.event_name == 'issue_comment' && github.event.comment.user.login != 'gemini-cli[bot]' && contains(github.event.comment.body, '@gemini-cli') && contains(fromJSON('["COLLABORATOR", "MEMBER", "OWNER"]'), github.event.comment.author_association)) ||
-        (github.event_name == 'pull_request_review_comment' && github.event.comment.user.login != 'gemini-cli[bot]' && contains(github.event.comment.body, '@gemini-cli') && contains(fromJSON('["COLLABORATOR", "MEMBER", "OWNER"]'), github.event.comment.author_association))
-      )
+    if: "github.repository == 'google-gemini/gemini-cli'"
     # The reasoning phase is strictly readonly.
     permissions:
       contents: 'read'
@@ -53,25 +32,9 @@ jobs:
     env:
       GEMINI_CLI_TRUST_WORKSPACE: 'true'
     steps:
-      - name: 'Determine Checkout Ref'
-        id: 'determine_ref'
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-          ISSUE_NUMBER: '${{ github.event.issue.number || github.event.pull_request.number || github.event.inputs.issue_number }}'
-        run: |
-          REF="${{ github.ref }}"
-          if [ -n "$ISSUE_NUMBER" ]; then
-            PR_HEAD=$(gh pr view "$ISSUE_NUMBER" --repo "${{ github.repository }}" --json headRefName --jq .headRefName 2>/dev/null || echo "")
-            if [ -n "$PR_HEAD" ]; then
-              REF="$PR_HEAD"
-            fi
-          fi
-          echo "ref=$REF" >> "$GITHUB_OUTPUT"
-
       - name: 'Checkout'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
         with:
-          ref: '${{ steps.determine_ref.outputs.ref }}'
           fetch-depth: 0
           persist-credentials: false
 
@@ -102,15 +65,8 @@ jobs:
           if [ -n "$LAST_RUN_ID" ]; then
             echo "Found previous successful run: $LAST_RUN_ID"
 
-            # Download brain memory to a temp dir so we can selectively restore only persistent state
-            mkdir -p .temp_brain_data
-            gh run download "$LAST_RUN_ID" -n brain-data -D .temp_brain_data || echo "brain-data not found"
-
-            # Restore only persistent memory files
-            cp .temp_brain_data/tools/gemini-cli-bot/lessons-learned.md tools/gemini-cli-bot/lessons-learned.md 2>/dev/null || true
-            mkdir -p tools/gemini-cli-bot/history/
-            cp .temp_brain_data/tools/gemini-cli-bot/history/*.csv tools/gemini-cli-bot/history/ 2>/dev/null || true
-            rm -rf .temp_brain_data
+            # Download brain memory (all state in one artifact)
+            gh run download "$LAST_RUN_ID" -n brain-data -D . || echo "brain-data not found"
           else
             echo "No previous successful run found."
           fi
@@ -126,47 +82,13 @@ jobs:
           GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
           GEMINI_MODEL: 'gemini-3-flash-preview'
           ENABLE_PRS: "${{ github.event.inputs.enable_prs || 'false' }}"
-          TRIGGER_ISSUE_NUMBER: '${{ github.event.issue.number || github.event.inputs.issue_number }}'
-          TRIGGER_COMMENT_ID: '${{ github.event.comment.id || github.event.inputs.comment_id }}'
-        run: |
-          PROMPT_PATH="tools/gemini-cli-bot/brain/metrics.md"
-          if [ "${{ github.event_name }}" = "issue_comment" ] || [ "${{ github.event.inputs.run_interactive }}" = "true" ]; then
-            PROMPT_PATH="tools/gemini-cli-bot/brain/interactive.md"
-            export ENABLE_PRS="true"
-          fi
-
-          touch trigger_context.md
-          if [ -n "$TRIGGER_ISSUE_NUMBER" ]; then
-            echo "<untrusted_context>" > trigger_context.md
-            echo "# Interactive Trigger Context" >> trigger_context.md
-            echo "You were invoked by a user in issue/PR #$TRIGGER_ISSUE_NUMBER." >> trigger_context.md
-
-            if [ -n "$TRIGGER_COMMENT_ID" ]; then
-              echo "## User Comment" >> trigger_context.md
-              gh api "repos/${{ github.repository }}/issues/comments/$TRIGGER_COMMENT_ID" -q '.body' >> trigger_context.md 2>/dev/null || gh api "repos/${{ github.repository }}/pulls/comments/$TRIGGER_COMMENT_ID" -q '.body' >> trigger_context.md
-              echo "" >> trigger_context.md
-            fi
-
-            echo "## Issue/PR Context" >> trigger_context.md
-            gh issue view "$TRIGGER_ISSUE_NUMBER" >> trigger_context.md 2>/dev/null || gh pr view "$TRIGGER_ISSUE_NUMBER" >> trigger_context.md
-            echo "</untrusted_context>" >> trigger_context.md
-          fi
-
-          cat trigger_context.md "$PROMPT_PATH" tools/gemini-cli-bot/brain/common.md > combined_prompt.md
-
-          node bundle/gemini.js --policy tools/gemini-cli-bot/ci-policy.toml -p "$(cat combined_prompt.md)"
-
-          if [ -n "$TRIGGER_ISSUE_NUMBER" ] && [ ! -s "issue-comment.md" ] && [ ! -s "pr-comment.md" ]; then
-            echo "Agent failed to respond. Generating fallback error message."
-            echo "⚠️ **Gemini CLI Bot failed to generate a response.**" > "issue-comment.md"
-            echo "" >> "issue-comment.md"
-            echo "I encountered an error or failed to generate a complete response to your request. You can check the [GitHub Actions Run Log](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}) for more details on what went wrong." >> "issue-comment.md"
-          fi
+        run: 'node bundle/gemini.js --policy tools/gemini-cli-bot/ci-policy.toml -p "$(cat tools/gemini-cli-bot/brain/metrics.md)"'
 
       - name: 'Run Critique Phase'
-        if: "${{ github.event.inputs.enable_prs == 'true' || github.event_name == 'issue_comment' || github.event_name == 'pull_request_review_comment' || github.event.inputs.run_interactive == 'true' }}"
+        if: "${{ github.event.inputs.enable_prs == 'true' }}"
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
+          # This token is strictly readonly as enforced by the job-level permissions.
           GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
           GEMINI_MODEL: 'gemini-3-flash-preview'
         run: |
@@ -176,23 +98,24 @@ jobs:
           else
              node bundle/gemini.js --policy tools/gemini-cli-bot/ci-policy.toml -p "$(cat tools/gemini-cli-bot/brain/critique.md)" 2>&1 | tee critique_output.log
 
-             if [ "${PIPESTATUS[0]}" -eq 0 ] && grep -q "\[APPROVED\]" critique_output.log && ! grep -q "\[REJECTED\]" critique_output.log; then
-               echo "[APPROVED]" > critique_result.txt
-             else
-               echo "Critique failed, rejected, or did not explicitly approve changes. Skipping PR creation."
+             # PIPESTATUS[0] captures the exit code of the node command before the pipe
+             if [ "${PIPESTATUS[0]}" -ne 0 ] || grep -q "\[REJECTED\]" critique_output.log; then
+               echo "Critique failed or rejected changes. Skipping PR creation."
                echo "[REJECTED]" > critique_result.txt
+             else
+               echo "[APPROVED]" > critique_result.txt
              fi
           fi
 
       - name: 'Generate Patch'
-        if: "${{ github.event.inputs.enable_prs == 'true' || github.event_name == 'issue_comment' || github.event_name == 'pull_request_review_comment' || github.event.inputs.run_interactive == 'true' }}"
+        if: "${{ github.event.inputs.enable_prs == 'true' }}"
         run: |
           touch bot-changes.patch
           touch pr-description.md
-          if [ -f critique_result.txt ] && grep -q "\[APPROVED\]" critique_result.txt && ! grep -q "\[REJECTED\]" critique_result.txt; then
-             git diff --staged > bot-changes.patch
+          if [ -f critique_result.txt ] && grep -q "\[REJECTED\]" critique_result.txt; then
+             echo "Critique rejected. Skipping patch generation."
           else
-             echo "Critique did not approve. Skipping patch generation."
+             git diff --staged > bot-changes.patch
           fi
 
       - name: 'Archive Brain Data'
@@ -207,7 +130,6 @@ jobs:
             branch-name.txt
             pr-comment.md
             pr-number.txt
-            issue-comment.md
           retention-days: 90
 
   publish:
@@ -221,38 +143,10 @@ jobs:
       pull-requests: 'write'
       actions: 'write'
     steps:
-      - name: 'Generate GitHub App Token 🔑'
-        id: 'generate_token'
-        if: "${{ github.event.inputs.enable_prs == 'true' || github.event_name == 'issue_comment' || github.event_name == 'pull_request_review_comment' || github.event.inputs.run_interactive == 'true' }}"
-        uses: 'actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b' # ratchet:actions/create-github-app-token@v2
-        with:
-          app-id: '${{ secrets.APP_ID }}'
-          private-key: '${{ secrets.PRIVATE_KEY }}'
-          owner: '${{ github.repository_owner }}'
-          repositories: '${{ github.event.repository.name }}'
-          permission-contents: 'write'
-          permission-pull-requests: 'write'
-          permission-issues: 'write'
-
-      - name: 'Determine Checkout Ref'
-        id: 'determine_ref'
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-          ISSUE_NUMBER: '${{ github.event.issue.number || github.event.pull_request.number || github.event.inputs.issue_number }}'
-        run: |
-          REF="main"
-          if [ -n "$ISSUE_NUMBER" ]; then
-            PR_HEAD=$(gh pr view "$ISSUE_NUMBER" --repo "${{ github.repository }}" --json headRefName --jq .headRefName 2>/dev/null || echo "")
-            if [ -n "$PR_HEAD" ]; then
-              REF="$PR_HEAD"
-            fi
-          fi
-          echo "ref=$REF" >> "$GITHUB_OUTPUT"
-
       - name: 'Checkout'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
         with:
-          ref: '${{ steps.determine_ref.outputs.ref }}'
+          ref: 'main'
           fetch-depth: 0
           persist-credentials: false
 
@@ -263,14 +157,13 @@ jobs:
           path: '${{ runner.temp }}/brain-data/'
 
       - name: 'Create or Update PR'
-        if: "${{ github.event.inputs.enable_prs == 'true' || github.event_name == 'issue_comment' || github.event_name == 'pull_request_review_comment' || github.event.inputs.run_interactive == 'true' }}"
+        if: "${{ github.event.inputs.enable_prs == 'true' }}"
         env:
-          GH_TOKEN: '${{ steps.generate_token.outputs.token }}'
-          FALLBACK_PAT: '${{ secrets.GEMINI_CLI_ROBOT_GITHUB_PAT }}'
+          GH_TOKEN: '${{ secrets.GEMINI_CLI_ROBOT_GITHUB_PAT }}'
         run: |
           if [ -s "${{ runner.temp }}/brain-data/bot-changes.patch" ]; then
-            git config user.name "gemini-cli[bot]"
-            git config user.email "gemini-cli[bot]@users.noreply.github.com"
+            git config user.name "gemini-cli-robot"
+            git config user.email "gemini-cli-robot@google.com"
             git remote set-url origin "https://x-access-token:${GH_TOKEN}@github.com/${{ github.repository }}.git"
 
             BRANCH_NAME="bot/productivity-updates-$(date +'%Y%m%d%H%M%S')-${{ github.run_id }}"
@@ -278,12 +171,13 @@ jobs:
               BRANCH_NAME=$(cat "${{ runner.temp }}/brain-data/branch-name.txt")
             fi
 
+            # SECURITY: Only allow pushing to branches starting with 'bot/'
             if [[ ! "$BRANCH_NAME" =~ ^bot/ ]]; then
               echo "Error: Branch name '$BRANCH_NAME' does not start with 'bot/'. Safety abort."
               exit 1
             fi
 
-            git checkout -B "$BRANCH_NAME"
+            git checkout -b "$BRANCH_NAME"
             git apply "${{ runner.temp }}/brain-data/bot-changes.patch"
             git add .
 
@@ -293,51 +187,35 @@ jobs:
               git commit -m "🤖 Gemini Bot Productivity Optimizations"
             fi
 
+            # Use force to update existing PR branches
+            git push origin "$BRANCH_NAME" --force
+
             PR_TITLE="🤖 Gemini Bot Productivity Optimizations"
             if [ -s "${{ runner.temp }}/brain-data/pr-description.md" ]; then
               PR_TITLE=$(head -n 1 "${{ runner.temp }}/brain-data/pr-description.md")
             fi
 
-            if ! git push origin "$BRANCH_NAME" --force; then
-              echo "Push failed. Retrying with FALLBACK_PAT..."
-              export GH_TOKEN="$FALLBACK_PAT"
-              git remote set-url origin "https://x-access-token:${FALLBACK_PAT}@github.com/${{ github.repository }}.git"
-              git push origin "$BRANCH_NAME" --force
-            fi
-
+            # Create PR if it doesn't exist
             if ! gh pr view "$BRANCH_NAME" > /dev/null 2>&1; then
               gh pr create --draft --title "$PR_TITLE" --body-file "${{ runner.temp }}/brain-data/pr-description.md" --head "$BRANCH_NAME" --base main || \
               gh pr create --draft --title "🤖 Gemini Bot Productivity Optimizations" --body "Automated changes generated by Gemini CLI Bot." --head "$BRANCH_NAME" --base main
-            else
-              PR_STATE=$(gh pr view "$BRANCH_NAME" --json state --jq .state)
-              if [ "$PR_STATE" = "CLOSED" ]; then
-                NEW_BRANCH_NAME="${BRANCH_NAME}-retry-${{ github.run_id }}"
-                git checkout -b "$NEW_BRANCH_NAME"
-                git push origin "$NEW_BRANCH_NAME" --force
-                gh pr create --draft --title "$PR_TITLE" --body-file "${{ runner.temp }}/brain-data/pr-description.md" --head "$NEW_BRANCH_NAME" --base main || \
-                gh pr create --draft --title "🤖 Gemini Bot Productivity Optimizations" --body "Automated changes generated by Gemini CLI Bot." --head "$NEW_BRANCH_NAME" --base main
-              fi
             fi
           fi
 
-      - name: 'Post PR/Issue Comment'
+      - name: 'Post PR Comment'
+        if: "${{ github.event.inputs.enable_prs == 'true' }}"
         env:
-          GH_TOKEN: '${{ steps.generate_token.outputs.token }}'
-          TRIGGER_ISSUE_NUMBER: '${{ github.event.issue.number || github.event.inputs.issue_number }}'
+          GH_TOKEN: '${{ secrets.GEMINI_CLI_ROBOT_GITHUB_PAT }}'
         run: |
-          if [ -s "${{ runner.temp }}/brain-data/issue-comment.md" ] && [ -n "$TRIGGER_ISSUE_NUMBER" ]; then
-            echo "Posting comment to triggering issue #$TRIGGER_ISSUE_NUMBER"
-            # Use REST API (gh api) instead of GraphQL (gh issue comment) to ensure robot identity
-            # while avoiding potential GraphQL-specific authorization hurdles with PATs.
-            gh api "repos/${{ github.repository }}/issues/$TRIGGER_ISSUE_NUMBER/comments" -F body=@"${{ runner.temp }}/brain-data/issue-comment.md"
-          fi
-
           if [ -s "${{ runner.temp }}/brain-data/pr-comment.md" ] && [ -f "${{ runner.temp }}/brain-data/pr-number.txt" ]; then
             PR_NUM=$(cat "${{ runner.temp }}/brain-data/pr-number.txt")
 
-            # Using GitHub App, so author check is no longer valid against gemini-cli-robot
-            # Skipping author validation here to let the app post.
+            # SECURITY: Only allow commenting on PRs authored by the bot
+            PR_AUTHOR=$(gh pr view "$PR_NUM" --json author --jq '.author.login')
+            if [ "$PR_AUTHOR" != "gemini-cli-robot" ]; then
+              echo "Error: PR #$PR_NUM is authored by '$PR_AUTHOR', not 'gemini-cli-robot'. Safety abort."
+              exit 1
+            fi
 
-            # Use REST API (gh api) for consistency and robot identity
-            gh api "repos/${{ github.repository }}/issues/$PR_NUM/comments" -F body=@"${{ runner.temp }}/brain-data/pr-comment.md"
+            gh pr comment "$PR_NUM" -F "${{ runner.temp }}/brain-data/pr-comment.md"
           fi

.github/workflows/release-notes.yml

@@ -70,8 +70,6 @@ jobs:
       - name: 'Generate Changelog with Gemini'
         if: "steps.validate_version.outputs.CONTINUE == 'true'"
         uses: 'google-github-actions/run-gemini-cli@a3bf79042542528e91937b3a3a6fbc4967ee3c31' # ratchet:google-github-actions/run-gemini-cli@v0
-        env:
-          GEMINI_CLI_TRUST_WORKSPACE: true
         with:
           gemini_api_key: '${{ secrets.GEMINI_API_KEY }}'
           prompt: |

README.md

@@ -395,16 +395,6 @@ for removal instructions.
   [Terms & Privacy](https://www.geminicli.com/docs/resources/tos-privacy)
 - **Security**: [Security Policy](SECURITY.md)
 
-<p align="left">
- <a href="https://www.star-history.com/google-gemini/gemini-cli">
-  <picture>
-   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/badge?repo=google-gemini/gemini-cli&theme=dark" />
-   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/badge?repo=google-gemini/gemini-cli" />
-   <img alt="Star History Rank" src="https://api.star-history.com/badge?repo=google-gemini/gemini-cli" />
-  </picture>
- </a>
-</p>
-
 ---
 
 <p align="center">

docs/changelogs/index.md

@@ -18,24 +18,6 @@ on GitHub.
 | [Preview](preview.md) | Experimental features ready for early feedback. |
 | [Stable](latest.md)   | Stable, recommended for general use.            |
 
-## Announcements: v0.40.0 - 2026-04-28
-
-- **Offline Search and Themes:** Bundled ripgrep for offline search support and
-  added GitHub-style colorblind themes
-  ([#25342](https://github.com/google-gemini/gemini-cli/pull/25342) by
-  @scidomino, [#15504](https://github.com/google-gemini/gemini-cli/pull/15504)
-  by @Z1xus).
-- **Advanced Resource and Memory Management:** Introduced MCP resource tools and
-  transitioned to a prompt-driven, four-tier memory management system
-  ([#25395](https://github.com/google-gemini/gemini-cli/pull/25395) by
-  @ruomengz, [#25716](https://github.com/google-gemini/gemini-cli/pull/25716) by
-  @SandyTao520).
-- **UX and Local Models:** Enabled topic update narrations by default and
-  streamlined Gemma local model setup with `gemini gemma`
-  ([#25586](https://github.com/google-gemini/gemini-cli/pull/25586) by
-  @gundermanc, [#25498](https://github.com/google-gemini/gemini-cli/pull/25498)
-  by @Samee24).
-
 ## Announcements: v0.39.0 - 2026-04-23
 
 - **Skill Management:** Added a new `/memory` inbox command for reviewing and

docs/changelogs/latest.md

@@ -1,6 +1,6 @@
-# Latest stable release: v0.40.0
+# Latest stable release: v0.39.0
 
-Released: April 28, 2026
+Released: April 23, 2026
 
 For most users, our latest stable release is the recommended release. Install
 the latest stable version with:
@@ -11,177 +11,252 @@ npm install -g @google/gemini-cli
 
 ## Highlights
 
-- **Offline Search Support:** Bundled ripgrep binaries into the Single
-  Executable Application (SEA) to enable powerful codebase searching even in
-  environments without internet access.
-- **Enhanced Theme Customization:** Introduced GitHub-style colorblind-friendly
-  themes to improve accessibility and provide more personalized visual options.
-- **MCP Resource Management:** Added new tools for listing and reading Model
-  Context Protocol (MCP) resources, enhancing the agent's ability to discover
-  and utilize external data.
-- **Improved Narrative Flow:** Enabled topic update narrations by default to
-  provide better session structure and a clearer understanding of the agent's
-  current focus.
-- **Streamlined Local Model Setup:** Introduced a simplified `gemini gemma`
-  command for quickly setting up and running Gemma models locally.
-- **Prompt-Driven Memory Management:** Replaced the legacy `MemoryManagerAgent`
-  with a more efficient prompt-driven memory editing system across four tiers of
-  context.
+- **Skill Extractor & Memory Inbox:** Introduced the `/memory` command to review
+  and patch skills extracted during agent sessions, streamlining the continuous
+  learning workflow.
+- **Enhanced Plan Mode Security:** Increased transparency in Plan Mode by
+  requiring user confirmation for skill activation and allowing users to view
+  the full content of generated plans.
+- **Advanced Display Protocol:** Implemented a tool-controlled display protocol,
+  enabling agents to provide richer, more structured visual feedback during
+  execution.
+- **Core Architecture Refactor:** Introduced a decoupled `ContextManager` and
+  `Sidecar` architecture to improve state management and session resilience.
+- **Streamlined Agent Feedback:** Restored the display of model thoughts and raw
+  text in responses, ensuring full visibility into the agent's reasoning
+  process.
 
 ## What's Changed
 
-- chore(release): bump version to 0.40.0-nightly.20260414.g5b1f7375a by
+- refactor(plan): simplify policy priorities and consolidate read-only rules by
+  @ruomengz in [#24849](https://github.com/google-gemini/gemini-cli/pull/24849)
+- feat(test-utils): add memory usage integration test harness by @sripasg in
+  [#24876](https://github.com/google-gemini/gemini-cli/pull/24876)
+- feat(memory): add /memory inbox command for reviewing extracted skills by
+  @SandyTao520 in
+  [#24544](https://github.com/google-gemini/gemini-cli/pull/24544)
+- chore(release): bump version to 0.39.0-nightly.20260408.e77b22e63 by
   @gemini-cli-robot in
-  [#25420](https://github.com/google-gemini/gemini-cli/pull/25420)
-- Fix(core): retry additional OpenSSL 3.x SSL errors during streaming (#16075)
-  by @rcleveng in
-  [#25187](https://github.com/google-gemini/gemini-cli/pull/25187)
-- fix(core): prevent YOLO mode from being downgraded by @galz10 in
-  [#25341](https://github.com/google-gemini/gemini-cli/pull/25341)
-- feat: bundle ripgrep binaries into SEA for offline support by @scidomino in
-  [#25342](https://github.com/google-gemini/gemini-cli/pull/25342)
-- Changelog for v0.39.0-preview.0 by @gemini-cli-robot in
-  [#25417](https://github.com/google-gemini/gemini-cli/pull/25417)
-- feat(test): add large conversation scenario for performance test by
-  @cynthialong0-0 in
-  [#25331](https://github.com/google-gemini/gemini-cli/pull/25331)
-- improve(core): require recurrence evidence before extracting skills by
+  [#24939](https://github.com/google-gemini/gemini-cli/pull/24939)
+- fix(core): ensure robust sandbox cleanup in all process execution paths by
+  @ehedlund in [#24763](https://github.com/google-gemini/gemini-cli/pull/24763)
+- chore: update ink version to 6.6.8 by @jacob314 in
+  [#24934](https://github.com/google-gemini/gemini-cli/pull/24934)
+- Changelog for v0.38.0-preview.0 by @gemini-cli-robot in
+  [#24938](https://github.com/google-gemini/gemini-cli/pull/24938)
+- chore: ignore conductor directory by @JayadityaGit in
+  [#22128](https://github.com/google-gemini/gemini-cli/pull/22128)
+- Changelog for v0.37.0 by @gemini-cli-robot in
+  [#24940](https://github.com/google-gemini/gemini-cli/pull/24940)
+- feat(plan): require user confirmation for activate_skill in Plan Mode by
+  @ruomengz in [#24946](https://github.com/google-gemini/gemini-cli/pull/24946)
+- feat(test-utils): add CPU performance integration test harness by @sripasg in
+  [#24951](https://github.com/google-gemini/gemini-cli/pull/24951)
+- fix(cli-ui): enable Ctrl+Backspace for word deletion in Windows Terminal by
+  @dogukanozen in
+  [#21447](https://github.com/google-gemini/gemini-cli/pull/21447)
+- test(sdk): add unit tests for GeminiCliSession by @AdamyaSingh7 in
+  [#21897](https://github.com/google-gemini/gemini-cli/pull/21897)
+- fix(core): resolve windows symlink bypass and stabilize sandbox integration
+  tests by @ehedlund in
+  [#24834](https://github.com/google-gemini/gemini-cli/pull/24834)
+- fix(cli): restore file path display in edit and write tool confirmations by
+  @jwhelangoog in
+  [#24974](https://github.com/google-gemini/gemini-cli/pull/24974)
+- feat(core): refine shell tool description display logic by @jwhelangoog in
+  [#24903](https://github.com/google-gemini/gemini-cli/pull/24903)
+- fix(core): dynamic session ID injection to resolve resume bugs by @scidomino
+  in [#24972](https://github.com/google-gemini/gemini-cli/pull/24972)
+- Update ink version to 6.6.9 by @jacob314 in
+  [#24980](https://github.com/google-gemini/gemini-cli/pull/24980)
+- Generalize evals infra to support more types of evals, organization and
+  queuing of named suites by @gundermanc in
+  [#24941](https://github.com/google-gemini/gemini-cli/pull/24941)
+- fix(cli): optimize startup with lightweight parent process by @sehoon38 in
+  [#24667](https://github.com/google-gemini/gemini-cli/pull/24667)
+- refactor(sandbox): use centralized sandbox paths in macOS Seatbelt
+  implementation by @ehedlund in
+  [#24984](https://github.com/google-gemini/gemini-cli/pull/24984)
+- feat(cli): refine tool output formatting for compact mode by @jwhelangoog in
+  [#24677](https://github.com/google-gemini/gemini-cli/pull/24677)
+- fix(sdk): skip broken sendStream tests to unblock nightly by @SandyTao520 in
+  [#25000](https://github.com/google-gemini/gemini-cli/pull/25000)
+- refactor(core): use centralized path resolution for Linux sandbox by @ehedlund
+  in [#24985](https://github.com/google-gemini/gemini-cli/pull/24985)
+- Support ctrl+shift+g by @jacob314 in
+  [#25035](https://github.com/google-gemini/gemini-cli/pull/25035)
+- feat(core): refactor subagent tool to unified invoke_subagent tool by
+  @abhipatel12 in
+  [#24489](https://github.com/google-gemini/gemini-cli/pull/24489)
+- fix(core): add explicit git identity env vars to prevent sandbox checkpointing
+  error by @mrpmohiburrahman in
+  [#19775](https://github.com/google-gemini/gemini-cli/pull/19775)
+- fix: respect hideContextPercentage when FooterConfigDialog is closed without
+  changes by @chernistry in
+  [#24773](https://github.com/google-gemini/gemini-cli/pull/24773)
+- fix(cli): suppress unhandled AbortError logs during request cancellation by
+  @euxaristia in
+  [#22621](https://github.com/google-gemini/gemini-cli/pull/22621)
+- Automated documentation audit by @g-samroberts in
+  [#24567](https://github.com/google-gemini/gemini-cli/pull/24567)
+- feat(cli): implement useAgentStream hook by @mbleigh in
+  [#24292](https://github.com/google-gemini/gemini-cli/pull/24292)
+- refactor(plan) Clean default plan toml by @ruomengz in
+  [#25037](https://github.com/google-gemini/gemini-cli/pull/25037)
+- refactor(core): remove legacy subagent wrapping tools by @abhipatel12 in
+  [#25053](https://github.com/google-gemini/gemini-cli/pull/25053)
+- fix(core): honor retryDelay in RetryInfo for 503 errors by @yunaseoul in
+  [#25057](https://github.com/google-gemini/gemini-cli/pull/25057)
+- fix(core): remediate subagent memory leaks using AbortSignal in MessageBus by
+  @abhipatel12 in
+  [#25048](https://github.com/google-gemini/gemini-cli/pull/25048)
+- feat(cli): wire up useAgentStream in AppContainer by @mbleigh in
+  [#24297](https://github.com/google-gemini/gemini-cli/pull/24297)
+- feat(core): migrate chat recording to JSONL streaming by @spencer426 in
+  [#23749](https://github.com/google-gemini/gemini-cli/pull/23749)
+- fix(core): clear 5-minute timeouts in oauth flow to prevent memory leaks by
+  @spencer426 in
+  [#24968](https://github.com/google-gemini/gemini-cli/pull/24968)
+- fix(sandbox): centralize async git worktree resolution and enforce read-only
+  security by @ehedlund in
+  [#25040](https://github.com/google-gemini/gemini-cli/pull/25040)
+- feat(test): add high-volume shell test and refine perf harness by @sripasg in
+  [#24983](https://github.com/google-gemini/gemini-cli/pull/24983)
+- fix(core): silently handle EPERM when listing dir structure by @scidomino in
+  [#25066](https://github.com/google-gemini/gemini-cli/pull/25066)
+- Changelog for v0.37.1 by @gemini-cli-robot in
+  [#25055](https://github.com/google-gemini/gemini-cli/pull/25055)
+- fix: decode Uint8Array and multi-byte UTF-8 in API error messages by
+  @kimjune01 in [#23341](https://github.com/google-gemini/gemini-cli/pull/23341)
+- Automated documentation audit results by @g-samroberts in
+  [#22755](https://github.com/google-gemini/gemini-cli/pull/22755)
+- debugging(ui): add optional debugRainbow setting by @jacob314 in
+  [#25088](https://github.com/google-gemini/gemini-cli/pull/25088)
+- fix: resolve lifecycle memory leaks by cleaning up listeners and root closures
+  by @spencer426 in
+  [#25049](https://github.com/google-gemini/gemini-cli/pull/25049)
+- docs(cli): updates f12 description to be more precise by @JayadityaGit in
+  [#15816](https://github.com/google-gemini/gemini-cli/pull/15816)
+- fix(cli): mark /settings as unsafe to run concurrently by @jacob314 in
+  [#25061](https://github.com/google-gemini/gemini-cli/pull/25061)
+- fix(core): remove buffer slice to prevent OOM on large output streams by
+  @spencer426 in
+  [#25094](https://github.com/google-gemini/gemini-cli/pull/25094)
+- feat(core): persist subagent agentId in tool call records by @abhipatel12 in
+  [#25092](https://github.com/google-gemini/gemini-cli/pull/25092)
+- chore(core): increase codebase investigator turn limits to 50 by @abhipatel12
+  in [#25125](https://github.com/google-gemini/gemini-cli/pull/25125)
+- refactor(core): consolidate execute() arguments into ExecuteOptions by
+  @mbleigh in [#25101](https://github.com/google-gemini/gemini-cli/pull/25101)
+- feat(core): add Strategic Re-evaluation guidance to system prompt by
+  @aishaneeshah in
+  [#25062](https://github.com/google-gemini/gemini-cli/pull/25062)
+- fix(core): preserve shell execution config fields on update by
+  @jasonmatthewsuhari in
+  [#25113](https://github.com/google-gemini/gemini-cli/pull/25113)
+- docs: add vi shortcuts and clarify MCP sandbox setup by @chrisjcthomas in
+  [#21679](https://github.com/google-gemini/gemini-cli/pull/21679)
+- fix(cli): pass session id to interactive shell executions by
+  @jasonmatthewsuhari in
+  [#25114](https://github.com/google-gemini/gemini-cli/pull/25114)
+- fix(cli): resolve text sanitization data loss due to C1 control characters by
+  @euxaristia in
+  [#22624](https://github.com/google-gemini/gemini-cli/pull/22624)
+- feat(core): add large memory regression test by @cynthialong0-0 in
+  [#25059](https://github.com/google-gemini/gemini-cli/pull/25059)
+- fix(core): resolve PTY exhaustion and orphan MCP subprocess leaks by
+  @spencer426 in
+  [#25079](https://github.com/google-gemini/gemini-cli/pull/25079)
+- chore(deps): update vulnerable dependencies via npm audit fix by @scidomino in
+  [#25140](https://github.com/google-gemini/gemini-cli/pull/25140)
+- perf(sandbox): optimize Windows sandbox initialization via native ACL
+  application by @ehedlund in
+  [#25077](https://github.com/google-gemini/gemini-cli/pull/25077)
+- chore: switch from keytar to @github/keytar by @cocosheng-g in
+  [#25143](https://github.com/google-gemini/gemini-cli/pull/25143)
+- fix: improve audio MIME normalization and validation in file reads by
+  @junaiddshaukat in
+  [#21636](https://github.com/google-gemini/gemini-cli/pull/21636)
+- docs: Update docs-audit to include changes in PR body by @g-samroberts in
+  [#25153](https://github.com/google-gemini/gemini-cli/pull/25153)
+- docs: correct documentation for enforced authentication type by @cocosheng-g
+  in [#25142](https://github.com/google-gemini/gemini-cli/pull/25142)
+- fix(cli): exclude update_topic from confirmation queue count by @Abhijit-2592
+  in [#24945](https://github.com/google-gemini/gemini-cli/pull/24945)
+- Memory fix for trace's streamWrapper. by @anthraxmilkshake in
+  [#25089](https://github.com/google-gemini/gemini-cli/pull/25089)
+- fix(core): fix quota footer for non-auto models and improve display by
+  @jackwotherspoon in
+  [#25121](https://github.com/google-gemini/gemini-cli/pull/25121)
+- docs(contributing): clarify self-assignment policy for issues by @jmr in
+  [#23087](https://github.com/google-gemini/gemini-cli/pull/23087)
+- feat(core): add skill patching support with /memory inbox integration by
   @SandyTao520 in
-  [#25147](https://github.com/google-gemini/gemini-cli/pull/25147)
-- test(evals): add subagent delegation evaluation tests by @anj-s in
-  [#24619](https://github.com/google-gemini/gemini-cli/pull/24619)
-- feat: add github colorblind themes by @Z1xus in
-  [#15504](https://github.com/google-gemini/gemini-cli/pull/15504)
-- fix(core): honor GOOGLE_GEMINI_BASE_URL and GOOGLE_VERTEX_BASE_URL by
-  @chrisjcthomas in
-  [#25357](https://github.com/google-gemini/gemini-cli/pull/25357)
-- fix(cli): clean up slash command IDE listeners by @jasonmatthewsuhari in
-  [#24397](https://github.com/google-gemini/gemini-cli/pull/24397)
-- Changelog for v0.38.0 by @gemini-cli-robot in
-  [#25470](https://github.com/google-gemini/gemini-cli/pull/25470)
-- fix(evals): update eval tests for invoke_agent telemetry and project-scoped
-  memory by @SandyTao520 in
-  [#25502](https://github.com/google-gemini/gemini-cli/pull/25502)
-- Changelog for v0.38.1 by @gemini-cli-robot in
-  [#25476](https://github.com/google-gemini/gemini-cli/pull/25476)
-- feat(core): integrate skill-creator into skill extraction agent by
-  @SandyTao520 in
-  [#25421](https://github.com/google-gemini/gemini-cli/pull/25421)
-- feat(cli): provide default post-submit prompt for skill command by @ruomengz
-  in [#25327](https://github.com/google-gemini/gemini-cli/pull/25327)
-- feat(core): add tools to list and read MCP resources by @ruomengz in
-  [#25395](https://github.com/google-gemini/gemini-cli/pull/25395)
-- fix(evals): add typecheck coverage for evals, integration-tests, and
-  memory-tests by @SandyTao520 in
-  [#25480](https://github.com/google-gemini/gemini-cli/pull/25480)
-- Use OSC 777 for terminal notifications by @jackyliuxx in
-  [#25300](https://github.com/google-gemini/gemini-cli/pull/25300)
-- fix(extensions): fix bundling for examples by @abhipatel12 in
-  [#25542](https://github.com/google-gemini/gemini-cli/pull/25542)
-- fix(cli): reset plan session state on /clear by @jasonmatthewsuhari in
-  [#25515](https://github.com/google-gemini/gemini-cli/pull/25515)
-- feat(core): add .mdx support to get-internal-docs tool by @g-samroberts in
-  [#25090](https://github.com/google-gemini/gemini-cli/pull/25090)
-- docs(policy): mention that workspace policies are broken by @6112 in
-  [#24367](https://github.com/google-gemini/gemini-cli/pull/24367)
-- fix(core): allow explicit write permissions to override governance file
-  protections in sandboxes by @galz10 in
-  [#25338](https://github.com/google-gemini/gemini-cli/pull/25338)
-- feat(sandbox): resolve custom seatbelt profiles from $HOME/.gemini first by
-  @mvanhorn in [#25427](https://github.com/google-gemini/gemini-cli/pull/25427)
-- Reduce blank lines. by @gundermanc in
-  [#25563](https://github.com/google-gemini/gemini-cli/pull/25563)
-- fix(ui): revert preview theme on dialog unmount by @JayadityaGit in
-  [#22542](https://github.com/google-gemini/gemini-cli/pull/22542)
-- fix(core): fix ShellExecutionConfig spread and add ProjectRegistry save
-  backoff by @mahimashanware in
-  [#25382](https://github.com/google-gemini/gemini-cli/pull/25382)
-- feat(core): Disable topic updates for subagents by @gundermanc in
-  [#25567](https://github.com/google-gemini/gemini-cli/pull/25567)
-- feat(core): enable topic update narration by default and promote to general by
+  [#25148](https://github.com/google-gemini/gemini-cli/pull/25148)
+- Stop suppressing thoughts and text in model response by @gundermanc in
+  [#25073](https://github.com/google-gemini/gemini-cli/pull/25073)
+- fix(release): prefix git hash in nightly versions to prevent semver
+  normalization by @SandyTao520 in
+  [#25304](https://github.com/google-gemini/gemini-cli/pull/25304)
+- feat(cli): extract QuotaContext and resolve infinite render loop by @Adib234
+  in [#24959](https://github.com/google-gemini/gemini-cli/pull/24959)
+- refactor(core): extract and centralize sandbox path utilities by @ehedlund in
+  [#25305](https://github.com/google-gemini/gemini-cli/pull/25305)
+- feat(ui): added enhancements to scroll momentum by @devr0306 in
+  [#24447](https://github.com/google-gemini/gemini-cli/pull/24447)
+- fix(core): replace custom binary detection with isbinaryfile to correctly
+  handle UTF-8 (U+FFFD) by @Anjaligarhwal in
+  [#25297](https://github.com/google-gemini/gemini-cli/pull/25297)
+- feat(agent): implement tool-controlled display protocol (Steps 2-3) by
+  @mbleigh in [#25134](https://github.com/google-gemini/gemini-cli/pull/25134)
+- Stop showing scrollbar unless we are in terminalBuffer mode by @jacob314 in
+  [#25320](https://github.com/google-gemini/gemini-cli/pull/25320)
+- feat: support auth block in MCP servers config in agents by @TanmayVartak in
+  [#24770](https://github.com/google-gemini/gemini-cli/pull/24770)
+- fix(core): expose GEMINI_PLANS_DIR to hook environment by @Adib234 in
+  [#25296](https://github.com/google-gemini/gemini-cli/pull/25296)
+- feat(core): implement silent fallback for Plan Mode model routing by @jerop in
+  [#25317](https://github.com/google-gemini/gemini-cli/pull/25317)
+- fix: correct redirect count increment in fetchJson by @KevinZhao in
+  [#24896](https://github.com/google-gemini/gemini-cli/pull/24896)
+- fix(core): prevent secondary crash in ModelRouterService finally block by
   @gundermanc in
-  [#25586](https://github.com/google-gemini/gemini-cli/pull/25586)
-- docs: migrate installation and authentication to mdx with tabbed layouts by
-  @g-samroberts in
-  [#25155](https://github.com/google-gemini/gemini-cli/pull/25155)
-- feat(config): split memoryManager flag into autoMemory by @SandyTao520 in
-  [#25601](https://github.com/google-gemini/gemini-cli/pull/25601)
-- fix(core): allow Cloud Shell users to use PRO_MODEL_NO_ACCESS experiment by
-  @sehoon38 in [#25702](https://github.com/google-gemini/gemini-cli/pull/25702)
-- fix(cli): round slow render latency to avoid opentelemetry float warning by
-  @scidomino in [#25709](https://github.com/google-gemini/gemini-cli/pull/25709)
-- docs(tracker): introduce experimental task tracker feature by @anj-s in
-  [#24556](https://github.com/google-gemini/gemini-cli/pull/24556)
-- docs(cli): fix inconsistent system.md casing in system prompt docs by @Bodlux
-  in [#25414](https://github.com/google-gemini/gemini-cli/pull/25414)
-- feat(cli): add streamlined `gemini gemma` local model setup by @Samee24 in
-  [#25498](https://github.com/google-gemini/gemini-cli/pull/25498)
-- Changelog for v0.38.2 by @gemini-cli-robot in
-  [#25593](https://github.com/google-gemini/gemini-cli/pull/25593)
-- Fix: Disallow overriding IDE stdio via workspace .env (RCE) by @M0nd0R in
-  [#25022](https://github.com/google-gemini/gemini-cli/pull/25022)
-- feat(test): refactor the memory usage test to use metrics from CLI process
-  instead of test runner by @cynthialong0-0 in
-  [#25708](https://github.com/google-gemini/gemini-cli/pull/25708)
-- feat(vertex): add settings for Vertex AI request routing by @gordonhwc in
-  [#25513](https://github.com/google-gemini/gemini-cli/pull/25513)
-- Fix/allow for session persistence by @ahsanfarooq210 in
-  [#25176](https://github.com/google-gemini/gemini-cli/pull/25176)
-- Allow dots on GEMINI_API_KEY by @DKbyo in
-  [#25497](https://github.com/google-gemini/gemini-cli/pull/25497)
-- feat(telemetry): add flag for enabling traces specifically by @spencer426 in
-  [#25343](https://github.com/google-gemini/gemini-cli/pull/25343)
-- fix(core): resolve nested plan directory duplication and relative path
-  policies by @mahimashanware in
-  [#25138](https://github.com/google-gemini/gemini-cli/pull/25138)
-- feat: detect new files in @ recommendations with watcher based updates by
-  @prassamin in [#25256](https://github.com/google-gemini/gemini-cli/pull/25256)
-- fix(cli): use newline in shell command wrapping to avoid breaking heredocs by
-  @cocosheng-g in
-  [#25537](https://github.com/google-gemini/gemini-cli/pull/25537)
-- fix(cli): ensure theme dialog labels are rendered for all themes by
-  @JayadityaGit in
-  [#24599](https://github.com/google-gemini/gemini-cli/pull/24599)
-- fix(core): disable detached mode in Bun to prevent immediate SIGHUP of child
-  processes by @euxaristia in
-  [#22620](https://github.com/google-gemini/gemini-cli/pull/22620)
-- feat: add /new as alias for /clear and refine command description by @ved015
-  in [#17865](https://github.com/google-gemini/gemini-cli/pull/17865)
-- fix(cli): start auto memory in ACP sessions by @jasonmatthewsuhari in
-  [#25626](https://github.com/google-gemini/gemini-cli/pull/25626)
-- fix(core): remove duplicate initialize call on agents refreshed by
-  @adamfweidman in
-  [#25670](https://github.com/google-gemini/gemini-cli/pull/25670)
-- test(e2e): default integration tests to Flash Preview by @SandyTao520 in
-  [#25753](https://github.com/google-gemini/gemini-cli/pull/25753)
-- refactor(memory): replace MemoryManagerAgent with prompt-driven memory editing
-  across four tiers by @SandyTao520 in
-  [#25716](https://github.com/google-gemini/gemini-cli/pull/25716)
-- fix(cli): fix "/clear (new)" command by @mini2s in
-  [#25801](https://github.com/google-gemini/gemini-cli/pull/25801)
-- fix(core): use dynamic CLI version for IDE client instead of hardcoded '1.0.0'
-  by @thekishandev in
-  [#24414](https://github.com/google-gemini/gemini-cli/pull/24414)
-- fix(core): handle line endings in ignore file parsing by @xoma-zver in
-  [#23895](https://github.com/google-gemini/gemini-cli/pull/23895)
-- Fix/command injection shell by @Famous077 in
-  [#24170](https://github.com/google-gemini/gemini-cli/pull/24170)
-- fix(ui): removed background color for input by @devr0306 in
-  [#25339](https://github.com/google-gemini/gemini-cli/pull/25339)
-- fix(devtools): reduce memory usage and defer connection by @SandyTao520 in
-  [#24496](https://github.com/google-gemini/gemini-cli/pull/24496)
-- fix(core): support jsonl session logs in memory and summary services by
-  @SandyTao520 in
-  [#25816](https://github.com/google-gemini/gemini-cli/pull/25816)
-- fix(release): exclude ripgrep binaries from npm tarballs by @SandyTao520 in
-  [#25841](https://github.com/google-gemini/gemini-cli/pull/25841)
-- fix(patch): cherry-pick 048bf6e to release/v0.40.0-preview.3-pr-25941 to patch
-  version v0.40.0-preview.3 and create version 0.40.0-preview.4 by
+  [#25333](https://github.com/google-gemini/gemini-cli/pull/25333)
+- feat(core): introduce decoupled ContextManager and Sidecar architecture by
+  @joshualitt in
+  [#24752](https://github.com/google-gemini/gemini-cli/pull/24752)
+- docs(core): update generalist agent documentation by @abhipatel12 in
+  [#25325](https://github.com/google-gemini/gemini-cli/pull/25325)
+- chore(mcp): check MCP error code over brittle string match by @jackwotherspoon
+  in [#25381](https://github.com/google-gemini/gemini-cli/pull/25381)
+- feat(plan): update plan mode prompt to allow showing plan content by @ruomengz
+  in [#25058](https://github.com/google-gemini/gemini-cli/pull/25058)
+- test(core): improve sandbox integration test coverage and fix OS-specific
+  failures by @ehedlund in
+  [#25307](https://github.com/google-gemini/gemini-cli/pull/25307)
+- fix(core): use debug level for keychain fallback logging by @ehedlund in
+  [#25398](https://github.com/google-gemini/gemini-cli/pull/25398)
+- feat(test): add a performance test in asian language by @cynthialong0-0 in
+  [#25392](https://github.com/google-gemini/gemini-cli/pull/25392)
+- feat(cli): enable mouse clicking for cursor positioning in AskUser multi-line
+  answers by @Adib234 in
+  [#24630](https://github.com/google-gemini/gemini-cli/pull/24630)
+- fix(core): detect kmscon terminal as supporting true color by @claygeo in
+  [#25282](https://github.com/google-gemini/gemini-cli/pull/25282)
+- ci: add agent session drift check workflow by @adamfweidman in
+  [#25389](https://github.com/google-gemini/gemini-cli/pull/25389)
+- use macos-latest-large runner where applicable. by @scidomino in
+  [#25413](https://github.com/google-gemini/gemini-cli/pull/25413)
+- Changelog for v0.37.2 by @gemini-cli-robot in
+  [#25336](https://github.com/google-gemini/gemini-cli/pull/25336)
+- fix(patch): cherry-pick a4e98c0 to release/v0.39.0-preview.0-pr-25138 to patch
+  version v0.39.0-preview.0 and create version 0.39.0-preview.1 by
   @gemini-cli-robot in
-  [#25942](https://github.com/google-gemini/gemini-cli/pull/25942)
-- fix(patch): cherry-pick 54b7586 to release/v0.40.0-preview.4-pr-26066
-  [CONFLICTS] by @gemini-cli-robot in
-  [#26124](https://github.com/google-gemini/gemini-cli/pull/26124)
+  [#25766](https://github.com/google-gemini/gemini-cli/pull/25766)
+- fix(patch): cherry-pick d6f88f8 to release/v0.39.0-preview.1-pr-25670 to patch
+  version v0.39.0-preview.1 and create version 0.39.0-preview.2 by
+  @gemini-cli-robot in
+  [#25776](https://github.com/google-gemini/gemini-cli/pull/25776)
 
 **Full Changelog**:
-https://github.com/google-gemini/gemini-cli/compare/v0.39.1...v0.40.0
+https://github.com/google-gemini/gemini-cli/compare/v0.38.2...v0.39.0

docs/changelogs/preview.md

@@ -1,6 +1,6 @@
-# Preview release: v0.41.0-preview.0
+# Preview release: v0.40.0-preview.3
 
-Released: April 28, 2026
+Released: April 24, 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).
@@ -13,109 +13,395 @@ npm install -g @google/gemini-cli@preview
 
 ## Highlights
 
-- **Real-Time Voice Mode:** Implemented a new real-time voice mode supporting
-  both cloud and local backends for a more interactive experience.
-- **Enhanced Security & Trust:** Enforced workspace trust in headless mode and
-  secured `.env` file loading to improve system integrity.
-- **Expanded Model Support:** Added experimental support for Gemma 4 models in
-  both core and CLI packages.
-- **Improved Core Infrastructure:** Wired up new `ContextManager` and
-  `AgentChatHistory` for better state management, and optimized boot performance
-  by fetching experiments and quota asynchronously.
-- **New Developer Tools & UX:** Added support for output redirection for CLI
-  commands, manual session UUIDs via command-line arguments, and persistent
-  auto-memory scratchpad for skill extraction.
+- **Ripgrep Binary Bundling:** Ripgrep binaries are now bundled into the Single
+  Executable Application (SEA), enabling grep functionality in offline
+  environments.
+- **MCP Resource Tools:** New core tools added to list and read MCP (Model
+  Context Protocol) resources, expanding the agent's ability to interact with
+  MCP servers.
+- **Local Model Setup:** Introduced a streamlined `gemini gemma` command for
+  easier local model setup and integration.
+- **Prompt-Driven Memory Management:** Refactored memory management into a
+  prompt-driven, four-tier system and integrated `skill-creator` for robust
+  skill extraction.
+- **Enhanced UI and Accessibility:** Added support for OSC 777 terminal
+  notifications and GitHub colorblind themes for better user feedback and
+  accessibility.
 
 ## What's Changed
 
-- chore(release): bump version to 0.41.0-nightly.20260423.gaa05b4583 by
-  @gemini-cli-robot in
-  [#25847](https://github.com/google-gemini/gemini-cli/pull/25847)
-- fix(core): only show `list` suggestion if the partial input is empty by
-  @cynthialong0-0 in
-  [#25821](https://github.com/google-gemini/gemini-cli/pull/25821)
-- feat(cli): secure .env loading and enforce workspace trust in headless mode by
-  @ehedlund in [#25814](https://github.com/google-gemini/gemini-cli/pull/25814)
-- fix: fatal hard-crash on loop detection via unhandled AbortError by @hsm207 in
-  [#20108](https://github.com/google-gemini/gemini-cli/pull/20108)
-- update package-lock.json by @ehedlund in
-  [#25876](https://github.com/google-gemini/gemini-cli/pull/25876)
-- feat(core): enhance shell command validation and add core tools allowlist by
-  @galz10 in [#25720](https://github.com/google-gemini/gemini-cli/pull/25720)
-- fix(ui): corrected background color check in user message components by
-  @devr0306 in [#25880](https://github.com/google-gemini/gemini-cli/pull/25880)
-- perf(core): fix slow boot by fetching experiments and quota asynchronously by
-  @spencer426 in
-  [#25758](https://github.com/google-gemini/gemini-cli/pull/25758)
-- feat(core,cli): add support for Gemma 4 models (experimental) by @Abhijit-2592
-  in [#25604](https://github.com/google-gemini/gemini-cli/pull/25604)
 - update FatalUntrustedWorkspaceError message to include doc link by @ehedlund
   in [#25874](https://github.com/google-gemini/gemini-cli/pull/25874)
-- docs: add Gemini CLI course link to README by @JayadityaGit in
-  [#25925](https://github.com/google-gemini/gemini-cli/pull/25925)
-- feat(repo): add gemini-cli-bot metrics and workflows by @gundermanc in
-  [#25888](https://github.com/google-gemini/gemini-cli/pull/25888)
-- fix(cli): allow output redirection for cli commands by @spencer426 in
-  [#25894](https://github.com/google-gemini/gemini-cli/pull/25894)
-- fix(core): fail closed in YOLO mode when shell parsing fails for restricted
-  rules by @ehedlund in
-  [#25935](https://github.com/google-gemini/gemini-cli/pull/25935)
-- fix(cli-ui): revert backspace handling to fix Windows regression by @scidomino
-  in [#25941](https://github.com/google-gemini/gemini-cli/pull/25941)
-- feat(voice): implement real-time voice mode with cloud and local backends by
-  @Abhijit-2592 in
-  [#24174](https://github.com/google-gemini/gemini-cli/pull/24174)
-- Changelog for v0.39.0 by @gemini-cli-robot in
-  [#25848](https://github.com/google-gemini/gemini-cli/pull/25848)
-- feat(memory): persist auto-memory scratchpad for skill extraction by
+- feat(core): enhance shell command validation and add core tools allowlist by
+  @galz10 in [#25720](https://github.com/google-gemini/gemini-cli/pull/25720)
+- feat(cli): secure .env loading and enforce workspace trust in headless mode by
+  @ehedlund in [#25814](https://github.com/google-gemini/gemini-cli/pull/25814)
+- chore(release): bump version to 0.40.0-nightly.20260414.g5b1f7375a by
+  @gemini-cli-robot in
+  [#25420](https://github.com/google-gemini/gemini-cli/pull/25420)
+- Fix(core): retry additional OpenSSL 3.x SSL errors during streaming (#16075)
+  by @rcleveng in
+  [#25187](https://github.com/google-gemini/gemini-cli/pull/25187)
+- fix(core): prevent YOLO mode from being downgraded by @galz10 in
+  [#25341](https://github.com/google-gemini/gemini-cli/pull/25341)
+- feat: bundle ripgrep binaries into SEA for offline support by @scidomino in
+  [#25342](https://github.com/google-gemini/gemini-cli/pull/25342)
+- Changelog for v0.39.0-preview.0 by @gemini-cli-robot in
+  [#25417](https://github.com/google-gemini/gemini-cli/pull/25417)
+- feat(test): add large conversation scenario for performance test by
+  @cynthialong0-0 in
+  [#25331](https://github.com/google-gemini/gemini-cli/pull/25331)
+- improve(core): require recurrence evidence before extracting skills by
   @SandyTao520 in
-  [#25873](https://github.com/google-gemini/gemini-cli/pull/25873)
-- fix(cli): add missing response key to custom theme text schema by @gaurav0107
-  in [#25822](https://github.com/google-gemini/gemini-cli/pull/25822)
-- fix(cli): provide manual update command when automatic update fails by
+  [#25147](https://github.com/google-gemini/gemini-cli/pull/25147)
+- test(evals): add subagent delegation evaluation tests by @anj-s in
+  [#24619](https://github.com/google-gemini/gemini-cli/pull/24619)
+- feat: add github colorblind themes by @Z1xus in
+  [#15504](https://github.com/google-gemini/gemini-cli/pull/15504)
+- fix(core): honor GOOGLE_GEMINI_BASE_URL and GOOGLE_VERTEX_BASE_URL by
+  @chrisjcthomas in
+  [#25357](https://github.com/google-gemini/gemini-cli/pull/25357)
+- fix(cli): clean up slash command IDE listeners by @jasonmatthewsuhari in
+  [#24397](https://github.com/google-gemini/gemini-cli/pull/24397)
+- Changelog for v0.38.0 by @gemini-cli-robot in
+  [#25470](https://github.com/google-gemini/gemini-cli/pull/25470)
+- fix(evals): update eval tests for invoke_agent telemetry and project-scoped
+  memory by @SandyTao520 in
+  [#25502](https://github.com/google-gemini/gemini-cli/pull/25502)
+- Changelog for v0.38.1 by @gemini-cli-robot in
+  [#25476](https://github.com/google-gemini/gemini-cli/pull/25476)
+- feat(core): integrate skill-creator into skill extraction agent by
+  @SandyTao520 in
+  [#25421](https://github.com/google-gemini/gemini-cli/pull/25421)
+- feat(cli): provide default post-submit prompt for skill command by @ruomengz
+  in [#25327](https://github.com/google-gemini/gemini-cli/pull/25327)
+- feat(core): add tools to list and read MCP resources by @ruomengz in
+  [#25395](https://github.com/google-gemini/gemini-cli/pull/25395)
+- fix(evals): add typecheck coverage for evals, integration-tests, and
+  memory-tests by @SandyTao520 in
+  [#25480](https://github.com/google-gemini/gemini-cli/pull/25480)
+- Use OSC 777 for terminal notifications by @jackyliuxx in
+  [#25300](https://github.com/google-gemini/gemini-cli/pull/25300)
+- fix(extensions): fix bundling for examples by @abhipatel12 in
+  [#25542](https://github.com/google-gemini/gemini-cli/pull/25542)
+- fix(cli): reset plan session state on /clear by @jasonmatthewsuhari in
+  [#25515](https://github.com/google-gemini/gemini-cli/pull/25515)
+- feat(core): add .mdx support to get-internal-docs tool by @g-samroberts in
+  [#25090](https://github.com/google-gemini/gemini-cli/pull/25090)
+- docs(policy): mention that workspace policies are broken by @6112 in
+  [#24367](https://github.com/google-gemini/gemini-cli/pull/24367)
+- fix(core): allow explicit write permissions to override governance file
+  protections in sandboxes by @galz10 in
+  [#25338](https://github.com/google-gemini/gemini-cli/pull/25338)
+- feat(sandbox): resolve custom seatbelt profiles from $HOME/.gemini first by
+  @mvanhorn in [#25427](https://github.com/google-gemini/gemini-cli/pull/25427)
+- Reduce blank lines. by @gundermanc in
+  [#25563](https://github.com/google-gemini/gemini-cli/pull/25563)
+- fix(ui): revert preview theme on dialog unmount by @JayadityaGit in
+  [#22542](https://github.com/google-gemini/gemini-cli/pull/22542)
+- fix(core): fix ShellExecutionConfig spread and add ProjectRegistry save
+  backoff by @mahimashanware in
+  [#25382](https://github.com/google-gemini/gemini-cli/pull/25382)
+- feat(core): Disable topic updates for subagents by @gundermanc in
+  [#25567](https://github.com/google-gemini/gemini-cli/pull/25567)
+- feat(core): enable topic update narration by default and promote to general by
+  @gundermanc in
+  [#25586](https://github.com/google-gemini/gemini-cli/pull/25586)
+- docs: migrate installation and authentication to mdx with tabbed layouts by
+  @g-samroberts in
+  [#25155](https://github.com/google-gemini/gemini-cli/pull/25155)
+- feat(config): split memoryManager flag into autoMemory by @SandyTao520 in
+  [#25601](https://github.com/google-gemini/gemini-cli/pull/25601)
+- fix(core): allow Cloud Shell users to use PRO_MODEL_NO_ACCESS experiment by
+  @sehoon38 in [#25702](https://github.com/google-gemini/gemini-cli/pull/25702)
+- fix(cli): round slow render latency to avoid opentelemetry float warning by
+  @scidomino in [#25709](https://github.com/google-gemini/gemini-cli/pull/25709)
+- docs(tracker): introduce experimental task tracker feature by @anj-s in
+  [#24556](https://github.com/google-gemini/gemini-cli/pull/24556)
+- docs(cli): fix inconsistent system.md casing in system prompt docs by @Bodlux
+  in [#25414](https://github.com/google-gemini/gemini-cli/pull/25414)
+- feat(cli): add streamlined `gemini gemma` local model setup by @Samee24 in
+  [#25498](https://github.com/google-gemini/gemini-cli/pull/25498)
+- Changelog for v0.38.2 by @gemini-cli-robot in
+  [#25593](https://github.com/google-gemini/gemini-cli/pull/25593)
+- Fix: Disallow overriding IDE stdio via workspace .env (RCE) by @M0nd0R in
+  [#25022](https://github.com/google-gemini/gemini-cli/pull/25022)
+- feat(test): refactor the memory usage test to use metrics from CLI process
+  instead of test runner by @cynthialong0-0 in
+  [#25708](https://github.com/google-gemini/gemini-cli/pull/25708)
+- feat(vertex): add settings for Vertex AI request routing by @gordonhwc in
+  [#25513](https://github.com/google-gemini/gemini-cli/pull/25513)
+- Fix/allow for session persistence by @ahsanfarooq210 in
+  [#25176](https://github.com/google-gemini/gemini-cli/pull/25176)
+- Allow dots on GEMINI_API_KEY by @DKbyo in
+  [#25497](https://github.com/google-gemini/gemini-cli/pull/25497)
+- feat(telemetry): add flag for enabling traces specifically by @spencer426 in
+  [#25343](https://github.com/google-gemini/gemini-cli/pull/25343)
+- fix(core): resolve nested plan directory duplication and relative path
+  policies by @mahimashanware in
+  [#25138](https://github.com/google-gemini/gemini-cli/pull/25138)
+- feat: detect new files in @ recommendations with watcher based updates by
+  @prassamin in [#25256](https://github.com/google-gemini/gemini-cli/pull/25256)
+- fix(cli): use newline in shell command wrapping to avoid breaking heredocs by
   @cocosheng-g in
-  [#26052](https://github.com/google-gemini/gemini-cli/pull/26052)
-- test(cli): add unit tests for restore ACP command (#23402) by @cocosheng-g in
-  [#26053](https://github.com/google-gemini/gemini-cli/pull/26053)
-- fix(ui): better error messages for ECONNRESET and ETIMEDOUT by @devr0306 in
-  [#26059](https://github.com/google-gemini/gemini-cli/pull/26059)
-- feat(core): wire up the new ContextManager and AgentChatHistory by @joshualitt
-  in [#25409](https://github.com/google-gemini/gemini-cli/pull/25409)
-- fix(cli): ensure sandbox proxy cleanup and remove handler leaks by @ehedlund
-  in [#26065](https://github.com/google-gemini/gemini-cli/pull/26065)
-- fix(cli): correct alternate buffer warning logic for JetBrains by @Adib234 in
-  [#26067](https://github.com/google-gemini/gemini-cli/pull/26067)
-- fix(cli): make MCP ping optional in list command and use configured timeout by
-  @cocosheng-g in
-  [#26068](https://github.com/google-gemini/gemini-cli/pull/26068)
-- fix(core): better error message for failed cloudshell-gca auth by @devr0306 in
-  [#26079](https://github.com/google-gemini/gemini-cli/pull/26079)
-- feat(cli): provide manual session UUID via command line arg by @cocosheng-g in
-  [#26060](https://github.com/google-gemini/gemini-cli/pull/26060)
-- Changelog for v0.40.0-preview.2 by @gemini-cli-robot in
-  [#25846](https://github.com/google-gemini/gemini-cli/pull/25846)
-- (docs) update sandboxing documentation by @g-samroberts in
-  [#25930](https://github.com/google-gemini/gemini-cli/pull/25930)
-- fix(core): enforce parallel task tracker updates by @anj-s in
-  [#24477](https://github.com/google-gemini/gemini-cli/pull/24477)
-- Update policy so transient errors are not marked terminal by @DavidAPierce in
-  [#26066](https://github.com/google-gemini/gemini-cli/pull/26066)
-- Implement bot that performs time-series metric analysis and suggests repo
-  management improvements by @gundermanc in
-  [#25945](https://github.com/google-gemini/gemini-cli/pull/25945)
-- fix(core): handle non-string model flags in resolution by @Adib234 in
-  [#26069](https://github.com/google-gemini/gemini-cli/pull/26069)
-- fix(ux): added error message for ENOTDIR by @devr0306 in
-  [#26128](https://github.com/google-gemini/gemini-cli/pull/26128)
-- Changelog for v0.40.0-preview.3 by @gemini-cli-robot in
-  [#25904](https://github.com/google-gemini/gemini-cli/pull/25904)
-- fix(cli): prevent ACP stdout pollution from SessionEnd hooks by @cocosheng-g
-  in [#26125](https://github.com/google-gemini/gemini-cli/pull/26125)
-- feat(cli): support boolean and number casting for env vars in settings.json by
-  @cocosheng-g in
-  [#26118](https://github.com/google-gemini/gemini-cli/pull/26118)
-- fix(cli): preserve Request headers in DevTools activity logger by @Adib234 in
-  [#26078](https://github.com/google-gemini/gemini-cli/pull/26078)
+  [#25537](https://github.com/google-gemini/gemini-cli/pull/25537)
+- fix(cli): ensure theme dialog labels are rendered for all themes by
+  @JayadityaGit in
+  [#24599](https://github.com/google-gemini/gemini-cli/pull/24599)
+- fix(core): disable detached mode in Bun to prevent immediate SIGHUP of child
+  processes by @euxaristia in
+  [#22620](https://github.com/google-gemini/gemini-cli/pull/22620)
+- feat: add /new as alias for /clear and refine command description by @ved015
+  in [#17865](https://github.com/google-gemini/gemini-cli/pull/17865)
+- fix(cli): start auto memory in ACP sessions by @jasonmatthewsuhari in
+  [#25626](https://github.com/google-gemini/gemini-cli/pull/25626)
+- fix(core): remove duplicate initialize call on agents refreshed by
+  @adamfweidman in
+  [#25670](https://github.com/google-gemini/gemini-cli/pull/25670)
+- test(e2e): default integration tests to Flash Preview by @SandyTao520 in
+  [#25753](https://github.com/google-gemini/gemini-cli/pull/25753)
+- refactor(memory): replace MemoryManagerAgent with prompt-driven memory editing
+  across four tiers by @SandyTao520 in
+  [#25716](https://github.com/google-gemini/gemini-cli/pull/25716)
+- fix(cli): fix "/clear (new)" command by @mini2s in
+  [#25801](https://github.com/google-gemini/gemini-cli/pull/25801)
+- fix(core): use dynamic CLI version for IDE client instead of hardcoded '1.0.0'
+  by @thekishandev in
+  [#24414](https://github.com/google-gemini/gemini-cli/pull/24414)
+- fix(core): handle line endings in ignore file parsing by @xoma-zver in
+  [#23895](https://github.com/google-gemini/gemini-cli/pull/23895)
+- Fix/command injection shell by @Famous077 in
+  [#24170](https://github.com/google-gemini/gemini-cli/pull/24170)
+- fix(ui): removed background color for input by @devr0306 in
+  [#25339](https://github.com/google-gemini/gemini-cli/pull/25339)
+- fix(devtools): reduce memory usage and defer connection by @SandyTao520 in
+  [#24496](https://github.com/google-gemini/gemini-cli/pull/24496)
+- fix(core): support jsonl session logs in memory and summary services by
+  @SandyTao520 in
+  [#25816](https://github.com/google-gemini/gemini-cli/pull/25816)
+- fix(release): exclude ripgrep binaries from npm tarballs by @SandyTao520 in
+  [#25841](https://github.com/google-gemini/gemini-cli/pull/25841)
+- refactor(plan): simplify policy priorities and consolidate read-only rules by
+  @ruomengz in [#24849](https://github.com/google-gemini/gemini-cli/pull/24849)
+- feat(test-utils): add memory usage integration test harness by @sripasg in
+  [#24876](https://github.com/google-gemini/gemini-cli/pull/24876)
+- feat(memory): add /memory inbox command for reviewing extracted skills by
+  @SandyTao520 in
+  [#24544](https://github.com/google-gemini/gemini-cli/pull/24544)
+- chore(release): bump version to 0.39.0-nightly.20260408.e77b22e63 by
+  @gemini-cli-robot in
+  [#24939](https://github.com/google-gemini/gemini-cli/pull/24939)
+- fix(core): ensure robust sandbox cleanup in all process execution paths by
+  @ehedlund in [#24763](https://github.com/google-gemini/gemini-cli/pull/24763)
+- chore: update ink version to 6.6.8 by @jacob314 in
+  [#24934](https://github.com/google-gemini/gemini-cli/pull/24934)
+- Changelog for v0.38.0-preview.0 by @gemini-cli-robot in
+  [#24938](https://github.com/google-gemini/gemini-cli/pull/24938)
+- chore: ignore conductor directory by @JayadityaGit in
+  [#22128](https://github.com/google-gemini/gemini-cli/pull/22128)
+- Changelog for v0.37.0 by @gemini-cli-robot in
+  [#24940](https://github.com/google-gemini/gemini-cli/pull/24940)
+- feat(plan): require user confirmation for activate_skill in Plan Mode by
+  @ruomengz in [#24946](https://github.com/google-gemini/gemini-cli/pull/24946)
+- feat(test-utils): add CPU performance integration test harness by @sripasg in
+  [#24951](https://github.com/google-gemini/gemini-cli/pull/24951)
+- fix(cli-ui): enable Ctrl+Backspace for word deletion in Windows Terminal by
+  @dogukanozen in
+  [#21447](https://github.com/google-gemini/gemini-cli/pull/21447)
+- test(sdk): add unit tests for GeminiCliSession by @AdamyaSingh7 in
+  [#21897](https://github.com/google-gemini/gemini-cli/pull/21897)
+- fix(core): resolve windows symlink bypass and stabilize sandbox integration
+  tests by @ehedlund in
+  [#24834](https://github.com/google-gemini/gemini-cli/pull/24834)
+- fix(cli): restore file path display in edit and write tool confirmations by
+  @jwhelangoog in
+  [#24974](https://github.com/google-gemini/gemini-cli/pull/24974)
+- feat(core): refine shell tool description display logic by @jwhelangoog in
+  [#24903](https://github.com/google-gemini/gemini-cli/pull/24903)
+- fix(core): dynamic session ID injection to resolve resume bugs by @scidomino
+  in [#24972](https://github.com/google-gemini/gemini-cli/pull/24972)
+- Update ink version to 6.6.9 by @jacob314 in
+  [#24980](https://github.com/google-gemini/gemini-cli/pull/24980)
+- Generalize evals infra to support more types of evals, organization and
+  queuing of named suites by @gundermanc in
+  [#24941](https://github.com/google-gemini/gemini-cli/pull/24941)
+- fix(cli): optimize startup with lightweight parent process by @sehoon38 in
+  [#24667](https://github.com/google-gemini/gemini-cli/pull/24667)
+- refactor(sandbox): use centralized sandbox paths in macOS Seatbelt
+  implementation by @ehedlund in
+  [#24984](https://github.com/google-gemini/gemini-cli/pull/24984)
+- feat(cli): refine tool output formatting for compact mode by @jwhelangoog in
+  [#24677](https://github.com/google-gemini/gemini-cli/pull/24677)
+- fix(sdk): skip broken sendStream tests to unblock nightly by @SandyTao520 in
+  [#25000](https://github.com/google-gemini/gemini-cli/pull/25000)
+- refactor(core): use centralized path resolution for Linux sandbox by @ehedlund
+  in [#24985](https://github.com/google-gemini/gemini-cli/pull/24985)
+- Support ctrl+shift+g by @jacob314 in
+  [#25035](https://github.com/google-gemini/gemini-cli/pull/25035)
+- feat(core): refactor subagent tool to unified invoke_subagent tool by
+  @abhipatel12 in
+  [#24489](https://github.com/google-gemini/gemini-cli/pull/24489)
+- fix(core): add explicit git identity env vars to prevent sandbox checkpointing
+  error by @mrpmohiburrahman in
+  [#19775](https://github.com/google-gemini/gemini-cli/pull/19775)
+- fix: respect hideContextPercentage when FooterConfigDialog is closed without
+  changes by @chernistry in
+  [#24773](https://github.com/google-gemini/gemini-cli/pull/24773)
+- fix(cli): suppress unhandled AbortError logs during request cancellation by
+  @euxaristia in
+  [#22621](https://github.com/google-gemini/gemini-cli/pull/22621)
+- Automated documentation audit by @g-samroberts in
+  [#24567](https://github.com/google-gemini/gemini-cli/pull/24567)
+- feat(cli): implement useAgentStream hook by @mbleigh in
+  [#24292](https://github.com/google-gemini/gemini-cli/pull/24292)
+- refactor(plan) Clean default plan toml by @ruomengz in
+  [#25037](https://github.com/google-gemini/gemini-cli/pull/25037)
+- refactor(core): remove legacy subagent wrapping tools by @abhipatel12 in
+  [#25053](https://github.com/google-gemini/gemini-cli/pull/25053)
+- fix(core): honor retryDelay in RetryInfo for 503 errors by @yunaseoul in
+  [#25057](https://github.com/google-gemini/gemini-cli/pull/25057)
+- fix(core): remediate subagent memory leaks using AbortSignal in MessageBus by
+  @abhipatel12 in
+  [#25048](https://github.com/google-gemini/gemini-cli/pull/25048)
+- feat(cli): wire up useAgentStream in AppContainer by @mbleigh in
+  [#24297](https://github.com/google-gemini/gemini-cli/pull/24297)
+- feat(core): migrate chat recording to JSONL streaming by @spencer426 in
+  [#23749](https://github.com/google-gemini/gemini-cli/pull/23749)
+- fix(core): clear 5-minute timeouts in oauth flow to prevent memory leaks by
+  @spencer426 in
+  [#24968](https://github.com/google-gemini/gemini-cli/pull/24968)
+- fix(sandbox): centralize async git worktree resolution and enforce read-only
+  security by @ehedlund in
+  [#25040](https://github.com/google-gemini/gemini-cli/pull/25040)
+- feat(test): add high-volume shell test and refine perf harness by @sripasg in
+  [#24983](https://github.com/google-gemini/gemini-cli/pull/24983)
+- fix(core): silently handle EPERM when listing dir structure by @scidomino in
+  [#25066](https://github.com/google-gemini/gemini-cli/pull/25066)
+- Changelog for v0.37.1 by @gemini-cli-robot in
+  [#25055](https://github.com/google-gemini/gemini-cli/pull/25055)
+- fix: decode Uint8Array and multi-byte UTF-8 in API error messages by
+  @kimjune01 in [#23341](https://github.com/google-gemini/gemini-cli/pull/23341)
+- Automated documentation audit results by @g-samroberts in
+  [#22755](https://github.com/google-gemini/gemini-cli/pull/22755)
+- debugging(ui): add optional debugRainbow setting by @jacob314 in
+  [#25088](https://github.com/google-gemini/gemini-cli/pull/25088)
+- fix: resolve lifecycle memory leaks by cleaning up listeners and root closures
+  by @spencer426 in
+  [#25049](https://github.com/google-gemini/gemini-cli/pull/25049)
+- docs(cli): updates f12 description to be more precise by @JayadityaGit in
+  [#15816](https://github.com/google-gemini/gemini-cli/pull/15816)
+- fix(cli): mark /settings as unsafe to run concurrently by @jacob314 in
+  [#25061](https://github.com/google-gemini/gemini-cli/pull/25061)
+- fix(core): remove buffer slice to prevent OOM on large output streams by
+  @spencer426 in
+  [#25094](https://github.com/google-gemini/gemini-cli/pull/25094)
+- feat(core): persist subagent agentId in tool call records by @abhipatel12 in
+  [#25092](https://github.com/google-gemini/gemini-cli/pull/25092)
+- chore(core): increase codebase investigator turn limits to 50 by @abhipatel12
+  in [#25125](https://github.com/google-gemini/gemini-cli/pull/25125)
+- refactor(core): consolidate execute() arguments into ExecuteOptions by
+  @mbleigh in [#25101](https://github.com/google-gemini/gemini-cli/pull/25101)
+- feat(core): add Strategic Re-evaluation guidance to system prompt by
+  @aishaneeshah in
+  [#25062](https://github.com/google-gemini/gemini-cli/pull/25062)
+- fix(core): preserve shell execution config fields on update by
+  @jasonmatthewsuhari in
+  [#25113](https://github.com/google-gemini/gemini-cli/pull/25113)
+- docs: add vi shortcuts and clarify MCP sandbox setup by @chrisjcthomas in
+  [#21679](https://github.com/google-gemini/gemini-cli/pull/21679)
+- fix(cli): pass session id to interactive shell executions by
+  @jasonmatthewsuhari in
+  [#25114](https://github.com/google-gemini/gemini-cli/pull/25114)
+- fix(cli): resolve text sanitization data loss due to C1 control characters by
+  @euxaristia in
+  [#22624](https://github.com/google-gemini/gemini-cli/pull/22624)
+- feat(core): add large memory regression test by @cynthialong0-0 in
+  [#25059](https://github.com/google-gemini/gemini-cli/pull/25059)
+- fix(core): resolve PTY exhaustion and orphan MCP subprocess leaks by
+  @spencer426 in
+  [#25079](https://github.com/google-gemini/gemini-cli/pull/25079)
+- chore(deps): update vulnerable dependencies via npm audit fix by @scidomino in
+  [#25140](https://github.com/google-gemini/gemini-cli/pull/25140)
+- perf(sandbox): optimize Windows sandbox initialization via native ACL
+  application by @ehedlund in
+  [#25077](https://github.com/google-gemini/gemini-cli/pull/25077)
+- chore: switch from keytar to @github/keytar by @cocosheng-g in
+  [#25143](https://github.com/google-gemini/gemini-cli/pull/25143)
+- fix: improve audio MIME normalization and validation in file reads by
+  @junaiddshaukat in
+  [#21636](https://github.com/google-gemini/gemini-cli/pull/21636)
+- docs: Update docs-audit to include changes in PR body by @g-samroberts in
+  [#25153](https://github.com/google-gemini/gemini-cli/pull/25153)
+- docs: correct documentation for enforced authentication type by @cocosheng-g
+  in [#25142](https://github.com/google-gemini/gemini-cli/pull/25142)
+- fix(cli): exclude update_topic from confirmation queue count by @Abhijit-2592
+  in [#24945](https://github.com/google-gemini/gemini-cli/pull/24945)
+- Memory fix for trace's streamWrapper. by @anthraxmilkshake in
+  [#25089](https://github.com/google-gemini/gemini-cli/pull/25089)
+- fix(core): fix quota footer for non-auto models and improve display by
+  @jackwotherspoon in
+  [#25121](https://github.com/google-gemini/gemini-cli/pull/25121)
+- docs(contributing): clarify self-assignment policy for issues by @jmr in
+  [#23087](https://github.com/google-gemini/gemini-cli/pull/23087)
+- feat(core): add skill patching support with /memory inbox integration by
+  @SandyTao520 in
+  [#25148](https://github.com/google-gemini/gemini-cli/pull/25148)
+- Stop suppressing thoughts and text in model response by @gundermanc in
+  [#25073](https://github.com/google-gemini/gemini-cli/pull/25073)
+- fix(release): prefix git hash in nightly versions to prevent semver
+  normalization by @SandyTao520 in
+  [#25304](https://github.com/google-gemini/gemini-cli/pull/25304)
+- feat(cli): extract QuotaContext and resolve infinite render loop by @Adib234
+  in [#24959](https://github.com/google-gemini/gemini-cli/pull/24959)
+- refactor(core): extract and centralize sandbox path utilities by @ehedlund in
+  [#25305](https://github.com/google-gemini/gemini-cli/pull/25305)
+- feat(ui): added enhancements to scroll momentum by @devr0306 in
+  [#24447](https://github.com/google-gemini/gemini-cli/pull/24447)
+- fix(core): replace custom binary detection with isbinaryfile to correctly
+  handle UTF-8 (U+FFFD) by @Anjaligarhwal in
+  [#25297](https://github.com/google-gemini/gemini-cli/pull/25297)
+- feat(agent): implement tool-controlled display protocol (Steps 2-3) by
+  @mbleigh in [#25134](https://github.com/google-gemini/gemini-cli/pull/25134)
+- Stop showing scrollbar unless we are in terminalBuffer mode by @jacob314 in
+  [#25320](https://github.com/google-gemini/gemini-cli/pull/25320)
+- feat: support auth block in MCP servers config in agents by @TanmayVartak in
+  [#24770](https://github.com/google-gemini/gemini-cli/pull/24770)
+- fix(core): expose GEMINI_PLANS_DIR to hook environment by @Adib234 in
+  [#25296](https://github.com/google-gemini/gemini-cli/pull/25296)
+- feat(core): implement silent fallback for Plan Mode model routing by @jerop in
+  [#25317](https://github.com/google-gemini/gemini-cli/pull/25317)
+- fix: correct redirect count increment in fetchJson by @KevinZhao in
+  [#24896](https://github.com/google-gemini/gemini-cli/pull/24896)
+- fix(core): prevent secondary crash in ModelRouterService finally block by
+  @gundermanc in
+  [#25333](https://github.com/google-gemini/gemini-cli/pull/25333)
+- feat(core): introduce decoupled ContextManager and Sidecar architecture by
+  @joshualitt in
+  [#24752](https://github.com/google-gemini/gemini-cli/pull/24752)
+- docs(core): update generalist agent documentation by @abhipatel12 in
+  [#25325](https://github.com/google-gemini/gemini-cli/pull/25325)
+- chore(mcp): check MCP error code over brittle string match by @jackwotherspoon
+  in [#25381](https://github.com/google-gemini/gemini-cli/pull/25381)
+- feat(plan): update plan mode prompt to allow showing plan content by @ruomengz
+  in [#25058](https://github.com/google-gemini/gemini-cli/pull/25058)
+- test(core): improve sandbox integration test coverage and fix OS-specific
+  failures by @ehedlund in
+  [#25307](https://github.com/google-gemini/gemini-cli/pull/25307)
+- fix(core): use debug level for keychain fallback logging by @ehedlund in
+  [#25398](https://github.com/google-gemini/gemini-cli/pull/25398)
+- feat(test): add a performance test in asian language by @cynthialong0-0 in
+  [#25392](https://github.com/google-gemini/gemini-cli/pull/25392)
+- feat(cli): enable mouse clicking for cursor positioning in AskUser multi-line
+  answers by @Adib234 in
+  [#24630](https://github.com/google-gemini/gemini-cli/pull/24630)
+- fix(core): detect kmscon terminal as supporting true color by @claygeo in
+  [#25282](https://github.com/google-gemini/gemini-cli/pull/25282)
+- ci: add agent session drift check workflow by @adamfweidman in
+  [#25389](https://github.com/google-gemini/gemini-cli/pull/25389)
+- use macos-latest-large runner where applicable. by @scidomino in
+  [#25413](https://github.com/google-gemini/gemini-cli/pull/25413)
+- Changelog for v0.37.2 by @gemini-cli-robot in
+  [#25336](https://github.com/google-gemini/gemini-cli/pull/25336)
 
 **Full Changelog**:
-https://github.com/google-gemini/gemini-cli/compare/v0.40.0-preview.5...v0.41.0-preview.0
+https://github.com/google-gemini/gemini-cli/compare/v0.38.0-preview.0...v0.40.0-preview.3

docs/cli/cli-reference.md

@@ -9,7 +9,7 @@ and parameters.
 | ---------------------------------- | ---------------------------------- | ------------------------------------------------------------ |
 | `gemini`                           | Start interactive REPL             | `gemini`                                                     |
 | `gemini -p "query"`                | Query non-interactively            | `gemini -p "summarize README.md"`                            |
-| gemini "query"                     | Query and continue interactively   | gemini "explain this project"                                |
+| `gemini "query"`                   | Query and continue interactively   | `gemini "explain this project"`                              |
 | `cat file \| gemini`               | Process piped content              | `cat logs.txt \| gemini`<br>`Get-Content logs.txt \| gemini` |
 | `gemini -i "query"`                | Execute and continue interactively | `gemini -i "What is the purpose of this project?"`           |
 | `gemini -r "latest"`               | Continue most recent session       | `gemini -r "latest"`                                         |
@@ -33,7 +33,6 @@ These commands are available within the interactive REPL.
 | -------------------- | ----------------------------------------------- |
 | `/skills reload`     | Reload discovered skills from disk              |
 | `/agents reload`     | Reload the agent registry                       |
-| `/commands list`     | List available custom slash commands            |
 | `/commands reload`   | Reload custom slash commands                    |
 | `/memory reload`     | Reload context files (for example, `GEMINI.md`) |
 | `/mcp reload`        | Restart and reload MCP servers                  |

docs/cli/creating-skills.md

@@ -1,21 +1,18 @@
 # Creating Agent Skills
 
-Agent Skills let you extend Gemini CLI with specialized expertise, procedural
-workflows, and task-specific resources. This guide walks you through both
-automated and manual methods for creating and organizing your skills.
+This guide provides an overview of how to create your own Agent Skills to extend
+the capabilities of Gemini CLI.
 
-## Quickstart: Create a skill with a prompt
+## Getting started: The `skill-creator` skill
 
-The fastest way to create a new skill is to use the built-in `skill-creator`.
-This meta-skill guides you through designing, scaffolding, and validating your
-expertise.
+The recommended way to create a new skill is to use the built-in `skill-creator`
+skill. To use it, ask Gemini CLI to create a new skill for you.
 
-Simply ask Gemini CLI to create a skill for you:
+**Example prompt:**
 
-> "Create a new skill called 'code-reviewer' that analyzes local files for
-> common errors and style violations."
+> "create a new skill called 'code-reviewer'"
 
-Gemini will then:
+Gemini CLI will then use the `skill-creator` to generate the skill:
 
 1.  Generate a new directory for your skill (for example, `my-new-skill/`).
 2.  Create a `SKILL.md` file with the necessary YAML frontmatter (`name` and
@@ -23,116 +20,24 @@ Gemini will then:
 3.  Create the standard resource directories: `scripts/`, `references/`, and
     `assets/`.
 
-Once created, you can find your new skill in `.gemini/skills/code-reviewer/`.
+## Manual skill creation
 
-## Manual creation
+If you prefer to create skills manually:
 
 1.  **Create a directory** for your skill (for example, `my-new-skill/`).
 2.  **Create a `SKILL.md` file** inside the new directory.
 
-### 1. Create the directory structure
+To add additional resources that support the skill, refer to the skill
+structure.
 
-The first step is to create the necessary folders for your skill and its
-scripts.
+## Skill structure
 
-**macOS/Linux**
+A skill is a directory containing a `SKILL.md` file at its root.
 
-```bash
-mkdir -p .gemini/skills/code-reviewer/scripts
-```
-
-**Windows (PowerShell)**
-
-```powershell
-New-Item -ItemType Directory -Force -Path ".gemini\skills\code-reviewer\scripts"
-```
-
-### 2. Define the skill (`SKILL.md`)
-
-The `SKILL.md` file defines the skill's purpose and instructions for the agent.
-Create a file at `.gemini/skills/code-reviewer/SKILL.md`.
-
-```markdown
----
-name: code-reviewer
-description:
-  Expertise in reviewing code changes for correctness, security, and style. Use
-  when the user asks to "review" their code or a PR.
----
-
-# Code Reviewer Instructions
-
-You act as a senior software engineer specialized in code quality. When this
-skill is active, you MUST:
-
-1.  **Analyze**: Review the provided code for logical errors, security
-    vulnerabilities, and style violations.
-2.  **Review**: Use the bundled `scripts/review.js` utility to perform an
-    automated check.
-3.  **Feedback**: Provide constructive feedback, clearly distinguishing between
-    critical issues and minor improvements.
-```
-
-### 3. Add the tool logic
-
-Skills can bundle resources like scripts to perform deterministic tasks. Create
-a file at `.gemini/skills/code-reviewer/scripts/review.js`.
-
-```javascript
-// .gemini/skills/code-reviewer/scripts/review.js
-const file = process.argv[2];
-
-if (!file) {
-  console.error('Usage: node review.js <file>');
-  process.exit(1);
-}
-
-console.log(`Reviewing ${file}...`);
-// Simple mock review logic
-setTimeout(() => {
-  console.log(`Result: Success (No major issues found in ${file})`);
-}, 500);
-```
-
-### 4. Test the skill
-
-Gemini CLI automatically discovers skills in the `.gemini/skills` directory.
-
-1.  Start a new session and ask a question that triggers the skill's
-    description: "Can you review index.js"
-2.  Gemini identifies the request matches the `code-reviewer` description and
-    asks for permission to activate it.
-3.  Once you approve, Gemini executes the bundled script:
-    `node .gemini/skills/code-reviewer/scripts/review.js index.js`
-
-To determine whether your skill has been correctly loaded, run the command:
-
-```bash
-/skills
-```
-
-### 5. Optional: Share your skill
-
-You can share your skills in several ways depending on your target audience.
-
-- **Workspace skills**: Commit your skill to a `.gemini/skills/` directory in
-  your project repository.
-- **Extensions**: Bundle your skill within a
-  [Gemini CLI extension](../extensions/writing-extensions.md).
-- **Git repositories**: Share the skill directory as a standalone Git repo and
-  install it using `gemini skills install <url>`.
-
----
-
-## Core concepts
-
-Now that you've built your first skill, let's explore the core components and
-workflows for developing more complex expertise.
-
-### Skill structure
+### Folder structure
 
 While a `SKILL.md` file is the only required component, we recommend the
-following structure for organizing your skill's resources.
+following structure for organizing your skill's resources:
 
 ```text
 my-skill/
@@ -142,66 +47,34 @@ my-skill/
 └── assets/        (Optional) Templates and other resources
 ```
 
-When a skill is activated, the model is granted access to this entire directory.
-You can instruct the model to use the tools and files found within these
-folders.
+### `SKILL.md` file
 
-### Metadata and triggers
+The `SKILL.md` file is the core of your skill. This file uses YAML frontmatter
+for metadata and Markdown for instructions. For example:
 
-The `SKILL.md` file uses YAML frontmatter for metadata.
+```markdown
+---
+name: code-reviewer
+description:
+  Use this skill to review code. It supports both local changes and remote Pull
+  Requests.
+---
+
+# Code Reviewer
+
+This skill guides the agent in conducting thorough code reviews.
+
+## Workflow
+
+### 1. Determine Review Target
+
+- **Remote PR**: If the user gives a PR number or URL, target that remote PR.
+- **Local Changes**: If changes are local... ...
+```
 
 - **`name`**: A unique identifier for the skill. This should match the directory
   name.
-- **`description`**: **CRITICAL.** This is how Gemini decides when to use the
-  skill. Be specific about the tasks it handles and the keywords that should
-  trigger it.
-
-### Discovery tiers
-
-Gemini CLI discovers skills from several locations, following a specific order
-of precedence (lowest to highest):
-
-1.  **Built-in Skills**: Included with Gemini CLI (pre-approved).
-2.  **Extension Skills**: Bundled within [extensions](../extensions/).
-3.  **User Skills**: `~/.gemini/skills/` or the `~/.agents/skills/` alias.
-4.  **Workspace Skills**: `.gemini/skills/` or the `.agents/skills/` alias.
-
-### Discovery aliases
-
-You can use `.agents/skills` as an alternative to `.gemini/skills`. This alias
-is compatible with other AI agent tools following the
-[Agent Skills](https://agentskills.io) standard.
-
-## Advanced development
-
-Once you've built a basic skill, you can use specialized scripts and workflows
-to streamline your development process.
-
-### Creation scripts
-
-If you are developing a skill and want to use the same scripts the built-in
-tools use, you can find them in the core package. These scripts help automate
-the initialization, validation, and packaging of skills.
-
-- **Initialize**: `node scripts/init_skill.cjs <name> --path <dir>`
-- **Validate**: `node scripts/validate_skill.cjs <path/to/skill>`
-- **Package**: `node scripts/package_skill.cjs <path/to/skill>` (Creates a
-  `.skill` zip file)
-
-### Linking for local development
-
-If you are developing a skill in a separate directory, you can link it to your
-user skills directory for testing:
-
-```bash
-gemini skills link .
-```
-
-## Next steps
-
-- [Skill best practices](./skills-best-practices.md): Learn strategies for
-  building reliable and effective skills.
-- [Agent Skills overview](./skills.md): Deep dive into discovery tiers and the
-  skill lifecycle.
-- [Get started with Agent Skills](./tutorials/skills-getting-started.md): A
-  quick walkthrough of triggering and using skills.
+- **`description`**: A description of what the skill does and when Gemini should
+  use it.
+- **Body**: The Markdown body of the file contains the instructions that guide
+  the agent's behavior when the skill is active.

docs/cli/custom-commands.md

@@ -34,7 +34,6 @@ separator (`/` or `\`) being converted to a colon (`:`).
 > [!TIP]
 > After creating or modifying `.toml` command files, run
 > `/commands reload` to pick up your changes without restarting the CLI.
-> To see all available command files, run `/commands list`.
 
 ## TOML file format (v1)
 

docs/cli/git-worktrees.md

@@ -80,23 +80,8 @@ manually remove the worktree if you no longer need it.
 
 ## Resuming work in a Git worktree
 
-To resume a session in an existing worktree, you can simply run Gemini with the
-same `--worktree` (`-w`) name:
-
-```bash
-gemini --worktree feature-search
-```
-
-Alternatively, you can navigate to the worktree directory and start Gemini
-directly:
-
-```bash
-cd .gemini/worktrees/feature-search
-gemini
-```
-
-To resume a specific previous chat session within that worktree, use the
-`--resume` flag and the session ID:
+To resume a session in a worktree, navigate to the worktree directory and start
+Gemini CLI with the `--resume` flag and the session ID:
 
 ```bash
 cd .gemini/worktrees/feature-search

docs/cli/model-routing.md

@@ -34,11 +34,11 @@ Gemini CLI will use a locally-running **Gemma** model to make routing decisions
 reduce costs associated with hosted model usage while offering similar routing
 decision latency and quality.
 
-The easiest way to set this up is using the automated `gemini gemma setup`
-command.
+In order to use this feature, the local Gemma model **must** be served behind a
+Gemini API and accessible via HTTP at an endpoint configured in `settings.json`.
 
 For more details on how to configure local model routing, see
-[`gemini gemma` — Local Model Routing Setup](../core/gemma-setup.md).
+[Local Model Routing](../core/local-model-routing.md).
 
 ### Model selection precedence
 

docs/cli/settings.md

@@ -163,10 +163,10 @@ they appear in the UI.
 
 | UI Label                                             | Setting                                         | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | Default              |
 | ---------------------------------------------------- | ----------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------- |
-| Gemma Models                                         | `experimental.gemma`                            | Enable access to Gemma 4 models via Gemini API.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `true`               |
+| Gemma Models                                         | `experimental.gemma`                            | Enable access to Gemma 4 models (experimental).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `false`              |
 | Voice Mode                                           | `experimental.voiceMode`                        | Enable experimental voice dictation and commands (/voice, /voice model).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `false`              |
 | Voice Activation Mode                                | `experimental.voice.activationMode`             | How to trigger voice recording with the Space key.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `"push-to-talk"`     |
-| Voice Transcription Backend                          | `experimental.voice.backend`                    | The backend to use for voice transcription. Note: When using the Gemini Live backend, voice recordings are sent to Google Cloud for transcription.                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `"gemini-live"`      |
+| Voice Transcription Backend                          | `experimental.voice.backend`                    | The backend to use for voice transcription.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `"gemini-live"`      |
 | Whisper Model                                        | `experimental.voice.whisperModel`               | The Whisper model to use for local transcription.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `"ggml-base.en.bin"` |
 | Voice Stop Grace Period (ms)                         | `experimental.voice.stopGracePeriodMs`          | How long to wait for final transcription after stopping recording.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `1000`               |
 | Enable Git Worktrees                                 | `experimental.worktrees`                        | Enable automated Git worktree management for parallel work.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `false`              |
@@ -180,6 +180,7 @@ they appear in the UI.
 | Auto Memory                                          | `experimental.autoMemory`                       | Automatically extract reusable skills from past sessions in the background. Review results with /memory inbox.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `false`              |
 | Use the generalist profile to manage agent contexts. | `experimental.generalistProfile`                | Suitable for general coding and software development tasks.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `false`              |
 | Enable Context Management                            | `experimental.contextManagement`                | Enable logic for context management.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `false`              |
+| Enhance Command                                      | `experimental.enhanceCommand`                   | Enable the experimental /enhance slash command.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `false`              |
 
 ### Skills
 

docs/cli/skills-best-practices.md

@@ -1,78 +0,0 @@
-# Agent Skill best practices
-
-Create high-quality, reliable Agent Skills by following these established design
-principles and patterns.
-
-## Design for discovery
-
-The most important part of a skill is its `description`. This is the only
-information the model has before activation.
-
-- **Be specific**: Use keywords that are likely to appear in user prompts (for
-  example, "audit," "security," "refactor," "migration").
-- **Define the trigger**: Clearly state _when_ the skill should be used (for
-  example, "Use this skill when the user asks to review a PR for performance
-  regressions").
-- **Avoid overlap**: Ensure your skill descriptions are distinct from one
-  another and from the general capabilities of the model.
-
-## Progressive disclosure
-
-The "context window" is a shared resource. Use a three-level loading system to
-manage context efficiently.
-
-1.  **Metadata (name + description)**: Always in context (~100 words).
-2.  **`SKILL.md` body**: Loaded only after the skill triggers (<5k words).
-3.  **Bundled resources**: Loaded only as needed by the model.
-
-**Best practice**: Keep the `SKILL.md` body focused on core procedural
-instructions. Move detailed reference material, schemas, and examples into
-separate files in a `references/` directory.
-
-## Degrees of freedom
-
-Match the level of instruction specificity to the task's fragility.
-
-- **High freedom (text-based instructions)**: Use when multiple approaches are
-  valid or decisions depend heavily on context.
-- **Medium freedom (pseudocode or scripts with parameters)**: Use when a
-  preferred pattern exists but some variation is acceptable.
-- **Low freedom (specific scripts, few parameters)**: Use when operations are
-  fragile and error-prone, or a specific sequence MUST be followed.
-
-## Bundle resources effectively
-
-Leverage the skill's ability to include scripts and assets to extend the agent's
-capabilities.
-
-- **Use scripts for deterministic tasks**: If a task can be automated with a
-  script (for example, running a linter, fetching data from an API), bundle it
-  in the `scripts/` folder.
-- **Agentic ergonomics**: Ensure scripts output LLM-friendly stdout. Suppress
-  verbose tracebacks and provide clear, concise success/failure messages.
-- **Provide templates**: Include common file headers or boilerplate code in the
-  `assets/` folder to ensure the agent produces consistent output.
-
-## Anatomy of a great skill
-
-A well-structured skill directory organizes its resources into specialized
-sub-folders.
-
-```text
-my-skill/
-├── SKILL.md       (Required) Core instructions and metadata
-├── scripts/       (Optional) Executable logic (Node.js, Python, etc.)
-├── references/    (Optional) Documentation to be loaded as needed
-└── assets/        (Optional) Templates and non-executable resources
-```
-
-## Security and privacy
-
-Design your skills with security in mind to protect your workspace and data.
-
-- **Avoid hardcoded secrets**: Never include API keys or passwords in your
-  skill's scripts or documentation.
-- **Review third-party skills**: Inspect the `SKILL.md` and scripts of any skill
-  before installing it from an untrusted source.
-- **Limit scope**: Design skills to be as focused as possible to minimize the
-  potential impact of errors.

docs/cli/skills.md

@@ -1,21 +1,112 @@
 # Agent Skills
 
-Agent Skills let you extend Gemini CLI with specialized expertise, procedural
-workflows, and task-specific resources. Based on the
+Agent Skills allow you to extend Gemini CLI with specialized expertise,
+procedural workflows, and task-specific resources. Based on the
 [Agent Skills](https://agentskills.io) open standard, a "skill" is a
 self-contained directory that packages instructions and assets into a
 discoverable capability.
 
-Unlike general context files ([GEMINI.md](./gemini-md.md)), which provide
+## Overview
+
+Unlike general context files ([`GEMINI.md`](./gemini-md.md)), which provide
 persistent workspace-wide background, Skills represent **on-demand expertise**.
-This lets Gemini CLI maintain a vast library of specialized capabilities—such as
-security auditing, cloud deployments, or codebase migrations—without cluttering
-the model's immediate context window.
+This allows Gemini to maintain a vast library of specialized capabilities—such
+as security auditing, cloud deployments, or codebase migrations—without
+cluttering the model's immediate context window.
 
-## How it works
+Gemini autonomously decides when to employ a skill based on your request and the
+skill's description. When a relevant skill is identified, the model "pulls in"
+the full instructions and resources required to complete the task using the
+`activate_skill` tool.
 
-The lifecycle of an Agent Skill involves discovery, activation, and conditional
-resource access.
+## Key Benefits
+
+- **Shared Expertise:** Package complex workflows (like a specific team's PR
+  review process) into a folder that anyone can use.
+- **Repeatable Workflows:** Ensure complex multi-step tasks are performed
+  consistently by providing a procedural framework.
+- **Resource Bundling:** Include scripts, templates, or example data alongside
+  instructions so the agent has everything it needs.
+- **Progressive Disclosure:** Only skill metadata (name and description) is
+  loaded initially. Detailed instructions and resources are only disclosed when
+  the model explicitly activates the skill, saving context tokens.
+
+## Skill Discovery Tiers
+
+Gemini CLI discovers skills from three primary locations:
+
+1.  **Workspace Skills**: Located in `.gemini/skills/` or the `.agents/skills/`
+    alias. Workspace skills are typically committed to version control and
+    shared with the team.
+2.  **User Skills**: Located in `~/.gemini/skills/` or the `~/.agents/skills/`
+    alias. These are personal skills available across all your workspaces.
+3.  **Extension Skills**: Skills bundled within installed
+    [extensions](../extensions/index.md).
+
+**Precedence:** If multiple skills share the same name, higher-precedence
+locations override lower ones: **Workspace > User > Extension**.
+
+Within the same tier (user or workspace), the `.agents/skills/` alias takes
+precedence over the `.gemini/skills/` directory. This generic alias provides an
+intuitive path for managing agent-specific expertise that remains compatible
+across different AI agent tools.
+
+## Managing Skills
+
+### In an Interactive Session
+
+Use the `/skills` slash command to view and manage available expertise:
+
+- `/skills list` (default): Shows all discovered skills and their status.
+- `/skills link <path>`: Links agent skills from a local directory via symlink.
+- `/skills disable <name>`: Prevents a specific skill from being used.
+- `/skills enable <name>`: Re-enables a disabled skill.
+- `/skills reload`: Refreshes the list of discovered skills from all tiers.
+
+<!-- prettier-ignore -->
+> [!NOTE]
+> `/skills disable` and `/skills enable` default to the `user` scope. Use
+> `--scope workspace` to manage workspace-specific settings.
+
+### From the Terminal
+
+The `gemini skills` command provides management utilities:
+
+```bash
+# List all discovered skills
+gemini skills list
+
+# Link agent skills from a local directory via symlink
+# Discovers skills (SKILL.md or */SKILL.md) and creates symlinks in ~/.gemini/skills
+# (or ~/.agents/skills)
+gemini skills link /path/to/my-skills-repo
+
+# Link to the workspace scope (.gemini/skills or .agents/skills)
+gemini skills link /path/to/my-skills-repo --scope workspace
+
+# Install a skill from a Git repository, local directory, or zipped skill file (.skill)
+# Uses the user scope by default (~/.gemini/skills or ~/.agents/skills)
+gemini skills install https://github.com/user/repo.git
+gemini skills install /path/to/local/skill
+gemini skills install /path/to/local/my-expertise.skill
+
+# Install a specific skill from a monorepo or subdirectory using --path
+gemini skills install https://github.com/my-org/my-skills.git --path skills/frontend-design
+
+# Install to the workspace scope (.gemini/skills or .agents/skills)
+gemini skills install /path/to/skill --scope workspace
+
+# Uninstall a skill by name
+gemini skills uninstall my-expertise --scope workspace
+
+# Enable a skill (globally)
+gemini skills enable my-expertise
+
+# Disable a skill. Can use --scope to specify workspace or user (defaults to workspace)
+gemini skills disable my-expertise --scope workspace
+```
+
+## How it Works
 
 1.  **Discovery**: At the start of a session, Gemini CLI scans the discovery
     tiers and injects the name and description of all enabled skills into the
@@ -32,110 +123,14 @@ resource access.
 5.  **Execution**: The model proceeds with the specialized expertise active. It
     is instructed to prioritize the skill's procedural guidance within reason.
 
-## Discovery tiers
+### Skill activation
 
-Gemini CLI discovers skills from several locations, following a specific order
-of precedence (lowest to highest):
+Once a skill is activated (typically by Gemini identifying a task that matches
+the skill's description and your approval), its specialized instructions and
+resources are loaded into the agent's context. A skill remains active and its
+guidance is prioritized for the duration of the session.
 
-1.  **Built-in skills**: Standard skills included with Gemini CLI that provide
-    foundational capabilities.
-2.  **Extension skills**: Skills bundled within installed
-    [extensions](../extensions/index.md).
-3.  **User skills**: Located in `~/.gemini/skills/` or the `~/.agents/skills/`
-    alias.
-4.  **Workspace skills**: Located in `.gemini/skills/` or the `.agents/skills/`
-    alias. Workspace skills are shared with your team via version control.
+## Creating your own skills
 
-### Precedence and aliases
-
-If multiple skills share the same name, the version from the higher-precedence
-location is used. Within the same tier (user or workspace), the
-`.agents/skills/` alias takes precedence over the `.gemini/skills/` directory.
-
-The `.agents/skills/` alias provides an interoperable path for managing
-agent-specific expertise that remains compatible across different AI tools.
-
-## Key benefits
-
-Agent Skills provide several advantages for managing specialized knowledge and
-complex workflows.
-
-- **Shared expertise**: Package complex workflows (like a specific team's PR
-  review process) into a folder that anyone can use.
-- **Repeatable workflows**: Ensure complex multi-step tasks are performed
-  consistently by providing a procedural framework.
-- **Resource bundling**: Include scripts, templates, or example data alongside
-  instructions so the agent has everything it needs.
-- **Progressive disclosure**: Only skill metadata (name and description) is
-  loaded initially. Detailed instructions and resources are only disclosed when
-  the model explicitly activates the skill, saving context tokens.
-
-<!-- prettier-ignore -->
-> [!NOTE]
-> `/skills disable` and `/skills enable` default to the `user` scope. Use
-> `--scope workspace` to manage workspace-specific settings.
-
-To see all available skills in your current session, use the `/skills list`
-command.
-
-## Managing skills
-
-You can manage Agent Skills through interactive session commands or directly
-from your terminal.
-
-### In an interactive session
-
-Use the `/skills` slash command to view and manage available expertise:
-
-- `/skills list [all] [nodesc]`: Shows discovered skills. Use `all` to include
-  built-in skills and `nodesc` to hide descriptions.
-- `/skills link <path> [--scope user|workspace]`: Links skills from a local
-  directory.
-- `/skills disable <name>`: Prevents a specific skill from being used.
-- `/skills enable <name>`: Re-enables a disabled skill.
-- `/skills reload` (or `/skills refresh`): Refreshes the list of discovered
-  skills from all tiers.
-
-### From the terminal
-
-The `gemini skills` command provides management utilities:
-
-```bash
-# List all discovered skills. Use --all to include built-in skills.
-gemini skills list --all
-
-# Install a skill from a Git repository or local directory.
-# Use --consent to skip the security confirmation prompt.
-gemini skills install https://github.com/user/repo.git --consent
-
-# Uninstall a skill.
-gemini skills uninstall my-skill --scope workspace
-```
-
-#### Command options
-
-The skill management commands support several global and command-specific
-options.
-
-- `--scope`: Either `user` (global, default) or `workspace` (local to the
-  project).
-- `--path`: The sub-directory within a Git repository containing the skill.
-- `--consent`: Acknowledge security risks and skip the interactive confirmation
-  during installation.
-
-For more details on CLI commands, see the
-[CLI reference](./cli-reference.md#skills-management).
-
-## Next steps
-
-Explore these resources to refine your skills and understand the framework
-better.
-
-- [Get started with Agent Skills](./tutorials/skills-getting-started.md): A
-  quick walkthrough of triggering and using skills.
-- [Creating Agent Skills](./creating-skills.md): Create your first skill and
-  bundle custom logic.
-- [Using Agent Skills](./using-agent-skills.md): Learn how to leverage built-in
-  and custom skills.
-- [Best practices](./skills-best-practices.md): Learn strategies for building
-  effective skills.
+To create your own skills, see the [Create Agent Skills](./creating-skills.md)
+guide.

docs/cli/tutorials/session-management.md

@@ -61,19 +61,6 @@ gemini --list-sessions
 gemini --delete-session 1
 ```
 
-### Scenario: Delete session on exit
-
-If you're doing a one-off task and don't want to leave any session history
-behind, use the `--delete` flag when exiting:
-
-```
-/exit --delete
-```
-
-This removes the current session's conversation history and tool output files
-before exiting. It's useful for privacy-sensitive tasks or quick one-off
-interactions.
-
 ## How to rewind time (Undo mistakes)
 
 Gemini CLI's **Rewind** feature is like `Ctrl+Z` for your workflow.

docs/cli/tutorials/skills-getting-started.md

@@ -1,158 +1,110 @@
 # Get started with Agent Skills
 
-Agent Skills extend Gemini CLI with specialized expertise. In this tutorial,
-you'll learn how to create your first skill, bundle custom logic, and activate
-it during a session.
+Agent Skills extend Gemini CLI with specialized expertise. In this guide, you'll
+learn how to create your first skill, bundle custom scripts, and activate them
+during a session.
 
-## Create your first skill
+## How to create a skill
 
-A skill is defined by a directory containing a `SKILL.md` file and
-subdirectories containing reference materials or scripts used by the skill.
-Let's create an **API Auditor** skill that runs a script to help you verify if
-local or remote endpoints are responding correctly.
+A skill is defined by a directory containing a `SKILL.md` file. Let's create an
+**API Auditor** skill that helps you verify if local or remote endpoints are
+responding correctly.
 
-### 1. Create the directory structure
+### Create the directory structure
 
-The first step is to create the necessary folders for your skill and its
-scripts.
+1.  Run the following command to create the folders:
 
-**macOS/Linux**
+    **macOS/Linux**
 
-```bash
-mkdir -p .gemini/skills/api-auditor/scripts
-```
+    ```bash
+    mkdir -p .gemini/skills/api-auditor/scripts
+    ```
 
-**Windows (PowerShell)**
+    **Windows (PowerShell)**
 
-```powershell
-New-Item -ItemType Directory -Force -Path ".gemini\skills\api-auditor\scripts"
-```
+    ```powershell
+    New-Item -ItemType Directory -Force -Path ".gemini\skills\api-auditor\scripts"
+    ```
 
-### 2. Create the definition (`SKILL.md`)
+### Create the definition
 
-The `SKILL.md` file defines the skill's purpose and instructions for the agent.
-Create a file at `.gemini/skills/api-auditor/SKILL.md`. This tells the agent
-_when_ to use the skill and _how_ to behave.
+1.  Create a file at `.gemini/skills/api-auditor/SKILL.md`. This tells the agent
+    _when_ to use the skill and _how_ to behave.
 
-```markdown
----
-name: api-auditor
-description:
-  Expertise in auditing and testing API endpoints. Use when the user asks to
-  "check", "test", or "audit" a URL or API.
----
+    ```markdown
+    ---
+    name: api-auditor
+    description:
+      Expertise in auditing and testing API endpoints. Use when the user asks to
+      "check", "test", or "audit" a URL or API.
+    ---
 
-# API Auditor Instructions
+    # API Auditor Instructions
 
-You act as a QA engineer specialized in API reliability. When this skill is
-active, you MUST:
+    You act as a QA engineer specialized in API reliability. When this skill is
+    active, you MUST:
 
-1.  **Audit**: Use the bundled `scripts/audit.js` utility to check the status of
-    the provided URL.
-2.  **Report**: Analyze the output (status codes, latency) and explain any
-    failures in plain English.
-3.  **Secure**: Remind the user if they are testing a sensitive endpoint without
-    an `https://` protocol.
-```
+    1.  **Audit**: Use the bundled `scripts/audit.js` utility to check the
+        status of the provided URL.
+    2.  **Report**: Analyze the output (status codes, latency) and explain any
+        failures in plain English.
+    3.  **Secure**: Remind the user if they are testing a sensitive endpoint
+        without an `https://` protocol.
+    ```
 
-### 3. Add the tool logic
+### Add the tool logic
 
-Skills can bundle resources like scripts to perform deterministic tasks. Create
-a file at `.gemini/skills/api-auditor/scripts/audit.js`. This is the code the
-agent will run.
+Skills can bundle resources like scripts.
 
-```javascript
-// .gemini/skills/api-auditor/scripts/audit.js
-const url = process.argv[2];
+1.  Create a file at `.gemini/skills/api-auditor/scripts/audit.js`. This is the
+    code the agent will run.
 
-if (!url) {
-  console.error('Usage: node audit.js <url>');
-  process.exit(1);
-}
+    ```javascript
+    // .gemini/skills/api-auditor/scripts/audit.js
+    const url = process.argv[2];
 
-console.log(`Auditing ${url}...`);
-fetch(url, { method: 'HEAD' })
-  .then((r) => console.log(`Result: Success (Status ${r.status})`))
-  .catch((e) => console.error(`Result: Failed (${e.message})`));
-```
+    if (!url) {
+      console.error('Usage: node audit.js <url>');
+      process.exit(1);
+    }
 
-## Verify discovery
+    console.log(`Auditing ${url}...`);
+    fetch(url, { method: 'HEAD' })
+      .then((r) => console.log(`Result: Success (Status ${r.status})`))
+      .catch((e) => console.error(`Result: Failed (${e.message})`));
+    ```
 
-Gemini CLI automatically discovers skills in the `.gemini/skills` directory (as
-well as the `.agents/skills` alias).
+## How to verify discovery
 
-To check if Gemini CLI found your new skill, use the `/skills list` command
-within an interactive session:
+Gemini CLI automatically discovers skills in the `.gemini/skills` directory. You
+can also use `.agents/skills` as a more generic alternative. Check that it found
+your new skill.
 
-```bash
-/skills list
-```
+**Command:** `/skills list`
 
-You should see `api-auditor` in the list of available skills. If you just added
-the files, you can run `/skills reload` to refresh the list without restarting
-the session.
-
-### If your skill doesn't appear
-
-If `/skills list` doesn't show your skill, check the following:
-
-1.  **The folder must be trusted (workspace skills only).** Skills under
-    `<workspace>/.gemini/skills/` are only loaded when the workspace folder is
-    marked as trusted. Run `/trust` and restart the session if needed. Skills
-    under `~/.gemini/skills/` (user scope) are not affected by trust.
-2.  **Check the path layout.** `SKILL.md` is discovered either at the root of
-    the skills directory (`.gemini/skills/SKILL.md`) or one directory deep
-    (`.gemini/skills/<skill-name>/SKILL.md`). The recommended layout uses a
-    subdirectory per skill so you can bundle scripts and other resources
-    alongside it. Files nested more than one directory deep are not discovered.
-3.  **The filename must be exactly `SKILL.md`.** Capitalization matters on
-    case-sensitive filesystems (Linux, and macOS when configured as such):
-    `skill.md` or `Skill.md` will be ignored.
-4.  **Frontmatter must include both `name:` and `description:`, and must be the
-    first thing in the file.** A `SKILL.md` is silently skipped if either field
-    is missing, if the delimiters (`---` on their own lines) are absent, or if
-    any text (an H1 title, a comment, even a blank line) appears before the
-    opening `---`.
-5.  **The skill name comes from the `name:` field, not the directory name.** If
-    your frontmatter says `name: foo`, the skill appears as `foo` in
-    `/skills list` regardless of what its parent directory is called. The
-    characters `: \ / < > * ? " |` in the name are replaced with `-`.
+You should see `api-auditor` in the list of available skills.
 
 ## How to use the skill
 
-Now that the skill is discovered, you can trigger its activation by asking a
-relevant question.
+Now, try it out. Start a new session and ask a question that triggers the
+skill's description.
 
-1.  **Trigger**: Start a new session and ask: "Can you audit https://google.com"
-2.  **Activation**: Gemini identifies that the request matches the `api-auditor`
-    description and calls the `activate_skill` tool.
-3.  **Consent**: You will see a confirmation prompt. Type **y** to approve.
-4.  **Execution**: Once activated, Gemini uses the `run_shell_command` tool to
-    execute your bundled script:
-    `node .gemini/skills/api-auditor/scripts/audit.js https://google.com`
+**User:** "Can you audit http://geminicli.com"
 
-## Pro tip: Use the skill-creator
+Gemini recognizes the request matches the `api-auditor` description and asks for
+permission to activate it.
 
-If you don't want to create the files manually, you can use the built-in
-`skill-creator` skill. Simply ask Gemini:
+**Model:** (After calling `activate_skill`) "I've activated the **api-auditor**
+skill. I'll run the audit script now..."
 
-> "Create a new skill called 'api-auditor' that tests if URLs are responding."
+Gemini then uses the `run_shell_command` tool to execute your bundled Node
+script:
 
-The `skill-creator` will handle the directory structure and boilerplate for you.
-
-## Manage skills
-
-You can also manage skills using the `gemini skills` command from your terminal:
-
-- **Install**: `gemini skills install <url-or-path>`
-- **Link**: `gemini skills link <path>` (useful for local development)
-- **Uninstall**: `gemini skills uninstall <name>`
+`node .gemini/skills/api-auditor/scripts/audit.js http://geminili.com`
 
 ## Next steps
 
-- [Creating Agent Skills](../creating-skills.md): Detailed guide on advanced
-  skill features and metadata.
-- [Using Agent Skills](../using-agent-skills.md): More ways to discover and
-  manage your skill library.
-- [Skill best practices](../skills-best-practices.md): Learn how to design
-  reliable and effective expertise.
+- Explore the
+  [Agent Skills Authoring Guide](../../cli/skills.md#creating-a-skill) to learn
+  about more advanced features.
+- Learn how to share skills via [Extensions](../../extensions/index.md).

docs/cli/using-agent-skills.md

@@ -1,89 +0,0 @@
-# Managing Agent Skills
-
-Agent Skills provide Gemini CLI with specialized expertise on demand. This guide
-covers advanced management techniques, including using slash commands, terminal
-utilities, and understanding discovery tiers.
-
-## Discovery tiers
-
-Gemini CLI discovers skills from several locations, following a specific order
-of precedence (lowest to highest):
-
-1.  **Built-in Skills**: Included with Gemini CLI and always available.
-2.  **Extension Skills**: Bundled within [extensions](../extensions/index.md).
-3.  **User Skills**: Located in `~/.gemini/skills/` or the `~/.agents/skills/`
-    alias. These are available across all your projects.
-4.  **Workspace Skills**: Located in `.gemini/skills/` or the `.agents/skills/`
-    alias within your current directory. These are project-specific.
-
-> **Tip:** If multiple skills share the same name, the version from the
-> higher-precedence location is used.
-
-## In-session management
-
-Use the `/skills` slash command during an interactive session to manage your
-available expertise.
-
-- **List skills**: `/skills list` (shows discovered skills).
-  - Use `/skills list all` to include internal built-in skills.
-  - Use `/skills list nodesc` to hide descriptions.
-- **Reload skills**: `/skills reload` (or `/skills refresh`) to scan for new or
-  modified skills without restarting the CLI.
-- **Toggle status**:
-  - `/skills disable <name>`: Prevents a skill from being triggered.
-  - `/skills enable <name>`: Re-enables a disabled skill.
-- **Link local skills**: `/skills link <path> [--scope user|workspace]` to
-  immediately use a skill you are developing.
-
-## Terminal utilities
-
-The `gemini skills` command provides management utilities directly from your
-system shell.
-
-### Install a skill
-
-To install a skill from a remote repository or a local `.skill` package:
-
-```bash
-gemini skills install https://github.com/user/my-awesome-skill
-```
-
-By default, this installs to your **user profile**. Use `--scope workspace` to
-install it only for the current project.
-
-### Link for development
-
-If you are developing a skill, use the `link` command to create a reference to
-your local directory:
-
-```bash
-gemini skills link ./path/to/my-skill
-```
-
-### Uninstall a skill
-
-To completely remove an installed or linked skill:
-
-```bash
-gemini skills uninstall <name>
-```
-
-## Security and consent
-
-Agent Skills can execute scripts and access your files. To protect your
-environment:
-
-1.  **Installation consent**: When installing from a remote URL, you will be
-    asked to confirm the source.
-2.  **Activation consent**: Every time a skill is triggered during a session,
-    the agent must ask for permission to activate it and gain access to its
-    resources.
-
-## Next steps
-
-- [Get started with Agent Skills](./tutorials/skills-getting-started.md): A
-  walkthrough for creating your first skill.
-- [Creating Agent Skills](./creating-skills.md): Detailed guide on bundling
-  scripts and assets.
-- [Skill best practices](./skills-best-practices.md): Strategies for building
-  reliable expertise.

docs/core/gemma-setup.md

@@ -1,83 +0,0 @@
-# `gemini gemma` — Automated Local Model Routing Setup
-
-Local model routing uses a local Gemma 3 1B model running on your machine to
-classify and route user requests. It routes simple requests (like file reads) to
-Gemini Flash and complex requests (like architecture discussions) to Gemini Pro.
-
-<!-- prettier-ignore -->
-> [!NOTE]
-> This is an experimental feature currently under active development.
-
-## What is this?
-
-This feature saves cloud API costs by using local inference for task
-classification instead of a cloud-based classifier. It adds a few milliseconds
-of local latency but can significantly reduce the overall token usage for hosted
-models.
-
-## Quick start
-
-```bash
-# One command does everything: downloads runtime, pulls model, configures settings, starts server
-gemini gemma setup
-```
-
-You'll be prompted to accept the Gemma Terms of Use. The model is ~1 GB.
-
-After setup, **just use the CLI normally** — routing happens automatically on
-every request.
-
-## Commands
-
-| Command               | What it does                                                   |
-| --------------------- | -------------------------------------------------------------- |
-| `gemini gemma setup`  | Full install (binary + model + settings + server start)        |
-| `gemini gemma status` | Health check — shows what's installed and running              |
-| `gemini gemma start`  | Start the LiteRT server (auto-starts on CLI launch by default) |
-| `gemini gemma stop`   | Stop the LiteRT server                                         |
-| `gemini gemma logs`   | Tail the server logs to see routing requests live              |
-| `/gemma`              | In-session status check (type it inside the CLI)               |
-
-## Verifying it works
-
-1. Run `gemini gemma status` — all checks should show green
-2. Open two terminals:
-   - Terminal 1: `gemini gemma logs` (watch for incoming requests)
-   - Terminal 2: use the CLI normally
-3. You should see classification requests appear in the logs as you interact
-   with the CLI
-4. The `/gemma` slash command inside a session shows a quick status panel
-
-## Setup flags
-
-```bash
-gemini gemma setup --port 8080      # custom port
-gemini gemma setup --no-start       # don't start server after install
-gemini gemma setup --force           # re-download everything
-gemini gemma setup --skip-model     # binary only, skip the 1GB model download
-```
-
-## How it works under the hood
-
-- Local Gemma classifies each request as "simple" or "complex" (~100ms)
-- Simple → Flash, Complex → Pro
-- If the local server is down, the CLI silently falls back to the cloud
-  classifier — no errors, no disruption
-
-## Disabling
-
-Set `enabled: false` in settings or just run `gemini gemma stop` to turn off the
-server:
-
-```json
-{ "experimental": { "gemmaModelRouter": { "enabled": false } } }
-```
-
-## Advanced setup
-
-If you are in an environment where the `gemini gemma setup` command cannot
-automatically download binaries (for example, behind a strict corporate
-firewall), you can perform the setup manually.
-
-For more information, see the
-[Manual Local Model Routing Setup guide](./local-model-routing.md).

docs/core/index.md

@@ -15,9 +15,8 @@ requests sent from `packages/cli`. For a general overview of Gemini CLI, see the
   modular GEMINI.md import feature using @file.md syntax.
 - **[Policy Engine](../reference/policy-engine.md):** Use the Policy Engine for
   fine-grained control over tool execution.
-- **[Local Model Routing (experimental)](./gemma-setup.md):** Learn how to
-  enable use of a local Gemma model for model routing decisions using the
-  automated setup command.
+- **[Local Model Routing (experimental)](./local-model-routing.md):** Learn how
+  to enable use of a local Gemma model for model routing decisions.
 
 ## Role of the core
 

docs/core/local-model-routing.md

@@ -1,29 +1,22 @@
-# Manual Local Model Routing Setup (experimental)
+# Local Model Routing (experimental)
 
 Gemini CLI supports using a local model for
 [routing decisions](../cli/model-routing.md). When configured, Gemini CLI will
 use a locally-running **Gemma** model to make routing decisions (instead of
 sending routing decisions to a hosted model).
 
-<!-- prettier-ignore -->
-> [!NOTE]
-> This is an experimental feature currently under active development.
-
-<!-- prettier-ignore -->
-> [!IMPORTANT]
-> **Recommended:** We now provide a fully automated setup command. We recommend
-> using the [`gemini gemma` Setup Guide](./gemma-setup.md) instead of following
-> these manual steps.
-
 This feature can help reduce costs associated with hosted model usage while
 offering similar routing decision latency and quality.
 
-## Manual Setup
+> **Note: Local model routing is currently an experimental feature.**
+
+## Setup
 
 Using a Gemma model for routing decisions requires that an implementation of a
 Gemma model be running locally on your machine, served behind an HTTP endpoint
-and accessed via the Gemini API. If you cannot use the `gemini gemma setup`
-command, follow these manual steps:
+and accessed via the Gemini API.
+
+To serve the Gemma model, follow these steps:
 
 ### Download the LiteRT-LM runtime
 

docs/reference/commands.md

@@ -111,11 +111,6 @@ Slash commands provide meta-level control over the CLI itself.
 
 - **Description:** Manage custom slash commands loaded from `.toml` files.
 - **Sub-commands:**
-  - **`list`**:
-    - **Description:** List available custom command `.toml` files from all
-      sources (user-level `~/.gemini/commands/`, project-level
-      `<project>/.gemini/commands/`, and active extensions).
-    - **Usage:** `/commands list`
   - **`reload`**:
     - **Description:** Reload custom command definitions from all sources
       (user-level `~/.gemini/commands/`, project-level
@@ -328,11 +323,6 @@ Slash commands provide meta-level control over the CLI itself.
 ### `/quit` (or `/exit`)
 
 - **Description:** Exit Gemini CLI.
-- **Flags:**
-  - **`--delete`** _(optional)_: Exit and permanently delete the current
-    session's history and temporary files (chat recording, tool outputs). Useful
-    for privacy or one-off tasks where you don't want to leave any traces.
-  - **Usage:** `/quit --delete` or `/exit --delete`
 
 ### `/restore`
 
@@ -509,12 +499,12 @@ the dedicated [Custom Commands documentation](../cli/custom-commands.md).
 These shortcuts apply directly to the input prompt for text manipulation.
 
 - **Undo:**
-  - **Keyboard shortcut:** Press **Ctrl+z** (Windows), **Cmd+z** (macOS), or
-    **Alt+z** (Linux/WSL) to undo the last action in the input prompt.
+  - **Keyboard shortcut:** Press **Alt+z** or **Cmd+z** to undo the last action
+    in the input prompt.
 
 - **Redo:**
-  - **Keyboard shortcut:** Press **Shift+Cmd+Z** (macOS), or **Shift+Alt+Z**
-    (Linux/WSL) to redo the last undone action in the input prompt.
+  - **Keyboard shortcut:** Press **Shift+Alt+Z** or **Shift+Cmd+Z** to redo the
+    last undone action in the input prompt.
 
 ## At commands (`@`)
 

docs/reference/configuration.md

@@ -1189,41 +1189,6 @@ their corresponding top-level category object in your `settings.json` file.
             "not_found": "prompt",
             "unknown": "prompt"
           },
-          "stateTransitions": {
-            "terminal": "terminal",
-            "transient": "terminal",
-            "not_found": "terminal",
-            "unknown": "terminal"
-          }
-        },
-        {
-          "model": "gemini-3-flash-preview",
-          "isLastResort": true,
-          "maxAttempts": 10,
-          "actions": {
-            "terminal": "prompt",
-            "transient": "prompt",
-            "not_found": "prompt",
-            "unknown": "prompt"
-          },
-          "stateTransitions": {
-            "terminal": "terminal",
-            "transient": "terminal",
-            "not_found": "terminal",
-            "unknown": "terminal"
-          }
-        }
-      ],
-      "auto-preview": [
-        {
-          "model": "gemini-3-pro-preview",
-          "maxAttempts": 3,
-          "actions": {
-            "terminal": "prompt",
-            "transient": "silent",
-            "not_found": "prompt",
-            "unknown": "prompt"
-          },
           "stateTransitions": {
             "terminal": "terminal",
             "transient": "sticky_retry",
@@ -1234,7 +1199,6 @@ their corresponding top-level category object in your `settings.json` file.
         {
           "model": "gemini-3-flash-preview",
           "isLastResort": true,
-          "maxAttempts": 10,
           "actions": {
             "terminal": "prompt",
             "transient": "prompt",
@@ -1243,7 +1207,7 @@ their corresponding top-level category object in your `settings.json` file.
           },
           "stateTransitions": {
             "terminal": "terminal",
-            "transient": "terminal",
+            "transient": "sticky_retry",
             "not_found": "terminal",
             "unknown": "terminal"
           }
@@ -1268,54 +1232,18 @@ their corresponding top-level category object in your `settings.json` file.
         {
           "model": "gemini-2.5-flash",
           "isLastResort": true,
-          "maxAttempts": 10,
           "actions": {
             "terminal": "prompt",
             "transient": "prompt",
             "not_found": "prompt",
             "unknown": "prompt"
           },
-          "stateTransitions": {
-            "terminal": "terminal",
-            "transient": "terminal",
-            "not_found": "terminal",
-            "unknown": "terminal"
-          }
-        }
-      ],
-      "auto-default": [
-        {
-          "model": "gemini-2.5-pro",
-          "maxAttempts": 3,
-          "actions": {
-            "terminal": "prompt",
-            "transient": "silent",
-            "not_found": "prompt",
-            "unknown": "prompt"
-          },
           "stateTransitions": {
             "terminal": "terminal",
             "transient": "sticky_retry",
             "not_found": "terminal",
             "unknown": "terminal"
           }
-        },
-        {
-          "model": "gemini-2.5-flash",
-          "isLastResort": true,
-          "maxAttempts": 10,
-          "actions": {
-            "terminal": "prompt",
-            "transient": "prompt",
-            "not_found": "prompt",
-            "unknown": "prompt"
-          },
-          "stateTransitions": {
-            "terminal": "terminal",
-            "transient": "terminal",
-            "not_found": "terminal",
-            "unknown": "terminal"
-          }
         }
       ],
       "lite": [
@@ -1329,7 +1257,7 @@ their corresponding top-level category object in your `settings.json` file.
           },
           "stateTransitions": {
             "terminal": "terminal",
-            "transient": "terminal",
+            "transient": "sticky_retry",
             "not_found": "terminal",
             "unknown": "terminal"
           }
@@ -1344,7 +1272,7 @@ their corresponding top-level category object in your `settings.json` file.
           },
           "stateTransitions": {
             "terminal": "terminal",
-            "transient": "terminal",
+            "transient": "sticky_retry",
             "not_found": "terminal",
             "unknown": "terminal"
           }
@@ -1360,7 +1288,7 @@ their corresponding top-level category object in your `settings.json` file.
           },
           "stateTransitions": {
             "terminal": "terminal",
-            "transient": "terminal",
+            "transient": "sticky_retry",
             "not_found": "terminal",
             "unknown": "terminal"
           }
@@ -1759,8 +1687,8 @@ their corresponding top-level category object in your `settings.json` file.
 #### `experimental`
 
 - **`experimental.gemma`** (boolean):
-  - **Description:** Enable access to Gemma 4 models via Gemini API.
-  - **Default:** `true`
+  - **Description:** Enable access to Gemma 4 models (experimental).
+  - **Default:** `false`
   - **Requires restart:** Yes
 
 - **`experimental.voiceMode`** (boolean):
@@ -1774,9 +1702,7 @@ their corresponding top-level category object in your `settings.json` file.
   - **Values:** `"push-to-talk"`, `"toggle"`
 
 - **`experimental.voice.backend`** (enum):
-  - **Description:** The backend to use for voice transcription. Note: When
-    using the Gemini Live backend, voice recordings are sent to Google Cloud for
-    transcription.
+  - **Description:** The backend to use for voice transcription.
   - **Default:** `"gemini-live"`
   - **Values:** `"gemini-live"`, `"whisper"`
 
@@ -1946,6 +1872,11 @@ their corresponding top-level category object in your `settings.json` file.
   - **Description:** Deprecated: Use general.topicUpdateNarration instead.
   - **Default:** `false`
 
+- **`experimental.enhanceCommand`** (boolean):
+  - **Description:** Enable the experimental /enhance slash command.
+  - **Default:** `false`
+  - **Requires restart:** Yes
+
 #### `skills`
 
 - **`skills.enabled`** (boolean):
@@ -2582,6 +2513,7 @@ for that specific session.
   - **Note:** For structured output and scripting, use the
     `--output-format json` or `--output-format stream-json` flag.
 - **`--prompt <your_prompt>`** (**`-p <your_prompt>`**):
+  - **Deprecated:** Use positional arguments instead.
   - Used to pass a prompt directly to the command. This invokes Gemini CLI in a
     non-interactive mode.
 - **`--prompt-interactive <your_prompt>`** (**`-i <your_prompt>`**):

docs/reference/keyboard-shortcuts.md

@@ -39,7 +39,7 @@ available combinations.
 | `edit.deleteWordRight` | Delete the next word.                            | `Ctrl+Delete`<br />`Alt+Delete`<br />`Alt+D`             |
 | `edit.deleteLeft`      | Delete the character to the left.                | `Backspace`<br />`Ctrl+H`                                |
 | `edit.deleteRight`     | Delete the character to the right.               | `Delete`<br />`Ctrl+D`                                   |
-| `edit.undo`            | Undo the most recent text edit.                  | `Ctrl+Z`<br />`Alt+Z`<br />`Cmd/Win+Z`                   |
+| `edit.undo`            | Undo the most recent text edit.                  | `Cmd/Win+Z`<br />`Alt+Z`                                 |
 | `edit.redo`            | Redo the most recent undone text edit.           | `Ctrl+Shift+Z`<br />`Shift+Cmd/Win+Z`<br />`Alt+Shift+Z` |
 
 #### Scrolling
@@ -94,6 +94,7 @@ available combinations.
 | `input.openExternalEditor`           | Open the current prompt or the plan in an external editor.                | `Ctrl+G`<br />`Ctrl+Shift+G`                                                        |
 | `input.deprecatedOpenExternalEditor` | Deprecated command to open external editor.                               | `Ctrl+X`                                                                            |
 | `input.paste`                        | Paste from the clipboard.                                                 | `Ctrl+V`<br />`Cmd/Win+V`<br />`Alt+V`                                              |
+| `input.enhancePrompt`                | Enhance the current prompt using an LLM.                                  | `Alt+E`                                                                             |
 
 #### App Controls
 

docs/reference/policy-engine.md

@@ -71,9 +71,7 @@ primary conditions are the tool's name and its arguments.
 
 #### Tool Name
 
-The `toolName` in the rule must match the name of the tool being called. For a
-complete list of built-in tool names, see the
-[Tools reference](/docs/reference/tools#available-tools).
+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).
@@ -89,9 +87,7 @@ complete list of built-in tool names, see the
 
 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 rule does not apply. For a list of
-argument keys available for each tool, see the **Parameters** in the
-[Tools reference](/docs/reference/tools#available-tools).
+the arguments don't match the pattern, the rule does not apply.
 
 #### Execution environment
 
@@ -283,11 +279,7 @@ directory are **ignored**.
 
 ### TOML rule schema
 
-This section describes the fields available in a TOML policy rule.
-
-For valid built-in `toolName` values and their argument structures (used by
-`argsPattern`), see the
-[Tools reference](/docs/reference/tools#available-tools).
+Here is a breakdown of the fields available in a TOML policy rule:
 
 ```toml
 [[rule]]
@@ -373,9 +365,6 @@ priority = 10
 
 To simplify writing policies for `run_shell_command`, you can use
 `commandPrefix` or `commandRegex` instead of the more complex `argsPattern`.
-These are policy-rule shorthands, not arguments of the `run_shell_command` tool
-itself. For the tool's invocation arguments, see [Shell tool](/docs/tools/shell)
-and [Tools reference](/docs/reference/tools#available-tools).
 
 - `commandPrefix`: Matches if the `command` argument starts with the given
   string.

docs/reference/tools.md

@@ -154,55 +154,6 @@ each tool.
 | [`google_web_search`](../tools/web-search.md) | `Search` | Performs a Google Search to find up-to-date information.                                                                                                                                                                                                                        |
 | [`web_fetch`](../tools/web-fetch.md)          | `Fetch`  | Retrieves and processes content from specific URLs. **Warning:** This tool can access local and private network addresses (for example, localhost), which may pose a security risk if used with untrusted prompts. In Plan Mode, this tool requires explicit user confirmation. |
 
-### Tool argument keys
-
-When writing [`argsPattern`](./policy-engine.md#arguments-pattern) rules for the
-[policy engine](./policy-engine.md), you need to know the JSON argument keys for
-each tool. The following table lists the keys that appear in the JSON
-representation of each tool's arguments.
-
-| Tool                     | JSON argument keys                                                                                                                                                                                   |
-| :----------------------- | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `run_shell_command`      | `command`, `description`, `dir_path`, `is_background`                                                                                                                                                |
-| `glob`                   | `pattern`, `dir_path`, `case_sensitive`, `respect_git_ignore`, `respect_gemini_ignore`                                                                                                               |
-| `grep_search`            | `pattern`, `dir_path`, `include_pattern`, `exclude_pattern`, `names_only`, `case_sensitive`, `fixed_strings`, `context`, `after`, `before`, `no_ignore`, `max_matches_per_file`, `total_max_matches` |
-| `list_directory`         | `dir_path`, `ignore`, `file_filtering_options`                                                                                                                                                       |
-| `read_file`              | `file_path`, `start_line`, `end_line`                                                                                                                                                                |
-| `read_many_files`        | `include`, `exclude`, `recursive`, `useDefaultExcludes`                                                                                                                                              |
-| `write_file`             | `file_path`, `content`                                                                                                                                                                               |
-| `replace`                | `file_path`, `old_string`, `new_string`, `instruction`, `allow_multiple`                                                                                                                             |
-| `ask_user`               | `questions` (array of `question`, `header`, `type`, `options`)                                                                                                                                       |
-| `write_todos`            | `todos` (array of `description`, `status`)                                                                                                                                                           |
-| `save_memory`            | `fact`                                                                                                                                                                                               |
-| `activate_skill`         | `name`                                                                                                                                                                                               |
-| `get_internal_docs`      | `path`                                                                                                                                                                                               |
-| `enter_plan_mode`        | `reason`                                                                                                                                                                                             |
-| `exit_plan_mode`         | `plan_path`                                                                                                                                                                                          |
-| `tracker_create_task`    | `title`, `description`, `type`                                                                                                                                                                       |
-| `tracker_update_task`    | `id`, `title`, `description`, `status`, `dependencies`                                                                                                                                               |
-| `tracker_get_task`       | `id`                                                                                                                                                                                                 |
-| `tracker_list_tasks`     | `status`, `type`, `parentId`                                                                                                                                                                         |
-| `tracker_add_dependency` | `taskId`, `dependencyId`                                                                                                                                                                             |
-| `tracker_visualize`      | _(none)_                                                                                                                                                                                             |
-| `update_topic`           | `title`, `summary`, `strategic_intent`                                                                                                                                                               |
-| `google_web_search`      | `query`                                                                                                                                                                                              |
-| `web_fetch`              | `prompt`                                                                                                                                                                                             |
-
-For example, to write a policy rule that blocks any `write_file` call targeting
-a `.env` file, you would match against the `file_path` key:
-
-```toml
-[[rule]]
-toolName = "write_file"
-argsPattern = '"file_path":".*\.env"'
-decision = "deny"
-priority = 100
-denyMessage = "Writing to .env files is not allowed."
-```
-
-For full argument descriptions and types, see the individual tool pages linked
-in the [tables above](#available-tools).
-
 ## Under the hood
 
 For developers, the tool system is designed to be extensible and robust. The

docs/releases.md

@@ -8,7 +8,7 @@
 
 Our release flows support both `dev` and `prod` environments.
 
-The `dev` environment pushes to a private GitHub-hosted NPM repository, with the
+The `dev` environment pushes to a private Github-hosted NPM repository, with the
 package names beginning with `@google-gemini/**` instead of `@google/**`.
 
 The `prod` environment pushes to the public global NPM registry via Wombat
@@ -20,7 +20,7 @@ More information can be found about these systems in the
 
 ### Package scopes
 
-| Package    | `prod` (Wombat Dressing Room) | `dev` (GitHub Private NPM Repo)           |
+| Package    | `prod` (Wombat Dressing Room) | `dev` (Github Private NPM Repo)           |
 | ---------- | ----------------------------- | ----------------------------------------- |
 | CLI        | @google/gemini-cli            | @google-gemini/gemini-cli                 |
 | Core       | @google/gemini-cli-core       | @google-gemini/gemini-cli-core A2A Server |

docs/sidebar.json

@@ -27,7 +27,7 @@
             "slug": "docs/cli/tutorials/file-management"
           },
           {
-            "label": "Get started with Agent Skills",
+            "label": "Get started with Agent skills",
             "slug": "docs/cli/tutorials/skills-getting-started"
           },
           {
@@ -95,29 +95,7 @@
               }
             ]
           },
-          {
-            "label": "Agent Skills",
-            "collapsed": true,
-            "items": [
-              { "label": "Overview", "slug": "docs/cli/skills" },
-              {
-                "label": "Get started with Agent Skills",
-                "slug": "docs/cli/tutorials/skills-getting-started"
-              },
-              {
-                "label": "Creating Agent Skills",
-                "slug": "docs/cli/creating-skills"
-              },
-              {
-                "label": "Using Agent Skills",
-                "slug": "docs/cli/using-agent-skills"
-              },
-              {
-                "label": "Developer guide: Best practices",
-                "slug": "docs/cli/skills-best-practices"
-              }
-            ]
-          },
+          { "label": "Agent Skills", "slug": "docs/cli/skills" },
           {
             "label": "Auto Memory",
             "badge": "🔬",

docs/tools/activate-skill.md

@@ -40,4 +40,4 @@ The agent uses this tool to provide professional-grade assistance:
 ## Next steps
 
 - Learn how to [Use Agent Skills](../cli/skills.md).
-- See the [Build agent skills](../cli/creating-skills.md) guide.
+- See the [Creating Agent Skills](../cli/creating-skills.md) guide.

docs/tools/shell.md

@@ -19,23 +19,6 @@ platforms, they execute with `bash -c`.
 - `is_background` (boolean, optional): Whether to move the process to the
   background immediately after starting.
 
-### Policy engine shorthands
-
-The [policy engine](../reference/policy-engine.md) provides two convenience
-fields for writing rules that target shell commands:
-
-- `commandPrefix`: Matches if the `command` argument starts with a given string.
-- `commandRegex`: Matches if the `command` argument matches a given regular
-  expression.
-
-These are syntactic sugar for combining `toolName = "run_shell_command"` with an
-`argsPattern` in a policy TOML file. They are **not** arguments of
-`run_shell_command` itself.
-
-For details on writing shell-specific policy rules, see
-[Special syntax for `run_shell_command`](../reference/policy-engine.md#special-syntax-for-run_shell_command)
-in the policy engine reference.
-
 ### Return values
 
 The tool returns a JSON object containing:

eslint.config.js

@@ -54,7 +54,6 @@ export default tseslint.config(
     ignores: [
       '**/node_modules/**',
       'eslint.config.js',
-      '**/coverage/**',
       'packages/**/dist/**',
       'bundle/**',
       'package/bundle/**',

evals/file_creation_behavior.eval.ts

@@ -1,132 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, expect } from 'vitest';
-import { evalTest } from './test-helper.js';
-
-describe('file_creation_behavior', () => {
-  evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
-    name: 'should create a new file in the correct directory when asked',
-    files: {
-      'package.json': JSON.stringify({
-        name: 'test-project',
-        version: '1.0.0',
-        type: 'module',
-      }),
-      'src/index.ts': 'console.log("hello");',
-    },
-    prompt:
-      'Please create a new file called src/logger.ts containing a simple logging class. Do not modify any existing files.',
-    assert: async (rig) => {
-      // 1) Verify write_file tool was called
-      const logs = rig.readToolLogs();
-      const writeFileCalls = logs.filter(
-        (log) => log.toolRequest?.name === 'write_file',
-      );
-      expect(
-        writeFileCalls.length,
-        'Expected a write_file call to create the new file',
-      ).toBeGreaterThanOrEqual(1);
-
-      // 2) Verify existing files were not modified
-      const indexContent = rig.readFile('src/index.ts');
-      expect(indexContent).toBe('console.log("hello");');
-
-      const pkgContent = rig.readFile('package.json');
-      expect(JSON.parse(pkgContent).name).toBe('test-project');
-
-      // 3) Verify new file is created
-      const loggerContent = rig.readFile('src/logger.ts');
-      expect(loggerContent.length).toBeGreaterThan(0);
-    },
-  });
-
-  evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
-    name: 'should not overwrite existing file when creating new file with same name',
-    files: {
-      'package.json': JSON.stringify({
-        name: 'test-project',
-        version: '1.0.0',
-        type: 'module',
-      }),
-      'config.json': JSON.stringify({ port: 3000, env: 'production' }),
-    },
-    prompt:
-      "Please create a new configuration file called config.json in the workspace. Ensure the port is set to 8080. Since there's already a config file there, make sure to check it first before making changes.",
-    assert: async (rig) => {
-      // Verify that read_file was called on config.json before write_file
-      const logs = rig.readToolLogs();
-      const targetReadFileIndex = logs.findIndex((log) => {
-        if (log.toolRequest?.name !== 'read_file') return false;
-        try {
-          const args =
-            typeof log.toolRequest.args === 'string'
-              ? JSON.parse(log.toolRequest.args)
-              : log.toolRequest.args;
-          return args.file_path === 'config.json';
-        } catch {
-          return false;
-        }
-      });
-
-      const targetWriteFileIndex = logs.findIndex((log) => {
-        if (log.toolRequest?.name !== 'write_file') return false;
-        try {
-          const args =
-            typeof log.toolRequest.args === 'string'
-              ? JSON.parse(log.toolRequest.args)
-              : log.toolRequest.args;
-          return args.file_path === 'config.json';
-        } catch {
-          return false;
-        }
-      });
-
-      expect(
-        targetReadFileIndex,
-        'Expected read_file to be called to inspect config.json before overwriting it',
-      ).toBeGreaterThanOrEqual(0);
-
-      if (targetWriteFileIndex !== -1) {
-        expect(
-          targetReadFileIndex,
-          'Expected read_file to be invoked before write_file for safety',
-        ).toBeLessThan(targetWriteFileIndex);
-      }
-
-      // Also check the resulting config.json content
-      const configContent = rig.readFile('config.json');
-      expect(configContent).toContain('8080');
-    },
-  });
-
-  evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
-    name: 'should scaffold multiple related files in correct locations',
-    files: {
-      'package.json': JSON.stringify({
-        name: 'test-project',
-        version: '1.0.0',
-        type: 'module',
-      }),
-    },
-    prompt:
-      'Please scaffold auth validation and types by creating two new files: src/auth/validator.ts and src/auth/types.ts with relevant exports. Do not modify existing files.',
-    assert: async (rig) => {
-      // Verify files are created in right place
-      const validatorContent = rig.readFile('src/auth/validator.ts');
-      const typesContent = rig.readFile('src/auth/types.ts');
-
-      expect(validatorContent.length).toBeGreaterThan(0);
-      expect(typesContent.length).toBeGreaterThan(0);
-    },
-  });
-});

evals/gitRepo.eval.ts

@@ -78,37 +78,4 @@ describe('git repo eval', () => {
       expect(commitCalls.length).toBeGreaterThanOrEqual(1);
     },
   });
-
-  /**
-   * Ensures that when the agent is prompted to commit its changes, it does not
-   * use `git add .` or `git add -A`.
-   */
-  evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
-    name: 'should not stage changes via git add . when prompted to commit',
-    prompt:
-      'Make a targeted fix for the bug in index.ts without building, installing anything, or adding tests. Then, stage and commit your changes.',
-    files: FILES,
-    assert: async (rig, _result) => {
-      const toolLogs = rig.readToolLogs();
-      const gitAddAllCalls = toolLogs.filter((log) => {
-        if (log.toolRequest.name !== 'run_shell_command') return false;
-        try {
-          const args = JSON.parse(log.toolRequest.args);
-          if (!args.command) return false;
-          const cmd = args.command.toLowerCase();
-          return (
-            cmd.includes('git add .') ||
-            cmd.includes('git add -a') ||
-            cmd.includes('git add --all')
-          );
-        } catch {
-          return false;
-        }
-      });
-
-      expect(gitAddAllCalls.length).toBe(0);
-    },
-  });
 });

evals/plan_mode.eval.ts

@@ -420,54 +420,4 @@ describe('plan_mode', () => {
       assertModelHasOutput(result);
     },
   });
-
-  evalTest('USUALLY_PASSES', {
-    suiteName: 'plan_mode',
-    suiteType: 'behavioral',
-    name: 'should invoke exit_plan_mode as a tool instead of a shell command',
-    approvalMode: ApprovalMode.PLAN,
-    params: {
-      settings: {
-        general: {
-          plan: { enabled: true },
-        },
-      },
-    },
-    files: {
-      'plans/my-plan.md': '# My Plan\n\n1. Step one',
-    },
-    prompt:
-      'I agree with the plan in plans/my-plan.md. Please exit plan mode and then run `echo "Starting implementation"`',
-    assert: async (rig) => {
-      await rig.waitForTelemetryReady();
-      const toolLogs = rig.readToolLogs();
-
-      // Check if exit_plan_mode was called as a tool
-      const exitPlanToolCall = toolLogs.find(
-        (log) => log.toolRequest.name === 'exit_plan_mode',
-      );
-
-      // Check if exit_plan_mode was called via shell
-      const shellCalls = toolLogs.filter(
-        (log) => log.toolRequest.name === 'run_shell_command',
-      );
-      const exitPlanViaShell = shellCalls.find((log) => {
-        try {
-          const args = JSON.parse(log.toolRequest.args);
-          return args.command.includes('exit_plan_mode');
-        } catch {
-          return false;
-        }
-      });
-
-      expect(
-        exitPlanViaShell,
-        'Should NOT call exit_plan_mode via run_shell_command',
-      ).toBeUndefined();
-      expect(
-        exitPlanToolCall,
-        'Should call exit_plan_mode tool directly',
-      ).toBeDefined();
-    },
-  });
 });

packages/cli/src/acp/README.md

@@ -1,81 +0,0 @@
-# Agent Client Protocol (ACP) Implementation
-
-This directory contains the implementation of the Agent Client Protocol (ACP)
-for the Gemini CLI. The ACP allows external clients (like IDE extensions) to
-communicate with the Gemini CLI agent over a structured JSON-RPC based protocol.
-
-## Directory Structure
-
-Following Phase 1 of the modularization refactor, the ACP client is organized
-into the following specialized modules, all sharing the `acp` prefix for
-consistency:
-
-- **[acpStdioTransport.ts](./acpStdioTransport.ts)**: Handles raw I/O. It sets
-  up the Web streams for standard input/output and creates the
-  `AgentSideConnection` using line-delimited JSON (ndjson).
-- **[acpRpcDispatcher.ts](./acpRpcDispatcher.ts)**: Contains the `GeminiAgent`
-  class. This is the main entry point for incoming JSON-RPC messages. It
-  implements the protocol methods and delegates session-specific work to the
-  manager and individual sessions.
-- **[acpSessionManager.ts](./acpSessionManager.ts)**: Manages multi-session
-  state. It handles session creation (`newSession`), loading (`loadSession`),
-  and configuration, isolating session state from the RPC routing.
-- **[acpSession.ts](./acpSession.ts)**: Manages individual active chat sessions.
-  It handles prompt execution, `@path` file resolution, tool execution, command
-  interception, and streaming updates back to the client.
-- **[acpUtils.ts](./acpUtils.ts)**: Contains shared helper functions, type
-  mappers (e.g., mapping internal tool kinds to ACP kinds), and Zod schemas used
-  across the modules.
-- **[acpErrors.ts](./acpErrors.ts)**: Centralized error handling and mapping to
-  ACP-compliant error codes.
-- **[acpCommandHandler.ts](./acpCommandHandler.ts)**: Handles interception and
-  execution of slash commands (e.g., `/memory`, `/init`) sent via ACP prompts.
-- **[acpFileSystemService.ts](./acpFileSystemService.ts)**: Provides access to
-  the file system restricted by the workspace boundaries and permissions.
-
-## Development Instructions
-
-### Running Tests
-
-Tests are co-located with the source files:
-
-- `acpRpcDispatcher.test.ts`: Tests for initialization, authentication, and
-  handler delegation.
-- `acpSessionManager.test.ts`: Tests for session lifecycle and configuration.
-- `acpSession.test.ts`: Tests for prompt loops, tool execution, and @path
-  resolution.
-- `acpResume.test.ts`: Integration tests for loading/resuming sessions.
-
-To run specific tests, use Vitest with the workspace filter:
-
-```bash
-# General pattern
-npm test -w @google/gemini-cli -- src/acp/<test-file-name>.ts
-
-# Example
-npm test -w @google/gemini-cli -- src/acp/acpRpcDispatcher.test.ts
-```
-
-Note: You may need to ensure your environment has Node available. If running in
-a restricted environment, try sourcing NVM first:
-
-```bash
-source ~/.nvm/nvm.sh && nvm use default && npm test -w @google/gemini-cli -- src/acp/acpSession.test.ts
-```
-
-### Adding New Features
-
-- **New RPC Method**: Add the method to `GeminiAgent` in `acpRpcDispatcher.ts`
-  and register it in the `AgentSideConnection` setup if necessary.
-- **Session State**: If a feature requires storing state across turns within a
-  session, add it to the `Session` class in `acpSession.ts`.
-- **Protocol Helpers**: Add any new mapping or serialization logic to
-  `acpUtils.ts`.
-
-### Coding Conventions
-
-- **Imports**: Use specific imports and do not import across package boundaries
-  using relative paths.
-- **License Headers**: All new files must include the Apache-2.0 license header.
-- **Type Safety**: Avoid using `any` assertions. Use Zod schemas to validate
-  untrusted input from the protocol.

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

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2026 Google LLC
+ * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 

packages/cli/src/acp/acpErrors.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2026 Google LLC
+ * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 

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

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2026 Google LLC
+ * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -13,7 +13,7 @@ import {
   type Mocked,
   type Mock,
 } from 'vitest';
-import { GeminiAgent } from './acpRpcDispatcher.js';
+import { GeminiAgent } from './acpClient.js';
 import * as acp from '@agentclientprotocol/sdk';
 import {
   ApprovalMode,
@@ -28,7 +28,6 @@ import {
 } from '../utils/sessionUtils.js';
 import { convertSessionToClientHistory } from '@google/gemini-cli-core';
 import type { LoadedSettings } from '../config/settings.js';
-import { waitFor } from '../test-utils/async.js';
 
 vi.mock('../config/config.js', () => ({
   loadCliConfig: vi.fn(),
@@ -107,9 +106,6 @@ describe('GeminiAgent Session Resume', () => {
       getHasAccessToPreviewModel: vi.fn().mockReturnValue(false),
       getGemini31LaunchedSync: vi.fn().mockReturnValue(false),
       getCheckpointingEnabled: vi.fn().mockReturnValue(false),
-      toolRegistry: {
-        getTool: vi.fn().mockReturnValue({ kind: 'read' }),
-      },
       get config() {
         return this;
       },
@@ -174,6 +170,11 @@ describe('GeminiAgent Session Resume', () => {
       ],
     };
 
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    (mockConfig as any).toolRegistry = {
+      getTool: vi.fn().mockReturnValue({ kind: 'read' }),
+    };
+
     (SessionSelector as unknown as Mock).mockImplementation(() => ({
       resolveSession: vi.fn().mockResolvedValue({
         sessionData,
@@ -239,7 +240,7 @@ describe('GeminiAgent Session Resume', () => {
       }),
     );
 
-    await waitFor(() => {
+    await vi.waitFor(() => {
       // User message
       expect(mockConnection.sessionUpdate).toHaveBeenCalledWith(
         expect.objectContaining({

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

@@ -1,338 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  type Mock,
-  type Mocked,
-} from 'vitest';
-import { GeminiAgent } from './acpRpcDispatcher.js';
-import * as acp from '@agentclientprotocol/sdk';
-import {
-  AuthType,
-  type Config,
-  type MessageBus,
-  type Storage,
-} from '@google/gemini-cli-core';
-import type { LoadedSettings } from '../config/settings.js';
-import { loadCliConfig, type CliArgs } from '../config/config.js';
-import { loadSettings, SettingScope } from '../config/settings.js';
-
-vi.mock('../config/config.js', () => ({
-  loadCliConfig: vi.fn(),
-}));
-
-vi.mock('../config/settings.js', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../config/settings.js')>();
-  return {
-    ...actual,
-    loadSettings: vi.fn(),
-  };
-});
-
-describe('GeminiAgent - RPC Dispatcher', () => {
-  let mockConfig: Mocked<Config>;
-  let mockSettings: Mocked<LoadedSettings>;
-  let mockArgv: CliArgs;
-  let mockConnection: Mocked<acp.AgentSideConnection>;
-  let agent: GeminiAgent;
-
-  beforeEach(() => {
-    mockConfig = {
-      refreshAuth: vi.fn(),
-      initialize: vi.fn(),
-      waitForMcpInit: vi.fn(),
-      getFileSystemService: vi.fn(),
-      setFileSystemService: vi.fn(),
-      getContentGeneratorConfig: vi.fn(),
-      getActiveModel: vi.fn().mockReturnValue('gemini-pro'),
-      getModel: vi.fn().mockReturnValue('gemini-pro'),
-      getGeminiClient: vi.fn().mockReturnValue({
-        startChat: vi.fn().mockResolvedValue({}),
-      }),
-      getMessageBus: vi.fn().mockReturnValue({
-        publish: vi.fn(),
-        subscribe: vi.fn(),
-        unsubscribe: vi.fn(),
-      }),
-      getApprovalMode: vi.fn().mockReturnValue('default'),
-      isPlanEnabled: vi.fn().mockReturnValue(true),
-      getGemini31LaunchedSync: vi.fn().mockReturnValue(false),
-      getHasAccessToPreviewModel: vi.fn().mockReturnValue(false),
-      getCheckpointingEnabled: vi.fn().mockReturnValue(false),
-      getDisableAlwaysAllow: vi.fn().mockReturnValue(false),
-      validatePathAccess: vi.fn().mockReturnValue(null),
-      getWorkspaceContext: vi.fn().mockReturnValue({
-        addReadOnlyPath: vi.fn(),
-      }),
-      getPolicyEngine: vi.fn().mockReturnValue({
-        addRule: vi.fn(),
-      }),
-      messageBus: {
-        publish: vi.fn(),
-        subscribe: vi.fn(),
-        unsubscribe: vi.fn(),
-      } as unknown as MessageBus,
-      storage: {
-        getWorkspaceAutoSavedPolicyPath: vi.fn(),
-        getAutoSavedPolicyPath: vi.fn(),
-      } as unknown as Storage,
-
-      get config() {
-        return this;
-      },
-    } as unknown as Mocked<Config>;
-    mockSettings = {
-      merged: {
-        security: { auth: { selectedType: 'login_with_google' } },
-        mcpServers: {},
-      },
-      setValue: vi.fn(),
-    } as unknown as Mocked<LoadedSettings>;
-    mockArgv = {} as unknown as CliArgs;
-    mockConnection = {
-      sessionUpdate: vi.fn(),
-      requestPermission: vi.fn(),
-    } as unknown as Mocked<acp.AgentSideConnection>;
-
-    (loadCliConfig as unknown as Mock).mockResolvedValue(mockConfig);
-    (loadSettings as unknown as Mock).mockImplementation(() => ({
-      merged: {
-        security: {
-          auth: { selectedType: AuthType.LOGIN_WITH_GOOGLE },
-          enablePermanentToolApproval: true,
-        },
-        mcpServers: {},
-      },
-      setValue: vi.fn(),
-    }));
-
-    agent = new GeminiAgent(mockConfig, mockSettings, mockArgv, mockConnection);
-  });
-
-  it('should initialize correctly', async () => {
-    const response = await agent.initialize({
-      clientCapabilities: { fs: { readTextFile: true, writeTextFile: true } },
-      protocolVersion: 1,
-    });
-
-    expect(response.protocolVersion).toBe(acp.PROTOCOL_VERSION);
-    expect(response.authMethods).toHaveLength(4);
-    const gatewayAuth = response.authMethods?.find(
-      (m) => m.id === AuthType.GATEWAY,
-    );
-    expect(gatewayAuth?._meta).toEqual({
-      gateway: {
-        protocol: 'google',
-        restartRequired: 'false',
-      },
-    });
-    const geminiAuth = response.authMethods?.find(
-      (m) => m.id === AuthType.USE_GEMINI,
-    );
-    expect(geminiAuth?._meta).toEqual({
-      'api-key': {
-        provider: 'google',
-      },
-    });
-    expect(response.agentCapabilities?.loadSession).toBe(true);
-  });
-
-  it('should authenticate correctly', async () => {
-    await agent.authenticate({
-      methodId: AuthType.LOGIN_WITH_GOOGLE,
-    });
-
-    expect(mockConfig.refreshAuth).toHaveBeenCalledWith(
-      AuthType.LOGIN_WITH_GOOGLE,
-      undefined,
-      undefined,
-      undefined,
-    );
-    expect(mockSettings.setValue).toHaveBeenCalledWith(
-      SettingScope.User,
-      'security.auth.selectedType',
-      AuthType.LOGIN_WITH_GOOGLE,
-    );
-  });
-
-  it('should authenticate correctly with api-key in _meta', async () => {
-    await agent.authenticate({
-      methodId: AuthType.USE_GEMINI,
-      _meta: {
-        'api-key': 'test-api-key',
-      },
-    } as unknown as acp.AuthenticateRequest);
-
-    expect(mockConfig.refreshAuth).toHaveBeenCalledWith(
-      AuthType.USE_GEMINI,
-      'test-api-key',
-      undefined,
-      undefined,
-    );
-    expect(mockSettings.setValue).toHaveBeenCalledWith(
-      SettingScope.User,
-      'security.auth.selectedType',
-      AuthType.USE_GEMINI,
-    );
-  });
-
-  it('should authenticate correctly with gateway method', async () => {
-    await agent.authenticate({
-      methodId: AuthType.GATEWAY,
-      _meta: {
-        gateway: {
-          baseUrl: 'https://example.com',
-          headers: { Authorization: 'Bearer token' },
-        },
-      },
-    } as unknown as acp.AuthenticateRequest);
-
-    expect(mockConfig.refreshAuth).toHaveBeenCalledWith(
-      AuthType.GATEWAY,
-      undefined,
-      'https://example.com',
-      { Authorization: 'Bearer token' },
-    );
-    expect(mockSettings.setValue).toHaveBeenCalledWith(
-      SettingScope.User,
-      'security.auth.selectedType',
-      AuthType.GATEWAY,
-    );
-  });
-
-  it('should throw acp.RequestError when gateway payload is malformed', async () => {
-    await expect(
-      agent.authenticate({
-        methodId: AuthType.GATEWAY,
-        _meta: {
-          gateway: {
-            baseUrl: 123,
-            headers: { Authorization: 'Bearer token' },
-          },
-        },
-      } as unknown as acp.AuthenticateRequest),
-    ).rejects.toThrow(/Malformed gateway payload/);
-  });
-
-  it('should cancel a session', async () => {
-    const mockSession = {
-      cancelPendingPrompt: vi.fn(),
-    };
-    (
-      agent as unknown as { sessionManager: { getSession: Mock } }
-    ).sessionManager = {
-      getSession: vi.fn().mockReturnValue(mockSession),
-    };
-
-    await agent.cancel({ sessionId: 'test-session-id' });
-
-    expect(mockSession.cancelPendingPrompt).toHaveBeenCalled();
-  });
-
-  it('should throw error when cancelling non-existent session', async () => {
-    (
-      agent as unknown as { sessionManager: { getSession: Mock } }
-    ).sessionManager = {
-      getSession: vi.fn().mockReturnValue(undefined),
-    };
-
-    await expect(agent.cancel({ sessionId: 'unknown' })).rejects.toThrow(
-      'Session not found',
-    );
-  });
-
-  it('should delegate prompt to session', async () => {
-    const mockSession = {
-      prompt: vi.fn().mockResolvedValue({ stopReason: 'end_turn' }),
-    };
-    (
-      agent as unknown as { sessionManager: { getSession: Mock } }
-    ).sessionManager = {
-      getSession: vi.fn().mockReturnValue(mockSession),
-    };
-
-    const result = await agent.prompt({
-      sessionId: 'test-session-id',
-      prompt: [],
-    });
-
-    expect(mockSession.prompt).toHaveBeenCalled();
-    expect(result).toMatchObject({ stopReason: 'end_turn' });
-  });
-
-  it('should delegate setMode to session', async () => {
-    const mockSession = {
-      setMode: vi.fn().mockReturnValue({}),
-    };
-    (
-      agent as unknown as { sessionManager: { getSession: Mock } }
-    ).sessionManager = {
-      getSession: vi.fn().mockReturnValue(mockSession),
-    };
-
-    const result = await agent.setSessionMode({
-      sessionId: 'test-session-id',
-      modeId: 'plan',
-    });
-
-    expect(mockSession.setMode).toHaveBeenCalledWith('plan');
-    expect(result).toEqual({});
-  });
-
-  it('should throw error when setting mode on non-existent session', async () => {
-    (
-      agent as unknown as { sessionManager: { getSession: Mock } }
-    ).sessionManager = {
-      getSession: vi.fn().mockReturnValue(undefined),
-    };
-
-    await expect(
-      agent.setSessionMode({
-        sessionId: 'unknown',
-        modeId: 'plan',
-      }),
-    ).rejects.toThrow('Session not found: unknown');
-  });
-
-  it('should delegate setModel to session (unstable)', async () => {
-    const mockSession = {
-      setModel: vi.fn().mockReturnValue({}),
-    };
-    (
-      agent as unknown as { sessionManager: { getSession: Mock } }
-    ).sessionManager = {
-      getSession: vi.fn().mockReturnValue(mockSession),
-    };
-
-    const result = await agent.unstable_setSessionModel({
-      sessionId: 'test-session-id',
-      modelId: 'gemini-2.0-pro-exp',
-    });
-
-    expect(mockSession.setModel).toHaveBeenCalledWith('gemini-2.0-pro-exp');
-    expect(result).toEqual({});
-  });
-
-  it('should throw error when setting model on non-existent session (unstable)', async () => {
-    (
-      agent as unknown as { sessionManager: { getSession: Mock } }
-    ).sessionManager = {
-      getSession: vi.fn().mockReturnValue(undefined),
-    };
-
-    await expect(
-      agent.unstable_setSessionModel({
-        sessionId: 'unknown',
-        modelId: 'gemini-2.0-pro-exp',
-      }),
-    ).rejects.toThrow('Session not found: unknown');
-  });
-});

packages/cli/src/acp/acpRpcDispatcher.ts

@@ -1,236 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import {
-  type AgentLoopContext,
-  AuthType,
-  clearCachedCredentialFile,
-  getVersion,
-} from '@google/gemini-cli-core';
-import * as acp from '@agentclientprotocol/sdk';
-import { z } from 'zod';
-import { SettingScope, type LoadedSettings } from '../config/settings.js';
-import type { CliArgs } from '../config/config.js';
-import { getAcpErrorMessage } from './acpErrors.js';
-import { AcpSessionManager, type AuthDetails } from './acpSessionManager.js';
-import { hasMeta } from './acpUtils.js';
-
-export class GeminiAgent {
-  private apiKey: string | undefined;
-  private baseUrl: string | undefined;
-  private customHeaders: Record<string, string> | undefined;
-  private sessionManager: AcpSessionManager;
-
-  constructor(
-    private context: AgentLoopContext,
-    private settings: LoadedSettings,
-    argv: CliArgs,
-    connection: acp.AgentSideConnection,
-  ) {
-    this.sessionManager = new AcpSessionManager(settings, argv, connection);
-  }
-
-  dispose(): void {
-    this.sessionManager.dispose();
-  }
-
-  async initialize(
-    args: acp.InitializeRequest,
-  ): Promise<acp.InitializeResponse> {
-    if (args.clientCapabilities) {
-      this.sessionManager.setClientCapabilities(args.clientCapabilities);
-    }
-
-    const authMethods = [
-      {
-        id: AuthType.LOGIN_WITH_GOOGLE,
-        name: 'Log in with Google',
-        description: 'Log in with your Google account',
-      },
-      {
-        id: AuthType.USE_GEMINI,
-        name: 'Gemini API key',
-        description: 'Use an API key with Gemini Developer API',
-        _meta: {
-          'api-key': {
-            provider: 'google',
-          },
-        },
-      },
-      {
-        id: AuthType.USE_VERTEX_AI,
-        name: 'Vertex AI',
-        description: 'Use an API key with Vertex AI GenAI API',
-      },
-      {
-        id: AuthType.GATEWAY,
-        name: 'AI API Gateway',
-        description: 'Use a custom AI API Gateway',
-        _meta: {
-          gateway: {
-            protocol: 'google',
-            restartRequired: 'false',
-          },
-        },
-      },
-    ];
-
-    await this.context.config.initialize();
-    const version = await getVersion();
-    return {
-      protocolVersion: acp.PROTOCOL_VERSION,
-      authMethods,
-      agentInfo: {
-        name: 'gemini-cli',
-        title: 'Gemini CLI',
-        version,
-      },
-      agentCapabilities: {
-        loadSession: true,
-        promptCapabilities: {
-          image: true,
-          audio: true,
-          embeddedContext: true,
-        },
-        mcpCapabilities: {
-          http: true,
-          sse: true,
-        },
-      },
-    };
-  }
-
-  async authenticate(req: acp.AuthenticateRequest): Promise<void> {
-    const { methodId } = req;
-    const method = z.nativeEnum(AuthType).parse(methodId);
-    const selectedAuthType = this.settings.merged.security.auth.selectedType;
-
-    // Only clear credentials when switching to a different auth method
-    if (selectedAuthType && selectedAuthType !== method) {
-      await clearCachedCredentialFile();
-    }
-    // Check for api-key in _meta
-    const meta = hasMeta(req) ? req._meta : undefined;
-    const apiKey =
-      typeof meta?.['api-key'] === 'string' ? meta['api-key'] : undefined;
-
-    // Refresh auth with the requested method
-    // This will reuse existing credentials if they're valid,
-    // or perform new authentication if needed
-    try {
-      if (apiKey) {
-        this.apiKey = apiKey;
-      }
-
-      // Extract gateway details if present
-      const gatewaySchema = z.object({
-        baseUrl: z.string().optional(),
-        headers: z.record(z.string()).optional(),
-      });
-
-      let baseUrl: string | undefined;
-      let headers: Record<string, string> | undefined;
-
-      if (meta?.['gateway']) {
-        const result = gatewaySchema.safeParse(meta['gateway']);
-        if (result.success) {
-          baseUrl = result.data.baseUrl;
-          headers = result.data.headers;
-        } else {
-          throw new acp.RequestError(
-            -32602,
-            `Malformed gateway payload: ${result.error.message}`,
-          );
-        }
-      }
-
-      this.baseUrl = baseUrl;
-      this.customHeaders = headers;
-
-      await this.context.config.refreshAuth(
-        method,
-        apiKey ?? this.apiKey,
-        baseUrl,
-        headers,
-      );
-    } catch (e) {
-      throw new acp.RequestError(-32000, getAcpErrorMessage(e));
-    }
-    this.settings.setValue(
-      SettingScope.User,
-      'security.auth.selectedType',
-      method,
-    );
-  }
-
-  private getAuthDetails(): AuthDetails {
-    return {
-      apiKey: this.apiKey,
-      baseUrl: this.baseUrl,
-      customHeaders: this.customHeaders,
-    };
-  }
-
-  async newSession(
-    params: acp.NewSessionRequest,
-  ): Promise<acp.NewSessionResponse> {
-    return this.sessionManager.newSession(params, this.getAuthDetails());
-  }
-
-  async loadSession(
-    params: acp.LoadSessionRequest,
-  ): Promise<acp.LoadSessionResponse> {
-    return this.sessionManager.loadSession(params, this.getAuthDetails());
-  }
-
-  async cancel(params: acp.CancelNotification): Promise<void> {
-    const session = this.sessionManager.getSession(params.sessionId);
-    if (!session) {
-      throw new acp.RequestError(
-        -32602,
-        `Session not found: ${params.sessionId}`,
-      );
-    }
-    await session.cancelPendingPrompt();
-  }
-
-  async prompt(params: acp.PromptRequest): Promise<acp.PromptResponse> {
-    const session = this.sessionManager.getSession(params.sessionId);
-    if (!session) {
-      throw new acp.RequestError(
-        -32602,
-        `Session not found: ${params.sessionId}`,
-      );
-    }
-    return session.prompt(params);
-  }
-
-  async setSessionMode(
-    params: acp.SetSessionModeRequest,
-  ): Promise<acp.SetSessionModeResponse> {
-    const session = this.sessionManager.getSession(params.sessionId);
-    if (!session) {
-      throw new acp.RequestError(
-        -32602,
-        `Session not found: ${params.sessionId}`,
-      );
-    }
-    return session.setMode(params.modeId);
-  }
-
-  async unstable_setSessionModel(
-    params: acp.SetSessionModelRequest,
-  ): Promise<acp.SetSessionModelResponse> {
-    const session = this.sessionManager.getSession(params.sessionId);
-    if (!session) {
-      throw new acp.RequestError(
-        -32602,
-        `Session not found: ${params.sessionId}`,
-      );
-    }
-    return session.setModel(params.modelId);
-  }
-}

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

@@ -1,589 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  afterEach,
-  type Mock,
-  type Mocked,
-  type MockInstance,
-} from 'vitest';
-import { Session } from './acpSession.js';
-import type * as acp from '@agentclientprotocol/sdk';
-import {
-  ReadManyFilesTool,
-  type GeminiChat,
-  type Config,
-  type MessageBus,
-  type GitService,
-  InvalidStreamError,
-  GeminiEventType,
-  type ServerGeminiStreamEvent,
-} from '@google/gemini-cli-core';
-import type { LoadedSettings } from '../config/settings.js';
-import { type Part, FinishReason } from '@google/genai';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import type { CommandHandler } from './acpCommandHandler.js';
-
-vi.mock('node:fs/promises');
-vi.mock('node:path', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('node:path')>();
-  return {
-    ...actual,
-    resolve: vi.fn(),
-  };
-});
-
-vi.mock(
-  '@google/gemini-cli-core',
-  async (
-    importOriginal: () => Promise<typeof import('@google/gemini-cli-core')>,
-  ) => {
-    const actual = await importOriginal();
-    return {
-      ...actual,
-      updatePolicy: vi.fn(),
-      ReadManyFilesTool: vi.fn(),
-      logToolCall: vi.fn(),
-      processSingleFileContent: vi.fn(),
-    };
-  },
-);
-
-async function* createMockStream(
-  items: readonly ServerGeminiStreamEvent[],
-): AsyncGenerator<ServerGeminiStreamEvent> {
-  for (const item of items) {
-    yield item;
-  }
-
-  yield {
-    type: GeminiEventType.Finished,
-    value: {
-      reason: FinishReason.STOP,
-      usageMetadata: {
-        promptTokenCount: 5,
-        candidatesTokenCount: 10,
-      },
-    },
-  };
-}
-
-describe('Session', () => {
-  let mockChat: Mocked<GeminiChat>;
-  let mockConfig: Mocked<Config>;
-  let mockConnection: Mocked<acp.AgentSideConnection>;
-  let session: Session;
-  let mockToolRegistry: { getTool: Mock };
-  let mockTool: { kind: string; build: Mock };
-  let mockMessageBus: Mocked<MessageBus>;
-  let mockSendMessageStream: MockInstance<
-    (
-      request: Part[],
-      signal: AbortSignal,
-      promptId: string,
-    ) => AsyncGenerator<ServerGeminiStreamEvent>
-  >;
-
-  beforeEach(() => {
-    mockChat = {
-      sendMessageStream: vi.fn(),
-      addHistory: vi.fn(),
-      recordCompletedToolCalls: vi.fn(),
-      getHistory: vi.fn().mockReturnValue([]),
-    } as unknown as Mocked<GeminiChat>;
-    mockTool = {
-      kind: 'read',
-      build: vi.fn().mockReturnValue({
-        getDescription: () => 'Test Tool',
-        toolLocations: () => [],
-        shouldConfirmExecute: vi.fn().mockResolvedValue(null),
-        execute: vi.fn().mockResolvedValue({ llmContent: 'Tool Result' }),
-      }),
-    };
-    mockToolRegistry = {
-      getTool: vi.fn().mockReturnValue(mockTool),
-    };
-    mockMessageBus = {
-      publish: vi.fn(),
-      subscribe: vi.fn(),
-      unsubscribe: vi.fn(),
-    } as unknown as Mocked<MessageBus>;
-    mockSendMessageStream = vi.fn();
-    mockConfig = {
-      getModel: vi.fn().mockReturnValue('gemini-pro'),
-      getActiveModel: vi.fn().mockReturnValue('gemini-pro'),
-      getModelRouterService: vi.fn().mockReturnValue({
-        route: vi.fn().mockResolvedValue({ model: 'resolved-model' }),
-      }),
-      getToolRegistry: vi.fn().mockReturnValue(mockToolRegistry),
-      getFileService: vi.fn().mockReturnValue({
-        shouldIgnoreFile: vi.fn().mockReturnValue(false),
-      }),
-      getFileFilteringOptions: vi.fn().mockReturnValue({}),
-      getFileSystemService: vi.fn().mockReturnValue({}),
-      getTargetDir: vi.fn().mockReturnValue('/tmp'),
-      getEnableRecursiveFileSearch: vi.fn().mockReturnValue(false),
-      getDebugMode: vi.fn().mockReturnValue(false),
-      getMessageBus: vi.fn().mockReturnValue(mockMessageBus),
-      setApprovalMode: vi.fn(),
-      setModel: vi.fn(),
-      isPlanEnabled: vi.fn().mockReturnValue(true),
-      getCheckpointingEnabled: vi.fn().mockReturnValue(false),
-      getGitService: vi.fn().mockResolvedValue({} as GitService),
-      validatePathAccess: vi.fn().mockReturnValue(null),
-      getWorkspaceContext: vi.fn().mockReturnValue({
-        addReadOnlyPath: vi.fn(),
-      }),
-      waitForMcpInit: vi.fn(),
-      getDisableAlwaysAllow: vi.fn().mockReturnValue(false),
-      getMaxSessionTurns: vi.fn().mockReturnValue(-1),
-      geminiClient: {
-        sendMessageStream: mockSendMessageStream,
-        getChat: vi.fn().mockReturnValue(mockChat),
-      },
-      get config() {
-        return this;
-      },
-      get toolRegistry() {
-        return mockToolRegistry;
-      },
-    } as unknown as Mocked<Config>;
-    mockConnection = {
-      sessionUpdate: vi.fn(),
-      requestPermission: vi.fn(),
-    } as unknown as Mocked<acp.AgentSideConnection>;
-
-    session = new Session('session-1', mockChat, mockConfig, mockConnection, {
-      merged: {
-        security: { enablePermanentToolApproval: true },
-        mcpServers: {},
-      },
-      errors: [],
-    } as unknown as LoadedSettings);
-
-    (ReadManyFilesTool as unknown as Mock).mockImplementation(() => ({
-      name: 'read_many_files',
-      kind: 'read',
-      build: vi.fn().mockReturnValue({
-        getDescription: () => 'Read files',
-        toolLocations: () => [],
-        execute: vi.fn().mockResolvedValue({
-          llmContent: ['--- file.txt ---\n\nFile content\n\n'],
-        }),
-      }),
-    }));
-  });
-
-  afterEach(() => {
-    vi.restoreAllMocks();
-  });
-
-  it('should send available commands', async () => {
-    await session.sendAvailableCommands();
-
-    expect(mockConnection.sessionUpdate).toHaveBeenCalledWith(
-      expect.objectContaining({
-        update: expect.objectContaining({
-          sessionUpdate: 'available_commands_update',
-        }),
-      }),
-    );
-  });
-
-  it('should await MCP initialization before processing a prompt', async () => {
-    const stream = createMockStream([
-      {
-        type: GeminiEventType.Content,
-        value: 'Hi',
-      },
-    ]);
-    mockSendMessageStream.mockReturnValue(stream);
-
-    await session.prompt({
-      sessionId: 'session-1',
-      prompt: [{ type: 'text', text: 'test' }],
-    });
-
-    expect(mockConfig.waitForMcpInit).toHaveBeenCalledOnce();
-  });
-
-  it('should handle prompt with text response', async () => {
-    const stream = createMockStream([
-      {
-        type: GeminiEventType.Content,
-        value: 'Hello',
-      },
-    ]);
-    mockSendMessageStream.mockReturnValue(stream);
-
-    const result = await session.prompt({
-      sessionId: 'session-1',
-      prompt: [{ type: 'text', text: 'Hi' }],
-    });
-
-    expect(mockSendMessageStream).toHaveBeenCalled();
-    expect(mockConnection.sessionUpdate).toHaveBeenCalledWith({
-      sessionId: 'session-1',
-      update: {
-        sessionUpdate: 'agent_message_chunk',
-        content: { type: 'text', text: 'Hello' },
-      },
-    });
-    expect(result).toMatchObject({ stopReason: 'end_turn' });
-  });
-
-  it('should pass current session information directly onto geminiClient.sendMessageStream', async () => {
-    const stream = createMockStream([
-      {
-        type: GeminiEventType.Content,
-        value: 'Hello',
-      },
-    ]);
-    mockSendMessageStream.mockReturnValue(stream);
-
-    await session.prompt({
-      sessionId: 'session-1',
-      prompt: [{ type: 'text', text: 'Hi' }],
-    });
-
-    expect(mockSendMessageStream).toHaveBeenCalledWith(
-      expect.arrayContaining([{ text: 'Hi' }]),
-      expect.any(AbortSignal),
-      expect.any(String),
-    );
-  });
-
-  it('should handle prompt with empty response (InvalidStreamError)', async () => {
-    const error = new InvalidStreamError('Empty response', 'NO_RESPONSE_TEXT');
-    mockSendMessageStream.mockImplementation(() => {
-      async function* errorGen(): AsyncGenerator<
-        ServerGeminiStreamEvent,
-        void,
-        unknown
-      > {
-        yield* [];
-        throw error;
-      }
-      return errorGen();
-    });
-
-    const result = await session.prompt({
-      sessionId: 'session-1',
-      prompt: [{ type: 'text', text: 'Hi' }],
-    });
-
-    expect(result).toMatchObject({ stopReason: 'end_turn' });
-  });
-
-  it('should handle prompt with no finish reason (InvalidStreamError)', async () => {
-    const error = new InvalidStreamError(
-      'No finish reason',
-      'NO_FINISH_REASON',
-    );
-    mockSendMessageStream.mockImplementation(() => {
-      async function* errorGen(): AsyncGenerator<
-        ServerGeminiStreamEvent,
-        void,
-        unknown
-      > {
-        yield* [];
-        throw error;
-      }
-      return errorGen();
-    });
-
-    const result = await session.prompt({
-      sessionId: 'session-1',
-      prompt: [{ type: 'text', text: 'Hi' }],
-    });
-
-    expect(result).toMatchObject({ stopReason: 'end_turn' });
-  });
-
-  it('should handle /memory command', async () => {
-    const handleCommandSpy = vi
-      .spyOn(
-        (session as unknown as { commandHandler: CommandHandler })
-          .commandHandler,
-        'handleCommand',
-      )
-      .mockResolvedValue(true);
-
-    const result = await session.prompt({
-      sessionId: 'session-1',
-      prompt: [{ type: 'text', text: '/memory view' }],
-    });
-
-    expect(result).toMatchObject({ stopReason: 'end_turn' });
-    expect(handleCommandSpy).toHaveBeenCalledWith(
-      '/memory view',
-      expect.any(Object),
-    );
-  });
-
-  it('should handle tool calls', async () => {
-    const stream1 = createMockStream([
-      {
-        type: GeminiEventType.ToolCallRequest,
-        value: {
-          callId: 'call-1',
-          name: 'test_tool',
-          args: { foo: 'bar' },
-          isClientInitiated: false,
-          prompt_id: 'prompt-1',
-        },
-      },
-    ]);
-    const stream2 = createMockStream([
-      {
-        type: GeminiEventType.Content,
-        value: 'Result',
-      },
-    ]);
-
-    mockSendMessageStream
-      .mockReturnValueOnce(stream1)
-      .mockReturnValueOnce(stream2);
-
-    const result = await session.prompt({
-      sessionId: 'session-1',
-      prompt: [{ type: 'text', text: 'Call tool' }],
-    });
-
-    expect(mockToolRegistry.getTool).toHaveBeenCalledWith('test_tool');
-    expect(result).toMatchObject({ stopReason: 'end_turn' });
-  });
-
-  it('should handle tool call permission request', async () => {
-    const confirmationDetails = {
-      type: 'info',
-      onConfirm: vi.fn(),
-    };
-    mockTool.build.mockReturnValue({
-      getDescription: () => 'Test Tool',
-      toolLocations: () => [],
-      shouldConfirmExecute: vi.fn().mockResolvedValue(confirmationDetails),
-      execute: vi.fn().mockResolvedValue({ llmContent: 'Tool Result' }),
-    });
-
-    mockConnection.requestPermission.mockResolvedValue({
-      outcome: {
-        outcome: 'selected',
-        optionId: 'proceed_once',
-      },
-    });
-
-    const stream1 = createMockStream([
-      {
-        type: GeminiEventType.ToolCallRequest,
-        value: {
-          callId: 'call-1',
-          name: 'test_tool',
-          args: {},
-          isClientInitiated: false,
-          prompt_id: 'prompt-1',
-        },
-      },
-    ]);
-    const stream2 = createMockStream([
-      {
-        type: GeminiEventType.Content,
-        value: '',
-      },
-    ]);
-
-    mockSendMessageStream
-      .mockReturnValueOnce(stream1)
-      .mockReturnValueOnce(stream2);
-
-    await session.prompt({
-      sessionId: 'session-1',
-      prompt: [{ type: 'text', text: 'Call tool' }],
-    });
-
-    expect(mockConnection.requestPermission).toHaveBeenCalled();
-    expect(confirmationDetails.onConfirm).toHaveBeenCalled();
-  });
-
-  it('should handle @path resolution', async () => {
-    (path.resolve as unknown as Mock).mockReturnValue('/tmp/file.txt');
-    (fs.stat as unknown as Mock).mockResolvedValue({
-      isDirectory: () => false,
-    });
-
-    const stream = createMockStream([
-      {
-        type: GeminiEventType.Content,
-        value: '',
-      },
-    ]);
-    mockSendMessageStream.mockReturnValue(stream);
-
-    await session.prompt({
-      sessionId: 'session-1',
-      prompt: [
-        { type: 'text', text: 'Read' },
-        {
-          type: 'resource_link',
-          uri: 'file://file.txt',
-          mimeType: 'text/plain',
-          name: 'file.txt',
-        },
-      ],
-    });
-
-    expect(path.resolve).toHaveBeenCalled();
-    expect(fs.stat).toHaveBeenCalled();
-    expect(mockSendMessageStream).toHaveBeenCalledWith(
-      expect.arrayContaining([
-        expect.objectContaining({
-          text: expect.stringContaining('Content from @file.txt'),
-        }),
-      ]),
-      expect.any(AbortSignal),
-      expect.any(String),
-    );
-  });
-
-  it('should handle rate limit error', async () => {
-    const error = new Error('Rate limit');
-    const customError = error as { status?: number; message?: string };
-    customError.status = 429;
-
-    mockSendMessageStream.mockImplementation(() => {
-      async function* errorGen(): AsyncGenerator<
-        ServerGeminiStreamEvent,
-        void,
-        unknown
-      > {
-        yield* [];
-        throw customError;
-      }
-      return errorGen();
-    });
-
-    await expect(
-      session.prompt({
-        sessionId: 'session-1',
-        prompt: [{ type: 'text', text: 'Hi' }],
-      }),
-    ).rejects.toMatchObject({
-      code: 429,
-      message: 'Rate limit exceeded. Try again later.',
-    });
-  });
-
-  it('should handle missing tool', async () => {
-    mockToolRegistry.getTool.mockReturnValue(undefined);
-
-    const stream1 = createMockStream([
-      {
-        type: GeminiEventType.ToolCallRequest,
-        value: {
-          callId: 'call-1',
-          name: 'unknown_tool',
-          args: {},
-          isClientInitiated: false,
-          prompt_id: 'prompt-1',
-        },
-      },
-    ]);
-    const stream2 = createMockStream([
-      {
-        type: GeminiEventType.Content,
-        value: '',
-      },
-    ]);
-
-    mockSendMessageStream
-      .mockReturnValueOnce(stream1)
-      .mockReturnValueOnce(stream2);
-
-    await session.prompt({
-      sessionId: 'session-1',
-      prompt: [{ type: 'text', text: 'Call tool' }],
-    });
-
-    expect(mockSendMessageStream).toHaveBeenCalledTimes(2);
-  });
-
-  it('should handle GeminiEventType.LoopDetected', async () => {
-    const stream = createMockStream([
-      {
-        type: GeminiEventType.LoopDetected,
-      },
-    ]);
-    mockSendMessageStream.mockReturnValue(stream);
-
-    const result = await session.prompt({
-      sessionId: 'session-1',
-      prompt: [{ type: 'text', text: 'Trigger Loop Simulation' }],
-    });
-
-    expect(result.stopReason).toBe('max_turn_requests');
-  });
-
-  it('should handle GeminiEventType.ContextWindowWillOverflow', async () => {
-    const stream = createMockStream([
-      {
-        type: GeminiEventType.ContextWindowWillOverflow,
-        value: { estimatedRequestTokenCount: 1000, remainingTokenCount: 200 },
-      },
-    ]);
-    mockSendMessageStream.mockReturnValue(stream);
-
-    const result = await session.prompt({
-      sessionId: 'session-1',
-      prompt: [{ type: 'text', text: 'Trigger Overflow Simulation' }],
-    });
-
-    expect(result.stopReason).toBe('max_tokens');
-  });
-
-  it('should handle GeminiEventType.MaxSessionTurns', async () => {
-    const stream = createMockStream([
-      {
-        type: GeminiEventType.MaxSessionTurns,
-      },
-    ]);
-    mockSendMessageStream.mockReturnValue(stream);
-
-    const result = await session.prompt({
-      sessionId: 'session-1',
-      prompt: [{ type: 'text', text: 'Trigger Safety Limits' }],
-    });
-
-    expect(result.stopReason).toBe('max_turn_requests');
-  });
-
-  it('should send sessionUpdate when approval mode changes', async () => {
-    const { coreEvents, CoreEvent, ApprovalMode } = await import(
-      '@google/gemini-cli-core'
-    );
-
-    coreEvents.emit(CoreEvent.ApprovalModeChanged, {
-      sessionId: 'session-1',
-      mode: ApprovalMode.PLAN,
-    });
-
-    expect(mockConnection.sessionUpdate).toHaveBeenCalledWith({
-      sessionId: 'session-1',
-      update: {
-        sessionUpdate: 'agent_message_chunk',
-        content: {
-          type: 'text',
-          text: `[MODE_UPDATE] ${ApprovalMode.PLAN}`,
-        },
-      },
-    });
-  });
-});

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

@@ -1,386 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  afterEach,
-  type Mock,
-  type Mocked,
-} from 'vitest';
-import { AcpSessionManager } from './acpSessionManager.js';
-import type * as acp from '@agentclientprotocol/sdk';
-import {
-  AuthType,
-  type Config,
-  type MessageBus,
-  type Storage,
-} from '@google/gemini-cli-core';
-import type { LoadedSettings } from '../config/settings.js';
-import { loadCliConfig, type CliArgs } from '../config/config.js';
-import { loadSettings } from '../config/settings.js';
-
-vi.mock('../config/config.js', () => ({
-  loadCliConfig: vi.fn(),
-}));
-
-vi.mock('../config/settings.js', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../config/settings.js')>();
-  return {
-    ...actual,
-    loadSettings: vi.fn(),
-  };
-});
-
-const startAutoMemoryIfEnabledMock = vi.fn();
-vi.mock('../utils/autoMemory.js', () => ({
-  startAutoMemoryIfEnabled: (config: Config) =>
-    startAutoMemoryIfEnabledMock(config),
-}));
-
-describe('AcpSessionManager', () => {
-  let mockConfig: Mocked<Config>;
-  let mockSettings: Mocked<LoadedSettings>;
-  let mockArgv: CliArgs;
-  let mockConnection: Mocked<acp.AgentSideConnection>;
-  let manager: AcpSessionManager;
-
-  beforeEach(() => {
-    mockConfig = {
-      refreshAuth: vi.fn(),
-      initialize: vi.fn(),
-      waitForMcpInit: vi.fn(),
-      getFileSystemService: vi.fn(),
-      setFileSystemService: vi.fn(),
-      getContentGeneratorConfig: vi.fn(),
-      getActiveModel: vi.fn().mockReturnValue('gemini-pro'),
-      getModel: vi.fn().mockReturnValue('gemini-pro'),
-      getGeminiClient: vi.fn().mockReturnValue({
-        startChat: vi.fn().mockResolvedValue({}),
-      }),
-      getMessageBus: vi.fn().mockReturnValue({
-        publish: vi.fn(),
-        subscribe: vi.fn(),
-        unsubscribe: vi.fn(),
-      }),
-      getApprovalMode: vi.fn().mockReturnValue('default'),
-      isPlanEnabled: vi.fn().mockReturnValue(true),
-      getGemini31LaunchedSync: vi.fn().mockReturnValue(false),
-      getHasAccessToPreviewModel: vi.fn().mockReturnValue(false),
-      getCheckpointingEnabled: vi.fn().mockReturnValue(false),
-      getDisableAlwaysAllow: vi.fn().mockReturnValue(false),
-      validatePathAccess: vi.fn().mockReturnValue(null),
-      getWorkspaceContext: vi.fn().mockReturnValue({
-        addReadOnlyPath: vi.fn(),
-      }),
-      getPolicyEngine: vi.fn().mockReturnValue({
-        addRule: vi.fn(),
-      }),
-      messageBus: {
-        publish: vi.fn(),
-        subscribe: vi.fn(),
-        unsubscribe: vi.fn(),
-      } as unknown as MessageBus,
-      storage: {
-        getWorkspaceAutoSavedPolicyPath: vi.fn(),
-        getAutoSavedPolicyPath: vi.fn(),
-      } as unknown as Storage,
-
-      get config() {
-        return this;
-      },
-    } as unknown as Mocked<Config>;
-    mockSettings = {
-      merged: {
-        security: { auth: { selectedType: 'login_with_google' } },
-        mcpServers: {},
-      },
-      setValue: vi.fn(),
-    } as unknown as Mocked<LoadedSettings>;
-    mockArgv = {} as unknown as CliArgs;
-    mockConnection = {
-      sessionUpdate: vi.fn(),
-      requestPermission: vi.fn(),
-    } as unknown as Mocked<acp.AgentSideConnection>;
-
-    (loadCliConfig as unknown as Mock).mockResolvedValue(mockConfig);
-    (loadSettings as unknown as Mock).mockImplementation(() => ({
-      merged: {
-        security: {
-          auth: { selectedType: AuthType.LOGIN_WITH_GOOGLE },
-          enablePermanentToolApproval: true,
-        },
-        mcpServers: {},
-      },
-      setValue: vi.fn(),
-    }));
-
-    manager = new AcpSessionManager(mockSettings, mockArgv, mockConnection);
-    vi.mock('node:crypto', () => ({
-      randomUUID: () => 'test-session-id',
-    }));
-  });
-
-  afterEach(() => {
-    vi.restoreAllMocks();
-  });
-
-  it('should create a new session', async () => {
-    vi.useFakeTimers();
-    mockConfig.getContentGeneratorConfig = vi.fn().mockReturnValue({
-      apiKey: 'test-key',
-    });
-    const response = await manager.newSession(
-      {
-        cwd: '/tmp',
-        mcpServers: [],
-      },
-      {},
-    );
-
-    expect(response.sessionId).toBe('test-session-id');
-    expect(loadCliConfig).toHaveBeenCalled();
-    expect(mockConfig.initialize).toHaveBeenCalled();
-    expect(mockConfig.getGeminiClient).toHaveBeenCalled();
-
-    // Verify deferred call (sendAvailableCommands)
-    await vi.runAllTimersAsync();
-    expect(mockConnection.sessionUpdate).toHaveBeenCalledWith(
-      expect.objectContaining({
-        update: expect.objectContaining({
-          sessionUpdate: 'available_commands_update',
-        }),
-      }),
-    );
-    vi.useRealTimers();
-  });
-
-  it('should return modes without plan mode when plan is disabled', async () => {
-    mockConfig.getContentGeneratorConfig = vi.fn().mockReturnValue({
-      apiKey: 'test-key',
-    });
-    mockConfig.isPlanEnabled = vi.fn().mockReturnValue(false);
-    mockConfig.getApprovalMode = vi.fn().mockReturnValue('default');
-
-    const response = await manager.newSession(
-      {
-        cwd: '/tmp',
-        mcpServers: [],
-      },
-      {},
-    );
-
-    expect(response.modes).toEqual({
-      availableModes: [
-        { id: 'default', name: 'Default', description: 'Prompts for approval' },
-        {
-          id: 'autoEdit',
-          name: 'Auto Edit',
-          description: 'Auto-approves edit tools',
-        },
-        { id: 'yolo', name: 'YOLO', description: 'Auto-approves all tools' },
-      ],
-      currentModeId: 'default',
-    });
-  });
-
-  it('should include preview models when user has access', async () => {
-    mockConfig.getContentGeneratorConfig = vi.fn().mockReturnValue({
-      apiKey: 'test-key',
-    });
-    mockConfig.getHasAccessToPreviewModel = vi.fn().mockReturnValue(true);
-    mockConfig.getGemini31LaunchedSync = vi.fn().mockReturnValue(true);
-
-    const response = await manager.newSession(
-      {
-        cwd: '/tmp',
-        mcpServers: [],
-      },
-      {},
-    );
-
-    expect(response.models?.availableModels).toEqual(
-      expect.arrayContaining([
-        expect.objectContaining({
-          modelId: 'auto-gemini-3',
-          name: expect.stringContaining('Auto'),
-        }),
-      ]),
-    );
-  });
-
-  it('should include gemini-3.1-flash-lite when useGemini31FlashLite is true', async () => {
-    mockConfig.getContentGeneratorConfig = vi.fn().mockReturnValue({
-      apiKey: 'test-key',
-    });
-    mockConfig.getHasAccessToPreviewModel = vi.fn().mockReturnValue(true);
-    mockConfig.getGemini31LaunchedSync = vi.fn().mockReturnValue(true);
-    mockConfig.getGemini31FlashLiteLaunchedSync = vi.fn().mockReturnValue(true);
-
-    const response = await manager.newSession(
-      {
-        cwd: '/tmp',
-        mcpServers: [],
-      },
-      {},
-    );
-
-    expect(response.models?.availableModels).toEqual(
-      expect.arrayContaining([
-        expect.objectContaining({
-          modelId: 'gemini-3.1-flash-lite-preview',
-          name: 'gemini-3.1-flash-lite-preview',
-        }),
-      ]),
-    );
-  });
-
-  it('should return modes with plan mode when plan is enabled', async () => {
-    mockConfig.getContentGeneratorConfig = vi.fn().mockReturnValue({
-      apiKey: 'test-key',
-    });
-    mockConfig.isPlanEnabled = vi.fn().mockReturnValue(true);
-    mockConfig.getApprovalMode = vi.fn().mockReturnValue('plan');
-
-    const response = await manager.newSession(
-      {
-        cwd: '/tmp',
-        mcpServers: [],
-      },
-      {},
-    );
-
-    expect(response.modes).toEqual({
-      availableModes: [
-        { id: 'default', name: 'Default', description: 'Prompts for approval' },
-        {
-          id: 'autoEdit',
-          name: 'Auto Edit',
-          description: 'Auto-approves edit tools',
-        },
-        { id: 'yolo', name: 'YOLO', description: 'Auto-approves all tools' },
-        { id: 'plan', name: 'Plan', description: 'Read-only mode' },
-      ],
-      currentModeId: 'plan',
-    });
-  });
-
-  it('should fail session creation if Gemini API key is missing', async () => {
-    (loadSettings as unknown as Mock).mockImplementation(() => ({
-      merged: {
-        security: { auth: { selectedType: AuthType.USE_GEMINI } },
-        mcpServers: {},
-      },
-      setValue: vi.fn(),
-    }));
-    mockConfig.getContentGeneratorConfig = vi.fn().mockReturnValue({
-      apiKey: undefined,
-    });
-
-    await expect(
-      manager.newSession(
-        {
-          cwd: '/tmp',
-          mcpServers: [],
-        },
-        {},
-      ),
-    ).rejects.toMatchObject({
-      message: 'Gemini API key is missing or not configured.',
-    });
-  });
-
-  it('should create a new session with mcp servers', async () => {
-    mockConfig.getContentGeneratorConfig = vi.fn().mockReturnValue({
-      apiKey: 'test-key',
-    });
-    const mcpServers = [
-      {
-        name: 'test-server',
-        command: 'node',
-        args: ['server.js'],
-        env: [{ name: 'KEY', value: 'VALUE' }],
-      },
-    ];
-
-    await manager.newSession(
-      {
-        cwd: '/tmp',
-        mcpServers,
-      },
-      {},
-    );
-
-    expect(loadCliConfig).toHaveBeenCalledWith(
-      expect.objectContaining({
-        mcpServers: expect.objectContaining({
-          'test-server': expect.objectContaining({
-            command: 'node',
-            args: ['server.js'],
-            env: { KEY: 'VALUE' },
-          }),
-        }),
-      }),
-      'test-session-id',
-      mockArgv,
-      { cwd: '/tmp' },
-    );
-  });
-
-  it('should handle authentication failure gracefully', async () => {
-    mockConfig.refreshAuth.mockRejectedValue(new Error('Auth failed'));
-
-    await expect(
-      manager.newSession(
-        {
-          cwd: '/tmp',
-          mcpServers: [],
-        },
-        {},
-      ),
-    ).rejects.toMatchObject({
-      message: 'Auth failed',
-    });
-  });
-
-  it('should initialize file system service if client supports it', async () => {
-    mockConfig.getContentGeneratorConfig = vi.fn().mockReturnValue({
-      apiKey: 'test-key',
-    });
-    manager.setClientCapabilities({
-      fs: { readTextFile: true, writeTextFile: true },
-    });
-
-    await manager.newSession(
-      {
-        cwd: '/tmp',
-        mcpServers: [],
-      },
-      {},
-    );
-
-    expect(mockConfig.setFileSystemService).toHaveBeenCalled();
-  });
-
-  it('should start auto memory for new ACP sessions', async () => {
-    mockConfig.getContentGeneratorConfig = vi.fn().mockReturnValue({
-      apiKey: 'test-key',
-    });
-
-    await manager.newSession(
-      {
-        cwd: '/tmp',
-        mcpServers: [],
-      },
-      {},
-    );
-
-    expect(startAutoMemoryIfEnabledMock).toHaveBeenCalledWith(mockConfig);
-  });
-});

packages/cli/src/acp/acpSessionManager.ts

@@ -1,335 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import {
-  type Config,
-  AuthType,
-  MCPServerConfig,
-  debugLogger,
-  startupProfiler,
-  convertSessionToClientHistory,
-  createPolicyUpdater,
-} from '@google/gemini-cli-core';
-import * as acp from '@agentclientprotocol/sdk';
-import { randomUUID } from 'node:crypto';
-import { loadSettings, type LoadedSettings } from '../config/settings.js';
-import { SessionSelector } from '../utils/sessionUtils.js';
-import { Session } from './acpSession.js';
-import { AcpFileSystemService } from './acpFileSystemService.js';
-import { getAcpErrorMessage } from './acpErrors.js';
-import { buildAvailableModels, buildAvailableModes } from './acpUtils.js';
-import { loadCliConfig, type CliArgs } from '../config/config.js';
-import { startAutoMemoryIfEnabled } from '../utils/autoMemory.js';
-
-export interface AuthDetails {
-  apiKey?: string;
-  baseUrl?: string;
-  customHeaders?: Record<string, string>;
-}
-
-export class AcpSessionManager {
-  private sessions: Map<string, Session> = new Map();
-  private clientCapabilities: acp.ClientCapabilities | undefined;
-
-  constructor(
-    private settings: LoadedSettings,
-    private argv: CliArgs,
-    private connection: acp.AgentSideConnection,
-  ) {}
-
-  setClientCapabilities(capabilities: acp.ClientCapabilities) {
-    this.clientCapabilities = capabilities;
-  }
-
-  getSession(sessionId: string): Session | undefined {
-    return this.sessions.get(sessionId);
-  }
-
-  dispose(): void {
-    for (const session of this.sessions.values()) {
-      session.dispose();
-    }
-    this.sessions.clear();
-  }
-
-  async newSession(
-    { cwd, mcpServers }: acp.NewSessionRequest,
-    authDetails: AuthDetails,
-  ): Promise<acp.NewSessionResponse> {
-    const sessionId = randomUUID();
-    const loadedSettings = loadSettings(cwd);
-    const config = await this.newSessionConfig(
-      sessionId,
-      cwd,
-      mcpServers,
-      loadedSettings,
-    );
-
-    const authType =
-      loadedSettings.merged.security.auth.selectedType || AuthType.USE_GEMINI;
-
-    let isAuthenticated = false;
-    let authErrorMessage = '';
-    try {
-      await config.refreshAuth(
-        authType,
-        authDetails.apiKey,
-        authDetails.baseUrl,
-        authDetails.customHeaders,
-      );
-      isAuthenticated = true;
-
-      // Extra validation for Gemini API key
-      const contentGeneratorConfig = config.getContentGeneratorConfig();
-      if (
-        authType === AuthType.USE_GEMINI &&
-        (!contentGeneratorConfig || !contentGeneratorConfig.apiKey)
-      ) {
-        isAuthenticated = false;
-        authErrorMessage = 'Gemini API key is missing or not configured.';
-      }
-    } catch (e) {
-      isAuthenticated = false;
-      authErrorMessage = getAcpErrorMessage(e);
-      debugLogger.error(
-        `Authentication failed: ${e instanceof Error ? e.stack : e}`,
-      );
-    }
-
-    if (!isAuthenticated) {
-      throw new acp.RequestError(
-        -32000,
-        authErrorMessage || 'Authentication required.',
-      );
-    }
-
-    if (this.clientCapabilities?.fs) {
-      const acpFileSystemService = new AcpFileSystemService(
-        this.connection,
-        sessionId,
-        this.clientCapabilities.fs,
-        config.getFileSystemService(),
-        cwd,
-      );
-      config.setFileSystemService(acpFileSystemService);
-    }
-
-    await config.initialize();
-    startupProfiler.flush(config);
-    startAutoMemoryIfEnabled(config);
-
-    const geminiClient = config.getGeminiClient();
-
-    const chat = await geminiClient.startChat();
-
-    const session = new Session(
-      sessionId,
-      chat,
-      config,
-      this.connection,
-      this.settings,
-    );
-    this.sessions.set(sessionId, session);
-
-    setTimeout(() => {
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      session.sendAvailableCommands();
-    }, 0);
-
-    const { availableModels, currentModelId } = buildAvailableModels(
-      config,
-      loadedSettings,
-    );
-
-    const response = {
-      sessionId,
-      modes: {
-        availableModes: buildAvailableModes(config.isPlanEnabled()),
-        currentModeId: config.getApprovalMode(),
-      },
-      models: {
-        availableModels,
-        currentModelId,
-      },
-    };
-    return response;
-  }
-
-  async loadSession(
-    { sessionId, cwd, mcpServers }: acp.LoadSessionRequest,
-    authDetails: AuthDetails,
-  ): Promise<acp.LoadSessionResponse> {
-    const config = await this.initializeSessionConfig(
-      sessionId,
-      cwd,
-      mcpServers,
-      authDetails,
-    );
-
-    const sessionSelector = new SessionSelector(config.storage);
-
-    const { sessionData, sessionPath } =
-      await sessionSelector.resolveSession(sessionId);
-
-    const clientHistory = convertSessionToClientHistory(sessionData.messages);
-
-    const geminiClient = config.getGeminiClient();
-    await geminiClient.initialize();
-    await geminiClient.resumeChat(clientHistory, {
-      conversation: sessionData,
-      filePath: sessionPath,
-    });
-
-    const session = new Session(
-      sessionId,
-      geminiClient.getChat(),
-      config,
-      this.connection,
-      this.settings,
-    );
-
-    const existingSession = this.sessions.get(sessionId);
-    if (existingSession) {
-      existingSession.dispose();
-    }
-
-    this.sessions.set(sessionId, session);
-
-    // Stream history back to client
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    session.streamHistory(sessionData.messages);
-
-    setTimeout(() => {
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      session.sendAvailableCommands();
-    }, 0);
-
-    const { availableModels, currentModelId } = buildAvailableModels(
-      config,
-      this.settings,
-    );
-
-    const response = {
-      modes: {
-        availableModes: buildAvailableModes(config.isPlanEnabled()),
-        currentModeId: config.getApprovalMode(),
-      },
-      models: {
-        availableModels,
-        currentModelId,
-      },
-    };
-    return response;
-  }
-
-  private async initializeSessionConfig(
-    sessionId: string,
-    cwd: string,
-    mcpServers: acp.McpServer[],
-    authDetails: AuthDetails,
-  ): Promise<Config> {
-    const selectedAuthType = this.settings.merged.security.auth.selectedType;
-    if (!selectedAuthType) {
-      throw acp.RequestError.authRequired();
-    }
-
-    // 1. Create config WITHOUT initializing it (no MCP servers started yet)
-    const config = await this.newSessionConfig(sessionId, cwd, mcpServers);
-
-    // 2. Authenticate BEFORE initializing configuration or starting MCP servers.
-    // This satisfies the security requirement to verify the user before executing
-    // potentially unsafe server definitions.
-    try {
-      await config.refreshAuth(
-        selectedAuthType,
-        authDetails.apiKey,
-        authDetails.baseUrl,
-        authDetails.customHeaders,
-      );
-    } catch (e) {
-      debugLogger.error(`Authentication failed: ${e}`);
-      throw acp.RequestError.authRequired();
-    }
-
-    // 3. Set the ACP FileSystemService (if supported) before config initialization
-    if (this.clientCapabilities?.fs) {
-      const acpFileSystemService = new AcpFileSystemService(
-        this.connection,
-        sessionId,
-        this.clientCapabilities.fs,
-        config.getFileSystemService(),
-        cwd,
-      );
-      config.setFileSystemService(acpFileSystemService);
-    }
-
-    // 4. Now that we are authenticated, it is safe to initialize the config
-    // which starts the MCP servers and other heavy resources.
-    await config.initialize();
-    startupProfiler.flush(config);
-    startAutoMemoryIfEnabled(config);
-
-    return config;
-  }
-
-  async newSessionConfig(
-    sessionId: string,
-    cwd: string,
-    mcpServers: acp.McpServer[],
-    loadedSettings?: LoadedSettings,
-  ): Promise<Config> {
-    const currentSettings = loadedSettings || this.settings;
-    const mergedMcpServers = { ...currentSettings.merged.mcpServers };
-
-    for (const server of mcpServers) {
-      if (
-        'type' in server &&
-        (server.type === 'sse' || server.type === 'http')
-      ) {
-        // HTTP or SSE MCP server
-        const headers = Object.fromEntries(
-          server.headers.map(({ name, value }) => [name, value]),
-        );
-        mergedMcpServers[server.name] = new MCPServerConfig(
-          undefined, // command
-          undefined, // args
-          undefined, // env
-          undefined, // cwd
-          server.type === 'sse' ? server.url : undefined, // url (sse)
-          server.type === 'http' ? server.url : undefined, // httpUrl
-          headers,
-        );
-      } else if ('command' in server) {
-        // Stdio MCP server
-        const env: Record<string, string> = {};
-        for (const { name: envName, value } of server.env) {
-          env[envName] = value;
-        }
-        mergedMcpServers[server.name] = new MCPServerConfig(
-          server.command,
-          server.args,
-          env,
-          cwd,
-        );
-      }
-    }
-
-    const settings = {
-      ...currentSettings.merged,
-      mcpServers: mergedMcpServers,
-    };
-
-    const config = await loadCliConfig(settings, sessionId, this.argv, { cwd });
-
-    createPolicyUpdater(
-      config.getPolicyEngine(),
-      config.messageBus,
-      config.storage,
-    );
-
-    return config;
-  }
-}

packages/cli/src/acp/acpStdioTransport.ts

@@ -1,35 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { type Config, createWorkingStdio } from '@google/gemini-cli-core';
-import { runExitCleanup } from '../utils/cleanup.js';
-import * as acp from '@agentclientprotocol/sdk';
-import { Readable, Writable } from 'node:stream';
-import type { LoadedSettings } from '../config/settings.js';
-import type { CliArgs } from '../config/config.js';
-import { GeminiAgent } from './acpRpcDispatcher.js';
-
-export async function runAcpClient(
-  config: Config,
-  settings: LoadedSettings,
-  argv: CliArgs,
-) {
-  const { stdout: workingStdout } = createWorkingStdio();
-  const stdout = Writable.toWeb(workingStdout) as WritableStream;
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-  const stdin = Readable.toWeb(process.stdin) as ReadableStream<Uint8Array>;
-
-  const stream = acp.ndJsonStream(stdout, stdin);
-  const connection = new acp.AgentSideConnection(
-    (connection) => new GeminiAgent(config, settings, argv, connection),
-    stream,
-  );
-
-  // SIGTERM/SIGINT handlers (in sdk.ts) don't fire when stdin closes.
-  // We must explicitly await the connection close to flush telemetry.
-  // Use finally() to ensure cleanup runs even on stream errors.
-  await connection.closed.finally(runExitCleanup);
-}

packages/cli/src/acp/acpUtils.ts

@@ -1,373 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import {
-  type Config,
-  type ToolResult,
-  type ToolCallConfirmationDetails,
-  Kind,
-  ApprovalMode,
-  DEFAULT_GEMINI_MODEL_AUTO,
-  PREVIEW_GEMINI_MODEL_AUTO,
-  DEFAULT_GEMINI_MODEL,
-  DEFAULT_GEMINI_FLASH_MODEL,
-  DEFAULT_GEMINI_FLASH_LITE_MODEL,
-  PREVIEW_GEMINI_3_1_MODEL,
-  PREVIEW_GEMINI_MODEL,
-  PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL,
-  PREVIEW_GEMINI_FLASH_MODEL,
-  PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL,
-  getDisplayString,
-  AuthType,
-  ToolConfirmationOutcome,
-} from '@google/gemini-cli-core';
-import type * as acp from '@agentclientprotocol/sdk';
-import { z } from 'zod';
-import type { LoadedSettings } from '../config/settings.js';
-
-export function hasMeta(
-  obj: unknown,
-): obj is { _meta?: Record<string, unknown> } {
-  return typeof obj === 'object' && obj !== null && '_meta' in obj;
-}
-
-export const RequestPermissionResponseSchema = z.object({
-  outcome: z.discriminatedUnion('outcome', [
-    z.object({ outcome: z.literal('cancelled') }),
-    z.object({
-      outcome: z.literal('selected'),
-      optionId: z.string(),
-    }),
-  ]),
-});
-
-export function toToolCallContent(
-  toolResult: ToolResult,
-): acp.ToolCallContent | null {
-  if (toolResult.error?.message) {
-    throw new Error(toolResult.error.message);
-  }
-
-  if (toolResult.returnDisplay) {
-    if (typeof toolResult.returnDisplay === 'string') {
-      return {
-        type: 'content',
-        content: { type: 'text', text: toolResult.returnDisplay },
-      };
-    } else {
-      if ('fileName' in toolResult.returnDisplay) {
-        return {
-          type: 'diff',
-          path:
-            toolResult.returnDisplay.filePath ??
-            toolResult.returnDisplay.fileName,
-          oldText: toolResult.returnDisplay.originalContent,
-          newText: toolResult.returnDisplay.newContent,
-          _meta: {
-            kind: !toolResult.returnDisplay.originalContent
-              ? 'add'
-              : toolResult.returnDisplay.newContent === ''
-                ? 'delete'
-                : 'modify',
-          },
-        };
-      }
-      return null;
-    }
-  } else {
-    return null;
-  }
-}
-
-const basicPermissionOptions = [
-  {
-    optionId: ToolConfirmationOutcome.ProceedOnce,
-    name: 'Allow',
-    kind: 'allow_once',
-  },
-  {
-    optionId: ToolConfirmationOutcome.Cancel,
-    name: 'Reject',
-    kind: 'reject_once',
-  },
-] as const;
-
-export function toPermissionOptions(
-  confirmation: ToolCallConfirmationDetails,
-  config: Config,
-  enablePermanentToolApproval: boolean = false,
-): acp.PermissionOption[] {
-  const disableAlwaysAllow = config.getDisableAlwaysAllow();
-  const options: acp.PermissionOption[] = [];
-
-  if (!disableAlwaysAllow) {
-    switch (confirmation.type) {
-      case 'edit':
-        options.push({
-          optionId: ToolConfirmationOutcome.ProceedAlways,
-          name: 'Allow for this session',
-          kind: 'allow_always',
-        });
-        if (enablePermanentToolApproval) {
-          options.push({
-            optionId: ToolConfirmationOutcome.ProceedAlwaysAndSave,
-            name: 'Allow for this file in all future sessions',
-            kind: 'allow_always',
-          });
-        }
-        break;
-      case 'exec':
-        options.push({
-          optionId: ToolConfirmationOutcome.ProceedAlways,
-          name: 'Allow for this session',
-          kind: 'allow_always',
-        });
-        if (enablePermanentToolApproval) {
-          options.push({
-            optionId: ToolConfirmationOutcome.ProceedAlwaysAndSave,
-            name: 'Allow this command for all future sessions',
-            kind: 'allow_always',
-          });
-        }
-        break;
-      case 'mcp':
-        options.push(
-          {
-            optionId: ToolConfirmationOutcome.ProceedAlwaysServer,
-            name: 'Allow all server tools for this session',
-            kind: 'allow_always',
-          },
-          {
-            optionId: ToolConfirmationOutcome.ProceedAlwaysTool,
-            name: 'Allow tool for this session',
-            kind: 'allow_always',
-          },
-        );
-        if (enablePermanentToolApproval) {
-          options.push({
-            optionId: ToolConfirmationOutcome.ProceedAlwaysAndSave,
-            name: 'Allow tool for all future sessions',
-            kind: 'allow_always',
-          });
-        }
-        break;
-      case 'info':
-        options.push({
-          optionId: ToolConfirmationOutcome.ProceedAlways,
-          name: 'Allow for this session',
-          kind: 'allow_always',
-        });
-        if (enablePermanentToolApproval) {
-          options.push({
-            optionId: ToolConfirmationOutcome.ProceedAlwaysAndSave,
-            name: 'Allow for all future sessions',
-            kind: 'allow_always',
-          });
-        }
-        break;
-      case 'ask_user':
-      case 'exit_plan_mode':
-        // askuser and exit_plan_mode don't need "always allow" options
-        break;
-      default:
-        // No "always allow" options for other types
-        break;
-    }
-  }
-
-  options.push(...basicPermissionOptions);
-
-  // Exhaustive check
-  switch (confirmation.type) {
-    case 'edit':
-    case 'exec':
-    case 'mcp':
-    case 'info':
-    case 'ask_user':
-    case 'exit_plan_mode':
-    case 'sandbox_expansion':
-      break;
-    default: {
-      const unreachable: never = confirmation;
-      throw new Error(`Unexpected: ${unreachable}`);
-    }
-  }
-
-  return options;
-}
-
-export function toAcpToolKind(kind: Kind): acp.ToolKind {
-  switch (kind) {
-    case Kind.Read:
-    case Kind.Edit:
-    case Kind.Execute:
-    case Kind.Search:
-    case Kind.Delete:
-    case Kind.Move:
-    case Kind.Think:
-    case Kind.Fetch:
-    case Kind.SwitchMode:
-    case Kind.Other:
-      return kind as acp.ToolKind;
-    case Kind.Agent:
-      return 'think';
-    case Kind.Plan:
-    case Kind.Communicate:
-    default:
-      return 'other';
-  }
-}
-
-export function buildAvailableModes(isPlanEnabled: boolean): acp.SessionMode[] {
-  const modes: acp.SessionMode[] = [
-    {
-      id: ApprovalMode.DEFAULT,
-      name: 'Default',
-      description: 'Prompts for approval',
-    },
-    {
-      id: ApprovalMode.AUTO_EDIT,
-      name: 'Auto Edit',
-      description: 'Auto-approves edit tools',
-    },
-    {
-      id: ApprovalMode.YOLO,
-      name: 'YOLO',
-      description: 'Auto-approves all tools',
-    },
-  ];
-
-  if (isPlanEnabled) {
-    modes.push({
-      id: ApprovalMode.PLAN,
-      name: 'Plan',
-      description: 'Read-only mode',
-    });
-  }
-
-  return modes;
-}
-
-export function buildAvailableModels(
-  config: Config,
-  settings: LoadedSettings,
-): {
-  availableModels: Array<{
-    modelId: string;
-    name: string;
-    description?: string;
-  }>;
-  currentModelId: string;
-} {
-  const preferredModel = config.getModel() || DEFAULT_GEMINI_MODEL_AUTO;
-  const shouldShowPreviewModels = config.getHasAccessToPreviewModel();
-  const useGemini31 = config.getGemini31LaunchedSync?.() ?? false;
-  const useGemini31FlashLite =
-    config.getGemini31FlashLiteLaunchedSync?.() ?? false;
-  const selectedAuthType = settings.merged.security.auth.selectedType;
-  const useCustomToolModel =
-    useGemini31 && selectedAuthType === AuthType.USE_GEMINI;
-
-  // --- DYNAMIC PATH ---
-  if (
-    config.getExperimentalDynamicModelConfiguration?.() === true &&
-    config.getModelConfigService
-  ) {
-    const options = config.getModelConfigService().getAvailableModelOptions({
-      useGemini3_1: useGemini31,
-      useGemini3_1FlashLite: useGemini31FlashLite,
-      useCustomTools: useCustomToolModel,
-      hasAccessToPreview: shouldShowPreviewModels,
-    });
-
-    return {
-      availableModels: options,
-      currentModelId: preferredModel,
-    };
-  }
-
-  // --- LEGACY PATH ---
-  const mainOptions = [
-    {
-      value: DEFAULT_GEMINI_MODEL_AUTO,
-      title: getDisplayString(DEFAULT_GEMINI_MODEL_AUTO),
-      description:
-        'Let Gemini CLI decide the best model for the task: gemini-2.5-pro, gemini-2.5-flash',
-    },
-  ];
-
-  if (shouldShowPreviewModels) {
-    mainOptions.unshift({
-      value: PREVIEW_GEMINI_MODEL_AUTO,
-      title: getDisplayString(PREVIEW_GEMINI_MODEL_AUTO),
-      description: useGemini31
-        ? 'Let Gemini CLI decide the best model for the task: gemini-3.1-pro, gemini-3-flash'
-        : 'Let Gemini CLI decide the best model for the task: gemini-3-pro, gemini-3-flash',
-    });
-  }
-
-  const manualOptions = [
-    {
-      value: DEFAULT_GEMINI_MODEL,
-      title: getDisplayString(DEFAULT_GEMINI_MODEL),
-    },
-    {
-      value: DEFAULT_GEMINI_FLASH_MODEL,
-      title: getDisplayString(DEFAULT_GEMINI_FLASH_MODEL),
-    },
-    {
-      value: DEFAULT_GEMINI_FLASH_LITE_MODEL,
-      title: getDisplayString(DEFAULT_GEMINI_FLASH_LITE_MODEL),
-    },
-  ];
-
-  if (shouldShowPreviewModels) {
-    const previewProModel = useGemini31
-      ? PREVIEW_GEMINI_3_1_MODEL
-      : PREVIEW_GEMINI_MODEL;
-
-    const previewProValue = useCustomToolModel
-      ? PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL
-      : previewProModel;
-
-    const previewOptions = [
-      {
-        value: previewProValue,
-        title: getDisplayString(previewProModel),
-      },
-      {
-        value: PREVIEW_GEMINI_FLASH_MODEL,
-        title: getDisplayString(PREVIEW_GEMINI_FLASH_MODEL),
-      },
-    ];
-
-    if (useGemini31FlashLite) {
-      previewOptions.push({
-        value: PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL,
-        title: getDisplayString(PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL),
-      });
-    }
-
-    manualOptions.unshift(...previewOptions);
-  }
-
-  const scaleOptions = (
-    options: Array<{ value: string; title: string; description?: string }>,
-  ) =>
-    options.map((o) => ({
-      modelId: o.value,
-      name: o.title,
-      description: o.description,
-    }));
-
-  return {
-    availableModels: [
-      ...scaleOptions(mainOptions),
-      ...scaleOptions(manualOptions),
-    ],
-    currentModelId: preferredModel,
-  };
-}

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

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { CommandHandler } from './acpCommandHandler.js';
+import { CommandHandler } from './commandHandler.js';
 import { describe, it, expect } from 'vitest';
 
 describe('CommandHandler', () => {

packages/cli/src/acp/commandHandler.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2026 Google LLC
+ * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 

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

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2026 Google LLC
+ * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 

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

@@ -1,100 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import type { CommandContext } from './types.js';
-import {
-  DisableExtensionCommand,
-  UninstallExtensionCommand,
-} from './extensions.js';
-import { ExtensionManager } from '../../config/extension-manager.js';
-
-const mockGetErrorMessage = vi.hoisted(() => vi.fn());
-
-vi.mock('@google/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@google/gemini-cli-core')>();
-  return {
-    ...actual,
-    getErrorMessage: mockGetErrorMessage,
-  };
-});
-
-vi.mock('../../config/extension-manager.js', () => {
-  class MockExtensionManager {
-    disableExtension = vi.fn(async () => undefined);
-    uninstallExtension = vi.fn(async () => undefined);
-    getExtensions = vi.fn(() => []);
-  }
-
-  return {
-    ExtensionManager: MockExtensionManager,
-    inferInstallMetadata: vi.fn(),
-  };
-});
-
-type TestExtensionManager = InstanceType<typeof ExtensionManager> & {
-  disableExtension: ReturnType<typeof vi.fn>;
-  uninstallExtension: ReturnType<typeof vi.fn>;
-  getExtensions: ReturnType<typeof vi.fn>;
-};
-
-function createExtensionManager(): TestExtensionManager {
-  return new ExtensionManager({} as never) as TestExtensionManager;
-}
-
-function createContext(extensionLoader: unknown): CommandContext {
-  return {
-    agentContext: {
-      config: {
-        getExtensionLoader: vi.fn().mockReturnValue(extensionLoader),
-      },
-    } as unknown as CommandContext['agentContext'],
-    settings: {} as CommandContext['settings'],
-    sendMessage: vi.fn().mockResolvedValue(undefined),
-  };
-}
-
-describe('ACP extensions error paths', () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    mockGetErrorMessage.mockImplementation((error: unknown) =>
-      error instanceof Error ? error.message : String(error),
-    );
-  });
-
-  it('returns error when disabling fails', async () => {
-    const command = new DisableExtensionCommand();
-    const extensionManager = createExtensionManager();
-    extensionManager.disableExtension.mockRejectedValue(
-      new Error('Extension not found.'),
-    );
-    const context = createContext(extensionManager);
-
-    const result = await command.execute(context, ['missing-ext']);
-
-    expect(result).toEqual({
-      name: 'extensions disable',
-      data: 'Failed to disable "missing-ext": Extension not found.',
-    });
-  });
-
-  it('returns error when uninstalling a non-existent extension', async () => {
-    const command = new UninstallExtensionCommand();
-    const extensionManager = createExtensionManager();
-    extensionManager.uninstallExtension.mockRejectedValue(
-      new Error('Extension not found.'),
-    );
-    const context = createContext(extensionManager);
-
-    const result = await command.execute(context, ['non-existent-ext']);
-
-    expect(result).toEqual({
-      name: 'extensions uninstall',
-      data: 'Failed to uninstall extension "non-existent-ext": Extension not found.',
-    });
-  });
-});

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

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2026 Google LLC
+ * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 

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

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2026 Google LLC
+ * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 

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

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2026 Google LLC
+ * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 

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

@@ -157,15 +157,10 @@ describe('RestoreCommand', () => {
 describe('ListCheckpointsCommand', () => {
   let context: CommandContext;
   let listCommand: ListCheckpointsCommand;
-  let mockReaddir: Mock<(path: string) => Promise<string[]>>;
 
   beforeEach(() => {
     vi.resetAllMocks();
     listCommand = new ListCheckpointsCommand();
-    mockReaddir = vi.mocked(fs.readdir) as unknown as Mock<
-      (path: string) => Promise<string[]>
-    >;
-
     context = {
       agentContext: {
         config: {
@@ -191,7 +186,10 @@ describe('ListCheckpointsCommand', () => {
   });
 
   it('returns "No checkpoints found." when no .json checkpoints exist', async () => {
-    mockReaddir.mockResolvedValue(['not-a-checkpoint.txt']);
+    vi.mocked(fs.readdir).mockResolvedValue([
+      'not-a-checkpoint.txt',
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    ] as any);
 
     const response = await listCommand.execute(context);
 
@@ -200,7 +198,7 @@ describe('ListCheckpointsCommand', () => {
 
   it('ignores error when mkdir fails', async () => {
     vi.mocked(fs.mkdir).mockRejectedValue(new Error('mkdir fail'));
-    mockReaddir.mockResolvedValue([]);
+    vi.mocked(fs.readdir).mockResolvedValue([]);
 
     const response = await listCommand.execute(context);
 
@@ -209,7 +207,11 @@ describe('ListCheckpointsCommand', () => {
   });
 
   it('formats checkpoint summary output from checkpoint metadata', async () => {
-    mockReaddir.mockResolvedValue(['cp1.json', 'cp2.json']);
+    vi.mocked(fs.readdir).mockResolvedValue([
+      'cp1.json',
+      'cp2.json',
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    ] as any);
     vi.mocked(getCheckpointInfoList).mockReturnValue([
       { messageId: 'id1', checkpoint: 'cp1' },
       { messageId: 'id2', checkpoint: 'cp2' },
@@ -224,7 +226,8 @@ describe('ListCheckpointsCommand', () => {
   });
 
   it('handles empty checkpoint info list', async () => {
-    mockReaddir.mockResolvedValue(['some.json']);
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    vi.mocked(fs.readdir).mockResolvedValue(['some.json'] as any);
     vi.mocked(getCheckpointInfoList).mockReturnValue([]);
 
     const response = await listCommand.execute(context);
@@ -233,7 +236,7 @@ describe('ListCheckpointsCommand', () => {
   });
 
   it('returns generic unexpected error message on failures', async () => {
-    mockReaddir.mockRejectedValue(new Error('Readdir fail'));
+    vi.mocked(fs.readdir).mockRejectedValue(new Error('Readdir fail'));
 
     const response = await listCommand.execute(context);
 

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

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2026 Google LLC
+ * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 

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

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2026 Google LLC
+ * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 

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

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2026 Google LLC
+ * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -13,7 +13,7 @@ import {
   afterEach,
   type Mocked,
 } from 'vitest';
-import { AcpFileSystemService } from './acpFileSystemService.js';
+import { AcpFileSystemService } from './fileSystemService.js';
 import type { AgentSideConnection } from '@agentclientprotocol/sdk';
 import type { FileSystemService } from '@google/gemini-cli-core';
 import os from 'node:os';

packages/cli/src/acp/fileSystemService.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2026 Google LLC
+ * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 

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

@@ -1174,20 +1174,6 @@ describe('Hierarchical Memory Loading (config.ts) - Placeholder Suite', () => {
       ['.git'], // boundaryMarkers
     );
   });
-
-  it('should NOT call loadServerHierarchicalMemory when skipMemoryLoad is true', async () => {
-    process.argv = ['node', 'script.js'];
-    const settings = createTestMergedSettings({
-      experimental: { jitContext: false },
-    });
-
-    const argv = await parseArguments(settings);
-    await loadCliConfig(settings, 'session-id', argv, {
-      skipMemoryLoad: true,
-    });
-
-    expect(ServerConfig.loadServerHierarchicalMemory).not.toHaveBeenCalled();
-  });
 });
 
 describe('mergeMcpServers', () => {
@@ -4002,7 +3988,7 @@ describe('loadCliConfig acpMode and clientName', () => {
     expect(config.getClientName()).toBe('acp-vscode');
   });
 
-  it('should set acpMode to true and set clientName to acp for generic terminals', async () => {
+  it('should set acpMode to true but leave clientName undefined for generic terminals', async () => {
     process.argv = ['node', 'script.js', '--acp'];
     vi.stubEnv('TERM_PROGRAM', 'iTerm.app'); // Generic terminal
     vi.stubEnv('VSCODE_GIT_ASKPASS_MAIN', '');
@@ -4014,10 +4000,10 @@ describe('loadCliConfig acpMode and clientName', () => {
       argv,
     );
     expect(config.getAcpMode()).toBe(true);
-    expect(config.getClientName()).toBe('acp');
+    expect(config.getClientName()).toBeUndefined();
   });
 
-  it('should set acpMode to false and clientName to tui by default', async () => {
+  it('should set acpMode to false and clientName to undefined by default', async () => {
     process.argv = ['node', 'script.js'];
     const argv = await parseArguments(createTestMergedSettings());
     const config = await loadCliConfig(
@@ -4026,6 +4012,6 @@ describe('loadCliConfig acpMode and clientName', () => {
       argv,
     );
     expect(config.getAcpMode()).toBe(false);
-    expect(config.getClientName()).toBe('tui');
+    expect(config.getClientName()).toBeUndefined();
   });
 });

packages/cli/src/config/config.ts

@@ -37,7 +37,6 @@ import {
   getAdminErrorMessage,
   isHeadlessMode,
   Config,
-  SimpleExtensionLoader,
   resolveToRealPath,
   applyAdminAllowlist,
   applyRequiredServers,
@@ -559,8 +558,6 @@ export interface LoadCliConfigOptions {
     disabled?: string[];
   };
   worktreeSettings?: WorktreeSettings;
-  skipExtensions?: boolean;
-  skipMemoryLoad?: boolean;
 }
 
 export async function loadCliConfig(
@@ -569,12 +566,7 @@ export async function loadCliConfig(
   argv: CliArgs,
   options: LoadCliConfigOptions = {},
 ): Promise<Config> {
-  const {
-    cwd = process.cwd(),
-    projectHooks,
-    skipExtensions = false,
-    skipMemoryLoad = false,
-  } = options;
+  const { cwd = process.cwd(), projectHooks } = options;
   const debugMode = isDebugMode(argv);
 
   const worktreeSettings =
@@ -649,24 +641,21 @@ export async function loadCliConfig(
     includeDirectories.push(...ideFolders);
   }
 
-  let extensionManager: ExtensionManager | undefined;
-  if (!skipExtensions) {
-    extensionManager = new ExtensionManager({
-      settings,
-      requestConsent: requestConsentNonInteractive,
-      requestSetting: promptForSetting,
-      workspaceDir: cwd,
-      enabledExtensionOverrides: argv.extensions,
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-      eventEmitter: coreEvents as EventEmitter<ExtensionEvents>,
-      clientVersion: await getVersion(),
-    });
-    await extensionManager.loadExtensions();
-  }
+  const extensionManager = new ExtensionManager({
+    settings,
+    requestConsent: requestConsentNonInteractive,
+    requestSetting: promptForSetting,
+    workspaceDir: cwd,
+    enabledExtensionOverrides: argv.extensions,
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+    eventEmitter: coreEvents as EventEmitter<ExtensionEvents>,
+    clientVersion: await getVersion(),
+  });
+  await extensionManager.loadExtensions();
 
   const extensionPlanSettings = extensionManager
-    ?.getExtensions()
-    ?.find((ext) => ext.isActive && ext.plan?.directory)?.plan;
+    .getExtensions()
+    .find((ext) => ext.isActive && ext.plan?.directory)?.plan;
 
   const experimentalJitContext = settings.experimental.jitContext ?? true;
 
@@ -684,10 +673,7 @@ export async function loadCliConfig(
   let fileCount = 0;
   let filePaths: string[] = [];
 
-  const finalExtensionLoader =
-    extensionManager ?? new SimpleExtensionLoader([]);
-
-  if (!experimentalJitContext && !skipMemoryLoad) {
+  if (!experimentalJitContext) {
     // Call the (now wrapper) loadHierarchicalGeminiMemory which calls the server's version
     const result = await loadServerHierarchicalMemory(
       cwd,
@@ -695,7 +681,7 @@ export async function loadCliConfig(
         ? includeDirectories
         : [],
       fileService,
-      finalExtensionLoader,
+      extensionManager,
       trustedFolder,
       memoryImportFormat,
       memoryFileFiltering,
@@ -945,13 +931,7 @@ export async function loadCliConfig(
       (ide.name !== 'vscode' || process.env['TERM_PROGRAM'] === 'vscode')
     ) {
       clientName = `acp-${ide.name}`;
-    } else {
-      clientName = 'acp';
     }
-  } else if (argv.isCommand) {
-    clientName = 'cli-command';
-  } else {
-    clientName = 'tui';
   }
 
   // TODO(joshualitt): Clean this up alongside removal of the legacy config.
@@ -1051,10 +1031,11 @@ export async function loadCliConfig(
     listSessions: argv.listSessions || false,
     deleteSession: argv.deleteSession,
     enabledExtensions: argv.extensions,
-    extensionLoader: finalExtensionLoader,
+    extensionLoader: extensionManager,
     extensionRegistryURI,
     enableExtensionReloading: settings.experimental?.extensionReloading,
     enableAgents: settings.experimental?.enableAgents,
+    enableEnhanceCommand: settings.experimental?.enhanceCommand ?? false,
     plan: settings.general?.plan?.enabled ?? true,
     voiceMode: settings.experimental?.voiceMode,
     tracker: settings.experimental?.taskTracker,

packages/cli/src/config/extension-manager-agents.test.ts

@@ -42,12 +42,10 @@ describe('ExtensionManager agents loading', () => {
 
   beforeEach(() => {
     vi.clearAllMocks();
-    vi.stubEnv('ANTIGRAVITY_CLI_ALIAS', '');
     vi.spyOn(debugLogger, 'warn').mockImplementation(() => {});
 
     tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'gemini-test-agents-'));
     mockHomedir.mockReturnValue(tempDir);
-    vi.stubEnv('GEMINI_CLI_HOME', tempDir);
 
     // Create the extensions directory that ExtensionManager expects
     extensionsDir = path.join(tempDir, '.gemini', EXTENSIONS_DIRECTORY_NAME);

packages/cli/src/config/extension-manager-hydration.test.ts

@@ -48,13 +48,11 @@ describe('ExtensionManager hydration', () => {
 
   beforeEach(() => {
     vi.clearAllMocks();
-    vi.stubEnv('ANTIGRAVITY_CLI_ALIAS', '');
     vi.spyOn(coreEvents, 'emitFeedback');
     vi.spyOn(debugLogger, 'debug').mockImplementation(() => {});
 
     tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'gemini-test-'));
     mockHomedir.mockReturnValue(tempDir);
-    vi.stubEnv('GEMINI_CLI_HOME', tempDir);
 
     // Create the extensions directory that ExtensionManager expects
     extensionsDir = path.join(tempDir, '.gemini', EXTENSIONS_DIRECTORY_NAME);

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

@@ -149,35 +149,6 @@ describe('consent', () => {
         expect(consent).toBe(expected);
       },
     );
-
-    it('should clear the active confirmation request before resolving', async () => {
-      const clearConfirmationRequest = vi.fn();
-      const steps: string[] = [];
-      const addExtensionUpdateConfirmationRequest = vi
-        .fn()
-        .mockImplementation((request: ConfirmationRequest) => {
-          steps.push('prompted');
-          request.onConfirm(true);
-          steps.push('confirmed');
-        });
-
-      const consentPromise = requestConsentInteractive(
-        'Test consent',
-        addExtensionUpdateConfirmationRequest,
-        () => {
-          steps.push('cleared');
-          clearConfirmationRequest();
-        },
-      ).then((consent) => {
-        steps.push('resolved');
-        return consent;
-      });
-
-      expect(clearConfirmationRequest).toHaveBeenCalledTimes(1);
-      expect(steps).toEqual(['prompted', 'cleared', 'confirmed']);
-      await expect(consentPromise).resolves.toBe(true);
-      expect(steps).toEqual(['prompted', 'cleared', 'confirmed', 'resolved']);
-    });
   });
 
   describe('maybeRequestConsentOrFail', () => {

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

@@ -78,12 +78,10 @@ export async function requestConsentNonInteractive(
 export async function requestConsentInteractive(
   consentDescription: string,
   addExtensionUpdateConfirmationRequest: (value: ConfirmationRequest) => void,
-  clearConfirmationRequest?: () => void,
 ): Promise<boolean> {
   return promptForConsentInteractive(
     consentDescription + '\n\nDo you want to continue?',
     addExtensionUpdateConfirmationRequest,
-    clearConfirmationRequest,
   );
 }
 
@@ -131,14 +129,12 @@ export async function promptForConsentNonInteractive(
 async function promptForConsentInteractive(
   prompt: string,
   addExtensionUpdateConfirmationRequest: (value: ConfirmationRequest) => void,
-  clearConfirmationRequest?: () => void,
 ): Promise<boolean> {
   return new Promise<boolean>((resolve) => {
     addExtensionUpdateConfirmationRequest({
       prompt,
       onConfirm: (resolvedConfirmed) => {
-        clearConfirmationRequest?.();
-        setImmediate(() => resolve(resolvedConfirmed));
+        resolve(resolvedConfirmed);
       },
     });
   });

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

@@ -82,7 +82,6 @@ import {
   FatalConfigError,
   GEMINI_DIR,
   Storage,
-  AuthType,
   type MCPServerConfig,
 } from '@google/gemini-cli-core';
 import { updateSettingsFilePreservingFormat } from '../utils/commentJson.js';
@@ -203,7 +202,6 @@ describe('Settings Loading and Merging', () => {
 
   afterEach(() => {
     vi.restoreAllMocks();
-    vi.unstubAllEnvs();
   });
 
   describe('loadSettings', () => {
@@ -3038,7 +3036,6 @@ describe('Settings Loading and Merging', () => {
       delete process.env['CLOUD_SHELL'];
       delete process.env['MALICIOUS_VAR'];
       delete process.env['FOO'];
-      delete process.env['_GEMINI_USER_GCP_PROJECT'];
       vi.resetAllMocks();
       vi.mocked(fs.existsSync).mockReturnValue(false);
     });
@@ -3271,134 +3268,6 @@ MALICIOUS_VAR=allowed-because-trusted
         expect(process.env['GOOGLE_CLOUD_PROJECT']).toBe('cloudshell-gca');
       });
 
-      it('should not override GOOGLE_CLOUD_PROJECT in Cloud Shell when auth type is vertex-ai', () => {
-        vi.stubEnv('CLOUD_SHELL', 'true');
-        vi.stubEnv('GOOGLE_CLOUD_PROJECT', 'my-vertex-project');
-        process.argv = ['node', 'gemini', '-s', 'prompt'];
-        vi.mocked(isWorkspaceTrusted).mockReturnValue({
-          isTrusted: false,
-          source: 'file',
-        });
-
-        // No .env file
-        vi.mocked(fs.existsSync).mockReturnValue(false);
-
-        loadEnvironment(
-          createMockSettings({
-            tools: { sandbox: false },
-            security: { auth: { selectedType: AuthType.USE_VERTEX_AI } },
-          }).merged,
-          MOCK_WORKSPACE_DIR,
-        );
-
-        expect(process.env['GOOGLE_CLOUD_PROJECT']).toBe('my-vertex-project');
-      });
-
-      it('should respect .env override for GOOGLE_CLOUD_PROJECT in Cloud Shell when auth type is vertex-ai', () => {
-        vi.stubEnv('CLOUD_SHELL', 'true');
-        vi.stubEnv('GOOGLE_CLOUD_PROJECT', 'my-vertex-project');
-        process.argv = ['node', 'gemini', '-s', 'prompt'];
-        vi.mocked(isWorkspaceTrusted).mockReturnValue({
-          isTrusted: true,
-          source: 'file',
-        });
-
-        // Mock .env file to override the shell project
-        vi.mocked(fs.existsSync).mockReturnValue(true);
-        vi.mocked(fs.readFileSync).mockReturnValue(
-          'GOOGLE_CLOUD_PROJECT=env-vertex-project',
-        );
-
-        loadEnvironment(
-          createMockSettings({
-            tools: { sandbox: false },
-            security: { auth: { selectedType: AuthType.USE_VERTEX_AI } },
-          }).merged,
-          MOCK_WORKSPACE_DIR,
-        );
-
-        expect(process.env['GOOGLE_CLOUD_PROJECT']).toBe('env-vertex-project');
-      });
-
-      it('should clear cloudshell-gca when switching to Vertex AI without an original project', () => {
-        process.env['CLOUD_SHELL'] = 'true';
-        process.argv = ['node', 'gemini', '-s', 'prompt'];
-        vi.mocked(isWorkspaceTrusted).mockReturnValue({
-          isTrusted: false,
-          source: 'file',
-        });
-        vi.mocked(fs.existsSync).mockReturnValue(false);
-
-        // First call: normal Cloud Shell auth sets cloudshell-gca
-        loadEnvironment(
-          createMockSettings({ tools: { sandbox: false } }).merged,
-          MOCK_WORKSPACE_DIR,
-        );
-        expect(process.env['GOOGLE_CLOUD_PROJECT']).toBe('cloudshell-gca');
-
-        // Second call: user switched to Vertex AI, should remove cloudshell-gca
-        loadEnvironment(
-          createMockSettings({
-            tools: { sandbox: false },
-            security: { auth: { selectedType: AuthType.USE_VERTEX_AI } },
-          }).merged,
-          MOCK_WORKSPACE_DIR,
-        );
-        expect(process.env['GOOGLE_CLOUD_PROJECT']).toBeUndefined();
-      });
-
-      it('should restore original project when switching to Vertex AI after Cloud Shell override', () => {
-        process.env['CLOUD_SHELL'] = 'true';
-        process.env['GOOGLE_CLOUD_PROJECT'] = 'my-real-project';
-        process.argv = ['node', 'gemini', '-s', 'prompt'];
-        vi.mocked(isWorkspaceTrusted).mockReturnValue({
-          isTrusted: false,
-          source: 'file',
-        });
-        vi.mocked(fs.existsSync).mockReturnValue(false);
-
-        // First call: saves original to _GEMINI_USER_GCP_PROJECT, sets cloudshell-gca
-        loadEnvironment(
-          createMockSettings({ tools: { sandbox: false } }).merged,
-          MOCK_WORKSPACE_DIR,
-        );
-        expect(process.env['GOOGLE_CLOUD_PROJECT']).toBe('cloudshell-gca');
-        expect(process.env['_GEMINI_USER_GCP_PROJECT']).toBe('my-real-project');
-
-        // Second call: switching to Vertex AI should restore the saved value
-        loadEnvironment(
-          createMockSettings({
-            tools: { sandbox: false },
-            security: { auth: { selectedType: AuthType.USE_VERTEX_AI } },
-          }).merged,
-          MOCK_WORKSPACE_DIR,
-        );
-        expect(process.env['GOOGLE_CLOUD_PROJECT']).toBe('my-real-project');
-      });
-
-      it('should restore project after restart when child inherits cloudshell-gca', () => {
-        // Simulate child process after restart: inherits cloudshell-gca and
-        // the saved original from the parent process.
-        process.env['CLOUD_SHELL'] = 'true';
-        process.env['GOOGLE_CLOUD_PROJECT'] = 'cloudshell-gca';
-        process.env['_GEMINI_USER_GCP_PROJECT'] = 'my-real-project';
-        process.argv = ['node', 'gemini', '-s', 'prompt'];
-        vi.mocked(isWorkspaceTrusted).mockReturnValue({
-          isTrusted: false,
-          source: 'file',
-        });
-        vi.mocked(fs.existsSync).mockReturnValue(false);
-
-        loadEnvironment(
-          createMockSettings({
-            tools: { sandbox: false },
-            security: { auth: { selectedType: AuthType.USE_VERTEX_AI } },
-          }).merged,
-          MOCK_WORKSPACE_DIR,
-        );
-        expect(process.env['GOOGLE_CLOUD_PROJECT']).toBe('my-real-project');
-      });
-
       it('should sanitize GOOGLE_CLOUD_PROJECT in Cloud Shell when loaded from .env in untrusted mode', () => {
         process.env['CLOUD_SHELL'] = 'true';
         process.argv = ['node', 'gemini', '-s', 'prompt'];

packages/cli/src/config/settings.ts

@@ -18,7 +18,6 @@ import {
   Storage,
   coreEvents,
   homedir,
-  AuthType,
   type AdminControlsSettings,
   createCache,
 } from '@google/gemini-cli-core';
@@ -533,41 +532,17 @@ function findEnvFile(startDir: string, isTrusted: boolean): string | null {
   }
 }
 
-// Internal env var used to preserve the user's original GOOGLE_CLOUD_PROJECT
-// across process restarts in Cloud Shell. This survives relaunch because child
-// processes inherit the parent's environment.
-const USER_GCP_PROJECT = '_GEMINI_USER_GCP_PROJECT';
-
 export function setUpCloudShellEnvironment(
   envFilePath: string | null,
   isTrusted: boolean,
   isSandboxed: boolean,
-  selectedAuthType?: string,
 ): void {
   // Special handling for GOOGLE_CLOUD_PROJECT in Cloud Shell:
   // Because GOOGLE_CLOUD_PROJECT in Cloud Shell tracks the project
   // set by the user using "gcloud config set project" we do not want to
   // use its value. So, unless the user overrides GOOGLE_CLOUD_PROJECT in
   // one of the .env files, we set the Cloud Shell-specific default here.
-  //
-  // However, if the user has explicitly selected Vertex AI auth, they intend
-  // to use their own GCP project, so we restore the original value and skip
-  // the Cloud Shell override to respect their .env settings.
-
-  // Save the user's original value before overwriting, so it can be restored
-  // if the user later switches to Vertex AI (even after a process restart).
-  if (!process.env[USER_GCP_PROJECT]) {
-    const current = process.env['GOOGLE_CLOUD_PROJECT'];
-    if (current && current !== 'cloudshell-gca') {
-      process.env[USER_GCP_PROJECT] = current;
-    }
-  }
-
-  let value: string | undefined = 'cloudshell-gca';
-
-  if (selectedAuthType === AuthType.USE_VERTEX_AI) {
-    value = process.env[USER_GCP_PROJECT];
-  }
+  let value = 'cloudshell-gca';
 
   if (envFilePath && fs.existsSync(envFilePath)) {
     const envFileContent = fs.readFileSync(envFilePath);
@@ -580,12 +555,7 @@ export function setUpCloudShellEnvironment(
       }
     }
   }
-
-  if (value !== undefined) {
-    process.env['GOOGLE_CLOUD_PROJECT'] = value;
-  } else if (process.env['GOOGLE_CLOUD_PROJECT'] === 'cloudshell-gca') {
-    delete process.env['GOOGLE_CLOUD_PROJECT'];
-  }
+  process.env['GOOGLE_CLOUD_PROJECT'] = value;
 }
 
 export function loadEnvironment(
@@ -614,13 +584,7 @@ export function loadEnvironment(
 
   // Cloud Shell environment variable handling
   if (process.env['CLOUD_SHELL'] === 'true') {
-    const selectedAuthType = settings.security?.auth?.selectedType;
-    setUpCloudShellEnvironment(
-      envFilePath,
-      isTrusted,
-      isSandboxed,
-      selectedAuthType,
-    );
+    setUpCloudShellEnvironment(envFilePath, isTrusted, isSandboxed);
   }
 
   if (envFilePath) {

packages/cli/src/config/settingsSchema.ts

@@ -2057,8 +2057,8 @@ const SETTINGS_SCHEMA = {
         label: 'Gemma Models',
         category: 'Experimental',
         requiresRestart: true,
-        default: true,
-        description: 'Enable access to Gemma 4 models via Gemini API.',
+        default: false,
+        description: 'Enable access to Gemma 4 models (experimental).',
         showInDialog: true,
       },
       voiceMode: {
@@ -2099,11 +2099,7 @@ const SETTINGS_SCHEMA = {
             category: 'Experimental',
             requiresRestart: false,
             default: 'gemini-live',
-            description: oneLine`
-              The backend to use for voice transcription. Note: When using the
-              Gemini Live backend, voice recordings are sent to Google Cloud for
-              transcription.
-            `,
+            description: 'The backend to use for voice transcription.',
             showInDialog: true,
             options: [
               { value: 'gemini-live', label: 'Gemini Live API (Cloud)' },
@@ -2441,6 +2437,15 @@ const SETTINGS_SCHEMA = {
         description: 'Deprecated: Use general.topicUpdateNarration instead.',
         showInDialog: false,
       },
+      enhanceCommand: {
+        type: 'boolean',
+        label: 'Enhance Command',
+        category: 'Experimental',
+        requiresRestart: true,
+        default: false,
+        description: 'Enable the experimental /enhance slash command.',
+        showInDialog: true,
+      },
     },
   },
   extensions: {

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

@@ -1,54 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { loadCliConfig, type CliArgs } from './config.js';
-import { ExtensionManager } from './extension-manager.js';
-import { createTestMergedSettings } from './settings.js';
-
-vi.mock('./extension-manager.js', () => ({
-  ExtensionManager: vi.fn().mockImplementation(() => ({
-    loadExtensions: vi.fn().mockResolvedValue([]),
-    getExtensions: vi.fn().mockReturnValue([]),
-  })),
-}));
-
-describe('loadCliConfig skipExtensions', () => {
-  const settings = createTestMergedSettings();
-  const argv = {
-    query: undefined,
-    model: undefined,
-    sandbox: undefined,
-    debug: undefined,
-    prompt: undefined,
-    promptInteractive: undefined,
-    yolo: undefined,
-    approvalMode: undefined,
-    policy: undefined,
-    adminPolicy: undefined,
-    allowedMcpServerNames: undefined,
-    allowedTools: undefined,
-    extensions: undefined,
-    listExtensions: undefined,
-    resume: undefined,
-    sessionId: undefined,
-    listSessions: undefined,
-  } as unknown as CliArgs;
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-  });
-
-  it('should load extensions by default', async () => {
-    await loadCliConfig(settings, 'session-id', argv);
-    expect(ExtensionManager).toHaveBeenCalled();
-  });
-
-  it('should skip extensions when skipExtensions is true', async () => {
-    await loadCliConfig(settings, 'session-id', argv, { skipExtensions: true });
-    expect(ExtensionManager).not.toHaveBeenCalled();
-  });
-});

packages/cli/src/gemini.tsx

@@ -13,7 +13,6 @@ import {
   type OutputPayload,
   type ConsoleLogPayload,
   type UserFeedbackPayload,
-  type CoreEvents,
   createSessionId,
   logUserPrompt,
   AuthType,
@@ -77,7 +76,7 @@ import {
   type InitializationResult,
 } from './core/initializer.js';
 import { validateAuthMethod } from './config/auth.js';
-import { runAcpClient } from './acp/acpStdioTransport.js';
+import { runAcpClient } from './acp/acpClient.js';
 import { validateNonInteractiveAuth } from './validateNonInterActiveAuth.js';
 import { appEvents, AppEvent } from './utils/events.js';
 import { SessionError, SessionSelector } from './utils/sessionUtils.js';
@@ -262,7 +261,6 @@ export async function startInteractiveUI(
 }
 
 export async function main() {
-  let config: Config | undefined;
   const cliStartupHandle = startupProfiler.start('cli_startup');
 
   // Listen for admin controls from parent process (IPC) in non-sandbox mode. In
@@ -275,7 +273,7 @@ export async function main() {
   const cleanupStdio = patchStdio();
   registerSyncCleanup(() => {
     // This is needed to ensure we don't lose any buffered output.
-    initializeOutputListenersAndFlush(config);
+    initializeOutputListenersAndFlush();
     cleanupStdio();
   });
 
@@ -411,8 +409,6 @@ export async function main() {
 
   const partialConfig = await loadCliConfig(settings.merged, sessionId, argv, {
     projectHooks: settings.workspace.settings.hooks,
-    skipExtensions: true,
-    skipMemoryLoad: true,
   });
 
   adminControlsListner.setConfig(partialConfig);
@@ -538,7 +534,7 @@ export async function main() {
   // may have side effects.
   {
     const loadConfigHandle = startupProfiler.start('load_cli_config');
-    config = await loadCliConfig(settings.merged, sessionId, argv, {
+    const config = await loadCliConfig(settings.merged, sessionId, argv, {
       projectHooks: settings.workspace.settings.hooks,
       worktreeSettings: worktreeInfo,
     });
@@ -784,7 +780,7 @@ export async function main() {
       debugLogger.log('Session ID: %s', sessionId);
     }
 
-    initializeOutputListenersAndFlush(config);
+    initializeOutputListenersAndFlush();
 
     await runNonInteractive({
       config,
@@ -799,7 +795,7 @@ export async function main() {
   }
 }
 
-export function initializeOutputListenersAndFlush(config?: Config) {
+export function initializeOutputListenersAndFlush() {
   // If there are no listeners for output, make sure we flush so output is not
   // lost.
   if (coreEvents.listenerCount(CoreEvent.Output) === 0) {
@@ -811,43 +807,24 @@ export function initializeOutputListenersAndFlush(config?: Config) {
         writeToStdout(payload.chunk, payload.encoding);
       }
     });
-  }
 
-  if (coreEvents.listenerCount(CoreEvent.ConsoleLog) === 0) {
-    coreEvents.on(CoreEvent.ConsoleLog, (payload: ConsoleLogPayload) => {
-      if (payload.type === 'error' || payload.type === 'warn') {
-        writeToStderr(payload.content + '\n');
-      } else {
-        writeToStderr(payload.content + '\n');
-      }
-    });
-  }
-
-  if (coreEvents.listenerCount(CoreEvent.UserFeedback) === 0) {
-    coreEvents.on(CoreEvent.UserFeedback, (payload: UserFeedbackPayload) => {
-      writeToStderr(payload.message + '\n');
-    });
-  }
-
-  const outputFormat = config?.getOutputFormat();
-  const forceToStderr = outputFormat === 'json';
-
-  coreEvents.drainBacklogs(
-    <K extends keyof CoreEvents>(event: K, args: CoreEvents[K]) => {
-      if (forceToStderr && event === (CoreEvent.Output as string)) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-        const payload = args[0] as OutputPayload;
-        if (!payload.isStderr) {
-          return {
-            event,
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-            args: [{ ...payload, isStderr: true }] as unknown as CoreEvents[K],
-          };
+    if (coreEvents.listenerCount(CoreEvent.ConsoleLog) === 0) {
+      coreEvents.on(CoreEvent.ConsoleLog, (payload: ConsoleLogPayload) => {
+        if (payload.type === 'error' || payload.type === 'warn') {
+          writeToStderr(payload.content + '\n');
+        } else {
+          writeToStderr(payload.content + '\n');
         }
-      }
-      return { event, args };
-    },
-  );
+      });
+    }
+
+    if (coreEvents.listenerCount(CoreEvent.UserFeedback) === 0) {
+      coreEvents.on(CoreEvent.UserFeedback, (payload: UserFeedbackPayload) => {
+        writeToStderr(payload.message + '\n');
+      });
+    }
+  }
+  coreEvents.drainBacklogs();
 }
 
 function setupAdminControlsListener() {

packages/cli/src/gemini_cleanup.test.tsx

@@ -157,7 +157,7 @@ vi.mock('./utils/cleanup.js', async (importOriginal) => {
   };
 });
 
-vi.mock('./acp/acpStdioTransport.js', () => ({
+vi.mock('./acp/acpClient.js', () => ({
   runAcpClient: vi.fn().mockResolvedValue(undefined),
 }));
 

packages/cli/src/interactiveCli.tsx

@@ -179,12 +179,7 @@ export async function startInteractiveUI(
 
   checkForUpdates(settings)
     .then((info) => {
-      handleAutoUpdate(
-        info,
-        settings,
-        config.getProjectRoot(),
-        config.getSandboxEnabled(),
-      );
+      handleAutoUpdate(info, settings, config.getProjectRoot());
     })
     .catch((err) => {
       // Silently ignore update check errors.

packages/cli/src/nonInteractiveCli.test.ts

@@ -21,7 +21,6 @@ import {
   FatalInputError,
   CoreEvent,
   CoreToolCallStatus,
-  JsonStreamEventType,
 } from '@google/gemini-cli-core';
 import type { Part } from '@google/genai';
 import { runNonInteractive } from './nonInteractiveCli.js';
@@ -263,6 +262,7 @@ describe('runNonInteractive', () => {
       expect.any(AbortSignal),
       'prompt-id-1',
       undefined,
+      false,
       'Test input',
     );
     expect(getWrittenOutput()).toBe('Hello World\n');
@@ -381,6 +381,7 @@ describe('runNonInteractive', () => {
       expect.any(AbortSignal),
       'prompt-id-2',
       undefined,
+      false,
       undefined,
     );
     expect(getWrittenOutput()).toBe('Final answer\n');
@@ -540,6 +541,7 @@ describe('runNonInteractive', () => {
       expect.any(AbortSignal),
       'prompt-id-3',
       undefined,
+      false,
       undefined,
     );
     expect(getWrittenOutput()).toBe('Sorry, let me try again.\n');
@@ -681,6 +683,7 @@ describe('runNonInteractive', () => {
       expect.any(AbortSignal),
       'prompt-id-7',
       undefined,
+      false,
       rawInput,
     );
 
@@ -700,7 +703,7 @@ describe('runNonInteractive', () => {
       createStreamFromEvents(events),
     );
     vi.mocked(mockConfig.getOutputFormat).mockReturnValue(OutputFormat.JSON);
-    vi.spyOn(uiTelemetryService, 'getMetrics').mockReturnValue(
+    vi.mocked(uiTelemetryService.getMetrics).mockReturnValue(
       MOCK_SESSION_METRICS,
     );
 
@@ -716,6 +719,7 @@ describe('runNonInteractive', () => {
       expect.any(AbortSignal),
       'prompt-id-1',
       undefined,
+      false,
       'Test input',
     );
     expect(processStdoutSpy).toHaveBeenCalledWith(
@@ -789,7 +793,7 @@ describe('runNonInteractive', () => {
       .mockReturnValueOnce(createStreamFromEvents(secondCallEvents));
 
     vi.mocked(mockConfig.getOutputFormat).mockReturnValue(OutputFormat.JSON);
-    vi.spyOn(uiTelemetryService, 'getMetrics').mockReturnValue(
+    vi.mocked(uiTelemetryService.getMetrics).mockReturnValue(
       MOCK_SESSION_METRICS,
     );
 
@@ -832,7 +836,7 @@ describe('runNonInteractive', () => {
       createStreamFromEvents(events),
     );
     vi.mocked(mockConfig.getOutputFormat).mockReturnValue(OutputFormat.JSON);
-    vi.spyOn(uiTelemetryService, 'getMetrics').mockReturnValue(
+    vi.mocked(uiTelemetryService.getMetrics).mockReturnValue(
       MOCK_SESSION_METRICS,
     );
 
@@ -848,6 +852,7 @@ describe('runNonInteractive', () => {
       expect.any(AbortSignal),
       'prompt-id-empty',
       undefined,
+      false,
       'Empty response test',
     );
 
@@ -984,6 +989,7 @@ describe('runNonInteractive', () => {
       expect.any(AbortSignal),
       'prompt-id-slash',
       undefined,
+      false,
       '/testcommand',
     );
 
@@ -1029,6 +1035,7 @@ describe('runNonInteractive', () => {
       expect.any(AbortSignal),
       'prompt-id-slash',
       undefined,
+      false,
       '/help',
     );
     expect(getWrittenOutput()).toBe('Response to slash command\n');
@@ -1206,6 +1213,7 @@ describe('runNonInteractive', () => {
       expect.any(AbortSignal),
       'prompt-id-unknown',
       undefined,
+      false,
       '/unknowncommand',
     );
 
@@ -1522,7 +1530,7 @@ describe('runNonInteractive', () => {
     vi.mocked(mockConfig.getOutputFormat).mockReturnValue(
       OutputFormat.STREAM_JSON,
     );
-    vi.spyOn(uiTelemetryService, 'getMetrics').mockReturnValue(
+    vi.mocked(uiTelemetryService.getMetrics).mockReturnValue(
       MOCK_SESSION_METRICS,
     );
 
@@ -1684,7 +1692,7 @@ describe('runNonInteractive', () => {
       vi.mocked(mockConfig.getOutputFormat).mockReturnValue(
         OutputFormat.STREAM_JSON,
       );
-      vi.spyOn(uiTelemetryService, 'getMetrics').mockReturnValue(
+      vi.mocked(uiTelemetryService.getMetrics).mockReturnValue(
         MOCK_SESSION_METRICS,
       );
 
@@ -1718,53 +1726,6 @@ describe('runNonInteractive', () => {
     },
   );
 
-  it.each([
-    {
-      name: 'loop detected',
-      events: [
-        { type: GeminiEventType.LoopDetected },
-      ] as ServerGeminiStreamEvent[],
-      expectedWarning: 'Loop detected, stopping execution',
-    },
-    {
-      name: 'max session turns',
-      events: [
-        { type: GeminiEventType.MaxSessionTurns },
-      ] as ServerGeminiStreamEvent[],
-      expectedWarning: 'Maximum session turns exceeded',
-    },
-  ])(
-    'should include warning in JSON mode for: $name',
-    async ({ events, expectedWarning }) => {
-      vi.mocked(mockConfig.getOutputFormat).mockReturnValue(OutputFormat.JSON);
-      vi.spyOn(uiTelemetryService, 'getMetrics').mockReturnValue(
-        MOCK_SESSION_METRICS,
-      );
-
-      const streamEvents: ServerGeminiStreamEvent[] = [
-        ...events,
-        {
-          type: GeminiEventType.Finished,
-          value: { reason: undefined, usageMetadata: { totalTokenCount: 0 } },
-        },
-      ];
-      mockGeminiClient.sendMessageStream.mockReturnValue(
-        createStreamFromEvents(streamEvents),
-      );
-
-      await runNonInteractive({
-        config: mockConfig,
-        settings: mockSettings,
-        input: 'test',
-        prompt_id: 'test',
-      });
-
-      const output = JSON.parse(getWrittenOutput());
-      expect(output.warnings).toBeDefined();
-      expect(output.warnings).toContain(expectedWarning);
-    },
-  );
-
   it('should log error when tool recording fails', async () => {
     const toolCallEvent: ServerGeminiStreamEvent = {
       type: GeminiEventType.ToolCallRequest,
@@ -1906,7 +1867,7 @@ describe('runNonInteractive', () => {
 
   it('should write JSON output when a tool call returns STOP_EXECUTION error', async () => {
     vi.mocked(mockConfig.getOutputFormat).mockReturnValue(OutputFormat.JSON);
-    vi.spyOn(uiTelemetryService, 'getMetrics').mockReturnValue(
+    vi.mocked(uiTelemetryService.getMetrics).mockReturnValue(
       MOCK_SESSION_METRICS,
     );
 
@@ -1970,7 +1931,7 @@ describe('runNonInteractive', () => {
     vi.mocked(mockConfig.getOutputFormat).mockReturnValue(
       OutputFormat.STREAM_JSON,
     );
-    vi.spyOn(uiTelemetryService, 'getMetrics').mockReturnValue(
+    vi.mocked(uiTelemetryService.getMetrics).mockReturnValue(
       MOCK_SESSION_METRICS,
     );
 
@@ -2076,235 +2037,6 @@ describe('runNonInteractive', () => {
       expect(mockGeminiClient.sendMessageStream).toHaveBeenCalledTimes(1);
       expect(getWrittenOutput()).toBe('Final answer\n');
     });
-
-    it('should emit ERROR event in STREAM_JSON mode when AgentExecutionBlocked occurs', async () => {
-      const allEvents: ServerGeminiStreamEvent[] = [
-        {
-          type: GeminiEventType.AgentExecutionBlocked,
-          value: { reason: 'Blocked by hook' },
-        },
-        { type: GeminiEventType.Content, value: 'Final answer' },
-        {
-          type: GeminiEventType.Finished,
-          value: { reason: undefined, usageMetadata: { totalTokenCount: 10 } },
-        },
-      ];
-
-      mockGeminiClient.sendMessageStream.mockReturnValue(
-        createStreamFromEvents(allEvents),
-      );
-
-      vi.spyOn(uiTelemetryService, 'getMetrics').mockReturnValue(
-        MOCK_SESSION_METRICS,
-      );
-
-      // Setup stream-json format
-      vi.mocked(mockConfig.getOutputFormat).mockReturnValue(
-        OutputFormat.STREAM_JSON,
-      );
-
-      await runNonInteractive({
-        config: mockConfig,
-        settings: mockSettings,
-        input: 'test block',
-        prompt_id: 'prompt-id-block',
-      });
-
-      const calls = processStdoutSpy.mock.calls.map((call) =>
-        JSON.parse(call[0] as string),
-      );
-      const errorEvent = calls.find(
-        (c) => c.type === JsonStreamEventType.ERROR,
-      );
-
-      expect(errorEvent).toBeDefined();
-      expect(errorEvent.message).toContain(
-        'Agent execution blocked: Blocked by hook',
-      );
-      expect(errorEvent.severity).toBe('warning');
-    });
-
-    it('should include warning in JSON mode when AgentExecutionBlocked occurs', async () => {
-      const allEvents: ServerGeminiStreamEvent[] = [
-        {
-          type: GeminiEventType.AgentExecutionBlocked,
-          value: { reason: 'Blocked by hook' },
-        },
-        { type: GeminiEventType.Content, value: 'Final answer' },
-        {
-          type: GeminiEventType.Finished,
-          value: { reason: undefined, usageMetadata: { totalTokenCount: 10 } },
-        },
-      ];
-
-      mockGeminiClient.sendMessageStream.mockReturnValue(
-        createStreamFromEvents(allEvents),
-      );
-
-      vi.mocked(mockConfig.getOutputFormat).mockReturnValue(OutputFormat.JSON);
-
-      await runNonInteractive({
-        config: mockConfig,
-        settings: mockSettings,
-        input: 'test block',
-        prompt_id: 'prompt-id-block',
-      });
-
-      const output = JSON.parse(getWrittenOutput());
-      expect(output.warnings).toBeDefined();
-      expect(output.warnings).toContain(
-        'Agent execution blocked: Blocked by hook',
-      );
-    });
-
-    it('should handle multiple AgentExecutionBlocked events and collect all warnings', async () => {
-      const allEvents: ServerGeminiStreamEvent[] = [
-        {
-          type: GeminiEventType.AgentExecutionBlocked,
-          value: { reason: 'Block 1', systemMessage: 'Reason 1' },
-        },
-        {
-          type: GeminiEventType.AgentExecutionBlocked,
-          value: { reason: 'Block 2', systemMessage: 'Reason 2' },
-        },
-        { type: GeminiEventType.Content, value: 'Final answer' },
-        {
-          type: GeminiEventType.Finished,
-          value: { reason: undefined, usageMetadata: { totalTokenCount: 10 } },
-        },
-      ];
-
-      mockGeminiClient.sendMessageStream.mockImplementation(() =>
-        createStreamFromEvents(allEvents),
-      );
-      vi.spyOn(uiTelemetryService, 'getMetrics').mockReturnValue(
-        MOCK_SESSION_METRICS,
-      );
-
-      vi.mocked(mockConfig.getOutputFormat).mockReturnValue(OutputFormat.JSON);
-
-      await runNonInteractive({
-        config: mockConfig,
-        settings: mockSettings,
-        input: 'test',
-        prompt_id: 'test',
-      });
-
-      const output = JSON.parse(getWrittenOutput());
-      expect(output.warnings).toHaveLength(2);
-      expect(output.warnings).toContain('Agent execution blocked: Reason 1');
-      expect(output.warnings).toContain('Agent execution blocked: Reason 2');
-    });
-
-    it('should not include warnings field in JSON output if no blocks occur', async () => {
-      const allEvents: ServerGeminiStreamEvent[] = [
-        { type: GeminiEventType.Content, value: 'Clean answer' },
-        {
-          type: GeminiEventType.Finished,
-          value: { reason: undefined, usageMetadata: { totalTokenCount: 10 } },
-        },
-      ];
-
-      mockGeminiClient.sendMessageStream.mockImplementation(() =>
-        createStreamFromEvents(allEvents),
-      );
-      vi.spyOn(uiTelemetryService, 'getMetrics').mockReturnValue(
-        MOCK_SESSION_METRICS,
-      );
-
-      vi.mocked(mockConfig.getOutputFormat).mockReturnValue(OutputFormat.JSON);
-
-      await runNonInteractive({
-        config: mockConfig,
-        settings: mockSettings,
-        input: 'test',
-        prompt_id: 'test',
-      });
-
-      const output = JSON.parse(getWrittenOutput());
-      expect(output.warnings).toBeUndefined();
-    });
-
-    it('should handle InvalidStream event gracefully in TEXT mode', async () => {
-      const events: ServerGeminiStreamEvent[] = [
-        { type: GeminiEventType.InvalidStream },
-      ];
-      mockGeminiClient.sendMessageStream.mockReturnValue(
-        createStreamFromEvents(events),
-      );
-
-      await runNonInteractive({
-        config: mockConfig,
-        settings: mockSettings,
-        input: 'test invalid stream',
-        prompt_id: 'prompt-id-invalid',
-      });
-
-      expect(processStderrSpy).toHaveBeenCalledWith(
-        '[ERROR] Invalid stream: The model returned an empty response or malformed tool call.\n',
-      );
-      expect(mockGeminiClient.sendMessageStream).toHaveBeenCalledTimes(1);
-    });
-
-    it('should handle InvalidStream event gracefully in STREAM_JSON mode', async () => {
-      vi.spyOn(uiTelemetryService, 'getMetrics').mockReturnValue(
-        MOCK_SESSION_METRICS,
-      );
-      vi.spyOn(mockConfig, 'getOutputFormat').mockReturnValue(
-        OutputFormat.STREAM_JSON,
-      );
-      const events: ServerGeminiStreamEvent[] = [
-        { type: GeminiEventType.InvalidStream },
-      ];
-      mockGeminiClient.sendMessageStream.mockReturnValue(
-        createStreamFromEvents(events),
-      );
-
-      await runNonInteractive({
-        config: mockConfig,
-        settings: mockSettings,
-        input: 'test invalid stream',
-        prompt_id: 'prompt-id-invalid',
-      });
-
-      const output = getWrittenOutput();
-      expect(output).toContain('"type":"error"');
-      expect(output).toContain('"severity":"error"');
-      expect(output).toContain(
-        'Invalid stream: The model returned an empty response or malformed tool call.',
-      );
-      expect(mockGeminiClient.sendMessageStream).toHaveBeenCalledTimes(1);
-    });
-
-    it('should handle InvalidStream event gracefully in JSON mode', async () => {
-      vi.spyOn(uiTelemetryService, 'getMetrics').mockReturnValue(
-        MOCK_SESSION_METRICS,
-      );
-      vi.spyOn(mockConfig, 'getOutputFormat').mockReturnValue(
-        OutputFormat.JSON,
-      );
-      const events: ServerGeminiStreamEvent[] = [
-        { type: GeminiEventType.InvalidStream },
-      ];
-      mockGeminiClient.sendMessageStream.mockReturnValue(
-        createStreamFromEvents(events),
-      );
-
-      await runNonInteractive({
-        config: mockConfig,
-        settings: mockSettings,
-        input: 'test invalid stream',
-        prompt_id: 'prompt-id-invalid',
-      });
-
-      const output = getWrittenOutput();
-      expect(output).toContain('"error": {');
-      expect(output).toContain('"type": "INVALID_STREAM"');
-      expect(output).toContain(
-        'Invalid stream: The model returned an empty response or malformed tool call.',
-      );
-      expect(mockGeminiClient.sendMessageStream).toHaveBeenCalledTimes(1);
-    });
   });
 
   describe('Output Sanitization', () => {
@@ -2486,7 +2218,7 @@ describe('runNonInteractive', () => {
       vi.mocked(mockConfig.getOutputFormat).mockReturnValue(
         OutputFormat.STREAM_JSON,
       );
-      vi.spyOn(uiTelemetryService, 'getMetrics').mockReturnValue(
+      vi.mocked(uiTelemetryService.getMetrics).mockReturnValue(
         MOCK_SESSION_METRICS,
       );
 

packages/cli/src/nonInteractiveCli.ts

@@ -56,13 +56,6 @@ interface RunNonInteractiveParams {
   resumedSessionData?: ResumedSessionData;
 }
 
-/**
- * Runs the non-interactive CLI loop.
- *
- * Programmatic output formats (JSON, STREAM_JSON) use lenient sanitization
- * by stripping ANSI escape sequences from messages to ensure clean,
- * parseable output for downstream consumers.
- */
 export async function runNonInteractive(
   params: RunNonInteractiveParams,
 ): Promise<void> {
@@ -302,8 +295,6 @@ export async function runNonInteractive(
       let currentMessages: Content[] = [{ role: 'user', parts: query }];
 
       let turnCount = 0;
-      let invalidStreamError: string | undefined;
-      const warnings: string[] = [];
       while (true) {
         turnCount++;
         if (
@@ -319,6 +310,7 @@ export async function runNonInteractive(
           abortController.signal,
           prompt_id,
           undefined,
+          false,
           turnCount === 1 ? input : undefined,
         );
 
@@ -359,27 +351,23 @@ export async function runNonInteractive(
             }
             toolCallRequests.push(event.value);
           } else if (event.type === GeminiEventType.LoopDetected) {
-            const message = 'Loop detected, stopping execution';
             if (streamFormatter) {
               streamFormatter.emitEvent({
                 type: JsonStreamEventType.ERROR,
                 timestamp: new Date().toISOString(),
                 severity: 'warning',
-                message,
+                message: 'Loop detected, stopping execution',
               });
             }
-            warnings.push(message);
           } else if (event.type === GeminiEventType.MaxSessionTurns) {
-            const message = 'Maximum session turns exceeded';
             if (streamFormatter) {
               streamFormatter.emitEvent({
                 type: JsonStreamEventType.ERROR,
                 timestamp: new Date().toISOString(),
                 severity: 'error',
-                message,
+                message: 'Maximum session turns exceeded',
               });
             }
-            warnings.push(message);
           } else if (event.type === GeminiEventType.Error) {
             throw event.value.error;
           } else if (event.type === GeminiEventType.AgentExecutionStopped) {
@@ -406,30 +394,7 @@ export async function runNonInteractive(
             const blockMessage = `Agent execution blocked: ${event.value.systemMessage?.trim() || event.value.reason}`;
             if (config.getOutputFormat() === OutputFormat.TEXT) {
               process.stderr.write(`[WARNING] ${blockMessage}\n`);
-            } else if (streamFormatter) {
-              streamFormatter.emitEvent({
-                type: JsonStreamEventType.ERROR,
-                timestamp: new Date().toISOString(),
-                severity: 'warning',
-                message: stripAnsi(blockMessage),
-              });
             }
-            warnings.push(blockMessage);
-          } else if (event.type === GeminiEventType.InvalidStream) {
-            invalidStreamError =
-              'Invalid stream: The model returned an empty response or malformed tool call.';
-            if (streamFormatter) {
-              streamFormatter.emitEvent({
-                type: JsonStreamEventType.ERROR,
-                timestamp: new Date().toISOString(),
-                severity: 'error',
-                message: invalidStreamError,
-              });
-            } else if (config.getOutputFormat() === OutputFormat.TEXT) {
-              process.stderr.write(`[ERROR] ${invalidStreamError}\n`);
-            }
-            toolCallRequests.length = 0;
-            break;
           }
         }
 
@@ -526,13 +491,7 @@ export async function runNonInteractive(
               const formatter = new JsonFormatter();
               const stats = uiTelemetryService.getMetrics();
               textOutput.write(
-                formatter.format(
-                  config.getSessionId(),
-                  responseText,
-                  stats,
-                  undefined,
-                  warnings,
-                ),
+                formatter.format(config.getSessionId(), responseText, stats),
               );
             } else {
               textOutput.ensureTrailingNewline(); // Ensure a final newline
@@ -549,22 +508,14 @@ export async function runNonInteractive(
             streamFormatter.emitEvent({
               type: JsonStreamEventType.RESULT,
               timestamp: new Date().toISOString(),
-              status: invalidStreamError ? 'error' : 'success',
+              status: 'success',
               stats: streamFormatter.convertToStreamStats(metrics, durationMs),
             });
           } else if (config.getOutputFormat() === OutputFormat.JSON) {
             const formatter = new JsonFormatter();
             const stats = uiTelemetryService.getMetrics();
             textOutput.write(
-              formatter.format(
-                config.getSessionId(),
-                responseText,
-                stats,
-                invalidStreamError
-                  ? { type: 'INVALID_STREAM', message: invalidStreamError }
-                  : undefined,
-                warnings,
-              ),
+              formatter.format(config.getSessionId(), responseText, stats),
             );
           } else {
             textOutput.ensureTrailingNewline(); // Ensure a final newline

packages/cli/src/nonInteractiveCliAgentSession.test.ts

@@ -21,7 +21,6 @@ import {
   FatalInputError,
   CoreEvent,
   CoreToolCallStatus,
-  JsonStreamEventType,
 } from '@google/gemini-cli-core';
 import type { Part } from '@google/genai';
 import { runNonInteractive } from './nonInteractiveCliAgentSession.js';
@@ -269,6 +268,7 @@ describe('runNonInteractive', () => {
       expect.any(AbortSignal),
       'prompt-id-1',
       undefined,
+      false,
       'Test input',
     );
     expect(getWrittenOutput()).toBe('Hello World\n');
@@ -435,6 +435,7 @@ describe('runNonInteractive', () => {
       expect.any(AbortSignal),
       'prompt-id-2',
       undefined,
+      false,
       undefined,
     );
     expect(getWrittenOutput()).toBe('Final answer\n');
@@ -594,6 +595,7 @@ describe('runNonInteractive', () => {
       expect.any(AbortSignal),
       'prompt-id-3',
       undefined,
+      false,
       undefined,
     );
     expect(getWrittenOutput()).toBe('Sorry, let me try again.\n');
@@ -735,6 +737,7 @@ describe('runNonInteractive', () => {
       expect.any(AbortSignal),
       'prompt-id-7',
       undefined,
+      false,
       rawInput,
     );
 
@@ -754,7 +757,7 @@ describe('runNonInteractive', () => {
       createStreamFromEvents(events),
     );
     vi.mocked(mockConfig.getOutputFormat).mockReturnValue(OutputFormat.JSON);
-    vi.spyOn(uiTelemetryService, 'getMetrics').mockReturnValue(
+    vi.mocked(uiTelemetryService.getMetrics).mockReturnValue(
       MOCK_SESSION_METRICS,
     );
 
@@ -770,6 +773,7 @@ describe('runNonInteractive', () => {
       expect.any(AbortSignal),
       'prompt-id-1',
       undefined,
+      false,
       'Test input',
     );
     expect(processStdoutSpy).toHaveBeenCalledWith(
@@ -843,7 +847,7 @@ describe('runNonInteractive', () => {
       .mockReturnValueOnce(createStreamFromEvents(secondCallEvents));
 
     vi.mocked(mockConfig.getOutputFormat).mockReturnValue(OutputFormat.JSON);
-    vi.spyOn(uiTelemetryService, 'getMetrics').mockReturnValue(
+    vi.mocked(uiTelemetryService.getMetrics).mockReturnValue(
       MOCK_SESSION_METRICS,
     );
 
@@ -923,7 +927,7 @@ describe('runNonInteractive', () => {
       );
 
     vi.mocked(mockConfig.getOutputFormat).mockReturnValue(OutputFormat.JSON);
-    vi.spyOn(uiTelemetryService, 'getMetrics').mockReturnValue(
+    vi.mocked(uiTelemetryService.getMetrics).mockReturnValue(
       MOCK_SESSION_METRICS,
     );
 
@@ -959,7 +963,7 @@ describe('runNonInteractive', () => {
       createStreamFromEvents(events),
     );
     vi.mocked(mockConfig.getOutputFormat).mockReturnValue(OutputFormat.JSON);
-    vi.spyOn(uiTelemetryService, 'getMetrics').mockReturnValue(
+    vi.mocked(uiTelemetryService.getMetrics).mockReturnValue(
       MOCK_SESSION_METRICS,
     );
 
@@ -975,6 +979,7 @@ describe('runNonInteractive', () => {
       expect.any(AbortSignal),
       'prompt-id-empty',
       undefined,
+      false,
       'Empty response test',
     );
 
@@ -1111,6 +1116,7 @@ describe('runNonInteractive', () => {
       expect.any(AbortSignal),
       'prompt-id-slash',
       undefined,
+      false,
       '/testcommand',
     );
 
@@ -1156,6 +1162,7 @@ describe('runNonInteractive', () => {
       expect.any(AbortSignal),
       'prompt-id-slash',
       undefined,
+      false,
       '/help',
     );
     expect(getWrittenOutput()).toBe('Response to slash command\n');
@@ -1375,6 +1382,7 @@ describe('runNonInteractive', () => {
       expect.any(AbortSignal),
       'prompt-id-unknown',
       undefined,
+      false,
       '/unknowncommand',
     );
 
@@ -1691,7 +1699,7 @@ describe('runNonInteractive', () => {
     vi.mocked(mockConfig.getOutputFormat).mockReturnValue(
       OutputFormat.STREAM_JSON,
     );
-    vi.spyOn(uiTelemetryService, 'getMetrics').mockReturnValue(
+    vi.mocked(uiTelemetryService.getMetrics).mockReturnValue(
       MOCK_SESSION_METRICS,
     );
 
@@ -1853,7 +1861,7 @@ describe('runNonInteractive', () => {
       vi.mocked(mockConfig.getOutputFormat).mockReturnValue(
         OutputFormat.STREAM_JSON,
       );
-      vi.spyOn(uiTelemetryService, 'getMetrics').mockReturnValue(
+      vi.mocked(uiTelemetryService.getMetrics).mockReturnValue(
         MOCK_SESSION_METRICS,
       );
 
@@ -1887,50 +1895,6 @@ describe('runNonInteractive', () => {
     },
   );
 
-  it.each([
-    {
-      name: 'loop detected',
-      events: [
-        { type: GeminiEventType.LoopDetected },
-      ] as ServerGeminiStreamEvent[],
-      expectedWarning: 'Loop detected, stopping execution',
-    },
-  ])(
-    'should include warning in JSON mode for: $name',
-    async ({ events, expectedWarning }) => {
-      vi.mocked(mockConfig.getOutputFormat).mockReturnValue(OutputFormat.JSON);
-      vi.spyOn(uiTelemetryService, 'getMetrics').mockReturnValue(
-        MOCK_SESSION_METRICS,
-      );
-
-      const streamEvents: ServerGeminiStreamEvent[] = [
-        ...events,
-        {
-          type: GeminiEventType.Finished,
-          value: { reason: undefined, usageMetadata: { totalTokenCount: 0 } },
-        },
-      ];
-      mockGeminiClient.sendMessageStream.mockReturnValue(
-        createStreamFromEvents(streamEvents),
-      );
-
-      try {
-        await runNonInteractive({
-          config: mockConfig,
-          settings: mockSettings,
-          input: 'test',
-          prompt_id: 'test',
-        });
-      } catch {
-        // Expected exit for max turns
-      }
-
-      const output = JSON.parse(getWrittenOutput());
-      expect(output.warnings).toBeDefined();
-      expect(output.warnings[0]).toContain(expectedWarning);
-    },
-  );
-
   it('should log error when tool recording fails', async () => {
     const toolCallEvent: ServerGeminiStreamEvent = {
       type: GeminiEventType.ToolCallRequest,
@@ -2070,7 +2034,7 @@ describe('runNonInteractive', () => {
 
   it('should write JSON output when a tool call returns STOP_EXECUTION error', async () => {
     vi.mocked(mockConfig.getOutputFormat).mockReturnValue(OutputFormat.JSON);
-    vi.spyOn(uiTelemetryService, 'getMetrics').mockReturnValue(
+    vi.mocked(uiTelemetryService.getMetrics).mockReturnValue(
       MOCK_SESSION_METRICS,
     );
 
@@ -2134,7 +2098,7 @@ describe('runNonInteractive', () => {
     vi.mocked(mockConfig.getOutputFormat).mockReturnValue(
       OutputFormat.STREAM_JSON,
     );
-    vi.spyOn(uiTelemetryService, 'getMetrics').mockReturnValue(
+    vi.mocked(uiTelemetryService.getMetrics).mockReturnValue(
       MOCK_SESSION_METRICS,
     );
 
@@ -2239,154 +2203,6 @@ describe('runNonInteractive', () => {
       expect(getWrittenOutput()).toBe('Final answer\n');
       expect(mockGeminiClient.sendMessageStream).toHaveBeenCalledTimes(1);
     });
-
-    it('should emit ERROR event in STREAM_JSON mode when AgentExecutionBlocked occurs', async () => {
-      const allEvents: ServerGeminiStreamEvent[] = [
-        {
-          type: GeminiEventType.AgentExecutionBlocked,
-          value: { reason: 'Blocked by hook' },
-        },
-        { type: GeminiEventType.Content, value: 'Final answer' },
-        {
-          type: GeminiEventType.Finished,
-          value: { reason: undefined, usageMetadata: { totalTokenCount: 10 } },
-        },
-      ];
-
-      mockGeminiClient.sendMessageStream.mockReturnValue(
-        createStreamFromEvents(allEvents),
-      );
-
-      vi.spyOn(uiTelemetryService, 'getMetrics').mockReturnValue(
-        MOCK_SESSION_METRICS,
-      );
-
-      // Setup stream-json format
-      vi.mocked(mockConfig.getOutputFormat).mockReturnValue(
-        OutputFormat.STREAM_JSON,
-      );
-
-      await runNonInteractive({
-        config: mockConfig,
-        settings: mockSettings,
-        input: 'test block',
-        prompt_id: 'prompt-id-block',
-      });
-
-      const calls = processStdoutSpy.mock.calls.map((call) =>
-        JSON.parse(call[0] as string),
-      );
-      const errorEvent = calls.find(
-        (c) => c.type === JsonStreamEventType.ERROR,
-      );
-
-      expect(errorEvent).toBeDefined();
-      expect(errorEvent.message).toContain(
-        'Agent execution blocked: Blocked by hook',
-      );
-      expect(errorEvent.severity).toBe('warning');
-    });
-
-    it('should include warning in JSON mode when AgentExecutionBlocked occurs', async () => {
-      const allEvents: ServerGeminiStreamEvent[] = [
-        {
-          type: GeminiEventType.AgentExecutionBlocked,
-          value: { reason: 'Blocked by hook' },
-        },
-        { type: GeminiEventType.Content, value: 'Final answer' },
-        {
-          type: GeminiEventType.Finished,
-          value: { reason: undefined, usageMetadata: { totalTokenCount: 10 } },
-        },
-      ];
-
-      mockGeminiClient.sendMessageStream.mockReturnValue(
-        createStreamFromEvents(allEvents),
-      );
-
-      vi.mocked(mockConfig.getOutputFormat).mockReturnValue(OutputFormat.JSON);
-
-      await runNonInteractive({
-        config: mockConfig,
-        settings: mockSettings,
-        input: 'test block',
-        prompt_id: 'prompt-id-block',
-      });
-
-      const output = JSON.parse(getWrittenOutput());
-      expect(output.warnings).toBeDefined();
-      expect(output.warnings).toContain(
-        'Agent execution blocked: Blocked by hook',
-      );
-    });
-
-    it('should handle multiple AgentExecutionBlocked events and collect all warnings', async () => {
-      const allEvents: ServerGeminiStreamEvent[] = [
-        {
-          type: GeminiEventType.AgentExecutionBlocked,
-          value: { reason: 'Block 1', systemMessage: 'Reason 1' },
-        },
-        {
-          type: GeminiEventType.AgentExecutionBlocked,
-          value: { reason: 'Block 2', systemMessage: 'Reason 2' },
-        },
-        { type: GeminiEventType.Content, value: 'Final answer' },
-        {
-          type: GeminiEventType.Finished,
-          value: { reason: undefined, usageMetadata: { totalTokenCount: 10 } },
-        },
-      ];
-
-      mockGeminiClient.sendMessageStream.mockImplementation(() =>
-        createStreamFromEvents(allEvents),
-      );
-      vi.spyOn(uiTelemetryService, 'getMetrics').mockReturnValue(
-        MOCK_SESSION_METRICS,
-      );
-
-      vi.mocked(mockConfig.getOutputFormat).mockReturnValue(OutputFormat.JSON);
-
-      await runNonInteractive({
-        config: mockConfig,
-        settings: mockSettings,
-        input: 'test',
-        prompt_id: 'test',
-      });
-
-      const output = JSON.parse(getWrittenOutput());
-      expect(output.warnings).toHaveLength(2);
-      expect(output.warnings).toContain('Agent execution blocked: Reason 1');
-      expect(output.warnings).toContain('Agent execution blocked: Reason 2');
-    });
-
-    it('should not include warnings field in JSON output if no blocks occur', async () => {
-      const allEvents: ServerGeminiStreamEvent[] = [
-        { type: GeminiEventType.Content, value: 'Clean answer' },
-        {
-          type: GeminiEventType.Finished,
-          value: { reason: undefined, usageMetadata: { totalTokenCount: 10 } },
-        },
-      ];
-
-      mockGeminiClient.sendMessageStream.mockImplementation(() =>
-        createStreamFromEvents(allEvents),
-      );
-      vi.spyOn(uiTelemetryService, 'getMetrics').mockReturnValue(
-        MOCK_SESSION_METRICS,
-      );
-
-      vi.mocked(mockConfig.getOutputFormat).mockReturnValue(OutputFormat.JSON);
-
-      await runNonInteractive({
-        config: mockConfig,
-        settings: mockSettings,
-        input: 'test',
-        prompt_id: 'test',
-      });
-
-      const output = JSON.parse(getWrittenOutput());
-      expect(output.warnings).toBeUndefined();
-    });
   });
 
   describe('Output Sanitization', () => {
@@ -2530,7 +2346,7 @@ describe('runNonInteractive', () => {
       vi.mocked(mockConfig.getOutputFormat).mockReturnValue(
         OutputFormat.STREAM_JSON,
       );
-      vi.spyOn(uiTelemetryService, 'getMetrics').mockReturnValue(
+      vi.mocked(uiTelemetryService.getMetrics).mockReturnValue(
         MOCK_SESSION_METRICS,
       );
 
@@ -2602,7 +2418,7 @@ describe('runNonInteractive', () => {
       vi.mocked(mockConfig.getOutputFormat).mockReturnValue(
         OutputFormat.STREAM_JSON,
       );
-      vi.spyOn(uiTelemetryService, 'getMetrics').mockReturnValue(
+      vi.mocked(uiTelemetryService.getMetrics).mockReturnValue(
         MOCK_SESSION_METRICS,
       );
 

packages/cli/src/nonInteractiveCliAgentSession.ts

@@ -59,13 +59,6 @@ interface RunNonInteractiveParams {
   resumedSessionData?: ResumedSessionData;
 }
 
-/**
- * Runs the non-interactive CLI using the LegacyAgentSession.
- *
- * Programmatic output formats (JSON, STREAM_JSON) use lenient sanitization
- * by stripping ANSI escape sequences from messages to ensure clean,
- * parseable output for downstream consumers.
- */
 export async function runNonInteractive({
   config,
   settings,
@@ -346,13 +339,7 @@ export async function runNonInteractive({
           const formatter = new JsonFormatter();
           const stats = uiTelemetryService.getMetrics();
           textOutput.write(
-            formatter.format(
-              config.getSessionId(),
-              responseText,
-              stats,
-              undefined,
-              warnings,
-            ),
+            formatter.format(config.getSessionId(), responseText, stats),
           );
         } else {
           textOutput.ensureTrailingNewline();
@@ -433,7 +420,6 @@ export async function runNonInteractive({
       let responseText = '';
       let preToolResponseText: string | undefined;
       let streamEnded = false;
-      const warnings: string[] = [];
       for await (const event of session.stream({ streamId })) {
         if (streamEnded) break;
         switch (event.type) {
@@ -552,18 +538,9 @@ export async function runNonInteractive({
             const errorCode = event._meta?.['code'];
 
             if (errorCode === 'AGENT_EXECUTION_BLOCKED') {
-              const blockMessage = `Agent execution blocked: ${event.message.trim()}`;
               if (config.getOutputFormat() === OutputFormat.TEXT) {
-                process.stderr.write(`[WARNING] ${blockMessage}\n`);
-              } else if (streamFormatter) {
-                streamFormatter.emitEvent({
-                  type: JsonStreamEventType.ERROR,
-                  timestamp: new Date().toISOString(),
-                  severity: 'warning',
-                  message: stripAnsi(blockMessage),
-                });
+                process.stderr.write(`[WARNING] ${event.message}\n`);
               }
-              warnings.push(blockMessage);
               break;
             }
 
@@ -577,10 +554,9 @@ export async function runNonInteractive({
                 type: JsonStreamEventType.ERROR,
                 timestamp: new Date().toISOString(),
                 severity,
-                message: stripAnsi(event.message),
+                message: event.message,
               });
             }
-            warnings.push(event.message);
             break;
           }
           case 'agent_end': {

packages/cli/src/output-redirection.test.ts

@@ -1,100 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { initializeOutputListenersAndFlush } from './gemini.js';
-import { coreEvents, CoreEvent, type Config } from '@google/gemini-cli-core';
-
-// Mock core dependencies
-vi.mock('@google/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@google/gemini-cli-core')>();
-  return {
-    ...actual,
-    writeToStdout: vi.fn(),
-    writeToStderr: vi.fn(),
-  };
-});
-
-import { writeToStdout, writeToStderr } from '@google/gemini-cli-core';
-
-describe('Output Redirection', () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    // Clear listeners to simulate a clean state for each test
-    coreEvents.removeAllListeners();
-  });
-
-  afterEach(() => {
-    coreEvents.removeAllListeners();
-  });
-
-  it('should redirect buffered stdout to stderr when output format is json', () => {
-    const mockConfig = {
-      getOutputFormat: () => 'json',
-    } as unknown as Config;
-
-    // Simulate buffered output
-    coreEvents.emitOutput(false, 'informational message');
-    coreEvents.emitOutput(true, 'error message');
-
-    // Initialize listeners and flush
-    initializeOutputListenersAndFlush(mockConfig);
-
-    // Verify informational message was forced to stderr
-    expect(writeToStderr).toHaveBeenCalledWith(
-      'informational message',
-      undefined,
-    );
-    expect(writeToStderr).toHaveBeenCalledWith('error message', undefined);
-    expect(writeToStdout).not.toHaveBeenCalled();
-  });
-
-  it('should NOT redirect buffered stdout to stderr when output format is NOT json', () => {
-    const mockConfig = {
-      getOutputFormat: () => 'text',
-    } as unknown as Config;
-
-    // Simulate buffered output
-    coreEvents.emitOutput(false, 'regular message');
-
-    // Initialize listeners and flush
-    initializeOutputListenersAndFlush(mockConfig);
-
-    // Verify regular message went to stdout
-    expect(writeToStdout).toHaveBeenCalledWith('regular message', undefined);
-    expect(writeToStderr).not.toHaveBeenCalled();
-  });
-
-  it('should NOT force stdout to stderr when config is undefined (early init/version)', () => {
-    // Simulate buffered output during early init
-    coreEvents.emitOutput(false, 'early init message');
-
-    // Initialize with undefined config
-    initializeOutputListenersAndFlush(undefined);
-
-    // Verify it went to stdout (default behavior)
-    expect(writeToStdout).toHaveBeenCalledWith('early init message', undefined);
-    expect(writeToStderr).not.toHaveBeenCalled();
-  });
-
-  it('should attach ConsoleLog and UserFeedback listeners even if Output already has one', () => {
-    // Manually attach an Output listener
-    coreEvents.on(CoreEvent.Output, vi.fn());
-
-    // Initialize - should still attach ConsoleLog and UserFeedback defaults
-    initializeOutputListenersAndFlush(undefined);
-
-    // Simulate events
-    coreEvents.emitConsoleLog('info', 'stray log');
-    coreEvents.emitFeedback('info', 'stray feedback');
-
-    // Draining happens inside initializeOutputListenersAndFlush for existing backlog,
-    // but here we check the newly attached listeners for immediate emission.
-    expect(writeToStderr).toHaveBeenCalledWith('stray log\n');
-    expect(writeToStderr).toHaveBeenCalledWith('stray feedback\n');
-  });
-});

packages/cli/src/services/BuiltinCommandLoader.test.ts

@@ -171,6 +171,7 @@ describe('BuiltinCommandLoader', () => {
         isAdminEnabled: vi.fn().mockReturnValue(true),
       }),
       isVoiceModeEnabled: vi.fn().mockReturnValue(true),
+      isEnhanceCommandEnabled: vi.fn().mockReturnValue(true),
       getContentGeneratorConfig: vi.fn().mockReturnValue({
         authType: 'other',
       }),
@@ -310,6 +311,22 @@ describe('BuiltinCommandLoader', () => {
     expect(agentsCmd).toBeUndefined();
   });
 
+  it('should include enhance command when experimental enhance command is enabled', async () => {
+    (mockConfig.isEnhanceCommandEnabled as Mock).mockReturnValue(true);
+    const loader = new BuiltinCommandLoader(mockConfig);
+    const commands = await loader.loadCommands(new AbortController().signal);
+    const enhanceCmd = commands.find((c) => c.name === 'enhance');
+    expect(enhanceCmd).toBeDefined();
+  });
+
+  it('should exclude enhance command when experimental enhance command is disabled', async () => {
+    (mockConfig.isEnhanceCommandEnabled as Mock).mockReturnValue(false);
+    const loader = new BuiltinCommandLoader(mockConfig);
+    const commands = await loader.loadCommands(new AbortController().signal);
+    const enhanceCmd = commands.find((c) => c.name === 'enhance');
+    expect(enhanceCmd).toBeUndefined();
+  });
+
   describe('chat debug command', () => {
     it('should NOT add debug subcommand to chat/resume commands if not a nightly build', async () => {
       vi.mocked(isNightly).mockResolvedValue(false);
@@ -398,6 +415,7 @@ describe('BuiltinCommandLoader profile', () => {
         isAdminEnabled: vi.fn().mockReturnValue(true),
       }),
       isVoiceModeEnabled: vi.fn().mockReturnValue(true),
+      isEnhanceCommandEnabled: vi.fn().mockReturnValue(true),
       getContentGeneratorConfig: vi.fn().mockReturnValue({
         authType: 'other',
       }),

packages/cli/src/services/BuiltinCommandLoader.ts

@@ -31,6 +31,7 @@ import { corgiCommand } from '../ui/commands/corgiCommand.js';
 import { docsCommand } from '../ui/commands/docsCommand.js';
 import { directoryCommand } from '../ui/commands/directoryCommand.js';
 import { editorCommand } from '../ui/commands/editorCommand.js';
+import { enhanceCommand } from '../ui/commands/enhanceCommand.js';
 import { extensionsCommand } from '../ui/commands/extensionsCommand.js';
 import { footerCommand } from '../ui/commands/footerCommand.js';
 import { helpCommand } from '../ui/commands/helpCommand.js';
@@ -135,6 +136,7 @@ export class BuiltinCommandLoader implements ICommandLoader {
       docsCommand,
       directoryCommand,
       editorCommand,
+      ...(this.config?.isEnhanceCommandEnabled() ? [enhanceCommand] : []),
       ...(this.config?.getExtensionsEnabled() === false
         ? [
             {

packages/cli/src/services/FileCommandLoader.ts

@@ -34,20 +34,13 @@ import {
 import { AtFileProcessor } from './prompt-processors/atFileProcessor.js';
 import { sanitizeForDisplay } from '../ui/utils/textUtils.js';
 
-export interface CommandDirectory {
+interface CommandDirectory {
   path: string;
   kind: CommandKind;
   extensionName?: string;
   extensionId?: string;
 }
 
-export interface CommandFileGroup {
-  displayName: string;
-  path: string;
-  files: string[];
-  error?: string;
-}
-
 /**
  * Defines the Zod schema for a command definition file. This serves as the
  * single source of truth for both validation and type inference.
@@ -148,59 +141,6 @@ export class FileCommandLoader implements ICommandLoader {
     return allCommands;
   }
 
-  /**
-   * Lists available .toml command files from user, project, and extension directories.
-   */
-  async listAvailableFiles(): Promise<CommandFileGroup[]> {
-    const directories = this.getCommandDirectories();
-    const groups: CommandFileGroup[] = [];
-
-    for (const dir of directories) {
-      const displayName = this.getDisplayName(dir);
-
-      try {
-        const files = await glob('**/*.toml', { cwd: dir.path });
-        if (files.length > 0) {
-          groups.push({
-            displayName,
-            path: dir.path,
-            files: [...files].sort(),
-          });
-        }
-      } catch (e) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-        if ((e as { code?: string }).code === 'ENOENT') {
-          continue;
-        }
-
-        groups.push({
-          displayName,
-          path: dir.path,
-          files: [],
-          error: e instanceof Error ? e.message : String(e),
-        });
-      }
-    }
-
-    return groups;
-  }
-
-  /**
-   * Returns a human-readable display name for the command directory source.
-   */
-  private getDisplayName(dir: CommandDirectory): string {
-    switch (dir.kind) {
-      case CommandKind.USER_FILE:
-        return 'User';
-      case CommandKind.WORKSPACE_FILE:
-        return 'Project';
-      case CommandKind.EXTENSION_FILE:
-        return `Extension: ${dir.extensionName || 'Unknown'}`;
-      default:
-        return 'Custom';
-    }
-  }
-
   /**
    * Get all command directories in order for loading.
    * User commands → Project commands → Extension commands

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

@@ -58,6 +58,7 @@ export const createMockCommandContext = (
       pendingItem: null,
       setPendingItem: vi.fn(),
       loadHistory: vi.fn(),
+      setInput: vi.fn(),
       toggleCorgiMode: vi.fn(),
       toggleShortcutsHelp: vi.fn(),
       toggleVimEnabled: vi.fn(),

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

@@ -135,6 +135,7 @@ export const createMockConfig = (overrides: Partial<Config> = {}): Config =>
     getUseRipgrep: vi.fn().mockReturnValue(false),
     getEnableInteractiveShell: vi.fn().mockReturnValue(false),
     getSkipNextSpeakerCheck: vi.fn().mockReturnValue(false),
+    getContinueOnFailedApiCall: vi.fn().mockReturnValue(false),
     getRetryFetchErrors: vi.fn().mockReturnValue(true),
     getEnableShellOutputEfficiency: vi.fn().mockReturnValue(true),
     getShellToolInactivityTimeout: vi.fn().mockReturnValue(300000),

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

@@ -592,7 +592,6 @@ const mockUIActions: UIActions = {
   setActiveBackgroundTaskPid: vi.fn(),
   setIsBackgroundTaskListOpen: vi.fn(),
   setAuthContext: vi.fn(),
-  dismissLoginRestart: vi.fn(),
   onHintInput: vi.fn(),
   onHintBackspace: vi.fn(),
   onHintClear: vi.fn(),

packages/cli/src/ui/AppContainer.tsx

@@ -173,6 +173,7 @@ import {
   QUEUE_ERROR_DISPLAY_DURATION_MS,
   EXPAND_HINT_DURATION_MS,
 } from './constants.js';
+import { LoginWithGoogleRestartDialog } from './auth/LoginWithGoogleRestartDialog.js';
 import { NewAgentsChoice } from './components/NewAgentsNotification.js';
 import { isSlashCommand } from './utils/commandUtils.js';
 import { parseSlashCommand } from '../utils/commands.js';
@@ -755,7 +756,7 @@ export const AppContainer = (props: AppContainerProps) => {
 
   useEffect(() => {
     if (authState === AuthState.Authenticated && authContext.requiresRestart) {
-      setAuthState(AuthState.AwaitingLoginRestart);
+      setAuthState(AuthState.AwaitingGoogleLoginRestart);
       setAuthContext({});
     }
   }, [authState, authContext, setAuthState]);
@@ -874,8 +875,10 @@ Logging in with Google... Restarting Gemini CLI to continue.
     async (apiKey: string) => {
       try {
         onAuthError(null);
-        if (!apiKey.trim()) {
-          onAuthError('API key cannot be empty or whitespace only.');
+        if (!apiKey.trim() && apiKey.length > 1) {
+          onAuthError(
+            'API key cannot be empty string with length greater than 1.',
+          );
           return;
         }
 
@@ -1127,22 +1130,19 @@ Logging in with Google... Restarting Gemini CLI to continue.
     }
   }, [config, historyManager]);
 
-  const cancelHandlerRef = useRef<
-    (shouldRestorePrompt?: boolean, clearBuffer?: boolean) => void
-  >(() => {});
-
-  const onCancelSubmit = useCallback(
-    (shouldRestorePrompt?: boolean, clearBuffer: boolean = false) => {
-      if (shouldRestorePrompt) {
-        setPendingRestorePrompt(true);
-      } else {
-        setPendingRestorePrompt(false);
-        cancelHandlerRef.current(false, clearBuffer);
-      }
-    },
-    [],
+  const cancelHandlerRef = useRef<(shouldRestorePrompt?: boolean) => void>(
+    () => {},
   );
 
+  const onCancelSubmit = useCallback((shouldRestorePrompt?: boolean) => {
+    if (shouldRestorePrompt) {
+      setPendingRestorePrompt(true);
+    } else {
+      setPendingRestorePrompt(false);
+      cancelHandlerRef.current(false);
+    }
+  }, []);
+
   useEffect(() => {
     if (pendingRestorePrompt) {
       const lastHistoryUserMsg = historyManager.history.findLast(
@@ -1324,18 +1324,18 @@ Logging in with Google... Restarting Gemini CLI to continue.
   });
 
   cancelHandlerRef.current = useCallback(
-    (shouldRestorePrompt: boolean = true, clearBuffer: boolean = false) => {
-      if (!clearBuffer && isToolAwaitingConfirmation(pendingHistoryItems)) {
+    (shouldRestorePrompt: boolean = true) => {
+      if (isToolAwaitingConfirmation(pendingHistoryItems)) {
         return; // Don't clear - user may be composing a follow-up message
       }
+      if (isToolExecuting(pendingHistoryItems)) {
+        buffer.setText(''); // Clear for Ctrl+C cancellation
+        return;
+      }
 
-      // If cancelling (shouldRestorePrompt=false):
+      // If cancelling (shouldRestorePrompt=false), never modify the buffer
+      // User is in control - preserve whatever text they typed, pasted, or restored
       if (!shouldRestorePrompt) {
-        // Clear the buffer if explicitly requested (e.g., Ctrl+C)
-        if (clearBuffer) {
-          buffer.setText('');
-        }
-        // Otherwise (e.g., Escape), user is in control - preserve whatever text they typed
         return;
       }
 
@@ -2187,13 +2187,8 @@ Logging in with Google... Restarting Gemini CLI to continue.
 
   const nightly = props.version.includes('nightly');
 
-  const isAwaitingLoginRestart = authState === AuthState.AwaitingLoginRestart;
-  const loginRestartMessage =
-    settings.merged.security.auth.selectedType === AuthType.USE_VERTEX_AI
-      ? 'Authenticating to Vertex AI in Cloud Shell requires a restart to apply project settings.'
-      : undefined;
-
   const dialogsVisible =
+    shouldShowIdePrompt ||
     shouldShowIdePrompt ||
     isFolderTrustDialogOpen ||
     isPolicyUpdateDialogOpen ||
@@ -2221,7 +2216,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
     !!emptyWalletRequest ||
     isSessionBrowserOpen ||
     authState === AuthState.AwaitingApiKeyInput ||
-    isAwaitingLoginRestart ||
     !!newAgents;
 
   const hasPendingToolConfirmation = useMemo(
@@ -2455,8 +2449,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
       accountSuspensionInfo,
       isAuthDialogOpen,
       isAwaitingApiKeyInput: authState === AuthState.AwaitingApiKeyInput,
-      isAwaitingLoginRestart,
-      loginRestartMessage,
       apiKeyDefaultValue,
       editorError,
       isEditorDialogOpen,
@@ -2662,8 +2654,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
       customDialog,
       apiKeyDefaultValue,
       authState,
-      isAwaitingLoginRestart,
-      loginRestartMessage,
       transientMessage,
       bannerData,
       bannerVisible,
@@ -2738,10 +2728,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
       setActiveBackgroundTaskPid,
       setIsBackgroundTaskListOpen,
       setAuthContext,
-      dismissLoginRestart: () => {
-        setAuthContext({});
-        setAuthState(AuthState.Updating);
-      },
       onHintInput: () => {},
       onHintBackspace: () => {},
       onHintClear: () => {},
@@ -2848,6 +2834,18 @@ Logging in with Google... Restarting Gemini CLI to continue.
     ],
   );
 
+  if (authState === AuthState.AwaitingGoogleLoginRestart) {
+    return (
+      <LoginWithGoogleRestartDialog
+        onDismiss={() => {
+          setAuthContext({});
+          setAuthState(AuthState.Updating);
+        }}
+        config={config}
+      />
+    );
+  }
+
   return (
     <UIStateContext.Provider value={uiState}>
       <QuotaContext.Provider value={quotaState}>

packages/cli/src/ui/auth/AuthDialog.test.tsx

@@ -243,32 +243,6 @@ describe('AuthDialog', () => {
       unmount();
     });
 
-    it('sets auth context with requiresRestart: true for USE_VERTEX_AI in Cloud Shell', async () => {
-      vi.stubEnv('CLOUD_SHELL', 'true');
-      mockedValidateAuthMethod.mockReturnValue(null);
-      const { unmount } = await renderWithProviders(<AuthDialog {...props} />);
-      const { onSelect: handleAuthSelect } =
-        mockedRadioButtonSelect.mock.calls[0][0];
-      await handleAuthSelect(AuthType.USE_VERTEX_AI);
-
-      expect(props.setAuthContext).toHaveBeenCalledWith({
-        requiresRestart: true,
-      });
-      unmount();
-    });
-
-    it('sets auth context with empty object for USE_VERTEX_AI outside Cloud Shell', async () => {
-      vi.stubEnv('CLOUD_SHELL', '');
-      mockedValidateAuthMethod.mockReturnValue(null);
-      const { unmount } = await renderWithProviders(<AuthDialog {...props} />);
-      const { onSelect: handleAuthSelect } =
-        mockedRadioButtonSelect.mock.calls[0][0];
-      await handleAuthSelect(AuthType.USE_VERTEX_AI);
-
-      expect(props.setAuthContext).toHaveBeenCalledWith({});
-      unmount();
-    });
-
     it('sets auth context with empty object for other auth types', async () => {
       mockedValidateAuthMethod.mockReturnValue(null);
       const { unmount } = await renderWithProviders(<AuthDialog {...props} />);

packages/cli/src/ui/auth/AuthDialog.tsx

@@ -119,12 +119,7 @@ export function AuthDialog({
         return;
       }
       if (authType) {
-        const needsRestart =
-          authType === AuthType.LOGIN_WITH_GOOGLE ||
-          (authType === AuthType.USE_VERTEX_AI &&
-            process.env['CLOUD_SHELL'] === 'true');
-
-        if (needsRestart) {
+        if (authType === AuthType.LOGIN_WITH_GOOGLE) {
           setAuthContext({ requiresRestart: true });
         } else {
           setAuthContext({});

packages/cli/src/ui/auth/LoginWithGoogleRestartDialog.test.tsx

@@ -1,12 +1,12 @@
 /**
  * @license
- * Copyright 2026 Google LLC
+ * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import { render } from '../../test-utils/render.js';
 import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
-import { LoginRestartDialog } from './LoginRestartDialog.js';
+import { LoginWithGoogleRestartDialog } from './LoginWithGoogleRestartDialog.js';
 import { useKeypress } from '../hooks/useKeypress.js';
 import { runExitCleanup } from '../../utils/cleanup.js';
 import {
@@ -27,7 +27,7 @@ vi.mock('../../utils/cleanup.js', () => ({
 const mockedUseKeypress = useKeypress as Mock;
 const mockedRunExitCleanup = runExitCleanup as Mock;
 
-describe('LoginRestartDialog', () => {
+describe('LoginWithGoogleRestartDialog', () => {
   const onDismiss = vi.fn();
   const exitSpy = vi
     .spyOn(process, 'exit')
@@ -44,20 +44,11 @@ describe('LoginRestartDialog', () => {
     _resetRelaunchStateForTesting();
   });
 
-  it('renders correctly with default message', async () => {
+  it('renders correctly', async () => {
     const { lastFrame, unmount } = await render(
-      <LoginRestartDialog onDismiss={onDismiss} config={mockConfig} />,
-    );
-    expect(lastFrame()).toMatchSnapshot();
-    unmount();
-  });
-
-  it('renders correctly with custom message', async () => {
-    const { lastFrame, unmount } = await render(
-      <LoginRestartDialog
+      <LoginWithGoogleRestartDialog
         onDismiss={onDismiss}
         config={mockConfig}
-        message="Authenticating to Vertex AI in Cloud Shell requires a restart to apply project settings."
       />,
     );
     expect(lastFrame()).toMatchSnapshot();
@@ -66,7 +57,10 @@ describe('LoginRestartDialog', () => {
 
   it('calls onDismiss when escape is pressed', async () => {
     const { unmount } = await render(
-      <LoginRestartDialog onDismiss={onDismiss} config={mockConfig} />,
+      <LoginWithGoogleRestartDialog
+        onDismiss={onDismiss}
+        config={mockConfig}
+      />,
     );
     const keypressHandler = mockedUseKeypress.mock.calls[0][0];
 
@@ -88,7 +82,10 @@ describe('LoginRestartDialog', () => {
       vi.useFakeTimers();
 
       const { unmount } = await render(
-        <LoginRestartDialog onDismiss={onDismiss} config={mockConfig} />,
+        <LoginWithGoogleRestartDialog
+          onDismiss={onDismiss}
+          config={mockConfig}
+        />,
       );
       const keypressHandler = mockedUseKeypress.mock.calls[0][0];
 

packages/cli/src/ui/auth/LoginWithGoogleRestartDialog.tsx

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2026 Google LLC
+ * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -10,17 +10,15 @@ import { theme } from '../semantic-colors.js';
 import { useKeypress } from '../hooks/useKeypress.js';
 import { relaunchApp } from '../../utils/processUtils.js';
 
-interface LoginRestartDialogProps {
+interface LoginWithGoogleRestartDialogProps {
   onDismiss: () => void;
   config: Config;
-  message?: string;
 }
 
-export const LoginRestartDialog = ({
+export const LoginWithGoogleRestartDialog = ({
   onDismiss,
   config,
-  message,
-}: LoginRestartDialogProps) => {
+}: LoginWithGoogleRestartDialogProps) => {
   useKeypress(
     (key) => {
       if (key.name === 'escape') {
@@ -46,20 +44,14 @@ export const LoginRestartDialog = ({
     { isActive: true },
   );
 
-  const displayMessage =
-    message ??
+  const message =
     "You've successfully signed in with Google. Gemini CLI needs to be restarted.";
 
   return (
-    <Box
-      borderStyle="round"
-      borderColor={theme.status.warning}
-      paddingX={1}
-      flexDirection="column"
-    >
-      <Text color={theme.status.warning}>{displayMessage}</Text>
+    <Box borderStyle="round" borderColor={theme.status.warning} paddingX={1}>
       <Text color={theme.status.warning}>
-        Press R to restart, or Esc to choose a different authentication method.
+        {message} Press R to restart, or Esc to choose a different
+        authentication method.
       </Text>
     </Box>
   );

packages/cli/src/ui/auth/__snapshots__/LoginRestartDialog.test.tsx.snap

@@ -1,17 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`LoginRestartDialog > renders correctly with custom message 1`] = `
-"╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
-│ Authenticating to Vertex AI in Cloud Shell requires a restart to apply project settings.         │
-│ Press R to restart, or Esc to choose a different authentication method.                          │
-╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
-"
-`;
-
-exports[`LoginRestartDialog > renders correctly with default message 1`] = `
-"╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
-│ You've successfully signed in with Google. Gemini CLI needs to be restarted.                     │
-│ Press R to restart, or Esc to choose a different authentication method.                          │
-╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
-"
-`;

packages/cli/src/ui/auth/__snapshots__/LoginWithGoogleRestartDialog.test.tsx.snap

@@ -0,0 +1,9 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`LoginWithGoogleRestartDialog > renders correctly 1`] = `
+"╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
+│ You've successfully signed in with Google. Gemini CLI needs to be restarted. Press R to restart, │
+│ or Esc to choose a different authentication method.                                              │
+╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
+"
+`;

packages/cli/src/ui/commands/__snapshots__/commandsCommand.test.ts.snap

@@ -1,12 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`commandsCommand > list > should list .toml files from available sources 1`] = `
-"### User Commands (/mock/user/commands)
-- user1.toml
-### Project Commands (/mock/project/commands)
-- proj1.toml
-### Extension: ext1 Commands (/mock/ext1/commands)
-- ext1.toml
-
-_Note: MCP prompts are dynamically loaded from configured MCP servers._"
-`;

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

@@ -4,32 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { Storage, type Config } from '@google/gemini-cli-core';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { commandsCommand } from './commandsCommand.js';
 import { MessageType } from '../types.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
 import type { CommandContext } from './types.js';
-import { FileCommandLoader } from '../../services/FileCommandLoader.js';
-
-vi.mock('../../services/FileCommandLoader.js');
-
-vi.mock('@google/gemini-cli-core', async () => {
-  const actual = await vi.importActual<
-    typeof import('@google/gemini-cli-core')
-  >('@google/gemini-cli-core');
-  return {
-    ...actual,
-    Storage: class extends actual.Storage {
-      static override getUserCommandsDir() {
-        return '/mock/user/commands';
-      }
-      override getProjectCommandsDir() {
-        return '/mock/project/commands';
-      }
-    },
-  };
-});
 
 describe('commandsCommand', () => {
   let context: CommandContext;
@@ -39,27 +18,10 @@ describe('commandsCommand', () => {
     context = createMockCommandContext({
       ui: {
         reloadCommands: vi.fn(),
-        addItem: vi.fn(),
-      },
-      services: {
-        agentContext: {
-          getProjectRoot: vi.fn().mockReturnValue('/mock/project'),
-          getFolderTrust: vi.fn().mockReturnValue(false),
-          isTrustedFolder: vi.fn().mockReturnValue(false),
-          getExtensions: vi.fn().mockReturnValue([
-            { name: 'ext1', path: '/mock/ext1', isActive: true },
-            { name: 'ext2', path: '/mock/ext2', isActive: false },
-          ]),
-          storage: new Storage('/mock/project'),
-        } as unknown as Config,
       },
     });
   });
 
-  afterEach(() => {
-    vi.restoreAllMocks();
-  });
-
   describe('default action', () => {
     it('should return an info message prompting subcommand usage', async () => {
       const result = await commandsCommand.action!(context, '');
@@ -68,70 +30,7 @@ describe('commandsCommand', () => {
         type: 'message',
         messageType: 'info',
         content:
-          'Use "/commands list" to view available .toml files, or "/commands reload" to reload custom command definitions.',
-      });
-    });
-  });
-
-  describe('list', () => {
-    it('should list .toml files from available sources', async () => {
-      vi.mocked(
-        FileCommandLoader.prototype.listAvailableFiles,
-      ).mockResolvedValue([
-        {
-          displayName: 'User',
-          path: '/mock/user/commands',
-          files: ['user1.toml'],
-        },
-        {
-          displayName: 'Project',
-          path: '/mock/project/commands',
-          files: ['proj1.toml'],
-        },
-        {
-          displayName: 'Extension: ext1',
-          path: '/mock/ext1/commands',
-          files: ['ext1.toml'],
-        },
-      ]);
-
-      const listCmd = commandsCommand.subCommands!.find(
-        (s) => s.name === 'list',
-      )!;
-
-      await listCmd.action!(context, '');
-
-      expect(context.ui.addItem).toHaveBeenCalledWith(
-        expect.objectContaining({
-          type: MessageType.INFO,
-          text: expect.any(String),
-        }),
-        expect.any(Number),
-      );
-
-      // Snapshot the text content
-      const addItemCall = vi.mocked(context.ui.addItem).mock.calls[0][0];
-
-      expect((addItemCall as { text: string }).text).toMatchSnapshot();
-    });
-
-    it('should show "No custom command files found" message if no .toml files exist', async () => {
-      vi.mocked(
-        FileCommandLoader.prototype.listAvailableFiles,
-      ).mockResolvedValue([]);
-
-      const listCmd = commandsCommand.subCommands!.find(
-        (s) => s.name === 'list',
-      )!;
-
-      const result = await listCmd.action!(context, '');
-
-      expect(result).toEqual({
-        type: 'message',
-        messageType: 'info',
-        content: expect.stringContaining(
-          'No custom command files (.toml) found.',
-        ),
+          'Use "/commands reload" to reload custom command definitions from .toml files.',
       });
     });
   });

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

@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { FileCommandLoader } from '../../services/FileCommandLoader.js';
 import {
   type CommandContext,
   type SlashCommand,
@@ -21,7 +20,7 @@ import {
  * Action for the default `/commands` invocation.
  * Displays a message prompting the user to use a subcommand.
  */
-async function defaultAction(
+async function listAction(
   _context: CommandContext,
   _args: string,
 ): Promise<void | SlashCommandActionReturn> {
@@ -29,64 +28,10 @@ async function defaultAction(
     type: 'message',
     messageType: 'info',
     content:
-      'Use "/commands list" to view available .toml files, or "/commands reload" to reload custom command definitions.',
+      'Use "/commands reload" to reload custom command definitions from .toml files.',
   };
 }
 
-/**
- * Action for `/commands list`.
- * Lists available .toml command files from user, project, and extension directories.
- */
-async function listSubcommandAction(
-  context: CommandContext,
-): Promise<void | SlashCommandActionReturn> {
-  try {
-    const config = context.services.agentContext?.config ?? null;
-    const loader = new FileCommandLoader(config);
-    const groups = await loader.listAvailableFiles();
-
-    const results: string[] = [];
-    for (const group of groups) {
-      results.push(`### ${group.displayName} Commands (${group.path})`);
-      if (group.error) {
-        results.push(`- (Error reading directory: ${group.error})`);
-      } else {
-        group.files.forEach((file) => results.push(`- ${file}`));
-      }
-    }
-
-    results.push(
-      '\n_Note: MCP prompts are dynamically loaded from configured MCP servers._',
-    );
-
-    if (results.length === 1) {
-      // Only the note is present
-      return {
-        type: 'message',
-        messageType: 'info',
-        content:
-          'No custom command files (.toml) found.\n\n_Note: MCP prompts are dynamically loaded from configured MCP servers._',
-      };
-    }
-
-    context.ui.addItem(
-      {
-        type: MessageType.INFO,
-        text: results.join('\n'),
-      } as HistoryItemInfo,
-      Date.now(),
-    );
-  } catch (error) {
-    context.ui.addItem(
-      {
-        type: MessageType.ERROR,
-        text: `Failed to list commands: ${error instanceof Error ? error.message : String(error)}`,
-      } as HistoryItemError,
-      Date.now(),
-    );
-  }
-}
-
 /**
  * Action for `/commands reload`.
  * Triggers a full re-discovery and reload of all slash commands, including
@@ -118,18 +63,10 @@ async function reloadAction(
 
 export const commandsCommand: SlashCommand = {
   name: 'commands',
-  description: 'Manage custom slash commands. Usage: /commands [list|reload]',
+  description: 'Manage custom slash commands. Usage: /commands [reload]',
   kind: CommandKind.BUILT_IN,
   autoExecute: false,
   subCommands: [
-    {
-      name: 'list',
-      description:
-        'List available custom command .toml files. Usage: /commands list',
-      kind: CommandKind.BUILT_IN,
-      autoExecute: true,
-      action: listSubcommandAction,
-    },
     {
       name: 'reload',
       altNames: ['refresh'],
@@ -140,5 +77,5 @@ export const commandsCommand: SlashCommand = {
       action: reloadAction,
     },
   ],
-  action: defaultAction,
+  action: listAction,
 };

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

@@ -0,0 +1,201 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe, it, expect, beforeEach, vi, type Mock } from 'vitest';
+import { enhanceCommand } from './enhanceCommand.js';
+import { type CommandContext } from './types.js';
+import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
+import { MessageType } from '../types.js';
+import { LlmRole } from '@google/gemini-cli-core';
+
+describe('enhanceCommand', () => {
+  let mockContext: CommandContext;
+  let mockGenerateContent: Mock;
+
+  beforeEach(() => {
+    mockGenerateContent = vi.fn();
+    mockContext = createMockCommandContext({
+      services: {
+        agentContext: {
+          promptId: 'test-prompt-id',
+          geminiClient: {
+            getHistory: vi.fn().mockReturnValue([
+              { role: 'user', parts: [{ text: 'previous user msg' }] },
+              { role: 'model', parts: [{ text: 'previous model msg' }] },
+            ]),
+          },
+          config: {
+            getModel: vi.fn().mockReturnValue('test-model'),
+            getContentGenerator: vi.fn().mockReturnValue({
+              generateContent: mockGenerateContent,
+            }),
+            getGemini31LaunchedSync: vi.fn().mockReturnValue(true),
+            getHasAccessToPreviewModel: vi.fn().mockReturnValue(true),
+          },
+        },
+      },
+      ui: {
+        addItem: vi.fn(),
+        setDebugMessage: vi.fn(),
+      },
+    } as unknown as CommandContext);
+  });
+
+  it('should have the correct name and description', () => {
+    expect(enhanceCommand.name).toBe('enhance');
+    expect(enhanceCommand.description).toBe(
+      'Enhance a prompt with additional context and rephrasing',
+    );
+  });
+
+  it('should show error if no prompt is provided', async () => {
+    if (!enhanceCommand.action) throw new Error('Action must be defined');
+
+    await enhanceCommand.action(mockContext, '');
+
+    expect(mockContext.ui.addItem).toHaveBeenCalledWith(
+      expect.objectContaining({
+        type: MessageType.ERROR,
+        text: expect.stringContaining('Please provide a prompt'),
+      }),
+    );
+  });
+
+  it('should call generateContent with correct parameters and show enhanced prompt', async () => {
+    if (!enhanceCommand.action) throw new Error('Action must be defined');
+
+    mockGenerateContent.mockResolvedValue({
+      candidates: [
+        {
+          content: {
+            parts: [{ text: 'Enhanced: do something' }],
+          },
+        },
+      ],
+    });
+
+    await enhanceCommand.action(mockContext, 'do something');
+
+    expect(mockGenerateContent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        model: 'test-model',
+        contents: [
+          { role: 'user', parts: [{ text: 'previous user msg' }] },
+          { role: 'model', parts: [{ text: 'previous model msg' }] },
+          { role: 'user', parts: [{ text: 'do something' }] },
+        ],
+        config: {
+          systemInstruction: {
+            role: 'system',
+            parts: [
+              {
+                text: expect.stringContaining(
+                  "Generate an enhanced version of the user's prompt",
+                ),
+              },
+            ],
+          },
+        },
+      }),
+      'test-prompt-id',
+      LlmRole.UTILITY_TOOL,
+    );
+
+    expect(mockContext.ui.addItem).toHaveBeenCalledWith(
+      expect.objectContaining({
+        type: MessageType.INFO,
+        text: expect.stringContaining(
+          'Enhanced prompt:\n\nEnhanced: do something',
+        ),
+      }),
+    );
+    expect(mockContext.ui.setInput).toHaveBeenCalledWith(
+      'Enhanced: do something',
+    );
+  });
+
+  it('should clean the response from markdown and quotes', async () => {
+    if (!enhanceCommand.action) throw new Error('Action must be defined');
+
+    mockGenerateContent.mockResolvedValue({
+      candidates: [
+        {
+          content: {
+            parts: [{ text: '```markdown\n"Clean me"\n```' }],
+          },
+        },
+      ],
+    });
+
+    await enhanceCommand.action(mockContext, 'dirty prompt');
+
+    expect(mockContext.ui.addItem).toHaveBeenCalledWith(
+      expect.objectContaining({
+        type: MessageType.INFO,
+        text: expect.stringContaining('Enhanced prompt:\n\nClean me'),
+      }),
+    );
+    expect(mockContext.ui.setInput).toHaveBeenCalledWith('Clean me');
+  });
+
+  it('should handle API errors gracefully', async () => {
+    if (!enhanceCommand.action) throw new Error('Action must be defined');
+
+    mockGenerateContent.mockRejectedValue(new Error('API Error'));
+
+    await enhanceCommand.action(mockContext, 'test prompt');
+
+    expect(mockContext.ui.addItem).toHaveBeenCalledWith(
+      expect.objectContaining({
+        type: MessageType.ERROR,
+        text: expect.stringContaining('Failed to enhance prompt: API Error'),
+      }),
+    );
+  });
+
+  it('should handle empty response from model', async () => {
+    if (!enhanceCommand.action) throw new Error('Action must be defined');
+
+    mockGenerateContent.mockResolvedValue({
+      candidates: [],
+    });
+
+    await enhanceCommand.action(mockContext, 'test prompt');
+
+    expect(mockContext.ui.addItem).toHaveBeenCalledWith(
+      expect.objectContaining({
+        type: MessageType.ERROR,
+        text: expect.stringContaining('Empty response from model'),
+      }),
+    );
+  });
+  it('should ignore thought parts and sanitize the output', async () => {
+    if (!enhanceCommand.action) throw new Error('Action must be defined');
+
+    mockGenerateContent.mockResolvedValue({
+      candidates: [
+        {
+          content: {
+            parts: [
+              { thought: true, text: 'This is a thought.' },
+              { text: 'Sanitized\nPrompt]' },
+            ],
+          },
+        },
+      ],
+    });
+
+    await enhanceCommand.action(mockContext, 'dirty prompt');
+
+    expect(mockContext.ui.addItem).toHaveBeenCalledWith(
+      expect.objectContaining({
+        type: MessageType.INFO,
+        text: expect.stringContaining('Enhanced prompt:\n\nSanitizedPrompt'),
+      }),
+    );
+    expect(mockContext.ui.setInput).toHaveBeenCalledWith('SanitizedPrompt');
+  });
+});

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

@@ -0,0 +1,109 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { CommandKind, type SlashCommand } from './types.js';
+import { MessageType } from '../types.js';
+import { LlmRole, resolveModel } from '@google/gemini-cli-core';
+import type { Content } from '@google/genai';
+
+const INSTRUCTION =
+  "Generate an enhanced version of the user's prompt, using the preceding conversation as context. Reply with ONLY the enhanced prompt - no conversation, explanations, lead-in, bullet points, placeholders, or surrounding quotes.";
+
+function clean(text: string) {
+  const stripped = text.replace(/^```\w*\n?|```$/g, '').trim();
+  return stripped.replace(/^(['"])([\s\S]*)\1$/, '$2').trim();
+}
+
+export const enhanceCommand: SlashCommand = {
+  name: 'enhance',
+  description: 'Enhance a prompt with additional context and rephrasing',
+  kind: CommandKind.BUILT_IN,
+  autoExecute: false,
+  action: async (context, args) => {
+    const draft = args.trim();
+    if (!draft) {
+      context.ui.addItem({
+        type: MessageType.ERROR,
+        text: 'Please provide a prompt to enhance. Usage: /enhance <prompt>',
+      });
+      return;
+    }
+
+    const agentContext = context.services.agentContext;
+    if (!agentContext) {
+      context.ui.addItem({
+        type: MessageType.ERROR,
+        text: 'Agent context not available.',
+      });
+      return;
+    }
+
+    const config = agentContext.config;
+    const contentGenerator = config.getContentGenerator();
+    const promptId = agentContext.promptId;
+
+    const model = resolveModel(
+      config.getModel(),
+      config.getGemini31LaunchedSync?.() ?? false,
+      false,
+      false,
+      config.getHasAccessToPreviewModel?.() ?? true,
+      config,
+    );
+
+    context.ui.setDebugMessage('Enhancing prompt...');
+
+    try {
+      const history = agentContext.geminiClient?.getHistory() ?? [];
+      const contents: Content[] = [
+        ...history,
+        { role: 'user', parts: [{ text: draft }] },
+      ];
+
+      const response = await contentGenerator.generateContent(
+        {
+          model,
+          contents,
+          config: {
+            systemInstruction: {
+              role: 'system',
+              parts: [{ text: INSTRUCTION }],
+            },
+          },
+        },
+        promptId,
+        LlmRole.UTILITY_TOOL,
+      );
+
+      const parts = response.candidates?.[0]?.content?.parts;
+      const enhancedText = parts
+        ?.find((part) => 'text' in part && !('thought' in part))
+        ?.text?.replace(/\n/g, '')
+        ?.replace(/]/g, '');
+
+      if (enhancedText) {
+        const cleanedText = clean(enhancedText);
+        context.ui.addItem({
+          type: MessageType.INFO,
+          text: `Enhanced prompt:\n\n${cleanedText}`,
+        });
+        context.ui.setInput(cleanedText);
+      } else {
+        context.ui.addItem({
+          type: MessageType.ERROR,
+          text: 'Failed to enhance prompt: Empty response from model.',
+        });
+      }
+    } catch (error) {
+      context.ui.addItem({
+        type: MessageType.ERROR,
+        text: `Failed to enhance prompt: ${error instanceof Error ? error.message : String(error)}`,
+      });
+    } finally {
+      context.ui.setDebugMessage('');
+    }
+  },
+};

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

@@ -782,13 +782,6 @@ describe('extensionsCommand', () => {
       expect(mockUninstallExtension).not.toHaveBeenCalled();
     });
 
-    it('should expose "delete" as an alias', () => {
-      const uninstallCmd = extensionsCommand(true).subCommands?.find(
-        (cmd) => cmd.name === 'uninstall',
-      );
-      expect(uninstallCmd?.altNames).toContain('delete');
-    });
-
     it('should call uninstallExtension and show success message', async () => {
       const extensionName = 'test-extension';
       await uninstallAction!(mockContext, extensionName);

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

@@ -838,7 +838,6 @@ const linkCommand: SlashCommand = {
 
 const uninstallCommand: SlashCommand = {
   name: 'uninstall',
-  altNames: ['delete'],
   description: 'Uninstall an extension',
   kind: CommandKind.BUILT_IN,
   autoExecute: false,