fix(theme): update color values in richLightTheme and richDarkTheme for improved contrast

fix(theme): add gradient colors to richLightTheme definition
fix(theme): update true color detection logic for terminal compatibility
2026-08-02 21:21:09 -07:00 · 2026-03-24 16:49:20 -07:00 · 2026-03-24 16:31:33 -07:00 · 2026-03-24 16:31:33 -07:00 · 2026-03-24 15:41:15 -07:00 · 2026-03-24 15:17:10 -07:00
241 changed files with 3838 additions and 12581 deletions
@@ -1,66 +0,0 @@
---
-name: ci
-description:
-  A specialized skill for Gemini CLI that provides high-performance, fail-fast
-  monitoring of GitHub Actions workflows and automated local verification of CI
-  failures. It handles run discovery automatically—simply provide the branch name.
---
-
-# CI Replicate & Status
-
-This skill enables the agent to efficiently monitor GitHub Actions, triage
-failures, and bridge remote CI errors to local development. It defaults to
-**automatic replication** of failures to streamline the fix cycle.
-
-## Core Capabilities
-
- **Automatic Replication**: Automatically monitors CI and immediately executes 
-  suggested test or lint commands locally upon failure.
- **Real-time Monitoring**: Aggregated status line for all concurrent workflows
-  on the current branch.
- **Fail-Fast Triage**: Immediately stops on the first job failure to provide a
-  structured report.
-
-## Workflow
-
-### 1. CI Replicate (`replicate`) - DEFAULT
-Use this as the primary path to monitor CI and **automatically** replicate 
-failures locally for immediate triage and fixing.
- **Behavior**: When this workflow is triggered, the agent will monitor the CI
-  and **immediately and automatically execute** all suggested test or lint
-  commands (marked with 🚀) as soon as a failure is detected. 
- **Tool**: `node .gemini/skills/ci/scripts/ci.mjs [branch]`
- **Discovery**: The script **automatically** finds the latest active or recent
-  run for the branch. Do NOT manually search for run IDs.
- **Goal**: Reproduce the failure locally without manual intervention, then
-  proceed to analyze and fix the code.
-
-### 1. CI Status (`status`)
-Use this when you have pushed changes and need to monitor the CI and reproduce
-any failures locally.
- **Tool**: `node .gemini/skills/ci/scripts/ci.mjs [branch] [run_id]`
- **Discovery**: The script **automatically** finds the latest active or recent
-  run for the branch. You should NOT manually search for \`run_id\` using \`gh run list\`
-  unless a specific historical run is requested. Simply provide the branch name.
- **Step 1 (Monitor)**: Execute the tool with the branch name.
- **Step 2 (Extract)**: Extract suggested \`npm test\` or \`npm run lint\` commands
-  from the output (marked with 🚀).
- **Step 3 (Reproduce)**: Execute those commands locally to confirm the failure.
- **Behavior**: It will poll every 15 seconds. If it detects a failure, it will
-  exit with a structured report and provide the exact commands to run locally.
-
-## Failure Categories & Actions
-
- **Test Failures**: Agent should run the specific `npm test -w <pkg> -- <path>`
-  command suggested.
- **Lint Errors**: Agent should run `npm run lint:all` or the specific package
-  lint command.
- **Build Errors**: Agent should check `tsc` output or build logs to resolve
-  compilation issues.
- **Job Errors**: Investigate `gh run view --job <job_id> --log` for
-  infrastructure or setup failures.
-
-## Noise Filtering
-The underlying scripts automatically filter noise (Git logs, NPM warnings, stack
-trace overhead). The agent should focus on the "Structured Failure Report"
-provided by the tool.
@@ -1,281 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { execSync } from 'node:child_process';
-
-const BRANCH =
-  process.argv[2] || execSync('git branch --show-current').toString().trim();
-const RUN_ID_OVERRIDE = process.argv[3];
-
-let REPO;
-try {
-  const remoteUrl = execSync('git remote get-url origin').toString().trim();
-  REPO = remoteUrl
-    .replace(/.*github\.com[\/:]/, '')
-    .replace(/\.git$/, '')
-    .trim();
-} catch (e) {
-  REPO = 'google-gemini/gemini-cli';
-}
-
-const FAILED_FILES = new Set();
-
-function runGh(args) {
-  try {
-    return execSync(`gh ${args}`, {
-      stdio: ['ignore', 'pipe', 'ignore'],
-    }).toString();
-  } catch (e) {
-    return null;
-  }
-}
-
-function fetchFailuresViaApi(jobId) {
-  try {
-    const cmd = `gh api repos/${REPO}/actions/jobs/${jobId}/logs | grep -iE " FAIL |❌|ERROR|Lint failed|Build failed|Exception|failed with exit code"`;
-    return execSync(cmd, {
-      stdio: ['ignore', 'pipe', 'ignore'],
-      maxBuffer: 10 * 1024 * 1024,
-    }).toString();
-  } catch (e) {
-    return '';
-  }
-}
-
-function isNoise(line) {
-  const lower = line.toLowerCase();
-  return (
-    lower.includes('* [new branch]') ||
-    lower.includes('npm warn') ||
-    lower.includes('fetching updates') ||
-    lower.includes('node:internal/errors') ||
-    lower.includes('at ') || // Stack traces
-    lower.includes('checkexecsyncerror') ||
-    lower.includes('node_modules')
-  );
-}
-
-function extractTestFile(failureText) {
-  const cleanLine = failureText
-    .replace(/[|#\[\]()]/g, ' ')
-    .replace(/<[^>]*>/g, ' ')
-    .trim();
-  const fileMatch = cleanLine.match(/([\w\/._-]+\.test\.[jt]sx?)/);
-  if (fileMatch) return fileMatch[1];
-  return null;
-}
-
-function generateTestCommand(failedFilesMap) {
-  const workspaceToFiles = new Map();
-  for (const [file, info] of failedFilesMap.entries()) {
-    if (
-      ['Job Error', 'Unknown File', 'Build Error', 'Lint Error'].includes(file)
-    )
-      continue;
-    let workspace = '@google/gemini-cli';
-    let relPath = file;
-    if (file.startsWith('packages/core/')) {
-      workspace = '@google/gemini-cli-core';
-      relPath = file.replace('packages/core/', '');
-    } else if (file.startsWith('packages/cli/')) {
-      workspace = '@google/gemini-cli';
-      relPath = file.replace('packages/cli/', '');
-    }
-    relPath = relPath.replace(/^.*packages\/[^\/]+\//, '');
-    if (!workspaceToFiles.has(workspace))
-      workspaceToFiles.set(workspace, new Set());
-    workspaceToFiles.get(workspace).add(relPath);
-  }
-  const commands = [];
-  for (const [workspace, files] of workspaceToFiles.entries()) {
-    commands.push(`npm test -w ${workspace} -- ${Array.from(files).join(' ')}`);
-  }
-  return commands.join(' && ');
-}
-
-async function monitor() {
-  let targetRunIds = [];
-  if (RUN_ID_OVERRIDE) {
-    targetRunIds = [RUN_ID_OVERRIDE];
-  } else {
-    // 1. Get runs directly associated with the branch
-    const runListOutput = runGh(
-      `run list --branch "${BRANCH}" --limit 10 --json databaseId,status,workflowName,createdAt`,
-    );
-    if (runListOutput) {
-      const runs = JSON.parse(runListOutput);
-      const activeRuns = runs.filter((r) => r.status !== 'completed');
-      if (activeRuns.length > 0) {
-        targetRunIds = activeRuns.map((r) => r.databaseId);
-      } else if (runs.length > 0) {
-        const latestTime = new Date(runs[0].createdAt).getTime();
-        targetRunIds = runs
-          .filter((r) => latestTime - new Date(r.createdAt).getTime() < 60000)
-          .map((r) => r.databaseId);
-      }
-    }
-
-    // 2. Get runs associated with commit statuses (handles chained/indirect runs)
-    try {
-      const headSha = execSync(`git rev-parse "${BRANCH}"`).toString().trim();
-      const statusOutput = runGh(
-        `api repos/${REPO}/commits/${headSha}/status -q '.statuses[] | select(.target_url | contains("actions/runs/")) | .target_url'`,
-      );
-      if (statusOutput) {
-        const statusRunIds = statusOutput
-          .split('\n')
-          .filter(Boolean)
-          .map((url) => {
-            const match = url.match(/actions\/runs\/(\d+)/);
-            return match ? parseInt(match[1], 10) : null;
-          })
-          .filter(Boolean);
-
-        for (const runId of statusRunIds) {
-          if (!targetRunIds.includes(runId)) {
-            targetRunIds.push(runId);
-          }
-        }
-      }
-    } catch (e) {
-      // Ignore if branch/SHA not found or API fails
-    }
-
-    if (targetRunIds.length > 0) {
-      const runNames = [];
-      for (const runId of targetRunIds) {
-        const runInfo = runGh(`run view "${runId}" --json workflowName`);
-        if (runInfo) {
-          runNames.push(JSON.parse(runInfo).workflowName);
-        }
-      }
-      console.log(`Monitoring workflows: ${[...new Set(runNames)].join(', ')}`);
-    }
-  }
-
-  if (targetRunIds.length === 0) {
-    console.log(`No runs found for branch ${BRANCH}.`);
-    process.exit(0);
-  }
-
-  while (true) {
-    let allPassed = 0,
-      allFailed = 0,
-      allRunning = 0,
-      allQueued = 0,
-      totalJobs = 0;
-    let anyRunInProgress = false;
-    const fileToTests = new Map();
-    let failuresFoundInLoop = false;
-
-    for (const runId of targetRunIds) {
-      const runOutput = runGh(
-        `run view "${runId}" --json databaseId,status,conclusion,workflowName`,
-      );
-      if (!runOutput) continue;
-      const run = JSON.parse(runOutput);
-      if (run.status !== 'completed') anyRunInProgress = true;
-
-      const jobsOutput = runGh(`run view "${runId}" --json jobs`);
-      if (jobsOutput) {
-        const { jobs } = JSON.parse(jobsOutput);
-        totalJobs += jobs.length;
-        const failedJobs = jobs.filter((j) => j.conclusion === 'failure');
-        if (failedJobs.length > 0) {
-          failuresFoundInLoop = true;
-          for (const job of failedJobs) {
-            const failures = fetchFailuresViaApi(job.databaseId);
-            if (failures.trim()) {
-              failures.split('\n').forEach((line) => {
-                if (!line.trim() || isNoise(line)) return;
-                const file = extractTestFile(line);
-                const filePath =
-                  file ||
-                  (line.toLowerCase().includes('lint')
-                    ? 'Lint Error'
-                    : line.toLowerCase().includes('build')
-                      ? 'Build Error'
-                      : 'Unknown File');
-                let testName = line;
-                if (line.includes(' > ')) {
-                  testName = line.split(' > ').slice(1).join(' > ').trim();
-                }
-                if (!fileToTests.has(filePath))
-                  fileToTests.set(filePath, new Set());
-                fileToTests.get(filePath).add(testName);
-              });
-            } else {
-              const step =
-                job.steps?.find((s) => s.conclusion === 'failure')?.name ||
-                'unknown';
-              const category = step.toLowerCase().includes('lint')
-                ? 'Lint Error'
-                : step.toLowerCase().includes('build')
-                  ? 'Build Error'
-                  : 'Job Error';
-              if (!fileToTests.has(category))
-                fileToTests.set(category, new Set());
-              fileToTests
-                .get(category)
-                .add(`${job.name}: Failed at step "${step}"`);
-            }
-          }
-        }
-        for (const job of jobs) {
-          if (job.status === 'in_progress') allRunning++;
-          else if (job.status === 'queued') allQueued++;
-          else if (job.conclusion === 'success') allPassed++;
-          else if (job.conclusion === 'failure') allFailed++;
-        }
-      }
-    }
-
-    if (failuresFoundInLoop) {
-      console.log(
-        `\n\n❌ Failures detected across ${allFailed} job(s). Stopping monitor...`,
-      );
-      console.log('\n--- Structured Failure Report (Noise Filtered) ---');
-      for (const [file, tests] of fileToTests.entries()) {
-        console.log(`\nCategory/File: ${file}`);
-        // Limit output per file if it's too large
-        const testsArr = Array.from(tests).map((t) =>
-          t.length > 500 ? t.substring(0, 500) + '... [TRUNCATED]' : t,
-        );
-        testsArr.slice(0, 10).forEach((t) => console.log(`  - ${t}`));
-        if (testsArr.length > 10)
-          console.log(`  ... and ${testsArr.length - 10} more`);
-      }
-      const testCmd = generateTestCommand(fileToTests);
-      if (testCmd) {
-        console.log('\n🚀 Run this to verify fixes:');
-        console.log(testCmd);
-      } else if (
-        Array.from(fileToTests.keys()).some((k) => k.includes('Lint'))
-      ) {
-        console.log('\n🚀 Run this to verify lint fixes:\nnpm run lint:all');
-      }
-      console.log('---------------------------------');
-      process.exit(1);
-    }
-
-    const completed = allPassed + allFailed;
-    process.stdout.write(
-      `\r⏳ Monitoring ${targetRunIds.length} runs... ${completed}/${totalJobs} jobs (${allPassed} passed, ${allFailed} failed, ${allRunning} running, ${allQueued} queued)          `,
-    );
-    if (!anyRunInProgress) {
-      console.log('\n✅ All workflows passed!');
-      process.exit(0);
-    }
-    await new Promise((r) => setTimeout(r, 15000));
-  }
-}
-
-monitor().catch((err) => {
-  console.error('\nMonitor error:', err.message);
-  process.exit(1);
-});
@@ -175,7 +175,7 @@ runs:
          --dry-run="${INPUTS_DRY_RUN}" \
          --workspace="${INPUTS_CORE_PACKAGE_NAME}" \
          --no-tag
-        npm dist-tag rm ${INPUTS_CORE_PACKAGE_NAME} false
+        npm dist-tag rm ${INPUTS_CORE_PACKAGE_NAME} false --silent

    - name: '🔗 Install latest core package'
      working-directory: '${{ inputs.working-directory }}'
@@ -221,9 +221,7 @@ runs:
          --dry-run="${INPUTS_DRY_RUN}" \
          --workspace="${INPUTS_CLI_PACKAGE_NAME}" \
          --no-tag
-        if [[ "${INPUTS_DRY_RUN}" == "false" ]]; then
-          npm dist-tag rm ${INPUTS_CLI_PACKAGE_NAME} false
-        fi
+        npm dist-tag rm ${INPUTS_CLI_PACKAGE_NAME} false --silent

    - name: 'Get a2a-server Token'
      uses: './.github/actions/npm-auth-token'
@@ -248,7 +246,7 @@ runs:
          --dry-run="${INPUTS_DRY_RUN}" \
          --workspace="${INPUTS_A2A_PACKAGE_NAME}" \
          --no-tag
-        npm dist-tag rm ${INPUTS_A2A_PACKAGE_NAME} false
+        npm dist-tag rm ${INPUTS_A2A_PACKAGE_NAME} false --silent

    - name: '🔬 Verify NPM release by version'
      uses: './.github/actions/verify-release'
@@ -34,7 +34,7 @@ runs:
        JSON_INPUTS: '${{ toJSON(inputs) }}'
      run: 'echo "$JSON_INPUTS"'
    - name: 'Checkout'
-      uses: 'actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5' # ratchet:actions/checkout@v4
+      uses: 'actions/checkout@v4'
      with:
        ref: '${{ inputs.github-sha }}'
        fetch-depth: 0
@@ -45,11 +45,11 @@ runs:
      shell: 'bash'
      run: 'npm run build'
    - name: 'Set up QEMU'
-      uses: 'docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130' # ratchet:docker/setup-qemu-action@v3
+      uses: 'docker/setup-qemu-action@v3'
    - name: 'Set up Docker Buildx'
-      uses: 'docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f' # ratchet:docker/setup-buildx-action@v3
+      uses: 'docker/setup-buildx-action@v3'
    - name: 'Log in to GitHub Container Registry'
-      uses: 'docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9' # ratchet:docker/login-action@v3
+      uses: 'docker/login-action@v3'
      with:
        registry: 'docker.io'
        username: '${{ inputs.dockerhub-username }}'
@@ -36,7 +36,7 @@ runs:
      run: 'echo "$JSON_INPUTS"'

    - name: 'setup node'
-      uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4
+      uses: 'actions/setup-node@v4'
      with:
        node-version: '20'

@@ -334,20 +334,8 @@ jobs:
        if: "${{ steps.check_evals.outputs.should_run == 'true' }}"
        env:
          GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
-          GEMINI_MODEL: 'gemini-3-pro-preview'
-          # Disable Vitest internal retries to avoid double-retrying;
-          # custom retry logic is handled in evals/test-helper.ts
-          VITEST_RETRY: 0
        run: 'npm run test:always_passing_evals'

-      - name: 'Upload Reliability Logs'
-        if: "always() && steps.check_evals.outputs.should_run == 'true'"
-        uses: 'actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02' # ratchet:actions/upload-artifact@v4
-        with:
-          name: 'eval-logs-${{ github.run_id }}-${{ github.run_attempt }}'
-          path: 'evals/logs/api-reliability.jsonl'
-          retention-days: 7
-
  e2e:
    name: 'E2E'
    if: |
@@ -67,7 +67,7 @@ jobs:
          cache: 'npm'

      - name: 'Cache Linters'
-        uses: 'actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830' # ratchet:actions/cache@v4
+        uses: 'actions/cache@v4'
        with:
          path: '${{ env.GEMINI_LINT_TEMP_DIR }}'
          key: "${{ runner.os }}-${{ runner.arch }}-linters-${{ hashFiles('scripts/lint.js') }}"
@@ -76,7 +76,7 @@ jobs:
        run: 'npm ci'

      - name: 'Cache ESLint'
-        uses: 'actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830' # ratchet:actions/cache@v4
+        uses: 'actions/cache@v4'
        with:
          path: '.eslintcache'
          key: "${{ runner.os }}-eslint-${{ hashFiles('package-lock.json', 'eslint.config.js') }}"
@@ -114,9 +114,6 @@ jobs:
      - name: 'Run sensitive keyword linter'
        run: 'node scripts/lint.js --sensitive-keywords'

-      - name: 'Run GitHub Actions pinning linter'
-        run: 'node scripts/lint.js --check-github-actions-pinning'
-
  link_checker:
    name: 'Link Checker'
    runs-on: 'ubuntu-latest'
@@ -161,12 +158,6 @@ jobs:
      - name: 'Build project'
        run: 'npm run build'

-      - name: 'Install system dependencies'
-        run: |
-          sudo apt-get update -qq && sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -qq bubblewrap
-          # Ubuntu 24.04+ requires this to allow bwrap to function in CI
-          sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0 || true
-
      - name: 'Install dependencies for testing'
        run: 'npm ci'

@@ -61,8 +61,6 @@ jobs:
          GEMINI_MODEL: '${{ matrix.model }}'
          RUN_EVALS: "${{ github.event.inputs.run_all != 'false' }}"
          TEST_NAME_PATTERN: '${{ github.event.inputs.test_name_pattern }}'
-          # Disable Vitest internal retries to avoid double-retrying;
-          # custom retry logic is handled in evals/test-helper.ts
          VITEST_RETRY: 0
        run: |
          CMD="npm run test:all_evals"
@@ -28,14 +28,14 @@ jobs:
    steps:
      - name: 'Generate GitHub App Token'
        id: 'generate_token'
-        uses: 'actions/create-github-app-token@fee1f7d63c2ff003460e3d139729b119787bc349' # ratchet:actions/create-github-app-token@v2
+        uses: 'actions/create-github-app-token@v2'
        with:
          app-id: '${{ secrets.APP_ID }}'
          private-key: '${{ secrets.PRIVATE_KEY }}'
          permission-issues: 'write'

      - name: 'Process Stale Issues'
-        uses: 'actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b' # ratchet:actions/github-script@v7
+        uses: 'actions/github-script@v7'
        env:
          DRY_RUN: '${{ inputs.dry_run }}'
        with:
@@ -27,13 +27,13 @@ jobs:
          APP_ID: '${{ secrets.APP_ID }}'
        if: |-
          ${{ env.APP_ID != '' }}
-        uses: 'actions/create-github-app-token@fee1f7d63c2ff003460e3d139729b119787bc349' # ratchet:actions/create-github-app-token@v2
+        uses: 'actions/create-github-app-token@v2'
        with:
          app-id: '${{ secrets.APP_ID }}'
          private-key: '${{ secrets.PRIVATE_KEY }}'

      - name: 'Process Stale PRs'
-        uses: 'actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b' # ratchet:actions/github-script@v7
+        uses: 'actions/github-script@v7'
        env:
          DRY_RUN: '${{ inputs.dry_run }}'
        with:
@@ -18,10 +18,10 @@ jobs:
    runs-on: 'ubuntu-latest'
    steps:
      - name: 'Checkout'
-        uses: 'actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5' # ratchet:actions/checkout@v4
+        uses: 'actions/checkout@v4'

      - name: 'Setup Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4
+        uses: 'actions/setup-node@v4'
        with:
          node-version: '20'
          cache: 'npm'
@@ -40,10 +40,10 @@ jobs:
    runs-on: 'ubuntu-latest'
    steps:
      - name: 'Checkout'
-        uses: 'actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5' # ratchet:actions/checkout@v4
+        uses: 'actions/checkout@v4'

      - name: 'Setup Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4
+        uses: 'actions/setup-node@v4'
        with:
          node-version: '20'
          cache: 'npm'
@@ -15,7 +15,7 @@ jobs:
      issues: 'write'
    steps:
      - name: 'Check for Parent Workstream and Apply Label'
-        uses: 'actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b' # ratchet:actions/github-script@v7
+        uses: 'actions/github-script@v7'
        with:
          script: |
            const labelToAdd = 'workstream-rollup';
@@ -19,7 +19,7 @@ jobs:
          APP_ID: '${{ secrets.APP_ID }}'
        if: |-
          ${{ env.APP_ID != '' }}
-        uses: 'actions/create-github-app-token@fee1f7d63c2ff003460e3d139729b119787bc349' # ratchet:actions/create-github-app-token@v2
+        uses: 'actions/create-github-app-token@v2'
        with:
          app-id: '${{ secrets.APP_ID }}'
          private-key: '${{ secrets.PRIVATE_KEY }}'
@@ -40,7 +40,7 @@ jobs:
      issues: 'write'
    steps:
      - name: 'Checkout repository'
-        uses: 'actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5' # ratchet:actions/checkout@v4
+        uses: 'actions/checkout@v4'
        with:
          ref: '${{ github.ref }}'
          fetch-depth: 0
@@ -29,14 +29,14 @@ jobs:
      pull-requests: 'write'
    steps:
      - name: 'Checkout repository'
-        uses: 'actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5' # ratchet:actions/checkout@v4
+        uses: 'actions/checkout@v4'
        with:
          # The user-level skills need to be available to the workflow
          fetch-depth: 0
          ref: 'main'

      - name: 'Set up Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4
+        uses: 'actions/setup-node@v4'
        with:
          node-version: '20'

@@ -86,7 +86,7 @@ jobs:

      - name: 'Create Pull Request'
        if: "steps.validate_version.outputs.CONTINUE == 'true'"
-        uses: 'peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c' # ratchet:peter-evans/create-pull-request@v6
+        uses: 'peter-evans/create-pull-request@v6'
        with:
          token: '${{ secrets.GEMINI_CLI_ROBOT_GITHUB_PAT }}'
          commit-message: 'docs(changelog): update for ${{ steps.release_info.outputs.VERSION }}'
@@ -33,7 +33,7 @@ jobs:

    steps:
      - name: 'Checkout'
-        uses: 'actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5' # ratchet:actions/checkout@v4
+        uses: 'actions/checkout@v4'

      - name: 'Optimize Windows Performance'
        if: "matrix.os == 'windows-latest'"
@@ -46,7 +46,7 @@ jobs:
        shell: 'powershell'

      - name: 'Set up Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4
+        uses: 'actions/setup-node@v4'
        with:
          node-version-file: '.nvmrc'
          architecture: '${{ matrix.arch }}'
@@ -63,7 +63,7 @@ jobs:

      - name: 'Setup Windows SDK (Windows)'
        if: "matrix.os == 'windows-latest'"
-        uses: 'microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce' # ratchet:microsoft/setup-msbuild@v2
+        uses: 'microsoft/setup-msbuild@v2'

      - name: 'Add Signtool to Path (Windows)'
        if: "matrix.os == 'windows-latest'"
@@ -153,7 +153,7 @@ jobs:
          npm run test:integration:sandbox:none -- --testTimeout=600000

      - name: 'Upload Artifact'
-        uses: 'actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02' # ratchet:actions/upload-artifact@v4
+        uses: 'actions/upload-artifact@v4'
        with:
          name: 'gemini-cli-${{ matrix.platform_name }}'
          path: 'dist/${{ matrix.platform_name }}/'
@@ -40,13 +40,13 @@ jobs:
    steps:
      - name: 'Generate GitHub App Token'
        id: 'generate_token'
-        uses: 'actions/create-github-app-token@fee1f7d63c2ff003460e3d139729b119787bc349' # ratchet:actions/create-github-app-token@v2
+        uses: 'actions/create-github-app-token@v2'
        with:
          app-id: '${{ secrets.APP_ID }}'
          private-key: '${{ secrets.PRIVATE_KEY }}'

      - name: 'Unassign inactive assignees'
-        uses: 'actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b' # ratchet:actions/github-script@v7
+        uses: 'actions/github-script@v7'
        env:
          DRY_RUN: '${{ inputs.dry_run }}'
        with:
@@ -323,8 +323,8 @@ fi

 #### Formatting

-To separately format the code in this project, run the following command from
-the root directory:
+To separately format the code in this project by running the following command
+from the root directory:

 ```bash
 npm run format
@@ -18,30 +18,6 @@ on GitHub.
 | [Preview](preview.md) | Experimental features ready for early feedback. |
 | [Stable](latest.md)   | Stable, recommended for general use.            |

-## Announcements: v0.35.0 - 2026-03-24
-
- **Customizable Keyboard Shortcuts:** Users can now customize their keyboard
-  shortcuts, including support for literal character keybindings and the
-  extended Kitty protocol
-  ([#21945](https://github.com/google-gemini/gemini-cli/pull/21945),
-  [#21972](https://github.com/google-gemini/gemini-cli/pull/21972) by
-  @scidomino).
- **Vim Mode Improvements:** Added missing motions (X, ~, r, f/F/t/T) and
-  yank/paste support with the unnamed register
-  ([#21932](https://github.com/google-gemini/gemini-cli/pull/21932),
-  [#22026](https://github.com/google-gemini/gemini-cli/pull/22026) by @aanari).
- **Tool Isolation and Sandboxing:** Introduced `SandboxManager` to isolate
-  process-spawning tools and added Linux bubblewrap/seccomp sandboxing support
-  ([#21774](https://github.com/google-gemini/gemini-cli/pull/21774),
-  [#22231](https://github.com/google-gemini/gemini-cli/pull/22231) by @galz10,
-  [#22680](https://github.com/google-gemini/gemini-cli/pull/22680) by
-  @DavidAPierce).
- **JIT Context Discovery:** Implemented Just-In-Time context discovery for file
-  system tools to improve model performance and accuracy
-  ([#22082](https://github.com/google-gemini/gemini-cli/pull/22082),
-  [#22736](https://github.com/google-gemini/gemini-cli/pull/22736) by
-  @SandyTao520).
-
 ## Announcements: v0.34.0 - 2026-03-17

 - **Plan Mode Enabled by Default:** Plan Mode is now enabled by default to help
@@ -1,6 +1,6 @@
-# Latest stable release: v0.35.1
+# Latest stable release: v0.34.0

-Released: March 26, 2026
+Released: March 17, 2026

 For most users, our latest stable release is the recommended release. Install
 the latest stable version with:
@@ -11,373 +11,474 @@ npm install -g @google/gemini-cli

 ## Highlights

- **Customizable Keyboard Shortcuts:** Significant improvements to input
-  flexibility with support for custom keybindings, literal character bindings,
-  and extended terminal protocol keys.
- **Vim Mode Enhancements:** Further refinement of the Vim modal editing
-  experience, adding common motions like \`X\`, \`~\`, \`r\`, and \`f/F/t/T\`,
-  along with yank and paste support.
- **Enhanced Security through Sandboxing:** Introduction of a unified
-  \`SandboxManager\` and integration of Linux-native sandboxing (bubblewrap and
-  seccomp) to isolate tool execution and improve system security.
- **JIT Context Discovery:** Improved performance and accuracy by enabling
-  Just-In-Time context loading for file system tools, ensuring the model has the
-  most relevant information without overwhelming the context.
- **Subagent & Performance Updates:** Subagents are now enabled by default,
-  supported by a model-driven parallel tool scheduler and code splitting for
-  faster startup and more efficient task execution.
+- **Plan Mode Enabled by Default**: The comprehensive planning capability is now
+  enabled by default, allowing for better structured task management and
+  execution.
+- **Enhanced Sandboxing Capabilities**: Added support for native gVisor (runsc)
+  sandboxing as well as experimental LXC container sandboxing to provide more
+  robust and isolated execution environments.
+- **Improved Loop Detection & Recovery**: Implemented iterative loop detection
+  and model feedback mechanisms to prevent the CLI from getting stuck in
+  repetitive actions.
+- **Customizable UI Elements**: You can now configure a custom footer using the
+  new `/footer` command, and enjoy standardized semantic focus colors for better
+  history visibility.
+- **Extensive Subagent Updates**: Refinements across the tracker visualization
+  tools, background process logging, and broader fallback support for models in
+  tool execution scenarios.

 ## What's Changed

- feat(cli): customizable keyboard shortcuts by @scidomino in
-  [#21945](https://github.com/google-gemini/gemini-cli/pull/21945)
- feat(core): Thread `AgentLoopContext` through core. by @joshualitt in
-  [#21944](https://github.com/google-gemini/gemini-cli/pull/21944)
- chore(release): bump version to 0.35.0-nightly.20260311.657f19c1f by
+- feat(cli): add chat resume footer on session quit by @lordshashank in
+  [#20667](https://github.com/google-gemini/gemini-cli/pull/20667)
+- Support bold and other styles in svg snapshots by @jacob314 in
+  [#20937](https://github.com/google-gemini/gemini-cli/pull/20937)
+- fix(core): increase A2A agent timeout to 30 minutes by @adamfweidman in
+  [#21028](https://github.com/google-gemini/gemini-cli/pull/21028)
+- Cleanup old branches. by @jacob314 in
+  [#19354](https://github.com/google-gemini/gemini-cli/pull/19354)
+- chore(release): bump version to 0.34.0-nightly.20260303.34f0c1538 by
  @gemini-cli-robot in
-  [#21966](https://github.com/google-gemini/gemini-cli/pull/21966)
- refactor(a2a): remove legacy CoreToolScheduler by @adamfweidman in
-  [#21955](https://github.com/google-gemini/gemini-cli/pull/21955)
- feat(ui): add missing vim mode motions (X, ~, r, f/F/t/T, df/dt and friends)
-  by @aanari in [#21932](https://github.com/google-gemini/gemini-cli/pull/21932)
- Feat/retry fetch notifications by @aishaneeshah in
-  [#21813](https://github.com/google-gemini/gemini-cli/pull/21813)
- fix(core): remove OAuth check from handle fallback and clean up stray file by
-  @sehoon38 in [#21962](https://github.com/google-gemini/gemini-cli/pull/21962)
- feat(cli): support literal character keybindings and extended Kitty protocol
-  keys by @scidomino in
-  [#21972](https://github.com/google-gemini/gemini-cli/pull/21972)
- fix(ui): clamp cursor to last char after all NORMAL mode deletes by @aanari in
-  [#21973](https://github.com/google-gemini/gemini-cli/pull/21973)
- test(core): add missing tests for prompts/utils.ts by @krrishverma1805-web in
-  [#19941](https://github.com/google-gemini/gemini-cli/pull/19941)
- fix(cli): allow scrolling keys in copy mode (Ctrl+S selection mode) by
-  @nsalerni in [#19933](https://github.com/google-gemini/gemini-cli/pull/19933)
- docs(cli): add custom keybinding documentation by @scidomino in
-  [#21980](https://github.com/google-gemini/gemini-cli/pull/21980)
- docs: fix misleading YOLO mode description in defaultApprovalMode by
-  @Gyanranjan-Priyam in
-  [#21878](https://github.com/google-gemini/gemini-cli/pull/21878)
- fix: clean up /clear and /resume by @jackwotherspoon in
-  [#22007](https://github.com/google-gemini/gemini-cli/pull/22007)
- fix(core)#20941: reap orphaned descendant processes on PTY abort by @manavmax
-  in [#21124](https://github.com/google-gemini/gemini-cli/pull/21124)
- fix(core): update language detection to use LSP 3.18 identifiers by @yunaseoul
-  in [#21931](https://github.com/google-gemini/gemini-cli/pull/21931)
- feat(cli): support removing keybindings via '-' prefix by @scidomino in
-  [#22042](https://github.com/google-gemini/gemini-cli/pull/22042)
- feat(policy): add --admin-policy flag for supplemental admin policies by
-  @galz10 in [#20360](https://github.com/google-gemini/gemini-cli/pull/20360)
- merge duplicate imports packages/cli/src subtask1 by @Nixxx19 in
-  [#22040](https://github.com/google-gemini/gemini-cli/pull/22040)
- perf(core): parallelize user quota and experiments fetching in refreshAuth by
-  @sehoon38 in [#21648](https://github.com/google-gemini/gemini-cli/pull/21648)
- Changelog for v0.34.0-preview.0 by @gemini-cli-robot in
-  [#21965](https://github.com/google-gemini/gemini-cli/pull/21965)
- Changelog for v0.33.0 by @gemini-cli-robot in
-  [#21967](https://github.com/google-gemini/gemini-cli/pull/21967)
- fix(core): handle EISDIR in robustRealpath on Windows by @sehoon38 in
-  [#21984](https://github.com/google-gemini/gemini-cli/pull/21984)
- feat(core): include initiationMethod in conversation interaction telemetry by
-  @yunaseoul in [#22054](https://github.com/google-gemini/gemini-cli/pull/22054)
- feat(ui): add vim yank/paste (y/p/P) with unnamed register by @aanari in
-  [#22026](https://github.com/google-gemini/gemini-cli/pull/22026)
- fix(core): enable numerical routing for api key users by @sehoon38 in
-  [#21977](https://github.com/google-gemini/gemini-cli/pull/21977)
- feat(telemetry): implement retry attempt telemetry for network related retries
-  by @aishaneeshah in
-  [#22027](https://github.com/google-gemini/gemini-cli/pull/22027)
- fix(policy): remove unnecessary escapeRegex from pattern builders by
-  @spencer426 in
-  [#21921](https://github.com/google-gemini/gemini-cli/pull/21921)
- fix(core): preserve dynamic tool descriptions on session resume by @sehoon38
-  in [#18835](https://github.com/google-gemini/gemini-cli/pull/18835)
- chore: allow 'gemini-3.1' in sensitive keyword linter by @scidomino in
-  [#22065](https://github.com/google-gemini/gemini-cli/pull/22065)
- feat(core): support custom base URL via env vars by @junaiddshaukat in
-  [#21561](https://github.com/google-gemini/gemini-cli/pull/21561)
- merge duplicate imports packages/cli/src subtask2 by @Nixxx19 in
-  [#22051](https://github.com/google-gemini/gemini-cli/pull/22051)
- fix(core): silently retry API errors up to 3 times before halting session by
-  @spencer426 in
-  [#21989](https://github.com/google-gemini/gemini-cli/pull/21989)
- feat(core): simplify subagent success UI and improve early termination display
+  [#21034](https://github.com/google-gemini/gemini-cli/pull/21034)
+- feat(ui): standardize semantic focus colors and enhance history visibility by
+  @keithguerin in
+  [#20745](https://github.com/google-gemini/gemini-cli/pull/20745)
+- fix: merge duplicate imports in packages/core (3/4) by @Nixxx19 in
+  [#20928](https://github.com/google-gemini/gemini-cli/pull/20928)
+- Add extra safety checks for proto pollution by @jacob314 in
+  [#20396](https://github.com/google-gemini/gemini-cli/pull/20396)
+- feat(core): Add tracker CRUD tools & visualization by @anj-s in
+  [#19489](https://github.com/google-gemini/gemini-cli/pull/19489)
+- Revert "fix(ui): persist expansion in AskUser dialog when navigating options"
+  by @jacob314 in
+  [#21042](https://github.com/google-gemini/gemini-cli/pull/21042)
+- Changelog for v0.33.0-preview.0 by @gemini-cli-robot in
+  [#21030](https://github.com/google-gemini/gemini-cli/pull/21030)
+- fix: model persistence for all scenarios by @sripasg in
+  [#21051](https://github.com/google-gemini/gemini-cli/pull/21051)
+- chore/release: bump version to 0.34.0-nightly.20260304.28af4e127 by
+  @gemini-cli-robot in
+  [#21054](https://github.com/google-gemini/gemini-cli/pull/21054)
+- Consistently guard restarts against concurrent auto updates by @scidomino in
+  [#21016](https://github.com/google-gemini/gemini-cli/pull/21016)
+- Defensive coding to reduce the risk of Maximum update depth errors by
+  @jacob314 in [#20940](https://github.com/google-gemini/gemini-cli/pull/20940)
+- fix(cli): Polish shell autocomplete rendering to be a little more shell native
+  feeling. by @jacob314 in
+  [#20931](https://github.com/google-gemini/gemini-cli/pull/20931)
+- Docs: Update plan mode docs by @jkcinouye in
+  [#19682](https://github.com/google-gemini/gemini-cli/pull/19682)
+- fix(mcp): Notifications/tools/list_changed support not working by @jacob314 in
+  [#21050](https://github.com/google-gemini/gemini-cli/pull/21050)
+- fix(cli): register extension lifecycle events in DebugProfiler by
+  @fayerman-source in
+  [#20101](https://github.com/google-gemini/gemini-cli/pull/20101)
+- chore(dev): update vscode settings for typescriptreact by @rohit-4321 in
+  [#19907](https://github.com/google-gemini/gemini-cli/pull/19907)
+- fix(cli): enable multi-arch docker builds for sandbox by @ru-aish in
+  [#19821](https://github.com/google-gemini/gemini-cli/pull/19821)
+- Changelog for v0.32.0 by @gemini-cli-robot in
+  [#21033](https://github.com/google-gemini/gemini-cli/pull/21033)
+- Changelog for v0.33.0-preview.1 by @gemini-cli-robot in
+  [#21058](https://github.com/google-gemini/gemini-cli/pull/21058)
+- feat(core): improve @scripts/copy_files.js autocomplete to prioritize
+  filenames by @sehoon38 in
+  [#21064](https://github.com/google-gemini/gemini-cli/pull/21064)
+- feat(sandbox): add experimental LXC container sandbox support by @h30s in
+  [#20735](https://github.com/google-gemini/gemini-cli/pull/20735)
+- feat(evals): add overall pass rate row to eval nightly summary table by
+  @gundermanc in
+  [#20905](https://github.com/google-gemini/gemini-cli/pull/20905)
+- feat(telemetry): include language in telemetry and fix accepted lines
+  computation by @gundermanc in
+  [#21126](https://github.com/google-gemini/gemini-cli/pull/21126)
+- Changelog for v0.32.1 by @gemini-cli-robot in
+  [#21055](https://github.com/google-gemini/gemini-cli/pull/21055)
+- feat(core): add robustness tests, logging, and metrics for CodeAssistServer
+  SSE parsing by @yunaseoul in
+  [#21013](https://github.com/google-gemini/gemini-cli/pull/21013)
+- feat: add issue assignee workflow by @kartikangiras in
+  [#21003](https://github.com/google-gemini/gemini-cli/pull/21003)
+- fix: improve error message when OAuth succeeds but project ID is required by
+  @Nixxx19 in [#21070](https://github.com/google-gemini/gemini-cli/pull/21070)
+- feat(loop-reduction): implement iterative loop detection and model feedback by
+  @aishaneeshah in
+  [#20763](https://github.com/google-gemini/gemini-cli/pull/20763)
+- chore(github): require prompt approvers for agent prompt files by @gundermanc
+  in [#20896](https://github.com/google-gemini/gemini-cli/pull/20896)
+- Docs: Create tools reference by @jkcinouye in
+  [#19470](https://github.com/google-gemini/gemini-cli/pull/19470)
+- fix(core, a2a-server): prevent hang during OAuth in non-interactive sessions
+  by @spencer426 in
+  [#21045](https://github.com/google-gemini/gemini-cli/pull/21045)
+- chore(cli): enable deprecated settings removal by default by @yashodipmore in
+  [#20682](https://github.com/google-gemini/gemini-cli/pull/20682)
+- feat(core): Disable fast ack helper for hints. by @joshualitt in
+  [#21011](https://github.com/google-gemini/gemini-cli/pull/21011)
+- fix(ui): suppress redundant failure note when tool error note is shown by
+  @NTaylorMullen in
+  [#21078](https://github.com/google-gemini/gemini-cli/pull/21078)
+- docs: document planning workflows with Conductor example by @jerop in
+  [#21166](https://github.com/google-gemini/gemini-cli/pull/21166)
+- feat(release): ship esbuild bundle in npm package by @genneth in
+  [#19171](https://github.com/google-gemini/gemini-cli/pull/19171)
+- fix(extensions): preserve symlinks in extension source path while enforcing
+  folder trust by @galz10 in
+  [#20867](https://github.com/google-gemini/gemini-cli/pull/20867)
+- fix(cli): defer tool exclusions to policy engine in non-interactive mode by
+  @EricRahm in [#20639](https://github.com/google-gemini/gemini-cli/pull/20639)
+- fix(ui): removed double padding on rendered content by @devr0306 in
+  [#21029](https://github.com/google-gemini/gemini-cli/pull/21029)
+- fix(core): truncate excessively long lines in grep search output by
+  @gundermanc in
+  [#21147](https://github.com/google-gemini/gemini-cli/pull/21147)
+- feat: add custom footer configuration via `/footer` by @jackwotherspoon in
+  [#19001](https://github.com/google-gemini/gemini-cli/pull/19001)
+- perf(core): fix OOM crash in long-running sessions by @WizardsForgeGames in
+  [#19608](https://github.com/google-gemini/gemini-cli/pull/19608)
+- refactor(cli): categorize built-in themes into dark/ and light/ directories by
+  @JayadityaGit in
+  [#18634](https://github.com/google-gemini/gemini-cli/pull/18634)
+- fix(core): explicitly allow codebase_investigator and cli_help in read-only
+  mode by @Adib234 in
+  [#21157](https://github.com/google-gemini/gemini-cli/pull/21157)
+- test: add browser agent integration tests by @kunal-10-cloud in
+  [#21151](https://github.com/google-gemini/gemini-cli/pull/21151)
+- fix(cli): fix enabling kitty codes on Windows Terminal by @scidomino in
+  [#21136](https://github.com/google-gemini/gemini-cli/pull/21136)
+- refactor(core): extract shared OAuth flow primitives from MCPOAuthProvider by
+  @SandyTao520 in
+  [#20895](https://github.com/google-gemini/gemini-cli/pull/20895)
+- fix(ui): add partial output to cancelled shell UI by @devr0306 in
+  [#21178](https://github.com/google-gemini/gemini-cli/pull/21178)
+- fix(cli): replace hardcoded keybinding strings with dynamic formatters by
+  @scidomino in [#21159](https://github.com/google-gemini/gemini-cli/pull/21159)
+- DOCS: Update quota and pricing page by @g-samroberts in
+  [#21194](https://github.com/google-gemini/gemini-cli/pull/21194)
+- feat(telemetry): implement Clearcut logging for startup statistics by
+  @yunaseoul in [#21172](https://github.com/google-gemini/gemini-cli/pull/21172)
+- feat(triage): add area/documentation to issue triage by @g-samroberts in
+  [#21222](https://github.com/google-gemini/gemini-cli/pull/21222)
+- Fix so shell calls are formatted by @jacob314 in
+  [#21237](https://github.com/google-gemini/gemini-cli/pull/21237)
+- feat(cli): add native gVisor (runsc) sandboxing support by @Zheyuan-Lin in
+  [#21062](https://github.com/google-gemini/gemini-cli/pull/21062)
+- docs: use absolute paths for internal links in plan-mode.md by @jerop in
+  [#21299](https://github.com/google-gemini/gemini-cli/pull/21299)
+- fix(core): prevent unhandled AbortError crash during stream loop detection by
+  @7hokerz in [#21123](https://github.com/google-gemini/gemini-cli/pull/21123)
+- fix:reorder env var redaction checks to scan values first by @kartikangiras in
+  [#21059](https://github.com/google-gemini/gemini-cli/pull/21059)
+- fix(acp): rename --experimental-acp to --acp & remove Zed-specific refrences
+  by @skeshive in
+  [#21171](https://github.com/google-gemini/gemini-cli/pull/21171)
+- feat(core): fallback to 2.5 models with no access for toolcalls by @sehoon38
+  in [#21283](https://github.com/google-gemini/gemini-cli/pull/21283)
+- test(core): improve testing for API request/response parsing by @sehoon38 in
+  [#21227](https://github.com/google-gemini/gemini-cli/pull/21227)
+- docs(links): update docs-writer skill and fix broken link by @g-samroberts in
+  [#21314](https://github.com/google-gemini/gemini-cli/pull/21314)
+- Fix code colorizer ansi escape bug. by @jacob314 in
+  [#21321](https://github.com/google-gemini/gemini-cli/pull/21321)
+- remove wildcard behavior on keybindings by @scidomino in
+  [#21315](https://github.com/google-gemini/gemini-cli/pull/21315)
+- feat(acp): Add support for AI Gateway auth by @skeshive in
+  [#21305](https://github.com/google-gemini/gemini-cli/pull/21305)
+- fix(theme): improve theme color contrast for macOS Terminal.app by @clocky in
+  [#21175](https://github.com/google-gemini/gemini-cli/pull/21175)
+- feat (core): Implement tracker related SI changes by @anj-s in
+  [#19964](https://github.com/google-gemini/gemini-cli/pull/19964)
+- Changelog for v0.33.0-preview.2 by @gemini-cli-robot in
+  [#21333](https://github.com/google-gemini/gemini-cli/pull/21333)
+- Changelog for v0.33.0-preview.3 by @gemini-cli-robot in
+  [#21347](https://github.com/google-gemini/gemini-cli/pull/21347)
+- docs: format release times as HH:MM UTC by @pavan-sh in
+  [#20726](https://github.com/google-gemini/gemini-cli/pull/20726)
+- fix(cli): implement --all flag for extensions uninstall by @sehoon38 in
+  [#21319](https://github.com/google-gemini/gemini-cli/pull/21319)
+- docs: fix incorrect relative links to command reference by @kanywst in
+  [#20964](https://github.com/google-gemini/gemini-cli/pull/20964)
+- documentiong ensures ripgrep by @Jatin24062005 in
+  [#21298](https://github.com/google-gemini/gemini-cli/pull/21298)
+- fix(core): handle AbortError thrown during processTurn by @MumuTW in
+  [#21296](https://github.com/google-gemini/gemini-cli/pull/21296)
+- docs(cli): clarify ! command output visibility in shell commands tutorial by
+  @MohammedADev in
+  [#21041](https://github.com/google-gemini/gemini-cli/pull/21041)
+- fix: logic for task tracker strategy and remove tracker tools by @anj-s in
+  [#21355](https://github.com/google-gemini/gemini-cli/pull/21355)
+- fix(partUtils): display media type and size for inline data parts by @Aboudjem
+  in [#21358](https://github.com/google-gemini/gemini-cli/pull/21358)
+- Fix(accessibility): add screen reader support to RewindViewer by @Famous077 in
+  [#20750](https://github.com/google-gemini/gemini-cli/pull/20750)
+- fix(hooks): propagate stopHookActive in AfterAgent retry path (#20426) by
+  @Aarchi-07 in [#20439](https://github.com/google-gemini/gemini-cli/pull/20439)
+- fix(core): deduplicate GEMINI.md files by device/inode on case-insensitive
+  filesystems (#19904) by @Nixxx19 in
+  [#19915](https://github.com/google-gemini/gemini-cli/pull/19915)
+- feat(core): add concurrency safety guidance for subagent delegation (#17753)
  by @abhipatel12 in
-  [#21917](https://github.com/google-gemini/gemini-cli/pull/21917)
- merge duplicate imports packages/cli/src subtask3 by @Nixxx19 in
-  [#22056](https://github.com/google-gemini/gemini-cli/pull/22056)
- fix(hooks): fix BeforeAgent/AfterAgent inconsistencies (#18514) by @krishdef7
-  in [#21383](https://github.com/google-gemini/gemini-cli/pull/21383)
- feat(core): implement SandboxManager interface and config schema by @galz10 in
-  [#21774](https://github.com/google-gemini/gemini-cli/pull/21774)
- docs: document npm deprecation warnings as safe to ignore by @h30s in
-  [#20692](https://github.com/google-gemini/gemini-cli/pull/20692)
- fix: remove status/need-triage from maintainer-only issues by @SandyTao520 in
-  [#22044](https://github.com/google-gemini/gemini-cli/pull/22044)
- fix(core): propagate subagent context to policy engine by @NTaylorMullen in
-  [#22086](https://github.com/google-gemini/gemini-cli/pull/22086)
- fix(cli): resolve skill uninstall failure when skill name is updated by
-  @NTaylorMullen in
-  [#22085](https://github.com/google-gemini/gemini-cli/pull/22085)
- docs(plan): clarify interactive plan editing with Ctrl+X by @Adib234 in
-  [#22076](https://github.com/google-gemini/gemini-cli/pull/22076)
- fix(policy): ensure user policies are loaded when policyPaths is empty by
-  @NTaylorMullen in
-  [#22090](https://github.com/google-gemini/gemini-cli/pull/22090)
- Docs: Add documentation for model steering (experimental). by @jkcinouye in
-  [#21154](https://github.com/google-gemini/gemini-cli/pull/21154)
- Add issue for automated changelogs by @g-samroberts in
-  [#21912](https://github.com/google-gemini/gemini-cli/pull/21912)
- fix(core): secure argsPattern and revert WEB_FETCH_TOOL_NAME escalation by
+  [#21278](https://github.com/google-gemini/gemini-cli/pull/21278)
+- feat(ui): dynamically generate all keybinding hints by @scidomino in
+  [#21346](https://github.com/google-gemini/gemini-cli/pull/21346)
+- feat(core): implement unified KeychainService and migrate token storage by
+  @ehedlund in [#21344](https://github.com/google-gemini/gemini-cli/pull/21344)
+- fix(cli): gracefully handle --resume when no sessions exist by @SandyTao520 in
+  [#21429](https://github.com/google-gemini/gemini-cli/pull/21429)
+- fix(plan): keep approved plan during chat compression by @ruomengz in
+  [#21284](https://github.com/google-gemini/gemini-cli/pull/21284)
+- feat(core): implement generic CacheService and optimize setupUser by @sehoon38
+  in [#21374](https://github.com/google-gemini/gemini-cli/pull/21374)
+- Update quota and pricing documentation with subscription tiers by @srithreepo
+  in [#21351](https://github.com/google-gemini/gemini-cli/pull/21351)
+- fix(core): append correct OTLP paths for HTTP exporters by
+  @sebastien-prudhomme in
+  [#16836](https://github.com/google-gemini/gemini-cli/pull/16836)
+- Changelog for v0.33.0-preview.4 by @gemini-cli-robot in
+  [#21354](https://github.com/google-gemini/gemini-cli/pull/21354)
+- feat(cli): implement dot-prefixing for slash command conflicts by @ehedlund in
+  [#20979](https://github.com/google-gemini/gemini-cli/pull/20979)
+- refactor(core): standardize MCP tool naming to mcp\_ FQN format by
+  @abhipatel12 in
+  [#21425](https://github.com/google-gemini/gemini-cli/pull/21425)
+- feat(cli): hide gemma settings from display and mark as experimental by
+  @abhipatel12 in
+  [#21471](https://github.com/google-gemini/gemini-cli/pull/21471)
+- feat(skills): refine string-reviewer guidelines and description by @clocky in
+  [#20368](https://github.com/google-gemini/gemini-cli/pull/20368)
+- fix(core): whitelist TERM and COLORTERM in environment sanitization by
+  @deadsmash07 in
+  [#20514](https://github.com/google-gemini/gemini-cli/pull/20514)
+- fix(billing): fix overage strategy lifecycle and settings integration by
+  @gsquared94 in
+  [#21236](https://github.com/google-gemini/gemini-cli/pull/21236)
+- fix: expand paste placeholders in TextInput on submit by @Jefftree in
+  [#19946](https://github.com/google-gemini/gemini-cli/pull/19946)
+- fix(core): add in-memory cache to ChatRecordingService to prevent OOM by
+  @SandyTao520 in
+  [#21502](https://github.com/google-gemini/gemini-cli/pull/21502)
+- feat(cli): overhaul thinking UI by @keithguerin in
+  [#18725](https://github.com/google-gemini/gemini-cli/pull/18725)
+- fix(ui): unify Ctrl+O expansion hint experience across buffer modes by
+  @jwhelangoog in
+  [#21474](https://github.com/google-gemini/gemini-cli/pull/21474)
+- fix(cli): correct shell height reporting by @jacob314 in
+  [#21492](https://github.com/google-gemini/gemini-cli/pull/21492)
+- Make test suite pass when the GEMINI_SYSTEM_MD env variable or
+  GEMINI_WRITE_SYSTEM_MD variable happens to be set locally/ by @jacob314 in
+  [#21480](https://github.com/google-gemini/gemini-cli/pull/21480)
+- Disallow underspecified types by @gundermanc in
+  [#21485](https://github.com/google-gemini/gemini-cli/pull/21485)
+- refactor(cli): standardize on 'reload' verb for all components by @keithguerin
+  in [#20654](https://github.com/google-gemini/gemini-cli/pull/20654)
+- feat(cli): Invert quota language to 'percent used' by @keithguerin in
+  [#20100](https://github.com/google-gemini/gemini-cli/pull/20100)
+- Docs: Add documentation for notifications (experimental)(macOS) by @jkcinouye
+  in [#21163](https://github.com/google-gemini/gemini-cli/pull/21163)
+- Code review comments as a pr by @jacob314 in
+  [#21209](https://github.com/google-gemini/gemini-cli/pull/21209)
+- feat(cli): unify /chat and /resume command UX by @LyalinDotCom in
+  [#20256](https://github.com/google-gemini/gemini-cli/pull/20256)
+- docs: fix typo 'allowslisted' -> 'allowlisted' in mcp-server.md by
+  @Gyanranjan-Priyam in
+  [#21665](https://github.com/google-gemini/gemini-cli/pull/21665)
+- fix(core): display actual graph output in tracker_visualize tool by @anj-s in
+  [#21455](https://github.com/google-gemini/gemini-cli/pull/21455)
+- fix(core): sanitize SSE-corrupted JSON and domain strings in error
+  classification by @gsquared94 in
+  [#21702](https://github.com/google-gemini/gemini-cli/pull/21702)
+- Docs: Make documentation links relative by @diodesign in
+  [#21490](https://github.com/google-gemini/gemini-cli/pull/21490)
+- feat(cli): expose /tools desc as explicit subcommand for discoverability by
+  @aworki in [#21241](https://github.com/google-gemini/gemini-cli/pull/21241)
+- feat(cli): add /compact alias for /compress command by @jackwotherspoon in
+  [#21711](https://github.com/google-gemini/gemini-cli/pull/21711)
+- feat(plan): enable Plan Mode by default by @jerop in
+  [#21713](https://github.com/google-gemini/gemini-cli/pull/21713)
+- feat(core): Introduce `AgentLoopContext`. by @joshualitt in
+  [#21198](https://github.com/google-gemini/gemini-cli/pull/21198)
+- fix(core): resolve symlinks for non-existent paths during validation by
+  @Adib234 in [#21487](https://github.com/google-gemini/gemini-cli/pull/21487)
+- docs: document tool exclusion from memory via deny policy by @Abhijit-2592 in
+  [#21428](https://github.com/google-gemini/gemini-cli/pull/21428)
+- perf(core): cache loadApiKey to reduce redundant keychain access by @sehoon38
+  in [#21520](https://github.com/google-gemini/gemini-cli/pull/21520)
+- feat(cli): implement /upgrade command by @sehoon38 in
+  [#21511](https://github.com/google-gemini/gemini-cli/pull/21511)
+- Feat/browser agent progress emission by @kunal-10-cloud in
+  [#21218](https://github.com/google-gemini/gemini-cli/pull/21218)
+- fix(settings): display objects as JSON instead of [object Object] by
+  @Zheyuan-Lin in
+  [#21458](https://github.com/google-gemini/gemini-cli/pull/21458)
+- Unmarshall update by @DavidAPierce in
+  [#21721](https://github.com/google-gemini/gemini-cli/pull/21721)
+- Update mcp's list function to check for disablement. by @DavidAPierce in
+  [#21148](https://github.com/google-gemini/gemini-cli/pull/21148)
+- robustness(core): static checks to validate history is immutable by @jacob314
+  in [#21228](https://github.com/google-gemini/gemini-cli/pull/21228)
+- refactor(cli): better react patterns for BaseSettingsDialog by @psinha40898 in
+  [#21206](https://github.com/google-gemini/gemini-cli/pull/21206)
+- feat(security): implement robust IP validation and safeFetch foundation by
+  @alisa-alisa in
+  [#21401](https://github.com/google-gemini/gemini-cli/pull/21401)
+- feat(core): improve subagent result display by @joshualitt in
+  [#20378](https://github.com/google-gemini/gemini-cli/pull/20378)
+- docs: fix broken markdown syntax and anchor links in /tools by @campox747 in
+  [#20902](https://github.com/google-gemini/gemini-cli/pull/20902)
+- feat(policy): support subagent-specific policies in TOML by @akh64bit in
+  [#21431](https://github.com/google-gemini/gemini-cli/pull/21431)
+- Add script to speed up reviewing PRs adding a worktree. by @jacob314 in
+  [#21748](https://github.com/google-gemini/gemini-cli/pull/21748)
+- fix(core): prevent infinite recursion in symlink resolution by @Adib234 in
+  [#21750](https://github.com/google-gemini/gemini-cli/pull/21750)
+- fix(docs): fix headless mode docs by @ame2en in
+  [#21287](https://github.com/google-gemini/gemini-cli/pull/21287)
+- feat/redesign header compact by @jacob314 in
+  [#20922](https://github.com/google-gemini/gemini-cli/pull/20922)
+- refactor: migrate to useKeyMatchers hook by @scidomino in
+  [#21753](https://github.com/google-gemini/gemini-cli/pull/21753)
+- perf(cli): cache loadSettings to reduce redundant disk I/O at startup by
+  @sehoon38 in [#21521](https://github.com/google-gemini/gemini-cli/pull/21521)
+- fix(core): resolve Windows line ending and path separation bugs across CLI by
+  @muhammadusman586 in
+  [#21068](https://github.com/google-gemini/gemini-cli/pull/21068)
+- docs: fix heading formatting in commands.md and phrasing in tools-api.md by
+  @campox747 in [#20679](https://github.com/google-gemini/gemini-cli/pull/20679)
+- refactor(ui): unify keybinding infrastructure and support string
+  initialization by @scidomino in
+  [#21776](https://github.com/google-gemini/gemini-cli/pull/21776)
+- Add support for updating extension sources and names by @chrstnb in
+  [#21715](https://github.com/google-gemini/gemini-cli/pull/21715)
+- fix(core): handle GUI editor non-zero exit codes gracefully by @reyyanxahmed
+  in [#20376](https://github.com/google-gemini/gemini-cli/pull/20376)
+- fix(core): destroy PTY on kill() and exception to prevent fd leak by @nbardy
+  in [#21693](https://github.com/google-gemini/gemini-cli/pull/21693)
+- fix(docs): update theme screenshots and add missing themes by @ashmod in
+  [#20689](https://github.com/google-gemini/gemini-cli/pull/20689)
+- refactor(cli): rename 'return' key to 'enter' internally by @scidomino in
+  [#21796](https://github.com/google-gemini/gemini-cli/pull/21796)
+- build(release): restrict npm bundling to non-stable tags by @sehoon38 in
+  [#21821](https://github.com/google-gemini/gemini-cli/pull/21821)
+- fix(core): override toolRegistry property for sub-agent schedulers by
+  @gsquared94 in
+  [#21766](https://github.com/google-gemini/gemini-cli/pull/21766)
+- fix(cli): make footer items equally spaced by @jacob314 in
+  [#21843](https://github.com/google-gemini/gemini-cli/pull/21843)
+- docs: clarify global policy rules application in plan mode by @jerop in
+  [#21864](https://github.com/google-gemini/gemini-cli/pull/21864)
+- fix(core): ensure correct flash model steering in plan mode implementation
+  phase by @jerop in
+  [#21871](https://github.com/google-gemini/gemini-cli/pull/21871)
+- fix(core): update @a2a-js/sdk to 0.3.11 by @adamfweidman in
+  [#21875](https://github.com/google-gemini/gemini-cli/pull/21875)
+- refactor(core): improve API response error logging when retry by @yunaseoul in
+  [#21784](https://github.com/google-gemini/gemini-cli/pull/21784)
+- fix(ui): handle headless execution in credits and upgrade dialogs by
+  @gsquared94 in
+  [#21850](https://github.com/google-gemini/gemini-cli/pull/21850)
+- fix(core): treat retryable errors with >5 min delay as terminal quota errors
+  by @gsquared94 in
+  [#21881](https://github.com/google-gemini/gemini-cli/pull/21881)
+- feat(telemetry): add specific PR, issue, and custom tracking IDs for GitHub
+  Actions by @cocosheng-g in
+  [#21129](https://github.com/google-gemini/gemini-cli/pull/21129)
+- feat(core): add OAuth2 Authorization Code auth provider for A2A agents by
+  @SandyTao520 in
+  [#21496](https://github.com/google-gemini/gemini-cli/pull/21496)
+- feat(cli): give visibility to /tools list command in the TUI and follow the
+  subcommand pattern of other commands by @JayadityaGit in
+  [#21213](https://github.com/google-gemini/gemini-cli/pull/21213)
+- Handle dirty worktrees better and warn about running scripts/review.sh on
+  untrusted code. by @jacob314 in
+  [#21791](https://github.com/google-gemini/gemini-cli/pull/21791)
+- feat(policy): support auto-add to policy by default and scoped persistence by
  @spencer426 in
-  [#22104](https://github.com/google-gemini/gemini-cli/pull/22104)
- feat(core): differentiate User-Agent for a2a-server and ACP clients by
-  @bdmorgan in [#22059](https://github.com/google-gemini/gemini-cli/pull/22059)
- refactor(core): extract ExecutionLifecycleService for tool backgrounding by
-  @adamfweidman in
-  [#21717](https://github.com/google-gemini/gemini-cli/pull/21717)
- feat: Display pending and confirming tool calls by @sripasg in
-  [#22106](https://github.com/google-gemini/gemini-cli/pull/22106)
- feat(browser): implement input blocker overlay during automation by
+  [#20361](https://github.com/google-gemini/gemini-cli/pull/20361)
+- fix(core): handle AbortError when ESC cancels tool execution by @PrasannaPal21
+  in [#20863](https://github.com/google-gemini/gemini-cli/pull/20863)
+- fix(release): Improve Patch Release Workflow Comments: Clearer Approval
+  Guidance by @jerop in
+  [#21894](https://github.com/google-gemini/gemini-cli/pull/21894)
+- docs: clarify telemetry setup and comprehensive data map by @jerop in
+  [#21879](https://github.com/google-gemini/gemini-cli/pull/21879)
+- feat(core): add per-model token usage to stream-json output by @yongruilin in
+  [#21839](https://github.com/google-gemini/gemini-cli/pull/21839)
+- docs: remove experimental badge from plan mode in sidebar by @jerop in
+  [#21906](https://github.com/google-gemini/gemini-cli/pull/21906)
+- fix(cli): prevent race condition in loop detection retry by @skyvanguard in
+  [#17916](https://github.com/google-gemini/gemini-cli/pull/17916)
+- Add behavioral evals for tracker by @anj-s in
+  [#20069](https://github.com/google-gemini/gemini-cli/pull/20069)
+- fix(auth): update terminology to 'sign in' and 'sign out' by @clocky in
+  [#20892](https://github.com/google-gemini/gemini-cli/pull/20892)
+- docs(mcp): standardize mcp tool fqn documentation by @abhipatel12 in
+  [#21664](https://github.com/google-gemini/gemini-cli/pull/21664)
+- fix(ui): prevent empty tool-group border stubs after filtering by @Aaxhirrr in
+  [#21852](https://github.com/google-gemini/gemini-cli/pull/21852)
+- make command names consistent by @scidomino in
+  [#21907](https://github.com/google-gemini/gemini-cli/pull/21907)
+- refactor: remove agent_card_requires_auth config flag by @adamfweidman in
+  [#21914](https://github.com/google-gemini/gemini-cli/pull/21914)
+- feat(a2a): implement standardized normalization and streaming reassembly by
+  @alisa-alisa in
+  [#21402](https://github.com/google-gemini/gemini-cli/pull/21402)
+- feat(cli): enable skill activation via slash commands by @NTaylorMullen in
+  [#21758](https://github.com/google-gemini/gemini-cli/pull/21758)
+- docs(cli): mention per-model token usage in stream-json result event by
+  @yongruilin in
+  [#21908](https://github.com/google-gemini/gemini-cli/pull/21908)
+- fix(plan): prevent plan truncation in approval dialog by supporting
+  unconstrained heights by @Adib234 in
+  [#21037](https://github.com/google-gemini/gemini-cli/pull/21037)
+- feat(a2a): switch from callback-based to event-driven tool scheduler by
+  @cocosheng-g in
+  [#21467](https://github.com/google-gemini/gemini-cli/pull/21467)
+- feat(voice): implement speech-friendly response formatter by @ayush31010 in
+  [#20989](https://github.com/google-gemini/gemini-cli/pull/20989)
+- feat: add pulsating blue border automation overlay to browser agent by
  @kunal-10-cloud in
-  [#21132](https://github.com/google-gemini/gemini-cli/pull/21132)
- fix: register themes on extension load not start by @jackwotherspoon in
-  [#22148](https://github.com/google-gemini/gemini-cli/pull/22148)
- feat(ui): Do not show Ultra users /upgrade hint (#22154) by @sehoon38 in
-  [#22156](https://github.com/google-gemini/gemini-cli/pull/22156)
- chore: remove unnecessary log for themes by @jackwotherspoon in
-  [#22165](https://github.com/google-gemini/gemini-cli/pull/22165)
- fix(core): resolve MCP tool FQN validation, schema export, and wildcards in
-  subagents by @abhipatel12 in
-  [#22069](https://github.com/google-gemini/gemini-cli/pull/22069)
- fix(cli): validate --model argument at startup by @JaisalJain in
-  [#21393](https://github.com/google-gemini/gemini-cli/pull/21393)
- fix(core): handle policy ALLOW for exit_plan_mode by @backnotprop in
-  [#21802](https://github.com/google-gemini/gemini-cli/pull/21802)
- feat(telemetry): add Clearcut instrumentation for AI credits billing events by
-  @gsquared94 in
-  [#22153](https://github.com/google-gemini/gemini-cli/pull/22153)
- feat(core): add google credentials provider for remote agents by @adamfweidman
-  in [#21024](https://github.com/google-gemini/gemini-cli/pull/21024)
- test(cli): add integration test for node deprecation warnings by @Nixxx19 in
-  [#20215](https://github.com/google-gemini/gemini-cli/pull/20215)
- feat(cli): allow safe tools to execute concurrently while agent is busy by
-  @spencer426 in
-  [#21988](https://github.com/google-gemini/gemini-cli/pull/21988)
- feat(core): implement model-driven parallel tool scheduler by @abhipatel12 in
-  [#21933](https://github.com/google-gemini/gemini-cli/pull/21933)
- update vulnerable deps by @scidomino in
-  [#22180](https://github.com/google-gemini/gemini-cli/pull/22180)
- fix(core): fix startup stats to use int values for timestamps and durations by
-  @yunaseoul in [#22201](https://github.com/google-gemini/gemini-cli/pull/22201)
- fix(core): prevent duplicate tool schemas for instantiated tools by
-  @abhipatel12 in
-  [#22204](https://github.com/google-gemini/gemini-cli/pull/22204)
- fix(core): add proxy routing support for remote A2A subagents by @adamfweidman
-  in [#22199](https://github.com/google-gemini/gemini-cli/pull/22199)
- fix(core/ide): add Antigravity CLI fallbacks by @apfine in
-  [#22030](https://github.com/google-gemini/gemini-cli/pull/22030)
- fix(browser): fix duplicate function declaration error in browser agent by
-  @gsquared94 in
-  [#22207](https://github.com/google-gemini/gemini-cli/pull/22207)
- feat(core): implement Stage 1 improvements for webfetch tool by @aishaneeshah
-  in [#21313](https://github.com/google-gemini/gemini-cli/pull/21313)
- Changelog for v0.34.0-preview.1 by @gemini-cli-robot in
-  [#22194](https://github.com/google-gemini/gemini-cli/pull/22194)
- perf(cli): enable code splitting and deferred UI loading by @sehoon38 in
-  [#22117](https://github.com/google-gemini/gemini-cli/pull/22117)
- fix: remove unused img.png from project root by @SandyTao520 in
-  [#22222](https://github.com/google-gemini/gemini-cli/pull/22222)
- docs(local model routing): add docs on how to use Gemma for local model
-  routing by @douglas-reid in
-  [#21365](https://github.com/google-gemini/gemini-cli/pull/21365)
- feat(a2a): enable native gRPC support and protocol routing by @alisa-alisa in
-  [#21403](https://github.com/google-gemini/gemini-cli/pull/21403)
- fix(cli): escape @ symbols on paste to prevent unintended file expansion by
-  @krishdef7 in [#21239](https://github.com/google-gemini/gemini-cli/pull/21239)
- feat(core): add trajectoryId to ConversationOffered telemetry by @yunaseoul in
-  [#22214](https://github.com/google-gemini/gemini-cli/pull/22214)
- docs: clarify that tools.core is an allowlist for ALL built-in tools by
-  @hobostay in [#18813](https://github.com/google-gemini/gemini-cli/pull/18813)
- docs(plan): document hooks with plan mode by @ruomengz in
-  [#22197](https://github.com/google-gemini/gemini-cli/pull/22197)
- Changelog for v0.33.1 by @gemini-cli-robot in
-  [#22235](https://github.com/google-gemini/gemini-cli/pull/22235)
- build(ci): fix false positive evals trigger on merge commits by @gundermanc in
-  [#22237](https://github.com/google-gemini/gemini-cli/pull/22237)
- fix(core): explicitly pass messageBus to policy engine for MCP tool saves by
-  @abhipatel12 in
-  [#22255](https://github.com/google-gemini/gemini-cli/pull/22255)
- feat(core): Fully migrate packages/core to AgentLoopContext. by @joshualitt in
-  [#22115](https://github.com/google-gemini/gemini-cli/pull/22115)
- feat(core): increase sub-agent turn and time limits by @bdmorgan in
-  [#22196](https://github.com/google-gemini/gemini-cli/pull/22196)
- feat(core): instrument file system tools for JIT context discovery by
-  @SandyTao520 in
-  [#22082](https://github.com/google-gemini/gemini-cli/pull/22082)
- refactor(ui): extract pure session browser utilities by @abhipatel12 in
-  [#22256](https://github.com/google-gemini/gemini-cli/pull/22256)
- fix(plan): Fix AskUser evals by @Adib234 in
-  [#22074](https://github.com/google-gemini/gemini-cli/pull/22074)
- fix(settings): prevent j/k navigation keys from intercepting edit buffer input
-  by @student-ankitpandit in
-  [#21865](https://github.com/google-gemini/gemini-cli/pull/21865)
- feat(skills): improve async-pr-review workflow and logging by @mattKorwel in
-  [#21790](https://github.com/google-gemini/gemini-cli/pull/21790)
- refactor(cli): consolidate getErrorMessage utility to core by @scidomino in
-  [#22190](https://github.com/google-gemini/gemini-cli/pull/22190)
- fix(core): show descriptive error messages when saving settings fails by
-  @afarber in [#18095](https://github.com/google-gemini/gemini-cli/pull/18095)
- docs(core): add authentication guide for remote subagents by @adamfweidman in
-  [#22178](https://github.com/google-gemini/gemini-cli/pull/22178)
- docs: overhaul subagents documentation and add /agents command by @abhipatel12
-  in [#22345](https://github.com/google-gemini/gemini-cli/pull/22345)
- refactor(ui): extract SessionBrowser static ui components by @abhipatel12 in
-  [#22348](https://github.com/google-gemini/gemini-cli/pull/22348)
- test: add Object.create context regression test and tool confirmation
-  integration test by @gsquared94 in
-  [#22356](https://github.com/google-gemini/gemini-cli/pull/22356)
- feat(tracker): return TodoList display for tracker tools by @anj-s in
-  [#22060](https://github.com/google-gemini/gemini-cli/pull/22060)
- feat(agent): add allowed domain restrictions for browser agent by
-  @cynthialong0-0 in
-  [#21775](https://github.com/google-gemini/gemini-cli/pull/21775)
- chore/release: bump version to 0.35.0-nightly.20260313.bb060d7a9 by
+  [#21173](https://github.com/google-gemini/gemini-cli/pull/21173)
+- Add extensionRegistryURI setting to change where the registry is read from by
+  @kevinjwang1 in
+  [#20463](https://github.com/google-gemini/gemini-cli/pull/20463)
+- fix: patch gaxios v7 Array.toString() stream corruption by @gsquared94 in
+  [#21884](https://github.com/google-gemini/gemini-cli/pull/21884)
+- fix: prevent hangs in non-interactive mode and improve agent guidance by
+  @cocosheng-g in
+  [#20893](https://github.com/google-gemini/gemini-cli/pull/20893)
+- Add ExtensionDetails dialog and support install by @chrstnb in
+  [#20845](https://github.com/google-gemini/gemini-cli/pull/20845)
+- chore/release: bump version to 0.34.0-nightly.20260310.4653b126f by
  @gemini-cli-robot in
-  [#22251](https://github.com/google-gemini/gemini-cli/pull/22251)
- Move keychain fallback to keychain service by @chrstnb in
-  [#22332](https://github.com/google-gemini/gemini-cli/pull/22332)
- feat(core): integrate SandboxManager to sandbox all process-spawning tools by
-  @galz10 in [#22231](https://github.com/google-gemini/gemini-cli/pull/22231)
- fix(cli): support CJK input and full Unicode scalar values in terminal
-  protocols by @scidomino in
-  [#22353](https://github.com/google-gemini/gemini-cli/pull/22353)
- Promote stable tests. by @gundermanc in
-  [#22253](https://github.com/google-gemini/gemini-cli/pull/22253)
- feat(tracker): add tracker policy by @anj-s in
-  [#22379](https://github.com/google-gemini/gemini-cli/pull/22379)
- feat(security): add disableAlwaysAllow setting to disable auto-approvals by
-  @galz10 in [#21941](https://github.com/google-gemini/gemini-cli/pull/21941)
- Revert "fix(cli): validate --model argument at startup" by @sehoon38 in
-  [#22378](https://github.com/google-gemini/gemini-cli/pull/22378)
- fix(mcp): handle equivalent root resource URLs in OAuth validation by @galz10
-  in [#20231](https://github.com/google-gemini/gemini-cli/pull/20231)
- fix(core): use session-specific temp directory for task tracker by @anj-s in
-  [#22382](https://github.com/google-gemini/gemini-cli/pull/22382)
- Fix issue where config was undefined. by @gundermanc in
-  [#22397](https://github.com/google-gemini/gemini-cli/pull/22397)
- fix(core): deduplicate project memory when JIT context is enabled by
-  @SandyTao520 in
-  [#22234](https://github.com/google-gemini/gemini-cli/pull/22234)
- feat(prompts): implement Topic-Action-Summary model for verbosity reduction by
-  @Abhijit-2592 in
-  [#21503](https://github.com/google-gemini/gemini-cli/pull/21503)
- fix(core): fix manual deletion of subagent histories by @abhipatel12 in
-  [#22407](https://github.com/google-gemini/gemini-cli/pull/22407)
- Add registry var by @kevinjwang1 in
-  [#22224](https://github.com/google-gemini/gemini-cli/pull/22224)
- Add ModelDefinitions to ModelConfigService by @kevinjwang1 in
-  [#22302](https://github.com/google-gemini/gemini-cli/pull/22302)
- fix(cli): improve command conflict handling for skills by @NTaylorMullen in
-  [#21942](https://github.com/google-gemini/gemini-cli/pull/21942)
- fix(core): merge user settings with extension-provided MCP servers by
-  @abhipatel12 in
-  [#22484](https://github.com/google-gemini/gemini-cli/pull/22484)
- fix(core): skip discovery for incomplete MCP configs and resolve merge race
-  condition by @abhipatel12 in
-  [#22494](https://github.com/google-gemini/gemini-cli/pull/22494)
- fix(automation): harden stale PR closer permissions and maintainer detection
-  by @bdmorgan in
-  [#22558](https://github.com/google-gemini/gemini-cli/pull/22558)
- fix(automation): evaluate staleness before checking protected labels by
-  @bdmorgan in [#22561](https://github.com/google-gemini/gemini-cli/pull/22561)
- feat(agent): replace the runtime npx for browser agent chrome devtool mcp with
-  pre-built bundle by @cynthialong0-0 in
-  [#22213](https://github.com/google-gemini/gemini-cli/pull/22213)
- perf: optimize TrackerService dependency checks by @anj-s in
-  [#22384](https://github.com/google-gemini/gemini-cli/pull/22384)
- docs(policy): remove trailing space from commandPrefix examples by @kawasin73
-  in [#22264](https://github.com/google-gemini/gemini-cli/pull/22264)
- fix(a2a-server): resolve unsafe assignment lint errors by @ehedlund in
-  [#22661](https://github.com/google-gemini/gemini-cli/pull/22661)
- fix: Adjust ToolGroupMessage filtering to hide Confirming and show Canceled
-  tool calls. by @sripasg in
-  [#22230](https://github.com/google-gemini/gemini-cli/pull/22230)
- Disallow Object.create() and reflect. by @gundermanc in
-  [#22408](https://github.com/google-gemini/gemini-cli/pull/22408)
- Guard pro model usage by @sehoon38 in
-  [#22665](https://github.com/google-gemini/gemini-cli/pull/22665)
- refactor(core): Creates AgentSession abstraction for consolidated agent
-  interface. by @mbleigh in
-  [#22270](https://github.com/google-gemini/gemini-cli/pull/22270)
- docs(changelog): remove internal commands from release notes by
-  @jackwotherspoon in
-  [#22529](https://github.com/google-gemini/gemini-cli/pull/22529)
- feat: enable subagents by @abhipatel12 in
-  [#22386](https://github.com/google-gemini/gemini-cli/pull/22386)
- feat(extensions): implement cryptographic integrity verification for extension
-  updates by @ehedlund in
-  [#21772](https://github.com/google-gemini/gemini-cli/pull/21772)
- feat(tracker): polish UI sorting and formatting by @anj-s in
-  [#22437](https://github.com/google-gemini/gemini-cli/pull/22437)
- Changelog for v0.34.0-preview.2 by @gemini-cli-robot in
-  [#22220](https://github.com/google-gemini/gemini-cli/pull/22220)
- fix(core): fix three JIT context bugs in read_file, read_many_files, and
-  memoryDiscovery by @SandyTao520 in
-  [#22679](https://github.com/google-gemini/gemini-cli/pull/22679)
- refactor(core): introduce InjectionService with source-aware injection and
-  backend-native background completions by @adamfweidman in
-  [#22544](https://github.com/google-gemini/gemini-cli/pull/22544)
- Linux sandbox bubblewrap by @DavidAPierce in
-  [#22680](https://github.com/google-gemini/gemini-cli/pull/22680)
- feat(core): increase thought signature retry resilience by @bdmorgan in
-  [#22202](https://github.com/google-gemini/gemini-cli/pull/22202)
- feat(core): implement Stage 2 security and consistency improvements for
-  web_fetch by @aishaneeshah in
-  [#22217](https://github.com/google-gemini/gemini-cli/pull/22217)
- refactor(core): replace positional execute params with ExecuteOptions bag by
-  @adamfweidman in
-  [#22674](https://github.com/google-gemini/gemini-cli/pull/22674)
- feat(config): enable JIT context loading by default by @SandyTao520 in
-  [#22736](https://github.com/google-gemini/gemini-cli/pull/22736)
- fix(config): ensure discoveryMaxDirs is passed to global config during
-  initialization by @kevin-ramdass in
-  [#22744](https://github.com/google-gemini/gemini-cli/pull/22744)
- fix(plan): allowlist get_internal_docs in Plan Mode by @Adib234 in
-  [#22668](https://github.com/google-gemini/gemini-cli/pull/22668)
- Changelog for v0.34.0-preview.3 by @gemini-cli-robot in
-  [#22393](https://github.com/google-gemini/gemini-cli/pull/22393)
- feat(core): add foundation for subagent tool isolation by @akh64bit in
-  [#22708](https://github.com/google-gemini/gemini-cli/pull/22708)
- fix(core): handle surrogate pairs in truncateString by @sehoon38 in
-  [#22754](https://github.com/google-gemini/gemini-cli/pull/22754)
- fix(cli): override j/k navigation in settings dialog to fix search input
-  conflict by @sehoon38 in
-  [#22800](https://github.com/google-gemini/gemini-cli/pull/22800)
- feat(plan): add 'All the above' option to multi-select AskUser questions by
-  @Adib234 in [#22365](https://github.com/google-gemini/gemini-cli/pull/22365)
- docs: distribute package-specific GEMINI.md context to each package by
-  @SandyTao520 in
-  [#22734](https://github.com/google-gemini/gemini-cli/pull/22734)
- fix(cli): clean up stale pasted placeholder metadata after word/line deletions
-  by @Jomak-x in
-  [#20375](https://github.com/google-gemini/gemini-cli/pull/20375)
- refactor(core): align JIT memory placement with tiered context model by
-  @SandyTao520 in
-  [#22766](https://github.com/google-gemini/gemini-cli/pull/22766)
- Linux sandbox seccomp by @DavidAPierce in
-  [#22815](https://github.com/google-gemini/gemini-cli/pull/22815)
- fix(patch): cherry-pick 4e5dfd0 to release/v0.35.0-preview.1-pr-23074 to patch
-  version v0.35.0-preview.1 and create version 0.35.0-preview.2 by
-  @gemini-cli-robot in
-  [#23134](https://github.com/google-gemini/gemini-cli/pull/23134)
- fix(patch): cherry-pick daf3691 to release/v0.35.0-preview.2-pr-23558 to patch
-  version v0.35.0-preview.2 and create version 0.35.0-preview.3 by
-  @gemini-cli-robot in
-  [#23565](https://github.com/google-gemini/gemini-cli/pull/23565)
- fix(patch): cherry-pick b2d6dc4 to release/v0.35.0-preview.4-pr-23546
+  [#21816](https://github.com/google-gemini/gemini-cli/pull/21816)
+- Changelog for v0.33.0-preview.13 by @gemini-cli-robot in
+  [#21927](https://github.com/google-gemini/gemini-cli/pull/21927)
+- fix(cli): stabilize prompt layout to prevent jumping when typing by
+  @NTaylorMullen in
+  [#21081](https://github.com/google-gemini/gemini-cli/pull/21081)
+- fix: preserve prompt text when cancelling streaming by @Nixxx19 in
+  [#21103](https://github.com/google-gemini/gemini-cli/pull/21103)
+- fix: robust UX for remote agent errors by @Shyam-Raghuwanshi in
+  [#20307](https://github.com/google-gemini/gemini-cli/pull/20307)
+- feat: implement background process logging and cleanup by @galz10 in
+  [#21189](https://github.com/google-gemini/gemini-cli/pull/21189)
+- Changelog for v0.33.0-preview.14 by @gemini-cli-robot in
+  [#21938](https://github.com/google-gemini/gemini-cli/pull/21938)
+- fix(patch): cherry-pick 45faf4d to release/v0.34.0-preview.0-pr-22148
  [CONFLICTS] by @gemini-cli-robot in
-  [#23585](https://github.com/google-gemini/gemini-cli/pull/23585)
+  [#22174](https://github.com/google-gemini/gemini-cli/pull/22174)
+- fix(patch): cherry-pick 8432bce to release/v0.34.0-preview.1-pr-22069 to patch
+  version v0.34.0-preview.1 and create version 0.34.0-preview.2 by
+  @gemini-cli-robot in
+  [#22205](https://github.com/google-gemini/gemini-cli/pull/22205)
+- fix(patch): cherry-pick 24adacd to release/v0.34.0-preview.2-pr-22332 to patch
+  version v0.34.0-preview.2 and create version 0.34.0-preview.3 by
+  @gemini-cli-robot in
+  [#22391](https://github.com/google-gemini/gemini-cli/pull/22391)
+- fix(patch): cherry-pick 48130eb to release/v0.34.0-preview.3-pr-22665 to patch
+  version v0.34.0-preview.3 and create version 0.34.0-preview.4 by
+  @gemini-cli-robot in
+  [#22719](https://github.com/google-gemini/gemini-cli/pull/22719)

 **Full Changelog**:
-https://github.com/google-gemini/gemini-cli/compare/v0.34.0...v0.35.1
+https://github.com/google-gemini/gemini-cli/compare/v0.33.2...v0.34.0
@@ -1,6 +1,6 @@
-# Preview release: v0.36.0-preview.3
+# Preview release: v0.35.0-preview.5

-Released: March 25, 2026
+Released: March 23, 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,370 +13,375 @@ npm install -g @google/gemini-cli@preview

 ## Highlights

- **Subagent Architecture Enhancements:** Significant updates to subagents,
-  including local execution, tool isolation, multi-registry discovery, dynamic
-  tool filtering, and JIT context injection.
- **Enhanced Security & Sandboxing:** Implemented strict macOS sandboxing using
-  Seatbelt allowlist, native Windows sandboxing, and support for
-  "Write-Protected" governance files.
- **Agent Context & State Management:** Introduced task tracker protocol
-  integration, 'blocked' statuses for tasks/todos, and `AgentSession` for
-  improved state management and replay semantics.
- **Browser & ACP Capabilities:** Added privacy consent for the browser agent,
-  sensitive action controls, improved API token usage metadata, and gateway auth
-  support via ACP.
- **CLI & UX Improvements:** Implemented a refreshed Composer layout, expanded
-  terminal fallback warnings, dynamic model resolution, and Git worktree support
-  for isolated parallel sessions.
+- **Subagents & Architecture Enhancements**: Enabled subagents and laid the
+  foundation for subagent tool isolation. Added proxy routing support for remote
+  A2A subagents and integrated `SandboxManager` to sandbox all process-spawning
+  tools.
+- **CLI & UI Improvements**: Introduced customizable keyboard shortcuts and
+  support for literal character keybindings. Added missing vim mode motions and
+  CJK input support. Enabled code splitting and deferred UI loading for improved
+  performance.
+- **Context & Tools Optimization**: JIT context loading is now enabled by
+  default with deduplication for project memory. Introduced a model-driven
+  parallel tool scheduler and allowed safe tools to execute concurrently.
+- **Security & Extensions**: Implemented cryptographic integrity verification
+  for extension updates and added a `disableAlwaysAllow` setting to prevent
+  auto-approvals for enhanced security.
+- **Plan Mode & Web Fetch Updates**: Added an 'All the above' option for
+  multi-select AskUser questions in Plan Mode. Rolled out Stage 1 and Stage 2
+  security and consistency improvements for the `web_fetch` tool.

 ## What's Changed

- fix(patch): cherry-pick 055ff92 to release/v0.36.0-preview.0-pr-23672 to patch
-  version v0.36.0-preview.0 and create version 0.36.0-preview.1 by
+- fix(patch): cherry-pick b2d6dc4 to release/v0.35.0-preview.4-pr-23546
+  [CONFLICTS] by @gemini-cli-robot in
+  [#23585](https://github.com/google-gemini/gemini-cli/pull/23585)
+- fix(patch): cherry-pick daf3691 to release/v0.35.0-preview.2-pr-23558 to patch
+  version v0.35.0-preview.2 and create version 0.35.0-preview.3 by
  @gemini-cli-robot in
-  [#23723](https://github.com/google-gemini/gemini-cli/pull/23723)
- Changelog for v0.33.2 by @gemini-cli-robot in
-  [#22730](https://github.com/google-gemini/gemini-cli/pull/22730)
- feat(core): multi-registry architecture and tool filtering for subagents by
-  @akh64bit in [#22712](https://github.com/google-gemini/gemini-cli/pull/22712)
- Changelog for v0.34.0-preview.4 by @gemini-cli-robot in
-  [#22752](https://github.com/google-gemini/gemini-cli/pull/22752)
- fix(devtools): use theme-aware text colors for console warnings and errors by
-  @SandyTao520 in
-  [#22181](https://github.com/google-gemini/gemini-cli/pull/22181)
- Add support for dynamic model Resolution to ModelConfigService by @kevinjwang1
-  in [#22578](https://github.com/google-gemini/gemini-cli/pull/22578)
- chore(release): bump version to 0.36.0-nightly.20260317.2f90b4653 by
+  [#23565](https://github.com/google-gemini/gemini-cli/pull/23565)
+- fix(patch): cherry-pick 4e5dfd0 to release/v0.35.0-preview.1-pr-23074 to patch
+  version v0.35.0-preview.1 and create version 0.35.0-preview.2 by
  @gemini-cli-robot in
-  [#22858](https://github.com/google-gemini/gemini-cli/pull/22858)
- fix(cli): use active sessionId in useLogger and improve resume robustness by
-  @mattKorwel in
-  [#22606](https://github.com/google-gemini/gemini-cli/pull/22606)
- fix(cli): expand tilde in policy paths from settings.json by @abhipatel12 in
-  [#22772](https://github.com/google-gemini/gemini-cli/pull/22772)
- fix(core): add actionable warnings for terminal fallbacks (#14426) by
+  [#23134](https://github.com/google-gemini/gemini-cli/pull/23134)
+- feat(cli): customizable keyboard shortcuts by @scidomino in
+  [#21945](https://github.com/google-gemini/gemini-cli/pull/21945)
+- feat(core): Thread `AgentLoopContext` through core. by @joshualitt in
+  [#21944](https://github.com/google-gemini/gemini-cli/pull/21944)
+- chore(release): bump version to 0.35.0-nightly.20260311.657f19c1f by
+  @gemini-cli-robot in
+  [#21966](https://github.com/google-gemini/gemini-cli/pull/21966)
+- refactor(a2a): remove legacy CoreToolScheduler by @adamfweidman in
+  [#21955](https://github.com/google-gemini/gemini-cli/pull/21955)
+- feat(ui): add missing vim mode motions (X, ~, r, f/F/t/T, df/dt and friends)
+  by @aanari in [#21932](https://github.com/google-gemini/gemini-cli/pull/21932)
+- Feat/retry fetch notifications by @aishaneeshah in
+  [#21813](https://github.com/google-gemini/gemini-cli/pull/21813)
+- fix(core): remove OAuth check from handleFallback and clean up stray file by
+  @sehoon38 in [#21962](https://github.com/google-gemini/gemini-cli/pull/21962)
+- feat(cli): support literal character keybindings and extended Kitty protocol
+  keys by @scidomino in
+  [#21972](https://github.com/google-gemini/gemini-cli/pull/21972)
+- fix(ui): clamp cursor to last char after all NORMAL mode deletes by @aanari in
+  [#21973](https://github.com/google-gemini/gemini-cli/pull/21973)
+- test(core): add missing tests for prompts/utils.ts by @krrishverma1805-web in
+  [#19941](https://github.com/google-gemini/gemini-cli/pull/19941)
+- fix(cli): allow scrolling keys in copy mode (Ctrl+S selection mode) by
+  @nsalerni in [#19933](https://github.com/google-gemini/gemini-cli/pull/19933)
+- docs(cli): add custom keybinding documentation by @scidomino in
+  [#21980](https://github.com/google-gemini/gemini-cli/pull/21980)
+- docs: fix misleading YOLO mode description in defaultApprovalMode by
+  @Gyanranjan-Priyam in
+  [#21878](https://github.com/google-gemini/gemini-cli/pull/21878)
+- fix: clean up /clear and /resume by @jackwotherspoon in
+  [#22007](https://github.com/google-gemini/gemini-cli/pull/22007)
+- fix(core)#20941: reap orphaned descendant processes on PTY abort by @manavmax
+  in [#21124](https://github.com/google-gemini/gemini-cli/pull/21124)
+- fix(core): update language detection to use LSP 3.18 identifiers by @yunaseoul
+  in [#21931](https://github.com/google-gemini/gemini-cli/pull/21931)
+- feat(cli): support removing keybindings via '-' prefix by @scidomino in
+  [#22042](https://github.com/google-gemini/gemini-cli/pull/22042)
+- feat(policy): add --admin-policy flag for supplemental admin policies by
+  @galz10 in [#20360](https://github.com/google-gemini/gemini-cli/pull/20360)
+- merge duplicate imports packages/cli/src subtask1 by @Nixxx19 in
+  [#22040](https://github.com/google-gemini/gemini-cli/pull/22040)
+- perf(core): parallelize user quota and experiments fetching in refreshAuth by
+  @sehoon38 in [#21648](https://github.com/google-gemini/gemini-cli/pull/21648)
+- Changelog for v0.34.0-preview.0 by @gemini-cli-robot in
+  [#21965](https://github.com/google-gemini/gemini-cli/pull/21965)
+- Changelog for v0.33.0 by @gemini-cli-robot in
+  [#21967](https://github.com/google-gemini/gemini-cli/pull/21967)
+- fix(core): handle EISDIR in robustRealpath on Windows by @sehoon38 in
+  [#21984](https://github.com/google-gemini/gemini-cli/pull/21984)
+- feat(core): include initiationMethod in conversation interaction telemetry by
+  @yunaseoul in [#22054](https://github.com/google-gemini/gemini-cli/pull/22054)
+- feat(ui): add vim yank/paste (y/p/P) with unnamed register by @aanari in
+  [#22026](https://github.com/google-gemini/gemini-cli/pull/22026)
+- fix(core): enable numerical routing for api key users by @sehoon38 in
+  [#21977](https://github.com/google-gemini/gemini-cli/pull/21977)
+- feat(telemetry): implement retry attempt telemetry for network related retries
+  by @aishaneeshah in
+  [#22027](https://github.com/google-gemini/gemini-cli/pull/22027)
+- fix(policy): remove unnecessary escapeRegex from pattern builders by
  @spencer426 in
-  [#22211](https://github.com/google-gemini/gemini-cli/pull/22211)
- feat(tracker): integrate task tracker protocol into core system prompt by
-  @anj-s in [#22442](https://github.com/google-gemini/gemini-cli/pull/22442)
- chore: add posttest build hooks and fix missing dependencies by @NTaylorMullen
-  in [#22865](https://github.com/google-gemini/gemini-cli/pull/22865)
- feat(a2a): add agent acknowledgment command and enhance registry discovery by
-  @alisa-alisa in
-  [#22389](https://github.com/google-gemini/gemini-cli/pull/22389)
- fix(cli): automatically add all VSCode workspace folders to Gemini context by
-  @sakshisemalti in
-  [#21380](https://github.com/google-gemini/gemini-cli/pull/21380)
- feat: add 'blocked' status to tasks and todos by @anj-s in
-  [#22735](https://github.com/google-gemini/gemini-cli/pull/22735)
- refactor(cli): remove extra newlines in ShellToolMessage.tsx by @NTaylorMullen
-  in [#22868](https://github.com/google-gemini/gemini-cli/pull/22868)
- fix(cli): lazily load settings in onModelChange to prevent stale closure data
-  loss by @KumarADITHYA123 in
-  [#20403](https://github.com/google-gemini/gemini-cli/pull/20403)
- feat(core): subagent local execution and tool isolation by @akh64bit in
-  [#22718](https://github.com/google-gemini/gemini-cli/pull/22718)
- fix(cli): resolve subagent grouping and UI state persistence by @abhipatel12
-  in [#22252](https://github.com/google-gemini/gemini-cli/pull/22252)
- refactor(ui): extract SessionBrowser search and navigation components by
-  @abhipatel12 in
-  [#22377](https://github.com/google-gemini/gemini-cli/pull/22377)
- fix: updates Docker image reference for GitHub MCP server by @jhhornn in
-  [#22938](https://github.com/google-gemini/gemini-cli/pull/22938)
- refactor(cli): group subagent trajectory deletion and use native filesystem
-  testing by @abhipatel12 in
-  [#22890](https://github.com/google-gemini/gemini-cli/pull/22890)
- refactor(cli): simplify keypress and mouse providers and update tests by
-  @scidomino in [#22853](https://github.com/google-gemini/gemini-cli/pull/22853)
- Changelog for v0.34.0 by @gemini-cli-robot in
-  [#22860](https://github.com/google-gemini/gemini-cli/pull/22860)
- test(cli): simplify createMockSettings calls by @scidomino in
-  [#22952](https://github.com/google-gemini/gemini-cli/pull/22952)
- feat(ui): format multi-line banner warnings with a bold title by @keithguerin
-  in [#22955](https://github.com/google-gemini/gemini-cli/pull/22955)
- Docs: Remove references to stale Gemini CLI file structure info by
-  @g-samroberts in
-  [#22976](https://github.com/google-gemini/gemini-cli/pull/22976)
- feat(ui): remove write todo list tool from UI tips by @aniruddhaadak80 in
-  [#22281](https://github.com/google-gemini/gemini-cli/pull/22281)
- Fix issue where subagent thoughts are appended. by @gundermanc in
-  [#22975](https://github.com/google-gemini/gemini-cli/pull/22975)
- Feat/browser privacy consent by @kunal-10-cloud in
-  [#21119](https://github.com/google-gemini/gemini-cli/pull/21119)
- fix(core): explicitly map execution context in LocalAgentExecutor by @akh64bit
-  in [#22949](https://github.com/google-gemini/gemini-cli/pull/22949)
- feat(plan): support plan mode in non-interactive mode by @ruomengz in
-  [#22670](https://github.com/google-gemini/gemini-cli/pull/22670)
- feat(core): implement strict macOS sandboxing using Seatbelt allowlist by
-  @ehedlund in [#22832](https://github.com/google-gemini/gemini-cli/pull/22832)
- docs: add additional notes by @abhipatel12 in
-  [#23008](https://github.com/google-gemini/gemini-cli/pull/23008)
- fix(cli): resolve duplicate footer on tool cancel via ESC (#21743) by
-  @ruomengz in [#21781](https://github.com/google-gemini/gemini-cli/pull/21781)
- Changelog for v0.35.0-preview.1 by @gemini-cli-robot in
-  [#23012](https://github.com/google-gemini/gemini-cli/pull/23012)
- fix(ui): fix flickering on small terminal heights by @devr0306 in
-  [#21416](https://github.com/google-gemini/gemini-cli/pull/21416)
- fix(acp): provide more meta in tool_call_update by @Mervap in
-  [#22663](https://github.com/google-gemini/gemini-cli/pull/22663)
- docs: add FAQ entry for checking Gemini CLI version by @surajsahani in
-  [#21271](https://github.com/google-gemini/gemini-cli/pull/21271)
- feat(core): resilient subagent tool rejection with contextual feedback by
-  @abhipatel12 in
-  [#22951](https://github.com/google-gemini/gemini-cli/pull/22951)
- fix(cli): correctly handle auto-update for standalone binaries by @bdmorgan in
-  [#23038](https://github.com/google-gemini/gemini-cli/pull/23038)
- feat(core): add content-utils by @adamfweidman in
-  [#22984](https://github.com/google-gemini/gemini-cli/pull/22984)
- fix: circumvent genai sdk requirement for api key when using gateway auth via
-  ACP by @sripasg in
-  [#23042](https://github.com/google-gemini/gemini-cli/pull/23042)
- fix(core): don't persist browser consent sentinel in non-interactive mode by
-  @jasonmatthewsuhari in
-  [#23073](https://github.com/google-gemini/gemini-cli/pull/23073)
- fix(core): narrow browser agent description to prevent stealing URL tasks from
-  web_fetch by @gsquared94 in
-  [#23086](https://github.com/google-gemini/gemini-cli/pull/23086)
- feat(cli): Partial threading of AgentLoopContext. by @joshualitt in
-  [#22978](https://github.com/google-gemini/gemini-cli/pull/22978)
- fix(browser-agent): enable "Allow all server tools" session policy by
-  @cynthialong0-0 in
-  [#22343](https://github.com/google-gemini/gemini-cli/pull/22343)
- refactor(cli): integrate real config loading into async test utils by
-  @scidomino in [#23040](https://github.com/google-gemini/gemini-cli/pull/23040)
- feat(core): inject memory and JIT context into subagents by @abhipatel12 in
-  [#23032](https://github.com/google-gemini/gemini-cli/pull/23032)
- Fix logging and virtual list. by @jacob314 in
-  [#23080](https://github.com/google-gemini/gemini-cli/pull/23080)
- feat(core): cap JIT context upward traversal at git root by @SandyTao520 in
-  [#23074](https://github.com/google-gemini/gemini-cli/pull/23074)
- Docs: Minor style updates from initial docs audit. by @g-samroberts in
-  [#22872](https://github.com/google-gemini/gemini-cli/pull/22872)
- feat(core): add experimental memory manager agent to replace save_memory tool
-  by @SandyTao520 in
-  [#22726](https://github.com/google-gemini/gemini-cli/pull/22726)
- Changelog for v0.35.0-preview.2 by @gemini-cli-robot in
-  [#23142](https://github.com/google-gemini/gemini-cli/pull/23142)
- Update website issue template for label and title by @g-samroberts in
-  [#23036](https://github.com/google-gemini/gemini-cli/pull/23036)
- fix: upgrade ACP SDK from 0.12 to 0.16.1 by @sripasg in
-  [#23132](https://github.com/google-gemini/gemini-cli/pull/23132)
- Update callouts to work on github. by @g-samroberts in
-  [#22245](https://github.com/google-gemini/gemini-cli/pull/22245)
- feat: ACP: Add token usage metadata to the `send` method's return value by
-  @sripasg in [#23148](https://github.com/google-gemini/gemini-cli/pull/23148)
- fix(plan): clarify that plan mode policies are combined with normal mode by
-  @ruomengz in [#23158](https://github.com/google-gemini/gemini-cli/pull/23158)
- Add ModelChain support to ModelConfigService and make ModelDialog dynamic by
-  @kevinjwang1 in
-  [#22914](https://github.com/google-gemini/gemini-cli/pull/22914)
- Ensure that copied extensions are writable in the user's local directory by
-  @kevinjwang1 in
-  [#23016](https://github.com/google-gemini/gemini-cli/pull/23016)
- feat(core): implement native Windows sandboxing by @mattKorwel in
-  [#21807](https://github.com/google-gemini/gemini-cli/pull/21807)
- feat(core): add support for admin-forced MCP server installations by
-  @gsquared94 in
-  [#23163](https://github.com/google-gemini/gemini-cli/pull/23163)
- chore(lint): ignore .gemini directory and recursive node_modules by
-  @mattKorwel in
-  [#23211](https://github.com/google-gemini/gemini-cli/pull/23211)
- feat(cli): conditionally exclude ask_user tool in ACP mode by @nmcnamara-eng
-  in [#23045](https://github.com/google-gemini/gemini-cli/pull/23045)
- feat(core): introduce AgentSession and rename stream events to agent events by
-  @mbleigh in [#23159](https://github.com/google-gemini/gemini-cli/pull/23159)
- feat(worktree): add Git worktree support for isolated parallel sessions by
-  @jerop in [#22973](https://github.com/google-gemini/gemini-cli/pull/22973)
- Add support for linking in the extension registry by @kevinjwang1 in
-  [#23153](https://github.com/google-gemini/gemini-cli/pull/23153)
- feat(extensions): add --skip-settings flag to install command by @Ratish1 in
-  [#17212](https://github.com/google-gemini/gemini-cli/pull/17212)
- feat(telemetry): track if session is running in a Git worktree by @jerop in
-  [#23265](https://github.com/google-gemini/gemini-cli/pull/23265)
- refactor(core): use absolute paths in GEMINI.md context markers by
-  @SandyTao520 in
-  [#23135](https://github.com/google-gemini/gemini-cli/pull/23135)
- fix(core): add sanitization to sub agent thoughts and centralize utilities by
-  @devr0306 in [#22828](https://github.com/google-gemini/gemini-cli/pull/22828)
- feat(core): refine User-Agent for VS Code traffic (unified format) by
-  @sehoon38 in [#23256](https://github.com/google-gemini/gemini-cli/pull/23256)
- Fix schema for ModelChains by @kevinjwang1 in
-  [#23284](https://github.com/google-gemini/gemini-cli/pull/23284)
- test(cli): refactor tests for async render utilities by @scidomino in
-  [#23252](https://github.com/google-gemini/gemini-cli/pull/23252)
- feat(core): add security prompt for browser agent by @cynthialong0-0 in
-  [#23241](https://github.com/google-gemini/gemini-cli/pull/23241)
- refactor(ide): replace dynamic undici import with static fetch import by
-  @cocosheng-g in
-  [#23268](https://github.com/google-gemini/gemini-cli/pull/23268)
- test(cli): address unresolved feedback from PR #23252 by @scidomino in
-  [#23303](https://github.com/google-gemini/gemini-cli/pull/23303)
- feat(browser): add sensitive action controls and read-only noise reduction by
-  @cynthialong0-0 in
-  [#22867](https://github.com/google-gemini/gemini-cli/pull/22867)
- Disabling failing test while investigating by @alisa-alisa in
-  [#23311](https://github.com/google-gemini/gemini-cli/pull/23311)
- fix broken extension link in hooks guide by @Indrapal-70 in
-  [#21728](https://github.com/google-gemini/gemini-cli/pull/21728)
- fix(core): fix agent description indentation by @abhipatel12 in
-  [#23315](https://github.com/google-gemini/gemini-cli/pull/23315)
- Wrap the text under TOML rule for easier readability in policy-engine.md… by
-  @CogitationOps in
-  [#23076](https://github.com/google-gemini/gemini-cli/pull/23076)
- fix(extensions): revert broken extension removal behavior by @ehedlund in
-  [#23317](https://github.com/google-gemini/gemini-cli/pull/23317)
- feat(core): set up onboarding telemetry by @yunaseoul in
-  [#23118](https://github.com/google-gemini/gemini-cli/pull/23118)
- Retry evals on API error. by @gundermanc in
-  [#23322](https://github.com/google-gemini/gemini-cli/pull/23322)
- fix(evals): remove tool restrictions and add compile-time guards by
-  @SandyTao520 in
-  [#23312](https://github.com/google-gemini/gemini-cli/pull/23312)
- fix(hooks): support 'ask' decision for BeforeTool hooks by @gundermanc in
-  [#21146](https://github.com/google-gemini/gemini-cli/pull/21146)
- feat(browser): add warning message for session mode 'existing' by
-  @cynthialong0-0 in
-  [#23288](https://github.com/google-gemini/gemini-cli/pull/23288)
- chore(lint): enforce zero warnings and cleanup syntax restrictions by
-  @alisa-alisa in
-  [#22902](https://github.com/google-gemini/gemini-cli/pull/22902)
- fix(cli): add Esc instruction to HooksDialog footer by @abhipatel12 in
-  [#23258](https://github.com/google-gemini/gemini-cli/pull/23258)
- Disallow and suppress misused spread operator. by @gundermanc in
-  [#23294](https://github.com/google-gemini/gemini-cli/pull/23294)
- fix(core): refine CliHelpAgent description for better delegation by
-  @abhipatel12 in
-  [#23310](https://github.com/google-gemini/gemini-cli/pull/23310)
- fix(core): enable global session and persistent approval for web_fetch by
+  [#21921](https://github.com/google-gemini/gemini-cli/pull/21921)
+- fix(core): preserve dynamic tool descriptions on session resume by @sehoon38
+  in [#18835](https://github.com/google-gemini/gemini-cli/pull/18835)
+- chore: allow 'gemini-3.1' in sensitive keyword linter by @scidomino in
+  [#22065](https://github.com/google-gemini/gemini-cli/pull/22065)
+- feat(core): support custom base URL via env vars by @junaiddshaukat in
+  [#21561](https://github.com/google-gemini/gemini-cli/pull/21561)
+- merge duplicate imports packages/cli/src subtask2 by @Nixxx19 in
+  [#22051](https://github.com/google-gemini/gemini-cli/pull/22051)
+- fix(core): silently retry API errors up to 3 times before halting session by
+  @spencer426 in
+  [#21989](https://github.com/google-gemini/gemini-cli/pull/21989)
+- feat(core): simplify subagent success UI and improve early termination display
+  by @abhipatel12 in
+  [#21917](https://github.com/google-gemini/gemini-cli/pull/21917)
+- merge duplicate imports packages/cli/src subtask3 by @Nixxx19 in
+  [#22056](https://github.com/google-gemini/gemini-cli/pull/22056)
+- fix(hooks): fix BeforeAgent/AfterAgent inconsistencies (#18514) by @krishdef7
+  in [#21383](https://github.com/google-gemini/gemini-cli/pull/21383)
+- feat(core): implement SandboxManager interface and config schema by @galz10 in
+  [#21774](https://github.com/google-gemini/gemini-cli/pull/21774)
+- docs: document npm deprecation warnings as safe to ignore by @h30s in
+  [#20692](https://github.com/google-gemini/gemini-cli/pull/20692)
+- fix: remove status/need-triage from maintainer-only issues by @SandyTao520 in
+  [#22044](https://github.com/google-gemini/gemini-cli/pull/22044)
+- fix(core): propagate subagent context to policy engine by @NTaylorMullen in
+  [#22086](https://github.com/google-gemini/gemini-cli/pull/22086)
+- fix(cli): resolve skill uninstall failure when skill name is updated by
  @NTaylorMullen in
-  [#23295](https://github.com/google-gemini/gemini-cli/pull/23295)
- fix(plan): add state transition override to prevent plan mode freeze by
-  @Adib234 in [#23020](https://github.com/google-gemini/gemini-cli/pull/23020)
- fix(cli): record skill activation tool calls in chat history by @NTaylorMullen
-  in [#23203](https://github.com/google-gemini/gemini-cli/pull/23203)
- fix(core): ensure subagent tool updates apply configuration overrides
-  immediately by @abhipatel12 in
-  [#23161](https://github.com/google-gemini/gemini-cli/pull/23161)
- fix(cli): resolve flicker at boundaries of list in BaseSelectionList by
-  @jackwotherspoon in
-  [#23298](https://github.com/google-gemini/gemini-cli/pull/23298)
- test(cli): force generic terminal in tests to fix snapshot failures by
-  @abhipatel12 in
-  [#23499](https://github.com/google-gemini/gemini-cli/pull/23499)
- Evals: PR Guidance adding workflow by @alisa-alisa in
-  [#23164](https://github.com/google-gemini/gemini-cli/pull/23164)
- feat(core): refactor SandboxManager to a stateless architecture and introduce
-  explicit Deny interface by @ehedlund in
-  [#23141](https://github.com/google-gemini/gemini-cli/pull/23141)
- feat(core): add event-translator and update agent types by @adamfweidman in
-  [#22985](https://github.com/google-gemini/gemini-cli/pull/22985)
- perf(cli): parallelize and background startup cleanup tasks by @sehoon38 in
-  [#23545](https://github.com/google-gemini/gemini-cli/pull/23545)
- fix: "allow always" for commands with paths by @scidomino in
-  [#23558](https://github.com/google-gemini/gemini-cli/pull/23558)
- fix(cli): prevent terminal escape sequences from leaking on exit by
-  @mattKorwel in
-  [#22682](https://github.com/google-gemini/gemini-cli/pull/22682)
- feat(cli): implement full "GEMINI CLI" logo for logged-out state by
-  @keithguerin in
-  [#22412](https://github.com/google-gemini/gemini-cli/pull/22412)
- fix(plan): reserve minimum height for selection list in AskUserDialog by
-  @ruomengz in [#23280](https://github.com/google-gemini/gemini-cli/pull/23280)
- fix(core): harden AgentSession replay semantics by @adamfweidman in
-  [#23548](https://github.com/google-gemini/gemini-cli/pull/23548)
- test(core): migrate hook tests to scheduler by @abhipatel12 in
-  [#23496](https://github.com/google-gemini/gemini-cli/pull/23496)
- chore(config): disable agents by default by @abhipatel12 in
-  [#23546](https://github.com/google-gemini/gemini-cli/pull/23546)
- fix(ui): make tool confirmations take up entire terminal height by @devr0306
-  in [#22366](https://github.com/google-gemini/gemini-cli/pull/22366)
- fix(core): prevent redundant remote agent loading on model switch by
+  [#22085](https://github.com/google-gemini/gemini-cli/pull/22085)
+- docs(plan): clarify interactive plan editing with Ctrl+X by @Adib234 in
+  [#22076](https://github.com/google-gemini/gemini-cli/pull/22076)
+- fix(policy): ensure user policies are loaded when policyPaths is empty by
+  @NTaylorMullen in
+  [#22090](https://github.com/google-gemini/gemini-cli/pull/22090)
+- Docs: Add documentation for model steering (experimental). by @jkcinouye in
+  [#21154](https://github.com/google-gemini/gemini-cli/pull/21154)
+- Add issue for automated changelogs by @g-samroberts in
+  [#21912](https://github.com/google-gemini/gemini-cli/pull/21912)
+- fix(core): secure argsPattern and revert WEB_FETCH_TOOL_NAME escalation by
+  @spencer426 in
+  [#22104](https://github.com/google-gemini/gemini-cli/pull/22104)
+- feat(core): differentiate User-Agent for a2a-server and ACP clients by
+  @bdmorgan in [#22059](https://github.com/google-gemini/gemini-cli/pull/22059)
+- refactor(core): extract ExecutionLifecycleService for tool backgrounding by
  @adamfweidman in
-  [#23576](https://github.com/google-gemini/gemini-cli/pull/23576)
- refactor(core): update production type imports from coreToolScheduler by
-  @abhipatel12 in
-  [#23498](https://github.com/google-gemini/gemini-cli/pull/23498)
- feat(cli): always prefix extension skills with colon separator by
-  @NTaylorMullen in
-  [#23566](https://github.com/google-gemini/gemini-cli/pull/23566)
- fix(core): properly support allowRedirect in policy engine by @scidomino in
-  [#23579](https://github.com/google-gemini/gemini-cli/pull/23579)
- fix(cli): prevent subcommand shadowing and skip auth for commands by
-  @mattKorwel in
-  [#23177](https://github.com/google-gemini/gemini-cli/pull/23177)
- fix(test): move flaky tests to non-blocking suite by @mattKorwel in
-  [#23259](https://github.com/google-gemini/gemini-cli/pull/23259)
- Changelog for v0.35.0-preview.3 by @gemini-cli-robot in
-  [#23574](https://github.com/google-gemini/gemini-cli/pull/23574)
- feat(skills): add behavioral-evals skill with fixing and promoting guides by
-  @abhipatel12 in
-  [#23349](https://github.com/google-gemini/gemini-cli/pull/23349)
- refactor(core): delete obsolete coreToolScheduler by @abhipatel12 in
-  [#23502](https://github.com/google-gemini/gemini-cli/pull/23502)
- Changelog for v0.35.0-preview.4 by @gemini-cli-robot in
-  [#23581](https://github.com/google-gemini/gemini-cli/pull/23581)
- feat(core): add LegacyAgentSession by @adamfweidman in
-  [#22986](https://github.com/google-gemini/gemini-cli/pull/22986)
- feat(test-utils): add TestMcpServerBuilder and support in TestRig by
-  @abhipatel12 in
-  [#23491](https://github.com/google-gemini/gemini-cli/pull/23491)
- fix(core)!: Force policy config to specify toolName by @kschaab in
-  [#23330](https://github.com/google-gemini/gemini-cli/pull/23330)
- eval(save_memory): add multi-turn interactive evals for memoryManager by
-  @SandyTao520 in
-  [#23572](https://github.com/google-gemini/gemini-cli/pull/23572)
- fix(telemetry): patch memory leak and enforce logPrompts privacy by
+  [#21717](https://github.com/google-gemini/gemini-cli/pull/21717)
+- feat: Display pending and confirming tool calls by @sripasg in
+  [#22106](https://github.com/google-gemini/gemini-cli/pull/22106)
+- feat(browser): implement input blocker overlay during automation by
+  @kunal-10-cloud in
+  [#21132](https://github.com/google-gemini/gemini-cli/pull/21132)
+- fix: register themes on extension load not start by @jackwotherspoon in
+  [#22148](https://github.com/google-gemini/gemini-cli/pull/22148)
+- feat(ui): Do not show Ultra users /upgrade hint (#22154) by @sehoon38 in
+  [#22156](https://github.com/google-gemini/gemini-cli/pull/22156)
+- chore: remove unnecessary log for themes by @jackwotherspoon in
+  [#22165](https://github.com/google-gemini/gemini-cli/pull/22165)
+- fix(core): resolve MCP tool FQN validation, schema export, and wildcards in
+  subagents by @abhipatel12 in
+  [#22069](https://github.com/google-gemini/gemini-cli/pull/22069)
+- fix(cli): validate --model argument at startup by @JaisalJain in
+  [#21393](https://github.com/google-gemini/gemini-cli/pull/21393)
+- fix(core): handle policy ALLOW for exit_plan_mode by @backnotprop in
+  [#21802](https://github.com/google-gemini/gemini-cli/pull/21802)
+- feat(telemetry): add Clearcut instrumentation for AI credits billing events by
+  @gsquared94 in
+  [#22153](https://github.com/google-gemini/gemini-cli/pull/22153)
+- feat(core): add google credentials provider for remote agents by @adamfweidman
+  in [#21024](https://github.com/google-gemini/gemini-cli/pull/21024)
+- test(cli): add integration test for node deprecation warnings by @Nixxx19 in
+  [#20215](https://github.com/google-gemini/gemini-cli/pull/20215)
+- feat(cli): allow safe tools to execute concurrently while agent is busy by
  @spencer426 in
-  [#23281](https://github.com/google-gemini/gemini-cli/pull/23281)
- perf(cli): background IDE client to speed up initialization by @sehoon38 in
-  [#23603](https://github.com/google-gemini/gemini-cli/pull/23603)
- fix(cli): prevent Ctrl+D exit when input buffer is not empty by @wtanaka in
-  [#23306](https://github.com/google-gemini/gemini-cli/pull/23306)
- fix: ACP: separate conversational text from execute tool command title by
-  @sripasg in [#23179](https://github.com/google-gemini/gemini-cli/pull/23179)
- feat(evals): add behavioral evaluations for subagent routing by @Samee24 in
-  [#23272](https://github.com/google-gemini/gemini-cli/pull/23272)
- refactor(cli,core): foundational layout, identity management, and type safety
-  by @jwhelangoog in
-  [#23286](https://github.com/google-gemini/gemini-cli/pull/23286)
- fix(core): accurately reflect subagent tool failure in UI by @abhipatel12 in
-  [#23187](https://github.com/google-gemini/gemini-cli/pull/23187)
- Changelog for v0.35.0-preview.5 by @gemini-cli-robot in
-  [#23606](https://github.com/google-gemini/gemini-cli/pull/23606)
- feat(ui): implement refreshed UX for Composer layout by @jwhelangoog in
-  [#21212](https://github.com/google-gemini/gemini-cli/pull/21212)
- fix: API key input dialog user interaction when selected Gemini API Key by
-  @kartikangiras in
-  [#21057](https://github.com/google-gemini/gemini-cli/pull/21057)
- docs: update `/mcp refresh` to `/mcp reload` by @adamfweidman in
-  [#23631](https://github.com/google-gemini/gemini-cli/pull/23631)
- Implementation of sandbox "Write-Protected" Governance Files by @DavidAPierce
-  in [#23139](https://github.com/google-gemini/gemini-cli/pull/23139)
- feat(sandbox): dynamic macOS sandbox expansion and worktree support by @galz10
-  in [#23301](https://github.com/google-gemini/gemini-cli/pull/23301)
- fix(acp): Pass the cwd to `AcpFileSystemService` to avoid looping failures in
-  asking for perms to write plan md file by @sripasg in
-  [#23612](https://github.com/google-gemini/gemini-cli/pull/23612)
- fix(plan): sandbox path resolution in Plan Mode to prevent hallucinations by
-  @Adib234 in [#22737](https://github.com/google-gemini/gemini-cli/pull/22737)
- feat(ui): allow immediate user input during startup by @sehoon38 in
-  [#23661](https://github.com/google-gemini/gemini-cli/pull/23661)
- refactor(sandbox): reorganize Windows sandbox files by @galz10 in
-  [#23645](https://github.com/google-gemini/gemini-cli/pull/23645)
- fix(core): improve remote agent streaming UI and UX by @adamfweidman in
-  [#23633](https://github.com/google-gemini/gemini-cli/pull/23633)
- perf(cli): optimize --version startup time by @sehoon38 in
-  [#23671](https://github.com/google-gemini/gemini-cli/pull/23671)
- refactor(core): stop gemini CLI from producing unsafe casts by @gundermanc in
-  [#23611](https://github.com/google-gemini/gemini-cli/pull/23611)
- use enableAutoUpdate in test rig by @scidomino in
-  [#23681](https://github.com/google-gemini/gemini-cli/pull/23681)
- feat(core): change user-facing auth type from oauth2 to oauth by @adamfweidman
-  in [#23639](https://github.com/google-gemini/gemini-cli/pull/23639)
- chore(deps): fix npm audit vulnerabilities by @scidomino in
-  [#23679](https://github.com/google-gemini/gemini-cli/pull/23679)
- test(evals): fix overlapping act() deadlock in app-test-helper by @Adib234 in
-  [#23666](https://github.com/google-gemini/gemini-cli/pull/23666)
+  [#21988](https://github.com/google-gemini/gemini-cli/pull/21988)
+- feat(core): implement model-driven parallel tool scheduler by @abhipatel12 in
+  [#21933](https://github.com/google-gemini/gemini-cli/pull/21933)
+- update vulnerable deps by @scidomino in
+  [#22180](https://github.com/google-gemini/gemini-cli/pull/22180)
+- fix(core): fix startup stats to use int values for timestamps and durations by
+  @yunaseoul in [#22201](https://github.com/google-gemini/gemini-cli/pull/22201)
+- fix(core): prevent duplicate tool schemas for instantiated tools by
+  @abhipatel12 in
+  [#22204](https://github.com/google-gemini/gemini-cli/pull/22204)
+- fix(core): add proxy routing support for remote A2A subagents by @adamfweidman
+  in [#22199](https://github.com/google-gemini/gemini-cli/pull/22199)
+- fix(core/ide): add Antigravity CLI fallbacks by @apfine in
+  [#22030](https://github.com/google-gemini/gemini-cli/pull/22030)
+- fix(browser): fix duplicate function declaration error in browser agent by
+  @gsquared94 in
+  [#22207](https://github.com/google-gemini/gemini-cli/pull/22207)
+- feat(core): implement Stage 1 improvements for webfetch tool by @aishaneeshah
+  in [#21313](https://github.com/google-gemini/gemini-cli/pull/21313)
+- Changelog for v0.34.0-preview.1 by @gemini-cli-robot in
+  [#22194](https://github.com/google-gemini/gemini-cli/pull/22194)
+- perf(cli): enable code splitting and deferred UI loading by @sehoon38 in
+  [#22117](https://github.com/google-gemini/gemini-cli/pull/22117)
+- fix: remove unused img.png from project root by @SandyTao520 in
+  [#22222](https://github.com/google-gemini/gemini-cli/pull/22222)
+- docs(local model routing): add docs on how to use Gemma for local model
+  routing by @douglas-reid in
+  [#21365](https://github.com/google-gemini/gemini-cli/pull/21365)
+- feat(a2a): enable native gRPC support and protocol routing by @alisa-alisa in
+  [#21403](https://github.com/google-gemini/gemini-cli/pull/21403)
+- fix(cli): escape @ symbols on paste to prevent unintended file expansion by
+  @krishdef7 in [#21239](https://github.com/google-gemini/gemini-cli/pull/21239)
+- feat(core): add trajectoryId to ConversationOffered telemetry by @yunaseoul in
+  [#22214](https://github.com/google-gemini/gemini-cli/pull/22214)
+- docs: clarify that tools.core is an allowlist for ALL built-in tools by
+  @hobostay in [#18813](https://github.com/google-gemini/gemini-cli/pull/18813)
+- docs(plan): document hooks with plan mode by @ruomengz in
+  [#22197](https://github.com/google-gemini/gemini-cli/pull/22197)
+- Changelog for v0.33.1 by @gemini-cli-robot in
+  [#22235](https://github.com/google-gemini/gemini-cli/pull/22235)
+- build(ci): fix false positive evals trigger on merge commits by @gundermanc in
+  [#22237](https://github.com/google-gemini/gemini-cli/pull/22237)
+- fix(core): explicitly pass messageBus to policy engine for MCP tool saves by
+  @abhipatel12 in
+  [#22255](https://github.com/google-gemini/gemini-cli/pull/22255)
+- feat(core): Fully migrate packages/core to AgentLoopContext. by @joshualitt in
+  [#22115](https://github.com/google-gemini/gemini-cli/pull/22115)
+- feat(core): increase sub-agent turn and time limits by @bdmorgan in
+  [#22196](https://github.com/google-gemini/gemini-cli/pull/22196)
+- feat(core): instrument file system tools for JIT context discovery by
+  @SandyTao520 in
+  [#22082](https://github.com/google-gemini/gemini-cli/pull/22082)
+- refactor(ui): extract pure session browser utilities by @abhipatel12 in
+  [#22256](https://github.com/google-gemini/gemini-cli/pull/22256)
+- fix(plan): Fix AskUser evals by @Adib234 in
+  [#22074](https://github.com/google-gemini/gemini-cli/pull/22074)
+- fix(settings): prevent j/k navigation keys from intercepting edit buffer input
+  by @student-ankitpandit in
+  [#21865](https://github.com/google-gemini/gemini-cli/pull/21865)
+- feat(skills): improve async-pr-review workflow and logging by @mattKorwel in
+  [#21790](https://github.com/google-gemini/gemini-cli/pull/21790)
+- refactor(cli): consolidate getErrorMessage utility to core by @scidomino in
+  [#22190](https://github.com/google-gemini/gemini-cli/pull/22190)
+- fix(core): show descriptive error messages when saving settings fails by
+  @afarber in [#18095](https://github.com/google-gemini/gemini-cli/pull/18095)
+- docs(core): add authentication guide for remote subagents by @adamfweidman in
+  [#22178](https://github.com/google-gemini/gemini-cli/pull/22178)
+- docs: overhaul subagents documentation and add /agents command by @abhipatel12
+  in [#22345](https://github.com/google-gemini/gemini-cli/pull/22345)
+- refactor(ui): extract SessionBrowser static ui components by @abhipatel12 in
+  [#22348](https://github.com/google-gemini/gemini-cli/pull/22348)
+- test: add Object.create context regression test and tool confirmation
+  integration test by @gsquared94 in
+  [#22356](https://github.com/google-gemini/gemini-cli/pull/22356)
+- feat(tracker): return TodoList display for tracker tools by @anj-s in
+  [#22060](https://github.com/google-gemini/gemini-cli/pull/22060)
+- feat(agent): add allowed domain restrictions for browser agent by
+  @cynthialong0-0 in
+  [#21775](https://github.com/google-gemini/gemini-cli/pull/21775)
+- chore/release: bump version to 0.35.0-nightly.20260313.bb060d7a9 by
+  @gemini-cli-robot in
+  [#22251](https://github.com/google-gemini/gemini-cli/pull/22251)
+- Move keychain fallback to keychain service by @chrstnb in
+  [#22332](https://github.com/google-gemini/gemini-cli/pull/22332)
+- feat(core): integrate SandboxManager to sandbox all process-spawning tools by
+  @galz10 in [#22231](https://github.com/google-gemini/gemini-cli/pull/22231)
+- fix(cli): support CJK input and full Unicode scalar values in terminal
+  protocols by @scidomino in
+  [#22353](https://github.com/google-gemini/gemini-cli/pull/22353)
+- Promote stable tests. by @gundermanc in
+  [#22253](https://github.com/google-gemini/gemini-cli/pull/22253)
+- feat(tracker): add tracker policy by @anj-s in
+  [#22379](https://github.com/google-gemini/gemini-cli/pull/22379)
+- feat(security): add disableAlwaysAllow setting to disable auto-approvals by
+  @galz10 in [#21941](https://github.com/google-gemini/gemini-cli/pull/21941)
+- Revert "fix(cli): validate --model argument at startup" by @sehoon38 in
+  [#22378](https://github.com/google-gemini/gemini-cli/pull/22378)
+- fix(mcp): handle equivalent root resource URLs in OAuth validation by @galz10
+  in [#20231](https://github.com/google-gemini/gemini-cli/pull/20231)
+- fix(core): use session-specific temp directory for task tracker by @anj-s in
+  [#22382](https://github.com/google-gemini/gemini-cli/pull/22382)
+- Fix issue where config was undefined. by @gundermanc in
+  [#22397](https://github.com/google-gemini/gemini-cli/pull/22397)
+- fix(core): deduplicate project memory when JIT context is enabled by
+  @SandyTao520 in
+  [#22234](https://github.com/google-gemini/gemini-cli/pull/22234)
+- feat(prompts): implement Topic-Action-Summary model for verbosity reduction by
+  @Abhijit-2592 in
+  [#21503](https://github.com/google-gemini/gemini-cli/pull/21503)
+- fix(core): fix manual deletion of subagent histories by @abhipatel12 in
+  [#22407](https://github.com/google-gemini/gemini-cli/pull/22407)
+- Add registry var by @kevinjwang1 in
+  [#22224](https://github.com/google-gemini/gemini-cli/pull/22224)
+- Add ModelDefinitions to ModelConfigService by @kevinjwang1 in
+  [#22302](https://github.com/google-gemini/gemini-cli/pull/22302)
+- fix(cli): improve command conflict handling for skills by @NTaylorMullen in
+  [#21942](https://github.com/google-gemini/gemini-cli/pull/21942)
+- fix(core): merge user settings with extension-provided MCP servers by
+  @abhipatel12 in
+  [#22484](https://github.com/google-gemini/gemini-cli/pull/22484)
+- fix(core): skip discovery for incomplete MCP configs and resolve merge race
+  condition by @abhipatel12 in
+  [#22494](https://github.com/google-gemini/gemini-cli/pull/22494)
+- fix(automation): harden stale PR closer permissions and maintainer detection
+  by @bdmorgan in
+  [#22558](https://github.com/google-gemini/gemini-cli/pull/22558)
+- fix(automation): evaluate staleness before checking protected labels by
+  @bdmorgan in [#22561](https://github.com/google-gemini/gemini-cli/pull/22561)
+- feat(agent): replace the runtime npx for browser agent chrome devtool mcp with
+  pre-built bundle by @cynthialong0-0 in
+  [#22213](https://github.com/google-gemini/gemini-cli/pull/22213)
+- perf: optimize TrackerService dependency checks by @anj-s in
+  [#22384](https://github.com/google-gemini/gemini-cli/pull/22384)
+- docs(policy): remove trailing space from commandPrefix examples by @kawasin73
+  in [#22264](https://github.com/google-gemini/gemini-cli/pull/22264)
+- fix(a2a-server): resolve unsafe assignment lint errors by @ehedlund in
+  [#22661](https://github.com/google-gemini/gemini-cli/pull/22661)
+- fix: Adjust ToolGroupMessage filtering to hide Confirming and show Canceled
+  tool calls. by @sripasg in
+  [#22230](https://github.com/google-gemini/gemini-cli/pull/22230)
+- Disallow Object.create() and reflect. by @gundermanc in
+  [#22408](https://github.com/google-gemini/gemini-cli/pull/22408)
+- Guard pro model usage by @sehoon38 in
+  [#22665](https://github.com/google-gemini/gemini-cli/pull/22665)
+- refactor(core): Creates AgentSession abstraction for consolidated agent
+  interface. by @mbleigh in
+  [#22270](https://github.com/google-gemini/gemini-cli/pull/22270)
+- docs(changelog): remove internal commands from release notes by
+  @jackwotherspoon in
+  [#22529](https://github.com/google-gemini/gemini-cli/pull/22529)
+- feat: enable subagents by @abhipatel12 in
+  [#22386](https://github.com/google-gemini/gemini-cli/pull/22386)
+- feat(extensions): implement cryptographic integrity verification for extension
+  updates by @ehedlund in
+  [#21772](https://github.com/google-gemini/gemini-cli/pull/21772)
+- feat(tracker): polish UI sorting and formatting by @anj-s in
+  [#22437](https://github.com/google-gemini/gemini-cli/pull/22437)
+- Changelog for v0.34.0-preview.2 by @gemini-cli-robot in
+  [#22220](https://github.com/google-gemini/gemini-cli/pull/22220)
+- fix(core): fix three JIT context bugs in read_file, read_many_files, and
+  memoryDiscovery by @SandyTao520 in
+  [#22679](https://github.com/google-gemini/gemini-cli/pull/22679)
+- refactor(core): introduce InjectionService with source-aware injection and
+  backend-native background completions by @adamfweidman in
+  [#22544](https://github.com/google-gemini/gemini-cli/pull/22544)
+- Linux sandbox bubblewrap by @DavidAPierce in
+  [#22680](https://github.com/google-gemini/gemini-cli/pull/22680)
+- feat(core): increase thought signature retry resilience by @bdmorgan in
+  [#22202](https://github.com/google-gemini/gemini-cli/pull/22202)
+- feat(core): implement Stage 2 security and consistency improvements for
+  web_fetch by @aishaneeshah in
+  [#22217](https://github.com/google-gemini/gemini-cli/pull/22217)
+- refactor(core): replace positional execute params with ExecuteOptions bag by
+  @adamfweidman in
+  [#22674](https://github.com/google-gemini/gemini-cli/pull/22674)
+- feat(config): enable JIT context loading by default by @SandyTao520 in
+  [#22736](https://github.com/google-gemini/gemini-cli/pull/22736)
+- fix(config): ensure discoveryMaxDirs is passed to global config during
+  initialization by @kevin-ramdass in
+  [#22744](https://github.com/google-gemini/gemini-cli/pull/22744)
+- fix(plan): allowlist get_internal_docs in Plan Mode by @Adib234 in
+  [#22668](https://github.com/google-gemini/gemini-cli/pull/22668)
+- Changelog for v0.34.0-preview.3 by @gemini-cli-robot in
+  [#22393](https://github.com/google-gemini/gemini-cli/pull/22393)
+- feat(core): add foundation for subagent tool isolation by @akh64bit in
+  [#22708](https://github.com/google-gemini/gemini-cli/pull/22708)
+- fix(core): handle surrogate pairs in truncateString by @sehoon38 in
+  [#22754](https://github.com/google-gemini/gemini-cli/pull/22754)
+- fix(cli): override j/k navigation in settings dialog to fix search input
+  conflict by @sehoon38 in
+  [#22800](https://github.com/google-gemini/gemini-cli/pull/22800)
+- feat(plan): add 'All the above' option to multi-select AskUser questions by
+  @Adib234 in [#22365](https://github.com/google-gemini/gemini-cli/pull/22365)
+- docs: distribute package-specific GEMINI.md context to each package by
+  @SandyTao520 in
+  [#22734](https://github.com/google-gemini/gemini-cli/pull/22734)
+- fix(cli): clean up stale pasted placeholder metadata after word/line deletions
+  by @Jomak-x in
+  [#20375](https://github.com/google-gemini/gemini-cli/pull/20375)
+- refactor(core): align JIT memory placement with tiered context model by
+  @SandyTao520 in
+  [#22766](https://github.com/google-gemini/gemini-cli/pull/22766)
+- Linux sandbox seccomp by @DavidAPierce in
+  [#22815](https://github.com/google-gemini/gemini-cli/pull/22815)

 **Full Changelog**:
-https://github.com/google-gemini/gemini-cli/compare/v0.35.0-preview.5...v0.36.0-preview.3
+https://github.com/google-gemini/gemini-cli/compare/v0.34.0-preview.4...v0.35.0-preview.5
@@ -92,7 +92,7 @@ To set up runsc:
 2.  Configure the Docker daemon to use the runsc runtime.
 3.  Verify the installation.

-### 5. LXC/LXD (Linux only, experimental)
+### 4. 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
@@ -30,7 +30,7 @@ they appear in the UI.
 | Default Approval Mode   | `general.defaultApprovalMode`      | The default approval mode for tool execution. 'default' prompts for approval, 'auto_edit' auto-approves edit tools, and 'plan' is read-only mode. YOLO mode (auto-approve all actions) can only be enabled via command line (--yolo or --approval-mode=yolo). | `"default"` |
 | Enable Auto Update      | `general.enableAutoUpdate`         | Enable automatic updates.                                                                                                                                                                                                                                     | `true`      |
 | Enable Notifications    | `general.enableNotifications`      | Enable run-event notifications for action-required prompts and session completion. Currently macOS only.                                                                                                                                                      | `false`     |
-| Plan Directory          | `general.plan.directory`           | The directory where planning artifacts are stored. If not specified, defaults to the system temporary directory. A custom directory requires a policy to allow write access in Plan Mode.                                                                     | `undefined` |
+| Plan Directory          | `general.plan.directory`           | The directory where planning artifacts are stored. If not specified, defaults to the system temporary directory.                                                                                                                                              | `undefined` |
 | Plan Model Routing      | `general.plan.modelRouting`        | Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pro for the planning phase and Flash for the implementation phase.                                                                                                          | `true`      |
 | Retry Fetch Errors      | `general.retryFetchErrors`         | Retry on "exception TypeError: fetch failed sending request" errors.                                                                                                                                                                                          | `true`      |
 | Max Chat Model Attempts | `general.maxAttempts`              | Maximum number of attempts for requests to the main chat model. Cannot exceed 10.                                                                                                                                                                             | `10`        |
@@ -59,7 +59,6 @@ they appear in the UI.
 | Hide Tips                            | `ui.hideTips`                          | Hide helpful tips in the UI                                                                                                                                       | `false`  |
 | Escape Pasted @ Symbols              | `ui.escapePastedAtSymbols`             | When enabled, @ symbols in pasted text are escaped to prevent unintended @path expansion.                                                                         | `false`  |
 | Show Shortcuts Hint                  | `ui.showShortcutsHint`                 | Show the "? for shortcuts" hint above the input.                                                                                                                  | `true`   |
-| Compact Tool Output                  | `ui.compactToolOutput`                 | Display tool outputs (like directory listings and file reads) in a compact, structured format.                                                                    | `false`  |
 | Hide Banner                          | `ui.hideBanner`                        | Hide the application banner                                                                                                                                       | `false`  |
 | Hide Context Summary                 | `ui.hideContextSummary`                | Hide the context summary (GEMINI.md, MCP servers) above the input.                                                                                                | `false`  |
 | Hide CWD                             | `ui.footer.hideCWD`                    | Hide the current working directory in the footer.                                                                                                                 | `false`  |
@@ -51,13 +51,12 @@ You can place them in:

 ### Configuration schema

-| Field             | Type   | Required | Description                                                                                                    |
-| :---------------- | :----- | :------- | :------------------------------------------------------------------------------------------------------------- |
-| `kind`            | string | Yes      | Must be `remote`.                                                                                              |
-| `name`            | string | Yes      | A unique name for the agent. Must be a valid slug (lowercase letters, numbers, hyphens, and underscores only). |
-| `agent_card_url`  | string | Yes\*    | The URL to the agent's A2A card endpoint. Required if `agent_card_json` is not provided.                       |
-| `agent_card_json` | string | Yes\*    | The inline JSON string of the agent's A2A card. Required if `agent_card_url` is not provided.                  |
-| `auth`            | object | No       | Authentication configuration. See [Authentication](#authentication).                                           |
+| Field            | Type   | Required | Description                                                                                                    |
+| :--------------- | :----- | :------- | :------------------------------------------------------------------------------------------------------------- |
+| `kind`           | string | Yes      | Must be `remote`.                                                                                              |
+| `name`           | string | Yes      | A unique name for the agent. Must be a valid slug (lowercase letters, numbers, hyphens, and underscores only). |
+| `agent_card_url` | string | Yes      | The URL to the agent's A2A card endpoint.                                                                      |
+| `auth`           | object | No       | Authentication configuration. See [Authentication](#authentication).                                           |

 ### Single-subagent example

@@ -89,95 +88,6 @@ Markdown file.
 > [!NOTE] Mixed local and remote agents, or multiple local agents, are not
 > supported in a single file; the list format is currently remote-only.

-### Inline Agent Card JSON
-
-<details>
-<summary>View formatting options for JSON strings</summary>
-
-If you don't have an endpoint serving the agent card, you can provide the A2A
-card directly as a JSON string using `agent_card_json`.
-
-When providing a JSON string in YAML, you must properly format it as a string
-scalar. You can use single quotes, a block scalar, or double quotes (which
-require escaping internal double quotes).
-
-#### Using single quotes
-
-Single quotes allow you to embed unescaped double quotes inside the JSON string.
-This format is useful for shorter, single-line JSON strings.
-
-```markdown
---
-kind: remote
-name: single-quotes-agent
-agent_card_json:
-  '{ "protocolVersion": "0.3.0", "name": "Example Agent", "version": "1.0.0",
-  "url": "dummy-url" }'
---
-```
-
-#### Using a block scalar
-
-The literal block scalar (`|`) preserves line breaks and is highly recommended
-for multiline JSON strings as it avoids quote escaping entirely. The following
-is a complete, valid Agent Card configuration using dummy values.
-
-```markdown
---
-kind: remote
-name: block-scalar-agent
-agent_card_json: |
-  {
-    "protocolVersion": "0.3.0",
-    "name": "Example Agent Name",
-    "description": "An example agent description for documentation purposes.",
-    "version": "1.0.0",
-    "url": "dummy-url",
-    "preferredTransport": "HTTP+JSON",
-    "capabilities": {
-      "streaming": true,
-      "extendedAgentCard": false
-    },
-    "defaultInputModes": [
-      "text/plain"
-    ],
-    "defaultOutputModes": [
-      "application/json"
-    ],
-    "skills": [
-      {
-        "id": "ExampleSkill",
-        "name": "Example Skill Assistant",
-        "description": "A description of what this example skill does.",
-        "tags": [
-          "example-tag"
-        ],
-        "examples": [
-          "Show me an example."
-        ]
-      }
-    ]
-  }
---
-```
-
-#### Using double quotes
-
-Double quotes are also supported, but any internal double quotes in your JSON
-must be escaped with a backslash.
-
-```markdown
---
-kind: remote
-name: double-quotes-agent
-agent_card_json:
-  '{ "protocolVersion": "0.3.0", "name": "Example Agent", "version": "1.0.0",
-  "url": "dummy-url" }'
---
-```
-
-</details>
-
 ## Authentication

 Many remote agents require authentication. Gemini CLI supports several
@@ -0,0 +1,141 @@
+# Gemini CLI examples
+
+Gemini CLI helps you automate common engineering tasks by combining AI reasoning
+with local system tools. This document provides examples of how to use the CLI
+for file management, code analysis, and data transformation.
+
+<!-- prettier-ignore -->
+> [!NOTE]
+> These examples demonstrate potential capabilities. Your actual
+> results can vary based on the model used and your project environment.
+
+## Rename your photographs based on content
+
+You can use Gemini CLI to automate file management tasks that require visual
+analysis. In this example, Gemini CLI renames images based on their actual
+subject matter.
+
+Scenario: You have a folder containing the following files:
+
+```bash
+photos/photo1.png
+photos/photo2.png
+photos/photo3.png
+```
+
+Give Gemini the following prompt:
+
+```cli
+Rename the photos in my "photos" directory based on their contents.
+```
+
+Result: Gemini asks for permission to rename your files.
+
+Select **Allow once** and your files are renamed:
+
+```bash
+photos/yellow_flowers.png
+photos/antique_dresser.png
+photos/green_android_robot.png
+```
+
+## Explain a repository by reading its code
+
+Gemini CLI is effective for rapid codebase exploration. The following example
+shows how to ask Gemini CLI to fetch, analyze, and summarize a remote project.
+
+Scenario: You want to understand how a popular open-source utility works by
+inspecting its code, not just its README.
+
+Give Gemini CLI the following prompt:
+
+```cli
+Clone the 'chalk' repository from https://github.com/chalk/chalk, read its key source files, and explain how it works.
+```
+
+Result: Gemini performs a sequence of actions to answer your request.
+
+1.  First, it asks for permission to run `git clone` to download the repository.
+2.  Next, it finds the important source files and asks for permission to read
+    them.
+3.  Finally, after analyzing the code, it provides a summary.
+
+Gemini CLI returns an explanation based on the actual source code:
+
+```markdown
+The `chalk` library is a popular npm package for styling terminal output with
+colors. After analyzing the source code, here's how it works:
+
+- **Core functionality:** The main file sets up a chainable API. Each color or
+  modifier (like `bold` or `italic`) is a getter that appends the corresponding
+  ANSI escape code to an internal stack.
+
+- **Chainable API:** When you call `chalk.red.bold('Hello')`, you are accessing
+  getters. The `red` getter adds the red color code, and the `bold` getter adds
+  the bold code.
+
+- **Output generation:** When the chain is treated as a string (e.g., in
+  `console.log`), a final `toString()` method is called. This method joins all
+  the stored ANSI codes, wraps them around the input string ('Hello'), and adds
+  a reset code at the end. This produces the final, styled string that the
+  terminal can render.
+```
+
+## Combine two spreadsheets into one spreadsheet
+
+Gemini CLI can process and transform data across multiple files. Use this
+capability to merge reports or reformat data sets without manual copying.
+
+Scenario: You have two .csv files: `Revenue - 2023.csv` and
+`Revenue - 2024.csv`. Each file contains monthly revenue figures.
+
+Give Gemini CLI the following prompt:
+
+```cli
+Combine the two .csv files into a single .csv file, with each year a different column.
+```
+
+Result: Gemini CLI reads each file and then asks for permission to write a new
+file. Provide your permission and Gemini CLI provides the combined data:
+
+```csv
+Month,2023,2024
+January,0,1000
+February,0,1200
+March,0,2400
+April,900,500
+May,1000,800
+June,1000,900
+July,1200,1000
+August,1800,400
+September,2000,2000
+October,2400,3400
+November,3400,1800
+December,2100,9000
+```
+
+## Run unit tests
+
+Gemini CLI can generate boilerplate code and tests based on your existing
+implementation. This example demonstrates how to request code coverage for a
+JavaScript component.
+
+Scenario: You've written a simple login page. You wish to write unit tests to
+ensure that your login page has code coverage.
+
+Give Gemini CLI the following prompt:
+
+```cli
+Write unit tests for Login.js.
+```
+
+Result: Gemini CLI asks for permission to write a new file and creates a test
+for your login page.
+
+## Next steps
+
+- Follow the [File management](../cli/tutorials/file-management.md) guide to
+  start working with your codebase.
+- Follow the [Quickstart](./index.md) to start your first session.
+- See the [Cheatsheet](../cli/cli-reference.md) for a quick reference of
+  available commands.
@@ -62,133 +62,7 @@ Once installed and authenticated, you can start using Gemini CLI by issuing
 commands and prompts in your terminal. Ask it to generate code, explain files,
 and more.

-<!-- prettier-ignore -->
-> [!NOTE]
-> These examples demonstrate potential capabilities. Your actual
-> results can vary based on the model used and your project environment.
-
-### Rename your photographs based on content
-
-You can use Gemini CLI to automate file management tasks that require visual
-analysis. In this example, Gemini CLI renames images based on their actual
-subject matter.
-
-Scenario: You have a folder containing the following files:
-
-```bash
-photos/photo1.png
-photos/photo2.png
-photos/photo3.png
-```
-
-Give Gemini the following prompt:
-
-```cli
-Rename the photos in my "photos" directory based on their contents.
-```
-
-Result: Gemini asks for permission to rename your files.
-
-Select **Allow once** and your files are renamed:
-
-```bash
-photos/yellow_flowers.png
-photos/antique_dresser.png
-photos/green_android_robot.png
-```
-
-### Explain a repository by reading its code
-
-Gemini CLI is effective for rapid codebase exploration. The following example
-shows how to ask Gemini CLI to fetch, analyze, and summarize a remote project.
-
-Scenario: You want to understand how a popular open-source utility works by
-inspecting its code, not just its README.
-
-Give Gemini CLI the following prompt:
-
-```cli
-Clone the 'chalk' repository from https://github.com/chalk/chalk, read its key source files, and explain how it works.
-```
-
-Result: Gemini performs a sequence of actions to answer your request.
-
-1.  First, it asks for permission to run `git clone` to download the repository.
-2.  Next, it finds the important source files and asks for permission to read
-    them.
-3.  Finally, after analyzing the code, it provides a summary.
-
-Gemini CLI returns an explanation based on the actual source code:
-
-```markdown
-The `chalk` library is a popular npm package for styling terminal output with
-colors. After analyzing the source code, here's how it works:
-
- **Core functionality:** The main file sets up a chainable API. Each color or
-  modifier (like `bold` or `italic`) is a getter that appends the corresponding
-  ANSI escape code to an internal stack.
-
- **Chainable API:** When you call `chalk.red.bold('Hello')`, you are accessing
-  getters. The `red` getter adds the red color code, and the `bold` getter adds
-  the bold code.
-
- **Output generation:** When the chain is treated as a string (e.g., in
-  `console.log`), a final `toString()` method is called. This method joins all
-  the stored ANSI codes, wraps them around the input string ('Hello'), and adds
-  a reset code at the end. This produces the final, styled string that the
-  terminal can render.
-```
-
-### Combine two spreadsheets into one spreadsheet
-
-Gemini CLI can process and transform data across multiple files. Use this
-capability to merge reports or reformat data sets without manual copying.
-
-Scenario: You have two .csv files: `Revenue - 2023.csv` and
-`Revenue - 2024.csv`. Each file contains monthly revenue figures.
-
-Give Gemini CLI the following prompt:
-
-```cli
-Combine the two .csv files into a single .csv file, with each year a different column.
-```
-
-Result: Gemini CLI reads each file and then asks for permission to write a new
-file. Provide your permission and Gemini CLI provides the combined data:
-
-```csv
-Month,2023,2024
-January,0,1000
-February,0,1200
-March,0,2400
-April,900,500
-May,1000,800
-June,1000,900
-July,1200,1000
-August,1800,400
-September,2000,2000
-October,2400,3400
-November,3400,1800
-December,2100,9000
-```
-
-### Run unit tests
-
-Gemini CLI can generate boilerplate code and tests based on your existing
-implementation. This example demonstrates how to request code coverage for a
-JavaScript component.
-
-Scenario: You've written a simple login page. You wish to write unit tests to
-ensure that your login page has code coverage.
-
-Give Gemini CLI the following prompt:
-
-```cli
-Write unit tests for Login.js.
-```
-
-Result: Gemini CLI asks for permission to write a new file and creates a test
-for your login page.
+To explore the power of Gemini CLI, see [Gemini CLI examples](./examples.md).

 ## Check usage and quota

@@ -19,6 +19,8 @@ Jump in to Gemini CLI.
  on your system.
 - **[Authentication](./get-started/authentication.md):** Setup instructions for
  personal and enterprise accounts.
+- **[Examples](./get-started/examples.md):** Practical examples of Gemini CLI in
+  action.
 - **[CLI cheatsheet](./cli/cli-reference.md):** A quick reference for common
  commands and options.
 - **[Gemini 3 on Gemini CLI](./get-started/gemini-3.md):** Learn about Gemini 3
@@ -13,7 +13,6 @@
  "/docs/faq": "/docs/resources/faq",
  "/docs/get-started/configuration": "/docs/reference/configuration",
  "/docs/get-started/configuration-v1": "/docs/reference/configuration",
-  "/docs/get-started/examples": "/docs/get-started/index",
  "/docs/index": "/docs",
  "/docs/quota-and-pricing": "/docs/resources/quota-and-pricing",
  "/docs/tos-privacy": "/docs/resources/tos-privacy",
@@ -143,8 +143,7 @@ their corresponding top-level category object in your `settings.json` file.

 - **`general.plan.directory`** (string):
  - **Description:** The directory where planning artifacts are stored. If not
-    specified, defaults to the system temporary directory. A custom directory
-    requires a policy to allow write access in Plan Mode.
+    specified, defaults to the system temporary directory.
  - **Default:** `undefined`
  - **Requires restart:** Yes

@@ -257,11 +256,6 @@ their corresponding top-level category object in your `settings.json` file.
  - **Description:** Show the "? for shortcuts" hint above the input.
  - **Default:** `true`

- **`ui.compactToolOutput`** (boolean):
-  - **Description:** Display tool outputs (like directory listings and file
-    reads) in a compact, structured format.
-  - **Default:** `false`
-
 - **`ui.hideBanner`** (boolean):
  - **Description:** Hide the application banner
  - **Default:** `false`
@@ -651,11 +645,6 @@ their corresponding top-level category object in your `settings.json` file.
          "model": "gemini-3-flash-preview"
        }
      },
-      "chat-compression-3.1-flash-lite": {
-        "modelConfig": {
-          "model": "gemini-3.1-flash-lite-preview"
-        }
-      },
      "chat-compression-2.5-pro": {
        "modelConfig": {
          "model": "gemini-2.5-pro"
@@ -860,12 +849,6 @@ their corresponding top-level category object in your `settings.json` file.
              "hasAccessToPreview": false
            },
            "target": "gemini-2.5-pro"
-          },
-          {
-            "condition": {
-              "useCustomTools": true
-            },
-            "target": "gemini-3.1-pro-preview-customtools"
          }
        ]
      },
@@ -990,17 +973,6 @@ their corresponding top-level category object in your `settings.json` file.
      "auto-gemini-2.5": {
        "default": "gemini-2.5-pro"
      },
-      "gemini-3.1-flash-lite-preview": {
-        "default": "gemini-3.1-flash-lite-preview",
-        "contexts": [
-          {
-            "condition": {
-              "useGemini3_1FlashLite": false
-            },
-            "target": "gemini-2.5-flash-lite"
-          }
-        ]
-      },
      "flash": {
        "default": "gemini-3-flash-preview",
        "contexts": [
@@ -1013,15 +985,7 @@ their corresponding top-level category object in your `settings.json` file.
        ]
      },
      "flash-lite": {
-        "default": "gemini-2.5-flash-lite",
-        "contexts": [
-          {
-            "condition": {
-              "useGemini3_1FlashLite": true
-            },
-            "target": "gemini-3.1-flash-lite-preview"
-          }
-        ]
+        "default": "gemini-2.5-flash-lite"
      }
    }
    ```
@@ -2382,13 +2346,9 @@ can be based on the base sandbox image:
 ```dockerfile
 FROM gemini-cli-sandbox

-# Add your custom dependencies or configurations here.
-# Note: The base image runs as the non-root 'node' user.
-# You must switch to 'root' to install system packages.
+# Add your custom dependencies or configurations here
 # For example:
-# USER root
 # RUN apt-get update && apt-get install -y some-package
-# USER node
 # COPY ./my-config /app/my-config
 ```

@@ -63,62 +63,29 @@ details.

 ## Available tools

-The following sections list all available tools, categorized by their primary
-function. For detailed parameter information, see the linked documentation for
-each tool.
+The following table lists all available tools, categorized by their primary
+function.

-### Execution
-
-| Tool                                     | Kind      | Description                                                                                                              |
-| :--------------------------------------- | :-------- | :----------------------------------------------------------------------------------------------------------------------- |
-| [`run_shell_command`](../tools/shell.md) | `Execute` | Executes arbitrary shell commands. Supports interactive sessions and background processes. Requires manual confirmation. |
-
-### File System
-
-| Tool                                         | Kind     | Description                                                                                           |
-| :------------------------------------------- | :------- | :---------------------------------------------------------------------------------------------------- |
-| [`glob`](../tools/file-system.md)            | `Search` | Finds files matching specific glob patterns across the workspace.                                     |
-| [`grep_search`](../tools/file-system.md)     | `Search` | Searches for a regular expression pattern within file contents. Legacy alias: `search_file_content`.  |
-| [`list_directory`](../tools/file-system.md)  | `Read`   | Lists the names of files and subdirectories within a specified path.                                  |
-| [`read_file`](../tools/file-system.md)       | `Read`   | Reads the content of a specific file. Supports text, images, audio, and PDF.                          |
-| [`read_many_files`](../tools/file-system.md) | `Read`   | Reads and concatenates content from multiple files. Often triggered by the `@` symbol in your prompt. |
-| [`replace`](../tools/file-system.md)         | `Edit`   | Performs precise text replacement within a file. Requires manual confirmation.                        |
-| [`write_file`](../tools/file-system.md)      | `Edit`   | Creates or overwrites a file with new content. Requires manual confirmation.                          |
-
-### Interaction
-
-| Tool                               | Kind          | Description                                                                            |
-| :--------------------------------- | :------------ | :------------------------------------------------------------------------------------- |
-| [`ask_user`](../tools/ask-user.md) | `Communicate` | Requests clarification or missing information via an interactive dialog.               |
-| [`write_todos`](../tools/todos.md) | `Other`       | Maintains an internal list of subtasks. The model uses this to track its own progress. |
-
-### Memory
-
-| Tool                                             | Kind    | Description                                                                          |
-| :----------------------------------------------- | :------ | :----------------------------------------------------------------------------------- |
-| [`activate_skill`](../tools/activate-skill.md)   | `Other` | Loads specialized procedural expertise from the `.gemini/skills` directory.          |
-| [`get_internal_docs`](../tools/internal-docs.md) | `Think` | Accesses Gemini CLI's own documentation for accurate answers about its capabilities. |
-| [`save_memory`](../tools/memory.md)              | `Think` | Persists specific facts and project details to your `GEMINI.md` file.                |
-
-### Planning
-
-| Tool                                      | Kind   | Description                                                                              |
-| :---------------------------------------- | :----- | :--------------------------------------------------------------------------------------- |
-| [`enter_plan_mode`](../tools/planning.md) | `Plan` | Switches the CLI to a safe, read-only "Plan Mode" for researching complex changes.       |
-| [`exit_plan_mode`](../tools/planning.md)  | `Plan` | Finalizes a plan, presents it for review, and requests approval to start implementation. |
-
-### System
-
-| Tool            | Kind    | Description                                                                                                        |
-| :-------------- | :------ | :----------------------------------------------------------------------------------------------------------------- |
-| `complete_task` | `Other` | Finalizes a subagent's mission and returns the result to the parent agent. This tool is not available to the user. |
-
-### Web
-
-| Tool                                          | Kind     | Description                                                                                                                                                                                                 |
-| :-------------------------------------------- | :------- | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [`google_web_search`](../tools/web-search.md) | `Search` | Performs a Google Search to find up-to-date information.                                                                                                                                                    |
-| [`web_fetch`](../tools/web-fetch.md)          | `Fetch`  | Retrieves and processes content from specific URLs. **Warning:** This tool can access local and private network addresses (e.g., localhost), which may pose a security risk if used with untrusted prompts. |
+| Category    | Tool                                             | Kind          | Description                                                                                                                                                                                                                                 |
+| :---------- | :----------------------------------------------- | :------------ | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| Execution   | [`run_shell_command`](../tools/shell.md)         | `Execute`     | Executes arbitrary shell commands. Supports interactive sessions and background processes. Requires manual confirmation.<br><br>**Parameters:** `command`, `description`, `dir_path`, `is_background`                                       |
+| File System | [`glob`](../tools/file-system.md)                | `Search`      | Finds files matching specific glob patterns across the workspace.<br><br>**Parameters:** `pattern`, `dir_path`, `case_sensitive`, `respect_git_ignore`, `respect_gemini_ignore`                                                             |
+| File System | [`grep_search`](../tools/file-system.md)         | `Search`      | Searches for a regular expression pattern within file contents. Legacy alias: `search_file_content`.<br><br>**Parameters:** `pattern`, `dir_path`, `include`, `exclude_pattern`, `names_only`, `max_matches_per_file`, `total_max_matches`  |
+| File System | [`list_directory`](../tools/file-system.md)      | `Read`        | Lists the names of files and subdirectories within a specified path.<br><br>**Parameters:** `dir_path`, `ignore`, `file_filtering_options`                                                                                                  |
+| File System | [`read_file`](../tools/file-system.md)           | `Read`        | Reads the content of a specific file. Supports text, images, audio, and PDF.<br><br>**Parameters:** `file_path`, `start_line`, `end_line`                                                                                                   |
+| File System | [`read_many_files`](../tools/file-system.md)     | `Read`        | Reads and concatenates content from multiple files. Often triggered by the `@` symbol in your prompt.<br><br>**Parameters:** `include`, `exclude`, `recursive`, `useDefaultExcludes`, `file_filtering_options`                              |
+| File System | [`replace`](../tools/file-system.md)             | `Edit`        | Performs precise text replacement within a file. Requires manual confirmation.<br><br>**Parameters:** `file_path`, `instruction`, `old_string`, `new_string`, `allow_multiple`                                                              |
+| File System | [`write_file`](../tools/file-system.md)          | `Edit`        | Creates or overwrites a file with new content. Requires manual confirmation.<br><br>**Parameters:** `file_path`, `content`                                                                                                                  |
+| Interaction | [`ask_user`](../tools/ask-user.md)               | `Communicate` | Requests clarification or missing information via an interactive dialog.<br><br>**Parameters:** `questions`                                                                                                                                 |
+| Interaction | [`write_todos`](../tools/todos.md)               | `Other`       | Maintains an internal list of subtasks. The model uses this to track its own progress and display it to you.<br><br>**Parameters:** `todos`                                                                                                 |
+| Memory      | [`activate_skill`](../tools/activate-skill.md)   | `Other`       | Loads specialized procedural expertise for specific tasks from the `.gemini/skills` directory.<br><br>**Parameters:** `name`                                                                                                                |
+| Memory      | [`get_internal_docs`](../tools/internal-docs.md) | `Think`       | Accesses Gemini CLI's own documentation to provide more accurate answers about its capabilities.<br><br>**Parameters:** `path`                                                                                                              |
+| Memory      | [`save_memory`](../tools/memory.md)              | `Think`       | Persists specific facts and project details to your `GEMINI.md` file to retain context.<br><br>**Parameters:** `fact`                                                                                                                       |
+| Planning    | [`enter_plan_mode`](../tools/planning.md)        | `Plan`        | Switches the CLI to a safe, read-only "Plan Mode" for researching complex changes.<br><br>**Parameters:** `reason`                                                                                                                          |
+| Planning    | [`exit_plan_mode`](../tools/planning.md)         | `Plan`        | Finalizes a plan, presents it for review, and requests approval to start implementation.<br><br>**Parameters:** `plan`                                                                                                                      |
+| System      | `complete_task`                                  | `Other`       | Finalizes a subagent's mission and returns the result to the parent agent. This tool is not available to the user.<br><br>**Parameters:** `result`                                                                                          |
+| Web         | [`google_web_search`](../tools/web-search.md)    | `Search`      | Performs a Google Search to find up-to-date information.<br><br>**Parameters:** `query`                                                                                                                                                     |
+| Web         | [`web_fetch`](../tools/web-fetch.md)             | `Fetch`       | Retrieves and processes content from specific URLs. **Warning:** This tool can access local and private network addresses (e.g., localhost), which may pose a security risk if used with untrusted prompts.<br><br>**Parameters:** `prompt` |

 ## Under the hood

@@ -12,6 +12,7 @@
            "label": "Authentication",
            "slug": "docs/get-started/authentication"
          },
+          { "label": "Examples", "slug": "docs/get-started/examples" },
          { "label": "CLI cheatsheet", "slug": "docs/cli/cli-reference" },
          {
            "label": "Gemini 3 on Gemini CLI",
@@ -1,207 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import fs from 'node:fs';
-import path from 'node:path';
-import { internalEvalTest } from './test-helper.js';
-import { TestRig } from '@google/gemini-cli-test-utils';
-
-// Mock TestRig to control API success/failure
-vi.mock('@google/gemini-cli-test-utils', () => {
-  return {
-    TestRig: vi.fn().mockImplementation(() => ({
-      setup: vi.fn(),
-      run: vi.fn(),
-      cleanup: vi.fn(),
-      readToolLogs: vi.fn().mockReturnValue([]),
-      _lastRunStderr: '',
-    })),
-  };
-});
-
-describe('evalTest reliability logic', () => {
-  const LOG_DIR = path.resolve(process.cwd(), 'evals/logs');
-  const RELIABILITY_LOG = path.join(LOG_DIR, 'api-reliability.jsonl');
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-    if (fs.existsSync(RELIABILITY_LOG)) {
-      fs.unlinkSync(RELIABILITY_LOG);
-    }
-  });
-
-  afterEach(() => {
-    if (fs.existsSync(RELIABILITY_LOG)) {
-      fs.unlinkSync(RELIABILITY_LOG);
-    }
-  });
-
-  it('should retry 3 times on 500 INTERNAL error and then SKIP', async () => {
-    const mockRig = new TestRig() as any;
-    (TestRig as any).mockReturnValue(mockRig);
-
-    // Simulate permanent 500 error
-    mockRig.run.mockRejectedValue(new Error('status: INTERNAL - API Down'));
-
-    // Execute the test function directly
-    await internalEvalTest({
-      name: 'test-api-failure',
-      prompt: 'do something',
-      assert: async () => {},
-    });
-
-    // Verify retries: 1 initial + 3 retries = 4 setups/runs
-    expect(mockRig.run).toHaveBeenCalledTimes(4);
-
-    // Verify log content
-    const logContent = fs
-      .readFileSync(RELIABILITY_LOG, 'utf-8')
-      .trim()
-      .split('\n');
-    expect(logContent.length).toBe(4);
-
-    const entries = logContent.map((line) => JSON.parse(line));
-    expect(entries[0].status).toBe('RETRY');
-    expect(entries[0].attempt).toBe(0);
-    expect(entries[3].status).toBe('SKIP');
-    expect(entries[3].attempt).toBe(3);
-    expect(entries[3].testName).toBe('test-api-failure');
-  });
-
-  it('should fail immediately on non-500 errors (like assertion failures)', async () => {
-    const mockRig = new TestRig() as any;
-    (TestRig as any).mockReturnValue(mockRig);
-
-    // Simulate a real logic error/bug
-    mockRig.run.mockResolvedValue('Success');
-    const assertError = new Error('Assertion failed: expected foo to be bar');
-
-    // Expect the test function to throw immediately
-    await expect(
-      internalEvalTest({
-        name: 'test-logic-failure',
-        prompt: 'do something',
-        assert: async () => {
-          throw assertError;
-        },
-      }),
-    ).rejects.toThrow('Assertion failed');
-
-    // Verify NO retries: only 1 attempt
-    expect(mockRig.run).toHaveBeenCalledTimes(1);
-
-    // Verify NO reliability log was created (it's not an API error)
-    expect(fs.existsSync(RELIABILITY_LOG)).toBe(false);
-  });
-
-  it('should recover if a retry succeeds', async () => {
-    const mockRig = new TestRig() as any;
-    (TestRig as any).mockReturnValue(mockRig);
-
-    // Fail once, then succeed
-    mockRig.run
-      .mockRejectedValueOnce(new Error('status: INTERNAL'))
-      .mockResolvedValueOnce('Success');
-
-    await internalEvalTest({
-      name: 'test-recovery',
-      prompt: 'do something',
-      assert: async () => {},
-    });
-
-    // Ran twice: initial (fail) + retry 1 (success)
-    expect(mockRig.run).toHaveBeenCalledTimes(2);
-
-    // Log should only have the one RETRY entry
-    const logContent = fs
-      .readFileSync(RELIABILITY_LOG, 'utf-8')
-      .trim()
-      .split('\n');
-    expect(logContent.length).toBe(1);
-    expect(JSON.parse(logContent[0]).status).toBe('RETRY');
-  });
-
-  it('should retry 3 times on 503 UNAVAILABLE error and then SKIP', async () => {
-    const mockRig = new TestRig() as any;
-    (TestRig as any).mockReturnValue(mockRig);
-
-    // Simulate permanent 503 error
-    mockRig.run.mockRejectedValue(
-      new Error('status: UNAVAILABLE - Service Busy'),
-    );
-
-    await internalEvalTest({
-      name: 'test-api-503',
-      prompt: 'do something',
-      assert: async () => {},
-    });
-
-    expect(mockRig.run).toHaveBeenCalledTimes(4);
-
-    const logContent = fs
-      .readFileSync(RELIABILITY_LOG, 'utf-8')
-      .trim()
-      .split('\n');
-    const entries = logContent.map((line) => JSON.parse(line));
-    expect(entries[0].errorCode).toBe('503');
-    expect(entries[3].status).toBe('SKIP');
-  });
-
-  it('should throw if an absolute path is used in files', async () => {
-    const mockRig = new TestRig() as any;
-    (TestRig as any).mockReturnValue(mockRig);
-    mockRig.testDir = path.resolve(process.cwd(), 'test-dir-tmp');
-    if (!fs.existsSync(mockRig.testDir)) {
-      fs.mkdirSync(mockRig.testDir, { recursive: true });
-    }
-
-    try {
-      await expect(
-        internalEvalTest({
-          name: 'test-absolute-path',
-          prompt: 'do something',
-          files: {
-            '/etc/passwd': 'hacked',
-          },
-          assert: async () => {},
-        }),
-      ).rejects.toThrow('Invalid file path in test case: /etc/passwd');
-    } finally {
-      if (fs.existsSync(mockRig.testDir)) {
-        fs.rmSync(mockRig.testDir, { recursive: true, force: true });
-      }
-    }
-  });
-
-  it('should throw if directory traversal is detected in files', async () => {
-    const mockRig = new TestRig() as any;
-    (TestRig as any).mockReturnValue(mockRig);
-    mockRig.testDir = path.resolve(process.cwd(), 'test-dir-tmp');
-
-    // Create a mock test-dir
-    if (!fs.existsSync(mockRig.testDir)) {
-      fs.mkdirSync(mockRig.testDir, { recursive: true });
-    }
-
-    try {
-      await expect(
-        internalEvalTest({
-          name: 'test-traversal',
-          prompt: 'do something',
-          files: {
-            '../sensitive.txt': 'hacked',
-          },
-          assert: async () => {},
-        }),
-      ).rejects.toThrow('Invalid file path in test case: ../sensitive.txt');
-    } finally {
-      if (fs.existsSync(mockRig.testDir)) {
-        fs.rmSync(mockRig.testDir, { recursive: true, force: true });
-      }
-    }
-  });
-});
@@ -39,34 +39,87 @@ export * from '@google/gemini-cli-test-utils';
 export type EvalPolicy = 'ALWAYS_PASSES' | 'USUALLY_PASSES';

 export function evalTest(policy: EvalPolicy, evalCase: EvalCase) {
-  runEval(
-    policy,
-    evalCase.name,
-    () => internalEvalTest(evalCase),
-    evalCase.timeout,
-  );
-}
-
-export async function internalEvalTest(evalCase: EvalCase) {
-  const maxRetries = 3;
-  let attempt = 0;
-
-  while (attempt <= maxRetries) {
+  const fn = async () => {
    const rig = new TestRig();
    const { logDir, sanitizedName } = await prepareLogDir(evalCase.name);
    const activityLogFile = path.join(logDir, `${sanitizedName}.jsonl`);
    const logFile = path.join(logDir, `${sanitizedName}.log`);
    let isSuccess = false;
-
    try {
      rig.setup(evalCase.name, evalCase.params);

-      if (evalCase.files) {
-        await setupTestFiles(rig, evalCase.files);
-      }
-
+      // Symlink node modules to reduce the amount of time needed to
+      // bootstrap test projects.
      symlinkNodeModules(rig.testDir || '');

+      if (evalCase.files) {
+        const acknowledgedAgents: Record<string, Record<string, string>> = {};
+        const projectRoot = fs.realpathSync(rig.testDir!);
+
+        for (const [filePath, content] of Object.entries(evalCase.files)) {
+          const fullPath = path.join(rig.testDir!, filePath);
+          fs.mkdirSync(path.dirname(fullPath), { recursive: true });
+          fs.writeFileSync(fullPath, content);
+
+          // If it's an agent file, calculate hash for acknowledgement
+          if (
+            filePath.startsWith('.gemini/agents/') &&
+            filePath.endsWith('.md')
+          ) {
+            const hash = crypto
+              .createHash('sha256')
+              .update(content)
+              .digest('hex');
+
+            try {
+              const agentDefs = await parseAgentMarkdown(fullPath, content);
+              if (agentDefs.length > 0) {
+                const agentName = agentDefs[0].name;
+                if (!acknowledgedAgents[projectRoot]) {
+                  acknowledgedAgents[projectRoot] = {};
+                }
+                acknowledgedAgents[projectRoot][agentName] = hash;
+              }
+            } catch (error) {
+              console.warn(
+                `Failed to parse agent for test acknowledgement: ${filePath}`,
+                error,
+              );
+            }
+          }
+        }
+
+        // Write acknowledged_agents.json to the home directory
+        if (Object.keys(acknowledgedAgents).length > 0) {
+          const ackPath = path.join(
+            rig.homeDir!,
+            '.gemini',
+            'acknowledgments',
+            'agents.json',
+          );
+          fs.mkdirSync(path.dirname(ackPath), { recursive: true });
+          fs.writeFileSync(
+            ackPath,
+            JSON.stringify(acknowledgedAgents, null, 2),
+          );
+        }
+
+        const execOptions = { cwd: rig.testDir!, stdio: 'inherit' as const };
+        execSync('git init', execOptions);
+        execSync('git config user.email "test@example.com"', execOptions);
+        execSync('git config user.name "Test User"', execOptions);
+
+        // Temporarily disable the interactive editor and git pager
+        // to avoid hanging the tests. It seems the the agent isn't
+        // consistently honoring the instructions to avoid interactive
+        // commands.
+        execSync('git config core.editor "true"', execOptions);
+        execSync('git config core.pager "cat"', execOptions);
+        execSync('git config commit.gpgsign false', execOptions);
+        execSync('git add .', execOptions);
+        execSync('git commit --allow-empty -m "Initial commit"', execOptions);
+      }
+
      // If messages are provided, write a session file so --resume can load it.
      let sessionId: string | undefined;
      if (evalCase.messages) {
@@ -135,37 +188,6 @@ export async function internalEvalTest(evalCase: EvalCase) {

      await evalCase.assert(rig, result);
      isSuccess = true;
-      return; // Success! Exit the retry loop.
-    } catch (error: unknown) {
-      const errorMessage =
-        error instanceof Error ? error.message : String(error);
-      const errorCode = getApiErrorCode(errorMessage);
-
-      if (errorCode) {
-        const status = attempt < maxRetries ? 'RETRY' : 'SKIP';
-        logReliabilityEvent(
-          evalCase.name,
-          attempt,
-          status,
-          errorCode,
-          errorMessage,
-        );
-
-        if (attempt < maxRetries) {
-          attempt++;
-          console.warn(
-            `[Eval] Attempt ${attempt} failed with ${errorCode} Error. Retrying...`,
-          );
-          continue; // Retry
-        }
-
-        console.warn(
-          `[Eval] '${evalCase.name}' failed after ${maxRetries} retries due to persistent API errors. Skipping failure to avoid blocking PR.`,
-        );
-        return; // Gracefully exit without failing the test
-      }
-
-      throw error; // Real failure
    } finally {
      if (isSuccess) {
        await fs.promises.unlink(activityLogFile).catch((err) => {
@@ -184,131 +206,9 @@ export async function internalEvalTest(evalCase: EvalCase) {
      );
      await rig.cleanup();
    }
-  }
-}
-
-function getApiErrorCode(message: string): '500' | '503' | undefined {
-  if (
-    message.includes('status: UNAVAILABLE') ||
-    message.includes('code: 503') ||
-    message.includes('Service Unavailable')
-  ) {
-    return '503';
-  }
-  if (
-    message.includes('status: INTERNAL') ||
-    message.includes('code: 500') ||
-    message.includes('Internal error encountered')
-  ) {
-    return '500';
-  }
-  return undefined;
-}
-
-/**
- * Log reliability event for later harvesting.
- *
- * Note: Uses synchronous file I/O to ensure the log is persisted even if the
- * test process is abruptly terminated by a timeout or CI crash. Performance
- * impact is negligible compared to long-running evaluation tests.
- */
-function logReliabilityEvent(
-  testName: string,
-  attempt: number,
-  status: 'RETRY' | 'SKIP',
-  errorCode: '500' | '503',
-  errorMessage: string,
-) {
-  const reliabilityLog = {
-    timestamp: new Date().toISOString(),
-    testName,
-    model: process.env.GEMINI_MODEL || 'unknown',
-    attempt,
-    status,
-    errorCode,
-    error: errorMessage,
  };

-  try {
-    const relDir = path.resolve(process.cwd(), 'evals/logs');
-    fs.mkdirSync(relDir, { recursive: true });
-    fs.appendFileSync(
-      path.join(relDir, 'api-reliability.jsonl'),
-      JSON.stringify(reliabilityLog) + '\n',
-    );
-  } catch (logError) {
-    console.error('Failed to write reliability log:', logError);
-  }
-}
-
-/**
- * Helper to setup test files and git repository.
- *
- * Note: While this is an async function (due to parseAgentMarkdown), it
- * intentionally uses synchronous filesystem and child_process operations
- * for simplicity and to ensure sequential environment preparation.
- */
-async function setupTestFiles(rig: TestRig, files: Record<string, string>) {
-  const acknowledgedAgents: Record<string, Record<string, string>> = {};
-  const projectRoot = fs.realpathSync(rig.testDir!);
-
-  for (const [filePath, content] of Object.entries(files)) {
-    if (filePath.includes('..') || path.isAbsolute(filePath)) {
-      throw new Error(`Invalid file path in test case: ${filePath}`);
-    }
-    const fullPath = path.join(projectRoot, filePath);
-    if (!fullPath.startsWith(projectRoot)) {
-      throw new Error(`Path traversal detected: ${filePath}`);
-    }
-
-    fs.mkdirSync(path.dirname(fullPath), { recursive: true });
-    fs.writeFileSync(fullPath, content);
-
-    if (filePath.startsWith('.gemini/agents/') && filePath.endsWith('.md')) {
-      const hash = crypto.createHash('sha256').update(content).digest('hex');
-      try {
-        const agentDefs = await parseAgentMarkdown(fullPath, content);
-        if (agentDefs.length > 0) {
-          const agentName = agentDefs[0].name;
-          if (!acknowledgedAgents[projectRoot]) {
-            acknowledgedAgents[projectRoot] = {};
-          }
-          acknowledgedAgents[projectRoot][agentName] = hash;
-        }
-      } catch (error) {
-        console.warn(
-          `Failed to parse agent for test acknowledgement: ${filePath}`,
-          error,
-        );
-      }
-    }
-  }
-
-  if (Object.keys(acknowledgedAgents).length > 0) {
-    const ackPath = path.join(
-      rig.homeDir!,
-      '.gemini',
-      'acknowledgments',
-      'agents.json',
-    );
-    fs.mkdirSync(path.dirname(ackPath), { recursive: true });
-    fs.writeFileSync(ackPath, JSON.stringify(acknowledgedAgents, null, 2));
-  }
-
-  const execOptions = { cwd: rig.testDir!, stdio: 'inherit' as const };
-  execSync('git init --initial-branch=main', execOptions);
-  execSync('git config user.email "test@example.com"', execOptions);
-  execSync('git config user.name "Test User"', execOptions);
-
-  // Temporarily disable the interactive editor and git pager
-  // to avoid hanging the tests. It seems the the agent isn't
-  // consistently honoring the instructions to avoid interactive
-  // commands.
-  execSync('git config core.editor "true"', execOptions);
-  execSync('git config core.pager "cat"', execOptions);
-  execSync('git config commit.gpgsign false', execOptions);
-  execSync('git add .', execOptions);
-  execSync('git commit --allow-empty -m "Initial commit"', execOptions);
+  runEval(policy, evalCase.name, fn, evalCase.timeout);
 }

 /**
@@ -16,6 +16,10 @@ export default defineConfig({
  },
  test: {
    testTimeout: 300000, // 5 minutes
+    // Retry in CI but not nightly to avoid blocking on API error.
+    retry: process.env['VITEST_RETRY']
+      ? parseInt(process.env['VITEST_RETRY'], 10)
+      : 3,
    reporters: ['default', 'json'],
    outputFile: {
      json: 'evals/logs/report.json',
@@ -6,9 +6,9 @@

 import { describe, it, expect, beforeEach, afterEach } from 'vitest';
 import * as os from 'node:os';
-import { TestRig, skipFlaky } from './test-helper.js';
+import { TestRig } from './test-helper.js';

-describe.skipIf(skipFlaky)('Ctrl+C exit', () => {
+describe('Ctrl+C exit', () => {
  let rig: TestRig;

  beforeEach(() => {
@@ -34,20 +34,16 @@ describe('extension install', () => {
    writeFileSync(testServerPath, extension);
    try {
      const result = await rig.runCommand(
-        ['--debug', 'extensions', 'install', `${rig.testDir!}`],
+        ['extensions', 'install', `${rig.testDir!}`],
        { stdin: 'y\n' },
      );
      expect(result).toContain('test-extension-install');

-      const listResult = await rig.runCommand([
-        '--debug',
-        'extensions',
-        'list',
-      ]);
+      const listResult = await rig.runCommand(['extensions', 'list']);
      expect(listResult).toContain('test-extension-install');
      writeFileSync(testServerPath, extensionUpdate);
      const updateResult = await rig.runCommand(
-        ['--debug', 'extensions', 'update', `test-extension-install`],
+        ['extensions', 'update', `test-extension-install`],
        { stdin: 'y\n' },
      );
      expect(updateResult).toContain('0.0.2');
@@ -66,7 +66,7 @@ describe('extension reloading', () => {
      }

      const result = await rig.runCommand(
-        ['--debug', 'extensions', 'install', `${rig.testDir!}`],
+        ['extensions', 'install', `${rig.testDir!}`],
        { stdin: 'y\n' },
      );
      expect(result).toContain('test-extension');
@@ -4,8 +4,10 @@
 * 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 } from './test-helper.js';
+import { TestRig, checkModelOutputContent, GEMINI_DIR } from './test-helper.js';

 describe('Plan Mode', () => {
  let rig: TestRig;
@@ -34,24 +36,28 @@ describe('Plan Mode', () => {
      },
    );

+    // We use a prompt that asks for both a read-only action and a write action.
+    // "List files" (read-only) followed by "touch denied.txt" (write).
    const result = await rig.run({
      approvalMode: 'plan',
-      args: 'Please list the files in the current directory, and then attempt to create a new file named "denied.txt" using a shell command.',
+      stdin:
+        'Please list the files in the current directory, and then attempt to create a new file named "denied.txt" using a shell command.',
    });

+    const lsCallFound = await rig.waitForToolCall('list_directory');
+    expect(lsCallFound, 'Expected list_directory to be called').toBe(true);
+
+    const shellCallFound = await rig.waitForToolCall('run_shell_command');
+    expect(shellCallFound, 'Expected run_shell_command to fail').toBe(false);
+
    const toolLogs = rig.readToolLogs();
    const lsLog = toolLogs.find((l) => l.toolRequest.name === 'list_directory');
-    const shellLog = toolLogs.find(
-      (l) => l.toolRequest.name === 'run_shell_command',
-    );
-
-    expect(lsLog, 'Expected list_directory to be called').toBeDefined();
-    expect(lsLog?.toolRequest.success).toBe(true);
    expect(
-      shellLog,
-      'Expected run_shell_command to be blocked (not even called)',
+      toolLogs.find((l) => l.toolRequest.name === 'run_shell_command'),
    ).toBeUndefined();

+    expect(lsLog?.toolRequest.success).toBe(true);
+
    checkModelOutputContent(result, {
      expectedContent: ['Plan Mode', 'read-only'],
      testName: 'Plan Mode restrictions test',
@@ -78,11 +84,23 @@ describe('Plan Mode', () => {
      },
    });

-    await rig.run({
+    // 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({
      approvalMode: 'plan',
-      args: 'Create a file called plan.md in the plans 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(
      (l) =>
@@ -90,25 +108,7 @@ describe('Plan Mode', () => {
        l.toolRequest.args.includes('plans') &&
        l.toolRequest.args.includes('plan.md'),
    );
-
-    if (!planWrite) {
-      console.error(
-        'All tool calls found:',
-        toolLogs.map((l) => ({
-          name: l.toolRequest.name,
-          args: l.toolRequest.args,
-        })),
-      );
-    }
-
-    expect(
-      planWrite,
-      'Expected write_file to be called for plan.md',
-    ).toBeDefined();
-    expect(
-      planWrite?.toolRequest.success,
-      `Expected write_file to succeed, but it failed with error: ${planWrite?.toolRequest.error}`,
-    ).toBe(true);
+    expect(planWrite?.toolRequest.success).toBe(true);
  });

  it('should deny write_file to non-plans directory in plan mode', async () => {
@@ -131,11 +131,19 @@ describe('Plan Mode', () => {
      },
    });

-    await rig.run({
+    // 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({
      approvalMode: 'plan',
-      args: 'Create a file called hello.txt in the current directory.',
    });

+    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) =>
@@ -143,11 +151,10 @@ describe('Plan Mode', () => {
        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,
-        'Expected write_file to non-plans dir to fail',
-      ).toBe(false);
+      expect(writeLog.toolRequest.success).toBe(false);
    }
  });

@@ -162,69 +169,28 @@ 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',
-      args: 'I want to perform a complex refactoring. Please enter plan mode so we can design it first.',
+      stdin:
+        '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');
+    expect(enterPlanCallFound, 'Expected enter_plan_mode to be called').toBe(
+      true,
+    );
+
    const toolLogs = rig.readToolLogs();
    const enterLog = toolLogs.find(
      (l) => l.toolRequest.name === 'enter_plan_mode',
    );
-    expect(enterLog, 'Expected enter_plan_mode to be called').toBeDefined();
    expect(enterLog?.toolRequest.success).toBe(true);
  });
-
-  it('should allow write_file to the plans directory in plan mode even without a session ID', async () => {
-    const plansDir = '.gemini/tmp/foo/plans';
-    const testName =
-      'should allow write_file to the plans directory in plan mode even without a session ID';
-
-    await rig.setup(testName, {
-      settings: {
-        experimental: { plan: true },
-        tools: {
-          core: ['write_file', 'read_file', 'list_directory'],
-        },
-        general: {
-          defaultApprovalMode: 'plan',
-          plan: {
-            directory: plansDir,
-          },
-        },
-      },
-    });
-
-    await rig.run({
-      approvalMode: 'plan',
-      args: 'Create a file called plan-no-session.md in the plans directory.',
-    });
-
-    const toolLogs = rig.readToolLogs();
-    const planWrite = toolLogs.find(
-      (l) =>
-        l.toolRequest.name === 'write_file' &&
-        l.toolRequest.args.includes('plans') &&
-        l.toolRequest.args.includes('plan-no-session.md'),
-    );
-
-    if (!planWrite) {
-      console.error(
-        'All tool calls found:',
-        toolLogs.map((l) => ({
-          name: l.toolRequest.name,
-          args: l.toolRequest.args,
-        })),
-      );
-    }
-
-    expect(
-      planWrite,
-      'Expected write_file to be called for plan-no-session.md',
-    ).toBeDefined();
-    expect(
-      planWrite?.toolRequest.success,
-      `Expected write_file to succeed, but it failed with error: ${planWrite?.toolRequest.error}`,
-    ).toBe(true);
-  });
 });
@@ -6,12 +6,19 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-import { main } from './src/gemini.js';
-import { FatalError, writeToStderr } from '@google/gemini-cli-core';
-import { runExitCleanup } from './src/utils/cleanup.js';
+// --- Fast Path for Version ---
+// We check for version flags at the very top to avoid loading any heavy dependencies.
+// process.env.CLI_VERSION is defined during the build process by esbuild.
+if (process.argv.includes('--version') || process.argv.includes('-v')) {
+  console.log(process.env['CLI_VERSION'] || 'unknown');
+  process.exit(0);
+}

 // --- Global Entry Point ---

+let writeToStderrFn: (message: string) => void = (msg) =>
+  process.stderr.write(msg);
+
 // Suppress known race condition error in node-pty on Windows
 // Tracking bug: https://github.com/microsoft/node-pty/issues/827
 process.on('uncaughtException', (error) => {
@@ -28,13 +35,22 @@ process.on('uncaughtException', (error) => {
  // For other errors, we rely on the default behavior, but since we attached a listener,
  // we must manually replicate it.
  if (error instanceof Error) {
-    writeToStderr(error.stack + '\n');
+    writeToStderrFn(error.stack + '\n');
  } else {
-    writeToStderr(String(error) + '\n');
+    writeToStderrFn(String(error) + '\n');
  }
  process.exit(1);
 });

+const [{ main }, { FatalError, writeToStderr }, { runExitCleanup }] =
+  await Promise.all([
+    import('./src/gemini.js'),
+    import('@google/gemini-cli-core'),
+    import('./src/utils/cleanup.js'),
+  ]);
+
+writeToStderrFn = writeToStderr;
+
 main().catch(async (error) => {
  // Set a timeout to force exit if cleanup hangs
  const cleanupTimeout = setTimeout(() => {
@@ -21,13 +21,13 @@ import {
  AuthType,
  ToolConfirmationOutcome,
  StreamEventType,
+  isWithinRoot,
  ReadManyFilesTool,
  type GeminiChat,
  type Config,
  type MessageBus,
  LlmRole,
  type GitService,
-  processSingleFileContent,
 } from '@google/gemini-cli-core';
 import {
  SettingScope,
@@ -111,6 +111,7 @@ vi.mock(
        }),
      })),
      logToolCall: vi.fn(),
+      isWithinRoot: vi.fn().mockReturnValue(true),
      LlmRole: {
        MAIN: 'main',
        SUBAGENT: 'subagent',
@@ -133,7 +134,6 @@ vi.mock(
        Cancelled: 'cancelled',
        AwaitingApproval: 'awaiting_approval',
      },
-      processSingleFileContent: vi.fn(),
    };
  },
 );
@@ -177,10 +177,6 @@ describe('GeminiAgent', () => {
      getHasAccessToPreviewModel: vi.fn().mockReturnValue(false),
      getCheckpointingEnabled: vi.fn().mockReturnValue(false),
      getDisableAlwaysAllow: vi.fn().mockReturnValue(false),
-      validatePathAccess: vi.fn().mockReturnValue(null),
-      getWorkspaceContext: vi.fn().mockReturnValue({
-        addReadOnlyPath: vi.fn(),
-      }),
      get config() {
        return this;
      },
@@ -195,7 +191,6 @@ describe('GeminiAgent', () => {
    mockArgv = {} as unknown as CliArgs;
    mockConnection = {
      sessionUpdate: vi.fn(),
-      requestPermission: vi.fn(),
    } as unknown as Mocked<acp.AgentSideConnection>;

    (loadCliConfig as unknown as Mock).mockResolvedValue(mockConfig);
@@ -653,7 +648,6 @@ describe('Session', () => {
        shouldIgnoreFile: vi.fn().mockReturnValue(false),
      }),
      getFileFilteringOptions: vi.fn().mockReturnValue({}),
-      getFileSystemService: vi.fn().mockReturnValue({}),
      getTargetDir: vi.fn().mockReturnValue('/tmp'),
      getEnableRecursiveFileSearch: vi.fn().mockReturnValue(false),
      getDebugMode: vi.fn().mockReturnValue(false),
@@ -663,10 +657,6 @@ describe('Session', () => {
      isPlanEnabled: vi.fn().mockReturnValue(true),
      getCheckpointingEnabled: vi.fn().mockReturnValue(false),
      getGitService: vi.fn().mockResolvedValue({} as GitService),
-      validatePathAccess: vi.fn().mockReturnValue(null),
-      getWorkspaceContext: vi.fn().mockReturnValue({
-        addReadOnlyPath: vi.fn(),
-      }),
      waitForMcpInit: vi.fn(),
      getDisableAlwaysAllow: vi.fn().mockReturnValue(false),
      get config() {
@@ -1366,6 +1356,7 @@ describe('Session', () => {
    (fs.stat as unknown as Mock).mockResolvedValue({
      isDirectory: () => false,
    });
+    (isWithinRoot as unknown as Mock).mockReturnValue(true);

    const stream = createMockStream([
      {
@@ -1423,6 +1414,7 @@ describe('Session', () => {
    (fs.stat as unknown as Mock).mockResolvedValue({
      isDirectory: () => false,
    });
+    (isWithinRoot as unknown as Mock).mockReturnValue(true);

    const MockReadManyFilesTool = ReadManyFilesTool as unknown as Mock;
    MockReadManyFilesTool.mockImplementationOnce(() => ({
@@ -1476,172 +1468,6 @@ describe('Session', () => {
    );
  });

-  it('should handle @path validation error and bubble it to user', async () => {
-    mockConfig.getTargetDir.mockReturnValue('/workspace');
-    (path.resolve as unknown as Mock).mockReturnValue('/tmp/disallowed.txt');
-    mockConfig.validatePathAccess.mockReturnValue('Path is outside workspace');
-
-    // Force fs.stat to fail to skip direct reading and triggers the warning
-    (fs.stat as unknown as Mock).mockRejectedValue(new Error('File not found'));
-
-    const stream = createMockStream([
-      {
-        type: StreamEventType.CHUNK,
-        value: { candidates: [] },
-      },
-    ]);
-    mockChat.sendMessageStream.mockResolvedValue(stream);
-
-    await session.prompt({
-      sessionId: 'session-1',
-      prompt: [
-        {
-          type: 'resource_link',
-          uri: 'file://disallowed.txt',
-          mimeType: 'text/plain',
-          name: 'disallowed.txt',
-        },
-      ],
-    });
-
-    // Verify warning sent via sendUpdate
-    expect(mockConnection.sessionUpdate).toHaveBeenCalledWith(
-      expect.objectContaining({
-        update: expect.objectContaining({
-          sessionUpdate: 'agent_thought_chunk',
-          content: expect.objectContaining({
-            text: expect.stringContaining(
-              'Warning: skipping access to `disallowed.txt`. Reason: Path is outside workspace',
-            ),
-          }),
-        }),
-      }),
-    );
-  });
-
-  it('should read absolute file directly if outside workspace', async () => {
-    mockConfig.getTargetDir.mockReturnValue('/workspace');
-    const testFilePath = '/tmp/custom.txt';
-    (path.resolve as unknown as Mock).mockReturnValue(testFilePath);
-    mockConfig.validatePathAccess.mockReturnValue('Path is outside workspace');
-
-    mockConnection.requestPermission.mockResolvedValue({
-      outcome: {
-        outcome: 'selected',
-        optionId: ToolConfirmationOutcome.ProceedOnce,
-      },
-    } as unknown as acp.RequestPermissionResponse);
-
-    const mockStats = {
-      isFile: () => true,
-      isDirectory: () => false,
-    };
-    (fs.stat as unknown as Mock).mockResolvedValue(mockStats);
-    (processSingleFileContent as unknown as Mock).mockResolvedValue({
-      llmContent: 'Absolute File Content',
-    });
-
-    const stream = createMockStream([
-      {
-        type: StreamEventType.CHUNK,
-        value: { candidates: [] },
-      },
-    ]);
-    mockChat.sendMessageStream.mockResolvedValue(stream);
-
-    await session.prompt({
-      sessionId: 'session-1',
-      prompt: [
-        {
-          type: 'resource_link',
-          uri: `file://${testFilePath}`,
-          mimeType: 'text/plain',
-          name: 'custom.txt',
-        },
-      ],
-    });
-
-    expect(processSingleFileContent).toHaveBeenCalledWith(
-      testFilePath,
-      expect.anything(),
-      expect.anything(),
-    );
-
-    // Verify content appended to sendMessageStream parts
-    expect(mockChat.sendMessageStream).toHaveBeenCalledWith(
-      expect.anything(),
-      expect.arrayContaining([
-        expect.objectContaining({
-          text: 'Absolute File Content',
-        }),
-      ]),
-      expect.anything(),
-      expect.any(AbortSignal),
-      expect.anything(),
-    );
-  });
-
-  it('should read escaping relative file directly if outside workspace', async () => {
-    mockConfig.getTargetDir.mockReturnValue('/workspace');
-    const testFilePath = '../../custom.txt';
-    (path.resolve as unknown as Mock).mockReturnValue('/custom.txt');
-    mockConfig.validatePathAccess.mockReturnValue('Path is outside workspace');
-
-    mockConnection.requestPermission.mockResolvedValue({
-      outcome: {
-        outcome: 'selected',
-        optionId: ToolConfirmationOutcome.ProceedOnce,
-      },
-    } as unknown as acp.RequestPermissionResponse);
-
-    const mockStats = {
-      isFile: () => true,
-      isDirectory: () => false,
-    };
-    (fs.stat as unknown as Mock).mockResolvedValue(mockStats);
-    (processSingleFileContent as unknown as Mock).mockResolvedValue({
-      llmContent: 'Escaping Relative File Content',
-    });
-
-    const stream = createMockStream([
-      {
-        type: StreamEventType.CHUNK,
-        value: { candidates: [] },
-      },
-    ]);
-    mockChat.sendMessageStream.mockResolvedValue(stream);
-
-    await session.prompt({
-      sessionId: 'session-1',
-      prompt: [
-        {
-          type: 'resource_link',
-          uri: `file://${testFilePath}`,
-          mimeType: 'text/plain',
-          name: 'custom.txt',
-        },
-      ],
-    });
-
-    expect(processSingleFileContent).toHaveBeenCalledWith(
-      '/custom.txt',
-      expect.any(String),
-      expect.anything(),
-    );
-
-    expect(mockChat.sendMessageStream).toHaveBeenCalledWith(
-      expect.anything(),
-      expect.arrayContaining([
-        expect.objectContaining({
-          text: 'Escaping Relative File Content',
-        }),
-      ]),
-      expect.anything(),
-      expect.any(AbortSignal),
-      expect.anything(),
-    );
-  });
-
  it('should handle cancellation during prompt', async () => {
    let streamController: ReadableStreamDefaultController<unknown>;
    const stream = new ReadableStream({
@@ -1840,6 +1666,7 @@ describe('Session', () => {
    (fs.stat as unknown as Mock).mockResolvedValue({
      isDirectory: () => true,
    });
+    (isWithinRoot as unknown as Mock).mockReturnValue(true);

    const stream = createMockStream([
      {
@@ -47,7 +47,6 @@ import {
  DEFAULT_GEMINI_MODEL_AUTO,
  PREVIEW_GEMINI_MODEL_AUTO,
  getDisplayString,
-  processSingleFileContent,
  type AgentLoopContext,
 } from '@google/gemini-cli-core';
 import * as acp from '@agentclientprotocol/sdk';
@@ -74,17 +73,6 @@ import { runExitCleanup } from '../utils/cleanup.js';
 import { SessionSelector } from '../utils/sessionUtils.js';

 import { CommandHandler } from './commandHandler.js';
-
-const RequestPermissionResponseSchema = z.object({
-  outcome: z.discriminatedUnion('outcome', [
-    z.object({ outcome: z.literal('cancelled') }),
-    z.object({
-      outcome: z.literal('selected'),
-      optionId: z.string(),
-    }),
-  ]),
-});
-
 export async function runAcpClient(
  config: Config,
  settings: LoadedSettings,
@@ -1023,12 +1011,10 @@ export class Session {
          },
        };

-        const output = RequestPermissionResponseSchema.parse(
-          await this.connection.requestPermission(params),
-        );
-
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+        const output = await this.connection.requestPermission(params);
        const outcome =
-          output.outcome.outcome === 'cancelled'
+          output.outcome.outcome === CoreToolCallStatus.Cancelled
            ? ToolConfirmationOutcome.Cancel
            : z
                .nativeEnum(ToolConfirmationOutcome)
@@ -1239,11 +1225,6 @@ export class Session {
    const pathSpecsToRead: string[] = [];
    const contentLabelsForDisplay: string[] = [];
    const ignoredPaths: string[] = [];
-    const directContents: Array<{
-      spec: string;
-      content?: string;
-      part?: Part;
-    }> = [];

    const toolRegistry = this.context.toolRegistry;
    const readManyFilesTool = new ReadManyFilesTool(
@@ -1266,197 +1247,28 @@ export class Session {
      }
      let currentPathSpec = pathName;
      let resolvedSuccessfully = false;
-      let readDirectly = false;
      try {
        const absolutePath = path.resolve(
          this.context.config.getTargetDir(),
          pathName,
        );
-
-        let validationError = this.context.config.validatePathAccess(
-          absolutePath,
-          'read',
-        );
-
-        // We ask the user for explicit permission to read them if outside sandboxed workspace boundaries (and not already authorized).
-        if (
-          validationError &&
-          !isWithinRoot(absolutePath, this.context.config.getTargetDir())
-        ) {
-          try {
-            const stats = await fs.stat(absolutePath);
-            if (stats.isFile()) {
-              const syntheticCallId = `resolve-prompt-${pathName}-${randomUUID()}`;
-              const params = {
-                sessionId: this.id,
-                options: [
-                  {
-                    optionId: ToolConfirmationOutcome.ProceedOnce,
-                    name: 'Allow once',
-                    kind: 'allow_once',
-                  },
-                  {
-                    optionId: ToolConfirmationOutcome.Cancel,
-                    name: 'Deny',
-                    kind: 'reject_once',
-                  },
-                ] as acp.PermissionOption[],
-                toolCall: {
-                  toolCallId: syntheticCallId,
-                  status: 'pending',
-                  title: `Allow access to absolute path: ${pathName}`,
-                  content: [
-                    {
-                      type: 'content',
-                      content: {
-                        type: 'text',
-                        text: `The Agent needs access to read an attached file outside your workspace: ${pathName}`,
-                      },
-                    },
-                  ],
-                  locations: [],
-                  kind: 'read',
-                },
-              };
-
-              const output = RequestPermissionResponseSchema.parse(
-                await this.connection.requestPermission(params),
-              );
-
-              const outcome =
-                output.outcome.outcome === 'cancelled'
-                  ? ToolConfirmationOutcome.Cancel
-                  : z
-                      .nativeEnum(ToolConfirmationOutcome)
-                      .parse(output.outcome.optionId);
-
-              if (outcome === ToolConfirmationOutcome.ProceedOnce) {
-                this.context.config
-                  .getWorkspaceContext()
-                  .addReadOnlyPath(absolutePath);
-                validationError = null;
-              } else {
-                this.debug(
-                  `Direct read authorization denied for absolute path ${pathName}`,
-                );
-                directContents.push({
-                  spec: pathName,
-                  content: `[Warning: Access to absolute path \`${pathName}\` denied by user.]`,
-                });
-                continue;
-              }
-            }
-          } catch (error) {
+        if (isWithinRoot(absolutePath, this.context.config.getTargetDir())) {
+          const stats = await fs.stat(absolutePath);
+          if (stats.isDirectory()) {
+            currentPathSpec = pathName.endsWith('/')
+              ? `${pathName}**`
+              : `${pathName}/**`;
            this.debug(
-              `Failed to request permission for absolute attachment ${pathName}: ${getErrorMessage(error)}`,
+              `Path ${pathName} resolved to directory, using glob: ${currentPathSpec}`,
            );
-            await this.sendUpdate({
-              sessionUpdate: 'agent_thought_chunk',
-              content: {
-                type: 'text',
-                text: `Warning: Failed to display permission dialog for \`${absolutePath}\`. Error: ${getErrorMessage(error)}`,
-              },
-            });
-          }
-        }
-
-        if (!validationError) {
-          // If it's an absolute path that is authorized (e.g. added via readOnlyPaths),
-          // read it directly to avoid ReadManyFilesTool absolute path resolution issues.
-          if (
-            (path.isAbsolute(pathName) ||
-              !isWithinRoot(
-                absolutePath,
-                this.context.config.getTargetDir(),
-              )) &&
-            !readDirectly
-          ) {
-            try {
-              const stats = await fs.stat(absolutePath);
-              if (stats.isFile()) {
-                const fileReadResult = await processSingleFileContent(
-                  absolutePath,
-                  this.context.config.getTargetDir(),
-                  this.context.config.getFileSystemService(),
-                );
-
-                if (!fileReadResult.error) {
-                  if (
-                    typeof fileReadResult.llmContent === 'object' &&
-                    'inlineData' in fileReadResult.llmContent
-                  ) {
-                    directContents.push({
-                      spec: pathName,
-                      part: fileReadResult.llmContent,
-                    });
-                  } else if (typeof fileReadResult.llmContent === 'string') {
-                    let contentToPush = fileReadResult.llmContent;
-                    if (fileReadResult.isTruncated) {
-                      contentToPush = `[WARNING: This file was truncated]\n\n${contentToPush}`;
-                    }
-                    directContents.push({
-                      spec: pathName,
-                      content: contentToPush,
-                    });
-                  }
-                  readDirectly = true;
-                  resolvedSuccessfully = true;
-                } else {
-                  this.debug(
-                    `Direct read failed for absolute path ${pathName}: ${fileReadResult.error}`,
-                  );
-                  await this.sendUpdate({
-                    sessionUpdate: 'agent_thought_chunk',
-                    content: {
-                      type: 'text',
-                      text: `Warning: file read failed for \`${pathName}\`. Reason: ${fileReadResult.error}`,
-                    },
-                  });
-                  continue;
-                }
-              }
-            } catch (error) {
-              this.debug(
-                `File stat/access error for absolute path ${pathName}: ${getErrorMessage(error)}`,
-              );
-              await this.sendUpdate({
-                sessionUpdate: 'agent_thought_chunk',
-                content: {
-                  type: 'text',
-                  text: `Warning: file access failed for \`${pathName}\`. Reason: ${getErrorMessage(error)}`,
-                },
-              });
-              continue;
-            }
-          }
-
-          if (!readDirectly) {
-            const stats = await fs.stat(absolutePath);
-            if (stats.isDirectory()) {
-              currentPathSpec = pathName.endsWith('/')
-                ? `${pathName}**`
-                : `${pathName}/**`;
-              this.debug(
-                `Path ${pathName} resolved to directory, using glob: ${currentPathSpec}`,
-              );
-            } else {
-              this.debug(
-                `Path ${pathName} resolved to file: ${currentPathSpec}`,
-              );
-            }
-            resolvedSuccessfully = true;
+          } else {
+            this.debug(`Path ${pathName} resolved to file: ${currentPathSpec}`);
          }
+          resolvedSuccessfully = true;
        } else {
          this.debug(
-            `Path ${pathName} access disallowed: ${validationError}. Skipping.`,
+            `Path ${pathName} is outside the project directory. Skipping.`,
          );
-          await this.sendUpdate({
-            sessionUpdate: 'agent_thought_chunk',
-            content: {
-              type: 'text',
-              text: `Warning: skipping access to \`${pathName}\`. Reason: ${validationError}`,
-            },
-          });
        }
      } catch (error) {
        if (isNodeError(error) && error.code === 'ENOENT') {
@@ -1516,9 +1328,7 @@ export class Session {
        }
      }
      if (resolvedSuccessfully) {
-        if (!readDirectly) {
-          pathSpecsToRead.push(currentPathSpec);
-        }
+        pathSpecsToRead.push(currentPathSpec);
        atPathToResolvedSpecMap.set(pathName, currentPathSpec);
        contentLabelsForDisplay.push(pathName);
      }
@@ -1579,11 +1389,7 @@ export class Session {

    const processedQueryParts: Part[] = [{ text: initialQueryText }];

-    if (
-      pathSpecsToRead.length === 0 &&
-      embeddedContext.length === 0 &&
-      directContents.length === 0
-    ) {
+    if (pathSpecsToRead.length === 0 && embeddedContext.length === 0) {
      // Fallback for lone "@" or completely invalid @-commands resulting in empty initialQueryText
      debugLogger.warn('No valid file paths found in @ commands to read.');
      return [{ text: initialQueryText }];
@@ -1675,30 +1481,6 @@ export class Session {
      }
    }

-    if (directContents.length > 0) {
-      const hasReferenceStart = processedQueryParts.some(
-        (p) =>
-          'text' in p &&
-          typeof p.text === 'string' &&
-          p.text.includes(REFERENCE_CONTENT_START),
-      );
-      if (!hasReferenceStart) {
-        processedQueryParts.push({
-          text: `\n${REFERENCE_CONTENT_START}`,
-        });
-      }
-      for (const item of directContents) {
-        processedQueryParts.push({
-          text: `\nContent from @${item.spec}:\n`,
-        });
-        if (item.content) {
-          processedQueryParts.push({ text: item.content });
-        } else if (item.part) {
-          processedQueryParts.push(item.part);
-        }
-      }
-    }
-
    if (embeddedContext.length > 0) {
      processedQueryParts.push({
        text: '\n--- Content from referenced context ---',
@@ -15,7 +15,6 @@ import {
  EDIT_TOOL_NAME,
  WEB_FETCH_TOOL_NAME,
  ASK_USER_TOOL_NAME,
-  UPDATE_TOPIC_TOOL_NAME,
  type ExtensionLoader,
  debugLogger,
  ApprovalMode,
@@ -1118,18 +1117,16 @@ describe('mergeExcludeTools', () => {
    ]);
    process.argv = ['node', 'script.js'];
    const argv = await parseArguments(createTestMergedSettings());
-    const config = await loadCliConfig(settings, 'test-session', argv);
-    expect(config.getExcludeTools()).toEqual(
-      new Set([
-        'tool1',
-        'tool2',
-        'tool3',
-        'tool4',
-        'tool5',
-        UPDATE_TOPIC_TOOL_NAME,
-      ]),
+    const config = await loadCliConfig(
+      settings,
+
+      'test-session',
+      argv,
    );
-    expect(config.getExcludeTools()).toHaveLength(6);
+    expect(config.getExcludeTools()).toEqual(
+      new Set(['tool1', 'tool2', 'tool3', 'tool4', 'tool5']),
+    );
+    expect(config.getExcludeTools()).toHaveLength(5);
  });

  it('should handle overlapping excludeTools between settings and extensions', async () => {
@@ -1151,9 +1148,9 @@ describe('mergeExcludeTools', () => {
    const argv = await parseArguments(createTestMergedSettings());
    const config = await loadCliConfig(settings, 'test-session', argv);
    expect(config.getExcludeTools()).toEqual(
-      new Set(['tool1', 'tool2', 'tool3', UPDATE_TOPIC_TOOL_NAME]),
+      new Set(['tool1', 'tool2', 'tool3']),
    );
-    expect(config.getExcludeTools()).toHaveLength(4);
+    expect(config.getExcludeTools()).toHaveLength(3);
  });

  it('should handle overlapping excludeTools between extensions', async () => {
@@ -1184,9 +1181,9 @@ describe('mergeExcludeTools', () => {
    const argv = await parseArguments(createTestMergedSettings());
    const config = await loadCliConfig(settings, 'test-session', argv);
    expect(config.getExcludeTools()).toEqual(
-      new Set(['tool1', 'tool2', 'tool3', 'tool4', UPDATE_TOPIC_TOOL_NAME]),
+      new Set(['tool1', 'tool2', 'tool3', 'tool4']),
    );
-    expect(config.getExcludeTools()).toHaveLength(5);
+    expect(config.getExcludeTools()).toHaveLength(4);
  });

  it('should return an empty array when no excludeTools are specified and it is interactive', async () => {
@@ -1195,7 +1192,7 @@ describe('mergeExcludeTools', () => {
    process.argv = ['node', 'script.js'];
    const argv = await parseArguments(createTestMergedSettings());
    const config = await loadCliConfig(settings, 'test-session', argv);
-    expect(config.getExcludeTools()).toEqual(new Set([UPDATE_TOPIC_TOOL_NAME]));
+    expect(config.getExcludeTools()).toEqual(new Set([]));
  });

  it('should return default excludes when no excludeTools are specified and it is not interactive', async () => {
@@ -1204,9 +1201,7 @@ describe('mergeExcludeTools', () => {
    process.argv = ['node', 'script.js', '-p', 'test'];
    const argv = await parseArguments(createTestMergedSettings());
    const config = await loadCliConfig(settings, 'test-session', argv);
-    expect(config.getExcludeTools()).toEqual(
-      new Set([ASK_USER_TOOL_NAME, UPDATE_TOPIC_TOOL_NAME]),
-    );
+    expect(config.getExcludeTools()).toEqual(new Set([ASK_USER_TOOL_NAME]));
  });

  it('should handle settings with excludeTools but no extensions', async () => {
@@ -1217,10 +1212,8 @@ describe('mergeExcludeTools', () => {
    });
    vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([]);
    const config = await loadCliConfig(settings, 'test-session', argv);
-    expect(config.getExcludeTools()).toEqual(
-      new Set(['tool1', 'tool2', UPDATE_TOPIC_TOOL_NAME]),
-    );
-    expect(config.getExcludeTools()).toHaveLength(3);
+    expect(config.getExcludeTools()).toEqual(new Set(['tool1', 'tool2']));
+    expect(config.getExcludeTools()).toHaveLength(2);
  });

  it('should handle extensions with excludeTools but no settings', async () => {
@@ -1239,10 +1232,8 @@ describe('mergeExcludeTools', () => {
    process.argv = ['node', 'script.js'];
    const argv = await parseArguments(createTestMergedSettings());
    const config = await loadCliConfig(settings, 'test-session', argv);
-    expect(config.getExcludeTools()).toEqual(
-      new Set(['tool1', 'tool2', UPDATE_TOPIC_TOOL_NAME]),
-    );
-    expect(config.getExcludeTools()).toHaveLength(3);
+    expect(config.getExcludeTools()).toEqual(new Set(['tool1', 'tool2']));
+    expect(config.getExcludeTools()).toHaveLength(2);
  });

  it('should not modify the original settings object', async () => {
@@ -300,7 +300,7 @@ const SETTINGS_SCHEMA = {
            requiresRestart: true,
            default: undefined as string | undefined,
            description:
-              'The directory where planning artifacts are stored. If not specified, defaults to the system temporary directory. A custom directory requires a policy to allow write access in Plan Mode.',
+              'The directory where planning artifacts are stored. If not specified, defaults to the system temporary directory.',
            showInDialog: true,
          },
          modelRouting: {
@@ -561,16 +561,6 @@ const SETTINGS_SCHEMA = {
        description: 'Show the "? for shortcuts" hint above the input.',
        showInDialog: true,
      },
-      compactToolOutput: {
-        type: 'boolean',
-        label: 'Compact Tool Output',
-        category: 'UI',
-        requiresRestart: false,
-        default: false,
-        description:
-          'Display tool outputs (like directory listings and file reads) in a compact, structured format.',
-        showInDialog: true,
-      },
      hideBanner: {
        type: 'boolean',
        label: 'Hide Banner',
@@ -3034,7 +3024,6 @@ export const SETTINGS_SCHEMA_DEFINITIONS: Record<
              type: 'object',
              properties: {
                useGemini3_1: { type: 'boolean' },
-                useGemini3_1FlashLite: { type: 'boolean' },
                useCustomTools: { type: 'boolean' },
                hasAccessToPreview: { type: 'boolean' },
                requestedModels: {
@@ -528,62 +528,6 @@ describe('gemini.tsx main function kitty protocol', () => {
    );
  });

-  it('should call process.stdin.resume when isInteractive is true to protect against implicit Node pause', async () => {
-    const resumeSpy = vi.spyOn(process.stdin, 'resume');
-    vi.mocked(loadCliConfig).mockResolvedValue(
-      createMockConfig({
-        isInteractive: () => true,
-        getQuestion: () => '',
-        getSandbox: () => undefined,
-      }),
-    );
-    vi.mocked(loadSettings).mockReturnValue(
-      createMockSettings({
-        merged: {
-          advanced: {},
-          security: { auth: {} },
-          ui: {},
-        },
-      }),
-    );
-    vi.mocked(parseArguments).mockResolvedValue({
-      model: undefined,
-      sandbox: undefined,
-      debug: undefined,
-      prompt: undefined,
-      promptInteractive: undefined,
-      query: undefined,
-      yolo: undefined,
-      approvalMode: undefined,
-      policy: undefined,
-      adminPolicy: undefined,
-      allowedMcpServerNames: undefined,
-      allowedTools: undefined,
-      experimentalAcp: undefined,
-      extensions: undefined,
-      listExtensions: undefined,
-      includeDirectories: undefined,
-      screenReader: undefined,
-      useWriteTodos: undefined,
-      resume: undefined,
-      listSessions: undefined,
-      deleteSession: undefined,
-      outputFormat: undefined,
-      fakeResponses: undefined,
-      recordResponses: undefined,
-      rawOutput: undefined,
-      acceptRawOutputRisk: undefined,
-      isCommand: undefined,
-    });
-
-    await act(async () => {
-      await main();
-    });
-
-    expect(resumeSpy).toHaveBeenCalledTimes(1);
-    resumeSpy.mockRestore();
-  });
-
  it.each([
    { flag: 'listExtensions' },
    { flag: 'listSessions' },
@@ -32,7 +32,6 @@ import {
  ValidationRequiredError,
  type AdminControlsSettings,
  debugLogger,
-  isHeadlessMode,
 } from '@google/gemini-cli-core';

 import { loadCliConfig, parseArguments } from './config/config.js';
@@ -297,7 +296,6 @@ export async function main() {
  const isDebugMode = cliConfig.isDebugMode(argv);
  const consolePatcher = new ConsolePatcher({
    stderr: true,
-    interactive: isHeadlessMode() ? false : true,
    debugMode: isDebugMode,
    onNewMessage: (msg) => {
      coreEvents.emitConsoleLog(msg.type, msg.content);
@@ -613,17 +611,8 @@ export async function main() {
    }

    cliStartupHandle?.end();
-
    // Render UI, passing necessary config values. Check that there is no command line question.
    if (config.isInteractive()) {
-      // Earlier initialization phases (like TerminalCapabilityManager resolving
-      // or authWithWeb) may have added and removed 'data' listeners on process.stdin.
-      // When the listener count drops to 0, Node.js implicitly pauses the stream buffer.
-      // React Ink's useInput hooks will silently fail to receive keystrokes if the stream remains paused.
-      if (process.stdin.isTTY) {
-        process.stdin.resume();
-      }
-
      await startInteractiveUI(
        config,
        settings,
@@ -65,7 +65,6 @@ export async function runNonInteractive({
  return promptIdContext.run(prompt_id, async () => {
    const consolePatcher = new ConsolePatcher({
      stderr: true,
-      interactive: false,
      debugMode: config.getDebugMode(),
      onNewMessage: (msg) => {
        coreEvents.emitConsoleLog(msg.type, msg.content);
@@ -193,17 +193,6 @@ export function createMockSettings(
    user: { settings: {} },
    workspace: { settings: {} },
    errors: [],
-    subscribe: vi.fn().mockReturnValue(() => {}),
-    getSnapshot: vi.fn().mockReturnValue({
-      system: { settings: {} },
-      systemDefaults: { settings: {} },
-      user: { settings: {} },
-      workspace: { settings: {} },
-      isTrusted: true,
-      errors: [],
-      merged,
-    }),
-    setValue: vi.fn(),
    ...overrides,
    merged,
  } as unknown as LoadedSettings;
@@ -524,8 +524,6 @@ const baseMockUiState = {
  nightly: false,
  updateInfo: null,
  pendingHistoryItems: [],
-  mainControlsRef: () => {},
-  rootUiRef: { current: null },
 };

 export const mockAppState: AppState = {
@@ -612,7 +610,6 @@ export const renderWithProviders = async (
    mouseEventsEnabled = false,
    config,
    uiActions,
-    toolActions,
    persistentState,
    appState = mockAppState,
  }: {
@@ -623,11 +620,6 @@ export const renderWithProviders = async (
    mouseEventsEnabled?: boolean;
    config?: Config;
    uiActions?: Partial<UIActions>;
-    toolActions?: Partial<{
-      isExpanded: (callId: string) => boolean;
-      toggleExpansion: (callId: string) => void;
-      toggleAllExpansion: (callIds: string[]) => void;
-    }>;
    persistentState?: {
      get?: typeof persistentStateMock.get;
      set?: typeof persistentStateMock.set;
@@ -715,16 +707,6 @@ export const renderWithProviders = async (
                        <ToolActionsProvider
                          config={config}
                          toolCalls={allToolCalls}
-                          isExpanded={
-                            toolActions?.isExpanded ??
-                            vi.fn().mockReturnValue(false)
-                          }
-                          toggleExpansion={
-                            toolActions?.toggleExpansion ?? vi.fn()
-                          }
-                          toggleAllExpansion={
-                            toolActions?.toggleAllExpansion ?? vi.fn()
-                          }
                        >
                          <AskUserActionsProvider
                            request={null}
@@ -70,7 +70,9 @@ describe('App', () => {
    cleanUiDetailsVisible: true,
    quittingMessages: null,
    dialogsVisible: false,
-    mainControlsRef: vi.fn(),
+    mainControlsRef: {
+      current: null,
+    } as unknown as React.MutableRefObject<DOMElement | null>,
    rootUiRef: {
      current: null,
    } as unknown as React.MutableRefObject<DOMElement | null>,
@@ -14,7 +14,7 @@ import {
 } from 'react';
 import {
  type DOMElement,
-  ResizeObserver,
+  measureElement,
  useApp,
  useStdout,
  useStdin,
@@ -168,7 +168,6 @@ import { useSuspend } from './hooks/useSuspend.js';
 import { useRunEventNotifications } from './hooks/useRunEventNotifications.js';
 import { isNotificationsEnabled } from '../utils/terminalNotifications.js';
 import {
-  getLastTurnToolCallIds,
  isToolExecuting,
  isToolAwaitingConfirmation,
  getAllToolCalls,
@@ -239,39 +238,6 @@ export const AppContainer = (props: AppContainerProps) => {

  const [adminSettingsChanged, setAdminSettingsChanged] = useState(false);

-  const [expandedTools, setExpandedTools] = useState<Set<string>>(new Set());
-
-  const toggleExpansion = useCallback((callId: string) => {
-    setExpandedTools((prev) => {
-      const next = new Set(prev);
-      if (next.has(callId)) {
-        next.delete(callId);
-      } else {
-        next.add(callId);
-      }
-      return next;
-    });
-  }, []);
-
-  const toggleAllExpansion = useCallback((callIds: string[]) => {
-    setExpandedTools((prev) => {
-      const next = new Set(prev);
-      const anyCollapsed = callIds.some((id) => !next.has(id));
-
-      if (anyCollapsed) {
-        callIds.forEach((id) => next.add(id));
-      } else {
-        callIds.forEach((id) => next.delete(id));
-      }
-      return next;
-    });
-  }, []);
-
-  const isExpanded = useCallback(
-    (callId: string) => expandedTools.has(callId),
-    [expandedTools],
-  );
-
  const [shellModeActive, setShellModeActive] = useState(false);
  const [modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError] =
    useState<boolean>(false);
@@ -431,6 +397,7 @@ export const AppContainer = (props: AppContainerProps) => {
  const branchName = useGitBranchName(config.getTargetDir());

  // Layout measurements
+  const mainControlsRef = useRef<DOMElement>(null);
  // For performance profiling only
  const rootUiRef = useRef<DOMElement>(null);
  const lastTitleRef = useRef<string | null>(null);
@@ -1171,6 +1138,11 @@ Logging in with Google... Restarting Gemini CLI to continue.
    [pendingSlashCommandHistoryItems, pendingGeminiHistoryItems],
  );

+  const hasPendingToolConfirmation = useMemo(
+    () => isToolAwaitingConfirmation(pendingHistoryItems),
+    [pendingHistoryItems],
+  );
+
  toggleBackgroundShellRef.current = toggleBackgroundShell;
  isBackgroundShellVisibleRef.current = isBackgroundShellVisible;
  backgroundShellsRef.current = backgroundShells;
@@ -1421,49 +1393,24 @@ Logging in with Google... Restarting Gemini CLI to continue.
    (streamingState === StreamingState.Idle ||
      streamingState === StreamingState.Responding ||
      streamingState === StreamingState.WaitingForConfirmation) &&
-    !proQuotaRequest &&
-    !copyModeEnabled;
+    !proQuotaRequest;

-  const observerRef = useRef<ResizeObserver | null>(null);
  const [controlsHeight, setControlsHeight] = useState(0);
-  const [lastNonCopyControlsHeight, setLastNonCopyControlsHeight] = useState(0);

  useLayoutEffect(() => {
-    if (!copyModeEnabled && controlsHeight > 0) {
-      setLastNonCopyControlsHeight(controlsHeight);
+    if (mainControlsRef.current) {
+      const fullFooterMeasurement = measureElement(mainControlsRef.current);
+      const roundedHeight = Math.round(fullFooterMeasurement.height);
+      if (roundedHeight > 0 && roundedHeight !== controlsHeight) {
+        setControlsHeight(roundedHeight);
+      }
    }
-  }, [copyModeEnabled, controlsHeight]);
+  }, [buffer, terminalWidth, terminalHeight, controlsHeight, isInputActive]);

-  const stableControlsHeight =
-    copyModeEnabled && lastNonCopyControlsHeight > 0
-      ? lastNonCopyControlsHeight
-      : controlsHeight;
-
-  const mainControlsRef = useCallback((node: DOMElement | null) => {
-    if (observerRef.current) {
-      observerRef.current.disconnect();
-      observerRef.current = null;
-    }
-
-    if (node) {
-      const observer = new ResizeObserver((entries) => {
-        const entry = entries[0];
-        if (entry) {
-          const roundedHeight = Math.round(entry.contentRect.height);
-          setControlsHeight((prev) =>
-            roundedHeight !== prev ? roundedHeight : prev,
-          );
-        }
-      });
-      observer.observe(node);
-      observerRef.current = observer;
-    }
-  }, []);
-
-  // Compute available terminal height based on stable controls measurement
+  // Compute available terminal height based on controls measurement
  const availableTerminalHeight = Math.max(
    0,
-    terminalHeight - stableControlsHeight - backgroundShellHeight - 1,
+    terminalHeight - controlsHeight - backgroundShellHeight - 1,
  );

  config.setShellExecutionConfig({
@@ -1756,26 +1703,13 @@ Logging in with Google... Restarting Gemini CLI to continue.
        return true;
      }

-      const toggleLastTurnTools = () => {
-        // If the user manually collapses/expands the view, show the hint and reset the x-second timer.
-        triggerExpandHint(true);
-
-        const targetToolCallIds = getLastTurnToolCallIds(
-          historyManager.history,
-          pendingHistoryItems,
-        );
-
-        if (targetToolCallIds.length > 0) {
-          toggleAllExpansion(targetToolCallIds);
-        }
-      };
-
      let enteringConstrainHeightMode = false;
      if (!constrainHeight) {
        enteringConstrainHeightMode = true;
        setConstrainHeight(true);
        if (keyMatchers[Command.SHOW_MORE_LINES](key)) {
-          toggleLastTurnTools();
+          // If the user manually collapses the view, show the hint and reset the x-second timer.
+          triggerExpandHint(true);
        }
        if (!isAlternateBuffer) {
          refreshStatic();
@@ -1823,14 +1757,11 @@ Logging in with Google... Restarting Gemini CLI to continue.
        !enteringConstrainHeightMode
      ) {
        setConstrainHeight(false);
-        toggleLastTurnTools();
-
-        // Force layout refresh after a short delay to allow the terminal layout to settle.
-        // Minimize "blank screen" issue after any async subview updates are complete.
-        setTimeout(() => {
+        // If the user manually expands the view, show the hint and reset the x-second timer.
+        triggerExpandHint(true);
+        if (!isAlternateBuffer) {
          refreshStatic();
-        }, 250);
-
+        }
        return true;
      } else if (
        (keyMatchers[Command.FOCUS_SHELL_INPUT](key) ||
@@ -1935,9 +1866,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
      triggerExpandHint,
      keyMatchers,
      isHelpDismissKey,
-      historyManager.history,
-      pendingHistoryItems,
-      toggleAllExpansion,
    ],
  );

@@ -2081,11 +2009,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
    authState === AuthState.AwaitingApiKeyInput ||
    !!newAgents;

-  const hasPendingToolConfirmation = useMemo(
-    () => isToolAwaitingConfirmation(pendingHistoryItems),
-    [pendingHistoryItems],
-  );
-
  const hasConfirmUpdateExtensionRequests =
    confirmUpdateExtensionRequests.length > 0;
  const hasLoopDetectionConfirmationRequest =
@@ -2346,7 +2269,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
      contextFileNames,
      errorCount,
      availableTerminalHeight,
-      stableControlsHeight,
      mainAreaWidth,
      staticAreaMaxItemHeight,
      staticExtraHeight,
@@ -2468,7 +2390,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
      contextFileNames,
      errorCount,
      availableTerminalHeight,
-      stableControlsHeight,
      mainAreaWidth,
      staticAreaMaxItemHeight,
      staticExtraHeight,
@@ -2690,13 +2611,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
              startupWarnings: props.startupWarnings || [],
            }}
          >
-            <ToolActionsProvider
-              config={config}
-              toolCalls={allToolCalls}
-              isExpanded={isExpanded}
-              toggleExpansion={toggleExpansion}
-              toggleAllExpansion={toggleAllExpansion}
-            >
+            <ToolActionsProvider config={config} toolCalls={allToolCalls}>
              <ShellFocusContext.Provider value={isFocused}>
                <App key={`app-${forceRerenderKey}`} />
              </ShellFocusContext.Provider>
@@ -37,8 +37,9 @@ Tips for getting started:



-Notifications

+
+Notifications
 Composer
 "
 `;
@@ -102,8 +103,9 @@ exports[`App > Snapshots > renders with dialogs visible 1`] = `



-Notifications

+
+Notifications
 DialogManager
 "
 `;
@@ -145,8 +147,9 @@ HistoryItemDisplay



-Notifications

+
+Notifications
 Composer
 "
 `;
@@ -1,266 +1,271 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="920" height="666" viewBox="0 0 920 666">
+<svg xmlns="http://www.w3.org/2000/svg" width="920" height="700" viewBox="0 0 920 700">
  <style>
    text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
  </style>
-  <rect width="920" height="666" fill="#000000" />
+  <rect width="920" height="700" fill="#000000" />
  <g transform="translate(10, 10)">
-    <rect x="0" y="0" width="900" height="17" fill="#141414" />
-    <text x="0" y="2" fill="#000000" textLength="900" lengthAdjust="spacingAndGlyphs">▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀</text>
-    <rect x="0" y="17" width="9" height="17" fill="#141414" />
-    <rect x="9" y="17" width="18" height="17" fill="#141414" />
-    <text x="9" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <rect x="27" y="17" width="324" height="17" fill="#141414" />
-    <text x="27" y="19" fill="#ffffff" textLength="324" lengthAdjust="spacingAndGlyphs">Can you edit InputPrompt.tsx for me?</text>
-    <rect x="351" y="17" width="549" height="17" fill="#141414" />
+    <text x="0" y="2" fill="#ffffff" textLength="450" lengthAdjust="spacingAndGlyphs">3. Ask coding questions, edit code or run commands</text>
+    <text x="0" y="19" fill="#ffffff" textLength="315" lengthAdjust="spacingAndGlyphs">4. Be specific for the best results</text>
    <rect x="0" y="34" width="900" height="17" fill="#141414" />
-    <text x="0" y="36" fill="#000000" textLength="900" lengthAdjust="spacingAndGlyphs">▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄</text>
-    <text x="0" y="53" fill="#ffffaf" textLength="891" lengthAdjust="spacingAndGlyphs">╭─────────────────────────────────────────────────────────────────────────────────────────────────╮</text>
-    <text x="0" y="70" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="70" fill="#ffffaf" textLength="135" lengthAdjust="spacingAndGlyphs" font-weight="bold">Action Required</text>
-    <text x="882" y="70" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="87" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="882" y="87" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="36" fill="#000000" textLength="900" lengthAdjust="spacingAndGlyphs">▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀</text>
+    <rect x="0" y="51" width="9" height="17" fill="#141414" />
+    <rect x="9" y="51" width="18" height="17" fill="#141414" />
+    <text x="9" y="53" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
+    <rect x="27" y="51" width="324" height="17" fill="#141414" />
+    <text x="27" y="53" fill="#ffffff" textLength="324" lengthAdjust="spacingAndGlyphs">Can you edit InputPrompt.tsx for me?</text>
+    <rect x="351" y="51" width="549" height="17" fill="#141414" />
+    <rect x="0" y="68" width="900" height="17" fill="#141414" />
+    <text x="0" y="70" fill="#000000" textLength="900" lengthAdjust="spacingAndGlyphs">▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄</text>
+    <text x="0" y="87" fill="#ffffaf" textLength="891" lengthAdjust="spacingAndGlyphs">╭─────────────────────────────────────────────────────────────────────────────────────────────────╮</text>
    <text x="0" y="104" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="104" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">?</text>
-    <text x="45" y="104" fill="#ffffff" textLength="36" lengthAdjust="spacingAndGlyphs" font-weight="bold">Edit</text>
-    <text x="90" y="104" fill="#afafaf" textLength="774" lengthAdjust="spacingAndGlyphs">packages/.../InputPrompt.tsx:   return kittyProtocolSupporte... =&gt;   return kittyProto</text>
-    <text x="864" y="104" fill="#ffffff" textLength="18" lengthAdjust="spacingAndGlyphs">… </text>
+    <text x="18" y="104" fill="#ffffaf" textLength="135" lengthAdjust="spacingAndGlyphs" font-weight="bold">Action Required</text>
    <text x="882" y="104" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="0" y="121" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="882" y="121" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="0" y="138" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="138" fill="#afafaf" textLength="414" lengthAdjust="spacingAndGlyphs">... first 44 lines hidden (Ctrl+O to show) ...</text>
+    <text x="18" y="138" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">?</text>
+    <text x="45" y="138" fill="#ffffff" textLength="36" lengthAdjust="spacingAndGlyphs" font-weight="bold">Edit</text>
+    <text x="90" y="138" fill="#afafaf" textLength="774" lengthAdjust="spacingAndGlyphs">packages/.../InputPrompt.tsx:   return kittyProtocolSupporte... =&gt;   return kittyProto</text>
+    <text x="864" y="138" fill="#ffffff" textLength="18" lengthAdjust="spacingAndGlyphs">… </text>
    <text x="882" y="138" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="0" y="155" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="155" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">45</text>
-    <text x="63" y="155" fill="#e5e5e5" textLength="54" lengthAdjust="spacingAndGlyphs">const </text>
-    <text x="117" y="155" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line45</text>
-    <text x="171" y="155" fill="#e5e5e5" textLength="27" lengthAdjust="spacingAndGlyphs"> = </text>
-    <text x="198" y="155" fill="#0000ee" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
-    <text x="234" y="155" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">;</text>
    <text x="882" y="155" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="0" y="172" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="172" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">46</text>
-    <text x="63" y="172" fill="#e5e5e5" textLength="54" lengthAdjust="spacingAndGlyphs">const </text>
-    <text x="117" y="172" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line46</text>
-    <text x="171" y="172" fill="#e5e5e5" textLength="27" lengthAdjust="spacingAndGlyphs"> = </text>
-    <text x="198" y="172" fill="#0000ee" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
-    <text x="234" y="172" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">;</text>
+    <text x="18" y="172" fill="#afafaf" textLength="414" lengthAdjust="spacingAndGlyphs">... first 44 lines hidden (Ctrl+O to show) ...</text>
    <text x="882" y="172" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="891" y="172" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">█</text>
    <text x="0" y="189" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="189" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">47</text>
+    <text x="18" y="189" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">45</text>
    <text x="63" y="189" fill="#e5e5e5" textLength="54" lengthAdjust="spacingAndGlyphs">const </text>
-    <text x="117" y="189" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line47</text>
+    <text x="117" y="189" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line45</text>
    <text x="171" y="189" fill="#e5e5e5" textLength="27" lengthAdjust="spacingAndGlyphs"> = </text>
    <text x="198" y="189" fill="#0000ee" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
    <text x="234" y="189" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">;</text>
    <text x="882" y="189" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="891" y="189" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">█</text>
    <text x="0" y="206" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="206" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">48</text>
+    <text x="18" y="206" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">46</text>
    <text x="63" y="206" fill="#e5e5e5" textLength="54" lengthAdjust="spacingAndGlyphs">const </text>
-    <text x="117" y="206" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line48</text>
+    <text x="117" y="206" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line46</text>
    <text x="171" y="206" fill="#e5e5e5" textLength="27" lengthAdjust="spacingAndGlyphs"> = </text>
    <text x="198" y="206" fill="#0000ee" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
    <text x="234" y="206" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">;</text>
    <text x="882" y="206" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="891" y="206" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">█</text>
    <text x="0" y="223" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="223" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">49</text>
+    <text x="18" y="223" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">47</text>
    <text x="63" y="223" fill="#e5e5e5" textLength="54" lengthAdjust="spacingAndGlyphs">const </text>
-    <text x="117" y="223" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line49</text>
+    <text x="117" y="223" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line47</text>
    <text x="171" y="223" fill="#e5e5e5" textLength="27" lengthAdjust="spacingAndGlyphs"> = </text>
    <text x="198" y="223" fill="#0000ee" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
    <text x="234" y="223" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">;</text>
    <text x="882" y="223" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="891" y="223" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">█</text>
    <text x="0" y="240" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="240" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">50</text>
+    <text x="18" y="240" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">48</text>
    <text x="63" y="240" fill="#e5e5e5" textLength="54" lengthAdjust="spacingAndGlyphs">const </text>
-    <text x="117" y="240" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line50</text>
+    <text x="117" y="240" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line48</text>
    <text x="171" y="240" fill="#e5e5e5" textLength="27" lengthAdjust="spacingAndGlyphs"> = </text>
    <text x="198" y="240" fill="#0000ee" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
    <text x="234" y="240" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">;</text>
    <text x="882" y="240" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="891" y="240" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">█</text>
    <text x="0" y="257" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="257" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">51</text>
+    <text x="18" y="257" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">49</text>
    <text x="63" y="257" fill="#e5e5e5" textLength="54" lengthAdjust="spacingAndGlyphs">const </text>
-    <text x="117" y="257" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line51</text>
+    <text x="117" y="257" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line49</text>
    <text x="171" y="257" fill="#e5e5e5" textLength="27" lengthAdjust="spacingAndGlyphs"> = </text>
    <text x="198" y="257" fill="#0000ee" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
    <text x="234" y="257" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">;</text>
    <text x="882" y="257" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="891" y="257" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">█</text>
    <text x="0" y="274" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="274" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">52</text>
+    <text x="18" y="274" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">50</text>
    <text x="63" y="274" fill="#e5e5e5" textLength="54" lengthAdjust="spacingAndGlyphs">const </text>
-    <text x="117" y="274" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line52</text>
+    <text x="117" y="274" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line50</text>
    <text x="171" y="274" fill="#e5e5e5" textLength="27" lengthAdjust="spacingAndGlyphs"> = </text>
    <text x="198" y="274" fill="#0000ee" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
    <text x="234" y="274" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">;</text>
    <text x="882" y="274" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="891" y="274" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">█</text>
    <text x="0" y="291" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="291" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">53</text>
+    <text x="18" y="291" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">51</text>
    <text x="63" y="291" fill="#e5e5e5" textLength="54" lengthAdjust="spacingAndGlyphs">const </text>
-    <text x="117" y="291" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line53</text>
+    <text x="117" y="291" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line51</text>
    <text x="171" y="291" fill="#e5e5e5" textLength="27" lengthAdjust="spacingAndGlyphs"> = </text>
    <text x="198" y="291" fill="#0000ee" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
    <text x="234" y="291" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">;</text>
    <text x="882" y="291" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="891" y="291" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">█</text>
    <text x="0" y="308" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="308" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">54</text>
+    <text x="18" y="308" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">52</text>
    <text x="63" y="308" fill="#e5e5e5" textLength="54" lengthAdjust="spacingAndGlyphs">const </text>
-    <text x="117" y="308" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line54</text>
+    <text x="117" y="308" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line52</text>
    <text x="171" y="308" fill="#e5e5e5" textLength="27" lengthAdjust="spacingAndGlyphs"> = </text>
    <text x="198" y="308" fill="#0000ee" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
    <text x="234" y="308" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">;</text>
    <text x="882" y="308" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="891" y="308" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">█</text>
    <text x="0" y="325" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="325" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">55</text>
+    <text x="18" y="325" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">53</text>
    <text x="63" y="325" fill="#e5e5e5" textLength="54" lengthAdjust="spacingAndGlyphs">const </text>
-    <text x="117" y="325" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line55</text>
+    <text x="117" y="325" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line53</text>
    <text x="171" y="325" fill="#e5e5e5" textLength="27" lengthAdjust="spacingAndGlyphs"> = </text>
    <text x="198" y="325" fill="#0000ee" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
    <text x="234" y="325" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">;</text>
    <text x="882" y="325" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="891" y="325" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">█</text>
    <text x="0" y="342" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="342" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">56</text>
+    <text x="18" y="342" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">54</text>
    <text x="63" y="342" fill="#e5e5e5" textLength="54" lengthAdjust="spacingAndGlyphs">const </text>
-    <text x="117" y="342" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line56</text>
+    <text x="117" y="342" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line54</text>
    <text x="171" y="342" fill="#e5e5e5" textLength="27" lengthAdjust="spacingAndGlyphs"> = </text>
    <text x="198" y="342" fill="#0000ee" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
    <text x="234" y="342" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">;</text>
    <text x="882" y="342" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="891" y="342" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">█</text>
    <text x="0" y="359" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="359" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">57</text>
+    <text x="18" y="359" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">55</text>
    <text x="63" y="359" fill="#e5e5e5" textLength="54" lengthAdjust="spacingAndGlyphs">const </text>
-    <text x="117" y="359" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line57</text>
+    <text x="117" y="359" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line55</text>
    <text x="171" y="359" fill="#e5e5e5" textLength="27" lengthAdjust="spacingAndGlyphs"> = </text>
    <text x="198" y="359" fill="#0000ee" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
    <text x="234" y="359" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">;</text>
    <text x="882" y="359" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="891" y="359" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">█</text>
    <text x="0" y="376" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="376" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">58</text>
+    <text x="18" y="376" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">56</text>
    <text x="63" y="376" fill="#e5e5e5" textLength="54" lengthAdjust="spacingAndGlyphs">const </text>
-    <text x="117" y="376" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line58</text>
+    <text x="117" y="376" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line56</text>
    <text x="171" y="376" fill="#e5e5e5" textLength="27" lengthAdjust="spacingAndGlyphs"> = </text>
    <text x="198" y="376" fill="#0000ee" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
    <text x="234" y="376" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">;</text>
    <text x="882" y="376" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="891" y="376" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">█</text>
    <text x="0" y="393" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="393" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">59</text>
+    <text x="18" y="393" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">57</text>
    <text x="63" y="393" fill="#e5e5e5" textLength="54" lengthAdjust="spacingAndGlyphs">const </text>
-    <text x="117" y="393" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line59</text>
+    <text x="117" y="393" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line57</text>
    <text x="171" y="393" fill="#e5e5e5" textLength="27" lengthAdjust="spacingAndGlyphs"> = </text>
    <text x="198" y="393" fill="#0000ee" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
    <text x="234" y="393" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">;</text>
    <text x="882" y="393" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="891" y="393" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">█</text>
    <text x="0" y="410" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="410" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">60</text>
+    <text x="18" y="410" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">58</text>
    <text x="63" y="410" fill="#e5e5e5" textLength="54" lengthAdjust="spacingAndGlyphs">const </text>
-    <text x="117" y="410" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line60</text>
+    <text x="117" y="410" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line58</text>
    <text x="171" y="410" fill="#e5e5e5" textLength="27" lengthAdjust="spacingAndGlyphs"> = </text>
    <text x="198" y="410" fill="#0000ee" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
    <text x="234" y="410" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">;</text>
    <text x="882" y="410" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="891" y="410" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">█</text>
    <text x="0" y="427" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <rect x="18" y="425" width="18" height="17" fill="#5f0000" />
-    <text x="18" y="427" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">61</text>
-    <rect x="36" y="425" width="9" height="17" fill="#5f0000" />
-    <rect x="45" y="425" width="9" height="17" fill="#5f0000" />
-    <text x="45" y="427" fill="#ff87af" textLength="9" lengthAdjust="spacingAndGlyphs">-</text>
-    <rect x="54" y="425" width="9" height="17" fill="#5f0000" />
-    <rect x="63" y="425" width="9" height="17" fill="#5f0000" />
-    <rect x="72" y="425" width="54" height="17" fill="#5f0000" />
-    <text x="72" y="427" fill="#0000ee" textLength="54" lengthAdjust="spacingAndGlyphs">return</text>
-    <rect x="126" y="425" width="234" height="17" fill="#5f0000" />
-    <text x="126" y="427" fill="#e5e5e5" textLength="234" lengthAdjust="spacingAndGlyphs"> kittyProtocolSupporte...;</text>
+    <text x="18" y="427" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">59</text>
+    <text x="63" y="427" fill="#e5e5e5" textLength="54" lengthAdjust="spacingAndGlyphs">const </text>
+    <text x="117" y="427" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line59</text>
+    <text x="171" y="427" fill="#e5e5e5" textLength="27" lengthAdjust="spacingAndGlyphs"> = </text>
+    <text x="198" y="427" fill="#0000ee" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
+    <text x="234" y="427" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">;</text>
    <text x="882" y="427" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="891" y="427" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">█</text>
    <text x="0" y="444" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <rect x="18" y="442" width="18" height="17" fill="#005f00" />
-    <text x="18" y="444" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">61</text>
-    <rect x="36" y="442" width="9" height="17" fill="#005f00" />
-    <rect x="45" y="442" width="9" height="17" fill="#005f00" />
-    <text x="45" y="444" fill="#d7ffd7" textLength="9" lengthAdjust="spacingAndGlyphs">+</text>
-    <rect x="54" y="442" width="9" height="17" fill="#005f00" />
-    <rect x="63" y="442" width="9" height="17" fill="#005f00" />
-    <rect x="72" y="442" width="54" height="17" fill="#005f00" />
-    <text x="72" y="444" fill="#0000ee" textLength="54" lengthAdjust="spacingAndGlyphs">return</text>
-    <rect x="126" y="442" width="234" height="17" fill="#005f00" />
-    <text x="126" y="444" fill="#e5e5e5" textLength="234" lengthAdjust="spacingAndGlyphs"> kittyProtocolSupporte...;</text>
+    <text x="18" y="444" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">60</text>
+    <text x="63" y="444" fill="#e5e5e5" textLength="54" lengthAdjust="spacingAndGlyphs">const </text>
+    <text x="117" y="444" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">line60</text>
+    <text x="171" y="444" fill="#e5e5e5" textLength="27" lengthAdjust="spacingAndGlyphs"> = </text>
+    <text x="198" y="444" fill="#0000ee" textLength="36" lengthAdjust="spacingAndGlyphs">true</text>
+    <text x="234" y="444" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">;</text>
    <text x="882" y="444" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="891" y="444" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">█</text>
    <text x="0" y="461" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="461" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">62</text>
-    <text x="63" y="461" fill="#e5e5e5" textLength="180" lengthAdjust="spacingAndGlyphs"> buffer: TextBuffer;</text>
+    <rect x="18" y="459" width="18" height="17" fill="#5f0000" />
+    <text x="18" y="461" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">61</text>
+    <rect x="36" y="459" width="9" height="17" fill="#5f0000" />
+    <rect x="45" y="459" width="9" height="17" fill="#5f0000" />
+    <text x="45" y="461" fill="#ff87af" textLength="9" lengthAdjust="spacingAndGlyphs">-</text>
+    <rect x="54" y="459" width="9" height="17" fill="#5f0000" />
+    <rect x="63" y="459" width="9" height="17" fill="#5f0000" />
+    <rect x="72" y="459" width="54" height="17" fill="#5f0000" />
+    <text x="72" y="461" fill="#0000ee" textLength="54" lengthAdjust="spacingAndGlyphs">return</text>
+    <rect x="126" y="459" width="234" height="17" fill="#5f0000" />
+    <text x="126" y="461" fill="#e5e5e5" textLength="234" lengthAdjust="spacingAndGlyphs"> kittyProtocolSupporte...;</text>
    <text x="882" y="461" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="891" y="461" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">█</text>
    <text x="0" y="478" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="478" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">63</text>
-    <text x="72" y="478" fill="#ffffff" textLength="72" lengthAdjust="spacingAndGlyphs">onSubmit</text>
-    <text x="144" y="478" fill="#e5e5e5" textLength="27" lengthAdjust="spacingAndGlyphs">: (</text>
-    <text x="171" y="478" fill="#ffffff" textLength="45" lengthAdjust="spacingAndGlyphs">value</text>
-    <text x="216" y="478" fill="#e5e5e5" textLength="18" lengthAdjust="spacingAndGlyphs">: </text>
-    <text x="234" y="478" fill="#00cdcd" textLength="54" lengthAdjust="spacingAndGlyphs">string</text>
-    <text x="288" y="478" fill="#e5e5e5" textLength="45" lengthAdjust="spacingAndGlyphs">) =&gt; </text>
-    <text x="333" y="478" fill="#00cdcd" textLength="36" lengthAdjust="spacingAndGlyphs">void</text>
-    <text x="369" y="478" fill="#e5e5e5" textLength="9" lengthAdjust="spacingAndGlyphs">;</text>
+    <rect x="18" y="476" width="18" height="17" fill="#005f00" />
+    <text x="18" y="478" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">61</text>
+    <rect x="36" y="476" width="9" height="17" fill="#005f00" />
+    <rect x="45" y="476" width="9" height="17" fill="#005f00" />
+    <text x="45" y="478" fill="#d7ffd7" textLength="9" lengthAdjust="spacingAndGlyphs">+</text>
+    <rect x="54" y="476" width="9" height="17" fill="#005f00" />
+    <rect x="63" y="476" width="9" height="17" fill="#005f00" />
+    <rect x="72" y="476" width="54" height="17" fill="#005f00" />
+    <text x="72" y="478" fill="#0000ee" textLength="54" lengthAdjust="spacingAndGlyphs">return</text>
+    <rect x="126" y="476" width="234" height="17" fill="#005f00" />
+    <text x="126" y="478" fill="#e5e5e5" textLength="234" lengthAdjust="spacingAndGlyphs"> kittyProtocolSupporte...;</text>
    <text x="882" y="478" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="891" y="478" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">█</text>
    <text x="0" y="495" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="495" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Apply this change?</text>
+    <text x="18" y="495" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">62</text>
+    <text x="63" y="495" fill="#e5e5e5" textLength="180" lengthAdjust="spacingAndGlyphs"> buffer: TextBuffer;</text>
    <text x="882" y="495" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="891" y="495" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">█</text>
    <text x="0" y="512" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="18" y="512" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">63</text>
+    <text x="72" y="512" fill="#ffffff" textLength="72" lengthAdjust="spacingAndGlyphs">onSubmit</text>
+    <text x="144" y="512" fill="#e5e5e5" textLength="27" lengthAdjust="spacingAndGlyphs">: (</text>
+    <text x="171" y="512" fill="#ffffff" textLength="45" lengthAdjust="spacingAndGlyphs">value</text>
+    <text x="216" y="512" fill="#e5e5e5" textLength="18" lengthAdjust="spacingAndGlyphs">: </text>
+    <text x="234" y="512" fill="#00cdcd" textLength="54" lengthAdjust="spacingAndGlyphs">string</text>
+    <text x="288" y="512" fill="#e5e5e5" textLength="45" lengthAdjust="spacingAndGlyphs">) =&gt; </text>
+    <text x="333" y="512" fill="#00cdcd" textLength="36" lengthAdjust="spacingAndGlyphs">void</text>
+    <text x="369" y="512" fill="#e5e5e5" textLength="9" lengthAdjust="spacingAndGlyphs">;</text>
    <text x="882" y="512" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="891" y="512" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">█</text>
    <text x="0" y="529" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <rect x="18" y="527" width="9" height="17" fill="#001a00" />
-    <text x="18" y="529" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">●</text>
-    <rect x="27" y="527" width="9" height="17" fill="#001a00" />
-    <rect x="36" y="527" width="18" height="17" fill="#001a00" />
-    <text x="36" y="529" fill="#00cd00" textLength="18" lengthAdjust="spacingAndGlyphs">1.</text>
-    <rect x="54" y="527" width="9" height="17" fill="#001a00" />
-    <rect x="63" y="527" width="90" height="17" fill="#001a00" />
-    <text x="63" y="529" fill="#00cd00" textLength="90" lengthAdjust="spacingAndGlyphs">Allow once</text>
-    <rect x="153" y="527" width="288" height="17" fill="#001a00" />
+    <text x="18" y="529" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Apply this change?</text>
    <text x="882" y="529" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="891" y="529" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">█</text>
    <text x="0" y="546" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="36" y="546" fill="#ffffff" textLength="18" lengthAdjust="spacingAndGlyphs">2.</text>
-    <text x="63" y="546" fill="#ffffff" textLength="198" lengthAdjust="spacingAndGlyphs">Allow for this session</text>
    <text x="882" y="546" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="891" y="546" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">█</text>
    <text x="0" y="563" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="36" y="563" fill="#ffffff" textLength="18" lengthAdjust="spacingAndGlyphs">3.</text>
-    <text x="63" y="563" fill="#ffffff" textLength="378" lengthAdjust="spacingAndGlyphs">Allow for this file in all future sessions</text>
+    <rect x="18" y="561" width="9" height="17" fill="#001a00" />
+    <text x="18" y="563" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">●</text>
+    <rect x="27" y="561" width="9" height="17" fill="#001a00" />
+    <rect x="36" y="561" width="18" height="17" fill="#001a00" />
+    <text x="36" y="563" fill="#00cd00" textLength="18" lengthAdjust="spacingAndGlyphs">1.</text>
+    <rect x="54" y="561" width="9" height="17" fill="#001a00" />
+    <rect x="63" y="561" width="90" height="17" fill="#001a00" />
+    <text x="63" y="563" fill="#00cd00" textLength="90" lengthAdjust="spacingAndGlyphs">Allow once</text>
+    <rect x="153" y="561" width="288" height="17" fill="#001a00" />
    <text x="882" y="563" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="891" y="563" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">█</text>
    <text x="0" y="580" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="36" y="580" fill="#ffffff" textLength="18" lengthAdjust="spacingAndGlyphs">4.</text>
-    <text x="63" y="580" fill="#ffffff" textLength="243" lengthAdjust="spacingAndGlyphs">Modify with external editor</text>
+    <text x="36" y="580" fill="#ffffff" textLength="18" lengthAdjust="spacingAndGlyphs">2.</text>
+    <text x="63" y="580" fill="#ffffff" textLength="198" lengthAdjust="spacingAndGlyphs">Allow for this session</text>
    <text x="882" y="580" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="891" y="580" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">█</text>
    <text x="0" y="597" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="36" y="597" fill="#ffffff" textLength="18" lengthAdjust="spacingAndGlyphs">5.</text>
-    <text x="63" y="597" fill="#ffffff" textLength="225" lengthAdjust="spacingAndGlyphs">No, suggest changes (esc)</text>
+    <text x="36" y="597" fill="#ffffff" textLength="18" lengthAdjust="spacingAndGlyphs">3.</text>
+    <text x="63" y="597" fill="#ffffff" textLength="378" lengthAdjust="spacingAndGlyphs">Allow for this file in all future sessions</text>
    <text x="882" y="597" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="891" y="597" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">█</text>
    <text x="0" y="614" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="36" y="614" fill="#ffffff" textLength="18" lengthAdjust="spacingAndGlyphs">4.</text>
+    <text x="63" y="614" fill="#ffffff" textLength="243" lengthAdjust="spacingAndGlyphs">Modify with external editor</text>
    <text x="882" y="614" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="891" y="614" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">█</text>
-    <text x="0" y="631" fill="#ffffaf" textLength="891" lengthAdjust="spacingAndGlyphs">╰─────────────────────────────────────────────────────────────────────────────────────────────────╯</text>
+    <text x="0" y="631" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="36" y="631" fill="#ffffff" textLength="18" lengthAdjust="spacingAndGlyphs">5.</text>
+    <text x="63" y="631" fill="#ffffff" textLength="225" lengthAdjust="spacingAndGlyphs">No, suggest changes (esc)</text>
+    <text x="882" y="631" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
    <text x="891" y="631" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">█</text>
+    <text x="0" y="648" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="882" y="648" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="891" y="648" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">█</text>
+    <text x="0" y="665" fill="#ffffaf" textLength="891" lengthAdjust="spacingAndGlyphs">╰─────────────────────────────────────────────────────────────────────────────────────────────────╯</text>
+    <text x="891" y="665" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">█</text>
  </g>
 </svg>
@@ -1,7 +1,9 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

 exports[`Full Terminal Tool Confirmation Snapshot > renders tool confirmation box in the frame of the entire terminal 1`] = `
-"▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+"3. Ask coding questions, edit code or run commands
+4. Be specific for the best results
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
 > Can you edit InputPrompt.tsx for me?                                                             
 ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
 ╭─────────────────────────────────────────────────────────────────────────────────────────────────╮
@@ -9,9 +11,9 @@ exports[`Full Terminal Tool Confirmation Snapshot > renders tool confirmation bo
 │                                                                                                 │
 │ ?  Edit packages/.../InputPrompt.tsx:   return kittyProtocolSupporte... =>   return kittyProto… │
 │                                                                                                 │
-│ ... first 44 lines hidden (Ctrl+O to show) ...                                                  │
-│ 45   const line45 = true;                                                                       │
-│ 46   const line46 = true;                                                                       │
+│ ... first 44 lines hidden (Ctrl+O to show) ...                                                  │█
+│ 45   const line45 = true;                                                                       │█
+│ 46   const line46 = true;                                                                       │█
 │ 47   const line47 = true;                                                                       │█
 │ 48   const line48 = true;                                                                       │█
 │ 49   const line49 = true;                                                                       │█
@@ -108,7 +108,7 @@ export const AppHeader = ({ version, showDetails = true }: AppHeaderProps) => {
          Gemini CLI
        </Text>
        <Text color={theme.text.secondary}> v{version}</Text>
-        {updateInfo?.isUpdating && (
+        {updateInfo && (
          <Box marginLeft={2}>
            <Text color={theme.text.secondary}>
              <CliSpinner /> Updating
@@ -1491,47 +1491,4 @@ describe('AskUserDialog', () => {
      expect(frame).toContain('3.  Option 3');
    });
  });
-
-  it('allows the question to exceed 15 lines in a tall terminal', async () => {
-    const longQuestion = Array.from(
-      { length: 25 },
-      (_, i) => `Line ${i + 1}`,
-    ).join('\n');
-    const questions: Question[] = [
-      {
-        question: longQuestion,
-        header: 'Tall Test',
-        type: QuestionType.CHOICE,
-        options: [
-          { label: 'Option 1', description: 'D1' },
-          { label: 'Option 2', description: 'D2' },
-          { label: 'Option 3', description: 'D3' },
-        ],
-        multiSelect: false,
-        unconstrainedHeight: false,
-      },
-    ];
-
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <AskUserDialog
-        questions={questions}
-        onSubmit={vi.fn()}
-        onCancel={vi.fn()}
-        width={80}
-        availableHeight={40} // Tall terminal
-      />,
-      { width: 80 },
-    );
-
-    await waitFor(async () => {
-      await waitUntilReady();
-      const frame = lastFrame();
-      // Should show more than 15 lines of the question
-      // (The limit was previously 15, so showing Line 20 proves it's working)
-      expect(frame).toContain('Line 20');
-      expect(frame).toContain('Line 25');
-      // Should still show the options
-      expect(frame).toContain('1.  Option 1');
-    });
-  });
 });
@@ -855,7 +855,13 @@ const ChoiceQuestionView: React.FC<ChoiceQuestionViewProps> = ({
    listHeight && !isAlternateBuffer
      ? question.unconstrainedHeight
        ? Math.max(1, listHeight - selectionItems.length * 2)
-        : Math.max(1, listHeight - Math.max(DIALOG_PADDING, reservedListHeight))
+        : Math.min(
+            15,
+            Math.max(
+              1,
+              listHeight - Math.max(DIALOG_PADDING, reservedListHeight),
+            ),
+          )
      : undefined;

  const maxItemsToShow =
@@ -4,8 +4,14 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-import { Box, useIsScreenReaderEnabled } from 'ink';
-import { useState, useEffect } from 'react';
+import {
+  ApprovalMode,
+  checkExhaustive,
+  CoreToolCallStatus,
+  isUserVisibleHook,
+} from '@google/gemini-cli-core';
+import { Box, Text, useIsScreenReaderEnabled } from 'ink';
+import { useState, useEffect, useMemo } from 'react';
 import { useConfig } from '../contexts/ConfigContext.js';
 import { useSettings } from '../contexts/SettingsContext.js';
 import { useUIState } from '../contexts/UIStateContext.js';
@@ -14,18 +20,28 @@ import { useVimMode } from '../contexts/VimModeContext.js';
 import { useAlternateBuffer } from '../hooks/useAlternateBuffer.js';
 import { useTerminalSize } from '../hooks/useTerminalSize.js';
 import { isNarrowWidth } from '../utils/isNarrowWidth.js';
+import { isContextUsageHigh } from '../utils/contextUsage.js';
+import { theme } from '../semantic-colors.js';
+import { GENERIC_WORKING_LABEL } from '../textConstants.js';
+import { INTERACTIVE_SHELL_WAITING_PHRASE } from '../hooks/usePhraseCycler.js';
+import { StreamingState, type HistoryItemToolGroup } from '../types.js';
+import { LoadingIndicator } from './LoadingIndicator.js';
+import { ContextUsageDisplay } from './ContextUsageDisplay.js';
+import { StatusDisplay } from './StatusDisplay.js';
+import { HorizontalLine } from './shared/HorizontalLine.js';
 import { ToastDisplay, shouldShowToast } from './ToastDisplay.js';
+import { ApprovalModeIndicator } from './ApprovalModeIndicator.js';
+import { ShellModeIndicator } from './ShellModeIndicator.js';
 import { DetailedMessagesDisplay } from './DetailedMessagesDisplay.js';
+import { RawMarkdownIndicator } from './RawMarkdownIndicator.js';
 import { ShortcutsHelp } from './ShortcutsHelp.js';
 import { InputPrompt } from './InputPrompt.js';
 import { Footer } from './Footer.js';
-import { StatusRow } from './StatusRow.js';
 import { ShowMoreLines } from './ShowMoreLines.js';
 import { QueuedMessageDisplay } from './QueuedMessageDisplay.js';
 import { OverflowProvider } from '../contexts/OverflowContext.js';
 import { ConfigInitDisplay } from './ConfigInitDisplay.js';
 import { TodoTray } from './messages/Todo.js';
-import { useComposerStatus } from '../hooks/useComposerStatus.js';

 export const Composer = ({ isFocused = true }: { isFocused?: boolean }) => {
  const uiState = useUIState();
@@ -40,17 +56,43 @@ export const Composer = ({ isFocused = true }: { isFocused?: boolean }) => {
  const [suggestionsVisible, setSuggestionsVisible] = useState(false);

  const isAlternateBuffer = useAlternateBuffer();
+  const showApprovalModeIndicator = uiState.showApprovalModeIndicator;
+  const loadingPhrases = settings.merged.ui.loadingPhrases;
+  const showTips = loadingPhrases === 'tips' || loadingPhrases === 'all';
+  const showWit = loadingPhrases === 'witty' || loadingPhrases === 'all';
+
  const showUiDetails = uiState.cleanUiDetailsVisible;
  const suggestionsPosition = isAlternateBuffer ? 'above' : 'below';
  const hideContextSummary =
    suggestionsVisible && suggestionsPosition === 'above';

-  const { hasPendingActionRequired, shouldCollapseDuringApproval } =
-    useComposerStatus();
+  const hasPendingToolConfirmation = useMemo(
+    () =>
+      (uiState.pendingHistoryItems ?? [])
+        .filter(
+          (item): item is HistoryItemToolGroup => item.type === 'tool_group',
+        )
+        .some((item) =>
+          item.tools.some(
+            (tool) => tool.status === CoreToolCallStatus.AwaitingApproval,
+          ),
+        ),
+    [uiState.pendingHistoryItems],
+  );
+
+  const hasPendingActionRequired =
+    hasPendingToolConfirmation ||
+    Boolean(uiState.commandConfirmationRequest) ||
+    Boolean(uiState.authConsentRequest) ||
+    (uiState.confirmUpdateExtensionRequests?.length ?? 0) > 0 ||
+    Boolean(uiState.loopDetectionConfirmationRequest) ||
+    Boolean(uiState.quota.proQuotaRequest) ||
+    Boolean(uiState.quota.validationRequest) ||
+    Boolean(uiState.customDialog);

  const isPassiveShortcutsHelpState =
    uiState.isInputActive &&
-    uiState.streamingState === 'idle' &&
+    uiState.streamingState === StreamingState.Idle &&
    !hasPendingActionRequired;

  const { setShortcutsHelpVisible } = uiActions;
@@ -67,19 +109,407 @@ export const Composer = ({ isFocused = true }: { isFocused?: boolean }) => {

  const showShortcutsHelp =
    uiState.shortcutsHelpVisible &&
-    uiState.streamingState === 'idle' &&
+    uiState.streamingState === StreamingState.Idle &&
    !hasPendingActionRequired;

+  /**
+   * Use the setting if provided, otherwise default to true for the new UX.
+   * This allows tests to override the collapse behavior.
+   */
+  const shouldCollapseDuringApproval =
+    settings.merged.ui.collapseDrawerDuringApproval !== false;
+
  if (hasPendingActionRequired && shouldCollapseDuringApproval) {
    return null;
  }

  const hasToast = shouldShowToast(uiState);
+  const showLoadingIndicator =
+    (!uiState.embeddedShellFocused || uiState.isBackgroundShellVisible) &&
+    uiState.streamingState === StreamingState.Responding &&
+    !hasPendingActionRequired;
+
  const hideUiDetailsForSuggestions =
    suggestionsVisible && suggestionsPosition === 'above';
+  const showApprovalIndicator =
+    !uiState.shellModeActive && !hideUiDetailsForSuggestions;
+  const showRawMarkdownIndicator = !uiState.renderMarkdown;
+
+  let modeBleedThrough: { text: string; color: string } | null = null;
+  switch (showApprovalModeIndicator) {
+    case ApprovalMode.YOLO:
+      modeBleedThrough = { text: 'YOLO', color: theme.status.error };
+      break;
+    case ApprovalMode.PLAN:
+      modeBleedThrough = { text: 'plan', color: theme.status.success };
+      break;
+    case ApprovalMode.AUTO_EDIT:
+      modeBleedThrough = { text: 'auto edit', color: theme.status.warning };
+      break;
+    case ApprovalMode.DEFAULT:
+      modeBleedThrough = null;
+      break;
+    default:
+      checkExhaustive(showApprovalModeIndicator);
+      modeBleedThrough = null;
+      break;
+  }
+
+  const hideMinimalModeHintWhileBusy =
+    !showUiDetails && (showLoadingIndicator || hasPendingActionRequired);
+
+  // Universal Content Objects
+  const modeContentObj = hideMinimalModeHintWhileBusy ? null : modeBleedThrough;
+
+  const allHooks = uiState.activeHooks;
+  const hasAnyHooks = allHooks.length > 0;
+  const userVisibleHooks = allHooks.filter((h) => isUserVisibleHook(h.source));
+  const hasUserVisibleHooks = userVisibleHooks.length > 0;
+
+  const shouldReserveSpaceForShortcutsHint =
+    settings.merged.ui.showShortcutsHint &&
+    !hideUiDetailsForSuggestions &&
+    !hasPendingActionRequired;
+
+  const isInteractiveShellWaiting = uiState.currentLoadingPhrase?.includes(
+    INTERACTIVE_SHELL_WAITING_PHRASE,
+  );
+
+  /**
+   * Calculate the estimated length of the status message to avoid collisions
+   * with the tips area.
+   */
+  let estimatedStatusLength = 0;
+  if (hasAnyHooks) {
+    if (hasUserVisibleHooks) {
+      const hookLabel =
+        userVisibleHooks.length > 1 ? 'Executing Hooks' : 'Executing Hook';
+      const hookNames = userVisibleHooks
+        .map(
+          (h) =>
+            h.name +
+            (h.index && h.total && h.total > 1
+              ? ` (${h.index}/${h.total})`
+              : ''),
+        )
+        .join(', ');
+      estimatedStatusLength = hookLabel.length + hookNames.length + 10;
+    } else {
+      estimatedStatusLength = GENERIC_WORKING_LABEL.length + 10;
+    }
+  } else if (showLoadingIndicator) {
+    const thoughtText = uiState.thought?.subject || GENERIC_WORKING_LABEL;
+    const inlineWittyLength =
+      showWit && uiState.currentWittyPhrase
+        ? uiState.currentWittyPhrase.length + 1
+        : 0;
+    estimatedStatusLength = thoughtText.length + 25 + inlineWittyLength;
+  } else if (hasPendingActionRequired) {
+    estimatedStatusLength = 20;
+  } else if (hasToast) {
+    estimatedStatusLength = 40;
+  }
+
+  /**
+   * Determine the ambient text (tip) to display.
+   */
+  const tipContentStr = (() => {
+    // 1. Proactive Tip (Priority)
+    if (
+      showTips &&
+      uiState.currentTip &&
+      !(
+        isInteractiveShellWaiting &&
+        uiState.currentTip === INTERACTIVE_SHELL_WAITING_PHRASE
+      )
+    ) {
+      if (
+        estimatedStatusLength + uiState.currentTip.length + 10 <=
+        terminalWidth
+      ) {
+        return uiState.currentTip;
+      }
+    }
+
+    // 2. Shortcut Hint (Fallback)
+    if (
+      settings.merged.ui.showShortcutsHint &&
+      !hideUiDetailsForSuggestions &&
+      !hasPendingActionRequired &&
+      uiState.buffer.text.length === 0
+    ) {
+      return showUiDetails ? '? for shortcuts' : 'press tab twice for more';
+    }
+
+    return undefined;
+  })();
+
+  const tipLength = tipContentStr?.length || 0;
+  const willCollideTip = estimatedStatusLength + tipLength + 5 > terminalWidth;
+
+  const showTipLine =
+    !hasPendingActionRequired && tipContentStr && !willCollideTip && !isNarrow;

  // Mini Mode VIP Flags (Pure Content Triggers)
-  const showMinimalToast = hasToast;
+  const miniMode_ShowApprovalMode =
+    Boolean(modeContentObj) && !hideUiDetailsForSuggestions;
+  const miniMode_ShowToast = hasToast;
+  const miniMode_ShowShortcuts = shouldReserveSpaceForShortcutsHint;
+  const miniMode_ShowStatus = showLoadingIndicator || hasAnyHooks;
+  const miniMode_ShowTip = showTipLine;
+  const miniMode_ShowContext = isContextUsageHigh(
+    uiState.sessionStats.lastPromptTokenCount,
+    uiState.currentModel,
+    settings.merged.model?.compressionThreshold,
+  );
+
+  // Composite Mini Mode Triggers
+  const showRow1_MiniMode =
+    miniMode_ShowToast ||
+    miniMode_ShowStatus ||
+    miniMode_ShowShortcuts ||
+    miniMode_ShowTip;
+
+  const showRow2_MiniMode = miniMode_ShowApprovalMode || miniMode_ShowContext;
+
+  // Final Display Rules (Stable Footer Architecture)
+  const showRow1 = showUiDetails || showRow1_MiniMode;
+  const showRow2 = showUiDetails || showRow2_MiniMode;
+
+  const showMinimalBleedThroughRow = !showUiDetails && showRow2_MiniMode;
+
+  const renderTipNode = () => {
+    if (!tipContentStr) return null;
+
+    const isShortcutHint =
+      tipContentStr === '? for shortcuts' ||
+      tipContentStr === 'press tab twice for more';
+    const color =
+      isShortcutHint && uiState.shortcutsHelpVisible
+        ? theme.text.accent
+        : theme.text.secondary;
+
+    return (
+      <Box flexDirection="row" justifyContent="flex-end">
+        <Text
+          color={color}
+          wrap="truncate-end"
+          italic={
+            !isShortcutHint && tipContentStr === uiState.currentWittyPhrase
+          }
+        >
+          {tipContentStr === uiState.currentTip
+            ? `Tip: ${tipContentStr}`
+            : tipContentStr}
+        </Text>
+      </Box>
+    );
+  };
+
+  const renderStatusNode = () => {
+    const allHooks = uiState.activeHooks;
+    if (allHooks.length === 0 && !showLoadingIndicator) return null;
+
+    if (allHooks.length > 0) {
+      const userVisibleHooks = allHooks.filter((h) =>
+        isUserVisibleHook(h.source),
+      );
+
+      let hookText = GENERIC_WORKING_LABEL;
+      if (userVisibleHooks.length > 0) {
+        const label =
+          userVisibleHooks.length > 1 ? 'Executing Hooks' : 'Executing Hook';
+        const displayNames = userVisibleHooks.map((h) => {
+          let name = h.name;
+          if (h.index && h.total && h.total > 1) {
+            name += ` (${h.index}/${h.total})`;
+          }
+          return name;
+        });
+        hookText = `${label}: ${displayNames.join(', ')}`;
+      }
+
+      return (
+        <LoadingIndicator
+          inline
+          showTips={showTips}
+          showWit={showWit}
+          errorVerbosity={settings.merged.ui.errorVerbosity}
+          currentLoadingPhrase={hookText}
+          elapsedTime={uiState.elapsedTime}
+          forceRealStatusOnly={false}
+          wittyPhrase={uiState.currentWittyPhrase}
+        />
+      );
+    }
+
+    return (
+      <LoadingIndicator
+        inline
+        showTips={showTips}
+        showWit={showWit}
+        errorVerbosity={settings.merged.ui.errorVerbosity}
+        thought={uiState.thought}
+        elapsedTime={uiState.elapsedTime}
+        forceRealStatusOnly={false}
+        wittyPhrase={uiState.currentWittyPhrase}
+      />
+    );
+  };
+
+  const statusNode = renderStatusNode();
+
+  /**
+   * Renders the minimal metadata row content shown when UI details are hidden.
+   */
+  const renderMinimalMetaRowContent = () => (
+    <Box flexDirection="row" columnGap={1}>
+      {renderStatusNode()}
+      {showMinimalBleedThroughRow && (
+        <Box>
+          {miniMode_ShowApprovalMode && modeContentObj && (
+            <Text color={modeContentObj.color}>● {modeContentObj.text}</Text>
+          )}
+        </Box>
+      )}
+    </Box>
+  );
+
+  const renderStatusRow = () => {
+    // Mini Mode Height Reservation (The "Anti-Jitter" line)
+    if (!showUiDetails && !showRow1_MiniMode && !showRow2_MiniMode) {
+      return <Box height={1} />;
+    }
+
+    return (
+      <Box flexDirection="column" width="100%">
+        {/* Row 1: multipurpose status (thinking, hooks, wit, tips) */}
+        {showRow1 && (
+          <Box
+            width="100%"
+            flexDirection="row"
+            alignItems="center"
+            justifyContent="space-between"
+            minHeight={1}
+          >
+            <Box flexDirection="row" flexGrow={1} flexShrink={1}>
+              {!showUiDetails && showRow1_MiniMode ? (
+                renderMinimalMetaRowContent()
+              ) : isInteractiveShellWaiting ? (
+                <Box width="100%" marginLeft={1}>
+                  <Text color={theme.status.warning}>
+                    ! Shell awaiting input (Tab to focus)
+                  </Text>
+                </Box>
+              ) : (
+                <Box
+                  flexDirection="row"
+                  alignItems={isNarrow ? 'flex-start' : 'center'}
+                  flexGrow={1}
+                  flexShrink={0}
+                  marginLeft={1}
+                >
+                  {statusNode}
+                </Box>
+              )}
+            </Box>
+
+            <Box flexShrink={0} marginLeft={2} marginRight={isNarrow ? 0 : 1}>
+              {!isNarrow && showTipLine && renderTipNode()}
+            </Box>
+          </Box>
+        )}
+
+        {/* Internal Separator Line */}
+        {showRow1 &&
+          showRow2 &&
+          (showUiDetails || (showRow1_MiniMode && showRow2_MiniMode)) && (
+            <Box width="100%">
+              <HorizontalLine dim />
+            </Box>
+          )}
+
+        {/* Row 2: Mode and Context Summary */}
+        {showRow2 && (
+          <Box
+            width="100%"
+            flexDirection={isNarrow ? 'column' : 'row'}
+            alignItems={isNarrow ? 'flex-start' : 'center'}
+            justifyContent="space-between"
+          >
+            <Box flexDirection="row" alignItems="center" marginLeft={1}>
+              {showUiDetails ? (
+                <>
+                  {showApprovalIndicator && (
+                    <ApprovalModeIndicator
+                      approvalMode={showApprovalModeIndicator}
+                      allowPlanMode={uiState.allowPlanMode}
+                    />
+                  )}
+                  {uiState.shellModeActive && (
+                    <Box
+                      marginLeft={showApprovalIndicator && !isNarrow ? 1 : 0}
+                      marginTop={showApprovalIndicator && isNarrow ? 1 : 0}
+                    >
+                      <ShellModeIndicator />
+                    </Box>
+                  )}
+                  {showRawMarkdownIndicator && (
+                    <Box
+                      marginLeft={
+                        (showApprovalIndicator || uiState.shellModeActive) &&
+                        !isNarrow
+                          ? 1
+                          : 0
+                      }
+                      marginTop={
+                        (showApprovalIndicator || uiState.shellModeActive) &&
+                        isNarrow
+                          ? 1
+                          : 0
+                      }
+                    >
+                      <RawMarkdownIndicator />
+                    </Box>
+                  )}
+                </>
+              ) : (
+                miniMode_ShowApprovalMode &&
+                modeContentObj && (
+                  <Text color={modeContentObj.color}>
+                    ● {modeContentObj.text}
+                  </Text>
+                )
+              )}
+            </Box>
+            <Box
+              marginTop={isNarrow ? 1 : 0}
+              flexDirection="row"
+              alignItems="center"
+              marginLeft={isNarrow ? 1 : 0}
+            >
+              {(showUiDetails || miniMode_ShowContext) && (
+                <StatusDisplay hideContextSummary={hideContextSummary} />
+              )}
+              {miniMode_ShowContext && !showUiDetails && (
+                <Box marginLeft={1}>
+                  <ContextUsageDisplay
+                    promptTokenCount={uiState.sessionStats.lastPromptTokenCount}
+                    model={
+                      typeof uiState.currentModel === 'string'
+                        ? uiState.currentModel
+                        : undefined
+                    }
+                    terminalWidth={uiState.terminalWidth}
+                  />
+                </Box>
+              )}
+            </Box>
+          </Box>
+        )}
+      </Box>
+    );
+  };

  return (
    <Box
@@ -100,21 +530,14 @@ export const Composer = ({ isFocused = true }: { isFocused?: boolean }) => {

      {showShortcutsHelp && <ShortcutsHelp />}

-      {(showUiDetails || showMinimalToast) && (
+      {(showUiDetails || miniMode_ShowToast) && (
        <Box minHeight={1} marginLeft={isNarrow ? 0 : 1}>
          <ToastDisplay />
        </Box>
      )}

      <Box width="100%" flexDirection="column">
-        <StatusRow
-          showUiDetails={showUiDetails}
-          isNarrow={isNarrow}
-          terminalWidth={terminalWidth}
-          hideContextSummary={hideContextSummary}
-          hideUiDetailsForSuggestions={hideUiDetailsForSuggestions}
-          hasPendingActionRequired={hasPendingActionRequired}
-        />
+        {renderStatusRow()}
      </Box>

      {showUiDetails && uiState.showErrorDetails && (
@@ -146,7 +569,7 @@ export const Composer = ({ isFocused = true }: { isFocused?: boolean }) => {
          commandContext={uiState.commandContext}
          shellModeActive={uiState.shellModeActive}
          setShellModeActive={uiActions.setShellModeActive}
-          approvalMode={uiState.showApprovalModeIndicator}
+          approvalMode={showApprovalModeIndicator}
          onEscapePromptChange={uiActions.onEscapePromptChange}
          focus={isFocused}
          vimHandleInput={uiActions.vimHandleInput}
@@ -165,15 +588,12 @@ export const Composer = ({ isFocused = true }: { isFocused?: boolean }) => {
          streamingState={uiState.streamingState}
          suggestionsPosition={suggestionsPosition}
          onSuggestionsVisibilityChange={setSuggestionsVisible}
-          copyModeEnabled={uiState.copyModeEnabled}
        />
      )}

      {showUiDetails &&
        !settings.merged.ui.hideFooter &&
-        !isScreenReaderEnabled && (
-          <Footer copyModeEnabled={uiState.copyModeEnabled} />
-        )}
+        !isScreenReaderEnabled && <Footer />}
    </Box>
  );
 };
@@ -12,14 +12,16 @@ import { theme } from '../semantic-colors.js';
 export const CopyModeWarning: React.FC = () => {
  const { copyModeEnabled } = useUIState();

+  if (!copyModeEnabled) {
+    return null;
+  }
+
  return (
-    <Box height={1}>
-      {copyModeEnabled && (
-        <Text color={theme.status.warning}>
-          In Copy Mode. Use Page Up/Down to scroll. Press Ctrl+S or any other
-          key to exit.
-        </Text>
-      )}
+    <Box>
+      <Text color={theme.status.warning}>
+        In Copy Mode. Use Page Up/Down to scroll. Press Ctrl+S or any other key
+        to exit.
+      </Text>
    </Box>
  );
 };
@@ -175,18 +175,12 @@ interface FooterColumn {
  isHighPriority: boolean;
 }

-export const Footer: React.FC<{ copyModeEnabled?: boolean }> = ({
-  copyModeEnabled = false,
-}) => {
+export const Footer: React.FC = () => {
  const uiState = useUIState();
  const config = useConfig();
  const settings = useSettings();
  const { vimEnabled, vimMode } = useVimMode();

-  if (copyModeEnabled) {
-    return <Box height={1} />;
-  }
-
  const {
    model,
    targetDir,
@@ -359,17 +353,7 @@ export const Footer: React.FC<{ copyModeEnabled?: boolean }> = ({
        break;
      }
      case 'memory-usage': {
-        addCol(
-          id,
-          header,
-          () => (
-            <MemoryUsageDisplay
-              color={itemColor}
-              isActive={!uiState.copyModeEnabled}
-            />
-          ),
-          10,
-        );
+        addCol(id, header, () => <MemoryUsageDisplay color={itemColor} />, 10);
        break;
      }
      case 'session-id': {
@@ -61,7 +61,7 @@ import type { UIState } from '../contexts/UIStateContext.js';
 import { isLowColorDepth } from '../utils/terminalUtils.js';
 import { cpLen } from '../utils/textUtils.js';
 import { defaultKeyMatchers, Command } from '../key/keyMatchers.js';
-import { useKeypress, type Key } from '../hooks/useKeypress.js';
+import type { Key } from '../hooks/useKeypress.js';
 import {
  appEvents,
  AppEvent,
@@ -163,18 +163,6 @@ describe('InputPrompt', () => {
  let mockBuffer: TextBuffer;
  let mockCommandContext: CommandContext;

-  const GlobalEscapeHandler = ({ onEscape }: { onEscape: () => void }) => {
-    useKeypress(
-      (key) => {
-        if (key.name !== 'escape') return false;
-        onEscape();
-        return true;
-      },
-      { isActive: true, priority: false },
-    );
-    return null;
-  };
-
  const mockedUseShellHistory = vi.mocked(useShellHistory);
  const mockedUseCommandCompletion = vi.mocked(useCommandCompletion);
  const mockedUseInputHistory = vi.mocked(useInputHistory);
@@ -2782,54 +2770,6 @@ describe('InputPrompt', () => {
      unmount();
    });

-    it('should not propagate ESC to global cancellation handler when shell mode is active (responding)', async () => {
-      props.shellModeActive = true;
-      props.streamingState = StreamingState.Responding;
-      const onGlobalEscape = vi.fn();
-
-      const { stdin, unmount } = await renderWithProviders(
-        <>
-          <GlobalEscapeHandler onEscape={onGlobalEscape} />
-          <InputPrompt {...props} />
-        </>,
-      );
-
-      await act(async () => {
-        stdin.write('\x1B');
-        vi.advanceTimersByTime(100);
-      });
-
-      await waitFor(() => {
-        expect(props.setShellModeActive).toHaveBeenCalledWith(false);
-      });
-      expect(onGlobalEscape).not.toHaveBeenCalled();
-      unmount();
-    });
-
-    it('should allow ESC to reach global cancellation handler when responding and no overlay is active', async () => {
-      props.shellModeActive = false;
-      props.streamingState = StreamingState.Responding;
-      const onGlobalEscape = vi.fn();
-
-      const { stdin, unmount } = await renderWithProviders(
-        <>
-          <GlobalEscapeHandler onEscape={onGlobalEscape} />
-          <InputPrompt {...props} />
-        </>,
-      );
-
-      await act(async () => {
-        stdin.write('\x1B');
-        vi.advanceTimersByTime(100);
-      });
-
-      await waitFor(() => {
-        expect(onGlobalEscape).toHaveBeenCalledTimes(1);
-      });
-      expect(props.setShellModeActive).not.toHaveBeenCalled();
-      unmount();
-    });
-
    it('should handle ESC when completion suggestions are showing', async () => {
      mockedUseCommandCompletion.mockReturnValue({
        ...mockCommandCompletion,
@@ -119,7 +119,6 @@ export interface InputPromptProps {
  popAllMessages?: () => string | undefined;
  suggestionsPosition?: 'above' | 'below';
  setBannerVisible: (visible: boolean) => void;
-  copyModeEnabled?: boolean;
 }

 // The input content, input container, and input suggestions list may have different widths
@@ -213,7 +212,6 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
  popAllMessages,
  suggestionsPosition = 'below',
  setBannerVisible,
-  copyModeEnabled = false,
 }) => {
  const isHelpDismissKey = useIsHelpDismissKey();
  const keyMatchers = useKeyMatchers();
@@ -333,8 +331,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
    isShellSuggestionsVisible,
  } = completion;

-  const showCursor =
-    focus && isShellFocused && !isEmbeddedShellFocused && !copyModeEnabled;
+  const showCursor = focus && isShellFocused && !isEmbeddedShellFocused;

  // Notify parent component about escape prompt state changes
  useEffect(() => {
@@ -686,9 +683,13 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
        return true;
      }

-      const isGenerating =
-        streamingState === StreamingState.Responding ||
-        streamingState === StreamingState.WaitingForConfirmation;
+      if (
+        key.name === 'escape' &&
+        (streamingState === StreamingState.Responding ||
+          streamingState === StreamingState.WaitingForConfirmation)
+      ) {
+        return false;
+      }

      const isPlainTab =
        key.name === 'tab' && !key.shift && !key.alt && !key.ctrl && !key.cmd;
@@ -873,12 +874,6 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
          return true;
        }

-        // If we're generating and no local overlay consumed Escape, let it
-        // propagate to the global cancellation handler.
-        if (isGenerating) {
-          return false;
-        }
-
        handleEscPress();
        return true;
      }
@@ -21,10 +21,6 @@ import {
  type UIState,
 } from '../contexts/UIStateContext.js';
 import { type IndividualToolCallDisplay } from '../types.js';
-import {
-  type ConfirmingToolState,
-  useConfirmingTool,
-} from '../hooks/useConfirmingTool.js';

 // Mock dependencies
 const mockUseSettings = vi.fn().mockReturnValue({
@@ -57,10 +53,6 @@ vi.mock('../hooks/useAlternateBuffer.js', () => ({
  useAlternateBuffer: vi.fn(),
 }));

-vi.mock('../hooks/useConfirmingTool.js', () => ({
-  useConfirmingTool: vi.fn(),
-}));
-
 vi.mock('./AppHeader.js', () => ({
  AppHeader: ({ showDetails = true }: { showDetails?: boolean }) => (
    <Text>{showDetails ? 'AppHeader(full)' : 'AppHeader(minimal)'}</Text>
@@ -511,54 +503,6 @@ describe('MainContent', () => {
    unmount();
  });

-  it('renders a subagent with a complete box including bottom border', async () => {
-    const subagentCall = {
-      callId: 'subagent-1',
-      name: 'codebase_investigator',
-      description: 'Investigating codebase',
-      status: CoreToolCallStatus.Executing,
-      kind: 'agent',
-      resultDisplay: {
-        isSubagentProgress: true,
-        agentName: 'codebase_investigator',
-        recentActivity: [
-          {
-            id: '1',
-            type: 'tool_call',
-            content: 'run_shell_command',
-            args: '{"command": "echo hello"}',
-            status: 'running',
-          },
-        ],
-        state: 'running',
-      },
-    } as Partial<IndividualToolCallDisplay> as IndividualToolCallDisplay;
-
-    const uiState = {
-      ...defaultMockUiState,
-      history: [{ id: 1, type: 'user', text: 'Investigate' }],
-      pendingHistoryItems: [
-        {
-          type: 'tool_group' as const,
-          tools: [subagentCall],
-          borderBottom: true,
-        },
-      ],
-    };
-
-    const { lastFrame, unmount } = await renderWithProviders(<MainContent />, {
-      uiState: uiState as Partial<UIState>,
-      config: makeFakeConfig({ useAlternateBuffer: false }),
-    });
-
-    await waitFor(() => {
-      expect(lastFrame()).toContain('codebase_investigator');
-    });
-
-    expect(lastFrame()).toMatchSnapshot();
-    unmount();
-  });
-
  it('renders a split tool group without a gap between static and pending areas', async () => {
    const toolCalls = [
      {
@@ -603,124 +547,13 @@ describe('MainContent', () => {
    const { lastFrame, unmount } = await renderWithProviders(<MainContent />, {
      uiState: uiState as Partial<UIState>,
    });
-
-    await waitFor(() => {
-      const output = lastFrame();
-      // Verify Part 1 and Part 2 are rendered.
-      expect(output).toContain('Part 1');
-      expect(output).toContain('Part 2');
-    });
+    const output = lastFrame();
+    // Verify Part 1 and Part 2 are rendered.
+    expect(output).toContain('Part 1');
+    expect(output).toContain('Part 2');

    // The snapshot will be the best way to verify there is no gap (empty line) between them.
-    expect(lastFrame()).toMatchSnapshot();
-    unmount();
-  });
-
-  it('renders a ToolConfirmationQueue without an extra line when preceded by hidden tools', async () => {
-    const { ApprovalMode, WRITE_FILE_DISPLAY_NAME } = await import(
-      '@google/gemini-cli-core'
-    );
-    const hiddenToolCalls = [
-      {
-        callId: 'tool-hidden',
-        name: WRITE_FILE_DISPLAY_NAME,
-        approvalMode: ApprovalMode.PLAN,
-        status: CoreToolCallStatus.Success,
-        resultDisplay: 'Hidden content',
-      } as Partial<IndividualToolCallDisplay> as IndividualToolCallDisplay,
-    ];
-
-    const confirmingTool = {
-      tool: {
-        callId: 'call-1',
-        name: 'exit_plan_mode',
-        status: CoreToolCallStatus.AwaitingApproval,
-        confirmationDetails: {
-          type: 'exit_plan_mode' as const,
-          planPath: '/path/to/plan',
-        },
-      },
-      index: 1,
-      total: 1,
-    };
-
-    const uiState = {
-      ...defaultMockUiState,
-      history: [{ id: 1, type: 'user', text: 'Apply plan' }],
-      pendingHistoryItems: [
-        {
-          type: 'tool_group' as const,
-          tools: hiddenToolCalls,
-          borderBottom: true,
-        },
-      ],
-    };
-
-    // We need to mock useConfirmingTool to return our confirmingTool
-    vi.mocked(useConfirmingTool).mockReturnValue(
-      confirmingTool as unknown as ConfirmingToolState,
-    );
-
-    mockUseSettings.mockReturnValue(
-      createMockSettings({
-        security: { enablePermanentToolApproval: true },
-        ui: { errorVerbosity: 'full' },
-      }),
-    );
-
-    const { lastFrame, unmount } = await renderWithProviders(<MainContent />, {
-      uiState: uiState as Partial<UIState>,
-      config: makeFakeConfig({ useAlternateBuffer: false }),
-    });
-
-    await waitFor(() => {
-      const output = lastFrame();
-      // The output should NOT contain 'Hidden content'
-      expect(output).not.toContain('Hidden content');
-      // The output should contain the confirmation header
-      expect(output).toContain('Ready to start implementation?');
-    });
-
-    // Snapshot will reveal if there are extra blank lines
-    expect(lastFrame()).toMatchSnapshot();
-    unmount();
-  });
-
-  it('renders a spurious line when a tool group has only hidden tools and borderBottom true', async () => {
-    const { ApprovalMode, WRITE_FILE_DISPLAY_NAME } = await import(
-      '@google/gemini-cli-core'
-    );
-    const uiState = {
-      ...defaultMockUiState,
-      history: [{ id: 1, type: 'user', text: 'Apply plan' }],
-      pendingHistoryItems: [
-        {
-          type: 'tool_group' as const,
-          tools: [
-            {
-              callId: 'tool-1',
-              name: WRITE_FILE_DISPLAY_NAME,
-              approvalMode: ApprovalMode.PLAN,
-              status: CoreToolCallStatus.Success,
-              resultDisplay: 'hidden',
-            } as Partial<IndividualToolCallDisplay> as IndividualToolCallDisplay,
-          ],
-          borderBottom: true,
-        },
-      ],
-    };
-
-    const { lastFrame, unmount } = await renderWithProviders(<MainContent />, {
-      uiState: uiState as Partial<UIState>,
-      config: makeFakeConfig({ useAlternateBuffer: false }),
-    });
-
-    await waitFor(() => {
-      expect(lastFrame()).toContain('Apply plan');
-    });
-
-    // This snapshot will show no spurious line because the group is now correctly suppressed.
-    expect(lastFrame()).toMatchSnapshot();
+    expect(output).toMatchSnapshot();
    unmount();
  });

@@ -11,18 +11,13 @@ import { theme } from '../semantic-colors.js';
 import process from 'node:process';
 import { formatBytes } from '../utils/formatters.js';

-export const MemoryUsageDisplay: React.FC<{
-  color?: string;
-  isActive?: boolean;
-}> = ({ color = theme.text.primary, isActive = true }) => {
+export const MemoryUsageDisplay: React.FC<{ color?: string }> = ({
+  color = theme.text.primary,
+}) => {
  const [memoryUsage, setMemoryUsage] = useState<string>('');
  const [memoryUsageColor, setMemoryUsageColor] = useState<string>(color);

  useEffect(() => {
-    if (!isActive) {
-      return;
-    }
-
    const updateMemory = () => {
      const usage = process.memoryUsage().rss;
      setMemoryUsage(formatBytes(usage));
@@ -30,11 +25,10 @@ export const MemoryUsageDisplay: React.FC<{
        usage >= 2 * 1024 * 1024 * 1024 ? theme.status.error : color,
      );
    };
-
    const intervalId = setInterval(updateMemory, 2000);
    updateMemory(); // Initial update
    return () => clearInterval(intervalId);
-  }, [color, isActive]);
+  }, [color]);

  return (
    <Box>
@@ -53,7 +53,6 @@ describe('<ModelDialog />', () => {
  const mockOnClose = vi.fn();
  const mockGetHasAccessToPreviewModel = vi.fn();
  const mockGetGemini31LaunchedSync = vi.fn();
-  const mockGetGemini31FlashLiteLaunchedSync = vi.fn();
  const mockGetProModelNoAccess = vi.fn();
  const mockGetProModelNoAccessSync = vi.fn();
  const mockGetUserTier = vi.fn();
@@ -64,7 +63,6 @@ describe('<ModelDialog />', () => {
    getHasAccessToPreviewModel: () => boolean;
    getIdeMode: () => boolean;
    getGemini31LaunchedSync: () => boolean;
-    getGemini31FlashLiteLaunchedSync: () => boolean;
    getProModelNoAccess: () => Promise<boolean>;
    getProModelNoAccessSync: () => boolean;
    getUserTier: () => UserTierId | undefined;
@@ -76,7 +74,6 @@ describe('<ModelDialog />', () => {
    getHasAccessToPreviewModel: mockGetHasAccessToPreviewModel,
    getIdeMode: () => false,
    getGemini31LaunchedSync: mockGetGemini31LaunchedSync,
-    getGemini31FlashLiteLaunchedSync: mockGetGemini31FlashLiteLaunchedSync,
    getProModelNoAccess: mockGetProModelNoAccess,
    getProModelNoAccessSync: mockGetProModelNoAccessSync,
    getUserTier: mockGetUserTier,
@@ -87,7 +84,6 @@ describe('<ModelDialog />', () => {
    mockGetModel.mockReturnValue(DEFAULT_GEMINI_MODEL_AUTO);
    mockGetHasAccessToPreviewModel.mockReturnValue(false);
    mockGetGemini31LaunchedSync.mockReturnValue(false);
-    mockGetGemini31FlashLiteLaunchedSync.mockReturnValue(false);
    mockGetProModelNoAccess.mockResolvedValue(false);
    mockGetProModelNoAccessSync.mockReturnValue(false);
    mockGetUserTier.mockReturnValue(UserTierId.STANDARD);
@@ -135,7 +131,6 @@ describe('<ModelDialog />', () => {
    mockGetProModelNoAccessSync.mockReturnValue(true);
    mockGetProModelNoAccess.mockResolvedValue(true);
    mockGetHasAccessToPreviewModel.mockReturnValue(true);
-    mockGetGemini31FlashLiteLaunchedSync.mockReturnValue(true);
    mockGetUserTier.mockReturnValue(UserTierId.FREE);
    mockGetDisplayString.mockImplementation((val: string) => val);

@@ -468,7 +463,6 @@ describe('<ModelDialog />', () => {
      mockGetProModelNoAccessSync.mockReturnValue(false);
      mockGetProModelNoAccess.mockResolvedValue(false);
      mockGetHasAccessToPreviewModel.mockReturnValue(true);
-      mockGetGemini31FlashLiteLaunchedSync.mockReturnValue(true);
      mockGetUserTier.mockReturnValue(UserTierId.FREE);
      const { lastFrame, stdin, waitUntilReady, unmount } =
        await renderComponent();
@@ -63,8 +63,6 @@ export function ModelDialog({ onClose }: ModelDialogProps): React.JSX.Element {

  const shouldShowPreviewModels = config?.getHasAccessToPreviewModel();
  const useGemini31 = config?.getGemini31LaunchedSync?.() ?? false;
-  const useGemini31FlashLite =
-    config?.getGemini31FlashLiteLaunchedSync?.() ?? false;
  const selectedAuthType = settings.merged.security.auth.selectedType;
  const useCustomToolModel =
    useGemini31 && selectedAuthType === AuthType.USE_GEMINI;
@@ -88,7 +86,6 @@ export function ModelDialog({ onClose }: ModelDialogProps): React.JSX.Element {
      PREVIEW_GEMINI_MODEL,
      PREVIEW_GEMINI_3_1_MODEL,
      PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL,
-      PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL,
      PREVIEW_GEMINI_FLASH_MODEL,
    ];
    if (manualModels.includes(preferredModel)) {
@@ -213,10 +210,7 @@ export function ModelDialog({ onClose }: ModelDialogProps): React.JSX.Element {

          // Flag Guard: Versioned models only show if their flag is active.
          if (id === PREVIEW_GEMINI_3_1_MODEL && !useGemini31) return false;
-          if (
-            id === PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL &&
-            !useGemini31FlashLite
-          )
+          if (id === PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL && !useGemini31)
            return false;

          return true;
@@ -224,13 +218,11 @@ export function ModelDialog({ onClose }: ModelDialogProps): React.JSX.Element {
        .map(([id, m]) => {
          const resolvedId = config.modelConfigService.resolveModelId(id, {
            useGemini3_1: useGemini31,
-            useGemini3_1FlashLite: useGemini31FlashLite,
            useCustomTools: useCustomToolModel,
          });
          // Title ID is the resolved ID without custom tools flag
          const titleId = config.modelConfigService.resolveModelId(id, {
            useGemini3_1: useGemini31,
-            useGemini3_1FlashLite: useGemini31FlashLite,
          });
          return {
            value: resolvedId,
@@ -292,7 +284,7 @@ export function ModelDialog({ onClose }: ModelDialogProps): React.JSX.Element {
        },
      ];

-      if (isFreeTier && useGemini31FlashLite) {
+      if (isFreeTier) {
        previewOptions.push({
          value: PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL,
          title: getDisplayString(PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL),
@@ -312,7 +304,6 @@ export function ModelDialog({ onClose }: ModelDialogProps): React.JSX.Element {
  }, [
    shouldShowPreviewModels,
    useGemini31,
-    useGemini31FlashLite,
    useCustomToolModel,
    hasAccessToProModel,
    config,
@@ -92,7 +92,6 @@ const buildModelRows = (
  config: Config,
  quotas?: RetrieveUserQuotaResponse,
  useGemini3_1 = false,
-  useGemini3_1FlashLite = false,
  useCustomToolModel = false,
 ) => {
  const getBaseModelName = (name: string) => name.replace('-001', '');
@@ -125,12 +124,7 @@ const buildModelRows = (
      ?.filter(
        (b) =>
          b.modelId &&
-          isActiveModel(
-            b.modelId,
-            useGemini3_1,
-            useGemini3_1FlashLite,
-            useCustomToolModel,
-          ) &&
+          isActiveModel(b.modelId, useGemini3_1, useCustomToolModel) &&
          !usedModelNames.has(getDisplayString(b.modelId, config)),
      )
      .map((bucket) => ({
@@ -158,7 +152,6 @@ const ModelUsageTable: React.FC<{
  pooledLimit?: number;
  pooledResetTime?: string;
  useGemini3_1?: boolean;
-  useGemini3_1FlashLite?: boolean;
  useCustomToolModel?: boolean;
 }> = ({
  models,
@@ -171,7 +164,6 @@ const ModelUsageTable: React.FC<{
  pooledLimit,
  pooledResetTime,
  useGemini3_1,
-  useGemini3_1FlashLite,
  useCustomToolModel,
 }) => {
  const { stdout } = useStdout();
@@ -181,7 +173,6 @@ const ModelUsageTable: React.FC<{
    config,
    quotas,
    useGemini3_1,
-    useGemini3_1FlashLite,
    useCustomToolModel,
  );

@@ -550,8 +541,6 @@ export const StatsDisplay: React.FC<StatsDisplayProps> = ({
  const settings = useSettings();
  const config = useConfig();
  const useGemini3_1 = config.getGemini31LaunchedSync?.() ?? false;
-  const useGemini3_1FlashLite =
-    config.getGemini31FlashLiteLaunchedSync?.() ?? false;
  const useCustomToolModel =
    useGemini3_1 &&
    config.getContentGeneratorConfig().authType === AuthType.USE_GEMINI;
@@ -708,7 +697,6 @@ export const StatsDisplay: React.FC<StatsDisplayProps> = ({
        pooledLimit={pooledLimit}
        pooledResetTime={pooledResetTime}
        useGemini3_1={useGemini3_1}
-        useGemini3_1FlashLite={useGemini3_1FlashLite}
        useCustomToolModel={useCustomToolModel}
      />
      {renderFooter()}
@@ -1,424 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import type React from 'react';
-import { useCallback, useRef, useState } from 'react';
-import { Box, Text, ResizeObserver, type DOMElement } from 'ink';
-import {
-  isUserVisibleHook,
-  type ThoughtSummary,
-} from '@google/gemini-cli-core';
-import stripAnsi from 'strip-ansi';
-import { type ActiveHook } from '../types.js';
-import { useUIState } from '../contexts/UIStateContext.js';
-import { useSettings } from '../contexts/SettingsContext.js';
-import { theme } from '../semantic-colors.js';
-import { GENERIC_WORKING_LABEL } from '../textConstants.js';
-import { INTERACTIVE_SHELL_WAITING_PHRASE } from '../hooks/usePhraseCycler.js';
-import { LoadingIndicator } from './LoadingIndicator.js';
-import { StatusDisplay } from './StatusDisplay.js';
-import { ContextUsageDisplay } from './ContextUsageDisplay.js';
-import { HorizontalLine } from './shared/HorizontalLine.js';
-import { ApprovalModeIndicator } from './ApprovalModeIndicator.js';
-import { ShellModeIndicator } from './ShellModeIndicator.js';
-import { RawMarkdownIndicator } from './RawMarkdownIndicator.js';
-import { useComposerStatus } from '../hooks/useComposerStatus.js';
-
-/**
- * Layout constants to prevent magic numbers.
- */
-const LAYOUT = {
-  STATUS_MIN_HEIGHT: 1,
-  TIP_LEFT_MARGIN: 2,
-  TIP_RIGHT_MARGIN_NARROW: 0,
-  TIP_RIGHT_MARGIN_WIDE: 1,
-  INDICATOR_LEFT_MARGIN: 1,
-  CONTEXT_DISPLAY_TOP_MARGIN_NARROW: 1,
-  CONTEXT_DISPLAY_LEFT_MARGIN_NARROW: 1,
-  CONTEXT_DISPLAY_LEFT_MARGIN_WIDE: 0,
-  COLLISION_GAP: 10,
-};
-
-interface StatusRowProps {
-  showUiDetails: boolean;
-  isNarrow: boolean;
-  terminalWidth: number;
-  hideContextSummary: boolean;
-  hideUiDetailsForSuggestions: boolean;
-  hasPendingActionRequired: boolean;
-}
-
-/**
- * Renders the loading or hook execution status.
- */
-export const StatusNode: React.FC<{
-  showTips: boolean;
-  showWit: boolean;
-  thought: ThoughtSummary | null;
-  elapsedTime: number;
-  currentWittyPhrase: string | undefined;
-  activeHooks: ActiveHook[];
-  showLoadingIndicator: boolean;
-  errorVerbosity: 'low' | 'full' | undefined;
-  onResize?: (width: number) => void;
-}> = ({
-  showTips,
-  showWit,
-  thought,
-  elapsedTime,
-  currentWittyPhrase,
-  activeHooks,
-  showLoadingIndicator,
-  errorVerbosity,
-  onResize,
-}) => {
-  const observerRef = useRef<ResizeObserver | null>(null);
-
-  const onRefChange = useCallback(
-    (node: DOMElement | null) => {
-      if (observerRef.current) {
-        observerRef.current.disconnect();
-        observerRef.current = null;
-      }
-
-      if (node && onResize) {
-        const observer = new ResizeObserver((entries) => {
-          const entry = entries[0];
-          if (entry) {
-            onResize(Math.round(entry.contentRect.width));
-          }
-        });
-        observer.observe(node);
-        observerRef.current = observer;
-      }
-    },
-    [onResize],
-  );
-
-  if (activeHooks.length === 0 && !showLoadingIndicator) return null;
-
-  let currentLoadingPhrase: string | undefined = undefined;
-  let currentThought: ThoughtSummary | null = null;
-
-  if (activeHooks.length > 0) {
-    const userVisibleHooks = activeHooks.filter((h) =>
-      isUserVisibleHook(h.source),
-    );
-
-    if (userVisibleHooks.length > 0) {
-      const label =
-        userVisibleHooks.length > 1 ? 'Executing Hooks' : 'Executing Hook';
-      const displayNames = userVisibleHooks.map((h) => {
-        let name = stripAnsi(h.name);
-        if (h.index && h.total && h.total > 1) {
-          name += ` (${h.index}/${h.total})`;
-        }
-        return name;
-      });
-      currentLoadingPhrase = `${label}: ${displayNames.join(', ')}`;
-    } else {
-      currentLoadingPhrase = GENERIC_WORKING_LABEL;
-    }
-  } else {
-    // Sanitize thought subject to prevent terminal injection
-    currentThought = thought
-      ? { ...thought, subject: stripAnsi(thought.subject) }
-      : null;
-  }
-
-  return (
-    <Box ref={onRefChange}>
-      <LoadingIndicator
-        inline
-        showTips={showTips}
-        showWit={showWit}
-        errorVerbosity={errorVerbosity}
-        thought={currentThought}
-        currentLoadingPhrase={currentLoadingPhrase}
-        elapsedTime={elapsedTime}
-        forceRealStatusOnly={false}
-        wittyPhrase={currentWittyPhrase}
-      />
-    </Box>
-  );
-};
-
-export const StatusRow: React.FC<StatusRowProps> = ({
-  showUiDetails,
-  isNarrow,
-  terminalWidth,
-  hideContextSummary,
-  hideUiDetailsForSuggestions,
-  hasPendingActionRequired,
-}) => {
-  const uiState = useUIState();
-  const settings = useSettings();
-  const {
-    isInteractiveShellWaiting,
-    showLoadingIndicator,
-    showTips,
-    showWit,
-    modeContentObj,
-    showMinimalContext,
-  } = useComposerStatus();
-
-  const [statusWidth, setStatusWidth] = useState(0);
-  const [tipWidth, setTipWidth] = useState(0);
-  const tipObserverRef = useRef<ResizeObserver | null>(null);
-
-  const onTipRefChange = useCallback((node: DOMElement | null) => {
-    if (tipObserverRef.current) {
-      tipObserverRef.current.disconnect();
-      tipObserverRef.current = null;
-    }
-
-    if (node) {
-      const observer = new ResizeObserver((entries) => {
-        const entry = entries[0];
-        if (entry) {
-          setTipWidth(Math.round(entry.contentRect.width));
-        }
-      });
-      observer.observe(node);
-      tipObserverRef.current = observer;
-    }
-  }, []);
-
-  const tipContentStr = (() => {
-    // 1. Proactive Tip (Priority)
-    if (
-      showTips &&
-      uiState.currentTip &&
-      !(
-        isInteractiveShellWaiting &&
-        uiState.currentTip === INTERACTIVE_SHELL_WAITING_PHRASE
-      )
-    ) {
-      return uiState.currentTip;
-    }
-
-    // 2. Shortcut Hint (Fallback)
-    if (
-      settings.merged.ui.showShortcutsHint &&
-      !hideUiDetailsForSuggestions &&
-      !hasPendingActionRequired &&
-      uiState.buffer.text.length === 0
-    ) {
-      return showUiDetails ? '? for shortcuts' : 'press tab twice for more';
-    }
-
-    return undefined;
-  })();
-
-  // Collision detection using measured widths
-  const willCollideTip =
-    statusWidth + tipWidth + LAYOUT.COLLISION_GAP > terminalWidth;
-
-  const showTipLine = Boolean(
-    !hasPendingActionRequired && tipContentStr && !willCollideTip && !isNarrow,
-  );
-
-  const showRow1Minimal =
-    showLoadingIndicator || uiState.activeHooks.length > 0 || showTipLine;
-  const showRow2Minimal =
-    (Boolean(modeContentObj) && !hideUiDetailsForSuggestions) ||
-    showMinimalContext;
-
-  const showRow1 = showUiDetails || showRow1Minimal;
-  const showRow2 = showUiDetails || showRow2Minimal;
-
-  const statusNode = (
-    <StatusNode
-      showTips={showTips}
-      showWit={showWit}
-      thought={uiState.thought}
-      elapsedTime={uiState.elapsedTime}
-      currentWittyPhrase={uiState.currentWittyPhrase}
-      activeHooks={uiState.activeHooks}
-      showLoadingIndicator={showLoadingIndicator}
-      errorVerbosity={
-        settings.merged.ui.errorVerbosity as 'low' | 'full' | undefined
-      }
-      onResize={setStatusWidth}
-    />
-  );
-
-  const renderTipNode = () => {
-    if (!tipContentStr) return null;
-
-    const isShortcutHint =
-      tipContentStr === '? for shortcuts' ||
-      tipContentStr === 'press tab twice for more';
-    const color =
-      isShortcutHint && uiState.shortcutsHelpVisible
-        ? theme.text.accent
-        : theme.text.secondary;
-
-    return (
-      <Box flexDirection="row" justifyContent="flex-end" ref={onTipRefChange}>
-        <Text
-          color={color}
-          wrap="truncate-end"
-          italic={
-            !isShortcutHint && tipContentStr === uiState.currentWittyPhrase
-          }
-        >
-          {tipContentStr === uiState.currentTip
-            ? `Tip: ${tipContentStr}`
-            : tipContentStr}
-        </Text>
-      </Box>
-    );
-  };
-
-  if (!showUiDetails && !showRow1Minimal && !showRow2Minimal) {
-    return <Box height={LAYOUT.STATUS_MIN_HEIGHT} />;
-  }
-
-  return (
-    <Box flexDirection="column" width="100%">
-      {/* Row 1: Status & Tips */}
-      {showRow1 && (
-        <Box
-          width="100%"
-          flexDirection="row"
-          alignItems="center"
-          justifyContent="space-between"
-          minHeight={LAYOUT.STATUS_MIN_HEIGHT}
-        >
-          <Box flexDirection="row" flexGrow={1} flexShrink={1}>
-            {!showUiDetails && showRow1Minimal ? (
-              <Box flexDirection="row" columnGap={1}>
-                {statusNode}
-                {!showUiDetails && showRow2Minimal && modeContentObj && (
-                  <Box>
-                    <Text color={modeContentObj.color}>
-                      ● {modeContentObj.text}
-                    </Text>
-                  </Box>
-                )}
-              </Box>
-            ) : isInteractiveShellWaiting ? (
-              <Box width="100%" marginLeft={LAYOUT.INDICATOR_LEFT_MARGIN}>
-                <Text color={theme.status.warning}>
-                  ! Shell awaiting input (Tab to focus)
-                </Text>
-              </Box>
-            ) : (
-              <Box
-                flexDirection="row"
-                alignItems={isNarrow ? 'flex-start' : 'center'}
-                flexGrow={1}
-                flexShrink={0}
-                marginLeft={LAYOUT.INDICATOR_LEFT_MARGIN}
-              >
-                {statusNode}
-              </Box>
-            )}
-          </Box>
-
-          <Box
-            flexShrink={0}
-            marginLeft={LAYOUT.TIP_LEFT_MARGIN}
-            marginRight={
-              isNarrow
-                ? LAYOUT.TIP_RIGHT_MARGIN_NARROW
-                : LAYOUT.TIP_RIGHT_MARGIN_WIDE
-            }
-          >
-            {/* 
-                We always render the tip node so it can be measured by ResizeObserver,
-                but we control its visibility based on the collision detection.
-            */}
-            <Box display={showTipLine ? 'flex' : 'none'}>
-              {!isNarrow && tipContentStr && renderTipNode()}
-            </Box>
-          </Box>
-        </Box>
-      )}
-
-      {/* Internal Separator */}
-      {showRow1 &&
-        showRow2 &&
-        (showUiDetails || (showRow1Minimal && showRow2Minimal)) && (
-          <Box width="100%">
-            <HorizontalLine dim />
-          </Box>
-        )}
-
-      {/* Row 2: Modes & Context */}
-      {showRow2 && (
-        <Box
-          width="100%"
-          flexDirection={isNarrow ? 'column' : 'row'}
-          alignItems={isNarrow ? 'flex-start' : 'center'}
-          justifyContent="space-between"
-        >
-          <Box
-            flexDirection="row"
-            alignItems="center"
-            marginLeft={LAYOUT.INDICATOR_LEFT_MARGIN}
-          >
-            {showUiDetails ? (
-              <>
-                {!hideUiDetailsForSuggestions && !uiState.shellModeActive && (
-                  <ApprovalModeIndicator
-                    approvalMode={uiState.showApprovalModeIndicator}
-                    allowPlanMode={uiState.allowPlanMode}
-                  />
-                )}
-                {uiState.shellModeActive && (
-                  <Box marginLeft={LAYOUT.INDICATOR_LEFT_MARGIN}>
-                    <ShellModeIndicator />
-                  </Box>
-                )}
-                {!uiState.renderMarkdown && (
-                  <Box marginLeft={LAYOUT.INDICATOR_LEFT_MARGIN}>
-                    <RawMarkdownIndicator />
-                  </Box>
-                )}
-              </>
-            ) : (
-              showRow2Minimal &&
-              modeContentObj && (
-                <Text color={modeContentObj.color}>
-                  ● {modeContentObj.text}
-                </Text>
-              )
-            )}
-          </Box>
-          <Box
-            marginTop={isNarrow ? LAYOUT.CONTEXT_DISPLAY_TOP_MARGIN_NARROW : 0}
-            flexDirection="row"
-            alignItems="center"
-            marginLeft={
-              isNarrow
-                ? LAYOUT.CONTEXT_DISPLAY_LEFT_MARGIN_NARROW
-                : LAYOUT.CONTEXT_DISPLAY_LEFT_MARGIN_WIDE
-            }
-          >
-            {(showUiDetails || showMinimalContext) && (
-              <StatusDisplay hideContextSummary={hideContextSummary} />
-            )}
-            {showMinimalContext && !showUiDetails && (
-              <Box marginLeft={LAYOUT.INDICATOR_LEFT_MARGIN}>
-                <ContextUsageDisplay
-                  promptTokenCount={uiState.sessionStats.lastPromptTokenCount}
-                  model={
-                    typeof uiState.currentModel === 'string'
-                      ? uiState.currentModel
-                      : undefined
-                  }
-                  terminalWidth={terminalWidth}
-                />
-              </Box>
-            )}
-          </Box>
-        </Box>
-      )}
-    </Box>
-  );
-};
@@ -67,6 +67,7 @@ export const StickyHeader: React.FC<StickyHeaderProps> = ({
      borderLeft={true}
      borderRight={true}
      paddingX={1}
+      paddingBottom={1}
      paddingTop={isFirst ? 0 : 1}
    >
      {children}
@@ -66,9 +66,9 @@ export const ToolConfirmationQueue: React.FC<ToolConfirmationQueueProps> = ({

  // ToolConfirmationMessage needs to know the height available for its OWN content.
  // We subtract the lines used by the Queue wrapper:
-  // - 2 lines for the rounded border (top/bottom)
+  // - 2 lines for the rounded border
  // - 2 lines for the Header (text + margin)
-  // - 2 lines for Tool Identity (text + margin) if shown
+  // - 2 lines for Tool Identity (text + margin)
  const availableContentHeight = constrainHeight
    ? Math.max(maxHeight - (hideToolIdentity ? 4 : 6), 4)
    : undefined;
@@ -83,7 +83,10 @@ export const ToolConfirmationQueue: React.FC<ToolConfirmationQueueProps> = ({
      >
        <Box flexDirection="column" width={mainAreaWidth - 4}>
          {/* Header */}
-          <Box marginBottom={1} justifyContent="space-between">
+          <Box
+            marginBottom={hideToolIdentity ? 0 : 1}
+            justifyContent="space-between"
+          >
            <Text color={borderColor} bold>
              {getConfirmationHeader(tool.confirmationDetails)}
            </Text>
@@ -95,7 +98,7 @@ export const ToolConfirmationQueue: React.FC<ToolConfirmationQueueProps> = ({
          </Box>

          {!hideToolIdentity && (
-            <Box marginBottom={1}>
+            <Box>
              <ToolStatusIndicator status={tool.status} name={tool.name} />
              <ToolInfo
                name={tool.name}
@@ -43,12 +43,10 @@ Tips for getting started:
 │ ✓  tool1 Description for tool 1                                          │
 │                                                                          │
 ╰──────────────────────────────────────────────────────────────────────────╯
-
 ╭──────────────────────────────────────────────────────────────────────────╮
 │ ✓  tool2 Description for tool 2                                          │
 │                                                                          │
 ╰──────────────────────────────────────────────────────────────────────────╯
-
 ╭──────────────────────────────────────────────────────────────────────────╮
 │ o  tool3 Description for tool 3                                          │
 │                                                                          │
@@ -95,7 +93,6 @@ Tips for getting started:
 │ ✓  tool1 Description for tool 1                                          │
 │                                                                          │
 ╰──────────────────────────────────────────────────────────────────────────╯
-
 ╭──────────────────────────────────────────────────────────────────────────╮
 │ ✓  tool2 Description for tool 2                                          │
 │                                                                          │
@@ -6,11 +6,12 @@ AppHeader(full)
 ╭──────────────────────────────────────────────────────────────────────────────────────────────╮
 │ ⊶  Shell Command Running a long command...                                                   │
 │                                                                                              │
+│ Line 10                                                                                      │
 │ Line 11                                                                                      │
 │ Line 12                                                                                      │
 │ Line 13                                                                                      │
 │ Line 14                                                                                      │
-│ Line 15                                                                                      │
+│ Line 15                                                                                    █ │
 │ Line 16                                                                                    █ │
 │ Line 17                                                                                    █ │
 │ Line 18                                                                                    █ │
@@ -26,11 +27,12 @@ AppHeader(full)
 ╭──────────────────────────────────────────────────────────────────────────────────────────────╮
 │ ⊶  Shell Command Running a long command...                                                   │
 │                                                                                              │
+│ Line 10                                                                                      │
 │ Line 11                                                                                      │
 │ Line 12                                                                                      │
 │ Line 13                                                                                      │
 │ Line 14                                                                                      │
-│ Line 15                                                                                      │
+│ Line 15                                                                                    █ │
 │ Line 16                                                                                    █ │
 │ Line 17                                                                                    █ │
 │ Line 18                                                                                    █ │
@@ -45,7 +47,8 @@ exports[`MainContent > MainContent Tool Output Height Logic > 'Normal mode - Con
 ╭──────────────────────────────────────────────────────────────────────────────────────────────╮
 │ ⊶  Shell Command Running a long command...                                                   │
 │                                                                                              │
-│ ... first 11 lines hidden (Ctrl+O to show) ...                                               │
+│ ... first 10 lines hidden (Ctrl+O to show) ...                                               │
+│ Line 11                                                                                      │
 │ Line 12                                                                                      │
 │ Line 13                                                                                      │
 │ Line 14                                                                                      │
@@ -88,19 +91,6 @@ exports[`MainContent > MainContent Tool Output Height Logic > 'Normal mode - Unc
 "
 `;

-exports[`MainContent > renders a ToolConfirmationQueue without an extra line when preceded by hidden tools 1`] = `
-"AppHeader(full)
-▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
- > Apply plan                                                                   
-▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
-╭──────────────────────────────────────────────────────────────────────────────╮
-│ Ready to start implementation?                                               │
-│                                                                              │
-│  Error reading plan: Storage must be initialized before use                  │
-╰──────────────────────────────────────────────────────────────────────────────╯
-"
-`;
-
 exports[`MainContent > renders a split tool group without a gap between static and pending areas 1`] = `
 "AppHeader(full)
 ╭──────────────────────────────────────────────────────────────────────────╮
@@ -115,30 +105,6 @@ exports[`MainContent > renders a split tool group without a gap between static a
 "
 `;

-exports[`MainContent > renders a spurious line when a tool group has only hidden tools and borderBottom true 1`] = `
-"AppHeader(full)
-▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
- > Apply plan                                                                   
-▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
-"
-`;
-
-exports[`MainContent > renders a subagent with a complete box including bottom border 1`] = `
-"AppHeader(full)
-▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
- > Investigate                                                                  
-▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
-╭──────────────────────────────────────────────────────────────────────────╮
-│ ≡ Running Agent... (ctrl+o to collapse)                                  │
-│                                                                          │
-│ Running subagent codebase_investigator...                                │
-│                                                                          │
-│ ⠋  run_shell_command echo hello                                          │
-│                                                                          │
-╰──────────────────────────────────────────────────────────────────────────╯
-"
-`;
-
 exports[`MainContent > renders mixed history items (user + gemini) with single line padding between them 1`] = `
 "ScrollableList
 AppHeader(full)
@@ -1,577 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect } from 'vitest';
-import { renderWithProviders } from '../../../test-utils/render.js';
-import { DenseToolMessage } from './DenseToolMessage.js';
-import {
-  CoreToolCallStatus,
-  type DiffStat,
-  type FileDiff,
-  type GrepResult,
-  type ListDirectoryResult,
-  type ReadManyFilesResult,
-  makeFakeConfig,
-} from '@google/gemini-cli-core';
-import type {
-  SerializableConfirmationDetails,
-  ToolResultDisplay,
-} from '../../types.js';
-
-import { createMockSettings } from '../../../test-utils/settings.js';
-
-describe('DenseToolMessage', () => {
-  const defaultProps = {
-    callId: 'call-1',
-    name: 'test-tool',
-    description: 'Test description',
-    status: CoreToolCallStatus.Success,
-    resultDisplay: 'Success result' as ToolResultDisplay,
-    confirmationDetails: undefined,
-    terminalWidth: 80,
-  };
-
-  it('renders correctly for a successful string result', async () => {
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage {...defaultProps} />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('test-tool');
-    expect(output).toContain('Test description');
-    expect(output).toContain('→ Success result');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('truncates long string results', async () => {
-    const longResult = 'A'.repeat(200);
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        resultDisplay={longResult as ToolResultDisplay}
-      />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('…');
-    expect(lastFrame()).toMatchSnapshot();
-  });
-
-  it('flattens newlines in string results', async () => {
-    const multilineResult = 'Line 1\nLine 2';
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        resultDisplay={multilineResult as ToolResultDisplay}
-      />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('→ Line 1 Line 2');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('renders correctly for file diff results with stats', async () => {
-    const diffResult: FileDiff = {
-      fileDiff: '@@ -1,1 +1,1 @@\n-old line\n+diff content',
-      fileName: 'test.ts',
-      filePath: '/path/to/test.ts',
-      originalContent: 'old content',
-      newContent: 'new content',
-      diffStat: {
-        user_added_lines: 5,
-        user_removed_lines: 2,
-        user_added_chars: 50,
-        user_removed_chars: 20,
-        model_added_lines: 10,
-        model_removed_lines: 4,
-        model_added_chars: 100,
-        model_removed_chars: 40,
-      },
-    };
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        resultDisplay={diffResult as ToolResultDisplay}
-      />,
-      {},
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('test.ts → Accepted (+15, -6)');
-    expect(output).toContain('diff content');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('renders correctly for Edit tool using confirmationDetails', async () => {
-    const confirmationDetails = {
-      type: 'edit' as const,
-      title: 'Confirm Edit',
-      fileName: 'styles.scss',
-      filePath: '/path/to/styles.scss',
-      fileDiff:
-        '@@ -1,1 +1,1 @@\n-body { color: blue; }\n+body { color: red; }',
-      originalContent: 'body { color: blue; }',
-      newContent: 'body { color: red; }',
-    };
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        name="Edit"
-        status={CoreToolCallStatus.AwaitingApproval}
-        resultDisplay={undefined}
-        confirmationDetails={
-          confirmationDetails as SerializableConfirmationDetails
-        }
-      />,
-      {},
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('Edit');
-    expect(output).toContain('styles.scss');
-    expect(output).toContain('→ Confirming');
-    expect(output).toContain('body { color: red; }');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('renders correctly for Rejected Edit tool', async () => {
-    const diffResult: FileDiff = {
-      fileDiff: '@@ -1,1 +1,1 @@\n-old line\n+new line',
-      fileName: 'styles.scss',
-      filePath: '/path/to/styles.scss',
-      originalContent: 'old line',
-      newContent: 'new line',
-      diffStat: {
-        user_added_lines: 1,
-        user_removed_lines: 1,
-        user_added_chars: 0,
-        user_removed_chars: 0,
-        model_added_lines: 0,
-        model_removed_lines: 0,
-        model_added_chars: 0,
-        model_removed_chars: 0,
-      },
-    };
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        name="Edit"
-        status={CoreToolCallStatus.Cancelled}
-        resultDisplay={diffResult as ToolResultDisplay}
-      />,
-      {},
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('Edit');
-    expect(output).toContain('styles.scss → Rejected (+1, -1)');
-    expect(output).toContain('- old line');
-    expect(output).toContain('+ new line');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('renders correctly for Rejected Edit tool with confirmationDetails and diffStat', async () => {
-    const confirmationDetails = {
-      type: 'edit' as const,
-      title: 'Confirm Edit',
-      fileName: 'styles.scss',
-      filePath: '/path/to/styles.scss',
-      fileDiff:
-        '@@ -1,1 +1,1 @@\n-body { color: blue; }\n+body { color: red; }',
-      originalContent: 'body { color: blue; }',
-      newContent: 'body { color: red; }',
-      diffStat: {
-        user_added_lines: 1,
-        user_removed_lines: 1,
-        user_added_chars: 0,
-        user_removed_chars: 0,
-        model_added_lines: 0,
-        model_removed_lines: 0,
-        model_added_chars: 0,
-        model_removed_chars: 0,
-      } as DiffStat,
-    };
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        name="Edit"
-        status={CoreToolCallStatus.Cancelled}
-        resultDisplay={undefined}
-        confirmationDetails={
-          confirmationDetails as unknown as SerializableConfirmationDetails
-        }
-      />,
-      {},
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('Edit');
-    expect(output).toContain('styles.scss → Rejected (+1, -1)');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('renders correctly for WriteFile tool', async () => {
-    const diffResult: FileDiff = {
-      fileDiff: '@@ -1,1 +1,1 @@\n-old content\n+new content',
-      fileName: 'config.json',
-      filePath: '/path/to/config.json',
-      originalContent: 'old content',
-      newContent: 'new content',
-      diffStat: {
-        user_added_lines: 1,
-        user_removed_lines: 1,
-        user_added_chars: 0,
-        user_removed_chars: 0,
-        model_added_lines: 0,
-        model_removed_lines: 0,
-        model_added_chars: 0,
-        model_removed_chars: 0,
-      },
-    };
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        name="WriteFile"
-        status={CoreToolCallStatus.Success}
-        resultDisplay={diffResult as ToolResultDisplay}
-      />,
-      {},
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('WriteFile');
-    expect(output).toContain('config.json → Accepted (+1, -1)');
-    expect(output).toContain('+ new content');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('renders correctly for Rejected WriteFile tool', async () => {
-    const diffResult: FileDiff = {
-      fileDiff: '@@ -1,1 +1,1 @@\n-old content\n+new content',
-      fileName: 'config.json',
-      filePath: '/path/to/config.json',
-      originalContent: 'old content',
-      newContent: 'new content',
-    };
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        name="WriteFile"
-        status={CoreToolCallStatus.Cancelled}
-        resultDisplay={diffResult as ToolResultDisplay}
-      />,
-      {},
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('WriteFile');
-    expect(output).toContain('config.json');
-    expect(output).toContain('→ Rejected');
-    expect(output).toContain('- old content');
-    expect(output).toContain('+ new content');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('renders correctly for Errored Edit tool', async () => {
-    const diffResult: FileDiff = {
-      fileDiff: '@@ -1,1 +1,1 @@\n-old line\n+new line',
-      fileName: 'styles.scss',
-      filePath: '/path/to/styles.scss',
-      originalContent: 'old line',
-      newContent: 'new line',
-      diffStat: {
-        user_added_lines: 1,
-        user_removed_lines: 1,
-        user_added_chars: 0,
-        user_removed_chars: 0,
-        model_added_lines: 0,
-        model_removed_lines: 0,
-        model_added_chars: 0,
-        model_removed_chars: 0,
-      },
-    };
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        name="Edit"
-        status={CoreToolCallStatus.Error}
-        resultDisplay={diffResult as ToolResultDisplay}
-      />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('Edit');
-    expect(output).toContain('styles.scss → Failed (+1, -1)');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('renders correctly for grep results', async () => {
-    const grepResult: GrepResult = {
-      summary: 'Found 2 matches',
-      matches: [
-        {
-          filePath: 'file1.ts',
-          absolutePath: '/file1.ts',
-          lineNumber: 10,
-          line: 'match 1',
-        },
-        {
-          filePath: 'file2.ts',
-          absolutePath: '/file2.ts',
-          lineNumber: 20,
-          line: 'match 2',
-        },
-      ],
-    };
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        resultDisplay={grepResult as unknown as ToolResultDisplay}
-      />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('→ Found 2 matches');
-    // Matches are rendered in a secondary list for high-signal summaries
-    expect(output).toContain('file1.ts:10: match 1');
-    expect(output).toContain('file2.ts:20: match 2');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('renders correctly for ls results', async () => {
-    const lsResult: ListDirectoryResult = {
-      summary: 'Listed 2 files. (1 ignored)',
-      files: ['file1.ts', 'dir1'],
-    };
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        resultDisplay={lsResult as unknown as ToolResultDisplay}
-      />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('→ Listed 2 files. (1 ignored)');
-    // Directory listings should not have a payload in dense mode
-    expect(output).not.toContain('file1.ts');
-    expect(output).not.toContain('dir1');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('renders correctly for ReadManyFiles results', async () => {
-    const rmfResult: ReadManyFilesResult = {
-      summary: 'Read 3 file(s)',
-      files: ['file1.ts', 'file2.ts', 'file3.ts'],
-      include: ['**/*.ts'],
-      skipped: [{ path: 'skipped.bin', reason: 'binary' }],
-    };
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        resultDisplay={rmfResult as unknown as ToolResultDisplay}
-      />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('Attempting to read files from **/*.ts');
-    expect(output).toContain('→ Read 3 file(s) (1 ignored)');
-    expect(output).toContain('file1.ts');
-    expect(output).toContain('file2.ts');
-    expect(output).toContain('file3.ts');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('renders correctly for todo updates', async () => {
-    const todoResult = {
-      todos: [],
-    };
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        resultDisplay={todoResult as ToolResultDisplay}
-      />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('→ Todos updated');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('renders generic output message for unknown object results', async () => {
-    const genericResult = {
-      some: 'data',
-    } as unknown as ToolResultDisplay;
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage {...defaultProps} resultDisplay={genericResult} />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('→ Returned (possible empty result)');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('renders correctly for error status with string message', async () => {
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        status={CoreToolCallStatus.Error}
-        resultDisplay={'Error occurred' as ToolResultDisplay}
-      />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('→ Error occurred');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('renders generic failure message for error status without string message', async () => {
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        status={CoreToolCallStatus.Error}
-        resultDisplay={undefined}
-      />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toContain('→ Failed');
-    expect(output).toMatchSnapshot();
-  });
-
-  it('does not render result arrow if resultDisplay is missing', async () => {
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <DenseToolMessage
-        {...defaultProps}
-        status={CoreToolCallStatus.Scheduled}
-        resultDisplay={undefined}
-      />,
-    );
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).not.toContain('→');
-    expect(output).toMatchSnapshot();
-  });
-
-  describe('Toggleable Diff View (Alternate Buffer)', () => {
-    const diffResult: FileDiff = {
-      fileDiff: '@@ -1,1 +1,1 @@\n-old line\n+new line',
-      fileName: 'test.ts',
-      filePath: '/path/to/test.ts',
-      originalContent: 'old content',
-      newContent: 'new content',
-    };
-
-    it('hides diff content by default when in alternate buffer mode', async () => {
-      const { lastFrame, waitUntilReady } = await renderWithProviders(
-        <DenseToolMessage
-          {...defaultProps}
-          resultDisplay={diffResult as ToolResultDisplay}
-          status={CoreToolCallStatus.Success}
-        />,
-        {
-          config: makeFakeConfig({ useAlternateBuffer: true }),
-          settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
-        },
-      );
-      await waitUntilReady();
-      const output = lastFrame();
-      expect(output).toContain('Accepted');
-      expect(output).not.toContain('new line');
-      expect(output).toMatchSnapshot();
-    });
-
-    it('shows diff content by default when NOT in alternate buffer mode', async () => {
-      const { lastFrame, waitUntilReady } = await renderWithProviders(
-        <DenseToolMessage
-          {...defaultProps}
-          resultDisplay={diffResult as ToolResultDisplay}
-          status={CoreToolCallStatus.Success}
-        />,
-        {
-          config: makeFakeConfig({ useAlternateBuffer: false }),
-          settings: createMockSettings({ ui: { useAlternateBuffer: false } }),
-        },
-      );
-      await waitUntilReady();
-      const output = lastFrame();
-      expect(output).toContain('Accepted');
-      expect(output).toContain('new line');
-      expect(output).toMatchSnapshot();
-    });
-
-    it('shows diff content when expanded via ToolActionsContext', async () => {
-      const { lastFrame, waitUntilReady } = await renderWithProviders(
-        <DenseToolMessage
-          {...defaultProps}
-          resultDisplay={diffResult as ToolResultDisplay}
-          status={CoreToolCallStatus.Success}
-        />,
-        {
-          config: makeFakeConfig({ useAlternateBuffer: true }),
-          settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
-          toolActions: {
-            isExpanded: () => true,
-          },
-        },
-      );
-      await waitUntilReady();
-
-      // Verify it shows the diff when expanded
-      expect(lastFrame()).toContain('new line');
-    });
-  });
-
-  describe('Visual Regression', () => {
-    it('matches SVG snapshot for an Accepted file edit with diff stats', async () => {
-      const diffResult: FileDiff = {
-        fileName: 'test.ts',
-        filePath: '/mock/test.ts',
-        fileDiff: '--- a/test.ts\n+++ b/test.ts\n@@ -1 +1 @@\n-old\n+new',
-        originalContent: 'old',
-        newContent: 'new',
-        diffStat: {
-          model_added_lines: 1,
-          model_removed_lines: 1,
-          model_added_chars: 3,
-          model_removed_chars: 3,
-          user_added_lines: 0,
-          user_removed_lines: 0,
-          user_added_chars: 0,
-          user_removed_chars: 0,
-        },
-      };
-
-      const renderResult = await renderWithProviders(
-        <DenseToolMessage
-          {...defaultProps}
-          name="edit"
-          description="Editing test.ts"
-          resultDisplay={diffResult as ToolResultDisplay}
-          status={CoreToolCallStatus.Success}
-        />,
-      );
-
-      await renderResult.waitUntilReady();
-      await expect(renderResult).toMatchSvgSnapshot();
-    });
-
-    it('matches SVG snapshot for a Rejected tool call', async () => {
-      const renderResult = await renderWithProviders(
-        <DenseToolMessage
-          {...defaultProps}
-          name="read_file"
-          description="Reading important.txt"
-          resultDisplay="Rejected by user"
-          status={CoreToolCallStatus.Cancelled}
-        />,
-      );
-
-      await renderResult.waitUntilReady();
-      await expect(renderResult).toMatchSvgSnapshot();
-    });
-  });
-});
@@ -1,624 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import type React from 'react';
-import { useMemo, useState, useRef } from 'react';
-import { Box, Text, type DOMElement } from 'ink';
-import {
-  CoreToolCallStatus,
-  type FileDiff,
-  type ListDirectoryResult,
-  type ReadManyFilesResult,
-  isFileDiff,
-  hasSummary,
-  isGrepResult,
-  isListResult,
-  isReadManyFilesResult,
-  UPDATE_TOPIC_DISPLAY_NAME,
-  UPDATE_TOPIC_TOOL_NAME,
-  TOPIC_PARAM_TITLE,
-  TOPIC_PARAM_STRATEGIC_INTENT,
-} from '@google/gemini-cli-core';
-import { type IndividualToolCallDisplay, isTodoList } from '../../types.js';
-import { useAlternateBuffer } from '../../hooks/useAlternateBuffer.js';
-import { ToolStatusIndicator } from './ToolShared.js';
-import { theme } from '../../semantic-colors.js';
-import {
-  DiffRenderer,
-  renderDiffLines,
-  isNewFile,
-  parseDiffWithLineNumbers,
-} from './DiffRenderer.js';
-import { useMouseClick } from '../../hooks/useMouseClick.js';
-import { ScrollableList } from '../shared/ScrollableList.js';
-import { COMPACT_TOOL_SUBVIEW_MAX_LINES } from '../../constants.js';
-import { useSettings } from '../../contexts/SettingsContext.js';
-import { colorizeCode } from '../../utils/CodeColorizer.js';
-import { useToolActions } from '../../contexts/ToolActionsContext.js';
-import { getFileExtension } from '../../utils/fileUtils.js';
-
-const PAYLOAD_MARGIN_LEFT = 6;
-const PAYLOAD_BORDER_CHROME_WIDTH = 4; // paddingX=1 (2 cols) + borders (2 cols)
-const PAYLOAD_SCROLL_GUTTER = 4;
-const PAYLOAD_MAX_WIDTH = 120 + PAYLOAD_SCROLL_GUTTER;
-
-interface DenseToolMessageProps extends IndividualToolCallDisplay {
-  terminalWidth: number;
-  availableTerminalHeight?: number;
-}
-
-interface ViewParts {
-  // brief description of action
-  description?: React.ReactNode;
-  // result summary or status text
-  summary?: React.ReactNode;
-  // detailed output, e.g. diff or command output
-  payload?: React.ReactNode;
-}
-
-interface PayloadResult {
-  summary: string;
-  payload: string;
-}
-
-const hasPayload = (res: unknown): res is PayloadResult => {
-  if (!hasSummary(res)) return false;
-  if (!('payload' in res)) return false;
-
-  const value = (res as { payload?: unknown }).payload;
-  return typeof value === 'string';
-};
-
-const RenderItemsList: React.FC<{
-  items?: string[];
-  maxVisible?: number;
-}> = ({ items, maxVisible = 20 }) => {
-  if (!items || items.length === 0) return null;
-  return (
-    <Box flexDirection="column">
-      {items.slice(0, maxVisible).map((item, i) => (
-        <Text key={i} color={theme.text.secondary}>
-          {item}
-        </Text>
-      ))}
-      {items.length > maxVisible && (
-        <Text color={theme.text.secondary}>
-          ... and {items.length - maxVisible} more
-        </Text>
-      )}
-    </Box>
-  );
-};
-
-function getFileOpData(
-  diff: FileDiff,
-  status: CoreToolCallStatus,
-  resultDisplay: unknown,
-  terminalWidth: number,
-  availableTerminalHeight?: number,
-  isClickable?: boolean,
-): ViewParts {
-  const added =
-    (diff.diffStat?.model_added_lines ?? 0) +
-    (diff.diffStat?.user_added_lines ?? 0);
-  const removed =
-    (diff.diffStat?.model_removed_lines ?? 0) +
-    (diff.diffStat?.user_removed_lines ?? 0);
-
-  const isAcceptedOrConfirming =
-    status === CoreToolCallStatus.Success ||
-    status === CoreToolCallStatus.Executing ||
-    status === CoreToolCallStatus.AwaitingApproval;
-
-  const addColor = isAcceptedOrConfirming
-    ? theme.status.success
-    : theme.text.secondary;
-  const removeColor = isAcceptedOrConfirming
-    ? theme.status.error
-    : theme.text.secondary;
-
-  // Always show diff stats if available, using neutral colors for rejected
-  const showDiffStat = !!diff.diffStat;
-
-  const description = (
-    <Box flexDirection="row">
-      <Text color={theme.text.secondary} wrap="truncate-end">
-        {diff.fileName}
-      </Text>
-    </Box>
-  );
-  let resultSummary = '';
-  let resultColor = theme.text.secondary;
-
-  if (status === CoreToolCallStatus.AwaitingApproval) {
-    resultSummary = 'Confirming';
-  } else if (
-    status === CoreToolCallStatus.Success ||
-    status === CoreToolCallStatus.Executing
-  ) {
-    resultSummary = 'Accepted';
-    resultColor = theme.text.accent;
-  } else if (status === CoreToolCallStatus.Cancelled) {
-    resultSummary = 'Rejected';
-    resultColor = theme.status.error;
-  } else if (status === CoreToolCallStatus.Error) {
-    resultSummary =
-      typeof resultDisplay === 'string' ? resultDisplay : 'Failed';
-    resultColor = theme.status.error;
-  }
-
-  const summary = (
-    <Box flexDirection="row">
-      {resultSummary && (
-        <Text color={resultColor} wrap="truncate-end">
-          →{' '}
-          <Text underline={isClickable}>
-            {resultSummary.replace(/\n/g, ' ')}
-          </Text>
-        </Text>
-      )}
-      {showDiffStat && (
-        <Box marginLeft={1} marginRight={2}>
-          <Text color={theme.text.secondary}>
-            {'('}
-            <Text color={addColor}>+{added}</Text>
-            {', '}
-            <Text color={removeColor}>-{removed}</Text>
-            {')'}
-          </Text>
-        </Box>
-      )}
-    </Box>
-  );
-
-  const payload = (
-    <DiffRenderer
-      diffContent={diff.fileDiff}
-      filename={diff.fileName}
-      terminalWidth={terminalWidth - PAYLOAD_MARGIN_LEFT}
-      availableTerminalHeight={availableTerminalHeight}
-      disableColor={status === CoreToolCallStatus.Cancelled}
-    />
-  );
-
-  return { description, summary, payload };
-}
-
-function getReadManyFilesData(result: ReadManyFilesResult): ViewParts {
-  const items = result.files ?? [];
-  const maxVisible = 10;
-  const includePatterns = result.include?.join(', ') ?? '';
-  const description = (
-    <Text color={theme.text.secondary} wrap="truncate-end">
-      Attempting to read files from {includePatterns}
-    </Text>
-  );
-
-  const skippedCount = result.skipped?.length ?? 0;
-  const summaryStr = `Read ${items.length} file(s)${
-    skippedCount > 0 ? ` (${skippedCount} ignored)` : ''
-  }`;
-  const summary = <Text color={theme.text.accent}>→ {summaryStr}</Text>;
-
-  const excludedText =
-    result.excludes && result.excludes.length > 0
-      ? `Excluded patterns: ${result.excludes.slice(0, 3).join(', ')}${
-          result.excludes.length > 3 ? '...' : ''
-        }`
-      : undefined;
-
-  const hasItems = items.length > 0;
-  const payload =
-    hasItems || excludedText ? (
-      <Box flexDirection="column" marginLeft={2}>
-        {hasItems && <RenderItemsList items={items} maxVisible={maxVisible} />}
-        {excludedText && (
-          <Text color={theme.text.secondary} dimColor>
-            {excludedText}
-          </Text>
-        )}
-      </Box>
-    ) : undefined;
-
-  return { description, summary, payload };
-}
-
-function getListDirectoryData(
-  result: ListDirectoryResult,
-  originalDescription?: string,
-): ViewParts {
-  const description = originalDescription ? (
-    <Text color={theme.text.secondary} wrap="truncate-end">
-      {originalDescription}
-    </Text>
-  ) : undefined;
-  const summary = <Text color={theme.text.accent}>→ {result.summary}</Text>;
-
-  // For directory listings, we want NO payload in dense mode
-  return { description, summary, payload: undefined };
-}
-
-function getListResultData(
-  result: ListDirectoryResult | ReadManyFilesResult,
-  originalDescription?: string,
-): ViewParts {
-  if (isReadManyFilesResult(result)) {
-    return getReadManyFilesData(result);
-  }
-  return getListDirectoryData(result, originalDescription);
-}
-
-function getGenericSuccessData(
-  resultDisplay: unknown,
-  originalDescription?: string,
-): ViewParts {
-  let summary: React.ReactNode;
-  let payload: React.ReactNode;
-
-  const description = originalDescription ? (
-    <Text color={theme.text.secondary} wrap="truncate-end">
-      {originalDescription}
-    </Text>
-  ) : undefined;
-
-  if (typeof resultDisplay === 'string') {
-    const flattened = resultDisplay.replace(/\n/g, ' ').trim();
-    summary = (
-      <Text color={theme.text.accent} wrap="truncate-end">
-        → {flattened}
-      </Text>
-    );
-  } else if (isGrepResult(resultDisplay)) {
-    summary = <Text color={theme.text.accent}>→ {resultDisplay.summary}</Text>;
-    const matches = resultDisplay.matches;
-    if (matches.length > 0) {
-      payload = (
-        <Box flexDirection="column" marginLeft={2}>
-          <RenderItemsList
-            items={matches.map(
-              (m) => `${m.filePath}:${m.lineNumber}: ${m.line.trim()}`,
-            )}
-            maxVisible={10}
-          />
-        </Box>
-      );
-    }
-  } else if (isTodoList(resultDisplay)) {
-    summary = (
-      <Text color={theme.text.accent} wrap="wrap">
-        → Todos updated
-      </Text>
-    );
-  } else if (hasPayload(resultDisplay)) {
-    summary = <Text color={theme.text.accent}>→ {resultDisplay.summary}</Text>;
-    payload = (
-      <Box marginLeft={2}>
-        <Text color={theme.text.secondary}>{resultDisplay.payload}</Text>
-      </Box>
-    );
-  } else {
-    summary = (
-      <Text color={theme.text.accent} wrap="wrap">
-        → Returned (possible empty result)
-      </Text>
-    );
-  }
-
-  return { description, summary, payload };
-}
-
-function getUpdateTopicData(args?: Record<string, unknown>): ViewParts {
-  const rawTitle = args?.[TOPIC_PARAM_TITLE];
-  const title = typeof rawTitle === 'string' ? rawTitle : undefined;
-  const rawIntent = args?.[TOPIC_PARAM_STRATEGIC_INTENT];
-  const intent = typeof rawIntent === 'string' ? rawIntent : undefined;
-
-  const description = (
-    <Text color={theme.text.primary} bold wrap="truncate-end">
-      {title || 'Topic'}
-    </Text>
-  );
-
-  const summary = intent ? (
-    <Text color={theme.text.secondary} wrap="truncate-end">
-      {' '}
-      -- {intent}
-    </Text>
-  ) : undefined;
-
-  return { description, summary };
-}
-
-export const DenseToolMessage: React.FC<DenseToolMessageProps> = (props) => {
-  const {
-    callId,
-    name,
-    args,
-    status,
-    resultDisplay,
-    confirmationDetails,
-    outputFile,
-    terminalWidth,
-    availableTerminalHeight,
-    description: originalDescription,
-  } = props;
-
-  const settings = useSettings();
-  const isAlternateBuffer = useAlternateBuffer();
-  const { isExpanded: isExpandedInContext, toggleExpansion } = useToolActions();
-
-  // ... (rest of component)
-
-  // Handle optional context members
-  const [localIsExpanded, setLocalIsExpanded] = useState(false);
-  const isExpanded = isExpandedInContext
-    ? isExpandedInContext(callId)
-    : localIsExpanded;
-
-  const [isFocused, setIsFocused] = useState(false);
-  const toggleRef = useRef<DOMElement>(null);
-
-  // Unified File Data Extraction (Safely bridge resultDisplay and confirmationDetails)
-  const diff = useMemo((): FileDiff | undefined => {
-    if (isFileDiff(resultDisplay)) return resultDisplay;
-    if (confirmationDetails?.type === 'edit') {
-      const details = confirmationDetails;
-      return {
-        fileName: details.fileName,
-        fileDiff: details.fileDiff,
-        filePath: details.filePath,
-        originalContent: details.originalContent,
-        newContent: details.newContent,
-        diffStat: details.diffStat,
-      };
-    }
-    return undefined;
-  }, [resultDisplay, confirmationDetails]);
-
-  const handleToggle = () => {
-    const next = !isExpanded;
-    if (!next) {
-      setIsFocused(false);
-    } else {
-      setIsFocused(true);
-    }
-
-    if (toggleExpansion) {
-      toggleExpansion(callId);
-    } else {
-      setLocalIsExpanded(next);
-    }
-  };
-
-  useMouseClick(toggleRef, handleToggle, {
-    isActive: isAlternateBuffer && !!diff,
-  });
-
-  // State-to-View Coordination
-  const viewParts = useMemo((): ViewParts => {
-    if (name === UPDATE_TOPIC_DISPLAY_NAME || name === UPDATE_TOPIC_TOOL_NAME) {
-      return getUpdateTopicData(args);
-    }
-    if (diff) {
-      return getFileOpData(
-        diff,
-        status,
-        resultDisplay,
-        terminalWidth,
-        availableTerminalHeight,
-        isAlternateBuffer,
-      );
-    }
-    if (isListResult(resultDisplay)) {
-      return getListResultData(resultDisplay, originalDescription);
-    }
-
-    if (isGrepResult(resultDisplay)) {
-      return getGenericSuccessData(resultDisplay, originalDescription);
-    }
-
-    if (status === CoreToolCallStatus.Success && resultDisplay) {
-      return getGenericSuccessData(resultDisplay, originalDescription);
-    }
-    if (status === CoreToolCallStatus.Error) {
-      const text =
-        typeof resultDisplay === 'string'
-          ? resultDisplay.replace(/\n/g, ' ')
-          : 'Failed';
-      const errorSummary = (
-        <Text color={theme.status.error} wrap="truncate-end">
-          → {text}
-        </Text>
-      );
-      const descriptionText = originalDescription ? (
-        <Text color={theme.text.secondary} wrap="truncate-end">
-          {originalDescription}
-        </Text>
-      ) : undefined;
-      return {
-        description: descriptionText,
-        summary: errorSummary,
-        payload: undefined,
-      };
-    }
-
-    const descriptionText = originalDescription ? (
-      <Text color={theme.text.secondary} wrap="truncate-end">
-        {originalDescription}
-      </Text>
-    ) : undefined;
-    return {
-      description: descriptionText,
-      summary: undefined,
-      payload: undefined,
-    };
-  }, [
-    diff,
-    status,
-    resultDisplay,
-    terminalWidth,
-    availableTerminalHeight,
-    originalDescription,
-    isAlternateBuffer,
-    name,
-    args,
-  ]);
-
-  const { description, summary } = viewParts;
-
-  const diffLines = useMemo(() => {
-    if (!diff || !isExpanded || !isAlternateBuffer) return [];
-
-    const parsedLines = parseDiffWithLineNumbers(diff.fileDiff);
-    const isNewFileResult = isNewFile(parsedLines);
-
-    if (isNewFileResult) {
-      const addedContent = parsedLines
-        .filter((line) => line.type === 'add')
-        .map((line) => line.content)
-        .join('\n');
-
-      const fileExtension = getFileExtension(diff.fileName);
-
-      return colorizeCode({
-        code: addedContent,
-        language: fileExtension,
-        maxWidth: terminalWidth - PAYLOAD_MARGIN_LEFT,
-        settings,
-        disableColor: status === CoreToolCallStatus.Cancelled,
-        returnLines: true,
-      });
-    } else {
-      return renderDiffLines({
-        parsedLines,
-        filename: diff.fileName,
-        terminalWidth: terminalWidth - PAYLOAD_MARGIN_LEFT,
-        disableColor: status === CoreToolCallStatus.Cancelled,
-      });
-    }
-  }, [diff, isExpanded, isAlternateBuffer, terminalWidth, settings, status]);
-
-  const showPayload = useMemo(() => {
-    const policy = !isAlternateBuffer || !diff || isExpanded;
-    if (!policy) return false;
-
-    if (diff) {
-      if (isAlternateBuffer) {
-        return isExpanded && diffLines.length > 0;
-      }
-      // In non-alternate buffer mode, we always show the diff.
-      return true;
-    }
-
-    return !!(viewParts.payload || outputFile);
-  }, [
-    isAlternateBuffer,
-    diff,
-    isExpanded,
-    diffLines.length,
-    viewParts.payload,
-    outputFile,
-  ]);
-
-  const keyExtractor = (_item: React.ReactNode, index: number) =>
-    `diff-line-${index}`;
-  const renderItem = ({ item }: { item: React.ReactNode }) => (
-    <Box minHeight={1}>{item}</Box>
-  );
-
-  return (
-    <Box flexDirection="column">
-      <Box marginLeft={2} flexDirection="row">
-        {name === UPDATE_TOPIC_DISPLAY_NAME ||
-        name === UPDATE_TOPIC_TOOL_NAME ? (
-          <>
-            <Box flexShrink={1} flexGrow={0}>
-              {description}
-            </Box>
-            {summary && (
-              <Box marginLeft={1} flexGrow={0} flexShrink={1}>
-                {summary}
-              </Box>
-            )}
-          </>
-        ) : (
-          <>
-            <ToolStatusIndicator status={status} name={name} />
-            <Box maxWidth={25} flexShrink={1} flexGrow={0}>
-              <Text color={theme.text.primary} bold wrap="truncate-end">
-                {name}{' '}
-              </Text>
-            </Box>
-            <Box marginLeft={1} flexShrink={1} flexGrow={0}>
-              {description}
-            </Box>
-            {summary && (
-              <Box
-                key="tool-summary"
-                ref={isAlternateBuffer && diff ? toggleRef : undefined}
-                marginLeft={1}
-                flexGrow={0}
-                flexShrink={1}
-              >
-                {summary}
-              </Box>
-            )}
-          </>
-        )}
-      </Box>
-
-      {showPayload && isAlternateBuffer && diffLines.length > 0 && (
-        <Box
-          marginLeft={PAYLOAD_MARGIN_LEFT}
-          marginTop={1}
-          marginBottom={1}
-          paddingX={1}
-          flexDirection="column"
-          height={
-            Math.min(diffLines.length, COMPACT_TOOL_SUBVIEW_MAX_LINES) + 2
-          }
-          maxHeight={COMPACT_TOOL_SUBVIEW_MAX_LINES + 2}
-          borderStyle="round"
-          borderColor={theme.border.default}
-          borderDimColor={true}
-          maxWidth={Math.min(
-            PAYLOAD_MAX_WIDTH,
-            terminalWidth - PAYLOAD_MARGIN_LEFT,
-          )}
-        >
-          <ScrollableList
-            data={diffLines}
-            renderItem={renderItem}
-            keyExtractor={keyExtractor}
-            estimatedItemHeight={() => 1}
-            hasFocus={isFocused}
-            width={Math.min(
-              PAYLOAD_MAX_WIDTH,
-              terminalWidth -
-                PAYLOAD_MARGIN_LEFT -
-                PAYLOAD_BORDER_CHROME_WIDTH -
-                PAYLOAD_SCROLL_GUTTER,
-            )}
-          />
-        </Box>
-      )}
-
-      {showPayload && (!isAlternateBuffer || !diff) && viewParts.payload && (
-        <Box marginLeft={PAYLOAD_MARGIN_LEFT} marginTop={1} marginBottom={1}>
-          {viewParts.payload}
-        </Box>
-      )}
-
-      {showPayload && outputFile && (
-        <Box marginLeft={PAYLOAD_MARGIN_LEFT} marginTop={1} marginBottom={1}>
-          <Text color={theme.text.secondary}>
-            (Output saved to: {outputFile})
-          </Text>
-        </Box>
-      )}
-    </Box>
-  );
-};
@@ -55,7 +55,6 @@ index 0000000..e69de29
            maxWidth: 80,
            theme: undefined,
            settings: expect.anything(),
-            disableColor: false,
          }),
        );
      });
@@ -90,7 +89,6 @@ index 0000000..e69de29
            maxWidth: 80,
            theme: undefined,
            settings: expect.anything(),
-            disableColor: false,
          }),
        );
      });
@@ -121,7 +119,6 @@ index 0000000..e69de29
            maxWidth: 80,
            theme: undefined,
            settings: expect.anything(),
-            disableColor: false,
          }),
        );
      });
@@ -13,16 +13,15 @@ import { MaxSizedBox } from '../shared/MaxSizedBox.js';
 import { theme as semanticTheme } from '../../semantic-colors.js';
 import type { Theme } from '../../themes/theme.js';
 import { useSettings } from '../../contexts/SettingsContext.js';
-import { getFileExtension } from '../../utils/fileUtils.js';

-export interface DiffLine {
+interface DiffLine {
  type: 'add' | 'del' | 'context' | 'hunk' | 'other';
  oldLine?: number;
  newLine?: number;
  content: string;
 }

-export function parseDiffWithLineNumbers(diffContent: string): DiffLine[] {
+function parseDiffWithLineNumbers(diffContent: string): DiffLine[] {
  const lines = diffContent.split(/\r?\n/);
  const result: DiffLine[] = [];
  let currentOldLine = 0;
@@ -89,7 +88,6 @@ interface DiffRendererProps {
  availableTerminalHeight?: number;
  terminalWidth: number;
  theme?: Theme;
-  disableColor?: boolean;
 }

 const DEFAULT_TAB_WIDTH = 4; // Spaces per tab for normalization
@@ -101,7 +99,6 @@ export const DiffRenderer: React.FC<DiffRendererProps> = ({
  availableTerminalHeight,
  terminalWidth,
  theme,
-  disableColor = false,
 }) => {
  const settings = useSettings();

@@ -114,7 +111,17 @@ export const DiffRenderer: React.FC<DiffRendererProps> = ({
    return parseDiffWithLineNumbers(diffContent);
  }, [diffContent]);

-  const isNewFileResult = useMemo(() => isNewFile(parsedLines), [parsedLines]);
+  const isNewFile = useMemo(() => {
+    if (parsedLines.length === 0) return false;
+    return parsedLines.every(
+      (line) =>
+        line.type === 'add' ||
+        line.type === 'hunk' ||
+        line.type === 'other' ||
+        line.content.startsWith('diff --git') ||
+        line.content.startsWith('new file mode'),
+    );
+  }, [parsedLines]);

  const renderedOutput = useMemo(() => {
    if (!diffContent || typeof diffContent !== 'string') {
@@ -144,14 +151,14 @@ export const DiffRenderer: React.FC<DiffRendererProps> = ({
      );
    }

-    if (isNewFileResult) {
+    if (isNewFile) {
      // Extract only the added lines' content
      const addedContent = parsedLines
        .filter((line) => line.type === 'add')
        .map((line) => line.content)
        .join('\n');
      // Attempt to infer language from filename, default to plain text if no filename
-      const fileExtension = getFileExtension(filename);
+      const fileExtension = filename?.split('.').pop() || null;
      const language = fileExtension
        ? getLanguageFromExtension(fileExtension)
        : null;
@@ -162,73 +169,39 @@ export const DiffRenderer: React.FC<DiffRendererProps> = ({
        maxWidth: terminalWidth,
        theme,
        settings,
-        disableColor,
      });
    } else {
-      const key = filename
-        ? `diff-box-${filename}`
-        : `diff-box-${crypto.createHash('sha1').update(JSON.stringify(parsedLines)).digest('hex')}`;
-
-      return (
-        <MaxSizedBox
-          maxHeight={availableTerminalHeight}
-          maxWidth={terminalWidth}
-          key={key}
-        >
-          {renderDiffLines({
-            parsedLines,
-            filename,
-            tabWidth,
-            terminalWidth,
-            disableColor,
-          })}
-        </MaxSizedBox>
+      return renderDiffContent(
+        parsedLines,
+        filename,
+        tabWidth,
+        availableTerminalHeight,
+        terminalWidth,
      );
    }
  }, [
    diffContent,
    parsedLines,
    screenReaderEnabled,
-    isNewFileResult,
+    isNewFile,
    filename,
    availableTerminalHeight,
    terminalWidth,
    theme,
    settings,
    tabWidth,
-    disableColor,
  ]);

  return renderedOutput;
 };

-export const isNewFile = (parsedLines: DiffLine[]): boolean => {
-  if (parsedLines.length === 0) return false;
-  return parsedLines.every(
-    (line) =>
-      line.type === 'add' ||
-      line.type === 'hunk' ||
-      line.type === 'other' ||
-      line.content.startsWith('diff --git') ||
-      line.content.startsWith('new file mode'),
-  );
-};
-
-export interface RenderDiffLinesOptions {
-  parsedLines: DiffLine[];
-  filename?: string;
-  tabWidth?: number;
-  terminalWidth: number;
-  disableColor?: boolean;
-}
-
-export const renderDiffLines = ({
-  parsedLines,
-  filename,
+const renderDiffContent = (
+  parsedLines: DiffLine[],
+  filename: string | undefined,
  tabWidth = DEFAULT_TAB_WIDTH,
-  terminalWidth,
-  disableColor = false,
-}: RenderDiffLinesOptions): React.ReactNode[] => {
+  availableTerminalHeight: number | undefined,
+  terminalWidth: number,
+) => {
  // 1. Normalize whitespace (replace tabs with spaces) *before* further processing
  const normalizedLines = parsedLines.map((line) => ({
    ...line,
@@ -241,16 +214,15 @@ export const renderDiffLines = ({
  );

  if (displayableLines.length === 0) {
-    return [
+    return (
      <Box
-        key="no-changes"
        borderStyle="round"
        borderColor={semanticTheme.border.default}
        padding={1}
      >
        <Text dimColor>No changes detected.</Text>
-      </Box>,
-    ];
+      </Box>
+    );
  }

  const maxLineNumber = Math.max(
@@ -260,7 +232,7 @@ export const renderDiffLines = ({
  );
  const gutterWidth = Math.max(1, maxLineNumber.toString().length);

-  const fileExtension = getFileExtension(filename);
+  const fileExtension = filename?.split('.').pop() || null;
  const language = fileExtension
    ? getLanguageFromExtension(fileExtension)
    : null;
@@ -280,6 +252,10 @@ export const renderDiffLines = ({
    baseIndentation = 0;
  }

+  const key = filename
+    ? `diff-box-${filename}`
+    : `diff-box-${crypto.createHash('sha1').update(JSON.stringify(parsedLines)).digest('hex')}`;
+
  let lastLineNumber: number | null = null;
  const MAX_CONTEXT_LINES_WITHOUT_GAP = 5;

@@ -345,26 +321,12 @@ export const renderDiffLines = ({

      const displayContent = line.content.substring(baseIndentation);

-      const backgroundColor = disableColor
-        ? undefined
-        : line.type === 'add'
+      const backgroundColor =
+        line.type === 'add'
          ? semanticTheme.background.diff.added
          : line.type === 'del'
            ? semanticTheme.background.diff.removed
            : undefined;
-
-      const gutterColor = disableColor
-        ? undefined
-        : semanticTheme.text.secondary;
-
-      const symbolColor = disableColor
-        ? undefined
-        : line.type === 'add'
-          ? semanticTheme.status.success
-          : line.type === 'del'
-            ? semanticTheme.status.error
-            : undefined;
-
      acc.push(
        <Box key={lineKey} flexDirection="row">
          <Box
@@ -374,24 +336,32 @@ export const renderDiffLines = ({
            backgroundColor={backgroundColor}
            justifyContent="flex-end"
          >
-            <Text color={gutterColor}>{gutterNumStr}</Text>
+            <Text color={semanticTheme.text.secondary}>{gutterNumStr}</Text>
          </Box>
          {line.type === 'context' ? (
            <>
              <Text>{prefixSymbol} </Text>
-              <Text wrap="wrap">
-                {colorizeLine(
-                  displayContent,
-                  language,
-                  undefined,
-                  disableColor,
-                )}
-              </Text>
+              <Text wrap="wrap">{colorizeLine(displayContent, language)}</Text>
            </>
          ) : (
-            <Text backgroundColor={backgroundColor} wrap="wrap">
-              <Text color={symbolColor}>{prefixSymbol}</Text>{' '}
-              {colorizeLine(displayContent, language, undefined, disableColor)}
+            <Text
+              backgroundColor={
+                line.type === 'add'
+                  ? semanticTheme.background.diff.added
+                  : semanticTheme.background.diff.removed
+              }
+              wrap="wrap"
+            >
+              <Text
+                color={
+                  line.type === 'add'
+                    ? semanticTheme.status.success
+                    : semanticTheme.status.error
+                }
+              >
+                {prefixSymbol}
+              </Text>{' '}
+              {colorizeLine(displayContent, language)}
            </Text>
          )}
        </Box>,
@@ -401,7 +371,15 @@ export const renderDiffLines = ({
    [],
  );

-  return content;
+  return (
+    <MaxSizedBox
+      maxHeight={availableTerminalHeight}
+      maxWidth={terminalWidth}
+      key={key}
+    >
+      {content}
+    </MaxSizedBox>
+  );
 };

 const getLanguageFromExtension = (extension: string): string | null => {
@@ -19,12 +19,8 @@ import { renderWithProviders } from '../../../test-utils/render.js';
 import { createMockSettings } from '../../../test-utils/settings.js';
 import { makeFakeConfig } from '@google/gemini-cli-core';
 import { waitFor } from '../../../test-utils/async.js';
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { SHELL_COMMAND_NAME, ACTIVE_SHELL_MAX_LINES } from '../../constants.js';
-import {
-  SHELL_CONTENT_OVERHEAD,
-  TOOL_RESULT_STANDARD_RESERVED_LINE_COUNT,
-} from '../../utils/toolLayoutUtils.js';

 describe('<ShellToolMessage />', () => {
  const baseProps: ShellToolMessageProps = {
@@ -39,7 +35,6 @@ describe('<ShellToolMessage />', () => {
    isFirst: true,
    borderColor: 'green',
    borderDimColor: false,
-    isExpandable: false,
    config: {
      getEnableInteractiveShell: () => true,
    } as unknown as Config,
@@ -57,11 +52,6 @@ describe('<ShellToolMessage />', () => {

  beforeEach(() => {
    vi.clearAllMocks();
-    vi.useFakeTimers();
-  });
-
-  afterEach(() => {
-    vi.useRealTimers();
  });

  describe('interactive shell focus', () => {
@@ -69,14 +59,14 @@ describe('<ShellToolMessage />', () => {
      ['SHELL_COMMAND_NAME', SHELL_COMMAND_NAME],
      ['SHELL_TOOL_NAME', SHELL_TOOL_NAME],
    ])('clicks inside the shell area sets focus for %s', async (_, name) => {
-      const { lastFrame, simulateClick, unmount, waitUntilReady } =
-        await renderWithProviders(
-          <ShellToolMessage {...baseProps} name={name} />,
-          { uiActions, mouseEventsEnabled: true },
-        );
+      const { lastFrame, simulateClick, unmount } = await renderWithProviders(
+        <ShellToolMessage {...baseProps} name={name} />,
+        { uiActions, mouseEventsEnabled: true },
+      );

-      await waitUntilReady();
-      expect(lastFrame()).toContain('A shell command');
+      await waitFor(() => {
+        expect(lastFrame()).toContain('A shell command');
+      });

      await simulateClick(2, 2);

@@ -85,7 +75,6 @@ describe('<ShellToolMessage />', () => {
      });
      unmount();
    });
-
    it('resets focus when shell finishes', async () => {
      let updateStatus: (s: CoreToolCallStatus) => void = () => {};

@@ -97,21 +86,19 @@ describe('<ShellToolMessage />', () => {
        return <ShellToolMessage {...baseProps} status={status} ptyId={1} />;
      };

-      const { lastFrame, unmount, waitUntilReady } = await renderWithProviders(
-        <Wrapper />,
-        {
-          uiActions,
-          uiState: {
-            streamingState: StreamingState.Idle,
-            embeddedShellFocused: true,
-            activePtyId: 1,
-          },
+      const { lastFrame, unmount } = await renderWithProviders(<Wrapper />, {
+        uiActions,
+        uiState: {
+          streamingState: StreamingState.Idle,
+          embeddedShellFocused: true,
+          activePtyId: 1,
        },
-      );
+      });

      // Verify it is initially focused
-      await waitUntilReady();
-      expect(lastFrame()).toContain('(Shift+Tab to unfocus)');
+      await waitFor(() => {
+        expect(lastFrame()).toContain('(Shift+Tab to unfocus)');
+      });

      // Now update status to Success
      await act(async () => {
@@ -197,33 +184,29 @@ describe('<ShellToolMessage />', () => {
      [
        'respects availableTerminalHeight when it is smaller than ACTIVE_SHELL_MAX_LINES',
        10,
-        10 - TOOL_RESULT_STANDARD_RESERVED_LINE_COUNT, // 7 (Header height is 3, but calculation uses reserved=3)
+        7,
        false,
        true,
-        false,
      ],
      [
        'uses ACTIVE_SHELL_MAX_LINES when availableTerminalHeight is large',
        100,
-        ACTIVE_SHELL_MAX_LINES - SHELL_CONTENT_OVERHEAD, // 11
+        ACTIVE_SHELL_MAX_LINES - 4,
        false,
        true,
-        false,
      ],
      [
        'uses full availableTerminalHeight when focused in alternate buffer mode',
        100,
-        100 - TOOL_RESULT_STANDARD_RESERVED_LINE_COUNT, // 97
+        97,
        true,
        false,
-        false,
      ],
      [
        'defaults to ACTIVE_SHELL_MAX_LINES in alternate buffer when availableTerminalHeight is undefined',
        undefined,
-        ACTIVE_SHELL_MAX_LINES - SHELL_CONTENT_OVERHEAD, // 11
+        ACTIVE_SHELL_MAX_LINES - 4,
        false,
-        true,
        false,
      ],
    ])(
@@ -234,34 +217,29 @@ describe('<ShellToolMessage />', () => {
        expectedMaxLines,
        focused,
        constrainHeight,
-        isExpandable,
      ) => {
-        const { lastFrame, waitUntilReady, unmount } =
-          await renderWithProviders(
-            <ShellToolMessage
-              {...baseProps}
-              resultDisplay={LONG_OUTPUT}
-              renderOutputAsMarkdown={false}
-              availableTerminalHeight={availableTerminalHeight}
-              ptyId={1}
-              status={CoreToolCallStatus.Executing}
-              isExpandable={isExpandable}
-            />,
-            {
-              uiActions,
-              config: makeFakeConfig({ useAlternateBuffer: true }),
-              settings: createMockSettings({
-                ui: { useAlternateBuffer: true },
-              }),
-              uiState: {
-                activePtyId: focused ? 1 : 2,
-                embeddedShellFocused: focused,
-                constrainHeight,
-              },
+        const { lastFrame, unmount } = await renderWithProviders(
+          <ShellToolMessage
+            {...baseProps}
+            resultDisplay={LONG_OUTPUT}
+            renderOutputAsMarkdown={false}
+            availableTerminalHeight={availableTerminalHeight}
+            ptyId={1}
+            status={CoreToolCallStatus.Executing}
+          />,
+          {
+            uiActions,
+            config: makeFakeConfig({ useAlternateBuffer: true }),
+            settings: createMockSettings({
+              ui: { useAlternateBuffer: true },
+            }),
+            uiState: {
+              activePtyId: focused ? 1 : 2,
+              embeddedShellFocused: focused,
+              constrainHeight,
            },
-          );
-
-        await waitUntilReady();
+          },
+        );

        const frame = lastFrame();
        expect(frame.match(/Line \d+/g)?.length).toBe(expectedMaxLines);
@@ -271,7 +249,7 @@ describe('<ShellToolMessage />', () => {
    );

    it('fully expands in standard mode when availableTerminalHeight is undefined', async () => {
-      const { lastFrame, unmount, waitUntilReady } = await renderWithProviders(
+      const { lastFrame, unmount } = await renderWithProviders(
        <ShellToolMessage
          {...baseProps}
          resultDisplay={LONG_OUTPUT}
@@ -286,15 +264,16 @@ describe('<ShellToolMessage />', () => {
        },
      );

-      await waitUntilReady();
-      const frame = lastFrame();
-      // Should show all 100 lines
-      expect(frame.match(/Line \d+/g)?.length).toBe(100);
+      await waitFor(() => {
+        const frame = lastFrame();
+        // Should show all 100 lines
+        expect(frame.match(/Line \d+/g)?.length).toBe(100);
+      });
      unmount();
    });

    it('fully expands in alternate buffer mode when constrainHeight is false and isExpandable is true', async () => {
-      const { lastFrame, unmount, waitUntilReady } = await renderWithProviders(
+      const { lastFrame, unmount } = await renderWithProviders(
        <ShellToolMessage
          {...baseProps}
          resultDisplay={LONG_OUTPUT}
@@ -313,16 +292,17 @@ describe('<ShellToolMessage />', () => {
        },
      );

-      await waitUntilReady();
-      const frame = lastFrame();
-      // Should show all 100 lines because constrainHeight is false and isExpandable is true
-      expect(frame.match(/Line \d+/g)?.length).toBe(100);
+      await waitFor(() => {
+        const frame = lastFrame();
+        // Should show all 100 lines because constrainHeight is false and isExpandable is true
+        expect(frame.match(/Line \d+/g)?.length).toBe(100);
+      });
      expect(lastFrame()).toMatchSnapshot();
      unmount();
    });

    it('stays constrained in alternate buffer mode when isExpandable is false even if constrainHeight is false', async () => {
-      const { lastFrame, unmount, waitUntilReady } = await renderWithProviders(
+      const { lastFrame, unmount } = await renderWithProviders(
        <ShellToolMessage
          {...baseProps}
          resultDisplay={LONG_OUTPUT}
@@ -341,12 +321,11 @@ describe('<ShellToolMessage />', () => {
        },
      );

-      await waitUntilReady();
-      const frame = lastFrame();
-      // Should still be constrained to 11 (15 - 4) because isExpandable is false
-      expect(frame.match(/Line \d+/g)?.length).toBe(
-        ACTIVE_SHELL_MAX_LINES - SHELL_CONTENT_OVERHEAD,
-      );
+      await waitFor(() => {
+        const frame = lastFrame();
+        // Should still be constrained to 11 (15 - 4) because isExpandable is false
+        expect(frame.match(/Line \d+/g)?.length).toBe(11);
+      });
      expect(lastFrame()).toMatchSnapshot();
      unmount();
    });
@@ -190,7 +190,6 @@ export const ShellToolMessage: React.FC<ShellToolMessageProps> = ({
        borderLeft={true}
        borderRight={true}
        paddingX={1}
-        paddingTop={1}
        flexDirection="column"
      >
        <ToolResultDisplay
@@ -34,9 +34,6 @@ describe('ToolConfirmationMessage', () => {
    confirm: mockConfirm,
    cancel: vi.fn(),
    isDiffingEnabled: false,
-    isExpanded: vi.fn().mockReturnValue(false),
-    toggleExpansion: vi.fn(),
-    toggleAllExpansion: vi.fn(),
  });

  const mockConfig = {
@@ -461,11 +458,7 @@ describe('ToolConfirmationMessage', () => {
        confirm: vi.fn(),
        cancel: vi.fn(),
        isDiffingEnabled: false,
-        isExpanded: vi.fn().mockReturnValue(false),
-        toggleExpansion: vi.fn(),
-        toggleAllExpansion: vi.fn(),
      });
-
      const { lastFrame, unmount } = await renderWithProviders(
        <ToolConfirmationMessage
          callId="test-call-id"
@@ -492,11 +485,7 @@ describe('ToolConfirmationMessage', () => {
        confirm: vi.fn(),
        cancel: vi.fn(),
        isDiffingEnabled: false,
-        isExpanded: vi.fn().mockReturnValue(false),
-        toggleExpansion: vi.fn(),
-        toggleAllExpansion: vi.fn(),
      });
-
      const { lastFrame, unmount } = await renderWithProviders(
        <ToolConfirmationMessage
          callId="test-call-id"
@@ -523,9 +512,6 @@ describe('ToolConfirmationMessage', () => {
        confirm: vi.fn(),
        cancel: vi.fn(),
        isDiffingEnabled: true,
-        isExpanded: vi.fn().mockReturnValue(false),
-        toggleExpansion: vi.fn(),
-        toggleAllExpansion: vi.fn(),
      });

      const { lastFrame, unmount } = await renderWithProviders(
@@ -742,9 +728,6 @@ describe('ToolConfirmationMessage', () => {
        confirm: mockConfirm,
        cancel: vi.fn(),
        isDiffingEnabled: false,
-        isExpanded: vi.fn().mockReturnValue(false),
-        toggleExpansion: vi.fn(),
-        toggleAllExpansion: vi.fn(),
      });
      const confirmationDetails: SerializableConfirmationDetails = {
        type: 'info',
@@ -1,178 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { renderWithProviders } from '../../../test-utils/render.js';
-import { createMockSettings } from '../../../test-utils/mockConfig.js';
-import { ToolGroupMessage } from './ToolGroupMessage.js';
-import {
-  CoreToolCallStatus,
-  LS_DISPLAY_NAME,
-  READ_FILE_DISPLAY_NAME,
-} from '@google/gemini-cli-core';
-import { expect, it, describe } from 'vitest';
-import type { IndividualToolCallDisplay } from '../../types.js';
-
-describe('ToolGroupMessage Compact Rendering', () => {
-  const defaultProps = {
-    item: {
-      id: '1',
-      role: 'assistant',
-      content: '',
-      timestamp: new Date(),
-      type: 'help' as const, // Adding type property to satisfy HistoryItem type
-    },
-    terminalWidth: 80,
-  };
-
-  const compactSettings = createMockSettings({
-    merged: {
-      ui: {
-        compactToolOutput: true,
-      },
-    },
-  });
-
-  it('renders consecutive compact tools without empty lines between them', async () => {
-    const toolCalls: IndividualToolCallDisplay[] = [
-      {
-        callId: 'call1',
-        name: LS_DISPLAY_NAME,
-        status: CoreToolCallStatus.Success,
-        resultDisplay: 'file1.txt\nfile2.txt',
-        description: 'Listing files',
-        confirmationDetails: undefined,
-        isClientInitiated: true,
-        parentCallId: undefined,
-      },
-      {
-        callId: 'call2',
-        name: LS_DISPLAY_NAME,
-        status: CoreToolCallStatus.Success,
-        resultDisplay: 'file3.txt',
-        description: 'Listing files',
-        confirmationDetails: undefined,
-        isClientInitiated: true,
-        parentCallId: undefined,
-      },
-    ];
-
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <ToolGroupMessage {...defaultProps} toolCalls={toolCalls} />,
-      { settings: compactSettings },
-    );
-
-    await waitUntilReady();
-    const output = lastFrame();
-
-    expect(output).toMatchSnapshot();
-  });
-
-  it('does not add an extra empty line between a compact tool and a standard tool', async () => {
-    const toolCalls: IndividualToolCallDisplay[] = [
-      {
-        callId: 'call1',
-        name: LS_DISPLAY_NAME,
-        status: CoreToolCallStatus.Success,
-        resultDisplay: 'file1.txt',
-        description: 'Listing files',
-        confirmationDetails: undefined,
-        isClientInitiated: true,
-        parentCallId: undefined,
-      },
-      {
-        callId: 'call2',
-        name: 'non-compact-tool',
-        status: CoreToolCallStatus.Success,
-        resultDisplay: 'some large output',
-        description: 'Doing something',
-        confirmationDetails: undefined,
-        isClientInitiated: true,
-        parentCallId: undefined,
-      },
-    ];
-
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <ToolGroupMessage {...defaultProps} toolCalls={toolCalls} />,
-      { settings: compactSettings },
-    );
-
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toMatchSnapshot();
-  });
-
-  it('does not add an extra empty line if a compact tool has a dense payload', async () => {
-    const toolCalls: IndividualToolCallDisplay[] = [
-      {
-        callId: 'call1',
-        name: LS_DISPLAY_NAME,
-        status: CoreToolCallStatus.Success,
-        resultDisplay: 'file1.txt',
-        description: 'Listing files',
-        confirmationDetails: undefined,
-        isClientInitiated: true,
-        parentCallId: undefined,
-      },
-      {
-        callId: 'call2',
-        name: READ_FILE_DISPLAY_NAME,
-        status: CoreToolCallStatus.Success,
-        resultDisplay: {
-          summary: 'read file',
-          payload: 'file content',
-          files: ['file.txt'],
-        }, // Dense payload
-        description: 'Reading file',
-        confirmationDetails: undefined,
-        isClientInitiated: true,
-        parentCallId: undefined,
-      },
-    ];
-
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <ToolGroupMessage {...defaultProps} toolCalls={toolCalls} />,
-      { settings: compactSettings },
-    );
-
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toMatchSnapshot();
-  });
-
-  it('does not add an extra empty line between a standard tool and a compact tool', async () => {
-    const toolCalls: IndividualToolCallDisplay[] = [
-      {
-        callId: 'call1',
-        name: 'non-compact-tool',
-        status: CoreToolCallStatus.Success,
-        resultDisplay: 'some large output',
-        description: 'Doing something',
-        confirmationDetails: undefined,
-        isClientInitiated: true,
-        parentCallId: undefined,
-      },
-      {
-        callId: 'call2',
-        name: LS_DISPLAY_NAME,
-        status: CoreToolCallStatus.Success,
-        resultDisplay: 'file1.txt',
-        description: 'Listing files',
-        confirmationDetails: undefined,
-        isClientInitiated: true,
-        parentCallId: undefined,
-      },
-    ];
-
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <ToolGroupMessage {...defaultProps} toolCalls={toolCalls} />,
-      { settings: compactSettings },
-    );
-
-    await waitUntilReady();
-    const output = lastFrame();
-    expect(output).toMatchSnapshot();
-  });
-});
@@ -22,9 +22,6 @@ import {
  EDIT_DISPLAY_NAME,
  READ_FILE_DISPLAY_NAME,
  GLOB_DISPLAY_NAME,
-  UPDATE_TOPIC_DISPLAY_NAME,
-  TOPIC_PARAM_TITLE,
-  TOPIC_PARAM_STRATEGIC_INTENT,
 } from '@google/gemini-cli-core';
 import os from 'node:os';
 import { createMockSettings } from '../../../test-utils/settings.js';
@@ -417,7 +414,7 @@ describe('<ToolGroupMessage />', () => {
      ];
      const item = createItem(toolCalls);
      const { lastFrame, unmount } = await renderWithProviders(
-        <Scrollable height={12} hasFocus={true} scrollToBottom={true}>
+        <Scrollable height={10} hasFocus={true} scrollToBottom={true}>
          <ToolGroupMessage {...baseProps} item={item} toolCalls={toolCalls} />
        </Scrollable>,
        {
@@ -467,60 +464,6 @@ describe('<ToolGroupMessage />', () => {
      unmount();
    });

-    describe('UpdateTopicTool', () => {
-      it('renders update_topic with Title -- Description format even when compact mode is disabled', async () => {
-        const toolCalls = [
-          createToolCall({
-            name: UPDATE_TOPIC_DISPLAY_NAME,
-            args: {
-              [TOPIC_PARAM_TITLE]: 'Research',
-              [TOPIC_PARAM_STRATEGIC_INTENT]: 'Researching Agent Skills',
-            },
-          }),
-        ];
-        const item = createItem(toolCalls);
-        const { lastFrame, unmount } = await renderWithProviders(
-          <ToolGroupMessage {...baseProps} item={item} toolCalls={toolCalls} />,
-          {
-            config: baseMockConfig,
-            settings: createMockSettings({
-              ui: { compactToolOutput: false },
-            }),
-          },
-        );
-
-        const output = lastFrame();
-        expect(output).toContain('Research');
-        expect(output).toContain('-- Researching Agent Skills');
-        expect(output).not.toContain('update_topic');
-        unmount();
-      });
-
-      it('renders update_topic with Topic -- Description format when title is missing', async () => {
-        const toolCalls = [
-          createToolCall({
-            name: UPDATE_TOPIC_DISPLAY_NAME,
-            args: {
-              [TOPIC_PARAM_STRATEGIC_INTENT]: 'Tactical update',
-            },
-          }),
-        ];
-        const item = createItem(toolCalls);
-        const { lastFrame, unmount } = await renderWithProviders(
-          <ToolGroupMessage {...baseProps} item={item} toolCalls={toolCalls} />,
-          {
-            config: baseMockConfig,
-            settings: fullVerbositySettings,
-          },
-        );
-
-        const output = lastFrame();
-        expect(output).toContain('Topic');
-        expect(output).toContain('-- Tactical update');
-        unmount();
-      });
-    });
-
    it('renders two tool groups where only the last line of the previous group is visible', async () => {
      const toolCalls1 = [
        createToolCall({
@@ -5,7 +5,7 @@
 */

 import type React from 'react';
-import { useMemo, Fragment } from 'react';
+import { useMemo } from 'react';
 import { Box, Text } from 'ink';
 import type {
  HistoryItem,
@@ -16,7 +16,6 @@ import { ToolCallStatus, mapCoreStatusToDisplayStatus } from '../../types.js';
 import { ToolMessage } from './ToolMessage.js';
 import { ShellToolMessage } from './ShellToolMessage.js';
 import { SubagentGroupDisplay } from './SubagentGroupDisplay.js';
-import { DenseToolMessage } from './DenseToolMessage.js';
 import { theme } from '../../semantic-colors.js';
 import { useConfig } from '../../contexts/ConfigContext.js';
 import { isShellTool } from './ToolShared.js';
@@ -24,93 +23,11 @@ import {
  shouldHideToolCall,
  CoreToolCallStatus,
  Kind,
-  EDIT_DISPLAY_NAME,
-  GLOB_DISPLAY_NAME,
-  WEB_SEARCH_DISPLAY_NAME,
-  READ_FILE_DISPLAY_NAME,
-  LS_DISPLAY_NAME,
-  GREP_DISPLAY_NAME,
-  WEB_FETCH_DISPLAY_NAME,
-  WRITE_FILE_DISPLAY_NAME,
-  READ_MANY_FILES_DISPLAY_NAME,
-  UPDATE_TOPIC_DISPLAY_NAME,
-  UPDATE_TOPIC_TOOL_NAME,
-  isFileDiff,
-  isGrepResult,
-  isListResult,
 } from '@google/gemini-cli-core';
 import { useUIState } from '../../contexts/UIStateContext.js';
 import { getToolGroupBorderAppearance } from '../../utils/borderStyles.js';
 import { useSettings } from '../../contexts/SettingsContext.js';

-const COMPACT_OUTPUT_ALLOWLIST = new Set([
-  EDIT_DISPLAY_NAME,
-  GLOB_DISPLAY_NAME,
-  WEB_SEARCH_DISPLAY_NAME,
-  READ_FILE_DISPLAY_NAME,
-  LS_DISPLAY_NAME,
-  GREP_DISPLAY_NAME,
-  WEB_FETCH_DISPLAY_NAME,
-  WRITE_FILE_DISPLAY_NAME,
-  READ_MANY_FILES_DISPLAY_NAME,
-  UPDATE_TOPIC_DISPLAY_NAME,
-  UPDATE_TOPIC_TOOL_NAME,
-]);
-
-// Helper to identify if a tool should use the compact view
-export const isCompactTool = (
-  tool: IndividualToolCallDisplay,
-  isCompactModeEnabled: boolean,
-): boolean => {
-  const hasCompactOutputSupport = COMPACT_OUTPUT_ALLOWLIST.has(tool.name);
-  const displayStatus = mapCoreStatusToDisplayStatus(tool.status);
-
-  // update_topic always uses the dense/compact representation
-  if (
-    tool.name === UPDATE_TOPIC_DISPLAY_NAME ||
-    tool.name === UPDATE_TOPIC_TOOL_NAME
-  ) {
-    return displayStatus !== ToolCallStatus.Confirming;
-  }
-
-  return (
-    isCompactModeEnabled &&
-    hasCompactOutputSupport &&
-    displayStatus !== ToolCallStatus.Confirming
-  );
-};
-
-// Helper to identify if a compact tool has a payload (diff, list, etc.)
-export const hasDensePayload = (tool: IndividualToolCallDisplay): boolean => {
-  if (tool.outputFile) return true;
-  const res = tool.resultDisplay;
-  if (!res) return false;
-
-  if (isFileDiff(res)) return true;
-  if (tool.confirmationDetails?.type === 'edit') return true;
-  if (isGrepResult(res) && res.matches.length > 0) return true;
-
-  // ReadManyFilesResult check (has 'include' and 'files')
-  if (isListResult(res) && 'include' in res) {
-    const includeProp = (res as { include?: unknown }).include;
-    if (Array.isArray(includeProp) && res.files.length > 0) {
-      return true;
-    }
-  }
-
-  // Generic summary/payload pattern
-  if (
-    typeof res === 'object' &&
-    res !== null &&
-    'summary' in res &&
-    'payload' in res
-  ) {
-    return true;
-  }
-
-  return false;
-};
-
 interface ToolGroupMessageProps {
  item: HistoryItem | HistoryItemWithoutId;
  toolCalls: IndividualToolCallDisplay[];
@@ -136,13 +53,11 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
 }) => {
  const settings = useSettings();
  const isLowErrorVerbosity = settings.merged.ui?.errorVerbosity !== 'full';
-  const isCompactModeEnabled = settings.merged.ui?.compactToolOutput === true;

  // Filter out tool calls that should be hidden (e.g. in-progress Ask User, or Plan Mode operations).
-  const visibleToolCalls = useMemo(
+  const toolCalls = useMemo(
    () =>
      allToolCalls.filter((t) => {
-        // Hide internal errors unless full verbosity
        if (
          isLowErrorVerbosity &&
          t.status === CoreToolCallStatus.Error &&
@@ -150,34 +65,19 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
        ) {
          return false;
        }
-        // Standard hiding logic (e.g. Plan Mode internal edits)
-        if (
-          shouldHideToolCall({
-            displayName: t.name,
-            status: t.status,
-            approvalMode: t.approvalMode,
-            hasResultDisplay: !!t.resultDisplay,
-            parentCallId: t.parentCallId,
-          })
-        ) {
-          return false;
-        }

-        // We HIDE tools that are still in pre-execution states (Confirming, Pending)
-        // from the History log. They live in the Global Queue or wait for their turn.
-        // Only show tools that are actually running or finished.
-        const displayStatus = mapCoreStatusToDisplayStatus(t.status);
-
-        // We hide Confirming tools from the history log because they are
-        // currently being rendered in the interactive ToolConfirmationQueue.
-        // We show everything else, including Pending (waiting to run) and
-        // Canceled (rejected by user), to ensure the history is complete
-        // and to avoid tools "vanishing" after approval.
-        return displayStatus !== ToolCallStatus.Confirming;
+        return !shouldHideToolCall({
+          displayName: t.name,
+          status: t.status,
+          approvalMode: t.approvalMode,
+          hasResultDisplay: !!t.resultDisplay,
+          parentCallId: t.parentCallId,
+        });
      }),
    [allToolCalls, isLowErrorVerbosity],
  );

+  const config = useConfig();
  const {
    activePtyId,
    embeddedShellFocused,
@@ -185,8 +85,6 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
    pendingHistoryItems,
  } = useUIState();

-  const config = useConfig();
-
  const { borderColor, borderDimColor } = useMemo(
    () =>
      getToolGroupBorderAppearance(
@@ -205,6 +103,41 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
    ],
  );

+  // We HIDE tools that are still in pre-execution states (Confirming, Pending)
+  // from the History log. They live in the Global Queue or wait for their turn.
+  // Only show tools that are actually running or finished.
+  // We explicitly exclude Pending and Confirming to ensure they only
+  // appear in the Global Queue until they are approved and start executing.
+  const visibleToolCalls = useMemo(
+    () =>
+      toolCalls.filter((t) => {
+        const displayStatus = mapCoreStatusToDisplayStatus(t.status);
+        // We hide Confirming tools from the history log because they are
+        // currently being rendered in the interactive ToolConfirmationQueue.
+        // We show everything else, including Pending (waiting to run) and
+        // Canceled (rejected by user), to ensure the history is complete
+        // and to avoid tools "vanishing" after approval.
+        return displayStatus !== ToolCallStatus.Confirming;
+      }),
+
+    [toolCalls],
+  );
+
+  const staticHeight = /* border */ 2;
+
+  let countToolCallsWithResults = 0;
+  for (const tool of visibleToolCalls) {
+    if (
+      tool.kind !== Kind.Agent &&
+      tool.resultDisplay !== undefined &&
+      tool.resultDisplay !== ''
+    ) {
+      countToolCallsWithResults++;
+    }
+  }
+  const countOneLineToolCalls =
+    visibleToolCalls.filter((t) => t.kind !== Kind.Agent).length -
+    countToolCallsWithResults;
  const groupedTools = useMemo(() => {
    const groups: Array<
      IndividualToolCallDisplay | IndividualToolCallDisplay[]
@@ -224,78 +157,10 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
    return groups;
  }, [visibleToolCalls]);

-  const staticHeight = useMemo(() => {
-    let height = 0;
-    for (let i = 0; i < groupedTools.length; i++) {
-      const group = groupedTools[i];
-      const isFirst = i === 0;
-      const prevGroup = i > 0 ? groupedTools[i - 1] : null;
-      const prevIsCompact =
-        prevGroup &&
-        !Array.isArray(prevGroup) &&
-        isCompactTool(prevGroup, isCompactModeEnabled);
-
-      const isAgentGroup = Array.isArray(group);
-      const isCompact =
-        !isAgentGroup && isCompactTool(group, isCompactModeEnabled);
-
-      if (isFirst) {
-        height += (borderTopOverride ?? false) ? 1 : 0;
-      } else if (isCompact && prevIsCompact) {
-        height += 0;
-      } else if (isCompact || prevIsCompact) {
-        height += 1;
-      } else {
-        // Gap is provided by StickyHeader's paddingTop=1
-        height += 0;
-      }
-
-      const isFirstProp = !!(isFirst
-        ? (borderTopOverride ?? true)
-        : prevIsCompact);
-
-      if (isAgentGroup) {
-        // Agent group
-        height += 1; // Header
-        height += group.length; // 1 line per agent
-        if (isFirstProp) height += 1; // Top border
-      } else {
-        if (isCompact) {
-          height += 1; // Base height for compact tool
-        } else {
-          // Static overhead for standard tool header:
-          // 1 line for header text
-          // 1 line for dark separator
-          // 1 line for tool body internal paddingTop=1
-          // 1 line for top border (if isFirstProp) OR StickyHeader paddingTop=1 (if !isFirstProp)
-          height += 3;
-          height += isFirstProp ? 1 : 1; // Either top border or paddingTop
-        }
-      }
-    }
-    return height;
-  }, [groupedTools, isCompactModeEnabled, borderTopOverride]);
-
-  let countToolCallsWithResults = 0;
-  for (const tool of visibleToolCalls) {
-    if (tool.kind !== Kind.Agent) {
-      if (isCompactTool(tool, isCompactModeEnabled)) {
-        if (hasDensePayload(tool)) {
-          countToolCallsWithResults++;
-        }
-      } else if (
-        tool.resultDisplay !== undefined &&
-        tool.resultDisplay !== ''
-      ) {
-        countToolCallsWithResults++;
-      }
-    }
-  }
-
  const availableTerminalHeightPerToolMessage = availableTerminalHeight
    ? Math.max(
        Math.floor(
-          (availableTerminalHeight - staticHeight) /
+          (availableTerminalHeight - staticHeight - countOneLineToolCalls) /
            Math.max(1, countToolCallsWithResults),
        ),
        1,
@@ -307,14 +172,12 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
  // If all tools are filtered out (e.g., in-progress AskUser tools, low-verbosity
  // internal errors, plan-mode hidden write/edit), we should not emit standalone
  // border fragments. The only case where an empty group should render is the
-  // explicit "closing slice" (tools: []) used to bridge static/pending sections,
-  // and only if it's actually continuing an open box from above.
+  // explicit "closing slice" (tools: []) used to bridge static/pending sections.
  const isExplicitClosingSlice = allToolCalls.length === 0;
-  const shouldShowGroup =
-    visibleToolCalls.length > 0 ||
-    (isExplicitClosingSlice && borderBottomOverride === true);
-
-  if (!shouldShowGroup) {
+  if (
+    visibleToolCalls.length === 0 &&
+    (!isExplicitClosingSlice || borderBottomOverride !== true)
+  ) {
    return null;
  }

@@ -329,160 +192,97 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
    */
      width={terminalWidth}
      paddingRight={TOOL_MESSAGE_HORIZONTAL_MARGIN}
-      marginBottom={(borderBottomOverride ?? true) ? 1 : 0}
    >
-      {visibleToolCalls.length === 0 &&
-        isExplicitClosingSlice &&
-        borderBottomOverride === true && (
-          <Box
-            height={0}
-            width={contentWidth}
-            borderLeft={true}
-            borderRight={true}
-            borderTop={false}
-            borderBottom={true}
-            borderColor={borderColor}
-            borderDimColor={borderDimColor}
-            borderStyle="round"
-          />
-        )}
      {groupedTools.map((group, index) => {
        const isFirst = index === 0;
-        const isLast = index === groupedTools.length - 1;
+        const resolvedIsFirst =
+          borderTopOverride !== undefined
+            ? borderTopOverride && isFirst
+            : isFirst;

-        const prevGroup = index > 0 ? groupedTools[index - 1] : null;
-        const prevIsCompact =
-          prevGroup &&
-          !Array.isArray(prevGroup) &&
-          isCompactTool(prevGroup, isCompactModeEnabled);
-
-        const nextGroup = !isLast ? groupedTools[index + 1] : null;
-        const nextIsCompact =
-          nextGroup &&
-          !Array.isArray(nextGroup) &&
-          isCompactTool(nextGroup, isCompactModeEnabled);
-
-        const isAgentGroup = Array.isArray(group);
-        const isCompact =
-          !isAgentGroup && isCompactTool(group, isCompactModeEnabled);
-
-        let marginTop = 0;
-        if (isFirst) {
-          marginTop = (borderTopOverride ?? false) ? 1 : 0;
-        } else if (isCompact && prevIsCompact) {
-          marginTop = 0;
-        } else if (isCompact || prevIsCompact) {
-          marginTop = 1;
-        } else {
-          // Subsequent standard tools: StickyHeader's paddingTop=1 provides the gap.
-          marginTop = 0;
-        }
-
-        const isFirstProp = !!(isFirst
-          ? (borderTopOverride ?? true)
-          : prevIsCompact);
-
-        const showClosingBorder = !isCompact && (nextIsCompact || isLast);
-
-        if (isAgentGroup) {
+        if (Array.isArray(group)) {
          return (
-            <Box
+            <SubagentGroupDisplay
              key={group[0].callId}
-              marginTop={marginTop}
-              flexDirection="column"
-              width={contentWidth}
-            >
-              <SubagentGroupDisplay
-                toolCalls={group}
-                availableTerminalHeight={availableTerminalHeight}
-                terminalWidth={contentWidth}
-                borderColor={borderColor}
-                borderDimColor={borderDimColor}
-                isFirst={isFirstProp}
-                isExpandable={isExpandable}
-              />
-              {showClosingBorder && (
-                <Box
-                  height={0}
-                  width={contentWidth}
-                  borderLeft={true}
-                  borderRight={true}
-                  borderTop={false}
-                  borderBottom={isLast ? (borderBottomOverride ?? true) : true}
-                  borderColor={borderColor}
-                  borderDimColor={borderDimColor}
-                  borderStyle="round"
-                />
-              )}
-            </Box>
+              toolCalls={group}
+              availableTerminalHeight={availableTerminalHeight}
+              terminalWidth={contentWidth}
+              borderColor={borderColor}
+              borderDimColor={borderDimColor}
+              isFirst={resolvedIsFirst}
+              isExpandable={isExpandable}
+            />
          );
        }

        const tool = group;
        const isShellToolCall = isShellTool(tool.name);
+
        const commonProps = {
          ...tool,
          availableTerminalHeight: availableTerminalHeightPerToolMessage,
          terminalWidth: contentWidth,
          emphasis: 'medium' as const,
-          isFirst: isCompact ? false : isFirstProp,
+          isFirst: resolvedIsFirst,
          borderColor,
          borderDimColor,
          isExpandable,
        };

        return (
-          <Fragment key={tool.callId}>
-            <Box
-              flexDirection="column"
-              minHeight={1}
-              width={contentWidth}
-              marginTop={marginTop}
-            >
-              {isCompact ? (
-                <DenseToolMessage {...commonProps} />
-              ) : isShellToolCall ? (
-                <ShellToolMessage {...commonProps} config={config} />
-              ) : (
-                <ToolMessage {...commonProps} />
-              )}
-              {!isCompact && tool.outputFile && (
-                <Box
-                  borderLeft={true}
-                  borderRight={true}
-                  borderTop={false}
-                  borderBottom={false}
-                  borderColor={borderColor}
-                  borderDimColor={borderDimColor}
-                  flexDirection="column"
-                  borderStyle="round"
-                  paddingLeft={1}
-                  paddingRight={1}
-                >
-                  <Box>
-                    <Text color={theme.text.primary}>
-                      Output too long and was saved to: {tool.outputFile}
-                    </Text>
-                  </Box>
-                </Box>
-              )}
-            </Box>
-            {showClosingBorder && (
+          <Box
+            key={tool.callId}
+            flexDirection="column"
+            minHeight={1}
+            width={contentWidth}
+          >
+            {isShellToolCall ? (
+              <ShellToolMessage {...commonProps} config={config} />
+            ) : (
+              <ToolMessage {...commonProps} />
+            )}
+            {tool.outputFile && (
              <Box
-                height={0}
-                width={contentWidth}
                borderLeft={true}
                borderRight={true}
                borderTop={false}
-                borderBottom={isLast ? (borderBottomOverride ?? true) : true}
+                borderBottom={false}
                borderColor={borderColor}
                borderDimColor={borderDimColor}
+                flexDirection="column"
                borderStyle="round"
-              />
+                paddingLeft={1}
+                paddingRight={1}
+              >
+                <Box>
+                  <Text color={theme.text.primary}>
+                    Output too long and was saved to: {tool.outputFile}
+                  </Text>
+                </Box>
+              </Box>
            )}
-          </Fragment>
+          </Box>
        );
      })}
+      {
+        /*
+            We have to keep the bottom border separate so it doesn't get
+            drawn over by the sticky header directly inside it.
+           */
+        (visibleToolCalls.length > 0 || borderBottomOverride !== undefined) && (
+          <Box
+            height={0}
+            width={contentWidth}
+            borderLeft={true}
+            borderRight={true}
+            borderTop={false}
+            borderBottom={borderBottomOverride ?? true}
+            borderColor={borderColor}
+            borderDimColor={borderDimColor}
+            borderStyle="round"
+          />
+        )
+      }
    </Box>
  );

@@ -1,160 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { renderWithProviders } from '../../../test-utils/render.js';
-import { describe, it, expect } from 'vitest';
-import { ToolGroupMessage } from './ToolGroupMessage.js';
-import {
-  makeFakeConfig,
-  CoreToolCallStatus,
-  ApprovalMode,
-  WRITE_FILE_DISPLAY_NAME,
-  Kind,
-} from '@google/gemini-cli-core';
-import os from 'node:os';
-import { createMockSettings } from '../../../test-utils/settings.js';
-import type { IndividualToolCallDisplay } from '../../types.js';
-
-describe('ToolGroupMessage Regression Tests', () => {
-  const baseMockConfig = makeFakeConfig({
-    model: 'gemini-pro',
-    targetDir: os.tmpdir(),
-  });
-  const fullVerbositySettings = createMockSettings({
-    ui: { errorVerbosity: 'full' },
-  });
-
-  const createToolCall = (
-    overrides: Partial<IndividualToolCallDisplay> = {},
-  ): IndividualToolCallDisplay =>
-    ({
-      callId: 'tool-123',
-      name: 'test-tool',
-      status: CoreToolCallStatus.Success,
-      ...overrides,
-    }) as IndividualToolCallDisplay;
-
-  const createItem = (tools: IndividualToolCallDisplay[]) => ({
-    id: 1,
-    type: 'tool_group' as const,
-    tools,
-  });
-
-  it('Plan Mode: suppresses phantom tool group (hidden tools)', async () => {
-    const toolCalls = [
-      createToolCall({
-        name: WRITE_FILE_DISPLAY_NAME,
-        approvalMode: ApprovalMode.PLAN,
-        status: CoreToolCallStatus.Success,
-      }),
-    ];
-    const item = createItem(toolCalls);
-
-    const { lastFrame, unmount } = await renderWithProviders(
-      <ToolGroupMessage
-        terminalWidth={80}
-        item={item}
-        toolCalls={toolCalls}
-        borderBottom={true}
-      />,
-      { config: baseMockConfig, settings: fullVerbositySettings },
-    );
-
-    expect(lastFrame({ allowEmpty: true })).toBe('');
-    unmount();
-  });
-
-  it('Agent Case: suppresses the bottom border box for ongoing agents (no vertical ticks)', async () => {
-    const toolCalls = [
-      createToolCall({
-        name: 'agent',
-        kind: Kind.Agent,
-        status: CoreToolCallStatus.Executing,
-        resultDisplay: {
-          isSubagentProgress: true,
-          agentName: 'TestAgent',
-          state: 'running',
-          recentActivity: [],
-        },
-      }),
-    ];
-    const item = createItem(toolCalls);
-
-    const { lastFrame, unmount } = await renderWithProviders(
-      <ToolGroupMessage
-        terminalWidth={80}
-        item={item}
-        toolCalls={toolCalls}
-        borderBottom={false} // Ongoing
-      />,
-      { config: baseMockConfig, settings: fullVerbositySettings },
-    );
-
-    const output = lastFrame();
-    expect(output).toContain('Running Agent...');
-    // It should render side borders from the content
-    expect(output).toContain('│');
-    // It should NOT render the bottom border box (no corners ╰ ╯)
-    expect(output).not.toContain('╰');
-    expect(output).not.toContain('╯');
-    unmount();
-  });
-
-  it('Agent Case: renders a bottom border horizontal line for completed agents', async () => {
-    const toolCalls = [
-      createToolCall({
-        name: 'agent',
-        kind: Kind.Agent,
-        status: CoreToolCallStatus.Success,
-        resultDisplay: {
-          isSubagentProgress: true,
-          agentName: 'TestAgent',
-          state: 'completed',
-          recentActivity: [],
-        },
-      }),
-    ];
-    const item = createItem(toolCalls);
-
-    const { lastFrame, unmount } = await renderWithProviders(
-      <ToolGroupMessage
-        terminalWidth={80}
-        item={item}
-        toolCalls={toolCalls}
-        borderBottom={true} // Completed
-      />,
-      { config: baseMockConfig, settings: fullVerbositySettings },
-    );
-
-    const output = lastFrame();
-    // Verify it rendered subagent content
-    expect(output).toContain('Agent');
-    // It should render the bottom horizontal line
-    expect(output).toContain(
-      '╰──────────────────────────────────────────────────────────────────────────╯',
-    );
-    unmount();
-  });
-
-  it('Bridges: still renders a bridge if it has a top border', async () => {
-    const toolCalls: IndividualToolCallDisplay[] = [];
-    const item = createItem(toolCalls);
-
-    const { lastFrame, unmount } = await renderWithProviders(
-      <ToolGroupMessage
-        terminalWidth={80}
-        item={item}
-        toolCalls={toolCalls}
-        borderTop={true}
-        borderBottom={true}
-      />,
-      { config: baseMockConfig, settings: fullVerbositySettings },
-    );
-
-    expect(lastFrame({ allowEmpty: true })).not.toBe('');
-    unmount();
-  });
-});
@@ -119,7 +119,6 @@ export const ToolMessage: React.FC<ToolMessageProps> = ({
        borderLeft={true}
        borderRight={true}
        paddingX={1}
-        paddingTop={1}
        flexDirection="column"
      >
        {status === CoreToolCallStatus.Executing && progress !== undefined && (
@@ -15,7 +15,6 @@ import {
  type AnsiOutput,
  type AnsiLine,
  isSubagentProgress,
-  isStructuredToolResult,
 } from '@google/gemini-cli-core';
 import { useUIState } from '../../contexts/UIStateContext.js';
 import { tryParseJSON } from '../../../utils/jsonoutput.js';
@@ -124,28 +123,7 @@ export const ToolResultDisplay: React.FC<ToolResultDisplayProps> = ({
          {contentData}
        </Text>
      );
-    } else if (isStructuredToolResult(contentData)) {
-      if (renderOutputAsMarkdown) {
-        content = (
-          <MarkdownDisplay
-            text={contentData.summary}
-            terminalWidth={childWidth}
-            renderMarkdown={renderMarkdown}
-            isPending={false}
-          />
-        );
-      } else {
-        content = (
-          <Text wrap="wrap" color={theme.text.primary}>
-            {contentData.summary}
-          </Text>
-        );
-      }
-    } else if (
-      typeof contentData === 'object' &&
-      contentData !== null &&
-      'fileDiff' in contentData
-    ) {
+    } else if (typeof contentData === 'object' && 'fileDiff' in contentData) {
      content = (
        <DiffRenderer
          diffContent={
@@ -179,16 +157,10 @@ export const ToolResultDisplay: React.FC<ToolResultDisplayProps> = ({

    // Final render based on session mode
    if (isAlternateBuffer) {
-      // If availableTerminalHeight is undefined, we don't have a fixed budget,
-      // so if maxLines is also undefined, we shouldn't cap the height at all.
-      const effectiveMaxHeight =
-        maxLines ??
-        (availableTerminalHeight !== undefined ? availableHeight : undefined);
-
      return (
        <Scrollable
          width={childWidth}
-          maxHeight={effectiveMaxHeight}
+          maxHeight={maxLines ?? availableHeight}
          hasFocus={hasFocus} // Allow scrolling via keyboard (Shift+Up/Down)
          scrollToBottom={true}
          reportOverflow={true}
@@ -120,10 +120,10 @@ describe('ToolMessage Sticky Header Regression', () => {
      expect(lastFrame()).toContain('tool-1');
    });
    expect(lastFrame()).toContain('Description for tool-1');
-    // Content lines 1-5 should be scrolled off
+    // Content lines 1-4 should be scrolled off
    expect(lastFrame()).not.toContain('c1-01');
-    expect(lastFrame()).not.toContain('c1-05');
-    // Line 6 and 7 should be visible (terminalHeight=5 means 2 lines of content show below 3-line header)
+    expect(lastFrame()).not.toContain('c1-04');
+    // Line 6 and 7 should be visible (terminalHeight=5 means only 2 lines of content show below 3-line header)
    expect(lastFrame()).toContain('c1-06');
    expect(lastFrame()).toContain('c1-07');
    expect(lastFrame()).toMatchSnapshot();
@@ -1,11 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="920" height="37" viewBox="0 0 920 37">
-  <style>
-    text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
-  </style>
-  <rect width="920" height="37" fill="#000000" />
-  <g transform="translate(10, 10)">
-    <text x="18" y="2" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs" font-weight="bold">-</text>
-    <text x="45" y="2" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs" font-weight="bold">read_file </text>
-    <text x="144" y="2" fill="#afafaf" textLength="189" lengthAdjust="spacingAndGlyphs">Reading important.txt</text>
-  </g>
-</svg>
@@ -1,33 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="920" height="88" viewBox="0 0 920 88">
-  <style>
-    text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
-  </style>
-  <rect width="920" height="88" fill="#000000" />
-  <g transform="translate(10, 10)">
-    <text x="18" y="2" fill="#d7ffd7" textLength="9" lengthAdjust="spacingAndGlyphs">✓</text>
-    <text x="45" y="2" fill="#ffffff" textLength="45" lengthAdjust="spacingAndGlyphs" font-weight="bold">edit </text>
-    <text x="99" y="2" fill="#afafaf" textLength="63" lengthAdjust="spacingAndGlyphs">test.ts</text>
-    <text x="171" y="2" fill="#d7afff" textLength="90" lengthAdjust="spacingAndGlyphs">→ Accepted</text>
-    <text x="270" y="2" fill="#afafaf" textLength="9" lengthAdjust="spacingAndGlyphs">(</text>
-    <text x="279" y="2" fill="#d7ffd7" textLength="18" lengthAdjust="spacingAndGlyphs">+1</text>
-    <text x="297" y="2" fill="#afafaf" textLength="18" lengthAdjust="spacingAndGlyphs">, </text>
-    <text x="315" y="2" fill="#ff87af" textLength="18" lengthAdjust="spacingAndGlyphs">-1</text>
-    <text x="333" y="2" fill="#afafaf" textLength="9" lengthAdjust="spacingAndGlyphs">)</text>
-    <rect x="54" y="34" width="9" height="17" fill="#5f0000" />
-    <text x="54" y="36" fill="#afafaf" textLength="9" lengthAdjust="spacingAndGlyphs">1</text>
-    <rect x="63" y="34" width="9" height="17" fill="#5f0000" />
-    <rect x="72" y="34" width="9" height="17" fill="#5f0000" />
-    <text x="72" y="36" fill="#ff87af" textLength="9" lengthAdjust="spacingAndGlyphs">-</text>
-    <rect x="81" y="34" width="9" height="17" fill="#5f0000" />
-    <rect x="90" y="34" width="27" height="17" fill="#5f0000" />
-    <text x="90" y="36" fill="#e5e5e5" textLength="27" lengthAdjust="spacingAndGlyphs">old</text>
-    <rect x="54" y="51" width="9" height="17" fill="#005f00" />
-    <text x="54" y="53" fill="#afafaf" textLength="9" lengthAdjust="spacingAndGlyphs">1</text>
-    <rect x="63" y="51" width="9" height="17" fill="#005f00" />
-    <rect x="72" y="51" width="9" height="17" fill="#005f00" />
-    <text x="72" y="53" fill="#d7ffd7" textLength="9" lengthAdjust="spacingAndGlyphs">+</text>
-    <rect x="81" y="51" width="9" height="17" fill="#005f00" />
-    <rect x="90" y="51" width="27" height="17" fill="#005f00" />
-    <text x="90" y="53" fill="#0000ee" textLength="27" lengthAdjust="spacingAndGlyphs">new</text>
-  </g>
-</svg>
@@ -1,143 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`DenseToolMessage > Toggleable Diff View (Alternate Buffer) > hides diff content by default when in alternate buffer mode 1`] = `
-"  ✓  test-tool  test.ts → Accepted
-"
-`;
-
-exports[`DenseToolMessage > Toggleable Diff View (Alternate Buffer) > shows diff content by default when NOT in alternate buffer mode 1`] = `
-"  ✓  test-tool  test.ts → Accepted
-
-      1 - old line
-      1 + new line
-"
-`;
-
-exports[`DenseToolMessage > Visual Regression > matches SVG snapshot for a Rejected tool call 1`] = `"  -  read_file  Reading important.txt"`;
-
-exports[`DenseToolMessage > Visual Regression > matches SVG snapshot for an Accepted file edit with diff stats 1`] = `
-"  ✓  edit  test.ts → Accepted (+1, -1)
-
-      1 - old
-      1 + new
-"
-`;
-
-exports[`DenseToolMessage > does not render result arrow if resultDisplay is missing 1`] = `
-"  o  test-tool  Test description
-"
-`;
-
-exports[`DenseToolMessage > flattens newlines in string results 1`] = `
-"  ✓  test-tool  Test description → Line 1 Line 2
-"
-`;
-
-exports[`DenseToolMessage > renders correctly for Edit tool using confirmationDetails 1`] = `
-"  ?  Edit  styles.scss → Confirming
-
-      1 - body { color: blue; }
-      1 + body { color: red; }
-"
-`;
-
-exports[`DenseToolMessage > renders correctly for Errored Edit tool 1`] = `
-"  x  Edit  styles.scss → Failed (+1, -1)
-
-      1 - old line
-      1 + new line
-"
-`;
-
-exports[`DenseToolMessage > renders correctly for ReadManyFiles results 1`] = `
-"  ✓  test-tool  Attempting to read files from **/*.ts → Read 3 file(s) (1 ignored)
-
-        file1.ts
-        file2.ts
-        file3.ts
-"
-`;
-
-exports[`DenseToolMessage > renders correctly for Rejected Edit tool 1`] = `
-"  -  Edit  styles.scss → Rejected (+1, -1)
-
-      1 - old line
-      1 + new line
-"
-`;
-
-exports[`DenseToolMessage > renders correctly for Rejected Edit tool with confirmationDetails and diffStat 1`] = `
-"  -  Edit  styles.scss → Rejected (+1, -1)
-
-      1 - body { color: blue; }
-      1 + body { color: red; }
-"
-`;
-
-exports[`DenseToolMessage > renders correctly for Rejected WriteFile tool 1`] = `
-"  -  WriteFile  config.json → Rejected
-
-      1 - old content
-      1 + new content
-"
-`;
-
-exports[`DenseToolMessage > renders correctly for WriteFile tool 1`] = `
-"  ✓  WriteFile  config.json → Accepted (+1, -1)
-
-      1 - old content
-      1 + new content
-"
-`;
-
-exports[`DenseToolMessage > renders correctly for a successful string result 1`] = `
-"  ✓  test-tool  Test description → Success result
-"
-`;
-
-exports[`DenseToolMessage > renders correctly for error status with string message 1`] = `
-"  x  test-tool  Test description → Error occurred
-"
-`;
-
-exports[`DenseToolMessage > renders correctly for file diff results with stats 1`] = `
-"  ✓  test-tool  test.ts → Accepted (+15, -6)
-
-      1 - old line
-      1 + diff content
-"
-`;
-
-exports[`DenseToolMessage > renders correctly for grep results 1`] = `
-"  ✓  test-tool  Test description → Found 2 matches
-
-        file1.ts:10: match 1
-        file2.ts:20: match 2
-"
-`;
-
-exports[`DenseToolMessage > renders correctly for ls results 1`] = `
-"  ✓  test-tool  Test description → Listed 2 files. (1 ignored)
-"
-`;
-
-exports[`DenseToolMessage > renders correctly for todo updates 1`] = `
-"  ✓  test-tool  Test description → Todos updated
-"
-`;
-
-exports[`DenseToolMessage > renders generic failure message for error status without string message 1`] = `
-"  x  test-tool  Test description → Failed
-"
-`;
-
-exports[`DenseToolMessage > renders generic output message for unknown object results 1`] = `
-"  ✓  test-tool  Test description → Returned (possible empty result)
-"
-`;
-
-exports[`DenseToolMessage > truncates long string results 1`] = `
-"  ✓  test-tool  Test description
-   → AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA…
-"
-`;
@@ -4,6 +4,7 @@ exports[`<ShellToolMessage /> > Height Constraints > defaults to ACTIVE_SHELL_MA
 "╭──────────────────────────────────────────────────────────────────────────────╮
 │ ⊶  Shell Command A shell command                                             │
 │                                                                              │
+│ Line 90                                                                      │
 │ Line 91                                                                      │
 │ Line 92                                                                      │
 │ Line 93                                                                      │
@@ -128,6 +129,7 @@ exports[`<ShellToolMessage /> > Height Constraints > respects availableTerminalH
 "╭──────────────────────────────────────────────────────────────────────────────╮
 │ ⊶  Shell Command A shell command                                             │
 │                                                                              │
+│ Line 94                                                                      │
 │ Line 95                                                                      │
 │ Line 96                                                                      │
 │ Line 97                                                                      │
@@ -141,6 +143,7 @@ exports[`<ShellToolMessage /> > Height Constraints > stays constrained in altern
 "╭──────────────────────────────────────────────────────────────────────────────╮
 │ ✓  Shell Command A shell command                                             │
 │                                                                              │
+│ Line 90                                                                      │
 │ Line 91                                                                      │
 │ Line 92                                                                      │
 │ Line 93                                                                      │
@@ -158,6 +161,7 @@ exports[`<ShellToolMessage /> > Height Constraints > uses ACTIVE_SHELL_MAX_LINES
 "╭──────────────────────────────────────────────────────────────────────────────╮
 │ ⊶  Shell Command A shell command                                             │
 │                                                                              │
+│ Line 90                                                                      │
 │ Line 91                                                                      │
 │ Line 92                                                                      │
 │ Line 93                                                                      │
@@ -175,10 +179,11 @@ exports[`<ShellToolMessage /> > Height Constraints > uses full availableTerminal
 "╭──────────────────────────────────────────────────────────────────────────────╮
 │ ⊶  Shell Command A shell command                      (Shift+Tab to unfocus) │
 │                                                                              │
+│ Line 4                                                                       │
 │ Line 5                                                                       │
 │ Line 6                                                                       │
-│ Line 7                                                                       │
-│ Line 8                                                                       │
+│ Line 7                                                                     █ │
+│ Line 8                                                                     █ │
 │ Line 9                                                                     █ │
 │ Line 10                                                                    █ │
 │ Line 11                                                                    █ │
@@ -1,35 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`ToolGroupMessage Compact Rendering > does not add an extra empty line between a compact tool and a standard tool 1`] = `
-"  ✓  ReadFolder  Listing files → file1.txt
-
-╭──────────────────────────────────────────────────────────────────────────╮
-│ ✓  non-compact-tool Doing something                                      │
-│                                                                          │
-│ some large output                                                        │
-╰──────────────────────────────────────────────────────────────────────────╯
-"
-`;
-
-exports[`ToolGroupMessage Compact Rendering > does not add an extra empty line between a standard tool and a compact tool 1`] = `
-"╭──────────────────────────────────────────────────────────────────────────╮
-│ ✓  non-compact-tool Doing something                                      │
-│                                                                          │
-│ some large output                                                        │
-╰──────────────────────────────────────────────────────────────────────────╯
-
-  ✓  ReadFolder  Listing files → file1.txt
-"
-`;
-
-exports[`ToolGroupMessage Compact Rendering > does not add an extra empty line if a compact tool has a dense payload 1`] = `
-"  ✓  ReadFolder  Listing files → file1.txt
-  ✓  ReadFile  Reading file → read file
-"
-`;
-
-exports[`ToolGroupMessage Compact Rendering > renders consecutive compact tools without empty lines between them 1`] = `
-"  ✓  ReadFolder  Listing files → file1.txt file2.txt
-  ✓  ReadFolder  Listing files → file3.txt
-"
-`;
@@ -63,8 +63,7 @@ exports[`<ToolGroupMessage /> > Golden Snapshots > renders empty tool calls arra
 exports[`<ToolGroupMessage /> > Golden Snapshots > renders header when scrolled 1`] = `
 "╭──────────────────────────────────────────────────────────────────────────╮
 │ ✓  tool-1 Description 1. This is a long description that will need to b… │
-│──────────────────────────────────────────────────────────────────────────│                       ▄
-│ line4                                                                    │                       █
+│──────────────────────────────────────────────────────────────────────────│
 │ line5                                                                    │                       █
 │                                                                          │                       █
 │ ✓  tool-2 Description 2                                                  │                       █
@@ -72,7 +71,6 @@ exports[`<ToolGroupMessage /> > Golden Snapshots > renders header when scrolled
 │ line1                                                                    │                       █
 │ line2                                                                    │                       █
 ╰──────────────────────────────────────────────────────────────────────────╯                       █
-                                                                                                   █
 "
 `;

@@ -130,12 +128,12 @@ exports[`<ToolGroupMessage /> > Golden Snapshots > renders tool call with output
 `;

 exports[`<ToolGroupMessage /> > Golden Snapshots > renders two tool groups where only the last line of the previous group is visible 1`] = `
-"╭──────────────────────────────────────────────────────────────────────────╮
+"╰──────────────────────────────────────────────────────────────────────────╯
+╭──────────────────────────────────────────────────────────────────────────╮
 │ ✓  tool-2 Description 2                                                  │
-│                                                                          │
-│ line1                                                                    │                       ▄
+│                                                                          │                       ▄
+│ line1                                                                    │                       █
 ╰──────────────────────────────────────────────────────────────────────────╯                       █
-                                                                                                   █
 "
 `;

@@ -37,7 +37,8 @@ exports[`ToolResultDisplay > renders string result as plain text when renderOutp
 `;

 exports[`ToolResultDisplay > truncates very long string results 1`] = `
-"... 250 hidden (Ctrl+O) ...
+"... 249 hidden (Ctrl+O) ...
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -2,7 +2,7 @@

 exports[`ToolMessage Sticky Header Regression > verifies that ShellToolMessage in a ToolGroupMessage in a ScrollableList has sticky headers 1`] = `
 "╭────────────────────────────────────────────────────────────────────────╮     █
-│ ✓  Shell Command Description for Shell Command                         │     ▀
+│ ✓  Shell Command Description for Shell Command                         │     █
 │                                                                        │
 │ shell-01                                                               │
 │ shell-02                                                               │
@@ -11,7 +11,7 @@ exports[`ToolMessage Sticky Header Regression > verifies that ShellToolMessage i

 exports[`ToolMessage Sticky Header Regression > verifies that ShellToolMessage in a ToolGroupMessage in a ScrollableList has sticky headers 2`] = `
 "╭────────────────────────────────────────────────────────────────────────╮
-│ ✓  Shell Command Description for Shell Command                         │
+│ ✓  Shell Command Description for Shell Command                         │     ▄
 │────────────────────────────────────────────────────────────────────────│     █
 │ shell-06                                                               │     ▀
 │ shell-07                                                               │
@@ -8,7 +8,6 @@ import { render } from '../../../test-utils/render.js';
 import { describe, it, expect } from 'vitest';
 import { SkillsList } from './SkillsList.js';
 import { type SkillDefinition } from '@google/gemini-cli-core';
-import { SKILLS_DOCS_URL } from '../../constants.js';

 describe('SkillsList Component', () => {
  const mockSkills: SkillDefinition[] = [
@@ -75,8 +74,9 @@ describe('SkillsList Component', () => {
      <SkillsList skills={[]} showDescriptions={true} />,
    );
    const output = lastFrame();
-    expect(output).toContain('No skills available.');
-    expect(output).toContain(`Learn how to add skills: ${SKILLS_DOCS_URL}`);
+
+    expect(output).toContain('No skills available');
+
    unmount();
  });

@@ -8,7 +8,6 @@ import type React from 'react';
 import { Box, Text } from 'ink';
 import { theme } from '../../semantic-colors.js';
 import { type SkillDefinition } from '../../types.js';
-import { SKILLS_DOCS_URL } from '../../constants.js';

 interface SkillsListProps {
  skills: readonly SkillDefinition[];
@@ -87,13 +86,7 @@ export const SkillsList: React.FC<SkillsListProps> = ({
      )}

      {skills.length === 0 && (
-        <Box flexDirection="column">
-          <Text color={theme.text.primary}>No skills available.</Text>
-          <Box flexDirection="row">
-            <Text color={theme.text.primary}>Learn how to add skills: </Text>
-            <Text color={theme.text.link}>{SKILLS_DOCS_URL}</Text>
-          </Box>
-        </Box>
+        <Text color={theme.text.primary}> No skills available</Text>
      )}
    </Box>
  );
@@ -58,10 +58,3 @@ export const MIN_TERMINAL_WIDTH_FOR_FULL_LABEL = 100;

 /** Default context usage fraction at which to trigger compression */
 export const DEFAULT_COMPRESSION_THRESHOLD = 0.5;
-
-/** Documentation URL for skills setup and configuration */
-export const SKILLS_DOCS_URL =
-  'https://github.com/google-gemini/gemini-cli/blob/main/docs/cli/skills.md';
-
-/** Max lines to show for a compact tool subview (e.g. diff) */
-export const COMPACT_TOOL_SUBVIEW_MAX_LINES = 15;
@@ -14,7 +14,6 @@ import {
  useKeypressContext,
  ESC_TIMEOUT,
  FAST_RETURN_TIMEOUT,
-  KeypressPriority,
  type Key,
 } from './KeypressContext.js';
 import { terminalCapabilityManager } from '../utils/terminalCapabilityManager.js';
@@ -260,48 +259,6 @@ describe('KeypressContext', () => {
      );
    });

-    it('should stop propagation when a higher priority handler returns true', async () => {
-      const higherPriorityHandler = vi.fn(() => true);
-      const lowerPriorityHandler = vi.fn();
-      const { result } = await renderHookWithProviders(() =>
-        useKeypressContext(),
-      );
-
-      act(() => {
-        result.current.subscribe(higherPriorityHandler, KeypressPriority.High);
-        result.current.subscribe(lowerPriorityHandler, KeypressPriority.Normal);
-      });
-
-      act(() => stdin.write('\x1b[27u'));
-
-      expect(higherPriorityHandler).toHaveBeenCalledWith(
-        expect.objectContaining({ name: 'escape' }),
-      );
-      expect(lowerPriorityHandler).not.toHaveBeenCalled();
-    });
-
-    it('should continue propagation when a higher priority handler does not consume the event', async () => {
-      const higherPriorityHandler = vi.fn(() => false);
-      const lowerPriorityHandler = vi.fn();
-      const { result } = await renderHookWithProviders(() =>
-        useKeypressContext(),
-      );
-
-      act(() => {
-        result.current.subscribe(higherPriorityHandler, KeypressPriority.High);
-        result.current.subscribe(lowerPriorityHandler, KeypressPriority.Normal);
-      });
-
-      act(() => stdin.write('\x1b[27u'));
-
-      expect(higherPriorityHandler).toHaveBeenCalledWith(
-        expect.objectContaining({ name: 'escape' }),
-      );
-      expect(lowerPriorityHandler).toHaveBeenCalledWith(
-        expect.objectContaining({ name: 'escape' }),
-      );
-    });
-
    it('should handle double Escape', async () => {
      const keyHandler = vi.fn();
      const { result } = await renderHookWithProviders(() =>
@@ -4,7 +4,7 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-import { act, useState, useCallback } from 'react';
+import { act } from 'react';
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { renderHook } from '../../test-utils/render.js';
 import { ToolActionsProvider, useToolActions } from './ToolActionsContext.js';
@@ -71,61 +71,16 @@ describe('ToolActionsContext', () => {

  beforeEach(() => {
    vi.clearAllMocks();
-    // Default to a pending promise to avoid unwanted async state updates in tests
-    // that don't specifically test the IdeClient initialization.
-    vi.mocked(IdeClient.getInstance).mockReturnValue(new Promise(() => {}));
  });

-  const WrapperReactComp = ({ children }: { children: React.ReactNode }) => {
-    const [expandedTools, setExpandedTools] = useState<Set<string>>(new Set());
-
-    const isExpanded = useCallback(
-      (callId: string) => expandedTools.has(callId),
-      [expandedTools],
-    );
-
-    const toggleExpansion = useCallback((callId: string) => {
-      setExpandedTools((prev) => {
-        const next = new Set(prev);
-        if (next.has(callId)) {
-          next.delete(callId);
-        } else {
-          next.add(callId);
-        }
-        return next;
-      });
-    }, []);
-
-    const toggleAllExpansion = useCallback((callIds: string[]) => {
-      setExpandedTools((prev) => {
-        const next = new Set(prev);
-        const anyCollapsed = callIds.some((id) => !next.has(id));
-
-        if (anyCollapsed) {
-          callIds.forEach((id) => next.add(id));
-        } else {
-          callIds.forEach((id) => next.delete(id));
-        }
-        return next;
-      });
-    }, []);
-    return (
-      <ToolActionsProvider
-        config={mockConfig}
-        toolCalls={mockToolCalls}
-        isExpanded={isExpanded}
-        toggleExpansion={toggleExpansion}
-        toggleAllExpansion={toggleAllExpansion}
-      >
-        {children}
-      </ToolActionsProvider>
-    );
-  };
+  const wrapper = ({ children }: { children: React.ReactNode }) => (
+    <ToolActionsProvider config={mockConfig} toolCalls={mockToolCalls}>
+      {children}
+    </ToolActionsProvider>
+  );

  it('publishes to MessageBus for tools with correlationId', async () => {
-    const { result } = await renderHook(() => useToolActions(), {
-      wrapper: WrapperReactComp,
-    });
+    const { result } = await renderHook(() => useToolActions(), { wrapper });

    await result.current.confirm(
      'modern-call',
@@ -143,9 +98,7 @@ describe('ToolActionsContext', () => {
  });

  it('handles cancel by calling confirm with Cancel outcome', async () => {
-    const { result } = await renderHook(() => useToolActions(), {
-      wrapper: WrapperReactComp,
-    });
+    const { result } = await renderHook(() => useToolActions(), { wrapper });

    await result.current.cancel('modern-call');

@@ -174,9 +127,7 @@ describe('ToolActionsContext', () => {
    );
    vi.mocked(mockConfig.getIdeMode).mockReturnValue(true);

-    const { result } = await renderHook(() => useToolActions(), {
-      wrapper: WrapperReactComp,
-    });
+    const { result } = await renderHook(() => useToolActions(), { wrapper });

    await act(async () => {
      deferredIdeClient.resolve(mockIdeClient);
@@ -218,9 +169,7 @@ describe('ToolActionsContext', () => {
    );
    vi.mocked(mockConfig.getIdeMode).mockReturnValue(true);

-    const { result } = await renderHook(() => useToolActions(), {
-      wrapper: WrapperReactComp,
-    });
+    const { result } = await renderHook(() => useToolActions(), { wrapper });

    await act(async () => {
      deferredIdeClient.resolve(mockIdeClient);
@@ -265,13 +214,7 @@ describe('ToolActionsContext', () => {

    const { result } = await renderHook(() => useToolActions(), {
      wrapper: ({ children }) => (
-        <ToolActionsProvider
-          config={mockConfig}
-          toolCalls={[legacyTool]}
-          isExpanded={vi.fn().mockReturnValue(false)}
-          toggleExpansion={vi.fn()}
-          toggleAllExpansion={vi.fn()}
-        >
+        <ToolActionsProvider config={mockConfig} toolCalls={[legacyTool]}>
          {children}
        </ToolActionsProvider>
      ),
@@ -290,58 +233,4 @@ describe('ToolActionsContext', () => {
    );
    expect(mockMessageBus.publish).not.toHaveBeenCalled();
  });
-
-  describe('toggleAllExpansion', () => {
-    it('expands all when none are expanded', async () => {
-      const { result } = await renderHook(() => useToolActions(), {
-        wrapper: WrapperReactComp,
-      });
-
-      act(() => {
-        result.current.toggleAllExpansion(['modern-call', 'edit-call']);
-      });
-
-      expect(result.current.isExpanded('modern-call')).toBe(true);
-      expect(result.current.isExpanded('edit-call')).toBe(true);
-    });
-
-    it('expands all when some are expanded', async () => {
-      const { result } = await renderHook(() => useToolActions(), {
-        wrapper: WrapperReactComp,
-      });
-
-      act(() => {
-        result.current.toggleExpansion('modern-call');
-      });
-      expect(result.current.isExpanded('modern-call')).toBe(true);
-      expect(result.current.isExpanded('edit-call')).toBe(false);
-
-      act(() => {
-        result.current.toggleAllExpansion(['modern-call', 'edit-call']);
-      });
-
-      expect(result.current.isExpanded('modern-call')).toBe(true);
-      expect(result.current.isExpanded('edit-call')).toBe(true);
-    });
-
-    it('collapses all when all are expanded', async () => {
-      const { result } = await renderHook(() => useToolActions(), {
-        wrapper: WrapperReactComp,
-      });
-
-      act(() => {
-        result.current.toggleExpansion('modern-call');
-        result.current.toggleExpansion('edit-call');
-      });
-      expect(result.current.isExpanded('modern-call')).toBe(true);
-      expect(result.current.isExpanded('edit-call')).toBe(true);
-
-      act(() => {
-        result.current.toggleAllExpansion(['modern-call', 'edit-call']);
-      });
-
-      expect(result.current.isExpanded('modern-call')).toBe(false);
-      expect(result.current.isExpanded('edit-call')).toBe(false);
-    });
-  });
 });
@@ -48,14 +48,11 @@ interface ToolActionsContextValue {
  ) => Promise<void>;
  cancel: (callId: string) => Promise<void>;
  isDiffingEnabled: boolean;
-  isExpanded: (callId: string) => boolean;
-  toggleExpansion: (callId: string) => void;
-  toggleAllExpansion: (callIds: string[]) => void;
 }

 const ToolActionsContext = createContext<ToolActionsContextValue | null>(null);

-export const useToolActions = (): ToolActionsContextValue => {
+export const useToolActions = () => {
  const context = useContext(ToolActionsContext);
  if (!context) {
    throw new Error('useToolActions must be used within a ToolActionsProvider');
@@ -67,22 +64,12 @@ interface ToolActionsProviderProps {
  children: React.ReactNode;
  config: Config;
  toolCalls: IndividualToolCallDisplay[];
-  isExpanded: (callId: string) => boolean;
-  toggleExpansion: (callId: string) => void;
-  toggleAllExpansion: (callIds: string[]) => void;
 }

 export const ToolActionsProvider: React.FC<ToolActionsProviderProps> = (
  props: ToolActionsProviderProps,
 ) => {
-  const {
-    children,
-    config,
-    toolCalls,
-    isExpanded,
-    toggleExpansion,
-    toggleAllExpansion,
-  } = props;
+  const { children, config, toolCalls } = props;

  // Hoist IdeClient logic here to keep UI pure
  const [ideClient, setIdeClient] = useState<IdeClient | null>(null);
@@ -90,23 +77,24 @@ export const ToolActionsProvider: React.FC<ToolActionsProviderProps> = (

  useEffect(() => {
    let isMounted = true;
-    let activeClient: IdeClient | null = null;
-
-    const handleStatusChange = () => {
-      if (isMounted && activeClient) {
-        setIsDiffingEnabled(activeClient.isDiffingEnabled());
-      }
-    };
-
    if (config.getIdeMode()) {
      IdeClient.getInstance()
        .then((client) => {
          if (!isMounted) return;
-          activeClient = client;
          setIdeClient(client);
          setIsDiffingEnabled(client.isDiffingEnabled());

+          const handleStatusChange = () => {
+            if (isMounted) {
+              setIsDiffingEnabled(client.isDiffingEnabled());
+            }
+          };
+
          client.addStatusChangeListener(handleStatusChange);
+          // Return a cleanup function for the listener
+          return () => {
+            client.removeStatusChangeListener(handleStatusChange);
+          };
        })
        .catch((error) => {
          debugLogger.error('Failed to get IdeClient instance:', error);
@@ -114,9 +102,6 @@ export const ToolActionsProvider: React.FC<ToolActionsProviderProps> = (
    }
    return () => {
      isMounted = false;
-      if (activeClient) {
-        activeClient.removeStatusChangeListener(handleStatusChange);
-      }
    };
  }, [config]);

@@ -179,16 +164,7 @@ export const ToolActionsProvider: React.FC<ToolActionsProviderProps> = (
  );

  return (
-    <ToolActionsContext.Provider
-      value={{
-        confirm,
-        cancel,
-        isDiffingEnabled,
-        isExpanded,
-        toggleExpansion,
-        toggleAllExpansion,
-      }}
-    >
+    <ToolActionsContext.Provider value={{ confirm, cancel, isDiffingEnabled }}>
      {children}
    </ToolActionsContext.Provider>
  );
@@ -180,7 +180,6 @@ export interface UIState {
  contextFileNames: string[];
  errorCount: number;
  availableTerminalHeight: number | undefined;
-  stableControlsHeight: number;
  mainAreaWidth: number;
  staticAreaMaxItemHeight: number;
  staticExtraHeight: number;
@@ -191,7 +190,7 @@ export interface UIState {
  sessionStats: SessionStatsState;
  terminalWidth: number;
  terminalHeight: number;
-  mainControlsRef: React.RefCallback<DOMElement | null>;
+  mainControlsRef: React.MutableRefObject<DOMElement | null>;
  // NOTE: This is for performance profiling only.
  rootUiRef: React.MutableRefObject<DOMElement | null>;
  currentIDE: IdeInfo | null;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mark McLaughlin	7898f5bbbb	fix(theme): update color values in richLightTheme and richDarkTheme for improved contrast	2026-03-24 16:49:20 -07:00
Mark McLaughlin	090b5ae485	fix(theme): add gradient colors to richLightTheme definition	2026-03-24 16:31:33 -07:00
Mark McLaughlin	bd60fb3590	fix(theme): update true color detection logic for terminal compatibility	2026-03-24 16:31:33 -07:00
Mark McLaughlin	8027e6113d	Merge branch 'main' into fix/default-theme-256	2026-03-24 15:41:15 -07:00
Mark McLaughlin	a20db9bb12	Merge branch 'main' into fix/default-theme-256	2026-03-24 15:17:10 -07:00
Mark McLaughlin	aa48d824a5	fix(theme): remove trailing whitespace in safeLightTheme definition	2026-03-24 15:09:20 -07:00
Mark McLaughlin	37dd8798ee	feat(theme): introduce safe and rich themes with true color support	2026-03-24 14:19:36 -07:00