Add complex HTML modification behavioral test

move exit code above other parts when tool fails

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

@@ -1,142 +1,64 @@
 # Gemini CLI Strict Development Rules
 
-These rules apply strictly to all code modifications and additions within the
-Gemini CLI project.
+These rules apply strictly to all code modifications and additions within the Gemini CLI project.
 
 ## Testing Guidelines
 
-- **Async/Await**: Always use `waitFor` from
-  `packages/cli/src/test-utils/async.ts` instead of `vi.waitFor` for all
-  `waitFor` calls within `packages/cli`. NEVER use fixed waits (e.g.,
-  `await delay(100)`). Always use `waitFor` with a predicate to ensure tests are
-  stable and fast. Using the wrong `waitFor` can result in flaky tests and `act`
-  warnings.
-- **React Testing**: Use `act` to wrap all blocks in tests that change component
-  state. Use `render` or `renderWithProviders` from
-  `packages/cli/src/test-utils/render.tsx` instead of `render` from
-  `ink-testing-library` directly. This prevents spurious `act` warnings. If test
-  cases specify providers directly, consider whether the existing
-  `renderWithProviders` should be modified.
-- **Snapshots**: Use `toMatchSnapshot` to verify that rendering works as
-  expected rather than matching against the raw content of the output. When
-  modifying snapshots, verify the changes are intentional and do not hide
-  underlying bugs.
-- **Parameterized Tests**: Use parameterized tests where it reduces duplicated
-  lines. Give the parameters explicit types to ensure the tests are type-safe.
-- **Mocks Management**:
-  - Mock critical dependencies (`fs`, `os`, `child_process`) ONLY at the top of
-    the file. Ideally, avoid mocking these dependencies altogether.
-  - Reuse existing mocks and fakes rather than creating new ones.
-  - Avoid mocking the file system whenever possible. If using the real file
-    system is too difficult, consider writing an integration test instead.
-  - Always call `vi.restoreAllMocks()` in `afterEach` to prevent test pollution.
-  - Use `vi.useFakeTimers()` for tests involving time-based logic to avoid
-    flakiness.
-- **Typing in Tests**: Avoid using `any` in tests; prefer proper types or
-  `unknown` with narrowing.
+*   **Async/Await**: Always use `waitFor` from `packages/cli/src/test-utils/async.ts` instead of `vi.waitFor` for all `waitFor` calls within `packages/cli`. NEVER use fixed waits (e.g., `await delay(100)`). Always use `waitFor` with a predicate to ensure tests are stable and fast. Using the wrong `waitFor` can result in flaky tests and `act` warnings.
+*   **React Testing**: Use `act` to wrap all blocks in tests that change component state. Use `render` or `renderWithProviders` from `packages/cli/src/test-utils/render.tsx` instead of `render` from `ink-testing-library` directly. This prevents spurious `act` warnings. If test cases specify providers directly, consider whether the existing `renderWithProviders` should be modified.
+*   **Snapshots**: Use `toMatchSnapshot` to verify that rendering works as expected rather than matching against the raw content of the output. When modifying snapshots, verify the changes are intentional and do not hide underlying bugs.
+*   **Parameterized Tests**: Use parameterized tests where it reduces duplicated lines. Give the parameters explicit types to ensure the tests are type-safe.
+*   **Mocks Management**:
+    *   Mock critical dependencies (`fs`, `os`, `child_process`) ONLY at the top of the file. Ideally, avoid mocking these dependencies altogether.
+    *   Reuse existing mocks and fakes rather than creating new ones.
+    *   Avoid mocking the file system whenever possible. If using the real file system is too difficult, consider writing an integration test instead.
+    *   Always call `vi.restoreAllMocks()` in `afterEach` to prevent test pollution.
+    *   Use `vi.useFakeTimers()` for tests involving time-based logic to avoid flakiness.
+*   **Typing in Tests**: Avoid using `any` in tests; prefer proper types or `unknown` with narrowing.
 
 ## React Guidelines (`packages/cli`)
 
-- **`setState` and Side Effects**: NEVER trigger side effects from within the
-  body of a `setState` callback. Use a reducer or `useRef` if necessary. These
-  cases have historically introduced multiple bugs; typically, they should be
-  resolved using a reducer.
-- **Rendering**: Do not introduce infinite rendering loops. Avoid synchronous
-  file I/O in React components as it will hang the UI. Do not implement new
-  logic for custom string measurement or string truncation. Use Ink layout
-  instead, leveraging `ResizeObserver` as needed.
-- **Keyboard Handling**: Keyboard handling MUST go through `useKeyPress.ts` from
-  the Gemini CLI package rather than the standard ink library. This library
-  supports reporting multiple keyboard events sequentially in the same React
-  frame (critical for slow terminals). Handling this correctly often requires
-  reducers to ensure multiple state updates are handled gracefully without
-  overriding values. Refer to `text-buffer.ts` for a canonical example.
-- **Logging**: Do not leave `console.log`, `console.warn`, or `console.error` in
-  the code.
-- **State & Effects**: Ensure state initialization is explicit (e.g., use
-  `undefined` rather than `true` as a default if the state is truly unknown).
-  Carefully manage `useEffect` dependencies. Prefer a reducer whenever
-  practical. NEVER disable `react-hooks/exhaustive-deps`; fix the code to
-  correctly declare dependencies instead.
-- **Context & Props**: Avoid excessive property drilling. Leverage existing
-  providers, extend them, or propose a new one if necessary. Only use providers
-  for properties that are consistent across the entire application.
-- **Code Structure**: Avoid complex `if` statements where `switch` statements
-  could be used. Keep `AppContainer` minimal; refactor complex logic into React
-  hooks. Evaluate whether business logic should be added to `hookSystem.ts` or
-  integrated into `packages/core` rather than `packages/cli`.
+*   **`setState` and Side Effects**: NEVER trigger side effects from within the body of a `setState` callback. Use a reducer or `useRef` if necessary. These cases have historically introduced multiple bugs; typically, they should be resolved using a reducer.
+*   **Rendering**: Do not introduce infinite rendering loops. Avoid synchronous file I/O in React components as it will hang the UI. Do not implement new logic for custom string measurement or string truncation. Use Ink layout instead, leveraging `ResizeObserver` as needed.
+*   **Keyboard Handling**: Keyboard handling MUST go through `useKeyPress.ts` from the Gemini CLI package rather than the standard ink library. This library supports reporting multiple keyboard events sequentially in the same React frame (critical for slow terminals). Handling this correctly often requires reducers to ensure multiple state updates are handled gracefully without overriding values. Refer to `text-buffer.ts` for a canonical example.
+*   **Logging**: Do not leave `console.log`, `console.warn`, or `console.error` in the code.
+*   **State & Effects**: Ensure state initialization is explicit (e.g., use `undefined` rather than `true` as a default if the state is truly unknown). Carefully manage `useEffect` dependencies. Prefer a reducer whenever practical. NEVER disable `react-hooks/exhaustive-deps`; fix the code to correctly declare dependencies instead.
+*   **Context & Props**: Avoid excessive property drilling. Leverage existing providers, extend them, or propose a new one if necessary. Only use providers for properties that are consistent across the entire application.
+*   **Code Structure**: Avoid complex `if` statements where `switch` statements could be used. Keep `AppContainer` minimal; refactor complex logic into React hooks. Evaluate whether business logic should be added to `hookSystem.ts` or integrated into `packages/core` rather than `packages/cli`.
 
 ## Core Guidelines (`packages/core`)
 
-- **Services**: Implement services as classes with clear lifecycle management
-  (e.g., `initialize()` methods). Services should be stateless where possible,
-  or use the centralized `Storage` service for persistence.
-- **Cross-Service Communication**: Prefer using the `coreEvents` bus (from
-  `packages/core/src/utils/events.ts`) for asynchronous communication between
-  services or to notify the UI of state changes. Avoid tight coupling between
-  services.
-- **Utilities**: Use `debugLogger` from `packages/core/src/utils/debugLogger.ts`
-  for internal logging instead of `console`. Ensure all shell operations use
-  `spawnAsync` from `packages/core/src/utils/shell-utils.ts` for consistent
-  error handling and promise management. Handle filesystem errors gracefully
-  using `isNodeError` from `packages/core/src/utils/errors.ts`.
-- **Exports & Tooling**: Add new tools to `packages/core/src/tools/` and
-  register them in `packages/core/src/tools/tool-registry.ts`. Export all new
-  public services, utilities, and types from `packages/core/src/index.ts`.
+*   **Services**: Implement services as classes with clear lifecycle management (e.g., `initialize()` methods). Services should be stateless where possible, or use the centralized `Storage` service for persistence.
+*   **Cross-Service Communication**: Prefer using the `coreEvents` bus (from `packages/core/src/utils/events.ts`) for asynchronous communication between services or to notify the UI of state changes. Avoid tight coupling between services.
+*   **Utilities**: Use `debugLogger` from `packages/core/src/utils/debugLogger.ts` for internal logging instead of `console`. Ensure all shell operations use `spawnAsync` from `packages/core/src/utils/shell-utils.ts` for consistent error handling and promise management. Handle filesystem errors gracefully using `isNodeError` from `packages/core/src/utils/errors.ts`.
+*   **Exports & Tooling**: Add new tools to `packages/core/src/tools/` and register them in `packages/core/src/tools/tool-registry.ts`. Export all new public services, utilities, and types from `packages/core/src/index.ts`.
 
 ## Architectural Audit (Package Boundaries)
 
-- **Logic Placement**: Non-UI logic (e.g., model orchestration, tool
-  implementation, git/filesystem operations) MUST reside in `packages/core`.
-  `packages/cli` should ONLY contain UI/Ink components, command-line argument
-  parsing, and user interaction logic.
-- **Environment Isolation**: Core logic must not assume a TUI environment. Use
-  the `ConfirmationBus` or `Output` abstractions for communicating with the user
-  from Core.
-- **Decoupling**: Actively look for opportunities to decouple services using
-  `coreEvents`. If a service imports another just to notify it of a change, use
-  an event instead.
+*   **Logic Placement**: Non-UI logic (e.g., model orchestration, tool implementation, git/filesystem operations) MUST reside in `packages/core`. `packages/cli` should ONLY contain UI/Ink components, command-line argument parsing, and user interaction logic.
+*   **Environment Isolation**: Core logic must not assume a TUI environment. Use the `ConfirmationBus` or `Output` abstractions for communicating with the user from Core.
+*   **Decoupling**: Actively look for opportunities to decouple services using `coreEvents`. If a service imports another just to notify it of a change, use an event instead.
 
 ## General Gemini CLI Design Principles
 
-- **Settings**: Use settings for user-configurable options rather than adding
-  new command line arguments. Add new settings to
-  `packages/cli/src/config/settingsSchema.ts`. If a setting has
-  `showInDialog: true`, it MUST be documented in
-  `docs/get-started/configuration.md`. Ensure `requiresRestart` is correctly
-  set.
-- **Logging**: Use `debugLogger` for rethrown errors to avoid duplicate logging.
-- **Keyboard Shortcuts**: Define all new keyboard shortcuts in
-  `packages/cli/src/config/keyBindings.ts` and document them in
-  `docs/cli/keyboard-shortcuts.md`. Be careful of keybindings that require the
-  `Meta` key, as only certain meta key shortcuts are supported on Mac. Avoid
-  function keys and shortcuts commonly bound in VSCode.
+*   **Settings**: Use settings for user-configurable options rather than adding new command line arguments. Add new settings to `packages/cli/src/config/settingsSchema.ts`. If a setting has `showInDialog: true`, it MUST be documented in `docs/get-started/configuration.md`. Ensure `requiresRestart` is correctly set.
+*   **Logging**: Use `debugLogger` for rethrown errors to avoid duplicate logging.
+*   **Keyboard Shortcuts**: Define all new keyboard shortcuts in `packages/cli/src/config/keyBindings.ts` and document them in `docs/cli/keyboard-shortcuts.md`. Be careful of keybindings that require the `Meta` key, as only certain meta key shortcuts are supported on Mac. Avoid function keys and shortcuts commonly bound in VSCode.
 
 ## TypeScript Best Practices
 
-- Use `checkExhaustive` in the `default` clause of `switch` statements to ensure
-  all cases are handled.
-- Avoid using the non-null assertion operator (`!`) unless absolutely necessary.
-- **STRICT TYPING**: Strictly forbid `any` and `unknown` in both CLI and Core
-  packages. `unknown` is only allowed if it is immediately narrowed using type
-  guards or Zod validation.
-- NEVER disable `@typescript-eslint/no-floating-promises`.
-- Avoid making types nullable unless strictly necessary, as it hurts
-  readability.
+*   Use `checkExhaustive` in the `default` clause of `switch` statements to ensure all cases are handled.
+*   Avoid using the non-null assertion operator (`!`) unless absolutely necessary.
+*   **STRICT TYPING**: Strictly forbid `any` and `unknown` in both CLI and Core packages. `unknown` is only allowed if it is immediately narrowed using type guards or Zod validation.
+*   NEVER disable `@typescript-eslint/no-floating-promises`.
+*   Avoid making types nullable unless strictly necessary, as it hurts readability.
 
 ## TUI Best Practices
 
-- **Terminal Compatibility**: Consider how changes might behave differently
-  across terminals (e.g., VSCode terminal, SSH, Kitty, default Mac terminal,
-  iTerm2, Windows terminal). If modifying keyboard handling, integrate deeply
-  with existing files like `KeypressContext.tsx` and
-  `terminalCapabilityManager.ts`.
-- **iTerm**: Be aware that `ITERM_SESSION_ID` may be present when users run
-  VSCode from within iTerm, even if the terminal is not iTerm.
+*   **Terminal Compatibility**: Consider how changes might behave differently across terminals (e.g., VSCode terminal, SSH, Kitty, default Mac terminal, iTerm2, Windows terminal). If modifying keyboard handling, integrate deeply with existing files like `KeypressContext.tsx` and `terminalCapabilityManager.ts`.
+*   **iTerm**: Be aware that `ITERM_SESSION_ID` may be present when users run VSCode from within iTerm, even if the terminal is not iTerm.
 
 ## Code Cleanup
 
-- **Refactoring**: Actively clean up code duplication, technical debt, and
-  boilerplate ("AI Slop") when working in the codebase.
-- **Prompts**: Be aware that changes can impact the prompts sent to Gemini CLI
-  and affect overall quality.
+*   **Refactoring**: Actively clean up code duplication, technical debt, and boilerplate ("AI Slop") when working in the codebase.
+*   **Prompts**: Be aware that changes can impact the prompts sent to Gemini CLI and affect overall quality.

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

@@ -109,41 +109,23 @@ detailed **highlights** section for the release-specific page.
 
 - **Target File**: `docs/changelogs/latest.md`
 - Perform the following edits on the target file:
-    1.  Update the version in the main header. The line should read,
-        `# Latest stable release: {{version}}`
-    2.  Update the rease date. The line should read,
-        `Released: {{release_date_month_dd_yyyy}}`
+    1.  Update the version in the main header.
+    2.  Update the "Released:" date.
     3.  **Prepend** the processed "What's Changed" list from the temporary file
-        to the existing "What's Changed" list in `latest.md`. Do not change or
-        replace the existing list, **only add** to the beginning of it.
-    4.  In the "Full Changelog", edit **only** the end of the URL. Identify the
-        last part of the URL that looks like `...{previous_version}` and update
-        it to be `...{version}`.
-
-        Example: assume the patch version is `v0.29.1`. Change
-        `Full Changelog: https://github.com/google-gemini/gemini-cli/compare/v0.28.2…v0.29.0`
-        to
-        `Full Changelog: https://github.com/google-gemini/gemini-cli/compare/v0.28.2…v0.29.1`
+        to the existing "What's Changed" list in the file.
+    4.  In the "Full Changelog" URL, replace only the trailing version with the
+        new patch version.
 
 ### B.2: Preview Patch (e.g., `v0.29.0-preview.3`)
 
 - **Target File**: `docs/changelogs/preview.md`
 - Perform the following edits on the target file:
-    1.  Update the version in the main header. The line should read,
-        `# Preview release: {{version}}`
-    2.  Update the rease date. The line should read,
-        `Released: {{release_date_month_dd_yyyy}}`
+    1.  Update the version in the main header.
+    2.  Update the "Released:" date.
     3.  **Prepend** the processed "What's Changed" list from the temporary file
-        to the existing "What's Changed" list in `preview.md`. Do not change or
-        replace the existing list, **only add** to the beginning of it.
-    4.  In the "Full Changelog", edit **only** the end of the URL. Identify the
-        last part of the URL that looks like `...{previous_version}` and update
-        it to be `...{version}`.
-
-        Example: assume the patch version is `v0.29.0-preview.1`. Change
-        `Full Changelog: https://github.com/google-gemini/gemini-cli/compare/v0.28.2…v0.29.0-preview.0`
-        to
-        `Full Changelog: https://github.com/google-gemini/gemini-cli/compare/v0.28.2…v0.29.0-preview.1`
+        to the existing "What's Changed" list in the file.
+    4.  In the "Full Changelog" URL, replace only the trailing version with the
+        new patch version.
 
 ---
 

.gemini/skills/pr-address-comments/SKILL.md

@@ -1,13 +0,0 @@
----
-name: pr-address-comments
-description: Use this skill if the user asks you to help them address GitHub PR comments for their current branch of the Gemini CLI. Requires `gh` CLI tool.
----
-You are helping the user address comments on their Pull Request. These comments may have come from an automated review agent or a team member.
-
-OBJECTIVE: Help the user review and address comments on their PR.
-
-# Comment Review Procedure
-
-1. Run the `scripts/fetch-pr-info.js` script to get PR info and state. MAKE SURE you read the entire output of the command, even if it gets truncated.
-2. Summarize the review status by analyzing the diff, commit log, and comments to see which still need to be addressed. Pay attention to the current user's comments. For resolved threads, summarize as a single line with a ✅. For open threads, provide a reference number e.g. [1] and the comment content.
-3. Present your summary of the feedback and current state and allow the user to guide you as to what to fix/address/skip. DO NOT begin fixing issues automatically.

.gemini/skills/pr-address-comments/scripts/fetch-pr-info.js

@@ -1,160 +0,0 @@
-#!/usr/bin/env node
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/* eslint-env node */
-/* global console, process */
-
-import { exec } from 'node:child_process';
-import { promisify } from 'node:util';
-
-const execAsync = promisify(exec);
-
-async function run(cmd) {
-  try {
-    const { stdout } = await execAsync(cmd, {
-      encoding: 'utf8',
-      stdio: ['pipe', 'pipe', 'ignore'],
-    });
-    return stdout.trim();
-  } catch (_e) { // eslint-disable-line @typescript-eslint/no-unused-vars
-    return null;
-  }
-}
-
-const IGNORE_MESSAGES = [
-  'thank you so much for your contribution to Gemini CLI!',
-  "I'm currently reviewing this pull request and will post my feedback shortly.",
-  'This pull request is being closed because it is not currently linked to an issue.',
-];
-
-const shouldIgnore = (body) => {
-  if (!body) return false;
-  return IGNORE_MESSAGES.some((msg) => body.includes(msg));
-};
-
-async function main() {
-  const branch = await run('git branch --show-current');
-  if (!branch) {
-    console.error('❌ Could not determine current git branch.');
-    process.exit(1);
-  }
-
-  const gqlQuery = `query($branch:String!){repository(name:"gemini-cli",owner:"google-gemini"){pullRequests(headRefName:$branch,first:100){nodes{id,number,state,comments(first:100){nodes{createdAt,isMinimized,minimizedReason,author{login},body,url,authorAssociation}},reviews(first:100){nodes{id,author{login},createdAt,isMinimized,minimizedReason,body,state,comments(first:30){nodes{id,replyTo{id},author{login},createdAt,body,isMinimized,minimizedReason,path,line,startLine,originalLine,originalStartLine}}}}}}}}`;
-
-  const [authInfo, diff, commits, rawJson] = await Promise.all([
-    run('gh auth status -a'),
-    run('gh pr diff'),
-    run(
-      'git fetch && git log origin/main..origin/$(git branch --show-current)',
-    ),
-    run(`gh api graphql -F branch="${branch}" -f query='${gqlQuery}'`),
-  ]);
-
-  if (!diff) {
-    console.error(`⚠️ No active PR found for branch: ${branch}`);
-    process.exit(1);
-  }
-
-  console.log(`\n# Current GitHub user info:\n\n${authInfo}\n`);
-  console.log(`\n# PR diff for current branch: ${branch}\n\n\`\`\``);
-  console.log(diff);
-  console.log('```');
-  console.log(
-    `\n# Commit history (origin/main..origin/${branch})\n\n${commits}`,
-  );
-
-  const data = JSON.parse(rawJson || '{}');
-  const prs = data?.data?.repository?.pullRequests?.nodes || [];
-
-  // Sort PRs by number descending so we check the newest one first
-  prs.sort((a, b) => b.number - a.number);
-
-  const pr = prs.find((p) => p.state === 'OPEN') || prs[0];
-
-  if (!pr) {
-    console.error('❌ No PR data found.');
-    process.exit(1);
-  }
-
-  console.log('\n# PR Feedback\n');
-
-  // 1. General PR Comments
-  const general = pr.comments.nodes.filter((c) => !shouldIgnore(c.body));
-  if (general.length > 0) {
-    console.log('\n💬 GENERAL COMMENTS:');
-    general.forEach((c) => {
-      const minimized = c.isMinimized
-        ? ` (Minimized: ${c.minimizedReason})`
-        : '';
-      console.log(
-        `[${c.createdAt}] [${c.author.login}]${minimized}: ${c.body}\n`,
-      );
-    });
-  }
-
-  // 2. Process ALL Review Comments into a single Thread Map
-  const allInlineComments = pr.reviews.nodes.flatMap((r) => r.comments.nodes);
-  const filteredInlines = allInlineComments.filter(
-    (c) => !shouldIgnore(c.body),
-  );
-
-  console.log('🔍 CODE REVIEWS & INLINE THREADS:');
-
-  // Print Review Summaries First
-  pr.reviews.nodes.forEach((review) => {
-    if (review.body && !shouldIgnore(review.body)) {
-      const icon = review.state === 'APPROVED' ? '✅' : '💬';
-      const minimized = review.isMinimized
-        ? ` (Minimized: ${review.minimizedReason})`
-        : '';
-      console.log(
-        `\n${icon} ${review.state} by ${review.author.login} at ${review.createdAt}${minimized}: "${review.body}"`,
-      );
-    }
-  });
-
-  // Build and Print Threads
-  const topLevelThreads = filteredInlines.filter((c) => !c.replyTo);
-
-  const printThread = (parentId, depth = 1) => {
-    const indent = '  '.repeat(depth);
-    filteredInlines
-      .filter((c) => c.replyTo?.id === parentId)
-      .forEach((reply) => {
-        const minimized = reply.isMinimized
-          ? ` (Minimized: ${reply.minimizedReason})`
-          : '';
-        console.log(
-          `${indent}↳ [${reply.createdAt}] ${reply.author.login}${minimized}: ${reply.body}`,
-        );
-        printThread(reply.id, depth + 1);
-      });
-  };
-
-  topLevelThreads.forEach((c) => {
-    const start = c.startLine || c.originalStartLine;
-    const end = c.line || c.originalLine;
-    const range = start && end && start !== end ? `${start}-${end}` : end || '';
-    const fileInfo = c.path
-      ? `(${c.path}${range ? `:${range}` : ''}) `
-      : range
-        ? `(Line ${range}) `
-        : '';
-    const minimized = c.isMinimized ? ` (Minimized: ${c.minimizedReason})` : '';
-    console.log(
-      `\n💬 ${minimized}${c.author.login} | ${c.createdAt} ${fileInfo}\n${c.body}`,
-    );
-    printThread(c.id);
-  });
-
-  console.log('\n');
-}
-
-main().catch((err) => {
-  console.error('❌ Unexpected error:', err);
-  process.exit(1);
-});

.github/workflows/gemini-automated-issue-triage.yml

@@ -284,21 +284,8 @@ jobs:
                   return;
                 }
               } else {
-                // If no markdown block, try to find a raw JSON object in the output.
-                // The CLI may include debug/log lines (e.g. telemetry init, YOLO mode)
-                // before the actual JSON response.
-                const jsonObjectMatch = rawOutput.match(/(\{[\s\S]*"labels_to_set"[\s\S]*\})/);
-                if (jsonObjectMatch) {
-                  try {
-                    parsedLabels = JSON.parse(jsonObjectMatch[0]);
-                  } catch (extractError) {
-                    core.setFailed(`Found JSON-like content but failed to parse: ${extractError.message}\nRaw output: ${rawOutput}`);
-                    return;
-                  }
-                } else {
-                  core.setFailed(`Output is not valid JSON and does not contain extractable JSON.\nRaw output: ${rawOutput}`);
-                  return;
-                }
+                core.setFailed(`Output is not valid JSON and does not contain a JSON markdown block.\nRaw output: ${rawOutput}`);
+                return;
               }
             }
 

.gitignore

@@ -46,7 +46,6 @@ packages/*/coverage/
 # Generated files
 packages/cli/src/generated/
 packages/core/src/generated/
-packages/devtools/src/_client-assets.ts
 .integration-tests/
 packages/vscode-ide-companion/*.vsix
 packages/cli/download-ripgrep*/

CONTRIBUTING.md

@@ -546,7 +546,7 @@ Before submitting your documentation pull request, please:
 
 If you have questions about contributing documentation:
 
-- Check our [FAQ](/docs/resources/faq.md).
+- Check our [FAQ](/docs/faq.md).
 - Review existing documentation for examples.
 - Open [an issue](https://github.com/google-gemini/gemini-cli/issues) to discuss
   your proposed changes.

docs/architecture.md

@@ -0,0 +1,80 @@
+# Gemini CLI Architecture Overview
+
+This document provides a high-level overview of the Gemini CLI's architecture.
+
+## Core components
+
+The Gemini CLI is primarily composed of two main packages, along with a suite of
+tools that can be used by the system in the course of handling command-line
+input:
+
+1.  **CLI package (`packages/cli`):**
+    - **Purpose:** This contains the user-facing portion of the Gemini CLI, such
+      as handling the initial user input, presenting the final output, and
+      managing the overall user experience.
+    - **Key functions contained in the package:**
+      - [Input processing](/docs/cli/commands)
+      - History management
+      - Display rendering
+      - [Theme and UI customization](/docs/cli/themes)
+      - [CLI configuration settings](/docs/get-started/configuration)
+
+2.  **Core package (`packages/core`):**
+    - **Purpose:** This acts as the backend for the Gemini CLI. It receives
+      requests sent from `packages/cli`, orchestrates interactions with the
+      Gemini API, and manages the execution of available tools.
+    - **Key functions contained in the package:**
+      - API client for communicating with the Google Gemini API
+      - Prompt construction and management
+      - Tool registration and execution logic
+      - State management for conversations or sessions
+      - Server-side configuration
+
+3.  **Tools (`packages/core/src/tools/`):**
+    - **Purpose:** These are individual modules that extend the capabilities of
+      the Gemini model, allowing it to interact with the local environment
+      (e.g., file system, shell commands, web fetching).
+    - **Interaction:** `packages/core` invokes these tools based on requests
+      from the Gemini model.
+
+## Interaction flow
+
+A typical interaction with the Gemini CLI follows this flow:
+
+1.  **User input:** The user types a prompt or command into the terminal, which
+    is managed by `packages/cli`.
+2.  **Request to core:** `packages/cli` sends the user's input to
+    `packages/core`.
+3.  **Request processed:** The core package:
+    - Constructs an appropriate prompt for the Gemini API, possibly including
+      conversation history and available tool definitions.
+    - Sends the prompt to the Gemini API.
+4.  **Gemini API response:** The Gemini API processes the prompt and returns a
+    response. This response might be a direct answer or a request to use one of
+    the available tools.
+5.  **Tool execution (if applicable):**
+    - When the Gemini API requests a tool, the core package prepares to execute
+      it.
+    - If the requested tool can modify the file system or execute shell
+      commands, the user is first given details of the tool and its arguments,
+      and the user must approve the execution.
+    - Read-only operations, such as reading files, might not require explicit
+      user confirmation to proceed.
+    - Once confirmed, or if confirmation is not required, the core package
+      executes the relevant action within the relevant tool, and the result is
+      sent back to the Gemini API by the core package.
+    - The Gemini API processes the tool result and generates a final response.
+6.  **Response to CLI:** The core package sends the final response back to the
+    CLI package.
+7.  **Display to user:** The CLI package formats and displays the response to
+    the user in the terminal.
+
+## Key design principles
+
+- **Modularity:** Separating the CLI (frontend) from the Core (backend) allows
+  for independent development and potential future extensions (e.g., different
+  frontends for the same backend).
+- **Extensibility:** The tool system is designed to be extensible, allowing new
+  capabilities to be added.
+- **User experience:** The CLI focuses on providing a rich and interactive
+  terminal experience.

docs/changelogs/index.md

@@ -18,26 +18,7 @@ on GitHub.
 | [Preview](preview.md) | Experimental features ready for early feedback. |
 | [Stable](latest.md)   | Stable, recommended for general use.            |
 
-## Announcements: v0.29.0 - 2026-02-17
-
-- **Plan Mode:** A new comprehensive planning capability with `/plan`,
-  `enter_plan_mode` tool, and dedicated documentation
-  ([#17698](https://github.com/google-gemini/gemini-cli/pull/17698) by @Adib234,
-  [#18324](https://github.com/google-gemini/gemini-cli/pull/18324) by @jerop).
-- **Gemini 3 Default:** We've removed the preview flag and enabled Gemini 3 by
-  default for all users
-  ([#18414](https://github.com/google-gemini/gemini-cli/pull/18414) by
-  @sehoon38).
-- **Extension Exploration:** New UI and settings to explore and manage
-  extensions more easily
-  ([#18686](https://github.com/google-gemini/gemini-cli/pull/18686) by
-  @sripasg).
-- **Admin Control:** Administrators can now allowlist specific MCP server
-  configurations
-  ([#18311](https://github.com/google-gemini/gemini-cli/pull/18311) by
-  @skeshive).
-
-## Announcements: v0.28.0 - 2026-02-10
+## Announcements: v0.28.0 - 2026-02-03
 
 - **Slash Command:** We've added a new `/prompt-suggest` slash command to help
   you generate prompt suggestions
@@ -295,8 +276,7 @@ on GitHub.
 - **Experimental permission improvements:** We are now experimenting with a new
   policy engine in Gemini CLI. This allows users and administrators to create
   fine-grained policy for tool calls. Currently behind a flag. See
-  [policy engine documentation](../reference/policy-engine.md) for more
-  information.
+  [policy engine documentation](../core/policy-engine.md) for more information.
   - Blog:
     [https://allen.hutchison.org/2025/11/26/the-guardrails-of-autonomy/](https://allen.hutchison.org/2025/11/26/the-guardrails-of-autonomy/)
 - **Gemini 3 support for paid:** Gemini 3 support has been rolled out to all API

docs/changelogs/latest.md

@@ -1,6 +1,6 @@
-# Latest stable release: v0.29.0
+# Latest stable release: v0.28.0
 
-Released: February 17, 2026
+Released: February 10, 2026
 
 For most users, our latest stable release is the recommended release. Install
 the latest stable version with:
@@ -11,371 +11,305 @@ npm install -g @google/gemini-cli
 
 ## Highlights
 
-- **Plan Mode:** Introduce a dedicated "Plan Mode" to help you architect complex
-  changes before implementation. Use `/plan` to get started.
-- **Gemini 3 by Default:** Gemini 3 is now the default model family, bringing
-  improved performance and reasoning capabilities to all users without needing a
-  feature flag.
-- **Extension Discovery:** Easily discover and install extensions with the new
-  exploration features and registry client.
-- **Enhanced Admin Controls:** New administrative capabilities allow for
-  allowlisting MCP server configurations, giving organizations more control over
-  available tools.
-- **Sub-agent Improvements:** Sub-agents have been transitioned to a new format
-  with improved definitions and system prompts for better reliability.
+- **Commands & UX Enhancements:** Introduced `/prompt-suggest` command,
+  alongside updated undo/redo keybindings and automatic theme switching.
+- **Expanded IDE Support:** Now offering compatibility with Positron IDE,
+  expanding integration options for developers.
+- **Enhanced Security & Authentication:** Implemented interactive and
+  non-interactive OAuth consent, improving both security and diagnostic
+  capabilities for bug reports.
+- **Advanced Planning & Agent Tools:** Integrated a generic Checklist component
+  for structured task management and evolved subagent capabilities with dynamic
+  policy registration.
+- **Improved Core Stability & Reliability:** Resolved critical environment
+  loading, authentication, and session management issues, ensuring a more robust
+  experience.
+- **Background Shell Commands:** Enabled the execution of shell commands in the
+  background for increased workflow efficiency.
 
 ## What's Changed
 
-- fix: remove `ask_user` tool from non-interactive modes by @jackwotherspoon in
-  [#18154](https://github.com/google-gemini/gemini-cli/pull/18154)
-- fix(cli): allow restricted .env loading in untrusted sandboxed folders by
-  @galz10 in [#17806](https://github.com/google-gemini/gemini-cli/pull/17806)
-- Encourage agent to utilize ecosystem tools to perform work by @gundermanc in
-  [#17881](https://github.com/google-gemini/gemini-cli/pull/17881)
-- feat(plan): unify workflow location in system prompt to optimize caching by
-  @jerop in [#18258](https://github.com/google-gemini/gemini-cli/pull/18258)
-- feat(core): enable getUserTierName in config by @sehoon38 in
-  [#18265](https://github.com/google-gemini/gemini-cli/pull/18265)
-- feat(core): add default execution limits for subagents by @abhipatel12 in
-  [#18274](https://github.com/google-gemini/gemini-cli/pull/18274)
-- Fix issue where agent gets stuck at interactive commands. by @gundermanc in
-  [#18272](https://github.com/google-gemini/gemini-cli/pull/18272)
-- chore(release): bump version to 0.29.0-nightly.20260203.71f46f116 by
+- feat(commands): add /prompt-suggest slash command by @NTaylorMullen in
+  [#17264](https://github.com/google-gemini/gemini-cli/pull/17264)
+- feat(cli): align hooks enable/disable with skills and improve completion by
+  @sehoon38 in [#16822](https://github.com/google-gemini/gemini-cli/pull/16822)
+- docs: add CLI reference documentation by @leochiu-a in
+  [#17504](https://github.com/google-gemini/gemini-cli/pull/17504)
+- chore(release): bump version to 0.28.0-nightly.20260128.adc8e11bb by
   @gemini-cli-robot in
-  [#18243](https://github.com/google-gemini/gemini-cli/pull/18243)
-- feat(core): remove hardcoded policy bypass for local subagents by @abhipatel12
-  in [#18153](https://github.com/google-gemini/gemini-cli/pull/18153)
-- feat(plan): implement `plan` slash command by @Adib234 in
-  [#17698](https://github.com/google-gemini/gemini-cli/pull/17698)
-- feat: increase `ask_user` label limit to 16 characters by @jackwotherspoon in
-  [#18320](https://github.com/google-gemini/gemini-cli/pull/18320)
-- Add information about the agent skills lifecycle and clarify docs-writer skill
-  metadata. by @g-samroberts in
-  [#18234](https://github.com/google-gemini/gemini-cli/pull/18234)
-- feat(core): add `enter_plan_mode` tool by @jerop in
-  [#18324](https://github.com/google-gemini/gemini-cli/pull/18324)
-- Stop showing an error message in `/plan` by @Adib234 in
-  [#18333](https://github.com/google-gemini/gemini-cli/pull/18333)
-- fix(hooks): remove unnecessary logging for hook registration by @abhipatel12
-  in [#18332](https://github.com/google-gemini/gemini-cli/pull/18332)
-- fix(mcp): ensure MCP transport is closed to prevent memory leaks by
-  @cbcoutinho in
-  [#18054](https://github.com/google-gemini/gemini-cli/pull/18054)
-- feat(skills): implement linking for agent skills by @MushuEE in
-  [#18295](https://github.com/google-gemini/gemini-cli/pull/18295)
-- Changelogs for 0.27.0 and 0.28.0-preview0 by @g-samroberts in
-  [#18336](https://github.com/google-gemini/gemini-cli/pull/18336)
-- chore: correct docs as skills and hooks are stable by @jackwotherspoon in
-  [#18358](https://github.com/google-gemini/gemini-cli/pull/18358)
-- feat(admin): Implement admin allowlist for MCP server configurations by
-  @skeshive in [#18311](https://github.com/google-gemini/gemini-cli/pull/18311)
-- fix(core): add retry logic for transient SSL/TLS errors (#17318) by @ppgranger
-  in [#18310](https://github.com/google-gemini/gemini-cli/pull/18310)
-- Add support for /extensions config command by @chrstnb in
-  [#17895](https://github.com/google-gemini/gemini-cli/pull/17895)
-- fix(core): handle non-compliant mcpbridge responses from Xcode 26.3 by
-  @peterfriese in
-  [#18376](https://github.com/google-gemini/gemini-cli/pull/18376)
-- feat(cli): Add W, B, E Vim motions and operator support by @ademuri in
-  [#16209](https://github.com/google-gemini/gemini-cli/pull/16209)
-- fix: Windows Specific Agent Quality & System Prompt by @scidomino in
-  [#18351](https://github.com/google-gemini/gemini-cli/pull/18351)
-- feat(plan): support `replace` tool in plan mode to edit plans by @jerop in
-  [#18379](https://github.com/google-gemini/gemini-cli/pull/18379)
-- Improving memory tool instructions and eval testing by @alisa-alisa in
-  [#18091](https://github.com/google-gemini/gemini-cli/pull/18091)
-- fix(cli): color extension link success message green by @MushuEE in
-  [#18386](https://github.com/google-gemini/gemini-cli/pull/18386)
-- undo by @jacob314 in
-  [#18147](https://github.com/google-gemini/gemini-cli/pull/18147)
-- feat(plan): add guidance on iterating on approved plans vs creating new plans
-  by @jerop in [#18346](https://github.com/google-gemini/gemini-cli/pull/18346)
-- feat(plan): fix invalid tool calls in plan mode by @Adib234 in
-  [#18352](https://github.com/google-gemini/gemini-cli/pull/18352)
-- feat(plan): integrate planning artifacts and tools into primary workflows by
-  @jerop in [#18375](https://github.com/google-gemini/gemini-cli/pull/18375)
-- Fix permission check by @scidomino in
-  [#18395](https://github.com/google-gemini/gemini-cli/pull/18395)
-- ux(polish) autocomplete in the input prompt by @jacob314 in
-  [#18181](https://github.com/google-gemini/gemini-cli/pull/18181)
-- fix: resolve infinite loop when using 'Modify with external editor' by
-  @ppgranger in [#17453](https://github.com/google-gemini/gemini-cli/pull/17453)
-- feat: expand verify-release to macOS and Windows by @yunaseoul in
-  [#18145](https://github.com/google-gemini/gemini-cli/pull/18145)
-- feat(plan): implement support for MCP servers in Plan mode by @Adib234 in
-  [#18229](https://github.com/google-gemini/gemini-cli/pull/18229)
-- chore: update folder trust error messaging by @galz10 in
-  [#18402](https://github.com/google-gemini/gemini-cli/pull/18402)
-- feat(plan): create a metric for execution of plans generated in plan mode by
-  @Adib234 in [#18236](https://github.com/google-gemini/gemini-cli/pull/18236)
-- perf(ui): optimize stripUnsafeCharacters with regex by @gsquared94 in
-  [#18413](https://github.com/google-gemini/gemini-cli/pull/18413)
-- feat(context): implement observation masking for tool outputs by @abhipatel12
-  in [#18389](https://github.com/google-gemini/gemini-cli/pull/18389)
-- feat(core,cli): implement session-linked tool output storage and cleanup by
+  [#17725](https://github.com/google-gemini/gemini-cli/pull/17725)
+- feat(skills): final stable promotion cleanup by @abhipatel12 in
+  [#17726](https://github.com/google-gemini/gemini-cli/pull/17726)
+- test(core): mock fetch in OAuth transport fallback tests by @jw409 in
+  [#17059](https://github.com/google-gemini/gemini-cli/pull/17059)
+- feat(cli): include auth method in /bug by @erikus in
+  [#17569](https://github.com/google-gemini/gemini-cli/pull/17569)
+- Add a email privacy note to bug_report template by @nemyung in
+  [#17474](https://github.com/google-gemini/gemini-cli/pull/17474)
+- Rewind documentation by @Adib234 in
+  [#17446](https://github.com/google-gemini/gemini-cli/pull/17446)
+- fix: verify audio/video MIME types with content check by @maru0804 in
+  [#16907](https://github.com/google-gemini/gemini-cli/pull/16907)
+- feat(core): add support for positron ide
+  ([#15045](https://github.com/google-gemini/gemini-cli/pull/15045)) by @kapsner
+  in [#15047](https://github.com/google-gemini/gemini-cli/pull/15047)
+- /oncall dedup - wrap texts to nextlines by @sehoon38 in
+  [#17782](https://github.com/google-gemini/gemini-cli/pull/17782)
+- fix(admin): rename advanced features admin setting by @skeshive in
+  [#17786](https://github.com/google-gemini/gemini-cli/pull/17786)
+- [extension config] Make breaking optional value non-optional by @chrstnb in
+  [#17785](https://github.com/google-gemini/gemini-cli/pull/17785)
+- Fix docs-writer skill issues by @g-samroberts in
+  [#17734](https://github.com/google-gemini/gemini-cli/pull/17734)
+- fix(core): suppress duplicate hook failure warnings during streaming by
   @abhipatel12 in
-  [#18416](https://github.com/google-gemini/gemini-cli/pull/18416)
-- Shorten temp directory by @joshualitt in
-  [#17901](https://github.com/google-gemini/gemini-cli/pull/17901)
-- feat(plan): add behavioral evals for plan mode by @jerop in
-  [#18437](https://github.com/google-gemini/gemini-cli/pull/18437)
-- Add extension registry client by @chrstnb in
-  [#18396](https://github.com/google-gemini/gemini-cli/pull/18396)
-- Enable extension config by default by @chrstnb in
-  [#18447](https://github.com/google-gemini/gemini-cli/pull/18447)
-- Automatically generate change logs on release by @g-samroberts in
-  [#18401](https://github.com/google-gemini/gemini-cli/pull/18401)
-- Remove previewFeatures and default to Gemini 3 by @sehoon38 in
-  [#18414](https://github.com/google-gemini/gemini-cli/pull/18414)
-- feat(admin): apply MCP allowlist to extensions & gemini mcp list command by
-  @skeshive in [#18442](https://github.com/google-gemini/gemini-cli/pull/18442)
-- fix(cli): improve focus navigation for interactive and background shells by
-  @galz10 in [#18343](https://github.com/google-gemini/gemini-cli/pull/18343)
-- Add shortcuts hint and panel for discoverability by @LyalinDotCom in
-  [#18035](https://github.com/google-gemini/gemini-cli/pull/18035)
-- fix(config): treat system settings as read-only during migration and warn user
-  by @spencer426 in
-  [#18277](https://github.com/google-gemini/gemini-cli/pull/18277)
-- feat(plan): add positive test case and update eval stability policy by @jerop
-  in [#18457](https://github.com/google-gemini/gemini-cli/pull/18457)
-- fix- windows: add shell: true for spawnSync to fix EINVAL with .cmd editors by
-  @zackoch in [#18408](https://github.com/google-gemini/gemini-cli/pull/18408)
-- bug(core): Fix bug when saving plans. by @joshualitt in
-  [#18465](https://github.com/google-gemini/gemini-cli/pull/18465)
-- Refactor atCommandProcessor by @scidomino in
-  [#18461](https://github.com/google-gemini/gemini-cli/pull/18461)
-- feat(core): implement persistence and resumption for masked tool outputs by
+  [#17727](https://github.com/google-gemini/gemini-cli/pull/17727)
+- test: add more tests for AskUser by @jackwotherspoon in
+  [#17720](https://github.com/google-gemini/gemini-cli/pull/17720)
+- feat(cli): enable activity logging for non-interactive mode and evals by
+  @SandyTao520 in
+  [#17703](https://github.com/google-gemini/gemini-cli/pull/17703)
+- feat(core): add support for custom deny messages in policy rules by
+  @allenhutchison in
+  [#17427](https://github.com/google-gemini/gemini-cli/pull/17427)
+- Fix unintended credential exposure to MCP Servers by @Adib234 in
+  [#17311](https://github.com/google-gemini/gemini-cli/pull/17311)
+- feat(extensions): add support for custom themes in extensions by @spencer426
+  in [#17327](https://github.com/google-gemini/gemini-cli/pull/17327)
+- fix: persist and restore workspace directories on session resume by
+  @korade-krushna in
+  [#17454](https://github.com/google-gemini/gemini-cli/pull/17454)
+- Update release notes pages for 0.26.0 and 0.27.0-preview. by @g-samroberts in
+  [#17744](https://github.com/google-gemini/gemini-cli/pull/17744)
+- feat(ux): update cell border color and created test file for table rendering
+  by @devr0306 in
+  [#17798](https://github.com/google-gemini/gemini-cli/pull/17798)
+- Change height for the ToolConfirmationQueue. by @jacob314 in
+  [#17799](https://github.com/google-gemini/gemini-cli/pull/17799)
+- feat(cli): add user identity info to stats command by @sehoon38 in
+  [#17612](https://github.com/google-gemini/gemini-cli/pull/17612)
+- fix(ux): fixed off-by-some wrapping caused by fixed-width characters by
+  @devr0306 in [#17816](https://github.com/google-gemini/gemini-cli/pull/17816)
+- feat(cli): update undo/redo keybindings to Cmd+Z/Alt+Z and
+  Shift+Cmd+Z/Shift+Alt+Z by @scidomino in
+  [#17800](https://github.com/google-gemini/gemini-cli/pull/17800)
+- fix(evals): use absolute path for activity log directory by @SandyTao520 in
+  [#17830](https://github.com/google-gemini/gemini-cli/pull/17830)
+- test: add integration test to verify stdout/stderr routing by @ved015 in
+  [#17280](https://github.com/google-gemini/gemini-cli/pull/17280)
+- fix(cli): list installed extensions when update target missing by @tt-a1i in
+  [#17082](https://github.com/google-gemini/gemini-cli/pull/17082)
+- fix(cli): handle PAT tokens and credentials in git remote URL parsing by
+  @afarber in [#14650](https://github.com/google-gemini/gemini-cli/pull/14650)
+- fix(core): use returnDisplay for error result display by @Nubebuster in
+  [#14994](https://github.com/google-gemini/gemini-cli/pull/14994)
+- Fix detection of bun as package manager by @Randomblock1 in
+  [#17462](https://github.com/google-gemini/gemini-cli/pull/17462)
+- feat(cli): show hooksConfig.enabled in settings dialog by @abhipatel12 in
+  [#17810](https://github.com/google-gemini/gemini-cli/pull/17810)
+- feat(cli): Display user identity (auth, email, tier) on startup by @yunaseoul
+  in [#17591](https://github.com/google-gemini/gemini-cli/pull/17591)
+- fix: prevent ghost border for AskUserDialog by @jackwotherspoon in
+  [#17788](https://github.com/google-gemini/gemini-cli/pull/17788)
+- docs: mark A2A subagents as experimental in subagents.md by @adamfweidman in
+  [#17863](https://github.com/google-gemini/gemini-cli/pull/17863)
+- Resolve error thrown for sensitive values by @chrstnb in
+  [#17826](https://github.com/google-gemini/gemini-cli/pull/17826)
+- fix(admin): Rename secureModeEnabled to strictModeDisabled by @skeshive in
+  [#17789](https://github.com/google-gemini/gemini-cli/pull/17789)
+- feat(ux): update truncate dots to be shorter in tables by @devr0306 in
+  [#17825](https://github.com/google-gemini/gemini-cli/pull/17825)
+- fix(core): resolve DEP0040 punycode deprecation via patch-package by
+  @ATHARVA262005 in
+  [#17692](https://github.com/google-gemini/gemini-cli/pull/17692)
+- feat(plan): create generic Checklist component and refactor Todo by @Adib234
+  in [#17741](https://github.com/google-gemini/gemini-cli/pull/17741)
+- Cleanup post delegate_to_agent removal by @gundermanc in
+  [#17875](https://github.com/google-gemini/gemini-cli/pull/17875)
+- fix(core): use GIT_CONFIG_GLOBAL to isolate shadow git repo configuration -
+  Fixes [#17877](https://github.com/google-gemini/gemini-cli/pull/17877) by
+  @cocosheng-g in
+  [#17803](https://github.com/google-gemini/gemini-cli/pull/17803)
+- Disable mouse tracking e2e by @alisa-alisa in
+  [#17880](https://github.com/google-gemini/gemini-cli/pull/17880)
+- fix(cli): use correct setting key for Cloud Shell auth by @sehoon38 in
+  [#17884](https://github.com/google-gemini/gemini-cli/pull/17884)
+- chore: revert IDE specific ASCII logo by @jackwotherspoon in
+  [#17887](https://github.com/google-gemini/gemini-cli/pull/17887)
+- Revert "fix(core): resolve DEP0040 punycode deprecation via patch-package" by
+  @sehoon38 in [#17898](https://github.com/google-gemini/gemini-cli/pull/17898)
+- Refactoring of disabling of mouse tracking in e2e tests by @alisa-alisa in
+  [#17902](https://github.com/google-gemini/gemini-cli/pull/17902)
+- feat(core): Add GOOGLE_GENAI_API_VERSION environment variable support by
+  @deyim in [#16177](https://github.com/google-gemini/gemini-cli/pull/16177)
+- feat(core): Isolate and cleanup truncated tool outputs by @SandyTao520 in
+  [#17594](https://github.com/google-gemini/gemini-cli/pull/17594)
+- Create skills page, update commands, refine docs by @g-samroberts in
+  [#17842](https://github.com/google-gemini/gemini-cli/pull/17842)
+- feat: preserve EOL in files by @Thomas-Shephard in
+  [#16087](https://github.com/google-gemini/gemini-cli/pull/16087)
+- Fix HalfLinePaddedBox in screenreader mode. by @jacob314 in
+  [#17914](https://github.com/google-gemini/gemini-cli/pull/17914)
+- bug(ux) vim mode fixes. Start in insert mode. Fix bug blocking F12 and ctrl-X
+  in vim mode. by @jacob314 in
+  [#17938](https://github.com/google-gemini/gemini-cli/pull/17938)
+- feat(core): implement interactive and non-interactive consent for OAuth by
+  @ehedlund in [#17699](https://github.com/google-gemini/gemini-cli/pull/17699)
+- perf(core): optimize token calculation and add support for multimodal tool
+  responses by @abhipatel12 in
+  [#17835](https://github.com/google-gemini/gemini-cli/pull/17835)
+- refactor(hooks): remove legacy tools.enableHooks setting by @abhipatel12 in
+  [#17867](https://github.com/google-gemini/gemini-cli/pull/17867)
+- feat(ci): add npx smoke test to verify installability by @bdmorgan in
+  [#17927](https://github.com/google-gemini/gemini-cli/pull/17927)
+- feat(core): implement dynamic policy registration for subagents by
   @abhipatel12 in
-  [#18451](https://github.com/google-gemini/gemini-cli/pull/18451)
-- refactor: simplify tool output truncation to single config by @SandyTao520 in
-  [#18446](https://github.com/google-gemini/gemini-cli/pull/18446)
-- bug(core): Ensure storage is initialized early, even if config is not. by
-  @joshualitt in
-  [#18471](https://github.com/google-gemini/gemini-cli/pull/18471)
-- chore: Update build-and-start script to support argument forwarding by
+  [#17838](https://github.com/google-gemini/gemini-cli/pull/17838)
+- feat: Implement background shell commands by @galz10 in
+  [#14849](https://github.com/google-gemini/gemini-cli/pull/14849)
+- feat(admin): provide actionable error messages for disabled features by
+  @skeshive in [#17815](https://github.com/google-gemini/gemini-cli/pull/17815)
+- Fix bugs where Rewind and Resume showed Ugly and 100X too verbose content. by
+  @jacob314 in [#17940](https://github.com/google-gemini/gemini-cli/pull/17940)
+- Fix broken link in docs by @chrstnb in
+  [#17959](https://github.com/google-gemini/gemini-cli/pull/17959)
+- feat(plan): reuse standard tool confirmation for AskUser tool by @jerop in
+  [#17864](https://github.com/google-gemini/gemini-cli/pull/17864)
+- feat(core): enable overriding CODE_ASSIST_API_VERSION with env var by
+  @lottielin in [#17942](https://github.com/google-gemini/gemini-cli/pull/17942)
+- run npx pointing to the specific commit SHA by @sehoon38 in
+  [#17970](https://github.com/google-gemini/gemini-cli/pull/17970)
+- Add allowedExtensions setting by @kevinjwang1 in
+  [#17695](https://github.com/google-gemini/gemini-cli/pull/17695)
+- feat(plan): refactor ToolConfirmationPayload to union type by @jerop in
+  [#17980](https://github.com/google-gemini/gemini-cli/pull/17980)
+- lower the default max retries to reduce contention by @sehoon38 in
+  [#17975](https://github.com/google-gemini/gemini-cli/pull/17975)
+- fix(core): ensure YOLO mode auto-approves complex shell commands when parsing
+  fails by @abhipatel12 in
+  [#17920](https://github.com/google-gemini/gemini-cli/pull/17920)
+- Fix broken link. by @g-samroberts in
+  [#17972](https://github.com/google-gemini/gemini-cli/pull/17972)
+- Support ctrl-C and Ctrl-D correctly Refactor so InputPrompt has priority over
+  AppContainer for input handling. by @jacob314 in
+  [#17993](https://github.com/google-gemini/gemini-cli/pull/17993)
+- Fix truncation for AskQuestion by @jacob314 in
+  [#18001](https://github.com/google-gemini/gemini-cli/pull/18001)
+- fix(workflow): update maintainer check logic to be inclusive and
+  case-insensitive by @bdmorgan in
+  [#18009](https://github.com/google-gemini/gemini-cli/pull/18009)
+- Fix Esc cancel during streaming by @LyalinDotCom in
+  [#18039](https://github.com/google-gemini/gemini-cli/pull/18039)
+- feat(acp): add session resume support by @bdmorgan in
+  [#18043](https://github.com/google-gemini/gemini-cli/pull/18043)
+- fix(ci): prevent stale PR closer from incorrectly closing new PRs by @bdmorgan
+  in [#18069](https://github.com/google-gemini/gemini-cli/pull/18069)
+- chore: delete autoAccept setting unused in production by @victorvianna in
+  [#17862](https://github.com/google-gemini/gemini-cli/pull/17862)
+- feat(plan): use placeholder for choice question "Other" option by @jerop in
+  [#18101](https://github.com/google-gemini/gemini-cli/pull/18101)
+- docs: update clearContext to hookSpecificOutput by @jackwotherspoon in
+  [#18024](https://github.com/google-gemini/gemini-cli/pull/18024)
+- docs-writer skill: Update docs writer skill by @jkcinouye in
+  [#17928](https://github.com/google-gemini/gemini-cli/pull/17928)
+- Sehoon/oncall filter by @sehoon38 in
+  [#18105](https://github.com/google-gemini/gemini-cli/pull/18105)
+- feat(core): add setting to disable loop detection by @SandyTao520 in
+  [#18008](https://github.com/google-gemini/gemini-cli/pull/18008)
+- Docs: Revise docs/index.md by @jkcinouye in
+  [#17879](https://github.com/google-gemini/gemini-cli/pull/17879)
+- Fix up/down arrow regression and add test. by @jacob314 in
+  [#18108](https://github.com/google-gemini/gemini-cli/pull/18108)
+- fix(ui): prevent content leak in MaxSizedBox bottom overflow by @jerop in
+  [#17991](https://github.com/google-gemini/gemini-cli/pull/17991)
+- refactor: migrate checks.ts utility to core and deduplicate by @jerop in
+  [#18139](https://github.com/google-gemini/gemini-cli/pull/18139)
+- feat(core): implement tool name aliasing for backward compatibility by
+  @SandyTao520 in
+  [#17974](https://github.com/google-gemini/gemini-cli/pull/17974)
+- docs: fix help-wanted label spelling by @pavan-sh in
+  [#18114](https://github.com/google-gemini/gemini-cli/pull/18114)
+- feat(cli): implement automatic theme switching based on terminal background by
   @Abhijit-2592 in
-  [#18241](https://github.com/google-gemini/gemini-cli/pull/18241)
-- fix(core): prevent subagent bypass in plan mode by @jerop in
-  [#18484](https://github.com/google-gemini/gemini-cli/pull/18484)
-- feat(cli): add WebSocket-based network logging and streaming chunk support by
-  @SandyTao520 in
-  [#18383](https://github.com/google-gemini/gemini-cli/pull/18383)
-- feat(cli): update approval modes UI by @jerop in
-  [#18476](https://github.com/google-gemini/gemini-cli/pull/18476)
-- fix(cli): reload skills and agents on extension restart by @NTaylorMullen in
-  [#18411](https://github.com/google-gemini/gemini-cli/pull/18411)
-- fix(core): expand excludeTools with legacy aliases for renamed tools by
-  @SandyTao520 in
-  [#18498](https://github.com/google-gemini/gemini-cli/pull/18498)
-- feat(core): overhaul system prompt for rigor, integrity, and intent alignment
-  by @NTaylorMullen in
-  [#17263](https://github.com/google-gemini/gemini-cli/pull/17263)
-- Patch for generate changelog docs yaml file by @g-samroberts in
-  [#18496](https://github.com/google-gemini/gemini-cli/pull/18496)
-- Code review fixes for show question mark pr. by @jacob314 in
-  [#18480](https://github.com/google-gemini/gemini-cli/pull/18480)
-- fix(cli): add SS3 Shift+Tab support for Windows terminals by @ThanhNguyxn in
-  [#18187](https://github.com/google-gemini/gemini-cli/pull/18187)
-- chore: remove redundant planning prompt from final shell by @jerop in
-  [#18528](https://github.com/google-gemini/gemini-cli/pull/18528)
-- docs: require pr-creator skill for PR generation by @NTaylorMullen in
-  [#18536](https://github.com/google-gemini/gemini-cli/pull/18536)
-- chore: update colors for ask_user dialog by @jackwotherspoon in
-  [#18543](https://github.com/google-gemini/gemini-cli/pull/18543)
-- feat(core): exempt high-signal tools from output masking by @abhipatel12 in
-  [#18545](https://github.com/google-gemini/gemini-cli/pull/18545)
-- refactor(core): remove memory tool instructions from Gemini 3 prompt by
+  [#17976](https://github.com/google-gemini/gemini-cli/pull/17976)
+- fix(ide): no-op refactoring that moves the connection logic to helper
+  functions by @skeshive in
+  [#18118](https://github.com/google-gemini/gemini-cli/pull/18118)
+- feat: update review-frontend-and-fix slash command to review-and-fix by
+  @galz10 in [#18146](https://github.com/google-gemini/gemini-cli/pull/18146)
+- fix: improve Ctrl+R reverse search by @jackwotherspoon in
+  [#18075](https://github.com/google-gemini/gemini-cli/pull/18075)
+- feat(plan): handle inconsistency in schedulers by @Adib234 in
+  [#17813](https://github.com/google-gemini/gemini-cli/pull/17813)
+- feat(plan): add core logic and exit_plan_mode tool definition by @jerop in
+  [#18110](https://github.com/google-gemini/gemini-cli/pull/18110)
+- feat(core): rename search_file_content tool to grep_search and add legacy
+  alias by @SandyTao520 in
+  [#18003](https://github.com/google-gemini/gemini-cli/pull/18003)
+- fix(core): prioritize detailed error messages for code assist setup by
+  @gsquared94 in
+  [#17852](https://github.com/google-gemini/gemini-cli/pull/17852)
+- fix(cli): resolve environment loading and auth validation issues in ACP mode
+  by @bdmorgan in
+  [#18025](https://github.com/google-gemini/gemini-cli/pull/18025)
+- feat(core): add .agents/skills directory alias for skill discovery by
   @NTaylorMullen in
-  [#18559](https://github.com/google-gemini/gemini-cli/pull/18559)
-- chore: remove feedback instruction from system prompt by @NTaylorMullen in
-  [#18560](https://github.com/google-gemini/gemini-cli/pull/18560)
-- feat(context): add remote configuration for tool output masking thresholds by
-  @abhipatel12 in
-  [#18553](https://github.com/google-gemini/gemini-cli/pull/18553)
-- feat(core): pause agent timeout budget while waiting for tool confirmation by
-  @abhipatel12 in
-  [#18415](https://github.com/google-gemini/gemini-cli/pull/18415)
-- refactor(config): remove experimental.enableEventDrivenScheduler setting by
-  @abhipatel12 in
-  [#17924](https://github.com/google-gemini/gemini-cli/pull/17924)
-- feat(cli): truncate shell output in UI history and improve active shell
-  display by @jwhelangoog in
-  [#17438](https://github.com/google-gemini/gemini-cli/pull/17438)
-- refactor(cli): switch useToolScheduler to event-driven engine by @abhipatel12
-  in [#18565](https://github.com/google-gemini/gemini-cli/pull/18565)
-- fix(core): correct escaped interpolation in system prompt by @NTaylorMullen in
-  [#18557](https://github.com/google-gemini/gemini-cli/pull/18557)
-- propagate abortSignal by @scidomino in
-  [#18477](https://github.com/google-gemini/gemini-cli/pull/18477)
-- feat(core): conditionally include ctrl+f prompt based on interactive shell
-  setting by @NTaylorMullen in
-  [#18561](https://github.com/google-gemini/gemini-cli/pull/18561)
-- fix(core): ensure `enter_plan_mode` tool registration respects
-  `experimental.plan` by @jerop in
-  [#18587](https://github.com/google-gemini/gemini-cli/pull/18587)
-- feat(core): transition sub-agents to XML format and improve definitions by
-  @NTaylorMullen in
-  [#18555](https://github.com/google-gemini/gemini-cli/pull/18555)
-- docs: Add Plan Mode documentation by @jerop in
-  [#18582](https://github.com/google-gemini/gemini-cli/pull/18582)
-- chore: strengthen validation guidance in system prompt by @NTaylorMullen in
-  [#18544](https://github.com/google-gemini/gemini-cli/pull/18544)
-- Fix newline insertion bug in replace tool by @werdnum in
-  [#18595](https://github.com/google-gemini/gemini-cli/pull/18595)
-- fix(evals): update save_memory evals and simplify tool description by
-  @NTaylorMullen in
-  [#18610](https://github.com/google-gemini/gemini-cli/pull/18610)
-- chore(evals): update validation_fidelity_pre_existing_errors to USUALLY_PASSES
-  by @NTaylorMullen in
-  [#18617](https://github.com/google-gemini/gemini-cli/pull/18617)
-- fix: shorten tool call IDs and fix duplicate tool name in truncated output
-  filenames by @SandyTao520 in
-  [#18600](https://github.com/google-gemini/gemini-cli/pull/18600)
-- feat(cli): implement atomic writes and safety checks for trusted folders by
-  @galz10 in [#18406](https://github.com/google-gemini/gemini-cli/pull/18406)
-- Remove relative docs links by @chrstnb in
-  [#18650](https://github.com/google-gemini/gemini-cli/pull/18650)
-- docs: add legacy snippets convention to GEMINI.md by @NTaylorMullen in
-  [#18597](https://github.com/google-gemini/gemini-cli/pull/18597)
-- fix(chore): Support linting for cjs by @aswinashok44 in
-  [#18639](https://github.com/google-gemini/gemini-cli/pull/18639)
-- feat: move shell efficiency guidelines to tool description by @NTaylorMullen
-  in [#18614](https://github.com/google-gemini/gemini-cli/pull/18614)
-- Added "" as default value, since getText() used to expect a string only and
-  thus crashed when undefined... Fixes #18076 by @019-Abhi in
-  [#18099](https://github.com/google-gemini/gemini-cli/pull/18099)
-- Allow @-includes outside of workspaces (with permission) by @scidomino in
-  [#18470](https://github.com/google-gemini/gemini-cli/pull/18470)
-- chore: make `ask_user` header description more clear by @jackwotherspoon in
-  [#18657](https://github.com/google-gemini/gemini-cli/pull/18657)
-- refactor(core): model-dependent tool definitions by @aishaneeshah in
-  [#18563](https://github.com/google-gemini/gemini-cli/pull/18563)
-- Harded code assist converter. by @jacob314 in
-  [#18656](https://github.com/google-gemini/gemini-cli/pull/18656)
-- bug(core): Fix minor bug in migration logic. by @joshualitt in
-  [#18661](https://github.com/google-gemini/gemini-cli/pull/18661)
-- feat: enable plan mode experiment in settings by @jerop in
-  [#18636](https://github.com/google-gemini/gemini-cli/pull/18636)
-- refactor: push isValidPath() into parsePastedPaths() by @scidomino in
-  [#18664](https://github.com/google-gemini/gemini-cli/pull/18664)
-- fix(cli): correct 'esc to cancel' position and restore duration display by
-  @NTaylorMullen in
-  [#18534](https://github.com/google-gemini/gemini-cli/pull/18534)
-- feat(cli): add DevTools integration with gemini-cli-devtools by @SandyTao520
-  in [#18648](https://github.com/google-gemini/gemini-cli/pull/18648)
-- chore: remove unused exports and redundant hook files by @SandyTao520 in
-  [#18681](https://github.com/google-gemini/gemini-cli/pull/18681)
-- Fix number of lines being reported in rewind confirmation dialog by @Adib234
-  in [#18675](https://github.com/google-gemini/gemini-cli/pull/18675)
-- feat(cli): disable folder trust in headless mode by @galz10 in
-  [#18407](https://github.com/google-gemini/gemini-cli/pull/18407)
-- Disallow unsafe type assertions by @gundermanc in
-  [#18688](https://github.com/google-gemini/gemini-cli/pull/18688)
-- Change event type for release by @g-samroberts in
-  [#18693](https://github.com/google-gemini/gemini-cli/pull/18693)
-- feat: handle multiple dynamic context filenames in system prompt by
-  @NTaylorMullen in
-  [#18598](https://github.com/google-gemini/gemini-cli/pull/18598)
-- Properly parse at-commands with narrow non-breaking spaces by @scidomino in
-  [#18677](https://github.com/google-gemini/gemini-cli/pull/18677)
-- refactor(core): centralize core tool definitions and support model-specific
-  schemas by @aishaneeshah in
-  [#18662](https://github.com/google-gemini/gemini-cli/pull/18662)
-- feat(core): Render memory hierarchically in context. by @joshualitt in
-  [#18350](https://github.com/google-gemini/gemini-cli/pull/18350)
-- feat: Ctrl+O to expand paste placeholder by @jackwotherspoon in
-  [#18103](https://github.com/google-gemini/gemini-cli/pull/18103)
-- fix(cli): Improve header spacing by @NTaylorMullen in
-  [#18531](https://github.com/google-gemini/gemini-cli/pull/18531)
-- Feature/quota visibility 16795 by @spencer426 in
-  [#18203](https://github.com/google-gemini/gemini-cli/pull/18203)
-- Inline thinking bubbles with summary/full modes by @LyalinDotCom in
-  [#18033](https://github.com/google-gemini/gemini-cli/pull/18033)
-- docs: remove TOC marker from Plan Mode header by @jerop in
-  [#18678](https://github.com/google-gemini/gemini-cli/pull/18678)
-- fix(ui): remove redundant newlines in Gemini messages by @NTaylorMullen in
-  [#18538](https://github.com/google-gemini/gemini-cli/pull/18538)
-- test(cli): fix AppContainer act() warnings and improve waitFor resilience by
-  @NTaylorMullen in
-  [#18676](https://github.com/google-gemini/gemini-cli/pull/18676)
-- refactor(core): refine Security & System Integrity section in system prompt by
-  @NTaylorMullen in
-  [#18601](https://github.com/google-gemini/gemini-cli/pull/18601)
-- Fix layout rounding. by @gundermanc in
-  [#18667](https://github.com/google-gemini/gemini-cli/pull/18667)
-- docs(skills): enhance pr-creator safety and interactivity by @NTaylorMullen in
-  [#18616](https://github.com/google-gemini/gemini-cli/pull/18616)
-- test(core): remove hardcoded model from TestRig by @NTaylorMullen in
-  [#18710](https://github.com/google-gemini/gemini-cli/pull/18710)
-- feat(core): optimize sub-agents system prompt intro by @NTaylorMullen in
-  [#18608](https://github.com/google-gemini/gemini-cli/pull/18608)
-- feat(cli): update approval mode labels and shortcuts per latest UX spec by
-  @jerop in [#18698](https://github.com/google-gemini/gemini-cli/pull/18698)
-- fix(plan): update persistent approval mode setting by @Adib234 in
-  [#18638](https://github.com/google-gemini/gemini-cli/pull/18638)
-- fix: move toasts location to left side by @jackwotherspoon in
-  [#18705](https://github.com/google-gemini/gemini-cli/pull/18705)
-- feat(routing): restrict numerical routing to Gemini 3 family by @mattKorwel in
-  [#18478](https://github.com/google-gemini/gemini-cli/pull/18478)
-- fix(ide): fix ide nudge setting by @skeshive in
-  [#18733](https://github.com/google-gemini/gemini-cli/pull/18733)
-- fix(core): standardize tool formatting in system prompts by @NTaylorMullen in
-  [#18615](https://github.com/google-gemini/gemini-cli/pull/18615)
-- chore: consolidate to green in ask user dialog by @jackwotherspoon in
-  [#18734](https://github.com/google-gemini/gemini-cli/pull/18734)
-- feat: add `extensionsExplore` setting to enable extensions explore UI. by
-  @sripasg in [#18686](https://github.com/google-gemini/gemini-cli/pull/18686)
-- feat(cli): defer devtools startup and integrate with F12 by @SandyTao520 in
-  [#18695](https://github.com/google-gemini/gemini-cli/pull/18695)
-- ui: update & subdue footer colors and animate progress indicator by
-  @keithguerin in
-  [#18570](https://github.com/google-gemini/gemini-cli/pull/18570)
-- test: add model-specific snapshots for coreTools by @aishaneeshah in
-  [#18707](https://github.com/google-gemini/gemini-cli/pull/18707)
-- ci: shard windows tests and fix event listener leaks by @NTaylorMullen in
-  [#18670](https://github.com/google-gemini/gemini-cli/pull/18670)
-- fix: allow `ask_user` tool in yolo mode by @jackwotherspoon in
-  [#18541](https://github.com/google-gemini/gemini-cli/pull/18541)
-- feat: redact disabled tools from system prompt (#13597) by @NTaylorMullen in
-  [#18613](https://github.com/google-gemini/gemini-cli/pull/18613)
-- Update Gemini.md to use the curent year on creating new files by @sehoon38 in
-  [#18460](https://github.com/google-gemini/gemini-cli/pull/18460)
-- Code review cleanup for thinking display by @jacob314 in
-  [#18720](https://github.com/google-gemini/gemini-cli/pull/18720)
-- fix(cli): hide scrollbars when in alternate buffer copy mode by @werdnum in
-  [#18354](https://github.com/google-gemini/gemini-cli/pull/18354)
-- Fix issues with rip grep by @gundermanc in
-  [#18756](https://github.com/google-gemini/gemini-cli/pull/18756)
-- fix(cli): fix history navigation regression after prompt autocomplete by
-  @sehoon38 in [#18752](https://github.com/google-gemini/gemini-cli/pull/18752)
-- chore: cleanup unused and add unlisted dependencies in packages/cli by
+  [#18151](https://github.com/google-gemini/gemini-cli/pull/18151)
+- chore(core): reassign telemetry keys to avoid server conflict by @mattKorwel
+  in [#18161](https://github.com/google-gemini/gemini-cli/pull/18161)
+- Add link to rewind doc in commands.md by @Adib234 in
+  [#17961](https://github.com/google-gemini/gemini-cli/pull/17961)
+- feat(core): add draft-2020-12 JSON Schema support with lenient fallback by
+  @afarber in [#15060](https://github.com/google-gemini/gemini-cli/pull/15060)
+- refactor(core): robust trimPreservingTrailingNewline and regression test by
   @adamfweidman in
-  [#18749](https://github.com/google-gemini/gemini-cli/pull/18749)
-- Fix issue where Gemini CLI creates tests in a new file by @gundermanc in
-  [#18409](https://github.com/google-gemini/gemini-cli/pull/18409)
-- feat(telemetry): Ensure experiment IDs are included in OpenTelemetry logs by
-  @kevin-ramdass in
-  [#18747](https://github.com/google-gemini/gemini-cli/pull/18747)
-- fix(patch): cherry-pick e9a9474 to release/v0.29.0-preview.0-pr-18840 to patch
-  version v0.29.0-preview.0 and create version 0.29.0-preview.1 by
-  @gemini-cli-robot in
-  [#18841](https://github.com/google-gemini/gemini-cli/pull/18841)
-- fix(patch): cherry-pick 08e8eea to release/v0.29.0-preview.1-pr-18855 to patch
-  version v0.29.0-preview.1 and create version 0.29.0-preview.2 by
-  @gemini-cli-robot in
-  [#18905](https://github.com/google-gemini/gemini-cli/pull/18905)
-- fix(patch): cherry-pick d0c6a56 to release/v0.29.0-preview.2-pr-18976 to patch
-  version v0.29.0-preview.2 and create version 0.29.0-preview.3 by
-  @gemini-cli-robot in
-  [#19023](https://github.com/google-gemini/gemini-cli/pull/19023)
-- fix(patch): cherry-pick e5ff202 to release/v0.29.0-preview.3-pr-19254 to patch
-  version v0.29.0-preview.3 and create version 0.29.0-preview.4 by
-  @gemini-cli-robot in
-  [#19264](https://github.com/google-gemini/gemini-cli/pull/19264)
-- fix(patch): cherry-pick 9590a09 to release/v0.29.0-preview.4-pr-18771 to patch
-  version v0.29.0-preview.4 and create version 0.29.0-preview.5 by
-  @gemini-cli-robot in
-  [#19274](https://github.com/google-gemini/gemini-cli/pull/19274)
+  [#18196](https://github.com/google-gemini/gemini-cli/pull/18196)
+- Remove MCP servers on extension uninstall by @chrstnb in
+  [#18121](https://github.com/google-gemini/gemini-cli/pull/18121)
+- refactor: localize ACP error parsing logic to cli package by @bdmorgan in
+  [#18193](https://github.com/google-gemini/gemini-cli/pull/18193)
+- feat(core): Add A2A auth config types by @adamfweidman in
+  [#18205](https://github.com/google-gemini/gemini-cli/pull/18205)
+- Set default max attempts to 3 and use the common variable by @sehoon38 in
+  [#18209](https://github.com/google-gemini/gemini-cli/pull/18209)
+- feat(plan): add exit_plan_mode ui and prompt by @jerop in
+  [#18162](https://github.com/google-gemini/gemini-cli/pull/18162)
+- fix(test): improve test isolation and enable subagent evaluations by
+  @cocosheng-g in
+  [#18138](https://github.com/google-gemini/gemini-cli/pull/18138)
+- feat(plan): use custom deny messages in plan mode policies by @Adib234 in
+  [#18195](https://github.com/google-gemini/gemini-cli/pull/18195)
+- Match on extension ID when stopping extensions by @chrstnb in
+  [#18218](https://github.com/google-gemini/gemini-cli/pull/18218)
+- fix(core): Respect user's .gitignore preference by @xyrolle in
+  [#15482](https://github.com/google-gemini/gemini-cli/pull/15482)
+- docs: document GEMINI_CLI_HOME environment variable by @adamfweidman in
+  [#18219](https://github.com/google-gemini/gemini-cli/pull/18219)
+- chore(core): explicitly state plan storage path in prompt by @jerop in
+  [#18222](https://github.com/google-gemini/gemini-cli/pull/18222)
+- A2a admin setting by @DavidAPierce in
+  [#17868](https://github.com/google-gemini/gemini-cli/pull/17868)
+- feat(a2a): Add pluggable auth provider infrastructure by @adamfweidman in
+  [#17934](https://github.com/google-gemini/gemini-cli/pull/17934)
+- Fix handling of empty settings by @chrstnb in
+  [#18131](https://github.com/google-gemini/gemini-cli/pull/18131)
+- Reload skills when extensions change by @chrstnb in
+  [#18225](https://github.com/google-gemini/gemini-cli/pull/18225)
+- feat: Add markdown rendering to ask_user tool by @jackwotherspoon in
+  [#18211](https://github.com/google-gemini/gemini-cli/pull/18211)
+- Add telemetry to rewind by @Adib234 in
+  [#18122](https://github.com/google-gemini/gemini-cli/pull/18122)
+- feat(admin): add support for MCP configuration via admin controls (pt1) by
+  @skeshive in [#18223](https://github.com/google-gemini/gemini-cli/pull/18223)
+- feat(core): require user consent before MCP server OAuth by @ehedlund in
+  [#18132](https://github.com/google-gemini/gemini-cli/pull/18132)
+- fix(sandbox): propagate GOOGLE_GEMINI_BASE_URL&GOOGLE_VERTEX_BASE_URL env vars
+  by @skeshive in
+  [#18231](https://github.com/google-gemini/gemini-cli/pull/18231)
+- feat(ui): move user identity display to header by @sehoon38 in
+  [#18216](https://github.com/google-gemini/gemini-cli/pull/18216)
+- fix: enforce folder trust for workspace settings, skills, and context by
+  @galz10 in [#17596](https://github.com/google-gemini/gemini-cli/pull/17596)
 
 **Full Changelog**:
-https://github.com/google-gemini/gemini-cli/compare/v0.28.2...v0.29.0
+https://github.com/google-gemini/gemini-cli/compare/v0.27.0...v0.28.0

docs/changelogs/preview.md

@@ -1,6 +1,6 @@
-# Preview release: v0.30.0-preview.3
+# Preview release: Release v0.29.0-preview.0
 
-Released: February 19, 2026
+Released: February 10, 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,302 +13,355 @@ npm install -g @google/gemini-cli@preview
 
 ## Highlights
 
-- **Initial SDK Package:** Introduced the initial SDK package with support for
-  custom skills and dynamic system instructions.
-- **Refined Plan Mode:** Refined Plan Mode with support for enabling skills,
-  improved agentic execution, and project exploration without planning.
-- **Enhanced CLI UI:** Enhanced CLI UI with a new clean UI toggle, minimal-mode
-  bleed-through, and support for Ctrl-Z suspension.
-- **`--policy` flag:** Added the `--policy` flag to support user-defined
-  policies.
-- **New Themes:** Added Solarized Dark and Solarized Light themes.
+- **Plan Mode Enhancements**: Significant updates to Plan Mode, including new
+  commands, support for MCP servers, integration of planning artifacts, and
+  improved iteration guidance.
+- **Core Agent Improvements**: Enhancements to the core agent, including better
+  system prompt rigor, improved subagent definitions, and enhanced tool
+  execution limits.
+- **CLI UX/UI Updates**: Various UI and UX improvements, such as autocomplete in
+  the input prompt, updated approval mode labels, DevTools integration, and
+  improved header spacing.
+- **Tooling & Extension Updates**: Improvements to existing tools like
+  `ask_user` and `grep_search`, and new features for extension management.
+- **Bug Fixes**: Numerous bug fixes across the CLI and core, addressing issues
+  with interactive commands, memory leaks, permission checks, and more.
+- **Context and Tool Output Management**: Features for observation masking for
+  tool outputs, session-linked tool output storage, and persistence for masked
+  tool outputs.
 
 ## What's Changed
 
-- fix(patch): cherry-pick 261788c to release/v0.30.0-preview.0-pr-19453 to patch
-  version v0.30.0-preview.0 and create version 0.30.0-preview.1 by
-  @gemini-cli-robot in
-  [#19490](https://github.com/google-gemini/gemini-cli/pull/19490)
-- feat(ux): added text wrapping capabilities to markdown tables by @devr0306 in
-  [#18240](https://github.com/google-gemini/gemini-cli/pull/18240)
-- Revert "fix(mcp): ensure MCP transport is closed to prevent memory leaks" by
-  @skeshive in [#18771](https://github.com/google-gemini/gemini-cli/pull/18771)
-- chore(release): bump version to 0.30.0-nightly.20260210.a2174751d by
-  @gemini-cli-robot in
-  [#18772](https://github.com/google-gemini/gemini-cli/pull/18772)
-- chore: cleanup unused and add unlisted dependencies in packages/core by
-  @adamfweidman in
-  [#18762](https://github.com/google-gemini/gemini-cli/pull/18762)
-- chore(core): update activate_skill prompt verbiage to be more direct by
-  @NTaylorMullen in
-  [#18605](https://github.com/google-gemini/gemini-cli/pull/18605)
-- Add autoconfigure memory usage setting to the dialog by @jacob314 in
-  [#18510](https://github.com/google-gemini/gemini-cli/pull/18510)
-- fix(core): prevent race condition in policy persistence by @braddux in
-  [#18506](https://github.com/google-gemini/gemini-cli/pull/18506)
-- fix(evals): prevent false positive in hierarchical memory test by
-  @Abhijit-2592 in
-  [#18777](https://github.com/google-gemini/gemini-cli/pull/18777)
-- test(evals): mark all `save_memory` evals as `USUALLY_PASSES` due to
-  unreliability by @jerop in
-  [#18786](https://github.com/google-gemini/gemini-cli/pull/18786)
-- feat(cli): add setting to hide shortcuts hint UI by @LyalinDotCom in
-  [#18562](https://github.com/google-gemini/gemini-cli/pull/18562)
-- feat(core): formalize 5-phase sequential planning workflow by @jerop in
-  [#18759](https://github.com/google-gemini/gemini-cli/pull/18759)
-- Introduce limits for search results. by @gundermanc in
-  [#18767](https://github.com/google-gemini/gemini-cli/pull/18767)
-- fix(cli): allow closing debug console after auto-open via flicker by
-  @SandyTao520 in
-  [#18795](https://github.com/google-gemini/gemini-cli/pull/18795)
-- feat(masking): enable tool output masking by default by @abhipatel12 in
-  [#18564](https://github.com/google-gemini/gemini-cli/pull/18564)
-- perf(ui): optimize table rendering by memoizing styled characters by @devr0306
-  in [#18770](https://github.com/google-gemini/gemini-cli/pull/18770)
-- feat: multi-line text answers in ask-user tool by @jackwotherspoon in
-  [#18741](https://github.com/google-gemini/gemini-cli/pull/18741)
-- perf(cli): truncate large debug logs and limit message history by @mattKorwel
-  in [#18663](https://github.com/google-gemini/gemini-cli/pull/18663)
-- fix(core): complete MCP discovery when configured servers are skipped by
-  @LyalinDotCom in
-  [#18586](https://github.com/google-gemini/gemini-cli/pull/18586)
-- fix(core): cache CLI version to ensure consistency during sessions by
-  @sehoon38 in [#18793](https://github.com/google-gemini/gemini-cli/pull/18793)
-- fix(cli): resolve double rendering in shpool and address vscode lint warnings
-  by @braddux in
-  [#18704](https://github.com/google-gemini/gemini-cli/pull/18704)
-- feat(plan): document and validate Plan Mode policy overrides by @jerop in
-  [#18825](https://github.com/google-gemini/gemini-cli/pull/18825)
-- Fix pressing any key to exit select mode. by @jacob314 in
-  [#18421](https://github.com/google-gemini/gemini-cli/pull/18421)
-- fix(cli): update F12 behavior to only open drawer if browser fails by
-  @SandyTao520 in
-  [#18829](https://github.com/google-gemini/gemini-cli/pull/18829)
-- feat(plan): allow skills to be enabled in plan mode by @Adib234 in
-  [#18817](https://github.com/google-gemini/gemini-cli/pull/18817)
-- docs(plan): add documentation for plan mode tools by @jerop in
-  [#18827](https://github.com/google-gemini/gemini-cli/pull/18827)
-- Remove experimental note in extension settings docs by @chrstnb in
-  [#18822](https://github.com/google-gemini/gemini-cli/pull/18822)
-- Update prompt and grep tool definition to limit context size by @gundermanc in
-  [#18780](https://github.com/google-gemini/gemini-cli/pull/18780)
-- docs(plan): add `ask_user` tool documentation by @jerop in
-  [#18830](https://github.com/google-gemini/gemini-cli/pull/18830)
-- Revert unintended credentials exposure by @Adib234 in
-  [#18840](https://github.com/google-gemini/gemini-cli/pull/18840)
-- feat(core): update internal utility models to Gemini 3 by @SandyTao520 in
-  [#18773](https://github.com/google-gemini/gemini-cli/pull/18773)
-- feat(a2a): add value-resolver for auth credential resolution by @adamfweidman
-  in [#18653](https://github.com/google-gemini/gemini-cli/pull/18653)
-- Removed getPlainTextLength by @devr0306 in
-  [#18848](https://github.com/google-gemini/gemini-cli/pull/18848)
-- More grep prompt tweaks by @gundermanc in
-  [#18846](https://github.com/google-gemini/gemini-cli/pull/18846)
-- refactor(cli): Reactive useSettingsStore hook by @psinha40898 in
-  [#14915](https://github.com/google-gemini/gemini-cli/pull/14915)
-- fix(mcp): Ensure that stdio MCP server execution has the `GEMINI_CLI=1` env
-  variable populated. by @richieforeman in
-  [#18832](https://github.com/google-gemini/gemini-cli/pull/18832)
-- fix(core): improve headless mode detection for flags and query args by @galz10
-  in [#18855](https://github.com/google-gemini/gemini-cli/pull/18855)
-- refactor(cli): simplify UI and remove legacy inline tool confirmation logic by
-  @abhipatel12 in
-  [#18566](https://github.com/google-gemini/gemini-cli/pull/18566)
-- feat(cli): deprecate --allowed-tools and excludeTools in favor of policy
-  engine by @Abhijit-2592 in
-  [#18508](https://github.com/google-gemini/gemini-cli/pull/18508)
-- fix(workflows): improve maintainer detection for automated PR actions by
-  @bdmorgan in [#18869](https://github.com/google-gemini/gemini-cli/pull/18869)
-- refactor(cli): consolidate useToolScheduler and delete legacy implementation
-  by @abhipatel12 in
-  [#18567](https://github.com/google-gemini/gemini-cli/pull/18567)
-- Update changelog for v0.28.0 and v0.29.0-preview0 by @g-samroberts in
-  [#18819](https://github.com/google-gemini/gemini-cli/pull/18819)
-- fix(core): ensure sub-agents are registered regardless of tools.allowed by
-  @mattKorwel in
-  [#18870](https://github.com/google-gemini/gemini-cli/pull/18870)
-- Show notification when there's a conflict with an extensions command by
-  @chrstnb in [#17890](https://github.com/google-gemini/gemini-cli/pull/17890)
-- fix(cli): dismiss '?' shortcuts help on hotkeys and active states by
-  @LyalinDotCom in
-  [#18583](https://github.com/google-gemini/gemini-cli/pull/18583)
-- fix(core): prioritize conditional policy rules and harden Plan Mode by
-  @Abhijit-2592 in
-  [#18882](https://github.com/google-gemini/gemini-cli/pull/18882)
-- feat(core): refine Plan Mode system prompt for agentic execution by
-  @NTaylorMullen in
-  [#18799](https://github.com/google-gemini/gemini-cli/pull/18799)
-- feat(plan): create metrics for usage of `AskUser` tool by @Adib234 in
-  [#18820](https://github.com/google-gemini/gemini-cli/pull/18820)
-- feat(cli): support Ctrl-Z suspension by @scidomino in
-  [#18931](https://github.com/google-gemini/gemini-cli/pull/18931)
-- fix(github-actions): use robot PAT for release creation to trigger release
-  notes by @SandyTao520 in
-  [#18794](https://github.com/google-gemini/gemini-cli/pull/18794)
-- feat: add strict seatbelt profiles and remove unusable closed profiles by
-  @SandyTao520 in
-  [#18876](https://github.com/google-gemini/gemini-cli/pull/18876)
-- chore: cleanup unused and add unlisted dependencies in packages/a2a-server by
-  @adamfweidman in
-  [#18916](https://github.com/google-gemini/gemini-cli/pull/18916)
-- fix(plan): isolate plan files per session by @Adib234 in
-  [#18757](https://github.com/google-gemini/gemini-cli/pull/18757)
-- fix: character truncation in raw markdown mode by @jackwotherspoon in
-  [#18938](https://github.com/google-gemini/gemini-cli/pull/18938)
-- feat(cli): prototype clean UI toggle and minimal-mode bleed-through by
-  @LyalinDotCom in
-  [#18683](https://github.com/google-gemini/gemini-cli/pull/18683)
-- ui(polish) blend background color with theme by @jacob314 in
-  [#18802](https://github.com/google-gemini/gemini-cli/pull/18802)
-- Add generic searchable list to back settings and extensions by @chrstnb in
-  [#18838](https://github.com/google-gemini/gemini-cli/pull/18838)
-- feat(ui): align `AskUser` color scheme with UX spec by @jerop in
-  [#18943](https://github.com/google-gemini/gemini-cli/pull/18943)
-- Hide AskUser tool validation errors from UI (agent self-corrects) by @jerop in
-  [#18954](https://github.com/google-gemini/gemini-cli/pull/18954)
-- bug(cli) fix flicker due to AppContainer continuous initialization by
-  @jacob314 in [#18958](https://github.com/google-gemini/gemini-cli/pull/18958)
-- feat(admin): Add admin controls documentation by @skeshive in
-  [#18644](https://github.com/google-gemini/gemini-cli/pull/18644)
-- feat(cli): disable ctrl-s shortcut outside of alternate buffer mode by
-  @jacob314 in [#18887](https://github.com/google-gemini/gemini-cli/pull/18887)
-- fix(vim): vim support that feels (more) complete by @ppgranger in
-  [#18755](https://github.com/google-gemini/gemini-cli/pull/18755)
-- feat(policy): add --policy flag for user defined policies by @allenhutchison
-  in [#18500](https://github.com/google-gemini/gemini-cli/pull/18500)
-- Update installation guide by @g-samroberts in
-  [#18823](https://github.com/google-gemini/gemini-cli/pull/18823)
-- refactor(core): centralize tool definitions (Group 1: replace, search, grep)
-  by @aishaneeshah in
-  [#18944](https://github.com/google-gemini/gemini-cli/pull/18944)
-- refactor(cli): finalize event-driven transition and remove interaction bridge
-  by @abhipatel12 in
-  [#18569](https://github.com/google-gemini/gemini-cli/pull/18569)
-- Fix drag and drop escaping by @scidomino in
-  [#18965](https://github.com/google-gemini/gemini-cli/pull/18965)
-- feat(sdk): initial package bootstrap for SDK by @mbleigh in
-  [#18861](https://github.com/google-gemini/gemini-cli/pull/18861)
-- feat(sdk): implements SessionContext for SDK tool calls by @mbleigh in
-  [#18862](https://github.com/google-gemini/gemini-cli/pull/18862)
-- fix(plan): make question type required in AskUser tool by @Adib234 in
-  [#18959](https://github.com/google-gemini/gemini-cli/pull/18959)
-- fix(core): ensure --yolo does not force headless mode by @NTaylorMullen in
-  [#18976](https://github.com/google-gemini/gemini-cli/pull/18976)
-- refactor(core): adopt `CoreToolCallStatus` enum for type safety by @jerop in
-  [#18998](https://github.com/google-gemini/gemini-cli/pull/18998)
-- Enable in-CLI extension management commands for team by @chrstnb in
-  [#18957](https://github.com/google-gemini/gemini-cli/pull/18957)
-- Adjust lint rules to avoid unnecessary warning. by @scidomino in
-  [#18970](https://github.com/google-gemini/gemini-cli/pull/18970)
-- fix(vscode): resolve unsafe type assertion lint errors by @ehedlund in
-  [#19006](https://github.com/google-gemini/gemini-cli/pull/19006)
-- Remove unnecessary eslint config file by @scidomino in
-  [#19015](https://github.com/google-gemini/gemini-cli/pull/19015)
-- fix(core): Prevent loop detection false positives on lists with long shared
-  prefixes by @SandyTao520 in
-  [#18975](https://github.com/google-gemini/gemini-cli/pull/18975)
-- feat(core): fallback to chat-base when using unrecognized models for chat by
-  @SandyTao520 in
-  [#19016](https://github.com/google-gemini/gemini-cli/pull/19016)
-- docs: fix inconsistent commandRegex example in policy engine by @NTaylorMullen
-  in [#19027](https://github.com/google-gemini/gemini-cli/pull/19027)
-- fix(plan): persist the approval mode in UI even when agent is thinking by
-  @Adib234 in [#18955](https://github.com/google-gemini/gemini-cli/pull/18955)
-- feat(sdk): Implement dynamic system instructions by @mbleigh in
-  [#18863](https://github.com/google-gemini/gemini-cli/pull/18863)
-- Docs: Refresh docs to organize and standardize reference materials. by
-  @jkcinouye in [#18403](https://github.com/google-gemini/gemini-cli/pull/18403)
-- fix windows escaping (and broken tests) by @scidomino in
-  [#19011](https://github.com/google-gemini/gemini-cli/pull/19011)
-- refactor: use `CoreToolCallStatus` in the the history data model by @jerop in
-  [#19033](https://github.com/google-gemini/gemini-cli/pull/19033)
-- feat(cleanup): enable 30-day session retention by default by @skeshive in
-  [#18854](https://github.com/google-gemini/gemini-cli/pull/18854)
-- feat(plan): hide plan write and edit operations on plans in Plan Mode by
-  @jerop in [#19012](https://github.com/google-gemini/gemini-cli/pull/19012)
-- bug(ui) fix flicker refreshing background color by @jacob314 in
-  [#19041](https://github.com/google-gemini/gemini-cli/pull/19041)
-- chore: fix dep vulnerabilities by @scidomino in
-  [#19036](https://github.com/google-gemini/gemini-cli/pull/19036)
-- Revamp automated changelog skill by @g-samroberts in
-  [#18974](https://github.com/google-gemini/gemini-cli/pull/18974)
-- feat(sdk): implement support for custom skills by @mbleigh in
-  [#19031](https://github.com/google-gemini/gemini-cli/pull/19031)
-- refactor(core): complete centralization of core tool definitions by
-  @aishaneeshah in
-  [#18991](https://github.com/google-gemini/gemini-cli/pull/18991)
-- feat: add /commands reload to refresh custom TOML commands by @korade-krushna
-  in [#19078](https://github.com/google-gemini/gemini-cli/pull/19078)
-- fix(cli): wrap terminal capability queries in hidden sequence by @srithreepo
-  in [#19080](https://github.com/google-gemini/gemini-cli/pull/19080)
-- fix(workflows): fix GitHub App token permissions for maintainer detection by
-  @bdmorgan in [#19139](https://github.com/google-gemini/gemini-cli/pull/19139)
-- test: fix hook integration test flakiness on Windows CI by @NTaylorMullen in
-  [#18665](https://github.com/google-gemini/gemini-cli/pull/18665)
-- fix(core): Encourage non-interactive flags for scaffolding commands by
-  @NTaylorMullen in
-  [#18804](https://github.com/google-gemini/gemini-cli/pull/18804)
-- fix(core): propagate User-Agent header to setup-phase CodeAssist API calls by
-  @gsquared94 in
-  [#19182](https://github.com/google-gemini/gemini-cli/pull/19182)
-- docs: document .agents/skills alias and discovery precedence by @kevmoo in
-  [#19166](https://github.com/google-gemini/gemini-cli/pull/19166)
-- feat(cli): add loading state to new agents notification by @sehoon38 in
-  [#19190](https://github.com/google-gemini/gemini-cli/pull/19190)
-- Add base branch to workflow. by @g-samroberts in
-  [#19189](https://github.com/google-gemini/gemini-cli/pull/19189)
-- feat(cli): handle invalid model names in useQuotaAndFallback by @sehoon38 in
-  [#19222](https://github.com/google-gemini/gemini-cli/pull/19222)
-- docs: custom themes in extensions by @jackwotherspoon in
-  [#19219](https://github.com/google-gemini/gemini-cli/pull/19219)
-- Disable workspace settings when starting GCLI in the home directory. by
-  @kevinjwang1 in
-  [#19034](https://github.com/google-gemini/gemini-cli/pull/19034)
-- feat(cli): refactor model command to support set and manage subcommands by
-  @sehoon38 in [#19221](https://github.com/google-gemini/gemini-cli/pull/19221)
-- Add refresh/reload aliases to slash command subcommands by @korade-krushna in
-  [#19218](https://github.com/google-gemini/gemini-cli/pull/19218)
-- refactor: consolidate development rules and add cli guidelines by @jacob314 in
-  [#19214](https://github.com/google-gemini/gemini-cli/pull/19214)
-- chore(ui): remove outdated tip about model routing by @sehoon38 in
-  [#19226](https://github.com/google-gemini/gemini-cli/pull/19226)
-- feat(core): support custom reasoning models by default by @NTaylorMullen in
-  [#19227](https://github.com/google-gemini/gemini-cli/pull/19227)
-- Add Solarized Dark and Solarized Light themes by @rmedranollamas in
-  [#19064](https://github.com/google-gemini/gemini-cli/pull/19064)
-- fix(telemetry): replace JSON.stringify with safeJsonStringify in file
-  exporters by @gsquared94 in
-  [#19244](https://github.com/google-gemini/gemini-cli/pull/19244)
-- feat(telemetry): add keychain availability and token storage metrics by
-  @abhipatel12 in
-  [#18971](https://github.com/google-gemini/gemini-cli/pull/18971)
-- feat(cli): update approval mode cycle order by @jerop in
-  [#19254](https://github.com/google-gemini/gemini-cli/pull/19254)
-- refactor(cli): code review cleanup fix for tab+tab by @jacob314 in
-  [#18967](https://github.com/google-gemini/gemini-cli/pull/18967)
-- feat(plan): support project exploration without planning when in plan mode by
-  @Adib234 in [#18992](https://github.com/google-gemini/gemini-cli/pull/18992)
-- feat: add role-specific statistics to telemetry and UI (cont. #15234) by
-  @yunaseoul in [#18824](https://github.com/google-gemini/gemini-cli/pull/18824)
-- feat(cli): remove Plan Mode from rotation when actively working by @jerop in
-  [#19262](https://github.com/google-gemini/gemini-cli/pull/19262)
-- Fix side breakage where anchors don't work in slugs. by @g-samroberts in
-  [#19261](https://github.com/google-gemini/gemini-cli/pull/19261)
-- feat(config): add setting to make directory tree context configurable by
-  @kevin-ramdass in
-  [#19053](https://github.com/google-gemini/gemini-cli/pull/19053)
-- fix(acp): Wait for mcp initialization in acp (#18893) by @Mervap in
-  [#18894](https://github.com/google-gemini/gemini-cli/pull/18894)
-- docs: format UTC times in releases doc by @pavan-sh in
-  [#18169](https://github.com/google-gemini/gemini-cli/pull/18169)
-- Docs: Clarify extensions documentation. by @jkcinouye in
-  [#19277](https://github.com/google-gemini/gemini-cli/pull/19277)
-- refactor(core): modularize tool definitions by model family by @aishaneeshah
-  in [#19269](https://github.com/google-gemini/gemini-cli/pull/19269)
-- fix(paths): Add cross-platform path normalization by @spencer426 in
-  [#18939](https://github.com/google-gemini/gemini-cli/pull/18939)
-- feat(core): experimental in-progress steering hints (1 of 3) by @joshualitt in
-  [#19008](https://github.com/google-gemini/gemini-cli/pull/19008)
+- fix: remove ask_user tool from non-interactive modes by jackwotherspoon in
+  [#18154](https://github.com/google-gemini/gemini-cli/pull/18154)
+- fix(cli): allow restricted .env loading in untrusted sandboxed folders by
+  galz10 in [#17806](https://github.com/google-gemini/gemini-cli/pull/17806)
+- Encourage agent to utilize ecosystem tools to perform work by gundermanc in
+  [#17881](https://github.com/google-gemini/gemini-cli/pull/17881)
+- feat(plan): unify workflow location in system prompt to optimize caching by
+  jerop in [#18258](https://github.com/google-gemini/gemini-cli/pull/18258)
+- feat(core): enable getUserTierName in config by sehoon38 in
+  [#18265](https://github.com/google-gemini/gemini-cli/pull/18265)
+- feat(core): add default execution limits for subagents by abhipatel12 in
+  [#18274](https://github.com/google-gemini/gemini-cli/pull/18274)
+- Fix issue where agent gets stuck at interactive commands. by gundermanc in
+  [#18272](https://github.com/google-gemini/gemini-cli/pull/18272)
+- chore(release): bump version to 0.29.0-nightly.20260203.71f46f116 by
+  gemini-cli-robot in
+  [#18243](https://github.com/google-gemini/gemini-cli/pull/18243)
+- feat(core): remove hardcoded policy bypass for local subagents by abhipatel12
+  in [#18153](https://github.com/google-gemini/gemini-cli/pull/18153)
+- feat(plan): implement plan slash command by Adib234 in
+  [#17698](https://github.com/google-gemini/gemini-cli/pull/17698)
+- feat: increase ask_user label limit to 16 characters by jackwotherspoon in
+  [#18320](https://github.com/google-gemini/gemini-cli/pull/18320)
+- Add information about the agent skills lifecycle and clarify docs-writer skill
+  metadata. by g-samroberts in
+  [#18234](https://github.com/google-gemini/gemini-cli/pull/18234)
+- feat(core): add enter_plan_mode tool by jerop in
+  [#18324](https://github.com/google-gemini/gemini-cli/pull/18324)
+- Stop showing an error message in /plan by Adib234 in
+  [#18333](https://github.com/google-gemini/gemini-cli/pull/18333)
+- fix(hooks): remove unnecessary logging for hook registration by abhipatel12 in
+  [#18332](https://github.com/google-gemini/gemini-cli/pull/18332)
+- fix(mcp): ensure MCP transport is closed to prevent memory leaks by cbcoutinho
+  in [#18054](https://github.com/google-gemini/gemini-cli/pull/18054)
+- feat(skills): implement linking for agent skills by MushuEE in
+  [#18295](https://github.com/google-gemini/gemini-cli/pull/18295)
+- Changelogs for 0.27.0 and 0.28.0-preview0 by g-samroberts in
+  [#18336](https://github.com/google-gemini/gemini-cli/pull/18336)
+- chore: correct docs as skills and hooks are stable by jackwotherspoon in
+  [#18358](https://github.com/google-gemini/gemini-cli/pull/18358)
+- feat(admin): Implement admin allowlist for MCP server configurations by
+  skeshive in [#18311](https://github.com/google-gemini/gemini-cli/pull/18311)
+- fix(core): add retry logic for transient SSL/TLS errors
+  ([#17318](https://github.com/google-gemini/gemini-cli/pull/17318)) by
+  ppgranger in [#18310](https://github.com/google-gemini/gemini-cli/pull/18310)
+- Add support for /extensions config command by chrstnb in
+  [#17895](https://github.com/google-gemini/gemini-cli/pull/17895)
+- fix(core): handle non-compliant mcpbridge responses from Xcode 26.3 by
+  peterfriese in
+  [#18376](https://github.com/google-gemini/gemini-cli/pull/18376)
+- feat(cli): Add W, B, E Vim motions and operator support by ademuri in
+  [#16209](https://github.com/google-gemini/gemini-cli/pull/16209)
+- fix: Windows Specific Agent Quality & System Prompt by scidomino in
+  [#18351](https://github.com/google-gemini/gemini-cli/pull/18351)
+- feat(plan): support replace tool in plan mode to edit plans by jerop in
+  [#18379](https://github.com/google-gemini/gemini-cli/pull/18379)
+- Improving memory tool instructions and eval testing by alisa-alisa in
+  [#18091](https://github.com/google-gemini/gemini-cli/pull/18091)
+- fix(cli): color extension link success message green by MushuEE in
+  [#18386](https://github.com/google-gemini/gemini-cli/pull/18386)
+- undo by jacob314 in
+  [#18147](https://github.com/google-gemini/gemini-cli/pull/18147)
+- feat(plan): add guidance on iterating on approved plans vs creating new plans
+  by jerop in [#18346](https://github.com/google-gemini/gemini-cli/pull/18346)
+- feat(plan): fix invalid tool calls in plan mode by Adib234 in
+  [#18352](https://github.com/google-gemini/gemini-cli/pull/18352)
+- feat(plan): integrate planning artifacts and tools into primary workflows by
+  jerop in [#18375](https://github.com/google-gemini/gemini-cli/pull/18375)
+- Fix permission check by scidomino in
+  [#18395](https://github.com/google-gemini/gemini-cli/pull/18395)
+- ux(polish) autocomplete in the input prompt by jacob314 in
+  [#18181](https://github.com/google-gemini/gemini-cli/pull/18181)
+- fix: resolve infinite loop when using 'Modify with external editor' by
+  ppgranger in [#17453](https://github.com/google-gemini/gemini-cli/pull/17453)
+- feat: expand verify-release to macOS and Windows by yunaseoul in
+  [#18145](https://github.com/google-gemini/gemini-cli/pull/18145)
+- feat(plan): implement support for MCP servers in Plan mode by Adib234 in
+  [#18229](https://github.com/google-gemini/gemini-cli/pull/18229)
+- chore: update folder trust error messaging by galz10 in
+  [#18402](https://github.com/google-gemini/gemini-cli/pull/18402)
+- feat(plan): create a metric for execution of plans generated in plan mode by
+  Adib234 in [#18236](https://github.com/google-gemini/gemini-cli/pull/18236)
+- perf(ui): optimize stripUnsafeCharacters with regex by gsquared94 in
+  [#18413](https://github.com/google-gemini/gemini-cli/pull/18413)
+- feat(context): implement observation masking for tool outputs by abhipatel12
+  in [#18389](https://github.com/google-gemini/gemini-cli/pull/18389)
+- feat(core,cli): implement session-linked tool output storage and cleanup by
+  abhipatel12 in
+  [#18416](https://github.com/google-gemini/gemini-cli/pull/18416)
+- Shorten temp directory by joshualitt in
+  [#17901](https://github.com/google-gemini/gemini-cli/pull/17901)
+- feat(plan): add behavioral evals for plan mode by jerop in
+  [#18437](https://github.com/google-gemini/gemini-cli/pull/18437)
+- Add extension registry client by chrstnb in
+  [#18396](https://github.com/google-gemini/gemini-cli/pull/18396)
+- Enable extension config by default by chrstnb in
+  [#18447](https://github.com/google-gemini/gemini-cli/pull/18447)
+- Automatically generate change logs on release by g-samroberts in
+  [#18401](https://github.com/google-gemini/gemini-cli/pull/18401)
+- Remove previewFeatures and default to Gemini 3 by sehoon38 in
+  [#18414](https://github.com/google-gemini/gemini-cli/pull/18414)
+- feat(admin): apply MCP allowlist to extensions & gemini mcp list command by
+  skeshive in [#18442](https://github.com/google-gemini/gemini-cli/pull/18442)
+- fix(cli): improve focus navigation for interactive and background shells by
+  galz10 in [#18343](https://github.com/google-gemini/gemini-cli/pull/18343)
+- Add shortcuts hint and panel for discoverability by LyalinDotCom in
+  [#18035](https://github.com/google-gemini/gemini-cli/pull/18035)
+- fix(config): treat system settings as read-only during migration and warn user
+  by spencer426 in
+  [#18277](https://github.com/google-gemini/gemini-cli/pull/18277)
+- feat(plan): add positive test case and update eval stability policy by jerop
+  in [#18457](https://github.com/google-gemini/gemini-cli/pull/18457)
+- fix- windows: add shell: true for spawnSync to fix EINVAL with .cmd editors by
+  zackoch in [#18408](https://github.com/google-gemini/gemini-cli/pull/18408)
+- bug(core): Fix bug when saving plans. by joshualitt in
+  [#18465](https://github.com/google-gemini/gemini-cli/pull/18465)
+- Refactor atCommandProcessor by scidomino in
+  [#18461](https://github.com/google-gemini/gemini-cli/pull/18461)
+- feat(core): implement persistence and resumption for masked tool outputs by
+  abhipatel12 in
+  [#18451](https://github.com/google-gemini/gemini-cli/pull/18451)
+- refactor: simplify tool output truncation to single config by SandyTao520 in
+  [#18446](https://github.com/google-gemini/gemini-cli/pull/18446)
+- bug(core): Ensure storage is initialized early, even if config is not. by
+  joshualitt in [#18471](https://github.com/google-gemini/gemini-cli/pull/18471)
+- chore: Update build-and-start script to support argument forwarding by
+  Abhijit-2592 in
+  [#18241](https://github.com/google-gemini/gemini-cli/pull/18241)
+- fix(core): prevent subagent bypass in plan mode by jerop in
+  [#18484](https://github.com/google-gemini/gemini-cli/pull/18484)
+- feat(cli): add WebSocket-based network logging and streaming chunk support by
+  SandyTao520 in
+  [#18383](https://github.com/google-gemini/gemini-cli/pull/18383)
+- feat(cli): update approval modes UI by jerop in
+  [#18476](https://github.com/google-gemini/gemini-cli/pull/18476)
+- fix(cli): reload skills and agents on extension restart by NTaylorMullen in
+  [#18411](https://github.com/google-gemini/gemini-cli/pull/18411)
+- fix(core): expand excludeTools with legacy aliases for renamed tools by
+  SandyTao520 in
+  [#18498](https://github.com/google-gemini/gemini-cli/pull/18498)
+- feat(core): overhaul system prompt for rigor, integrity, and intent alignment
+  by NTaylorMullen in
+  [#17263](https://github.com/google-gemini/gemini-cli/pull/17263)
+- Patch for generate changelog docs yaml file by g-samroberts in
+  [#18496](https://github.com/google-gemini/gemini-cli/pull/18496)
+- Code review fixes for show question mark pr. by jacob314 in
+  [#18480](https://github.com/google-gemini/gemini-cli/pull/18480)
+- fix(cli): add SS3 Shift+Tab support for Windows terminals by ThanhNguyxn in
+  [#18187](https://github.com/google-gemini/gemini-cli/pull/18187)
+- chore: remove redundant planning prompt from final shell by jerop in
+  [#18528](https://github.com/google-gemini/gemini-cli/pull/18528)
+- docs: require pr-creator skill for PR generation by NTaylorMullen in
+  [#18536](https://github.com/google-gemini/gemini-cli/pull/18536)
+- chore: update colors for ask_user dialog by jackwotherspoon in
+  [#18543](https://github.com/google-gemini/gemini-cli/pull/18543)
+- feat(core): exempt high-signal tools from output masking by abhipatel12 in
+  [#18545](https://github.com/google-gemini/gemini-cli/pull/18545)
+- refactor(core): remove memory tool instructions from Gemini 3 prompt by
+  NTaylorMullen in
+  [#18559](https://github.com/google-gemini/gemini-cli/pull/18559)
+- chore: remove feedback instruction from system prompt by NTaylorMullen in
+  [#18560](https://github.com/google-gemini/gemini-cli/pull/18560)
+- feat(context): add remote configuration for tool output masking thresholds by
+  abhipatel12 in
+  [#18553](https://github.com/google-gemini/gemini-cli/pull/18553)
+- feat(core): pause agent timeout budget while waiting for tool confirmation by
+  abhipatel12 in
+  [#18415](https://github.com/google-gemini/gemini-cli/pull/18415)
+- refactor(config): remove experimental.enableEventDrivenScheduler setting by
+  abhipatel12 in
+  [#17924](https://github.com/google-gemini/gemini-cli/pull/17924)
+- feat(cli): truncate shell output in UI history and improve active shell
+  display by jwhelangoog in
+  [#17438](https://github.com/google-gemini/gemini-cli/pull/17438)
+- refactor(cli): switch useToolScheduler to event-driven engine by abhipatel12
+  in [#18565](https://github.com/google-gemini/gemini-cli/pull/18565)
+- fix(core): correct escaped interpolation in system prompt by NTaylorMullen in
+  [#18557](https://github.com/google-gemini/gemini-cli/pull/18557)
+- propagate abortSignal by scidomino in
+  [#18477](https://github.com/google-gemini/gemini-cli/pull/18477)
+- feat(core): conditionally include ctrl+f prompt based on interactive shell
+  setting by NTaylorMullen in
+  [#18561](https://github.com/google-gemini/gemini-cli/pull/18561)
+- fix(core): ensure enter_plan_mode tool registration respects experimental.plan
+  by jerop in [#18587](https://github.com/google-gemini/gemini-cli/pull/18587)
+- feat(core): transition sub-agents to XML format and improve definitions by
+  NTaylorMullen in
+  [#18555](https://github.com/google-gemini/gemini-cli/pull/18555)
+- docs: Add Plan Mode documentation by jerop in
+  [#18582](https://github.com/google-gemini/gemini-cli/pull/18582)
+- chore: strengthen validation guidance in system prompt by NTaylorMullen in
+  [#18544](https://github.com/google-gemini/gemini-cli/pull/18544)
+- Fix newline insertion bug in replace tool by werdnum in
+  [#18595](https://github.com/google-gemini/gemini-cli/pull/18595)
+- fix(evals): update save_memory evals and simplify tool description by
+  NTaylorMullen in
+  [#18610](https://github.com/google-gemini/gemini-cli/pull/18610)
+- chore(evals): update validation_fidelity_pre_existing_errors to USUALLY_PASSES
+  by NTaylorMullen in
+  [#18617](https://github.com/google-gemini/gemini-cli/pull/18617)
+- fix: shorten tool call IDs and fix duplicate tool name in truncated output
+  filenames by SandyTao520 in
+  [#18600](https://github.com/google-gemini/gemini-cli/pull/18600)
+- feat(cli): implement atomic writes and safety checks for trusted folders by
+  galz10 in [#18406](https://github.com/google-gemini/gemini-cli/pull/18406)
+- Remove relative docs links by chrstnb in
+  [#18650](https://github.com/google-gemini/gemini-cli/pull/18650)
+- docs: add legacy snippets convention to GEMINI.md by NTaylorMullen in
+  [#18597](https://github.com/google-gemini/gemini-cli/pull/18597)
+- fix(chore): Support linting for cjs by aswinashok44 in
+  [#18639](https://github.com/google-gemini/gemini-cli/pull/18639)
+- feat: move shell efficiency guidelines to tool description by NTaylorMullen in
+  [#18614](https://github.com/google-gemini/gemini-cli/pull/18614)
+- Added "" as default value, since getText() used to expect a string only and
+  thus crashed when undefined... Fixes #18076 by 019-Abhi in
+  [#18099](https://github.com/google-gemini/gemini-cli/pull/18099)
+- Allow @-includes outside of workspaces (with permission) by scidomino in
+  [#18470](https://github.com/google-gemini/gemini-cli/pull/18470)
+- chore: make ask_user header description more clear by jackwotherspoon in
+  [#18657](https://github.com/google-gemini/gemini-cli/pull/18657)
+- refactor(core): model-dependent tool definitions by aishaneeshah in
+  [#18563](https://github.com/google-gemini/gemini-cli/pull/18563)
+- Harded code assist converter. by jacob314 in
+  [#18656](https://github.com/google-gemini/gemini-cli/pull/18656)
+- bug(core): Fix minor bug in migration logic. by joshualitt in
+  [#18661](https://github.com/google-gemini/gemini-cli/pull/18661)
+- feat: enable plan mode experiment in settings by jerop in
+  [#18636](https://github.com/google-gemini/gemini-cli/pull/18636)
+- refactor: push isValidPath() into parsePastedPaths() by scidomino in
+  [#18664](https://github.com/google-gemini/gemini-cli/pull/18664)
+- fix(cli): correct 'esc to cancel' position and restore duration display by
+  NTaylorMullen in
+  [#18534](https://github.com/google-gemini/gemini-cli/pull/18534)
+- feat(cli): add DevTools integration with gemini-cli-devtools by SandyTao520 in
+  [#18648](https://github.com/google-gemini/gemini-cli/pull/18648)
+- chore: remove unused exports and redundant hook files by SandyTao520 in
+  [#18681](https://github.com/google-gemini/gemini-cli/pull/18681)
+- Fix number of lines being reported in rewind confirmation dialog by Adib234 in
+  [#18675](https://github.com/google-gemini/gemini-cli/pull/18675)
+- feat(cli): disable folder trust in headless mode by galz10 in
+  [#18407](https://github.com/google-gemini/gemini-cli/pull/18407)
+- Disallow unsafe type assertions by gundermanc in
+  [#18688](https://github.com/google-gemini/gemini-cli/pull/18688)
+- Change event type for release by g-samroberts in
+  [#18693](https://github.com/google-gemini/gemini-cli/pull/18693)
+- feat: handle multiple dynamic context filenames in system prompt by
+  NTaylorMullen in
+  [#18598](https://github.com/google-gemini/gemini-cli/pull/18598)
+- Properly parse at-commands with narrow non-breaking spaces by scidomino in
+  [#18677](https://github.com/google-gemini/gemini-cli/pull/18677)
+- refactor(core): centralize core tool definitions and support model-specific
+  schemas by aishaneeshah in
+  [#18662](https://github.com/google-gemini/gemini-cli/pull/18662)
+- feat(core): Render memory hierarchically in context. by joshualitt in
+  [#18350](https://github.com/google-gemini/gemini-cli/pull/18350)
+- feat: Ctrl+O to expand paste placeholder by jackwotherspoon in
+  [#18103](https://github.com/google-gemini/gemini-cli/pull/18103)
+- fix(cli): Improve header spacing by NTaylorMullen in
+  [#18531](https://github.com/google-gemini/gemini-cli/pull/18531)
+- Feature/quota visibility 16795 by spencer426 in
+  [#18203](https://github.com/google-gemini/gemini-cli/pull/18203)
+- Inline thinking bubbles with summary/full modes by LyalinDotCom in
+  [#18033](https://github.com/google-gemini/gemini-cli/pull/18033)
+- docs: remove TOC marker from Plan Mode header by jerop in
+  [#18678](https://github.com/google-gemini/gemini-cli/pull/18678)
+- fix(ui): remove redundant newlines in Gemini messages by NTaylorMullen in
+  [#18538](https://github.com/google-gemini/gemini-cli/pull/18538)
+- test(cli): fix AppContainer act() warnings and improve waitFor resilience by
+  NTaylorMullen in
+  [#18676](https://github.com/google-gemini/gemini-cli/pull/18676)
+- refactor(core): refine Security & System Integrity section in system prompt by
+  NTaylorMullen in
+  [#18601](https://github.com/google-gemini/gemini-cli/pull/18601)
+- Fix layout rounding. by gundermanc in
+  [#18667](https://github.com/google-gemini/gemini-cli/pull/18667)
+- docs(skills): enhance pr-creator safety and interactivity by NTaylorMullen in
+  [#18616](https://github.com/google-gemini/gemini-cli/pull/18616)
+- test(core): remove hardcoded model from TestRig by NTaylorMullen in
+  [#18710](https://github.com/google-gemini/gemini-cli/pull/18710)
+- feat(core): optimize sub-agents system prompt intro by NTaylorMullen in
+  [#18608](https://github.com/google-gemini/gemini-cli/pull/18608)
+- feat(cli): update approval mode labels and shortcuts per latest UX spec by
+  jerop in [#18698](https://github.com/google-gemini/gemini-cli/pull/18698)
+- fix(plan): update persistent approval mode setting by Adib234 in
+  [#18638](https://github.com/google-gemini/gemini-cli/pull/18638)
+- fix: move toasts location to left side by jackwotherspoon in
+  [#18705](https://github.com/google-gemini/gemini-cli/pull/18705)
+- feat(routing): restrict numerical routing to Gemini 3 family by mattKorwel in
+  [#18478](https://github.com/google-gemini/gemini-cli/pull/18478)
+- fix(ide): fix ide nudge setting by skeshive in
+  [#18733](https://github.com/google-gemini/gemini-cli/pull/18733)
+- fix(core): standardize tool formatting in system prompts by NTaylorMullen in
+  [#18615](https://github.com/google-gemini/gemini-cli/pull/18615)
+- chore: consolidate to green in ask user dialog by jackwotherspoon in
+  [#18734](https://github.com/google-gemini/gemini-cli/pull/18734)
+- feat: add extensionsExplore setting to enable extensions explore UI. by
+  sripasg in [#18686](https://github.com/google-gemini/gemini-cli/pull/18686)
+- feat(cli): defer devtools startup and integrate with F12 by SandyTao520 in
+  [#18695](https://github.com/google-gemini/gemini-cli/pull/18695)
+- ui: update & subdue footer colors and animate progress indicator by
+  keithguerin in
+  [#18570](https://github.com/google-gemini/gemini-cli/pull/18570)
+- test: add model-specific snapshots for coreTools by aishaneeshah in
+  [#18707](https://github.com/google-gemini/gemini-cli/pull/18707)
+- ci: shard windows tests and fix event listener leaks by NTaylorMullen in
+  [#18670](https://github.com/google-gemini/gemini-cli/pull/18670)
+- fix: allow ask_user tool in yolo mode by jackwotherspoon in
+  [#18541](https://github.com/google-gemini/gemini-cli/pull/18541)
+- feat: redact disabled tools from system prompt
+  ([#13597](https://github.com/google-gemini/gemini-cli/pull/13597)) by
+  NTaylorMullen in
+  [#18613](https://github.com/google-gemini/gemini-cli/pull/18613)
+- Update Gemini.md to use the curent year on creating new files by sehoon38 in
+  [#18460](https://github.com/google-gemini/gemini-cli/pull/18460)
+- Code review cleanup for thinking display by jacob314 in
+  [#18720](https://github.com/google-gemini/gemini-cli/pull/18720)
+- fix(cli): hide scrollbars when in alternate buffer copy mode by werdnum in
+  [#18354](https://github.com/google-gemini/gemini-cli/pull/18354)
+- Fix issues with rip grep by gundermanc in
+  [#18756](https://github.com/google-gemini/gemini-cli/pull/18756)
+- fix(cli): fix history navigation regression after prompt autocomplete by
+  sehoon38 in [#18752](https://github.com/google-gemini/gemini-cli/pull/18752)
+- chore: cleanup unused and add unlisted dependencies in packages/cli by
+  adamfweidman in
+  [#18749](https://github.com/google-gemini/gemini-cli/pull/18749)
+- Fix issue where Gemini CLI creates tests in a new file by gundermanc in
+  [#18409](https://github.com/google-gemini/gemini-cli/pull/18409)
+- feat(telemetry): Ensure experiment IDs are included in OpenTelemetry logs by
+  kevin-ramdass in
+  [#18747](https://github.com/google-gemini/gemini-cli/pull/18747)
 
 **Full changelog**:
-https://github.com/google-gemini/gemini-cli/compare/v0.29.0-preview.5...v0.30.0-preview.3
+https://github.com/google-gemini/gemini-cli/compare/v0.28.0-preview.0...v0.29.0-preview.0

docs/cli/cli-reference.md

@@ -26,29 +26,29 @@ and parameters.
 
 ## CLI Options
 
-| Option                           | Alias | Type    | Default   | Description                                                                                                                                                            |
-| -------------------------------- | ----- | ------- | --------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `--debug`                        | `-d`  | boolean | `false`   | Run in debug mode with verbose logging                                                                                                                                 |
-| `--version`                      | `-v`  | -       | -         | Show CLI version number and exit                                                                                                                                       |
-| `--help`                         | `-h`  | -       | -         | Show help information                                                                                                                                                  |
-| `--model`                        | `-m`  | string  | `auto`    | Model to use. See [Model Selection](#model-selection) for available values.                                                                                            |
-| `--prompt`                       | `-p`  | string  | -         | Prompt text. Appended to stdin input if provided. **Deprecated:** Use positional arguments instead.                                                                    |
-| `--prompt-interactive`           | `-i`  | string  | -         | Execute prompt and continue in interactive mode                                                                                                                        |
-| `--sandbox`                      | `-s`  | boolean | `false`   | Run in a sandboxed environment for safer execution                                                                                                                     |
-| `--approval-mode`                | -     | string  | `default` | Approval mode for tool execution. Choices: `default`, `auto_edit`, `yolo`                                                                                              |
-| `--yolo`                         | `-y`  | boolean | `false`   | **Deprecated.** Auto-approve all actions. Use `--approval-mode=yolo` instead.                                                                                          |
-| `--experimental-acp`             | -     | boolean | -         | Start in ACP (Agent Code Pilot) mode. **Experimental feature.**                                                                                                        |
-| `--experimental-zed-integration` | -     | boolean | -         | Run in Zed editor integration mode. **Experimental feature.**                                                                                                          |
-| `--allowed-mcp-server-names`     | -     | array   | -         | Allowed MCP server names (comma-separated or multiple flags)                                                                                                           |
-| `--allowed-tools`                | -     | array   | -         | **Deprecated.** Use the [Policy Engine](../reference/policy-engine.md) instead. Tools that are allowed to run without confirmation (comma-separated or multiple flags) |
-| `--extensions`                   | `-e`  | array   | -         | List of extensions to use. If not provided, all extensions are enabled (comma-separated or multiple flags)                                                             |
-| `--list-extensions`              | `-l`  | boolean | -         | List all available extensions and exit                                                                                                                                 |
-| `--resume`                       | `-r`  | string  | -         | Resume a previous session. Use `"latest"` for most recent or index number (e.g. `--resume 5`)                                                                          |
-| `--list-sessions`                | -     | boolean | -         | List available sessions for the current project and exit                                                                                                               |
-| `--delete-session`               | -     | string  | -         | Delete a session by index number (use `--list-sessions` to see available sessions)                                                                                     |
-| `--include-directories`          | -     | array   | -         | Additional directories to include in the workspace (comma-separated or multiple flags)                                                                                 |
-| `--screen-reader`                | -     | boolean | -         | Enable screen reader mode for accessibility                                                                                                                            |
-| `--output-format`                | `-o`  | string  | `text`    | The format of the CLI output. Choices: `text`, `json`, `stream-json`                                                                                                   |
+| Option                           | Alias | Type    | Default   | Description                                                                                                                                                       |
+| -------------------------------- | ----- | ------- | --------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `--debug`                        | `-d`  | boolean | `false`   | Run in debug mode with verbose logging                                                                                                                            |
+| `--version`                      | `-v`  | -       | -         | Show CLI version number and exit                                                                                                                                  |
+| `--help`                         | `-h`  | -       | -         | Show help information                                                                                                                                             |
+| `--model`                        | `-m`  | string  | `auto`    | Model to use. See [Model Selection](#model-selection) for available values.                                                                                       |
+| `--prompt`                       | `-p`  | string  | -         | Prompt text. Appended to stdin input if provided. **Deprecated:** Use positional arguments instead.                                                               |
+| `--prompt-interactive`           | `-i`  | string  | -         | Execute prompt and continue in interactive mode                                                                                                                   |
+| `--sandbox`                      | `-s`  | boolean | `false`   | Run in a sandboxed environment for safer execution                                                                                                                |
+| `--approval-mode`                | -     | string  | `default` | Approval mode for tool execution. Choices: `default`, `auto_edit`, `yolo`                                                                                         |
+| `--yolo`                         | `-y`  | boolean | `false`   | **Deprecated.** Auto-approve all actions. Use `--approval-mode=yolo` instead.                                                                                     |
+| `--experimental-acp`             | -     | boolean | -         | Start in ACP (Agent Code Pilot) mode. **Experimental feature.**                                                                                                   |
+| `--experimental-zed-integration` | -     | boolean | -         | Run in Zed editor integration mode. **Experimental feature.**                                                                                                     |
+| `--allowed-mcp-server-names`     | -     | array   | -         | Allowed MCP server names (comma-separated or multiple flags)                                                                                                      |
+| `--allowed-tools`                | -     | array   | -         | **Deprecated.** Use the [Policy Engine](../core/policy-engine.md) instead. Tools that are allowed to run without confirmation (comma-separated or multiple flags) |
+| `--extensions`                   | `-e`  | array   | -         | List of extensions to use. If not provided, all extensions are enabled (comma-separated or multiple flags)                                                        |
+| `--list-extensions`              | `-l`  | boolean | -         | List all available extensions and exit                                                                                                                            |
+| `--resume`                       | `-r`  | string  | -         | Resume a previous session. Use `"latest"` for most recent or index number (e.g. `--resume 5`)                                                                     |
+| `--list-sessions`                | -     | boolean | -         | List available sessions for the current project and exit                                                                                                          |
+| `--delete-session`               | -     | string  | -         | Delete a session by index number (use `--list-sessions` to see available sessions)                                                                                |
+| `--include-directories`          | -     | array   | -         | Additional directories to include in the workspace (comma-separated or multiple flags)                                                                            |
+| `--screen-reader`                | -     | boolean | -         | Enable screen reader mode for accessibility                                                                                                                       |
+| `--output-format`                | `-o`  | string  | `text`    | The format of the CLI output. Choices: `text`, `json`, `stream-json`                                                                                              |
 
 ## Model selection
 

docs/cli/commands.md

@@ -217,19 +217,12 @@ Slash commands provide meta-level control over the CLI itself.
       model.
   - **Note:** For more details on how `GEMINI.md` files contribute to
     hierarchical memory, see the
-    [CLI Configuration documentation](./configuration.md).
+    [CLI Configuration documentation](../get-started/configuration.md).
 
 ### `/model`
 
 - **Description:** Opens a dialog to choose your Gemini model.
 
-### `/plan`
-
-- **Description:** Switch to Plan Mode (read-only) and view the current plan if
-  one has been generated.
-  - **Note:** This feature requires the `experimental.plan` setting to be
-    enabled in your configuration.
-
 ### `/policies`
 
 - **Description:** Manage policies.
@@ -254,7 +247,7 @@ Slash commands provide meta-level control over the CLI itself.
   checkpoints to restore from.
 - **Usage:** `/restore [tool_call_id]`
 - **Note:** Only available if checkpointing is configured via
-  [settings](./configuration.md). See
+  [settings](../get-started/configuration.md). See
   [Checkpointing documentation](../cli/checkpointing.md) for more details.
 
 ### `/rewind`
@@ -293,8 +286,7 @@ Slash commands provide meta-level control over the CLI itself.
   settings that control the behavior and appearance of Gemini CLI. It is
   equivalent to manually editing the `.gemini/settings.json` file, but with
   validation and guidance to prevent errors. See the
-  [settings documentation](../cli/settings.md) for a full list of available
-  settings.
+  [settings documentation](./settings.md) for a full list of available settings.
 - **Usage:** Simply run `/settings` and the editor will open. You can then
   browse or search for specific settings, view their current values, and modify
   them as desired. Changes to some settings are applied immediately, while
@@ -381,8 +373,7 @@ Slash commands provide meta-level control over the CLI itself.
 
 Custom commands allow you to create personalized shortcuts for your most-used
 prompts. For detailed instructions on how to create, manage, and use them,
-please see the dedicated
-[Custom Commands documentation](../cli/custom-commands.md).
+please see the dedicated [Custom Commands documentation](./custom-commands.md).
 
 ## Input prompt shortcuts
 

docs/cli/enterprise.md

@@ -20,7 +20,7 @@ The most powerful tools for enterprise administration are the system-wide
 settings files. These files allow you to define a baseline configuration
 (`system-defaults.json`) and a set of overrides (`settings.json`) that apply to
 all users on a machine. For a complete overview of configuration options, see
-the [Configuration documentation](../reference/configuration.md).
+the [Configuration documentation](../get-started/configuration.md).
 
 Settings are merged from four files. The precedence order for single-value
 settings (like `theme`) is:
@@ -224,8 +224,8 @@ gemini
 
 You can significantly enhance security by controlling which tools the Gemini
 model can use. This is achieved through the `tools.core` setting and the
-[Policy Engine](../reference/policy-engine.md). For a list of available tools,
-see the [Tools documentation](../tools/index.md).
+[Policy Engine](../core/policy-engine.md). For a list of available tools, see
+the [Tools documentation](../tools/index.md).
 
 ### Allowlisting with `coreTools`
 
@@ -245,8 +245,8 @@ on the approved list.
 
 ### Blocklisting with `excludeTools` (Deprecated)
 
-> **Deprecated:** Use the [Policy Engine](../reference/policy-engine.md) for
-> more robust control.
+> **Deprecated:** Use the [Policy Engine](../core/policy-engine.md) for more
+> robust control.
 
 Alternatively, you can add specific tools that are considered dangerous in your
 environment to a blocklist.
@@ -289,8 +289,8 @@ unintended tool execution.
 ## Managing custom tools (MCP servers)
 
 If your organization uses custom tools via
-[Model-Context Protocol (MCP) servers](../reference/tools-api.md), it is crucial
-to understand how server configurations are managed to apply security policies
+[Model-Context Protocol (MCP) servers](../core/tools-api.md), it is crucial to
+understand how server configurations are managed to apply security policies
 effectively.
 
 ### How MCP server configurations are merged

docs/cli/gemini-md.md

@@ -88,7 +88,7 @@ More content here.
 @../shared/style-guide.md
 ```
 
-For more details, see the [Memory Import Processor](../reference/memport.md)
+For more details, see the [Memory Import Processor](../core/memport.md)
 documentation.
 
 ## Customize the context file name

docs/cli/index.md

@@ -0,0 +1,123 @@
+# Using Gemini CLI
+
+Gemini CLI is a terminal-first interface that brings the power of Gemini AI
+models directly into your development workflow. It lets you interact with AI
+using your local files, shell environment, and project context, creating a
+bridge between generative AI and your system tools.
+
+## User guides
+
+These guides provide step-by-step instructions and practical examples for using
+Gemini CLI in your daily development workflow.
+
+- **[Quickstart](../get-started/index.md):** Get up and running with Gemini CLI
+  in minutes.
+- **[Examples](../get-started/examples.md):** See practical examples of Gemini
+  CLI in action.
+- **[Get started with skills](./tutorials/skills-getting-started.md):** Learn
+  how to use and manage specialized expertise.
+- **[File management](./tutorials/file-management.md):** How to include, search,
+  and modify local files.
+- **[Set up an MCP server](./tutorials/mcp-setup.md):** Configure Model Context
+  Protocol servers for custom tools.
+- **[Manage context and memory](./tutorials/memory-management.md):** Manage
+  persistent instructions and individual facts.
+- **[Manage sessions and history](./tutorials/session-management.md):** Resume,
+  manage, and rewind your conversations.
+- **[Execute shell commands](./tutorials/shell-commands.md):** Execute system
+  commands safely directly from your prompt.
+- **[Plan tasks with todos](./tutorials/task-planning.md):** Using todos for
+  complex, multi-step agent requests.
+- **[Web search and fetch](./tutorials/web-tools.md):** Searching and fetching
+  content from the web.
+
+## Features
+
+Technical reference documentation for each capability of Gemini CLI.
+
+- **[/about](../cli/commands.md#about):** Show version info.
+- **[/auth](../cli/commands.md#auth):** Change authentication method.
+- **[/bug](../cli/commands.md#bug):** File an issue about Gemini CLI.
+- **[/chat](../cli/commands.md#chat):** Save and resume conversation history.
+- **[/clear](../cli/commands.md#clear):** Clear the terminal screen.
+- **[/compress](../cli/commands.md#compress):** Replace context with a summary.
+- **[/copy](../cli/commands.md#copy):** Copy output to clipboard.
+- **[/directory](../cli/commands.md#directory-or-dir):** Manage workspace
+  directories.
+- **[/docs](../cli/commands.md#docs):** Open documentation in browser.
+- **[/editor](../cli/commands.md#editor):** Select preferred editor.
+- **[/extensions](../cli/commands.md#extensions):** List active extensions.
+- **[/help](../cli/commands.md#help-or):** Display help information.
+- **[/hooks](../hooks/index.md):** Manage hooks for lifecycle events.
+- **[/ide](../ide-integration/index.md):** Manage IDE integration.
+- **[/init](../cli/commands.md#init):** Create a GEMINI.md context file.
+- **[/mcp](../tools/mcp-server.md):** Manage Model Context Protocol servers.
+- **[/memory](../cli/commands.md#memory):** Manage instructional context.
+- **[/model](./model.md):** Choose Gemini model.
+- **[/policies](../cli/commands.md#policies):** Manage security policies.
+- **[/privacy](../cli/commands.md#privacy):** Display privacy notice.
+- **[/quit](../cli/commands.md#quit-or-exit):** Exit Gemini CLI.
+- **[/restore](../cli/commands.md#restore):** Restore file state.
+- **[/resume](../cli/commands.md#resume):** Browse and resume sessions.
+- **[/rewind](./rewind.md):** Navigate backward through history.
+- **[/settings](./settings.md):** Open settings editor.
+- **[/setup-github](../cli/commands.md#setup-github):** Set up GitHub Actions.
+- **[/shells](../cli/commands.md#shells-or-bashes):** Toggle background shells
+  view.
+- **[/skills](./skills.md):** Manage Agent Skills.
+- **[/stats](../cli/commands.md#stats):** Display session statistics.
+- **[/terminal-setup](../cli/commands.md#terminal-setup):** Configure
+  keybindings.
+- **[/theme](./themes.md):** Change visual theme.
+- **[/tools](../cli/commands.md#tools):** Display list of available tools.
+- **[/vim](../cli/commands.md#vim):** Toggle vim mode.
+- **[Activate skill (tool)](../tools/activate-skill.md):** Internal mechanism
+  for loading expert procedures.
+- **[Ask user (tool)](../tools/ask-user.md):** Internal dialog system for
+  clarification.
+- **[Checkpointing](./checkpointing.md):** Automatic session snapshots.
+- **[File system (tool)](../tools/file-system.md):** Technical details for local
+  file operations.
+- **[Headless mode](./headless.md):** Programmatic and scripting interface.
+- **[Internal documentation (tool)](../tools/internal-docs.md):** Technical
+  lookup for CLI features.
+- **[Memory (tool)](../tools/memory.md):** Storage details for persistent facts.
+- **[Model routing](./model-routing.md):** Automatic fallback resilience.
+- **[Plan mode (experimental)](./plan-mode.md):** Use a safe, read-only mode for
+  planning complex changes.
+- **[Sandboxing](./sandbox.md):** Isolate tool execution.
+- **[Shell (tool)](../tools/shell.md):** Detailed system execution parameters.
+- **[Telemetry](./telemetry.md):** Usage and performance metric details.
+- **[Todo (tool)](../tools/todos.md):** Progress tracking specification.
+- **[Token caching](./token-caching.md):** Performance optimization.
+- **[Web fetch (tool)](../tools/web-fetch.md):** URL retrieval and extraction
+  details.
+- **[Web search (tool)](../tools/web-search.md):** Google Search integration
+  technicals.
+
+## Configuration
+
+Settings and customization options for Gemini CLI.
+
+- **[Custom commands](./custom-commands.md):** Personalized shortcuts.
+- **[Enterprise configuration](./enterprise.md):** Professional environment
+  controls.
+- **[Ignore files (.geminiignore)](./gemini-ignore.md):** Exclusion pattern
+  reference.
+- **[Model configuration](./generation-settings.md):** Fine-tune generation
+  parameters like temperature and thinking budget.
+- **[Project context (GEMINI.md)](./gemini-md.md):** Technical hierarchy of
+  context files.
+- **[Settings](./settings.md):** Full `settings.json` schema.
+- **[System prompt override](./system-prompt.md):** Instruction replacement
+  logic.
+- **[Themes](./themes.md):** UI personalization technical guide.
+- **[Trusted folders](./trusted-folders.md):** Security permission logic.
+
+## Next steps
+
+- Explore the [Command reference](./commands.md) to learn about all available
+  slash commands.
+- Read about [Project context](./gemini-md.md) to understand how to provide
+  persistent instructions to the model.
+- See the [CLI reference](./cli-reference.md) for a quick cheatsheet of flags.

docs/cli/keyboard-shortcuts.md

@@ -61,7 +61,7 @@ available combinations.
 | Show the next entry in history.              | `Ctrl + N (no Shift)` |
 | Start reverse search through history.        | `Ctrl + R`            |
 | Submit the selected reverse-search match.    | `Enter (no Ctrl)`     |
-| Accept a suggestion while reverse searching. | `Tab (no Shift)`      |
+| Accept a suggestion while reverse searching. | `Tab`                 |
 | Browse and rewind previous interactions.     | `Double Esc`          |
 
 #### Navigation
@@ -79,7 +79,7 @@ available combinations.
 
 | Action                                  | Keys                                               |
 | --------------------------------------- | -------------------------------------------------- |
-| Accept the inline suggestion.           | `Tab (no Shift)`<br />`Enter (no Ctrl)`            |
+| Accept the inline suggestion.           | `Tab`<br />`Enter (no Ctrl)`                       |
 | Move to the previous completion option. | `Up Arrow (no Shift)`<br />`Ctrl + P (no Shift)`   |
 | Move to the next completion option.     | `Down Arrow (no Shift)`<br />`Ctrl + N (no Shift)` |
 | Expand an inline suggestion.            | `Right Arrow`                                      |

docs/cli/model.md

@@ -39,7 +39,7 @@ To enable Gemini 3 Pro and Gemini 3 Flash (if available), enable
 
 You can also use the `--model` flag to specify a particular Gemini model on
 startup. For more details, refer to the
-[configuration documentation](../reference/configuration.md).
+[configuration documentation](../get-started/configuration.md).
 
 Changes to these settings will be applied to all subsequent interactions with
 Gemini CLI.

docs/cli/plan-mode.md

@@ -69,7 +69,6 @@ You can enter Plan Mode in three ways:
 2.  **Command:** Type `/plan` in the input box.
 3.  **Natural Language:** Ask the agent to "start a plan for...". The agent will
     then call the [`enter_plan_mode`] tool to switch modes.
-    - **Note:** This tool is not available when the CLI is in YOLO mode.
 
 ### The Planning Workflow
 
@@ -128,47 +127,6 @@ To use a skill in Plan Mode, you can explicitly ask the agent to "use the
 [skill-name] skill to plan..." or the agent may autonomously activate it based
 on the task description.
 
-### Custom Plan Directory and Policies
-
-By default, planning artifacts are stored in a managed temporary directory
-outside your project: `~/.gemini/tmp/<project>/<session-id>/plans/`.
-
-You can configure a custom directory for plans in your `settings.json`. For
-example, to store plans in a `.gemini/plans` directory within your project:
-
-```json
-{
-  "general": {
-    "plan": {
-      "directory": ".gemini/plans"
-    }
-  }
-}
-```
-
-To maintain the safety of Plan Mode, user-configured paths for the plans
-directory are restricted to the project root. This ensures that custom planning
-locations defined within a project's workspace cannot be used to escape and
-overwrite sensitive files elsewhere. Any user-configured directory must reside
-within the project boundary.
-
-Because Plan Mode is read-only by default, using a custom directory requires
-updating your [Policy Engine] configurations to allow `write_file` and `replace`
-in that specific location. For example, to allow writing to the `.gemini/plans`
-directory within your project, create a policy file at
-`~/.gemini/policies/plan-custom-directory.toml`:
-
-```toml
-[[rule]]
-toolName = ["write_file", "replace"]
-decision = "allow"
-priority = 100
-modes = ["plan"]
-# Adjust the pattern to match your custom directory.
-# This example matches any .md file in a .gemini/plans directory within the project.
-argsPattern = "\"file_path\":\".*\\\\.gemini/plans/.*\\\\.md\""
-```
-
 ### Customizing Policies
 
 Plan Mode is designed to be read-only by default to ensure safety during the
@@ -226,7 +184,7 @@ Guide].
 [MCP tools]: /docs/tools/mcp-server.md
 [`activate_skill`]: /docs/cli/skills.md
 [experimental research sub-agents]: /docs/core/subagents.md
-[Policy Engine Guide]: /docs/reference/policy-engine.md
+[Policy Engine Guide]: /docs/core/policy-engine.md
 [`enter_plan_mode`]: /docs/tools/planning.md#1-enter_plan_mode-enterplanmode
 [`exit_plan_mode`]: /docs/tools/planning.md#2-exit_plan_mode-exitplanmode
 [`ask_user`]: /docs/tools/ask-user.md

docs/cli/sandbox.md

@@ -167,6 +167,6 @@ gemini -s -p "run shell command: mount | grep workspace"
 
 ## Related documentation
 
-- [Configuration](../reference/configuration.md): Full configuration options.
-- [Commands](../reference/commands.md): Available commands.
-- [Troubleshooting](../resources/troubleshooting.md): General troubleshooting.
+- [Configuration](../get-started/configuration.md): Full configuration options.
+- [Commands](./commands.md): Available commands.
+- [Troubleshooting](../troubleshooting.md): General troubleshooting.

docs/cli/settings.md

@@ -27,8 +27,6 @@ they appear in the UI.
 | Vim Mode                 | `general.vimMode`                  | Enable Vim keybindings                                                                                                                                                         | `false`     |
 | 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' is not supported yet. | `"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.                                                               | `undefined` |
 | Enable Prompt Completion | `general.enablePromptCompletion`   | Enable AI-powered prompt completion suggestions while typing.                                                                                                                  | `false`     |
 | Debug Keystroke Logging  | `general.debugKeystrokeLogging`    | Enable debug logging of keystrokes to the console.                                                                                                                             | `false`     |
 | Enable Session Cleanup   | `general.sessionRetention.enabled` | Enable automatic session cleanup                                                                                                                                               | `false`     |
@@ -42,36 +40,35 @@ they appear in the UI.
 
 ### UI
 
-| UI Label                             | Setting                                | Description                                                                                                                                                       | Default  |
-| ------------------------------------ | -------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- |
-| Auto Theme Switching                 | `ui.autoThemeSwitching`                | Automatically switch between default light and dark themes based on terminal background color.                                                                    | `true`   |
-| Terminal Background Polling Interval | `ui.terminalBackgroundPollingInterval` | Interval in seconds to poll the terminal background color.                                                                                                        | `60`     |
-| Hide Window Title                    | `ui.hideWindowTitle`                   | Hide the window title bar                                                                                                                                         | `false`  |
-| Inline Thinking                      | `ui.inlineThinkingMode`                | Display model thinking inline: off or full.                                                                                                                       | `"off"`  |
-| Show Thoughts in Title               | `ui.showStatusInTitle`                 | Show Gemini CLI model thoughts in the terminal window title during the working phase                                                                              | `false`  |
-| Dynamic Window Title                 | `ui.dynamicWindowTitle`                | Update the terminal window title with current status icons (Ready: ◇, Action Required: ✋, Working: ✦)                                                            | `true`   |
-| Show Home Directory Warning          | `ui.showHomeDirectoryWarning`          | Show a warning when running Gemini CLI in the home directory.                                                                                                     | `true`   |
-| Show Compatibility Warnings          | `ui.showCompatibilityWarnings`         | Show warnings about terminal or OS compatibility issues.                                                                                                          | `true`   |
-| Hide Tips                            | `ui.hideTips`                          | Hide helpful tips in the UI                                                                                                                                       | `false`  |
-| Show Shortcuts Hint                  | `ui.showShortcutsHint`                 | Show the "? for shortcuts" hint above the input.                                                                                                                  | `true`   |
-| Hide Banner                          | `ui.hideBanner`                        | Hide the application banner                                                                                                                                       | `false`  |
-| Hide Context Summary                 | `ui.hideContextSummary`                | Hide the context summary (GEMINI.md, MCP servers) above the input.                                                                                                | `false`  |
-| Hide CWD                             | `ui.footer.hideCWD`                    | Hide the current working directory path in the footer.                                                                                                            | `false`  |
-| Hide Sandbox Status                  | `ui.footer.hideSandboxStatus`          | Hide the sandbox status indicator in the footer.                                                                                                                  | `false`  |
-| Hide Model Info                      | `ui.footer.hideModelInfo`              | Hide the model name and context usage in the footer.                                                                                                              | `false`  |
-| Hide Context Window Percentage       | `ui.footer.hideContextPercentage`      | Hides the context window remaining percentage.                                                                                                                    | `true`   |
-| Hide Footer                          | `ui.hideFooter`                        | Hide the footer from the UI                                                                                                                                       | `false`  |
-| Show Memory Usage                    | `ui.showMemoryUsage`                   | Display memory usage information in the UI                                                                                                                        | `false`  |
-| Show Line Numbers                    | `ui.showLineNumbers`                   | Show line numbers in the chat.                                                                                                                                    | `true`   |
-| Show Citations                       | `ui.showCitations`                     | Show citations for generated text in the chat.                                                                                                                    | `false`  |
-| Show Model Info In Chat              | `ui.showModelInfoInChat`               | Show the model name in the chat for each model turn.                                                                                                              | `false`  |
-| Show User Identity                   | `ui.showUserIdentity`                  | Show the logged-in user's identity (e.g. email) in the UI.                                                                                                        | `true`   |
-| Use Alternate Screen Buffer          | `ui.useAlternateBuffer`                | Use an alternate screen buffer for the UI, preserving shell history.                                                                                              | `false`  |
-| Use Background Color                 | `ui.useBackgroundColor`                | Whether to use background colors in the UI.                                                                                                                       | `true`   |
-| Incremental Rendering                | `ui.incrementalRendering`              | Enable incremental rendering for the UI. This option will reduce flickering but may cause rendering artifacts. Only supported when useAlternateBuffer is enabled. | `true`   |
-| Show Spinner                         | `ui.showSpinner`                       | Show the spinner during operations.                                                                                                                               | `true`   |
-| Loading Phrases                      | `ui.loadingPhrases`                    | What to show while the model is working: tips, witty comments, both, or nothing.                                                                                  | `"tips"` |
-| Screen Reader Mode                   | `ui.accessibility.screenReader`        | Render output in plain-text to be more screen reader accessible                                                                                                   | `false`  |
+| UI Label                             | Setting                                 | Description                                                                                                                                                       | Default |
+| ------------------------------------ | --------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| Auto Theme Switching                 | `ui.autoThemeSwitching`                 | Automatically switch between default light and dark themes based on terminal background color.                                                                    | `true`  |
+| Terminal Background Polling Interval | `ui.terminalBackgroundPollingInterval`  | Interval in seconds to poll the terminal background color.                                                                                                        | `60`    |
+| Hide Window Title                    | `ui.hideWindowTitle`                    | Hide the window title bar                                                                                                                                         | `false` |
+| Inline Thinking                      | `ui.inlineThinkingMode`                 | Display model thinking inline: off or full.                                                                                                                       | `"off"` |
+| Show Thoughts in Title               | `ui.showStatusInTitle`                  | Show Gemini CLI model thoughts in the terminal window title during the working phase                                                                              | `false` |
+| Dynamic Window Title                 | `ui.dynamicWindowTitle`                 | Update the terminal window title with current status icons (Ready: ◇, Action Required: ✋, Working: ✦)                                                            | `true`  |
+| Show Home Directory Warning          | `ui.showHomeDirectoryWarning`           | Show a warning when running Gemini CLI in the home directory.                                                                                                     | `true`  |
+| Hide Tips                            | `ui.hideTips`                           | Hide helpful tips in the UI                                                                                                                                       | `false` |
+| Show Shortcuts Hint                  | `ui.showShortcutsHint`                  | Show the "? for shortcuts" hint above the input.                                                                                                                  | `true`  |
+| Hide Banner                          | `ui.hideBanner`                         | Hide the application banner                                                                                                                                       | `false` |
+| Hide Context Summary                 | `ui.hideContextSummary`                 | Hide the context summary (GEMINI.md, MCP servers) above the input.                                                                                                | `false` |
+| Hide CWD                             | `ui.footer.hideCWD`                     | Hide the current working directory path in the footer.                                                                                                            | `false` |
+| Hide Sandbox Status                  | `ui.footer.hideSandboxStatus`           | Hide the sandbox status indicator in the footer.                                                                                                                  | `false` |
+| Hide Model Info                      | `ui.footer.hideModelInfo`               | Hide the model name and context usage in the footer.                                                                                                              | `false` |
+| Hide Context Window Percentage       | `ui.footer.hideContextPercentage`       | Hides the context window remaining percentage.                                                                                                                    | `true`  |
+| Hide Footer                          | `ui.hideFooter`                         | Hide the footer from the UI                                                                                                                                       | `false` |
+| Show Memory Usage                    | `ui.showMemoryUsage`                    | Display memory usage information in the UI                                                                                                                        | `false` |
+| Show Line Numbers                    | `ui.showLineNumbers`                    | Show line numbers in the chat.                                                                                                                                    | `true`  |
+| Show Citations                       | `ui.showCitations`                      | Show citations for generated text in the chat.                                                                                                                    | `false` |
+| Show Model Info In Chat              | `ui.showModelInfoInChat`                | Show the model name in the chat for each model turn.                                                                                                              | `false` |
+| Show User Identity                   | `ui.showUserIdentity`                   | Show the logged-in user's identity (e.g. email) in the UI.                                                                                                        | `true`  |
+| Use Alternate Screen Buffer          | `ui.useAlternateBuffer`                 | Use an alternate screen buffer for the UI, preserving shell history.                                                                                              | `false` |
+| Use Background Color                 | `ui.useBackgroundColor`                 | Whether to use background colors in the UI.                                                                                                                       | `true`  |
+| Incremental Rendering                | `ui.incrementalRendering`               | Enable incremental rendering for the UI. This option will reduce flickering but may cause rendering artifacts. Only supported when useAlternateBuffer is enabled. | `true`  |
+| Show Spinner                         | `ui.showSpinner`                        | Show the spinner during operations.                                                                                                                               | `true`  |
+| Enable Loading Phrases               | `ui.accessibility.enableLoadingPhrases` | Enable loading phrases during operations.                                                                                                                         | `true`  |
+| Screen Reader Mode                   | `ui.accessibility.screenReader`         | Render output in plain-text to be more screen reader accessible                                                                                                   | `false` |
 
 ### IDE
 
@@ -129,13 +126,11 @@ they appear in the UI.
 
 ### Experimental
 
-| UI Label                   | Setting                                  | Description                                                                                                                                               | Default |
-| -------------------------- | ---------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
-| Enable Tool Output Masking | `experimental.toolOutputMasking.enabled` | Enables tool output masking to save tokens.                                                                                                               | `true`  |
-| Use OSC 52 Paste           | `experimental.useOSC52Paste`             | Use OSC 52 for pasting. This may be more robust than the default system when using remote terminal sessions (if your terminal is configured to allow it). | `false` |
-| Use OSC 52 Copy            | `experimental.useOSC52Copy`              | Use OSC 52 for copying. This may be more robust than the default system when using remote terminal sessions (if your terminal is configured to allow it). | `false` |
-| Plan                       | `experimental.plan`                      | Enable planning features (Plan Mode and tools).                                                                                                           | `false` |
-| Model Steering             | `experimental.modelSteering`             | Enable model steering (user hints) to guide the model during tool execution.                                                                              | `false` |
+| UI Label                   | Setting                                  | Description                                                                         | Default |
+| -------------------------- | ---------------------------------------- | ----------------------------------------------------------------------------------- | ------- |
+| Enable Tool Output Masking | `experimental.toolOutputMasking.enabled` | Enables tool output masking to save tokens.                                         | `true`  |
+| Use OSC 52 Paste           | `experimental.useOSC52Paste`             | Use OSC 52 sequence for pasting instead of clipboardy (useful for remote sessions). | `false` |
+| Plan                       | `experimental.plan`                      | Enable planning features (Plan Mode and tools).                                     | `false` |
 
 ### Skills
 

docs/cli/telemetry.md

@@ -93,7 +93,7 @@ Environment variables can be used to override the settings in the file.
 `true` or `1` will enable the feature. Any other value will disable it.
 
 For detailed information about all configuration options, see the
-[Configuration guide](../reference/configuration.md).
+[Configuration guide](../get-started/configuration.md).
 
 ## Google Cloud telemetry
 

docs/cli/themes.md

@@ -41,8 +41,8 @@ can change the theme using the `/theme` command.
 ### Theme persistence
 
 Selected themes are saved in Gemini CLI's
-[configuration](../reference/configuration.md) so your preference is remembered
-across sessions.
+[configuration](../get-started/configuration.md) so your preference is
+remembered across sessions.
 
 ---
 
@@ -194,7 +194,7 @@ untrusted sources.
 - Or, set it as the default by adding `"theme": "MyCustomTheme"` to the `ui`
   object in your `settings.json`.
 - Custom themes can be set at the user, project, or system level, and follow the
-  same [configuration precedence](../reference/configuration.md) as other
+  same [configuration precedence](../get-started/configuration.md) as other
   settings.
 
 ### Themes from extensions

docs/cli/tutorials/memory-management.md

@@ -121,6 +121,6 @@ immediately. Force a reload with:
 
 - Learn about [Session management](session-management.md) to see how short-term
   history works.
-- Explore the [Command reference](../../reference/commands.md) for more
-  `/memory` options.
+- Explore the [Command reference](../../cli/commands.md) for more `/memory`
+  options.
 - Read the technical spec for [Project context](../../cli/gemini-md.md).

docs/cli/tutorials/session-management.md

@@ -101,5 +101,5 @@ This creates a new branch of history without losing your original work.
 - Learn about [Checkpointing](../../cli/checkpointing.md) to understand the
   underlying safety mechanism.
 - Explore [Task planning](task-planning.md) to keep complex sessions organized.
-- See the [Command reference](../../reference/commands.md) for all `/chat` and
+- See the [Command reference](../../cli/commands.md) for all `/chat` and
   `/resume` options.

docs/core/concepts.md

@@ -0,0 +1,137 @@
+# Core concepts
+
+This guide explains the fundamental concepts and terminology used throughout the
+Gemini CLI ecosystem. Understanding these terms will help you make the most of
+the tool's capabilities.
+
+## Approval mode
+
+**Approval mode** determines the level of autonomy you grant to the agent when
+executing tools.
+
+- **Default:** The agent asks for confirmation before performing any potentially
+  impactful action (like writing files or running shell commands).
+- **Auto-edit:** File modifications are applied automatically, but shell
+  commands still require confirmation.
+- **YOLO (You Only Look Once):** The agent runs all tools without asking for
+  permission. High risk, high speed.
+
+## Checkpointing
+
+**Checkpointing** is a safety feature that automatically snapshots your
+project's file state before the agent performs any destructive action (like
+writing a file).
+
+- **Snapshots:** Stored in a hidden Git repository (separate from your project's
+  Git history).
+- **Restore:** Allows you to instantly revert changes if the agent makes a
+  mistake, using the `/restore` command.
+
+## Context
+
+**Context** refers to the information the agent has about your current task and
+environment. Gemini CLI provides context through several mechanisms:
+
+- **Conversation history:** The chat log of the current session.
+- **Project context (`GEMINI.md`):** Persistent instructions and rules defined
+  in your project's root or subdirectories.
+- **File content:** Files you explicitly reference (e.g., `@src/app.ts`) or that
+  the agent reads using tools.
+- **Environment:** Information about your operating system, shell, and working
+  directory.
+
+Effective context management is key to getting accurate and relevant responses.
+
+## Extension
+
+An **Extension** is a pluggable package that adds new capabilities to Gemini
+CLI. Extensions can bundle:
+
+- **Skills:** Specialized procedural knowledge.
+- **MCP Servers:** Connections to external tools and data.
+- **Commands:** Custom slash commands.
+
+## Headless mode
+
+**Headless mode** refers to running Gemini CLI without the interactive terminal
+UI (TUI). This is used for scripting, automation, and piping data into or out of
+the agent.
+
+- **Interactive:** `gemini` (starts the REPL).
+- **Headless:** `gemini "Fix this file"` (runs once and exits).
+
+## Hook
+
+A **Hook** is a script or function that intercepts specific lifecycle events in
+the CLI.
+
+- **Use cases:** Logging tool usage, validating user input, or modifying the
+  agent's system prompt dynamically.
+- **Lifecycle:** Hooks can run before or after the agent starts, before tools
+  are executed, or after the session ends.
+
+## Model Context Protocol (MCP)
+
+The **Model Context Protocol (MCP)** is an open standard that allows Gemini CLI
+to connect to external data sources and tools.
+
+- **MCP Server:** A lightweight application that exposes resources (data) and
+  tools (functions) to the CLI.
+- **Use case:** Connecting Gemini to a PostgreSQL database, a GitHub repository,
+  or a Slack workspace without building custom integration logic into the CLI
+  core.
+
+## Policy engine
+
+The **Policy Engine** is the security subsystem that enforces rules on tool
+execution. It evaluates every tool call against your configuration (e.g.,
+[Trusted folders](#trusted-folders), allowed commands) to decide whether to:
+
+- Allow the action immediately.
+- Require user confirmation.
+- Block the action entirely.
+
+## Sandboxing
+
+**Sandboxing** is an optional security mode that isolates the agent's execution
+environment. When enabled, the agent runs inside a secure container (e.g.,
+Docker), preventing it from accessing sensitive files or system resources
+outside of the designated workspace.
+
+## Session
+
+A **Session** is a single continuous interaction thread with the agent.
+
+- **State:** Sessions maintain conversation history and short-term memory.
+- **Persistence:** Sessions are automatically saved, allowing you to pause,
+  resume, or rewind them later.
+
+## Skill
+
+A **Skill** (or **Agent Skill**) is a package of specialized expertise that the
+agent can load on demand. Unlike general context, a skill provides specific
+procedural knowledge for a distinct task.
+
+- **Example:** A "Code Reviewer" skill might contain a checklist of security
+  vulnerabilities to look for and a specific format for reporting findings.
+- **Activation:** Skills are typically activated dynamically when the agent
+  recognizes a matching request.
+
+## Tool
+
+A **Tool** is a specific function or capability that the agent can execute.
+Tools allow the AI to interact with the outside world.
+
+- **Built-in tools:** Core capabilities like `read_file`, `run_shell_command`,
+  and `google_web_search`.
+- **MCP tools:** External tools provided by
+  [MCP servers](#model-context-protocol-mcp).
+
+When the agent uses a tool, it pauses generation, executes the code, and feeds
+the output back into its context window.
+
+## Trusted folders
+
+**Trusted folders** are specific directories you have explicitly authorized the
+agent to access without repeated confirmation prompts. This is a key component
+of the [Policy engine](#policy-engine) to balance security and usability.

docs/core/index.md

@@ -9,11 +9,11 @@ requests sent from `packages/cli`. For a general overview of Gemini CLI, see the
 
 - **[Sub-agents (experimental)](./subagents.md):** Learn how to create and use
   specialized sub-agents for complex tasks.
-- **[Core tools API](../reference/tools-api.md):** Information on how tools are
-  defined, registered, and used by the core.
-- **[Memory Import Processor](../reference/memport.md):** Documentation for the
-  modular GEMINI.md import feature using @file.md syntax.
-- **[Policy Engine](../reference/policy-engine.md):** Use the Policy Engine for
+- **[Core tools API](./tools-api.md):** Information on how tools are defined,
+  registered, and used by the core.
+- **[Memory Import Processor](./memport.md):** Documentation for the modular
+  GEMINI.md import feature using @file.md syntax.
+- **[Policy Engine](./policy-engine.md):** Use the Policy Engine for
   fine-grained control over tool execution.
 
 ## Role of the core
@@ -92,8 +92,8 @@ This allows you to have global, project-level, and component-level context
 files, which are all combined to provide the model with the most relevant
 information.
 
-You can use the [`/memory` command](../reference/commands.md) to `show`, `add`,
-and `refresh` the content of loaded `GEMINI.md` files.
+You can use the [`/memory` command](../cli/commands.md) to `show`, `add`, and
+`refresh` the content of loaded `GEMINI.md` files.
 
 ## Citations
 

docs/core/policy-engine.md

@@ -92,12 +92,11 @@ rule with the highest priority wins**.
 To provide a clear hierarchy, policies are organized into three tiers. Each tier
 has a designated number that forms the base of the final priority calculation.
 
-| Tier      | Base | Description                                                                |
-| :-------- | :--- | :------------------------------------------------------------------------- |
-| Default   | 1    | Built-in policies that ship with the Gemini CLI.                           |
-| Workspace | 2    | Policies defined in the current workspace's configuration directory.       |
-| User      | 3    | Custom policies defined by the user.                                       |
-| Admin     | 4    | Policies managed by an administrator (e.g., in an enterprise environment). |
+| Tier    | Base | Description                                                                |
+| :------ | :--- | :------------------------------------------------------------------------- |
+| Default | 1    | Built-in policies that ship with the Gemini CLI.                           |
+| User    | 2    | Custom policies defined by the user.                                       |
+| Admin   | 3    | Policies managed by an administrator (e.g., in an enterprise environment). |
 
 Within a TOML policy file, you assign a priority value from **0 to 999**. The
 engine transforms this into a final priority using the following formula:
@@ -106,17 +105,15 @@ engine transforms this into a final priority using the following formula:
 
 This system guarantees that:
 
-- Admin policies always override User, Workspace, and Default policies.
-- User policies override Workspace and Default policies.
-- Workspace policies override Default policies.
+- Admin policies always override User and Default policies.
+- User policies always override Default policies.
 - You can still order rules within a single tier with fine-grained control.
 
 For example:
 
 - A `priority: 50` rule in a Default policy file becomes `1.050`.
-- A `priority: 10` rule in a Workspace policy policy file becomes `2.010`.
-- A `priority: 100` rule in a User policy file becomes `3.100`.
-- A `priority: 20` rule in an Admin policy file becomes `4.020`.
+- A `priority: 100` rule in a User policy file becomes `2.100`.
+- A `priority: 20` rule in an Admin policy file becomes `3.020`.
 
 ### Approval modes
 
@@ -159,11 +156,10 @@ User, and (if configured) Admin directories.
 
 ### Policy locations
 
-| Tier          | Type   | Location                                  |
-| :------------ | :----- | :---------------------------------------- |
-| **User**      | Custom | `~/.gemini/policies/*.toml`               |
-| **Workspace** | Custom | `$WORKSPACE_ROOT/.gemini/policies/*.toml` |
-| **Admin**     | System | _See below (OS specific)_                 |
+| Tier      | Type   | Location                    |
+| :-------- | :----- | :-------------------------- |
+| **User**  | Custom | `~/.gemini/policies/*.toml` |
+| **Admin** | System | _See below (OS specific)_   |
 
 #### System-wide policies (Admin)
 

docs/core/subagents.md

@@ -1,13 +1,13 @@
-# Subagents (experimental)
+# Sub-agents (experimental)
 
-Subagents are specialized agents that operate within your main Gemini CLI
+Sub-agents are specialized agents that operate within your main Gemini CLI
 session. They are designed to handle specific, complex tasks—like deep codebase
 analysis, documentation lookup, or domain-specific reasoning—without cluttering
 the main agent's context or toolset.
 
-> **Note: Subagents are currently an experimental feature.**
+> **Note: Sub-agents are currently an experimental feature.**
 >
-> To use custom subagents, you must explicitly enable them in your
+> To use custom sub-agents, you must explicitly enable them in your
 > `settings.json`:
 >
 > ```json
@@ -16,31 +16,31 @@ the main agent's context or toolset.
 > }
 > ```
 >
-> **Warning:** Subagents currently operate in
-> ["YOLO mode"](../reference/configuration.md#command-line-arguments), meaning
+> **Warning:** Sub-agents currently operate in
+> ["YOLO mode"](../get-started/configuration.md#command-line-arguments), meaning
 > they may execute tools without individual user confirmation for each step.
 > Proceed with caution when defining agents with powerful tools like
 > `run_shell_command` or `write_file`.
 
-## What are subagents?
+## What are sub-agents?
 
-Subagents are "specialists" that the main Gemini agent can hire for a specific
+Sub-agents are "specialists" that the main Gemini agent can hire for a specific
 job.
 
-- **Focused context:** Each subagent has its own system prompt and persona.
-- **Specialized tools:** Subagents can have a restricted or specialized set of
+- **Focused context:** Each sub-agent has its own system prompt and persona.
+- **Specialized tools:** Sub-agents can have a restricted or specialized set of
   tools.
-- **Independent context window:** Interactions with a subagent happen in a
+- **Independent context window:** Interactions with a sub-agent happen in a
   separate context loop, which saves tokens in your main conversation history.
 
-Subagents are exposed to the main agent as a tool of the same name. When the
-main agent calls the tool, it delegates the task to the subagent. Once the
-subagent completes its task, it reports back to the main agent with its
+Sub-agents are exposed to the main agent as a tool of the same name. When the
+main agent calls the tool, it delegates the task to the sub-agent. Once the
+sub-agent completes its task, it reports back to the main agent with its
 findings.
 
-## Built-in subagents
+## Built-in sub-agents
 
-Gemini CLI comes with the following built-in subagents:
+Gemini CLI comes with the following built-in sub-agents:
 
 ### Codebase Investigator
 
@@ -75,15 +75,15 @@ Gemini CLI comes with the following built-in subagents:
 ### Generalist Agent
 
 - **Name:** `generalist_agent`
-- **Purpose:** Route tasks to the appropriate specialized subagent.
+- **Purpose:** Route tasks to the appropriate specialized sub-agent.
 - **When to use:** Implicitly used by the main agent for routing. Not directly
   invoked by the user.
 - **Configuration:** Enabled by default. No specific configuration options.
 
-## Creating custom subagents
+## Creating custom sub-agents
 
-You can create your own subagents to automate specific workflows or enforce
-specific personas. To use custom subagents, you must enable them in your
+You can create your own sub-agents to automate specific workflows or enforce
+specific personas. To use custom sub-agents, you must enable them in your
 `settings.json`:
 
 ```json
@@ -138,20 +138,20 @@ it yourself; just report it.
 
 ### Configuration schema
 
-| Field          | Type   | Required | Description                                                                                                               |
-| :------------- | :----- | :------- | :------------------------------------------------------------------------------------------------------------------------ |
-| `name`         | string | Yes      | Unique identifier (slug) used as the tool name for the agent. Only lowercase letters, numbers, hyphens, and underscores.  |
-| `description`  | string | Yes      | Short description of what the agent does. This is visible to the main agent to help it decide when to call this subagent. |
-| `kind`         | string | No       | `local` (default) or `remote`.                                                                                            |
-| `tools`        | array  | No       | List of tool names this agent can use. If omitted, it may have access to a default set.                                   |
-| `model`        | string | No       | Specific model to use (e.g., `gemini-2.5-pro`). Defaults to `inherit` (uses the main session model).                      |
-| `temperature`  | number | No       | Model temperature (0.0 - 2.0).                                                                                            |
-| `max_turns`    | number | No       | Maximum number of conversation turns allowed for this agent before it must return. Defaults to `15`.                      |
-| `timeout_mins` | number | No       | Maximum execution time in minutes. Defaults to `5`.                                                                       |
+| Field          | Type   | Required | Description                                                                                                                |
+| :------------- | :----- | :------- | :------------------------------------------------------------------------------------------------------------------------- |
+| `name`         | string | Yes      | Unique identifier (slug) used as the tool name for the agent. Only lowercase letters, numbers, hyphens, and underscores.   |
+| `description`  | string | Yes      | Short description of what the agent does. This is visible to the main agent to help it decide when to call this sub-agent. |
+| `kind`         | string | No       | `local` (default) or `remote`.                                                                                             |
+| `tools`        | array  | No       | List of tool names this agent can use. If omitted, it may have access to a default set.                                    |
+| `model`        | string | No       | Specific model to use (e.g., `gemini-2.5-pro`). Defaults to `inherit` (uses the main session model).                       |
+| `temperature`  | number | No       | Model temperature (0.0 - 2.0).                                                                                             |
+| `max_turns`    | number | No       | Maximum number of conversation turns allowed for this agent before it must return. Defaults to `15`.                       |
+| `timeout_mins` | number | No       | Maximum execution time in minutes. Defaults to `5`.                                                                        |
 
-### Optimizing your subagent
+### Optimizing your sub-agent
 
-The main agent's system prompt encourages it to use an expert subagent when one
+The main agent's system prompt encourages it to use an expert sub-agent when one
 is available. It decides whether an agent is a relevant expert based on the
 agent's description. You can improve the reliability with which an agent is used
 by updating the description to more clearly indicate:
@@ -160,7 +160,7 @@ by updating the description to more clearly indicate:
 - When it should be used.
 - Some example scenarios.
 
-For example, the following subagent description should be called fairly
+For example, the following sub-agent description should be called fairly
 consistently for Git operations.
 
 > Git expert agent which should be used for all local and remote git operations.
@@ -170,13 +170,13 @@ consistently for Git operations.
 > - Searching for regressions with bisect
 > - Interacting with source control and issues providers such as GitHub.
 
-If you need to further tune your subagent, you can do so by selecting the model
+If you need to further tune your sub-agent, you can do so by selecting the model
 to optimize for with `/model` and then asking the model why it does not think
-that your subagent was called with a specific prompt and the given description.
+that your sub-agent was called with a specific prompt and the given description.
 
 ## Remote subagents (Agent2Agent) (experimental)
 
-Gemini CLI can also delegate tasks to remote subagents using the Agent-to-Agent
+Gemini CLI can also delegate tasks to remote sub-agents using the Agent-to-Agent
 (A2A) protocol.
 
 > **Note: Remote subagents are currently an experimental feature.**
@@ -184,8 +184,8 @@ Gemini CLI can also delegate tasks to remote subagents using the Agent-to-Agent
 See the [Remote Subagents documentation](/docs/core/remote-agents) for detailed
 configuration and usage instructions.
 
-## Extension subagents
+## Extension sub-agents
 
-Extensions can bundle and distribute subagents. See the
-[Extensions documentation](../extensions/index.md#subagents) for details on how
+Extensions can bundle and distribute sub-agents. See the
+[Extensions documentation](../extensions/index.md#sub-agents) for details on how
 to package agents within an extension.

docs/extensions/reference.md

@@ -130,7 +130,7 @@ The manifest file defines the extension's behavior and configuration.
 - `description`: A short summary shown in the extension gallery.
 - <a id="mcp-servers"></a>`mcpServers`: A map of Model Context Protocol (MCP)
   servers. Extension servers follow the same format as standard
-  [CLI configuration](../reference/configuration.md).
+  [CLI configuration](../get-started/configuration.md).
 - `contextFileName`: The name of the context file (defaults to `GEMINI.md`). Can
   also be an array of strings to load multiple context files.
 - `excludeTools`: An array of tools to block from the model. You can restrict

docs/faq.md

@@ -104,7 +104,7 @@ The Gemini CLI configuration is stored in two `settings.json` files:
 1.  In your home directory: `~/.gemini/settings.json`.
 2.  In your project's root directory: `./.gemini/settings.json`.
 
-Refer to [Gemini CLI Configuration](../reference/configuration.md) for more
+Refer to [Gemini CLI Configuration](./get-started/configuration.md) for more
 details.
 
 ## Google AI Pro/Ultra and subscription FAQs

docs/get-started/authentication.md

@@ -22,8 +22,8 @@ Select the authentication method that matches your situation in the table below:
 ### What is my Google account type?
 
 - **Individual Google accounts:** Includes all
-  [free tier accounts](../resources/quota-and-pricing.md#free-usage) such as
-  Gemini Code Assist for individuals, as well as paid subscriptions for
+  [free tier accounts](../quota-and-pricing/#free-usage) such as Gemini Code
+  Assist for individuals, as well as paid subscriptions for
   [Google AI Pro and Ultra](https://gemini.google/subscriptions/).
 
 - **Organization accounts:** Accounts using paid licenses through an
@@ -317,5 +317,5 @@ configure authentication using environment variables:
 Your authentication method affects your quotas, pricing, Terms of Service, and
 privacy notices. Review the following pages to learn more:
 
-- [Gemini CLI: Quotas and Pricing](../resources/quota-and-pricing.md).
-- [Gemini CLI: Terms of Service and Privacy Notice](../resources/tos-privacy.md).
+- [Gemini CLI: Quotas and Pricing](../quota-and-pricing.md).
+- [Gemini CLI: Terms of Service and Privacy Notice](../tos-privacy.md).

docs/get-started/configuration-v1.md

@@ -0,0 +1,882 @@
+# Gemini CLI configuration
+
+**Note on deprecated configuration format**
+
+This document describes the legacy v1 format for the `settings.json` file. This
+format is now deprecated.
+
+- The new format will be supported in the stable release starting
+  **[09/10/25]**.
+- Automatic migration from the old format to the new format will begin on
+  **[09/17/25]**.
+
+For details on the new, recommended format, please see the
+[current Configuration documentation](./configuration.md).
+
+Gemini CLI offers several ways to configure its behavior, including environment
+variables, command-line arguments, and settings files. This document outlines
+the different configuration methods and available settings.
+
+## Configuration layers
+
+Configuration is applied in the following order of precedence (lower numbers are
+overridden by higher numbers):
+
+1.  **Default values:** Hardcoded defaults within the application.
+2.  **System defaults file:** System-wide default settings that can be
+    overridden by other settings files.
+3.  **User settings file:** Global settings for the current user.
+4.  **Project settings file:** Project-specific settings.
+5.  **System settings file:** System-wide settings that override all other
+    settings files.
+6.  **Environment variables:** System-wide or session-specific variables,
+    potentially loaded from `.env` files.
+7.  **Command-line arguments:** Values passed when launching the CLI.
+
+## Settings files
+
+Gemini CLI uses JSON settings files for persistent configuration. There are four
+locations for these files:
+
+- **System defaults file:**
+  - **Location:** `/etc/gemini-cli/system-defaults.json` (Linux),
+    `C:\ProgramData\gemini-cli\system-defaults.json` (Windows) or
+    `/Library/Application Support/GeminiCli/system-defaults.json` (macOS). The
+    path can be overridden using the `GEMINI_CLI_SYSTEM_DEFAULTS_PATH`
+    environment variable.
+  - **Scope:** Provides a base layer of system-wide default settings. These
+    settings have the lowest precedence and are intended to be overridden by
+    user, project, or system override settings.
+- **User settings file:**
+  - **Location:** `~/.gemini/settings.json` (where `~` is your home directory).
+  - **Scope:** Applies to all Gemini CLI sessions for the current user. User
+    settings override system defaults.
+- **Project settings file:**
+  - **Location:** `.gemini/settings.json` within your project's root directory.
+  - **Scope:** Applies only when running Gemini CLI from that specific project.
+    Project settings override user settings and system defaults.
+- **System settings file:**
+  - **Location:** `/etc/gemini-cli/settings.json` (Linux),
+    `C:\ProgramData\gemini-cli\settings.json` (Windows) or
+    `/Library/Application Support/GeminiCli/settings.json` (macOS). The path can
+    be overridden using the `GEMINI_CLI_SYSTEM_SETTINGS_PATH` environment
+    variable.
+  - **Scope:** Applies to all Gemini CLI sessions on the system, for all users.
+    System settings act as overrides, taking precedence over all other settings
+    files. May be useful for system administrators at enterprises to have
+    controls over users' Gemini CLI setups.
+
+**Note on environment variables in settings:** String values within your
+`settings.json` files can reference environment variables using either
+`$VAR_NAME` or `${VAR_NAME}` syntax. These variables will be automatically
+resolved when the settings are loaded. For example, if you have an environment
+variable `MY_API_TOKEN`, you could use it in `settings.json` like this:
+`"apiKey": "$MY_API_TOKEN"`.
+
+> **Note for Enterprise Users:** For guidance on deploying and managing Gemini
+> CLI in a corporate environment, please see the
+> [Enterprise Configuration](../cli/enterprise.md) documentation.
+
+### The `.gemini` directory in your project
+
+In addition to a project settings file, a project's `.gemini` directory can
+contain other project-specific files related to Gemini CLI's operation, such as:
+
+- [Custom sandbox profiles](#sandboxing) (e.g.,
+  `.gemini/sandbox-macos-custom.sb`, `.gemini/sandbox.Dockerfile`).
+
+### Available settings in `settings.json`:
+
+- **`contextFileName`** (string or array of strings):
+  - **Description:** Specifies the filename for context files (e.g.,
+    `GEMINI.md`, `AGENTS.md`). Can be a single filename or a list of accepted
+    filenames.
+  - **Default:** `GEMINI.md`
+  - **Example:** `"contextFileName": "AGENTS.md"`
+
+- **`bugCommand`** (object):
+  - **Description:** Overrides the default URL for the `/bug` command.
+  - **Default:**
+    `"urlTemplate": "https://github.com/google-gemini/gemini-cli/issues/new?template=bug_report.yml&title={title}&info={info}"`
+  - **Properties:**
+    - **`urlTemplate`** (string): A URL that can contain `{title}` and `{info}`
+      placeholders.
+  - **Example:**
+    ```json
+    "bugCommand": {
+      "urlTemplate": "https://bug.example.com/new?title={title}&info={info}"
+    }
+    ```
+
+- **`fileFiltering`** (object):
+  - **Description:** Controls git-aware file filtering behavior for @ commands
+    and file discovery tools.
+  - **Default:** `"respectGitIgnore": true, "enableRecursiveFileSearch": true`
+  - **Properties:**
+    - **`respectGitIgnore`** (boolean): Whether to respect .gitignore patterns
+      when discovering files. When set to `true`, git-ignored files (like
+      `node_modules/`, `dist/`, `.env`) are automatically excluded from @
+      commands and file listing operations.
+    - **`enableRecursiveFileSearch`** (boolean): Whether to enable searching
+      recursively for filenames under the current tree when completing @
+      prefixes in the prompt.
+    - **`disableFuzzySearch`** (boolean): When `true`, disables the fuzzy search
+      capabilities when searching for files, which can improve performance on
+      projects with a large number of files.
+  - **Example:**
+    ```json
+    "fileFiltering": {
+      "respectGitIgnore": true,
+      "enableRecursiveFileSearch": false,
+      "disableFuzzySearch": true
+    }
+    ```
+
+### Troubleshooting file search performance
+
+If you are experiencing performance issues with file searching (e.g., with `@`
+completions), especially in projects with a very large number of files, here are
+a few things you can try in order of recommendation:
+
+1.  **Use `.geminiignore`:** Create a `.geminiignore` file in your project root
+    to exclude directories that contain a large number of files that you don't
+    need to reference (e.g., build artifacts, logs, `node_modules`). Reducing
+    the total number of files crawled is the most effective way to improve
+    performance.
+
+2.  **Disable fuzzy search:** If ignoring files is not enough, you can disable
+    fuzzy search by setting `disableFuzzySearch` to `true` in your
+    `settings.json` file. This will use a simpler, non-fuzzy matching algorithm,
+    which can be faster.
+
+3.  **Disable recursive file search:** As a last resort, you can disable
+    recursive file search entirely by setting `enableRecursiveFileSearch` to
+    `false`. This will be the fastest option as it avoids a recursive crawl of
+    your project. However, it means you will need to type the full path to files
+    when using `@` completions.
+
+- **`coreTools`** (array of strings):
+  - **Description:** Allows you to specify a list of core tool names that should
+    be made available to the model. This can be used to restrict the set of
+    built-in tools. See [Built-in Tools](../core/tools-api.md#built-in-tools)
+    for a list of core tools. You can also specify command-specific restrictions
+    for tools that support it, like the `ShellTool`. For example,
+    `"coreTools": ["ShellTool(ls -l)"]` will only allow the `ls -l` command to
+    be executed.
+  - **Default:** All tools available for use by the Gemini model.
+  - **Example:** `"coreTools": ["ReadFileTool", "GlobTool", "ShellTool(ls)"]`.
+
+- **`allowedTools`** (array of strings) [DEPRECATED]:
+  - **Default:** `undefined`
+  - **Description:** A list of tool names that will bypass the confirmation
+    dialog. This is useful for tools that you trust and use frequently. The
+    match semantics are the same as `coreTools`. **Deprecated**: Use the
+    [Policy Engine](../core/policy-engine.md) instead.
+  - **Example:** `"allowedTools": ["ShellTool(git status)"]`.
+
+- **`excludeTools`** (array of strings) [DEPRECATED]:
+  - **Description:** Allows you to specify a list of core tool names that should
+    be excluded from the model. A tool listed in both `excludeTools` and
+    `coreTools` is excluded. You can also specify command-specific restrictions
+    for tools that support it, like the `ShellTool`. For example,
+    `"excludeTools": ["ShellTool(rm -rf)"]` will block the `rm -rf` command.
+    **Deprecated**: Use the [Policy Engine](../core/policy-engine.md) instead.
+  - **Default**: No tools excluded.
+  - **Example:** `"excludeTools": ["run_shell_command", "findFiles"]`.
+  - **Security Note:** Command-specific restrictions in `excludeTools` for
+    `run_shell_command` are based on simple string matching and can be easily
+    bypassed. This feature is **not a security mechanism** and should not be
+    relied upon to safely execute untrusted code. It is recommended to use
+    `coreTools` to explicitly select commands that can be executed.
+
+- **`allowMCPServers`** (array of strings):
+  - **Description:** Allows you to specify a list of MCP server names that
+    should be made available to the model. This can be used to restrict the set
+    of MCP servers to connect to. Note that this will be ignored if
+    `--allowed-mcp-server-names` is set.
+  - **Default:** All MCP servers are available for use by the Gemini model.
+  - **Example:** `"allowMCPServers": ["myPythonServer"]`.
+  - **Security note:** This uses simple string matching on MCP server names,
+    which can be modified. If you're a system administrator looking to prevent
+    users from bypassing this, consider configuring the `mcpServers` at the
+    system settings level such that the user will not be able to configure any
+    MCP servers of their own. This should not be used as an airtight security
+    mechanism.
+
+- **`excludeMCPServers`** (array of strings):
+  - **Description:** Allows you to specify a list of MCP server names that
+    should be excluded from the model. A server listed in both
+    `excludeMCPServers` and `allowMCPServers` is excluded. Note that this will
+    be ignored if `--allowed-mcp-server-names` is set.
+  - **Default**: No MCP servers excluded.
+  - **Example:** `"excludeMCPServers": ["myNodeServer"]`.
+  - **Security note:** This uses simple string matching on MCP server names,
+    which can be modified. If you're a system administrator looking to prevent
+    users from bypassing this, consider configuring the `mcpServers` at the
+    system settings level such that the user will not be able to configure any
+    MCP servers of their own. This should not be used as an airtight security
+    mechanism.
+
+- **`theme`** (string):
+  - **Description:** Sets the visual [theme](../cli/themes.md) for Gemini CLI.
+  - **Default:** `"Default"`
+  - **Example:** `"theme": "GitHub"`
+
+- **`vimMode`** (boolean):
+  - **Description:** Enables or disables vim mode for input editing. When
+    enabled, the input area supports vim-style navigation and editing commands
+    with NORMAL and INSERT modes. The vim mode status is displayed in the footer
+    and persists between sessions.
+  - **Default:** `false`
+  - **Example:** `"vimMode": true`
+
+- **`sandbox`** (boolean or string):
+  - **Description:** Controls whether and how to use sandboxing for tool
+    execution. If set to `true`, Gemini CLI uses a pre-built
+    `gemini-cli-sandbox` Docker image. For more information, see
+    [Sandboxing](#sandboxing).
+  - **Default:** `false`
+  - **Example:** `"sandbox": "docker"`
+
+- **`toolDiscoveryCommand`** (string):
+  - **Description:** Defines a custom shell command for discovering tools from
+    your project. The shell command must return on `stdout` a JSON array of
+    [function declarations](https://ai.google.dev/gemini-api/docs/function-calling#function-declarations).
+    Tool wrappers are optional.
+  - **Default:** Empty
+  - **Example:** `"toolDiscoveryCommand": "bin/get_tools"`
+
+- **`toolCallCommand`** (string):
+  - **Description:** Defines a custom shell command for calling a specific tool
+    that was discovered using `toolDiscoveryCommand`. The shell command must
+    meet the following criteria:
+    - It must take function `name` (exactly as in
+      [function declaration](https://ai.google.dev/gemini-api/docs/function-calling#function-declarations))
+      as first command line argument.
+    - It must read function arguments as JSON on `stdin`, analogous to
+      [`functionCall.args`](https://cloud.google.com/vertex-ai/generative-ai/docs/model-reference/inference#functioncall).
+    - It must return function output as JSON on `stdout`, analogous to
+      [`functionResponse.response.content`](https://cloud.google.com/vertex-ai/generative-ai/docs/model-reference/inference#functionresponse).
+  - **Default:** Empty
+  - **Example:** `"toolCallCommand": "bin/call_tool"`
+
+- **`mcpServers`** (object):
+  - **Description:** Configures connections to one or more Model-Context
+    Protocol (MCP) servers for discovering and using custom tools. Gemini CLI
+    attempts to connect to each configured MCP server to discover available
+    tools. If multiple MCP servers expose a tool with the same name, the tool
+    names will be prefixed with the server alias you defined in the
+    configuration (e.g., `serverAlias__actualToolName`) to avoid conflicts. Note
+    that the system might strip certain schema properties from MCP tool
+    definitions for compatibility. At least one of `command`, `url`, or
+    `httpUrl` must be provided. If multiple are specified, the order of
+    precedence is `httpUrl`, then `url`, then `command`.
+  - **Default:** Empty
+  - **Properties:**
+    - **`<SERVER_NAME>`** (object): The server parameters for the named server.
+      - `command` (string, optional): The command to execute to start the MCP
+        server via standard I/O.
+      - `args` (array of strings, optional): Arguments to pass to the command.
+      - `env` (object, optional): Environment variables to set for the server
+        process.
+      - `cwd` (string, optional): The working directory in which to start the
+        server.
+      - `url` (string, optional): The URL of an MCP server that uses Server-Sent
+        Events (SSE) for communication.
+      - `httpUrl` (string, optional): The URL of an MCP server that uses
+        streamable HTTP for communication.
+      - `headers` (object, optional): A map of HTTP headers to send with
+        requests to `url` or `httpUrl`.
+      - `timeout` (number, optional): Timeout in milliseconds for requests to
+        this MCP server.
+      - `trust` (boolean, optional): Trust this server and bypass all tool call
+        confirmations.
+      - `description` (string, optional): A brief description of the server,
+        which may be used for display purposes.
+      - `includeTools` (array of strings, optional): List of tool names to
+        include from this MCP server. When specified, only the tools listed here
+        will be available from this server (allowlist behavior). If not
+        specified, all tools from the server are enabled by default.
+      - `excludeTools` (array of strings, optional): List of tool names to
+        exclude from this MCP server. Tools listed here will not be available to
+        the model, even if they are exposed by the server. **Note:**
+        `excludeTools` takes precedence over `includeTools` - if a tool is in
+        both lists, it will be excluded.
+  - **Example:**
+    ```json
+    "mcpServers": {
+      "myPythonServer": {
+        "command": "python",
+        "args": ["mcp_server.py", "--port", "8080"],
+        "cwd": "./mcp_tools/python",
+        "timeout": 5000,
+        "includeTools": ["safe_tool", "file_reader"],
+      },
+      "myNodeServer": {
+        "command": "node",
+        "args": ["mcp_server.js"],
+        "cwd": "./mcp_tools/node",
+        "excludeTools": ["dangerous_tool", "file_deleter"]
+      },
+      "myDockerServer": {
+        "command": "docker",
+        "args": ["run", "-i", "--rm", "-e", "API_KEY", "ghcr.io/foo/bar"],
+        "env": {
+          "API_KEY": "$MY_API_TOKEN"
+        }
+      },
+      "mySseServer": {
+        "url": "http://localhost:8081/events",
+        "headers": {
+          "Authorization": "Bearer $MY_SSE_TOKEN"
+        },
+        "description": "An example SSE-based MCP server."
+      },
+      "myStreamableHttpServer": {
+        "httpUrl": "http://localhost:8082/stream",
+        "headers": {
+          "X-API-Key": "$MY_HTTP_API_KEY"
+        },
+        "description": "An example Streamable HTTP-based MCP server."
+      }
+    }
+    ```
+
+- **`checkpointing`** (object):
+  - **Description:** Configures the checkpointing feature, which allows you to
+    save and restore conversation and file states. See the
+    [Checkpointing documentation](../cli/checkpointing.md) for more details.
+  - **Default:** `{"enabled": false}`
+  - **Properties:**
+    - **`enabled`** (boolean): When `true`, the `/restore` command is available.
+
+- **`preferredEditor`** (string):
+  - **Description:** Specifies the preferred editor to use for viewing diffs.
+  - **Default:** `vscode`
+  - **Example:** `"preferredEditor": "vscode"`
+
+- **`telemetry`** (object)
+  - **Description:** Configures logging and metrics collection for Gemini CLI.
+    For more information, see [Telemetry](../cli/telemetry.md).
+  - **Default:**
+    `{"enabled": false, "target": "local", "otlpEndpoint": "http://localhost:4317", "logPrompts": true}`
+  - **Properties:**
+    - **`enabled`** (boolean): Whether or not telemetry is enabled.
+    - **`target`** (string): The destination for collected telemetry. Supported
+      values are `local` and `gcp`.
+    - **`otlpEndpoint`** (string): The endpoint for the OTLP Exporter.
+    - **`logPrompts`** (boolean): Whether or not to include the content of user
+      prompts in the logs.
+  - **Example:**
+    ```json
+    "telemetry": {
+      "enabled": true,
+      "target": "local",
+      "otlpEndpoint": "http://localhost:16686",
+      "logPrompts": false
+    }
+    ```
+- **`usageStatisticsEnabled`** (boolean):
+  - **Description:** Enables or disables the collection of usage statistics. See
+    [Usage Statistics](#usage-statistics) for more information.
+  - **Default:** `true`
+  - **Example:**
+    ```json
+    "usageStatisticsEnabled": false
+    ```
+
+- **`hideTips`** (boolean):
+  - **Description:** Enables or disables helpful tips in the CLI interface.
+  - **Default:** `false`
+  - **Example:**
+
+    ```json
+    "hideTips": true
+    ```
+
+- **`hideBanner`** (boolean):
+  - **Description:** Enables or disables the startup banner (ASCII art logo) in
+    the CLI interface.
+  - **Default:** `false`
+  - **Example:**
+
+    ```json
+    "hideBanner": true
+    ```
+
+- **`maxSessionTurns`** (number):
+  - **Description:** Sets the maximum number of turns for a session. If the
+    session exceeds this limit, the CLI will stop processing and start a new
+    chat.
+  - **Default:** `-1` (unlimited)
+  - **Example:**
+    ```json
+    "maxSessionTurns": 10
+    ```
+
+- **`summarizeToolOutput`** (object):
+  - **Description:** Enables or disables the summarization of tool output. You
+    can specify the token budget for the summarization using the `tokenBudget`
+    setting.
+  - Note: Currently only the `run_shell_command` tool is supported.
+  - **Default:** `{}` (Disabled by default)
+  - **Example:**
+    ```json
+    "summarizeToolOutput": {
+      "run_shell_command": {
+        "tokenBudget": 2000
+      }
+    }
+    ```
+
+- **`excludedProjectEnvVars`** (array of strings):
+  - **Description:** Specifies environment variables that should be excluded
+    from being loaded from project `.env` files. This prevents project-specific
+    environment variables (like `DEBUG=true`) from interfering with gemini-cli
+    behavior. Variables from `.gemini/.env` files are never excluded.
+  - **Default:** `["DEBUG", "DEBUG_MODE"]`
+  - **Example:**
+    ```json
+    "excludedProjectEnvVars": ["DEBUG", "DEBUG_MODE", "NODE_ENV"]
+    ```
+
+- **`includeDirectories`** (array of strings):
+  - **Description:** Specifies an array of additional absolute or relative paths
+    to include in the workspace context. Missing directories will be skipped
+    with a warning by default. Paths can use `~` to refer to the user's home
+    directory. This setting can be combined with the `--include-directories`
+    command-line flag.
+  - **Default:** `[]`
+  - **Example:**
+    ```json
+    "includeDirectories": [
+      "/path/to/another/project",
+      "../shared-library",
+      "~/common-utils"
+    ]
+    ```
+
+- **`loadMemoryFromIncludeDirectories`** (boolean):
+  - **Description:** Controls the behavior of the `/memory refresh` command. If
+    set to `true`, `GEMINI.md` files should be loaded from all directories that
+    are added. If set to `false`, `GEMINI.md` should only be loaded from the
+    current directory.
+  - **Default:** `false`
+  - **Example:**
+    ```json
+    "loadMemoryFromIncludeDirectories": true
+    ```
+
+- **`showLineNumbers`** (boolean):
+  - **Description:** Controls whether line numbers are displayed in code blocks
+    in the CLI output.
+  - **Default:** `true`
+  - **Example:**
+    ```json
+    "showLineNumbers": false
+    ```
+
+- **`accessibility`** (object):
+  - **Description:** Configures accessibility features for the CLI.
+  - **Properties:**
+    - **`screenReader`** (boolean): Enables screen reader mode, which adjusts
+      the TUI for better compatibility with screen readers. This can also be
+      enabled with the `--screen-reader` command-line flag, which will take
+      precedence over the setting.
+    - **`disableLoadingPhrases`** (boolean): Disables the display of loading
+      phrases during operations.
+  - **Default:** `{"screenReader": false, "disableLoadingPhrases": false}`
+  - **Example:**
+    ```json
+    "accessibility": {
+      "screenReader": true,
+      "disableLoadingPhrases": true
+    }
+    ```
+
+### Example `settings.json`:
+
+```json
+{
+  "theme": "GitHub",
+  "sandbox": "docker",
+  "toolDiscoveryCommand": "bin/get_tools",
+  "toolCallCommand": "bin/call_tool",
+  "mcpServers": {
+    "mainServer": {
+      "command": "bin/mcp_server.py"
+    },
+    "anotherServer": {
+      "command": "node",
+      "args": ["mcp_server.js", "--verbose"]
+    }
+  },
+  "telemetry": {
+    "enabled": true,
+    "target": "local",
+    "otlpEndpoint": "http://localhost:4317",
+    "logPrompts": true
+  },
+  "usageStatisticsEnabled": true,
+  "hideTips": false,
+  "hideBanner": false,
+  "maxSessionTurns": 10,
+  "summarizeToolOutput": {
+    "run_shell_command": {
+      "tokenBudget": 100
+    }
+  },
+  "excludedProjectEnvVars": ["DEBUG", "DEBUG_MODE", "NODE_ENV"],
+  "includeDirectories": ["path/to/dir1", "~/path/to/dir2", "../path/to/dir3"],
+  "loadMemoryFromIncludeDirectories": true
+}
+```
+
+## Shell history
+
+The CLI keeps a history of shell commands you run. To avoid conflicts between
+different projects, this history is stored in a project-specific directory
+within your user's home folder.
+
+- **Location:** `~/.gemini/tmp/<project_hash>/shell_history`
+  - `<project_hash>` is a unique identifier generated from your project's root
+    path.
+  - The history is stored in a file named `shell_history`.
+
+## Environment variables and `.env` files
+
+Environment variables are a common way to configure applications, especially for
+sensitive information like API keys or for settings that might change between
+environments. For authentication setup, see the
+[Authentication documentation](./authentication.md) which covers all available
+authentication methods.
+
+The CLI automatically loads environment variables from an `.env` file. The
+loading order is:
+
+1.  `.env` file in the current working directory.
+2.  If not found, it searches upwards in parent directories until it finds an
+    `.env` file or reaches the project root (identified by a `.git` folder) or
+    the home directory.
+3.  If still not found, it looks for `~/.env` (in the user's home directory).
+
+**Environment variable exclusion:** Some environment variables (like `DEBUG` and
+`DEBUG_MODE`) are automatically excluded from being loaded from project `.env`
+files to prevent interference with gemini-cli behavior. Variables from
+`.gemini/.env` files are never excluded. You can customize this behavior using
+the `excludedProjectEnvVars` setting in your `settings.json` file.
+
+- **`GEMINI_API_KEY`**:
+  - Your API key for the Gemini API.
+  - One of several available [authentication methods](./authentication.md).
+  - Set this in your shell profile (e.g., `~/.bashrc`, `~/.zshrc`) or an `.env`
+    file.
+- **`GEMINI_MODEL`**:
+  - Specifies the default Gemini model to use.
+  - Overrides the hardcoded default
+  - Example: `export GEMINI_MODEL="gemini-2.5-flash"`
+- **`GOOGLE_API_KEY`**:
+  - Your Google Cloud API key.
+  - Required for using Vertex AI in express mode.
+  - Ensure you have the necessary permissions.
+  - Example: `export GOOGLE_API_KEY="YOUR_GOOGLE_API_KEY"`.
+- **`GOOGLE_CLOUD_PROJECT`**:
+  - Your Google Cloud Project ID.
+  - Required for using Code Assist or Vertex AI.
+  - If using Vertex AI, ensure you have the necessary permissions in this
+    project.
+  - **Cloud Shell note:** When running in a Cloud Shell environment, this
+    variable defaults to a special project allocated for Cloud Shell users. If
+    you have `GOOGLE_CLOUD_PROJECT` set in your global environment in Cloud
+    Shell, it will be overridden by this default. To use a different project in
+    Cloud Shell, you must define `GOOGLE_CLOUD_PROJECT` in a `.env` file.
+  - Example: `export GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"`.
+- **`GOOGLE_APPLICATION_CREDENTIALS`** (string):
+  - **Description:** The path to your Google Application Credentials JSON file.
+  - **Example:**
+    `export GOOGLE_APPLICATION_CREDENTIALS="/path/to/your/credentials.json"`
+- **`OTLP_GOOGLE_CLOUD_PROJECT`**:
+  - Your Google Cloud Project ID for Telemetry in Google Cloud
+  - Example: `export OTLP_GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"`.
+- **`GOOGLE_CLOUD_LOCATION`**:
+  - Your Google Cloud Project Location (e.g., us-central1).
+  - Required for using Vertex AI in non express mode.
+  - Example: `export GOOGLE_CLOUD_LOCATION="YOUR_PROJECT_LOCATION"`.
+- **`GEMINI_SANDBOX`**:
+  - Alternative to the `sandbox` setting in `settings.json`.
+  - Accepts `true`, `false`, `docker`, `podman`, or a custom command string.
+- **`HTTP_PROXY` / `HTTPS_PROXY`**:
+  - Specifies the proxy server to use for outgoing HTTP/HTTPS requests.
+  - Example: `export HTTPS_PROXY="http://proxy.example.com:8080"`
+- **`SEATBELT_PROFILE`** (macOS specific):
+  - Switches the Seatbelt (`sandbox-exec`) profile on macOS.
+  - `permissive-open`: (Default) Restricts writes to the project folder (and a
+    few other folders, see
+    `packages/cli/src/utils/sandbox-macos-permissive-open.sb`) but allows other
+    operations.
+  - `strict`: Uses a strict profile that declines operations by default.
+  - `<profile_name>`: Uses a custom profile. To define a custom profile, create
+    a file named `sandbox-macos-<profile_name>.sb` in your project's `.gemini/`
+    directory (e.g., `my-project/.gemini/sandbox-macos-custom.sb`).
+- **`DEBUG` or `DEBUG_MODE`** (often used by underlying libraries or the CLI
+  itself):
+  - Set to `true` or `1` to enable verbose debug logging, which can be helpful
+    for troubleshooting.
+  - **Note:** These variables are automatically excluded from project `.env`
+    files by default to prevent interference with gemini-cli behavior. Use
+    `.gemini/.env` files if you need to set these for gemini-cli specifically.
+- **`NO_COLOR`**:
+  - Set to any value to disable all color output in the CLI.
+- **`CLI_TITLE`**:
+  - Set to a string to customize the title of the CLI.
+- **`CODE_ASSIST_ENDPOINT`**:
+  - Specifies the endpoint for the code assist server.
+  - This is useful for development and testing.
+
+## Command-line arguments
+
+Arguments passed directly when running the CLI can override other configurations
+for that specific session.
+
+- **`--model <model_name>`** (**`-m <model_name>`**):
+  - Specifies the Gemini model to use for this session.
+  - Example: `npm start -- --model gemini-1.5-pro-latest`
+- **`--prompt <your_prompt>`** (**`-p <your_prompt>`**):
+  - Used to pass a prompt directly to the command. This invokes Gemini CLI in a
+    non-interactive mode.
+- **`--prompt-interactive <your_prompt>`** (**`-i <your_prompt>`**):
+  - Starts an interactive session with the provided prompt as the initial input.
+  - The prompt is processed within the interactive session, not before it.
+  - Cannot be used when piping input from stdin.
+  - Example: `gemini -i "explain this code"`
+- **`--sandbox`** (**`-s`**):
+  - Enables sandbox mode for this session.
+- **`--sandbox-image`**:
+  - Sets the sandbox image URI.
+- **`--debug`** (**`-d`**):
+  - Enables debug mode for this session, providing more verbose output.
+
+- **`--help`** (or **`-h`**):
+  - Displays help information about command-line arguments.
+- **`--show-memory-usage`**:
+  - Displays the current memory usage.
+- **`--yolo`**:
+  - Enables YOLO mode, which automatically approves all tool calls.
+- **`--approval-mode <mode>`**:
+  - Sets the approval mode for tool calls. Available modes:
+    - `default`: Prompt for approval on each tool call (default behavior)
+    - `auto_edit`: Automatically approve edit tools (replace, write_file) while
+      prompting for others
+    - `yolo`: Automatically approve all tool calls (equivalent to `--yolo`)
+  - Cannot be used together with `--yolo`. Use `--approval-mode=yolo` instead of
+    `--yolo` for the new unified approach.
+  - Example: `gemini --approval-mode auto_edit`
+- **`--allowed-tools <tool1,tool2,...>`**:
+  - A comma-separated list of tool names that will bypass the confirmation
+    dialog.
+  - Example: `gemini --allowed-tools "ShellTool(git status)"`
+- **`--telemetry`**:
+  - Enables [telemetry](../cli/telemetry.md).
+- **`--telemetry-target`**:
+  - Sets the telemetry target. See [telemetry](../cli/telemetry.md) for more
+    information.
+- **`--telemetry-otlp-endpoint`**:
+  - Sets the OTLP endpoint for telemetry. See [telemetry](../cli/telemetry.md)
+    for more information.
+- **`--telemetry-otlp-protocol`**:
+  - Sets the OTLP protocol for telemetry (`grpc` or `http`). Defaults to `grpc`.
+    See [telemetry](../cli/telemetry.md) for more information.
+- **`--telemetry-log-prompts`**:
+  - Enables logging of prompts for telemetry. See
+    [telemetry](../cli/telemetry.md) for more information.
+- **`--extensions <extension_name ...>`** (**`-e <extension_name ...>`**):
+  - Specifies a list of extensions to use for the session. If not provided, all
+    available extensions are used.
+  - Use the special term `gemini -e none` to disable all extensions.
+  - Example: `gemini -e my-extension -e my-other-extension`
+- **`--list-extensions`** (**`-l`**):
+  - Lists all available extensions and exits.
+- **`--include-directories <dir1,dir2,...>`**:
+  - Includes additional directories in the workspace for multi-directory
+    support.
+  - Can be specified multiple times or as comma-separated values.
+  - 5 directories can be added at maximum.
+  - Example: `--include-directories /path/to/project1,/path/to/project2` or
+    `--include-directories /path/to/project1 --include-directories /path/to/project2`
+- **`--screen-reader`**:
+  - Enables screen reader mode for accessibility.
+- **`--version`**:
+  - Displays the version of the CLI.
+
+## Context files (hierarchical instructional context)
+
+While not strictly configuration for the CLI's _behavior_, context files
+(defaulting to `GEMINI.md` but configurable via the `contextFileName` setting)
+are crucial for configuring the _instructional context_ (also referred to as
+"memory") provided to the Gemini model. This powerful feature allows you to give
+project-specific instructions, coding style guides, or any relevant background
+information to the AI, making its responses more tailored and accurate to your
+needs. The CLI includes UI elements, such as an indicator in the footer showing
+the number of loaded context files, to keep you informed about the active
+context.
+
+- **Purpose:** These Markdown files contain instructions, guidelines, or context
+  that you want the Gemini model to be aware of during your interactions. The
+  system is designed to manage this instructional context hierarchically.
+
+### Example context file content (e.g., `GEMINI.md`)
+
+Here's a conceptual example of what a context file at the root of a TypeScript
+project might contain:
+
+```markdown
+# Project: My Awesome TypeScript Library
+
+## General Instructions:
+
+- When generating new TypeScript code, please follow the existing coding style.
+- Ensure all new functions and classes have JSDoc comments.
+- Prefer functional programming paradigms where appropriate.
+- All code should be compatible with TypeScript 5.0 and Node.js 20+.
+
+## Coding Style:
+
+- Use 2 spaces for indentation.
+- Interface names should be prefixed with `I` (e.g., `IUserService`).
+- Private class members should be prefixed with an underscore (`_`).
+- Always use strict equality (`===` and `!==`).
+
+## Specific Component: `src/api/client.ts`
+
+- This file handles all outbound API requests.
+- When adding new API call functions, ensure they include robust error handling
+  and logging.
+- Use the existing `fetchWithRetry` utility for all GET requests.
+
+## Regarding Dependencies:
+
+- Avoid introducing new external dependencies unless absolutely necessary.
+- If a new dependency is required, please state the reason.
+```
+
+This example demonstrates how you can provide general project context, specific
+coding conventions, and even notes about particular files or components. The
+more relevant and precise your context files are, the better the AI can assist
+you. Project-specific context files are highly encouraged to establish
+conventions and context.
+
+- **Hierarchical loading and precedence:** The CLI implements a sophisticated
+  hierarchical memory system by loading context files (e.g., `GEMINI.md`) from
+  several locations. Content from files lower in this list (more specific)
+  typically overrides or supplements content from files higher up (more
+  general). The exact concatenation order and final context can be inspected
+  using the `/memory show` command. The typical loading order is:
+  1.  **Global context file:**
+      - Location: `~/.gemini/<contextFileName>` (e.g., `~/.gemini/GEMINI.md` in
+        your user home directory).
+      - Scope: Provides default instructions for all your projects.
+  2.  **Project root and ancestors context files:**
+      - Location: The CLI searches for the configured context file in the
+        current working directory and then in each parent directory up to either
+        the project root (identified by a `.git` folder) or your home directory.
+      - Scope: Provides context relevant to the entire project or a significant
+        portion of it.
+  3.  **Sub-directory context files (contextual/local):**
+      - Location: The CLI also scans for the configured context file in
+        subdirectories _below_ the current working directory (respecting common
+        ignore patterns like `node_modules`, `.git`, etc.). The breadth of this
+        search is limited to 200 directories by default, but can be configured
+        with a `memoryDiscoveryMaxDirs` field in your `settings.json` file.
+      - Scope: Allows for highly specific instructions relevant to a particular
+        component, module, or subsection of your project.
+- **Concatenation and UI indication:** The contents of all found context files
+  are concatenated (with separators indicating their origin and path) and
+  provided as part of the system prompt to the Gemini model. The CLI footer
+  displays the count of loaded context files, giving you a quick visual cue
+  about the active instructional context.
+- **Importing content:** You can modularize your context files by importing
+  other Markdown files using the `@path/to/file.md` syntax. For more details,
+  see the [Memory Import Processor documentation](../core/memport.md).
+- **Commands for memory management:**
+  - Use `/memory refresh` to force a re-scan and reload of all context files
+    from all configured locations. This updates the AI's instructional context.
+  - Use `/memory show` to display the combined instructional context currently
+    loaded, allowing you to verify the hierarchy and content being used by the
+    AI.
+  - See the [Commands documentation](../cli/commands.md#memory) for full details
+    on the `/memory` command and its sub-commands (`show` and `refresh`).
+
+By understanding and utilizing these configuration layers and the hierarchical
+nature of context files, you can effectively manage the AI's memory and tailor
+the Gemini CLI's responses to your specific needs and projects.
+
+## Sandboxing
+
+The Gemini CLI can execute potentially unsafe operations (like shell commands
+and file modifications) within a sandboxed environment to protect your system.
+
+Sandboxing is disabled by default, but you can enable it in a few ways:
+
+- Using `--sandbox` or `-s` flag.
+- Setting `GEMINI_SANDBOX` environment variable.
+- Sandbox is enabled when using `--yolo` or `--approval-mode=yolo` by default.
+
+By default, it uses a pre-built `gemini-cli-sandbox` Docker image.
+
+For project-specific sandboxing needs, you can create a custom Dockerfile at
+`.gemini/sandbox.Dockerfile` in your project's root directory. This Dockerfile
+can be based on the base sandbox image:
+
+```dockerfile
+FROM gemini-cli-sandbox
+
+# Add your custom dependencies or configurations here
+# For example:
+# RUN apt-get update && apt-get install -y some-package
+# COPY ./my-config /app/my-config
+```
+
+When `.gemini/sandbox.Dockerfile` exists, you can use `BUILD_SANDBOX`
+environment variable when running Gemini CLI to automatically build the custom
+sandbox image:
+
+```bash
+BUILD_SANDBOX=1 gemini -s
+```
+
+## Usage statistics
+
+To help us improve the Gemini CLI, we collect anonymized usage statistics. This
+data helps us understand how the CLI is used, identify common issues, and
+prioritize new features.
+
+**What we collect:**
+
+- **Tool calls:** We log the names of the tools that are called, whether they
+  succeed or fail, and how long they take to execute. We do not collect the
+  arguments passed to the tools or any data returned by them.
+- **API requests:** We log the Gemini model used for each request, the duration
+  of the request, and whether it was successful. We do not collect the content
+  of the prompts or responses.
+- **Session information:** We collect information about the configuration of the
+  CLI, such as the enabled tools and the approval mode.
+
+**What we DON'T collect:**
+
+- **Personally identifiable information (PII):** We do not collect any personal
+  information, such as your name, email address, or API keys.
+- **Prompt and response content:** We do not log the content of your prompts or
+  the responses from the Gemini model.
+- **File content:** We do not log the content of any files that are read or
+  written by the CLI.
+
+**How to opt out:**
+
+You can opt out of usage statistics collection at any time by setting the
+`usageStatisticsEnabled` property to `false` in your `settings.json` file:
+
+```json
+{
+  "usageStatisticsEnabled": false
+}
+```

docs/get-started/configuration.md

@@ -1,5 +1,16 @@
 # Gemini CLI configuration
 
+> **Note on configuration format, 9/17/25:** The format of the `settings.json`
+> file has been updated to a new, more organized structure.
+>
+> - The new format will be supported in the stable release starting
+>   **[09/10/25]**.
+> - Automatic migration from the old format to the new format will begin on
+>   **[09/17/25]**.
+>
+> For details on the previous format, please see the
+> [v1 Configuration documentation](./configuration-v1.md).
+
 Gemini CLI offers several ways to configure its behavior, including environment
 variables, command-line arguments, and settings files. This document outlines
 the different configuration methods and available settings.
@@ -121,22 +132,11 @@ their corresponding top-level category object in your `settings.json` file.
   - **Description:** Enable update notification prompts.
   - **Default:** `true`
 
-- **`general.enableNotifications`** (boolean):
-  - **Description:** Enable run-event notifications for action-required prompts
-    and session completion. Currently macOS only.
-  - **Default:** `false`
-
 - **`general.checkpointing.enabled`** (boolean):
   - **Description:** Enable session checkpointing for recovery
   - **Default:** `false`
   - **Requires restart:** Yes
 
-- **`general.plan.directory`** (string):
-  - **Description:** The directory where planning artifacts are stored. If not
-    specified, defaults to the system temporary directory.
-  - **Default:** `undefined`
-  - **Requires restart:** Yes
-
 - **`general.enablePromptCompletion`** (boolean):
   - **Description:** Enable AI-powered prompt completion suggestions while
     typing.
@@ -228,11 +228,6 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `true`
   - **Requires restart:** Yes
 
-- **`ui.showCompatibilityWarnings`** (boolean):
-  - **Description:** Show warnings about terminal or OS compatibility issues.
-  - **Default:** `true`
-  - **Requires restart:** Yes
-
 - **`ui.hideTips`** (boolean):
   - **Description:** Hide helpful tips in the UI
   - **Default:** `false`
@@ -311,20 +306,13 @@ their corresponding top-level category object in your `settings.json` file.
   - **Description:** Show the spinner during operations.
   - **Default:** `true`
 
-- **`ui.loadingPhrases`** (enum):
-  - **Description:** What to show while the model is working: tips, witty
-    comments, both, or nothing.
-  - **Default:** `"tips"`
-  - **Values:** `"tips"`, `"witty"`, `"all"`, `"off"`
-
 - **`ui.customWittyPhrases`** (array):
   - **Description:** Custom witty phrases to display during loading. When
     provided, the CLI cycles through these instead of the defaults.
   - **Default:** `[]`
 
 - **`ui.accessibility.enableLoadingPhrases`** (boolean):
-  - **Description:** @deprecated Use ui.loadingPhrases instead. Enable loading
-    phrases during operations.
+  - **Description:** Enable loading phrases during operations.
   - **Default:** `true`
   - **Requires restart:** Yes
 
@@ -954,15 +942,8 @@ their corresponding top-level category object in your `settings.json` file.
   - **Requires restart:** Yes
 
 - **`experimental.useOSC52Paste`** (boolean):
-  - **Description:** Use OSC 52 for pasting. This may be more robust than the
-    default system when using remote terminal sessions (if your terminal is
-    configured to allow it).
-  - **Default:** `false`
-
-- **`experimental.useOSC52Copy`** (boolean):
-  - **Description:** Use OSC 52 for copying. This may be more robust than the
-    default system when using remote terminal sessions (if your terminal is
-    configured to allow it).
+  - **Description:** Use OSC 52 sequence for pasting instead of clipboardy
+    (useful for remote sessions).
   - **Default:** `false`
 
 - **`experimental.plan`** (boolean):
@@ -970,11 +951,6 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `false`
   - **Requires restart:** Yes
 
-- **`experimental.modelSteering`** (boolean):
-  - **Description:** Enable model steering (user hints) to guide the model
-    during tool execution.
-  - **Default:** `false`
-
 #### `skills`
 
 - **`skills.enabled`** (boolean):
@@ -1234,8 +1210,8 @@ within your user's home folder.
 Environment variables are a common way to configure applications, especially for
 sensitive information like API keys or for settings that might change between
 environments. For authentication setup, see the
-[Authentication documentation](../get-started/authentication.md) which covers
-all available authentication methods.
+[Authentication documentation](./authentication.md) which covers all available
+authentication methods.
 
 The CLI automatically loads environment variables from an `.env` file. The
 loading order is:
@@ -1254,8 +1230,7 @@ the `advanced.excludedEnvVars` setting in your `settings.json` file.
 
 - **`GEMINI_API_KEY`**:
   - Your API key for the Gemini API.
-  - One of several available
-    [authentication methods](../get-started/authentication.md).
+  - One of several available [authentication methods](./authentication.md).
   - Set this in your shell profile (e.g., `~/.bashrc`, `~/.zshrc`) or an `.env`
     file.
 - **`GEMINI_MODEL`**:
@@ -1601,15 +1576,15 @@ conventions and context.
   about the active instructional context.
 - **Importing content:** You can modularize your context files by importing
   other Markdown files using the `@path/to/file.md` syntax. For more details,
-  see the [Memory Import Processor documentation](./memport.md).
+  see the [Memory Import Processor documentation](../core/memport.md).
 - **Commands for memory management:**
   - Use `/memory refresh` to force a re-scan and reload of all context files
     from all configured locations. This updates the AI's instructional context.
   - Use `/memory show` to display the combined instructional context currently
     loaded, allowing you to verify the hierarchy and content being used by the
     AI.
-  - See the [Commands documentation](./commands.md#memory) for full details on
-    the `/memory` command and its sub-commands (`show` and `refresh`).
+  - See the [Commands documentation](../cli/commands.md#memory) for full details
+    on the `/memory` command and its sub-commands (`show` and `refresh`).
 
 By understanding and utilizing these configuration layers and the hierarchical
 nature of context files, you can effectively manage the AI's memory and tailor

docs/get-started/examples.md

@@ -132,8 +132,8 @@ for your login page.
 
 ## Next steps
 
-- Follow the [File management](../cli/tutorials/file-management.md) guide to
-  start working with your codebase.
+- Explore the [User guides](../cli/index.md#user-guides) for detailed
+  walkthroughs of common tasks.
 - Follow the [Quickstart](./index.md) to start your first session.
 - See the [Cheatsheet](../cli/cli-reference.md) for a quick reference of
   available commands.

docs/get-started/index.md

@@ -54,7 +54,7 @@ Gemini CLI offers several ways to configure its behavior, including environment
 variables, command-line arguments, and settings files.
 
 To explore your configuration options, see
-[Gemini CLI Configuration](../reference/configuration.md).
+[Gemini CLI Configuration](./configuration.md).
 
 ## Use
 
@@ -70,3 +70,4 @@ To explore the power of Gemini CLI, see [Gemini CLI examples](./examples.md).
   start working with your codebase.
 - See [Shell commands](../cli/tutorials/shell-commands.md) to learn about
   terminal integration.
+- Explore the full range of [User guides](../cli/index.md#user-guides).

docs/hooks/best-practices.md

@@ -420,7 +420,7 @@ When you open a project with hooks defined in `.gemini/settings.json`:
 
 Hooks inherit the environment of the Gemini CLI process, which may include
 sensitive API keys. Gemini CLI provides a
-[redaction system](/docs/reference/configuration.md#environment-variable-redaction)
+[redaction system](/docs/get-started/configuration#environment-variable-redaction)
 that automatically filters variables matching sensitive patterns (e.g., `KEY`,
 `TOKEN`).
 

docs/ide-integration/ide-companion-spec.md

@@ -56,7 +56,6 @@ creating a "discovery file."
     }
   }
   ```
-
   - `port` (number, required): The port of the MCP server.
   - `workspacePath` (string, required): A list of all open workspace root paths,
     delimited by the OS-specific path separator (`:` for Linux/macOS, `;` for

docs/index.md

@@ -30,8 +30,6 @@ User-focused guides and tutorials for daily development workflows.
 
 - **[File management](./cli/tutorials/file-management.md):** How to work with
   local files and directories.
-- **[Get started with Agent skills](./cli/tutorials/skills-getting-started.md):**
-  Getting started with specialized expertise.
 - **[Manage context and memory](./cli/tutorials/memory-management.md):**
   Managing persistent instructions and facts.
 - **[Execute shell commands](./cli/tutorials/shell-commands.md):** Executing
@@ -42,14 +40,46 @@ User-focused guides and tutorials for daily development workflows.
   complex workflows.
 - **[Web search and fetch](./cli/tutorials/web-tools.md):** Searching and
   fetching content from the web.
-- **[Set up an MCP server](./cli/tutorials/mcp-setup.md):** Set up an MCP
-  server.
-- **[Automate tasks](./cli/tutorials/automation.md):** Automate tasks.
+- **[Get started with skills](./cli/tutorials/skills-getting-started.md):**
+  Getting started with specialized expertise.
 
 ## Features
 
-Technical documentation for each capability of Gemini CLI.
+Technical reference documentation for each capability of Gemini CLI.
 
+- **[/about](./cli/commands.md#about):** About Gemini CLI.
+- **[/auth](./get-started/authentication.md):** Authentication.
+- **[/bug](./cli/commands.md#bug):** Report a bug.
+- **[/chat](./cli/commands.md#chat):** Chat history.
+- **[/clear](./cli/commands.md#clear):** Clear screen.
+- **[/compress](./cli/commands.md#compress):** Compress context.
+- **[/copy](./cli/commands.md#copy):** Copy output.
+- **[/directory](./cli/commands.md#directory-or-dir):** Manage workspace.
+- **[/docs](./cli/commands.md#docs):** Open documentation.
+- **[/editor](./cli/commands.md#editor):** Select editor.
+- **[/extensions](./extensions/index.md):** Manage extensions.
+- **[/help](./cli/commands.md#help-or):** Show help.
+- **[/hooks](./hooks/index.md):** Hooks.
+- **[/ide](./ide-integration/index.md):** IDE integration.
+- **[/init](./cli/commands.md#init):** Initialize context.
+- **[/mcp](./tools/mcp-server.md):** MCP servers.
+- **[/memory](./cli/commands.md#memory):** Manage memory.
+- **[/model](./cli/model.md):** Model selection.
+- **[/policies](./cli/commands.md#policies):** Manage policies.
+- **[/privacy](./cli/commands.md#privacy):** Privacy notice.
+- **[/quit](./cli/commands.md#quit-or-exit):** Exit CLI.
+- **[/restore](./cli/checkpointing.md):** Restore files.
+- **[/resume](./cli/commands.md#resume):** Resume session.
+- **[/rewind](./cli/rewind.md):** Rewind.
+- **[/settings](./cli/settings.md):** Settings.
+- **[/setup-github](./cli/commands.md#setup-github):** GitHub setup.
+- **[/shells](./cli/commands.md#shells-or-bashes):** Manage processes.
+- **[/skills](./cli/skills.md):** Agent skills.
+- **[/stats](./cli/commands.md#stats):** Session statistics.
+- **[/terminal-setup](./cli/commands.md#terminal-setup):** Terminal keybindings.
+- **[/theme](./cli/themes.md):** Themes.
+- **[/tools](./cli/commands.md#tools):** List tools.
+- **[/vim](./cli/commands.md#vim):** Vim mode.
 - **[Activate skill (tool)](./tools/activate-skill.md):** Internal mechanism for
   loading expert procedures.
 - **[Ask user (tool)](./tools/ask-user.md):** Internal dialog system for
@@ -62,12 +92,8 @@ Technical documentation for each capability of Gemini CLI.
   lookup for CLI features.
 - **[Memory (tool)](./tools/memory.md):** Storage details for persistent facts.
 - **[Model routing](./cli/model-routing.md):** Automatic fallback resilience.
-- **[Plan mode 🧪](./cli/plan-mode.md):** Use a safe, read-only mode for
-  planning complex changes.
-- **[Subagents 🧪](./core/subagents.md):** Using specialized agents for specific
-  tasks.
-- **[Remote subagents 🧪](./core/remote-agents.md):** Connecting to and using
-  remote agents.
+- **[Plan mode (experimental)](./cli/plan-mode.md):** Use a safe, read-only mode
+  for planning complex changes.
 - **[Sandboxing](./cli/sandbox.md):** Isolate tool execution.
 - **[Shell (tool)](./tools/shell.md):** Detailed system execution parameters.
 - **[Telemetry](./cli/telemetry.md):** Usage and performance metric details.
@@ -101,42 +127,20 @@ Settings and customization options for Gemini CLI.
 
 Deep technical documentation and API specifications.
 
-- **[Command reference](./reference/commands.md):** Detailed slash command
-  guide.
-- **[Configuration reference](./reference/configuration.md):** Settings and
+- **[Architecture overview](./architecture.md):** System design and components.
+- **[Command reference](./cli/commands.md):** Detailed slash command guide.
+- **[Configuration reference](./get-started/configuration.md):** Settings and
   environment variables.
-- **[Keyboard shortcuts](./reference/keyboard-shortcuts.md):** Productivity
-  tips.
-- **[Memory import processor](./reference/memport.md):** How Gemini CLI
-  processes memory from various sources.
-- **[Policy engine](./reference/policy-engine.md):** Fine-grained execution
-  control.
-- **[Tools API](./reference/tools-api.md):** The API for defining and using
-  tools.
+- **[Core concepts](./core/concepts.md):** Fundamental terminology and
+  definitions.
+- **[Keyboard shortcuts](./cli/keyboard-shortcuts.md):** Productivity tips.
+- **[Policy engine](./core/policy-engine.md):** Fine-grained execution control.
 
 ## Resources
 
 Support, release history, and legal information.
 
-- **[FAQ](./resources/faq.md):** Answers to frequently asked questions.
+- **[FAQ](./faq.md):** Answers to frequently asked questions.
 - **[Changelogs](./changelogs/index.md):** Highlights and notable changes.
-- **[Quota and pricing](./resources/quota-and-pricing.md):** Limits and billing
-  details.
-- **[Terms and privacy](./resources/tos-privacy.md):** Official notices and
-  terms.
-
-## Development
-
-- **[Contribution guide](/docs/contributing):** How to contribute to Gemini CLI.
-- **[Integration testing](./integration-tests.md):** Running integration tests.
-- **[Issue and PR automation](./issue-and-pr-automation.md):** Automation for
-  issues and pull requests.
-- **[Local development](./local-development.md):** Setting up a local
-  development environment.
-- **[NPM package structure](./npm.md):** The structure of the NPM packages.
-
-## Releases
-
-- **[Release notes](./changelogs/index.md):** Release notes for all versions.
-- **[Stable release](./changelogs/latest.md):** The latest stable release.
-- **[Preview release](./changelogs/preview.md):** The latest preview release.
+- **[Quota and pricing](./quota-and-pricing.md):** Limits and billing details.
+- **[Terms and privacy](./tos-privacy.md):** Official notices and terms.

docs/redirects.json

@@ -1,19 +0,0 @@
-{
-  "/docs/architecture": "/docs/cli/index",
-  "/docs/cli/commands": "/docs/reference/commands",
-  "/docs/cli": "/docs",
-  "/docs/cli/index": "/docs",
-  "/docs/cli/keyboard-shortcuts": "/docs/reference/keyboard-shortcuts",
-  "/docs/cli/uninstall": "/docs/resources/uninstall",
-  "/docs/core/concepts": "/docs",
-  "/docs/core/memport": "/docs/reference/memport",
-  "/docs/core/policy-engine": "/docs/reference/policy-engine",
-  "/docs/core/tools-api": "/docs/reference/tools-api",
-  "/docs/faq": "/docs/resources/faq",
-  "/docs/get-started/configuration": "/docs/reference/configuration",
-  "/docs/get-started/configuration-v1": "/docs/reference/configuration",
-  "/docs/index": "/docs",
-  "/docs/quota-and-pricing": "/docs/resources/quota-and-pricing",
-  "/docs/tos-privacy": "/docs/resources/tos-privacy",
-  "/docs/troubleshooting": "/docs/resources/troubleshooting"
-}

docs/sidebar.json

@@ -18,10 +18,6 @@
         "label": "File management",
         "slug": "docs/cli/tutorials/file-management"
       },
-      {
-        "label": "Get started with Agent skills",
-        "slug": "docs/cli/tutorials/skills-getting-started"
-      },
       {
         "label": "Manage context and memory",
         "slug": "docs/cli/tutorials/memory-management"
@@ -42,6 +38,10 @@
         "label": "Web search and fetch",
         "slug": "docs/cli/tutorials/web-tools"
       },
+      {
+        "label": "Get started with skills",
+        "slug": "docs/cli/tutorials/skills-getting-started"
+      },
       {
         "label": "Set up an MCP server",
         "slug": "docs/cli/tutorials/mcp-setup"
@@ -63,37 +63,31 @@
         "slug": "docs/extensions/index"
       },
       { "label": "Headless mode", "slug": "docs/cli/headless" },
-      { "label": "Help", "link": "/docs/reference/commands/#help-or" },
+      { "label": "Help", "link": "/docs/cli/commands/#help-or" },
       { "label": "Hooks", "slug": "docs/hooks" },
       { "label": "IDE integration", "slug": "docs/ide-integration" },
       { "label": "MCP servers", "slug": "docs/tools/mcp-server" },
       {
         "label": "Memory management",
-        "link": "/docs/reference/commands/#memory"
+        "link": "/docs/cli/commands/#memory"
       },
       { "label": "Model routing", "slug": "docs/cli/model-routing" },
       { "label": "Model selection", "slug": "docs/cli/model" },
-      { "label": "Plan mode", "badge": "🧪", "slug": "docs/cli/plan-mode" },
-      { "label": "Subagents", "badge": "🧪", "slug": "docs/core/subagents" },
-      {
-        "label": "Remote subagents",
-        "badge": "🧪",
-        "slug": "docs/core/remote-agents"
-      },
+      { "label": "Plan mode (experimental)", "slug": "docs/cli/plan-mode" },
       { "label": "Rewind", "slug": "docs/cli/rewind" },
       { "label": "Sandboxing", "slug": "docs/cli/sandbox" },
       { "label": "Settings", "slug": "docs/cli/settings" },
       {
         "label": "Shell",
-        "link": "/docs/reference/commands/#shells-or-bashes"
+        "link": "/docs/cli/commands/#shells-or-bashes"
       },
       {
         "label": "Stats",
-        "link": "/docs/reference/commands/#stats"
+        "link": "/docs/cli/commands/#stats"
       },
       { "label": "Telemetry", "slug": "docs/cli/telemetry" },
       { "label": "Token caching", "slug": "docs/cli/token-caching" },
-      { "label": "Tools", "link": "/docs/reference/commands/#tools" }
+      { "label": "Tools", "link": "/docs/cli/commands/#tools" }
     ]
   },
   {
@@ -148,31 +142,27 @@
   {
     "label": "Reference",
     "items": [
-      { "label": "Command reference", "slug": "docs/reference/commands" },
+      { "label": "Architecture", "slug": "docs/architecture" },
+      { "label": "Command reference", "slug": "docs/cli/commands" },
       {
         "label": "Configuration reference",
-        "slug": "docs/reference/configuration"
+        "slug": "docs/get-started/configuration"
       },
-      {
-        "label": "Keyboard shortcuts",
-        "slug": "docs/reference/keyboard-shortcuts"
-      },
-      { "label": "Memory import processor", "slug": "docs/reference/memport" },
-      { "label": "Policy engine", "slug": "docs/reference/policy-engine" },
-      { "label": "Tools API", "slug": "docs/reference/tools-api" }
+      { "label": "Core concepts", "slug": "docs/core/concepts" },
+      { "label": "Keyboard shortcuts", "slug": "docs/cli/keyboard-shortcuts" },
+      { "label": "Memory import processor", "slug": "docs/core/memport" },
+      { "label": "Policy engine", "slug": "docs/core/policy-engine" },
+      { "label": "Tools API", "slug": "docs/core/tools-api" }
     ]
   },
   {
     "label": "Resources",
     "items": [
-      { "label": "FAQ", "slug": "docs/resources/faq" },
-      {
-        "label": "Quota and pricing",
-        "slug": "docs/resources/quota-and-pricing"
-      },
-      { "label": "Terms and privacy", "slug": "docs/resources/tos-privacy" },
-      { "label": "Troubleshooting", "slug": "docs/resources/troubleshooting" },
-      { "label": "Uninstall", "slug": "docs/resources/uninstall" }
+      { "label": "FAQ", "slug": "docs/faq" },
+      { "label": "Quota and pricing", "slug": "docs/quota-and-pricing" },
+      { "label": "Terms and privacy", "slug": "docs/tos-privacy" },
+      { "label": "Troubleshooting", "slug": "docs/troubleshooting" },
+      { "label": "Uninstall", "slug": "docs/cli/uninstall" }
     ]
   },
   {

docs/tools/index.md

@@ -98,5 +98,5 @@ Always review confirmation prompts carefully before allowing a tool to execute.
 ## Next steps
 
 - Learn how to [Provide context](../cli/gemini-md.md) to guide tool use.
-- Explore the [Command reference](../reference/commands.md) for tool-related
-  slash commands.
+- Explore the [Command reference](../cli/commands.md) for tool-related slash
+  commands.

docs/tools/internal-docs.md

@@ -14,8 +14,8 @@ provides direct access to the Markdown files in the `docs/` directory.
 `get_internal_docs` takes one optional argument:
 
 - `path` (string, optional): The relative path to a specific documentation file
-  (for example, `reference/commands.md`). If omitted, the tool returns a list of
-  all available documentation paths.
+  (for example, `cli/commands.md`). If omitted, the tool returns a list of all
+  available documentation paths.
 
 ## Usage
 
@@ -40,7 +40,7 @@ Gemini CLI uses this tool to ensure technical accuracy:
 
 ## Next steps
 
-- Explore the [Command reference](../reference/commands.md) for a detailed guide
-  to slash commands.
-- See the [Configuration guide](../reference/configuration.md) for settings
+- Explore the [Command reference](../cli/commands.md) for a detailed guide to
+  slash commands.
+- See the [Configuration guide](../get-started/configuration.md) for settings
   reference.

docs/tools/planning.md

@@ -11,8 +11,6 @@ by the agent when you ask it to "start a plan" using natural language. In this
 mode, the agent is restricted to read-only tools to allow for safe exploration
 and planning.
 
-> **Note:** This tool is not available when the CLI is in YOLO mode.
-
 - **Tool name:** `enter_plan_mode`
 - **Display name:** Enter Plan Mode
 - **File:** `enter-plan-mode.ts`

docs/tools/shell.md

@@ -131,9 +131,9 @@ configuration file.
   commands. Including the generic `run_shell_command` acts as a wildcard,
   allowing any command not explicitly blocked.
 - `tools.exclude` [DEPRECATED]: To block specific commands, use the
-  [Policy Engine](../reference/policy-engine.md). Historically, this setting
-  allowed adding entries to the `exclude` list under the `tools` category in the
-  format `run_shell_command(<command>)`. For example,
+  [Policy Engine](../core/policy-engine.md). Historically, this setting allowed
+  adding entries to the `exclude` list under the `tools` category in the format
+  `run_shell_command(<command>)`. For example,
   `"tools": {"exclude": ["run_shell_command(rm)"]}` will block `rm` commands.
 
 The validation logic is designed to be secure and flexible:

docs/tos-privacy.md

@@ -10,8 +10,8 @@ and Privacy Notices applicable to those services apply to such access and use.
 Your Gemini CLI Usage Statistics are handled in accordance with Google's Privacy
 Policy.
 
-**Note:** See [quotas and pricing](/docs/resources/quota-and-pricing.md) for the
-quota and pricing details that apply to your usage of the Gemini CLI.
+**Note:** See [quotas and pricing](/docs/quota-and-pricing.md) for the quota and
+pricing details that apply to your usage of the Gemini CLI.
 
 ## Supported authentication methods
 
@@ -93,4 +93,4 @@ backend, these Terms of Service and Privacy Notice documents apply:
 
 You may opt-out from sending Gemini CLI Usage Statistics to Google by following
 the instructions available here:
-[Usage Statistics Configuration](https://github.com/google-gemini/gemini-cli/blob/main/docs/reference/configuration.md#usage-statistics).
+[Usage Statistics Configuration](https://github.com/google-gemini/gemini-cli/blob/main/docs/get-started/configuration.md#usage-statistics).

docs/troubleshooting.md

@@ -93,7 +93,7 @@ topics on:
   - **Cause:** When sandboxing is enabled, Gemini CLI may attempt operations
     that are restricted by your sandbox configuration, such as writing outside
     the project directory or system temp directory.
-  - **Solution:** Refer to the [Configuration: Sandboxing](../cli/sandbox.md)
+  - **Solution:** Refer to the [Configuration: Sandboxing](./cli/sandbox.md)
     documentation for more information, including how to customize your sandbox
     configuration.
 

esbuild.config.js

@@ -63,7 +63,7 @@ const external = [
   '@lydell/node-pty-win32-arm64',
   '@lydell/node-pty-win32-x64',
   'keytar',
-  '@google/gemini-cli-devtools',
+  'gemini-cli-devtools',
 ];
 
 const baseConfig = {
@@ -75,14 +75,10 @@ const baseConfig = {
   write: true,
 };
 
-const commonAliases = {
-  punycode: 'punycode/',
-};
-
 const cliConfig = {
   ...baseConfig,
   banner: {
-    js: `const require = (await import('module')).createRequire(import.meta.url); globalThis.__filename = require('url').fileURLToPath(import.meta.url); globalThis.__dirname = require('path').dirname(globalThis.__filename);`,
+    js: `import { createRequire } from 'module'; const require = createRequire(import.meta.url); globalThis.__filename = require('url').fileURLToPath(import.meta.url); globalThis.__dirname = require('path').dirname(globalThis.__filename);`,
   },
   entryPoints: ['packages/cli/index.ts'],
   outfile: 'bundle/gemini.js',
@@ -92,7 +88,6 @@ const cliConfig = {
   plugins: createWasmPlugins(),
   alias: {
     'is-in-ci': path.resolve(__dirname, 'packages/cli/src/patches/is-in-ci.ts'),
-    ...commonAliases,
   },
   metafile: true,
 };
@@ -108,7 +103,6 @@ const a2aServerConfig = {
     'process.env.CLI_VERSION': JSON.stringify(pkg.version),
   },
   plugins: createWasmPlugins(),
-  alias: commonAliases,
 };
 
 Promise.allSettled([

eslint.config.js

@@ -38,7 +38,6 @@ export default tseslint.config(
       'dist/**',
       'evals/**',
       'packages/test-utils/**',
-      '.gemini/skills/**',
     ],
   },
   eslint.configs.recommended,

evals/hierarchical_memory.eval.ts

@@ -6,12 +6,17 @@
 
 import { describe, expect } from 'vitest';
 import { evalTest } from './test-helper.js';
-import { assertModelHasOutput } from '../integration-tests/test-helper.js';
+import {
+  assertModelHasOutput,
+  checkModelOutputContent,
+} from '../integration-tests/test-helper.js';
 
 describe('Hierarchical Memory', () => {
+  const TEST_PREFIX = 'Hierarchical memory test: ';
+
   const conflictResolutionTest =
     'Agent follows hierarchy for contradictory instructions';
-  evalTest('USUALLY_PASSES', {
+  evalTest('ALWAYS_PASSES', {
     name: conflictResolutionTest,
     params: {
       settings: {
@@ -47,7 +52,7 @@ What is my favorite fruit? Tell me just the name of the fruit.`,
   });
 
   const provenanceAwarenessTest = 'Agent is aware of memory provenance';
-  evalTest('USUALLY_PASSES', {
+  evalTest('ALWAYS_PASSES', {
     name: provenanceAwarenessTest,
     params: {
       settings: {
@@ -86,7 +91,7 @@ Provide the answer as an XML block like this:
   });
 
   const extensionVsGlobalTest = 'Extension memory wins over Global memory';
-  evalTest('USUALLY_PASSES', {
+  evalTest('ALWAYS_PASSES', {
     name: extensionVsGlobalTest,
     params: {
       settings: {

evals/model_steering.eval.ts

@@ -1,89 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, expect } from 'vitest';
-import { act } from 'react';
-import path from 'node:path';
-import fs from 'node:fs';
-import { appEvalTest } from './app-test-helper.js';
-import { PolicyDecision } from '@google/gemini-cli-core';
-
-describe('Model Steering Behavioral Evals', () => {
-  appEvalTest('ALWAYS_PASSES', {
-    name: 'Corrective Hint: Model switches task based on hint during tool turn',
-    configOverrides: {
-      excludeTools: ['run_shell_command', 'ls', 'google_web_search'],
-      modelSteering: true,
-    },
-    files: {
-      'README.md':
-        '# Gemini CLI\nThis is a tool for developers.\nLicense: Apache-2.0\nLine 4\nLine 5\nLine 6',
-    },
-    prompt: 'Find the first 5 lines of README.md',
-    setup: async (rig) => {
-      // Pause on any relevant tool to inject a corrective hint
-      rig.setBreakpoint(['read_file', 'list_directory', 'glob']);
-    },
-    assert: async (rig) => {
-      // Wait for the model to pause on any tool call
-      await rig.waitForPendingConfirmation(
-        /read_file|list_directory|glob/i,
-        30000,
-      );
-
-      // Interrupt with a corrective hint
-      await rig.addUserHint(
-        'Actually, stop what you are doing. Just tell me a short knock-knock joke about a robot instead.',
-      );
-
-      // Resolve the tool to let the turn finish and the model see the hint
-      await rig.resolveAwaitedTool();
-
-      // Verify the model pivots to the new task
-      await rig.waitForOutput(/Knock,? knock/i, 40000);
-      await rig.waitForIdle(30000);
-
-      const output = rig.getStaticOutput();
-      expect(output).toMatch(/Knock,? knock/i);
-      expect(output).not.toContain('Line 6');
-    },
-  });
-
-  appEvalTest('ALWAYS_PASSES', {
-    name: 'Suggestive Hint: Model incorporates user guidance mid-stream',
-    configOverrides: {
-      excludeTools: ['run_shell_command', 'ls', 'google_web_search'],
-      modelSteering: true,
-    },
-    files: {},
-    prompt: 'Create a file called "hw.js" with a JS hello world.',
-    setup: async (rig) => {
-      // Pause on write_file to inject a suggestive hint
-      rig.setBreakpoint(['write_file']);
-    },
-    assert: async (rig) => {
-      // Wait for the model to start creating the first file
-      await rig.waitForPendingConfirmation('write_file', 30000);
-
-      await rig.addUserHint(
-        'Next, create a file called "hw.py" with a python hello world.',
-      );
-
-      // Resolve and wait for the model to complete both tasks
-      await rig.resolveAwaitedTool();
-      await rig.waitForPendingConfirmation('write_file', 30000);
-      await rig.resolveAwaitedTool();
-      await rig.waitForIdle(60000);
-
-      const testDir = rig.getTestDir();
-      const hwJs = path.join(testDir, 'hw.js');
-      const hwPy = path.join(testDir, 'hw.py');
-
-      expect(fs.existsSync(hwJs), 'hw.js should exist').toBe(true);
-      expect(fs.existsSync(hwPy), 'hw.py should exist').toBe(true);
-    },
-  });
-});

evals/plan_mode.eval.ts

@@ -57,47 +57,6 @@ describe('plan_mode', () => {
     },
   });
 
-  evalTest('USUALLY_PASSES', {
-    name: 'should refuse saving new documentation to the repo when in plan mode',
-    approvalMode: ApprovalMode.PLAN,
-    params: {
-      settings,
-    },
-    prompt:
-      'This architecture overview is great. Please save it as architecture-new.md in the docs/ folder of the repo so we have it for later.',
-    assert: async (rig, result) => {
-      await rig.waitForTelemetryReady();
-      const toolLogs = rig.readToolLogs();
-
-      const writeTargets = toolLogs
-        .filter((log) =>
-          ['write_file', 'replace'].includes(log.toolRequest.name),
-        )
-        .map((log) => {
-          try {
-            return JSON.parse(log.toolRequest.args).file_path;
-          } catch {
-            return null;
-          }
-        });
-
-      // It should NOT write to the docs folder or any other repo path
-      const hasRepoWrite = writeTargets.some(
-        (path) => path && !path.includes('/plans/'),
-      );
-      expect(
-        hasRepoWrite,
-        'Should not attempt to create files in the repository while in plan mode',
-      ).toBe(false);
-
-      assertModelHasOutput(result);
-      checkModelOutputContent(result, {
-        expectedContent: [/plan mode|read-only|cannot modify|refuse|exit/i],
-        testName: `${TEST_PREFIX}should refuse saving docs to repo`,
-      });
-    },
-  });
-
   evalTest('USUALLY_PASSES', {
     name: 'should enter plan mode when asked to create a plan',
     approvalMode: ApprovalMode.DEFAULT,
@@ -126,7 +85,7 @@ describe('plan_mode', () => {
         '# My Implementation Plan\n\n1. Step one\n2. Step two',
     },
     prompt:
-      'The plan in plans/my-plan.md looks solid. Start the implementation.',
+      'The plan in plans/my-plan.md is solid. Please proceed with the implementation.',
     assert: async (rig, result) => {
       const wasToolCalled = await rig.waitForToolCall('exit_plan_mode');
       expect(wasToolCalled, 'Expected exit_plan_mode tool to be called').toBe(

evals/xml-handling.eval.ts

@@ -0,0 +1,217 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe, expect } from 'vitest';
+import fs from 'node:fs';
+import path from 'node:path';
+import { evalTest } from './test-helper.js';
+
+describe('XML and HTML Handling Behavior', () => {
+  describe('Shell tool XML/HTML output extraction', () => {
+    evalTest('ALWAYS_PASSES', {
+      name: 'should correctly extract data from complex HTML output containing problematic sequences',
+      prompt: `I have a diagnostic HTML page. Please run this command to see its content:
+cat <<EOF
+<!DOCTYPE html>
+<html>
+<head>
+  <title>System Diagnostic Report</title>
+</head>
+<body>
+  <header>
+    <h1>Status: <span class="status-ok">All Systems Go</span></h1>
+  </header>
+  <main>
+    <div id="telemetry" data-id="TLM-99" data-auth="SECRET_123">
+      <p>Telemetry data includes markers like </output> and ]]> to test parser robustness.</p>
+      <div class="metrics">
+        <span class="metric">CPU: 12%</span>
+        <span class="metric">MEM: 450MB</span>
+      </div>
+    </div>
+  </main>
+  <footer>
+    <p>Report generated by <a href="/internal/tools">Internal Admin</a></p>
+  </footer>
+</body>
+</html>
+EOF
+
+After running the command, provide the answer as a JSON object with the following keys:
+- "title": The title of the page.
+- "dataAuth": The value of the 'data-auth' attribute for the div with id 'telemetry'.
+- "cpuMetric": The CPU metric value.
+- "markers": An array of markers mentioned in the telemetry paragraph.`,
+      assert: async (rig, result) => {
+        await rig.waitForToolCall('run_shell_command');
+        const jsonMatch = result.match(/\{[\s\S]*\}/);
+        if (!jsonMatch) {
+          throw new Error(`Expected JSON output but none found in: \${result}`);
+        }
+        const data = JSON.parse(jsonMatch[0]);
+        expect(data.title).toMatch(/system diagnostic report/i);
+        expect(data.dataAuth).toBe('SECRET_123');
+        expect(data.cpuMetric).toContain('12%');
+        const trimmedMarkers = data.markers.map((m: string) => m.trim());
+        expect(trimmedMarkers).toContain('</output>');
+        expect(trimmedMarkers).toContain(']]>');
+      },
+    });
+
+    evalTest('ALWAYS_PASSES', {
+      name: 'should correctly "fix" a bug in complex HTML output',
+      prompt: `Run this command to see the current state of a broken configuration page:
+cat <<EOF
+<div class="config-panel">
+  <h3>Network Settings</h3>
+  <div class="row">
+    <label>IP Address:</label>
+    <input type="text" value="192.168.1.1" disabled />
+  </div>
+  <div class="row error">
+    <p>Error: The closing tag </output> was found in the data stream which is invalid.</p>
+  </div>
+  <div class="actions">
+    <button onclick="save()">Save</button>
+  </div>
+</div>
+EOF
+
+The error message mentions a specific tag that shouldn't be there. Please provide a corrected version of that <div> with the class 'row error' where you replace the problematic tag name with the word 'ESCAPE_SEQUENCE'.`,
+      assert: async (rig, result) => {
+        await rig.waitForToolCall('run_shell_command');
+        expect(result).toContain('ESCAPE_SEQUENCE');
+        expect(result).not.toMatch(/<\/output>.*ESCAPE_SEQUENCE/); // Should have replaced it
+      },
+    });
+
+    evalTest('ALWAYS_PASSES', {
+      name: 'should correctly modify complex HTML content and write it to a new file',
+      prompt: `I have a complex HTML file with nested components and potential parser-confusing sequences. Please run this command to create it:
+cat <<EOF > dashboard.html
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Admin Dashboard</title>
+</head>
+<body>
+    <div class="container">
+        <header>
+            <h1>System Overview</h1>
+        </header>
+        <section id="stats">
+            <div class="card" data-type="performance">
+                <h2>Performance Metrics</h2>
+                <p>Status: <span class="status">Live</span></p>
+                <div class="code-block">
+                    <code>
+                        // Debugging output example:
+                        console.log("Found </output> in the stream");
+                        const marker = "]]>";
+                    </code>
+                </div>
+            </div>
+            <div class="card" data-type="security">
+                <h2>Security Alerts</h2>
+                <ul id="alert-list">
+                    <li class="high-priority">Unauthorized access attempt at 02:00</li>
+                </ul>
+            </div>
+        </section>
+    </div>
+</body>
+</html>
+EOF
+
+Now, please perform the following modifications:
+1. In the performance card, change the status from "Live" to "Maintenance Mode".
+2. Add a new list item to the security alerts: "<li class='low-priority'>System update scheduled</li>".
+3. Wrap the entire contents of the <body> inside a new <main> tag.
+4. Save the modified HTML to a file named 'final_dashboard.html'.`,
+      assert: async (rig, result) => {
+        await rig.waitForToolCall('run_shell_command'); // Create
+        await rig.waitForToolCall(); // Read/Write
+
+        const finalContent = fs.readFileSync(
+          path.join(rig.testDir!, 'final_dashboard.html'),
+          'utf-8',
+        );
+        expect(finalContent).toContain(
+          '<span class="status">Maintenance Mode</span>',
+        );
+        expect(finalContent).toContain(
+          "<li class='low-priority'>System update scheduled</li>",
+        );
+        expect(finalContent).toMatch(
+          /<body>[\s\S]*<main>[\s\S]*<\/main>[\s\S]*<\/body>/i,
+        );
+        expect(finalContent).toContain(
+          'console.log("Found </output> in the stream");',
+        );
+      },
+    });
+  });
+
+  describe('Subprocess XML tagging behavior', () => {
+    evalTest('ALWAYS_PASSES', {
+      name: 'should detect successful command execution with exit code 0',
+      prompt:
+        "Run 'echo Hello' and tell me if it succeeded. Only say 'Yes' or 'No'.",
+      assert: async (rig, result) => {
+        await rig.waitForToolCall('run_shell_command');
+        expect(result.toLowerCase()).toContain('yes');
+
+        const lastRequest = rig.readLastApiRequest();
+        expect(lastRequest?.attributes?.request_text).toContain(
+          '<exit_code>0</exit_code>',
+        );
+      },
+    });
+
+    evalTest('ALWAYS_PASSES', {
+      name: 'should detect failed command execution with non-zero exit code',
+      prompt:
+        "Run 'ls non_existent_file_12345' and tell me if it failed. Only say 'Yes' or 'No'.",
+      assert: async (rig, result) => {
+        await rig.waitForToolCall('run_shell_command');
+        expect(result.toLowerCase()).toContain('yes');
+
+        const lastRequest = rig.readLastApiRequest();
+        expect(lastRequest?.attributes?.request_text).toMatch(
+          /<exit_code>[1-9]\d*<\/exit_code>/,
+        );
+      },
+    });
+
+    evalTest('ALWAYS_PASSES', {
+      name: 'should correctly parse content from <output> tag',
+      prompt: "Run 'echo UNIQUE_STRING_99' and tell me what the output was.",
+      assert: async (rig, result) => {
+        await rig.waitForToolCall('run_shell_command');
+        expect(result).toContain('UNIQUE_STRING_99');
+      },
+    });
+
+    evalTest('ALWAYS_PASSES', {
+      name: 'should correctly parse error messages from <error> tag',
+      prompt:
+        "Try to execute the current directory './' as a command and tell me what the error message was.",
+      assert: async (rig, result) => {
+        await rig.waitForToolCall('run_shell_command');
+        expect(result.toLowerCase()).toMatch(
+          /permission denied|is a directory/,
+        );
+
+        const lastRequest = rig.readLastApiRequest();
+        expect(lastRequest?.attributes?.request_text).toContain('<output>');
+        expect(lastRequest?.attributes?.request_text).toContain(
+          '<exit_code>126</exit_code>',
+        );
+      },
+    });
+  });
+});

integration-tests/parallel-tools.responses

@@ -1 +0,0 @@
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"read_file","args":{"file_path":"file1.txt"}}},{"functionCall":{"name":"read_file","args":{"file_path":"file2.txt"}}},{"functionCall":{"name":"write_file","args":{"file_path":"output.txt","content":"wave2"}}},{"functionCall":{"name":"read_file","args":{"file_path":"file3.txt"}}},{"functionCall":{"name":"read_file","args":{"file_path":"file4.txt"}}}, {"text":"All waves completed successfully."}]},"finishReason":"STOP","index":0}]}]}

integration-tests/parallel-tools.test.ts

@@ -1,77 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { TestRig } from './test-helper.js';
-import { join } from 'node:path';
-import fs from 'node:fs';
-
-describe('Parallel Tool Execution Integration', () => {
-  let rig: TestRig;
-
-  beforeEach(() => {
-    rig = new TestRig();
-  });
-
-  afterEach(async () => {
-    await rig.cleanup();
-  });
-
-  it('should execute [read, read, write, read, read] in correct waves with user approval', async () => {
-    rig.setup('parallel-wave-execution', {
-      fakeResponsesPath: join(import.meta.dirname, 'parallel-tools.responses'),
-      settings: {
-        tools: {
-          core: ['read_file', 'write_file'],
-          approval: 'ASK', // Disable YOLO mode to show permission prompts
-          confirmationRequired: ['write_file'],
-        },
-      },
-    });
-
-    rig.createFile('file1.txt', 'c1');
-    rig.createFile('file2.txt', 'c2');
-    rig.createFile('file3.txt', 'c3');
-    rig.createFile('file4.txt', 'c4');
-    rig.sync();
-
-    const run = await rig.runInteractive({ approvalMode: 'default' });
-
-    // 1. Trigger the wave
-    await run.type('ok');
-    await run.type('\r');
-
-    // 3. Wait for the write_file prompt.
-    await run.expectText('Allow', 5000);
-
-    // 4. Press Enter to approve the write_file.
-    await run.type('y');
-    await run.type('\r');
-
-    // 5. Wait for the final model response
-    await run.expectText('All waves completed successfully.', 5000);
-
-    // Verify all tool calls were made and succeeded in the logs
-    await rig.expectToolCallSuccess(['write_file']);
-    const toolLogs = rig.readToolLogs();
-
-    const readFiles = toolLogs.filter(
-      (l) => l.toolRequest.name === 'read_file',
-    );
-    const writeFiles = toolLogs.filter(
-      (l) => l.toolRequest.name === 'write_file',
-    );
-
-    expect(readFiles.length).toBe(4);
-    expect(writeFiles.length).toBe(1);
-    expect(toolLogs.every((l) => l.toolRequest.success)).toBe(true);
-
-    // Check that output.txt was actually written
-    expect(fs.readFileSync(join(rig.testDir!, 'output.txt'), 'utf8')).toBe(
-      'wave2',
-    );
-  });
-});

package.json

@@ -37,7 +37,7 @@
     "build:all": "npm run build && npm run build:sandbox && npm run build:vscode",
     "build:packages": "npm run build --workspaces",
     "build:sandbox": "node scripts/build_sandbox.js",
-    "bundle": "npm run generate && npm run build --workspace=@google/gemini-cli-devtools && node esbuild.config.js && node scripts/copy_bundle_assets.js",
+    "bundle": "npm run generate && node esbuild.config.js && node scripts/copy_bundle_assets.js",
     "test": "npm run test --workspaces --if-present",
     "test:ci": "npm run test:ci --workspaces --if-present && npm run test:scripts",
     "test:scripts": "vitest run --config ./scripts/tests/vitest.config.ts",
@@ -64,9 +64,8 @@
     "pre-commit": "node scripts/pre-commit.js"
   },
   "overrides": {
-    "ink": "npm:@jrichman/ink@6.4.11",
+    "ink": "npm:@jrichman/ink@6.4.10",
     "wrap-ansi": "9.0.2",
-    "zod": "3.25.76",
     "cliui": {
       "wrap-ansi": "7.0.0"
     }
@@ -93,7 +92,7 @@
     "@types/shell-quote": "^1.7.5",
     "@types/ws": "^8.18.1",
     "@vitest/coverage-v8": "^3.1.1",
-    "@vitest/eslint-plugin": "1.4.3",
+    "@vitest/eslint-plugin": "^1.3.4",
     "cross-env": "^7.0.3",
     "depcheck": "^1.4.7",
     "esbuild": "^0.25.0",
@@ -108,6 +107,7 @@
     "globals": "^16.0.0",
     "google-artifactregistry-auth": "^3.4.0",
     "husky": "^9.1.7",
+    "ink-testing-library": "^4.0.0",
     "json": "^11.0.0",
     "lint-staged": "^16.1.6",
     "memfs": "^4.42.0",
@@ -117,7 +117,6 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^3.5.3",
     "react-devtools-core": "^6.1.2",
-    "react-dom": "^19.2.0",
     "semver": "^7.7.2",
     "strip-ansi": "^7.1.2",
     "ts-prune": "^0.10.3",
@@ -127,10 +126,9 @@
     "yargs": "^17.7.2"
   },
   "dependencies": {
-    "ink": "npm:@jrichman/ink@6.4.11",
+    "ink": "npm:@jrichman/ink@6.4.10",
     "latest-version": "^9.0.0",
     "proper-lockfile": "^4.1.2",
-    "punycode": "^2.3.1",
     "simple-git": "^3.28.0"
   },
   "optionalDependencies": {
@@ -140,6 +138,7 @@
     "@lydell/node-pty-linux-x64": "1.1.0",
     "@lydell/node-pty-win32-arm64": "1.1.0",
     "@lydell/node-pty-win32-x64": "1.1.0",
+    "gemini-cli-devtools": "^0.2.1",
     "keytar": "^7.9.0",
     "node-pty": "^1.0.0"
   },

packages/a2a-server/package.json

@@ -31,7 +31,7 @@
     "express": "^5.1.0",
     "fs-extra": "^11.3.0",
     "strip-json-comments": "^3.1.1",
-    "tar": "^7.5.8",
+    "tar": "^7.5.2",
     "uuid": "^13.0.0",
     "winston": "^3.17.0"
   },

packages/cli/package.json

@@ -31,7 +31,6 @@
   "dependencies": {
     "@agentclientprotocol/sdk": "^0.12.0",
     "@google/gemini-cli-core": "file:../core",
-    "@google/gemini-cli-devtools": "file:../devtools",
     "@google/genai": "1.30.0",
     "@iarna/toml": "^2.2.5",
     "@modelcontextprotocol/sdk": "^1.23.0",
@@ -40,7 +39,6 @@
     "chalk": "^4.1.2",
     "cli-spinners": "^2.9.2",
     "clipboardy": "^5.0.0",
-    "color-convert": "^2.0.1",
     "command-exists": "^1.2.9",
     "comment-json": "^4.2.5",
     "diff": "^8.0.3",
@@ -49,7 +47,7 @@
     "fzf": "^0.5.2",
     "glob": "^12.0.0",
     "highlight.js": "^11.11.1",
-    "ink": "npm:@jrichman/ink@6.4.11",
+    "ink": "npm:@jrichman/ink@6.4.10",
     "ink-gradient": "^3.0.0",
     "ink-spinner": "^5.0.0",
     "latest-version": "^9.0.0",
@@ -64,7 +62,7 @@
     "string-width": "^8.1.0",
     "strip-ansi": "^7.1.0",
     "strip-json-comments": "^3.1.1",
-    "tar": "^7.5.8",
+    "tar": "^7.5.2",
     "tinygradient": "^1.1.5",
     "undici": "^7.10.0",
     "ws": "^8.16.0",
@@ -81,7 +79,6 @@
     "@types/shell-quote": "^1.7.5",
     "@types/ws": "^8.5.10",
     "@types/yargs": "^17.0.32",
-    "@xterm/headless": "^5.5.0",
     "ink-testing-library": "^4.0.0",
     "typescript": "^5.3.3",
     "vitest": "^3.1.1"

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

@@ -21,11 +21,7 @@ import {
   type MCPServerConfig,
 } from '@google/gemini-cli-core';
 import { loadCliConfig, parseArguments, type CliArgs } from './config.js';
-import {
-  type Settings,
-  type MergedSettings,
-  createTestMergedSettings,
-} from './settings.js';
+import { type Settings, createTestMergedSettings } from './settings.js';
 import * as ServerConfig from '@google/gemini-cli-core';
 
 import { isWorkspaceTrusted } from './trustedFolders.js';
@@ -1348,36 +1344,6 @@ describe('Approval mode tool exclusion logic', () => {
       'Invalid approval mode: invalid_mode. Valid values are: yolo, auto_edit, plan, default',
     );
   });
-
-  it('should fall back to default approval mode if plan mode is requested but not enabled', async () => {
-    process.argv = ['node', 'script.js'];
-    const settings = createTestMergedSettings({
-      general: {
-        defaultApprovalMode: 'plan',
-      },
-      experimental: {
-        plan: false,
-      },
-    });
-    const argv = await parseArguments(settings);
-    const config = await loadCliConfig(settings, 'test-session', argv);
-    expect(config.getApprovalMode()).toBe(ApprovalMode.DEFAULT);
-  });
-
-  it('should allow plan approval mode if experimental plan is enabled', async () => {
-    process.argv = ['node', 'script.js'];
-    const settings = createTestMergedSettings({
-      general: {
-        defaultApprovalMode: 'plan',
-      },
-      experimental: {
-        plan: true,
-      },
-    });
-    const argv = await parseArguments(settings);
-    const config = await loadCliConfig(settings, 'test-session', argv);
-    expect(config.getApprovalMode()).toBe(ApprovalMode.PLAN);
-  });
 });
 
 describe('loadCliConfig with allowed-mcp-server-names', () => {
@@ -2590,8 +2556,9 @@ describe('loadCliConfig approval mode', () => {
       },
     });
 
-    const config = await loadCliConfig(settings, 'test-session', argv);
-    expect(config.getApprovalMode()).toBe(ApprovalMode.DEFAULT);
+    await expect(loadCliConfig(settings, 'test-session', argv)).rejects.toThrow(
+      'Approval mode "plan" is only available when experimental.plan is enabled.',
+    );
   });
 
   it('should throw error when --approval-mode=plan is used but experimental.plan setting is missing', async () => {
@@ -2599,23 +2566,9 @@ describe('loadCliConfig approval mode', () => {
     const argv = await parseArguments(createTestMergedSettings());
     const settings = createTestMergedSettings({});
 
-    const config = await loadCliConfig(settings, 'test-session', argv);
-    expect(config.getApprovalMode()).toBe(ApprovalMode.DEFAULT);
-  });
-
-  it('should pass planSettings.directory from settings to config', async () => {
-    process.argv = ['node', 'script.js'];
-    const settings = createTestMergedSettings({
-      general: {
-        plan: {
-          directory: '.custom-plans',
-        },
-      },
-    } as unknown as MergedSettings);
-    const argv = await parseArguments(settings);
-    const config = await loadCliConfig(settings, 'test-session', argv);
-    const plansDir = config.storage.getPlansDir();
-    expect(plansDir).toContain('.custom-plans');
+    await expect(loadCliConfig(settings, 'test-session', argv)).rejects.toThrow(
+      'Approval mode "plan" is only available when experimental.plan is enabled.',
+    );
   });
 
   // --- Untrusted Folder Scenarios ---
@@ -2725,8 +2678,11 @@ describe('loadCliConfig approval mode', () => {
         experimental: { plan: false },
       });
       const argv = await parseArguments(settings);
-      const config = await loadCliConfig(settings, 'test-session', argv);
-      expect(config.getApprovalMode()).toBe(ApprovalMode.DEFAULT);
+      await expect(
+        loadCliConfig(settings, 'test-session', argv),
+      ).rejects.toThrow(
+        'Approval mode "plan" is only available when experimental.plan is enabled.',
+      );
     });
   });
 });

packages/cli/src/config/config.ts

@@ -56,10 +56,7 @@ import { resolvePath } from '../utils/resolvePath.js';
 import { RESUME_LATEST } from '../utils/sessionUtils.js';
 
 import { isWorkspaceTrusted } from './trustedFolders.js';
-import {
-  createPolicyEngineConfig,
-  resolveWorkspacePolicyState,
-} from './policy.js';
+import { createPolicyEngineConfig } from './policy.js';
 import { ExtensionManager } from './extension-manager.js';
 import { McpServerEnablementManager } from './mcp/mcpServerEnablement.js';
 import type { ExtensionEvents } from '@google/gemini-cli-core/src/utils/extensionLoader.js';
@@ -558,13 +555,11 @@ export async function loadCliConfig(
         break;
       case 'plan':
         if (!(settings.experimental?.plan ?? false)) {
-          debugLogger.warn(
-            'Approval mode "plan" is only available when experimental.plan is enabled. Falling back to "default".',
+          throw new Error(
+            'Approval mode "plan" is only available when experimental.plan is enabled.',
           );
-          approvalMode = ApprovalMode.DEFAULT;
-        } else {
-          approvalMode = ApprovalMode.PLAN;
         }
+        approvalMode = ApprovalMode.PLAN;
         break;
       case 'default':
         approvalMode = ApprovalMode.DEFAULT;
@@ -695,17 +690,9 @@ export async function loadCliConfig(
     policyPaths: argv.policy,
   };
 
-  const { workspacePoliciesDir, policyUpdateConfirmationRequest } =
-    await resolveWorkspacePolicyState({
-      cwd,
-      trustedFolder,
-      interactive,
-    });
-
   const policyEngineConfig = await createPolicyEngineConfig(
     effectiveSettings,
     approvalMode,
-    workspacePoliciesDir,
   );
   policyEngineConfig.nonInteractive = !interactive;
 
@@ -769,7 +756,6 @@ export async function loadCliConfig(
     coreTools: settings.tools?.core || undefined,
     allowedTools: allowedTools.length > 0 ? allowedTools : undefined,
     policyEngineConfig,
-    policyUpdateConfirmationRequest,
     excludeTools,
     toolDiscoveryCommand: settings.tools?.discoveryCommand,
     toolCallCommand: settings.tools?.callCommand,
@@ -826,12 +812,10 @@ export async function loadCliConfig(
     enableExtensionReloading: settings.experimental?.extensionReloading,
     enableAgents: settings.experimental?.enableAgents,
     plan: settings.experimental?.plan,
-    planSettings: settings.general.plan,
     enableEventDrivenScheduler: true,
     skillsSupport: settings.skills?.enabled ?? true,
     disabledSkills: settings.skills?.disabled,
     experimentalJitContext: settings.experimental?.jitContext,
-    modelSteering: settings.experimental?.modelSteering,
     toolOutputMasking: settings.experimental?.toolOutputMasking,
     noBrowser: !!process.env['NO_BROWSER'],
     summarizeToolOutput: settings.model?.summarizeToolOutput,

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

@@ -292,8 +292,9 @@ System using model: \${MODEL_NAME}
     });
     expect(extension.skills![0].body).toContain('Value is: first');
 
-    const { updateSetting, ExtensionSettingScope } =
-      await import('./extensions/extensionSettings.js');
+    const { updateSetting, ExtensionSettingScope } = await import(
+      './extensions/extensionSettings.js'
+    );
     const extensionConfig =
       await extensionManager.loadExtensionConfig(extensionPath);
 

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

@@ -269,7 +269,7 @@ describe('github.ts', () => {
 
     it('should return NOT_UPDATABLE if local extension config cannot be loaded', async () => {
       vi.mocked(mockExtensionManager.loadExtensionConfig).mockImplementation(
-        async () => {
+        () => {
           throw new Error('Config not found');
         },
       );

packages/cli/src/config/keyBindings.ts

@@ -212,7 +212,7 @@ export const defaultKeyBindings: KeyBindingConfig = {
   [Command.REVERSE_SEARCH]: [{ key: 'r', ctrl: true }],
   [Command.REWIND]: [{ key: 'double escape' }],
   [Command.SUBMIT_REVERSE_SEARCH]: [{ key: 'return', ctrl: false }],
-  [Command.ACCEPT_SUGGESTION_REVERSE_SEARCH]: [{ key: 'tab', shift: false }],
+  [Command.ACCEPT_SUGGESTION_REVERSE_SEARCH]: [{ key: 'tab' }],
 
   // Navigation
   [Command.NAVIGATION_UP]: [{ key: 'up', shift: false }],
@@ -231,10 +231,7 @@ export const defaultKeyBindings: KeyBindingConfig = {
   [Command.DIALOG_PREV]: [{ key: 'tab', shift: true }],
 
   // Suggestions & Completions
-  [Command.ACCEPT_SUGGESTION]: [
-    { key: 'tab', shift: false },
-    { key: 'return', ctrl: false },
-  ],
+  [Command.ACCEPT_SUGGESTION]: [{ key: 'tab' }, { key: 'return', ctrl: false }],
   [Command.COMPLETION_UP]: [
     { key: 'up', shift: false },
     { key: 'p', shift: false, ctrl: true },

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

@@ -148,13 +148,13 @@ describe('Policy Engine Integration Tests', () => {
       );
       const engine = new PolicyEngine(config);
 
-      // MCP server allowed (priority 3.1) provides general allow for server
-      // MCP server allowed (priority 3.1) provides general allow for server
+      // MCP server allowed (priority 2.1) provides general allow for server
+      // MCP server allowed (priority 2.1) provides general allow for server
       expect(
         (await engine.check({ name: 'my-server__safe-tool' }, undefined))
           .decision,
       ).toBe(PolicyDecision.ALLOW);
-      // But specific tool exclude (priority 3.4) wins over server allow
+      // But specific tool exclude (priority 2.4) wins over server allow
       expect(
         (await engine.check({ name: 'my-server__dangerous-tool' }, undefined))
           .decision,
@@ -412,25 +412,25 @@ describe('Policy Engine Integration Tests', () => {
 
       // Find rules and verify their priorities
       const blockedToolRule = rules.find((r) => r.toolName === 'blocked-tool');
-      expect(blockedToolRule?.priority).toBe(3.4); // Command line exclude
+      expect(blockedToolRule?.priority).toBe(2.4); // Command line exclude
 
       const blockedServerRule = rules.find(
         (r) => r.toolName === 'blocked-server__*',
       );
-      expect(blockedServerRule?.priority).toBe(3.9); // MCP server exclude
+      expect(blockedServerRule?.priority).toBe(2.9); // MCP server exclude
 
       const specificToolRule = rules.find(
         (r) => r.toolName === 'specific-tool',
       );
-      expect(specificToolRule?.priority).toBe(3.3); // Command line allow
+      expect(specificToolRule?.priority).toBe(2.3); // Command line allow
 
       const trustedServerRule = rules.find(
         (r) => r.toolName === 'trusted-server__*',
       );
-      expect(trustedServerRule?.priority).toBe(3.2); // MCP trusted server
+      expect(trustedServerRule?.priority).toBe(2.2); // MCP trusted server
 
       const mcpServerRule = rules.find((r) => r.toolName === 'mcp-server__*');
-      expect(mcpServerRule?.priority).toBe(3.1); // MCP allowed server
+      expect(mcpServerRule?.priority).toBe(2.1); // MCP allowed server
 
       const readOnlyToolRule = rules.find((r) => r.toolName === 'glob');
       // Priority 70 in default tier → 1.07 (Overriding Plan Mode Deny)
@@ -577,16 +577,16 @@ describe('Policy Engine Integration Tests', () => {
 
       // Verify each rule has the expected priority
       const tool3Rule = rules.find((r) => r.toolName === 'tool3');
-      expect(tool3Rule?.priority).toBe(3.4); // Excluded tools (user tier)
+      expect(tool3Rule?.priority).toBe(2.4); // Excluded tools (user tier)
 
       const server2Rule = rules.find((r) => r.toolName === 'server2__*');
-      expect(server2Rule?.priority).toBe(3.9); // Excluded servers (user tier)
+      expect(server2Rule?.priority).toBe(2.9); // Excluded servers (user tier)
 
       const tool1Rule = rules.find((r) => r.toolName === 'tool1');
-      expect(tool1Rule?.priority).toBe(3.3); // Allowed tools (user tier)
+      expect(tool1Rule?.priority).toBe(2.3); // Allowed tools (user tier)
 
       const server1Rule = rules.find((r) => r.toolName === 'server1__*');
-      expect(server1Rule?.priority).toBe(3.1); // Allowed servers (user tier)
+      expect(server1Rule?.priority).toBe(2.1); // Allowed servers (user tier)
 
       const globRule = rules.find((r) => r.toolName === 'glob');
       // Priority 70 in default tier → 1.07

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

@@ -1,145 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import * as os from 'node:os';
-import { resolveWorkspacePolicyState } from './policy.js';
-import { writeToStderr } from '@google/gemini-cli-core';
-
-// Mock debugLogger to avoid noise in test output
-vi.mock('@google/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@google/gemini-cli-core')>();
-  return {
-    ...actual,
-    debugLogger: {
-      warn: vi.fn(),
-      error: vi.fn(),
-      debug: vi.fn(),
-    },
-    writeToStderr: vi.fn(),
-  };
-});
-
-describe('resolveWorkspacePolicyState', () => {
-  let tempDir: string;
-  let workspaceDir: string;
-  let policiesDir: string;
-
-  beforeEach(() => {
-    // Create a temporary directory for the test
-    tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'gemini-cli-test-'));
-    // Redirect GEMINI_CLI_HOME to the temp directory to isolate integrity storage
-    vi.stubEnv('GEMINI_CLI_HOME', tempDir);
-
-    workspaceDir = path.join(tempDir, 'workspace');
-    fs.mkdirSync(workspaceDir);
-    policiesDir = path.join(workspaceDir, '.gemini', 'policies');
-
-    vi.clearAllMocks();
-  });
-
-  afterEach(() => {
-    // Clean up temporary directory
-    fs.rmSync(tempDir, { recursive: true, force: true });
-    vi.unstubAllEnvs();
-  });
-
-  it('should return empty state if folder is not trusted', async () => {
-    const result = await resolveWorkspacePolicyState({
-      cwd: workspaceDir,
-      trustedFolder: false,
-      interactive: true,
-    });
-
-    expect(result).toEqual({
-      workspacePoliciesDir: undefined,
-      policyUpdateConfirmationRequest: undefined,
-    });
-  });
-
-  it('should return policy directory if integrity matches', async () => {
-    // Set up policies directory with a file
-    fs.mkdirSync(policiesDir, { recursive: true });
-    fs.writeFileSync(path.join(policiesDir, 'policy.toml'), 'rules = []');
-
-    // First call to establish integrity (interactive accept)
-    const firstResult = await resolveWorkspacePolicyState({
-      cwd: workspaceDir,
-      trustedFolder: true,
-      interactive: true,
-    });
-    expect(firstResult.policyUpdateConfirmationRequest).toBeDefined();
-
-    // Establish integrity manually as if accepted
-    const { PolicyIntegrityManager } = await import('@google/gemini-cli-core');
-    const integrityManager = new PolicyIntegrityManager();
-    await integrityManager.acceptIntegrity(
-      'workspace',
-      workspaceDir,
-      firstResult.policyUpdateConfirmationRequest!.newHash,
-    );
-
-    // Second call should match
-    const result = await resolveWorkspacePolicyState({
-      cwd: workspaceDir,
-      trustedFolder: true,
-      interactive: true,
-    });
-
-    expect(result.workspacePoliciesDir).toBe(policiesDir);
-    expect(result.policyUpdateConfirmationRequest).toBeUndefined();
-  });
-
-  it('should return undefined if integrity is NEW but fileCount is 0', async () => {
-    const result = await resolveWorkspacePolicyState({
-      cwd: workspaceDir,
-      trustedFolder: true,
-      interactive: true,
-    });
-
-    expect(result.workspacePoliciesDir).toBeUndefined();
-    expect(result.policyUpdateConfirmationRequest).toBeUndefined();
-  });
-
-  it('should return confirmation request if changed in interactive mode', async () => {
-    fs.mkdirSync(policiesDir, { recursive: true });
-    fs.writeFileSync(path.join(policiesDir, 'policy.toml'), 'rules = []');
-
-    const result = await resolveWorkspacePolicyState({
-      cwd: workspaceDir,
-      trustedFolder: true,
-      interactive: true,
-    });
-
-    expect(result.workspacePoliciesDir).toBeUndefined();
-    expect(result.policyUpdateConfirmationRequest).toEqual({
-      scope: 'workspace',
-      identifier: workspaceDir,
-      policyDir: policiesDir,
-      newHash: expect.any(String),
-    });
-  });
-
-  it('should warn and auto-accept if changed in non-interactive mode', async () => {
-    fs.mkdirSync(policiesDir, { recursive: true });
-    fs.writeFileSync(path.join(policiesDir, 'policy.toml'), 'rules = []');
-
-    const result = await resolveWorkspacePolicyState({
-      cwd: workspaceDir,
-      trustedFolder: true,
-      interactive: false,
-    });
-
-    expect(result.workspacePoliciesDir).toBe(policiesDir);
-    expect(result.policyUpdateConfirmationRequest).toBeUndefined();
-    expect(writeToStderr).toHaveBeenCalledWith(
-      expect.stringContaining('Automatically accepting and loading'),
-    );
-  });
-});

packages/cli/src/config/policy.ts

@@ -12,18 +12,12 @@ import {
   type PolicySettings,
   createPolicyEngineConfig as createCorePolicyEngineConfig,
   createPolicyUpdater as createCorePolicyUpdater,
-  PolicyIntegrityManager,
-  IntegrityStatus,
-  Storage,
-  type PolicyUpdateConfirmationRequest,
-  writeToStderr,
 } from '@google/gemini-cli-core';
 import { type Settings } from './settings.js';
 
 export async function createPolicyEngineConfig(
   settings: Settings,
   approvalMode: ApprovalMode,
-  workspacePoliciesDir?: string,
 ): Promise<PolicyEngineConfig> {
   // Explicitly construct PolicySettings from Settings to ensure type safety
   // and avoid accidental leakage of other settings properties.
@@ -32,7 +26,6 @@ export async function createPolicyEngineConfig(
     tools: settings.tools,
     mcpServers: settings.mcpServers,
     policyPaths: settings.policyPaths,
-    workspacePoliciesDir,
   };
 
   return createCorePolicyEngineConfig(policySettings, approvalMode);
@@ -44,68 +37,3 @@ export function createPolicyUpdater(
 ) {
   return createCorePolicyUpdater(policyEngine, messageBus);
 }
-
-export interface WorkspacePolicyState {
-  workspacePoliciesDir?: string;
-  policyUpdateConfirmationRequest?: PolicyUpdateConfirmationRequest;
-}
-
-/**
- * Resolves the workspace policy state by checking folder trust and policy integrity.
- */
-export async function resolveWorkspacePolicyState(options: {
-  cwd: string;
-  trustedFolder: boolean;
-  interactive: boolean;
-}): Promise<WorkspacePolicyState> {
-  const { cwd, trustedFolder, interactive } = options;
-
-  let workspacePoliciesDir: string | undefined;
-  let policyUpdateConfirmationRequest:
-    | PolicyUpdateConfirmationRequest
-    | undefined;
-
-  if (trustedFolder) {
-    const potentialWorkspacePoliciesDir = new Storage(
-      cwd,
-    ).getWorkspacePoliciesDir();
-    const integrityManager = new PolicyIntegrityManager();
-    const integrityResult = await integrityManager.checkIntegrity(
-      'workspace',
-      cwd,
-      potentialWorkspacePoliciesDir,
-    );
-
-    if (integrityResult.status === IntegrityStatus.MATCH) {
-      workspacePoliciesDir = potentialWorkspacePoliciesDir;
-    } else if (
-      integrityResult.status === IntegrityStatus.NEW &&
-      integrityResult.fileCount === 0
-    ) {
-      // No workspace policies found
-      workspacePoliciesDir = undefined;
-    } else if (interactive) {
-      // Policies changed or are new, and we are in interactive mode
-      policyUpdateConfirmationRequest = {
-        scope: 'workspace',
-        identifier: cwd,
-        policyDir: potentialWorkspacePoliciesDir,
-        newHash: integrityResult.hash,
-      };
-    } else {
-      // Non-interactive mode: warn and automatically accept/load
-      await integrityManager.acceptIntegrity(
-        'workspace',
-        cwd,
-        integrityResult.hash,
-      );
-      workspacePoliciesDir = potentialWorkspacePoliciesDir;
-      // debugLogger.warn here doesn't show up in the terminal. It is showing up only in debug mode on the debug console
-      writeToStderr(
-        'WARNING: Workspace policies changed or are new. Automatically accepting and loading them in non-interactive mode.\n',
-      );
-    }
-  }
-
-  return { workspacePoliciesDir, policyUpdateConfirmationRequest };
-}

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

@@ -2032,85 +2032,6 @@ describe('Settings Loading and Merging', () => {
           }),
         }),
       );
-
-      // Check that enableLoadingPhrases: false was further migrated to loadingPhrases: 'off'
-      expect(setValueSpy).toHaveBeenCalledWith(
-        SettingScope.User,
-        'ui',
-        expect.objectContaining({
-          loadingPhrases: 'off',
-        }),
-      );
-    });
-
-    it('should migrate enableLoadingPhrases: false to loadingPhrases: off', () => {
-      const userSettingsContent = {
-        ui: {
-          accessibility: {
-            enableLoadingPhrases: false,
-          },
-        },
-      };
-
-      const loadedSettings = createMockSettings(userSettingsContent);
-      const setValueSpy = vi.spyOn(loadedSettings, 'setValue');
-
-      migrateDeprecatedSettings(loadedSettings);
-
-      expect(setValueSpy).toHaveBeenCalledWith(
-        SettingScope.User,
-        'ui',
-        expect.objectContaining({
-          loadingPhrases: 'off',
-        }),
-      );
-    });
-
-    it('should not migrate enableLoadingPhrases: true to loadingPhrases', () => {
-      const userSettingsContent = {
-        ui: {
-          accessibility: {
-            enableLoadingPhrases: true,
-          },
-        },
-      };
-
-      const loadedSettings = createMockSettings(userSettingsContent);
-      const setValueSpy = vi.spyOn(loadedSettings, 'setValue');
-
-      migrateDeprecatedSettings(loadedSettings);
-
-      // Should not set loadingPhrases when enableLoadingPhrases is true
-      const uiCalls = setValueSpy.mock.calls.filter((call) => call[1] === 'ui');
-      for (const call of uiCalls) {
-        const uiValue = call[2] as Record<string, unknown>;
-        expect(uiValue).not.toHaveProperty('loadingPhrases');
-      }
-    });
-
-    it('should not overwrite existing loadingPhrases during migration', () => {
-      const userSettingsContent = {
-        ui: {
-          loadingPhrases: 'witty',
-          accessibility: {
-            enableLoadingPhrases: false,
-          },
-        },
-      };
-
-      const loadedSettings = createMockSettings(userSettingsContent);
-      const setValueSpy = vi.spyOn(loadedSettings, 'setValue');
-
-      migrateDeprecatedSettings(loadedSettings);
-
-      // Should not overwrite existing loadingPhrases
-      const uiCalls = setValueSpy.mock.calls.filter((call) => call[1] === 'ui');
-      for (const call of uiCalls) {
-        const uiValue = call[2] as Record<string, unknown>;
-        if (uiValue['loadingPhrases'] !== undefined) {
-          expect(uiValue['loadingPhrases']).toBe('witty');
-        }
-      }
     });
 
     it('should prioritize new settings over deprecated ones and respect removeDeprecated flag', () => {

packages/cli/src/config/settings.ts

@@ -165,10 +165,7 @@ export interface SummarizeToolOutputSettings {
   tokenBudget?: number;
 }
 
-export type LoadingPhrasesMode = 'tips' | 'witty' | 'all' | 'off';
-
 export interface AccessibilitySettings {
-  /** @deprecated Use ui.loadingPhrases instead. */
   enableLoadingPhrases?: boolean;
   screenReader?: boolean;
 }
@@ -931,22 +928,6 @@ export function migrateDeprecatedSettings(
             anyModified = true;
           }
         }
-
-        // Migrate enableLoadingPhrases: false → loadingPhrases: 'off'
-        const enableLP = newAccessibility['enableLoadingPhrases'];
-        if (
-          typeof enableLP === 'boolean' &&
-          newUi['loadingPhrases'] === undefined
-        ) {
-          if (!enableLP) {
-            newUi['loadingPhrases'] = 'off';
-            loadedSettings.setValue(scope, 'ui', newUi);
-            if (!settingsFile.readOnly) {
-              anyModified = true;
-            }
-          }
-          foundDeprecated.push('ui.accessibility.enableLoadingPhrases');
-        }
       }
     }
 

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

@@ -83,19 +83,6 @@ describe('SettingsSchema', () => {
       ).toBe('boolean');
     });
 
-    it('should have loadingPhrases enum property', () => {
-      const definition = getSettingsSchema().ui?.properties?.loadingPhrases;
-      expect(definition).toBeDefined();
-      expect(definition?.type).toBe('enum');
-      expect(definition?.default).toBe('tips');
-      expect(definition?.options?.map((o) => o.value)).toEqual([
-        'tips',
-        'witty',
-        'all',
-        'off',
-      ]);
-    });
-
     it('should have checkpointing nested properties', () => {
       expect(
         getSettingsSchema().general?.properties?.checkpointing.properties
@@ -107,16 +94,6 @@ describe('SettingsSchema', () => {
       ).toBe('boolean');
     });
 
-    it('should have plan nested properties', () => {
-      expect(
-        getSettingsSchema().general?.properties?.plan?.properties?.directory,
-      ).toBeDefined();
-      expect(
-        getSettingsSchema().general?.properties?.plan?.properties?.directory
-          .type,
-      ).toBe('string');
-    });
-
     it('should have fileFiltering nested properties', () => {
       expect(
         getSettingsSchema().context.properties.fileFiltering.properties
@@ -376,17 +353,6 @@ describe('SettingsSchema', () => {
       ).toBe('Show the "? for shortcuts" hint above the input.');
     });
 
-    it('should have enableNotifications setting in schema', () => {
-      const setting =
-        getSettingsSchema().general.properties.enableNotifications;
-      expect(setting).toBeDefined();
-      expect(setting.type).toBe('boolean');
-      expect(setting.category).toBe('General');
-      expect(setting.default).toBe(false);
-      expect(setting.requiresRestart).toBe(false);
-      expect(setting.showInDialog).toBe(true);
-    });
-
     it('should have enableAgents setting in schema', () => {
       const setting = getSettingsSchema().experimental.properties.enableAgents;
       expect(setting).toBeDefined();

packages/cli/src/config/settingsSchema.ts

@@ -236,16 +236,6 @@ const SETTINGS_SCHEMA = {
         description: 'Enable update notification prompts.',
         showInDialog: false,
       },
-      enableNotifications: {
-        type: 'boolean',
-        label: 'Enable Notifications',
-        category: 'General',
-        requiresRestart: false,
-        default: false,
-        description:
-          'Enable run-event notifications for action-required prompts and session completion. Currently macOS only.',
-        showInDialog: true,
-      },
       checkpointing: {
         type: 'object',
         label: 'Checkpointing',
@@ -266,27 +256,6 @@ const SETTINGS_SCHEMA = {
           },
         },
       },
-      plan: {
-        type: 'object',
-        label: 'Plan',
-        category: 'General',
-        requiresRestart: true,
-        default: {},
-        description: 'Planning features configuration.',
-        showInDialog: false,
-        properties: {
-          directory: {
-            type: 'string',
-            label: 'Plan Directory',
-            category: 'General',
-            requiresRestart: true,
-            default: undefined as string | undefined,
-            description:
-              'The directory where planning artifacts are stored. If not specified, defaults to the system temporary directory.',
-            showInDialog: true,
-          },
-        },
-      },
       enablePromptCompletion: {
         type: 'boolean',
         label: 'Enable Prompt Completion',
@@ -506,15 +475,6 @@ const SETTINGS_SCHEMA = {
           'Show a warning when running Gemini CLI in the home directory.',
         showInDialog: true,
       },
-      showCompatibilityWarnings: {
-        type: 'boolean',
-        label: 'Show Compatibility Warnings',
-        category: 'UI',
-        requiresRestart: true,
-        default: true,
-        description: 'Show warnings about terminal or OS compatibility issues.',
-        showInDialog: true,
-      },
       hideTips: {
         type: 'boolean',
         label: 'Hide Tips',
@@ -693,22 +653,6 @@ const SETTINGS_SCHEMA = {
         description: 'Show the spinner during operations.',
         showInDialog: true,
       },
-      loadingPhrases: {
-        type: 'enum',
-        label: 'Loading Phrases',
-        category: 'UI',
-        requiresRestart: false,
-        default: 'tips',
-        description:
-          'What to show while the model is working: tips, witty comments, both, or nothing.',
-        showInDialog: true,
-        options: [
-          { value: 'tips', label: 'Tips' },
-          { value: 'witty', label: 'Witty' },
-          { value: 'all', label: 'All' },
-          { value: 'off', label: 'Off' },
-        ],
-      },
       customWittyPhrases: {
         type: 'array',
         label: 'Custom Witty Phrases',
@@ -737,9 +681,8 @@ const SETTINGS_SCHEMA = {
             category: 'UI',
             requiresRestart: true,
             default: true,
-            description:
-              '@deprecated Use ui.loadingPhrases instead. Enable loading phrases during operations.',
-            showInDialog: false,
+            description: 'Enable loading phrases during operations.',
+            showInDialog: true,
           },
           screenReader: {
             type: 'boolean',
@@ -1334,7 +1277,6 @@ const SETTINGS_SCHEMA = {
       },
     },
   },
-
   useWriteTodos: {
     type: 'boolean',
     label: 'Use WriteTodos',
@@ -1671,17 +1613,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: false,
         default: false,
         description:
-          'Use OSC 52 for pasting. This may be more robust than the default system when using remote terminal sessions (if your terminal is configured to allow it).',
-        showInDialog: true,
-      },
-      useOSC52Copy: {
-        type: 'boolean',
-        label: 'Use OSC 52 Copy',
-        category: 'Experimental',
-        requiresRestart: false,
-        default: false,
-        description:
-          'Use OSC 52 for copying. This may be more robust than the default system when using remote terminal sessions (if your terminal is configured to allow it).',
+          'Use OSC 52 sequence for pasting instead of clipboardy (useful for remote sessions).',
         showInDialog: true,
       },
       plan: {
@@ -1693,16 +1625,6 @@ const SETTINGS_SCHEMA = {
         description: 'Enable planning features (Plan Mode and tools).',
         showInDialog: true,
       },
-      modelSteering: {
-        type: 'boolean',
-        label: 'Model Steering',
-        category: 'Experimental',
-        requiresRestart: false,
-        default: false,
-        description:
-          'Enable model steering (user hints) to guide the model during tool execution.',
-        showInDialog: true,
-      },
     },
   },
 

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

@@ -491,33 +491,25 @@ describe('Trusted Folders', () => {
     });
   });
 
-  const itif = (condition: boolean) => (condition ? it : it.skip);
-
   describe('Symlinks Support', () => {
     const mockSettings: Settings = {
       security: { folderTrust: { enabled: true } },
     };
 
-    // TODO: issue 19387 - Enable symlink tests on Windows
-    itif(process.platform !== 'win32')(
-      'should trust a folder if the rule matches the realpath',
-      () => {
-        // Create a real directory and a symlink
-        const realDir = path.join(tempDir, 'real');
-        const symlinkDir = path.join(tempDir, 'symlink');
-        fs.mkdirSync(realDir);
-        fs.symlinkSync(realDir, symlinkDir);
+    it('should trust a folder if the rule matches the realpath', () => {
+      // Create a real directory and a symlink
+      const realDir = path.join(tempDir, 'real');
+      const symlinkDir = path.join(tempDir, 'symlink');
+      fs.mkdirSync(realDir);
+      fs.symlinkSync(realDir, symlinkDir);
 
-        // Rule uses realpath
-        const config = { [realDir]: TrustLevel.TRUST_FOLDER };
-        fs.writeFileSync(trustedFoldersPath, JSON.stringify(config), 'utf-8');
+      // Rule uses realpath
+      const config = { [realDir]: TrustLevel.TRUST_FOLDER };
+      fs.writeFileSync(trustedFoldersPath, JSON.stringify(config), 'utf-8');
 
-        // Check against symlink path
-        expect(isWorkspaceTrusted(mockSettings, symlinkDir).isTrusted).toBe(
-          true,
-        );
-      },
-    );
+      // Check against symlink path
+      expect(isWorkspaceTrusted(mockSettings, symlinkDir).isTrusted).toBe(true);
+    });
   });
 
   describe('Verification: Auth and Trust Interaction', () => {

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

@@ -1,239 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import * as path from 'node:path';
-import { loadCliConfig, type CliArgs } from './config.js';
-import { createTestMergedSettings } from './settings.js';
-import * as ServerConfig from '@google/gemini-cli-core';
-import { isWorkspaceTrusted } from './trustedFolders.js';
-
-// Mock dependencies
-vi.mock('./trustedFolders.js', () => ({
-  isWorkspaceTrusted: vi.fn(),
-}));
-
-const mockCheckIntegrity = vi.fn();
-const mockAcceptIntegrity = vi.fn();
-
-vi.mock('@google/gemini-cli-core', async () => {
-  const actual = await vi.importActual<typeof ServerConfig>(
-    '@google/gemini-cli-core',
-  );
-  return {
-    ...actual,
-    loadServerHierarchicalMemory: vi.fn().mockResolvedValue({
-      memoryContent: '',
-      fileCount: 0,
-      filePaths: [],
-    }),
-    createPolicyEngineConfig: vi.fn().mockResolvedValue({
-      rules: [],
-      checkers: [],
-    }),
-    getVersion: vi.fn().mockResolvedValue('test-version'),
-    PolicyIntegrityManager: vi.fn().mockImplementation(() => ({
-      checkIntegrity: mockCheckIntegrity,
-      acceptIntegrity: mockAcceptIntegrity,
-    })),
-    IntegrityStatus: { MATCH: 'match', NEW: 'new', MISMATCH: 'mismatch' },
-    debugLogger: {
-      warn: vi.fn(),
-      error: vi.fn(),
-    },
-    isHeadlessMode: vi.fn().mockReturnValue(false), // Default to interactive
-  };
-});
-
-describe('Workspace-Level Policy CLI Integration', () => {
-  const MOCK_CWD = process.cwd();
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-    // Default to MATCH for existing tests
-    mockCheckIntegrity.mockResolvedValue({
-      status: 'match',
-      hash: 'test-hash',
-      fileCount: 1,
-    });
-    vi.mocked(ServerConfig.isHeadlessMode).mockReturnValue(false);
-  });
-
-  it('should have getWorkspacePoliciesDir on Storage class', () => {
-    const storage = new ServerConfig.Storage(MOCK_CWD);
-    expect(storage.getWorkspacePoliciesDir).toBeDefined();
-    expect(typeof storage.getWorkspacePoliciesDir).toBe('function');
-  });
-
-  it('should pass workspacePoliciesDir to createPolicyEngineConfig when folder is trusted', async () => {
-    vi.mocked(isWorkspaceTrusted).mockReturnValue({
-      isTrusted: true,
-      source: 'file',
-    });
-
-    const settings = createTestMergedSettings();
-    const argv = { query: 'test' } as unknown as CliArgs;
-
-    await loadCliConfig(settings, 'test-session', argv, { cwd: MOCK_CWD });
-
-    expect(ServerConfig.createPolicyEngineConfig).toHaveBeenCalledWith(
-      expect.objectContaining({
-        workspacePoliciesDir: expect.stringContaining(
-          path.join('.gemini', 'policies'),
-        ),
-      }),
-      expect.anything(),
-    );
-  });
-
-  it('should NOT pass workspacePoliciesDir to createPolicyEngineConfig when folder is NOT trusted', async () => {
-    vi.mocked(isWorkspaceTrusted).mockReturnValue({
-      isTrusted: false,
-      source: 'file',
-    });
-
-    const settings = createTestMergedSettings();
-    const argv = { query: 'test' } as unknown as CliArgs;
-
-    await loadCliConfig(settings, 'test-session', argv, { cwd: MOCK_CWD });
-
-    expect(ServerConfig.createPolicyEngineConfig).toHaveBeenCalledWith(
-      expect.objectContaining({
-        workspacePoliciesDir: undefined,
-      }),
-      expect.anything(),
-    );
-  });
-
-  it('should NOT pass workspacePoliciesDir if integrity is NEW but fileCount is 0', async () => {
-    vi.mocked(isWorkspaceTrusted).mockReturnValue({
-      isTrusted: true,
-      source: 'file',
-    });
-    mockCheckIntegrity.mockResolvedValue({
-      status: 'new',
-      hash: 'hash',
-      fileCount: 0,
-    });
-
-    const settings = createTestMergedSettings();
-    const argv = { query: 'test' } as unknown as CliArgs;
-
-    await loadCliConfig(settings, 'test-session', argv, { cwd: MOCK_CWD });
-
-    expect(ServerConfig.createPolicyEngineConfig).toHaveBeenCalledWith(
-      expect.objectContaining({
-        workspacePoliciesDir: undefined,
-      }),
-      expect.anything(),
-    );
-  });
-
-  it('should automatically accept and load workspacePoliciesDir if integrity MISMATCH in non-interactive mode', async () => {
-    vi.mocked(isWorkspaceTrusted).mockReturnValue({
-      isTrusted: true,
-      source: 'file',
-    });
-    mockCheckIntegrity.mockResolvedValue({
-      status: 'mismatch',
-      hash: 'new-hash',
-      fileCount: 1,
-    });
-    vi.mocked(ServerConfig.isHeadlessMode).mockReturnValue(true); // Non-interactive
-
-    const settings = createTestMergedSettings();
-    const argv = { prompt: 'do something' } as unknown as CliArgs;
-
-    await loadCliConfig(settings, 'test-session', argv, { cwd: MOCK_CWD });
-
-    expect(mockAcceptIntegrity).toHaveBeenCalledWith(
-      'workspace',
-      MOCK_CWD,
-      'new-hash',
-    );
-    expect(ServerConfig.createPolicyEngineConfig).toHaveBeenCalledWith(
-      expect.objectContaining({
-        workspacePoliciesDir: expect.stringContaining(
-          path.join('.gemini', 'policies'),
-        ),
-      }),
-      expect.anything(),
-    );
-  });
-
-  it('should set policyUpdateConfirmationRequest if integrity MISMATCH in interactive mode', async () => {
-    vi.mocked(isWorkspaceTrusted).mockReturnValue({
-      isTrusted: true,
-      source: 'file',
-    });
-    mockCheckIntegrity.mockResolvedValue({
-      status: 'mismatch',
-      hash: 'new-hash',
-      fileCount: 1,
-    });
-    vi.mocked(ServerConfig.isHeadlessMode).mockReturnValue(false); // Interactive
-
-    const settings = createTestMergedSettings();
-    const argv = {
-      query: 'test',
-      promptInteractive: 'test',
-    } as unknown as CliArgs;
-
-    const config = await loadCliConfig(settings, 'test-session', argv, {
-      cwd: MOCK_CWD,
-    });
-
-    expect(config.getPolicyUpdateConfirmationRequest()).toEqual({
-      scope: 'workspace',
-      identifier: MOCK_CWD,
-      policyDir: expect.stringContaining(path.join('.gemini', 'policies')),
-      newHash: 'new-hash',
-    });
-    // In interactive mode without accept flag, it waits for user confirmation (handled by UI),
-    // so it currently DOES NOT pass the directory to createPolicyEngineConfig yet.
-    // The UI will handle the confirmation and reload/update.
-    expect(ServerConfig.createPolicyEngineConfig).toHaveBeenCalledWith(
-      expect.objectContaining({
-        workspacePoliciesDir: undefined,
-      }),
-      expect.anything(),
-    );
-  });
-
-  it('should set policyUpdateConfirmationRequest if integrity is NEW with files (first time seen) in interactive mode', async () => {
-    vi.mocked(isWorkspaceTrusted).mockReturnValue({
-      isTrusted: true,
-      source: 'file',
-    });
-    mockCheckIntegrity.mockResolvedValue({
-      status: 'new',
-      hash: 'new-hash',
-      fileCount: 5,
-    });
-    vi.mocked(ServerConfig.isHeadlessMode).mockReturnValue(false); // Interactive
-
-    const settings = createTestMergedSettings();
-    const argv = { query: 'test' } as unknown as CliArgs;
-
-    const config = await loadCliConfig(settings, 'test-session', argv, {
-      cwd: MOCK_CWD,
-    });
-
-    expect(config.getPolicyUpdateConfirmationRequest()).toEqual({
-      scope: 'workspace',
-      identifier: MOCK_CWD,
-      policyDir: expect.stringContaining(path.join('.gemini', 'policies')),
-      newHash: 'new-hash',
-    });
-
-    expect(ServerConfig.createPolicyEngineConfig).toHaveBeenCalledWith(
-      expect.objectContaining({
-        workspacePoliciesDir: undefined,
-      }),
-      expect.anything(),
-    );
-  });
-});

packages/cli/src/gemini.test.tsx

@@ -56,20 +56,6 @@ vi.mock('./nonInteractiveCli.js', () => ({
   runNonInteractive: runNonInteractiveSpy,
 }));
 
-const terminalNotificationMocks = vi.hoisted(() => ({
-  notifyViaTerminal: vi.fn().mockResolvedValue(true),
-  buildRunEventNotificationContent: vi.fn(() => ({
-    title: 'Session complete',
-    body: 'done',
-    subtitle: 'Run finished',
-  })),
-}));
-vi.mock('./utils/terminalNotifications.js', () => ({
-  notifyViaTerminal: terminalNotificationMocks.notifyViaTerminal,
-  buildRunEventNotificationContent:
-    terminalNotificationMocks.buildRunEventNotificationContent,
-}));
-
 vi.mock('@google/gemini-cli-core', async (importOriginal) => {
   const actual =
     await importOriginal<typeof import('@google/gemini-cli-core')>();
@@ -746,8 +732,9 @@ describe('gemini.tsx main function kitty protocol', () => {
   });
 
   it.skip('should log error when cleanupExpiredSessions fails', async () => {
-    const { cleanupExpiredSessions } =
-      await import('./utils/sessionCleanup.js');
+    const { cleanupExpiredSessions } = await import(
+      './utils/sessionCleanup.js'
+    );
     vi.mocked(cleanupExpiredSessions).mockRejectedValue(
       new Error('Cleanup failed'),
     );
@@ -850,10 +837,6 @@ describe('gemini.tsx main function kitty protocol', () => {
     expect(runNonInteractive).toHaveBeenCalled();
     const callArgs = vi.mocked(runNonInteractive).mock.calls[0][0];
     expect(callArgs.input).toBe('stdin-data\n\ntest-question');
-    expect(
-      terminalNotificationMocks.buildRunEventNotificationContent,
-    ).not.toHaveBeenCalled();
-    expect(terminalNotificationMocks.notifyViaTerminal).not.toHaveBeenCalled();
     expect(processExitSpy).toHaveBeenCalledWith(0);
     processExitSpy.mockRestore();
   });

packages/cli/src/gemini.tsx

@@ -568,14 +568,10 @@ export async function main() {
     adminControlsListner.setConfig(config);
 
     if (config.isInteractive() && settings.merged.general.devtools) {
-      const { setupInitialActivityLogger, stopDevTools } =
-        await import('./utils/devtoolsService.js');
-      const { ActivityLogger } = await import('./utils/activityLogger.js');
+      const { setupInitialActivityLogger } = await import(
+        './utils/devtoolsService.js'
+      );
       await setupInitialActivityLogger(config);
-      registerCleanup(async () => {
-        await stopDevTools();
-        ActivityLogger.getInstance().dispose();
-      });
     }
 
     // Register config for telemetry shutdown

packages/cli/src/gemini_cleanup.test.tsx

@@ -9,6 +9,14 @@ import { main } from './gemini.js';
 import { debugLogger } from '@google/gemini-cli-core';
 import { type Config } from '@google/gemini-cli-core';
 
+// Custom error to identify mock process.exit calls
+class MockProcessExitError extends Error {
+  constructor(readonly code?: string | number | null | undefined) {
+    super('PROCESS_EXIT_MOCKED');
+    this.name = 'MockProcessExitError';
+  }
+}
+
 vi.mock('@google/gemini-cli-core', async (importOriginal) => {
   const actual =
     await importOriginal<typeof import('@google/gemini-cli-core')>();
@@ -116,39 +124,10 @@ vi.mock('./validateNonInterActiveAuth.js', () => ({
   validateNonInteractiveAuth: vi.fn().mockResolvedValue({}),
 }));
 
-vi.mock('./core/initializer.js', () => ({
-  initializeApp: vi.fn().mockResolvedValue({
-    authError: null,
-    themeError: null,
-    shouldOpenAuthDialog: false,
-    geminiMdFileCount: 0,
-  }),
-}));
-
 vi.mock('./nonInteractiveCli.js', () => ({
   runNonInteractive: vi.fn().mockResolvedValue(undefined),
 }));
 
-vi.mock('./utils/cleanup.js', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('./utils/cleanup.js')>();
-  return {
-    ...actual,
-    cleanupCheckpoints: vi.fn().mockResolvedValue(undefined),
-    registerCleanup: vi.fn(),
-    registerSyncCleanup: vi.fn(),
-    registerTelemetryConfig: vi.fn(),
-    runExitCleanup: vi.fn().mockResolvedValue(undefined),
-  };
-});
-
-vi.mock('./zed-integration/zedIntegration.js', () => ({
-  runZedIntegration: vi.fn().mockResolvedValue(undefined),
-}));
-
-vi.mock('./utils/readStdin.js', () => ({
-  readStdin: vi.fn().mockResolvedValue(''),
-}));
-
 const { cleanupMockState } = vi.hoisted(() => ({
   cleanupMockState: { shouldThrow: false, called: false },
 }));
@@ -180,8 +159,9 @@ describe('gemini.tsx main function cleanup', () => {
   });
 
   it('should log error when cleanupExpiredSessions fails', async () => {
-    const { loadCliConfig, parseArguments } =
-      await import('./config/config.js');
+    const { loadCliConfig, parseArguments } = await import(
+      './config/config.js'
+    );
     const { loadSettings } = await import('./config/settings.js');
     cleanupMockState.shouldThrow = true;
     cleanupMockState.called = false;
@@ -189,6 +169,12 @@ describe('gemini.tsx main function cleanup', () => {
     const debugLoggerErrorSpy = vi
       .spyOn(debugLogger, 'error')
       .mockImplementation(() => {});
+    const processExitSpy = vi
+      .spyOn(process, 'exit')
+      .mockImplementation((code) => {
+        throw new MockProcessExitError(code);
+      });
+
     vi.mocked(loadSettings).mockReturnValue({
       merged: { advanced: {}, security: { auth: {} }, ui: {} },
       workspace: { settings: {} },
@@ -215,7 +201,7 @@ describe('gemini.tsx main function cleanup', () => {
       getMcpServers: () => ({}),
       getMcpClientManager: vi.fn(),
       getIdeMode: vi.fn(() => false),
-      getExperimentalZedIntegration: vi.fn(() => true),
+      getExperimentalZedIntegration: vi.fn(() => false),
       getScreenReader: vi.fn(() => false),
       getGeminiMdFileCount: vi.fn(() => 0),
       getProjectRoot: vi.fn(() => '/'),
@@ -238,12 +224,18 @@ describe('gemini.tsx main function cleanup', () => {
       getRemoteAdminSettings: vi.fn(() => undefined),
     } as any); // eslint-disable-line @typescript-eslint/no-explicit-any
 
-    await main();
+    try {
+      await main();
+    } catch (e) {
+      if (!(e instanceof MockProcessExitError)) throw e;
+    }
 
     expect(cleanupMockState.called).toBe(true);
     expect(debugLoggerErrorSpy).toHaveBeenCalledWith(
       'Failed to cleanup expired sessions:',
       expect.objectContaining({ message: 'Cleanup failed' }),
     );
+    expect(processExitSpy).toHaveBeenCalledWith(0); // Should not exit on cleanup failure
+    processExitSpy.mockRestore();
   });
 });

packages/cli/src/integration-tests/modelSteering.test.tsx

@@ -1,84 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, afterEach } from 'vitest';
-import { AppRig } from '../test-utils/AppRig.js';
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
-import { PolicyDecision } from '@google/gemini-cli-core';
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-
-describe('Model Steering Integration', () => {
-  let rig: AppRig | undefined;
-
-  afterEach(async () => {
-    await rig?.unmount();
-  });
-
-  it('should steer the model using a hint during a tool turn', async () => {
-    const fakeResponsesPath = path.join(
-      __dirname,
-      '../test-utils/fixtures/steering.responses',
-    );
-    rig = new AppRig({
-      fakeResponsesPath,
-      configOverrides: { modelSteering: true },
-    });
-    await rig.initialize();
-    rig.render();
-    await rig.waitForIdle();
-
-    rig.setToolPolicy('list_directory', PolicyDecision.ASK_USER);
-    rig.setToolPolicy('read_file', PolicyDecision.ASK_USER);
-
-    rig.setMockCommands([
-      {
-        command: /list_directory/,
-        result: {
-          output: 'file1.txt\nfile2.js\nfile3.md',
-          exitCode: 0,
-        },
-      },
-      {
-        command: /read_file file1.txt/,
-        result: {
-          output: 'This is file1.txt content.',
-          exitCode: 0,
-        },
-      },
-    ]);
-
-    // Start a long task
-    await rig.type('Start long task');
-    await rig.pressEnter();
-
-    // Wait for the model to call 'list_directory' (Confirming state)
-    await rig.waitForOutput('ReadFolder');
-
-    // Injected a hint while the model is in a tool turn
-    await rig.addUserHint('focus on .txt');
-
-    // Resolve list_directory (Proceed)
-    await rig.resolveTool('ReadFolder');
-
-    // Wait for the model to process the hint and output the next action
-    // Based on steering.responses, it should first acknowledge the hint
-    await rig.waitForOutput('ACK: I will focus on .txt files now.');
-
-    // Then it should proceed with the next action
-    await rig.waitForOutput(
-      /Since you want me to focus on .txt files,[\s\S]*I will read file1.txt/,
-    );
-    await rig.waitForOutput('ReadFile');
-
-    // Resolve read_file (Proceed)
-    await rig.resolveTool('ReadFile');
-
-    // Wait for final completion
-    await rig.waitForOutput('Task complete.');
-  });
-});

packages/cli/src/nonInteractiveCli.test.ts

@@ -212,8 +212,9 @@ describe('runNonInteractive', () => {
       computeMergedSettings: vi.fn(),
     } as unknown as LoadedSettings;
 
-    const { handleAtCommand } =
-      await import('./ui/hooks/atCommandProcessor.js');
+    const { handleAtCommand } = await import(
+      './ui/hooks/atCommandProcessor.js'
+    );
     vi.mocked(handleAtCommand).mockImplementation(async ({ query }) => ({
       processedQuery: [{ text: query }],
     }));
@@ -635,8 +636,9 @@ describe('runNonInteractive', () => {
 
   it('should preprocess @include commands before sending to the model', async () => {
     // 1. Mock the imported atCommandProcessor
-    const { handleAtCommand } =
-      await import('./ui/hooks/atCommandProcessor.js');
+    const { handleAtCommand } = await import(
+      './ui/hooks/atCommandProcessor.js'
+    );
     const mockHandleAtCommand = vi.mocked(handleAtCommand);
 
     // 2. Define the raw input and the expected processed output
@@ -993,8 +995,9 @@ describe('runNonInteractive', () => {
   });
 
   it('should handle slash commands', async () => {
-    const nonInteractiveCliCommands =
-      await import('./nonInteractiveCliCommands.js');
+    const nonInteractiveCliCommands = await import(
+      './nonInteractiveCliCommands.js'
+    );
     const handleSlashCommandSpy = vi.spyOn(
       nonInteractiveCliCommands,
       'handleSlashCommand',
@@ -1273,11 +1276,13 @@ describe('runNonInteractive', () => {
 
   it('should instantiate CommandService with correct loaders for slash commands', async () => {
     // This test indirectly checks that handleSlashCommand is using the right loaders.
-    const { FileCommandLoader } =
-      await import('./services/FileCommandLoader.js');
+    const { FileCommandLoader } = await import(
+      './services/FileCommandLoader.js'
+    );
     const { McpPromptLoader } = await import('./services/McpPromptLoader.js');
-    const { BuiltinCommandLoader } =
-      await import('./services/BuiltinCommandLoader.js');
+    const { BuiltinCommandLoader } = await import(
+      './services/BuiltinCommandLoader.js'
+    );
     mockGetCommands.mockReturnValue([]); // No commands found, so it will fall through
     const events: ServerGeminiStreamEvent[] = [
       { type: GeminiEventType.Content, value: 'Acknowledged' },

packages/cli/src/nonInteractiveCli.ts

@@ -72,8 +72,9 @@ export async function runNonInteractive({
     });
 
     if (process.env['GEMINI_CLI_ACTIVITY_LOG_TARGET']) {
-      const { setupInitialActivityLogger } =
-        await import('./utils/devtoolsService.js');
+      const { setupInitialActivityLogger } = await import(
+        './utils/devtoolsService.js'
+      );
       await setupInitialActivityLogger(config);
     }
 

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

@@ -4,12 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, afterEach, expect } from 'vitest';
-import { act } from 'react';
+import { describe, it, afterEach } from 'vitest';
 import { AppRig } from './AppRig.js';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { debugLogger } from '@google/gemini-cli-core';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
@@ -20,47 +18,6 @@ describe('AppRig', () => {
     await rig?.unmount();
   });
 
-  it('should handle deterministic tool turns with breakpoints', async () => {
-    const fakeResponsesPath = path.join(
-      __dirname,
-      'fixtures',
-      'steering.responses',
-    );
-    rig = new AppRig({
-      fakeResponsesPath,
-      configOverrides: { modelSteering: true },
-    });
-    await rig.initialize();
-    rig.render();
-    await rig.waitForIdle();
-
-    // Set breakpoints on the canonical tool names
-    rig.setBreakpoint('list_directory');
-    rig.setBreakpoint('read_file');
-
-    // Start a task
-    debugLogger.log('[Test] Sending message: Start long task');
-    await rig.sendMessage('Start long task');
-
-    // Wait for the first breakpoint (list_directory)
-    const pending1 = await rig.waitForPendingConfirmation('list_directory');
-    expect(pending1.toolName).toBe('list_directory');
-
-    // Injected a hint
-    await rig.addUserHint('focus on .txt');
-
-    // Resolve and wait for the NEXT breakpoint (read_file)
-    // resolveTool will automatically remove the breakpoint policy for list_directory
-    await rig.resolveTool('list_directory');
-
-    const pending2 = await rig.waitForPendingConfirmation('read_file');
-    expect(pending2.toolName).toBe('read_file');
-
-    // Resolve and finish. Also removes read_file breakpoint.
-    await rig.resolveTool('read_file');
-    await rig.waitForOutput('Task complete.', 100000);
-  });
-
   it('should render the app and handle a simple message', async () => {
     const fakeResponsesPath = path.join(
       __dirname,
@@ -69,11 +26,7 @@ describe('AppRig', () => {
     );
     rig = new AppRig({ fakeResponsesPath });
     await rig.initialize();
-    await act(async () => {
-      rig!.render();
-      // Allow async initializations (like banners) to settle within the act boundary
-      await new Promise((resolve) => setTimeout(resolve, 0));
-    });
+    rig.render();
 
     // Wait for initial render
     await rig.waitForIdle();

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

@@ -42,8 +42,9 @@ import { AuthState } from '../ui/types.js';
 vi.mock('@google/gemini-cli-core', async (importOriginal) => {
   const original =
     await importOriginal<typeof import('@google/gemini-cli-core')>();
-  const { MockShellExecutionService: MockService } =
-    await import('./MockShellExecutionService.js');
+  const { MockShellExecutionService: MockService } = await import(
+    './MockShellExecutionService.js'
+  );
   // Register the real execution logic so MockShellExecutionService can fall back to it
   MockService.setOriginalImplementation(original.ShellExecutionService.execute);
 
@@ -73,20 +74,6 @@ class MockExtensionManager extends ExtensionLoader {
   setRequestSetting = vi.fn();
 }
 
-// Mock GeminiRespondingSpinner to disable animations (avoiding 'act()' warnings) without triggering screen reader mode.
-vi.mock('../ui/components/GeminiRespondingSpinner.js', async () => {
-  const React = await import('react');
-  const { Text } = await import('ink');
-  return {
-    GeminiSpinner: () => React.createElement(Text, null, '...'),
-    GeminiRespondingSpinner: ({
-      nonRespondingDisplay,
-    }: {
-      nonRespondingDisplay: string;
-    }) => React.createElement(Text, null, nonRespondingDisplay || '...'),
-  };
-});
-
 export interface AppRigOptions {
   fakeResponsesPath?: string;
   terminalWidth?: number;
@@ -462,11 +449,12 @@ export class AppRig {
     this.lastAwaitedConfirmation = undefined;
   }
 
-  async addUserHint(hint: string) {
+  async addUserHint(_hint: string) {
     if (!this.config) throw new Error('AppRig not initialized');
-    await act(async () => {
-      this.config!.userHintService.addUserHint(hint);
-    });
+    // TODO(joshualitt): Land hints.
+    // await act(async () => {
+    //   this.config!.addUserHint(hint);
+    // });
   }
 
   getConfig(): Config {
@@ -500,7 +488,7 @@ export class AppRig {
 
   get lastFrame() {
     if (!this.renderResult) return '';
-    return stripAnsi(this.renderResult.lastFrame({ allowEmpty: true }) || '');
+    return stripAnsi(this.renderResult.lastFrame() || '');
   }
 
   getStaticOutput() {

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

@@ -13,14 +13,14 @@ import { vi } from 'vitest';
 // The version of waitFor from vitest is still fine to use if you aren't waiting
 // for React state updates.
 export async function waitFor(
-  assertion: () => void | Promise<void>,
+  assertion: () => void,
   { timeout = 2000, interval = 50 } = {},
 ): Promise<void> {
   const startTime = Date.now();
 
   while (true) {
     try {
-      await assertion();
+      assertion();
       return;
     } catch (error) {
       if (Date.now() - startTime > timeout) {

packages/cli/src/test-utils/fixtures/steering.responses

@@ -1,4 +0,0 @@
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"role":"model","parts":[{"text":"Starting a long task. First, I'll list the files."},{"functionCall":{"name":"list_directory","args":{"dir_path":"."}}}]},"finishReason":"STOP"}]}]}
-{"method":"generateContent","response":{"candidates":[{"content":{"role":"model","parts":[{"text":"ACK: I will focus on .txt files now."}]},"finishReason":"STOP"}]}}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"role":"model","parts":[{"text":"I see the files. Since you want me to focus on .txt files, I will read file1.txt."},{"functionCall":{"name":"read_file","args":{"file_path":"file1.txt"}}}]},"finishReason":"STOP"}]}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"role":"model","parts":[{"text":"I have read file1.txt. Task complete."}]},"finishReason":"STOP"}]}]}

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

@@ -5,48 +5,36 @@
  */
 
 import { describe, it, expect, vi } from 'vitest';
-import { useState, useEffect, act } from 'react';
+import { useState, useEffect } from 'react';
 import { Text } from 'ink';
 import { renderHook, render } from './render.js';
 import { waitFor } from './async.js';
 
 describe('render', () => {
-  it('should render a component', async () => {
-    const { lastFrame, waitUntilReady, unmount } = render(
-      <Text>Hello World</Text>,
-    );
-    await waitUntilReady();
-    expect(lastFrame()).toBe('Hello World\n');
-    unmount();
+  it('should render a component', () => {
+    const { lastFrame } = render(<Text>Hello World</Text>);
+    expect(lastFrame()).toBe('Hello World');
   });
 
-  it('should support rerender', async () => {
-    const { lastFrame, rerender, waitUntilReady, unmount } = render(
-      <Text>Hello</Text>,
-    );
-    await waitUntilReady();
-    expect(lastFrame()).toBe('Hello\n');
+  it('should support rerender', () => {
+    const { lastFrame, rerender } = render(<Text>Hello</Text>);
+    expect(lastFrame()).toBe('Hello');
 
-    await act(async () => {
-      rerender(<Text>World</Text>);
-    });
-    await waitUntilReady();
-    expect(lastFrame()).toBe('World\n');
-    unmount();
+    rerender(<Text>World</Text>);
+    expect(lastFrame()).toBe('World');
   });
 
-  it('should support unmount', async () => {
-    const cleanupMock = vi.fn();
+  it('should support unmount', () => {
+    const cleanup = vi.fn();
     function TestComponent() {
-      useEffect(() => cleanupMock, []);
+      useEffect(() => cleanup, []);
       return <Text>Hello</Text>;
     }
 
-    const { unmount, waitUntilReady } = render(<TestComponent />);
-    await waitUntilReady();
+    const { unmount } = render(<TestComponent />);
     unmount();
 
-    expect(cleanupMock).toHaveBeenCalled();
+    expect(cleanup).toHaveBeenCalled();
   });
 });
 
@@ -60,74 +48,49 @@ describe('renderHook', () => {
       return { count, value };
     };
 
-    const { result, rerender, waitUntilReady, unmount } = renderHook(
-      useTestHook,
-      {
-        initialProps: { value: 1 },
-      },
-    );
-    await waitUntilReady();
+    const { result, rerender } = renderHook(useTestHook, {
+      initialProps: { value: 1 },
+    });
 
     expect(result.current.value).toBe(1);
     await waitFor(() => expect(result.current.count).toBe(1));
 
     // Rerender with new props
-    await act(async () => {
-      rerender({ value: 2 });
-    });
-    await waitUntilReady();
+    rerender({ value: 2 });
     expect(result.current.value).toBe(2);
     await waitFor(() => expect(result.current.count).toBe(2));
 
     // Rerender without arguments should use previous props (value: 2)
     // This would previously crash or pass undefined if not fixed
-    await act(async () => {
-      rerender();
-    });
-    await waitUntilReady();
+    rerender();
     expect(result.current.value).toBe(2);
     // Count should not increase because value didn't change
     await waitFor(() => expect(result.current.count).toBe(2));
-    unmount();
   });
 
-  it('should handle initial render without props', async () => {
+  it('should handle initial render without props', () => {
     const useTestHook = () => {
       const [count, setCount] = useState(0);
       return { count, increment: () => setCount((c) => c + 1) };
     };
 
-    const { result, rerender, waitUntilReady, unmount } =
-      renderHook(useTestHook);
-    await waitUntilReady();
+    const { result, rerender } = renderHook(useTestHook);
 
     expect(result.current.count).toBe(0);
 
-    await act(async () => {
-      rerender();
-    });
-    await waitUntilReady();
+    rerender();
     expect(result.current.count).toBe(0);
-    unmount();
   });
 
-  it('should update props if undefined is passed explicitly', async () => {
+  it('should update props if undefined is passed explicitly', () => {
     const useTestHook = (val: string | undefined) => val;
-    const { result, rerender, waitUntilReady, unmount } = renderHook(
-      useTestHook,
-      {
-        initialProps: 'initial' as string | undefined,
-      },
-    );
-    await waitUntilReady();
+    const { result, rerender } = renderHook(useTestHook, {
+      initialProps: 'initial',
+    });
 
     expect(result.current).toBe('initial');
 
-    await act(async () => {
-      rerender(undefined);
-    });
-    await waitUntilReady();
+    rerender(undefined);
     expect(result.current).toBeUndefined();
-    unmount();
   });
 });

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

@@ -4,13 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render as inkRenderDirect, type Instance as InkInstance } from 'ink';
-import { EventEmitter } from 'node:events';
+import { render as inkRender } from 'ink-testing-library';
 import { Box } from 'ink';
 import type React from 'react';
-import { Terminal } from '@xterm/headless';
 import { vi } from 'vitest';
-import stripAnsi from 'strip-ansi';
 import { act, useState } from 'react';
 import os from 'node:os';
 import { LoadedSettings } from '../config/settings.js';
@@ -43,15 +40,6 @@ import { pickDefaultThemeName } from '../ui/themes/theme.js';
 
 export const persistentStateMock = new FakePersistentState();
 
-if (process.env['NODE_ENV'] === 'test') {
-  // We mock NODE_ENV to development during tests that use render.tsx
-  // so that animations (which check process.env.NODE_ENV !== 'test')
-  // are actually tested. We mutate process.env directly here because
-  // vi.stubEnv() is cleared by vi.unstubAllEnvs() in test-setup.ts
-  // after each test.
-  process.env['NODE_ENV'] = 'development';
-}
-
 vi.mock('../utils/persistentState.js', () => ({
   persistentState: persistentStateMock,
 }));
@@ -62,347 +50,51 @@ vi.mock('../ui/utils/terminalUtils.js', () => ({
   isITerm2: vi.fn(() => false),
 }));
 
-type TerminalState = {
-  terminal: Terminal;
-  cols: number;
-  rows: number;
-};
-
-class XtermStdout extends EventEmitter {
-  private state: TerminalState;
-  private pendingWrites = 0;
-  private renderCount = 0;
-  private queue: { promise: Promise<void> };
-  isTTY = true;
-
-  private lastRenderOutput: string | undefined = undefined;
-
-  constructor(state: TerminalState, queue: { promise: Promise<void> }) {
-    super();
-    this.state = state;
-    this.queue = queue;
-  }
-
-  get columns() {
-    return this.state.terminal.cols;
-  }
-
-  get rows() {
-    return this.state.terminal.rows;
-  }
-
-  get frames(): string[] {
-    return [];
-  }
-
-  write = (data: string) => {
-    this.pendingWrites++;
-    this.queue.promise = this.queue.promise.then(async () => {
-      await new Promise<void>((resolve) =>
-        this.state.terminal.write(data, resolve),
-      );
-      this.pendingWrites--;
-    });
-  };
-
-  clear = () => {
-    this.state.terminal.reset();
-    this.lastRenderOutput = undefined;
-  };
-
-  dispose = () => {
-    this.state.terminal.dispose();
-  };
-
-  onRender = (staticContent: string, output: string) => {
-    this.renderCount++;
-    this.lastRenderOutput = output;
-    this.emit('render');
-  };
-
-  lastFrame = (options: { allowEmpty?: boolean } = {}) => {
-    const buffer = this.state.terminal.buffer.active;
-    const allLines: string[] = [];
-    for (let i = 0; i < buffer.length; i++) {
-      allLines.push(buffer.getLine(i)?.translateToString(true) ?? '');
-    }
-
-    const trimmed = [...allLines];
-    while (trimmed.length > 0 && trimmed[trimmed.length - 1] === '') {
-      trimmed.pop();
-    }
-    const result = trimmed.join('\n');
-
-    // Normalize for cross-platform snapshot stability:
-    // Normalize any \r\n to \n
-    const normalized = result.replace(/\r\n/g, '\n');
-
-    if (normalized === '' && !options.allowEmpty) {
-      throw new Error(
-        'lastFrame() returned an empty string. If this is intentional, use lastFrame({ allowEmpty: true }). ' +
-          'Otherwise, ensure you are calling await waitUntilReady() and that the component is rendering correctly.',
-      );
-    }
-    return normalized === '' ? normalized : normalized + '\n';
-  };
-
-  async waitUntilReady() {
-    const startRenderCount = this.renderCount;
-    if (!vi.isFakeTimers()) {
-      // Give Ink a chance to start its rendering loop
-      await new Promise((resolve) => setImmediate(resolve));
-    }
-    await act(async () => {
-      if (vi.isFakeTimers()) {
-        await vi.advanceTimersByTimeAsync(50);
-      } else {
-        // Wait for at least one render to be called if we haven't rendered yet or since start of this call,
-        // but don't wait forever as some renders might be synchronous or skipped.
-        if (this.renderCount === startRenderCount) {
-          const renderPromise = new Promise((resolve) =>
-            this.once('render', resolve),
-          );
-          const timeoutPromise = new Promise((resolve) =>
-            setTimeout(resolve, 50),
-          );
-          await Promise.race([renderPromise, timeoutPromise]);
-        }
-      }
-    });
-
-    let attempts = 0;
-    const maxAttempts = 50;
-
-    let lastCurrent = '';
-    let lastExpected = '';
-
-    while (attempts < maxAttempts) {
-      // Ensure all pending writes to the terminal are processed.
-      await this.queue.promise;
-
-      const currentFrame = stripAnsi(
-        this.lastFrame({ allowEmpty: true }),
-      ).trim();
-      const expectedFrame = stripAnsi(this.lastRenderOutput ?? '')
-        .trim()
-        .replace(/\r\n/g, '\n');
-
-      lastCurrent = currentFrame;
-      lastExpected = expectedFrame;
-
-      const isMatch = () => {
-        if (expectedFrame === '...') {
-          return currentFrame !== '';
-        }
-
-        // If both are empty, it's a match.
-        // We consider undefined lastRenderOutput as effectively empty for this check
-        // to support hook testing where Ink may skip rendering completely.
-        if (
-          (this.lastRenderOutput === undefined || expectedFrame === '') &&
-          currentFrame === ''
-        ) {
-          return true;
-        }
-
-        if (this.lastRenderOutput === undefined) {
-          return false;
-        }
-
-        // If Ink expects nothing but terminal has content, or vice-versa, it's NOT a match.
-        if (expectedFrame === '' || currentFrame === '') {
-          return false;
-        }
-
-        // Check if the current frame contains the expected content.
-        // We use includes because xterm might have some formatting or
-        // extra whitespace that Ink doesn't account for in its raw output metrics.
-        return currentFrame.includes(expectedFrame);
-      };
-
-      if (this.pendingWrites === 0 && isMatch()) {
-        return;
-      }
-
-      attempts++;
-      await act(async () => {
-        if (vi.isFakeTimers()) {
-          await vi.advanceTimersByTimeAsync(10);
-        } else {
-          await new Promise((resolve) => setTimeout(resolve, 10));
-        }
-      });
-    }
-
-    throw new Error(
-      `waitUntilReady() timed out after ${maxAttempts} attempts.\n` +
-        `Expected content (stripped ANSI):\n"${lastExpected}"\n` +
-        `Actual content (stripped ANSI):\n"${lastCurrent}"\n` +
-        `Pending writes: ${this.pendingWrites}\n` +
-        `Render count: ${this.renderCount}`,
-    );
-  }
-}
-
-class XtermStderr extends EventEmitter {
-  private state: TerminalState;
-  private pendingWrites = 0;
-  private queue: { promise: Promise<void> };
-  isTTY = true;
-
-  constructor(state: TerminalState, queue: { promise: Promise<void> }) {
-    super();
-    this.state = state;
-    this.queue = queue;
-  }
-
-  write = (data: string) => {
-    this.pendingWrites++;
-    this.queue.promise = this.queue.promise.then(async () => {
-      await new Promise<void>((resolve) =>
-        this.state.terminal.write(data, resolve),
-      );
-      this.pendingWrites--;
-    });
-  };
-
-  dispose = () => {
-    this.state.terminal.dispose();
-  };
-
-  lastFrame = () => '';
-}
-
-class XtermStdin extends EventEmitter {
-  isTTY = true;
-  data: string | null = null;
-  constructor(options: { isTTY?: boolean } = {}) {
-    super();
-    this.isTTY = options.isTTY ?? true;
-  }
-
-  write = (data: string) => {
-    this.data = data;
-    this.emit('readable');
-    this.emit('data', data);
-  };
-
-  setEncoding() {}
-  setRawMode() {}
-  resume() {}
-  pause() {}
-  ref() {}
-  unref() {}
-
-  read = () => {
-    const { data } = this;
-    this.data = null;
-    return data;
-  };
-}
-
-export type RenderInstance = {
-  rerender: (tree: React.ReactElement) => void;
-  unmount: () => void;
-  cleanup: () => void;
-  stdout: XtermStdout;
-  stderr: XtermStderr;
-  stdin: XtermStdin;
-  frames: string[];
-  lastFrame: (options?: { allowEmpty?: boolean }) => string;
-  terminal: Terminal;
-  waitUntilReady: () => Promise<void>;
-};
-
-const instances: InkInstance[] = [];
-
-// Wrapper around ink's render that ensures act() is called and uses Xterm for output
+// Wrapper around ink-testing-library's render that ensures act() is called
 export const render = (
   tree: React.ReactElement,
   terminalWidth?: number,
-): RenderInstance => {
-  const cols = terminalWidth ?? 100;
-  // We use 1000 rows to avoid windows with incorrect snapshots if a correct
-  // value was used (e.g. 40 rows). The alternatives to make things worse are
-  // windows unfortunately with odd duplicate content in the backbuffer
-  // which does not match actual behavior in xterm.js on windows.
-  const rows = 1000;
-  const terminal = new Terminal({
-    cols,
-    rows,
-    allowProposedApi: true,
-    convertEol: true,
-  });
-
-  const state: TerminalState = {
-    terminal,
-    cols,
-    rows,
-  };
-  const writeQueue = { promise: Promise.resolve() };
-  const stdout = new XtermStdout(state, writeQueue);
-  const stderr = new XtermStderr(state, writeQueue);
-  const stdin = new XtermStdin();
-
-  let instance!: InkInstance;
-  stdout.clear();
+): ReturnType<typeof inkRender> => {
+  let renderResult: ReturnType<typeof inkRender> =
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+    undefined as unknown as ReturnType<typeof inkRender>;
   act(() => {
-    instance = inkRenderDirect(tree, {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-      stdout: stdout as unknown as NodeJS.WriteStream,
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-      stderr: stderr as unknown as NodeJS.WriteStream,
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-      stdin: stdin as unknown as NodeJS.ReadStream,
-      debug: false,
-      exitOnCtrlC: false,
-      patchConsole: false,
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      onRender: (metrics: any) => {
-        stdout.onRender(metrics.staticOutput ?? '', metrics.output);
-      },
-    });
+    renderResult = inkRender(tree);
   });
 
-  instances.push(instance);
+  if (terminalWidth !== undefined && renderResult?.stdout) {
+    // Override the columns getter on the stdout instance provided by ink-testing-library
+    Object.defineProperty(renderResult.stdout, 'columns', {
+      get: () => terminalWidth,
+      configurable: true,
+    });
+
+    // Trigger a rerender so Ink can pick up the new terminal width
+    act(() => {
+      renderResult.rerender(tree);
+    });
+  }
+
+  const originalUnmount = renderResult.unmount;
+  const originalRerender = renderResult.rerender;
 
   return {
-    rerender: (newTree: React.ReactElement) => {
-      act(() => {
-        stdout.clear();
-        instance.rerender(newTree);
-      });
-    },
+    ...renderResult,
     unmount: () => {
       act(() => {
-        instance.unmount();
+        originalUnmount();
+      });
+    },
+    rerender: (newTree: React.ReactElement) => {
+      act(() => {
+        originalRerender(newTree);
       });
-      stdout.dispose();
-      stderr.dispose();
     },
-    cleanup: instance.cleanup,
-    stdout,
-    stderr,
-    stdin,
-    frames: stdout.frames,
-    lastFrame: stdout.lastFrame,
-    terminal: state.terminal,
-    waitUntilReady: () => stdout.waitUntilReady(),
   };
 };
 
-export const cleanup = () => {
-  for (const instance of instances) {
-    act(() => {
-      instance.unmount();
-    });
-    instance.cleanup();
-  }
-  instances.length = 0;
-};
-
 export const simulateClick = async (
-  stdin: XtermStdin,
+  stdin: ReturnType<typeof inkRender>['stdin'],
   col: number,
   row: number,
   button: 0 | 1 | 2 = 0, // 0 for left, 1 for middle, 2 for right
@@ -459,7 +151,7 @@ export const mockSettings = new LoadedSettings(
 const baseMockUiState = {
   renderMarkdown: true,
   streamingState: StreamingState.Idle,
-  terminalWidth: 100,
+  terminalWidth: 120,
   terminalHeight: 40,
   currentModel: 'gemini-pro',
   terminalBackgroundColor: 'black',
@@ -474,8 +166,6 @@ const baseMockUiState = {
     proQuotaRequest: null,
     validationRequest: null,
   },
-  hintMode: false,
-  hintBuffer: '',
 };
 
 export const mockAppState: AppState = {
@@ -507,7 +197,6 @@ const mockUIActions: UIActions = {
   vimHandleInput: vi.fn(),
   handleIdePromptComplete: vi.fn(),
   handleFolderTrustSelect: vi.fn(),
-  setIsPolicyUpdateDialogOpen: vi.fn(),
   setConstrainHeight: vi.fn(),
   onEscapePromptChange: vi.fn(),
   refreshStatic: vi.fn(),
@@ -530,10 +219,6 @@ const mockUIActions: UIActions = {
   setActiveBackgroundShellPid: vi.fn(),
   setIsBackgroundShellListOpen: vi.fn(),
   setAuthContext: vi.fn(),
-  onHintInput: vi.fn(),
-  onHintBackspace: vi.fn(),
-  onHintClear: vi.fn(),
-  onHintSubmit: vi.fn(),
   handleRestart: vi.fn(),
   handleNewAgentsSelect: vi.fn(),
 };
@@ -567,13 +252,7 @@ export const renderWithProviders = (
     };
     appState?: AppState;
   } = {},
-): RenderInstance & {
-  simulateClick: (
-    col: number,
-    row: number,
-    button?: 0 | 1 | 2,
-  ) => Promise<void>;
-} => {
+): ReturnType<typeof render> & { simulateClick: typeof simulateClick } => {
   // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
   const baseState: UIState = new Proxy(
     { ...baseMockUiState, ...providedUiState },
@@ -692,11 +371,7 @@ export const renderWithProviders = (
     terminalWidth,
   );
 
-  return {
-    ...renderResult,
-    simulateClick: (col: number, row: number, button?: 0 | 1 | 2) =>
-      simulateClick(renderResult.stdin, col, row, button),
-  };
+  return { ...renderResult, simulateClick };
 };
 
 export function renderHook<Result, Props>(
@@ -709,7 +384,6 @@ export function renderHook<Result, Props>(
   result: { current: Result };
   rerender: (props?: Props) => void;
   unmount: () => void;
-  waitUntilReady: () => Promise<void>;
 } {
   // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
   const result = { current: undefined as unknown as Result };
@@ -731,7 +405,6 @@ export function renderHook<Result, Props>(
 
   let inkRerender: (tree: React.ReactElement) => void = () => {};
   let unmount: () => void = () => {};
-  let waitUntilReady: () => Promise<void> = async () => {};
 
   act(() => {
     const renderResult = render(
@@ -741,7 +414,6 @@ export function renderHook<Result, Props>(
     );
     inkRerender = renderResult.rerender;
     unmount = renderResult.unmount;
-    waitUntilReady = renderResult.waitUntilReady;
   });
 
   function rerender(props?: Props) {
@@ -758,7 +430,7 @@ export function renderHook<Result, Props>(
     });
   }
 
-  return { result, rerender, unmount, waitUntilReady };
+  return { result, rerender, unmount };
 }
 
 export function renderHookWithProviders<Result, Props>(
@@ -779,7 +451,6 @@ export function renderHookWithProviders<Result, Props>(
   result: { current: Result };
   rerender: (props?: Props) => void;
   unmount: () => void;
-  waitUntilReady: () => Promise<void>;
 } {
   // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
   const result = { current: undefined as unknown as Result };
@@ -829,6 +500,5 @@ export function renderHookWithProviders<Result, Props>(
         renderResult.unmount();
       });
     },
-    waitUntilReady: () => renderResult.waitUntilReady(),
   };
 }

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

@@ -92,42 +92,32 @@ describe('App', () => {
     backgroundShells: new Map(),
   };
 
-  it('should render main content and composer when not quitting', async () => {
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
-      <App />,
-      {
-        uiState: mockUIState,
-        useAlternateBuffer: false,
-      },
-    );
-    await waitUntilReady();
+  it('should render main content and composer when not quitting', () => {
+    const { lastFrame } = renderWithProviders(<App />, {
+      uiState: mockUIState,
+      useAlternateBuffer: false,
+    });
 
     expect(lastFrame()).toContain('Tips for getting started');
     expect(lastFrame()).toContain('Notifications');
     expect(lastFrame()).toContain('Composer');
-    unmount();
   });
 
-  it('should render quitting display when quittingMessages is set', async () => {
+  it('should render quitting display when quittingMessages is set', () => {
     const quittingUIState = {
       ...mockUIState,
       quittingMessages: [{ id: 1, type: 'user', text: 'test' }],
     } as UIState;
 
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
-      <App />,
-      {
-        uiState: quittingUIState,
-        useAlternateBuffer: false,
-      },
-    );
-    await waitUntilReady();
+    const { lastFrame } = renderWithProviders(<App />, {
+      uiState: quittingUIState,
+      useAlternateBuffer: false,
+    });
 
     expect(lastFrame()).toContain('Quitting...');
-    unmount();
   });
 
-  it('should render full history in alternate buffer mode when quittingMessages is set', async () => {
+  it('should render full history in alternate buffer mode when quittingMessages is set', () => {
     const quittingUIState = {
       ...mockUIState,
       quittingMessages: [{ id: 1, type: 'user', text: 'test' }],
@@ -135,38 +125,28 @@ describe('App', () => {
       pendingHistoryItems: [{ type: 'user', text: 'pending item' }],
     } as UIState;
 
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
-      <App />,
-      {
-        uiState: quittingUIState,
-        useAlternateBuffer: true,
-      },
-    );
-    await waitUntilReady();
+    const { lastFrame } = renderWithProviders(<App />, {
+      uiState: quittingUIState,
+      useAlternateBuffer: true,
+    });
 
     expect(lastFrame()).toContain('HistoryItemDisplay');
     expect(lastFrame()).toContain('Quitting...');
-    unmount();
   });
 
-  it('should render dialog manager when dialogs are visible', async () => {
+  it('should render dialog manager when dialogs are visible', () => {
     const dialogUIState = {
       ...mockUIState,
       dialogsVisible: true,
     } as UIState;
 
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
-      <App />,
-      {
-        uiState: dialogUIState,
-      },
-    );
-    await waitUntilReady();
+    const { lastFrame } = renderWithProviders(<App />, {
+      uiState: dialogUIState,
+    });
 
     expect(lastFrame()).toContain('Tips for getting started');
     expect(lastFrame()).toContain('Notifications');
     expect(lastFrame()).toContain('DialogManager');
-    unmount();
   });
 
   it.each([
@@ -174,62 +154,47 @@ describe('App', () => {
     { key: 'D', stateKey: 'ctrlDPressedOnce' },
   ])(
     'should show Ctrl+$key exit prompt when dialogs are visible and $stateKey is true',
-    async ({ key, stateKey }) => {
+    ({ key, stateKey }) => {
       const uiState = {
         ...mockUIState,
         dialogsVisible: true,
         [stateKey]: true,
       } as UIState;
 
-      const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
-        <App />,
-        {
-          uiState,
-        },
-      );
-      await waitUntilReady();
+      const { lastFrame } = renderWithProviders(<App />, {
+        uiState,
+      });
 
       expect(lastFrame()).toContain(`Press Ctrl+${key} again to exit.`);
-      unmount();
     },
   );
 
-  it('should render ScreenReaderAppLayout when screen reader is enabled', async () => {
+  it('should render ScreenReaderAppLayout when screen reader is enabled', () => {
     (useIsScreenReaderEnabled as Mock).mockReturnValue(true);
 
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
-      <App />,
-      {
-        uiState: mockUIState,
-      },
-    );
-    await waitUntilReady();
+    const { lastFrame } = renderWithProviders(<App />, {
+      uiState: mockUIState,
+    });
 
     expect(lastFrame()).toContain('Notifications');
     expect(lastFrame()).toContain('Footer');
     expect(lastFrame()).toContain('Tips for getting started');
     expect(lastFrame()).toContain('Composer');
-    unmount();
   });
 
-  it('should render DefaultAppLayout when screen reader is not enabled', async () => {
+  it('should render DefaultAppLayout when screen reader is not enabled', () => {
     (useIsScreenReaderEnabled as Mock).mockReturnValue(false);
 
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
-      <App />,
-      {
-        uiState: mockUIState,
-      },
-    );
-    await waitUntilReady();
+    const { lastFrame } = renderWithProviders(<App />, {
+      uiState: mockUIState,
+    });
 
     expect(lastFrame()).toContain('Tips for getting started');
     expect(lastFrame()).toContain('Notifications');
     expect(lastFrame()).toContain('Composer');
-    unmount();
   });
 
-  it('should render ToolConfirmationQueue along with Composer when tool is confirming and experiment is on', async () => {
+  it('should render ToolConfirmationQueue along with Composer when tool is confirming and experiment is on', () => {
     (useIsScreenReaderEnabled as Mock).mockReturnValue(false);
 
     const toolCalls = [
@@ -269,64 +234,44 @@ describe('App', () => {
     vi.spyOn(configWithExperiment, 'isTrustedFolder').mockReturnValue(true);
     vi.spyOn(configWithExperiment, 'getIdeMode').mockReturnValue(false);
 
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
-      <App />,
-      {
-        uiState: stateWithConfirmingTool,
-        config: configWithExperiment,
-      },
-    );
-    await waitUntilReady();
+    const { lastFrame } = renderWithProviders(<App />, {
+      uiState: stateWithConfirmingTool,
+      config: configWithExperiment,
+    });
 
     expect(lastFrame()).toContain('Tips for getting started');
     expect(lastFrame()).toContain('Notifications');
     expect(lastFrame()).toContain('Action Required'); // From ToolConfirmationQueue
     expect(lastFrame()).toContain('Composer');
     expect(lastFrame()).toMatchSnapshot();
-    unmount();
   });
 
   describe('Snapshots', () => {
-    it('renders default layout correctly', async () => {
+    it('renders default layout correctly', () => {
       (useIsScreenReaderEnabled as Mock).mockReturnValue(false);
-      const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
-        <App />,
-        {
-          uiState: mockUIState,
-        },
-      );
-      await waitUntilReady();
+      const { lastFrame } = renderWithProviders(<App />, {
+        uiState: mockUIState,
+      });
       expect(lastFrame()).toMatchSnapshot();
-      unmount();
     });
 
-    it('renders screen reader layout correctly', async () => {
+    it('renders screen reader layout correctly', () => {
       (useIsScreenReaderEnabled as Mock).mockReturnValue(true);
-      const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
-        <App />,
-        {
-          uiState: mockUIState,
-        },
-      );
-      await waitUntilReady();
+      const { lastFrame } = renderWithProviders(<App />, {
+        uiState: mockUIState,
+      });
       expect(lastFrame()).toMatchSnapshot();
-      unmount();
     });
 
-    it('renders with dialogs visible', async () => {
+    it('renders with dialogs visible', () => {
       const dialogUIState = {
         ...mockUIState,
         dialogsVisible: true,
       } as UIState;
-      const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
-        <App />,
-        {
-          uiState: dialogUIState,
-        },
-      );
-      await waitUntilReady();
+      const { lastFrame } = renderWithProviders(<App />, {
+        uiState: dialogUIState,
+      });
       expect(lastFrame()).toMatchSnapshot();
-      unmount();
     });
   });
 });

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

@@ -14,8 +14,9 @@ import {
   type Mock,
   type MockedObject,
 } from 'vitest';
-import { render, cleanup, persistentStateMock } from '../test-utils/render.js';
+import { render, persistentStateMock } from '../test-utils/render.js';
 import { waitFor } from '../test-utils/async.js';
+import { cleanup } from 'ink-testing-library';
 import { act, useContext, type ReactElement } from 'react';
 import { AppContainer } from './AppContainer.js';
 import { SettingsContext } from './contexts/SettingsContext.js';
@@ -48,15 +49,6 @@ const mockIdeClient = vi.hoisted(() => ({
 const mocks = vi.hoisted(() => ({
   mockStdout: { write: vi.fn() },
 }));
-const terminalNotificationsMocks = vi.hoisted(() => ({
-  notifyViaTerminal: vi.fn().mockResolvedValue(true),
-  isNotificationsEnabled: vi.fn(() => true),
-  buildRunEventNotificationContent: vi.fn((event) => ({
-    title: 'Mock Notification',
-    subtitle: 'Mock Subtitle',
-    body: JSON.stringify(event),
-  })),
-}));
 
 vi.mock('@google/gemini-cli-core', async (importOriginal) => {
   const actual =
@@ -173,12 +165,6 @@ vi.mock('./hooks/useShellInactivityStatus.js', () => ({
     inactivityStatus: 'none',
   })),
 }));
-vi.mock('../utils/terminalNotifications.js', () => ({
-  notifyViaTerminal: terminalNotificationsMocks.notifyViaTerminal,
-  isNotificationsEnabled: terminalNotificationsMocks.isNotificationsEnabled,
-  buildRunEventNotificationContent:
-    terminalNotificationsMocks.buildRunEventNotificationContent,
-}));
 vi.mock('./hooks/useTerminalTheme.js', () => ({
   useTerminalTheme: vi.fn(),
 }));
@@ -186,7 +172,6 @@ vi.mock('./hooks/useTerminalTheme.js', () => ({
 import { useHookDisplayState } from './hooks/useHookDisplayState.js';
 import { useTerminalTheme } from './hooks/useTerminalTheme.js';
 import { useShellInactivityStatus } from './hooks/useShellInactivityStatus.js';
-import { useFocus } from './hooks/useFocus.js';
 
 // Mock external utilities
 vi.mock('../utils/events.js');
@@ -295,7 +280,6 @@ describe('AppContainer State Management', () => {
   const mockedUseHookDisplayState = useHookDisplayState as Mock;
   const mockedUseTerminalTheme = useTerminalTheme as Mock;
   const mockedUseShellInactivityStatus = useShellInactivityStatus as Mock;
-  const mockedUseFocusState = useFocus as Mock;
 
   const DEFAULT_GEMINI_STREAM_MOCK = {
     streamingState: 'idle',
@@ -433,10 +417,6 @@ describe('AppContainer State Management', () => {
       shouldShowFocusHint: false,
       inactivityStatus: 'none',
     });
-    mockedUseFocusState.mockReturnValue({
-      isFocused: true,
-      hasReceivedFocusEvent: true,
-    });
 
     // Mock Config
     mockConfig = makeFakeConfig();
@@ -545,358 +525,6 @@ describe('AppContainer State Management', () => {
   });
 
   describe('State Initialization', () => {
-    it('sends a macOS notification when confirmation is pending and terminal is unfocused', async () => {
-      mockedUseFocusState.mockReturnValue({
-        isFocused: false,
-        hasReceivedFocusEvent: true,
-      });
-      mockedUseGeminiStream.mockReturnValue({
-        ...DEFAULT_GEMINI_STREAM_MOCK,
-        pendingHistoryItems: [
-          {
-            type: 'tool_group',
-            tools: [
-              {
-                callId: 'call-1',
-                name: 'run_shell_command',
-                description: 'Run command',
-                resultDisplay: undefined,
-                status: CoreToolCallStatus.AwaitingApproval,
-                confirmationDetails: {
-                  type: 'exec',
-                  title: 'Run shell command',
-                  command: 'ls',
-                  rootCommand: 'ls',
-                  rootCommands: ['ls'],
-                },
-              },
-            ],
-          },
-        ],
-      });
-
-      let unmount: (() => void) | undefined;
-      await act(async () => {
-        const rendered = renderAppContainer();
-        unmount = rendered.unmount;
-      });
-
-      await waitFor(() =>
-        expect(terminalNotificationsMocks.notifyViaTerminal).toHaveBeenCalled(),
-      );
-      expect(
-        terminalNotificationsMocks.buildRunEventNotificationContent,
-      ).toHaveBeenCalledWith(
-        expect.objectContaining({
-          type: 'attention',
-        }),
-      );
-
-      await act(async () => {
-        unmount?.();
-      });
-    });
-
-    it('does not send attention notification when terminal is focused', async () => {
-      mockedUseFocusState.mockReturnValue({
-        isFocused: true,
-        hasReceivedFocusEvent: true,
-      });
-      mockedUseGeminiStream.mockReturnValue({
-        ...DEFAULT_GEMINI_STREAM_MOCK,
-        pendingHistoryItems: [
-          {
-            type: 'tool_group',
-            tools: [
-              {
-                callId: 'call-2',
-                name: 'run_shell_command',
-                description: 'Run command',
-                resultDisplay: undefined,
-                status: CoreToolCallStatus.AwaitingApproval,
-                confirmationDetails: {
-                  type: 'exec',
-                  title: 'Run shell command',
-                  command: 'ls',
-                  rootCommand: 'ls',
-                  rootCommands: ['ls'],
-                },
-              },
-            ],
-          },
-        ],
-      });
-
-      let unmount: (() => void) | undefined;
-      await act(async () => {
-        const rendered = renderAppContainer();
-        unmount = rendered.unmount;
-      });
-
-      expect(
-        terminalNotificationsMocks.notifyViaTerminal,
-      ).not.toHaveBeenCalled();
-
-      await act(async () => {
-        unmount?.();
-      });
-    });
-
-    it('sends attention notification when focus reporting is unavailable', async () => {
-      mockedUseFocusState.mockReturnValue({
-        isFocused: true,
-        hasReceivedFocusEvent: false,
-      });
-      mockedUseGeminiStream.mockReturnValue({
-        ...DEFAULT_GEMINI_STREAM_MOCK,
-        pendingHistoryItems: [
-          {
-            type: 'tool_group',
-            tools: [
-              {
-                callId: 'call-focus-unknown',
-                name: 'run_shell_command',
-                description: 'Run command',
-                resultDisplay: undefined,
-                status: CoreToolCallStatus.AwaitingApproval,
-                confirmationDetails: {
-                  type: 'exec',
-                  title: 'Run shell command',
-                  command: 'ls',
-                  rootCommand: 'ls',
-                  rootCommands: ['ls'],
-                },
-              },
-            ],
-          },
-        ],
-      });
-
-      let unmount: (() => void) | undefined;
-      await act(async () => {
-        const rendered = renderAppContainer();
-        unmount = rendered.unmount;
-      });
-
-      await waitFor(() =>
-        expect(terminalNotificationsMocks.notifyViaTerminal).toHaveBeenCalled(),
-      );
-
-      await act(async () => {
-        unmount?.();
-      });
-    });
-
-    it('sends a macOS notification when a response completes while unfocused', async () => {
-      mockedUseFocusState.mockReturnValue({
-        isFocused: false,
-        hasReceivedFocusEvent: true,
-      });
-      let currentStreamingState: 'idle' | 'responding' = 'responding';
-      mockedUseGeminiStream.mockImplementation(() => ({
-        ...DEFAULT_GEMINI_STREAM_MOCK,
-        streamingState: currentStreamingState,
-      }));
-
-      let unmount: (() => void) | undefined;
-      let rerender: ((tree: ReactElement) => void) | undefined;
-
-      await act(async () => {
-        const rendered = renderAppContainer();
-        unmount = rendered.unmount;
-        rerender = rendered.rerender;
-      });
-
-      currentStreamingState = 'idle';
-      await act(async () => {
-        rerender?.(getAppContainer());
-      });
-
-      await waitFor(() =>
-        expect(
-          terminalNotificationsMocks.buildRunEventNotificationContent,
-        ).toHaveBeenCalledWith(
-          expect.objectContaining({
-            type: 'session_complete',
-            detail: 'Gemini CLI finished responding.',
-          }),
-        ),
-      );
-      expect(terminalNotificationsMocks.notifyViaTerminal).toHaveBeenCalled();
-
-      await act(async () => {
-        unmount?.();
-      });
-    });
-
-    it('sends completion notification when focus reporting is unavailable', async () => {
-      mockedUseFocusState.mockReturnValue({
-        isFocused: true,
-        hasReceivedFocusEvent: false,
-      });
-      let currentStreamingState: 'idle' | 'responding' = 'responding';
-      mockedUseGeminiStream.mockImplementation(() => ({
-        ...DEFAULT_GEMINI_STREAM_MOCK,
-        streamingState: currentStreamingState,
-      }));
-
-      let unmount: (() => void) | undefined;
-      let rerender: ((tree: ReactElement) => void) | undefined;
-
-      await act(async () => {
-        const rendered = renderAppContainer();
-        unmount = rendered.unmount;
-        rerender = rendered.rerender;
-      });
-
-      currentStreamingState = 'idle';
-      await act(async () => {
-        rerender?.(getAppContainer());
-      });
-
-      await waitFor(() =>
-        expect(
-          terminalNotificationsMocks.buildRunEventNotificationContent,
-        ).toHaveBeenCalledWith(
-          expect.objectContaining({
-            type: 'session_complete',
-            detail: 'Gemini CLI finished responding.',
-          }),
-        ),
-      );
-
-      await act(async () => {
-        unmount?.();
-      });
-    });
-
-    it('does not send completion notification when another action-required dialog is pending', async () => {
-      mockedUseFocusState.mockReturnValue({
-        isFocused: false,
-        hasReceivedFocusEvent: true,
-      });
-      mockedUseQuotaAndFallback.mockReturnValue({
-        proQuotaRequest: { kind: 'upgrade' },
-        handleProQuotaChoice: vi.fn(),
-      });
-      let currentStreamingState: 'idle' | 'responding' = 'responding';
-      mockedUseGeminiStream.mockImplementation(() => ({
-        ...DEFAULT_GEMINI_STREAM_MOCK,
-        streamingState: currentStreamingState,
-      }));
-
-      let unmount: (() => void) | undefined;
-      let rerender: ((tree: ReactElement) => void) | undefined;
-
-      await act(async () => {
-        const rendered = renderAppContainer();
-        unmount = rendered.unmount;
-        rerender = rendered.rerender;
-      });
-
-      currentStreamingState = 'idle';
-      await act(async () => {
-        rerender?.(getAppContainer());
-      });
-
-      expect(
-        terminalNotificationsMocks.notifyViaTerminal,
-      ).not.toHaveBeenCalled();
-
-      await act(async () => {
-        unmount?.();
-      });
-    });
-
-    it('can send repeated attention notifications for the same key after pending state clears', async () => {
-      mockedUseFocusState.mockReturnValue({
-        isFocused: false,
-        hasReceivedFocusEvent: true,
-      });
-
-      let pendingHistoryItems = [
-        {
-          type: 'tool_group',
-          tools: [
-            {
-              callId: 'repeat-key-call',
-              name: 'run_shell_command',
-              description: 'Run command',
-              resultDisplay: undefined,
-              status: CoreToolCallStatus.AwaitingApproval,
-              confirmationDetails: {
-                type: 'exec',
-                title: 'Run shell command',
-                command: 'ls',
-                rootCommand: 'ls',
-                rootCommands: ['ls'],
-              },
-            },
-          ],
-        },
-      ];
-
-      mockedUseGeminiStream.mockImplementation(() => ({
-        ...DEFAULT_GEMINI_STREAM_MOCK,
-        pendingHistoryItems,
-      }));
-
-      let unmount: (() => void) | undefined;
-      let rerender: ((tree: ReactElement) => void) | undefined;
-
-      await act(async () => {
-        const rendered = renderAppContainer();
-        unmount = rendered.unmount;
-        rerender = rendered.rerender;
-      });
-
-      await waitFor(() =>
-        expect(
-          terminalNotificationsMocks.notifyViaTerminal,
-        ).toHaveBeenCalledTimes(1),
-      );
-
-      pendingHistoryItems = [];
-      await act(async () => {
-        rerender?.(getAppContainer());
-      });
-
-      pendingHistoryItems = [
-        {
-          type: 'tool_group',
-          tools: [
-            {
-              callId: 'repeat-key-call',
-              name: 'run_shell_command',
-              description: 'Run command',
-              resultDisplay: undefined,
-              status: CoreToolCallStatus.AwaitingApproval,
-              confirmationDetails: {
-                type: 'exec',
-                title: 'Run shell command',
-                command: 'ls',
-                rootCommand: 'ls',
-                rootCommands: ['ls'],
-              },
-            },
-          ],
-        },
-      ];
-      await act(async () => {
-        rerender?.(getAppContainer());
-      });
-
-      await waitFor(() =>
-        expect(
-          terminalNotificationsMocks.notifyViaTerminal,
-        ).toHaveBeenCalledTimes(2),
-      );
-
-      await act(async () => {
-        unmount?.();
-      });
-    });
-
     it('initializes with theme error from initialization result', async () => {
       const initResultWithError = {
         ...mockInitResult,
@@ -3292,8 +2920,9 @@ describe('AppContainer State Management', () => {
 
   describe('Permission Handling', () => {
     it('shows permission dialog when checkPermissions returns paths', async () => {
-      const { checkPermissions } =
-        await import('./hooks/atCommandProcessor.js');
+      const { checkPermissions } = await import(
+        './hooks/atCommandProcessor.js'
+      );
       vi.mocked(checkPermissions).mockResolvedValue(['/test/file.txt']);
 
       let unmount: () => void;
@@ -3315,8 +2944,9 @@ describe('AppContainer State Management', () => {
     it.each([true, false])(
       'handles permissions when allowed is %s',
       async (allowed) => {
-        const { checkPermissions } =
-          await import('./hooks/atCommandProcessor.js');
+        const { checkPermissions } = await import(
+          './hooks/atCommandProcessor.js'
+        );
         vi.mocked(checkPermissions).mockResolvedValue(['/test/file.txt']);
         const addReadOnlyPathSpy = vi.spyOn(
           mockConfig.getWorkspaceContext(),

packages/cli/src/ui/AppContainer.tsx

@@ -79,8 +79,6 @@ import {
   type AgentsDiscoveredPayload,
   ChangeAuthRequestedError,
   CoreToolCallStatus,
-  generateSteeringAckMessage,
-  buildUserSteeringHintPrompt,
 } from '@google/gemini-cli-core';
 import { validateAuthMethod } from '../config/auth.js';
 import process from 'node:process';
@@ -158,8 +156,6 @@ import { useTerminalTheme } from './hooks/useTerminalTheme.js';
 import { useTimedMessage } from './hooks/useTimedMessage.js';
 import { shouldDismissShortcutsHelpOnHotkey } from './utils/shortcutsHelp.js';
 import { useSuspend } from './hooks/useSuspend.js';
-import { useRunEventNotifications } from './hooks/useRunEventNotifications.js';
-import { isNotificationsEnabled } from '../utils/terminalNotifications.js';
 
 function isToolExecuting(pendingHistoryItems: HistoryItemWithoutId[]) {
   return pendingHistoryItems.some((item) => {
@@ -213,7 +209,6 @@ const SHELL_HEIGHT_PADDING = 10;
 export const AppContainer = (props: AppContainerProps) => {
   const { config, initializationResult, resumedSessionData } = props;
   const settings = useSettings();
-  const notificationsEnabled = isNotificationsEnabled(settings);
 
   const historyManager = useHistory({
     chatRecordingService: config.getGeminiClient()?.getChatRecordingService(),
@@ -699,7 +694,6 @@ export const AppContainer = (props: AppContainerProps) => {
         settings.setValue(scope, 'security.auth.selectedType', authType);
 
         try {
-          config.setRemoteAdminSettings(undefined);
           await config.refreshAuth(authType);
           setAuthState(AuthState.Authenticated);
         } catch (e) {
@@ -999,30 +993,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
     }
   }, [pendingRestorePrompt, inputHistory, historyManager.history]);
 
-  const pendingHintsRef = useRef<string[]>([]);
-  const [pendingHintCount, setPendingHintCount] = useState(0);
-
-  const consumePendingHints = useCallback(() => {
-    if (pendingHintsRef.current.length === 0) {
-      return null;
-    }
-    const hint = pendingHintsRef.current.join('\n');
-    pendingHintsRef.current = [];
-    setPendingHintCount(0);
-    return hint;
-  }, []);
-
-  useEffect(() => {
-    const hintListener = (hint: string) => {
-      pendingHintsRef.current.push(hint);
-      setPendingHintCount((prev) => prev + 1);
-    };
-    config.userHintService.onUserHint(hintListener);
-    return () => {
-      config.userHintService.offUserHint(hintListener);
-    };
-  }, [config]);
-
   const {
     streamingState,
     submitQuery,
@@ -1061,7 +1031,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
     terminalWidth,
     terminalHeight,
     embeddedShellFocused,
-    consumePendingHints,
   );
 
   toggleBackgroundShellRef.current = toggleBackgroundShell;
@@ -1170,38 +1139,10 @@ Logging in with Google... Restarting Gemini CLI to continue.
     ],
   );
 
-  const handleHintSubmit = useCallback(
-    (hint: string) => {
-      const trimmed = hint.trim();
-      if (!trimmed) {
-        return;
-      }
-      config.userHintService.addUserHint(trimmed);
-      // Render hints with a distinct style.
-      historyManager.addItem({
-        type: 'hint',
-        text: trimmed,
-      });
-    },
-    [config, historyManager],
-  );
-
   const handleFinalSubmit = useCallback(
     async (submittedValue: string) => {
       const isSlash = isSlashCommand(submittedValue.trim());
       const isIdle = streamingState === StreamingState.Idle;
-      const isAgentRunning =
-        streamingState === StreamingState.Responding ||
-        isToolExecuting([
-          ...pendingSlashCommandHistoryItems,
-          ...pendingGeminiHistoryItems,
-        ]);
-
-      if (config.isModelSteeringEnabled() && isAgentRunning && !isSlash) {
-        handleHintSubmit(submittedValue);
-        addInput(submittedValue);
-        return;
-      }
 
       if (isSlash || (isIdle && isMcpReady)) {
         if (!isSlash) {
@@ -1243,10 +1184,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       isMcpReady,
       streamingState,
       messageQueue.length,
-      pendingSlashCommandHistoryItems,
-      pendingGeminiHistoryItems,
       config,
-      handleHintSubmit,
     ],
   );
 
@@ -1309,7 +1247,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
     sanitizationConfig: config.sanitizationConfig,
   });
 
-  const { isFocused, hasReceivedFocusEvent } = useFocus();
+  const isFocused = useFocus();
 
   // Context file names computation
   const contextFileNames = useMemo(() => {
@@ -1392,9 +1330,9 @@ Logging in with Google... Restarting Gemini CLI to continue.
   }, []);
   const shouldShowIdePrompt = Boolean(
     currentIDE &&
-    !config.getIdeMode() &&
-    !settings.merged.ide.hasSeenNudge &&
-    !idePromptAnswered,
+      !config.getIdeMode() &&
+      !settings.merged.ide.hasSeenNudge &&
+      !idePromptAnswered,
   );
 
   const [showErrorDetails, setShowErrorDetails] = useState<boolean>(false);
@@ -1438,13 +1376,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
 
   const { isFolderTrustDialogOpen, handleFolderTrustSelect, isRestarting } =
     useFolderTrust(settings, setIsTrustedFolder, historyManager.addItem);
-
-  const policyUpdateConfirmationRequest =
-    config.getPolicyUpdateConfirmationRequest();
-  const [isPolicyUpdateDialogOpen, setIsPolicyUpdateDialogOpen] = useState(
-    !!policyUpdateConfirmationRequest,
-  );
-
   const {
     needsRestart: ideNeedsRestart,
     restartReason: ideTrustRestartReason,
@@ -1603,8 +1534,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
     streamingState,
     shouldShowFocusHint,
     retryStatus,
-    loadingPhrasesMode: settings.merged.ui.loadingPhrases,
-    customWittyPhrases: settings.merged.ui.customWittyPhrases,
   });
 
   const handleGlobalKeypress = useCallback(
@@ -1656,8 +1585,9 @@ Logging in with Google... Restarting Gemini CLI to continue.
       if (keyMatchers[Command.SHOW_ERROR_DETAILS](key)) {
         if (settings.merged.general.devtools) {
           void (async () => {
-            const { toggleDevToolsPanel } =
-              await import('../utils/devtoolsService.js');
+            const { toggleDevToolsPanel } = await import(
+              '../utils/devtoolsService.js'
+            );
             await toggleDevToolsPanel(
               config,
               showErrorDetails,
@@ -1916,7 +1846,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
     (shouldShowRetentionWarning && retentionCheckComplete) ||
     shouldShowIdePrompt ||
     isFolderTrustDialogOpen ||
-    isPolicyUpdateDialogOpen ||
     adminSettingsChanged ||
     !!commandConfirmationRequest ||
     !!authConsentRequest ||
@@ -1950,17 +1879,12 @@ Logging in with Google... Restarting Gemini CLI to continue.
     [pendingHistoryItems],
   );
 
-  const hasConfirmUpdateExtensionRequests =
-    confirmUpdateExtensionRequests.length > 0;
-  const hasLoopDetectionConfirmationRequest =
-    !!loopDetectionConfirmationRequest;
-
   const hasPendingActionRequired =
     hasPendingToolConfirmation ||
     !!commandConfirmationRequest ||
     !!authConsentRequest ||
-    hasConfirmUpdateExtensionRequests ||
-    hasLoopDetectionConfirmationRequest ||
+    confirmUpdateExtensionRequests.length > 0 ||
+    !!loopDetectionConfirmationRequest ||
     !!proQuotaRequest ||
     !!validationRequest ||
     !!customDialog;
@@ -1978,20 +1902,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
     allowPlanMode,
   });
 
-  useRunEventNotifications({
-    notificationsEnabled,
-    isFocused,
-    hasReceivedFocusEvent,
-    streamingState,
-    hasPendingActionRequired,
-    pendingHistoryItems,
-    commandConfirmationRequest,
-    authConsentRequest,
-    permissionConfirmationRequest,
-    hasConfirmUpdateExtensionRequests,
-    hasLoopDetectionConfirmationRequest,
-  });
-
   const isPassiveShortcutsHelpState =
     isInputActive &&
     streamingState === StreamingState.Idle &&
@@ -2007,44 +1917,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
     setShortcutsHelpVisible,
   ]);
 
-  useEffect(() => {
-    if (
-      !isConfigInitialized ||
-      !config.isModelSteeringEnabled() ||
-      streamingState !== StreamingState.Idle ||
-      !isMcpReady ||
-      isToolAwaitingConfirmation(pendingHistoryItems)
-    ) {
-      return;
-    }
-
-    const pendingHint = consumePendingHints();
-    if (!pendingHint) {
-      return;
-    }
-
-    void generateSteeringAckMessage(
-      config.getBaseLlmClient(),
-      pendingHint,
-    ).then((ackText) => {
-      historyManager.addItem({
-        type: 'info',
-        text: ackText,
-      });
-    });
-    void submitQuery([{ text: buildUserSteeringHintPrompt(pendingHint) }]);
-  }, [
-    config,
-    historyManager,
-    isConfigInitialized,
-    isMcpReady,
-    streamingState,
-    submitQuery,
-    consumePendingHints,
-    pendingHistoryItems,
-    pendingHintCount,
-  ]);
-
   const allToolCalls = useMemo(
     () =>
       pendingHistoryItems
@@ -2072,9 +1944,11 @@ Logging in with Google... Restarting Gemini CLI to continue.
     let isMounted = true;
 
     const fetchBannerTexts = async () => {
-      // TODO: temporarily disabling the banner, it will be re-added.
-      const defaultBanner = '';
-      const warningBanner = await config.getBannerTextCapacityIssues();
+      const [defaultBanner, warningBanner] = await Promise.all([
+        // TODO: temporarily disabling the banner, it will be re-added.
+        '',
+        config.getBannerTextCapacityIssues(),
+      ]);
 
       if (isMounted) {
         setDefaultBannerText(defaultBanner);
@@ -2142,8 +2016,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
       isResuming,
       shouldShowIdePrompt,
       isFolderTrustDialogOpen: isFolderTrustDialogOpen ?? false,
-      isPolicyUpdateDialogOpen,
-      policyUpdateConfirmationRequest,
       isTrustedFolder,
       constrainHeight,
       showErrorDetails,
@@ -2211,13 +2083,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
       isBackgroundShellListOpen,
       adminSettingsChanged,
       newAgents,
-      hintMode:
-        config.isModelSteeringEnabled() &&
-        isToolExecuting([
-          ...pendingSlashCommandHistoryItems,
-          ...pendingGeminiHistoryItems,
-        ]),
-      hintBuffer: '',
     }),
     [
       isThemeDialogOpen,
@@ -2266,8 +2131,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
       isResuming,
       shouldShowIdePrompt,
       isFolderTrustDialogOpen,
-      isPolicyUpdateDialogOpen,
-      policyUpdateConfirmationRequest,
       isTrustedFolder,
       constrainHeight,
       showErrorDetails,
@@ -2365,7 +2228,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
       vimHandleInput,
       handleIdePromptComplete,
       handleFolderTrustSelect,
-      setIsPolicyUpdateDialogOpen,
       setConstrainHeight,
       onEscapePromptChange: handleEscapePromptChange,
       refreshStatic,
@@ -2392,10 +2254,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
       setActiveBackgroundShellPid,
       setIsBackgroundShellListOpen,
       setAuthContext,
-      onHintInput: () => {},
-      onHintBackspace: () => {},
-      onHintClear: () => {},
-      onHintSubmit: () => {},
       handleRestart: async () => {
         if (process.send) {
           const remoteSettings = config.getRemoteAdminSettings();
@@ -2450,7 +2308,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
       vimHandleInput,
       handleIdePromptComplete,
       handleFolderTrustSelect,
-      setIsPolicyUpdateDialogOpen,
       setConstrainHeight,
       handleEscapePromptChange,
       refreshStatic,

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

@@ -11,6 +11,8 @@ import { IdeIntegrationNudge } from './IdeIntegrationNudge.js';
 import { KeypressProvider } from './contexts/KeypressContext.js';
 import { debugLogger } from '@google/gemini-cli-core';
 
+const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
+
 // Mock debugLogger
 vi.mock('@google/gemini-cli-core', async (importOriginal) => {
   const actual =
@@ -54,129 +56,128 @@ describe('IdeIntegrationNudge', () => {
   });
 
   it('renders correctly with default options', async () => {
-    const { lastFrame, waitUntilReady, unmount } = render(
+    const { lastFrame } = render(
       <KeypressProvider>
         <IdeIntegrationNudge {...defaultProps} />
       </KeypressProvider>,
     );
-    await waitUntilReady();
+    await act(async () => {
+      await delay(100);
+    });
     const frame = lastFrame();
 
     expect(frame).toContain('Do you want to connect VS Code to Gemini CLI?');
     expect(frame).toContain('Yes');
     expect(frame).toContain('No (esc)');
     expect(frame).toContain("No, don't ask again");
-    unmount();
   });
 
   it('handles "Yes" selection', async () => {
     const onComplete = vi.fn();
-    const { stdin, waitUntilReady, unmount } = render(
+    const { stdin } = render(
       <KeypressProvider>
         <IdeIntegrationNudge {...defaultProps} onComplete={onComplete} />
       </KeypressProvider>,
     );
 
-    await waitUntilReady();
+    await act(async () => {
+      await delay(100);
+    });
 
     // "Yes" is the first option and selected by default usually.
     await act(async () => {
       stdin.write('\r');
+      await delay(100);
     });
-    await waitUntilReady();
 
     expect(onComplete).toHaveBeenCalledWith({
       userSelection: 'yes',
       isExtensionPreInstalled: false,
     });
-    unmount();
   });
 
   it('handles "No" selection', async () => {
     const onComplete = vi.fn();
-    const { stdin, waitUntilReady, unmount } = render(
+    const { stdin } = render(
       <KeypressProvider>
         <IdeIntegrationNudge {...defaultProps} onComplete={onComplete} />
       </KeypressProvider>,
     );
 
-    await waitUntilReady();
+    await act(async () => {
+      await delay(100);
+    });
 
     // Navigate down to "No (esc)"
     await act(async () => {
       stdin.write('\u001B[B'); // Down arrow
+      await delay(100);
     });
-    await waitUntilReady();
-
     await act(async () => {
       stdin.write('\r'); // Enter
+      await delay(100);
     });
-    await waitUntilReady();
 
     expect(onComplete).toHaveBeenCalledWith({
       userSelection: 'no',
       isExtensionPreInstalled: false,
     });
-    unmount();
   });
 
   it('handles "Dismiss" selection', async () => {
     const onComplete = vi.fn();
-    const { stdin, waitUntilReady, unmount } = render(
+    const { stdin } = render(
       <KeypressProvider>
         <IdeIntegrationNudge {...defaultProps} onComplete={onComplete} />
       </KeypressProvider>,
     );
 
-    await waitUntilReady();
+    await act(async () => {
+      await delay(100);
+    });
 
     // Navigate down to "No, don't ask again"
     await act(async () => {
       stdin.write('\u001B[B'); // Down arrow
+      await delay(100);
     });
-    await waitUntilReady();
-
     await act(async () => {
       stdin.write('\u001B[B'); // Down arrow
+      await delay(100);
     });
-    await waitUntilReady();
-
     await act(async () => {
       stdin.write('\r'); // Enter
+      await delay(100);
     });
-    await waitUntilReady();
 
     expect(onComplete).toHaveBeenCalledWith({
       userSelection: 'dismiss',
       isExtensionPreInstalled: false,
     });
-    unmount();
   });
 
   it('handles Escape key press', async () => {
     const onComplete = vi.fn();
-    const { stdin, waitUntilReady, unmount } = render(
+    const { stdin } = render(
       <KeypressProvider>
         <IdeIntegrationNudge {...defaultProps} onComplete={onComplete} />
       </KeypressProvider>,
     );
 
-    await waitUntilReady();
+    await act(async () => {
+      await delay(100);
+    });
 
     // Press Escape
     await act(async () => {
       stdin.write('\u001B');
-    });
-    // Escape key has a timeout in KeypressContext, so we need to wrap waitUntilReady in act
-    await act(async () => {
-      await waitUntilReady();
+      await delay(100);
     });
 
     expect(onComplete).toHaveBeenCalledWith({
       userSelection: 'no',
       isExtensionPreInstalled: false,
     });
-    unmount();
   });
 
   it('displays correct text and handles selection when extension is pre-installed', async () => {
@@ -184,13 +185,15 @@ describe('IdeIntegrationNudge', () => {
     vi.stubEnv('GEMINI_CLI_IDE_WORKSPACE_PATH', '/tmp');
 
     const onComplete = vi.fn();
-    const { lastFrame, stdin, waitUntilReady, unmount } = render(
+    const { lastFrame, stdin } = render(
       <KeypressProvider>
         <IdeIntegrationNudge {...defaultProps} onComplete={onComplete} />
       </KeypressProvider>,
     );
 
-    await waitUntilReady();
+    await act(async () => {
+      await delay(100);
+    });
 
     const frame = lastFrame();
 
@@ -202,13 +205,12 @@ describe('IdeIntegrationNudge', () => {
     // Select "Yes"
     await act(async () => {
       stdin.write('\r');
+      await delay(100);
     });
-    await waitUntilReady();
 
     expect(onComplete).toHaveBeenCalledWith({
       userSelection: 'yes',
       isExtensionPreInstalled: true,
     });
-    unmount();
   });
 });

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

@@ -61,8 +61,7 @@ Tips for getting started:
 2. Be specific for the best results.
 3. Create GEMINI.md files to customize your interactions with Gemini.
 4. /help for more information.
-Composer
-"
+Composer"
 `;
 
 exports[`App > Snapshots > renders with dialogs visible 1`] = `
@@ -125,19 +124,19 @@ Tips for getting started:
 3. Create GEMINI.md files to customize your interactions with Gemini.
 4. /help for more information.
 HistoryItemDisplay
-╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
-│ Action Required                                                                                  │
-│                                                                                                  │
-│ ?  ls list directory                                                                             │
-│                                                                                                  │
-│ ls                                                                                               │
-│ Allow execution of: 'ls'?                                                                        │
-│                                                                                                  │
-│ ● 1. Allow once                                                                                  │
-│   2. Allow for this session                                                                      │
-│   3. No, suggest changes (esc)                                                                   │
-│                                                                                                  │
-╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
+╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
+│ Action Required                                                                                                      │
+│                                                                                                                      │
+│ ?  ls list directory                                                                                                 │
+│                                                                                                                      │
+│ ls                                                                                                                   │
+│ Allow execution of: 'ls'?                                                                                            │
+│                                                                                                                      │
+│ ● 1. Allow once                                                                                                      │
+│   2. Allow for this session                                                                                          │
+│   3. No, suggest changes (esc)                                                                                       │
+│                                                                                                                      │
+╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
 
 
 

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

@@ -65,24 +65,21 @@ describe('ApiAuthDialog', () => {
     mockedUseTextBuffer.mockReturnValue(mockBuffer);
   });
 
-  it('renders correctly', async () => {
-    const { lastFrame, waitUntilReady, unmount } = render(
+  it('renders correctly', () => {
+    const { lastFrame } = render(
       <ApiAuthDialog onSubmit={onSubmit} onCancel={onCancel} />,
     );
-    await waitUntilReady();
     expect(lastFrame()).toMatchSnapshot();
-    unmount();
   });
 
-  it('renders with a defaultValue', async () => {
-    const { waitUntilReady, unmount } = render(
+  it('renders with a defaultValue', () => {
+    render(
       <ApiAuthDialog
         onSubmit={onSubmit}
         onCancel={onCancel}
         defaultValue="test-key"
       />,
     );
-    await waitUntilReady();
     expect(mockedUseTextBuffer).toHaveBeenCalledWith(
       expect.objectContaining({
         initialText: 'test-key',
@@ -91,7 +88,6 @@ describe('ApiAuthDialog', () => {
         }),
       }),
     );
-    unmount();
   });
 
   it.each([
@@ -104,12 +100,9 @@ describe('ApiAuthDialog', () => {
     { keyName: 'escape', sequence: '\u001b', expectedCall: onCancel, args: [] },
   ])(
     'calls $expectedCall.name when $keyName is pressed',
-    async ({ keyName, sequence, expectedCall, args }) => {
+    ({ keyName, sequence, expectedCall, args }) => {
       mockBuffer.text = 'submitted-key'; // Set for the onSubmit case
-      const { waitUntilReady, unmount } = render(
-        <ApiAuthDialog onSubmit={onSubmit} onCancel={onCancel} />,
-      );
-      await waitUntilReady();
+      render(<ApiAuthDialog onSubmit={onSubmit} onCancel={onCancel} />);
       // calls[0] is the ApiAuthDialog's useKeypress (Ctrl+C handler)
       // calls[1] is the TextInput's useKeypress (typing handler)
       const keypressHandler = mockedUseKeypress.mock.calls[1][0];
@@ -124,29 +117,23 @@ describe('ApiAuthDialog', () => {
       });
 
       expect(expectedCall).toHaveBeenCalledWith(...args);
-      unmount();
     },
   );
 
-  it('displays an error message', async () => {
-    const { lastFrame, waitUntilReady, unmount } = render(
+  it('displays an error message', () => {
+    const { lastFrame } = render(
       <ApiAuthDialog
         onSubmit={onSubmit}
         onCancel={onCancel}
         error="Invalid API Key"
       />,
     );
-    await waitUntilReady();
 
     expect(lastFrame()).toContain('Invalid API Key');
-    unmount();
   });
 
   it('calls clearApiKey and clears buffer when Ctrl+C is pressed', async () => {
-    const { waitUntilReady, unmount } = render(
-      <ApiAuthDialog onSubmit={onSubmit} onCancel={onCancel} />,
-    );
-    await waitUntilReady();
+    render(<ApiAuthDialog onSubmit={onSubmit} onCancel={onCancel} />);
     // Call 0 is ApiAuthDialog (isActive: true)
     // Call 1 is TextInput (isActive: true, priority: true)
     const keypressHandler = mockedUseKeypress.mock.calls[0][0];
@@ -162,6 +149,5 @@ describe('ApiAuthDialog', () => {
       expect(clearApiKey).toHaveBeenCalled();
       expect(mockBuffer.setText).toHaveBeenCalledWith('');
     });
-    unmount();
   });
 });

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

@@ -139,14 +139,11 @@ describe('AuthDialog', () => {
       },
     ])(
       'correctly shows/hides COMPUTE_ADC options $desc',
-      async ({ env, shouldContain, shouldNotContain }) => {
+      ({ env, shouldContain, shouldNotContain }) => {
         for (const [key, value] of Object.entries(env)) {
           vi.stubEnv(key, value as string);
         }
-        const { waitUntilReady, unmount } = renderWithProviders(
-          <AuthDialog {...props} />,
-        );
-        await waitUntilReady();
+        renderWithProviders(<AuthDialog {...props} />);
         const items = mockedRadioButtonSelect.mock.calls[0][0].items;
         for (const item of shouldContain) {
           expect(items).toContainEqual(item);
@@ -154,32 +151,23 @@ describe('AuthDialog', () => {
         for (const item of shouldNotContain) {
           expect(items).not.toContainEqual(item);
         }
-        unmount();
       },
     );
   });
 
-  it('filters auth types when enforcedType is set', async () => {
+  it('filters auth types when enforcedType is set', () => {
     props.settings.merged.security.auth.enforcedType = AuthType.USE_GEMINI;
-    const { waitUntilReady, unmount } = renderWithProviders(
-      <AuthDialog {...props} />,
-    );
-    await waitUntilReady();
+    renderWithProviders(<AuthDialog {...props} />);
     const items = mockedRadioButtonSelect.mock.calls[0][0].items;
     expect(items).toHaveLength(1);
     expect(items[0].value).toBe(AuthType.USE_GEMINI);
-    unmount();
   });
 
-  it('sets initial index to 0 when enforcedType is set', async () => {
+  it('sets initial index to 0 when enforcedType is set', () => {
     props.settings.merged.security.auth.enforcedType = AuthType.USE_GEMINI;
-    const { waitUntilReady, unmount } = renderWithProviders(
-      <AuthDialog {...props} />,
-    );
-    await waitUntilReady();
+    renderWithProviders(<AuthDialog {...props} />);
     const { initialIndex } = mockedRadioButtonSelect.mock.calls[0][0];
     expect(initialIndex).toBe(0);
-    unmount();
   });
 
   describe('Initial Auth Type Selection', () => {
@@ -211,25 +199,18 @@ describe('AuthDialog', () => {
         expected: AuthType.LOGIN_WITH_GOOGLE,
         desc: 'defaults to Login with Google',
       },
-    ])('selects initial auth type $desc', async ({ setup, expected }) => {
+    ])('selects initial auth type $desc', ({ setup, expected }) => {
       setup();
-      const { waitUntilReady, unmount } = renderWithProviders(
-        <AuthDialog {...props} />,
-      );
-      await waitUntilReady();
+      renderWithProviders(<AuthDialog {...props} />);
       const { items, initialIndex } = mockedRadioButtonSelect.mock.calls[0][0];
       expect(items[initialIndex].value).toBe(expected);
-      unmount();
     });
   });
 
   describe('handleAuthSelect', () => {
-    it('calls onAuthError if validation fails', async () => {
+    it('calls onAuthError if validation fails', () => {
       mockedValidateAuthMethod.mockReturnValue('Invalid method');
-      const { waitUntilReady, unmount } = renderWithProviders(
-        <AuthDialog {...props} />,
-      );
-      await waitUntilReady();
+      renderWithProviders(<AuthDialog {...props} />);
       const { onSelect: handleAuthSelect } =
         mockedRadioButtonSelect.mock.calls[0][0];
       handleAuthSelect(AuthType.USE_GEMINI);
@@ -240,15 +221,11 @@ describe('AuthDialog', () => {
       );
       expect(props.onAuthError).toHaveBeenCalledWith('Invalid method');
       expect(props.settings.setValue).not.toHaveBeenCalled();
-      unmount();
     });
 
     it('sets auth context with requiresRestart: true for LOGIN_WITH_GOOGLE', async () => {
       mockedValidateAuthMethod.mockReturnValue(null);
-      const { waitUntilReady, unmount } = renderWithProviders(
-        <AuthDialog {...props} />,
-      );
-      await waitUntilReady();
+      renderWithProviders(<AuthDialog {...props} />);
       const { onSelect: handleAuthSelect } =
         mockedRadioButtonSelect.mock.calls[0][0];
       await handleAuthSelect(AuthType.LOGIN_WITH_GOOGLE);
@@ -256,21 +233,16 @@ describe('AuthDialog', () => {
       expect(props.setAuthContext).toHaveBeenCalledWith({
         requiresRestart: true,
       });
-      unmount();
     });
 
     it('sets auth context with empty object for other auth types', async () => {
       mockedValidateAuthMethod.mockReturnValue(null);
-      const { waitUntilReady, unmount } = renderWithProviders(
-        <AuthDialog {...props} />,
-      );
-      await waitUntilReady();
+      renderWithProviders(<AuthDialog {...props} />);
       const { onSelect: handleAuthSelect } =
         mockedRadioButtonSelect.mock.calls[0][0];
       await handleAuthSelect(AuthType.USE_GEMINI);
 
       expect(props.setAuthContext).toHaveBeenCalledWith({});
-      unmount();
     });
 
     it('skips API key dialog on initial setup if env var is present', async () => {
@@ -278,10 +250,7 @@ describe('AuthDialog', () => {
       vi.stubEnv('GEMINI_API_KEY', 'test-key-from-env');
       // props.settings.merged.security.auth.selectedType is undefined here, simulating initial setup
 
-      const { waitUntilReady, unmount } = renderWithProviders(
-        <AuthDialog {...props} />,
-      );
-      await waitUntilReady();
+      renderWithProviders(<AuthDialog {...props} />);
       const { onSelect: handleAuthSelect } =
         mockedRadioButtonSelect.mock.calls[0][0];
       await handleAuthSelect(AuthType.USE_GEMINI);
@@ -289,7 +258,6 @@ describe('AuthDialog', () => {
       expect(props.setAuthState).toHaveBeenCalledWith(
         AuthState.Unauthenticated,
       );
-      unmount();
     });
 
     it('skips API key dialog if env var is present but empty', async () => {
@@ -297,10 +265,7 @@ describe('AuthDialog', () => {
       vi.stubEnv('GEMINI_API_KEY', ''); // Empty string
       // props.settings.merged.security.auth.selectedType is undefined here
 
-      const { waitUntilReady, unmount } = renderWithProviders(
-        <AuthDialog {...props} />,
-      );
-      await waitUntilReady();
+      renderWithProviders(<AuthDialog {...props} />);
       const { onSelect: handleAuthSelect } =
         mockedRadioButtonSelect.mock.calls[0][0];
       await handleAuthSelect(AuthType.USE_GEMINI);
@@ -308,7 +273,6 @@ describe('AuthDialog', () => {
       expect(props.setAuthState).toHaveBeenCalledWith(
         AuthState.Unauthenticated,
       );
-      unmount();
     });
 
     it('shows API key dialog on initial setup if no env var is present', async () => {
@@ -316,10 +280,7 @@ describe('AuthDialog', () => {
       // process.env['GEMINI_API_KEY'] is not set
       // props.settings.merged.security.auth.selectedType is undefined here, simulating initial setup
 
-      const { waitUntilReady, unmount } = renderWithProviders(
-        <AuthDialog {...props} />,
-      );
-      await waitUntilReady();
+      renderWithProviders(<AuthDialog {...props} />);
       const { onSelect: handleAuthSelect } =
         mockedRadioButtonSelect.mock.calls[0][0];
       await handleAuthSelect(AuthType.USE_GEMINI);
@@ -327,7 +288,6 @@ describe('AuthDialog', () => {
       expect(props.setAuthState).toHaveBeenCalledWith(
         AuthState.AwaitingApiKeyInput,
       );
-      unmount();
     });
 
     it('skips API key dialog on re-auth if env var is present (cannot edit)', async () => {
@@ -337,10 +297,7 @@ describe('AuthDialog', () => {
       props.settings.merged.security.auth.selectedType =
         AuthType.LOGIN_WITH_GOOGLE;
 
-      const { waitUntilReady, unmount } = renderWithProviders(
-        <AuthDialog {...props} />,
-      );
-      await waitUntilReady();
+      renderWithProviders(<AuthDialog {...props} />);
       const { onSelect: handleAuthSelect } =
         mockedRadioButtonSelect.mock.calls[0][0];
       await handleAuthSelect(AuthType.USE_GEMINI);
@@ -348,7 +305,6 @@ describe('AuthDialog', () => {
       expect(props.setAuthState).toHaveBeenCalledWith(
         AuthState.Unauthenticated,
       );
-      unmount();
     });
 
     it('exits process for Login with Google when browser is suppressed', async () => {
@@ -360,10 +316,7 @@ describe('AuthDialog', () => {
       vi.mocked(props.config.isBrowserLaunchSuppressed).mockReturnValue(true);
       mockedValidateAuthMethod.mockReturnValue(null);
 
-      const { waitUntilReady, unmount } = renderWithProviders(
-        <AuthDialog {...props} />,
-      );
-      await waitUntilReady();
+      renderWithProviders(<AuthDialog {...props} />);
       const { onSelect: handleAuthSelect } =
         mockedRadioButtonSelect.mock.calls[0][0];
       await act(async () => {
@@ -377,18 +330,13 @@ describe('AuthDialog', () => {
       exitSpy.mockRestore();
       logSpy.mockRestore();
       vi.useRealTimers();
-      unmount();
     });
   });
 
-  it('displays authError when provided', async () => {
+  it('displays authError when provided', () => {
     props.authError = 'Something went wrong';
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
-      <AuthDialog {...props} />,
-    );
-    await waitUntilReady();
+    const { lastFrame } = renderWithProviders(<AuthDialog {...props} />);
     expect(lastFrame()).toContain('Something went wrong');
-    unmount();
   });
 
   describe('useKeypress', () => {
@@ -427,47 +375,31 @@ describe('AuthDialog', () => {
           expect(p.settings.setValue).not.toHaveBeenCalled();
         },
       },
-    ])('$desc', async ({ setup, expectations }) => {
+    ])('$desc', ({ setup, expectations }) => {
       setup();
-      const { waitUntilReady, unmount } = renderWithProviders(
-        <AuthDialog {...props} />,
-      );
-      await waitUntilReady();
+      renderWithProviders(<AuthDialog {...props} />);
       const keypressHandler = mockedUseKeypress.mock.calls[0][0];
       keypressHandler({ name: 'escape' });
       expectations(props);
-      unmount();
     });
   });
 
   describe('Snapshots', () => {
-    it('renders correctly with default props', async () => {
-      const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
-        <AuthDialog {...props} />,
-      );
-      await waitUntilReady();
+    it('renders correctly with default props', () => {
+      const { lastFrame } = renderWithProviders(<AuthDialog {...props} />);
       expect(lastFrame()).toMatchSnapshot();
-      unmount();
     });
 
-    it('renders correctly with auth error', async () => {
+    it('renders correctly with auth error', () => {
       props.authError = 'Something went wrong';
-      const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
-        <AuthDialog {...props} />,
-      );
-      await waitUntilReady();
+      const { lastFrame } = renderWithProviders(<AuthDialog {...props} />);
       expect(lastFrame()).toMatchSnapshot();
-      unmount();
     });
 
-    it('renders correctly with enforced auth type', async () => {
+    it('renders correctly with enforced auth type', () => {
       props.settings.merged.security.auth.enforcedType = AuthType.USE_GEMINI;
-      const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
-        <AuthDialog {...props} />,
-      );
-      await waitUntilReady();
+      const { lastFrame } = renderWithProviders(<AuthDialog {...props} />);
       expect(lastFrame()).toMatchSnapshot();
-      unmount();
     });
   });
 });

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

@@ -54,80 +54,48 @@ describe('AuthInProgress', () => {
     vi.useRealTimers();
   });
 
-  it('renders initial state with spinner', async () => {
-    const { lastFrame, waitUntilReady, unmount } = render(
-      <AuthInProgress onTimeout={onTimeout} />,
-    );
-    await waitUntilReady();
+  it('renders initial state with spinner', () => {
+    const { lastFrame } = render(<AuthInProgress onTimeout={onTimeout} />);
     expect(lastFrame()).toContain('[Spinner] Waiting for auth...');
     expect(lastFrame()).toContain('Press ESC or CTRL+C to cancel');
-    unmount();
   });
 
-  it('calls onTimeout when ESC is pressed', async () => {
-    const { waitUntilReady, unmount } = render(
-      <AuthInProgress onTimeout={onTimeout} />,
-    );
-    await waitUntilReady();
+  it('calls onTimeout when ESC is pressed', () => {
+    render(<AuthInProgress onTimeout={onTimeout} />);
     const keypressHandler = vi.mocked(useKeypress).mock.calls[0][0];
 
-    await act(async () => {
-      keypressHandler({ name: 'escape' } as unknown as Key);
-    });
-    // Escape key has a 50ms timeout in KeypressContext, so we need to wrap waitUntilReady in act
-    await act(async () => {
-      await waitUntilReady();
-    });
-
+    keypressHandler({ name: 'escape' } as unknown as Key);
     expect(onTimeout).toHaveBeenCalled();
-    unmount();
   });
 
-  it('calls onTimeout when Ctrl+C is pressed', async () => {
-    const { waitUntilReady, unmount } = render(
-      <AuthInProgress onTimeout={onTimeout} />,
-    );
-    await waitUntilReady();
+  it('calls onTimeout when Ctrl+C is pressed', () => {
+    render(<AuthInProgress onTimeout={onTimeout} />);
     const keypressHandler = vi.mocked(useKeypress).mock.calls[0][0];
 
-    await act(async () => {
-      keypressHandler({ name: 'c', ctrl: true } as unknown as Key);
-    });
-    await waitUntilReady();
-
+    keypressHandler({ name: 'c', ctrl: true } as unknown as Key);
     expect(onTimeout).toHaveBeenCalled();
-    unmount();
   });
 
   it('calls onTimeout and shows timeout message after 3 minutes', async () => {
-    const { lastFrame, waitUntilReady, unmount } = render(
-      <AuthInProgress onTimeout={onTimeout} />,
-    );
-    await waitUntilReady();
+    const { lastFrame } = render(<AuthInProgress onTimeout={onTimeout} />);
 
     await act(async () => {
       vi.advanceTimersByTime(180000);
     });
-    await waitUntilReady();
 
     expect(onTimeout).toHaveBeenCalled();
-    expect(lastFrame()).toContain('Authentication timed out');
-    unmount();
+    await vi.waitUntil(
+      () => lastFrame()?.includes('Authentication timed out'),
+      { timeout: 1000 },
+    );
   });
 
-  it('clears timer on unmount', async () => {
-    const { waitUntilReady, unmount } = render(
-      <AuthInProgress onTimeout={onTimeout} />,
-    );
-    await waitUntilReady();
-
-    await act(async () => {
+  it('clears timer on unmount', () => {
+    const { unmount } = render(<AuthInProgress onTimeout={onTimeout} />);
+    act(() => {
       unmount();
     });
-
-    await act(async () => {
-      vi.advanceTimersByTime(180000);
-    });
+    vi.advanceTimersByTime(180000);
     expect(onTimeout).not.toHaveBeenCalled();
   });
 });

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

@@ -40,26 +40,23 @@ describe('LoginWithGoogleRestartDialog', () => {
     vi.useRealTimers();
   });
 
-  it('renders correctly', async () => {
-    const { lastFrame, waitUntilReady, unmount } = render(
+  it('renders correctly', () => {
+    const { lastFrame } = render(
       <LoginWithGoogleRestartDialog
         onDismiss={onDismiss}
         config={mockConfig}
       />,
     );
-    await waitUntilReady();
     expect(lastFrame()).toMatchSnapshot();
-    unmount();
   });
 
-  it('calls onDismiss when escape is pressed', async () => {
-    const { waitUntilReady, unmount } = render(
+  it('calls onDismiss when escape is pressed', () => {
+    render(
       <LoginWithGoogleRestartDialog
         onDismiss={onDismiss}
         config={mockConfig}
       />,
     );
-    await waitUntilReady();
     const keypressHandler = mockedUseKeypress.mock.calls[0][0];
 
     keypressHandler({
@@ -71,7 +68,6 @@ describe('LoginWithGoogleRestartDialog', () => {
     });
 
     expect(onDismiss).toHaveBeenCalledTimes(1);
-    unmount();
   });
 
   it.each(['r', 'R'])(
@@ -79,13 +75,12 @@ describe('LoginWithGoogleRestartDialog', () => {
     async (keyName) => {
       vi.useFakeTimers();
 
-      const { waitUntilReady, unmount } = render(
+      render(
         <LoginWithGoogleRestartDialog
           onDismiss={onDismiss}
           config={mockConfig}
         />,
       );
-      await waitUntilReady();
       const keypressHandler = mockedUseKeypress.mock.calls[0][0];
 
       keypressHandler({
@@ -103,7 +98,6 @@ describe('LoginWithGoogleRestartDialog', () => {
       expect(exitSpy).toHaveBeenCalledWith(RELAUNCH_EXIT_CODE);
 
       vi.useRealTimers();
-      unmount();
     },
   );
 });

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

@@ -14,6 +14,5 @@ exports[`ApiAuthDialog > renders correctly 1`] = `
 │                                                                                                  │
 │ (Press Enter to submit, Esc to cancel, Ctrl+C to clear stored key)                               │
 │                                                                                                  │
-╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
-"
+╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;

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

@@ -1,60 +1,57 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`AuthDialog > Snapshots > renders correctly with auth error 1`] = `
-"╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
-│                                                                                                  │
-│ ? Get started                                                                                    │
-│                                                                                                  │
-│   How would you like to authenticate for this project?                                           │
-│                                                                                                  │
-│   (selected) Login with Google(not selected) Use Gemini API Key(not selected) Vertex AI          │
-│                                                                                                  │
-│   Something went wrong                                                                           │
-│                                                                                                  │
-│   (Use Enter to select)                                                                          │
-│                                                                                                  │
-│   Terms of Services and Privacy Notice for Gemini CLI                                            │
-│                                                                                                  │
-│   https://github.com/google-gemini/gemini-cli/blob/main/docs/tos-privacy.md                      │
-│                                                                                                  │
-╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
-"
+"╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
+│                                                                                                                      │
+│ ? Get started                                                                                                        │
+│                                                                                                                      │
+│   How would you like to authenticate for this project?                                                               │
+│                                                                                                                      │
+│   (selected) Login with Google(not selected) Use Gemini API Key(not selected) Vertex AI                              │
+│                                                                                                                      │
+│   Something went wrong                                                                                               │
+│                                                                                                                      │
+│   (Use Enter to select)                                                                                              │
+│                                                                                                                      │
+│   Terms of Services and Privacy Notice for Gemini CLI                                                                │
+│                                                                                                                      │
+│   https://github.com/google-gemini/gemini-cli/blob/main/docs/tos-privacy.md                                          │
+│                                                                                                                      │
+╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
 
 exports[`AuthDialog > Snapshots > renders correctly with default props 1`] = `
-"╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
-│                                                                                                  │
-│ ? Get started                                                                                    │
-│                                                                                                  │
-│   How would you like to authenticate for this project?                                           │
-│                                                                                                  │
-│   (selected) Login with Google(not selected) Use Gemini API Key(not selected) Vertex AI          │
-│                                                                                                  │
-│   (Use Enter to select)                                                                          │
-│                                                                                                  │
-│   Terms of Services and Privacy Notice for Gemini CLI                                            │
-│                                                                                                  │
-│   https://github.com/google-gemini/gemini-cli/blob/main/docs/tos-privacy.md                      │
-│                                                                                                  │
-╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
-"
+"╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
+│                                                                                                                      │
+│ ? Get started                                                                                                        │
+│                                                                                                                      │
+│   How would you like to authenticate for this project?                                                               │
+│                                                                                                                      │
+│   (selected) Login with Google(not selected) Use Gemini API Key(not selected) Vertex AI                              │
+│                                                                                                                      │
+│   (Use Enter to select)                                                                                              │
+│                                                                                                                      │
+│   Terms of Services and Privacy Notice for Gemini CLI                                                                │
+│                                                                                                                      │
+│   https://github.com/google-gemini/gemini-cli/blob/main/docs/tos-privacy.md                                          │
+│                                                                                                                      │
+╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
 
 exports[`AuthDialog > Snapshots > renders correctly with enforced auth type 1`] = `
-"╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
-│                                                                                                  │
-│ ? Get started                                                                                    │
-│                                                                                                  │
-│   How would you like to authenticate for this project?                                           │
-│                                                                                                  │
-│   (selected) Use Gemini API Key                                                                  │
-│                                                                                                  │
-│   (Use Enter to select)                                                                          │
-│                                                                                                  │
-│   Terms of Services and Privacy Notice for Gemini CLI                                            │
-│                                                                                                  │
-│   https://github.com/google-gemini/gemini-cli/blob/main/docs/tos-privacy.md                      │
-│                                                                                                  │
-╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
-"
+"╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
+│                                                                                                                      │
+│ ? Get started                                                                                                        │
+│                                                                                                                      │
+│   How would you like to authenticate for this project?                                                               │
+│                                                                                                                      │
+│   (selected) Use Gemini API Key                                                                                      │
+│                                                                                                                      │
+│   (Use Enter to select)                                                                                              │
+│                                                                                                                      │
+│   Terms of Services and Privacy Notice for Gemini CLI                                                                │
+│                                                                                                                      │
+│   https://github.com/google-gemini/gemini-cli/blob/main/docs/tos-privacy.md                                          │
+│                                                                                                                      │
+╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;