Merge branch 'main' into split/sandbox-flags

.gemini/skills/docs-writer/SKILL.md

@@ -45,10 +45,6 @@ Write precisely to ensure your instructions are unambiguous.
   specific verbs.
 - **Examples:** Use meaningful names in examples; avoid placeholders like
   "foo" or "bar."
-- **Quota and limit terminology:** For any content involving resource capacity
-  or using the word "quota" or "limit", strictly adhere to the guidelines in
-  the `quota-limit-style-guide.md` resource file. Generally, Use "quota" for the
-  administrative bucket and "limit" for the numerical ceiling.
 
 ### Formatting and syntax
 Apply consistent formatting to make documentation visually organized and

.gemini/skills/docs-writer/quota-limit-style-guide.md

@@ -1,61 +0,0 @@
-# Style Guide: Quota vs. Limit
-
-This guide defines the usage of "quota," "limit," and related terms in
-user-facing interfaces.
-
-## TL;DR
-
-- **`quota`**: The administrative "bucket." Use for settings, billing, and
-  requesting increases. (e.g., "Adjust your storage **quota**.")
-- **`limit`**: The real-time numerical "ceiling." Use for error messages when a
-  user is blocked. (e.g., "You've reached your request **limit**.")
-- **When blocked, combine them:** Explain the **limit** that was hit and the
-  **quota** that is the remedy. (e.g., "You've reached the request **limit** for
-  your developer **quota**.")
-- **Related terms:** Use `usage` for consumption tracking, `restriction` for
-  fixed rules, and `reset` for when a limit refreshes.
-
----
-
-## Detailed Guidelines
-
-### Definitions
-
-- **Quota is the "what":** It identifies the category of resource being managed
-  (e.g., storage quota, GPU quota, request/prompt quota).
-- **Limit is the "how much":** It defines the numerical boundary.
-
-Use **quota** when referring to the administrative concept or the request for
-more. Use **limit** when discussing the specific point of exhaustion.
-
-### When to use "quota"
-
-Use this term for **account management, billing, and settings.** It describes
-the entitlement the user has purchased or been assigned.
-
-**Examples:**
-
-- **Navigation label:** Quota and usage
-- **Contextual help:** Your **usage quota** is managed by your organization. To
-  request an increase, contact your administrator.
-
-### When to use "limit"
-
-Use this term for **real-time feedback, notifications, and error messages.** It
-identifies the specific wall the user just hit.
-
-**Examples:**
-
-- **Error message:** You’ve reached the 50-request-per-minute **limit**.
-- **Inline warning:** Input exceeds the 32k token **limit**.
-
-### How to use both together
-
-When a user is blocked, combine both terms to explain the **event** (limit) and
-the **remedy** (quota).
-
-**Example:**
-
-- **Heading:** Daily usage limit reached
-- **Body:** You've reached the maximum daily capacity for your developer quota.
-  To continue working today, upgrade your quota.

.gemini/skills/github-issue-creator/SKILL.md

@@ -1,76 +0,0 @@
----
-name: github-issue-creator
-description:
-  Use this skill when asked to create a GitHub issue. It handles different issue
-  types (bug, feature, etc.) using repository templates and ensures proper
-  labeling.
----
-
-# GitHub Issue Creator
-
-This skill guides the creation of high-quality GitHub issues that adhere to the
-repository's standards and use the appropriate templates.
-
-## Workflow
-
-Follow these steps to create a GitHub issue:
-
-1.  **Identify Issue Type**: Determine if the request is a bug report, feature
-    request, or other category.
-
-2.  **Locate Template**: Search for issue templates in
-    `.github/ISSUE_TEMPLATE/`.
-    - `bug_report.yml`
-    - `feature_request.yml`
-    - `website_issue.yml`
-    - If no relevant YAML template is found, look for `.md` templates in the same
-      directory.
-
-3.  **Read Template**: Read the content of the identified template file to
-    understand the required fields.
-
-4.  **Draft Content**: Draft the issue title and body/fields.
-    - If using a YAML template (form), prepare values for each `id` defined in
-      the template.
-    - If using a Markdown template, follow its structure exactly.
-    - **Default Label**: Always include the `🔒 maintainer only` label unless the
-      user explicitly requests otherwise.
-
-5.  **Create Issue**: Use the `gh` CLI to create the issue.
-    - **CRITICAL:** To avoid shell escaping and formatting issues with
-      multi-line Markdown or complex text, ALWAYS write the description/body to
-      a temporary file first.
-
-    **For Markdown Templates or Simple Body:**
-    ```bash
-    # 1. Write the drafted content to a temporary file
-    # 2. Create the issue using the --body-file flag
-    gh issue create --title "Succinct title" --body-file <temp_file_path> --label "🔒 maintainer only"
-    # 3. Remove the temporary file
-    rm <temp_file_path>
-    ```
-
-    **For YAML Templates (Forms):**
-    While `gh issue create` supports `--body-file`, YAML forms usually expect
-    key-value pairs via flags if you want to bypass the interactive prompt.
-    However, the most reliable non-interactive way to ensure formatting is
-    preserved for long text fields is to use the `--body` or `--body-file` if the
-    form has been converted to a standard body, OR to use the `--field` flags
-    for YAML forms.
-
-    *Note: For the `gemini-cli` repository which uses YAML forms, you can often
-    submit the content as a single body if a specific field-based submission is
-    not required by the automation.*
-
-6.  **Verify**: Confirm the issue was created successfully and provide the link
-    to the user.
-
-## Principles
-
-- **Clarity**: Titles should be descriptive and follow project conventions.
-- **Defensive Formatting**: Always use temporary files with `--body-file` to
-  prevent newline and special character issues.
-- **Maintainer Priority**: Default to internal/maintainer labels to keep the
-  backlog organized.
-- **Completeness**: Provide all requested information (e.g., version info,
-  reproduction steps).

.github/CODEOWNERS

@@ -14,4 +14,3 @@
 
 # Docs have a dedicated approver group in addition to maintainers
 /docs/ @google-gemini/gemini-cli-maintainers @google-gemini/gemini-cli-docs
-/README.md @google-gemini/gemini-cli-maintainers @google-gemini/gemini-cli-docs

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

@@ -44,8 +44,6 @@ runs:
     - name: 'npm build'
       shell: 'bash'
       run: 'npm run build'
-    - name: 'Set up QEMU'
-      uses: 'docker/setup-qemu-action@v3'
     - name: 'Set up Docker Buildx'
       uses: 'docker/setup-buildx-action@v3'
     - name: 'Log in to GitHub Container Registry'
@@ -71,19 +69,16 @@ runs:
       env:
         INPUTS_GITHUB_REF_NAME: '${{ inputs.github-ref-name }}'
         INPUTS_GITHUB_SHA: '${{ inputs.github-sha }}'
-    # We build amd64 just so we can verify it.
-    # We build and push both amd64 and arm64 in the publish step.
     - name: 'build'
       id: 'docker_build'
       shell: 'bash'
       env:
         GEMINI_SANDBOX_IMAGE_TAG: '${{ steps.image_tag.outputs.FINAL_TAG }}'
         GEMINI_SANDBOX: 'docker'
-        BUILD_SANDBOX_FLAGS: '--platform linux/amd64 --load'
         STEPS_IMAGE_TAG_OUTPUTS_FINAL_TAG: '${{ steps.image_tag.outputs.FINAL_TAG }}'
       run: |-
         npm run build:sandbox -- \
-          --image "google/gemini-cli-sandbox:${STEPS_IMAGE_TAG_OUTPUTS_FINAL_TAG}" \
+          --image google/gemini-cli-sandbox:${STEPS_IMAGE_TAG_OUTPUTS_FINAL_TAG} \
           --output-file final_image_uri.txt
         echo "uri=$(cat final_image_uri.txt)" >> $GITHUB_OUTPUT
     - name: 'verify'
@@ -97,14 +92,10 @@ runs:
     - name: 'publish'
       shell: 'bash'
       if: "${{ inputs.dry-run != 'true' }}"
-      env:
-        GEMINI_SANDBOX_IMAGE_TAG: '${{ steps.image_tag.outputs.FINAL_TAG }}'
-        GEMINI_SANDBOX: 'docker'
-        BUILD_SANDBOX_FLAGS: '--platform linux/amd64,linux/arm64 --push'
-        STEPS_IMAGE_TAG_OUTPUTS_FINAL_TAG: '${{ steps.image_tag.outputs.FINAL_TAG }}'
       run: |-
-        npm run build:sandbox -- \
-          --image "google/gemini-cli-sandbox:${STEPS_IMAGE_TAG_OUTPUTS_FINAL_TAG}"
+        docker push "${STEPS_DOCKER_BUILD_OUTPUTS_URI}"
+      env:
+        STEPS_DOCKER_BUILD_OUTPUTS_URI: '${{ steps.docker_build.outputs.uri }}'
     - name: 'Create issue on failure'
       if: |-
         ${{ failure() }}

.github/workflows/chained_e2e.yml

@@ -290,7 +290,6 @@ jobs:
         with:
           ref: '${{ needs.parse_run_context.outputs.sha }}'
           repository: '${{ needs.parse_run_context.outputs.repository }}'
-          fetch-depth: 0
 
       - name: 'Set up Node.js 20.x'
         uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions-node@v4
@@ -303,14 +302,7 @@ jobs:
       - name: 'Build project'
         run: 'npm run build'
 
-      - name: 'Check if evals should run'
-        id: 'check_evals'
-        run: |
-          SHOULD_RUN=$(node scripts/changed_prompt.js)
-          echo "should_run=$SHOULD_RUN" >> "$GITHUB_OUTPUT"
-
       - name: 'Run Evals (Required to pass)'
-        if: "${{ steps.check_evals.outputs.should_run == 'true' }}"
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
         run: 'npm run test:always_passing_evals'

.github/workflows/deflake.yml

@@ -117,6 +117,7 @@ jobs:
     name: 'Slow E2E - Win'
     runs-on: 'gemini-cli-windows-16-core'
     if: "github.repository == 'google-gemini/gemini-cli'"
+
     steps:
       - name: 'Checkout'
         uses: 'actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955' # ratchet:actions/checkout@v5

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

@@ -23,10 +23,6 @@ jobs:
     steps:
       - name: 'Generate GitHub App Token'
         id: 'generate_token'
-        env:
-          APP_ID: '${{ secrets.APP_ID }}'
-        if: |-
-          ${{ env.APP_ID != '' }}
         uses: 'actions/create-github-app-token@v2'
         with:
           app-id: '${{ secrets.APP_ID }}'
@@ -37,7 +33,7 @@ jobs:
         env:
           DRY_RUN: '${{ inputs.dry_run }}'
         with:
-          github-token: '${{ steps.generate_token.outputs.token || secrets.GITHUB_TOKEN }}'
+          github-token: '${{ steps.generate_token.outputs.token }}'
           script: |
             const dryRun = process.env.DRY_RUN === 'true';
             const thirtyDaysAgo = new Date();

.github/workflows/gemini-self-assign-issue.yml

@@ -25,7 +25,7 @@ jobs:
     if: |-
       github.repository == 'google-gemini/gemini-cli' &&
       github.event_name == 'issue_comment' &&
-      (contains(github.event.comment.body, '/assign') || contains(github.event.comment.body, '/unassign'))
+      contains(github.event.comment.body, '/assign')
     runs-on: 'ubuntu-latest'
     steps:
       - name: 'Generate GitHub App Token'
@@ -38,7 +38,6 @@ jobs:
           permission-issues: 'write'
 
       - name: 'Assign issue to user'
-        if: "contains(github.event.comment.body, '/assign')"
         uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea'
         with:
           github-token: '${{ steps.generate_token.outputs.token }}'
@@ -109,42 +108,3 @@ jobs:
               issue_number: issueNumber,
               body: `👋 @${commenter}, you've been assigned to this issue! Thank you for taking the time to contribute. Make sure to check out our [contributing guidelines](https://github.com/google-gemini/gemini-cli/blob/main/CONTRIBUTING.md).`
             });
-
-      - name: 'Unassign issue from user'
-        if: "contains(github.event.comment.body, '/unassign')"
-        uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea'
-        with:
-          github-token: '${{ steps.generate_token.outputs.token }}'
-          script: |
-            const issueNumber = context.issue.number;
-            const commenter = context.actor;
-            const owner = context.repo.owner;
-            const repo = context.repo.repo;
-            const commentBody = context.payload.comment.body.trim();
-
-            if (commentBody !== '/unassign') {
-              return;
-            }
-
-            const issue = await github.rest.issues.get({
-              owner: owner,
-              repo: repo,
-              issue_number: issueNumber,
-            });
-
-            const isAssigned = issue.data.assignees.some(assignee => assignee.login === commenter);
-
-            if (isAssigned) {
-              await github.rest.issues.removeAssignees({
-                owner: owner,
-                repo: repo,
-                issue_number: issueNumber,
-                assignees: [commenter]
-              });
-              await github.rest.issues.createComment({
-                owner: owner,
-                repo: repo,
-                issue_number: issueNumber,
-                body: `👋 @${commenter}, you have been unassigned from this issue.`
-              });
-            }

.github/workflows/release-nightly.yml

@@ -145,7 +145,7 @@ jobs:
           branch-name: 'release/${{ steps.nightly_version.outputs.RELEASE_TAG }}'
           pr-title: 'chore/release: bump version to ${{ steps.nightly_version.outputs.RELEASE_VERSION }}'
           pr-body: 'Automated version bump for nightly release.'
-          github-token: '${{ secrets.GEMINI_CLI_ROBOT_GITHUB_PAT }}'
+          github-token: '${{ secrets.GITHUB_TOKEN }}'
           dry-run: '${{ steps.vars.outputs.is_dry_run }}'
           working-directory: './release'
 

.github/workflows/release-promote.yml

@@ -335,7 +335,6 @@ jobs:
     name: 'Create Nightly PR'
     needs: ['publish-stable', 'calculate-versions']
     runs-on: 'ubuntu-latest'
-    environment: "${{ github.event.inputs.environment || 'prod' }}"
     permissions:
       contents: 'write'
       pull-requests: 'write'
@@ -398,7 +397,7 @@ jobs:
           branch-name: '${{ steps.release_branch.outputs.BRANCH_NAME }}'
           pr-title: 'chore(release): bump version to ${{ needs.calculate-versions.outputs.NEXT_NIGHTLY_VERSION }}'
           pr-body: 'Automated version bump to prepare for the next nightly release.'
-          github-token: '${{ secrets.GEMINI_CLI_ROBOT_GITHUB_PAT }}'
+          github-token: '${{ secrets.GITHUB_TOKEN }}'
           dry-run: '${{ github.event.inputs.dry_run }}'
 
       - name: 'Create Issue on Failure'

.github/workflows/test-build-binary.yml

@@ -1,160 +0,0 @@
-name: 'Test Build Binary'
-
-on:
-  workflow_dispatch:
-
-permissions:
-  contents: 'read'
-
-defaults:
-  run:
-    shell: 'bash'
-
-jobs:
-  build-node-binary:
-    name: 'Build Binary (${{ matrix.os }})'
-    runs-on: '${{ matrix.os }}'
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: 'ubuntu-latest'
-            platform_name: 'linux-x64'
-            arch: 'x64'
-          - os: 'windows-latest'
-            platform_name: 'win32-x64'
-            arch: 'x64'
-          - os: 'macos-latest' # Apple Silicon (ARM64)
-            platform_name: 'darwin-arm64'
-            arch: 'arm64'
-          - os: 'macos-latest' # Intel (x64) running on ARM via Rosetta
-            platform_name: 'darwin-x64'
-            arch: 'x64'
-
-    steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@v4'
-
-      - name: 'Optimize Windows Performance'
-        if: "matrix.os == 'windows-latest'"
-        run: |
-          Set-MpPreference -DisableRealtimeMonitoring $true
-          Stop-Service -Name "wsearch" -Force -ErrorAction SilentlyContinue
-          Set-Service -Name "wsearch" -StartupType Disabled
-          Stop-Service -Name "SysMain" -Force -ErrorAction SilentlyContinue
-          Set-Service -Name "SysMain" -StartupType Disabled
-        shell: 'powershell'
-
-      - name: 'Set up Node.js'
-        uses: 'actions/setup-node@v4'
-        with:
-          node-version-file: '.nvmrc'
-          architecture: '${{ matrix.arch }}'
-          cache: 'npm'
-
-      - name: 'Install dependencies'
-        run: 'npm ci'
-
-      - name: 'Check Secrets'
-        id: 'check_secrets'
-        run: |
-          echo "has_win_cert=${{ secrets.WINDOWS_PFX_BASE64 != '' }}" >> "$GITHUB_OUTPUT"
-          echo "has_mac_cert=${{ secrets.MACOS_CERT_P12_BASE64 != '' }}" >> "$GITHUB_OUTPUT"
-
-      - name: 'Setup Windows SDK (Windows)'
-        if: "matrix.os == 'windows-latest'"
-        uses: 'microsoft/setup-msbuild@v2'
-
-      - name: 'Add Signtool to Path (Windows)'
-        if: "matrix.os == 'windows-latest'"
-        run: |
-          $signtoolPath = Get-ChildItem -Path "C:\Program Files (x86)\Windows Kits\10\bin" -Recurse -Filter "signtool.exe" | Sort-Object FullName -Descending | Select-Object -First 1 -ExpandProperty DirectoryName
-          echo "Found signtool at: $signtoolPath"
-          echo "$signtoolPath" >> $env:GITHUB_PATH
-        shell: 'pwsh'
-
-      - name: 'Setup macOS Keychain'
-        if: "startsWith(matrix.os, 'macos') && steps.check_secrets.outputs.has_mac_cert == 'true' && github.event_name != 'pull_request'"
-        env:
-          BUILD_CERTIFICATE_BASE64: '${{ secrets.MACOS_CERT_P12_BASE64 }}'
-          P12_PASSWORD: '${{ secrets.MACOS_CERT_PASSWORD }}'
-          KEYCHAIN_PASSWORD: 'temp-password'
-        run: |
-          # Create the P12 file
-          echo "$BUILD_CERTIFICATE_BASE64" | base64 --decode > certificate.p12
-
-          # Create a temporary keychain
-          security create-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
-          security default-keychain -s build.keychain
-          security unlock-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
-
-          # Import the certificate
-          security import certificate.p12 -k build.keychain -P "$P12_PASSWORD" -T /usr/bin/codesign
-
-          # Allow codesign to access it
-          security set-key-partition-list -S apple-tool:,apple: -s -k "$KEYCHAIN_PASSWORD" build.keychain
-
-          # Set Identity for build script
-          echo "APPLE_IDENTITY=${{ secrets.MACOS_CERT_IDENTITY }}" >> "$GITHUB_ENV"
-
-      - name: 'Setup Windows Certificate'
-        if: "matrix.os == 'windows-latest' && steps.check_secrets.outputs.has_win_cert == 'true' && github.event_name != 'pull_request'"
-        env:
-          PFX_BASE64: '${{ secrets.WINDOWS_PFX_BASE64 }}'
-          PFX_PASSWORD: '${{ secrets.WINDOWS_PFX_PASSWORD }}'
-        run: |
-          $pfx_cert_byte = [System.Convert]::FromBase64String("$env:PFX_BASE64")
-          $certPath = Join-Path (Get-Location) "cert.pfx"
-          [IO.File]::WriteAllBytes($certPath, $pfx_cert_byte)
-          echo "WINDOWS_PFX_FILE=$certPath" >> $env:GITHUB_ENV
-          echo "WINDOWS_PFX_PASSWORD=$env:PFX_PASSWORD" >> $env:GITHUB_ENV
-        shell: 'pwsh'
-
-      - name: 'Build Binary'
-        run: 'npm run build:binary'
-
-      - name: 'Build Core Package'
-        run: 'npm run build -w @google/gemini-cli-core'
-
-      - name: 'Verify Output Exists'
-        run: |
-          if [ -f "dist/${{ matrix.platform_name }}/gemini" ]; then
-            echo "Binary found at dist/${{ matrix.platform_name }}/gemini"
-          elif [ -f "dist/${{ matrix.platform_name }}/gemini.exe" ]; then
-            echo "Binary found at dist/${{ matrix.platform_name }}/gemini.exe"
-          else
-            echo "Error: Binary not found in dist/${{ matrix.platform_name }}/"
-            ls -R dist/
-            exit 1
-          fi
-
-      - name: 'Smoke Test Binary'
-        run: |
-          echo "Running binary smoke test..."
-          if [ -f "dist/${{ matrix.platform_name }}/gemini.exe" ]; then
-            "./dist/${{ matrix.platform_name }}/gemini.exe" --version
-          else
-            "./dist/${{ matrix.platform_name }}/gemini" --version
-          fi
-
-      - name: 'Run Integration Tests'
-        if: "github.event_name != 'pull_request'"
-        env:
-          GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
-        run: |
-          echo "Running integration tests with binary..."
-          if [[ "${{ matrix.os }}" == 'windows-latest' ]]; then
-            BINARY_PATH="$(cygpath -m "$(pwd)/dist/${{ matrix.platform_name }}/gemini.exe")"
-          else
-            BINARY_PATH="$(pwd)/dist/${{ matrix.platform_name }}/gemini"
-          fi
-          echo "Using binary at $BINARY_PATH"
-          export INTEGRATION_TEST_GEMINI_BINARY_PATH="$BINARY_PATH"
-          npm run test:integration:sandbox:none -- --testTimeout=600000
-
-      - name: 'Upload Artifact'
-        uses: 'actions/upload-artifact@v4'
-        with:
-          name: 'gemini-cli-${{ matrix.platform_name }}'
-          path: 'dist/${{ matrix.platform_name }}/'
-          retention-days: 5

.gitignore

@@ -61,5 +61,4 @@ gemini-debug.log
 .genkit
 .gemini-clipboard/
 .eslintcache
-evals/logs/
-data/optimization/
+evals/logs/

.vscode/settings.json

@@ -7,9 +7,6 @@
   "[typescript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
-  "[typescriptreact]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
   "[json]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },

CONTRIBUTING.md

@@ -75,14 +75,11 @@ Replace `<PR_NUMBER>` with your pull request number. Authors are encouraged to
 run this on their own PRs for self-review, and reviewers should use it to
 augment their manual review process.
 
-### Self-assigning and unassigning issues
+### Self assigning issues
 
-To assign an issue to yourself, simply add a comment with the text `/assign`. To
-unassign yourself from an issue, add a comment with the text `/unassign`.
-
-The comment must contain only that text and nothing else. These commands will
-assign or unassign the issue as requested, provided the conditions are met
-(e.g., an issue must be unassigned to be assigned).
+To assign an issue to yourself, simply add a comment with the text `/assign`.
+The comment must contain only that text and nothing else. This command will
+assign the issue to you, provided it is not already assigned.
 
 Please note that you can have a maximum of 3 issues assigned to you at any given
 time.

README.md

@@ -282,14 +282,14 @@ gemini
   quickly.
 - [**Authentication Setup**](./docs/get-started/authentication.md) - Detailed
   auth configuration.
-- [**Configuration Guide**](./docs/reference/configuration.md) - Settings and
+- [**Configuration Guide**](./docs/get-started/configuration.md) - Settings and
   customization.
-- [**Keyboard Shortcuts**](./docs/reference/keyboard-shortcuts.md) -
-  Productivity tips.
+- [**Keyboard Shortcuts**](./docs/cli/keyboard-shortcuts.md) - Productivity
+  tips.
 
 ### Core Features
 
-- [**Commands Reference**](./docs/reference/commands.md) - All slash commands
+- [**Commands Reference**](./docs/cli/commands.md) - All slash commands
   (`/help`, `/chat`, etc).
 - [**Custom Commands**](./docs/cli/custom-commands.md) - Create your own
   reusable commands.
@@ -323,16 +323,15 @@ gemini
 - [**Enterprise Guide**](./docs/cli/enterprise.md) - Deploy and manage in a
   corporate environment.
 - [**Telemetry & Monitoring**](./docs/cli/telemetry.md) - Usage tracking.
-- [**Tools API Development**](./docs/reference/tools-api.md) - Create custom
-  tools.
+- [**Tools API Development**](./docs/core/tools-api.md) - Create custom tools.
 - [**Local development**](./docs/local-development.md) - Local development
   tooling.
 
 ### Troubleshooting & Support
 
-- [**Troubleshooting Guide**](./docs/resources/troubleshooting.md) - Common
-  issues and solutions.
-- [**FAQ**](./docs/resources/faq.md) - Frequently asked questions.
+- [**Troubleshooting Guide**](./docs/troubleshooting.md) - Common issues and
+  solutions.
+- [**FAQ**](./docs/faq.md) - Frequently asked questions.
 - Use `/bug` command to report issues directly from the CLI.
 
 ### Using MCP Servers
@@ -378,8 +377,7 @@ for planned features and priorities.
 
 ### Uninstall
 
-See the [Uninstall Guide](./docs/resources/uninstall.md) for removal
-instructions.
+See the [Uninstall Guide](docs/cli/uninstall.md) for removal instructions.
 
 ## 📄 Legal
 

data/manifest.json

@@ -1,80 +0,0 @@
-{
-  "project": "Gemini CLI Tool Alignment Optimization",
-  "version": "1.0.0",
-  "optimization_constraints": {
-    "immutable_tokens": [
-      "glob",
-      "grep_search",
-      "list_directory",
-      "read_file",
-      "run_shell_command",
-      "write_file",
-      "replace",
-      "google_web_search",
-      "write_todos",
-      "web_fetch",
-      "read_many_files",
-      "save_memory",
-      "get_internal_docs",
-      "activate_skill",
-      "ask_user",
-      "exit_plan_mode",
-      "enter_plan_mode",
-      "codebase_investigator",
-      "cli_help",
-      "generalist"
-    ],
-    "protected_variables": [
-      "${FILE_PATH}",
-      "${DIR_PATH}",
-      "${PATTERN}",
-      "${OLD_STRING}",
-      "${NEW_STRING}",
-      "${GREP_PATTERN}",
-      "${SEARCH_PATTERN}"
-    ]
-  },
-  "data_inventory": {
-    "target_samples_per_tool": 5,
-    "overrides": {
-      "replace": 12,
-      "write_file": 10
-    },
-    "tools": {
-      "glob": { "description": "Find files by glob pattern" },
-      "grep_search": { "description": "Search text in files" },
-      "list_directory": { "description": "List files in a directory" },
-      "read_file": { "description": "Read a single file" },
-      "run_shell_command": { "description": "Execute shell commands" },
-      "write_file": { "description": "Write a complete file" },
-      "replace": { "description": "Surgical text replacement" },
-      "google_web_search": { "description": "Web search via Google" },
-      "write_todos": { "description": "Manage subtasks" },
-      "web_fetch": { "description": "Extract content from URLs" },
-      "read_many_files": { "description": "Read multiple files" },
-      "save_memory": { "description": "Global user preferences" },
-      "get_internal_docs": { "description": "Gemini CLI internal docs" },
-      "activate_skill": { "description": "Enable specialized skills" },
-      "ask_user": { "description": "Interactive user questions" },
-      "enter_plan_mode": { "description": "Start planning mode" },
-      "exit_plan_mode": { "description": "Exit planning mode" },
-      "codebase_investigator": {
-        "description": "High-level architecture mapping"
-      },
-      "cli_help": { "description": "Assistance with Gemini CLI" },
-      "generalist": { "description": "General purpose agent delegation" }
-    },
-    "file_descriptions": {
-      "data/tool_alignment.jsonl": "Ensures the model selects the correct built-in tool over generic shell commands and optimizes for brevity."
-    },
-    "optimization_targets": {
-      "snippets": [
-        "renderCoreMandates",
-        "renderPrimaryWorkflows",
-        "renderOperationalGuidelines",
-        "renderSubAgents",
-        "renderGitRepo"
-      ]
-    }
-  }
-}

data/tool_alignment.jsonl

@@ -1,113 +0,0 @@
-{"id":"read_file-01","metadata":{"tags":["tool:read_file","shell-avoidance"],"created_at":"2026-03-02T13:00:00Z","platform":"darwin"},"input":{"user_query":"What are the contents of package.json?"},"expected":{"tool_calls":[{"name":"read_file","arguments":{"file_path":"package.json"}}],"rationale":"Directly use read_file for reading file contents instead of shell 'cat'."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"cat package.json"}}],"reason":"Generic shell command 'cat' is used instead of the specialized read_file tool.","severity":"high"},{"tool_calls":[{"name":"read_file","arguments":{"file_path":"package.json"}}],"output_text":"Certainly! I can help you read that file. Here are the contents of package.json:","reason":"Correct tool but excessive conversational filler.","severity":"low"}]}
-{"id":"read_file-02","metadata":{"tags":["tool:read_file","shell-avoidance"],"created_at":"2026-03-02T13:00:00Z","platform":"win32"},"input":{"user_query":"Show me the content of the README.md file"},"expected":{"tool_calls":[{"name":"read_file","arguments":{"file_path":"README.md"}}],"rationale":"Directly use read_file for reading file contents instead of shell 'type'."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"type README.md"}}],"reason":"Generic shell command 'type' is used on Windows instead of the specialized read_file tool.","severity":"high"}]}
-{"id":"read_file-03","metadata":{"tags":["tool:read_file","range-efficiency"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Read the first 50 lines of src/index.ts"},"expected":{"tool_calls":[{"name":"read_file","arguments":{"file_path":"src/index.ts","start_line":1,"end_line":50}}],"rationale":"Use line range parameters to read only the requested portion of a file."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"head -n 50 src/index.ts"}}],"reason":"Used shell 'head' instead of read_file range parameters.","severity":"high"}]}
-{"id":"read_file-04","metadata":{"tags":["tool:read_file","shell-avoidance"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Get the contents of the .env file"},"expected":{"tool_calls":[{"name":"read_file","arguments":{"file_path":".env"}}],"rationale":"Directly use read_file for reading file contents."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"cat .env"}}],"reason":"Used shell 'cat' for a file read.","severity":"high"}]}
-{"id":"read_file-05","metadata":{"tags":["tool:read_file","precision"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Check the version in the VERSION file"},"expected":{"tool_calls":[{"name":"read_file","arguments":{"file_path":"VERSION"}}],"rationale":"Use read_file for quick file inspection."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"cat VERSION"}}],"reason":"Used shell 'cat' instead of read_file.","severity":"high"}]}
-{"id":"list_directory-01","metadata":{"tags":["tool:list_directory","shell-avoidance"],"created_at":"2026-03-02T13:00:00Z","platform":"darwin"},"input":{"user_query":"List the files in the src directory"},"expected":{"tool_calls":[{"name":"list_directory","arguments":{"dir_path":"src"}}],"rationale":"Use list_directory for viewing folder contents instead of shell 'ls'."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"ls src"}}],"reason":"Used shell 'ls' instead of list_directory.","severity":"high"}]}
-{"id":"list_directory-02","metadata":{"tags":["tool:list_directory","shell-avoidance"],"created_at":"2026-03-02T13:00:00Z","platform":"win32"},"input":{"user_query":"Show me what's in the docs folder"},"expected":{"tool_calls":[{"name":"list_directory","arguments":{"dir_path":"docs"}}],"rationale":"Use list_directory for viewing folder contents instead of shell 'dir'."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"dir docs"}}],"reason":"Used shell 'dir' on Windows instead of list_directory.","severity":"high"}]}
-{"id":"list_directory-03","metadata":{"tags":["tool:list_directory","recursive-failure"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"What files are in the project root?"},"expected":{"tool_calls":[{"name":"list_directory","arguments":{"dir_path":"."}}],"rationale":"Use list_directory for top-level directory listing."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"ls -F"}}],"reason":"Used shell 'ls' instead of list_directory.","severity":"high"}]}
-{"id":"list_directory-04","metadata":{"tags":["tool:list_directory","filter-efficiency"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"List files in 'tests' but ignore '.tmp' files"},"expected":{"tool_calls":[{"name":"list_directory","arguments":{"dir_path":"tests","ignore":["*.tmp"]}}],"rationale":"Use the 'ignore' parameter of list_directory to filter results efficiently."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"ls tests | grep -v '.tmp'"}}],"reason":"Used a shell pipeline (ls | grep) instead of built-in list_directory filtering.","severity":"high"}]}
-{"id":"list_directory-05","metadata":{"tags":["tool:list_directory","precision"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"What is in the current folder?"},"expected":{"tool_calls":[{"name":"list_directory","arguments":{"dir_path":"."}}],"rationale":"Use list_directory for exploring the current working directory."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"ls"}}],"reason":"Used shell 'ls' instead of list_directory.","severity":"high"}]}
-{"id":"write_file-01","metadata":{"tags":["tool:write_file","shell-avoidance"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Create a file named hello.txt with the content 'Hello World'"},"expected":{"tool_calls":[{"name":"write_file","arguments":{"file_path":"hello.txt","content":"Hello World"}}],"rationale":"Use write_file to create new files instead of shell 'echo'."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"echo 'Hello World' > hello.txt"}}],"reason":"Used shell redirection 'echo >' to create a file.","severity":"high"}]}
-{"id":"write_file-02","metadata":{"tags":["tool:write_file","shell-avoidance"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Save this config to config.json: { \"active\": true }"},"expected":{"tool_calls":[{"name":"write_file","arguments":{"file_path":"config.json","content":"{ \"active\": true }"}}],"rationale":"Use write_file for creating structured data files."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"echo '{ \"active\": true }' > config.json"}}],"reason":"Used shell 'echo' for file creation.","severity":"high"}]}
-{"id":"write_file-03","metadata":{"tags":["tool:write_file","precision"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Create a new empty file called .gitignore"},"expected":{"tool_calls":[{"name":"write_file","arguments":{"file_path":".gitignore","content":""}}],"rationale":"Use write_file with empty content to create empty files."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"touch .gitignore"}}],"reason":"Used shell 'touch' instead of write_file.","severity":"high"}]}
-{"id":"write_file-04","metadata":{"tags":["tool:write_file","boilerplate"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Initialize a new README.md with some basic info"},"expected":{"tool_calls":[{"name":"write_file","arguments":{"file_path":"README.md","content":"# Project\n\nThis is a new project."}}],"rationale":"Use write_file for initial file creation."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"cat <<EOF > README.md\n# Project\n\nThis is a new project.\nEOF"}}],"reason":"Used shell heredoc instead of write_file.","severity":"high"}]}
-{"id":"write_file-05","metadata":{"tags":["tool:write_file","overwrite"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Overwrite the current LICENSE file with the Apache-2.0 header"},"expected":{"tool_calls":[{"name":"write_file","arguments":{"file_path":"LICENSE","content":"Apache-2.0 Header..."}}],"rationale":"Use write_file to overwrite existing file content entirely."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"cp apache_header.txt LICENSE"}}],"reason":"Used shell 'cp' to overwrite a file instead of write_file.","severity":"high"}]}
-{"id":"write_file-06","metadata":{"tags":["tool:write_file","large-content"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Create a new utility file in src/utils/logger.ts with a full logger implementation"},"expected":{"tool_calls":[{"name":"write_file","arguments":{"file_path":"src/utils/logger.ts","content":"export class Logger { ... }"}}],"rationale":"Use write_file for creating new source files with complete implementations."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"mkdir -p src/utils && echo 'export class Logger { ... }' > src/utils/logger.ts"}}],"reason":"Used shell 'mkdir' and 'echo' for file creation. write_file handles parent directory creation automatically.","severity":"high"}]}
-{"id":"write_file-07","metadata":{"tags":["tool:write_file","data-integrity"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Write the tool_alignment schema to data/schema.ts"},"expected":{"tool_calls":[{"name":"write_file","arguments":{"file_path":"data/schema.ts","content":"export interface Scenario { ... }"}}],"rationale":"Use write_file for adding new code files to the project."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"cat > data/schema.ts <<EOF\n...\nEOF"}}],"reason":"Used shell redirection instead of write_file tool.","severity":"high"}]}
-{"id":"write_file-08","metadata":{"tags":["tool:write_file","new-app"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Create a new index.html for the landing page."},"expected":{"tool_calls":[{"name":"write_file","arguments":{"file_path":"index.html","content":"<!DOCTYPE html>..."}}],"rationale":"Use write_file for creating web assets."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"echo '<!DOCTYPE html>...' > index.html"}}],"reason":"Used shell echo for file creation.","severity":"high"}]}
-{"id":"write_file-09","metadata":{"tags":["tool:write_file","json-creation"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Create a manifest.json file for the app."},"expected":{"tool_calls":[{"name":"write_file","arguments":{"file_path":"manifest.json","content":"{ \"name\": \"My App\" }"}}],"rationale":"Use write_file for structured data files."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"echo '{ \"name\": \"My App\" }' > manifest.json"}}],"reason":"Used shell echo instead of write_file.","severity":"high"}]}
-{"id":"write_file-10","metadata":{"tags":["tool:write_file","overwrite-safety"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Update the entire CONTRIBUTING.md with new instructions."},"expected":{"tool_calls":[{"name":"write_file","arguments":{"file_path":"CONTRIBUTING.md","content":"# Contributing..."}}],"rationale":"Use write_file for full-file updates when the entire content changes."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"cat > CONTRIBUTING.md <<EOF\n...\nEOF"}}],"reason":"Used shell heredoc for full-file update.","severity":"high"}]}
-{"id":"replace-01","metadata":{"tags":["tool:replace","shell-avoidance"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Change the port from 3000 to 8080 in server.ts"},"expected":{"tool_calls":[{"name":"replace","arguments":{"file_path":"server.ts","old_string":"port: 3000","new_string":"port: 8080","instruction":"Change the server port to 8080."}}],"rationale":"Use replace for surgical text updates instead of shell 'sed'."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"sed -i 's/port: 3000/port: 8080/g' server.ts"}}],"reason":"Used shell 'sed' for text replacement.","severity":"high"}]}
-{"id":"replace-02","metadata":{"tags":["tool:replace","inefficiency"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Fix a typo in index.ts: change 'recieve' to 'receive'"},"expected":{"tool_calls":[{"name":"replace","arguments":{"file_path":"index.ts","old_string":"recieve","new_string":"receive","instruction":"Fix typo: 'recieve' to 'receive'."}}],"rationale":"Use replace for small fixes instead of rewriting the entire file with write_file."},"negatives":[{"tool_calls":[{"name":"write_file","arguments":{"file_path":"index.ts","content":"(full content with fix)"}}],"reason":"Rewrote entire file for a single word fix. replace is more efficient and safer for large files.","severity":"medium"}]}
-{"id":"replace-03","metadata":{"tags":["tool:replace","multi-occurrence"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Rename the variable 'userCount' to 'totalUsers' throughout app.ts"},"expected":{"tool_calls":[{"name":"replace","arguments":{"file_path":"app.ts","old_string":"userCount","new_string":"totalUsers","allow_multiple":true,"instruction":"Rename variable 'userCount' to 'totalUsers' globally in the file."}}],"rationale":"Use replace with allow_multiple=true for global renaming within a single file."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"sed -i 's/userCount/totalUsers/g' app.ts"}}],"reason":"Used shell 'sed' instead of replace.","severity":"high"}]}
-{"id":"replace-04","metadata":{"tags":["tool:replace","context-safety"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Update the deprecated API call in src/client.ts"},"expected":{"tool_calls":[{"name":"replace","arguments":{"file_path":"src/client.ts","old_string":"api.oldMethod()","new_string":"api.newMethod()","instruction":"Update deprecated API call from oldMethod to newMethod."}}],"rationale":"Use replace to target specific code blocks safely."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"grep -l 'api.oldMethod()' src/client.ts && sed -i 's/api.oldMethod()/api.newMethod()/g' src/client.ts"}}],"reason":"Used a combination of shell commands instead of replace.","severity":"high"}]}
-{"id":"replace-05","metadata":{"tags":["tool:replace","multiline"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Replace the existing try/catch block in main.ts with a more robust version"},"expected":{"tool_calls":[{"name":"replace","arguments":{"file_path":"main.ts","old_string":"try {\n  doWork();\n} catch (e) {\n  console.log(e);\n}","new_string":"try {\n  await doWork();\n} catch (e) {\n  logger.error('Failed to do work', e);\n  throw e;\n}","instruction":"Improve error handling in the main work loop."}}],"rationale":"Use replace for multiline code block updates. It's safer than complex sed commands."},"negatives":[{"tool_calls":[{"name":"write_file","arguments":{"file_path":"main.ts","content":"(entire file)"}}],"reason":"Rewriting the whole file for a small block change is inefficient.","severity":"medium"}]}
-{"id":"replace-06","metadata":{"tags":["tool:replace","steering-example"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Add the following log line to server.ts: console.log('started');"},"expected":{"tool_calls":[{"name":"replace","arguments":{"file_path":"server.ts","old_string":"app.listen(3000, () => {","new_string":"app.listen(3000, () => {\n  console.log('started');","instruction":"Add a start log to the server listen callback."}}],"rationale":"Prefer using replace to add content to existing files instead of shell redirection (>>)."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"echo \"console.log('started');\" >> server.ts"}}],"reason":"Used shell redirection to append content. This is risky for source code as it doesn't guarantee correct placement or formatting.","severity":"high"}]}
-{"id":"replace-07","metadata":{"tags":["tool:replace","version-bump"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Bump the version in package.json from 1.0.0 to 1.1.0."},"expected":{"tool_calls":[{"name":"replace","arguments":{"file_path":"package.json","old_string":"\"version\": \"1.0.0\"","new_string":"\"version\": \"1.1.0\"","instruction":"Bump project version to 1.1.0."}}],"rationale":"Use replace for surgical updates to configuration files."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"npm version 1.1.0 --no-git-tag-version"}}],"reason":"While the command works, the optimizer wants to see the model use internal tools for precise control when asked.","severity":"low"}]}
-{"id":"replace-08","metadata":{"tags":["tool:replace","comment-update"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Update the TODO comment in database.ts to 'Fixed in v2'."},"expected":{"tool_calls":[{"name":"replace","arguments":{"file_path":"database.ts","old_string":"// TODO: optimize query","new_string":"// Fixed in v2","instruction":"Mark TODO as fixed."}}],"rationale":"Use replace for updating documentation and comments."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"sed -i 's|// TODO: optimize query|// Fixed in v2|' database.ts"}}],"reason":"Used shell sed for comment update.","severity":"high"}]}
-{"id":"replace-09","metadata":{"tags":["tool:replace","import-fix"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Fix the import in main.ts: change '../utils' to '@utils'."},"expected":{"tool_calls":[{"name":"replace","arguments":{"file_path":"main.ts","old_string":"import { log } from '../utils'","new_string":"import { log } from '@utils'","instruction":"Fix relative import path."}}],"rationale":"Use replace for fixing import paths."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"sed -i \"s|'../utils'|'@utils'|\" main.ts"}}],"reason":"Used shell sed for import fix.","severity":"high"}]}
-{"id":"replace-10","metadata":{"tags":["tool:replace","logic-patch"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Fix the off-by-one error in the loop in utils.ts."},"expected":{"tool_calls":[{"name":"replace","arguments":{"file_path":"utils.ts","old_string":"for (let i = 0; i <= arr.length; i++)","new_string":"for (let i = 0; i < arr.length; i++)","instruction":"Fix off-by-one error in loop condition."}}],"rationale":"Use replace for surgical logic fixes."},"negatives":[{"tool_calls":[{"name":"write_file","arguments":{"file_path":"utils.ts","content":"..."}}],"reason":"Rewrote entire file for a one-character fix.","severity":"medium"}]}
-{"id":"replace-11","metadata":{"tags":["tool:replace","css-update"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Change the background color to #fff in styles.css."},"expected":{"tool_calls":[{"name":"replace","arguments":{"file_path":"styles.css","old_string":"background: #000;","new_string":"background: #fff;","instruction":"Update background color."}}],"rationale":"Use replace for styling updates."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"sed -i 's/#000/#fff/' styles.css"}}],"reason":"Used shell sed for CSS update.","severity":"high"}]}
-{"id":"replace-12","metadata":{"tags":["tool:replace","md-update"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Update the title in README.md."},"expected":{"tool_calls":[{"name":"replace","arguments":{"file_path":"README.md","old_string":"# Old Title","new_string":"# New Title","instruction":"Update project title."}}],"rationale":"Use replace for documentation updates."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"sed -i 's/# Old Title/# New Title/' README.md"}}],"reason":"Used shell sed for Markdown update.","severity":"high"}]}
-{"id":"grep_search-01","metadata":{"tags":["tool:grep_search","shell-avoidance"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Search for all occurrences of 'TODO' in the src directory"},"expected":{"tool_calls":[{"name":"grep_search","arguments":{"pattern":"TODO","dir_path":"src"}}],"rationale":"Use grep_search for recursive text searching instead of shell 'grep'."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"grep -r 'TODO' src"}}],"reason":"Used shell 'grep' instead of grep_search.","severity":"high"}]}
-{"id":"grep_search-02","metadata":{"tags":["tool:grep_search","precision"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Find where 'AuthService' is defined in the codebase"},"expected":{"tool_calls":[{"name":"grep_search","arguments":{"pattern":"class AuthService","include_pattern":"**/*.ts"}}],"rationale":"Use grep_search with include_pattern for precise code discovery."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"grep -r 'class AuthService' ."}}],"reason":"Used shell 'grep' instead of grep_search.","severity":"high"}]}
-{"id":"grep_search-03","metadata":{"tags":["tool:grep_search","case-sensitive"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Search for 'ERROR' (case-sensitive) in logs/"},"expected":{"tool_calls":[{"name":"grep_search","arguments":{"pattern":"ERROR","dir_path":"logs","case_sensitive":true}}],"rationale":"Use grep_search with case_sensitive parameter."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"grep 'ERROR' logs/*"}}],"reason":"Used shell 'grep' instead of grep_search.","severity":"high"}]}
-{"id":"grep_search-04","metadata":{"tags":["tool:grep_search","fixed-strings"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Find the exact string 'api/v1/users' in the config files"},"expected":{"tool_calls":[{"name":"grep_search","arguments":{"pattern":"api/v1/users","fixed_strings":true,"include_pattern":"config/**"}}],"rationale":"Use fixed_strings:true for literal matches to avoid regex escaping issues."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"grep -F 'api/v1/users' config/*"}}],"reason":"Used shell 'grep -F' instead of grep_search.","severity":"high"}]}
-{"id":"grep_search-05","metadata":{"tags":["tool:grep_search","context"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Search for 'db.connect' and show 3 lines of context"},"expected":{"tool_calls":[{"name":"grep_search","arguments":{"pattern":"db.connect","context":3}}],"rationale":"Use context parameter to get surrounding lines."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"grep -C 3 'db.connect' ."}}],"reason":"Used shell 'grep -C' instead of grep_search.","severity":"high"}]}
-{"id":"glob-01","metadata":{"tags":["tool:glob","shell-avoidance"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Find all .test.ts files in the integration-tests folder"},"expected":{"tool_calls":[{"name":"glob","arguments":{"pattern":"integration-tests/**/*.test.ts"}}],"rationale":"Use glob for recursive file discovery instead of shell 'find'."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"find integration-tests -name '*.test.ts'"}}],"reason":"Used shell 'find' instead of glob.","severity":"high"}]}
-{"id":"glob-02","metadata":{"tags":["tool:glob","precision"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Where are the CSS files located in the project?"},"expected":{"tool_calls":[{"name":"glob","arguments":{"pattern":"**/*.css"}}],"rationale":"Use glob with double asterisks for project-wide file discovery."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"find . -name '*.css'"}}],"reason":"Used shell 'find' instead of glob.","severity":"high"}]}
-{"id":"glob-03","metadata":{"tags":["tool:glob","shell-avoidance"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"List all markdown files in the docs directory"},"expected":{"tool_calls":[{"name":"glob","arguments":{"pattern":"docs/**/*.md"}}],"rationale":"Use glob for finding files matching a pattern."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"ls docs/**/*.md"}}],"reason":"Used shell 'ls' with globs instead of the specialized glob tool.","severity":"high"}]}
-{"id":"glob-04","metadata":{"tags":["tool:glob","ignore-patterns"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Find all .js files, ignoring node_modules"},"expected":{"tool_calls":[{"name":"glob","arguments":{"pattern":"**/*.js","respect_git_ignore":true}}],"rationale":"glob respects .gitignore by default, which usually includes node_modules."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"find . -name '*.js' -not -path '*/node_modules/*'"}}],"reason":"Used complex shell find instead of glob.","severity":"high"}]}
-{"id":"glob-05","metadata":{"tags":["tool:glob","sorting"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Find the most recently modified log files"},"expected":{"tool_calls":[{"name":"glob","arguments":{"pattern":"logs/*.log"}}],"rationale":"glob returns results sorted by modification time (newest first)."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"ls -t logs/*.log"}}],"reason":"Used shell 'ls -t' instead of glob.","severity":"high"}]}
-{"id":"codebase_investigator-01","metadata":{"tags":["tool:codebase_investigator","architecture"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"How does the authentication flow work in this project?"},"expected":{"tool_calls":[{"name":"codebase_investigator","arguments":{"objective":"Investigate and explain the authentication flow, including key files and logic."}}],"rationale":"Use codebase_investigator for high-level architectural understanding."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"grep -r 'auth' ."}}],"reason":"Used raw grep for a complex architectural question. codebase_investigator is better for mapping dependencies and structure.","severity":"high"},{"tool_calls":[{"name":"grep_search","arguments":{"pattern":"auth"}}],"reason":"Used grep_search when a higher-level investigator is more appropriate for broad understanding.","severity":"medium"}]}
-{"id":"codebase_investigator-02","metadata":{"tags":["tool:codebase_investigator","refactoring"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"I want to refactor the tool execution logic. Where should I start?"},"expected":{"tool_calls":[{"name":"codebase_investigator","arguments":{"objective":"Identify the core components and dependencies of the tool execution logic to prepare for a refactor."}}],"rationale":"Use codebase_investigator to map out dependencies before a major refactor."},"negatives":[{"tool_calls":[{"name":"list_directory","arguments":{"dir_path":"packages/core/src/tools"}}],"reason":"Used list_directory for a broad refactoring question. codebase_investigator provides more strategic insight.","severity":"medium"}]}
-{"id":"codebase_investigator-03","metadata":{"tags":["tool:codebase_investigator","onboarding"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"What is the overall structure of this monorepo?"},"expected":{"tool_calls":[{"name":"codebase_investigator","arguments":{"objective":"Map out the monorepo structure, identifying the purpose of each package."}}],"rationale":"Use codebase_investigator for quick onboarding to a new codebase."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"ls -R"}}],"reason":"Used shell 'ls -R' which produces too much noise for structural understanding.","severity":"high"}]}
-{"id":"codebase_investigator-04","metadata":{"tags":["tool:codebase_investigator","debugging"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Investigate why the telemetry logs are not being sent to the server."},"expected":{"tool_calls":[{"name":"codebase_investigator","arguments":{"objective":"Find the telemetry logging logic and identify why it might be failing to send data."}}],"rationale":"Use codebase_investigator for root-cause analysis of system-wide issues."},"negatives":[{"tool_calls":[{"name":"grep_search","arguments":{"pattern":"telemetry"}}],"reason":"Used simple grep when a systemic investigation is needed.","severity":"medium"}]}
-{"id":"codebase_investigator-05","metadata":{"tags":["tool:codebase_investigator","feature-planning"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"I want to add a new tool for database access. Where do the existing tools live?"},"expected":{"tool_calls":[{"name":"codebase_investigator","arguments":{"objective":"Locate the tool definition directory and understand the pattern for adding new tools."}}],"rationale":"Use codebase_investigator to find patterns and locations for new features."},"negatives":[{"tool_calls":[{"name":"glob","arguments":{"pattern":"**/*tool*"}}],"reason":"Used glob for a discovery task that codebase_investigator can handle more intelligently.","severity":"medium"}]}
-{"id":"generalist-01","metadata":{"tags":["tool:generalist","delegation"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Fix all the linting errors in the 'packages/cli' directory."},"expected":{"tool_calls":[{"name":"generalist","arguments":{"request":"Fix all lint errors in the packages/cli directory using available tools like 'eslint --fix'."}}],"rationale":"Use the generalist agent for repetitive batch tasks across multiple files."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"npm run lint -- --fix"}}],"reason":"While the shell command works, the generalist agent is preferred for 'autonomous' fixing that might require manual intervention for complex errors.","severity":"low"},{"tool_calls":[{"name":"read_file","arguments":{"file_path":"packages/cli/src/main.tsx"}}],"reason":"Attempted to manually read and fix files one by one instead of delegating the batch task.","severity":"medium"}]}
-{"id":"generalist-02","metadata":{"tags":["tool:generalist","high-volume"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Add a license header to every .ts file in the project."},"expected":{"tool_calls":[{"name":"generalist","arguments":{"request":"Add Apache-2.0 license headers to all .ts files in the project."}}],"rationale":"Use generalist for high-volume, repetitive file modifications."},"negatives":[{"tool_calls":[{"name":"replace","arguments":{"file_path":"src/index.ts","old_string":"","new_string":"// License..."}}],"reason":"Attempted to manually add headers file-by-file.","severity":"high"}]}
-{"id":"generalist-03","metadata":{"tags":["tool:generalist","speculative-research"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Try various ways to optimize the bundling process for the VS Code extension."},"expected":{"tool_calls":[{"name":"generalist","arguments":{"request":"Research and experiment with various bundling optimizations for the VS Code extension."}}],"rationale":"Use generalist for speculative research and trial-and-error investigations."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"npm run build"}}],"reason":"Only ran the build once without systematic research.","severity":"medium"}]}
-{"id":"generalist-04","metadata":{"tags":["tool:generalist","batch-refactor"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Migrate all 'interface' definitions to 'type' definitions in 'packages/core'."},"expected":{"tool_calls":[{"name":"generalist","arguments":{"request":"Convert all interfaces to types in the packages/core directory."}}],"rationale":"Use generalist for systematic, codebase-wide refactoring tasks."},"negatives":[{"tool_calls":[{"name":"replace","arguments":{"file_path":"packages/core/src/types.ts","old_string":"interface","new_string":"type"}}],"reason":"Attempted to manually migrate file-by-file.","severity":"high"}]}
-{"id":"generalist-05","metadata":{"tags":["tool:generalist","delegation"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Clean up all temporary files and log files in the project."},"expected":{"tool_calls":[{"name":"generalist","arguments":{"request":"Find and delete all temporary files (.tmp, .log) across the workspace."}}],"rationale":"Use generalist for maintenance tasks that span multiple directories."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"rm -rf **/*.log"}}],"reason":"Used a potentially dangerous recursive shell command when a generalist can do it safely and verify.","severity":"medium"}]}
-{"id":"cli_help-01","metadata":{"tags":["tool:cli_help","meta"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"How do I enable the devtools in Gemini CLI?"},"expected":{"tool_calls":[{"name":"cli_help","arguments":{"question":"How to enable devtools in settings."}}],"rationale":"Use cli_help for questions about using the Gemini CLI itself."},"negatives":[{"tool_calls":[{"name":"grep_search","arguments":{"pattern":"devtools","dir_path":"docs"}}],"reason":"Searched documentation manually when cli_help is the specialized assistant for this.","severity":"medium"}]}
-{"id":"cli_help-02","metadata":{"tags":["tool:cli_help","config"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"What are the available settings in config.yaml?"},"expected":{"tool_calls":[{"name":"cli_help","arguments":{"question":"Available settings in config.yaml"}}],"rationale":"Use cli_help to understand CLI configuration options."},"negatives":[{"tool_calls":[{"name":"read_file","arguments":{"file_path":".gemini/config.yaml"}}],"reason":"Read the config file directly without understanding the possible options and their meanings.","severity":"medium"}]}
-{"id":"cli_help-03","metadata":{"tags":["tool:cli_help","features"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Does Gemini CLI support Model Context Protocol (MCP)?"},"expected":{"tool_calls":[{"name":"cli_help","arguments":{"question":"Support for Model Context Protocol (MCP)"}}],"rationale":"Use cli_help for feature-related inquiries."},"negatives":[{"tool_calls":[{"name":"google_web_search","arguments":{"query":"gemini cli mcp support"}}],"reason":"Used external search for a question about the internal features of the CLI.","severity":"medium"}]}
-{"id":"cli_help-04","metadata":{"tags":["tool:cli_help","shortcuts"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"What is the keyboard shortcut to focus the shell?"},"expected":{"tool_calls":[{"name":"cli_help","arguments":{"question":"Keyboard shortcut for focusing the shell"}}],"rationale":"Use cli_help for questions about CLI interaction and shortcuts."},"negatives":[{"tool_calls":[{"name":"grep_search","arguments":{"pattern":"keybinding"}}],"reason":"Used grep to search for keybindings.","severity":"medium"}]}
-{"id":"cli_help-05","metadata":{"tags":["tool:cli_help","troubleshooting"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"I'm getting an 'invalid_request' error when using Google Search tool."},"expected":{"tool_calls":[{"name":"cli_help","arguments":{"question":"Troubleshooting 'invalid_request' error in Google Search tool"}}],"rationale":"Use cli_help for troubleshooting errors related to the CLI's tools and extensions."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"npm run debug"}}],"reason":"Started debugging without checking the help system first for known issues.","severity":"low"}]}
-{"id":"activate_skill-01","metadata":{"tags":["tool:activate_skill","workflow"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"I want to create a new pull request for my changes."},"expected":{"tool_calls":[{"name":"activate_skill","arguments":{"name":"pr-creator"}}],"rationale":"Use activate_skill to get specialized instructions for common workflows like PR creation."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"gh pr create"}}],"reason":"Using the CLI directly is fine, but activate_skill provides repository-specific guidance and templates.","severity":"low"},{"tool_calls":[{"name":"generalist","arguments":{"request":"Create a PR"}}],"reason":"Delegated to a generalist when a specialized skill exists.","severity":"medium"}]}
-{"id":"activate_skill-02","metadata":{"tags":["tool:activate_skill","docs"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Help me update the documentation in the docs/ folder."},"expected":{"tool_calls":[{"name":"activate_skill","arguments":{"name":"docs-writer"}}],"rationale":"Use docs-writer skill for any tasks involving Markdown or documentation files."},"negatives":[{"tool_calls":[{"name":"write_file","arguments":{"file_path":"docs/index.md","content":"..."}}],"reason":"Attempted to write documentation directly without activating the specialized documentation skill.","severity":"medium"}]}
-{"id":"activate_skill-03","metadata":{"tags":["tool:activate_skill","review"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Can you review my local changes?"},"expected":{"tool_calls":[{"name":"activate_skill","arguments":{"name":"code-reviewer"}}],"rationale":"Use code-reviewer skill for high-quality code analysis."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"git diff"}}],"reason":"Just looking at the diff is not a proper review. activate_skill provides a specialized agent for reviews.","severity":"medium"}]}
-{"id":"activate_skill-04","metadata":{"tags":["tool:activate_skill","issues"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"I found a bug. Create a GitHub issue for it."},"expected":{"tool_calls":[{"name":"activate_skill","arguments":{"name":"github-issue-creator"}}],"rationale":"Use github-issue-creator for standardized issue reporting."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"gh issue create"}}],"reason":"Direct CLI usage misses the benefit of project-specific templates provided by the skill.","severity":"low"}]}
-{"id":"activate_skill-05","metadata":{"tags":["tool:activate_skill","new-skill"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"I want to create a new skill to automate my deployments."},"expected":{"tool_calls":[{"name":"activate_skill","arguments":{"name":"skill-creator"}}],"rationale":"Use skill-creator to extend the CLI's capabilities."},"negatives":[{"tool_calls":[{"name":"write_file","arguments":{"file_path":".gemini/skills/deploy/SKILL.md","content":"..."}}],"reason":"Attempted to create a skill manually without the expert guidance of the skill-creator.","severity":"medium"}]}
-{"id":"ask_user-01","metadata":{"tags":["tool:ask_user","confirmation"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"I'm ready to delete the old build artifacts. Should I proceed?"},"expected":{"tool_calls":[{"name":"ask_user","arguments":{"questions":[{"question":"Are you sure you want to delete the old build artifacts?","header":"Confirm Delete","type":"yesno"}]}}],"rationale":"Use ask_user with type:'yesno' for critical confirmations."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"rm -rf dist/*"}}],"reason":"Proceeded with a destructive action without explicit user confirmation.","severity":"high"}]}
-{"id":"ask_user-02","metadata":{"tags":["tool:ask_user","selection"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"I need to know which database you want to use for the new service."},"expected":{"tool_calls":[{"name":"ask_user","arguments":{"questions":[{"question":"Which database should be used for the new service?","header":"Database Select","type":"choice","options":[{"label":"PostgreSQL","description":"Relational database"},{"label":"MongoDB","description":"NoSQL document store"}]}]}}],"rationale":"Use ask_user with type:'choice' for structured options."},"negatives":[{"tool_calls":[{"name":"ask_user","arguments":{"questions":[{"question":"What database do you want?","header":"DB","type":"text"}]}}],"reason":"Used a free-form text input when specific choices were available, leading to potential ambiguity.","severity":"low"}]}
-{"id":"ask_user-03","metadata":{"tags":["tool:ask_user","multi-question"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"I need your name and email to set up the git config."},"expected":{"tool_calls":[{"name":"ask_user","arguments":{"questions":[{"question":"What is your name?","header":"Git Name","type":"text"},{"question":"What is your email?","header":"Git Email","type":"text"}]}}],"rationale":"Use ask_user to gather multiple pieces of information in one turn."},"negatives":[{"tool_calls":[{"name":"ask_user","arguments":{"questions":[{"question":"What is your name?","header":"Name","type":"text"}]}}],"reason":"Only asked one question when two were needed, requiring an extra turn.","severity":"medium"}]}
-{"id":"ask_user-04","metadata":{"tags":["tool:ask_user","clarification"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Update the API."},"expected":{"tool_calls":[{"name":"ask_user","arguments":{"questions":[{"question":"Which API do you want to update (Internal or External)?","header":"Clarification","type":"choice","options":[{"label":"Internal","description":"Packages/core/src/api"},{"label":"External","description":"Public facing API"}]}]}}],"rationale":"Use ask_user to clarify ambiguous user requests before acting."},"negatives":[{"tool_calls":[{"name":"grep_search","arguments":{"pattern":"API"}}],"reason":"Attempted to search for 'API' without clarifying the user's vague intent.","severity":"medium"}]}
-{"id":"ask_user-05","metadata":{"tags":["tool:ask_user","multiselect"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Which packages should I run the tests for?"},"expected":{"tool_calls":[{"name":"ask_user","arguments":{"questions":[{"question":"Select the packages to run tests for:","header":"Package Select","type":"choice","multiSelect":true,"options":[{"label":"cli","description":"Terminal UI"},{"label":"core","description":"Backend logic"},{"label":"devtools","description":"Inspector UI"}]}]}}],"rationale":"Use multiSelect:true for allowing multiple choices."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"npm test"}}],"reason":"Ran all tests without asking the user which specific packages they were interested in.","severity":"medium"}]}
-{"id":"enter_plan_mode-01","metadata":{"tags":["tool:enter_plan_mode","complex-task"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"I want to implement a new Model Context Protocol (MCP) server."},"expected":{"tool_calls":[{"name":"enter_plan_mode","arguments":{"reason":"Design and plan the implementation of a new MCP server, including architecture and tool definitions."}}],"rationale":"Use enter_plan_mode for complex, multi-stage implementation tasks."},"negatives":[{"tool_calls":[{"name":"write_file","arguments":{"file_path":"packages/mcp-server/src/index.ts","content":"..."}}],"reason":"Started coding a complex feature without a design phase.","severity":"high"}]}
-{"id":"enter_plan_mode-02","metadata":{"tags":["tool:enter_plan_mode","refactoring"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Refactor the entire telemetry system to use a new backend."},"expected":{"tool_calls":[{"name":"enter_plan_mode","arguments":{"reason":"Plan the refactoring of the telemetry system, ensuring all components are updated and tested."}}],"rationale":"Use enter_plan_mode for large-scale refactoring."},"negatives":[{"tool_calls":[{"name":"codebase_investigator","arguments":{"objective":"Refactor telemetry"}}],"reason":"Delegated to an investigator without entering plan mode first to manage the complex transition.","severity":"medium"}]}
-{"id":"enter_plan_mode-03","metadata":{"tags":["tool:enter_plan_mode","architecture"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"How should we handle secrets in our CI/CD pipeline?"},"expected":{"tool_calls":[{"name":"enter_plan_mode","arguments":{"reason":"Research and design a secure secret management strategy for the CI/CD pipeline."}}],"rationale":"Use enter_plan_mode for architectural design discussions."},"negatives":[{"tool_calls":[{"name":"google_web_search","arguments":{"query":"github actions secrets best practices"}}],"reason":"Started research without entering a formal planning state for the architectural decision.","severity":"low"}]}
-{"id":"enter_plan_mode-04","metadata":{"tags":["tool:enter_plan_mode","integration"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Integrate the new DevTools UI with the main CLI application."},"expected":{"tool_calls":[{"name":"enter_plan_mode","arguments":{"reason":"Plan the integration of DevTools UI, focusing on the connection between React/Ink and the DevTools server."}}],"rationale":"Use enter_plan_mode for complex integration tasks."},"negatives":[{"tool_calls":[{"name":"replace","arguments":{"file_path":"packages/cli/src/main.tsx","old_string":"...","new_string":"..."}}],"reason":"Attempted to integrate a major feature via a single file edit without planning.","severity":"high"}]}
-{"id":"enter_plan_mode-05","metadata":{"tags":["tool:enter_plan_mode","system-change"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Change the build system from esbuild to Rollup."},"expected":{"tool_calls":[{"name":"enter_plan_mode","arguments":{"reason":"Evaluate and plan the migration of the build system from esbuild to Rollup."}}],"rationale":"Use enter_plan_mode for fundamental system changes."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"npm install rollup"}}],"reason":"Started installing dependencies before planning the migration.","severity":"medium"}]}
-{"id":"exit_plan_mode-01","metadata":{"tags":["tool:exit_plan_mode","transition"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"I've finished the design doc. Let's start implementing."},"expected":{"tool_calls":[{"name":"exit_plan_mode","arguments":{"plan_path":"plans/my-feature-plan.md"}}],"rationale":"Use exit_plan_mode to transition from planning to implementation."},"negatives":[{"tool_calls":[{"name":"write_file","arguments":{"file_path":"src/feature.ts","content":"..."}}],"reason":"Started implementation without formally exiting plan mode.","severity":"medium"}]}
-{"id":"get_internal_docs-01","metadata":{"tags":["tool:get_internal_docs","discovery"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"What are the coding standards for this project?"},"expected":{"tool_calls":[{"name":"get_internal_docs","arguments":{"path":"reference/coding-standards.md"}}],"rationale":"Use get_internal_docs for project-specific standards."},"negatives":[{"tool_calls":[{"name":"read_file","arguments":{"file_path":"docs/reference/coding-standards.md"}}],"reason":"Read the doc file directly instead of using the specialized internal docs tool.","severity":"low"}]}
-{"id":"get_internal_docs-02","metadata":{"tags":["tool:get_internal_docs","onboarding"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Show me all the internal documentation available."},"expected":{"tool_calls":[{"name":"get_internal_docs","arguments":{}}],"rationale":"Call get_internal_docs without arguments to list all available docs."},"negatives":[{"tool_calls":[{"name":"list_directory","arguments":{"dir_path":"docs"}}],"reason":"Listed the directory instead of using the docs tool to see organized documentation.","severity":"low"}]}
-{"id":"exit_plan_mode-02","metadata":{"tags":["tool:exit_plan_mode","rejection"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"I don't like this plan. Can we try a different approach?"},"expected":{"tool_calls":[{"name":"exit_plan_mode","arguments":{"plan_path":"plans/rejected-plan.md"}}],"rationale":"Use exit_plan_mode when a plan is rejected and need to restart or pivot."},"negatives":[{"tool_calls":[{"name":"enter_plan_mode","arguments":{"reason":"Try again"}}],"reason":"Attempted to re-enter plan mode without exiting the current one first.","severity":"medium"}]}
-{"id":"exit_plan_mode-03","metadata":{"tags":["tool:exit_plan_mode","completion"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"The plan looks perfect. Go ahead."},"expected":{"tool_calls":[{"name":"exit_plan_mode","arguments":{"plan_path":"plans/approved-plan.md"}}],"rationale":"Use exit_plan_mode to signal that planning is over and implementation can begin."},"negatives":[{"tool_calls":[{"name":"generalist","arguments":{"request":"Start implementing"}}],"reason":"Delegated implementation while still in plan mode.","severity":"medium"}]}
-{"id":"exit_plan_mode-04","metadata":{"tags":["tool:exit_plan_mode","cancel"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Nevermind about this feature, let's stop planning."},"expected":{"tool_calls":[{"name":"exit_plan_mode","arguments":{"plan_path":"plans/cancelled-feature.md"}}],"rationale":"Use exit_plan_mode to gracefully stop a planning session."},"negatives":[{"tool_calls":[{"name":"ask_user","arguments":{"questions":[{"question":"Should I stop?","header":"Stop","type":"yesno"}]}}],"reason":"Asked for confirmation to stop when the intent to stop was clear.","severity":"low"}]}
-{"id":"exit_plan_mode-05","metadata":{"tags":["tool:exit_plan_mode","handoff"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"I'll take it from here, thanks for the plan."},"expected":{"tool_calls":[{"name":"exit_plan_mode","arguments":{"plan_path":"plans/handoff-plan.md"}}],"rationale":"Use exit_plan_mode to finalize the plan for the user."},"negatives":[{"tool_calls":[{"name":"save_memory","arguments":{"fact":"The user liked the plan"}}],"reason":"Saved a memory instead of closing the planning session.","severity":"low"}]}
-{"id":"get_internal_docs-03","metadata":{"tags":["tool:get_internal_docs","troubleshooting"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"How do I fix common authentication errors?"},"expected":{"tool_calls":[{"name":"get_internal_docs","arguments":{"path":"admin/auth-troubleshooting.md"}}],"rationale":"Use internal docs for specialized troubleshooting guides."},"negatives":[{"tool_calls":[{"name":"google_web_search","arguments":{"query":"gemini cli auth error"}}],"reason":"Searched the web for internal documentation.","severity":"medium"}]}
-{"id":"get_internal_docs-04","metadata":{"tags":["tool:get_internal_docs","tools"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"What are the parameters for the 'replace' tool?"},"expected":{"tool_calls":[{"name":"get_internal_docs","arguments":{"path":"tools/replace.md"}}],"rationale":"Use internal docs to find detailed tool information."},"negatives":[{"tool_calls":[{"name":"cli_help","arguments":{"question":"replace tool params"}}],"reason":"While cli_help works, get_internal_docs provides direct access to the documentation source.","severity":"low"}]}
-{"id":"get_internal_docs-05","metadata":{"tags":["tool:get_internal_docs","contribution"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"How can I contribute to this project?"},"expected":{"tool_calls":[{"name":"get_internal_docs","arguments":{"path":"CONTRIBUTING.md"}}],"rationale":"Use get_internal_docs to access project meta-documentation."},"negatives":[{"tool_calls":[{"name":"read_file","arguments":{"file_path":"CONTRIBUTING.md"}}],"reason":"Read the file directly instead of using the docs tool.","severity":"low"}]}
-{"id":"google_web_search-01","metadata":{"tags":["tool:google_web_search","research"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"What's the latest stable version of React?"},"expected":{"tool_calls":[{"name":"google_web_search","arguments":{"query":"latest stable version of React"}}],"rationale":"Use web search for up-to-date external information."},"negatives":[{"tool_calls":[{"name":"read_file","arguments":{"file_path":"package.json"}}],"reason":"Checked local file for global external information.","severity":"medium"}]}
-{"id":"google_web_search-02","metadata":{"tags":["tool:google_web_search","documentation"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"How do I use the 'Suspense' component in React 18?"},"expected":{"tool_calls":[{"name":"google_web_search","arguments":{"query":"React 18 Suspense documentation"}}],"rationale":"Use web search for library-specific documentation."},"negatives":[{"tool_calls":[{"name":"grep_search","arguments":{"pattern":"Suspense"}}],"reason":"Searched local code for external library documentation.","severity":"medium"}]}
-{"id":"google_web_search-03","metadata":{"tags":["tool:google_web_search","troubleshooting"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Error: TS2322: Type 'string' is not assignable to type 'number'."},"expected":{"tool_calls":[{"name":"google_web_search","arguments":{"query":"TypeScript error TS2322 string not assignable to number"}}],"rationale":"Use web search to research common programming errors."},"negatives":[{"tool_calls":[{"name":"generalist","arguments":{"request":"Fix TS2322"}}],"reason":"Delegated to an agent before researching the error.","severity":"low"}]}
-{"id":"google_web_search-04","metadata":{"tags":["tool:google_web_search","comparison"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Compare Vitest vs Jest for a new TypeScript project."},"expected":{"tool_calls":[{"name":"google_web_search","arguments":{"query":"Vitest vs Jest comparison 2026"}}],"rationale":"Use web search for architectural comparisons."},"negatives":[{"tool_calls":[{"name":"cli_help","arguments":{"question":"Vitest vs Jest"}}],"reason":"Asked the internal help system for external library comparisons.","severity":"medium"}]}
-{"id":"google_web_search-05","metadata":{"tags":["tool:google_web_search","news"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"What are the new features in the latest Node.js release?"},"expected":{"tool_calls":[{"name":"google_web_search","arguments":{"query":"latest Node.js release features"}}],"rationale":"Use web search for recent technical news."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"node -v"}}],"reason":"Checked local version instead of researching new features.","severity":"medium"}]}
-{"id":"read_many_files-01","metadata":{"tags":["tool:read_many_files","codebase-overview"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Show me all the CSS files in the project to check the styling."},"expected":{"tool_calls":[{"name":"read_many_files","arguments":{"include":["**/*.css"]}}],"rationale":"Use read_many_files to get the content of multiple files matching a pattern."},"negatives":[{"tool_calls":[{"name":"glob","arguments":{"pattern":"**/*.css"}}],"reason":"Only listed the files instead of reading their content as requested.","severity":"medium"},{"tool_calls":[{"name":"read_file","arguments":{"file_path":"src/app.css"}}],"reason":"Read only one file when all CSS files were requested.","severity":"medium"}]}
-{"id":"read_many_files-02","metadata":{"tags":["tool:read_many_files","batch-reading"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Read all the README files in the packages directory."},"expected":{"tool_calls":[{"name":"read_many_files","arguments":{"include":["packages/**/README.md"]}}],"rationale":"Use read_many_files for batch content retrieval."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"cat packages/**/README.md"}}],"reason":"Used shell 'cat' with globs instead of the specialized read_many_files tool.","severity":"high"}]}
-{"id":"read_many_files-03","metadata":{"tags":["tool:read_many_files","precision"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Show me the content of all .test.ts files in src/utils."},"expected":{"tool_calls":[{"name":"read_many_files","arguments":{"include":["src/utils/*.test.ts"]}}],"rationale":"Use read_many_files for targeted batch reading."},"negatives":[{"tool_calls":[{"name":"read_many_files","arguments":{"include":["**/*.test.ts"]}}],"reason":"Read too many files (all tests) instead of only those in src/utils.","severity":"low"}]}
-{"id":"read_many_files-04","metadata":{"tags":["tool:read_many_files","context-gathering"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"I need to see all the configuration files (json and yaml)."},"expected":{"tool_calls":[{"name":"read_many_files","arguments":{"include":["**/*.json","**/*.yaml"]}}],"rationale":"Use read_many_files with multiple patterns to gather context."},"negatives":[{"tool_calls":[{"name":"list_directory","arguments":{"dir_path":"."}}],"reason":"Only listed files instead of reading their content.","severity":"medium"}]}
-{"id":"read_many_files-05","metadata":{"tags":["tool:read_many_files","efficiency"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Read all source files in the current folder."},"expected":{"tool_calls":[{"name":"read_many_files","arguments":{"include":["*.ts","*.tsx","*.js"]}}],"rationale":"Use read_many_files to read specific source extensions."},"negatives":[{"tool_calls":[{"name":"read_file","arguments":{"file_path":"index.ts"}}],"reason":"Read only one file instead of all source files.","severity":"medium"}]}
-{"id":"save_memory-01","metadata":{"tags":["tool:save_memory","preference"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"I prefer using tabs instead of spaces for indentation."},"expected":{"tool_calls":[{"name":"save_memory","arguments":{"fact":"The user prefers using tabs instead of spaces for indentation."}}],"rationale":"Use save_memory to persist global user preferences."},"negatives":[{"tool_calls":[{"name":"write_file","arguments":{"file_path":".editorconfig","content":"..."}}],"reason":"Attempted to change project-specific config instead of saving a global user preference.","severity":"medium"}]}
-{"id":"save_memory-02","metadata":{"tags":["tool:save_memory","style"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Always use double quotes for strings in TypeScript."},"expected":{"tool_calls":[{"name":"save_memory","arguments":{"fact":"The user prefers double quotes for strings in TypeScript."}}],"rationale":"Use save_memory for coding style preferences."},"negatives":[{"tool_calls":[{"name":"ask_user","arguments":{"questions":[{"question":"Should I use double quotes?","header":"Style","type":"yesno"}]}}],"reason":"Asked for confirmation instead of remembering the clear preference.","severity":"low"}]}
-{"id":"save_memory-03","metadata":{"tags":["tool:save_memory","project-context-failure"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Remember that the main server file is src/server.ts."},"expected":{"tool_calls":[{"name":"ask_user","arguments":{"questions":[{"question":"This seems specific to this project. Should I remember it globally or is it only for this workspace?","header":"Memory Scope","type":"choice","options":[{"label":"Global","description":"Save to global memory"},{"label":"Project","description":"Only for this project (do not save)"}]}]}}],"rationale":"Ask before saving project-specific facts to global memory to avoid cluttering cross-session context."},"negatives":[{"tool_calls":[{"name":"save_memory","arguments":{"fact":"The main server file is src/server.ts"}}],"reason":"Saved a project-specific fact to global memory without confirmation.","severity":"medium"}]}
-{"id":"save_memory-04","metadata":{"tags":["tool:save_memory","persona"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"I am a senior backend engineer."},"expected":{"tool_calls":[{"name":"save_memory","arguments":{"fact":"The user is a senior backend engineer."}}],"rationale":"Use save_memory to remember user background/persona info."},"negatives":[{"tool_calls":[{"name":"generalist","arguments":{"request":"Remember user profile"}}],"reason":"Delegated to a simple memory task.","severity":"low"}]}
-{"id":"save_memory-05","metadata":{"tags":["tool:save_memory","workflow"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"I like to run tests before every commit."},"expected":{"tool_calls":[{"name":"save_memory","arguments":{"fact":"The user prefers to run tests before every commit."}}],"rationale":"Use save_memory for workflow preferences."},"negatives":[{"tool_calls":[{"name":"write_todos","arguments":{"todos":[{"description":"Run tests","status":"pending"}]}}],"reason":"Added to current todos instead of saving a permanent preference.","severity":"low"}]}
-{"id":"run_shell_command-01","metadata":{"tags":["tool:run_shell_command","test-execution"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Run the unit tests for the core package."},"expected":{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"npm run test -w @google/gemini-cli-core"}}],"rationale":"Use run_shell_command for executing ecosystem tools like test runners."},"negatives":[{"tool_calls":[{"name":"generalist","arguments":{"request":"Run tests"}}],"reason":"Delegated a simple command execution to an agent.","severity":"low"}]}
-{"id":"run_shell_command-02","metadata":{"tags":["tool:run_shell_command","git-ops"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Check the git status of the project."},"expected":{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"git status"}}],"rationale":"Use run_shell_command for git operations."},"negatives":[{"tool_calls":[{"name":"list_directory","arguments":{"dir_path":".git"}}],"reason":"Attempted to check git status by listing the .git directory.","severity":"medium"}]}
-{"id":"run_shell_command-03","metadata":{"tags":["tool:run_shell_command","background-process"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Start the DevTools server in the background."},"expected":{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"npm run start --workspace @google/gemini-cli-devtools","is_background":true}}],"rationale":"Use is_background:true for long-running servers."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"npm run start --workspace @google/gemini-cli-devtools"}}],"reason":"Started a server in the foreground, which would block the CLI.","severity":"medium"}]}
-{"id":"run_shell_command-04","metadata":{"tags":["tool:run_shell_command","env-check"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"What version of Node.js am I running?"},"expected":{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"node -v"}}],"rationale":"Use run_shell_command for environment introspection."},"negatives":[{"tool_calls":[{"name":"google_web_search","arguments":{"query":"latest node version"}}],"reason":"Searched web instead of checking local environment.","severity":"medium"}]}
-{"id":"run_shell_command-05","metadata":{"tags":["tool:run_shell_command","build-system"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Build the whole project."},"expected":{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"npm run build:all"}}],"rationale":"Use run_shell_command for build commands."},"negatives":[{"tool_calls":[{"name":"generalist","arguments":{"request":"Build project"}}],"reason":"Delegated a standard build command.","severity":"low"}]}
-{"id":"web_fetch-01","metadata":{"tags":["tool:web_fetch","documentation"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Summarize the breaking changes in this URL: https://example.com/changelog"},"expected":{"tool_calls":[{"name":"web_fetch","arguments":{"prompt":"Summarize the breaking changes from https://example.com/changelog"}}],"rationale":"Use web_fetch to extract and summarize content from a specific URL."},"negatives":[{"tool_calls":[{"name":"google_web_search","arguments":{"query":"breaking changes example.com"}}],"reason":"Used search instead of fetching the provided URL directly.","severity":"medium"}]}
-{"id":"web_fetch-02","metadata":{"tags":["tool:web_fetch","github-code"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Read the implementation of this function: https://github.com/user/repo/blob/main/src/lib.ts#L10"},"expected":{"tool_calls":[{"name":"web_fetch","arguments":{"prompt":"Read and explain the implementation at https://github.com/user/repo/blob/main/src/lib.ts#L10"}}],"rationale":"Use web_fetch for reading remote code snippets."},"negatives":[{"tool_calls":[{"name":"google_web_search","arguments":{"query":"implementation of src/lib.ts"}}],"reason":"Used search for a specific GitHub link.","severity":"medium"}]}
-{"id":"web_fetch-03","metadata":{"tags":["tool:web_fetch","multi-url"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Compare the feature sets of these two libraries: https://lib-a.com and https://lib-b.com"},"expected":{"tool_calls":[{"name":"web_fetch","arguments":{"prompt":"Compare the feature sets of https://lib-a.com and https://lib-b.com"}}],"rationale":"Use web_fetch to analyze and compare multiple URLs."},"negatives":[{"tool_calls":[{"name":"google_web_search","arguments":{"query":"compare lib-a vs lib-b"}}],"reason":"Used search instead of directly analyzing the provided URLs.","severity":"low"}]}
-{"id":"web_fetch-04","metadata":{"tags":["tool:web_fetch","research-depth"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"What is the main argument in this research paper? https://arxiv.org/pdf/1234.5678"},"expected":{"tool_calls":[{"name":"web_fetch","arguments":{"prompt":"Identify the main argument in the research paper at https://arxiv.org/pdf/1234.5678"}}],"rationale":"Use web_fetch for analyzing PDF content from a URL."},"negatives":[{"tool_calls":[{"name":"google_web_search","arguments":{"query":"main argument of arxiv 1234.5678"}}],"reason":"Used search for a direct PDF link analysis.","severity":"medium"}]}
-{"id":"web_fetch-05","metadata":{"tags":["tool:web_fetch","api-docs"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"How do I authenticate with this API? https://api-docs.com/auth"},"expected":{"tool_calls":[{"name":"web_fetch","arguments":{"prompt":"Find the authentication instructions at https://api-docs.com/auth"}}],"rationale":"Use web_fetch for extracting specific information from documentation URLs."},"negatives":[{"tool_calls":[{"name":"google_web_search","arguments":{"query":"how to authenticate with api-docs.com"}}],"reason":"Used search for a provided documentation link.","severity":"medium"}]}
-{"id":"write_todos-01","metadata":{"tags":["tool:write_todos","planning"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Implement a new feature to handle user profiles."},"expected":{"tool_calls":[{"name":"write_todos","arguments":{"todos":[{"description":"Design user profile schema","status":"pending"},{"description":"Implement database migrations","status":"pending"},{"description":"Create API endpoints for profiles","status":"pending"},{"description":"Add unit tests","status":"pending"}]}}],"rationale":"Use write_todos to break down a complex task into manageable subtasks."},"negatives":[{"tool_calls":[{"name":"write_file","arguments":{"file_path":"src/profiles.ts","content":"..."}}],"reason":"Started implementation without defining subtasks for a complex feature.","severity":"medium"}]}
-{"id":"write_todos-02","metadata":{"tags":["tool:write_todos","progress-tracking"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"I've finished the schema design. What's next?"},"expected":{"tool_calls":[{"name":"write_todos","arguments":{"todos":[{"description":"Design user profile schema","status":"completed"},{"description":"Implement database migrations","status":"in_progress"},{"description":"Create API endpoints for profiles","status":"pending"},{"description":"Add unit tests","status":"pending"}]}}],"rationale":"Use write_todos to update progress as tasks are completed."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"npm run build"}}],"reason":"Just ran build instead of updating the task list.","severity":"low"}]}
-{"id":"write_todos-03","metadata":{"tags":["tool:write_todos","complex-debugging"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Debug the memory leak issue in the production server."},"expected":{"tool_calls":[{"name":"write_todos","arguments":{"todos":[{"description":"Analyze heap dumps","status":"in_progress"},{"description":"Identify leaking objects","status":"pending"},{"description":"Locate source of leak in code","status":"pending"},{"description":"Implement fix and verify","status":"pending"}]}}],"rationale":"Use write_todos for managing complex, non-linear debugging tasks."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"top"}}],"reason":"Only ran a monitoring command instead of planning the debugging process.","severity":"medium"}]}
-{"id":"write_todos-04","metadata":{"tags":["tool:write_todos","multi-stage-fix"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Fix the authentication bug and then update the docs."},"expected":{"tool_calls":[{"name":"write_todos","arguments":{"todos":[{"description":"Reproduce authentication bug","status":"in_progress"},{"description":"Implement fix","status":"pending"},{"description":"Verify fix with tests","status":"pending"},{"description":"Update admin/auth-troubleshooting.md","status":"pending"}]}}],"rationale":"Use write_todos to sequence multi-part fixes."},"negatives":[{"tool_calls":[{"name":"grep_search","arguments":{"pattern":"auth"}}],"reason":"Started searching without defining the multi-stage task.","severity":"low"}]}
-{"id":"write_todos-05","metadata":{"tags":["tool:write_todos","refactor-planning"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"Migrate the database to PostgreSQL."},"expected":{"tool_calls":[{"name":"write_todos","arguments":{"todos":[{"description":"Install PostgreSQL drivers","status":"pending"},{"description":"Update database configuration","status":"pending"},{"description":"Migrate existing data","status":"pending"},{"description":"Verify with integration tests","status":"pending"}]}}],"rationale":"Use write_todos for planning migrations."},"negatives":[{"tool_calls":[{"name":"run_shell_command","arguments":{"command":"npm install pg"}}],"reason":"Started installation before defining the full migration path.","severity":"medium"}]}
-{"id":"save_memory-06","metadata":{"tags":["tool:save_memory","persistence"],"created_at":"2026-03-02T13:00:00Z"},"input":{"user_query":"I want you to remember that my name is Abhijit."},"expected":{"tool_calls":[{"name":"save_memory","arguments":{"fact":"The user's name is Abhijit."}}],"rationale":"Use save_memory to persist personal user information across sessions."},"negatives":[{"tool_calls":[{"name":"generalist","arguments":{"request":"Remember user's name"}}],"reason":"Delegated a simple memory task to an agent.","severity":"low"}]}

docs/changelogs/index.md

@@ -18,51 +18,6 @@ on GitHub.
 | [Preview](preview.md) | Experimental features ready for early feedback. |
 | [Stable](latest.md)   | Stable, recommended for general use.            |
 
-## Announcements: v0.32.0 - 2026-03-03
-
-- **Generalist Agent:** The generalist agent is now enabled to improve task
-  delegation and routing
-  ([#19665](https://github.com/google-gemini/gemini-cli/pull/19665) by
-  @joshualitt).
-- **Model Steering in Workspace:** Added support for model steering directly in
-  the workspace
-  ([#20343](https://github.com/google-gemini/gemini-cli/pull/20343) by
-  @joshualitt).
-- **Plan Mode Enhancements:** Users can now open and modify plans in an external
-  editor, and the planning workflow has been adapted to handle complex tasks
-  more effectively with multi-select options
-  ([#20348](https://github.com/google-gemini/gemini-cli/pull/20348) by @Adib234,
-  [#20465](https://github.com/google-gemini/gemini-cli/pull/20465) by @jerop).
-- **Interactive Shell Autocompletion:** Introduced interactive shell
-  autocompletion for a more seamless experience
-  ([#20082](https://github.com/google-gemini/gemini-cli/pull/20082) by
-  @mrpmohiburrahman).
-- **Parallel Extension Loading:** Extensions are now loaded in parallel to
-  improve startup times
-  ([#20229](https://github.com/google-gemini/gemini-cli/pull/20229) by
-  @scidomino).
-
-## Announcements: v0.31.0 - 2026-02-27
-
-- **Gemini 3.1 Pro Preview:** Gemini CLI now supports the new Gemini 3.1 Pro
-  Preview model
-  ([#19676](https://github.com/google-gemini/gemini-cli/pull/19676) by
-  @sehoon38).
-- **Experimental Browser Agent:** We've introduced a new experimental browser
-  agent to interact with web pages
-  ([#19284](https://github.com/google-gemini/gemini-cli/pull/19284) by
-  @gsquared94).
-- **Policy Engine Updates:** The policy engine now supports project-level
-  policies, MCP server wildcards, and tool annotation matching
-  ([#18682](https://github.com/google-gemini/gemini-cli/pull/18682) by
-  @Abhijit-2592,
-  [#20024](https://github.com/google-gemini/gemini-cli/pull/20024) by @jerop).
-- **Web Fetch Improvements:** We've implemented an experimental direct web fetch
-  feature and added rate limiting to mitigate DDoS risks
-  ([#19557](https://github.com/google-gemini/gemini-cli/pull/19557) by @mbleigh,
-  [#19567](https://github.com/google-gemini/gemini-cli/pull/19567) by
-  @mattKorwel).
-
 ## Announcements: v0.30.0 - 2026-02-25
 
 - **SDK & Custom Skills:** Introduced the initial SDK package, enabling dynamic
@@ -488,9 +443,8 @@ on GitHub.
   page in their default browser directly from the CLI using the `/extension`
   explore command. ([pr](https://github.com/google-gemini/gemini-cli/pull/11846)
   by [@JayadityaGit](https://github.com/JayadityaGit)).
-- **Configurable compression:** Users can modify the context compression
-  threshold in `/settings` (decimal with percentage display). The default has
-  been made more proactive
+- **Configurable compression:** Users can modify the compression threshold in
+  `/settings`. The default has been made more proactive
   ([pr](https://github.com/google-gemini/gemini-cli/pull/12317) by
   [@scidomino](https://github.com/scidomino)).
 - **API key authentication:** Users can now securely enter and store their

docs/changelogs/latest.md

@@ -1,6 +1,6 @@
-# Latest stable release: v0.32.0
+# Latest stable release: v0.30.1
 
-Released: March 03, 2026
+Released: February 27, 2026
 
 For most users, our latest stable release is the recommended release. Install
 the latest stable version with:
@@ -11,195 +11,326 @@ npm install -g @google/gemini-cli
 
 ## Highlights
 
-- **Plan Mode Enhancements**: Significant updates to Plan Mode, including the
-  ability to open and modify plans in an external editor, adaptations for
-  complex tasks with multi-select options, and integration tests for plan mode.
-- **Agent and Steering Improvements**: The generalist agent has been enabled to
-  enhance task delegation, model steering is now supported directly within the
-  workspace, and contiguous parallel admission is enabled for `Kind.Agent`
-  tools.
-- **Interactive Shell**: Interactive shell autocompletion has been introduced,
-  significantly enhancing the user experience.
-- **Core Stability and Performance**: Extensions are now loaded in parallel,
-  fetch timeouts have been increased, robust A2A streaming reassembly was
-  implemented, and orphaned processes when terminal closes have been prevented.
-- **Billing and Quota Handling**: Implemented G1 AI credits overage flow with
-  billing telemetry and added support for quota error fallbacks across all
-  authentication types.
+- **SDK & Custom Skills**: Introduced the initial SDK package, dynamic system
+  instructions, `SessionContext` for SDK tool calls, and support for custom
+  skills.
+- **Policy Engine Enhancements**: Added a `--policy` flag for user-defined
+  policies, strict seatbelt profiles, and transitioned away from
+  `--allowed-tools`.
+- **UI & Themes**: Introduced a generic searchable list for settings and
+  extensions, added Solarized Dark and Light themes, text wrapping capabilities
+  to markdown tables, and a clean UI toggle prototype.
+- **Vim Support & Ctrl-Z**: Improved Vim support to provide a more complete
+  experience and added support for Ctrl-Z suspension.
+- **Plan Mode & Tools**: Plan Mode now supports project exploration without
+  planning and skills can be enabled in plan mode. Tool output masking is
+  enabled by default, and core tool definitions have been centralized.
 
 ## What's Changed
 
-- feat(plan): add integration tests for plan mode by @Adib234 in
-  [#20214](https://github.com/google-gemini/gemini-cli/pull/20214)
-- fix(acp): update auth handshake to spec by @skeshive in
-  [#19725](https://github.com/google-gemini/gemini-cli/pull/19725)
-- feat(core): implement robust A2A streaming reassembly and fix task continuity
-  by @adamfweidman in
-  [#20091](https://github.com/google-gemini/gemini-cli/pull/20091)
-- feat(cli): load extensions in parallel by @scidomino in
-  [#20229](https://github.com/google-gemini/gemini-cli/pull/20229)
-- Plumb the maxAttempts setting through Config args by @kevinjwang1 in
-  [#20239](https://github.com/google-gemini/gemini-cli/pull/20239)
-- fix(cli): skip 404 errors in setup-github file downloads by @h30s in
-  [#20287](https://github.com/google-gemini/gemini-cli/pull/20287)
-- fix(cli): expose model.name setting in settings dialog for persistence by
-  @achaljhawar in
-  [#19605](https://github.com/google-gemini/gemini-cli/pull/19605)
-- docs: remove legacy cmd examples in favor of powershell by @scidomino in
-  [#20323](https://github.com/google-gemini/gemini-cli/pull/20323)
-- feat(core): Enable model steering in workspace. by @joshualitt in
-  [#20343](https://github.com/google-gemini/gemini-cli/pull/20343)
-- fix: remove trailing comma in issue triage workflow settings json by @Nixxx19
-  in [#20265](https://github.com/google-gemini/gemini-cli/pull/20265)
-- feat(core): implement task tracker foundation and service by @anj-s in
-  [#19464](https://github.com/google-gemini/gemini-cli/pull/19464)
-- test: support tests that include color information by @jacob314 in
-  [#20220](https://github.com/google-gemini/gemini-cli/pull/20220)
-- feat(core): introduce Kind.Agent for sub-agent classification by @abhipatel12
-  in [#20369](https://github.com/google-gemini/gemini-cli/pull/20369)
-- Changelog for v0.30.0 by @gemini-cli-robot in
-  [#20252](https://github.com/google-gemini/gemini-cli/pull/20252)
-- Update changelog workflow to reject nightly builds by @g-samroberts in
-  [#20248](https://github.com/google-gemini/gemini-cli/pull/20248)
-- Changelog for v0.31.0-preview.0 by @gemini-cli-robot in
-  [#20249](https://github.com/google-gemini/gemini-cli/pull/20249)
-- feat(cli): hide workspace policy update dialog and auto-accept by default by
+- fix(patch): cherry-pick 58df1c6 to release/v0.30.0-pr-20374 [CONFLICTS] by
+  @gemini-cli-robot in
+  [#20567](https://github.com/google-gemini/gemini-cli/pull/20567)
+- feat(ux): added text wrapping capabilities to markdown tables by @devr0306 in
+  [#18240](https://github.com/google-gemini/gemini-cli/pull/18240)
+- Revert "fix(mcp): ensure MCP transport is closed to prevent memory leaks" by
+  @skeshive in [#18771](https://github.com/google-gemini/gemini-cli/pull/18771)
+- chore(release): bump version to 0.30.0-nightly.20260210.a2174751d by
+  @gemini-cli-robot in
+  [#18772](https://github.com/google-gemini/gemini-cli/pull/18772)
+- chore: cleanup unused and add unlisted dependencies in packages/core by
+  @adamfweidman in
+  [#18762](https://github.com/google-gemini/gemini-cli/pull/18762)
+- chore(core): update activate_skill prompt verbiage to be more direct by
+  @NTaylorMullen in
+  [#18605](https://github.com/google-gemini/gemini-cli/pull/18605)
+- Add autoconfigure memory usage setting to the dialog by @jacob314 in
+  [#18510](https://github.com/google-gemini/gemini-cli/pull/18510)
+- fix(core): prevent race condition in policy persistence by @braddux in
+  [#18506](https://github.com/google-gemini/gemini-cli/pull/18506)
+- fix(evals): prevent false positive in hierarchical memory test by
   @Abhijit-2592 in
-  [#20351](https://github.com/google-gemini/gemini-cli/pull/20351)
-- feat(core): rename grep_search include parameter to include_pattern by
+  [#18777](https://github.com/google-gemini/gemini-cli/pull/18777)
+- test(evals): mark all `save_memory` evals as `USUALLY_PASSES` due to
+  unreliability by @jerop in
+  [#18786](https://github.com/google-gemini/gemini-cli/pull/18786)
+- feat(cli): add setting to hide shortcuts hint UI by @LyalinDotCom in
+  [#18562](https://github.com/google-gemini/gemini-cli/pull/18562)
+- feat(core): formalize 5-phase sequential planning workflow by @jerop in
+  [#18759](https://github.com/google-gemini/gemini-cli/pull/18759)
+- Introduce limits for search results. by @gundermanc in
+  [#18767](https://github.com/google-gemini/gemini-cli/pull/18767)
+- fix(cli): allow closing debug console after auto-open via flicker by
   @SandyTao520 in
-  [#20328](https://github.com/google-gemini/gemini-cli/pull/20328)
-- feat(plan): support opening and modifying plan in external editor by @Adib234
-  in [#20348](https://github.com/google-gemini/gemini-cli/pull/20348)
-- feat(cli): implement interactive shell autocompletion by @mrpmohiburrahman in
-  [#20082](https://github.com/google-gemini/gemini-cli/pull/20082)
-- fix(core): allow /memory add to work in plan mode by @Jefftree in
-  [#20353](https://github.com/google-gemini/gemini-cli/pull/20353)
-- feat(core): add HTTP 499 to retryable errors and map to RetryableQuotaError by
-  @bdmorgan in [#20432](https://github.com/google-gemini/gemini-cli/pull/20432)
-- feat(core): Enable generalist agent by @joshualitt in
-  [#19665](https://github.com/google-gemini/gemini-cli/pull/19665)
-- Updated tests in TableRenderer.test.tsx to use SVG snapshots by @devr0306 in
-  [#20450](https://github.com/google-gemini/gemini-cli/pull/20450)
-- Refactor Github Action per b/485167538 by @google-admin in
-  [#19443](https://github.com/google-gemini/gemini-cli/pull/19443)
-- fix(github): resolve actionlint and yamllint regressions from #19443 by @jerop
-  in [#20467](https://github.com/google-gemini/gemini-cli/pull/20467)
-- fix: action var usage by @galz10 in
-  [#20492](https://github.com/google-gemini/gemini-cli/pull/20492)
-- feat(core): improve A2A content extraction by @adamfweidman in
-  [#20487](https://github.com/google-gemini/gemini-cli/pull/20487)
-- fix(cli): support quota error fallbacks for all authentication types by
-  @sehoon38 in [#20475](https://github.com/google-gemini/gemini-cli/pull/20475)
-- fix(core): flush transcript for pure tool-call responses to ensure BeforeTool
-  hooks see complete state by @krishdef7 in
-  [#20419](https://github.com/google-gemini/gemini-cli/pull/20419)
-- feat(plan): adapt planning workflow based on complexity of task by @jerop in
-  [#20465](https://github.com/google-gemini/gemini-cli/pull/20465)
-- fix: prevent orphaned processes from consuming 100% CPU when terminal closes
-  by @yuvrajangadsingh in
-  [#16965](https://github.com/google-gemini/gemini-cli/pull/16965)
-- feat(core): increase fetch timeout and fix [object Object] error
-  stringification by @bdmorgan in
-  [#20441](https://github.com/google-gemini/gemini-cli/pull/20441)
-- [Gemma x Gemini CLI] Add an Experimental Gemma Router that uses a LiteRT-LM
-  shim into the Composite Model Classifier Strategy by @sidwan02 in
-  [#17231](https://github.com/google-gemini/gemini-cli/pull/17231)
-- docs(plan): update documentation regarding supporting editing of plan files
-  during plan approval by @Adib234 in
-  [#20452](https://github.com/google-gemini/gemini-cli/pull/20452)
-- test(cli): fix flaky ToolResultDisplay overflow test by @jwhelangoog in
-  [#20518](https://github.com/google-gemini/gemini-cli/pull/20518)
-- ui(cli): reduce length of Ctrl+O hint by @jwhelangoog in
-  [#20490](https://github.com/google-gemini/gemini-cli/pull/20490)
-- fix(ui): correct styled table width calculations by @devr0306 in
-  [#20042](https://github.com/google-gemini/gemini-cli/pull/20042)
-- Avoid overaggressive unescaping by @scidomino in
-  [#20520](https://github.com/google-gemini/gemini-cli/pull/20520)
-- feat(telemetry) Instrument traces with more attributes and make them available
-  to OTEL users by @heaventourist in
-  [#20237](https://github.com/google-gemini/gemini-cli/pull/20237)
-- Add support for policy engine in extensions by @chrstnb in
-  [#20049](https://github.com/google-gemini/gemini-cli/pull/20049)
-- Docs: Update to Terms of Service & FAQ by @jkcinouye in
-  [#20488](https://github.com/google-gemini/gemini-cli/pull/20488)
-- Fix bottom border rendering for search and add a regression test. by @jacob314
-  in [#20517](https://github.com/google-gemini/gemini-cli/pull/20517)
-- fix(core): apply retry logic to CodeAssistServer for all users by @bdmorgan in
-  [#20507](https://github.com/google-gemini/gemini-cli/pull/20507)
-- Fix extension MCP server env var loading by @chrstnb in
-  [#20374](https://github.com/google-gemini/gemini-cli/pull/20374)
-- feat(ui): add 'ctrl+o' hint to truncated content message by @jerop in
-  [#20529](https://github.com/google-gemini/gemini-cli/pull/20529)
-- Fix flicker showing message to press ctrl-O again to collapse. by @jacob314 in
-  [#20414](https://github.com/google-gemini/gemini-cli/pull/20414)
-- fix(cli): hide shortcuts hint while model is thinking or the user has typed a
-  prompt + add debounce to avoid flicker by @jacob314 in
-  [#19389](https://github.com/google-gemini/gemini-cli/pull/19389)
-- feat(plan): update planning workflow to encourage multi-select with
-  descriptions of options by @Adib234 in
-  [#20491](https://github.com/google-gemini/gemini-cli/pull/20491)
-- refactor(core,cli): useAlternateBuffer read from config by @psinha40898 in
-  [#20346](https://github.com/google-gemini/gemini-cli/pull/20346)
-- fix(cli): ensure dialogs stay scrolled to bottom in alternate buffer mode by
-  @jacob314 in [#20527](https://github.com/google-gemini/gemini-cli/pull/20527)
-- fix(core): revert auto-save of policies to user space by @Abhijit-2592 in
-  [#20531](https://github.com/google-gemini/gemini-cli/pull/20531)
-- Demote unreliable test. by @gundermanc in
-  [#20571](https://github.com/google-gemini/gemini-cli/pull/20571)
-- fix(core): handle optional response fields from code assist API by @sehoon38
-  in [#20345](https://github.com/google-gemini/gemini-cli/pull/20345)
-- fix(cli): keep thought summary when loading phrases are off by @LyalinDotCom
-  in [#20497](https://github.com/google-gemini/gemini-cli/pull/20497)
-- feat(cli): add temporary flag to disable workspace policies by @Abhijit-2592
-  in [#20523](https://github.com/google-gemini/gemini-cli/pull/20523)
-- Disable expensive and scheduled workflows on personal forks by @dewitt in
-  [#20449](https://github.com/google-gemini/gemini-cli/pull/20449)
-- Moved markdown parsing logic to a separate util file by @devr0306 in
-  [#20526](https://github.com/google-gemini/gemini-cli/pull/20526)
-- fix(plan): prevent agent from using ask_user for shell command confirmation by
-  @Adib234 in [#20504](https://github.com/google-gemini/gemini-cli/pull/20504)
-- fix(core): disable retries for code assist streaming requests by @sehoon38 in
-  [#20561](https://github.com/google-gemini/gemini-cli/pull/20561)
-- feat(billing): implement G1 AI credits overage flow with billing telemetry by
-  @gsquared94 in
-  [#18590](https://github.com/google-gemini/gemini-cli/pull/18590)
-- feat: better error messages by @gsquared94 in
-  [#20577](https://github.com/google-gemini/gemini-cli/pull/20577)
-- fix(ui): persist expansion in AskUser dialog when navigating options by @jerop
-  in [#20559](https://github.com/google-gemini/gemini-cli/pull/20559)
-- fix(cli): prevent sub-agent tool calls from leaking into UI by @abhipatel12 in
-  [#20580](https://github.com/google-gemini/gemini-cli/pull/20580)
-- fix(cli): Shell autocomplete polish by @jacob314 in
-  [#20411](https://github.com/google-gemini/gemini-cli/pull/20411)
-- Changelog for v0.31.0-preview.1 by @gemini-cli-robot in
-  [#20590](https://github.com/google-gemini/gemini-cli/pull/20590)
-- Add slash command for promoting behavioral evals to CI blocking by @gundermanc
-  in [#20575](https://github.com/google-gemini/gemini-cli/pull/20575)
-- Changelog for v0.30.1 by @gemini-cli-robot in
-  [#20589](https://github.com/google-gemini/gemini-cli/pull/20589)
-- Add low/full CLI error verbosity mode for cleaner UI by @LyalinDotCom in
-  [#20399](https://github.com/google-gemini/gemini-cli/pull/20399)
-- Disable Gemini PR reviews on draft PRs. by @gundermanc in
-  [#20362](https://github.com/google-gemini/gemini-cli/pull/20362)
-- Docs: FAQ update by @jkcinouye in
-  [#20585](https://github.com/google-gemini/gemini-cli/pull/20585)
-- fix(core): reduce intrusive MCP errors and deduplicate diagnostics by
-  @spencer426 in
-  [#20232](https://github.com/google-gemini/gemini-cli/pull/20232)
-- docs: fix spelling typos in installation guide by @campox747 in
-  [#20579](https://github.com/google-gemini/gemini-cli/pull/20579)
-- Promote stable tests to CI blocking. by @gundermanc in
-  [#20581](https://github.com/google-gemini/gemini-cli/pull/20581)
-- feat(core): enable contiguous parallel admission for Kind.Agent tools by
+  [#18795](https://github.com/google-gemini/gemini-cli/pull/18795)
+- feat(masking): enable tool output masking by default by @abhipatel12 in
+  [#18564](https://github.com/google-gemini/gemini-cli/pull/18564)
+- perf(ui): optimize table rendering by memoizing styled characters by @devr0306
+  in [#18770](https://github.com/google-gemini/gemini-cli/pull/18770)
+- feat: multi-line text answers in ask-user tool by @jackwotherspoon in
+  [#18741](https://github.com/google-gemini/gemini-cli/pull/18741)
+- perf(cli): truncate large debug logs and limit message history by @mattKorwel
+  in [#18663](https://github.com/google-gemini/gemini-cli/pull/18663)
+- fix(core): complete MCP discovery when configured servers are skipped by
+  @LyalinDotCom in
+  [#18586](https://github.com/google-gemini/gemini-cli/pull/18586)
+- fix(core): cache CLI version to ensure consistency during sessions by
+  @sehoon38 in [#18793](https://github.com/google-gemini/gemini-cli/pull/18793)
+- fix(cli): resolve double rendering in shpool and address vscode lint warnings
+  by @braddux in
+  [#18704](https://github.com/google-gemini/gemini-cli/pull/18704)
+- feat(plan): document and validate Plan Mode policy overrides by @jerop in
+  [#18825](https://github.com/google-gemini/gemini-cli/pull/18825)
+- Fix pressing any key to exit select mode. by @jacob314 in
+  [#18421](https://github.com/google-gemini/gemini-cli/pull/18421)
+- fix(cli): update F12 behavior to only open drawer if browser fails by
+  @SandyTao520 in
+  [#18829](https://github.com/google-gemini/gemini-cli/pull/18829)
+- feat(plan): allow skills to be enabled in plan mode by @Adib234 in
+  [#18817](https://github.com/google-gemini/gemini-cli/pull/18817)
+- docs(plan): add documentation for plan mode tools by @jerop in
+  [#18827](https://github.com/google-gemini/gemini-cli/pull/18827)
+- Remove experimental note in extension settings docs by @chrstnb in
+  [#18822](https://github.com/google-gemini/gemini-cli/pull/18822)
+- Update prompt and grep tool definition to limit context size by @gundermanc in
+  [#18780](https://github.com/google-gemini/gemini-cli/pull/18780)
+- docs(plan): add `ask_user` tool documentation by @jerop in
+  [#18830](https://github.com/google-gemini/gemini-cli/pull/18830)
+- Revert unintended credentials exposure by @Adib234 in
+  [#18840](https://github.com/google-gemini/gemini-cli/pull/18840)
+- feat(core): update internal utility models to Gemini 3 by @SandyTao520 in
+  [#18773](https://github.com/google-gemini/gemini-cli/pull/18773)
+- feat(a2a): add value-resolver for auth credential resolution by @adamfweidman
+  in [#18653](https://github.com/google-gemini/gemini-cli/pull/18653)
+- Removed getPlainTextLength by @devr0306 in
+  [#18848](https://github.com/google-gemini/gemini-cli/pull/18848)
+- More grep prompt tweaks by @gundermanc in
+  [#18846](https://github.com/google-gemini/gemini-cli/pull/18846)
+- refactor(cli): Reactive useSettingsStore hook by @psinha40898 in
+  [#14915](https://github.com/google-gemini/gemini-cli/pull/14915)
+- fix(mcp): Ensure that stdio MCP server execution has the `GEMINI_CLI=1` env
+  variable populated. by @richieforeman in
+  [#18832](https://github.com/google-gemini/gemini-cli/pull/18832)
+- fix(core): improve headless mode detection for flags and query args by @galz10
+  in [#18855](https://github.com/google-gemini/gemini-cli/pull/18855)
+- refactor(cli): simplify UI and remove legacy inline tool confirmation logic by
   @abhipatel12 in
-  [#20583](https://github.com/google-gemini/gemini-cli/pull/20583)
-- Enforce import/no-duplicates as error by @Nixxx19 in
-  [#19797](https://github.com/google-gemini/gemini-cli/pull/19797)
-- fix: merge duplicate imports in sdk and test-utils packages (1/4) by @Nixxx19
-  in [#19777](https://github.com/google-gemini/gemini-cli/pull/19777)
-- fix: merge duplicate imports in a2a-server package (2/4) by @Nixxx19 in
-  [#19781](https://github.com/google-gemini/gemini-cli/pull/19781)
+  [#18566](https://github.com/google-gemini/gemini-cli/pull/18566)
+- feat(cli): deprecate --allowed-tools and excludeTools in favor of policy
+  engine by @Abhijit-2592 in
+  [#18508](https://github.com/google-gemini/gemini-cli/pull/18508)
+- fix(workflows): improve maintainer detection for automated PR actions by
+  @bdmorgan in [#18869](https://github.com/google-gemini/gemini-cli/pull/18869)
+- refactor(cli): consolidate useToolScheduler and delete legacy implementation
+  by @abhipatel12 in
+  [#18567](https://github.com/google-gemini/gemini-cli/pull/18567)
+- Update changelog for v0.28.0 and v0.29.0-preview0 by @g-samroberts in
+  [#18819](https://github.com/google-gemini/gemini-cli/pull/18819)
+- fix(core): ensure sub-agents are registered regardless of tools.allowed by
+  @mattKorwel in
+  [#18870](https://github.com/google-gemini/gemini-cli/pull/18870)
+- Show notification when there's a conflict with an extensions command by
+  @chrstnb in [#17890](https://github.com/google-gemini/gemini-cli/pull/17890)
+- fix(cli): dismiss '?' shortcuts help on hotkeys and active states by
+  @LyalinDotCom in
+  [#18583](https://github.com/google-gemini/gemini-cli/pull/18583)
+- fix(core): prioritize conditional policy rules and harden Plan Mode by
+  @Abhijit-2592 in
+  [#18882](https://github.com/google-gemini/gemini-cli/pull/18882)
+- feat(core): refine Plan Mode system prompt for agentic execution by
+  @NTaylorMullen in
+  [#18799](https://github.com/google-gemini/gemini-cli/pull/18799)
+- feat(plan): create metrics for usage of `AskUser` tool by @Adib234 in
+  [#18820](https://github.com/google-gemini/gemini-cli/pull/18820)
+- feat(cli): support Ctrl-Z suspension by @scidomino in
+  [#18931](https://github.com/google-gemini/gemini-cli/pull/18931)
+- fix(github-actions): use robot PAT for release creation to trigger release
+  notes by @SandyTao520 in
+  [#18794](https://github.com/google-gemini/gemini-cli/pull/18794)
+- feat: add strict seatbelt profiles and remove unusable closed profiles by
+  @SandyTao520 in
+  [#18876](https://github.com/google-gemini/gemini-cli/pull/18876)
+- chore: cleanup unused and add unlisted dependencies in packages/a2a-server by
+  @adamfweidman in
+  [#18916](https://github.com/google-gemini/gemini-cli/pull/18916)
+- fix(plan): isolate plan files per session by @Adib234 in
+  [#18757](https://github.com/google-gemini/gemini-cli/pull/18757)
+- fix: character truncation in raw markdown mode by @jackwotherspoon in
+  [#18938](https://github.com/google-gemini/gemini-cli/pull/18938)
+- feat(cli): prototype clean UI toggle and minimal-mode bleed-through by
+  @LyalinDotCom in
+  [#18683](https://github.com/google-gemini/gemini-cli/pull/18683)
+- ui(polish) blend background color with theme by @jacob314 in
+  [#18802](https://github.com/google-gemini/gemini-cli/pull/18802)
+- Add generic searchable list to back settings and extensions by @chrstnb in
+  [#18838](https://github.com/google-gemini/gemini-cli/pull/18838)
+- feat(ui): align `AskUser` color scheme with UX spec by @jerop in
+  [#18943](https://github.com/google-gemini/gemini-cli/pull/18943)
+- Hide AskUser tool validation errors from UI (agent self-corrects) by @jerop in
+  [#18954](https://github.com/google-gemini/gemini-cli/pull/18954)
+- bug(cli) fix flicker due to AppContainer continuous initialization by
+  @jacob314 in [#18958](https://github.com/google-gemini/gemini-cli/pull/18958)
+- feat(admin): Add admin controls documentation by @skeshive in
+  [#18644](https://github.com/google-gemini/gemini-cli/pull/18644)
+- feat(cli): disable ctrl-s shortcut outside of alternate buffer mode by
+  @jacob314 in [#18887](https://github.com/google-gemini/gemini-cli/pull/18887)
+- fix(vim): vim support that feels (more) complete by @ppgranger in
+  [#18755](https://github.com/google-gemini/gemini-cli/pull/18755)
+- feat(policy): add --policy flag for user defined policies by @allenhutchison
+  in [#18500](https://github.com/google-gemini/gemini-cli/pull/18500)
+- Update installation guide by @g-samroberts in
+  [#18823](https://github.com/google-gemini/gemini-cli/pull/18823)
+- refactor(core): centralize tool definitions (Group 1: replace, search, grep)
+  by @aishaneeshah in
+  [#18944](https://github.com/google-gemini/gemini-cli/pull/18944)
+- refactor(cli): finalize event-driven transition and remove interaction bridge
+  by @abhipatel12 in
+  [#18569](https://github.com/google-gemini/gemini-cli/pull/18569)
+- Fix drag and drop escaping by @scidomino in
+  [#18965](https://github.com/google-gemini/gemini-cli/pull/18965)
+- feat(sdk): initial package bootstrap for SDK by @mbleigh in
+  [#18861](https://github.com/google-gemini/gemini-cli/pull/18861)
+- feat(sdk): implements SessionContext for SDK tool calls by @mbleigh in
+  [#18862](https://github.com/google-gemini/gemini-cli/pull/18862)
+- fix(plan): make question type required in AskUser tool by @Adib234 in
+  [#18959](https://github.com/google-gemini/gemini-cli/pull/18959)
+- fix(core): ensure --yolo does not force headless mode by @NTaylorMullen in
+  [#18976](https://github.com/google-gemini/gemini-cli/pull/18976)
+- refactor(core): adopt `CoreToolCallStatus` enum for type safety by @jerop in
+  [#18998](https://github.com/google-gemini/gemini-cli/pull/18998)
+- Enable in-CLI extension management commands for team by @chrstnb in
+  [#18957](https://github.com/google-gemini/gemini-cli/pull/18957)
+- Adjust lint rules to avoid unnecessary warning. by @scidomino in
+  [#18970](https://github.com/google-gemini/gemini-cli/pull/18970)
+- fix(vscode): resolve unsafe type assertion lint errors by @ehedlund in
+  [#19006](https://github.com/google-gemini/gemini-cli/pull/19006)
+- Remove unnecessary eslint config file by @scidomino in
+  [#19015](https://github.com/google-gemini/gemini-cli/pull/19015)
+- fix(core): Prevent loop detection false positives on lists with long shared
+  prefixes by @SandyTao520 in
+  [#18975](https://github.com/google-gemini/gemini-cli/pull/18975)
+- feat(core): fallback to chat-base when using unrecognized models for chat by
+  @SandyTao520 in
+  [#19016](https://github.com/google-gemini/gemini-cli/pull/19016)
+- docs: fix inconsistent commandRegex example in policy engine by @NTaylorMullen
+  in [#19027](https://github.com/google-gemini/gemini-cli/pull/19027)
+- fix(plan): persist the approval mode in UI even when agent is thinking by
+  @Adib234 in [#18955](https://github.com/google-gemini/gemini-cli/pull/18955)
+- feat(sdk): Implement dynamic system instructions by @mbleigh in
+  [#18863](https://github.com/google-gemini/gemini-cli/pull/18863)
+- Docs: Refresh docs to organize and standardize reference materials. by
+  @jkcinouye in [#18403](https://github.com/google-gemini/gemini-cli/pull/18403)
+- fix windows escaping (and broken tests) by @scidomino in
+  [#19011](https://github.com/google-gemini/gemini-cli/pull/19011)
+- refactor: use `CoreToolCallStatus` in the the history data model by @jerop in
+  [#19033](https://github.com/google-gemini/gemini-cli/pull/19033)
+- feat(cleanup): enable 30-day session retention by default by @skeshive in
+  [#18854](https://github.com/google-gemini/gemini-cli/pull/18854)
+- feat(plan): hide plan write and edit operations on plans in Plan Mode by
+  @jerop in [#19012](https://github.com/google-gemini/gemini-cli/pull/19012)
+- bug(ui) fix flicker refreshing background color by @jacob314 in
+  [#19041](https://github.com/google-gemini/gemini-cli/pull/19041)
+- chore: fix dep vulnerabilities by @scidomino in
+  [#19036](https://github.com/google-gemini/gemini-cli/pull/19036)
+- Revamp automated changelog skill by @g-samroberts in
+  [#18974](https://github.com/google-gemini/gemini-cli/pull/18974)
+- feat(sdk): implement support for custom skills by @mbleigh in
+  [#19031](https://github.com/google-gemini/gemini-cli/pull/19031)
+- refactor(core): complete centralization of core tool definitions by
+  @aishaneeshah in
+  [#18991](https://github.com/google-gemini/gemini-cli/pull/18991)
+- feat: add /commands reload to refresh custom TOML commands by @korade-krushna
+  in [#19078](https://github.com/google-gemini/gemini-cli/pull/19078)
+- fix(cli): wrap terminal capability queries in hidden sequence by @srithreepo
+  in [#19080](https://github.com/google-gemini/gemini-cli/pull/19080)
+- fix(workflows): fix GitHub App token permissions for maintainer detection by
+  @bdmorgan in [#19139](https://github.com/google-gemini/gemini-cli/pull/19139)
+- test: fix hook integration test flakiness on Windows CI by @NTaylorMullen in
+  [#18665](https://github.com/google-gemini/gemini-cli/pull/18665)
+- fix(core): Encourage non-interactive flags for scaffolding commands by
+  @NTaylorMullen in
+  [#18804](https://github.com/google-gemini/gemini-cli/pull/18804)
+- fix(core): propagate User-Agent header to setup-phase CodeAssist API calls by
+  @gsquared94 in
+  [#19182](https://github.com/google-gemini/gemini-cli/pull/19182)
+- docs: document .agents/skills alias and discovery precedence by @kevmoo in
+  [#19166](https://github.com/google-gemini/gemini-cli/pull/19166)
+- feat(cli): add loading state to new agents notification by @sehoon38 in
+  [#19190](https://github.com/google-gemini/gemini-cli/pull/19190)
+- Add base branch to workflow. by @g-samroberts in
+  [#19189](https://github.com/google-gemini/gemini-cli/pull/19189)
+- feat(cli): handle invalid model names in useQuotaAndFallback by @sehoon38 in
+  [#19222](https://github.com/google-gemini/gemini-cli/pull/19222)
+- docs: custom themes in extensions by @jackwotherspoon in
+  [#19219](https://github.com/google-gemini/gemini-cli/pull/19219)
+- Disable workspace settings when starting GCLI in the home directory. by
+  @kevinjwang1 in
+  [#19034](https://github.com/google-gemini/gemini-cli/pull/19034)
+- feat(cli): refactor model command to support set and manage subcommands by
+  @sehoon38 in [#19221](https://github.com/google-gemini/gemini-cli/pull/19221)
+- Add refresh/reload aliases to slash command subcommands by @korade-krushna in
+  [#19218](https://github.com/google-gemini/gemini-cli/pull/19218)
+- refactor: consolidate development rules and add cli guidelines by @jacob314 in
+  [#19214](https://github.com/google-gemini/gemini-cli/pull/19214)
+- chore(ui): remove outdated tip about model routing by @sehoon38 in
+  [#19226](https://github.com/google-gemini/gemini-cli/pull/19226)
+- feat(core): support custom reasoning models by default by @NTaylorMullen in
+  [#19227](https://github.com/google-gemini/gemini-cli/pull/19227)
+- Add Solarized Dark and Solarized Light themes by @rmedranollamas in
+  [#19064](https://github.com/google-gemini/gemini-cli/pull/19064)
+- fix(telemetry): replace JSON.stringify with safeJsonStringify in file
+  exporters by @gsquared94 in
+  [#19244](https://github.com/google-gemini/gemini-cli/pull/19244)
+- feat(telemetry): add keychain availability and token storage metrics by
+  @abhipatel12 in
+  [#18971](https://github.com/google-gemini/gemini-cli/pull/18971)
+- feat(cli): update approval mode cycle order by @jerop in
+  [#19254](https://github.com/google-gemini/gemini-cli/pull/19254)
+- refactor(cli): code review cleanup fix for tab+tab by @jacob314 in
+  [#18967](https://github.com/google-gemini/gemini-cli/pull/18967)
+- feat(plan): support project exploration without planning when in plan mode by
+  @Adib234 in [#18992](https://github.com/google-gemini/gemini-cli/pull/18992)
+- feat: add role-specific statistics to telemetry and UI (cont. #15234) by
+  @yunaseoul in [#18824](https://github.com/google-gemini/gemini-cli/pull/18824)
+- feat(cli): remove Plan Mode from rotation when actively working by @jerop in
+  [#19262](https://github.com/google-gemini/gemini-cli/pull/19262)
+- Fix side breakage where anchors don't work in slugs. by @g-samroberts in
+  [#19261](https://github.com/google-gemini/gemini-cli/pull/19261)
+- feat(config): add setting to make directory tree context configurable by
+  @kevin-ramdass in
+  [#19053](https://github.com/google-gemini/gemini-cli/pull/19053)
+- fix(acp): Wait for mcp initialization in acp (#18893) by @Mervap in
+  [#18894](https://github.com/google-gemini/gemini-cli/pull/18894)
+- docs: format UTC times in releases doc by @pavan-sh in
+  [#18169](https://github.com/google-gemini/gemini-cli/pull/18169)
+- Docs: Clarify extensions documentation. by @jkcinouye in
+  [#19277](https://github.com/google-gemini/gemini-cli/pull/19277)
+- refactor(core): modularize tool definitions by model family by @aishaneeshah
+  in [#19269](https://github.com/google-gemini/gemini-cli/pull/19269)
+- fix(paths): Add cross-platform path normalization by @spencer426 in
+  [#18939](https://github.com/google-gemini/gemini-cli/pull/18939)
+- feat(core): experimental in-progress steering hints (1 of 3) by @joshualitt in
+  [#19008](https://github.com/google-gemini/gemini-cli/pull/19008)
+- fix(patch): cherry-pick 261788c to release/v0.30.0-preview.0-pr-19453 to patch
+  version v0.30.0-preview.0 and create version 0.30.0-preview.1 by
+  @gemini-cli-robot in
+  [#19490](https://github.com/google-gemini/gemini-cli/pull/19490)
+- fix(patch): cherry-pick c43500c to release/v0.30.0-preview.1-pr-19502 to patch
+  version v0.30.0-preview.1 and create version 0.30.0-preview.2 by
+  @gemini-cli-robot in
+  [#19521](https://github.com/google-gemini/gemini-cli/pull/19521)
+- fix(patch): cherry-pick aa9163d to release/v0.30.0-preview.3-pr-19991 to patch
+  version v0.30.0-preview.3 and create version 0.30.0-preview.4 by
+  @gemini-cli-robot in
+  [#20040](https://github.com/google-gemini/gemini-cli/pull/20040)
+- fix(patch): cherry-pick 2c1d6f8 to release/v0.30.0-preview.4-pr-19369 to patch
+  version v0.30.0-preview.4 and create version 0.30.0-preview.5 by
+  @gemini-cli-robot in
+  [#20086](https://github.com/google-gemini/gemini-cli/pull/20086)
+- fix(patch): cherry-pick d96bd05 to release/v0.30.0-preview.5-pr-19867 to patch
+  version v0.30.0-preview.5 and create version 0.30.0-preview.6 by
+  @gemini-cli-robot in
+  [#20112](https://github.com/google-gemini/gemini-cli/pull/20112)
 
 **Full Changelog**:
-https://github.com/google-gemini/gemini-cli/compare/v0.31.0...v0.32.0
+https://github.com/google-gemini/gemini-cli/compare/v0.29.7...v0.30.1

docs/changelogs/preview.md

@@ -1,6 +1,6 @@
-# Preview release: v0.33.0-preview.1
+# Preview release: v0.31.0-preview.1
 
-Released: March 04, 2026
+Released: February 27, 2026
 
 Our preview release includes the latest, new, and experimental features. This
 release may not be as stable as our [latest weekly release](latest.md).
@@ -13,175 +13,404 @@ npm install -g @google/gemini-cli@preview
 
 ## Highlights
 
-- **Plan Mode Enhancements**: Added support for annotating plans with feedback
-  for iteration, enabling built-in research subagents in plan mode, and a new
-  `copy` subcommand.
-- **Agent and Skill Improvements**: Introduced the new `github-issue-creator`
-  skill, implemented HTTP authentication support for A2A remote agents, and
-  added support for authenticated A2A agent card discovery.
-- **CLI UX/UI Updates**: Redesigned the header to be compact with an ASCII icon,
-  inverted the context window display to show usage, and directly indicate auth
-  required state for agents.
-- **Core and ACP Enhancements**: Implemented slash command handling in ACP (for
-  `/memory`, `/init`, `/extensions`, and `/restore`), added a set models
-  interface to ACP, and centralized `read_file` limits while truncating large
-  MCP tool output.
+- **Plan Mode Enhancements**: Numerous additions including automatic model
+  switching, custom storage directory configuration, message injection upon
+  manual exit, enforcement of read-only constraints, and centralized tool
+  visibility in the policy engine.
+- **Policy Engine Updates**: Project-level policy support added, alongside MCP
+  server wildcard support, tool annotation propagation and matching, and
+  workspace-level "Always Allow" persistence.
+- **MCP Integration Improvements**: Better integration through support for MCP
+  progress updates with input validation and throttling, environment variable
+  expansion for servers, and full details expansion on tool approval.
+- **CLI & Core UX Enhancements**: Several UI and quality-of-life updates such as
+  Alt+D for forward word deletion, macOS run-event notifications, enhanced
+  folder trust configurations with security warnings, improved startup warnings,
+  and a new experimental browser agent.
+- **Security & Stability**: Introduced the Conseca framework, deceptive URL and
+  Unicode character detection, stricter access checks, rate limits on web fetch,
+  and resolved multiple dependency vulnerabilities.
 
 ## What's Changed
 
-- fix(patch): cherry-pick 0659ad1 to release/v0.33.0-preview.0-pr-21042 to patch
-  version v0.33.0-preview.0 and create version 0.33.0-preview.1 by
+- fix(patch): cherry-pick 58df1c6 to release/v0.31.0-preview.0-pr-20374 to patch
+  version v0.31.0-preview.0 and create version 0.31.0-preview.1 by
   @gemini-cli-robot in
-  [#21047](https://github.com/google-gemini/gemini-cli/pull/21047)
-
-* Docs: Update model docs to remove Preview Features. by @jkcinouye in
-  [#20084](https://github.com/google-gemini/gemini-cli/pull/20084)
-* docs: fix typo in installation documentation by @AdityaSharma-Git3207 in
-  [#20153](https://github.com/google-gemini/gemini-cli/pull/20153)
-* docs: add Windows PowerShell equivalents for environments and scripting by
-  @scidomino in [#20333](https://github.com/google-gemini/gemini-cli/pull/20333)
-* fix(core): parse raw ASCII buffer strings in Gaxios errors by @sehoon38 in
-  [#20626](https://github.com/google-gemini/gemini-cli/pull/20626)
-* chore(release): bump version to 0.33.0-nightly.20260227.ba149afa0 by @galz10
-  in [#20637](https://github.com/google-gemini/gemini-cli/pull/20637)
-* fix(github): use robot PAT for automated PRs to pass CLA check by @galz10 in
-  [#20641](https://github.com/google-gemini/gemini-cli/pull/20641)
-* chore/release: bump version to 0.33.0-nightly.20260228.1ca5c05d0 by
-  @gemini-cli-robot in
-  [#20644](https://github.com/google-gemini/gemini-cli/pull/20644)
-* Changelog for v0.31.0 by @gemini-cli-robot in
-  [#20634](https://github.com/google-gemini/gemini-cli/pull/20634)
-* fix: use full paths for ACP diff payloads by @JagjeevanAK in
-  [#19539](https://github.com/google-gemini/gemini-cli/pull/19539)
-* Changelog for v0.32.0-preview.0 by @gemini-cli-robot in
-  [#20627](https://github.com/google-gemini/gemini-cli/pull/20627)
-* fix: acp/zed race condition between MCP initialisation and prompt by
-  @kartikangiras in
-  [#20205](https://github.com/google-gemini/gemini-cli/pull/20205)
-* fix(cli): reset themeManager between tests to ensure isolation by
-  @NTaylorMullen in
-  [#20598](https://github.com/google-gemini/gemini-cli/pull/20598)
-* refactor(core): Extract tool parameter names as constants by @SandyTao520 in
-  [#20460](https://github.com/google-gemini/gemini-cli/pull/20460)
-* fix(cli): resolve autoThemeSwitching when background hasn't changed but theme
-  mismatches by @sehoon38 in
-  [#20706](https://github.com/google-gemini/gemini-cli/pull/20706)
-* feat(skills): add github-issue-creator skill by @sehoon38 in
-  [#20709](https://github.com/google-gemini/gemini-cli/pull/20709)
-* fix(cli): allow sub-agent confirmation requests in UI while preventing
-  background flicker by @abhipatel12 in
-  [#20722](https://github.com/google-gemini/gemini-cli/pull/20722)
-* Merge User and Agent Card Descriptions #20849 by @adamfweidman in
-  [#20850](https://github.com/google-gemini/gemini-cli/pull/20850)
-* fix(core): reduce LLM-based loop detection false positives by @SandyTao520 in
-  [#20701](https://github.com/google-gemini/gemini-cli/pull/20701)
-* fix(plan): deflake plan mode integration tests by @Adib234 in
-  [#20477](https://github.com/google-gemini/gemini-cli/pull/20477)
-* Add /unassign support by @scidomino in
-  [#20864](https://github.com/google-gemini/gemini-cli/pull/20864)
-* feat(core): implement HTTP authentication support for A2A remote agents by
+  [#20568](https://github.com/google-gemini/gemini-cli/pull/20568)
+- Use ranged reads and limited searches and fuzzy editing improvements by
+  @gundermanc in
+  [#19240](https://github.com/google-gemini/gemini-cli/pull/19240)
+- Fix bottom border color by @jacob314 in
+  [#19266](https://github.com/google-gemini/gemini-cli/pull/19266)
+- Release note generator fix by @g-samroberts in
+  [#19363](https://github.com/google-gemini/gemini-cli/pull/19363)
+- test(evals): add behavioral tests for tool output masking by @NTaylorMullen in
+  [#19172](https://github.com/google-gemini/gemini-cli/pull/19172)
+- docs: clarify preflight instructions in GEMINI.md by @NTaylorMullen in
+  [#19377](https://github.com/google-gemini/gemini-cli/pull/19377)
+- feat(cli): add gemini --resume hint on exit by @Mag1ck in
+  [#16285](https://github.com/google-gemini/gemini-cli/pull/16285)
+- fix: optimize height calculations for ask_user dialog by @jackwotherspoon in
+  [#19017](https://github.com/google-gemini/gemini-cli/pull/19017)
+- feat(cli): add Alt+D for forward word deletion by @scidomino in
+  [#19300](https://github.com/google-gemini/gemini-cli/pull/19300)
+- Disable failing eval test by @chrstnb in
+  [#19455](https://github.com/google-gemini/gemini-cli/pull/19455)
+- fix(cli): support legacy onConfirm callback in ToolActionsContext by
   @SandyTao520 in
-  [#20510](https://github.com/google-gemini/gemini-cli/pull/20510)
-* feat(core): centralize read_file limits and update gemini-3 description by
+  [#19369](https://github.com/google-gemini/gemini-cli/pull/19369)
+- chore(deps): bump tar from 7.5.7 to 7.5.8 by dependabot[bot] in
+  [#19367](https://github.com/google-gemini/gemini-cli/pull/19367)
+- fix(plan): allow safe fallback when experiment setting for plan is not enabled
+  but approval mode at startup is plan by @Adib234 in
+  [#19439](https://github.com/google-gemini/gemini-cli/pull/19439)
+- Add explicit color-convert dependency by @chrstnb in
+  [#19460](https://github.com/google-gemini/gemini-cli/pull/19460)
+- feat(devtools): migrate devtools package into monorepo by @SandyTao520 in
+  [#18936](https://github.com/google-gemini/gemini-cli/pull/18936)
+- fix(core): clarify plan mode constraints and exit mechanism by @jerop in
+  [#19438](https://github.com/google-gemini/gemini-cli/pull/19438)
+- feat(cli): add macOS run-event notifications (interactive only) by
+  @LyalinDotCom in
+  [#19056](https://github.com/google-gemini/gemini-cli/pull/19056)
+- Changelog for v0.29.0 by @gemini-cli-robot in
+  [#19361](https://github.com/google-gemini/gemini-cli/pull/19361)
+- fix(ui): preventing empty history items from being added by @devr0306 in
+  [#19014](https://github.com/google-gemini/gemini-cli/pull/19014)
+- Changelog for v0.30.0-preview.0 by @gemini-cli-robot in
+  [#19364](https://github.com/google-gemini/gemini-cli/pull/19364)
+- feat(core): add support for MCP progress updates by @NTaylorMullen in
+  [#19046](https://github.com/google-gemini/gemini-cli/pull/19046)
+- fix(core): ensure directory exists before writing conversation file by
+  @godwiniheuwa in
+  [#18429](https://github.com/google-gemini/gemini-cli/pull/18429)
+- fix(ui): move margin from top to bottom in ToolGroupMessage by @imadraude in
+  [#17198](https://github.com/google-gemini/gemini-cli/pull/17198)
+- fix(cli): treat unknown slash commands as regular input instead of showing
+  error by @skyvanguard in
+  [#17393](https://github.com/google-gemini/gemini-cli/pull/17393)
+- feat(core): experimental in-progress steering hints (2 of 2) by @joshualitt in
+  [#19307](https://github.com/google-gemini/gemini-cli/pull/19307)
+- docs(plan): add documentation for plan mode command by @Adib234 in
+  [#19467](https://github.com/google-gemini/gemini-cli/pull/19467)
+- fix(core): ripgrep fails when pattern looks like ripgrep flag by @syvb in
+  [#18858](https://github.com/google-gemini/gemini-cli/pull/18858)
+- fix(cli): disable auto-completion on Shift+Tab to preserve mode cycling by
+  @NTaylorMullen in
+  [#19451](https://github.com/google-gemini/gemini-cli/pull/19451)
+- use issuer instead of authorization_endpoint for oauth discovery by
+  @garrettsparks in
+  [#17332](https://github.com/google-gemini/gemini-cli/pull/17332)
+- feat(cli): include `/dir add` directories in @ autocomplete suggestions by
+  @jasmeetsb in [#19246](https://github.com/google-gemini/gemini-cli/pull/19246)
+- feat(admin): Admin settings should only apply if adminControlsApplicable =
+  true and fetch errors should be fatal by @skeshive in
+  [#19453](https://github.com/google-gemini/gemini-cli/pull/19453)
+- Format strict-development-rules command by @g-samroberts in
+  [#19484](https://github.com/google-gemini/gemini-cli/pull/19484)
+- feat(core): centralize compatibility checks and add TrueColor detection by
+  @spencer426 in
+  [#19478](https://github.com/google-gemini/gemini-cli/pull/19478)
+- Remove unused files and update index and sidebar. by @g-samroberts in
+  [#19479](https://github.com/google-gemini/gemini-cli/pull/19479)
+- Migrate core render util to use xterm.js as part of the rendering loop. by
+  @jacob314 in [#19044](https://github.com/google-gemini/gemini-cli/pull/19044)
+- Changelog for v0.30.0-preview.1 by @gemini-cli-robot in
+  [#19496](https://github.com/google-gemini/gemini-cli/pull/19496)
+- build: replace deprecated built-in punycode with userland package by @jacob314
+  in [#19502](https://github.com/google-gemini/gemini-cli/pull/19502)
+- Speculative fixes to try to fix react error. by @jacob314 in
+  [#19508](https://github.com/google-gemini/gemini-cli/pull/19508)
+- fix spacing by @jacob314 in
+  [#19494](https://github.com/google-gemini/gemini-cli/pull/19494)
+- fix(core): ensure user rejections update tool outcome for telemetry by
+  @abhiasap in [#18982](https://github.com/google-gemini/gemini-cli/pull/18982)
+- fix(acp): Initialize config (#18897) by @Mervap in
+  [#18898](https://github.com/google-gemini/gemini-cli/pull/18898)
+- fix(core): add error logging for IDE fetch failures by @yuvrajangadsingh in
+  [#17981](https://github.com/google-gemini/gemini-cli/pull/17981)
+- feat(acp): support set_mode interface (#18890) by @Mervap in
+  [#18891](https://github.com/google-gemini/gemini-cli/pull/18891)
+- fix(core): robust workspace-based IDE connection discovery by @ehedlund in
+  [#18443](https://github.com/google-gemini/gemini-cli/pull/18443)
+- Deflake windows tests. by @jacob314 in
+  [#19511](https://github.com/google-gemini/gemini-cli/pull/19511)
+- Fix: Avoid tool confirmation timeout when no UI listeners are present by
+  @pdHaku0 in [#17955](https://github.com/google-gemini/gemini-cli/pull/17955)
+- format md file by @scidomino in
+  [#19474](https://github.com/google-gemini/gemini-cli/pull/19474)
+- feat(cli): add experimental.useOSC52Copy setting by @scidomino in
+  [#19488](https://github.com/google-gemini/gemini-cli/pull/19488)
+- feat(cli): replace loading phrases boolean with enum setting by @LyalinDotCom
+  in [#19347](https://github.com/google-gemini/gemini-cli/pull/19347)
+- Update skill to adjust for generated results. by @g-samroberts in
+  [#19500](https://github.com/google-gemini/gemini-cli/pull/19500)
+- Fix message too large issue. by @gundermanc in
+  [#19499](https://github.com/google-gemini/gemini-cli/pull/19499)
+- fix(core): prevent duplicate tool approval entries in auto-saved.toml by
+  @Abhijit-2592 in
+  [#19487](https://github.com/google-gemini/gemini-cli/pull/19487)
+- fix(core): resolve crash in ClearcutLogger when os.cpus() is empty by @Adib234
+  in [#19555](https://github.com/google-gemini/gemini-cli/pull/19555)
+- chore(core): improve encapsulation and remove unused exports by @adamfweidman
+  in [#19556](https://github.com/google-gemini/gemini-cli/pull/19556)
+- Revert "Add generic searchable list to back settings and extensions (… by
+  @chrstnb in [#19434](https://github.com/google-gemini/gemini-cli/pull/19434)
+- fix(core): improve error type extraction for telemetry by @yunaseoul in
+  [#19565](https://github.com/google-gemini/gemini-cli/pull/19565)
+- fix: remove extra padding in Composer by @jackwotherspoon in
+  [#19529](https://github.com/google-gemini/gemini-cli/pull/19529)
+- feat(plan): support configuring custom plans storage directory by @jerop in
+  [#19577](https://github.com/google-gemini/gemini-cli/pull/19577)
+- Migrate files to resource or references folder. by @g-samroberts in
+  [#19503](https://github.com/google-gemini/gemini-cli/pull/19503)
+- feat(policy): implement project-level policy support by @Abhijit-2592 in
+  [#18682](https://github.com/google-gemini/gemini-cli/pull/18682)
+- feat(core): Implement parallel FC for read only tools. by @joshualitt in
+  [#18791](https://github.com/google-gemini/gemini-cli/pull/18791)
+- chore(skills): adds pr-address-comments skill to work on PR feedback by
+  @mbleigh in [#19576](https://github.com/google-gemini/gemini-cli/pull/19576)
+- refactor(sdk): introduce session-based architecture by @mbleigh in
+  [#19180](https://github.com/google-gemini/gemini-cli/pull/19180)
+- fix(ci): add fallback JSON extraction to issue triage workflow by @bdmorgan in
+  [#19593](https://github.com/google-gemini/gemini-cli/pull/19593)
+- feat(core): refine Edit and WriteFile tool schemas for Gemini 3 by
+  @SandyTao520 in
+  [#19476](https://github.com/google-gemini/gemini-cli/pull/19476)
+- Changelog for v0.30.0-preview.3 by @gemini-cli-robot in
+  [#19585](https://github.com/google-gemini/gemini-cli/pull/19585)
+- fix(plan): exclude EnterPlanMode tool from YOLO mode by @Adib234 in
+  [#19570](https://github.com/google-gemini/gemini-cli/pull/19570)
+- chore: resolve build warnings and update dependencies by @mattKorwel in
+  [#18880](https://github.com/google-gemini/gemini-cli/pull/18880)
+- feat(ui): add source indicators to slash commands by @ehedlund in
+  [#18839](https://github.com/google-gemini/gemini-cli/pull/18839)
+- docs: refine Plan Mode documentation structure and workflow by @jerop in
+  [#19644](https://github.com/google-gemini/gemini-cli/pull/19644)
+- Docs: Update release information regarding Gemini 3.1 by @jkcinouye in
+  [#19568](https://github.com/google-gemini/gemini-cli/pull/19568)
+- fix(security): rate limit web_fetch tool to mitigate DDoS via prompt injection
+  by @mattKorwel in
+  [#19567](https://github.com/google-gemini/gemini-cli/pull/19567)
+- Add initial implementation of /extensions explore command by @chrstnb in
+  [#19029](https://github.com/google-gemini/gemini-cli/pull/19029)
+- fix: use discoverOAuthFromWWWAuthenticate for reactive OAuth flow (#18760) by
+  @maximus12793 in
+  [#19038](https://github.com/google-gemini/gemini-cli/pull/19038)
+- Search updates by @alisa-alisa in
+  [#19482](https://github.com/google-gemini/gemini-cli/pull/19482)
+- feat(cli): add support for numpad SS3 sequences by @scidomino in
+  [#19659](https://github.com/google-gemini/gemini-cli/pull/19659)
+- feat(cli): enhance folder trust with configuration discovery and security
+  warnings by @galz10 in
+  [#19492](https://github.com/google-gemini/gemini-cli/pull/19492)
+- feat(ui): improve startup warnings UX with dismissal and show-count limits by
+  @spencer426 in
+  [#19584](https://github.com/google-gemini/gemini-cli/pull/19584)
+- feat(a2a): Add API key authentication provider by @adamfweidman in
+  [#19548](https://github.com/google-gemini/gemini-cli/pull/19548)
+- Send accepted/removed lines with ACCEPT_FILE telemetry. by @gundermanc in
+  [#19670](https://github.com/google-gemini/gemini-cli/pull/19670)
+- feat(models): support Gemini 3.1 Pro Preview and fixes by @sehoon38 in
+  [#19676](https://github.com/google-gemini/gemini-cli/pull/19676)
+- feat(plan): enforce read-only constraints in Plan Mode by @mattKorwel in
+  [#19433](https://github.com/google-gemini/gemini-cli/pull/19433)
+- fix(cli): allow perfect match @scripts/test-windows-paths.js completions to
+  submit on Enter by @spencer426 in
+  [#19562](https://github.com/google-gemini/gemini-cli/pull/19562)
+- fix(core): treat 503 Service Unavailable as retryable quota error by @sehoon38
+  in [#19642](https://github.com/google-gemini/gemini-cli/pull/19642)
+- Update sidebar.json for to allow top nav tabs. by @g-samroberts in
+  [#19595](https://github.com/google-gemini/gemini-cli/pull/19595)
+- security: strip deceptive Unicode characters from terminal output by @ehedlund
+  in [#19026](https://github.com/google-gemini/gemini-cli/pull/19026)
+- Fixes 'input.on' is not a function error in Gemini CLI by @gundermanc in
+  [#19691](https://github.com/google-gemini/gemini-cli/pull/19691)
+- Revert "feat(ui): add source indicators to slash commands" by @ehedlund in
+  [#19695](https://github.com/google-gemini/gemini-cli/pull/19695)
+- security: implement deceptive URL detection and disclosure in tool
+  confirmations by @ehedlund in
+  [#19288](https://github.com/google-gemini/gemini-cli/pull/19288)
+- fix(core): restore auth consent in headless mode and add unit tests by
+  @ehedlund in [#19689](https://github.com/google-gemini/gemini-cli/pull/19689)
+- Fix unsafe assertions in code_assist folder. by @gundermanc in
+  [#19706](https://github.com/google-gemini/gemini-cli/pull/19706)
+- feat(cli): make JetBrains warning more specific by @jacob314 in
+  [#19687](https://github.com/google-gemini/gemini-cli/pull/19687)
+- fix(cli): extensions dialog UX polish by @jacob314 in
+  [#19685](https://github.com/google-gemini/gemini-cli/pull/19685)
+- fix(cli): use getDisplayString for manual model selection in dialog by
+  @sehoon38 in [#19726](https://github.com/google-gemini/gemini-cli/pull/19726)
+- feat(policy): repurpose "Always Allow" persistence to workspace level by
+  @Abhijit-2592 in
+  [#19707](https://github.com/google-gemini/gemini-cli/pull/19707)
+- fix(cli): re-enable CLI banner by @sehoon38 in
+  [#19741](https://github.com/google-gemini/gemini-cli/pull/19741)
+- Disallow and suppress unsafe assignment by @gundermanc in
+  [#19736](https://github.com/google-gemini/gemini-cli/pull/19736)
+- feat(core): migrate read_file to 1-based start_line/end_line parameters by
+  @adamfweidman in
+  [#19526](https://github.com/google-gemini/gemini-cli/pull/19526)
+- feat(cli): improve CTRL+O experience for both standard and alternate screen
+  buffer (ASB) modes by @jwhelangoog in
+  [#19010](https://github.com/google-gemini/gemini-cli/pull/19010)
+- Utilize pipelining of grep_search -> read_file to eliminate turns by
+  @gundermanc in
+  [#19574](https://github.com/google-gemini/gemini-cli/pull/19574)
+- refactor(core): remove unsafe type assertions in error utils (Phase 1.1) by
+  @mattKorwel in
+  [#19750](https://github.com/google-gemini/gemini-cli/pull/19750)
+- Disallow unsafe returns. by @gundermanc in
+  [#19767](https://github.com/google-gemini/gemini-cli/pull/19767)
+- fix(cli): filter subagent sessions from resume history by @abhipatel12 in
+  [#19698](https://github.com/google-gemini/gemini-cli/pull/19698)
+- chore(lint): fix lint errors seen when running npm run lint by @abhipatel12 in
+  [#19844](https://github.com/google-gemini/gemini-cli/pull/19844)
+- feat(core): remove unnecessary login verbiage from Code Assist auth by
+  @NTaylorMullen in
+  [#19861](https://github.com/google-gemini/gemini-cli/pull/19861)
+- fix(plan): time share by approval mode dashboard reporting negative time
+  shares by @Adib234 in
+  [#19847](https://github.com/google-gemini/gemini-cli/pull/19847)
+- fix(core): allow any preview model in quota access check by @bdmorgan in
+  [#19867](https://github.com/google-gemini/gemini-cli/pull/19867)
+- fix(core): prevent omission placeholder deletions in replace/write_file by
+  @nsalerni in [#19870](https://github.com/google-gemini/gemini-cli/pull/19870)
+- fix(core): add uniqueness guard to edit tool by @Shivangisharma4 in
+  [#19890](https://github.com/google-gemini/gemini-cli/pull/19890)
+- refactor(config): remove enablePromptCompletion from settings by @sehoon38 in
+  [#19974](https://github.com/google-gemini/gemini-cli/pull/19974)
+- refactor(core): move session conversion logic to core by @abhipatel12 in
+  [#19972](https://github.com/google-gemini/gemini-cli/pull/19972)
+- Fix: Persist manual model selection on restart #19864 by @Nixxx19 in
+  [#19891](https://github.com/google-gemini/gemini-cli/pull/19891)
+- fix(core): increase default retry attempts and add quota error backoff by
+  @sehoon38 in [#19949](https://github.com/google-gemini/gemini-cli/pull/19949)
+- feat(core): add policy chain support for Gemini 3.1 by @sehoon38 in
+  [#19991](https://github.com/google-gemini/gemini-cli/pull/19991)
+- Updates command reference and /stats command. by @g-samroberts in
+  [#19794](https://github.com/google-gemini/gemini-cli/pull/19794)
+- Fix for silent failures in non-interactive mode by @owenofbrien in
+  [#19905](https://github.com/google-gemini/gemini-cli/pull/19905)
+- fix(plan): allow plan mode writes on Windows and fix prompt paths by @Adib234
+  in [#19658](https://github.com/google-gemini/gemini-cli/pull/19658)
+- fix(core): prevent OAuth server crash on unexpected requests by @reyyanxahmed
+  in [#19668](https://github.com/google-gemini/gemini-cli/pull/19668)
+- feat: Map tool kinds to explicit ACP.ToolKind values and update test … by
+  @sripasg in [#19547](https://github.com/google-gemini/gemini-cli/pull/19547)
+- chore: restrict gemini-automted-issue-triage to only allow echo by @galz10 in
+  [#20047](https://github.com/google-gemini/gemini-cli/pull/20047)
+- Allow ask headers longer than 16 chars by @scidomino in
+  [#20041](https://github.com/google-gemini/gemini-cli/pull/20041)
+- fix(core): prevent state corruption in McpClientManager during collis by @h30s
+  in [#19782](https://github.com/google-gemini/gemini-cli/pull/19782)
+- fix(bundling): copy devtools package to bundle for runtime resolution by
+  @SandyTao520 in
+  [#19766](https://github.com/google-gemini/gemini-cli/pull/19766)
+- feat(policy): Support MCP Server Wildcards in Policy Engine by @jerop in
+  [#20024](https://github.com/google-gemini/gemini-cli/pull/20024)
+- docs(CONTRIBUTING): update React DevTools version to 6 by @mmgok in
+  [#20014](https://github.com/google-gemini/gemini-cli/pull/20014)
+- feat(core): optimize tool descriptions and schemas for Gemini 3 by
   @aishaneeshah in
-  [#20619](https://github.com/google-gemini/gemini-cli/pull/20619)
-* Do not block CI on evals by @gundermanc in
-  [#20870](https://github.com/google-gemini/gemini-cli/pull/20870)
-* document node limitation for shift+tab by @scidomino in
-  [#20877](https://github.com/google-gemini/gemini-cli/pull/20877)
-* Add install as an option when extension is selected. by @DavidAPierce in
-  [#20358](https://github.com/google-gemini/gemini-cli/pull/20358)
-* Update CODEOWNERS for README.md reviewers by @g-samroberts in
-  [#20860](https://github.com/google-gemini/gemini-cli/pull/20860)
-* feat(core): truncate large MCP tool output by @SandyTao520 in
-  [#19365](https://github.com/google-gemini/gemini-cli/pull/19365)
-* Subagent activity UX. by @gundermanc in
-  [#17570](https://github.com/google-gemini/gemini-cli/pull/17570)
-* style(cli) : Dialog pattern for /hooks Command by @AbdulTawabJuly in
-  [#17930](https://github.com/google-gemini/gemini-cli/pull/17930)
-* feat: redesign header to be compact with ASCII icon by @keithguerin in
-  [#18713](https://github.com/google-gemini/gemini-cli/pull/18713)
-* fix(core): ensure subagents use qualified MCP tool names by @abhipatel12 in
-  [#20801](https://github.com/google-gemini/gemini-cli/pull/20801)
-* feat(core): support authenticated A2A agent card discovery by @SandyTao520 in
-  [#20622](https://github.com/google-gemini/gemini-cli/pull/20622)
-* refactor(cli): fully remove React anti patterns, improve type safety and fix
-  UX oversights in SettingsDialog.tsx by @psinha40898 in
-  [#18963](https://github.com/google-gemini/gemini-cli/pull/18963)
-* Adding MCPOAuthProvider implementing the MCPSDK OAuthClientProvider by
-  @Nayana-Parameswarappa in
-  [#20121](https://github.com/google-gemini/gemini-cli/pull/20121)
-* feat(core): add tool name validation in TOML policy files by @allenhutchison
-  in [#19281](https://github.com/google-gemini/gemini-cli/pull/19281)
-* docs: fix broken markdown links in main README.md by @Hamdanbinhashim in
-  [#20300](https://github.com/google-gemini/gemini-cli/pull/20300)
-* refactor(core): replace manual syncPlanModeTools with declarative policy rules
-  by @jerop in [#20596](https://github.com/google-gemini/gemini-cli/pull/20596)
-* fix(core): increase default headers timeout to 5 minutes by @gundermanc in
-  [#20890](https://github.com/google-gemini/gemini-cli/pull/20890)
-* feat(admin): enable 30 day default retention for chat history & remove warning
-  by @skeshive in
-  [#20853](https://github.com/google-gemini/gemini-cli/pull/20853)
-* feat(plan): support annotating plans with feedback for iteration by @Adib234
-  in [#20876](https://github.com/google-gemini/gemini-cli/pull/20876)
-* Add some dos and don'ts to behavioral evals README. by @gundermanc in
-  [#20629](https://github.com/google-gemini/gemini-cli/pull/20629)
-* fix(core): skip telemetry logging for AbortError exceptions by @yunaseoul in
-  [#19477](https://github.com/google-gemini/gemini-cli/pull/19477)
-* fix(core): restrict "System: Please continue" invalid stream retry to Gemini 2
-  models by @SandyTao520 in
-  [#20897](https://github.com/google-gemini/gemini-cli/pull/20897)
-* ci(evals): only run evals in CI if prompts or tools changed by @gundermanc in
-  [#20898](https://github.com/google-gemini/gemini-cli/pull/20898)
-* Build binary by @aswinashok44 in
-  [#18933](https://github.com/google-gemini/gemini-cli/pull/18933)
-* Code review fixes as a pr by @jacob314 in
-  [#20612](https://github.com/google-gemini/gemini-cli/pull/20612)
-* fix(ci): handle empty APP_ID in stale PR closer by @bdmorgan in
-  [#20919](https://github.com/google-gemini/gemini-cli/pull/20919)
-* feat(cli): invert context window display to show usage by @keithguerin in
-  [#20071](https://github.com/google-gemini/gemini-cli/pull/20071)
-* fix(plan): clean up session directories and plans on deletion by @jerop in
-  [#20914](https://github.com/google-gemini/gemini-cli/pull/20914)
-* fix(core): enforce optionality for API response fields in code_assist by
-  @sehoon38 in [#20714](https://github.com/google-gemini/gemini-cli/pull/20714)
-* feat(extensions): add support for plan directory in extension manifest by
-  @mahimashanware in
-  [#20354](https://github.com/google-gemini/gemini-cli/pull/20354)
-* feat(plan): enable built-in research subagents in plan mode by @Adib234 in
-  [#20972](https://github.com/google-gemini/gemini-cli/pull/20972)
-* feat(agents): directly indicate auth required state by @adamfweidman in
-  [#20986](https://github.com/google-gemini/gemini-cli/pull/20986)
-* fix(cli): wait for background auto-update before relaunching by @scidomino in
-  [#20904](https://github.com/google-gemini/gemini-cli/pull/20904)
-* fix: pre-load @scripts/copy_files.js references from external editor prompts
-  by @kartikangiras in
-  [#20963](https://github.com/google-gemini/gemini-cli/pull/20963)
-* feat(evals): add behavioral evals for ask_user tool by @Adib234 in
-  [#20620](https://github.com/google-gemini/gemini-cli/pull/20620)
-* refactor common settings logic for skills,agents by @ishaanxgupta in
-  [#17490](https://github.com/google-gemini/gemini-cli/pull/17490)
-* Update docs-writer skill with new resource by @g-samroberts in
-  [#20917](https://github.com/google-gemini/gemini-cli/pull/20917)
-* fix(cli): pin clipboardy to ~5.2.x by @scidomino in
-  [#21009](https://github.com/google-gemini/gemini-cli/pull/21009)
-* feat: Implement slash command handling in ACP for
-  `/memory`,`/init`,`/extensions` and `/restore` by @sripasg in
-  [#20528](https://github.com/google-gemini/gemini-cli/pull/20528)
-* Docs/add hooks reference by @AadithyaAle in
-  [#20961](https://github.com/google-gemini/gemini-cli/pull/20961)
-* feat(plan): add copy subcommand to plan (#20491) by @ruomengz in
-  [#20988](https://github.com/google-gemini/gemini-cli/pull/20988)
-* fix(core): sanitize and length-check MCP tool qualified names by @abhipatel12
-  in [#20987](https://github.com/google-gemini/gemini-cli/pull/20987)
-* Format the quota/limit style guide. by @g-samroberts in
-  [#21017](https://github.com/google-gemini/gemini-cli/pull/21017)
-* fix(core): send shell output to model on cancel by @devr0306 in
-  [#20501](https://github.com/google-gemini/gemini-cli/pull/20501)
-* remove hardcoded tiername when missing tier by @sehoon38 in
-  [#21022](https://github.com/google-gemini/gemini-cli/pull/21022)
-* feat(acp): add set models interface by @skeshive in
-  [#20991](https://github.com/google-gemini/gemini-cli/pull/20991)
+  [#19643](https://github.com/google-gemini/gemini-cli/pull/19643)
+- feat(core): implement experimental direct web fetch by @mbleigh in
+  [#19557](https://github.com/google-gemini/gemini-cli/pull/19557)
+- feat(core): replace expected_replacements with allow_multiple in replace tool
+  by @SandyTao520 in
+  [#20033](https://github.com/google-gemini/gemini-cli/pull/20033)
+- fix(sandbox): harden image packaging integrity checks by @aviralgarg05 in
+  [#19552](https://github.com/google-gemini/gemini-cli/pull/19552)
+- fix(core): allow environment variable expansion and explicit overrides for MCP
+  servers by @galz10 in
+  [#18837](https://github.com/google-gemini/gemini-cli/pull/18837)
+- feat(policy): Implement Tool Annotation Matching in Policy Engine by @jerop in
+  [#20029](https://github.com/google-gemini/gemini-cli/pull/20029)
+- fix(core): prevent utility calls from changing session active model by
+  @adamfweidman in
+  [#20035](https://github.com/google-gemini/gemini-cli/pull/20035)
+- fix(cli): skip workspace policy loading when in home directory by
+  @Abhijit-2592 in
+  [#20054](https://github.com/google-gemini/gemini-cli/pull/20054)
+- fix(scripts): Add Windows (win32/x64) support to lint.js by @ZafeerMahmood in
+  [#16193](https://github.com/google-gemini/gemini-cli/pull/16193)
+- fix(a2a-server): Remove unsafe type assertions in agent by @Nixxx19 in
+  [#19723](https://github.com/google-gemini/gemini-cli/pull/19723)
+- Fix: Handle corrupted token file gracefully when switching auth types (#19845)
+  by @Nixxx19 in
+  [#19850](https://github.com/google-gemini/gemini-cli/pull/19850)
+- fix critical dep vulnerability by @scidomino in
+  [#20087](https://github.com/google-gemini/gemini-cli/pull/20087)
+- Add new setting to configure maxRetries by @kevinjwang1 in
+  [#20064](https://github.com/google-gemini/gemini-cli/pull/20064)
+- Stabilize tests. by @gundermanc in
+  [#20095](https://github.com/google-gemini/gemini-cli/pull/20095)
+- make windows tests mandatory by @scidomino in
+  [#20096](https://github.com/google-gemini/gemini-cli/pull/20096)
+- Add 3.1 pro preview to behavioral evals. by @gundermanc in
+  [#20088](https://github.com/google-gemini/gemini-cli/pull/20088)
+- feat:PR-rate-limit by @JagjeevanAK in
+  [#19804](https://github.com/google-gemini/gemini-cli/pull/19804)
+- feat(cli): allow expanding full details of MCP tool on approval by @y-okt in
+  [#19916](https://github.com/google-gemini/gemini-cli/pull/19916)
+- feat(security): Introduce Conseca framework by @shrishabh in
+  [#13193](https://github.com/google-gemini/gemini-cli/pull/13193)
+- fix(cli): Remove unsafe type assertions in activityLogger #19713 by @Nixxx19
+  in [#19745](https://github.com/google-gemini/gemini-cli/pull/19745)
+- feat: implement AfterTool tail tool calls by @googlestrobe in
+  [#18486](https://github.com/google-gemini/gemini-cli/pull/18486)
+- ci(actions): fix PR rate limiter excluding maintainers by @scidomino in
+  [#20117](https://github.com/google-gemini/gemini-cli/pull/20117)
+- Shortcuts: Move SectionHeader title below top line and refine styling by
+  @keithguerin in
+  [#18721](https://github.com/google-gemini/gemini-cli/pull/18721)
+- refactor(ui): Update and simplify use of gray colors in themes by @keithguerin
+  in [#20141](https://github.com/google-gemini/gemini-cli/pull/20141)
+- fix punycode2 by @jacob314 in
+  [#20154](https://github.com/google-gemini/gemini-cli/pull/20154)
+- feat(ide): add GEMINI_CLI_IDE_PID env var to override IDE process detection by
+  @kiryltech in [#15842](https://github.com/google-gemini/gemini-cli/pull/15842)
+- feat(policy): Propagate Tool Annotations for MCP Servers by @jerop in
+  [#20083](https://github.com/google-gemini/gemini-cli/pull/20083)
+- fix(a2a-server): pass allowedTools settings to core Config by @reyyanxahmed in
+  [#19680](https://github.com/google-gemini/gemini-cli/pull/19680)
+- feat(mcp): add progress bar, throttling, and input validation for MCP tool
+  progress by @jasmeetsb in
+  [#19772](https://github.com/google-gemini/gemini-cli/pull/19772)
+- feat(policy): centralize plan mode tool visibility in policy engine by @jerop
+  in [#20178](https://github.com/google-gemini/gemini-cli/pull/20178)
+- feat(browser): implement experimental browser agent by @gsquared94 in
+  [#19284](https://github.com/google-gemini/gemini-cli/pull/19284)
+- feat(plan): summarize work after executing a plan by @jerop in
+  [#19432](https://github.com/google-gemini/gemini-cli/pull/19432)
+- fix(core): create new McpClient on restart to apply updated config by @h30s in
+  [#20126](https://github.com/google-gemini/gemini-cli/pull/20126)
+- Changelog for v0.30.0-preview.5 by @gemini-cli-robot in
+  [#20107](https://github.com/google-gemini/gemini-cli/pull/20107)
+- Update packages. by @jacob314 in
+  [#20152](https://github.com/google-gemini/gemini-cli/pull/20152)
+- Fix extension env dir loading issue by @chrstnb in
+  [#20198](https://github.com/google-gemini/gemini-cli/pull/20198)
+- restrict /assign to help-wanted issues by @scidomino in
+  [#20207](https://github.com/google-gemini/gemini-cli/pull/20207)
+- feat(plan): inject message when user manually exits Plan mode by @jerop in
+  [#20203](https://github.com/google-gemini/gemini-cli/pull/20203)
+- feat(extensions): enforce folder trust for local extension install by @galz10
+  in [#19703](https://github.com/google-gemini/gemini-cli/pull/19703)
+- feat(hooks): adds support for RuntimeHook functions. by @mbleigh in
+  [#19598](https://github.com/google-gemini/gemini-cli/pull/19598)
+- Docs: Update UI links. by @jkcinouye in
+  [#20224](https://github.com/google-gemini/gemini-cli/pull/20224)
+- feat: prompt users to run /terminal-setup with yes/no by @ishaanxgupta in
+  [#16235](https://github.com/google-gemini/gemini-cli/pull/16235)
+- fix: additional high vulnerabilities (minimatch, cross-spawn) by @adamfweidman
+  in [#20221](https://github.com/google-gemini/gemini-cli/pull/20221)
+- feat(telemetry): Add context breakdown to API response event by @SandyTao520
+  in [#19699](https://github.com/google-gemini/gemini-cli/pull/19699)
+- Docs: Add nested sub-folders for related topics by @g-samroberts in
+  [#20235](https://github.com/google-gemini/gemini-cli/pull/20235)
+- feat(plan): support automatic model switching for Plan Mode by @jerop in
+  [#20240](https://github.com/google-gemini/gemini-cli/pull/20240)
 
 **Full Changelog**:
-https://github.com/google-gemini/gemini-cli/compare/v0.32.0-preview.0...v0.33.0-preview.1
+https://github.com/google-gemini/gemini-cli/compare/v0.30.0-preview.6...v0.31.0-preview.1

docs/cli/cli-reference.md

@@ -5,18 +5,18 @@ and parameters.
 
 ## CLI commands
 
-| Command                            | Description                        | Example                                                      |
-| ---------------------------------- | ---------------------------------- | ------------------------------------------------------------ |
-| `gemini`                           | Start interactive REPL             | `gemini`                                                     |
-| `gemini "query"`                   | Query non-interactively, then exit | `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"`                                         |
-| `gemini -r "latest" "query"`       | Continue session with a new prompt | `gemini -r "latest" "Check for type errors"`                 |
-| `gemini -r "<session-id>" "query"` | Resume session by ID               | `gemini -r "abc123" "Finish this PR"`                        |
-| `gemini update`                    | Update to latest version           | `gemini update`                                              |
-| `gemini extensions`                | Manage extensions                  | See [Extensions Management](#extensions-management)          |
-| `gemini mcp`                       | Configure MCP servers              | See [MCP Server Management](#mcp-server-management)          |
+| Command                            | Description                        | Example                                             |
+| ---------------------------------- | ---------------------------------- | --------------------------------------------------- |
+| `gemini`                           | Start interactive REPL             | `gemini`                                            |
+| `gemini "query"`                   | Query non-interactively, then exit | `gemini "explain this project"`                     |
+| `cat file \| gemini`               | Process piped content              | `cat 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"`                                |
+| `gemini -r "latest" "query"`       | Continue session with a new prompt | `gemini -r "latest" "Check for type errors"`        |
+| `gemini -r "<session-id>" "query"` | Resume session by ID               | `gemini -r "abc123" "Finish this PR"`               |
+| `gemini update`                    | Update to latest version           | `gemini update`                                     |
+| `gemini extensions`                | Manage extensions                  | See [Extensions Management](#extensions-management) |
+| `gemini mcp`                       | Configure MCP servers              | See [MCP Server Management](#mcp-server-management) |
 
 ### Positional arguments
 

docs/cli/custom-commands.md

@@ -278,20 +278,11 @@ Let's create a global command that asks the model to refactor a piece of code.
 First, ensure the user commands directory exists, then create a `refactor`
 subdirectory for organization and the final TOML file.
 
-**macOS/Linux**
-
 ```bash
 mkdir -p ~/.gemini/commands/refactor
 touch ~/.gemini/commands/refactor/pure.toml
 ```
 
-**Windows (PowerShell)**
-
-```powershell
-New-Item -ItemType Directory -Force -Path "$env:USERPROFILE\.gemini\commands\refactor"
-New-Item -ItemType File -Force -Path "$env:USERPROFILE\.gemini\commands\refactor\pure.toml"
-```
-
 **2. Add the content to the file:**
 
 Open `~/.gemini/commands/refactor/pure.toml` in your editor and add the

docs/cli/enterprise.md

@@ -203,15 +203,6 @@ with the actual Gemini CLI process, which inherits the environment variable.
 This makes it significantly more difficult for a user to bypass the enforced
 settings.
 
-**PowerShell Profile (Windows alternative):**
-
-On Windows, administrators can achieve similar results by adding the environment
-variable to the system-wide or user-specific PowerShell profile:
-
-```powershell
-Add-Content -Path $PROFILE -Value '$env:GEMINI_CLI_SYSTEM_SETTINGS_PATH="C:\ProgramData\gemini-cli\settings.json"'
-```
-
 ## User isolation in shared environments
 
 In shared compute environments (like ML experiment runners or shared build
@@ -223,22 +214,12 @@ use the `GEMINI_CLI_HOME` environment variable to point to a unique directory
 for a specific user or job. The CLI will create a `.gemini` folder inside the
 specified path.
 
-**macOS/Linux**
-
 ```bash
 # Isolate state for a specific job
 export GEMINI_CLI_HOME="/tmp/gemini-job-123"
 gemini
 ```
 
-**Windows (PowerShell)**
-
-```powershell
-# Isolate state for a specific job
-$env:GEMINI_CLI_HOME="C:\temp\gemini-job-123"
-gemini
-```
-
 ## Restricting tool access
 
 You can significantly enhance security by controlling which tools the Gemini

docs/cli/plan-mode.md

@@ -1,7 +1,7 @@
 # Plan Mode (experimental)
 
 Plan Mode is a read-only environment for architecting robust solutions before
-implementation. With Plan Mode, you can:
+implementation. It allows you to:
 
 - **Research:** Explore the project in a read-only state to prevent accidental
   changes.
@@ -16,45 +16,57 @@ implementation. With Plan Mode, you can:
 >   GitHub.
 > - Use the **/bug** command within Gemini CLI to file an issue.
 
-## How to enable Plan Mode
+- [Enabling Plan Mode](#enabling-plan-mode)
+- [How to use Plan Mode](#how-to-use-plan-mode)
+  - [Entering Plan Mode](#entering-plan-mode)
+  - [Planning Workflow](#planning-workflow)
+  - [Exiting Plan Mode](#exiting-plan-mode)
+- [Tool Restrictions](#tool-restrictions)
+  - [Customizing Planning with Skills](#customizing-planning-with-skills)
+  - [Customizing Policies](#customizing-policies)
+    - [Example: Allow git commands in Plan Mode](#example-allow-git-commands-in-plan-mode)
+    - [Example: Enable research subagents in Plan Mode](#example-enable-research-subagents-in-plan-mode)
+  - [Custom Plan Directory and Policies](#custom-plan-directory-and-policies)
+- [Automatic Model Routing](#automatic-model-routing)
 
-Enable Plan Mode in **Settings** or by editing your configuration file.
+## Enabling Plan Mode
 
-- **Settings:** Use the `/settings` command and set **Plan** to `true`.
-- **Configuration:** Add the following to your `settings.json`:
+To use Plan Mode, enable it via **/settings** (search for **Plan**) or add the
+following to your `settings.json`:
+
+```json
+{
+  "experimental": {
+    "plan": true
+  }
+}
+```
+
+## How to use Plan Mode
+
+### Entering Plan Mode
+
+You can configure Gemini CLI to start in Plan Mode by default or enter it
+manually during a session.
+
+- **Configuration:** Configure Gemini CLI to start directly in Plan Mode by
+  default:
+  1.  Type `/settings` in the CLI.
+  2.  Search for **Default Approval Mode**.
+  3.  Set the value to **Plan**.
+
+  Alternatively, use the `gemini --approval-mode=plan` CLI flag or manually
+  update:
 
   ```json
   {
-    "experimental": {
-      "plan": true
+    "general": {
+      "defaultApprovalMode": "plan"
     }
   }
   ```
 
-## How to enter Plan Mode
-
-Plan Mode integrates seamlessly into your workflow, letting you switch between
-planning and execution as needed.
-
-You can either configure Gemini CLI to start in Plan Mode by default or enter
-Plan Mode manually during a session.
-
-### Launch in Plan Mode
-
-To start Gemini CLI directly in Plan Mode by default:
-
-1.  Use the `/settings` command.
-2.  Set **Default Approval Mode** to `Plan`.
-
-To launch Gemini CLI in Plan Mode once:
-
-1. Use `gemini --approval-mode=plan` when launching Gemini CLI.
-
-### Enter Plan Mode manually
-
-To start Plan Mode while using Gemini CLI:
-
-- **Keyboard shortcut:** Press `Shift+Tab` to cycle through approval modes
+- **Keyboard Shortcut:** Press `Shift+Tab` to cycle through approval modes
   (`Default` -> `Auto-Edit` -> `Plan`).
 
   > **Note:** Plan Mode is automatically removed from the rotation when Gemini
@@ -62,54 +74,55 @@ To start Plan Mode while using Gemini CLI:
 
 - **Command:** Type `/plan` in the input box.
 
-- **Natural Language:** Ask Gemini CLI to "start a plan for...". Gemini CLI
+- **Natural Language:** Ask Gemini CLI to "start a plan for...". Gemini CLI then
   calls the [`enter_plan_mode`] tool to switch modes.
   > **Note:** This tool is not available when Gemini CLI is in [YOLO mode].
 
-## How to use Plan Mode
+### Planning Workflow
 
-Plan Mode lets you collaborate with Gemini CLI to design a solution before
-Gemini CLI takes action.
+Plan Mode uses an adaptive planning workflow where the research depth, plan
+structure, and consultation level are proportional to the task's complexity:
 
-1.  **Provide a goal:** Start by describing what you want to achieve. Gemini CLI
-    will then enter Plan Mode (if it's not already) to research the task.
-2.  **Review research and provide input:** As Gemini CLI analyzes your codebase,
-    it may ask you questions or present different implementation options using
-    [`ask_user`]. Provide your preferences to help guide the design.
-3.  **Review the plan:** Once Gemini CLI has a proposed strategy, it creates a
-    detailed implementation plan as a Markdown file in your plans directory. You
-    can open and read this file to understand the proposed changes.
-4.  **Approve or iterate:** Gemini CLI will present the finalized plan for your
-    approval.
-    - **Approve:** If you're satisfied with the plan, approve it to start the
-      implementation immediately: **Yes, automatically accept edits** or **Yes,
-      manually accept edits**.
-    - **Iterate:** If the plan needs adjustments, provide feedback. Gemini CLI
-      will refine the strategy and update the plan.
-    - **Cancel:** You can cancel your plan with `Esc`.
+1.  **Explore & Analyze:** Analyze requirements and use read-only tools to map
+    affected modules and identify dependencies.
+2.  **Consult:** The depth of consultation is proportional to the task's
+    complexity:
+    - **Simple Tasks:** Proceed directly to drafting.
+    - **Standard Tasks:** Present a summary of viable approaches via
+      [`ask_user`] for selection.
+    - **Complex Tasks:** Present detailed trade-offs for at least two viable
+      approaches via [`ask_user`] and obtain approval before drafting.
+3.  **Draft:** Write a detailed implementation plan to the
+    [plans directory](#custom-plan-directory-and-policies). The plan's structure
+    adapts to the task:
+    - **Simple Tasks:** Focused on specific **Changes** and **Verification**
+      steps.
+    - **Standard Tasks:** Includes an **Objective**, **Key Files & Context**,
+      **Implementation Steps**, and **Verification & Testing**.
+    - **Complex Tasks:** Comprehensive plans including **Background &
+      Motivation**, **Scope & Impact**, **Proposed Solution**, **Alternatives
+      Considered**, a phased **Implementation Plan**, **Verification**, and
+      **Migration & Rollback** strategies.
+4.  **Review & Approval:** Use the [`exit_plan_mode`] tool to present the plan
+    and formally request approval.
+    - **Approve:** Exit Plan Mode and start implementation.
+    - **Iterate:** Provide feedback to refine the plan.
+    - **Refine manually:** Press **Ctrl + X** to open the plan file in your
+      [preferred external editor]. This allows you to manually refine the plan
+      steps before approval. The CLI will automatically refresh and show the
+      updated plan after you save and close the editor.
 
 For more complex or specialized planning tasks, you can
-[customize the planning workflow with skills](#custom-planning-with-skills).
+[customize the planning workflow with skills](#customizing-planning-with-skills).
 
-## How to exit Plan Mode
+### Exiting Plan Mode
 
-You can exit Plan Mode at any time, whether you have finalized a plan or want to
-switch back to another mode.
+To exit Plan Mode, you can:
 
-- **Approve a plan:** When Gemini CLI presents a finalized plan, approving it
-  automatically exits Plan Mode and starts the implementation.
-- **Keyboard shortcut:** Press `Shift+Tab` to cycle to the desired mode.
-- **Natural language:** Ask Gemini CLI to "exit plan mode" or "stop planning."
+- **Keyboard Shortcut:** Press `Shift+Tab` to cycle to the desired mode.
 
-## Customization and best practices
-
-Plan Mode is secure by default, but you can adapt it to fit your specific
-workflows. You can customize how Gemini CLI plans by using skills, adjusting
-safety policies, or changing where plans are stored.
-
-## Commands
-
-- **`/plan copy`**: Copy the currently approved plan to your clipboard.
+- **Tool:** Gemini CLI calls the [`exit_plan_mode`] tool to present the
+  finalized plan for your approval.
 
 ## Tool Restrictions
 
@@ -119,9 +132,8 @@ These are the only allowed tools:
 
 - **FileSystem (Read):** [`read_file`], [`list_directory`], [`glob`]
 - **Search:** [`grep_search`], [`google_web_search`]
-- **Research Subagents:** [`codebase_investigator`], [`cli_help`]
 - **Interaction:** [`ask_user`]
-- **MCP tools (Read):** Read-only [MCP tools] (for example, `github_read_issue`,
+- **MCP Tools (Read):** Read-only [MCP tools] (e.g., `github_read_issue`,
   `postgres_read_schema`) are allowed.
 - **Planning (Write):** [`write_file`] and [`replace`] only allowed for `.md`
   files in the `~/.gemini/tmp/<project>/<session-id>/plans/` directory or your
@@ -130,12 +142,12 @@ These are the only allowed tools:
 - **Skills:** [`activate_skill`] (allows loading specialized instructions and
   resources in a read-only manner)
 
-### Custom planning with skills
+### Customizing Planning with Skills
 
 You can use [Agent Skills](./skills.md) to customize how Gemini CLI approaches
 planning for specific types of tasks. When a skill is activated during Plan
 Mode, its specialized instructions and procedural workflows will guide the
-research, design, and planning phases.
+research, design and planning phases.
 
 For example:
 
@@ -150,7 +162,7 @@ To use a skill in Plan Mode, you can explicitly ask Gemini CLI to "use the
 `<skill-name>` skill to plan..." or Gemini CLI may autonomously activate it
 based on the task description.
 
-### Custom policies
+### Customizing Policies
 
 Plan Mode's default tool restrictions are managed by the [policy engine] and
 defined in the built-in [`plan.toml`] file. The built-in policy (Tier 1)
@@ -174,13 +186,10 @@ priority = 100
 modes = ["plan"]
 ```
 
-For more information on how the policy engine works, see the [policy engine]
-docs.
-
 #### Example: Allow git commands in Plan Mode
 
-This rule lets you check the repository status and see changes while in Plan
-Mode.
+This rule allows you to check the repository status and see changes while in
+Plan Mode.
 
 `~/.gemini/policies/git-research.toml`
 
@@ -193,17 +202,16 @@ priority = 100
 modes = ["plan"]
 ```
 
-#### Example: Enable custom subagents in Plan Mode
+#### Example: Enable research subagents in Plan Mode
 
-Built-in research [subagents] like [`codebase_investigator`] and [`cli_help`]
-are enabled by default in Plan Mode. You can enable additional [custom
-subagents] by adding a rule to your policy.
+You can enable experimental research [subagents] like `codebase_investigator` to
+help gather architecture details during the planning phase.
 
 `~/.gemini/policies/research-subagents.toml`
 
 ```toml
 [[rule]]
-toolName = "my_custom_subagent"
+toolName = "codebase_investigator"
 decision = "allow"
 priority = 100
 modes = ["plan"]
@@ -212,7 +220,10 @@ modes = ["plan"]
 Tell Gemini CLI it can use these tools in your prompt, for example: _"You can
 check ongoing changes in git."_
 
-### Custom plan directory and policies
+For more information on how the policy engine works, see the [policy engine]
+docs.
+
+### Custom Plan Directory and Policies
 
 By default, planning artifacts are stored in a managed temporary directory
 outside your project: `~/.gemini/tmp/<project>/<session-id>/plans/`.
@@ -278,24 +289,6 @@ performance. You can disable this automatic switching in your settings:
 }
 ```
 
-## Cleanup
-
-By default, Gemini CLI automatically cleans up old session data, including all
-associated plan files and task trackers.
-
-- **Default behavior:** Sessions (and their plans) are retained for **30 days**.
-- **Configuration:** You can customize this behavior via the `/settings` command
-  (search for **Session Retention**) or in your `settings.json` file. See
-  [session retention] for more details.
-
-Manual deletion also removes all associated artifacts:
-
-- **Command Line:** Use `gemini --delete-session <index|id>`.
-- **Session Browser:** Press `/resume`, navigate to a session, and press `x`.
-
-If you use a [custom plans directory](#custom-plan-directory-and-policies),
-those files are not automatically deleted and must be managed manually.
-
 [`list_directory`]: /docs/tools/file-system.md#1-list_directory-readfolder
 [`read_file`]: /docs/tools/file-system.md#2-read_file-readfile
 [`grep_search`]: /docs/tools/file-system.md#5-grep_search-searchtext
@@ -306,10 +299,7 @@ those files are not automatically deleted and must be managed manually.
 [MCP tools]: /docs/tools/mcp-server.md
 [`save_memory`]: /docs/tools/memory.md
 [`activate_skill`]: /docs/cli/skills.md
-[`codebase_investigator`]: /docs/core/subagents.md#codebase_investigator
-[`cli_help`]: /docs/core/subagents.md#cli_help
 [subagents]: /docs/core/subagents.md
-[custom subagents]: /docs/core/subagents.md#creating-custom-subagents
 [policy engine]: /docs/reference/policy-engine.md
 [`enter_plan_mode`]: /docs/tools/planning.md#1-enter_plan_mode-enterplanmode
 [`exit_plan_mode`]: /docs/tools/planning.md#2-exit_plan_mode-exitplanmode
@@ -320,4 +310,3 @@ those files are not automatically deleted and must be managed manually.
 [auto model]: /docs/reference/configuration.md#model-settings
 [model routing]: /docs/cli/telemetry.md#model-routing
 [preferred external editor]: /docs/reference/configuration.md#general
-[session retention]: /docs/cli/session-management.md#session-retention

docs/cli/sandbox.md

@@ -50,76 +50,17 @@ Cross-platform sandboxing with complete process isolation.
 **Note**: Requires building the sandbox image locally or using a published image
 from your organization's registry.
 
-### 3. LXC/LXD (Linux only, experimental)
-
-Full-system container sandboxing using LXC/LXD. Unlike Docker/Podman, LXC
-containers run a complete Linux system with `systemd`, `snapd`, and other system
-services. This is ideal for tools that don't work in standard Docker containers,
-such as Snapcraft and Rockcraft.
-
-**Prerequisites**:
-
-- Linux only.
-- LXC/LXD must be installed (`snap install lxd` or `apt install lxd`).
-- A container must be created and running before starting Gemini CLI. Gemini
-  does **not** create the container automatically.
-
-**Quick setup**:
-
-```bash
-# Initialize LXD (first time only)
-lxd init --auto
-
-# Create and start an Ubuntu container
-lxc launch ubuntu:24.04 gemini-sandbox
-
-# Enable LXC sandboxing
-export GEMINI_SANDBOX=lxc
-gemini -p "build the project"
-```
-
-**Custom container name**:
-
-```bash
-export GEMINI_SANDBOX=lxc
-export GEMINI_SANDBOX_IMAGE=my-snapcraft-container
-gemini -p "build the snap"
-```
-
-**Limitations**:
-
-- Linux only (LXC is not available on macOS or Windows).
-- The container must already exist and be running.
-- The workspace directory is bind-mounted into the container at the same
-  absolute path — the path must be writable inside the container.
-- Used with tools like Snapcraft or Rockcraft that require a full system.
-
 ## Quickstart
 
 ```bash
 # Enable sandboxing with command flag
 gemini -s -p "analyze the code structure"
-```
 
-**Use environment variable**
-
-**macOS/Linux**
-
-```bash
+# Use environment variable
 export GEMINI_SANDBOX=true
 gemini -p "run the test suite"
-```
 
-**Windows (PowerShell)**
-
-```powershell
-$env:GEMINI_SANDBOX="true"
-gemini -p "run the test suite"
-```
-
-**Configure in settings.json**
-
-```json
+# Configure in settings.json
 {
   "tools": {
     "sandbox": "docker"
@@ -132,8 +73,7 @@ gemini -p "run the test suite"
 ### Enable sandboxing (in order of precedence)
 
 1. **Command flag**: `-s` or `--sandbox`
-2. **Environment variable**:
-   `GEMINI_SANDBOX=true|docker|podman|sandbox-exec|lxc`
+2. **Environment variable**: `GEMINI_SANDBOX=true|docker|podman|sandbox-exec`
 3. **Settings file**: `"sandbox": true` in the `tools` object of your
    `settings.json` file (e.g., `{"tools": {"sandbox": true}}`).
 
@@ -151,59 +91,44 @@ Built-in profiles (set via `SEATBELT_PROFILE` env var):
 ### Custom sandbox flags
 
 For container-based sandboxing, you can inject custom flags into the `docker` or
-`podman` command using the `SANDBOX_FLAGS` environment variable. This is useful
-for advanced configurations, such as disabling security features for specific
-use cases.
+`podman` command using the `tools.sandboxFlags` setting in your `settings.json`
+or the `SANDBOX_FLAGS` environment variable. This is useful for advanced
+configurations, such as disabling security features for specific use cases.
 
-**Example (Podman)**:
+**Example (`settings.json`)**:
+
+```json
+{
+  "tools": {
+    "sandboxFlags": "--security-opt label=disable"
+  }
+}
+```
+
+**Example (Environment variable)**:
 
 To disable SELinux labeling for volume mounts, you can set the following:
 
-**macOS/Linux**
-
 ```bash
 export SANDBOX_FLAGS="--security-opt label=disable"
 ```
 
-**Windows (PowerShell)**
-
-```powershell
-$env:SANDBOX_FLAGS="--security-opt label=disable"
-```
-
 Multiple flags can be provided as a space-separated string:
 
-**macOS/Linux**
-
 ```bash
 export SANDBOX_FLAGS="--flag1 --flag2=value"
 ```
 
-**Windows (PowerShell)**
-
-```powershell
-$env:SANDBOX_FLAGS="--flag1 --flag2=value"
-```
-
 ## Linux UID/GID handling
 
 The sandbox automatically handles user permissions on Linux. Override these
 permissions with:
 
-**macOS/Linux**
-
 ```bash
 export SANDBOX_SET_UID_GID=true   # Force host UID/GID
 export SANDBOX_SET_UID_GID=false  # Disable UID/GID mapping
 ```
 
-**Windows (PowerShell)**
-
-```powershell
-$env:SANDBOX_SET_UID_GID="true"   # Force host UID/GID
-$env:SANDBOX_SET_UID_GID="false"  # Disable UID/GID mapping
-```
-
 ## Troubleshooting
 
 ### Common issues

docs/cli/session-management.md

@@ -121,36 +121,27 @@ session lengths.
 
 ### Session retention
 
-By default, Gemini CLI automatically cleans up old session data to prevent your
-history from growing indefinitely. When a session is deleted, Gemini CLI also
-removes all associated data, including implementation plans, task trackers, tool
-outputs, and activity logs.
-
-The default policy is to **retain sessions for 30 days**.
-
-#### Configuration
-
-You can customize these policies using the `/settings` command or by manually
-editing your `settings.json` file:
+To prevent your history from growing indefinitely, enable automatic cleanup
+policies in your settings.
 
 ```json
 {
   "general": {
     "sessionRetention": {
       "enabled": true,
-      "maxAge": "30d",
-      "maxCount": 50
+      "maxAge": "30d", // Keep sessions for 30 days
+      "maxCount": 50 // Keep the 50 most recent sessions
     }
   }
 }
 ```
 
 - **`enabled`**: (boolean) Master switch for session cleanup. Defaults to
-  `true`.
+  `false`.
 - **`maxAge`**: (string) Duration to keep sessions (for example, "24h", "7d",
-  "4w"). Sessions older than this are deleted. Defaults to `"30d"`.
+  "4w"). Sessions older than this are deleted.
 - **`maxCount`**: (number) Maximum number of sessions to retain. The oldest
-  sessions exceeding this count are deleted. Defaults to undefined (unlimited).
+  sessions exceeding this count are deleted.
 - **`minRetention`**: (string) Minimum retention period (safety limit). Defaults
   to `"1d"`. Sessions newer than this period are never deleted by automatic
   cleanup.

docs/cli/settings.md

@@ -32,8 +32,8 @@ they appear in the UI.
 | Plan Model Routing      | `general.plan.modelRouting`        | Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pro for the planning phase and Flash for the implementation phase.                           | `true`      |
 | Max Chat Model Attempts | `general.maxAttempts`              | Maximum number of attempts for requests to the main chat model. Cannot exceed 10.                                                                                              | `10`        |
 | Debug Keystroke Logging | `general.debugKeystrokeLogging`    | Enable debug logging of keystrokes to the console.                                                                                                                             | `false`     |
-| Enable Session Cleanup  | `general.sessionRetention.enabled` | Enable automatic session cleanup                                                                                                                                               | `true`      |
-| Keep chat history       | `general.sessionRetention.maxAge`  | Automatically delete chats older than this time period (e.g., "30d", "7d", "24h", "1w")                                                                                        | `"30d"`     |
+| Enable Session Cleanup  | `general.sessionRetention.enabled` | Enable automatic session cleanup                                                                                                                                               | `false`     |
+| Keep chat history       | `general.sessionRetention.maxAge`  | Automatically delete chats older than this time period (e.g., "30d", "7d", "24h", "1w")                                                                                        | `undefined` |
 
 ### Output
 
@@ -60,7 +60,7 @@ they appear in the UI.
 | Hide CWD                             | `ui.footer.hideCWD`                    | Hide the current working directory path in the footer.                                                                                                            | `false`  |
 | Hide Sandbox Status                  | `ui.footer.hideSandboxStatus`          | Hide the sandbox status indicator in the footer.                                                                                                                  | `false`  |
 | Hide Model Info                      | `ui.footer.hideModelInfo`              | Hide the model name and context usage in the footer.                                                                                                              | `false`  |
-| Hide Context Window Percentage       | `ui.footer.hideContextPercentage`      | Hides the context window usage percentage.                                                                                                                        | `true`   |
+| Hide Context Window Percentage       | `ui.footer.hideContextPercentage`      | Hides the context window remaining percentage.                                                                                                                    | `true`   |
 | Hide Footer                          | `ui.hideFooter`                        | Hide the footer from the UI                                                                                                                                       | `false`  |
 | Show Memory Usage                    | `ui.showMemoryUsage`                   | Display memory usage information in the UI                                                                                                                        | `false`  |
 | Show Line Numbers                    | `ui.showLineNumbers`                   | Show line numbers in the chat.                                                                                                                                    | `true`   |
@@ -89,13 +89,13 @@ they appear in the UI.
 
 ### Model
 
-| UI Label                      | Setting                      | Description                                                                            | Default     |
-| ----------------------------- | ---------------------------- | -------------------------------------------------------------------------------------- | ----------- |
-| Model                         | `model.name`                 | The Gemini model to use for conversations.                                             | `undefined` |
-| Max Session Turns             | `model.maxSessionTurns`      | Maximum number of user/model/tool turns to keep in a session. -1 means unlimited.      | `-1`        |
-| Context Compression Threshold | `model.compressionThreshold` | The fraction of context usage at which to trigger context compression (e.g. 0.2, 0.3). | `0.5`       |
-| Disable Loop Detection        | `model.disableLoopDetection` | Disable automatic detection and prevention of infinite loops.                          | `false`     |
-| Skip Next Speaker Check       | `model.skipNextSpeakerCheck` | Skip the next speaker check.                                                           | `true`      |
+| UI Label                | Setting                      | Description                                                                            | Default     |
+| ----------------------- | ---------------------------- | -------------------------------------------------------------------------------------- | ----------- |
+| Model                   | `model.name`                 | The Gemini model to use for conversations.                                             | `undefined` |
+| Max Session Turns       | `model.maxSessionTurns`      | Maximum number of user/model/tool turns to keep in a session. -1 means unlimited.      | `-1`        |
+| Compression Threshold   | `model.compressionThreshold` | The fraction of context usage at which to trigger context compression (e.g. 0.2, 0.3). | `0.5`       |
+| Disable Loop Detection  | `model.disableLoopDetection` | Disable automatic detection and prevention of infinite loops.                          | `false`     |
+| Skip Next Speaker Check | `model.skipNextSpeakerCheck` | Skip the next speaker check.                                                           | `true`      |
 
 ### Context
 
@@ -113,6 +113,7 @@ they appear in the UI.
 
 | UI Label                         | Setting                              | Description                                                                                                                                                                | Default |
 | -------------------------------- | ------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| Sandbox Flags                    | `tools.sandboxFlags`                 | Additional flags to pass to the sandbox container engine (Docker or Podman). Environment variables can be used and will be expanded.                                       | `""`    |
 | Enable Interactive Shell         | `tools.shell.enableInteractiveShell` | Use node-pty for an interactive shell experience. Fallback to child_process still applies.                                                                                 | `true`  |
 | Show Color                       | `tools.shell.showColor`              | Show color in shell output.                                                                                                                                                | `false` |
 | Use Ripgrep                      | `tools.useRipgrep`                   | Use ripgrep for file content search instead of the fallback implementation. Provides faster search performance.                                                            | `true`  |

docs/cli/telemetry.md

@@ -103,52 +103,23 @@ Before using either method below, complete these steps:
 
 1. Set your Google Cloud project ID:
    - For telemetry in a separate project from inference:
-
-     **macOS/Linux**
-
      ```bash
      export OTLP_GOOGLE_CLOUD_PROJECT="your-telemetry-project-id"
      ```
-
-     **Windows (PowerShell)**
-
-     ```powershell
-     $env:OTLP_GOOGLE_CLOUD_PROJECT="your-telemetry-project-id"
-     ```
-
    - For telemetry in the same project as inference:
-
-     **macOS/Linux**
-
      ```bash
      export GOOGLE_CLOUD_PROJECT="your-project-id"
      ```
 
-     **Windows (PowerShell)**
-
-     ```powershell
-     $env:GOOGLE_CLOUD_PROJECT="your-project-id"
-     ```
-
 2. Authenticate with Google Cloud:
    - If using a user account:
      ```bash
      gcloud auth application-default login
      ```
    - If using a service account:
-
-     **macOS/Linux**
-
      ```bash
      export GOOGLE_APPLICATION_CREDENTIALS="/path/to/your/service-account.json"
      ```
-
-     **Windows (PowerShell)**
-
-     ```powershell
-     $env:GOOGLE_APPLICATION_CREDENTIALS="C:\path\to\your\service-account.json"
-     ```
-
 3. Make sure your account or service account has these IAM roles:
    - Cloud Trace Agent
    - Monitoring Metric Writer

docs/cli/tutorials/automation.md

@@ -37,18 +37,10 @@ output.
 
 Pipe a file:
 
-**macOS/Linux**
-
 ```bash
 cat error.log | gemini "Explain why this failed"
 ```
 
-**Windows (PowerShell)**
-
-```powershell
-Get-Content error.log | gemini "Explain why this failed"
-```
-
 Pipe a command:
 
 ```bash
@@ -65,10 +57,7 @@ results to a file.
 You have a folder of Python scripts and want to generate a `README.md` for each
 one.
 
-1.  Save the following code as `generate_docs.sh` (or `generate_docs.ps1` for
-    Windows):
-
-    **macOS/Linux (`generate_docs.sh`)**
+1.  Save the following code as `generate_docs.sh`:
 
     ```bash
     #!/bin/bash
@@ -83,34 +72,13 @@ one.
     done
     ```
 
-    **Windows PowerShell (`generate_docs.ps1`)**
-
-    ```powershell
-    # Loop through all Python files
-    Get-ChildItem -Filter *.py | ForEach-Object {
-      Write-Host "Generating docs for $($_.Name)..."
-
-      $newName = $_.Name -replace '\.py$', '.md'
-      # Ask Gemini CLI to generate the documentation and print it to stdout
-      gemini "Generate a Markdown documentation summary for @$($_.Name). Print the result to standard output." | Out-File -FilePath $newName -Encoding utf8
-    }
-    ```
-
 2.  Make the script executable and run it in your directory:
 
-    **macOS/Linux**
-
     ```bash
     chmod +x generate_docs.sh
     ./generate_docs.sh
     ```
 
-    **Windows (PowerShell)**
-
-    ```powershell
-    .\generate_docs.ps1
-    ```
-
     This creates a corresponding Markdown file for every Python file in the
     folder.
 
@@ -122,10 +90,7 @@ like `jq`. To get pure JSON data from the model, combine the
 
 ### Scenario: Extract and return structured data
 
-1.  Save the following script as `generate_json.sh` (or `generate_json.ps1` for
-    Windows):
-
-    **macOS/Linux (`generate_json.sh`)**
+1.  Save the following script as `generate_json.sh`:
 
     ```bash
     #!/bin/bash
@@ -140,35 +105,13 @@ like `jq`. To get pure JSON data from the model, combine the
     gemini --output-format json "Return a raw JSON object with keys 'version' and 'deps' from @package.json" | jq -r '.response' > data.json
     ```
 
-    **Windows PowerShell (`generate_json.ps1`)**
-
-    ```powershell
-    # Ensure we are in a project root
-    if (-not (Test-Path "package.json")) {
-      Write-Error "Error: package.json not found."
-      exit 1
-    }
-
-    # Extract data (requires jq installed, or you can use ConvertFrom-Json)
-    $output = gemini --output-format json "Return a raw JSON object with keys 'version' and 'deps' from @package.json" | ConvertFrom-Json
-    $output.response | Out-File -FilePath data.json -Encoding utf8
-    ```
-
-2.  Run the script:
-
-    **macOS/Linux**
+2.  Run `generate_json.sh`:
 
     ```bash
     chmod +x generate_json.sh
     ./generate_json.sh
     ```
 
-    **Windows (PowerShell)**
-
-    ```powershell
-    .\generate_json.ps1
-    ```
-
 3.  Check `data.json`. The file should look like this:
 
     ```json
@@ -186,10 +129,8 @@ Use headless mode to perform custom, automated AI tasks.
 
 ### Scenario: Create a "Smart Commit" alias
 
-You can add a function to your shell configuration to create a `git commit`
-wrapper that writes the message for you.
-
-**macOS/Linux (Bash/Zsh)**
+You can add a function to your shell configuration (like `.zshrc` or `.bashrc`)
+to create a `git commit` wrapper that writes the message for you.
 
 1.  Open your `.zshrc` file (or `.bashrc` if you use Bash) in your preferred
     text editor.
@@ -229,43 +170,6 @@ wrapper that writes the message for you.
     source ~/.zshrc
     ```
 
-**Windows (PowerShell)**
-
-1.  Open your PowerShell profile in your preferred text editor.
-
-    ```powershell
-    notepad $PROFILE
-    ```
-
-2.  Scroll to the very bottom of the file and paste this code:
-
-    ```powershell
-    function gcommit {
-      # Get the diff of staged changes
-      $diff = git diff --staged
-
-      if (-not $diff) {
-        Write-Host "No staged changes to commit."
-        return
-      }
-
-      # Ask Gemini to write the message
-      Write-Host "Generating commit message..."
-      $msg = $diff | gemini "Write a concise Conventional Commit message for this diff. Output ONLY the message."
-
-      # Commit with the generated message
-      git commit -m "$msg"
-    }
-    ```
-
-    Save your file and exit.
-
-3.  Run this command to make the function available immediately:
-
-    ```powershell
-    . $PROFILE
-    ```
-
 4.  Use your new command:
 
     ```bash

docs/cli/tutorials/mcp-setup.md

@@ -20,18 +20,10 @@ Most MCP servers require authentication. For GitHub, you need a PAT.
     **Read/Write** access to **Issues** and **Pull Requests**.
 3.  Store it in your environment:
 
-**macOS/Linux**
-
 ```bash
 export GITHUB_PERSONAL_ACCESS_TOKEN="github_pat_..."
 ```
 
-**Windows (PowerShell)**
-
-```powershell
-$env:GITHUB_PERSONAL_ACCESS_TOKEN="github_pat_..."
-```
-
 ## How to configure Gemini CLI
 
 You tell Gemini about new servers by editing your `settings.json`.

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

@@ -14,18 +14,10 @@ responding correctly.
 
 1.  Run the following command to create the folders:
 
-    **macOS/Linux**
-
     ```bash
     mkdir -p .gemini/skills/api-auditor/scripts
     ```
 
-    **Windows (PowerShell)**
-
-    ```powershell
-    New-Item -ItemType Directory -Force -Path ".gemini\skills\api-auditor\scripts"
-    ```
-
 ### Create the definition
 
 1.  Create a file at `.gemini/skills/api-auditor/SKILL.md`. This tells the agent

docs/extensions/reference.md

@@ -122,10 +122,7 @@ The manifest file defines the extension's behavior and configuration.
     }
   },
   "contextFileName": "GEMINI.md",
-  "excludeTools": ["run_shell_command"],
-  "plan": {
-    "directory": ".gemini/plans"
-  }
+  "excludeTools": ["run_shell_command"]
 }
 ```
 
@@ -160,11 +157,6 @@ The manifest file defines the extension's behavior and configuration.
   `"excludeTools": ["run_shell_command(rm -rf)"]` will block the `rm -rf`
   command. Note that this differs from the MCP server `excludeTools`
   functionality, which can be listed in the MCP server config.
-- `plan`: Planning features configuration.
-  - `directory`: The directory where planning artifacts are stored. This serves
-    as a fallback if the user hasn't specified a plan directory in their
-    settings. If not specified by either the extension or the user, the default
-    is `~/.gemini/tmp/<project>/<session-id>/plans/`.
 
 When Gemini CLI starts, it loads all the extensions and merges their
 configurations. If there are any conflicts, the workspace configuration takes

docs/extensions/writing-extensions.md

@@ -189,18 +189,10 @@ Custom commands create shortcuts for complex prompts.
 
 1.  Create a `commands` directory and a subdirectory for your command group:
 
-    **macOS/Linux**
-
     ```bash
     mkdir -p commands/fs
     ```
 
-    **Windows (PowerShell)**
-
-    ```powershell
-    New-Item -ItemType Directory -Force -Path "commands\fs"
-    ```
-
 2.  Create a file named `commands/fs/grep-code.toml`:
 
     ```toml
@@ -260,18 +252,10 @@ Skills are activated only when needed, which saves context tokens.
 
 1.  Create a `skills` directory and a subdirectory for your skill:
 
-    **macOS/Linux**
-
     ```bash
     mkdir -p skills/security-audit
     ```
 
-    **Windows (PowerShell)**
-
-    ```powershell
-    New-Item -ItemType Directory -Force -Path "skills\security-audit"
-    ```
-
 2.  Create a `skills/security-audit/SKILL.md` file:
 
     ```markdown

docs/get-started/authentication.md

@@ -78,20 +78,11 @@ To authenticate and use Gemini CLI with a Gemini API key:
 
 2. Set the `GEMINI_API_KEY` environment variable to your key. For example:
 
-   **macOS/Linux**
-
    ```bash
    # Replace YOUR_GEMINI_API_KEY with the key from AI Studio
    export GEMINI_API_KEY="YOUR_GEMINI_API_KEY"
    ```
 
-   **Windows (PowerShell)**
-
-   ```powershell
-   # Replace YOUR_GEMINI_API_KEY with the key from AI Studio
-   $env:GEMINI_API_KEY="YOUR_GEMINI_API_KEY"
-   ```
-
    To make this setting persistent, see
    [Persisting Environment Variables](#persisting-vars).
 
@@ -123,22 +114,12 @@ or the location where you want to run your jobs.
 
 For example:
 
-**macOS/Linux**
-
 ```bash
 # Replace with your project ID and desired location (e.g., us-central1)
 export GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"
 export GOOGLE_CLOUD_LOCATION="YOUR_PROJECT_LOCATION"
 ```
 
-**Windows (PowerShell)**
-
-```powershell
-# Replace with your project ID and desired location (e.g., us-central1)
-$env:GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"
-$env:GOOGLE_CLOUD_LOCATION="YOUR_PROJECT_LOCATION"
-```
-
 To make any Vertex AI environment variable settings persistent, see
 [Persisting Environment Variables](#persisting-vars).
 
@@ -149,17 +130,9 @@ Consider this authentication method if you have Google Cloud CLI installed.
 > **Note:** If you have previously set `GOOGLE_API_KEY` or `GEMINI_API_KEY`, you
 > must unset them to use ADC:
 >
-> **macOS/Linux**
->
 > ```bash
 > unset GOOGLE_API_KEY GEMINI_API_KEY
 > ```
->
-> **Windows (PowerShell)**
->
-> ```powershell
-> Remove-Item Env:\GOOGLE_API_KEY, Env:\GEMINI_API_KEY -ErrorAction Ignore
-> ```
 
 1. Verify you have a Google Cloud project and Vertex AI API is enabled.
 
@@ -187,17 +160,9 @@ pipelines, or if your organization restricts user-based ADC or API key creation.
 > **Note:** If you have previously set `GOOGLE_API_KEY` or `GEMINI_API_KEY`, you
 > must unset them:
 >
-> **macOS/Linux**
->
 > ```bash
 > unset GOOGLE_API_KEY GEMINI_API_KEY
 > ```
->
-> **Windows (PowerShell)**
->
-> ```powershell
-> Remove-Item Env:\GOOGLE_API_KEY, Env:\GEMINI_API_KEY -ErrorAction Ignore
-> ```
 
 1.  [Create a service account and key](https://cloud.google.com/iam/docs/keys-create-delete)
     and download the provided JSON file. Assign the "Vertex AI User" role to the
@@ -206,20 +171,11 @@ pipelines, or if your organization restricts user-based ADC or API key creation.
 2.  Set the `GOOGLE_APPLICATION_CREDENTIALS` environment variable to the JSON
     file's absolute path. For example:
 
-    **macOS/Linux**
-
     ```bash
     # Replace /path/to/your/keyfile.json with the actual path
     export GOOGLE_APPLICATION_CREDENTIALS="/path/to/your/keyfile.json"
     ```
 
-    **Windows (PowerShell)**
-
-    ```powershell
-    # Replace C:\path\to\your\keyfile.json with the actual path
-    $env:GOOGLE_APPLICATION_CREDENTIALS="C:\path\to\your\keyfile.json"
-    ```
-
 3.  [Configure your Google Cloud Project](#set-gcp).
 
 4.  Start the CLI:
@@ -239,20 +195,11 @@ pipelines, or if your organization restricts user-based ADC or API key creation.
 
 2.  Set the `GOOGLE_API_KEY` environment variable:
 
-    **macOS/Linux**
-
     ```bash
     # Replace YOUR_GOOGLE_API_KEY with your Vertex AI API key
     export GOOGLE_API_KEY="YOUR_GOOGLE_API_KEY"
     ```
 
-    **Windows (PowerShell)**
-
-    ```powershell
-    # Replace YOUR_GOOGLE_API_KEY with your Vertex AI API key
-    $env:GOOGLE_API_KEY="YOUR_GOOGLE_API_KEY"
-    ```
-
     > **Note:** If you see errors like
     > `"API keys are not supported by this API..."`, your organization might
     > restrict API key usage for this service. Try the other Vertex AI
@@ -296,20 +243,11 @@ To configure Gemini CLI to use a Google Cloud project, do the following:
 
     For example, to set the `GOOGLE_CLOUD_PROJECT_ID` variable:
 
-    **macOS/Linux**
-
     ```bash
     # Replace YOUR_PROJECT_ID with your actual Google Cloud project ID
     export GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"
     ```
 
-    **Windows (PowerShell)**
-
-    ```powershell
-    # Replace YOUR_PROJECT_ID with your actual Google Cloud project ID
-    $env:GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"
-    ```
-
     To make this setting persistent, see
     [Persisting Environment Variables](#persisting-vars).
 
@@ -319,22 +257,16 @@ To avoid setting environment variables for every terminal session, you can
 persist them with the following methods:
 
 1.  **Add your environment variables to your shell configuration file:** Append
-    the environment variable commands to your shell's startup file.
-
-    **macOS/Linux** (e.g., `~/.bashrc`, `~/.zshrc`, or `~/.profile`):
+    the `export ...` commands to your shell's startup file (e.g., `~/.bashrc`,
+    `~/.zshrc`, or `~/.profile`) and reload your shell (e.g.,
+    `source ~/.bashrc`).
 
     ```bash
+    # Example for .bashrc
     echo 'export GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"' >> ~/.bashrc
     source ~/.bashrc
     ```
 
-    **Windows (PowerShell)** (e.g., `$PROFILE`):
-
-    ```powershell
-    Add-Content -Path $PROFILE -Value '$env:GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"'
-    . $PROFILE
-    ```
-
     > **Warning:** Be aware that when you export API keys or service account
     > paths in your shell configuration file, any process launched from that
     > shell can read them.
@@ -342,13 +274,10 @@ persist them with the following methods:
 2.  **Use a `.env` file:** Create a `.gemini/.env` file in your project
     directory or home directory. Gemini CLI automatically loads variables from
     the first `.env` file it finds, searching up from the current directory,
-    then in your home directory's `.gemini/.env` (e.g., `~/.gemini/.env` or
-    `%USERPROFILE%\.gemini\.env`).
+    then in `~/.gemini/.env` or `~/.env`. `.gemini/.env` is recommended.
 
     Example for user-wide settings:
 
-    **macOS/Linux**
-
     ```bash
     mkdir -p ~/.gemini
     cat >> ~/.gemini/.env <<'EOF'
@@ -357,16 +286,6 @@ persist them with the following methods:
     EOF
     ```
 
-    **Windows (PowerShell)**
-
-    ```powershell
-    New-Item -ItemType Directory -Force -Path "$env:USERPROFILE\.gemini"
-    @"
-    GOOGLE_CLOUD_PROJECT="your-project-id"
-    # Add other variables like GEMINI_API_KEY as needed
-    "@ | Out-File -FilePath "$env:USERPROFILE\.gemini\.env" -Encoding utf8 -Append
-    ```
-
 Variables are loaded from the first file found, not merged.
 
 ## Running in Google Cloud environments <a id="cloud-env"></a>

docs/get-started/installation.md

@@ -13,7 +13,7 @@ installation methods, and release types.
   - "Casual" usage: 4GB+ RAM (short sessions, common tasks and edits)
   - "Power" usage: 16GB+ RAM (long sessions, large codebases, deep context)
 - **Runtime:** Node.js 20.0.0+
-- **Shell:** Bash, Zsh, or PowerShell
+- **Shell:** Bash or Zsh
 - **Location:**
   [Gemini Code Assist supported locations](https://developers.google.com/gemini-code-assist/resources/available-locations#americas)
 - **Internet connection required**

docs/hooks/best-practices.md

@@ -167,8 +167,6 @@ try {
 Run hook scripts manually with sample JSON input to verify they behave as
 expected before hooking them up to the CLI.
 
-**macOS/Linux**
-
 ```bash
 # Create test input
 cat > test-input.json << 'EOF'
@@ -189,30 +187,7 @@ cat test-input.json | .gemini/hooks/my-hook.sh
 
 # Check exit code
 echo "Exit code: $?"
-```
 
-**Windows (PowerShell)**
-
-```powershell
-# Create test input
-@"
-{
-  "session_id": "test-123",
-  "cwd": "C:\\temp\\test",
-  "hook_event_name": "BeforeTool",
-  "tool_name": "write_file",
-  "tool_input": {
-    "file_path": "test.txt",
-    "content": "Test content"
-  }
-}
-"@ | Out-File -FilePath test-input.json -Encoding utf8
-
-# Test the hook
-Get-Content test-input.json | .\.gemini\hooks\my-hook.ps1
-
-# Check exit code
-Write-Host "Exit code: $LASTEXITCODE"
 ```
 
 ### Check exit codes
@@ -358,7 +333,7 @@ tool_name=$(echo "$input" | jq -r '.tool_name')
 
 ### Make scripts executable
 
-Always make hook scripts executable on macOS/Linux:
+Always make hook scripts executable:
 
 ```bash
 chmod +x .gemini/hooks/*.sh
@@ -366,10 +341,6 @@ chmod +x .gemini/hooks/*.js
 
 ```
 
-**Windows Note**: On Windows, PowerShell scripts (`.ps1`) don't use `chmod`, but
-you may need to ensure your execution policy allows them to run (e.g.,
-`Set-ExecutionPolicy RemoteSigned -Scope CurrentUser`).
-
 ### Version control
 
 Commit hooks to share with your team:
@@ -510,9 +481,6 @@ ls -la .gemini/hooks/my-hook.sh
 chmod +x .gemini/hooks/my-hook.sh
 ```
 
-**Windows Note**: On Windows, ensure your execution policy allows running
-scripts (e.g., `Get-ExecutionPolicy`).
-
 **Verify script path:** Ensure the path in `settings.json` resolves correctly.
 
 ```bash

docs/hooks/writing-hooks.md

@@ -28,8 +28,6 @@ Create a directory for hooks and a simple logging script.
 > This example uses `jq` to parse JSON. If you don't have it installed, you can
 > perform similar logic using Node.js or Python.
 
-**macOS/Linux**
-
 ```bash
 mkdir -p .gemini/hooks
 cat > .gemini/hooks/log-tools.sh << 'EOF'
@@ -54,28 +52,6 @@ EOF
 chmod +x .gemini/hooks/log-tools.sh
 ```
 
-**Windows (PowerShell)**
-
-```powershell
-New-Item -ItemType Directory -Force -Path ".gemini\hooks"
-@"
-# Read hook input from stdin
-`$inputJson = `$input | Out-String | ConvertFrom-Json
-
-# Extract tool name
-`$toolName = `$inputJson.tool_name
-
-# Log to stderr (visible in terminal if hook fails, or captured in logs)
-[Console]::Error.WriteLine("Logging tool: `$toolName")
-
-# Log to file
-"[`$(Get-Date -Format 'o')] Tool executed: `$toolName" | Out-File -FilePath ".gemini\tool-log.txt" -Append -Encoding utf8
-
-# Return success with empty JSON
-"{}"
-"@ | Out-File -FilePath ".gemini\hooks\log-tools.ps1" -Encoding utf8
-```
-
 ## Exit Code Strategies
 
 There are two ways to control or block an action in Gemini CLI:

docs/ide-integration/index.md

@@ -177,18 +177,10 @@ standalone terminal and want to manually associate it with a specific IDE
 instance, you can set the `GEMINI_CLI_IDE_PID` environment variable to the
 process ID (PID) of your IDE.
 
-**macOS/Linux**
-
 ```bash
 export GEMINI_CLI_IDE_PID=12345
 ```
 
-**Windows (PowerShell)**
-
-```powershell
-$env:GEMINI_CLI_IDE_PID=12345
-```
-
 When this variable is set, Gemini CLI will skip automatic detection and attempt
 to connect using the provided PID.
 

docs/reference/commands.md

@@ -270,9 +270,6 @@ Slash commands provide meta-level control over the CLI itself.
   one has been generated.
   - **Note:** This feature requires the `experimental.plan` setting to be
     enabled in your configuration.
-- **Sub-commands:**
-  - **`copy`**:
-    - **Description:** Copy the currently approved plan to your clipboard.
 
 ### `/policies`
 

docs/reference/configuration.md

@@ -159,12 +159,12 @@ their corresponding top-level category object in your `settings.json` file.
 
 - **`general.sessionRetention.enabled`** (boolean):
   - **Description:** Enable automatic session cleanup
-  - **Default:** `true`
+  - **Default:** `false`
 
 - **`general.sessionRetention.maxAge`** (string):
   - **Description:** Automatically delete chats older than this time period
     (e.g., "30d", "7d", "24h", "1w")
-  - **Default:** `"30d"`
+  - **Default:** `undefined`
 
 - **`general.sessionRetention.maxCount`** (number):
   - **Description:** Alternative: Maximum number of sessions to keep (most
@@ -175,6 +175,11 @@ their corresponding top-level category object in your `settings.json` file.
   - **Description:** Minimum retention period (safety limit, defaults to "1d")
   - **Default:** `"1d"`
 
+- **`general.sessionRetention.warningAcknowledged`** (boolean):
+  - **Description:** INTERNAL: Whether the user has acknowledged the session
+    retention warning
+  - **Default:** `false`
+
 #### `output`
 
 - **`output.format`** (enum):
@@ -263,7 +268,7 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `false`
 
 - **`ui.footer.hideContextPercentage`** (boolean):
-  - **Description:** Hides the context window usage percentage.
+  - **Description:** Hides the context window remaining percentage.
   - **Default:** `true`
 
 - **`ui.hideFooter`** (boolean):
@@ -747,11 +752,16 @@ their corresponding top-level category object in your `settings.json` file.
 
 - **`tools.sandbox`** (boolean | string):
   - **Description:** Sandbox execution environment. Set to a boolean to enable
-    or disable the sandbox, provide a string path to a sandbox profile, or
-    specify an explicit sandbox command (e.g., "docker", "podman", "lxc").
+    or disable the sandbox, or provide a string path to a sandbox profile.
   - **Default:** `undefined`
   - **Requires restart:** Yes
 
+- **`tools.sandboxFlags`** (string):
+  - **Description:** Additional flags to pass to the sandbox container engine
+    (Docker or Podman). Environment variables can be used and will be expanded.
+  - **Default:** `""`
+  - **Requires restart:** Yes
+
 - **`tools.shell.enableInteractiveShell`** (boolean):
   - **Description:** Use node-pty for an interactive shell experience. Fallback
     to child_process still applies.
@@ -1015,11 +1025,6 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `false`
   - **Requires restart:** Yes
 
-- **`experimental.taskTracker`** (boolean):
-  - **Description:** Enable task tracker tools.
-  - **Default:** `false`
-  - **Requires restart:** Yes
-
 - **`experimental.modelSteering`** (boolean):
   - **Description:** Enable model steering (user hints) to guide the model
     during tool execution.
@@ -1333,8 +1338,7 @@ the `advanced.excludedEnvVars` setting in your `settings.json` file.
 - **`GEMINI_MODEL`**:
   - Specifies the default Gemini model to use.
   - Overrides the hardcoded default
-  - Example: `export GEMINI_MODEL="gemini-3-flash-preview"` (Windows PowerShell:
-    `$env:GEMINI_MODEL="gemini-3-flash-preview"`)
+  - Example: `export GEMINI_MODEL="gemini-3-flash-preview"`
 - **`GEMINI_CLI_IDE_PID`**:
   - Manually specifies the PID of the IDE process to use for integration. This
     is useful when running Gemini CLI in a standalone terminal while still
@@ -1346,14 +1350,12 @@ the `advanced.excludedEnvVars` setting in your `settings.json` file.
   - By default, this is the user's system home directory. The CLI will create a
     `.gemini` folder inside this directory.
   - Useful for shared compute environments or keeping CLI state isolated.
-  - Example: `export GEMINI_CLI_HOME="/path/to/user/config"` (Windows
-    PowerShell: `$env:GEMINI_CLI_HOME="C:\path\to\user\config"`)
+  - Example: `export GEMINI_CLI_HOME="/path/to/user/config"`
 - **`GOOGLE_API_KEY`**:
   - Your Google Cloud API key.
   - Required for using Vertex AI in express mode.
   - Ensure you have the necessary permissions.
-  - Example: `export GOOGLE_API_KEY="YOUR_GOOGLE_API_KEY"` (Windows PowerShell:
-    `$env:GOOGLE_API_KEY="YOUR_GOOGLE_API_KEY"`).
+  - Example: `export GOOGLE_API_KEY="YOUR_GOOGLE_API_KEY"`.
 - **`GOOGLE_CLOUD_PROJECT`**:
   - Your Google Cloud Project ID.
   - Required for using Code Assist or Vertex AI.
@@ -1364,23 +1366,18 @@ the `advanced.excludedEnvVars` setting in your `settings.json` file.
     you have `GOOGLE_CLOUD_PROJECT` set in your global environment in Cloud
     Shell, it will be overridden by this default. To use a different project in
     Cloud Shell, you must define `GOOGLE_CLOUD_PROJECT` in a `.env` file.
-  - Example: `export GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"` (Windows
-    PowerShell: `$env:GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"`).
+  - Example: `export GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"`.
 - **`GOOGLE_APPLICATION_CREDENTIALS`** (string):
   - **Description:** The path to your Google Application Credentials JSON file.
   - **Example:**
     `export GOOGLE_APPLICATION_CREDENTIALS="/path/to/your/credentials.json"`
-    (Windows PowerShell:
-    `$env:GOOGLE_APPLICATION_CREDENTIALS="C:\path\to\your\credentials.json"`)
 - **`GOOGLE_GENAI_API_VERSION`**:
   - Specifies the API version to use for Gemini API requests.
   - When set, overrides the default API version used by the SDK.
-  - Example: `export GOOGLE_GENAI_API_VERSION="v1"` (Windows PowerShell:
-    `$env:GOOGLE_GENAI_API_VERSION="v1"`)
+  - Example: `export GOOGLE_GENAI_API_VERSION="v1"`
 - **`OTLP_GOOGLE_CLOUD_PROJECT`**:
   - Your Google Cloud Project ID for Telemetry in Google Cloud
-  - Example: `export OTLP_GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"` (Windows
-    PowerShell: `$env:OTLP_GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"`).
+  - Example: `export OTLP_GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"`.
 - **`GEMINI_TELEMETRY_ENABLED`**:
   - Set to `true` or `1` to enable telemetry. Any other value is treated as
     disabling it.
@@ -1408,8 +1405,7 @@ the `advanced.excludedEnvVars` setting in your `settings.json` file.
 - **`GOOGLE_CLOUD_LOCATION`**:
   - Your Google Cloud Project Location (e.g., us-central1).
   - Required for using Vertex AI in non-express mode.
-  - Example: `export GOOGLE_CLOUD_LOCATION="YOUR_PROJECT_LOCATION"` (Windows
-    PowerShell: `$env:GOOGLE_CLOUD_LOCATION="YOUR_PROJECT_LOCATION"`).
+  - Example: `export GOOGLE_CLOUD_LOCATION="YOUR_PROJECT_LOCATION"`.
 - **`GEMINI_SANDBOX`**:
   - Alternative to the `sandbox` setting in `settings.json`.
   - Accepts `true`, `false`, `docker`, `podman`, or a custom command string.

docs/reference/keyboard-shortcuts.md

@@ -152,13 +152,3 @@ available combinations.
   inline when the cursor is over the placeholder.
 - `Double-click` on a paste placeholder (alternate buffer mode only): Expand to
   view full content inline. Double-click again to collapse.
-
-## Limitations
-
-- On [Windows Terminal](https://en.wikipedia.org/wiki/Windows_Terminal):
-  - `shift+enter` is not supported.
-  - `shift+tab`
-    [is not supported](https://github.com/google-gemini/gemini-cli/issues/20314)
-    on Node 20 and earlier versions of Node 22.
-- On macOS's [Terminal](<https://en.wikipedia.org/wiki/Terminal_(macOS)>):
-  - `shift+enter` is not supported.

docs/reference/policy-engine.md

@@ -10,19 +10,9 @@ confirmation.
 To create your first policy:
 
 1.  **Create the policy directory** if it doesn't exist:
-
-    **macOS/Linux**
-
     ```bash
     mkdir -p ~/.gemini/policies
     ```
-
-    **Windows (PowerShell)**
-
-    ```powershell
-    New-Item -ItemType Directory -Force -Path "$env:USERPROFILE\.gemini\policies"
-    ```
-
 2.  **Create a new policy file** (e.g., `~/.gemini/policies/my-rules.toml`). You
     can use any filename ending in `.toml`; all such files in this directory
     will be loaded and combined:

docs/resources/faq.md

@@ -88,18 +88,10 @@ You can configure your Google Cloud Project ID using an environment variable.
 
 Set the `GOOGLE_CLOUD_PROJECT` environment variable in your shell:
 
-**macOS/Linux**
-
 ```bash
 export GOOGLE_CLOUD_PROJECT="your-project-id"
 ```
 
-**Windows (PowerShell)**
-
-```powershell
-$env:GOOGLE_CLOUD_PROJECT="your-project-id"
-```
-
 To make this setting permanent, add this line to your shell's startup file
 (e.g., `~/.bashrc`, `~/.zshrc`).
 

docs/resources/troubleshooting.md

@@ -55,13 +55,10 @@ topics on:
     - Set the `NODE_USE_SYSTEM_CA=1` environment variable to tell Node.js to use
       the operating system's native certificate store (where corporate
       certificates are typically already installed).
-      - Example: `export NODE_USE_SYSTEM_CA=1` (Windows PowerShell:
-        `$env:NODE_USE_SYSTEM_CA=1`)
+      - Example: `export NODE_USE_SYSTEM_CA=1`
     - Set the `NODE_EXTRA_CA_CERTS` environment variable to the absolute path of
       your corporate root CA certificate file.
       - Example: `export NODE_EXTRA_CA_CERTS=/path/to/your/corporate-ca.crt`
-        (Windows PowerShell:
-        `$env:NODE_EXTRA_CA_CERTS="C:\path\to\your\corporate-ca.crt"`)
 
 ## Common error messages and solutions
 

docs/sidebar.json

@@ -94,14 +94,7 @@
           { "label": "Agent Skills", "slug": "docs/cli/skills" },
           { "label": "Checkpointing", "slug": "docs/cli/checkpointing" },
           { "label": "Headless mode", "slug": "docs/cli/headless" },
-          {
-            "label": "Hooks",
-            "collapsed": true,
-            "items": [
-              { "label": "Overview", "slug": "docs/hooks" },
-              { "label": "Reference", "slug": "docs/hooks/reference" }
-            ]
-          },
+          { "label": "Hooks", "slug": "docs/hooks" },
           { "label": "IDE integration", "slug": "docs/ide-integration" },
           { "label": "MCP servers", "slug": "docs/tools/mcp-server" },
           { "label": "Model routing", "slug": "docs/cli/model-routing" },

docs/tools/planning.md

@@ -1,8 +1,8 @@
 # Gemini CLI planning tools
 
-Planning tools let Gemini CLI switch into a safe, read-only "Plan Mode" for
-researching and planning complex changes, and to signal the finalization of a
-plan to the user.
+Planning tools allow the Gemini model to switch into a safe, read-only "Plan
+Mode" for researching and planning complex changes, and to signal the
+finalization of a plan to the user.
 
 ## 1. `enter_plan_mode` (EnterPlanMode)
 
@@ -18,12 +18,11 @@ and planning.
 - **File:** `enter-plan-mode.ts`
 - **Parameters:**
   - `reason` (string, optional): A short reason explaining why the agent is
-    entering plan mode (for example, "Starting a complex feature
-    implementation").
+    entering plan mode (e.g., "Starting a complex feature implementation").
 - **Behavior:**
   - Switches the CLI's approval mode to `PLAN`.
   - Notifies the user that the agent has entered Plan Mode.
-- **Output (`llmContent`):** A message indicating the switch, for example,
+- **Output (`llmContent`):** A message indicating the switch, e.g.,
   `Switching to Plan mode.`
 - **Confirmation:** Yes. The user is prompted to confirm entering Plan Mode.
 
@@ -38,7 +37,7 @@ finalized plan to the user and requests approval to start the implementation.
 - **Parameters:**
   - `plan_path` (string, required): The path to the finalized Markdown plan
     file. This file MUST be located within the project's temporary plans
-    directory (for example, `~/.gemini/tmp/<project>/plans/`).
+    directory (e.g., `~/.gemini/tmp/<project>/plans/`).
 - **Behavior:**
   - Validates that the `plan_path` is within the allowed directory and that the
     file exists and has content.

esbuild.config.js

@@ -88,9 +88,6 @@ const cliConfig = {
   outfile: 'bundle/gemini.js',
   define: {
     'process.env.CLI_VERSION': JSON.stringify(pkg.version),
-    'process.env.GEMINI_SANDBOX_IMAGE_DEFAULT': JSON.stringify(
-      pkg.config?.sandboxImageUri,
-    ),
   },
   plugins: createWasmPlugins(),
   alias: {

eslint.config.js

@@ -25,18 +25,6 @@ const __dirname = path.dirname(__filename);
 const projectRoot = __dirname;
 const currentYear = new Date().getFullYear();
 
-const commonRestrictedSyntaxRules = [
-  {
-    selector: 'CallExpression[callee.name="require"]',
-    message: 'Avoid using require(). Use ES6 imports instead.',
-  },
-  {
-    selector: 'ThrowStatement > Literal:not([value=/^\\w+Error:/])',
-    message:
-      'Do not throw string literals or non-Error objects. Throw new Error("...") instead.',
-  },
-];
-
 export default tseslint.config(
   {
     // Global ignores
@@ -68,11 +56,7 @@ export default tseslint.config(
   },
   {
     // Rules for packages/*/src (TS/TSX)
-    files: [
-      'packages/*/src/**/*.{ts,tsx}',
-      'data/**/*.ts',
-      'scripts/optimization/**/*.ts',
-    ],
+    files: ['packages/*/src/**/*.{ts,tsx}'],
     plugins: {
       import: importPlugin,
     },
@@ -136,7 +120,18 @@ export default tseslint.config(
       'no-cond-assign': 'error',
       'no-debugger': 'error',
       'no-duplicate-case': 'error',
-      'no-restricted-syntax': ['error', ...commonRestrictedSyntaxRules],
+      'no-restricted-syntax': [
+        'error',
+        {
+          selector: 'CallExpression[callee.name="require"]',
+          message: 'Avoid using require(). Use ES6 imports instead.',
+        },
+        {
+          selector: 'ThrowStatement > Literal:not([value=/^\\w+Error:/])',
+          message:
+            'Do not throw string literals or non-Error objects. Throw new Error("...") instead.',
+        },
+      ],
       'no-unsafe-finally': 'error',
       'no-unused-expressions': 'off', // Disable base rule
       '@typescript-eslint/no-unused-expressions': [
@@ -176,28 +171,6 @@ export default tseslint.config(
       ],
     },
   },
-  {
-    // API Response Optionality enforcement for Code Assist
-    files: ['packages/core/src/code_assist/**/*.{ts,tsx}'],
-    rules: {
-      'no-restricted-syntax': [
-        'error',
-        ...commonRestrictedSyntaxRules,
-        {
-          selector:
-            'TSInterfaceDeclaration[id.name=/.+Response$/] TSPropertySignature:not([optional=true])',
-          message:
-            'All fields in API response interfaces (*Response) must be marked as optional (?) to prevent developers from accidentally assuming a field will always be present based on current backend behavior.',
-        },
-        {
-          selector:
-            'TSTypeAliasDeclaration[id.name=/.+Response$/] TSPropertySignature:not([optional=true])',
-          message:
-            'All fields in API response types (*Response) must be marked as optional (?) to prevent developers from accidentally assuming a field will always be present based on current backend behavior.',
-        },
-      ],
-    },
-  },
   {
     // Rules that only apply to product code
     files: ['packages/*/src/**/*.{ts,tsx}'],

evals/README.md

@@ -3,8 +3,7 @@
 Behavioral evaluations (evals) are tests designed to validate the agent's
 behavior in response to specific prompts. They serve as a critical feedback loop
 for changes to system prompts, tool definitions, and other model-steering
-mechanisms, and as a tool for assessing feature reliability by model, and
-preventing regressions.
+mechanisms.
 
 ## Why Behavioral Evals?
 
@@ -31,48 +30,6 @@ CLI's features.
   those that are generally reliable but might occasionally vary
   (`USUALLY_PASSES`).
 
-## Best Practices
-
-When designing behavioral evals, aim for scenarios that accurately reflect
-real-world usage while remaining small and maintainable.
-
-- **Realistic Complexity**: Evals should be complicated enough to be
-  "realistic." They should operate on actual files and a source directory,
-  mirroring how a real agent interacts with a workspace. Remember that the agent
-  may behave differently in a larger codebase, so we want to avoid scenarios
-  that are too simple to be realistic.
-  - _Good_: An eval that provides a small, functional React component and asks
-    the agent to add a specific feature, requiring it to read the file,
-    understand the context, and write the correct changes.
-  - _Bad_: An eval that simply asks the agent a trivia question or asks it to
-    write a generic script without providing any local workspace context.
-- **Maintainable Size**: Evals should be small enough to reason about and
-  maintain. We probably can't check in an entire repo as a test case, though
-  over time we will want these evals to mature into more and more realistic
-  scenarios.
-  - _Good_: A test setup with 2-3 files (e.g., a source file, a config file, and
-    a test file) that isolates the specific behavior being evaluated.
-  - _Bad_: A test setup containing dozens of files from a complex framework
-    where the setup logic itself is prone to breaking.
-- **Unambiguous and Reliable Assertions**: Assertions must be clear and specific
-  to ensure the test passes for the right reason.
-  - _Good_: Checking that a modified file contains a specific AST node or exact
-    string, or verifying that a tool was called with with the right parameters.
-  - _Bad_: Only checking for a tool call, which could happen for an unrelated
-    reason. Expecting specific LLM output.
-- **Fail First**: Have tests that failed before your prompt or tool change. We
-  want to be sure the test fails before your "fix". It's pretty easy to
-  accidentally create a passing test that asserts behaviors we get for free. In
-  general, every eval should be accompanied by prompt change, and most prompt
-  changes should be accompanied by an eval.
-  - _Good_: Observing a failure, writing an eval that reliably reproduces the
-    failure, modifying the prompt/tool, and then verifying the eval passes.
-  - _Bad_: Writing an eval that passes on the first run and assuming your new
-    prompt change was responsible.
-- **Less is More**: Prefer fewer, more realistic tests that assert the major
-  paths vs. more tests that are more unit-test like. These are evals, so the
-  value is in testing how the agent works in a semi-realistic scenario.
-
 ## Creating an Evaluation
 
 Evaluations are located in the `evals` directory. Each evaluation is a Vitest

evals/ask_user.eval.ts

@@ -1,92 +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('ask_user', () => {
-  evalTest('USUALLY_PASSES', {
-    name: 'Agent uses AskUser tool to present multiple choice options',
-    prompt: `Use the ask_user tool to ask me what my favorite color is. Provide 3 options: red, green, or blue.`,
-    assert: async (rig) => {
-      const wasToolCalled = await rig.waitForToolCall('ask_user');
-      expect(wasToolCalled, 'Expected ask_user tool to be called').toBe(true);
-    },
-  });
-
-  evalTest('USUALLY_PASSES', {
-    name: 'Agent uses AskUser tool to clarify ambiguous requirements',
-    files: {
-      'package.json': JSON.stringify({ name: 'my-app', version: '1.0.0' }),
-    },
-    prompt: `I want to build a new feature in this app. Ask me questions to clarify the requirements before proceeding.`,
-    assert: async (rig) => {
-      const wasToolCalled = await rig.waitForToolCall('ask_user');
-      expect(wasToolCalled, 'Expected ask_user tool to be called').toBe(true);
-    },
-  });
-
-  evalTest('USUALLY_PASSES', {
-    name: 'Agent uses AskUser tool before performing significant ambiguous rework',
-    files: {
-      'packages/core/src/index.ts': '// index\nexport const version = "1.0.0";',
-      'packages/core/src/util.ts': '// util\nexport function help() {}',
-      'packages/core/package.json': JSON.stringify({
-        name: '@google/gemini-cli-core',
-      }),
-      'README.md': '# Gemini CLI',
-    },
-    prompt: `Refactor the entire core package to be better.`,
-    assert: async (rig) => {
-      const wasPlanModeCalled = await rig.waitForToolCall('enter_plan_mode');
-      expect(wasPlanModeCalled, 'Expected enter_plan_mode to be called').toBe(
-        true,
-      );
-
-      const wasAskUserCalled = await rig.waitForToolCall('ask_user');
-      expect(
-        wasAskUserCalled,
-        'Expected ask_user tool to be called to clarify the significant rework',
-      ).toBe(true);
-    },
-  });
-
-  // --- Regression Tests for Recent Fixes ---
-
-  // Regression test for issue #20177: Ensure the agent does not use `ask_user` to
-  // confirm shell commands. Fixed via prompt refinements and tool definition
-  // updates to clarify that shell command confirmation is handled by the UI.
-  // See fix: https://github.com/google-gemini/gemini-cli/pull/20504
-  evalTest('USUALLY_PASSES', {
-    name: 'Agent does NOT use AskUser to confirm shell commands',
-    files: {
-      'package.json': JSON.stringify({
-        scripts: { build: 'echo building' },
-      }),
-    },
-    prompt: `Run 'npm run build' in the current directory.`,
-    assert: async (rig) => {
-      await rig.waitForTelemetryReady();
-
-      const toolLogs = rig.readToolLogs();
-      const wasShellCalled = toolLogs.some(
-        (log) => log.toolRequest.name === 'run_shell_command',
-      );
-      const wasAskUserCalled = toolLogs.some(
-        (log) => log.toolRequest.name === 'ask_user',
-      );
-
-      expect(
-        wasShellCalled,
-        'Expected run_shell_command tool to be called',
-      ).toBe(true);
-      expect(
-        wasAskUserCalled,
-        'ask_user should not be called to confirm shell commands',
-      ).toBe(false);
-    },
-  });
-});

integration-tests/hooks-agent-flow.test.ts

@@ -165,15 +165,14 @@ describe('Hooks Agent Flow', () => {
 
       // BeforeModel hook to track message counts across LLM calls
       const messageCountFile = join(rig.testDir!, 'message-counts.json');
-      const escapedPath = JSON.stringify(messageCountFile);
       const beforeModelScript = `
         const fs = require('fs');
         const input = JSON.parse(fs.readFileSync(0, 'utf-8'));
         const messageCount = input.llm_request?.contents?.length || 0;
         let counts = [];
-        try { counts = JSON.parse(fs.readFileSync(${escapedPath}, 'utf-8')); } catch (e) {}
+        try { counts = JSON.parse(fs.readFileSync(${JSON.stringify(messageCountFile)}, 'utf-8')); } catch (e) {}
         counts.push(messageCount);
-        fs.writeFileSync(${escapedPath}, JSON.stringify(counts));
+        fs.writeFileSync(${JSON.stringify(messageCountFile)}, JSON.stringify(counts));
         console.log(JSON.stringify({ decision: 'allow' }));
       `;
       const beforeModelScriptPath = rig.createScript(

integration-tests/json-output.test.ts

@@ -81,9 +81,7 @@ describe('JSON output', () => {
     const message = (thrown as Error).message;
 
     // Use a regex to find the first complete JSON object in the string
-    // We expect the JSON to start with a quote (e.g. {"error": ...}) to avoid
-    // matching random error objects printed to stderr (like ENOENT).
-    const jsonMatch = message.match(/{\s*"[\s\S]*}/);
+    const jsonMatch = message.match(/{[\s\S]*}/);
 
     // Fail if no JSON-like text was found
     expect(

integration-tests/plan-mode.test.ts

@@ -4,10 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { writeFileSync } from 'node:fs';
-import { join } from 'node:path';
 import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { TestRig, checkModelOutputContent, GEMINI_DIR } from './test-helper.js';
+import { TestRig, checkModelOutputContent } from './test-helper.js';
 
 describe('Plan Mode', () => {
   let rig: TestRig;
@@ -64,98 +62,50 @@ describe('Plan Mode', () => {
     });
   });
 
-  it('should allow write_file to the plans directory in plan mode', async () => {
-    const plansDir = '.gemini/tmp/foo/123/plans';
-    const testName =
-      'should allow write_file to the plans directory in plan mode';
-
-    await rig.setup(testName, {
-      settings: {
-        experimental: { plan: true },
-        tools: {
-          core: ['write_file', 'read_file', 'list_directory'],
-        },
-        general: {
-          defaultApprovalMode: 'plan',
-          plan: {
-            directory: plansDir,
+  it.skip('should allow write_file only in the plans directory in plan mode', async () => {
+    await rig.setup(
+      'should allow write_file only in the plans directory in plan mode',
+      {
+        settings: {
+          experimental: { plan: true },
+          tools: {
+            core: ['write_file', 'read_file', 'list_directory'],
+            allowed: ['write_file'],
           },
+          general: { defaultApprovalMode: 'plan' },
         },
       },
-    });
-
-    // Disable the interactive terminal setup prompt in tests
-    writeFileSync(
-      join(rig.homeDir!, GEMINI_DIR, 'state.json'),
-      JSON.stringify({ terminalSetupPromptShown: true }, null, 2),
     );
 
-    const run = await rig.runInteractive({
+    // We ask the agent to create a plan for a feature, which should trigger a write_file in the plans directory.
+    // Verify that write_file outside of plan directory fails
+    await rig.run({
       approvalMode: 'plan',
+      stdin:
+        'Create a file called plan.md in the plans directory. Then create a file called hello.txt in the current directory',
     });
 
-    await run.type('Create a file called plan.md in the plans directory.');
-    await run.type('\r');
-
-    await rig.expectToolCallSuccess(['write_file'], 30000, (args) =>
-      args.includes('plan.md'),
-    );
-
     const toolLogs = rig.readToolLogs();
-    const planWrite = toolLogs.find(
+    const writeLogs = toolLogs.filter(
+      (l) => l.toolRequest.name === 'write_file',
+    );
+
+    const planWrite = writeLogs.find(
       (l) =>
-        l.toolRequest.name === 'write_file' &&
         l.toolRequest.args.includes('plans') &&
         l.toolRequest.args.includes('plan.md'),
     );
-    expect(planWrite?.toolRequest.success).toBe(true);
-  });
 
-  it('should deny write_file to non-plans directory in plan mode', async () => {
-    const plansDir = '.gemini/tmp/foo/123/plans';
-    const testName =
-      'should deny write_file to non-plans directory in plan mode';
-
-    await rig.setup(testName, {
-      settings: {
-        experimental: { plan: true },
-        tools: {
-          core: ['write_file', 'read_file', 'list_directory'],
-        },
-        general: {
-          defaultApprovalMode: 'plan',
-          plan: {
-            directory: plansDir,
-          },
-        },
-      },
-    });
-
-    // Disable the interactive terminal setup prompt in tests
-    writeFileSync(
-      join(rig.homeDir!, GEMINI_DIR, 'state.json'),
-      JSON.stringify({ terminalSetupPromptShown: true }, null, 2),
+    const blockedWrite = writeLogs.find((l) =>
+      l.toolRequest.args.includes('hello.txt'),
     );
 
-    const run = await rig.runInteractive({
-      approvalMode: 'plan',
-    });
-
-    await run.type('Create a file called hello.txt in the current directory.');
-    await run.type('\r');
-
-    const toolLogs = rig.readToolLogs();
-    const writeLog = toolLogs.find(
-      (l) =>
-        l.toolRequest.name === 'write_file' &&
-        l.toolRequest.args.includes('hello.txt'),
-    );
-
-    // In Plan Mode, writes outside the plans directory should be blocked.
-    // Model is undeterministic, sometimes it doesn't even try, but if it does, it must fail.
-    if (writeLog) {
-      expect(writeLog.toolRequest.success).toBe(false);
+    // Model is undeterministic, sometimes a blocked write appears in tool logs and sometimes it doesn't
+    if (blockedWrite) {
+      expect(blockedWrite?.toolRequest.success).toBe(false);
     }
+
+    expect(planWrite?.toolRequest.success).toBe(true);
   });
 
   it('should be able to enter plan mode from default mode', async () => {
@@ -169,12 +119,6 @@ describe('Plan Mode', () => {
       },
     });
 
-    // Disable the interactive terminal setup prompt in tests
-    writeFileSync(
-      join(rig.homeDir!, GEMINI_DIR, 'state.json'),
-      JSON.stringify({ terminalSetupPromptShown: true }, null, 2),
-    );
-
     // Start in default mode and ask to enter plan mode.
     await rig.run({
       approvalMode: 'default',
@@ -182,7 +126,10 @@ describe('Plan Mode', () => {
         'I want to perform a complex refactoring. Please enter plan mode so we can design it first.',
     });
 
-    const enterPlanCallFound = await rig.waitForToolCall('enter_plan_mode');
+    const enterPlanCallFound = await rig.waitForToolCall(
+      'enter_plan_mode',
+      10000,
+    );
     expect(enterPlanCallFound, 'Expected enter_plan_mode to be called').toBe(
       true,
     );

integration-tests/run_shell_command.test.ts

@@ -18,7 +18,6 @@ const { shell } = getShellConfiguration();
 function getLineCountCommand(): { command: string; tool: string } {
   switch (shell) {
     case 'powershell':
-      return { command: `Measure-Object -Line`, tool: 'Measure-Object' };
     case 'cmd':
       return { command: `find /c /v`, tool: 'find' };
     case 'bash':
@@ -239,12 +238,8 @@ describe('run_shell_command', () => {
   });
 
   it('should succeed in yolo mode', async () => {
-    const isWindows = process.platform === 'win32';
     await rig.setup('should succeed in yolo mode', {
-      settings: {
-        tools: { core: ['run_shell_command'] },
-        shell: isWindows ? { enableInteractiveShell: false } : undefined,
-      },
+      settings: { tools: { core: ['run_shell_command'] } },
     });
 
     const testFile = rig.createFile('test.txt', 'Lorem\nIpsum\nDolor\n');

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@google/gemini-cli",
-  "version": "0.34.0-nightly.20260304.28af4e127",
+  "version": "0.30.0-nightly.20260210.a2174751d",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@google/gemini-cli",
-      "version": "0.34.0-nightly.20260304.28af4e127",
+      "version": "0.30.0-nightly.20260210.a2174751d",
       "workspaces": [
         "packages/*"
       ],
@@ -73,7 +73,6 @@
         "node": ">=20.0.0"
       },
       "optionalDependencies": {
-        "@ax-llm/ax": "^19.0.11",
         "@lydell/node-pty": "1.1.0",
         "@lydell/node-pty-darwin-arm64": "1.1.0",
         "@lydell/node-pty-darwin-x64": "1.1.0",
@@ -180,21 +179,6 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/@ax-llm/ax": {
-      "version": "19.0.11",
-      "resolved": "https://registry.npmjs.org/@ax-llm/ax/-/ax-19.0.11.tgz",
-      "integrity": "sha512-U3ZYzBrmMDTDst32jxgH873gC4c75aYjzdCZgwQWy+CwSDL2SskwQX2kZAWGDmmSzs8BxskleoASzQUXuqRLfQ==",
-      "hasInstallScript": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "dependencies": {
-        "@opentelemetry/api": "^1.9.0",
-        "dayjs": "^1.11.13"
-      },
-      "bin": {
-        "ax": "cli/index.mjs"
-      }
-    },
     "node_modules/@azu/format-text": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@azu/format-text/-/format-text-1.0.2.tgz",
@@ -2308,7 +2292,6 @@
       "integrity": "sha512-t54CUOsFMappY1Jbzb7fetWeO0n6K0k/4+/ZpkS+3Joz8I4VcvY9OiEBFRYISqaI2fq5sCiPtAjRDOzVYG8m+Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@octokit/auth-token": "^6.0.0",
         "@octokit/graphql": "^9.0.2",
@@ -2489,7 +2472,6 @@
       "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz",
       "integrity": "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==",
       "license": "Apache-2.0",
-      "peer": true,
       "engines": {
         "node": ">=8.0.0"
       }
@@ -2539,7 +2521,6 @@
       "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-2.5.0.tgz",
       "integrity": "sha512-ka4H8OM6+DlUhSAZpONu0cPBtPPTQKxbxVzC4CzVx5+K4JnroJVBtDzLAMx4/3CDTJXRvVFhpFjtl4SaiTNoyQ==",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@opentelemetry/semantic-conventions": "^1.29.0"
       },
@@ -2914,7 +2895,6 @@
       "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-2.5.0.tgz",
       "integrity": "sha512-F8W52ApePshpoSrfsSk1H2yJn9aKjCrbpQF1M9Qii0GHzbfVeFUB+rc3X4aggyZD8x9Gu3Slua+s6krmq6Dt8g==",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@opentelemetry/core": "2.5.0",
         "@opentelemetry/semantic-conventions": "^1.29.0"
@@ -2948,7 +2928,6 @@
       "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics/-/sdk-metrics-2.5.0.tgz",
       "integrity": "sha512-BeJLtU+f5Gf905cJX9vXFQorAr6TAfK3SPvTFqP+scfIpDQEJfRaGJWta7sJgP+m4dNtBf9y3yvBKVAZZtJQVA==",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@opentelemetry/core": "2.5.0",
         "@opentelemetry/resources": "2.5.0"
@@ -3003,7 +2982,6 @@
       "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-2.5.0.tgz",
       "integrity": "sha512-VzRf8LzotASEyNDUxTdaJ9IRJ1/h692WyArDBInf5puLCjxbICD6XkHgpuudis56EndyS7LYFmtTMny6UABNdQ==",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@opentelemetry/core": "2.5.0",
         "@opentelemetry/resources": "2.5.0",
@@ -4200,7 +4178,6 @@
       "integrity": "sha512-6mDvHUFSjyT2B2yeNx2nUgMxh9LtOWvkhIU3uePn2I2oyNymUAX1NIsdgviM4CH+JSrp2D2hsMvJOkxY+0wNRA==",
       "devOptional": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "csstype": "^3.0.2"
       }
@@ -4474,7 +4451,6 @@
       "integrity": "sha512-klQbnPAAiGYFyI02+znpBRLyjL4/BrBd0nyWkdC0s/6xFLkXYQ8OoRrSkqacS1ddVxf/LDyODIKbQ5TgKAf/Fg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.56.1",
         "@typescript-eslint/types": "8.56.1",
@@ -5322,7 +5298,6 @@
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -6323,36 +6298,16 @@
         "node": ">= 12"
       }
     },
-    "node_modules/clipboard-image": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/clipboard-image/-/clipboard-image-0.1.0.tgz",
-      "integrity": "sha512-SWk7FgaXLNFld19peQ/rTe0n97lwR1WbkqxV6JKCAOh7U52AKV/PeMFCyt/8IhBdqyDA8rdyewQMKZqvWT5Akg==",
-      "license": "MIT",
-      "dependencies": {
-        "run-jxa": "^3.0.0"
-      },
-      "bin": {
-        "clipboard-image": "cli.js"
-      },
-      "engines": {
-        "node": ">=20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/clipboardy": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-5.2.1.tgz",
-      "integrity": "sha512-RWp4E/ivQAzgF4QSWA9sjeW+Bjo+U2SvebkDhNIfO7y65eGdXPUxMTdIKYsn+bxM3ItPHGm3e68Bv3fgQ3mARw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-5.0.0.tgz",
+      "integrity": "sha512-MQfKHaD09eP80Pev4qBxZLbxJK/ONnqfSYAPlCmPh+7BDboYtO/3BmB6HGzxDIT0SlTRc2tzS8lQqfcdLtZ0Kg==",
       "license": "MIT",
       "dependencies": {
-        "clipboard-image": "^0.1.0",
-        "execa": "^9.6.1",
+        "execa": "^9.6.0",
         "is-wayland": "^0.1.0",
         "is-wsl": "^3.1.0",
-        "is64bit": "^2.0.0",
-        "powershell-utils": "^0.2.0"
+        "is64bit": "^2.0.0"
       },
       "engines": {
         "node": ">=20"
@@ -6608,9 +6563,6 @@
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.1.tgz",
       "integrity": "sha512-oIXISMynqSqm241k6kcQ5UwttDILMK4BiurCfGEREw6+X9jkkpEe5T9FZaApyLGGOnFuyMWZpdolTXMtvEJ08Q==",
       "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "5.2.1"
-      },
       "engines": {
         "node": ">=18"
       },
@@ -6777,33 +6729,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/crypto-random-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-4.0.0.tgz",
-      "integrity": "sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==",
-      "license": "MIT",
-      "dependencies": {
-        "type-fest": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/crypto-random-string/node_modules/type-fest": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",
-      "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==",
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/css-select": {
       "version": "5.2.2",
       "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.2.2.tgz",
@@ -6904,13 +6829,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/dayjs": {
-      "version": "1.11.19",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.19.tgz",
-      "integrity": "sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw==",
-      "license": "MIT",
-      "optional": true
-    },
     "node_modules/debug": {
       "version": "4.4.3",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
@@ -7933,7 +7851,6 @@
       "integrity": "sha512-VmQ+sifHUbI/IcSopBCF/HO3YiHQx/AVd3UVyYL6weuwW+HvON9VYn5l6Zl1WZzPWXPNZrSQpxwkkZ/VuvJZzg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -8502,9 +8419,9 @@
       }
     },
     "node_modules/execa": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-9.6.1.tgz",
-      "integrity": "sha512-9Be3ZoN4LmYR90tUoVu2te2BsbzHfhJyfEiAVfz7N5/zv+jduIfLrV2xdQXOHbaD6KgpGdO9PRPM1Y4Q9QkPkA==",
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-9.6.0.tgz",
+      "integrity": "sha512-jpWzZ1ZhwUmeWRhS7Qv3mhpOhLfwI+uAX4e5fOcXqwMR7EcJ0pj2kV1CVzHVMX/LphnKWD3LObjZCoJ71lKpHw==",
       "license": "MIT",
       "dependencies": {
         "@sindresorhus/merge-streams": "^4.0.0",
@@ -8566,7 +8483,6 @@
       "resolved": "https://registry.npmjs.org/express/-/express-5.2.1.tgz",
       "integrity": "sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "accepts": "^2.0.0",
         "body-parser": "^2.2.1",
@@ -8623,15 +8539,6 @@
         "express": ">= 4.11"
       }
     },
-    "node_modules/express/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "license": "MIT",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
     "node_modules/extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -8883,24 +8790,13 @@
         "statuses": "^2.0.1"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">= 18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
-    "node_modules/finalhandler/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "license": "MIT",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/finalhandler/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "license": "MIT"
-    },
     "node_modules/find-up": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
@@ -9881,7 +9777,6 @@
       "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.2.tgz",
       "integrity": "sha512-gJnaDHXKDayjt8ue0n8Gs0A007yKXj4Xzb8+cNjZeYsSzzwKc0Lr+OZgYwVfB0pHfUs17EPoLvrOsEaJ9mj+Tg==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=16.9.0"
       }
@@ -10161,7 +10056,6 @@
       "resolved": "https://registry.npmjs.org/@jrichman/ink/-/ink-6.4.11.tgz",
       "integrity": "sha512-93LQlzT7vvZ1XJcmOMwN4s+6W334QegendeHOMnEJBlhnpIzr8bws6/aOEHG8ZCuVD/vNeeea5m1msHIdAY6ig==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@alcalzone/ansi-tokenize": "^0.2.1",
         "ansi-escapes": "^7.0.0",
@@ -11777,21 +11671,6 @@
       "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
       "license": "ISC"
     },
-    "node_modules/macos-version": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/macos-version/-/macos-version-6.0.0.tgz",
-      "integrity": "sha512-O2S8voA+pMfCHhBn/TIYDXzJ1qNHpPDU32oFxglKnVdJABiYYITt45oLkV9yhwA3E2FDwn3tQqUFrTsr1p3sBQ==",
-      "license": "MIT",
-      "dependencies": {
-        "semver": "^7.3.5"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/magic-string": {
       "version": "0.30.21",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
@@ -11927,12 +11806,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "license": "MIT"
-    },
     "node_modules/merge2": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
@@ -13483,18 +13356,6 @@
         "node": "^10 || ^12 || >=14"
       }
     },
-    "node_modules/powershell-utils": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/powershell-utils/-/powershell-utils-0.2.0.tgz",
-      "integrity": "sha512-ZlsFlG7MtSFCoc5xreOvBAozCJ6Pf06opgJjh9ONEv418xpZSAzNjstD36C6+JwOnfSqOW/9uDkqKjezTdxZhw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -13844,7 +13705,6 @@
       "resolved": "https://registry.npmjs.org/react/-/react-19.2.4.tgz",
       "integrity": "sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -13855,7 +13715,6 @@
       "integrity": "sha512-ePrwPfxAnB+7hgnEr8vpKxL9cmnp7F322t8oqcPshbIQQhDKgFDW4tjhF2wjVbdXF9O/nyuy3sQWd9JGpiLPvA==",
       "devOptional": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "shell-quote": "^1.6.1",
         "ws": "^7"
@@ -14379,107 +14238,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/run-jxa": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/run-jxa/-/run-jxa-3.0.0.tgz",
-      "integrity": "sha512-4f2CrY7H+sXkKXJn/cE6qRA3z+NMVO7zvlZ/nUV0e62yWftpiLAfw5eV9ZdomzWd2TXWwEIiGjAT57+lWIzzvA==",
-      "license": "MIT",
-      "dependencies": {
-        "execa": "^5.1.1",
-        "macos-version": "^6.0.0",
-        "subsume": "^4.0.0",
-        "type-fest": "^2.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/run-jxa/node_modules/execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "license": "MIT",
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/run-jxa/node_modules/get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/run-jxa/node_modules/human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=10.17.0"
-      }
-    },
-    "node_modules/run-jxa/node_modules/npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "license": "MIT",
-      "dependencies": {
-        "path-key": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/run-jxa/node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "license": "ISC"
-    },
-    "node_modules/run-jxa/node_modules/strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/run-jxa/node_modules/type-fest": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
-      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=12.20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/run-parallel": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -15416,34 +15174,6 @@
       "integrity": "sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw==",
       "license": "MIT"
     },
-    "node_modules/subsume": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/subsume/-/subsume-4.0.0.tgz",
-      "integrity": "sha512-BWnYJElmHbYZ/zKevy+TG+SsyoFCmRPDHJbR1MzLxkPOv1Jp/4hGhVUtP98s+wZBsBsHwCXvPTP0x287/WMjGg==",
-      "license": "MIT",
-      "dependencies": {
-        "escape-string-regexp": "^5.0.0",
-        "unique-string": "^3.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/subsume/node_modules/escape-string-regexp": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
-      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/superagent": {
       "version": "10.2.3",
       "resolved": "https://registry.npmjs.org/superagent/-/superagent-10.2.3.tgz",
@@ -15944,7 +15674,6 @@
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -16168,8 +15897,7 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
       "dev": true,
-      "license": "0BSD",
-      "peer": true
+      "license": "0BSD"
     },
     "node_modules/tsx": {
       "version": "4.20.3",
@@ -16177,7 +15905,6 @@
       "integrity": "sha512-qjbnuR9Tr+FJOMBqJCW5ehvIo/buZq7vH7qD7JziU98h6l3qGy0a/yPFjwO+y0/T7GFpNgNAvEcPPVfyT8rrPQ==",
       "devOptional": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "esbuild": "~0.25.0",
         "get-tsconfig": "^4.7.5"
@@ -16337,7 +16064,6 @@
       "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
       "devOptional": true,
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -16430,21 +16156,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/unique-string": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-3.0.0.tgz",
-      "integrity": "sha512-VGXBUVwxKMBUznyffQweQABPRRW1vHZAbadFZud4pLFAqRGvv/96vafgjWFqzourzr8YonlQiPgH0YCJfawoGQ==",
-      "license": "MIT",
-      "dependencies": {
-        "crypto-random-string": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/universal-user-agent": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-7.0.3.tgz",
@@ -16561,7 +16272,6 @@
       "resolved": "https://registry.npmjs.org/vite/-/vite-7.2.2.tgz",
       "integrity": "sha512-BxAKBWmIbrDgrokdGZH1IgkIk/5mMHDreLDmCJ0qpyJaAteP8NvMhkwr/ZCQNqNH97bw/dANTE9PDzqwJghfMQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "esbuild": "^0.25.0",
         "fdir": "^6.5.0",
@@ -16675,7 +16385,6 @@
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -16688,7 +16397,6 @@
       "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.2.4.tgz",
       "integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/chai": "^5.2.2",
         "@vitest/expect": "3.2.4",
@@ -17333,7 +17041,6 @@
       "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
       "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
       "license": "MIT",
-      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
@@ -17349,7 +17056,7 @@
     },
     "packages/a2a-server": {
       "name": "@google/gemini-cli-a2a-server",
-      "version": "0.34.0-nightly.20260304.28af4e127",
+      "version": "0.30.0-nightly.20260210.a2174751d",
       "dependencies": {
         "@a2a-js/sdk": "^0.3.8",
         "@google-cloud/storage": "^7.16.0",
@@ -17407,7 +17114,7 @@
     },
     "packages/cli": {
       "name": "@google/gemini-cli",
-      "version": "0.34.0-nightly.20260304.28af4e127",
+      "version": "0.30.0-nightly.20260210.a2174751d",
       "license": "Apache-2.0",
       "dependencies": {
         "@agentclientprotocol/sdk": "^0.12.0",
@@ -17419,7 +17126,7 @@
         "ansi-regex": "^6.2.2",
         "chalk": "^4.1.2",
         "cli-spinners": "^2.9.2",
-        "clipboardy": "~5.2.0",
+        "clipboardy": "^5.0.0",
         "color-convert": "^2.0.1",
         "command-exists": "^1.2.9",
         "comment-json": "^4.2.5",
@@ -17490,7 +17197,7 @@
     },
     "packages/core": {
       "name": "@google/gemini-cli-core",
-      "version": "0.34.0-nightly.20260304.28af4e127",
+      "version": "0.30.0-nightly.20260210.a2174751d",
       "license": "Apache-2.0",
       "dependencies": {
         "@a2a-js/sdk": "^0.3.8",
@@ -17733,7 +17440,6 @@
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -17756,7 +17462,7 @@
     },
     "packages/devtools": {
       "name": "@google/gemini-cli-devtools",
-      "version": "0.34.0-nightly.20260304.28af4e127",
+      "version": "0.30.0-nightly.20260210.a2174751d",
       "license": "Apache-2.0",
       "dependencies": {
         "ws": "^8.16.0"
@@ -17771,7 +17477,7 @@
     },
     "packages/sdk": {
       "name": "@google/gemini-cli-sdk",
-      "version": "0.34.0-nightly.20260304.28af4e127",
+      "version": "0.29.0-nightly.20260203.71f46f116",
       "license": "Apache-2.0",
       "dependencies": {
         "@google/gemini-cli-core": "file:../core",
@@ -17788,7 +17494,7 @@
     },
     "packages/test-utils": {
       "name": "@google/gemini-cli-test-utils",
-      "version": "0.34.0-nightly.20260304.28af4e127",
+      "version": "0.30.0-nightly.20260210.a2174751d",
       "license": "Apache-2.0",
       "dependencies": {
         "@google/gemini-cli-core": "file:../core",
@@ -17805,7 +17511,7 @@
     },
     "packages/vscode-ide-companion": {
       "name": "gemini-cli-vscode-ide-companion",
-      "version": "0.34.0-nightly.20260304.28af4e127",
+      "version": "0.30.0-nightly.20260210.a2174751d",
       "license": "LICENSE",
       "dependencies": {
         "@modelcontextprotocol/sdk": "^1.23.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/gemini-cli",
-  "version": "0.34.0-nightly.20260304.28af4e127",
+  "version": "0.30.0-nightly.20260210.a2174751d",
   "engines": {
     "node": ">=20.0.0"
   },
@@ -14,7 +14,7 @@
     "url": "git+https://github.com/google-gemini/gemini-cli.git"
   },
   "config": {
-    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.34.0-nightly.20260304.28af4e127"
+    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.30.0-nightly.20260210.a2174751d"
   },
   "scripts": {
     "start": "cross-env NODE_ENV=development node scripts/start.js",
@@ -37,12 +37,10 @@
     "build:all": "npm run build && npm run build:sandbox && npm run build:vscode",
     "build:packages": "npm run build --workspaces",
     "build:sandbox": "node scripts/build_sandbox.js",
-    "build:binary": "node scripts/build_binary.js",
     "bundle": "npm run generate && npm run build --workspace=@google/gemini-cli-devtools && node esbuild.config.js && node scripts/copy_bundle_assets.js",
-    "test": "npm run test --workspaces --if-present && npm run test:sea-launch",
-    "test:ci": "npm run test:ci --workspaces --if-present && npm run test:scripts && npm run test:sea-launch",
+    "test": "npm run test --workspaces --if-present",
+    "test:ci": "npm run test:ci --workspaces --if-present && npm run test:scripts",
     "test:scripts": "vitest run --config ./scripts/tests/vitest.config.ts",
-    "test:sea-launch": "vitest run sea/sea-launch.test.js",
     "test:always_passing_evals": "vitest run --config evals/vitest.config.ts",
     "test:all_evals": "cross-env RUN_EVALS=1 vitest run --config evals/vitest.config.ts",
     "test:e2e": "cross-env VERBOSE=true KEEP_OUTPUT=true npm run test:integration:sandbox:none",
@@ -61,11 +59,6 @@
     "prepare:package": "node scripts/prepare-package.js",
     "release:version": "node scripts/version.js",
     "telemetry": "node scripts/telemetry.js",
-    "data:validate": "tsx scripts/validate-data.ts",
-    "data:format": "prettier --write 'data/*.json' 'scripts/validate-data.ts' 'scripts/optimization/**/*.ts'",
-    "data:lint": "eslint 'scripts/validate-data.ts' 'scripts/optimization/**/*.ts'",
-    "optimize": "tsx scripts/optimization/optimize.ts",
-    "optimize:extract": "tsx scripts/optimization/extract.ts",
     "check:lockfile": "node scripts/check-lockfile.js",
     "clean": "node scripts/clean.js",
     "pre-commit": "node scripts/pre-commit.js"
@@ -147,7 +140,6 @@
     "simple-git": "^3.28.0"
   },
   "optionalDependencies": {
-    "@ax-llm/ax": "^19.0.11",
     "@lydell/node-pty": "1.1.0",
     "@lydell/node-pty-darwin-arm64": "1.1.0",
     "@lydell/node-pty-darwin-x64": "1.1.0",

packages/a2a-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/gemini-cli-a2a-server",
-  "version": "0.34.0-nightly.20260304.28af4e127",
+  "version": "0.30.0-nightly.20260210.a2174751d",
   "description": "Gemini CLI A2A Server",
   "repository": {
     "type": "git",

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

@@ -27,8 +27,7 @@ import {
   type ToolCallConfirmationDetails,
   type Config,
   type UserTierId,
-  type ToolLiveOutput,
-  isSubagentProgress,
+  type AnsiOutput,
   EDIT_TOOL_NAMES,
   processRestorableToolCalls,
 } from '@google/gemini-cli-core';
@@ -337,13 +336,11 @@ export class Task {
 
   private _schedulerOutputUpdate(
     toolCallId: string,
-    outputChunk: ToolLiveOutput,
+    outputChunk: string | AnsiOutput,
   ): void {
     let outputAsText: string;
     if (typeof outputChunk === 'string') {
       outputAsText = outputChunk;
-    } else if (isSubagentProgress(outputChunk)) {
-      outputAsText = JSON.stringify(outputChunk);
     } else {
       outputAsText = outputChunk
         .map((line) => line.map((token) => token.text).join(''))

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

@@ -28,7 +28,6 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
       const mockConfig = {
         ...params,
         initialize: vi.fn(),
-        waitForMcpInit: vi.fn(),
         refreshAuth: vi.fn(),
         getExperiments: vi.fn().mockReturnValue({
           flags: {
@@ -95,7 +94,6 @@ describe('loadConfig', () => {
           const mockConfig = {
             ...(params as object),
             initialize: vi.fn(),
-            waitForMcpInit: vi.fn(),
             refreshAuth: vi.fn(),
             getExperiments: vi.fn().mockReturnValue({
               flags: {

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

@@ -166,8 +166,6 @@ export async function loadConfig(
 
   // Needed to initialize ToolRegistry, and git checkpointing if enabled
   await config.initialize();
-
-  await config.waitForMcpInit();
   startupProfiler.flush(config);
 
   await refreshAuthentication(config, adcFilePath, 'Config');

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

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import express, { type Request } from 'express';
+import express from 'express';
 
 import type { AgentCard, Message } from '@a2a-js/sdk';
 import {
@@ -13,9 +13,8 @@ import {
   InMemoryTaskStore,
   DefaultExecutionEventBus,
   type AgentExecutionEvent,
-  UnauthenticatedUser,
 } from '@a2a-js/sdk/server';
-import { A2AExpressApp, type UserBuilder } from '@a2a-js/sdk/server/express'; // Import server components
+import { A2AExpressApp } from '@a2a-js/sdk/server/express'; // Import server components
 import { v4 as uuidv4 } from 'uuid';
 import { logger } from '../utils/logger.js';
 import type { AgentSettings } from '../types.js';
@@ -56,17 +55,8 @@ const coderAgentCard: AgentCard = {
     pushNotifications: false,
     stateTransitionHistory: true,
   },
-  securitySchemes: {
-    bearerAuth: {
-      type: 'http',
-      scheme: 'bearer',
-    },
-    basicAuth: {
-      type: 'http',
-      scheme: 'basic',
-    },
-  },
-  security: [{ bearerAuth: [] }, { basicAuth: [] }],
+  securitySchemes: undefined,
+  security: undefined,
   defaultInputModes: ['text'],
   defaultOutputModes: ['text'],
   skills: [
@@ -91,35 +81,6 @@ export function updateCoderAgentCardUrl(port: number) {
   coderAgentCard.url = `http://localhost:${port}/`;
 }
 
-const customUserBuilder: UserBuilder = async (req: Request) => {
-  const auth = req.headers['authorization'];
-  if (auth) {
-    const scheme = auth.split(' ')[0];
-    logger.info(
-      `[customUserBuilder] Received Authorization header with scheme: ${scheme}`,
-    );
-  }
-  if (!auth) return new UnauthenticatedUser();
-
-  // 1. Bearer Auth
-  if (auth.startsWith('Bearer ')) {
-    const token = auth.substring(7);
-    if (token === 'valid-token') {
-      return { userName: 'bearer-user', isAuthenticated: true };
-    }
-  }
-
-  // 2. Basic Auth
-  if (auth.startsWith('Basic ')) {
-    const credentials = Buffer.from(auth.substring(6), 'base64').toString();
-    if (credentials === 'admin:password') {
-      return { userName: 'basic-user', isAuthenticated: true };
-    }
-  }
-
-  return new UnauthenticatedUser();
-};
-
 async function handleExecuteCommand(
   req: express.Request,
   res: express.Response,
@@ -243,7 +204,7 @@ export async function createApp() {
       requestStorage.run({ req }, next);
     });
 
-    const appBuilder = new A2AExpressApp(requestHandler, customUserBuilder);
+    const appBuilder = new A2AExpressApp(requestHandler);
     expressApp = appBuilder.setupRoutes(expressApp, '');
     expressApp.use(express.json());
 

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/gemini-cli",
-  "version": "0.34.0-nightly.20260304.28af4e127",
+  "version": "0.30.0-nightly.20260210.a2174751d",
   "description": "Gemini CLI",
   "license": "Apache-2.0",
   "repository": {
@@ -26,7 +26,7 @@
     "dist"
   ],
   "config": {
-    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.34.0-nightly.20260304.28af4e127"
+    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.30.0-nightly.20260210.a2174751d"
   },
   "dependencies": {
     "@agentclientprotocol/sdk": "^0.12.0",
@@ -38,7 +38,7 @@
     "ansi-regex": "^6.2.2",
     "chalk": "^4.1.2",
     "cli-spinners": "^2.9.2",
-    "clipboardy": "~5.2.0",
+    "clipboardy": "^5.0.0",
     "color-convert": "^2.0.1",
     "command-exists": "^1.2.9",
     "comment-json": "^4.2.5",

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

@@ -19,8 +19,6 @@ import {
   debugLogger,
   ApprovalMode,
   type MCPServerConfig,
-  type GeminiCLIExtension,
-  Storage,
 } from '@google/gemini-cli-core';
 import { loadCliConfig, parseArguments, type CliArgs } from './config.js';
 import {
@@ -3526,101 +3524,4 @@ describe('loadCliConfig mcpEnabled', () => {
     expect(config.getAllowedMcpServers()).toEqual(['serverA']);
     expect(config.getBlockedMcpServers()).toEqual(['serverB']);
   });
-
-  describe('extension plan settings', () => {
-    beforeEach(() => {
-      vi.spyOn(Storage.prototype, 'getProjectTempDir').mockReturnValue(
-        '/mock/home/user/.gemini/tmp/test-project',
-      );
-    });
-
-    it('should use plan directory from active extension when user has not specified one', async () => {
-      process.argv = ['node', 'script.js'];
-      const settings = createTestMergedSettings({
-        experimental: { plan: true },
-      });
-      const argv = await parseArguments(settings);
-
-      vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([
-        {
-          name: 'ext-plan',
-          isActive: true,
-          plan: { directory: 'ext-plans-dir' },
-        } as unknown as GeminiCLIExtension,
-      ]);
-
-      const config = await loadCliConfig(settings, 'test-session', argv);
-      expect(config.storage.getPlansDir()).toContain('ext-plans-dir');
-    });
-
-    it('should NOT use plan directory from active extension when user has specified one', async () => {
-      process.argv = ['node', 'script.js'];
-      const settings = createTestMergedSettings({
-        experimental: { plan: true },
-        general: {
-          plan: { directory: 'user-plans-dir' },
-        },
-      });
-      const argv = await parseArguments(settings);
-
-      vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([
-        {
-          name: 'ext-plan',
-          isActive: true,
-          plan: { directory: 'ext-plans-dir' },
-        } as unknown as GeminiCLIExtension,
-      ]);
-
-      const config = await loadCliConfig(settings, 'test-session', argv);
-      expect(config.storage.getPlansDir()).toContain('user-plans-dir');
-      expect(config.storage.getPlansDir()).not.toContain('ext-plans-dir');
-    });
-
-    it('should NOT use plan directory from inactive extension', async () => {
-      process.argv = ['node', 'script.js'];
-      const settings = createTestMergedSettings({
-        experimental: { plan: true },
-      });
-      const argv = await parseArguments(settings);
-
-      vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([
-        {
-          name: 'ext-plan',
-          isActive: false,
-          plan: { directory: 'ext-plans-dir-inactive' },
-        } as unknown as GeminiCLIExtension,
-      ]);
-
-      const config = await loadCliConfig(settings, 'test-session', argv);
-      expect(config.storage.getPlansDir()).not.toContain(
-        'ext-plans-dir-inactive',
-      );
-    });
-
-    it('should use default path if neither user nor extension settings provide a plan directory', async () => {
-      process.argv = ['node', 'script.js'];
-      const settings = createTestMergedSettings({
-        experimental: { plan: true },
-      });
-      const argv = await parseArguments(settings);
-
-      // No extensions providing plan directory
-      vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([]);
-
-      const config = await loadCliConfig(settings, 'test-session', argv);
-      // Should return the default managed temp directory path
-      expect(config.storage.getPlansDir()).toBe(
-        path.join(
-          '/mock',
-          'home',
-          'user',
-          '.gemini',
-          'tmp',
-          'test-project',
-          'test-session',
-          'plans',
-        ),
-      );
-    });
-  });
 });

packages/cli/src/config/config.ts

@@ -511,10 +511,6 @@ export async function loadCliConfig(
   });
   await extensionManager.loadExtensions();
 
-  const extensionPlanSettings = extensionManager
-    .getExtensions()
-    .find((ext) => ext.isActive && ext.plan?.directory)?.plan;
-
   const experimentalJitContext = settings.experimental?.jitContext ?? false;
 
   let memoryContent: string | HierarchicalMemory = '';
@@ -830,11 +826,8 @@ export async function loadCliConfig(
     enableExtensionReloading: settings.experimental?.extensionReloading,
     enableAgents: settings.experimental?.enableAgents,
     plan: settings.experimental?.plan,
-    tracker: settings.experimental?.taskTracker,
     directWebFetch: settings.experimental?.directWebFetch,
-    planSettings: settings.general?.plan?.directory
-      ? settings.general.plan
-      : (extensionPlanSettings ?? settings.general?.plan),
+    planSettings: settings.general?.plan,
     enableEventDrivenScheduler: true,
     skillsSupport: settings.skills?.enabled ?? true,
     disabledSkills: settings.skills?.disabled,

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

@@ -886,7 +886,6 @@ Would you like to attempt to install via "git clone" instead?`,
         themes: config.themes,
         rules,
         checkers,
-        plan: config.plan,
       };
     } catch (e) {
       debugLogger.error(

packages/cli/src/config/extension.ts

@@ -33,15 +33,6 @@ export interface ExtensionConfig {
    * These themes will be registered when the extension is activated.
    */
   themes?: CustomTheme[];
-  /**
-   * Planning features configuration contributed by this extension.
-   */
-  plan?: {
-    /**
-     * The directory where planning artifacts are stored.
-     */
-    directory?: string;
-  };
 }
 
 export interface ExtensionUpdateInfo {

packages/cli/src/config/extensions/__snapshots__/consent-consent-maybeRequestConsentOrFail-consent-string-generation-should-request-consent-if-skills-change.snap.svg

@@ -10,15 +10,11 @@
     <text x="0" y="53" fill="#ffffff" textLength="900" lengthAdjust="spacingAndGlyphs">  * server2 (remote): https://remote.com                                                            </text>
     <text x="0" y="70" fill="#ffffff" textLength="900" lengthAdjust="spacingAndGlyphs">This extension will append info to your gemini.md context using my-context.md                       </text>
     <text x="0" y="87" fill="#ffffff" textLength="900" lengthAdjust="spacingAndGlyphs">This extension will exclude the following core tools: tool1,tool2                                   </text>
-    <text x="0" y="121" fill="#ffffff" textLength="117" lengthAdjust="spacingAndGlyphs" font-weight="bold">Agent Skills:</text>
+    <text x="0" y="121" fill="#ffffff" textLength="900" lengthAdjust="spacingAndGlyphs">Agent Skills:                                                                                       </text>
     <text x="0" y="155" fill="#ffffff" textLength="900" lengthAdjust="spacingAndGlyphs">This extension will install the following agent skills:                                             </text>
-    <text x="0" y="189" fill="#ffffff" textLength="36" lengthAdjust="spacingAndGlyphs">  * </text>
-    <text x="36" y="189" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs" font-weight="bold">skill1</text>
-    <text x="90" y="189" fill="#ffffff" textLength="810" lengthAdjust="spacingAndGlyphs">: desc1                                                                                   </text>
+    <text x="0" y="189" fill="#ffffff" textLength="900" lengthAdjust="spacingAndGlyphs">  * skill1: desc1                                                                                   </text>
     <text x="0" y="206" fill="#ffffff" textLength="900" lengthAdjust="spacingAndGlyphs">    (Source: /mock/temp/dir/skill1/SKILL.md) (2 items in directory)                                 </text>
-    <text x="0" y="240" fill="#ffffff" textLength="36" lengthAdjust="spacingAndGlyphs">  * </text>
-    <text x="36" y="240" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs" font-weight="bold">skill2</text>
-    <text x="90" y="240" fill="#ffffff" textLength="810" lengthAdjust="spacingAndGlyphs">: desc2                                                                                   </text>
+    <text x="0" y="240" fill="#ffffff" textLength="900" lengthAdjust="spacingAndGlyphs">  * skill2: desc2                                                                                   </text>
     <text x="0" y="257" fill="#ffffff" textLength="900" lengthAdjust="spacingAndGlyphs">    (Source: /mock/temp/dir/skill2/SKILL.md) (1 items in directory)                                 </text>
     <text x="0" y="308" fill="#cdcd00" textLength="891" lengthAdjust="spacingAndGlyphs">The extension you are about to install may have been created by a third-party developer and sourced</text>
     <text x="0" y="325" fill="#cdcd00" textLength="882" lengthAdjust="spacingAndGlyphs">from a public repository. Google does not vet, endorse, or guarantee the functionality or security</text>

packages/cli/src/config/extensions/__snapshots__/consent-consent-maybeRequestConsentOrFail-consent-string-generation-should-show-a-warning-if-the-skill-directory-cannot-be-read.snap.svg

@@ -5,11 +5,9 @@
   <rect width="920" height="343" fill="#000000" />
   <g transform="translate(10, 10)">
     <text x="0" y="2" fill="#ffffff" textLength="900" lengthAdjust="spacingAndGlyphs">Installing extension &quot;test-ext&quot;.                                                                    </text>
-    <text x="0" y="36" fill="#ffffff" textLength="117" lengthAdjust="spacingAndGlyphs" font-weight="bold">Agent Skills:</text>
+    <text x="0" y="36" fill="#ffffff" textLength="900" lengthAdjust="spacingAndGlyphs">Agent Skills:                                                                                       </text>
     <text x="0" y="70" fill="#ffffff" textLength="900" lengthAdjust="spacingAndGlyphs">This extension will install the following agent skills:                                             </text>
-    <text x="0" y="104" fill="#ffffff" textLength="36" lengthAdjust="spacingAndGlyphs">  * </text>
-    <text x="36" y="104" fill="#ffffff" textLength="108" lengthAdjust="spacingAndGlyphs" font-weight="bold">locked-skill</text>
-    <text x="144" y="104" fill="#ffffff" textLength="756" lengthAdjust="spacingAndGlyphs">: A skill in a locked dir                                                           </text>
+    <text x="0" y="104" fill="#ffffff" textLength="900" lengthAdjust="spacingAndGlyphs">  * locked-skill: A skill in a locked dir                                                           </text>
     <text x="0" y="121" fill="#ffffff" textLength="405" lengthAdjust="spacingAndGlyphs">    (Source: /mock/temp/dir/locked/SKILL.md) </text>
     <text x="405" y="121" fill="#cd0000" textLength="342" lengthAdjust="spacingAndGlyphs">⚠️ (Could not count items in directory)</text>
     <text x="0" y="172" fill="#cdcd00" textLength="891" lengthAdjust="spacingAndGlyphs">The extension you are about to install may have been created by a third-party developer and sourced</text>

packages/cli/src/config/extensions/__snapshots__/consent-consent-skillsConsentString-should-generate-a-consent-string-for-skills.snap.svg

@@ -6,9 +6,7 @@
   <g transform="translate(10, 10)">
     <text x="0" y="2" fill="#ffffff" textLength="900" lengthAdjust="spacingAndGlyphs">Installing agent skill(s) from &quot;https://example.com/repo.git&quot;.                                      </text>
     <text x="0" y="36" fill="#ffffff" textLength="900" lengthAdjust="spacingAndGlyphs">The following agent skill(s) will be installing:                                                    </text>
-    <text x="0" y="70" fill="#ffffff" textLength="36" lengthAdjust="spacingAndGlyphs">  * </text>
-    <text x="36" y="70" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs" font-weight="bold">skill1</text>
-    <text x="90" y="70" fill="#ffffff" textLength="810" lengthAdjust="spacingAndGlyphs">: desc1                                                                                   </text>
+    <text x="0" y="70" fill="#ffffff" textLength="900" lengthAdjust="spacingAndGlyphs">  * skill1: desc1                                                                                   </text>
     <text x="0" y="87" fill="#ffffff" textLength="900" lengthAdjust="spacingAndGlyphs">    (Source: /mock/temp/dir/skill1/SKILL.md) (1 items in directory)                                 </text>
     <text x="0" y="121" fill="#ffffff" textLength="900" lengthAdjust="spacingAndGlyphs">Install Destination: /mock/target/dir                                                               </text>
     <text x="0" y="155" fill="#cdcd00" textLength="882" lengthAdjust="spacingAndGlyphs">Agent skills inject specialized instructions and domain-specific knowledge into the agent&apos;s system</text>

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

@@ -97,7 +97,7 @@ describe('loadSandboxConfig', () => {
     it('should throw if GEMINI_SANDBOX is an invalid command', async () => {
       process.env['GEMINI_SANDBOX'] = 'invalid-command';
       await expect(loadSandboxConfig({}, {})).rejects.toThrow(
-        "Invalid sandbox command 'invalid-command'. Must be one of docker, podman, sandbox-exec, lxc",
+        "Invalid sandbox command 'invalid-command'. Must be one of docker, podman, sandbox-exec",
       );
     });
 
@@ -108,22 +108,6 @@ describe('loadSandboxConfig', () => {
         "Missing sandbox command 'docker' (from GEMINI_SANDBOX)",
       );
     });
-
-    it('should use lxc if GEMINI_SANDBOX=lxc and it exists', async () => {
-      process.env['GEMINI_SANDBOX'] = 'lxc';
-      mockedCommandExistsSync.mockReturnValue(true);
-      const config = await loadSandboxConfig({}, {});
-      expect(config).toEqual({ command: 'lxc', image: 'default/image' });
-      expect(mockedCommandExistsSync).toHaveBeenCalledWith('lxc');
-    });
-
-    it('should throw if GEMINI_SANDBOX=lxc but lxc command does not exist', async () => {
-      process.env['GEMINI_SANDBOX'] = 'lxc';
-      mockedCommandExistsSync.mockReturnValue(false);
-      await expect(loadSandboxConfig({}, {})).rejects.toThrow(
-        "Missing sandbox command 'lxc' (from GEMINI_SANDBOX)",
-      );
-    });
   });
 
   describe('with sandbox: true', () => {

packages/cli/src/config/sandboxConfig.ts

@@ -27,7 +27,6 @@ const VALID_SANDBOX_COMMANDS: ReadonlyArray<SandboxConfig['command']> = [
   'docker',
   'podman',
   'sandbox-exec',
-  'lxc',
 ];
 
 function isSandboxCommand(value: string): value is SandboxConfig['command'] {
@@ -92,9 +91,6 @@ function getSandboxCommand(
   }
 
   return '';
-  // Note: 'lxc' is intentionally not auto-detected because it requires a
-  // pre-existing, running container managed by the user. Use
-  // GEMINI_SANDBOX=lxc or sandbox: "lxc" in settings to enable it.
 }
 
 export async function loadSandboxConfig(
@@ -106,9 +102,9 @@ export async function loadSandboxConfig(
 
   const packageJson = await getPackageJson(__dirname);
   const image =
-    process.env['GEMINI_SANDBOX_IMAGE'] ??
-    process.env['GEMINI_SANDBOX_IMAGE_DEFAULT'] ??
-    packageJson?.config?.sandboxImageUri;
+    process.env['GEMINI_SANDBOX_IMAGE'] ?? packageJson?.config?.sandboxImageUri;
 
-  return command && image ? { command, image } : undefined;
+  const flags = settings.tools?.sandboxFlags;
+
+  return command && image ? { command, image, flags } : undefined;
 }

packages/cli/src/config/settings.ts

@@ -185,6 +185,9 @@ export interface SessionRetentionSettings {
 
   /** Minimum retention period (safety limit, defaults to "1d") */
   minRetention?: string;
+
+  /** INTERNAL: Whether the user has acknowledged the session retention warning */
+  warningAcknowledged?: boolean;
 }
 
 export interface SettingsError {

packages/cli/src/config/settingsSchema.ts

@@ -117,10 +117,6 @@ export interface SettingDefinition {
    * For map-like objects without explicit `properties`, describes the shape of the values.
    */
   additionalProperties?: SettingCollectionDefinition;
-  /**
-   * Optional unit to display after the value (e.g. '%').
-   */
-  unit?: string;
   /**
    * Optional reference identifier for generators that emit a `$ref`.
    */
@@ -343,7 +339,7 @@ const SETTINGS_SCHEMA = {
             label: 'Enable Session Cleanup',
             category: 'General',
             requiresRestart: false,
-            default: true as boolean,
+            default: false,
             description: 'Enable automatic session cleanup',
             showInDialog: true,
           },
@@ -352,7 +348,7 @@ const SETTINGS_SCHEMA = {
             label: 'Keep chat history',
             category: 'General',
             requiresRestart: false,
-            default: '30d' as string,
+            default: undefined as string | undefined,
             description:
               'Automatically delete chats older than this time period (e.g., "30d", "7d", "24h", "1w")',
             showInDialog: true,
@@ -376,6 +372,16 @@ const SETTINGS_SCHEMA = {
             description: `Minimum retention period (safety limit, defaults to "${DEFAULT_MIN_RETENTION}")`,
             showInDialog: false,
           },
+          warningAcknowledged: {
+            type: 'boolean',
+            label: 'Warning Acknowledged',
+            category: 'General',
+            requiresRestart: false,
+            default: false,
+            showInDialog: false,
+            description:
+              'INTERNAL: Whether the user has acknowledged the session retention warning',
+          },
         },
         description: 'Settings for automatic session cleanup.',
       },
@@ -599,7 +605,7 @@ const SETTINGS_SCHEMA = {
             category: 'UI',
             requiresRestart: false,
             default: true,
-            description: 'Hides the context window usage percentage.',
+            description: 'Hides the context window remaining percentage.',
             showInDialog: true,
           },
         },
@@ -917,14 +923,13 @@ const SETTINGS_SCHEMA = {
       },
       compressionThreshold: {
         type: 'number',
-        label: 'Context Compression Threshold',
+        label: 'Compression Threshold',
         category: 'Model',
         requiresRestart: true,
         default: 0.5 as number,
         description:
           'The fraction of context usage at which to trigger context compression (e.g. 0.2, 0.3).',
         showInDialog: true,
-        unit: '%',
       },
       disableLoopDetection: {
         type: 'boolean',
@@ -1236,11 +1241,22 @@ const SETTINGS_SCHEMA = {
         ref: 'BooleanOrString',
         description: oneLine`
           Sandbox execution environment.
-          Set to a boolean to enable or disable the sandbox, provide a string path to a sandbox profile,
-          or specify an explicit sandbox command (e.g., "docker", "podman", "lxc").
+          Set to a boolean to enable or disable the sandbox, or provide a string path to a sandbox profile.
         `,
         showInDialog: false,
       },
+      sandboxFlags: {
+        type: 'string',
+        label: 'Sandbox Flags',
+        category: 'Tools',
+        requiresRestart: true,
+        default: '',
+        description: oneLine`
+          Additional flags to pass to the sandbox container engine (Docker or Podman).
+          Environment variables can be used and will be expanded.
+        `,
+        showInDialog: true,
+      },
       shell: {
         type: 'object',
         label: 'Shell',
@@ -1807,15 +1823,6 @@ const SETTINGS_SCHEMA = {
         description: 'Enable planning features (Plan Mode and tools).',
         showInDialog: true,
       },
-      taskTracker: {
-        type: 'boolean',
-        label: 'Task Tracker',
-        category: 'Experimental',
-        requiresRestart: true,
-        default: false,
-        description: 'Enable task tracker tools.',
-        showInDialog: false,
-      },
       modelSteering: {
         type: 'boolean',
         label: 'Model Steering',

packages/cli/src/gemini.tsx

@@ -243,7 +243,7 @@ export async function startInteractiveUI(
               <ScrollProvider>
                 <OverflowProvider>
                   <SessionStatsProvider>
-                    <VimModeProvider>
+                    <VimModeProvider settings={settings}>
                       <AppContainer
                         config={config}
                         startupWarnings={startupWarnings}

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

@@ -528,13 +528,12 @@ export const mockSettings = new LoadedSettings(
 // A minimal mock UIState to satisfy the context provider.
 // Tests that need specific UIState values should provide their own.
 const baseMockUiState = {
-  history: [],
   renderMarkdown: true,
   streamingState: StreamingState.Idle,
   terminalWidth: 100,
   terminalHeight: 40,
   currentModel: 'gemini-pro',
-  terminalBackgroundColor: 'black' as const,
+  terminalBackgroundColor: 'black',
   cleanUiDetailsVisible: false,
   allowPlanMode: true,
   activePtyId: undefined,
@@ -553,9 +552,6 @@ const baseMockUiState = {
     warningText: '',
   },
   bannerVisible: false,
-  nightly: false,
-  updateInfo: null,
-  pendingHistoryItems: [],
 };
 
 export const mockAppState: AppState = {
@@ -756,7 +752,7 @@ export const renderWithProviders = (
       <ConfigContext.Provider value={finalConfig}>
         <SettingsContext.Provider value={finalSettings}>
           <UIStateContext.Provider value={finalUiState}>
-            <VimModeProvider>
+            <VimModeProvider settings={finalSettings}>
               <ShellFocusContext.Provider value={shellFocus}>
                 <SessionStatsProvider>
                   <StreamingContext.Provider

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

@@ -89,7 +89,6 @@ export const generateSvgForTerminal = (terminal: Terminal): string => {
       break;
     }
   }
-
   if (contentRows === 0) contentRows = 1; // Minimum 1 row
 
   const width = terminal.cols * charWidth + padding * 2;
@@ -114,9 +113,6 @@ export const generateSvgForTerminal = (terminal: Terminal): string => {
 
     let currentFgHex: string | null = null;
     let currentBgHex: string | null = null;
-    let currentIsBold = false;
-    let currentIsItalic = false;
-    let currentIsUnderline = false;
     let currentBlockStartCol = -1;
     let currentBlockText = '';
     let currentBlockNumCells = 0;
@@ -132,20 +128,12 @@ export const generateSvgForTerminal = (terminal: Terminal): string => {
             svg += `    <rect x="${xPos}" y="${yPos}" width="${rectWidth}" height="${charHeight}" fill="${currentBgHex}" />
 `;
           }
-          if (currentBlockText.trim().length > 0 || currentIsUnderline) {
+          if (currentBlockText.trim().length > 0) {
             const fill = currentFgHex || '#ffffff'; // Default text color
             const textWidth = currentBlockNumCells * charWidth;
-
-            let extraAttrs = '';
-            if (currentIsBold) extraAttrs += ' font-weight="bold"';
-            if (currentIsItalic) extraAttrs += ' font-style="italic"';
-            if (currentIsUnderline)
-              extraAttrs += ' text-decoration="underline"';
-
             // Use textLength to ensure the block fits exactly into its designated cells
-            const textElement = `<text x="${xPos}" y="${yPos + 2}" fill="${fill}" textLength="${textWidth}" lengthAdjust="spacingAndGlyphs"${extraAttrs}>${escapeXml(currentBlockText)}</text>`;
-
-            svg += `    ${textElement}\n`;
+            svg += `    <text x="${xPos}" y="${yPos + 2}" fill="${fill}" textLength="${textWidth}" lengthAdjust="spacingAndGlyphs">${escapeXml(currentBlockText)}</text>
+`;
           }
         }
       }
@@ -176,27 +164,17 @@ export const generateSvgForTerminal = (terminal: Terminal): string => {
         bgHex = tempFgHex || '#ffffff';
       }
 
-      const isBold = !!cell.isBold();
-      const isItalic = !!cell.isItalic();
-      const isUnderline = !!cell.isUnderline();
-
       let chars = cell.getChars();
       if (chars === '') chars = ' '.repeat(cellWidth);
 
       if (
         fgHex !== currentFgHex ||
         bgHex !== currentBgHex ||
-        isBold !== currentIsBold ||
-        isItalic !== currentIsItalic ||
-        isUnderline !== currentIsUnderline ||
         currentBlockStartCol === -1
       ) {
         finalizeBlock(x);
         currentFgHex = fgHex;
         currentBgHex = bgHex;
-        currentIsBold = isBold;
-        currentIsItalic = isItalic;
-        currentIsUnderline = isUnderline;
         currentBlockStartCol = x;
         currentBlockText = chars;
         currentBlockNumCells = cellWidth;
@@ -207,7 +185,6 @@ export const generateSvgForTerminal = (terminal: Terminal): string => {
     }
     finalizeBlock(line.length);
   }
-
   svg += `  </g>\n</svg>`;
   return svg;
 };

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

@@ -2544,6 +2544,136 @@ describe('AppContainer State Management', () => {
     });
   });
 
+  describe('Expansion Persistence', () => {
+    let rerender: () => void;
+    let unmount: () => void;
+    let stdin: ReturnType<typeof render>['stdin'];
+
+    const setupExpansionPersistenceTest = async (
+      HighPriorityChild?: React.FC,
+    ) => {
+      const getTree = () => (
+        <SettingsContext.Provider value={mockSettings}>
+          <KeypressProvider config={mockConfig}>
+            <OverflowProvider>
+              <AppContainer
+                config={mockConfig}
+                version="1.0.0"
+                initializationResult={mockInitResult}
+              />
+              {HighPriorityChild && <HighPriorityChild />}
+            </OverflowProvider>
+          </KeypressProvider>
+        </SettingsContext.Provider>
+      );
+
+      const renderResult = render(getTree());
+      stdin = renderResult.stdin;
+      await act(async () => {
+        vi.advanceTimersByTime(100);
+      });
+      rerender = () => renderResult.rerender(getTree());
+      unmount = () => renderResult.unmount();
+    };
+
+    const writeStdin = async (sequence: string) => {
+      await act(async () => {
+        stdin.write(sequence);
+        // Advance timers to allow escape sequence parsing and broadcasting
+        vi.advanceTimersByTime(100);
+      });
+      rerender();
+    };
+
+    beforeEach(() => {
+      vi.useFakeTimers();
+    });
+
+    afterEach(() => {
+      vi.useRealTimers();
+      vi.restoreAllMocks();
+    });
+
+    it('should reset expansion when a key is NOT handled by anyone', async () => {
+      await setupExpansionPersistenceTest();
+
+      // Expand first
+      act(() => capturedUIActions.setConstrainHeight(false));
+      rerender();
+      expect(capturedUIState.constrainHeight).toBe(false);
+
+      // Press a random key that no one handles (hits Low priority fallback)
+      await writeStdin('x');
+
+      // Should be reset to true (collapsed)
+      expect(capturedUIState.constrainHeight).toBe(true);
+
+      unmount();
+    });
+
+    it('should toggle expansion when Ctrl+O is pressed', async () => {
+      await setupExpansionPersistenceTest();
+
+      // Initial state is collapsed
+      expect(capturedUIState.constrainHeight).toBe(true);
+
+      // Press Ctrl+O to expand (Ctrl+O is sequence \x0f)
+      await writeStdin('\x0f');
+      expect(capturedUIState.constrainHeight).toBe(false);
+
+      // Press Ctrl+O again to collapse
+      await writeStdin('\x0f');
+      expect(capturedUIState.constrainHeight).toBe(true);
+
+      unmount();
+    });
+
+    it('should NOT collapse when a high-priority component handles the key (e.g., up/down arrows)', async () => {
+      const NavigationHandler = () => {
+        // use real useKeypress
+        useKeypress(
+          (key: Key) => {
+            if (key.name === 'up' || key.name === 'down') {
+              return true; // Handle navigation
+            }
+            return false;
+          },
+          { isActive: true, priority: true }, // High priority
+        );
+        return null;
+      };
+
+      await setupExpansionPersistenceTest(NavigationHandler);
+
+      // Expand first
+      act(() => capturedUIActions.setConstrainHeight(false));
+      rerender();
+      expect(capturedUIState.constrainHeight).toBe(false);
+
+      // 1. Simulate Up arrow (handled by high priority child)
+      // CSI A is Up arrow
+      await writeStdin('\u001b[A');
+
+      // Should STILL be expanded
+      expect(capturedUIState.constrainHeight).toBe(false);
+
+      // 2. Simulate Down arrow (handled by high priority child)
+      // CSI B is Down arrow
+      await writeStdin('\u001b[B');
+
+      // Should STILL be expanded
+      expect(capturedUIState.constrainHeight).toBe(false);
+
+      // 3. Sanity check: press an unhandled key
+      await writeStdin('x');
+
+      // Should finally collapse
+      expect(capturedUIState.constrainHeight).toBe(true);
+
+      unmount();
+    });
+  });
+
   describe('Shortcuts Help Visibility', () => {
     let handleGlobalKeypress: (key: Key) => boolean;
     let mockedUseKeypress: Mock;

packages/cli/src/ui/AppContainer.tsx

@@ -129,7 +129,7 @@ import { appEvents, AppEvent, TransientMessageType } from '../utils/events.js';
 import { type UpdateObject } from './utils/updateCheck.js';
 import { setUpdateHandler } from '../utils/handleAutoUpdate.js';
 import { registerCleanup, runExitCleanup } from '../utils/cleanup.js';
-import { relaunchApp } from '../utils/processUtils.js';
+import { RELAUNCH_EXIT_CODE } from '../utils/processUtils.js';
 import type { SessionInfo } from '../utils/sessionUtils.js';
 import { useMessageQueue } from './hooks/useMessageQueue.js';
 import { useMcpStatus } from './hooks/useMcpStatus.js';
@@ -146,6 +146,7 @@ import { requestConsentInteractive } from '../config/extensions/consent.js';
 import { useSessionBrowser } from './hooks/useSessionBrowser.js';
 import { useSessionResume } from './hooks/useSessionResume.js';
 import { useIncludeDirsTrust } from './hooks/useIncludeDirsTrust.js';
+import { useSessionRetentionCheck } from './hooks/useSessionRetentionCheck.js';
 import { isWorkspaceTrusted } from '../config/trustedFolders.js';
 import { useSettings } from './contexts/SettingsContext.js';
 import { terminalCapabilityManager } from './utils/terminalCapabilityManager.js';
@@ -781,12 +782,13 @@ export const AppContainer = (props: AppContainerProps) => {
           authType === AuthType.LOGIN_WITH_GOOGLE &&
           config.isBrowserLaunchSuppressed()
         ) {
+          await runExitCleanup();
           writeToStdout(`
 ----------------------------------------------------------------
 Logging in with Google... Restarting Gemini CLI to continue.
 ----------------------------------------------------------------
           `);
-          await relaunchApp();
+          process.exit(RELAUNCH_EXIT_CODE);
         }
       }
       setAuthState(AuthState.Authenticated);
@@ -1546,6 +1548,28 @@ Logging in with Google... Restarting Gemini CLI to continue.
 
   useIncludeDirsTrust(config, isTrustedFolder, historyManager, setCustomDialog);
 
+  const handleAutoEnableRetention = useCallback(() => {
+    const userSettings = settings.forScope(SettingScope.User).settings;
+    const currentRetention = userSettings.general?.sessionRetention ?? {};
+
+    settings.setValue(SettingScope.User, 'general.sessionRetention', {
+      ...currentRetention,
+      enabled: true,
+      maxAge: '30d',
+      warningAcknowledged: true,
+    });
+  }, [settings]);
+
+  const {
+    shouldShowWarning: shouldShowRetentionWarning,
+    checkComplete: retentionCheckComplete,
+    sessionsToDeleteCount,
+  } = useSessionRetentionCheck(
+    config,
+    settings.merged,
+    handleAutoEnableRetention,
+  );
+
   const tabFocusTimeoutRef = useRef<NodeJS.Timeout | null>(null);
 
   useEffect(() => {
@@ -1872,7 +1896,10 @@ Logging in with Google... Restarting Gemini CLI to continue.
     ],
   );
 
-  useKeypress(handleGlobalKeypress, { isActive: true, priority: true });
+  useKeypress(handleGlobalKeypress, {
+    isActive: true,
+    priority: KeypressPriority.Low,
+  });
 
   useKeypress(
     () => {
@@ -1988,7 +2015,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
   const nightly = props.version.includes('nightly');
 
   const dialogsVisible =
-    shouldShowIdePrompt ||
+    (shouldShowRetentionWarning && retentionCheckComplete) ||
     shouldShowIdePrompt ||
     isFolderTrustDialogOpen ||
     isPolicyUpdateDialogOpen ||
@@ -2175,7 +2202,9 @@ Logging in with Google... Restarting Gemini CLI to continue.
       history: historyManager.history,
       historyManager,
       isThemeDialogOpen,
-
+      shouldShowRetentionWarning:
+        shouldShowRetentionWarning && retentionCheckComplete,
+      sessionsToDeleteCount: sessionsToDeleteCount ?? 0,
       themeError,
       isAuthenticating,
       isConfigInitialized,
@@ -2305,7 +2334,9 @@ Logging in with Google... Restarting Gemini CLI to continue.
     }),
     [
       isThemeDialogOpen,
-
+      shouldShowRetentionWarning,
+      retentionCheckComplete,
+      sessionsToDeleteCount,
       themeError,
       isAuthenticating,
       isConfigInitialized,
@@ -2496,7 +2527,8 @@ Logging in with Google... Restarting Gemini CLI to continue.
             });
           }
         }
-        await relaunchApp();
+        await runExitCleanup();
+        process.exit(RELAUNCH_EXIT_CODE);
       },
       handleNewAgentsSelect: async (choice: NewAgentsChoice) => {
         if (newAgents && choice === NewAgentsChoice.ACKNOWLEDGE) {

packages/cli/src/ui/__snapshots__/App.test.tsx.snap

@@ -2,20 +2,20 @@
 
 exports[`App > Snapshots > renders default layout correctly 1`] = `
 "
-  ▝▜▄     Gemini CLI v1.2.3
-    ▝▜▄
-   ▗▟▀ 
-  ▝▀    
-
+ ███         █████████ 
+░░░███      ███░░░░░███
+  ░░░███   ███     ░░░ 
+    ░░░███░███         
+     ███░ ░███    █████
+   ███░   ░░███  ░░███ 
+ ███░      ░░█████████ 
+░░░         ░░░░░░░░░  
 
 Tips for getting started:
-1. Create GEMINI.md files to customize your interactions
-2. /help for more information
-3. Ask coding questions, edit code or run commands
-4. Be specific for the best results
-
-
-
+1. Ask questions, edit files, or run commands.
+2. Be specific for the best results.
+3. Create GEMINI.md files to customize your interactions with Gemini.
+4. /help for more information.
 
 
 
@@ -47,31 +47,34 @@ exports[`App > Snapshots > renders screen reader layout correctly 1`] = `
 "Notifications
 Footer
 
-  ▝▜▄     Gemini CLI v1.2.3
-    ▝▜▄
-   ▗▟▀ 
-  ▝▀    
-
+ ███         █████████ 
+░░░███      ███░░░░░███
+  ░░░███   ███     ░░░ 
+    ░░░███░███         
+     ███░ ░███    █████
+   ███░   ░░███  ░░███ 
+ ███░      ░░█████████ 
+░░░         ░░░░░░░░░  
 
 Tips for getting started:
-1. Create GEMINI.md files to customize your interactions
-2. /help for more information
-3. Ask coding questions, edit code or run commands
-4. Be specific for the best results
+1. Ask questions, edit files, or run commands.
+2. Be specific for the best results.
+3. Create GEMINI.md files to customize your interactions with Gemini.
+4. /help for more information.
 Composer
 "
 `;
 
 exports[`App > Snapshots > renders with dialogs visible 1`] = `
 "
-  ▝▜▄     Gemini CLI v1.2.3
-    ▝▜▄
-   ▗▟▀ 
-  ▝▀    
-
-
-
-
+ ███         █████████ 
+░░░███      ███░░░░░███
+  ░░░███   ███     ░░░ 
+    ░░░███░███         
+     ███░ ░███    █████
+   ███░   ░░███  ░░███ 
+ ███░      ░░█████████ 
+░░░         ░░░░░░░░░  
 
 
 
@@ -107,17 +110,20 @@ DialogManager
 
 exports[`App > should render ToolConfirmationQueue along with Composer when tool is confirming and experiment is on 1`] = `
 "
-  ▝▜▄     Gemini CLI v1.2.3
-    ▝▜▄
-   ▗▟▀ 
-  ▝▀    
-
+ ███         █████████ 
+░░░███      ███░░░░░███
+  ░░░███   ███     ░░░ 
+    ░░░███░███         
+     ███░ ░███    █████
+   ███░   ░░███  ░░███ 
+ ███░      ░░█████████ 
+░░░         ░░░░░░░░░  
 
 Tips for getting started:
-1. Create GEMINI.md files to customize your interactions
-2. /help for more information
-3. Ask coding questions, edit code or run commands
-4. Be specific for the best results
+1. Ask questions, edit files, or run commands.
+2. Be specific for the best results.
+3. Create GEMINI.md files to customize your interactions with Gemini.
+4. /help for more information.
 HistoryItemDisplay
 ╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
 │ Action Required                                                                                  │
@@ -140,9 +146,6 @@ HistoryItemDisplay
 
 
 
-
-
-
 Notifications
 Composer
 "

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

@@ -98,7 +98,7 @@ export function ApiAuthDialog({
   return (
     <Box
       borderStyle="round"
-      borderColor={theme.ui.focus}
+      borderColor={theme.border.focused}
       flexDirection="column"
       padding={1}
       width="100%"

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

@@ -21,8 +21,9 @@ import {
 } from '@google/gemini-cli-core';
 import { useKeypress } from '../hooks/useKeypress.js';
 import { AuthState } from '../types.js';
+import { runExitCleanup } from '../../utils/cleanup.js';
 import { validateAuthMethodWithSettings } from './useAuth.js';
-import { relaunchApp } from '../../utils/processUtils.js';
+import { RELAUNCH_EXIT_CODE } from '../../utils/processUtils.js';
 
 interface AuthDialogProps {
   config: Config;
@@ -132,7 +133,10 @@ export function AuthDialog({
           config.isBrowserLaunchSuppressed()
         ) {
           setExiting(true);
-          setTimeout(relaunchApp, 100);
+          setTimeout(async () => {
+            await runExitCleanup();
+            process.exit(RELAUNCH_EXIT_CODE);
+          }, 100);
           return;
         }
 
@@ -189,7 +193,7 @@ export function AuthDialog({
     return (
       <Box
         borderStyle="round"
-        borderColor={theme.ui.focus}
+        borderColor={theme.border.focused}
         flexDirection="row"
         padding={1}
         width="100%"
@@ -205,7 +209,7 @@ export function AuthDialog({
   return (
     <Box
       borderStyle="round"
-      borderColor={theme.ui.focus}
+      borderColor={theme.border.focused}
       flexDirection="row"
       padding={1}
       width="100%"

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

@@ -9,10 +9,7 @@ import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
 import { LoginWithGoogleRestartDialog } from './LoginWithGoogleRestartDialog.js';
 import { useKeypress } from '../hooks/useKeypress.js';
 import { runExitCleanup } from '../../utils/cleanup.js';
-import {
-  RELAUNCH_EXIT_CODE,
-  _resetRelaunchStateForTesting,
-} from '../../utils/processUtils.js';
+import { RELAUNCH_EXIT_CODE } from '../../utils/processUtils.js';
 import { type Config } from '@google/gemini-cli-core';
 
 // Mocks
@@ -41,7 +38,6 @@ describe('LoginWithGoogleRestartDialog', () => {
     vi.clearAllMocks();
     exitSpy.mockClear();
     vi.useRealTimers();
-    _resetRelaunchStateForTesting();
   });
 
   it('renders correctly', async () => {

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

@@ -8,7 +8,8 @@ import { type Config } from '@google/gemini-cli-core';
 import { Box, Text } from 'ink';
 import { theme } from '../semantic-colors.js';
 import { useKeypress } from '../hooks/useKeypress.js';
-import { relaunchApp } from '../../utils/processUtils.js';
+import { runExitCleanup } from '../../utils/cleanup.js';
+import { RELAUNCH_EXIT_CODE } from '../../utils/processUtils.js';
 
 interface LoginWithGoogleRestartDialogProps {
   onDismiss: () => void;
@@ -35,7 +36,8 @@ export const LoginWithGoogleRestartDialog = ({
               });
             }
           }
-          await relaunchApp();
+          await runExitCleanup();
+          process.exit(RELAUNCH_EXIT_CODE);
         }, 100);
         return true;
       }

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

@@ -21,10 +21,6 @@ import {
   ConfigExtensionDialog,
   type ConfigExtensionDialogProps,
 } from '../components/ConfigExtensionDialog.js';
-import {
-  ExtensionRegistryView,
-  type ExtensionRegistryViewProps,
-} from '../components/views/ExtensionRegistryView.js';
 import { type CommandContext, type SlashCommand } from './types.js';
 
 import {
@@ -43,8 +39,6 @@ import {
 } from '../../config/extension-manager.js';
 import { SettingScope } from '../../config/settings.js';
 import { stat } from 'node:fs/promises';
-import { type RegistryExtension } from '../../config/extensionRegistryClient.js';
-import { waitFor } from '../../test-utils/async.js';
 
 vi.mock('../../config/extension-manager.js', async (importOriginal) => {
   const actual =
@@ -173,7 +167,6 @@ describe('extensionsCommand', () => {
       },
       ui: {
         dispatchExtensionStateUpdate: mockDispatchExtensionState,
-        removeComponent: vi.fn(),
       },
     });
   });
@@ -436,61 +429,6 @@ describe('extensionsCommand', () => {
       throw new Error('Explore action not found');
     }
 
-    it('should return ExtensionRegistryView custom dialog when experimental.extensionRegistry is true', async () => {
-      mockContext.services.settings.merged.experimental.extensionRegistry = true;
-
-      const result = await exploreAction(mockContext, '');
-
-      expect(result).toBeDefined();
-      if (result?.type !== 'custom_dialog') {
-        throw new Error('Expected custom_dialog');
-      }
-
-      const component =
-        result.component as ReactElement<ExtensionRegistryViewProps>;
-      expect(component.type).toBe(ExtensionRegistryView);
-      expect(component.props.extensionManager).toBe(mockExtensionLoader);
-    });
-
-    it('should handle onSelect and onClose in ExtensionRegistryView', async () => {
-      mockContext.services.settings.merged.experimental.extensionRegistry = true;
-
-      const result = await exploreAction(mockContext, '');
-      if (result?.type !== 'custom_dialog') {
-        throw new Error('Expected custom_dialog');
-      }
-
-      const component =
-        result.component as ReactElement<ExtensionRegistryViewProps>;
-
-      const extension = {
-        extensionName: 'test-ext',
-        url: 'https://github.com/test/ext.git',
-      } as RegistryExtension;
-
-      vi.mocked(inferInstallMetadata).mockResolvedValue({
-        source: extension.url,
-        type: 'git',
-      });
-      mockInstallExtension.mockResolvedValue({ name: extension.url });
-
-      // Call onSelect
-      component.props.onSelect?.(extension);
-
-      await waitFor(() => {
-        expect(inferInstallMetadata).toHaveBeenCalledWith(extension.url);
-        expect(mockInstallExtension).toHaveBeenCalledWith({
-          source: extension.url,
-          type: 'git',
-        });
-      });
-      expect(mockContext.ui.removeComponent).toHaveBeenCalledTimes(1);
-
-      // Call onClose
-      component.props.onClose?.();
-      expect(mockContext.ui.removeComponent).toHaveBeenCalledTimes(2);
-    });
-
     it("should add an info message and call 'open' in a non-sandbox environment", async () => {
       // Ensure no special environment variables that would affect behavior
       vi.stubEnv('NODE_ENV', '');

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

@@ -280,9 +280,7 @@ async function exploreAction(
         type: 'custom_dialog' as const,
         component: React.createElement(ExtensionRegistryView, {
           onSelect: (extension) => {
-            debugLogger.log(`Selected extension: ${extension.extensionName}`);
-            void installAction(context, extension.url);
-            context.ui.removeComponent();
+            debugLogger.debug(`Selected extension: ${extension.extensionName}`);
           },
           onClose: () => context.ui.removeComponent(),
           extensionManager,

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

@@ -7,6 +7,7 @@
 import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
 import { hooksCommand } from './hooksCommand.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
+import { MessageType } from '../types.js';
 import type { HookRegistryEntry } from '@google/gemini-cli-core';
 import { HookType, HookEventName, ConfigSource } from '@google/gemini-cli-core';
 import type { CommandContext } from './types.js';
@@ -126,10 +127,13 @@ describe('hooksCommand', () => {
         createMockHook('test-hook', HookEventName.BeforeTool, true),
       ]);
 
-      const result = await hooksCommand.action(mockContext, '');
+      await hooksCommand.action(mockContext, '');
 
-      expect(result).toHaveProperty('type', 'custom_dialog');
-      expect(result).toHaveProperty('component');
+      expect(mockContext.ui.addItem).toHaveBeenCalledWith(
+        expect.objectContaining({
+          type: MessageType.HOOKS_LIST,
+        }),
+      );
     });
   });
 
@@ -157,7 +161,7 @@ describe('hooksCommand', () => {
       });
     });
 
-    it('should return custom_dialog even when hook system is not enabled', async () => {
+    it('should display panel even when hook system is not enabled', async () => {
       mockConfig.getHookSystem.mockReturnValue(null);
 
       const panelCmd = hooksCommand.subCommands!.find(
@@ -167,13 +171,17 @@ describe('hooksCommand', () => {
         throw new Error('panel command must have an action');
       }
 
-      const result = await panelCmd.action(mockContext, '');
+      await panelCmd.action(mockContext, '');
 
-      expect(result).toHaveProperty('type', 'custom_dialog');
-      expect(result).toHaveProperty('component');
+      expect(mockContext.ui.addItem).toHaveBeenCalledWith(
+        expect.objectContaining({
+          type: MessageType.HOOKS_LIST,
+          hooks: [],
+        }),
+      );
     });
 
-    it('should return custom_dialog when no hooks are configured', async () => {
+    it('should display panel when no hooks are configured', async () => {
       mockHookSystem.getAllHooks.mockReturnValue([]);
       (mockContext.services.settings.merged as Record<string, unknown>)[
         'hooksConfig'
@@ -186,13 +194,17 @@ describe('hooksCommand', () => {
         throw new Error('panel command must have an action');
       }
 
-      const result = await panelCmd.action(mockContext, '');
+      await panelCmd.action(mockContext, '');
 
-      expect(result).toHaveProperty('type', 'custom_dialog');
-      expect(result).toHaveProperty('component');
+      expect(mockContext.ui.addItem).toHaveBeenCalledWith(
+        expect.objectContaining({
+          type: MessageType.HOOKS_LIST,
+          hooks: [],
+        }),
+      );
     });
 
-    it('should return custom_dialog when hooks are configured', async () => {
+    it('should display hooks list when hooks are configured', async () => {
       const mockHooks: HookRegistryEntry[] = [
         createMockHook('echo-test', HookEventName.BeforeTool, true),
         createMockHook('notify', HookEventName.AfterAgent, false),
@@ -210,10 +222,14 @@ describe('hooksCommand', () => {
         throw new Error('panel command must have an action');
       }
 
-      const result = await panelCmd.action(mockContext, '');
+      await panelCmd.action(mockContext, '');
 
-      expect(result).toHaveProperty('type', 'custom_dialog');
-      expect(result).toHaveProperty('component');
+      expect(mockContext.ui.addItem).toHaveBeenCalledWith(
+        expect.objectContaining({
+          type: MessageType.HOOKS_LIST,
+          hooks: mockHooks,
+        }),
+      );
     });
   });
 

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

@@ -4,13 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { createElement } from 'react';
-import type {
-  SlashCommand,
-  CommandContext,
-  OpenCustomDialogActionReturn,
-} from './types.js';
+import type { SlashCommand, CommandContext } from './types.js';
 import { CommandKind } from './types.js';
+import { MessageType, type HistoryItemHooksList } from '../types.js';
 import type {
   HookRegistryEntry,
   MessageActionReturn,
@@ -19,14 +15,13 @@ import { getErrorMessage } from '@google/gemini-cli-core';
 import { SettingScope, isLoadableSettingScope } from '../../config/settings.js';
 import { enableHook, disableHook } from '../../utils/hookSettings.js';
 import { renderHookActionFeedback } from '../../utils/hookUtils.js';
-import { HooksDialog } from '../components/HooksDialog.js';
 
 /**
- * Display a formatted list of hooks with their status in a dialog
+ * Display a formatted list of hooks with their status
  */
-function panelAction(
+async function panelAction(
   context: CommandContext,
-): MessageActionReturn | OpenCustomDialogActionReturn {
+): Promise<void | MessageActionReturn> {
   const { config } = context.services;
   if (!config) {
     return {
@@ -39,13 +34,12 @@ function panelAction(
   const hookSystem = config.getHookSystem();
   const allHooks = hookSystem?.getAllHooks() || [];
 
-  return {
-    type: 'custom_dialog',
-    component: createElement(HooksDialog, {
-      hooks: allHooks,
-      onClose: () => context.ui.removeComponent(),
-    }),
+  const hooksListItem: HistoryItemHooksList = {
+    type: MessageType.HOOKS_LIST,
+    hooks: allHooks,
   };
+
+  context.ui.addItem(hooksListItem);
 }
 
 /**
@@ -349,7 +343,6 @@ const panelCommand: SlashCommand = {
   altNames: ['list', 'show'],
   description: 'Display all registered hooks with their status',
   kind: CommandKind.BUILT_IN,
-  autoExecute: true,
   action: panelAction,
 };
 
@@ -400,5 +393,5 @@ export const hooksCommand: SlashCommand = {
     enableAllCommand,
     disableAllCommand,
   ],
-  action: (context: CommandContext) => panelCommand.action!(context, ''),
+  action: async (context: CommandContext) => panelCommand.action!(context, ''),
 };

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

@@ -14,9 +14,7 @@ import {
   coreEvents,
   processSingleFileContent,
   type ProcessedFileReadResult,
-  readFileWithEncoding,
 } from '@google/gemini-cli-core';
-import { copyToClipboard } from '../utils/commandUtils.js';
 
 vi.mock('@google/gemini-cli-core', async (importOriginal) => {
   const actual =
@@ -27,7 +25,6 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
       emitFeedback: vi.fn(),
     },
     processSingleFileContent: vi.fn(),
-    readFileWithEncoding: vi.fn(),
     partToString: vi.fn((val) => val),
   };
 });
@@ -38,14 +35,9 @@ vi.mock('node:path', async (importOriginal) => {
     ...actual,
     default: { ...actual },
     join: vi.fn((...args) => args.join('/')),
-    basename: vi.fn((p) => p.split('/').pop()),
   };
 });
 
-vi.mock('../utils/commandUtils.js', () => ({
-  copyToClipboard: vi.fn(),
-}));
-
 describe('planCommand', () => {
   let mockContext: CommandContext;
 
@@ -123,46 +115,4 @@ describe('planCommand', () => {
       text: '# Approved Plan Content',
     });
   });
-
-  describe('copy subcommand', () => {
-    it('should copy the approved plan to clipboard', async () => {
-      const mockPlanPath = '/mock/plans/dir/approved-plan.md';
-      vi.mocked(
-        mockContext.services.config!.getApprovedPlanPath,
-      ).mockReturnValue(mockPlanPath);
-      vi.mocked(readFileWithEncoding).mockResolvedValue('# Plan Content');
-
-      const copySubCommand = planCommand.subCommands?.find(
-        (sc) => sc.name === 'copy',
-      );
-      if (!copySubCommand?.action) throw new Error('Copy action missing');
-
-      await copySubCommand.action(mockContext, '');
-
-      expect(readFileWithEncoding).toHaveBeenCalledWith(mockPlanPath);
-      expect(copyToClipboard).toHaveBeenCalledWith('# Plan Content');
-      expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-        'info',
-        'Plan copied to clipboard (approved-plan.md).',
-      );
-    });
-
-    it('should warn if no approved plan is found', async () => {
-      vi.mocked(
-        mockContext.services.config!.getApprovedPlanPath,
-      ).mockReturnValue(undefined);
-
-      const copySubCommand = planCommand.subCommands?.find(
-        (sc) => sc.name === 'copy',
-      );
-      if (!copySubCommand?.action) throw new Error('Copy action missing');
-
-      await copySubCommand.action(mockContext, '');
-
-      expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-        'warning',
-        'No approved plan found to copy.',
-      );
-    });
-  });
 });

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

@@ -4,54 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  type CommandContext,
-  CommandKind,
-  type SlashCommand,
-} from './types.js';
+import { CommandKind, type SlashCommand } from './types.js';
 import {
   ApprovalMode,
   coreEvents,
   debugLogger,
   processSingleFileContent,
   partToString,
-  readFileWithEncoding,
 } from '@google/gemini-cli-core';
 import { MessageType } from '../types.js';
 import * as path from 'node:path';
-import { copyToClipboard } from '../utils/commandUtils.js';
-
-async function copyAction(context: CommandContext) {
-  const config = context.services.config;
-  if (!config) {
-    debugLogger.debug('Plan copy command: config is not available in context');
-    return;
-  }
-
-  const planPath = config.getApprovedPlanPath();
-
-  if (!planPath) {
-    coreEvents.emitFeedback('warning', 'No approved plan found to copy.');
-    return;
-  }
-
-  try {
-    const content = await readFileWithEncoding(planPath);
-    await copyToClipboard(content);
-    coreEvents.emitFeedback(
-      'info',
-      `Plan copied to clipboard (${path.basename(planPath)}).`,
-    );
-  } catch (error) {
-    coreEvents.emitFeedback('error', `Failed to copy plan: ${error}`, error);
-  }
-}
 
 export const planCommand: SlashCommand = {
   name: 'plan',
   description: 'Switch to Plan Mode and view current plan',
   kind: CommandKind.BUILT_IN,
-  autoExecute: false,
+  autoExecute: true,
   action: async (context) => {
     const config = context.services.config;
     if (!config) {
@@ -94,13 +62,4 @@ export const planCommand: SlashCommand = {
       );
     }
   },
-  subCommands: [
-    {
-      name: 'copy',
-      description: 'Copy the currently approved plan to your clipboard',
-      kind: CommandKind.BUILT_IN,
-      autoExecute: true,
-      action: copyAction,
-    },
-  ],
 };

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

@@ -19,7 +19,6 @@ import {
   BaseSettingsDialog,
   type SettingsDialogItem,
 } from './shared/BaseSettingsDialog.js';
-import { getNestedValue, isRecord } from '../../utils/settingsUtils.js';
 
 /**
  * Configuration field definition for agent settings
@@ -112,12 +111,32 @@ interface AgentConfigDialogProps {
   onSave?: () => void;
 }
 
+/**
+ * Get a nested value from an object using a path array
+ */
+function getNestedValue(
+  obj: Record<string, unknown> | undefined,
+  path: string[],
+): unknown {
+  if (!obj) return undefined;
+  let current: unknown = obj;
+  for (const key of path) {
+    if (current === null || current === undefined) return undefined;
+    if (typeof current !== 'object') return undefined;
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+    current = (current as Record<string, unknown>)[key];
+  }
+  return current;
+}
+
 /**
  * Set a nested value in an object using a path array, creating intermediate objects as needed
  */
-function setNestedValue(obj: unknown, path: string[], value: unknown): unknown {
-  if (!isRecord(obj)) return obj;
-
+function setNestedValue(
+  obj: Record<string, unknown>,
+  path: string[],
+  value: unknown,
+): Record<string, unknown> {
   const result = { ...obj };
   let current = result;
 
@@ -125,17 +144,12 @@ function setNestedValue(obj: unknown, path: string[], value: unknown): unknown {
     const key = path[i];
     if (current[key] === undefined || current[key] === null) {
       current[key] = {};
-    } else if (isRecord(current[key])) {
-      current[key] = { ...current[key] };
-    }
-
-    const next = current[key];
-    if (isRecord(next)) {
-      current = next;
     } else {
-      // Cannot traverse further through non-objects
-      return result;
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+      current[key] = { ...(current[key] as Record<string, unknown>) };
     }
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+    current = current[key] as Record<string, unknown>;
   }
 
   const finalKey = path[path.length - 1];
@@ -253,7 +267,11 @@ export function AgentConfigDialog({
   const items: SettingsDialogItem[] = useMemo(
     () =>
       AGENT_CONFIG_FIELDS.map((field) => {
-        const currentValue = getNestedValue(pendingOverride, field.path);
+        const currentValue = getNestedValue(
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+          pendingOverride as Record<string, unknown>,
+          field.path,
+        );
         const defaultValue = getFieldDefaultFromDefinition(field, definition);
         const effectiveValue =
           currentValue !== undefined ? currentValue : defaultValue;
@@ -306,18 +324,23 @@ export function AgentConfigDialog({
       const field = AGENT_CONFIG_FIELDS.find((f) => f.key === key);
       if (!field || field.type !== 'boolean') return;
 
-      const currentValue = getNestedValue(pendingOverride, field.path);
+      const currentValue = getNestedValue(
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+        pendingOverride as Record<string, unknown>,
+        field.path,
+      );
       const defaultValue = getFieldDefaultFromDefinition(field, definition);
       const effectiveValue =
         currentValue !== undefined ? currentValue : defaultValue;
       const newValue = !effectiveValue;
 
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       const newOverride = setNestedValue(
-        pendingOverride,
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+        pendingOverride as Record<string, unknown>,
         field.path,
         newValue,
       ) as AgentOverride;
+
       setPendingOverride(newOverride);
       setModifiedFields((prev) => new Set(prev).add(key));
 
@@ -352,9 +375,9 @@ export function AgentConfigDialog({
       }
 
       // Update pending override locally
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       const newOverride = setNestedValue(
-        pendingOverride,
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+        pendingOverride as Record<string, unknown>,
         field.path,
         parsed,
       ) as AgentOverride;
@@ -375,9 +398,9 @@ export function AgentConfigDialog({
       if (!field) return;
 
       // Remove the override (set to undefined)
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       const newOverride = setNestedValue(
-        pendingOverride,
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+        pendingOverride as Record<string, unknown>,
         field.path,
         undefined,
       ) as AgentOverride;

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

@@ -213,12 +213,6 @@ describe('<AppHeader />', () => {
 
   it('should NOT render Tips when tipsShown is 10 or more', async () => {
     const mockConfig = makeFakeConfig();
-    const uiState = {
-      bannerData: {
-        defaultText: '',
-        warningText: '',
-      },
-    };
 
     persistentStateMock.setData({ tipsShown: 10 });
 
@@ -226,7 +220,6 @@ describe('<AppHeader />', () => {
       <AppHeader version="1.0.0" />,
       {
         config: mockConfig,
-        uiState,
       },
     );
     await waitUntilReady();

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

@@ -1,113 +1,58 @@
 /**
  * @license
- * Copyright 2026 Google LLC
+ * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import { UserIdentity } from './UserIdentity.js';
+import { Box } from 'ink';
+import { Header } from './Header.js';
 import { Tips } from './Tips.js';
+import { UserIdentity } from './UserIdentity.js';
 import { useSettings } from '../contexts/SettingsContext.js';
 import { useConfig } from '../contexts/ConfigContext.js';
 import { useUIState } from '../contexts/UIStateContext.js';
 import { Banner } from './Banner.js';
 import { useBanner } from '../hooks/useBanner.js';
 import { useTips } from '../hooks/useTips.js';
-import { theme } from '../semantic-colors.js';
-import { ThemedGradient } from './ThemedGradient.js';
-import { CliSpinner } from './CliSpinner.js';
 
 interface AppHeaderProps {
   version: string;
   showDetails?: boolean;
 }
 
-const ICON = `▝▜▄  
-  ▝▜▄
- ▗▟▀ 
-▝▀    `;
-
 export const AppHeader = ({ version, showDetails = true }: AppHeaderProps) => {
   const settings = useSettings();
   const config = useConfig();
-  const { terminalWidth, bannerData, bannerVisible, updateInfo } = useUIState();
+  const { nightly, terminalWidth, bannerData, bannerVisible } = useUIState();
 
   const { bannerText } = useBanner(bannerData);
   const { showTips } = useTips();
 
-  const showHeader = !(
-    settings.merged.ui.hideBanner || config.getScreenReader()
-  );
-
   if (!showDetails) {
     return (
       <Box flexDirection="column">
-        {showHeader && (
-          <Box
-            flexDirection="row"
-            marginTop={1}
-            marginBottom={1}
-            paddingLeft={2}
-          >
-            <Box flexShrink={0}>
-              <ThemedGradient>{ICON}</ThemedGradient>
-            </Box>
-            <Box marginLeft={2} flexDirection="column">
-              <Box>
-                <Text bold color={theme.text.primary}>
-                  Gemini CLI
-                </Text>
-                <Text color={theme.text.secondary}> v{version}</Text>
-              </Box>
-            </Box>
-          </Box>
-        )}
+        <Header version={version} nightly={false} />
       </Box>
     );
   }
 
   return (
     <Box flexDirection="column">
-      {showHeader && (
-        <Box flexDirection="row" marginTop={1} marginBottom={1} paddingLeft={2}>
-          <Box flexShrink={0}>
-            <ThemedGradient>{ICON}</ThemedGradient>
-          </Box>
-          <Box marginLeft={2} flexDirection="column">
-            {/* Line 1: Gemini CLI vVersion [Updating] */}
-            <Box>
-              <Text bold color={theme.text.primary}>
-                Gemini CLI
-              </Text>
-              <Text color={theme.text.secondary}> v{version}</Text>
-              {updateInfo && (
-                <Box marginLeft={2}>
-                  <Text color={theme.text.secondary}>
-                    <CliSpinner /> Updating
-                  </Text>
-                </Box>
-              )}
-            </Box>
-
-            {/* Line 2: Blank */}
-            <Box height={1} />
-
-            {/* Lines 3 & 4: User Identity info (Email /auth and Plan /upgrade) */}
-            {settings.merged.ui.showUserIdentity !== false && (
-              <UserIdentity config={config} />
-            )}
-          </Box>
-        </Box>
+      {!(settings.merged.ui.hideBanner || config.getScreenReader()) && (
+        <>
+          <Header version={version} nightly={nightly} />
+          {bannerVisible && bannerText && (
+            <Banner
+              width={terminalWidth}
+              bannerText={bannerText}
+              isWarning={bannerData.warningText !== ''}
+            />
+          )}
+        </>
       )}
-
-      {bannerVisible && bannerText && (
-        <Banner
-          width={terminalWidth}
-          bannerText={bannerText}
-          isWarning={bannerData.warningText !== ''}
-        />
+      {settings.merged.ui.showUserIdentity !== false && (
+        <UserIdentity config={config} />
       )}
-
       {!(settings.merged.ui.hideTips || config.getScreenReader()) &&
         showTips && <Tips config={config} />}
     </Box>

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

@@ -427,7 +427,7 @@ export const BackgroundShellDisplay = ({
       height="100%"
       width="100%"
       borderStyle="single"
-      borderColor={isFocused ? theme.ui.focus : undefined}
+      borderColor={isFocused ? theme.border.focused : undefined}
     >
       <Box
         flexDirection="row"
@@ -438,7 +438,7 @@ export const BackgroundShellDisplay = ({
         borderRight={false}
         borderTop={false}
         paddingX={1}
-        borderColor={isFocused ? theme.ui.focus : undefined}
+        borderColor={isFocused ? theme.border.focused : undefined}
       >
         <Box flexDirection="row">
           {renderTabs()}

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

@@ -1,118 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { renderWithProviders } from '../../test-utils/render.js';
-import { ColorsDisplay } from './ColorsDisplay.js';
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { themeManager } from '../themes/theme-manager.js';
-import type { Theme, ColorsTheme } from '../themes/theme.js';
-import type { SemanticColors } from '../themes/semantic-tokens.js';
-
-describe('ColorsDisplay', () => {
-  beforeEach(() => {
-    vi.spyOn(themeManager, 'getSemanticColors').mockReturnValue({
-      text: {
-        primary: '#ffffff',
-        secondary: '#cccccc',
-        link: '#0000ff',
-        accent: '#ff00ff',
-        response: '#ffffff',
-      },
-      background: {
-        primary: '#000000',
-        message: '#111111',
-        input: '#222222',
-        focus: '#333333',
-        diff: {
-          added: '#003300',
-          removed: '#330000',
-        },
-      },
-      border: {
-        default: '#555555',
-      },
-      ui: {
-        comment: '#666666',
-        symbol: '#cccccc',
-        active: '#0000ff',
-        dark: '#333333',
-        focus: '#0000ff',
-        gradient: undefined,
-      },
-      status: {
-        error: '#ff0000',
-        success: '#00ff00',
-        warning: '#ffff00',
-      },
-    });
-
-    vi.spyOn(themeManager, 'getActiveTheme').mockReturnValue({
-      name: 'Test Theme',
-      type: 'dark',
-      colors: {} as unknown as ColorsTheme,
-      semanticColors: {
-        text: {
-          primary: '#ffffff',
-          secondary: '#cccccc',
-          link: '#0000ff',
-          accent: '#ff00ff',
-          response: '#ffffff',
-        },
-        background: {
-          primary: '#000000',
-          message: '#111111',
-          input: '#222222',
-          diff: {
-            added: '#003300',
-            removed: '#330000',
-          },
-        },
-        border: {
-          default: '#555555',
-        },
-        ui: {
-          comment: '#666666',
-          symbol: '#cccccc',
-          active: '#0000ff',
-          dark: '#333333',
-          focus: '#0000ff',
-          gradient: undefined,
-        },
-        status: {
-          error: '#ff0000',
-          success: '#00ff00',
-          warning: '#ffff00',
-        },
-      } as unknown as SemanticColors,
-    } as unknown as Theme);
-  });
-
-  afterEach(() => {
-    vi.restoreAllMocks();
-  });
-
-  it('renders correctly', async () => {
-    const mockTheme = themeManager.getActiveTheme();
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
-      <ColorsDisplay activeTheme={mockTheme} />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-
-    // Check for title and description
-    expect(output).toContain('How do colors get applied?');
-    expect(output).toContain('Hex:');
-
-    // Check for some color names and values    expect(output).toContain('text.primary');
-    expect(output).toContain('#ffffff');
-    expect(output).toContain('background.diff.added');
-    expect(output).toContain('#003300');
-    expect(output).toContain('border.default');
-    expect(output).toContain('#555555');
-
-    unmount();
-  });
-});

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

@@ -1,277 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import type React from 'react';
-import { Box, Text } from 'ink';
-import Gradient from 'ink-gradient';
-import { theme } from '../semantic-colors.js';
-import type { Theme } from '../themes/theme.js';
-
-interface StandardColorRow {
-  type: 'standard';
-  name: string;
-  value: string;
-}
-
-interface GradientColorRow {
-  type: 'gradient';
-  name: string;
-  value: string[];
-}
-
-interface BackgroundColorRow {
-  type: 'background';
-  name: string;
-  value: string;
-}
-
-type ColorRow = StandardColorRow | GradientColorRow | BackgroundColorRow;
-
-const VALUE_COLUMN_WIDTH = 10;
-
-const COLOR_DESCRIPTIONS: Record<string, string> = {
-  'text.primary': 'Primary text color (uses terminal default if blank)',
-  'text.secondary': 'Secondary/dimmed text color',
-  'text.link': 'Hyperlink and highlighting color',
-  'text.accent': 'Accent color for emphasis',
-  'text.response':
-    'Color for model response text (uses terminal default if blank)',
-  'background.primary': 'Main terminal background color',
-  'background.message': 'Subtle background for message blocks',
-  'background.input': 'Background for the input prompt',
-  'background.focus': 'Background highlight for selected/focused items',
-  'background.diff.added': 'Background for added lines in diffs',
-  'background.diff.removed': 'Background for removed lines in diffs',
-  'border.default': 'Standard border color',
-  'ui.comment': 'Color for code comments and metadata',
-  'ui.symbol': 'Color for technical symbols and UI icons',
-  'ui.active': 'Border color for active or running elements',
-  'ui.dark': 'Deeply dimmed color for subtle UI elements',
-  'ui.focus':
-    'Color for focused elements (e.g. selected menu items, focused borders)',
-  'status.error': 'Color for error messages and critical status',
-  'status.success': 'Color for success messages and positive status',
-  'status.warning': 'Color for warnings and cautionary status',
-};
-
-interface ColorsDisplayProps {
-  activeTheme: Theme;
-}
-
-/**
- * Determines a contrasting text color (black or white) based on the background color's luminance.
- */
-function getContrastingTextColor(hex: string): string {
-  if (!hex || !hex.startsWith('#') || hex.length < 7) {
-    // Fallback for invalid hex codes or named colors
-    return theme.text.primary;
-  }
-  const r = parseInt(hex.slice(1, 3), 16);
-  const g = parseInt(hex.slice(3, 5), 16);
-  const b = parseInt(hex.slice(5, 7), 16);
-  // Using YIQ formula to determine luminance
-  const yiq = (r * 299 + g * 587 + b * 114) / 1000;
-  return yiq >= 128 ? '#000000' : '#FFFFFF';
-}
-
-export const ColorsDisplay: React.FC<ColorsDisplayProps> = ({
-  activeTheme,
-}) => {
-  const semanticColors = activeTheme.semanticColors;
-
-  const backgroundRows: BackgroundColorRow[] = [];
-  const standardRows: StandardColorRow[] = [];
-  let gradientRow: GradientColorRow | null = null;
-
-  if (semanticColors.ui.gradient && semanticColors.ui.gradient.length > 0) {
-    gradientRow = {
-      type: 'gradient',
-      name: 'ui.gradient',
-      value: semanticColors.ui.gradient,
-    };
-  }
-
-  /**
-   * Recursively flattens the semanticColors object.
-   */
-  const flattenColors = (obj: object, path: string = '') => {
-    for (const [key, value] of Object.entries(obj)) {
-      if (value === undefined || value === null) continue;
-      const newPath = path ? `${path}.${key}` : key;
-
-      if (key === 'gradient' && Array.isArray(value)) {
-        // Gradient handled separately
-        continue;
-      }
-
-      if (typeof value === 'object' && !Array.isArray(value)) {
-        flattenColors(value, newPath);
-      } else if (typeof value === 'string') {
-        if (newPath.startsWith('background.')) {
-          backgroundRows.push({
-            type: 'background',
-            name: newPath,
-            value,
-          });
-        } else {
-          standardRows.push({
-            type: 'standard',
-            name: newPath,
-            value,
-          });
-        }
-      }
-    }
-  };
-
-  flattenColors(semanticColors);
-
-  // Final order: Backgrounds first, then Standards, then Gradient
-  const allRows: ColorRow[] = [
-    ...backgroundRows,
-    ...standardRows,
-    ...(gradientRow ? [gradientRow] : []),
-  ];
-
-  return (
-    <Box
-      flexDirection="column"
-      paddingX={1}
-      paddingY={0}
-      borderStyle="round"
-      borderColor={theme.border.default}
-    >
-      <Box marginBottom={1} flexDirection="column">
-        <Text bold color={theme.text.accent}>
-          DEVELOPER TOOLS (Not visible to users)
-        </Text>
-        <Box marginTop={1} flexDirection="column">
-          <Text color={theme.text.primary}>
-            <Text bold>How do colors get applied?</Text>
-          </Text>
-          <Box marginLeft={2} flexDirection="column">
-            <Text color={theme.text.primary}>
-              • <Text bold>Hex:</Text> Rendered exactly by modern terminals. Not
-              overridden by app themes.
-            </Text>
-            <Text color={theme.text.primary}>
-              • <Text bold>Blank:</Text> Uses your terminal&apos;s default
-              foreground/background.
-            </Text>
-            <Text color={theme.text.primary}>
-              • <Text bold>Compatibility:</Text> On older terminals, hex is
-              approximated to the nearest ANSI color.
-            </Text>
-            <Text color={theme.text.primary}>
-              • <Text bold>ANSI Names:</Text> &apos;red&apos;,
-              &apos;green&apos;, etc. are mapped to your terminal app&apos;s
-              palette.
-            </Text>
-          </Box>
-        </Box>
-      </Box>
-
-      {/* Header */}
-      <Box flexDirection="row" marginBottom={0} paddingX={1}>
-        <Box width={VALUE_COLUMN_WIDTH}>
-          <Text bold color={theme.text.link} dimColor>
-            Value
-          </Text>
-        </Box>
-        <Box flexGrow={1}>
-          <Text bold color={theme.text.link} dimColor>
-            Name
-          </Text>
-        </Box>
-      </Box>
-
-      {/* All Rows */}
-      <Box flexDirection="column">
-        {allRows.map((row) => {
-          if (row.type === 'standard') return renderStandardRow(row);
-          if (row.type === 'gradient') return renderGradientRow(row);
-          if (row.type === 'background') return renderBackgroundRow(row);
-          return null;
-        })}
-      </Box>
-    </Box>
-  );
-};
-
-function renderStandardRow({ name, value }: StandardColorRow) {
-  const isHex = value.startsWith('#');
-  const displayColor = isHex ? value : theme.text.primary;
-  const description = COLOR_DESCRIPTIONS[name] || '';
-
-  return (
-    <Box key={name} flexDirection="row" paddingX={1}>
-      <Box width={VALUE_COLUMN_WIDTH}>
-        <Text color={displayColor}>{value || '(blank)'}</Text>
-      </Box>
-      <Box flexGrow={1} flexDirection="row">
-        <Box width="30%">
-          <Text color={displayColor}>{name}</Text>
-        </Box>
-        <Box flexGrow={1} paddingLeft={1}>
-          <Text color={theme.text.secondary}>{description}</Text>
-        </Box>
-      </Box>
-    </Box>
-  );
-}
-
-function renderGradientRow({ name, value }: GradientColorRow) {
-  const description = COLOR_DESCRIPTIONS[name] || '';
-
-  return (
-    <Box key={name} flexDirection="row" paddingX={1}>
-      <Box width={VALUE_COLUMN_WIDTH} flexDirection="column">
-        {value.map((c, i) => (
-          <Text key={i} color={c}>
-            {c}
-          </Text>
-        ))}
-      </Box>
-      <Box flexGrow={1} flexDirection="row">
-        <Box width="30%">
-          <Gradient colors={value}>
-            <Text>{name}</Text>
-          </Gradient>
-        </Box>
-        <Box flexGrow={1} paddingLeft={1}>
-          <Text color={theme.text.secondary}>{description}</Text>
-        </Box>
-      </Box>
-    </Box>
-  );
-}
-
-function renderBackgroundRow({ name, value }: BackgroundColorRow) {
-  const description = COLOR_DESCRIPTIONS[name] || '';
-
-  return (
-    <Box key={name} flexDirection="row" paddingX={1}>
-      <Box
-        width={VALUE_COLUMN_WIDTH}
-        backgroundColor={value}
-        justifyContent="center"
-        paddingX={1}
-      >
-        <Text color={getContrastingTextColor(value)} bold wrap="truncate">
-          {value || 'default'}
-        </Text>
-      </Box>
-      <Box flexGrow={1} flexDirection="row" paddingLeft={1}>
-        <Box width="30%">
-          <Text color={theme.text.primary}>{name}</Text>
-        </Box>
-        <Box flexGrow={1} paddingLeft={1}>
-          <Text color={theme.text.secondary}>{description}</Text>
-        </Box>
-      </Box>
-    </Box>
-  );
-}

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

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { renderWithProviders } from '../../test-utils/render.js';
+import { render } from '../../test-utils/render.js';
 import { ContextUsageDisplay } from './ContextUsageDisplay.js';
 import { describe, it, expect, vi } from 'vitest';
 
@@ -17,9 +17,18 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
   };
 });
 
+vi.mock('../../config/settings.js', () => ({
+  DEFAULT_MODEL_CONFIGS: {},
+  LoadedSettings: class {
+    constructor() {
+      // this.merged = {};
+    }
+  },
+}));
+
 describe('ContextUsageDisplay', () => {
-  it('renders correct percentage used', async () => {
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+  it('renders correct percentage left', async () => {
+    const { lastFrame, waitUntilReady, unmount } = render(
       <ContextUsageDisplay
         promptTokenCount={5000}
         model="gemini-pro"
@@ -28,56 +37,27 @@ describe('ContextUsageDisplay', () => {
     );
     await waitUntilReady();
     const output = lastFrame();
-    expect(output).toContain('50% context used');
+    expect(output).toContain('50% context left');
     unmount();
   });
 
-  it('renders correctly when usage is 0%', async () => {
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
-      <ContextUsageDisplay
-        promptTokenCount={0}
-        model="gemini-pro"
-        terminalWidth={120}
-      />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('0% context used');
-    unmount();
-  });
-
-  it('renders abbreviated label when terminal width is small', async () => {
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+  it('renders short label when terminal width is small', async () => {
+    const { lastFrame, waitUntilReady, unmount } = render(
       <ContextUsageDisplay
         promptTokenCount={2000}
         model="gemini-pro"
         terminalWidth={80}
       />,
-      { width: 80 },
     );
     await waitUntilReady();
     const output = lastFrame();
-    expect(output).toContain('20%');
-    expect(output).not.toContain('context used');
+    expect(output).toContain('80%');
+    expect(output).not.toContain('context left');
     unmount();
   });
 
-  it('renders 80% correctly', async () => {
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
-      <ContextUsageDisplay
-        promptTokenCount={8000}
-        model="gemini-pro"
-        terminalWidth={120}
-      />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('80% context used');
-    unmount();
-  });
-
-  it('renders 100% when full', async () => {
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+  it('renders 0% when full', async () => {
+    const { lastFrame, waitUntilReady, unmount } = render(
       <ContextUsageDisplay
         promptTokenCount={10000}
         model="gemini-pro"
@@ -86,7 +66,7 @@ describe('ContextUsageDisplay', () => {
     );
     await waitUntilReady();
     const output = lastFrame();
-    expect(output).toContain('100% context used');
+    expect(output).toContain('0% context left');
     unmount();
   });
 });

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

@@ -7,11 +7,6 @@
 import { Text } from 'ink';
 import { theme } from '../semantic-colors.js';
 import { getContextUsagePercentage } from '../utils/contextUsage.js';
-import { useSettings } from '../contexts/SettingsContext.js';
-import {
-  MIN_TERMINAL_WIDTH_FOR_FULL_LABEL,
-  DEFAULT_COMPRESSION_THRESHOLD,
-} from '../constants.js';
 
 export const ContextUsageDisplay = ({
   promptTokenCount,
@@ -19,30 +14,17 @@ export const ContextUsageDisplay = ({
   terminalWidth,
 }: {
   promptTokenCount: number;
-  model: string | undefined;
+  model: string;
   terminalWidth: number;
 }) => {
-  const settings = useSettings();
   const percentage = getContextUsagePercentage(promptTokenCount, model);
-  const percentageUsed = (percentage * 100).toFixed(0);
+  const percentageLeft = ((1 - percentage) * 100).toFixed(0);
 
-  const threshold =
-    settings.merged.model?.compressionThreshold ??
-    DEFAULT_COMPRESSION_THRESHOLD;
-
-  let textColor = theme.text.secondary;
-  if (percentage >= 1.0) {
-    textColor = theme.status.error;
-  } else if (percentage >= threshold) {
-    textColor = theme.status.warning;
-  }
-
-  const label =
-    terminalWidth < MIN_TERMINAL_WIDTH_FOR_FULL_LABEL ? '%' : '% context used';
+  const label = terminalWidth < 100 ? '%' : '% context left';
 
   return (
-    <Text color={textColor}>
-      {percentageUsed}
+    <Text color={theme.text.secondary}>
+      {percentageLeft}
       {label}
     </Text>
   );

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

@@ -171,16 +171,6 @@ export const DebugProfiler = () => {
       appEvents.on(eventName, handler);
     }
 
-    // Register handlers for extension lifecycle events emitted on coreEvents
-    // but not part of the CoreEvent enum, to prevent false-positive idle warnings.
-    const extensionEvents = [
-      'extensionsStarting',
-      'extensionsStopping',
-    ] as const;
-    for (const eventName of extensionEvents) {
-      coreEvents.on(eventName, handler);
-    }
-
     return () => {
       stdin.off('data', handler);
       stdout.off('resize', handler);
@@ -193,10 +183,6 @@ export const DebugProfiler = () => {
         appEvents.off(eventName, handler);
       }
 
-      for (const eventName of extensionEvents) {
-        coreEvents.off(eventName, handler);
-      }
-
       profiler.profilersActive--;
     };
   }, []);

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

@@ -76,7 +76,7 @@ describe('DetailedMessagesDisplay', () => {
     unmount();
   });
 
-  it('shows the F12 hint even in low error verbosity mode', async () => {
+  it('hides the F12 hint in low error verbosity mode', async () => {
     const messages: ConsoleMessageItem[] = [
       { type: 'error', content: 'Error message', count: 1 },
     ];
@@ -95,7 +95,7 @@ describe('DetailedMessagesDisplay', () => {
       },
     );
     await waitUntilReady();
-    expect(lastFrame()).toContain('(F12 to close)');
+    expect(lastFrame()).not.toContain('(F12 to close)');
     unmount();
   });