Fix up exit code table

.gemini/commands/fix-behavioral-eval.toml

@@ -0,0 +1,60 @@
+description = "Check status of nightly evals, fix failures for key models, and re-run."
+prompt = """
+You are an expert at fixing behavioral evaluations.
+
+1. **Investigate**:
+   - Use 'gh' cli to fetch the results from the latest run from the main branch: https://github.com/google-gemini/gemini-cli/actions/workflows/evals-nightly.yml.
+   - DO NOT push any changes or start any runs. The rest of your evaluation will be local.
+   - Evals are in evals/ directory and are documented by evals/README.md.
+   - The test case trajectory logs will be logged to evals/logs.
+   - You should also enable and review the verbose agent logs by setting the GEMINI_DEBUG_LOG_FILE environment variable.
+   - Identify the relevant test. Confine your investigation and validation to just this test.
+   - Proactively add logging that will aid in gathering information or validating your hypotheses.
+
+2. **Fix**:
+   - If a relevant test is failing, locate the test file and the corresponding prompt/code.
+   - It's often helpful to make an extreme, brute force change to see if you are changing the right place to make an improvement and then scope it back iteratively.
+   - Your **final** change should be **minimal and targeted**.
+   - Keep in mind the following:
+     - The prompt has multiple configurations and pieces. Take care that your changes
+       end up in the final prompt for the selected model and configuration.
+     - The prompt chosen for the eval is intentional. It's often vague or indirect
+       to see how the agent performs with ambiguous instructions. Changing it should
+       be a last resort.
+     - When changing the test prompt, carefully consider whether the prompt still tests
+       the same scenario. We don't want to lose test fidelity by making the prompts too
+       direct (i.e.: easy).
+     - Your primary mechanism for improving the agent's behavior is to make changes to
+       tool instructions, system prompt (snippets.ts), and/or modules that contribute to the prompt.
+     - If prompt and description changes are unsuccessful, use logs and debugging to
+       confirm that everything is working as expected.
+    - If unable to fix the test, you can make recommendations for architecture changes
+      that might help stablize the test. Be sure to THINK DEEPLY if offering architecture guidance.
+      Some facts that might help with this are:
+      - Agents may be composed of one or more agent loops.
+      - AgentLoop == 'context + toolset + prompt'. Subagents are one type of agent loop.
+      - Agent loops perform better when:
+        - They have direct, unambiguous, and non-contradictory prompts.
+        - They have fewer irrelevant tools.
+        - They have fewer goals or steps to perform.
+        - They have less low value or irrelevant context.
+      - You may suggest compositions of existing primitives, like subagents, or
+        propose a new one.
+      - These recommendations should be high confidence and should be grounded
+        in observed deficient behaviors rather than just parroting the facts above.
+        Investigate as needed to ground your recommendations.
+
+3. **Verify**:
+   - Run just that one test if needed to validate that it is fixed. Be sure to run vitest in non-interactive mode.
+   - Running the tests can take a long time, so consider whether you can diagnose via other means or log diagnostics before committing the time. You must minimize the number of test runs needed to diagnose the failure.
+   - After the test completes, check whether it seems to have improved.
+   - You will need to run the test 3 times for Gemini 3.0, Gemini 3 flash, and Gemini 2.5 pro to ensure that it is truly stable. Run these runs in parallel, using scripts if needed.
+   - Some flakiness is expected; if it looks like a transient issue or the test is inherently unstable but passes 2/3 times, you might decide it cannot be improved.
+
+4. **Report**:
+   - Provide a summary of the test success rate for each of the tested models.
+   - Success rate is calculated based on 3 runs per model (e.g., 3/3 = 100%).
+   - If you couldn't fix it due to persistent flakiness, explain why.
+
+{{args}}
+"""

.gemini/commands/promote-behavioral-eval.toml

@@ -0,0 +1,29 @@
+description = "Promote behavioral evals that have a 100% success rate over the last 7 nightly runs."
+prompt = """
+You are an expert at analyzing and promoting behavioral evaluations.
+
+1. **Investigate**:
+   - Use 'gh' cli to fetch the results from the most recent run from the main branch: https://github.com/google-gemini/gemini-cli/actions/workflows/evals-nightly.yml.
+   - DO NOT push any changes or start any runs. The rest of your evaluation will be local.
+   - Evals are in evals/ directory and are documented by evals/README.md.
+   - Identify tests that have passed 100% of the time for ALL enabled models across the past 7 runs in a row.
+   - NOTE: the results summary from the most recent run contains the last 7 runs test results. 100% means the test passed 3/3 times for that model and run.
+   - If a test meets this criteria, it is a candidate for promotion.
+
+2. **Promote**:
+   - For each candidate test, locate the test file in the evals/ directory.
+   - Promote the test according to the project's standard promotion process (e.g., moving it to a stable suite, updating its tags, or removing skip/flaky annotations). 
+   - Ensure you follow any guidelines in evals/README.md for stable tests.
+   - Your **final** change should be **minimal and targeted** to just promoting the test status.
+
+3. **Verify**:
+   - Run the promoted tests locally to validate that they still execute correctly. Be sure to run vitest in non-interactive mode.
+   - Check that the test is now part of the expected standard or stable test suites.
+
+4. **Report**:
+   - Provide a summary of the tests that were promoted.
+   - Include the success rate evidence (7/7 runs passed for all models) for each promoted test.
+   - If no tests met the criteria for promotion, clearly state that and summarize the closest candidates.
+
+{{args}}
+"""

.gemini/skills/behavioral-evals/SKILL.md

@@ -1,56 +0,0 @@
----
-name: behavioral-evals
-description: Guidance for creating, running, fixing, and promoting behavioral evaluations. Use when verifying agent decision logic, debugging failures, debugging prompt steering, or adding workspace regression tests.
----
-
-# Behavioral Evals
-
-## Overview
-
-Behavioral evaluations (evals) are tests that validate the **agent's decision-making** (e.g., tool choice) rather than pure functionality. They are critical for verifying prompt changes, debugging steerability, and preventing regressions.
-
-> [!NOTE]
-> **Single Source of Truth**: For core concepts, policies, running tests, and general best practices, always refer to **[evals/README.md](file:///Users/abhipatel/code/gemini-cli/docs/evals/README.md)**.
-
----
-
-## 🔄 Workflow Decision Tree
-
-1.  **Does a prompt/tool change need validation?**
-    *   *No* -> Normal integration tests.
-    *   *Yes* -> Continue below.
-2.  **Is it UI/Interaction heavy?**
-    *   *Yes* -> Use `appEvalTest` (`AppRig`). See **[creating.md](references/creating.md)**.
-    *   *No* -> Use `evalTest` (`TestRig`). See **[creating.md](references/creating.md)**.
-3.  **Is it a new test?**
-    *   *Yes* -> Set policy to `USUALLY_PASSES`.
-    *   *No* -> `ALWAYS_PASSES` (locks in regression).
-4.  **Are you fixing a failure or promoting a test?**
-    *   *Fixing* -> See **[fixing.md](references/fixing.md)**.
-    *   *Promoting* -> See **[promoting.md](references/promoting.md)**.
-
----
-
-## 📋 Quick Checklist
-
-### 1. Setup Workspace
-Seed the workspace with necessary files using the `files` object to simulate a realistic scenario (e.g., NodeJS project with `package.json`).
-*   *Details in **[creating.md](references/creating.md)***
-
-### 2. Write Assertions
-Audit agent decisions using `rig.setBreakpoint()` (AppRig only) or index verification on `rig.readToolLogs()`.
-*   *Details in **[creating.md](references/creating.md)***
-
-### 3. Verify
-Run single tests locally with Vitest. Confirm stability locally before relying on CI workflows.
-*   *See **[evals/README.md](file:///Users/abhipatel/code/gemini-cli/docs/evals/README.md)** for running commands.*
-
----
-
-## 📦 Bundled Resources
-
-Detailed procedural guides:
-*   **[creating.md](references/creating.md)**: Assertion strategies, Rig selection, Mock MCPs.
-*   **[fixing.md](references/fixing.md)**: Step-by-step automated investigation, architecture diagnosis guidelines.
-*   **[promoting.md](references/promoting.md)**: Candidate identification criteria and threshold guidelines.
-

.gemini/skills/behavioral-evals/assets/interactive_eval.ts.txt

@@ -1,27 +0,0 @@
-import { describe, expect } from 'vitest';
-import { appEvalTest } from './app-test-helper.js';
-
-describe('interactive_feature', () => {
-  // New tests MUST start as USUALLY_PASSES
-  appEvalTest('USUALLY_PASSES', {
-    name: 'should pause for user confirmation',
-    files: {
-      'package.json': JSON.stringify({ name: 'app' })
-    },
-    prompt: 'Task description here requiring approval',
-    timeout: 60000, 
-    setup: async (rig) => {
-      // ⚠️ Breakpoints are ONLY safe in appEvalTest
-      rig.setBreakpoint(['ask_user']);
-    },
-    assert: async (rig) => {
-      // 1. Wait for the breakpoint to trigger
-      const confirmation = await rig.waitForPendingConfirmation('ask_user');
-      expect(confirmation).toBeDefined();
-
-      // 2. Resolve it so the test can finish
-      await rig.resolveTool(confirmation);
-      await rig.waitForIdle();
-    },
-  });
-});

.gemini/skills/behavioral-evals/assets/standard_eval.ts.txt

@@ -1,30 +0,0 @@
-import { describe, expect } from 'vitest';
-import { evalTest } from './test-helper.js';
-
-describe('core_feature', () => {
-  // New tests MUST start as USUALLY_PASSES
-  evalTest('USUALLY_PASSES', {
-    name: 'should perform expected agent action',
-    setup: async (rig) => {
-      // For mocking offline MCP:
-      // rig.addMockMcpServer('workspace-server', 'google-workspace');
-    },
-    files: {
-      'src/app.ts': '// some code',
-    },
-    prompt: 'Task description here',
-    timeout: 60000, // 1 minute safety limit
-    assert: async (rig, result) => {
-      // 1. Audit the trajectory (Safe for standard evalTest)
-      const logs = rig.readToolLogs();
-      const hasTool = logs.some((l) => l.toolRequest.name === 'read_file');
-      expect(hasTool, 'Agent should have read the file').toBe(true);
-
-      // 2. Assert efficiency (Cost/Turn)
-      expect(logs.length).toBeLessThan(5);
-
-      // 3. Assert final output
-      expect(result).toContain('Expected Keyword');
-    },
-  });
-});

.gemini/skills/behavioral-evals/references/creating.md

@@ -1,151 +0,0 @@
-# Creating Behavioral Evals
-
-## 🔬 Rig Selection
-
-| Rig Type          | Import From            | Architecture                                                         | Use When                                                                                              |
-| :---------------- | :--------------------- | :------------------------------------------------------------------- | :---------------------------------------------------------------------------------------------------- |
-| **`evalTest`**    | `./test-helper.js`     | **Subprocess**. Runs the CLI in a separate process + waits for exit. | Standard workspace tests. **Do not use `setBreakpoint`**; auditing history (`readToolLogs`) is safer. |
-| **`appEvalTest`** | `./app-test-helper.js` | **In-Process**. Runs directly inside the runner loop.                | UI/Ink rendering. Safe for `setBreakpoint` triggers.                                                  |
-
----
-
-## 🏗️ Scenario Design
-
-Evals must simulate realistic agent environments to effectively test
-decision-making.
-
-- **Workspace State**: Seed with standard project anchors if testing general
-  capabilities:
-  - `package.json` for NodeJS environments.
-  - Minimal configuration files (`tsconfig.json`, `GEMINI.md`).
-- **Structural Complexity**: Provide enough files to force the agent to _search_
-  or _navigate_, rather than giving the answer directly. Avoid trivial one-file
-  tests unless testing exact prompt steering.
-
----
-
-## ❌ Fail First Principle
-
-Before asserting a new capability or locking in a fix, **verify that the test
-fails first**.
-
-- It is easy to accidentally write an eval that asserts behaviors that are
-  already met or pass by default.
-- **Process**: reproduce failure with test -> apply fix (prompt/tool) -> verify
-  test passes.
-
----
-
-## ✋ Testing Patterns
-
-### 1. Breakpoints
-
-Verifies the agent _intends_ to use a tool BEFORE executing it. Useful for
-interactive prompts or safety checks.
-
-```typescript
-// ⚠️ Only works with appEvalTest (AppRig)
-setup: async (rig) => {
-  rig.setBreakpoint(['ask_user']);
-},
-assert: async (rig) => {
-  const confirmation = await rig.waitForPendingConfirmation('ask_user');
-  expect(confirmation).toBeDefined();
-}
-```
-
-### 2. Tool Confirmation Race
-
-When asserting multiple triggers (e.g., "enters plan mode then asks question"):
-
-```typescript
-assert: async (rig) => {
-  let confirmation = await rig.waitForPendingConfirmation([
-    'enter_plan_mode',
-    'ask_user',
-  ]);
-
-  if (confirmation?.name === 'enter_plan_mode') {
-    rig.acceptConfirmation('enter_plan_mode');
-    confirmation = await rig.waitForPendingConfirmation('ask_user');
-  }
-  expect(confirmation?.toolName).toBe('ask_user');
-};
-```
-
-### 3. Audit Tool Logs
-
-Audit exact operations to ensure efficiency (e.g., no redundant reads).
-
-```typescript
-assert: async (rig, result) => {
-  await rig.waitForTelemetryReady();
-  const toolLogs = rig.readToolLogs();
-
-  const writeCall = toolLogs.find(
-    (log) => log.toolRequest.name === 'write_file',
-  );
-  expect(writeCall).toBeDefined();
-};
-```
-
-### 4. Mock MCP Facades
-
-To evaluate tools connected via MCP without hitting live endpoints, load a mock
-server configuration in the `setup` hook.
-
-```typescript
-setup: async (rig) => {
-  rig.addMockMcpServer('workspace-server', 'google-workspace');
-},
-assert: async (rig) => {
-  await rig.waitForTelemetryReady();
-  const toolLogs = rig.readToolLogs();
-  const workspaceCall = toolLogs.find(
-    (log) => log.toolRequest.name === 'mcp_workspace-server_docs.getText'
-  );
-  expect(workspaceCall).toBeDefined();
-};
-```
-
----
-
-## ⚠️ Safety & Efficiency Guardrails
-
-### 1. Breakpoint Deadlocks
-
-Breakpoints (`setBreakpoint`) pause execution. In standard `evalTest`,
-`rig.run()` waits for the process to exit _before_ assertions run. **This will
-hang indefinitely.**
-
-- **Use Breakpoints** for `appEvalTest` or interactive simulations.
-- **Use Audit Tool Logs** (above) for standard trajectory tests.
-
-### 2. Runaway Timeout
-
-Always set a budget boundary in the `EvalCase` to prevent runaway loops on
-quota:
-
-```typescript
-evalTest('USUALLY_PASSES', {
-  name: '...',
-  timeout: 60000, // 1 minute safety limit
-  // ...
-});
-```
-
-### 3. Efficiency Assertion (Turn limits)
-
-Check if a tool is called _early_ using index checks:
-
-```typescript
-assert: async (rig) => {
-  const toolLogs = rig.readToolLogs();
-  const toolCallIndex = toolLogs.findIndex(
-    (log) => log.toolRequest.name === 'cli_help',
-  );
-
-  expect(toolCallIndex).toBeGreaterThan(-1);
-  expect(toolCallIndex).toBeLessThan(5); // Called within first 5 turns
-};
-```

.gemini/skills/behavioral-evals/references/fixing.md

@@ -1,71 +0,0 @@
-# Fixing Behavioral Evals
-
-Use this guide when asked to debug, troubleshoot, or fix a failing behavioral
-evaluation.
-
----
-
-## 1. 🔍 Investigate
-
-1.  **Fetch Nightly Results**: Use the `gh` CLI to inspect the latest run from
-    `evals-nightly.yml` if applicable.
-    - _Example view URL_:
-      `https://github.com/google-gemini/gemini-cli/actions/workflows/evals-nightly.yml`
-2.  **Isolate**: DO NOT push changes or start remote runs. Confine investigation
-    to the local workspace.
-3.  **Read Logs**:
-    - Eval logs live in `evals/logs/<test_name>.log`.
-    - Enable verbose debugging via `export GEMINI_DEBUG_LOG_FILE="debug.log"`.
-4.  **Diagnose**: Audit tool logs and telemetry. Note if due to setup/assert.
-    - **Tip**: Proactively add custom logging/diagnostics to check hypotheses.
-
----
-
-## 2. 🛠️ Fix Strategy
-
-1.  **Targeted Location**: Locate the test case and the corresponding
-    prompt/code.
-2.  **Iterative Scope**: Make extreme change first to verify scope, then refine
-    to a minimal, targeted change.
-3.  **Assertion Fidelity**:
-    - Changing the test prompt is a **last resort** (prompts are often vague by
-      design).
-    - **Warning**: Do not lose test fidelity by making prompts too direct/easy.
-    - **Primary Fix Trigger**: Adjust tool descriptions, system prompts
-      (`snippets.ts`), or **modules that contribute to the prompt template**.
-    - **Warning**: Prompts have multiple configurations; ensure your fix targets
-      the correct config for the model in question.
-4.  **Architecture Options**: If prompt or instruction tuning triggers no
-    improvement, analyze loop composition.
-    - **AgentLoop**: Defined by `context + toolset + prompt`.
-    - **Enhancements**: Loops perform best with direct prompts, fewer irrelevant
-      tools, low goal density, and minimal low-value/irrelevant context.
-    - **Modifications**: Compose subagents or isolate tools. Ground in observed
-      traces.
-    - **Warning**: Think deeply before offering recommendations; avoid parroting
-      abstract design guidelines.
-
----
-
-## 3. ✅ Verify
-
-1.  **Run Local**: Run Vitest in non-interactive mode on just the file.
-2.  **Log Audit**: Prioritize diagnosing failures via log comparison before
-    triggering heavy test runs.
-3.  **Stability Limit**: Run the test **3 times** locally on key models (can use
-    scripts to run in parallel for speed):
-    - **Gemini 3.0**
-    - **Gemini 3 Flash**
-    - **Gemini 2.5 Pro**
-4.  **Flakiness Rule**: If it passes 2/3 times, it may be inherent noise
-    difficult to improve without a structural split.
-
----
-
-## 4. 📊 Report
-
-Provide a summary of:
-
-- Test success rate for each tested model (e.g., 3/3 = 100%).
-- Root cause identification and fix explanation.
-- If unfixed, provide high-confidence architecture recommendations.

.gemini/skills/behavioral-evals/references/promoting.md

@@ -1,55 +0,0 @@
-# Promoting Behavioral Evals
-
-Use this guide when asked to analyze nightly results and promote incubated tests
-to stable suites.
-
----
-
-## 1. 🔍 Investigate candidates
-
-1.  **Audit Nightly Logs**: Use the `gh` CLI to fetch results from
-    `evals-nightly.yml` (Direct URL:
-    `https://github.com/google-gemini/gemini-cli/actions/workflows/evals-nightly.yml`).
-    - **Tip**: The aggregate summary from the most recent run integrates the
-      last 7 runs of history automatically.
-    - **Safety**: DO NOT push changes or start remote runs. All verification is
-      local.
-2.  **Assess Stability**: Identify tests that pass **100% of the time** across
-    ALL enabled models over the **last 7 nightly runs** in a row.
-    - _100% means the test passed 3/3 times for every model and run._
-3.  **Promotion Targets**: Tests meeting this criteria are candidates for
-    promotion from `USUALLY_PASSES` to `ALWAYS_PASSES`.
-
----
-
-## 2. 🚥 Promotion Steps
-
-1.  **Locate File**: Locate the eval file in the `evals/` directory.
-2.  **Update Policy**: Modify the policy argument to `ALWAYS_PASSES`.
-    ```typescript
-    evalTest('ALWAYS_PASSES', { ... })
-    ```
-3.  **Targeting**: Follow guidelines in `evals/README.md` regarding stable suite
-    organization.
-4.  **Constraint**: Your final change must be **minimal and targeted** strictly
-    to promoting the test status. Do not refactor the test or setup fixtures.
-
----
-
-## 3. ✅ Verify
-
-1.  **Run Prompted Tests**: Run the promoted test locally using non-interactive
-    Vitest to confirm structure validity.
-2.  **Verify Suite Inclusion**: Check that the test is successfully picked up by
-    standard runnable ranges.
-
----
-
-## 4. 📊 Report
-
-Provide a summary of:
-
-- Which tests were promoted.
-- Provide the success rate evidence (e.g., 7/7 runs passed for all models).
-- If no candidates qualified, list the next closest candidates and their current
-  pass rate.

.gemini/skills/behavioral-evals/references/running.md

@@ -1,95 +0,0 @@
-# Running & Promoting Evals
-
-## 🛠️ Prerequisites
-
-Behavioral evals run against the compiled binary. You **must** build and bundle
-the project first after making changes:
-
-```bash
-npm run build && npm run bundle
-```
-
----
-
-## 🏃‍♂️ Running Tests
-
-### 1. Configure Environment Variables
-
-Evals require a standard API key. If your `.env` file has multiple keys or
-comments, use this precise extraction setup:
-
-```bash
-export GEMINI_API_KEY=$(grep '^GEMINI_API_KEY=' .env | cut -d '=' -f2) && RUN_EVALS=1 npx vitest run --config evals/vitest.config.ts <file_name>
-```
-
-### 2. Commands
-
-| Command                             | Scope           | Description                                        |
-| :---------------------------------- | :-------------- | :------------------------------------------------- |
-| `npm run test:always_passing_evals` | `ALWAYS_PASSES` | Fast feedback, runs in CI.                         |
-| `npm run test:all_evals`            | All             | Runs nightly incubation tests. Sets `RUN_EVALS=1`. |
-
-### Target Specific File
-
-_Note: `RUN_EVALS=1` is required for incubated (`USUALLY_PASSES`) tests._
-
-```bash
-RUN_EVALS=1 npx vitest run --config evals/vitest.config.ts my_feature.eval.ts
-```
-
----
-
-## 🐞 Debugging and Logs
-
-If a test fails, verify:
-
-- **Tool Trajectory Logs**:序列 of calls in `evals/logs/<test_name>.log`.
-- **Verbose Reasoning**: Capture raw buffer traces by setting
-  `GEMINI_DEBUG_LOG_FILE`:
-  ```bash
-  export GEMINI_DEBUG_LOG_FILE="debug.log"
-  ```
-
----
-
-### 🎯 Verify Model Targeting
-
-- **Tip:** Standard evals benchmark against model variations. If a test passes
-  on Flash but fails on Pro (or vice versa), the issue is usually in the **tool
-  description**, not the prompt definition. Flash is sensitive to "instruction
-  bloat," while Pro is sensitive to "ambiguous intent."
-
----
-
-## 🚥 deflaking & Promotion
-
-To maintain CI stability, all new evals follow a strict incubation period.
-
-### 1. Incubation (`USUALLY_PASSES`)
-
-New tests must be created with the `USUALLY_PASSES` policy.
-
-```typescript
-evalTest('USUALLY_PASSES', { ... })
-```
-
-They run in **Evals: Nightly** workflows and do not block PR merges.
-
-### 2. Investigate Failures
-
-If a nightly eval regresses, investigate via agent:
-
-```bash
-gemini /fix-behavioral-eval [optional-run-uri]
-```
-
-### 3. Promotion (`ALWAYS_PASSES`)
-
-Once a test scores 100% consistency over multiple nightly cycles:
-
-```bash
-gemini /promote-behavioral-eval
-```
-
-_Do not promote manually._ The command verifies trajectory logs before updating
-the file policy.

.github/workflows/eval-guidance.yml

@@ -1,69 +0,0 @@
-name: 'Evals: PR Guidance'
-
-on:
-  pull_request:
-    paths:
-      - 'packages/core/src/**/*.ts'
-      - '!**/*.test.ts'
-      - '!**/*.test.tsx'
-
-permissions:
-  pull-requests: 'write'
-  contents: 'read'
-
-jobs:
-  provide-guidance:
-    name: 'Model Steering Guidance'
-    runs-on: 'ubuntu-latest'
-    if: "github.repository == 'google-gemini/gemini-cli'"
-    steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955' # ratchet:actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: 'Set up Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4.4.0
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'npm'
-
-      - name: 'Detect Steering Changes'
-        id: 'detect'
-        run: |
-          STEERING_DETECTED=$(node scripts/changed_prompt.js --steering-only)
-          echo "STEERING_DETECTED=$STEERING_DETECTED" >> "$GITHUB_OUTPUT"
-
-      - name: 'Analyze PR Content'
-        if: "steps.detect.outputs.STEERING_DETECTED == 'true'"
-        id: 'analysis'
-        env:
-          GH_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-        run: |
-          # Check for behavioral eval changes
-          EVAL_CHANGES=$(git diff --name-only origin/${{ github.base_ref }}...HEAD | grep "^evals/" || true)
-          if [ -z "$EVAL_CHANGES" ]; then
-            echo "MISSING_EVALS=true" >> "$GITHUB_OUTPUT"
-          fi
-
-          # Check if user is a maintainer (has write/admin access)
-          USER_PERMISSION=$(gh api repos/${{ github.repository }}/collaborators/${{ github.actor }}/permission --jq '.permission')
-          if [[ "$USER_PERMISSION" == "admin" || "$USER_PERMISSION" == "write" ]]; then
-            echo "IS_MAINTAINER=true" >> "$GITHUB_OUTPUT"
-          fi
-
-      - name: 'Post Guidance Comment'
-        if: "steps.detect.outputs.STEERING_DETECTED == 'true'"
-        uses: 'thollander/actions-comment-pull-request@65f9e5c9a1f2cd378bd74b2e057c9736982a8e74' # ratchet:thollander/actions-comment-pull-request@v3
-        with:
-          comment-tag: 'eval-guidance-bot'
-          message: |
-            ### 🧠 Model Steering Guidance
-
-            This PR modifies files that affect the model's behavior (prompts, tools, or instructions).
-
-            ${{ steps.analysis.outputs.MISSING_EVALS == 'true' && '- ⚠️ **Consider adding Evals:** No behavioral evaluations (`evals/*.eval.ts`) were added or updated in this PR. Consider adding a test case to verify the new behavior and prevent regressions.' || '' }}
-            ${{ steps.analysis.outputs.IS_MAINTAINER == 'true' && '- 🚀 **Maintainer Reminder:** Please ensure that these changes do not regress results on benchmark evals before merging.' || '' }}
-
-            ---
-            *This is an automated guidance message triggered by steering logic signatures.*

.github/workflows/evals-nightly.yml

@@ -61,7 +61,6 @@ jobs:
           GEMINI_MODEL: '${{ matrix.model }}'
           RUN_EVALS: "${{ github.event.inputs.run_all != 'false' }}"
           TEST_NAME_PATTERN: '${{ github.event.inputs.test_name_pattern }}'
-          VITEST_RETRY: 0
         run: |
           CMD="npm run test:all_evals"
           PATTERN="${TEST_NAME_PATTERN}"

docs/changelogs/preview.md

@@ -1,6 +1,6 @@
-# Preview release: v0.35.0-preview.5
+# Preview release: v0.35.0-preview.2
 
-Released: March 23, 2026
+Released: March 19, 2026
 
 Our preview release includes the latest, new, and experimental features. This
 release may not be as stable as our [latest weekly release](latest.md).
@@ -33,13 +33,6 @@ npm install -g @google/gemini-cli@preview
 
 ## What's Changed
 
-- fix(patch): cherry-pick b2d6dc4 to release/v0.35.0-preview.4-pr-23546
-  [CONFLICTS] by @gemini-cli-robot in
-  [#23585](https://github.com/google-gemini/gemini-cli/pull/23585)
-- fix(patch): cherry-pick daf3691 to release/v0.35.0-preview.2-pr-23558 to patch
-  version v0.35.0-preview.2 and create version 0.35.0-preview.3 by
-  @gemini-cli-robot in
-  [#23565](https://github.com/google-gemini/gemini-cli/pull/23565)
 - fix(patch): cherry-pick 4e5dfd0 to release/v0.35.0-preview.1-pr-23074 to patch
   version v0.35.0-preview.1 and create version 0.35.0-preview.2 by
   @gemini-cli-robot in
@@ -384,4 +377,4 @@ npm install -g @google/gemini-cli@preview
   [#22815](https://github.com/google-gemini/gemini-cli/pull/22815)
 
 **Full Changelog**:
-https://github.com/google-gemini/gemini-cli/compare/v0.34.0-preview.4...v0.35.0-preview.5
+https://github.com/google-gemini/gemini-cli/compare/v0.34.0-preview.4...v0.35.0-preview.2

docs/cli/headless.md

@@ -36,13 +36,22 @@ Returns a stream of newline-delimited JSON (JSONL) events.
 
 ## Exit codes
 
-The CLI returns standard exit codes to indicate the result of the headless
-execution:
+Gemini CLI uses the following exit codes to indicate why the tool terminated
+unexpectedly. You can use these codes to handle errors in scripts and automation
+workflows.
 
-- `0`: Success.
-- `1`: General error or API failure.
-- `42`: Input error (invalid prompt or arguments).
-- `53`: Turn limit exceeded.
+| Exit code | Error type                 | Description                                                                                         |
+| --------- | -------------------------- | --------------------------------------------------------------------------------------------------- |
+| 41        | `FatalAuthenticationError` | An error occurred during the authentication process.                                                |
+| 42        | `FatalInputError`          | Invalid or missing input was provided to the CLI. (non-interactive mode only)                       |
+| 44        | `FatalSandboxError`        | An error occurred with the sandboxing environment (e.g., Docker, Podman, or Seatbelt).              |
+| 52        | `FatalConfigError`         | A configuration file (`settings.json`) is invalid or contains errors.                               |
+| 53        | `FatalTurnLimitedError`    | The maximum number of conversational turns for the session was reached. (non-interactive mode only) |
+| 54        | `FatalToolExecutionError`  | An error occurred during tool execution.                                                            |
+| 130       | `FatalCancellationError`   | The operation was canceled by the user (e.g., SIGINT).                                              |
+
+Exit code 0 indicates that Gemini CLI finished successfully. Exit code 1
+indicates a general error or API failure occurred.
 
 ## Next steps
 

docs/cli/plan-mode.md

@@ -200,7 +200,6 @@ your specific environment.
 
 ```toml
 [[rule]]
-toolName = "*"
 mcpName = "*"
 toolAnnotations = { readOnlyHint = true }
 decision = "allow"

docs/cli/sandbox.md

@@ -298,4 +298,5 @@ gemini -s -p "run shell command: mount | grep workspace"
 
 - [Configuration](../reference/configuration.md): Full configuration options.
 - [Commands](../reference/commands.md): Available commands.
-- [Troubleshooting](../resources/troubleshooting.md): General troubleshooting.
+- [FAQ](../resources/faq.md): General troubleshooting and answers to common
+  questions.

docs/cli/settings.md

@@ -101,13 +101,6 @@ they appear in the UI.
 | Disable Loop Detection        | `model.disableLoopDetection` | Disable automatic detection and prevention of infinite loops.                          | `false`     |
 | Skip Next Speaker Check       | `model.skipNextSpeakerCheck` | Skip the next speaker check.                                                           | `true`      |
 
-### Agents
-
-| UI Label                  | Setting                                  | Description                                                                                   | Default |
-| ------------------------- | ---------------------------------------- | --------------------------------------------------------------------------------------------- | ------- |
-| Confirm Sensitive Actions | `agents.browser.confirmSensitiveActions` | Require manual confirmation for sensitive browser actions (e.g., fill_form, evaluate_script). | `false` |
-| Block File Uploads        | `agents.browser.blockFileUploads`        | Hard-block file upload requests from the browser agent.                                       | `false` |
-
 ### Context
 
 | UI Label                             | Setting                                           | Description                                                                                                                                                                                                                                 | Default |

docs/cli/telemetry.md

@@ -306,7 +306,6 @@ Emitted at startup with the CLI configuration.
 - `extension_ids` (string)
 - `extensions_count` (int)
 - `auth_type` (string)
-- `worktree_active` (boolean)
 - `github_workflow_name` (string, optional)
 - `github_repository_hash` (string, optional)
 - `github_event_name` (string, optional)
@@ -904,20 +903,6 @@ Logs keychain availability checks.
 
 - `available` (boolean)
 
-##### `gemini_cli.startup_stats`
-
-Logs detailed startup performance statistics.
-
-<details>
-<summary>Attributes</summary>
-
-- `phases` (json array of startup phases)
-- `os_platform` (string)
-- `os_release` (string)
-- `is_docker` (boolean)
-
-</details>
-
 </details>
 
 ### Metrics
@@ -934,20 +919,6 @@ Gemini CLI exports several custom metrics.
 
 Incremented once per CLI startup.
 
-##### Onboarding
-
-Tracks onboarding flow from authentication to the user
-
-- `gemini_cli.onboarding.start` (Counter, Int): Incremented when the
-  authentication flow begins.
-
-- `gemini_cli.onboarding.success` (Counter, Int): Incremented when the user
-onboarding flow completes successfully.
-<details>
-<summary>Attributes (Success)</summary>
-
-- `user_tier` (string)
-
 ##### Tools
 
 ##### `gemini_cli.tool.call.count`

docs/cli/visual-validation.md

@@ -1,138 +0,0 @@
-# Visual validation and TTY testing
-
-Gemini CLI uses a multi-layered approach to validate its user interface (UI) and
-ensure the CLI boots correctly in real terminal environments. This document
-explains the tools and techniques used for visual regression and bootstrap
-testing.
-
-## Overview
-
-While standard integration tests focus on logic and file system operations,
-visual validation ensures that the terminal output looks correct to the user. We
-use two primary methods for this:
-
-1.  **TTY Bootstrap Smoke Tests:** Spawns the actual built binary in a real
-    pseudo-terminal (PTY) to verify startup and basic interactivity.
-2.  **Visual Regression (SVG Snapshots):** Renders integrated UI flows inside a
-    virtual terminal and compares the output against committed "golden" SVG
-    baselines.
-
-## TTY bootstrap smoke tests
-
-These tests validate that the Gemini CLI binary can successfully initialize and
-render its Ink-based UI in a real terminal environment. They catch issues like
-missing dependencies, broken startup sequences, or TTY-specific crashes.
-
-These tests are located in `packages/cli/integration-tests/`.
-
-### Running TTY tests
-
-To run the bootstrap smoke test, use the following command:
-
-```bash
-npm test -w @google/gemini-cli -- integration-tests/bootstrap.test.ts
-```
-
-### How it works
-
-The test utility `runInteractive` (found in `@google/gemini-cli-test-utils`)
-uses `node-pty` to spawn the CLI. It provides a programmable interface to wait
-for specific text markers and send simulated user input.
-
-```typescript
-const run = await runInteractive();
-const readyMarker = 'Type your message or @path/to/file';
-await run.expectText(readyMarker, 30000); // Wait for the main prompt
-await run.kill();
-```
-
-### TDD Example: Adding a Welcome Message
-
-To add a new visual feature like a "Welcome to Gemini CLI!" message:
-
-1.  **Write the failing test:** Update `bootstrap.test.ts` to expect the new
-    string.
-    ```typescript
-    const welcomeMessage = 'Welcome to Gemini CLI!';
-    await run.expectText(welcomeMessage, 30000);
-    ```
-2.  **Verify failure:** Run `npm test` and observe the TTY rig reporting the
-    missing text.
-3.  **Implement the feature:** Add the message to `AppHeader.tsx`.
-4.  **Verify success:** Rebuild the binary (`npm run bundle`) and run the test
-    again to see it pass.
-
-## Visual regression with SVG snapshots
-
-To automate the verification of complex UI layouts (like tables, progress bars,
-or policy warnings), we use **SVG Snapshots**. This approach captures colors,
-spacing, and text formatting in a deterministic way.
-
-These tests are located in `packages/cli/src/ui/` and use the `AppRig` utility.
-
-### Running visual tests
-
-To run the visual validation suite, use the following command:
-
-```bash
-npm test -w @google/gemini-cli -- src/ui/PolicyVisual.test.tsx
-```
-
-### Updating snapshots
-
-If you intentionally change the UI, the visual tests will fail because the
-actual output no longer matches the saved snapshot. To "bless" your changes and
-update the snapshots, run the tests with the update flag:
-
-```bash
-npm test -w @google/gemini-cli -- src/ui/PolicyVisual.test.tsx -u
-```
-
-After updating, you must review the resulting `.snap.svg` files in the
-`__snapshots__` directory to ensure they look as intended.
-
-### New use cases unlocked
-
-This framework allows maintainers to validate scenarios that were previously
-difficult to automate:
-
-- **Policy Visibility:** Ensuring that security blocks or "Ask User" prompts are
-  clearly rendered and not suppressed by error verbosity settings.
-- **Integrated Flow Validation:** Testing the full cycle of a model response
-  triggering a tool, which is then handled by the policy engine and displayed in
-  the UI.
-- **Startup Health:** Verifying that changes to the core scheduler or config
-  resolution don't cause the app to hang in the "Initializing..." state.
-
-## Comparison with existing tests
-
-| Test Type             | Rig Used   | Environment       | Best For                            |
-| :-------------------- | :--------- | :---------------- | :---------------------------------- |
-| **Integration (E2E)** | `TestRig`  | Headless / Binary | File system logic, tool execution   |
-| **Bootstrap Smoke**   | `node-pty` | Real PTY / Binary | Startup health, TTY compatibility   |
-| **Visual (Snapshot)** | `AppRig`   | Virtual / Ink     | UI layout, colors, integrated flows |
-| **Behavioral (Old)**  | `AppRig`   | Virtual / Ink     | Model decision-making and steering  |
-
-## Why this matters
-
-Existing testing layers often miss critical user experience regressions:
-
-- **Integration tests** may pass if the logic is sound, but they won't detect if
-  the app hangs during UI initialization or if the binary fails to communicate
-  with the TTY.
-- **Behavioral evaluations** validate the model's intent, but they don't ensure
-  that the resulting state (like a policy violation) is actually visible to the
-  user.
-
-The new validation tools bridge these gaps. For example, they were used to
-expose critical issues where visual feedback for the Policy Engine was
-suppressed in certain modes and the core scheduler was prone to TTY-based race
-conditions. The high-fidelity validation provided by these tools was essential
-for identifying and verifying the fixes for these issues.
-
-## Next steps
-
-- **Extend Coverage:** Add SVG snapshots for more complex components like
-  `DiffRenderer` or `McpStatus`.
-- **CI Integration:** Ensure TTY-based tests run in GitHub Actions environments
-  that support pseudo-terminals.

docs/core/remote-agents.md

@@ -104,7 +104,7 @@ Gemini CLI supports the following authentication types:
 | `apiKey`             | Send a static API key as an HTTP header.                                                       |
 | `http`               | HTTP authentication (Bearer token, Basic credentials, or any IANA-registered scheme).          |
 | `google-credentials` | Google Application Default Credentials (ADC). Automatically selects access or identity tokens. |
-| `oauth`              | OAuth 2.0 Authorization Code flow with PKCE. Opens a browser for interactive sign-in.          |
+| `oauth2`             | OAuth 2.0 Authorization Code flow with PKCE. Opens a browser for interactive sign-in.          |
 
 ### Dynamic values
 
@@ -263,7 +263,7 @@ hosts:
 
 Requests to any other host will be rejected with an error. If your agent is
 hosted on a different domain, use one of the other auth types (`apiKey`, `http`,
-or `oauth`).
+or `oauth2`).
 
 #### Examples
 
@@ -297,7 +297,7 @@ auth:
 ---
 ```
 
-### OAuth 2.0 (`oauth`)
+### OAuth 2.0 (`oauth2`)
 
 Performs an interactive OAuth 2.0 Authorization Code flow with PKCE. On first
 use, Gemini CLI opens your browser for sign-in and persists the resulting tokens
@@ -305,7 +305,7 @@ for subsequent requests.
 
 | Field               | Type     | Required | Description                                                                                                                                        |
 | :------------------ | :------- | :------- | :------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `type`              | string   | Yes      | Must be `oauth`.                                                                                                                                   |
+| `type`              | string   | Yes      | Must be `oauth2`.                                                                                                                                  |
 | `client_id`         | string   | Yes\*    | OAuth client ID. Required for interactive auth.                                                                                                    |
 | `client_secret`     | string   | No\*     | OAuth client secret. Required by most authorization servers (confidential clients). Can be omitted for public clients that don't require a secret. |
 | `scopes`            | string[] | No       | Requested scopes. Can also be discovered from the agent card.                                                                                      |
@@ -318,7 +318,7 @@ kind: remote
 name: oauth-agent
 agent_card_url: https://example.com/.well-known/agent.json
 auth:
-  type: oauth
+  type: oauth2
   client_id: my-client-id.apps.example.com
 ---
 ```

docs/hooks/writing-hooks.md

@@ -470,5 +470,5 @@ console.error('Consolidating memories for session end...');
 
 While project-level hooks are great for specific repositories, you can share
 your hooks across multiple projects by packaging them as a
-[Gemini CLI extension](../extensions/index.md). This provides version control,
-easy distribution, and centralized management.
+[Gemini CLI extension](https://www.google.com/search?q=../extensions/index.md).
+This provides version control, easy distribution, and centralized management.

docs/index.md

@@ -115,13 +115,12 @@ Deep technical documentation and API specifications.
 
 Support, release history, and legal information.
 
-- **[FAQ](./resources/faq.md):** Answers to frequently asked questions.
+- **[FAQ](./resources/faq.md):** Answers to frequently asked questions,
+  including troubleshooting questions.
 - **[Quota and pricing](./resources/quota-and-pricing.md):** Limits and billing
   details.
 - **[Terms and privacy](./resources/tos-privacy.md):** Official notices and
   terms.
-- **[Troubleshooting](./resources/troubleshooting.md):** Common issues and
-  solutions.
 - **[Uninstall](./resources/uninstall.md):** How to uninstall Gemini CLI.
 
 ## Development

docs/integration-tests.md

@@ -12,9 +12,6 @@ verify that it behaves as expected when interacting with the file system.
 These tests are located in the `integration-tests` directory and are run using a
 custom test runner.
 
-For information about visual regression and TTY bootstrap testing, see
-[Visual validation and TTY testing](/docs/cli/visual-validation.md).
-
 ## Building the tests
 
 Prior to running any integration tests, you need to create a release bundle that

docs/redirects.json

@@ -16,5 +16,5 @@
   "/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/troubleshooting": "/docs/resources/faq"
 }

docs/reference/commands.md

@@ -250,8 +250,8 @@ Slash commands provide meta-level control over the CLI itself.
   - **`list`** or **`ls`**:
     - **Description:** List configured MCP servers and tools. This is the
       default action if no subcommand is specified.
-  - **`reload`**:
-    - **Description:** Reloads all MCP servers and re-discovers their available
+  - **`refresh`**:
+    - **Description:** Restarts all MCP servers and re-discovers their available
       tools.
   - **`schema`**:
     - **Description:** List configured MCP servers and tools with descriptions

docs/reference/configuration.md

@@ -295,11 +295,6 @@ their corresponding top-level category object in your `settings.json` file.
   - **Description:** Hide the footer from the UI
   - **Default:** `false`
 
-- **`ui.collapseDrawerDuringApproval`** (boolean):
-  - **Description:** Whether to collapse the UI drawer when a tool is awaiting
-    confirmation.
-  - **Default:** `true`
-
 - **`ui.showMemoryUsage`** (boolean):
   - **Description:** Display memory usage information in the UI
   - **Default:** `false`
@@ -1215,22 +1210,6 @@ their corresponding top-level category object in your `settings.json` file.
   - **Description:** Disable user input on browser window during automation.
   - **Default:** `true`
 
-- **`agents.browser.maxActionsPerTask`** (number):
-  - **Description:** The maximum number of tool calls allowed per browser task.
-    Enforcement is hard: the agent will be terminated when the limit is reached.
-  - **Default:** `100`
-
-- **`agents.browser.confirmSensitiveActions`** (boolean):
-  - **Description:** Require manual confirmation for sensitive browser actions
-    (e.g., fill_form, evaluate_script).
-  - **Default:** `false`
-  - **Requires restart:** Yes
-
-- **`agents.browser.blockFileUploads`** (boolean):
-  - **Description:** Hard-block file upload requests from the browser agent.
-  - **Default:** `false`
-  - **Requires restart:** Yes
-
 #### `context`
 
 - **`context.fileName`** (string | string[]):

docs/reference/policy-engine.md

@@ -262,8 +262,8 @@ Here is a breakdown of the fields available in a TOML policy rule:
 # A unique name for the tool, or an array of names.
 toolName = "run_shell_command"
 
-# (Optional) The name of a subagent. If provided, the rule only applies to tool
-# calls made by this specific subagent.
+# (Optional) The name of a subagent. If provided, the rule only applies to tool calls
+# made by this specific subagent.
 subagent = "generalist"
 
 # (Optional) The name of an MCP server. Can be combined with toolName
@@ -278,17 +278,14 @@ toolAnnotations = { readOnlyHint = true }
 argsPattern = '"command":"(git|npm)'
 
 # (Optional) A string or array of strings that a shell command must start with.
-# This is syntactic sugar for `toolName = "run_shell_command"` and an
-# `argsPattern`.
+# This is syntactic sugar for `toolName = "run_shell_command"` and an `argsPattern`.
 commandPrefix = "git"
 
 # (Optional) A regex to match against the entire shell command.
 # This is also syntactic sugar for `toolName = "run_shell_command"`.
-# Note: This pattern is tested against the JSON representation of the arguments
-# (e.g., `{"command":"<your_command>"}`). Because it prepends `"command":"`,
-# it effectively matches from the start of the command.
-# Anchors like `^` or `$` apply to the full JSON string,
-# so `^` should usually be avoided here.
+# Note: This pattern is tested against the JSON representation of the arguments (e.g., `{"command":"<your_command>"}`).
+# Because it prepends `"command":"`, it effectively matches from the start of the command.
+# Anchors like `^` or `$` apply to the full JSON string, so `^` should usually be avoided here.
 # You cannot use commandPrefix and commandRegex in the same rule.
 commandRegex = "git (commit|push)"
 
@@ -298,26 +295,16 @@ decision = "ask_user"
 # The priority of the rule, from 0 to 999.
 priority = 10
 
-# (Optional) A custom message to display when a tool call is denied by this
-# rule. This message is returned to the model and user,
-# useful for explaining *why* it was denied.
-denyMessage = "Deletion is permanent"
+# (Optional) A custom message to display when a tool call is denied by this rule.
+# This message is returned to the model and user, useful for explaining *why* it was denied.
+deny_message = "Deletion is permanent"
 
 # (Optional) An array of approval modes where this rule is active.
 modes = ["autoEdit"]
 
-# (Optional) A boolean to restrict the rule to interactive (true) or
-# non-interactive (false) environments.
+# (Optional) A boolean to restrict the rule to interactive (true) or non-interactive (false) environments.
 # If omitted, the rule applies to both.
 interactive = true
-
-# (Optional) If true, lets shell commands use redirection operators
-# (>, >>, <, <<, <<<). By default, the policy engine asks for confirmation
-# when redirection is detected, even if a rule matches the command.
-# This permission is granular; it only applies to the specific rule it's
-# defined in. In chained commands (e.g., cmd1 > file && cmd2), each
-# individual command rule must permit redirection if it's used.
-allowRedirection = true
 ```
 
 ### Using arrays (lists)
@@ -402,7 +389,7 @@ server.
 mcpName = "untrusted-server"
 decision = "deny"
 priority = 500
-denyMessage = "This server is not trusted by the admin."
+deny_message = "This server is not trusted by the admin."
 ```
 
 **3. Targeting all MCP servers**
@@ -413,7 +400,6 @@ registered MCP server. This is useful for setting category-wide defaults.
 ```toml
 # Ask user for any tool call from any MCP server
 [[rule]]
-toolName = "*"
 mcpName = "*"
 decision = "ask_user"
 priority = 10

docs/resources/faq.md

@@ -56,6 +56,94 @@ like Google Gmail or Google Workspace, respectively). This is because the Gemini
 Code Assist API does not support cached content creation. You can still view
 your total token usage using the `/stats` command in Gemini CLI.
 
+### Why am I getting 'You must be a named user on your organization's Gemini Code Assist Standard edition subscription' error?
+
+This error might occur if Gemini CLI detects the `GOOGLE_CLOUD_PROJECT` or
+`GOOGLE_CLOUD_PROJECT_ID` environment variable is defined. Setting these
+variables forces an organization subscription check. This might be an issue if
+you are using an individual Google account not linked to an organizational
+subscription.
+
+- **Individual users:** Unset the `GOOGLE_CLOUD_PROJECT` and
+  `GOOGLE_CLOUD_PROJECT_ID` environment variables. Check and remove these
+  variables from your shell configuration files (for example, `.bashrc`,
+  `.zshrc`) and any `.env` files. If this doesn't resolve the issue, try using a
+  different Google account.
+- **Organizational users:** Ask your Google Cloud administrator to add you to
+  your organization's Gemini Code Assist subscription.
+
+### Why am I getting a 'Failed to sign in. Message: Your current account is not eligible... because it is not currently available in your location' error?
+
+Gemini CLI does not currently support your location. For a full list of
+supported locations, see the
+[Available locations](https://developers.google.com/gemini-code-assist/resources/available-locations#americas)
+page for Gemini Code Assist for individuals.
+
+### Why am I getting a 'Failed to sign in. Message: Request contains an invalid argument' error?
+
+Users with Google Workspace accounts or Google Cloud accounts associated with
+their Gmail accounts may not be able to activate the free tier of the Google
+Code Assist plan. For Google Cloud accounts, you can work around this by setting
+`GOOGLE_CLOUD_PROJECT` to your project ID. Alternatively, you can obtain the
+Gemini API key from [Google AI Studio](http://aistudio.google.com/app/apikey),
+which also includes a separate free tier.
+
+### Why am I getting an `UNABLE_TO_GET_ISSUER_CERT_LOCALLY` or `unable to get local issuer certificate` error?
+
+You may be on a corporate network with a firewall that intercepts and inspects
+SSL/TLS traffic. This often requires a custom root CA certificate to be trusted
+by Node.js.
+
+First try setting `NODE_USE_SYSTEM_CA`; if that does not resolve the issue, set
+`NODE_EXTRA_CA_CERTS`:
+
+- Set the `NODE_USE_SYSTEM_CA=1` environment variable to tell Node.js to use the
+  operating system's native certificate store (where corporate certificates are
+  typically already installed). Example: `export NODE_USE_SYSTEM_CA=1` (Windows
+  PowerShell: `$env:NODE_USE_SYSTEM_CA=1`)
+- Set the `NODE_EXTRA_CA_CERTS` environment variable to the absolute path of
+  your corporate root CA certificate file. Example:
+  `export NODE_EXTRA_CA_CERTS=/path/to/your/corporate-ca.crt` (Windows
+  PowerShell: `$env:NODE_EXTRA_CA_CERTS="C:\path\to\your\corporate-ca.crt"`)
+
+### Why am I getting an `EADDRINUSE` (Address already in use) error when starting an MCP server?
+
+Another process is already using the port that the MCP server is trying to bind
+to. Either stop the other process that is using the port or configure the MCP
+server to use a different port.
+
+### Why am I getting `MODULE_NOT_FOUND` or import errors?
+
+Dependencies are not installed correctly, or the project hasn't been built.
+
+1. Run `npm install` to ensure all dependencies are present.
+2. Run `npm run build` to compile the project.
+3. Verify that the build completed successfully with `npm run start`.
+
+### Why am I getting 'Operation not permitted' or 'Permission denied' errors?
+
+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. Refer to the
+[Configuration: Sandboxing](../cli/sandbox.md) documentation for more
+information, including how to customize your sandbox configuration.
+
+### Why isn't Gemini CLI running in interactive mode in my CI environment?
+
+The Gemini CLI does not enter interactive mode (no prompt appears) if an
+environment variable starting with `CI_` (e.g., `CI_TOKEN`) is set. The
+underlying UI framework detects these variables and assumes a non-interactive CI
+environment. If the `CI_` prefixed variable is not needed for the CLI to
+function, you can temporarily unset it for the command. e.g.,
+`env -u CI_TOKEN gemini`.
+
+### Why doesn't DEBUG mode work when I set it in my project's `.env` file?
+
+The `DEBUG` and `DEBUG_MODE` variables are automatically excluded from project
+`.env` files to prevent interference with gemini-cli behavior. Use a
+`.gemini/.env` file instead, or configure the `advanced.excludedEnvVars` setting
+in your `settings.json` to exclude fewer variables.
+
 ## Installation and updates
 
 ### How do I check which version of Gemini CLI I'm currently running?
@@ -78,6 +166,28 @@ If you installed it globally via `npm`, update it using the command
 the latest changes from the repository, and then rebuild using the command
 `npm run build`.
 
+### Why am I getting a 'Command not found' error when attempting to run `gemini`?
+
+Gemini CLI is not correctly installed or it is not in your system's `PATH`.
+
+- If you installed `gemini` globally, check that your `npm` global binary
+  directory is in your `PATH`. You can update Gemini CLI using the command
+  `npm install -g @google/gemini-cli@latest`.
+- If you are running `gemini` from source, ensure you are using the correct
+  command to invoke it (e.g., `node packages/cli/dist/index.js ...`). To update
+  Gemini CLI, pull the latest changes from the repository, and then rebuild
+  using the command `npm run build`.
+
+### Why am I seeing `npm WARN deprecated node-domexception@1.0.0` or `npm WARN deprecated glob` during install or update?
+
+When installing or updating the Gemini CLI globally, you might see deprecation
+warnings regarding `node-domexception` or old versions of `glob`. These warnings
+occur because some dependencies rely on older package versions. Since Gemini CLI
+requires Node.js 20 or higher, the platform's native features are used, making
+these warnings purely informational. They are harmless and can be safely
+ignored. Your installation or update will complete successfully and function
+properly.
+
 ## Platform-specific issues
 
 ### Why does the CLI crash on Windows when I run a command like `chmod +x`?
@@ -180,6 +290,35 @@ using your data to improve Google's machine learning models. See the
 [Gemini Code Assist for individuals privacy notice](https://developers.google.com/gemini-code-assist/resources/privacy-notice-gemini-code-assist-individuals)
 for more information.
 
+## Debugging tips
+
+### How do I debug issues with Gemini CLI?
+
+- **CLI debugging:**
+  - Use the `--debug` flag for more detailed output. In interactive mode, press
+    F12 to view the debug console.
+  - Check the CLI logs, often found in a user-specific configuration or cache
+    directory.
+
+- **Core debugging:**
+  - Check the server console output for error messages or stack traces.
+  - Increase log verbosity if configurable. For example, set the `DEBUG_MODE`
+    environment variable to `true` or `1`.
+  - Use Node.js debugging tools (e.g., `node --inspect`) if you need to step
+    through server-side code.
+
+- **Tool issues:**
+  - If a specific tool is failing, try to isolate the issue by running the
+    simplest possible version of the command or operation the tool performs.
+  - For `run_shell_command`, check that the command works directly in your shell
+    first.
+  - For _file system tools_, verify that paths are correct and check the
+    permissions.
+
+- **Pre-flight checks:**
+  - Always run `npm run preflight` before committing code. This can catch many
+    common issues related to formatting, linting, and type errors.
+
 ## Not seeing your question?
 
 Search the

docs/resources/troubleshooting.md

@@ -1,193 +0,0 @@
-# Troubleshooting guide
-
-This guide provides solutions to common issues and debugging tips, including
-topics on:
-
-- Authentication or login errors
-- Frequently asked questions (FAQs)
-- Debugging tips
-- Existing GitHub Issues similar to yours or creating new Issues
-
-## Authentication or login errors
-
-- **Error:
-  `You must be a named user on your organization's Gemini Code Assist Standard edition subscription to use this service. Please contact your administrator to request an entitlement to Gemini Code Assist Standard edition.`**
-  - **Cause:** This error might occur if Gemini CLI detects the
-    `GOOGLE_CLOUD_PROJECT` or `GOOGLE_CLOUD_PROJECT_ID` environment variable is
-    defined. Setting these variables forces an organization subscription check.
-    This might be an issue if you are using an individual Google account not
-    linked to an organizational subscription.
-
-  - **Solution:**
-    - **Individual Users:** Unset the `GOOGLE_CLOUD_PROJECT` and
-      `GOOGLE_CLOUD_PROJECT_ID` environment variables. Check and remove these
-      variables from your shell configuration files (for example, `.bashrc`,
-      `.zshrc`) and any `.env` files. If this doesn't resolve the issue, try
-      using a different Google account.
-
-    - **Organizational Users:** Contact your Google Cloud administrator to be
-      added to your organization's Gemini Code Assist subscription.
-
-- **Error:
-  `Failed to sign in. Message: Your current account is not eligible... because it is not currently available in your location.`**
-  - **Cause:** Gemini CLI does not currently support your location. For a full
-    list of supported locations, see the following pages:
-    - Gemini Code Assist for individuals:
-      [Available locations](https://developers.google.com/gemini-code-assist/resources/available-locations#americas)
-
-- **Error: `Failed to sign in. Message: Request contains an invalid argument`**
-  - **Cause:** Users with Google Workspace accounts or Google Cloud accounts
-    associated with their Gmail accounts may not be able to activate the free
-    tier of the Google Code Assist plan.
-  - **Solution:** For Google Cloud accounts, you can work around this by setting
-    `GOOGLE_CLOUD_PROJECT` to your project ID. Alternatively, you can obtain the
-    Gemini API key from
-    [Google AI Studio](http://aistudio.google.com/app/apikey), which also
-    includes a separate free tier.
-
-- **Error: `UNABLE_TO_GET_ISSUER_CERT_LOCALLY` or
-  `unable to get local issuer certificate`**
-  - **Cause:** You may be on a corporate network with a firewall that intercepts
-    and inspects SSL/TLS traffic. This often requires a custom root CA
-    certificate to be trusted by Node.js.
-  - **Solution:** First try setting `NODE_USE_SYSTEM_CA`; if that does not
-    resolve the issue, set `NODE_EXTRA_CA_CERTS`.
-    - Set the `NODE_USE_SYSTEM_CA=1` environment variable to tell Node.js to use
-      the operating system's native certificate store (where corporate
-      certificates are typically already installed).
-      - Example: `export NODE_USE_SYSTEM_CA=1` (Windows PowerShell:
-        `$env:NODE_USE_SYSTEM_CA=1`)
-    - Set the `NODE_EXTRA_CA_CERTS` environment variable to the absolute path of
-      your corporate root CA certificate file.
-      - Example: `export NODE_EXTRA_CA_CERTS=/path/to/your/corporate-ca.crt`
-        (Windows PowerShell:
-        `$env:NODE_EXTRA_CA_CERTS="C:\path\to\your\corporate-ca.crt"`)
-
-## Common error messages and solutions
-
-- **Error: `EADDRINUSE` (Address already in use) when starting an MCP server.**
-  - **Cause:** Another process is already using the port that the MCP server is
-    trying to bind to.
-  - **Solution:** Either stop the other process that is using the port or
-    configure the MCP server to use a different port.
-
-- **Error: Command not found (when attempting to run Gemini CLI with
-  `gemini`).**
-  - **Cause:** Gemini CLI is not correctly installed or it is not in your
-    system's `PATH`.
-  - **Solution:** The update depends on how you installed Gemini CLI:
-    - If you installed `gemini` globally, check that your `npm` global binary
-      directory is in your `PATH`. You can update Gemini CLI using the command
-      `npm install -g @google/gemini-cli@latest`.
-    - If you are running `gemini` from source, ensure you are using the correct
-      command to invoke it (e.g., `node packages/cli/dist/index.js ...`). To
-      update Gemini CLI, pull the latest changes from the repository, and then
-      rebuild using the command `npm run build`.
-
-- **Error: `MODULE_NOT_FOUND` or import errors.**
-  - **Cause:** Dependencies are not installed correctly, or the project hasn't
-    been built.
-  - **Solution:**
-    1.  Run `npm install` to ensure all dependencies are present.
-    2.  Run `npm run build` to compile the project.
-    3.  Verify that the build completed successfully with `npm run start`.
-
-- **Error: "Operation not permitted", "Permission denied", or similar.**
-  - **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)
-    documentation for more information, including how to customize your sandbox
-    configuration.
-
-- **Gemini CLI is not running in interactive mode in "CI" environments**
-  - **Issue:** The Gemini CLI does not enter interactive mode (no prompt
-    appears) if an environment variable starting with `CI_` (e.g., `CI_TOKEN`)
-    is set. This is because the `is-in-ci` package, used by the underlying UI
-    framework, detects these variables and assumes a non-interactive CI
-    environment.
-  - **Cause:** The `is-in-ci` package checks for the presence of `CI`,
-    `CONTINUOUS_INTEGRATION`, or any environment variable with a `CI_` prefix.
-    When any of these are found, it signals that the environment is
-    non-interactive, which prevents the Gemini CLI from starting in its
-    interactive mode.
-  - **Solution:** If the `CI_` prefixed variable is not needed for the CLI to
-    function, you can temporarily unset it for the command. e.g.,
-    `env -u CI_TOKEN gemini`
-
-- **DEBUG mode not working from project .env file**
-  - **Issue:** Setting `DEBUG=true` in a project's `.env` file doesn't enable
-    debug mode for gemini-cli.
-  - **Cause:** The `DEBUG` and `DEBUG_MODE` variables are automatically excluded
-    from project `.env` files to prevent interference with gemini-cli behavior.
-  - **Solution:** Use a `.gemini/.env` file instead, or configure the
-    `advanced.excludedEnvVars` setting in your `settings.json` to exclude fewer
-    variables.
-
-- **Warning: `npm WARN deprecated node-domexception@1.0.0` or
-  `npm WARN deprecated glob` during install/update**
-  - **Issue:** When installing or updating the Gemini CLI globally via
-    `npm install -g @google/gemini-cli` or `npm update -g @google/gemini-cli`,
-    you might see deprecation warnings regarding `node-domexception` or old
-    versions of `glob`.
-  - **Cause:** These warnings occur because some dependencies (or their
-    sub-dependencies, like `google-auth-library`) rely on older package
-    versions. Since Gemini CLI requires Node.js 20 or higher, the platform's
-    native features (like the native `DOMException`) are used, making these
-    warnings purely informational.
-  - **Solution:** These warnings are harmless and can be safely ignored. Your
-    installation or update will complete successfully and function properly
-    without any action required.
-
-## Exit codes
-
-The Gemini CLI uses specific exit codes to indicate the reason for termination.
-This is especially useful for scripting and automation.
-
-| Exit Code | Error Type                 | Description                                                                                         |
-| --------- | -------------------------- | --------------------------------------------------------------------------------------------------- |
-| 41        | `FatalAuthenticationError` | An error occurred during the authentication process.                                                |
-| 42        | `FatalInputError`          | Invalid or missing input was provided to the CLI. (non-interactive mode only)                       |
-| 44        | `FatalSandboxError`        | An error occurred with the sandboxing environment (e.g., Docker, Podman, or Seatbelt).              |
-| 52        | `FatalConfigError`         | A configuration file (`settings.json`) is invalid or contains errors.                               |
-| 53        | `FatalTurnLimitedError`    | The maximum number of conversational turns for the session was reached. (non-interactive mode only) |
-
-## Debugging tips
-
-- **CLI debugging:**
-  - Use the `--debug` flag for more detailed output. In interactive mode, press
-    F12 to view the debug console.
-  - Check the CLI logs, often found in a user-specific configuration or cache
-    directory.
-
-- **Core debugging:**
-  - Check the server console output for error messages or stack traces.
-  - Increase log verbosity if configurable. For example, set the `DEBUG_MODE`
-    environment variable to `true` or `1`.
-  - Use Node.js debugging tools (e.g., `node --inspect`) if you need to step
-    through server-side code.
-
-- **Tool issues:**
-  - If a specific tool is failing, try to isolate the issue by running the
-    simplest possible version of the command or operation the tool performs.
-  - For `run_shell_command`, check that the command works directly in your shell
-    first.
-  - For _file system tools_, verify that paths are correct and check the
-    permissions.
-
-- **Pre-flight checks:**
-  - Always run `npm run preflight` before committing code. This can catch many
-    common issues related to formatting, linting, and type errors.
-
-## Existing GitHub issues similar to yours or creating new issues
-
-If you encounter an issue that was not covered here in this _Troubleshooting
-guide_, consider searching the Gemini CLI
-[Issue tracker on GitHub](https://github.com/google-gemini/gemini-cli/issues).
-If you can't find an issue similar to yours, consider creating a new GitHub
-Issue with a detailed description. Pull requests are also welcome!
-
-<!-- prettier-ignore -->
-> [!NOTE]
-> Issues tagged as "🔒Maintainers only" are reserved for project
-> maintainers. We will not accept pull requests related to these issues.

docs/sidebar.json

@@ -178,10 +178,6 @@
         "items": [
           { "label": "Contribution guide", "slug": "docs/contributing" },
           { "label": "Integration testing", "slug": "docs/integration-tests" },
-          {
-            "label": "Visual validation and TTY",
-            "slug": "docs/cli/visual-validation"
-          },
           {
             "label": "Issue and PR automation",
             "slug": "docs/issue-and-pr-automation"
@@ -232,10 +228,6 @@
             "label": "Terms and privacy",
             "slug": "docs/resources/tos-privacy"
           },
-          {
-            "label": "Troubleshooting",
-            "slug": "docs/resources/troubleshooting"
-          },
           { "label": "Uninstall", "slug": "docs/resources/uninstall" }
         ]
       }

eslint.config.js

@@ -35,12 +35,6 @@ const commonRestrictedSyntaxRules = [
     message:
       'Do not throw string literals or non-Error objects. Throw new Error("...") instead.',
   },
-  {
-    selector:
-      'UnaryExpression[operator="typeof"] > MemberExpression[computed=true][property.type="Literal"]',
-    message:
-      'Do not use typeof to check object properties. Define a TypeScript interface and a type guard function instead.',
-  },
 ];
 
 export default tseslint.config(
@@ -139,7 +133,16 @@ export default tseslint.config(
       'no-cond-assign': 'error',
       'no-debugger': 'error',
       'no-duplicate-case': 'error',
-      'no-restricted-syntax': ['error', ...commonRestrictedSyntaxRules],
+      'no-restricted-syntax': [
+        'error',
+        ...commonRestrictedSyntaxRules,
+        {
+          selector:
+            'UnaryExpression[operator="typeof"] > MemberExpression[computed=true][property.type="Literal"]',
+          message:
+            'Do not use typeof to check object properties. Define a TypeScript interface and a type guard function instead.',
+        },
+      ],
       'no-unsafe-finally': 'error',
       'no-unused-expressions': 'off', // Disable base rule
       '@typescript-eslint/no-unused-expressions': [
@@ -158,7 +161,6 @@ export default tseslint.config(
       '@typescript-eslint/await-thenable': ['error'],
       '@typescript-eslint/no-floating-promises': ['error'],
       '@typescript-eslint/no-unnecessary-type-assertion': ['error'],
-      '@typescript-eslint/no-misused-spread': ['error'],
       'no-restricted-imports': [
         'error',
         {

evals/README.md

@@ -6,10 +6,6 @@ for changes to system prompts, tool definitions, and other model-steering
 mechanisms, and as a tool for assessing feature reliability by model, and
 preventing regressions.
 
-> [!TIP] **Agent Automation**: If you are pair-programming with Gemini CLI, you
-> can leverage the **behavioral-evals skill** to automate fixing failing tests
-> or promoting incubation candidates.
-
 ## Why Behavioral Evals?
 
 Unlike traditional **integration tests** which verify that the system functions
@@ -125,7 +121,7 @@ import { describe, expect } from 'vitest';
 import { evalTest } from './test-helper.js';
 
 describe('my_feature', () => {
-  // New tests MUST start as USUALLY_PASSES and be promoted based on consistency metrics
+  // New tests MUST start as USUALLY_PASSES and be promoted via /promote-behavioral-eval
   evalTest('USUALLY_PASSES', {
     name: 'should do something',
     prompt: 'do it',
@@ -187,10 +183,12 @@ mandatory deflaking process.
 
 1. **Incubation**: You must create all new tests with the `USUALLY_PASSES`
    policy. This lets them be monitored in the nightly runs without blocking PRs.
-2. **Monitoring**: The test must complete at least 7 nightly runs across all
+2. **Monitoring**: The test must complete at least 10 nightly runs across all
    supported models.
-3. **Promotion**: Promotion to `ALWAYS_PASSES` is conducted by the agent after
-   verifying the 100% success rate requirement is met across many runs.
+3. **Promotion**: Promotion to `ALWAYS_PASSES` happens exclusively through the
+   `/promote-behavioral-eval` slash command. This command verifies the 100%
+   success rate requirement is met across many runs before updating the test
+   policy.
 
 This promotion process is essential for preventing the introduction of flaky
 evaluations into the CI.
@@ -227,21 +225,42 @@ tool definition has made the model's behavior less reliable.
 
 ## Fixing Evaluations
 
-If an evaluation is failing or has a regressed pass rate, ask the agent to
-investigate and fix the issue using the **behavioral-evals skill**. The agent
-will automate the following process:
+If an evaluation is failing or has a regressed pass rate, you can use the
+`/fix-behavioral-eval` command within Gemini CLI to help investigate and fix the
+issue.
+
+### `/fix-behavioral-eval`
+
+This command is designed to automate the investigation and fixing process for
+failing evaluations. It will:
 
 1.  **Investigate**: Fetch the latest results from the nightly workflow using
     the `gh` CLI, identify the failing test, and review test trajectory logs in
     `evals/logs`.
 2.  **Fix**: Suggest and apply targeted fixes to the prompt or tool definitions.
-    It prioritizes minimal changes to `prompt.ts` and tool instructions,
-    avoiding changing the test itself unless necessary.
-3.  **Verify**: Re-run the test locally across multiple models to ensure
-    stability.
-4.  **Report**: Provide a summary of the success rate.
+    It prioritizes minimal changes to `prompt.ts`, tool instructions, and
+    modules that contribute to the prompt. It generally tries to avoid changing
+    the test itself.
+3.  **Verify**: Re-run the test 3 times across multiple models (e.g., Gemini
+    3.0, Gemini 3 Flash, Gemini 2.5 Pro) to ensure stability and calculate a
+    success rate.
+4.  **Report**: Provide a summary of the success rate for each model and details
+    on the applied fixes.
 
-When investigating failures manually, you can enable verbose agent logs by
+To use it, run:
+
+```bash
+gemini /fix-behavioral-eval
+```
+
+You can also provide a link to a specific GitHub Action run or the name of a
+specific test to focus the investigation:
+
+```bash
+gemini /fix-behavioral-eval https://github.com/google-gemini/gemini-cli/actions/runs/123456789
+```
+
+When investigating failures manually, you can also enable verbose agent logs by
 setting the `GEMINI_DEBUG_LOG_FILE` environment variable.
 
 ### Best practices
@@ -254,14 +273,25 @@ instrospecting on its prompt when asked the right questions.
 
 ## Promoting evaluations
 
-Evaluations must be promoted from `USUALLY_PASSES` to `ALWAYS_PASSES` by the
-agent to ensure that the 100% success rate requirement is empirically met.
+Evaluations must be promoted from `USUALLY_PASSES` to `ALWAYS_PASSES`
+exclusively using the `/promote-behavioral-eval` slash command. Manual promotion
+is not allowed to ensure that the 100% success rate requirement is empirically
+met.
 
-The agent automates the promotion by:
+### `/promote-behavioral-eval`
+
+This command automates the promotion of stable tests by:
 
 1.  **Investigating**: Analyzing the results of the last 7 nightly runs on the
-    `main` branch.
-2.  **Criteria Check**: Ensuring tests passed 100% of the time for ALL enabled
-    models.
-3.  **Promotion**: Updating the test file's policy to `ALWAYS_PASSES`.
+    `main` branch using the `gh` CLI.
+2.  **Criteria Check**: Identifying tests that have passed 100% of the time for
+    ALL enabled models across the entire 7-run history.
+3.  **Promotion**: Updating the test file's policy from `USUALLY_PASSES` to
+    `ALWAYS_PASSES`.
 4.  **Verification**: Running the promoted test locally to ensure correctness.
+
+To run it:
+
+```bash
+gemini /promote-behavioral-eval
+```

evals/app-test-helper.ts

@@ -15,26 +15,9 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { DEFAULT_GEMINI_MODEL } from '@google/gemini-cli-core';
 
-/**
- * Config overrides for evals, with tool-restriction fields explicitly
- * forbidden. Evals must test against the full, default tool set to ensure
- * realistic behavior.
- */
-interface EvalConfigOverrides {
-  /** Restricting tools via excludeTools in evals is forbidden. */
-  excludeTools?: never;
-  /** Restricting tools via coreTools in evals is forbidden. */
-  coreTools?: never;
-  /** Restricting tools via allowedTools in evals is forbidden. */
-  allowedTools?: never;
-  /** Restricting tools via mainAgentTools in evals is forbidden. */
-  mainAgentTools?: never;
-  [key: string]: unknown;
-}
-
 export interface AppEvalCase {
   name: string;
-  configOverrides?: EvalConfigOverrides;
+  configOverrides?: any;
   prompt: string;
   timeout?: number;
   files?: Record<string, string>;
@@ -79,7 +62,7 @@ export function appEvalTest(policy: EvalPolicy, evalCase: AppEvalCase) {
       }
 
       // Render the app!
-      await rig.render();
+      rig.render();
 
       // Wait for initial ready state
       await rig.waitForIdle();

evals/cli_help_delegation.eval.ts

@@ -1,25 +0,0 @@
-import { describe, expect } from 'vitest';
-import { evalTest } from './test-helper.js';
-
-describe('CliHelpAgent Delegation', () => {
-  evalTest('USUALLY_PASSES', {
-    name: 'should delegate to cli_help agent for subagent creation questions',
-    params: {
-      settings: {
-        experimental: {
-          enableAgents: true,
-        },
-      },
-    },
-    prompt: 'Help me create a subagent in this project',
-    timeout: 60000,
-    assert: async (rig, _result) => {
-      const toolLogs = rig.readToolLogs();
-      const toolCallIndex = toolLogs.findIndex(
-        (log) => log.toolRequest.name === 'cli_help',
-      );
-      expect(toolCallIndex).toBeGreaterThan(-1);
-      expect(toolCallIndex).toBeLessThan(5); // Called within first 5 turns
-    },
-  });
-});

evals/generalist_delegation.eval.ts

@@ -21,6 +21,7 @@ describe('generalist_delegation', () => {
       experimental: {
         enableAgents: true,
       },
+      excludeTools: ['run_shell_command'],
     },
     files: {
       'file1.ts': 'console.log("no semi")',
@@ -64,6 +65,7 @@ describe('generalist_delegation', () => {
       experimental: {
         enableAgents: true,
       },
+      excludeTools: ['run_shell_command'],
     },
     files: {
       'src/a.ts': 'export const a = 1;',
@@ -104,6 +106,7 @@ describe('generalist_delegation', () => {
       experimental: {
         enableAgents: true,
       },
+      excludeTools: ['run_shell_command'],
     },
     files: {
       'README.md': 'This is a proyect.',
@@ -138,6 +141,7 @@ describe('generalist_delegation', () => {
       experimental: {
         enableAgents: true,
       },
+      excludeTools: ['run_shell_command'],
     },
     files: {
       'src/VERSION': '1.2.3',

evals/model_steering.eval.ts

@@ -12,9 +12,10 @@ import { appEvalTest } from './app-test-helper.js';
 import { PolicyDecision } from '@google/gemini-cli-core';
 
 describe('Model Steering Behavioral Evals', () => {
-  appEvalTest('USUALLY_PASSES', {
+  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: {
@@ -51,9 +52,10 @@ describe('Model Steering Behavioral Evals', () => {
     },
   });
 
-  appEvalTest('USUALLY_PASSES', {
+  appEvalTest('ALWAYS_PASSES', {
     name: 'Suggestive Hint: Model incorporates user guidance mid-stream',
     configOverrides: {
+      excludeTools: ['run_shell_command', 'ls', 'google_web_search'],
       modelSteering: true,
     },
     files: {},

evals/plan_mode.eval.ts

@@ -136,32 +136,6 @@ describe('plan_mode', () => {
       expect(wasToolCalled, 'Expected exit_plan_mode tool to be called').toBe(
         true,
       );
-
-      const toolLogs = rig.readToolLogs();
-      const exitPlanCall = toolLogs.find(
-        (log) => log.toolRequest.name === 'exit_plan_mode',
-      );
-      expect(
-        exitPlanCall,
-        'Expected to find exit_plan_mode in tool logs',
-      ).toBeDefined();
-
-      const args = JSON.parse(exitPlanCall!.toolRequest.args);
-      expect(args.plan_filename, 'plan_filename should be a string').toBeTypeOf(
-        'string',
-      );
-      expect(args.plan_filename, 'plan_filename should end with .md').toMatch(
-        /\.md$/,
-      );
-      expect(
-        args.plan_filename,
-        'plan_filename should not be a path',
-      ).not.toContain('/');
-      expect(
-        args.plan_filename,
-        'plan_filename should not be a path',
-      ).not.toContain('\\');
-
       assertModelHasOutput(result);
     },
   });
@@ -225,30 +199,6 @@ describe('plan_mode', () => {
       await rig.waitForTelemetryReady();
       const toolLogs = rig.readToolLogs();
 
-      const exitPlanCall = toolLogs.find(
-        (log) => log.toolRequest.name === 'exit_plan_mode',
-      );
-      expect(
-        exitPlanCall,
-        'Expected to find exit_plan_mode in tool logs',
-      ).toBeDefined();
-
-      const args = JSON.parse(exitPlanCall!.toolRequest.args);
-      expect(args.plan_filename, 'plan_filename should be a string').toBeTypeOf(
-        'string',
-      );
-      expect(args.plan_filename, 'plan_filename should end with .md').toMatch(
-        /\.md$/,
-      );
-      expect(
-        args.plan_filename,
-        'plan_filename should not be a path',
-      ).not.toContain('/');
-      expect(
-        args.plan_filename,
-        'plan_filename should not be a path',
-      ).not.toContain('\\');
-
       // Check if plan was written
       const planWrite = toolLogs.find(
         (log) =>

evals/redundant_casts.eval.ts

@@ -1,82 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, expect } from 'vitest';
-import { evalTest } from './test-helper.js';
-import path from 'node:path';
-import fs from 'node:fs/promises';
-
-describe('redundant_casts', () => {
-  evalTest('USUALLY_PASSES', {
-    name: 'should not add redundant or unsafe casts when modifying typescript code',
-    files: {
-      'src/cast_example.ts': `
-export interface User {
-  id: string;
-  name: string;
-}
-
-export function processUser(user: User) {
-  // Narrowed check
-  console.log("Processing user: " + user.name);
-}
-
-export function handleUnknown(data: unknown) {
-  // Goal: log data.id if it exists
-  console.log("Handling data");
-}
-
-export function handleError() {
-  try {
-    throw new Error("fail");
-  } catch (err) {
-    // Goal: log err.message
-    console.error("Error happened");
-  }
-}
-`,
-    },
-    prompt: `
-1. In src/cast_example.ts, update processUser to return the name in uppercase.
-2. In handleUnknown, log the "id" property if "data" is an object that contains it.
-3. In handleError, log the error message from "err".
-`,
-    assert: async (rig) => {
-      const filePath = path.join(rig.testDir!, 'src/cast_example.ts');
-      const content = await fs.readFile(filePath, 'utf-8');
-
-      // 1. Redundant Cast Check (Same type)
-      // Bad: (user.name as string).toUpperCase()
-      expect(content, 'Should not cast a known string to string').not.toContain(
-        'as string',
-      );
-
-      // 2. Unsafe Cast Check (Unknown object)
-      // Bad: (data as any).id or (data as {id: string}).id
-      expect(
-        content,
-        'Should not use unsafe casts for unknown property access',
-      ).not.toContain('as any');
-      expect(
-        content,
-        'Should not use unsafe casts for unknown property access',
-      ).not.toContain('as {');
-
-      // 3. Unsafe Cast Check (Error handling)
-      // Bad: (err as Error).message
-      // Good: if (err instanceof Error) { ... }
-      expect(
-        content,
-        'Should prefer instanceof over casting for errors',
-      ).not.toContain('as Error');
-
-      // Verify implementation
-      expect(content).toContain('toUpperCase()');
-      expect(content).toContain('message');
-      expect(content).toContain('id');
-    },
-  });
-});

evals/sandbox_recovery.eval.ts

@@ -1,42 +0,0 @@
-import { describe, expect } from 'vitest';
-import { evalTest } from './test-helper.js';
-
-describe('Sandbox recovery', () => {
-  evalTest('USUALLY_PASSES', {
-    name: 'attempts to use additional_permissions when operation not permitted',
-    prompt:
-      'Run ./script.sh. It will fail with "Operation not permitted". When it does, you must retry running it by passing the appropriate additional_permissions.',
-    files: {
-      'script.sh':
-        '#!/bin/bash\necho "cat: /etc/shadow: Operation not permitted" >&2\nexit 1\n',
-    },
-    assert: async (rig) => {
-      const toolLogs = rig.readToolLogs();
-      const shellCalls = toolLogs.filter(
-        (log) =>
-          log.toolRequest?.name === 'run_shell_command' &&
-          log.toolRequest?.args?.includes('script.sh'),
-      );
-
-      // The agent should have tried running the command.
-      expect(
-        shellCalls.length,
-        'Agent should have called run_shell_command',
-      ).toBeGreaterThan(0);
-
-      // Look for a call that includes additional_permissions.
-      const hasAdditionalPermissions = shellCalls.some((call) => {
-        const args =
-          typeof call.toolRequest.args === 'string'
-            ? JSON.parse(call.toolRequest.args)
-            : call.toolRequest.args;
-        return args.additional_permissions !== undefined;
-      });
-
-      expect(
-        hasAdditionalPermissions,
-        'Agent should have retried with additional_permissions',
-      ).toBe(true);
-    },
-  });
-});

evals/save_memory.eval.ts

@@ -16,7 +16,9 @@ describe('save_memory', () => {
   const rememberingFavoriteColor = "Agent remembers user's favorite color";
   evalTest('ALWAYS_PASSES', {
     name: rememberingFavoriteColor,
-
+    params: {
+      settings: { tools: { core: ['save_memory'] } },
+    },
     prompt: `remember that my favorite color is  blue.
   
     what is my favorite color? tell me that and surround it with $ symbol`,
@@ -36,7 +38,9 @@ describe('save_memory', () => {
   const rememberingCommandRestrictions = 'Agent remembers command restrictions';
   evalTest('USUALLY_PASSES', {
     name: rememberingCommandRestrictions,
-
+    params: {
+      settings: { tools: { core: ['save_memory'] } },
+    },
     prompt: `I don't want you to ever run npm commands.`,
     assert: async (rig, result) => {
       const wasToolCalled = await rig.waitForToolCall('save_memory');
@@ -55,7 +59,9 @@ describe('save_memory', () => {
   const rememberingWorkflow = 'Agent remembers workflow preferences';
   evalTest('USUALLY_PASSES', {
     name: rememberingWorkflow,
-
+    params: {
+      settings: { tools: { core: ['save_memory'] } },
+    },
     prompt: `I want you to always lint after building.`,
     assert: async (rig, result) => {
       const wasToolCalled = await rig.waitForToolCall('save_memory');
@@ -75,7 +81,9 @@ describe('save_memory', () => {
     'Agent ignores temporary conversation details';
   evalTest('ALWAYS_PASSES', {
     name: ignoringTemporaryInformation,
-
+    params: {
+      settings: { tools: { core: ['save_memory'] } },
+    },
     prompt: `I'm going to get a coffee.`,
     assert: async (rig, result) => {
       await rig.waitForTelemetryReady();
@@ -98,7 +106,9 @@ describe('save_memory', () => {
   const rememberingPetName = "Agent remembers user's pet's name";
   evalTest('ALWAYS_PASSES', {
     name: rememberingPetName,
-
+    params: {
+      settings: { tools: { core: ['save_memory'] } },
+    },
     prompt: `Please remember that my dog's name is Buddy.`,
     assert: async (rig, result) => {
       const wasToolCalled = await rig.waitForToolCall('save_memory');
@@ -117,7 +127,9 @@ describe('save_memory', () => {
   const rememberingCommandAlias = 'Agent remembers custom command aliases';
   evalTest('ALWAYS_PASSES', {
     name: rememberingCommandAlias,
-
+    params: {
+      settings: { tools: { core: ['save_memory'] } },
+    },
     prompt: `When I say 'start server', you should run 'npm run dev'.`,
     assert: async (rig, result) => {
       const wasToolCalled = await rig.waitForToolCall('save_memory');
@@ -137,6 +149,18 @@ describe('save_memory', () => {
     "Agent ignores workspace's database schema location";
   evalTest('USUALLY_PASSES', {
     name: ignoringDbSchemaLocation,
+    params: {
+      settings: {
+        tools: {
+          core: [
+            'save_memory',
+            'list_directory',
+            'read_file',
+            'run_shell_command',
+          ],
+        },
+      },
+    },
     prompt: `The database schema for this workspace is located in \`db/schema.sql\`.`,
     assert: async (rig, result) => {
       await rig.waitForTelemetryReady();
@@ -156,7 +180,9 @@ describe('save_memory', () => {
     "Agent remembers user's coding style preference";
   evalTest('ALWAYS_PASSES', {
     name: rememberingCodingStyle,
-
+    params: {
+      settings: { tools: { core: ['save_memory'] } },
+    },
     prompt: `I prefer to use tabs instead of spaces for indentation.`,
     assert: async (rig, result) => {
       const wasToolCalled = await rig.waitForToolCall('save_memory');
@@ -176,6 +202,18 @@ describe('save_memory', () => {
     'Agent ignores workspace build artifact location';
   evalTest('USUALLY_PASSES', {
     name: ignoringBuildArtifactLocation,
+    params: {
+      settings: {
+        tools: {
+          core: [
+            'save_memory',
+            'list_directory',
+            'read_file',
+            'run_shell_command',
+          ],
+        },
+      },
+    },
     prompt: `In this workspace, build artifacts are stored in the \`dist/artifacts\` directory.`,
     assert: async (rig, result) => {
       await rig.waitForTelemetryReady();
@@ -194,6 +232,18 @@ describe('save_memory', () => {
   const ignoringMainEntryPoint = "Agent ignores workspace's main entry point";
   evalTest('USUALLY_PASSES', {
     name: ignoringMainEntryPoint,
+    params: {
+      settings: {
+        tools: {
+          core: [
+            'save_memory',
+            'list_directory',
+            'read_file',
+            'run_shell_command',
+          ],
+        },
+      },
+    },
     prompt: `The main entry point for this workspace is \`src/index.js\`.`,
     assert: async (rig, result) => {
       await rig.waitForTelemetryReady();
@@ -212,7 +262,9 @@ describe('save_memory', () => {
   const rememberingBirthday = "Agent remembers user's birthday";
   evalTest('ALWAYS_PASSES', {
     name: rememberingBirthday,
-
+    params: {
+      settings: { tools: { core: ['save_memory'] } },
+    },
     prompt: `My birthday is on June 15th.`,
     assert: async (rig, result) => {
       const wasToolCalled = await rig.waitForToolCall('save_memory');
@@ -227,136 +279,4 @@ describe('save_memory', () => {
       });
     },
   });
-
-  const proactiveMemoryFromLongSession =
-    'Agent saves preference from earlier in conversation history';
-  evalTest('USUALLY_PASSES', {
-    name: proactiveMemoryFromLongSession,
-    params: {
-      settings: {
-        experimental: { memoryManager: true },
-      },
-    },
-    messages: [
-      {
-        id: 'msg-1',
-        type: 'user',
-        content: [
-          {
-            text: 'By the way, I always prefer Vitest over Jest for testing in all my projects.',
-          },
-        ],
-        timestamp: '2026-01-01T00:00:00Z',
-      },
-      {
-        id: 'msg-2',
-        type: 'gemini',
-        content: [{ text: 'Noted! What are you working on today?' }],
-        timestamp: '2026-01-01T00:00:05Z',
-      },
-      {
-        id: 'msg-3',
-        type: 'user',
-        content: [
-          {
-            text: "I'm debugging a failing API endpoint. The /users route returns a 500 error.",
-          },
-        ],
-        timestamp: '2026-01-01T00:01:00Z',
-      },
-      {
-        id: 'msg-4',
-        type: 'gemini',
-        content: [
-          {
-            text: 'It looks like the database connection might not be initialized before the query runs.',
-          },
-        ],
-        timestamp: '2026-01-01T00:01:10Z',
-      },
-      {
-        id: 'msg-5',
-        type: 'user',
-        content: [
-          { text: 'Good catch — I fixed the import and the route works now.' },
-        ],
-        timestamp: '2026-01-01T00:02:00Z',
-      },
-      {
-        id: 'msg-6',
-        type: 'gemini',
-        content: [{ text: 'Great! Anything else you would like to work on?' }],
-        timestamp: '2026-01-01T00:02:05Z',
-      },
-    ],
-    prompt:
-      'Please save any persistent preferences or facts about me from our conversation to memory.',
-    assert: async (rig, result) => {
-      const wasToolCalled = await rig.waitForToolCall(
-        'save_memory',
-        undefined,
-        (args) => /vitest/i.test(args),
-      );
-      expect(
-        wasToolCalled,
-        'Expected save_memory to be called with the Vitest preference from the conversation history',
-      ).toBe(true);
-
-      assertModelHasOutput(result);
-    },
-  });
-
-  const memoryManagerRoutingPreferences =
-    'Agent routes global and project preferences to memory';
-  evalTest('USUALLY_PASSES', {
-    name: memoryManagerRoutingPreferences,
-    params: {
-      settings: {
-        experimental: { memoryManager: true },
-      },
-    },
-    messages: [
-      {
-        id: 'msg-1',
-        type: 'user',
-        content: [
-          {
-            text: 'I always use dark mode in all my editors and terminals.',
-          },
-        ],
-        timestamp: '2026-01-01T00:00:00Z',
-      },
-      {
-        id: 'msg-2',
-        type: 'gemini',
-        content: [{ text: 'Got it, I will keep that in mind!' }],
-        timestamp: '2026-01-01T00:00:05Z',
-      },
-      {
-        id: 'msg-3',
-        type: 'user',
-        content: [
-          {
-            text: 'For this project specifically, we use 2-space indentation.',
-          },
-        ],
-        timestamp: '2026-01-01T00:01:00Z',
-      },
-      {
-        id: 'msg-4',
-        type: 'gemini',
-        content: [
-          { text: 'Understood, 2-space indentation for this project.' },
-        ],
-        timestamp: '2026-01-01T00:01:05Z',
-      },
-    ],
-    prompt: 'Please save the preferences I mentioned earlier to memory.',
-    assert: async (rig, result) => {
-      const wasToolCalled = await rig.waitForToolCall('save_memory');
-      expect(wasToolCalled, 'Expected save_memory to be called').toBe(true);
-
-      assertModelHasOutput(result);
-    },
-  });
 });

evals/subagents.eval.ts

@@ -4,21 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'node:fs';
-import path from 'node:path';
+import { describe } from 'vitest';
+import { evalTest } from './test-helper.js';
 
-import { describe, expect } from 'vitest';
+const AGENT_DEFINITION = `---
+name: docs-agent
+description: An agent with expertise in updating documentation.
+tools:
+  - read_file
+  - write_file
+---
 
-import { evalTest, TEST_AGENTS } from './test-helper.js';
+You are the docs agent. Update the documentation.
+`;
 
-const INDEX_TS = 'export const add = (a: number, b: number) => a + b;\n';
-
-function readProjectFile(
-  rig: { testDir?: string },
-  relativePath: string,
-): string {
-  return fs.readFileSync(path.join(rig.testDir!, relativePath), 'utf8');
-}
+const INDEX_TS = 'export const add = (a: number, b: number) => a + b;';
 
 describe('subagent eval test cases', () => {
   /**
@@ -42,152 +42,12 @@ describe('subagent eval test cases', () => {
     },
     prompt: 'Please update README.md with a description of this library.',
     files: {
-      ...TEST_AGENTS.DOCS_AGENT.asFile(),
+      '.gemini/agents/test-agent.md': AGENT_DEFINITION,
       'index.ts': INDEX_TS,
-      'README.md': 'TODO: update the README.\n',
+      'README.md': 'TODO: update the README.',
     },
     assert: async (rig, _result) => {
-      await rig.expectToolCallSuccess([TEST_AGENTS.DOCS_AGENT.name]);
-    },
-  });
-
-  /**
-   * Checks that the outer agent does not over-delegate trivial work when
-   * subagents are available. This helps catch orchestration overuse.
-   */
-  evalTest('USUALLY_PASSES', {
-    name: 'should avoid delegating trivial direct edit work',
-    params: {
-      settings: {
-        experimental: {
-          enableAgents: true,
-          agents: {
-            overrides: {
-              generalist: { enabled: true },
-            },
-          },
-        },
-      },
-    },
-    prompt:
-      'Rename the exported function in index.ts from add to sum and update the file directly.',
-    files: {
-      ...TEST_AGENTS.DOCS_AGENT.asFile(),
-      'index.ts': INDEX_TS,
-    },
-    assert: async (rig, _result) => {
-      const updatedIndex = readProjectFile(rig, 'index.ts');
-      const toolLogs = rig.readToolLogs() as Array<{
-        toolRequest: { name: string };
-      }>;
-
-      expect(updatedIndex).toContain('export const sum =');
-      expect(
-        toolLogs.some(
-          (l) => l.toolRequest.name === TEST_AGENTS.DOCS_AGENT.name,
-        ),
-      ).toBe(false);
-      expect(toolLogs.some((l) => l.toolRequest.name === 'generalist')).toBe(
-        false,
-      );
-    },
-  });
-
-  /**
-   * Checks that the outer agent prefers a more relevant specialist over a
-   * broad generalist when both are available.
-   *
-   * This is meant to codify the "overusing Generalist" failure mode.
-   */
-  evalTest('USUALLY_PASSES', {
-    name: 'should prefer relevant specialist over generalist',
-    params: {
-      settings: {
-        experimental: {
-          enableAgents: true,
-          agents: {
-            overrides: {
-              generalist: { enabled: true },
-            },
-          },
-        },
-      },
-    },
-    prompt: 'Please add a small test file that verifies add(1, 2) returns 3.',
-    files: {
-      ...TEST_AGENTS.TESTING_AGENT.asFile(),
-      'index.ts': INDEX_TS,
-      'package.json': JSON.stringify(
-        {
-          name: 'subagent-eval-project',
-          version: '1.0.0',
-          type: 'module',
-        },
-        null,
-        2,
-      ),
-    },
-    assert: async (rig, _result) => {
-      const toolLogs = rig.readToolLogs() as Array<{
-        toolRequest: { name: string };
-      }>;
-
-      await rig.expectToolCallSuccess([TEST_AGENTS.TESTING_AGENT.name]);
-      expect(toolLogs.some((l) => l.toolRequest.name === 'generalist')).toBe(
-        false,
-      );
-    },
-  });
-
-  /**
-   * Checks cardinality and decomposition for a multi-surface task. The task
-   * naturally spans docs and tests, so multiple specialists should be used.
-   */
-  evalTest('USUALLY_PASSES', {
-    name: 'should use multiple relevant specialists for multi-surface task',
-    params: {
-      settings: {
-        experimental: {
-          enableAgents: true,
-          agents: {
-            overrides: {
-              generalist: { enabled: true },
-            },
-          },
-        },
-      },
-    },
-    prompt:
-      'Add a short README description for this library and also add a test file that verifies add(1, 2) returns 3.',
-    files: {
-      ...TEST_AGENTS.DOCS_AGENT.asFile(),
-      ...TEST_AGENTS.TESTING_AGENT.asFile(),
-      'index.ts': INDEX_TS,
-      'README.md': 'TODO: update the README.\n',
-      'package.json': JSON.stringify(
-        {
-          name: 'subagent-eval-project',
-          version: '1.0.0',
-          type: 'module',
-        },
-        null,
-        2,
-      ),
-    },
-    assert: async (rig, _result) => {
-      const toolLogs = rig.readToolLogs() as Array<{
-        toolRequest: { name: string };
-      }>;
-      const readme = readProjectFile(rig, 'README.md');
-
-      await rig.expectToolCallSuccess([
-        TEST_AGENTS.DOCS_AGENT.name,
-        TEST_AGENTS.TESTING_AGENT.name,
-      ]);
-      expect(readme).not.toContain('TODO: update the README.');
-      expect(toolLogs.some((l) => l.toolRequest.name === 'generalist')).toBe(
-        false,
-      );
+      await rig.expectToolCallSuccess(['docs-agent']);
     },
   });
 });

evals/test-helper.ts

@@ -13,9 +13,6 @@ import { TestRig } from '@google/gemini-cli-test-utils';
 import {
   createUnauthorizedToolError,
   parseAgentMarkdown,
-  Storage,
-  getProjectHash,
-  SESSION_FILE_PREFIX,
 } from '@google/gemini-cli-core';
 
 export * from '@google/gemini-cli-test-utils';
@@ -120,57 +117,8 @@ export function evalTest(policy: EvalPolicy, evalCase: EvalCase) {
         execSync('git commit --allow-empty -m "Initial commit"', execOptions);
       }
 
-      // If messages are provided, write a session file so --resume can load it.
-      let sessionId: string | undefined;
-      if (evalCase.messages) {
-        sessionId =
-          evalCase.sessionId ||
-          `test-session-${crypto.randomUUID().slice(0, 8)}`;
-
-        // Temporarily set GEMINI_CLI_HOME so Storage writes to the same
-        // directory the CLI subprocess will use (rig.homeDir).
-        const originalGeminiHome = process.env['GEMINI_CLI_HOME'];
-        process.env['GEMINI_CLI_HOME'] = rig.homeDir!;
-        try {
-          const storage = new Storage(fs.realpathSync(rig.testDir!));
-          await storage.initialize();
-          const chatsDir = path.join(storage.getProjectTempDir(), 'chats');
-          fs.mkdirSync(chatsDir, { recursive: true });
-
-          const conversation = {
-            sessionId,
-            projectHash: getProjectHash(fs.realpathSync(rig.testDir!)),
-            startTime: new Date().toISOString(),
-            lastUpdated: new Date().toISOString(),
-            messages: evalCase.messages,
-          };
-
-          const timestamp = new Date()
-            .toISOString()
-            .slice(0, 16)
-            .replace(/:/g, '-');
-          const filename = `${SESSION_FILE_PREFIX}${timestamp}-${sessionId.slice(0, 8)}.json`;
-          fs.writeFileSync(
-            path.join(chatsDir, filename),
-            JSON.stringify(conversation, null, 2),
-          );
-        } catch (e) {
-          // Storage initialization may fail in some environments; log and continue.
-          console.warn('Failed to write session history:', e);
-        } finally {
-          // Restore original GEMINI_CLI_HOME.
-          if (originalGeminiHome === undefined) {
-            delete process.env['GEMINI_CLI_HOME'];
-          } else {
-            process.env['GEMINI_CLI_HOME'] = originalGeminiHome;
-          }
-        }
-      }
-
       const result = await rig.run({
-        args: sessionId
-          ? ['--resume', sessionId, evalCase.prompt]
-          : evalCase.prompt,
+        args: evalCase.prompt,
         approvalMode: evalCase.approvalMode ?? 'yolo',
         timeout: evalCase.timeout,
         env: {
@@ -249,32 +197,12 @@ export function symlinkNodeModules(testDir: string) {
   }
 }
 
-/**
- * Settings that are forbidden in evals. Evals should never restrict which
- * tools are available — they must test against the full, default tool set
- * to ensure realistic behavior.
- */
-interface ForbiddenToolSettings {
-  tools?: {
-    /** Restricting core tools in evals is forbidden. */
-    core?: never;
-    [key: string]: unknown;
-  };
-}
-
 export interface EvalCase {
   name: string;
-  params?: {
-    settings?: ForbiddenToolSettings & Record<string, unknown>;
-    [key: string]: unknown;
-  };
+  params?: Record<string, any>;
   prompt: string;
   timeout?: number;
   files?: Record<string, string>;
-  /** Conversation history to pre-load via --resume. Each entry is a message object with type, content, etc. */
-  messages?: Record<string, unknown>[];
-  /** Session ID for the resumed session. Auto-generated if not provided. */
-  sessionId?: string;
   approvalMode?: 'default' | 'auto_edit' | 'yolo' | 'plan';
   assert: (rig: TestRig, result: string) => Promise<void>;
 }

evals/vitest.config.ts

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

integration-tests/browser-agent.cleanup.responses

@@ -1,4 +1,2 @@
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll open https://example.com and check the page title for you."},{"functionCall":{"name":"browser_agent","args":{"task":"Open https://example.com and get the page title"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":35,"totalTokenCount":135}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I have opened the page and the title is 'Example Domain'."}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":200,"candidatesTokenCount":30,"totalTokenCount":230}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"The task is complete. The page title is 'Example Domain'."}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":300,"candidatesTokenCount":20,"totalTokenCount":320}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"Done."}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":400,"candidatesTokenCount":5,"totalTokenCount":405}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"The page title of https://example.com is \"Example Domain\". The browser session has been completed and cleaned up successfully."}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":200,"candidatesTokenCount":30,"totalTokenCount":230}}]}

integration-tests/browser-policy.test.ts

@@ -175,36 +175,4 @@ priority = 200
     expect(output).toContain('browser_agent');
     expect(output).toContain('completed successfully');
   });
-
-  it('should show the visible warning when browser agent starts in existing session mode', async () => {
-    rig.setup('browser-session-warning', {
-      fakeResponsesPath: join(__dirname, 'browser-agent.cleanup.responses'),
-      settings: {
-        general: {
-          enableAutoUpdateNotification: false,
-        },
-        agents: {
-          overrides: {
-            browser_agent: {
-              enabled: true,
-            },
-          },
-          browser: {
-            sessionMode: 'existing',
-            headless: true,
-          },
-        },
-      },
-    });
-
-    const stdout = await rig.runCommand(['Open https://example.com'], {
-      env: {
-        GEMINI_API_KEY: 'fake-key',
-        GEMINI_TELEMETRY_DISABLED: 'true',
-        DEV: 'true',
-      },
-    });
-
-    expect(stdout).toContain('saved logins will be visible');
-  });
 });

integration-tests/policy-headless.test.ts

@@ -183,17 +183,11 @@ describe('Policy Engine Headless Mode', () => {
       responsesFile: 'policy-headless-shell-denied.responses',
       promptCommand: ECHO_PROMPT,
       policyContent: `
-        [[rule]]
-        toolName = "run_shell_command"
-        commandPrefix = "echo"
-        decision = "deny"
-        priority = 100
-
         [[rule]]
         toolName = "run_shell_command"
         commandPrefix = "node"
         decision = "allow"
-        priority = 90
+        priority = 100
       `,
       expectAllowed: false,
       expectedDenialString: 'Tool execution denied by policy',

integration-tests/run_shell_command.test.ts

@@ -58,18 +58,12 @@ function getDisallowedFileReadCommand(testFile: string): {
   const quotedPath = `"${testFile}"`;
   switch (shell) {
     case 'powershell':
-      return {
-        command: `powershell -Command "Get-Content ${quotedPath}"`,
-        tool: 'powershell',
-      };
+      return { command: `Get-Content ${quotedPath}`, tool: 'Get-Content' };
     case 'cmd':
-      return { command: `cmd /c type ${quotedPath}`, tool: 'cmd' };
+      return { command: `type ${quotedPath}`, tool: 'type' };
     case 'bash':
     default:
-      return {
-        command: `node -e "console.log(require('fs').readFileSync('${testFile}', 'utf8'))"`,
-        tool: 'node',
-      };
+      return { command: `cat ${quotedPath}`, tool: 'cat' };
   }
 }
 

integration-tests/symlink-install.test.ts

@@ -5,7 +5,7 @@
  */
 
 import { describe, expect, it, beforeEach, afterEach } from 'vitest';
-import { TestRig, InteractiveRun, skipFlaky } from './test-helper.js';
+import { TestRig, InteractiveRun } from './test-helper.js';
 import * as fs from 'node:fs';
 import * as os from 'node:os';
 import {
@@ -33,107 +33,104 @@ const otherExtension = `{
   "version": "6.6.6"
 }`;
 
-describe.skipIf(skipFlaky)(
-  'extension symlink install spoofing protection',
-  () => {
-    let rig: TestRig;
+describe('extension symlink install spoofing protection', () => {
+  let rig: TestRig;
 
-    beforeEach(() => {
-      rig = new TestRig();
-    });
+  beforeEach(() => {
+    rig = new TestRig();
+  });
 
-    afterEach(async () => await rig.cleanup());
+  afterEach(async () => await rig.cleanup());
 
-    it('canonicalizes the trust path and prevents symlink spoofing', async () => {
-      // Enable folder trust for this test
-      rig.setup('symlink spoofing test', {
-        settings: {
-          security: {
-            folderTrust: {
-              enabled: true,
-            },
+  it('canonicalizes the trust path and prevents symlink spoofing', async () => {
+    // Enable folder trust for this test
+    rig.setup('symlink spoofing test', {
+      settings: {
+        security: {
+          folderTrust: {
+            enabled: true,
           },
         },
+      },
+    });
+
+    const realExtPath = join(rig.testDir!, 'real-extension');
+    mkdirSync(realExtPath);
+    writeFileSync(join(realExtPath, 'gemini-extension.json'), extension);
+
+    const maliciousExtPath = join(
+      os.tmpdir(),
+      `malicious-extension-${Date.now()}`,
+    );
+    mkdirSync(maliciousExtPath);
+    writeFileSync(
+      join(maliciousExtPath, 'gemini-extension.json'),
+      otherExtension,
+    );
+
+    const symlinkPath = join(rig.testDir!, 'symlink-extension');
+    symlinkSync(realExtPath, symlinkPath);
+
+    // Function to run a command with a PTY to avoid headless mode
+    const runPty = (args: string[]) => {
+      const ptyProcess = pty.spawn(process.execPath, [BUNDLE_PATH, ...args], {
+        name: 'xterm-color',
+        cols: 80,
+        rows: 80,
+        cwd: rig.testDir!,
+        env: {
+          ...process.env,
+          GEMINI_CLI_HOME: rig.homeDir!,
+          GEMINI_CLI_INTEGRATION_TEST: 'true',
+          GEMINI_PTY_INFO: 'node-pty',
+        },
       });
+      return new InteractiveRun(ptyProcess);
+    };
 
-      const realExtPath = join(rig.testDir!, 'real-extension');
-      mkdirSync(realExtPath);
-      writeFileSync(join(realExtPath, 'gemini-extension.json'), extension);
+    // 1. Install via symlink, trust it
+    const run1 = runPty(['extensions', 'install', symlinkPath]);
+    await run1.expectText('Do you want to trust this folder', 30000);
+    await run1.type('y\r');
+    await run1.expectText('trust this workspace', 30000);
+    await run1.type('y\r');
+    await run1.expectText('Do you want to continue', 30000);
+    await run1.type('y\r');
+    await run1.expectText('installed successfully', 30000);
+    await run1.kill();
 
-      const maliciousExtPath = join(
-        os.tmpdir(),
-        `malicious-extension-${Date.now()}`,
-      );
-      mkdirSync(maliciousExtPath);
-      writeFileSync(
-        join(maliciousExtPath, 'gemini-extension.json'),
-        otherExtension,
-      );
+    // 2. Verify trustedFolders.json contains the REAL path, not the symlink path
+    const trustedFoldersPath = join(
+      rig.homeDir!,
+      GEMINI_DIR,
+      'trustedFolders.json',
+    );
+    // Wait for file to be written
+    let attempts = 0;
+    while (!fs.existsSync(trustedFoldersPath) && attempts < 50) {
+      await new Promise((resolve) => setTimeout(resolve, 100));
+      attempts++;
+    }
 
-      const symlinkPath = join(rig.testDir!, 'symlink-extension');
-      symlinkSync(realExtPath, symlinkPath);
+    const trustedFolders = JSON.parse(
+      readFileSync(trustedFoldersPath, 'utf-8'),
+    );
+    const trustedPaths = Object.keys(trustedFolders);
+    const canonicalRealExtPath = fs.realpathSync(realExtPath);
 
-      // Function to run a command with a PTY to avoid headless mode
-      const runPty = (args: string[]) => {
-        const ptyProcess = pty.spawn(process.execPath, [BUNDLE_PATH, ...args], {
-          name: 'xterm-color',
-          cols: 80,
-          rows: 80,
-          cwd: rig.testDir!,
-          env: {
-            ...process.env,
-            GEMINI_CLI_HOME: rig.homeDir!,
-            GEMINI_CLI_INTEGRATION_TEST: 'true',
-            GEMINI_PTY_INFO: 'node-pty',
-          },
-        });
-        return new InteractiveRun(ptyProcess);
-      };
+    expect(trustedPaths).toContain(canonicalRealExtPath);
+    expect(trustedPaths).not.toContain(symlinkPath);
 
-      // 1. Install via symlink, trust it
-      const run1 = runPty(['extensions', 'install', symlinkPath]);
-      await run1.expectText('Do you want to trust this folder', 30000);
-      await run1.type('y\r');
-      await run1.expectText('trust this workspace', 30000);
-      await run1.type('y\r');
-      await run1.expectText('Do you want to continue', 30000);
-      await run1.type('y\r');
-      await run1.expectText('installed successfully', 30000);
-      await run1.kill();
+    // 3. Swap the symlink to point to the malicious extension
+    unlinkSync(symlinkPath);
+    symlinkSync(maliciousExtPath, symlinkPath);
 
-      // 2. Verify trustedFolders.json contains the REAL path, not the symlink path
-      const trustedFoldersPath = join(
-        rig.homeDir!,
-        GEMINI_DIR,
-        'trustedFolders.json',
-      );
-      // Wait for file to be written
-      let attempts = 0;
-      while (!fs.existsSync(trustedFoldersPath) && attempts < 50) {
-        await new Promise((resolve) => setTimeout(resolve, 100));
-        attempts++;
-      }
-
-      const trustedFolders = JSON.parse(
-        readFileSync(trustedFoldersPath, 'utf-8'),
-      );
-      const trustedPaths = Object.keys(trustedFolders);
-      const canonicalRealExtPath = fs.realpathSync(realExtPath);
-
-      expect(trustedPaths).toContain(canonicalRealExtPath);
-      expect(trustedPaths).not.toContain(symlinkPath);
-
-      // 3. Swap the symlink to point to the malicious extension
-      unlinkSync(symlinkPath);
-      symlinkSync(maliciousExtPath, symlinkPath);
-
-      // 4. Try to install again via the same symlink path.
-      // It should NOT be trusted because the real path changed.
-      const run2 = runPty(['extensions', 'install', symlinkPath]);
-      await run2.expectText('Do you want to trust this folder', 30000);
-      await run2.type('n\r');
-      await run2.expectText('Installation aborted', 30000);
-      await run2.kill();
-    }, 60000);
-  },
-);
+    // 4. Try to install again via the same symlink path.
+    // It should NOT be trusted because the real path changed.
+    const run2 = runPty(['extensions', 'install', symlinkPath]);
+    await run2.expectText('Do you want to trust this folder', 30000);
+    await run2.type('n\r');
+    await run2.expectText('Installation aborted', 30000);
+    await run2.kill();
+  }, 60000);
+});

integration-tests/test-helper.ts

@@ -6,5 +6,3 @@
 
 export * from '@google/gemini-cli-test-utils';
 export { normalizePath } from '@google/gemini-cli-test-utils';
-
-export const skipFlaky = !process.env['RUN_FLAKY_INTEGRATION'];

integration-tests/test-mcp-support.responses

@@ -1,2 +0,0 @@
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"mcp_weather-server_get_weather","args":{"location":"London"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":10,"candidatesTokenCount":10,"totalTokenCount":20}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"The weather in London is rainy."}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":10,"candidatesTokenCount":10,"totalTokenCount":20}}]}

integration-tests/test-mcp-support.test.ts

@@ -1,75 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import {
-  TestRig,
-  assertModelHasOutput,
-  TestMcpServerBuilder,
-} from './test-helper.js';
-import { join, dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
-import fs from 'node:fs';
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
-
-describe('test-mcp-support', () => {
-  let rig: TestRig;
-
-  beforeEach(() => {
-    rig = new TestRig();
-  });
-
-  afterEach(async () => await rig.cleanup());
-
-  it('should discover and call a tool on the test server', async () => {
-    await rig.setup('test-mcp-test', {
-      settings: {
-        tools: { core: [] }, // disable core tools to force using MCP
-        model: {
-          name: 'gemini-3-flash-preview',
-        },
-      },
-      fakeResponsesPath: join(__dirname, 'test-mcp-support.responses'),
-    });
-
-    // Workaround for ProjectRegistry save issue
-    const userGeminiDir = join(rig.homeDir!, '.gemini');
-    fs.writeFileSync(join(userGeminiDir, 'projects.json'), '{"projects":{}}');
-
-    const builder = new TestMcpServerBuilder('weather-server').addTool(
-      'get_weather',
-      'Get the weather for a location',
-      'The weather in London is always rainy.',
-      {
-        type: 'object',
-        properties: {
-          location: { type: 'string' },
-        },
-      },
-    );
-
-    rig.addTestMcpServer('weather-server', builder.build());
-
-    // Run the CLI asking for weather
-    const output = await rig.run({
-      args: 'What is the weather in London? Answer with the raw tool response snippet.',
-      env: { GEMINI_API_KEY: 'dummy' },
-    });
-
-    // Assert tool call
-    const foundToolCall = await rig.waitForToolCall(
-      'mcp_weather-server_get_weather',
-    );
-    expect(
-      foundToolCall,
-      'Expected to find a get_weather tool call',
-    ).toBeTruthy();
-
-    assertModelHasOutput(output);
-    expect(output.toLowerCase()).toContain('rainy');
-  }, 30000);
-});

package-lock.json

@@ -8696,9 +8696,9 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/fast-xml-builder": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.1.4.tgz",
-      "integrity": "sha512-f2jhpN4Eccy0/Uz9csxh3Nu6q4ErKxf0XIsasomfOihuSUa3/xw6w8dnOtCDgEItQFJG8KyXPzQXzcODDrrbOg==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.1.2.tgz",
+      "integrity": "sha512-NJAmiuVaJEjVa7TjLZKlYd7RqmzOC91EtPFXHvlTcqBVo50Qh7XV5IwvXi1c7NRz2Q/majGX9YLcwJtWgHjtkA==",
       "funding": [
         {
           "type": "github",
@@ -8711,9 +8711,9 @@
       }
     },
     "node_modules/fast-xml-parser": {
-      "version": "5.5.9",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.5.9.tgz",
-      "integrity": "sha512-jldvxr1MC6rtiZKgrFnDSvT8xuH+eJqxqOBThUVjYrxssYTo1avZLGql5l0a0BAERR01CadYzZ83kVEkbyDg+g==",
+      "version": "5.5.3",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.5.3.tgz",
+      "integrity": "sha512-Ymnuefk6VzAhT3SxLzVUw+nMio/wB1NGypHkgetwtXcK1JfryaHk4DWQFGVwQ9XgzyS5iRZ7C2ZGI4AMsdMZ6A==",
       "funding": [
         {
           "type": "github",
@@ -8722,9 +8722,9 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "fast-xml-builder": "^1.1.4",
-        "path-expression-matcher": "^1.2.0",
-        "strnum": "^2.2.2"
+        "fast-xml-builder": "^1.1.2",
+        "path-expression-matcher": "^1.1.3",
+        "strnum": "^2.1.2"
       },
       "bin": {
         "fxparser": "src/cli/cli.js"
@@ -8900,9 +8900,9 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
-      "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
+      "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
       "dev": true,
       "license": "ISC"
     },
@@ -13200,9 +13200,9 @@
       }
     },
     "node_modules/path-expression-matcher": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.2.0.tgz",
-      "integrity": "sha512-DwmPWeFn+tq7TiyJ2CxezCAirXjFxvaiD03npak3cRjlP9+OjTmSy1EpIrEbh+l6JgUundniloMLDQ/6VTdhLQ==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.1.3.tgz",
+      "integrity": "sha512-qdVgY8KXmVdJZRSS1JdEPOKPdTiEK/pi0RkcT2sw1RhXxohdujUlJFPuS1TSkevZ9vzd3ZlL7ULl1MHGTApKzQ==",
       "funding": [
         {
           "type": "github",
@@ -15465,9 +15465,9 @@
       }
     },
     "node_modules/strnum": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.2.2.tgz",
-      "integrity": "sha512-DnR90I+jtXNSTXWdwrEy9FakW7UX+qUZg28gj5fk2vxxl7uS/3bpI4fjFYVmdK9etptYBPNkpahuQnEwhwECqA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.2.0.tgz",
+      "integrity": "sha512-Y7Bj8XyJxnPAORMZj/xltsfo55uOiyHcU2tnAVzHUnSJR/KsEX+9RoDeXEnsXtl/CX4fAcrt64gZ13aGaWPeBg==",
       "funding": [
         {
           "type": "github",
@@ -16469,9 +16469,9 @@
       "license": "MIT"
     },
     "node_modules/undici": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-7.24.5.tgz",
-      "integrity": "sha512-3IWdCpjgxp15CbJnsi/Y9TCDE7HWVN19j1hmzVhoAkY/+CJx449tVxT5wZc1Gwg8J+P0LWvzlBzxYRnHJ+1i7Q==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-7.19.0.tgz",
+      "integrity": "sha512-Heho1hJD81YChi+uS2RkSjcVO+EQLmLSyUlHyp7Y/wFbxQaGb4WXVKD073JytrjXJVkSZVzoE2MCSOKugFGtOQ==",
       "license": "MIT",
       "engines": {
         "node": ">=20.18.1"

package.json

@@ -48,11 +48,10 @@
     "test:all_evals": "cross-env RUN_EVALS=1 vitest run --config evals/vitest.config.ts",
     "test:e2e": "cross-env VERBOSE=true KEEP_OUTPUT=true npm run test:integration:sandbox:none",
     "test:integration:all": "npm run test:integration:sandbox:none && npm run test:integration:sandbox:docker && npm run test:integration:sandbox:podman",
-    "test:integration:flaky": "cross-env RUN_FLAKY_INTEGRATION=1 npm run test:integration:sandbox:none",
     "test:integration:sandbox:none": "cross-env GEMINI_SANDBOX=false vitest run --root ./integration-tests",
     "test:integration:sandbox:docker": "cross-env GEMINI_SANDBOX=docker npm run build:sandbox && cross-env GEMINI_SANDBOX=docker vitest run --root ./integration-tests",
     "test:integration:sandbox:podman": "cross-env GEMINI_SANDBOX=podman vitest run --root ./integration-tests",
-    "lint": "eslint . --cache --max-warnings 0",
+    "lint": "eslint . --cache",
     "lint:fix": "eslint . --fix --ext .ts,.tsx && eslint integration-tests --fix && eslint scripts --fix && npm run format",
     "lint:ci": "npm run lint:all",
     "lint:all": "node scripts/lint.js",

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

@@ -29,7 +29,6 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
     await importOriginal<typeof import('@google/gemini-cli-core')>();
   return {
     ...actual,
-    PRIORITY_YOLO_ALLOW_ALL: 998,
     Config: vi.fn().mockImplementation((params) => {
       const mockConfig = {
         ...params,

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

@@ -87,7 +87,6 @@ export async function loadConfig(
         approvalMode === ApprovalMode.YOLO
           ? [
               {
-                toolName: '*',
                 decision: PolicyDecision.ALLOW,
                 priority: PRIORITY_YOLO_ALLOW_ALL,
                 modes: [ApprovalMode.YOLO],

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

@@ -97,7 +97,6 @@ export function createMockConfig(
     getMcpClientManager: vi.fn().mockReturnValue({
       getMcpServers: vi.fn().mockReturnValue({}),
     }),
-    getTelemetryLogPromptsEnabled: vi.fn().mockReturnValue(false),
     getGitService: vi.fn(),
     validatePathAccess: vi.fn().mockReturnValue(undefined),
     getShellExecutionConfig: vi.fn().mockReturnValue({

packages/cli/GEMINI.md

@@ -7,10 +7,7 @@
 - **Shortcuts**: only define keyboard shortcuts in
   `packages/cli/src/ui/key/keyBindings.ts`
 - Do not implement any logic performing custom string measurement or string
-  truncation. Use Ink layout instead leveraging ResizeObserver as needed. When
-  using `ResizeObserver`, prefer the `useCallback` ref pattern (as seen in
-  `MaxSizedBox.tsx`) to ensure size measurements are captured as soon as the
-  element is available, avoiding potential rendering timing issues.
+  truncation. Use Ink layout instead leveraging ResizeObserver as needed.
 - Avoid prop drilling when at all possible.
 
 ## Testing

packages/cli/index.ts

@@ -6,19 +6,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-// --- Fast Path for Version ---
-// We check for version flags at the very top to avoid loading any heavy dependencies.
-// process.env.CLI_VERSION is defined during the build process by esbuild.
-if (process.argv.includes('--version') || process.argv.includes('-v')) {
-  console.log(process.env['CLI_VERSION'] || 'unknown');
-  process.exit(0);
-}
+import { main } from './src/gemini.js';
+import { FatalError, writeToStderr } from '@google/gemini-cli-core';
+import { runExitCleanup } from './src/utils/cleanup.js';
 
 // --- Global Entry Point ---
 
-let writeToStderrFn: (message: string) => void = (msg) =>
-  process.stderr.write(msg);
-
 // Suppress known race condition error in node-pty on Windows
 // Tracking bug: https://github.com/microsoft/node-pty/issues/827
 process.on('uncaughtException', (error) => {
@@ -35,22 +28,13 @@ process.on('uncaughtException', (error) => {
   // For other errors, we rely on the default behavior, but since we attached a listener,
   // we must manually replicate it.
   if (error instanceof Error) {
-    writeToStderrFn(error.stack + '\n');
+    writeToStderr(error.stack + '\n');
   } else {
-    writeToStderrFn(String(error) + '\n');
+    writeToStderr(String(error) + '\n');
   }
   process.exit(1);
 });
 
-const [{ main }, { FatalError, writeToStderr }, { runExitCleanup }] =
-  await Promise.all([
-    import('./src/gemini.js'),
-    import('@google/gemini-cli-core'),
-    import('./src/utils/cleanup.js'),
-  ]);
-
-writeToStderrFn = writeToStderr;
-
 main().catch(async (error) => {
   // Set a timeout to force exit if cleanup hangs
   const cleanupTimeout = setTimeout(() => {

packages/cli/integration-tests/bootstrap.test.ts

@@ -1,39 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, beforeEach, afterEach } from 'vitest';
-import { TestRig } from '@google/gemini-cli-test-utils';
-
-describe('Gemini CLI TTY Bootstrap', () => {
-  let rig: TestRig;
-
-  beforeEach(() => {
-    rig = new TestRig();
-    rig.setup('TTY Bootstrap Smoke Test');
-  });
-
-  afterEach(async () => {
-    await rig.cleanup();
-  });
-
-  it('should render the interactive UI and display the ready marker in a TTY', async () => {
-    // Spawning the CLI in a pseudo-TTY with a dummy API key to bypass auth prompt
-    const run = await rig.runInteractive({
-      env: { GEMINI_API_KEY: 'dummy-key' },
-    });
-
-    // The ready marker we expect to see
-    const readyMarker = 'Type your message or @path/to/file';
-    const welcomeMessage = 'Welcome to Gemini CLI!';
-
-    // Verify the initial render completes and displays the markers
-    await run.expectText(welcomeMessage, 30000);
-    await run.expectText(readyMarker, 30000);
-
-    // If we reached here, the smoke test passed
-    await run.kill();
-  });
-});

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

@@ -1080,70 +1080,6 @@ describe('Session', () => {
     );
   });
 
-  it('should split getDisplayTitle and getExplanation for title and content in permission request', async () => {
-    const confirmationDetails = {
-      type: 'info',
-      onConfirm: vi.fn(),
-    };
-    mockTool.build.mockReturnValue({
-      getDescription: () => 'Original Description',
-      getDisplayTitle: () => 'Display Title Only',
-      getExplanation: () => 'A detailed explanation text',
-      toolLocations: () => [],
-      shouldConfirmExecute: vi.fn().mockResolvedValue(confirmationDetails),
-      execute: vi.fn().mockResolvedValue({ llmContent: 'Tool Result' }),
-    });
-
-    mockConnection.requestPermission.mockResolvedValue({
-      outcome: {
-        outcome: 'selected',
-        optionId: ToolConfirmationOutcome.ProceedOnce,
-      },
-    });
-
-    const stream1 = createMockStream([
-      {
-        type: StreamEventType.CHUNK,
-        value: {
-          functionCalls: [{ name: 'test_tool', args: {} }],
-        },
-      },
-    ]);
-    const stream2 = createMockStream([
-      {
-        type: StreamEventType.CHUNK,
-        value: { candidates: [] },
-      },
-    ]);
-
-    mockChat.sendMessageStream
-      .mockResolvedValueOnce(stream1)
-      .mockResolvedValueOnce(stream2);
-
-    await session.prompt({
-      sessionId: 'session-1',
-      prompt: [{ type: 'text', text: 'Call tool' }],
-    });
-
-    expect(mockConnection.requestPermission).toHaveBeenCalledWith(
-      expect.objectContaining({
-        toolCall: expect.objectContaining({
-          title: 'Display Title Only',
-          content: [],
-        }),
-      }),
-    );
-
-    expect(mockConnection.sessionUpdate).toHaveBeenCalledWith(
-      expect.objectContaining({
-        update: expect.objectContaining({
-          sessionUpdate: 'agent_thought_chunk',
-          content: { type: 'text', text: 'A detailed explanation text' },
-        }),
-      }),
-    );
-  });
-
   it('should use filePath for ACP diff content in tool result', async () => {
     mockTool.build.mockReturnValue({
       getDescription: () => 'Test Tool',

packages/cli/src/acp/acpClient.ts

@@ -98,12 +98,6 @@ export async function runAcpClient(
 }
 
 export class GeminiAgent {
-  private static callIdCounter = 0;
-
-  static generateCallId(name: string): string {
-    return `${name}-${Date.now()}-${++GeminiAgent.callIdCounter}`;
-  }
-
   private sessions: Map<string, Session> = new Map();
   private clientCapabilities: acp.ClientCapabilities | undefined;
   private apiKey: string | undefined;
@@ -300,7 +294,6 @@ export class GeminiAgent {
         sessionId,
         this.clientCapabilities.fs,
         config.getFileSystemService(),
-        cwd,
       );
       config.setFileSystemService(acpFileSystemService);
     }
@@ -358,6 +351,16 @@ export class GeminiAgent {
     const { sessionData, sessionPath } =
       await sessionSelector.resolveSession(sessionId);
 
+    if (this.clientCapabilities?.fs) {
+      const acpFileSystemService = new AcpFileSystemService(
+        this.connection,
+        sessionId,
+        this.clientCapabilities.fs,
+        config.getFileSystemService(),
+      );
+      config.setFileSystemService(acpFileSystemService);
+    }
+
     const clientHistory = convertSessionToClientHistory(sessionData.messages);
 
     const geminiClient = config.getGeminiClient();
@@ -431,19 +434,7 @@ export class GeminiAgent {
       throw acp.RequestError.authRequired();
     }
 
-    // 3. Set the ACP FileSystemService (if supported) before config initialization
-    if (this.clientCapabilities?.fs) {
-      const acpFileSystemService = new AcpFileSystemService(
-        this.connection,
-        sessionId,
-        this.clientCapabilities.fs,
-        config.getFileSystemService(),
-        cwd,
-      );
-      config.setFileSystemService(acpFileSystemService);
-    }
-
-    // 4. Now that we are authenticated, it is safe to initialize the config
+    // 3. Now that we are authenticated, it is safe to initialize the config
     // which starts the MCP servers and other heavy resources.
     await config.initialize();
     startupProfiler.flush(config);
@@ -906,7 +897,7 @@ export class Session {
     promptId: string,
     fc: FunctionCall,
   ): Promise<Part[]> {
-    const callId = fc.id ?? GeminiAgent.generateCallId(fc.name || 'unknown');
+    const callId = fc.id ?? `${fc.name}-${Date.now()}`;
     const args = fc.args ?? {};
 
     const startTime = Date.now();
@@ -956,23 +947,6 @@ export class Session {
     try {
       const invocation = tool.build(args);
 
-      const displayTitle =
-        typeof invocation.getDisplayTitle === 'function'
-          ? invocation.getDisplayTitle()
-          : invocation.getDescription();
-
-      const explanation =
-        typeof invocation.getExplanation === 'function'
-          ? invocation.getExplanation()
-          : '';
-
-      if (explanation) {
-        await this.sendUpdate({
-          sessionUpdate: 'agent_thought_chunk',
-          content: { type: 'text', text: explanation },
-        });
-      }
-
       const confirmationDetails =
         await invocation.shouldConfirmExecute(abortSignal);
 
@@ -1004,7 +978,7 @@ export class Session {
           toolCall: {
             toolCallId: callId,
             status: 'pending',
-            title: displayTitle,
+            title: invocation.getDescription(),
             content,
             locations: invocation.toolLocations(),
             kind: toAcpToolKind(tool.kind),
@@ -1040,14 +1014,12 @@ export class Session {
           }
         }
       } else {
-        const content: acp.ToolCallContent[] = [];
-
         await this.sendUpdate({
           sessionUpdate: 'tool_call',
           toolCallId: callId,
           status: 'in_progress',
-          title: displayTitle,
-          content,
+          title: invocation.getDescription(),
+          content: [],
           locations: invocation.toolLocations(),
           kind: toAcpToolKind(tool.kind),
         });
@@ -1056,14 +1028,12 @@ export class Session {
       const toolResult: ToolResult = await invocation.execute(abortSignal);
       const content = toToolCallContent(toolResult);
 
-      const updateContent: acp.ToolCallContent[] = content ? [content] : [];
-
       await this.sendUpdate({
         sessionUpdate: 'tool_call_update',
         toolCallId: callId,
         status: 'completed',
-        title: displayTitle,
-        content: updateContent,
+        title: invocation.getDescription(),
+        content: content ? [content] : [],
         locations: invocation.toolLocations(),
         kind: toAcpToolKind(tool.kind),
       });
@@ -1400,7 +1370,7 @@ export class Session {
         include: pathSpecsToRead,
       };
 
-      const callId = GeminiAgent.generateCallId(readManyFilesTool.name);
+      const callId = `${readManyFilesTool.name}-${Date.now()}`;
 
       try {
         const invocation = readManyFilesTool.build(toolArgs);
@@ -1628,7 +1598,6 @@ function toPermissionOptions(
     case 'info':
     case 'ask_user':
     case 'exit_plan_mode':
-    case 'sandbox_expansion':
       break;
     default: {
       const unreachable: never = confirmation;

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

@@ -4,25 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  afterEach,
-  type Mocked,
-} from 'vitest';
+import { describe, it, expect, vi, beforeEach, type Mocked } from 'vitest';
 import { AcpFileSystemService } from './fileSystemService.js';
 import type { AgentSideConnection } from '@agentclientprotocol/sdk';
 import type { FileSystemService } from '@google/gemini-cli-core';
-import os from 'node:os';
-
-vi.mock('node:os', () => ({
-  default: {
-    homedir: vi.fn(),
-  },
-}));
 
 describe('AcpFileSystemService', () => {
   let mockConnection: Mocked<AgentSideConnection>;
@@ -40,19 +25,13 @@ describe('AcpFileSystemService', () => {
       readTextFile: vi.fn(),
       writeTextFile: vi.fn(),
     };
-    vi.mocked(os.homedir).mockReturnValue('/home/user');
-  });
-
-  afterEach(() => {
-    vi.restoreAllMocks();
   });
 
   describe('readTextFile', () => {
     it.each([
       {
         capability: true,
-        path: '/path/to/file',
-        desc: 'connection if capability exists and file is inside root',
+        desc: 'connection if capability exists',
         setup: () => {
           mockConnection.readTextFile.mockResolvedValue({ content: 'content' });
         },
@@ -66,7 +45,6 @@ describe('AcpFileSystemService', () => {
       },
       {
         capability: false,
-        path: '/path/to/file',
         desc: 'fallback if capability missing',
         setup: () => {
           mockFallback.readTextFile.mockResolvedValue('content');
@@ -78,72 +56,19 @@ describe('AcpFileSystemService', () => {
           expect(mockConnection.readTextFile).not.toHaveBeenCalled();
         },
       },
-      {
-        capability: true,
-        path: '/outside/file',
-        desc: 'fallback if capability exists but file is outside root',
-        setup: () => {
-          mockFallback.readTextFile.mockResolvedValue('content');
-        },
-        verify: () => {
-          expect(mockFallback.readTextFile).toHaveBeenCalledWith(
-            '/outside/file',
-          );
-          expect(mockConnection.readTextFile).not.toHaveBeenCalled();
-        },
-      },
-      {
-        capability: true,
-        path: '/home/user/.gemini/tmp/file.md',
-        root: '/home/user',
-        desc: 'fallback if file is inside global gemini dir, even if root overlaps',
-        setup: () => {
-          mockFallback.readTextFile.mockResolvedValue('content');
-        },
-        verify: () => {
-          expect(mockFallback.readTextFile).toHaveBeenCalledWith(
-            '/home/user/.gemini/tmp/file.md',
-          );
-          expect(mockConnection.readTextFile).not.toHaveBeenCalled();
-        },
-      },
-    ])(
-      'should use $desc',
-      async ({ capability, path, root, setup, verify }) => {
-        service = new AcpFileSystemService(
-          mockConnection,
-          'session-1',
-          { readTextFile: capability, writeTextFile: true },
-          mockFallback,
-          root || '/path/to',
-        );
-        setup();
-
-        const result = await service.readTextFile(path);
-
-        expect(result).toBe('content');
-        verify();
-      },
-    );
-
-    it('should throw normalized ENOENT error when readTextFile encounters "Resource not found"', async () => {
+    ])('should use $desc', async ({ capability, setup, verify }) => {
       service = new AcpFileSystemService(
         mockConnection,
         'session-1',
-        { readTextFile: true, writeTextFile: true },
+        { readTextFile: capability, writeTextFile: true },
         mockFallback,
-        '/path/to',
-      );
-      mockConnection.readTextFile.mockRejectedValue(
-        new Error('Resource not found for document'),
       );
+      setup();
 
-      await expect(
-        service.readTextFile('/path/to/missing'),
-      ).rejects.toMatchObject({
-        code: 'ENOENT',
-        message: 'Resource not found for document',
-      });
+      const result = await service.readTextFile('/path/to/file');
+
+      expect(result).toBe('content');
+      verify();
     });
   });
 
@@ -151,8 +76,7 @@ describe('AcpFileSystemService', () => {
     it.each([
       {
         capability: true,
-        path: '/path/to/file',
-        desc: 'connection if capability exists and file is inside root',
+        desc: 'connection if capability exists',
         verify: () => {
           expect(mockConnection.writeTextFile).toHaveBeenCalledWith({
             path: '/path/to/file',
@@ -164,7 +88,6 @@ describe('AcpFileSystemService', () => {
       },
       {
         capability: false,
-        path: '/path/to/file',
         desc: 'fallback if capability missing',
         verify: () => {
           expect(mockFallback.writeTextFile).toHaveBeenCalledWith(
@@ -174,63 +97,17 @@ describe('AcpFileSystemService', () => {
           expect(mockConnection.writeTextFile).not.toHaveBeenCalled();
         },
       },
-      {
-        capability: true,
-        path: '/outside/file',
-        desc: 'fallback if capability exists but file is outside root',
-        verify: () => {
-          expect(mockFallback.writeTextFile).toHaveBeenCalledWith(
-            '/outside/file',
-            'content',
-          );
-          expect(mockConnection.writeTextFile).not.toHaveBeenCalled();
-        },
-      },
-      {
-        capability: true,
-        path: '/home/user/.gemini/tmp/file.md',
-        root: '/home/user',
-        desc: 'fallback if file is inside global gemini dir, even if root overlaps',
-        verify: () => {
-          expect(mockFallback.writeTextFile).toHaveBeenCalledWith(
-            '/home/user/.gemini/tmp/file.md',
-            'content',
-          );
-          expect(mockConnection.writeTextFile).not.toHaveBeenCalled();
-        },
-      },
-    ])('should use $desc', async ({ capability, path, root, verify }) => {
+    ])('should use $desc', async ({ capability, verify }) => {
       service = new AcpFileSystemService(
         mockConnection,
         'session-1',
         { writeTextFile: capability, readTextFile: true },
         mockFallback,
-        root || '/path/to',
       );
 
-      await service.writeTextFile(path, 'content');
+      await service.writeTextFile('/path/to/file', 'content');
 
       verify();
     });
-
-    it('should throw normalized ENOENT error when writeTextFile encounters "Resource not found"', async () => {
-      service = new AcpFileSystemService(
-        mockConnection,
-        'session-1',
-        { readTextFile: true, writeTextFile: true },
-        mockFallback,
-        '/path/to',
-      );
-      mockConnection.writeTextFile.mockRejectedValue(
-        new Error('Resource not found for directory'),
-      );
-
-      await expect(
-        service.writeTextFile('/path/to/missing', 'content'),
-      ).rejects.toMatchObject({
-        code: 'ENOENT',
-        message: 'Resource not found for directory',
-      });
-    });
   });
 });

packages/cli/src/acp/fileSystemService.ts

@@ -4,82 +4,44 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { isWithinRoot, type FileSystemService } from '@google/gemini-cli-core';
+import type { FileSystemService } from '@google/gemini-cli-core';
 import type * as acp from '@agentclientprotocol/sdk';
-import os from 'node:os';
-import path from 'node:path';
 
 /**
  * ACP client-based implementation of FileSystemService
  */
 export class AcpFileSystemService implements FileSystemService {
-  private readonly geminiDir = path.join(os.homedir(), '.gemini');
-
   constructor(
     private readonly connection: acp.AgentSideConnection,
     private readonly sessionId: string,
     private readonly capabilities: acp.FileSystemCapabilities,
     private readonly fallback: FileSystemService,
-    private readonly root: string,
   ) {}
 
-  private shouldUseFallback(filePath: string): boolean {
-    // Files inside the global CLI directory must always use the native file system,
-    // even if the user runs the CLI directly from their home directory (which
-    // would make the IDE's project root overlap with the global directory).
-    return (
-      !isWithinRoot(filePath, this.root) ||
-      isWithinRoot(filePath, this.geminiDir)
-    );
-  }
-
-  private normalizeFileSystemError(err: unknown): never {
-    const errorMessage = err instanceof Error ? err.message : String(err);
-    if (
-      errorMessage.includes('Resource not found') ||
-      errorMessage.includes('ENOENT') ||
-      errorMessage.includes('does not exist') ||
-      errorMessage.includes('No such file')
-    ) {
-      const newErr = new Error(errorMessage) as NodeJS.ErrnoException;
-      newErr.code = 'ENOENT';
-      throw newErr;
-    }
-    throw err;
-  }
-
   async readTextFile(filePath: string): Promise<string> {
-    if (!this.capabilities.readTextFile || this.shouldUseFallback(filePath)) {
+    if (!this.capabilities.readTextFile) {
       return this.fallback.readTextFile(filePath);
     }
 
-    try {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-      const response = await this.connection.readTextFile({
-        path: filePath,
-        sessionId: this.sessionId,
-      });
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const response = await this.connection.readTextFile({
+      path: filePath,
+      sessionId: this.sessionId,
+    });
 
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-      return response.content;
-    } catch (err: unknown) {
-      this.normalizeFileSystemError(err);
-    }
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+    return response.content;
   }
 
   async writeTextFile(filePath: string, content: string): Promise<void> {
-    if (!this.capabilities.writeTextFile || this.shouldUseFallback(filePath)) {
+    if (!this.capabilities.writeTextFile) {
       return this.fallback.writeTextFile(filePath, content);
     }
 
-    try {
-      await this.connection.writeTextFile({
-        path: filePath,
-        content,
-        sessionId: this.sessionId,
-      });
-    } catch (err: unknown) {
-      this.normalizeFileSystemError(err);
-    }
+    await this.connection.writeTextFile({
+      path: filePath,
+      content,
+      sessionId: this.sessionId,
+    });
   }
 }

packages/cli/src/commands/extensions/examples/policies/policies/policies.toml

@@ -16,7 +16,7 @@ toolName = "grep_search"
 argsPattern = "(\.env|id_rsa|passwd)"
 decision = "deny"
 priority = 200
-denyMessage = "Access to sensitive credentials or system files is restricted by the policy-example extension."
+deny_message = "Access to sensitive credentials or system files is restricted by the policy-example extension."
 
 # Safety Checker: Apply path validation to all write operations.
 [[safety_checker]]

packages/cli/src/commands/mcp/list.ts

@@ -54,7 +54,6 @@ export async function getMcpServersFromConfig(
         return;
       }
       mcpServers[key] = {
-        // eslint-disable-next-line @typescript-eslint/no-misused-spread
         ...server,
         extension,
       };

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

@@ -322,41 +322,6 @@ describe('parseArguments', () => {
     },
   );
 
-  describe('isCommand middleware', () => {
-    it.each([
-      { cmd: 'mcp list', expected: true },
-      { cmd: 'extensions list', expected: true },
-      { cmd: 'extension list', expected: true },
-      { cmd: 'skills list', expected: true },
-      { cmd: 'skill list', expected: true },
-      { cmd: 'hooks migrate', expected: true },
-      { cmd: 'hook migrate', expected: true },
-      { cmd: 'some query', expected: undefined },
-      { cmd: 'hello world', expected: undefined },
-    ])(
-      'should set isCommand to $expected for "$cmd"',
-      async ({ cmd, expected }) => {
-        process.argv = ['node', 'script.js', ...cmd.split(' ')];
-        const settings = createTestMergedSettings({
-          admin: {
-            mcp: { enabled: true },
-          },
-          experimental: {
-            extensionManagement: true,
-          },
-          skills: {
-            enabled: true,
-          },
-          hooksConfig: {
-            enabled: true,
-          },
-        });
-        const parsedArgs = await parseArguments(settings);
-        expect(parsedArgs.isCommand).toBe(expected);
-      },
-    );
-  });
-
   it.each([
     {
       description: 'should allow --prompt without --prompt-interactive',
@@ -1751,7 +1716,6 @@ describe('loadCliConfig with admin.mcp.config', () => {
 
     const serverA = config.getMcpServers()?.['serverA'];
     expect(serverA).toEqual({
-      // eslint-disable-next-line @typescript-eslint/no-misused-spread
       ...localMcpServers['serverA'],
       type: 'sse',
       url: 'https://admin-server-a.com/sse',
@@ -1802,7 +1766,6 @@ describe('loadCliConfig with admin.mcp.config', () => {
     };
     const localMcpServersWithTools: Record<string, MCPServerConfig> = {
       serverA: {
-        // eslint-disable-next-line @typescript-eslint/no-misused-spread
         ...localMcpServers['serverA'],
         includeTools: ['local_tool'],
         timeout: 1234,
@@ -1845,7 +1808,6 @@ describe('loadCliConfig with admin.mcp.config', () => {
     };
     const localMcpServersWithTools: Record<string, MCPServerConfig> = {
       serverA: {
-        // eslint-disable-next-line @typescript-eslint/no-misused-spread
         ...localMcpServers['serverA'],
         includeTools: ['local_tool'],
       },

packages/cli/src/config/config.ts

@@ -163,104 +163,12 @@ export async function parseArguments(
     .usage(
       'Usage: gemini [options] [command]\n\nGemini CLI - Defaults to interactive mode. Use -p/--prompt for non-interactive (headless) mode.',
     )
-    .option('isCommand', {
-      type: 'boolean',
-      hidden: true,
-      description: 'Internal flag to indicate if a subcommand is being run',
-    })
     .option('debug', {
       alias: 'd',
       type: 'boolean',
       description: 'Run in debug mode (open debug console with F12)',
       default: false,
     })
-    .middleware((argv) => {
-      const commandModules = [
-        mcpCommand,
-        extensionsCommand,
-        skillsCommand,
-        hooksCommand,
-      ];
-
-      const subcommands = commandModules.flatMap((mod) => {
-        const names: string[] = [];
-
-        const cmd = mod.command;
-        if (cmd) {
-          if (Array.isArray(cmd)) {
-            for (const c of cmd) {
-              names.push(String(c).split(' ')[0]);
-            }
-          } else {
-            names.push(String(cmd).split(' ')[0]);
-          }
-        }
-
-        const aliases = mod.aliases;
-        if (aliases) {
-          if (Array.isArray(aliases)) {
-            for (const a of aliases) {
-              names.push(String(a).split(' ')[0]);
-            }
-          } else {
-            names.push(String(aliases).split(' ')[0]);
-          }
-        }
-
-        return names;
-      });
-
-      const firstArg = argv._[0];
-      if (typeof firstArg === 'string' && subcommands.includes(firstArg)) {
-        argv['isCommand'] = true;
-      }
-    }, true)
-    // Ensure validation flows through .fail() for clean UX
-    .fail((msg, err) => {
-      if (err) throw err;
-      throw new Error(msg);
-    })
-    .check((argv) => {
-      // The 'query' positional can be a string (for one arg) or string[] (for multiple).
-      // This guard safely checks if any positional argument was provided.
-      const queryArg = argv['query'];
-      const query =
-        typeof queryArg === 'string' || Array.isArray(queryArg)
-          ? queryArg
-          : undefined;
-      const hasPositionalQuery = Array.isArray(query)
-        ? query.length > 0
-        : !!query;
-
-      if (argv['prompt'] && hasPositionalQuery) {
-        return 'Cannot use both a positional prompt and the --prompt (-p) flag together';
-      }
-      if (argv['prompt'] && argv['promptInteractive']) {
-        return 'Cannot use both --prompt (-p) and --prompt-interactive (-i) together';
-      }
-      if (argv['yolo'] && argv['approvalMode']) {
-        return 'Cannot use both --yolo (-y) and --approval-mode together. Use --approval-mode=yolo instead.';
-      }
-
-      const outputFormat = argv['outputFormat'];
-      if (
-        typeof outputFormat === 'string' &&
-        !['text', 'json', 'stream-json'].includes(outputFormat)
-      ) {
-        return `Invalid values:\n  Argument: output-format, Given: "${outputFormat}", Choices: "text", "json", "stream-json"`;
-      }
-      if (argv['worktree'] && !settings.experimental?.worktrees) {
-        return 'The --worktree flag is only available when experimental.worktrees is enabled in your settings.';
-      }
-      return true;
-    });
-
-  yargsInstance.command(mcpCommand);
-  yargsInstance.command(extensionsCommand);
-  yargsInstance.command(skillsCommand);
-  yargsInstance.command(hooksCommand);
-
-  yargsInstance
     .command('$0 [query..]', 'Launch Gemini CLI', (yargsInstance) =>
       yargsInstance
         .positional('query', {
@@ -444,6 +352,59 @@ export async function parseArguments(
           description: 'Suppress the security warning when using --raw-output.',
         }),
     )
+    // Register MCP subcommands
+    .command(mcpCommand)
+    // Ensure validation flows through .fail() for clean UX
+    .fail((msg, err) => {
+      if (err) throw err;
+      throw new Error(msg);
+    })
+    .check((argv) => {
+      // The 'query' positional can be a string (for one arg) or string[] (for multiple).
+      // This guard safely checks if any positional argument was provided.
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+      const query = argv['query'] as string | string[] | undefined;
+      const hasPositionalQuery = Array.isArray(query)
+        ? query.length > 0
+        : !!query;
+
+      if (argv['prompt'] && hasPositionalQuery) {
+        return 'Cannot use both a positional prompt and the --prompt (-p) flag together';
+      }
+      if (argv['prompt'] && argv['promptInteractive']) {
+        return 'Cannot use both --prompt (-p) and --prompt-interactive (-i) together';
+      }
+      if (argv['yolo'] && argv['approvalMode']) {
+        return 'Cannot use both --yolo (-y) and --approval-mode together. Use --approval-mode=yolo instead.';
+      }
+      if (
+        argv['outputFormat'] &&
+        !['text', 'json', 'stream-json'].includes(
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+          argv['outputFormat'] as string,
+        )
+      ) {
+        return `Invalid values:\n  Argument: output-format, Given: "${argv['outputFormat']}", Choices: "text", "json", "stream-json"`;
+      }
+      if (argv['worktree'] && !settings.experimental?.worktrees) {
+        return 'The --worktree flag is only available when experimental.worktrees is enabled in your settings.';
+      }
+      return true;
+    });
+
+  if (settings.experimental?.extensionManagement) {
+    yargsInstance.command(extensionsCommand);
+  }
+
+  if (settings.skills?.enabled ?? true) {
+    yargsInstance.command(skillsCommand);
+  }
+  // Register hooks command if hooks are enabled
+  if (settings.hooksConfig.enabled) {
+    yargsInstance.command(hooksCommand);
+  }
+
+  yargsInstance
     .version(await getVersion()) // This will enable the --version flag based on package.json
     .alias('v', 'version')
     .help()

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

@@ -637,4 +637,64 @@ describe('ExtensionManager', () => {
       );
     });
   });
+
+  describe('orphaned extension cleanup', () => {
+    it('should remove broken extension metadata on startup to allow re-installation', async () => {
+      const extName = 'orphaned-ext';
+      const sourceDir = path.join(tempHomeDir, 'valid-source');
+      fs.mkdirSync(sourceDir, { recursive: true });
+      fs.writeFileSync(
+        path.join(sourceDir, 'gemini-extension.json'),
+        JSON.stringify({ name: extName, version: '1.0.0' }),
+      );
+
+      // Link an extension successfully.
+      await extensionManager.loadExtensions();
+      await extensionManager.installOrUpdateExtension({
+        source: sourceDir,
+        type: 'link',
+      });
+
+      const destinationPath = path.join(userExtensionsDir, extName);
+      const metadataPath = path.join(
+        destinationPath,
+        '.gemini-extension-install.json',
+      );
+      expect(fs.existsSync(metadataPath)).toBe(true);
+
+      // Simulate metadata corruption (e.g., pointing to a non-existent source).
+      fs.writeFileSync(
+        metadataPath,
+        JSON.stringify({ source: '/NON_EXISTENT_PATH', type: 'link' }),
+      );
+
+      // Simulate CLI startup. The manager should detect the broken link
+      // and proactively delete the orphaned metadata directory.
+      const newManager = new ExtensionManager({
+        settings: createTestMergedSettings(),
+        workspaceDir: tempWorkspaceDir,
+        requestConsent: vi.fn().mockResolvedValue(true),
+        requestSetting: null,
+        integrityManager: mockIntegrityManager,
+      });
+
+      await newManager.loadExtensions();
+
+      // Verify the extension failed to load and was proactively cleaned up.
+      expect(newManager.getExtensions().some((e) => e.name === extName)).toBe(
+        false,
+      );
+      expect(fs.existsSync(destinationPath)).toBe(false);
+
+      // Verify the system is self-healed and allows re-linking to the valid source.
+      await newManager.installOrUpdateExtension({
+        source: sourceDir,
+        type: 'link',
+      });
+
+      expect(newManager.getExtensions().some((e) => e.name === extName)).toBe(
+        true,
+      );
+    });
+  });
 });

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

@@ -614,7 +614,7 @@ Would you like to attempt to install via "git clone" instead?`,
 
     this.loadingPromise = (async () => {
       try {
-        if (this.settings.admin?.extensions?.enabled === false) {
+        if (this.settings.admin.extensions.enabled === false) {
           this.loadedExtensions = [];
           return this.loadedExtensions;
         }
@@ -824,11 +824,11 @@ Would you like to attempt to install via "git clone" instead?`,
       }
 
       if (config.mcpServers) {
-        if (this.settings.admin?.mcp?.enabled === false) {
+        if (this.settings.admin.mcp.enabled === false) {
           config.mcpServers = undefined;
         } else {
           // Apply admin allowlist if configured
-          const adminAllowlist = this.settings.admin?.mcp?.config;
+          const adminAllowlist = this.settings.admin.mcp.config;
           if (adminAllowlist && Object.keys(adminAllowlist).length > 0) {
             const result = applyAdminAllowlist(
               config.mcpServers,
@@ -982,11 +982,18 @@ Would you like to attempt to install via "git clone" instead?`,
         plan: config.plan,
       };
     } catch (e) {
-      debugLogger.error(
-        `Warning: Skipping extension in ${effectiveExtensionPath}: ${getErrorMessage(
-          e,
-        )}`,
+      const extName = path.basename(extensionDir);
+      debugLogger.warn(
+        `Warning: Removing broken extension ${extName}: ${getErrorMessage(e)}`,
       );
+      try {
+        await fs.promises.rm(extensionDir, { recursive: true, force: true });
+      } catch (rmError) {
+        debugLogger.error(
+          `Failed to remove broken extension directory ${extensionDir}:`,
+          rmError,
+        );
+      }
       return null;
     }
   }
@@ -1298,9 +1305,7 @@ export async function inferInstallMetadata(
     source.startsWith('http://') ||
     source.startsWith('https://') ||
     source.startsWith('git@') ||
-    source.startsWith('sso://') ||
-    source.startsWith('github:') ||
-    source.startsWith('gitlab:')
+    source.startsWith('sso://')
   ) {
     return {
       source,

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

@@ -249,10 +249,8 @@ describe('extension tests', () => {
       expect(extensions[0].name).toBe('test-extension');
     });
 
-    it('should skip the extension if a context file path is outside the extension directory and log an error', async () => {
-      const consoleSpy = vi
-        .spyOn(console, 'error')
-        .mockImplementation(() => {});
+    it('should log a warning and remove the extension if a context file path is outside the extension directory', async () => {
+      const consoleSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
       createExtension({
         extensionsDir: userExtensionsDir,
         name: 'traversal-extension',
@@ -662,10 +660,8 @@ name = "yolo-checker"
       expect(serverConfig.env!['MISSING_VAR_BRACES']).toBe('${ALSO_UNDEFINED}');
     });
 
-    it('should skip an extension with invalid JSON config and log an error', async () => {
-      const consoleSpy = vi
-        .spyOn(console, 'error')
-        .mockImplementation(() => {});
+    it('should remove an extension with invalid JSON config and log a warning', async () => {
+      const consoleSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
 
       // Good extension
       createExtension({
@@ -686,17 +682,15 @@ name = "yolo-checker"
       expect(extensions[0].name).toBe('good-ext');
       expect(consoleSpy).toHaveBeenCalledWith(
         expect.stringContaining(
-          `Warning: Skipping extension in ${badExtDir}: Failed to load extension config from ${badConfigPath}`,
+          `Warning: Removing broken extension bad-ext: Failed to load extension config from ${badConfigPath}`,
         ),
       );
 
       consoleSpy.mockRestore();
     });
 
-    it('should skip an extension with missing "name" in config and log an error', async () => {
-      const consoleSpy = vi
-        .spyOn(console, 'error')
-        .mockImplementation(() => {});
+    it('should remove an extension with missing "name" in config and log a warning', async () => {
+      const consoleSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
 
       // Good extension
       createExtension({
@@ -717,7 +711,7 @@ name = "yolo-checker"
       expect(extensions[0].name).toBe('good-ext');
       expect(consoleSpy).toHaveBeenCalledWith(
         expect.stringContaining(
-          `Warning: Skipping extension in ${badExtDir}: Failed to load extension config from ${badConfigPath}: Invalid configuration in ${badConfigPath}: missing "name"`,
+          `Warning: Removing broken extension bad-ext-no-name: Failed to load extension config from ${badConfigPath}: Invalid configuration in ${badConfigPath}: missing "name"`,
         ),
       );
 
@@ -743,10 +737,8 @@ name = "yolo-checker"
       expect(extensions[0].mcpServers?.['test-server'].trust).toBeUndefined();
     });
 
-    it('should log an error for invalid extension names during loading', async () => {
-      const consoleSpy = vi
-        .spyOn(console, 'error')
-        .mockImplementation(() => {});
+    it('should log a warning for invalid extension names during loading', async () => {
+      const consoleSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
       createExtension({
         extensionsDir: userExtensionsDir,
         name: 'bad_name',

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

@@ -59,9 +59,8 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
 });
 
 async function expectConsentSnapshot(consentString: string) {
-  const renderResult = await render(
-    React.createElement(Text, null, consentString),
-  );
+  const renderResult = render(React.createElement(Text, null, consentString));
+  await renderResult.waitUntilReady();
   await expect(renderResult).toMatchSvgSnapshot();
 }
 

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

@@ -13,7 +13,6 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
   return {
     ...actual,
     Storage: {
-      // eslint-disable-next-line @typescript-eslint/no-misused-spread
       ...actual.Storage,
       getGlobalGeminiDir: () => '/virtual-home/.gemini',
     },

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

@@ -381,7 +381,6 @@ describe('Policy Engine Integration Tests', () => {
       // Add a manual rule with annotations to the config
       config.rules = config.rules || [];
       config.rules.push({
-        toolName: '*',
         toolAnnotations: { readOnlyHint: true },
         decision: PolicyDecision.ALLOW,
         priority: 10,

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

@@ -538,32 +538,8 @@ describe('SettingsSchema', () => {
       }
     };
 
-    const visitJsonSchema = (jsonSchema: Record<string, unknown>) => {
-      const ref = jsonSchema['ref'];
-      if (typeof ref === 'string') {
-        referenced.add(ref);
-      }
-      const properties = jsonSchema['properties'];
-      if (
-        properties &&
-        typeof properties === 'object' &&
-        !Array.isArray(properties)
-      ) {
-        Object.values(properties as Record<string, unknown>).forEach((prop) =>
-          visitJsonSchema(prop as Record<string, unknown>),
-        );
-      }
-      const items = jsonSchema['items'];
-      if (items && typeof items === 'object' && !Array.isArray(items)) {
-        visitJsonSchema(items as Record<string, unknown>);
-      }
-    };
-
     Object.values(schema).forEach(visitDefinition);
 
-    // Also visit all definitions to find nested references
-    Object.values(SETTINGS_SCHEMA_DEFINITIONS).forEach(visitJsonSchema);
-
     // Ensure definitions map doesn't accumulate stale entries.
     Object.keys(SETTINGS_SCHEMA_DEFINITIONS).forEach((key) => {
       if (!referenced.has(key)) {

packages/cli/src/config/settingsSchema.ts

@@ -657,16 +657,6 @@ const SETTINGS_SCHEMA = {
         description: 'Hide the footer from the UI',
         showInDialog: true,
       },
-      collapseDrawerDuringApproval: {
-        type: 'boolean',
-        label: 'Collapse Drawer During Approval',
-        category: 'UI',
-        requiresRestart: false,
-        default: true,
-        description:
-          'Whether to collapse the UI drawer when a tool is awaiting confirmation.',
-        showInDialog: false,
-      },
       showMemoryUsage: {
         type: 'boolean',
         label: 'Show Memory Usage',
@@ -1104,7 +1094,7 @@ const SETTINGS_SCHEMA = {
         showInDialog: false,
         additionalProperties: {
           type: 'array',
-          ref: 'ModelPolicyChain',
+          ref: 'ModelPolicy',
         },
       },
     },
@@ -1208,36 +1198,6 @@ const SETTINGS_SCHEMA = {
               'Disable user input on browser window during automation.',
             showInDialog: false,
           },
-          maxActionsPerTask: {
-            type: 'number',
-            label: 'Max Actions Per Task',
-            category: 'Advanced',
-            requiresRestart: false,
-            default: 100,
-            description:
-              'The maximum number of tool calls allowed per browser task. Enforcement is hard: the agent will be terminated when the limit is reached.',
-            showInDialog: false,
-          },
-          confirmSensitiveActions: {
-            type: 'boolean',
-            label: 'Confirm Sensitive Actions',
-            category: 'Advanced',
-            requiresRestart: true,
-            default: false,
-            description:
-              'Require manual confirmation for sensitive browser actions (e.g., fill_form, evaluate_script).',
-            showInDialog: true,
-          },
-          blockFileUploads: {
-            type: 'boolean',
-            label: 'Block File Uploads',
-            category: 'Advanced',
-            requiresRestart: true,
-            default: false,
-            description:
-              'Hard-block file upload requests from the browser agent.',
-            showInDialog: true,
-          },
         },
       },
     },
@@ -3038,14 +2998,6 @@ export const SETTINGS_SCHEMA_DEFINITIONS: Record<
       },
     },
   },
-  ModelPolicyChain: {
-    type: 'array',
-    description: 'A chain of model policies for fallback behavior.',
-    items: {
-      type: 'object',
-      ref: 'ModelPolicy',
-    },
-  },
   ModelPolicy: {
     type: 'object',
     description:

packages/cli/src/core/initializer.test.ts

@@ -105,9 +105,6 @@ describe('initializer', () => {
       mockSettings,
     );
 
-    // Wait for the background promise to resolve
-    await new Promise((resolve) => setTimeout(resolve, 0));
-
     expect(result).toEqual({
       authError: null,
       accountSuspensionInfo: null,

packages/cli/src/core/initializer.ts

@@ -13,7 +13,6 @@ import {
   StartSessionEvent,
   logCliConfiguration,
   startupProfiler,
-  debugLogger,
 } from '@google/gemini-cli-core';
 import { type LoadedSettings } from '../config/settings.js';
 import { performInitialAuth } from './auth.js';
@@ -56,18 +55,9 @@ export async function initializeApp(
   );
 
   if (config.getIdeMode()) {
-    IdeClient.getInstance()
-      .then(async (ideClient) => {
-        await ideClient.connect();
-        logIdeConnection(
-          config,
-          new IdeConnectionEvent(IdeConnectionType.START),
-        );
-      })
-      .catch((e) => {
-        // We log locally if IDE connection setup fails in the background.
-        debugLogger.error('Failed to initialize IDE client:', e);
-      });
+    const ideClient = await IdeClient.getInstance();
+    await ideClient.connect();
+    logIdeConnection(config, new IdeConnectionEvent(IdeConnectionType.START));
   }
 
   return {

packages/cli/src/gemini.test.tsx

@@ -126,7 +126,6 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
       clearInstance: vi.fn(),
     },
     coreEvents: {
-      // eslint-disable-next-line @typescript-eslint/no-misused-spread
       ...actual.coreEvents,
       emitFeedback: vi.fn(),
       emitConsoleLog: vi.fn(),
@@ -1509,7 +1508,6 @@ describe('startInteractiveUI', () => {
       .spyOn(process.stdout, 'write')
       .mockImplementation(() => true);
     const mockConfigWithScreenReader = {
-      // eslint-disable-next-line @typescript-eslint/no-misused-spread
       ...mockConfig,
       getScreenReader: () => screenReader,
     } as Config;

packages/cli/src/gemini.tsx

@@ -213,36 +213,12 @@ export async function main() {
   loadSettingsHandle?.end();
 
   // If a worktree is requested and enabled, set it up early.
-  // This must be awaited before any other async tasks that depend on CWD (like loadCliConfig)
-  // because setupWorktree calls process.chdir().
   const requestedWorktree = cliConfig.getRequestedWorktreeName(settings);
   let worktreeInfo: WorktreeInfo | undefined;
   if (requestedWorktree !== undefined) {
-    const worktreeHandle = startupProfiler.start('setup_worktree');
     worktreeInfo = await setupWorktree(requestedWorktree || undefined);
-    worktreeHandle?.end();
   }
 
-  const cleanupOpsHandle = startupProfiler.start('cleanup_ops');
-  Promise.all([
-    cleanupCheckpoints(),
-    cleanupToolOutputFiles(settings.merged),
-    cleanupBackgroundLogs(),
-  ])
-    .catch((e) => {
-      debugLogger.error('Early cleanup failed:', e);
-    })
-    .finally(() => {
-      cleanupOpsHandle?.end();
-    });
-
-  const parseArgsHandle = startupProfiler.start('parse_arguments');
-  const argvPromise = parseArguments(settings.merged).finally(() => {
-    parseArgsHandle?.end();
-  });
-
-  const rawStartupWarningsPromise = getStartupWarnings();
-
   // Report settings errors once during startup
   settings.errors.forEach((error) => {
     coreEvents.emitFeedback('warning', error.message);
@@ -256,7 +232,15 @@ export async function main() {
     );
   });
 
-  const argv = await argvPromise;
+  await Promise.all([
+    cleanupCheckpoints(),
+    cleanupToolOutputFiles(settings.merged),
+    cleanupBackgroundLogs(),
+  ]);
+
+  const parseArgsHandle = startupProfiler.start('parse_arguments');
+  const argv = await parseArguments(settings.merged);
+  parseArgsHandle?.end();
 
   if (
     (argv.allowedTools && argv.allowedTools.length > 0) ||
@@ -334,7 +318,7 @@ export async function main() {
   // the sandbox because the sandbox will interfere with the Oauth2 web
   // redirect.
   let initialAuthFailed = false;
-  if (!settings.merged.security.auth.useExternal && !argv.isCommand) {
+  if (!settings.merged.security.auth.useExternal) {
     try {
       if (
         partialConfig.isInteractive() &&
@@ -386,7 +370,7 @@ export async function main() {
   await runDeferredCommand(settings.merged);
 
   // hop into sandbox if we are outside and sandboxing is enabled
-  if (!process.env['SANDBOX'] && !argv.isCommand) {
+  if (!process.env['SANDBOX']) {
     const memoryArgs = settings.merged.advanced.autoConfigureMemory
       ? getNodeMemoryArgs(isDebugMode)
       : [];
@@ -483,10 +467,12 @@ export async function main() {
       await config.getHookSystem()?.fireSessionEndEvent(SessionEndReason.Exit);
     });
 
-    // Launch cleanup expired sessions as a background task
-    cleanupExpiredSessions(config, settings.merged).catch((e) => {
+    // Cleanup sessions after config initialization
+    try {
+      await cleanupExpiredSessions(config, settings.merged);
+    } catch (e) {
       debugLogger.error('Failed to cleanup expired sessions:', e);
-    });
+    }
 
     if (config.getListExtensions()) {
       debugLogger.log('Installed extensions:');
@@ -538,9 +524,7 @@ export async function main() {
       });
     }
 
-    const terminalHandle = startupProfiler.start('setup_terminal');
     await setupTerminalAndTheme(config, settings);
-    terminalHandle?.end();
 
     const initAppHandle = startupProfiler.start('initialize_app');
     const initializationResult = await initializeApp(config, settings);
@@ -564,7 +548,7 @@ export async function main() {
       isAlternateBufferEnabled(config),
       config.getScreenReader(),
     );
-    const rawStartupWarnings = await rawStartupWarningsPromise;
+    const rawStartupWarnings = await getStartupWarnings();
     const startupWarnings: StartupWarning[] = [
       ...rawStartupWarnings.map((message) => ({
         id: `startup-${createHash('sha256').update(message).digest('hex').substring(0, 16)}`,

packages/cli/src/nonInteractiveCli.test.ts

@@ -1137,7 +1137,6 @@ describe('runNonInteractive', () => {
 
     expect(
       processStderrSpy.mock.calls.some(
-        // eslint-disable-next-line no-restricted-syntax
         (call) => typeof call[0] === 'string' && call[0].includes('Cancelling'),
       ),
     ).toBe(true);

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

@@ -266,7 +266,6 @@ describe('BuiltinCommandLoader', () => {
 
   it('should include policies command when message bus integration is enabled', async () => {
     const mockConfigWithMessageBus = {
-      // eslint-disable-next-line @typescript-eslint/no-misused-spread
       ...mockConfig,
       getEnableHooks: () => false,
       getMcpEnabled: () => true,

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

@@ -43,7 +43,7 @@ describe('SlashCommandResolver', () => {
       ]);
 
       expect(finalCommands.map((c) => c.name)).toContain('deploy');
-      expect(finalCommands.map((c) => c.name)).toContain('firebase:deploy');
+      expect(finalCommands.map((c) => c.name)).toContain('firebase.deploy');
       expect(conflicts).toHaveLength(1);
     });
 
@@ -159,7 +159,7 @@ describe('SlashCommandResolver', () => {
 
     it('should apply numeric suffixes when renames also conflict', () => {
       const user1 = createMockCommand('deploy', CommandKind.USER_FILE);
-      const user2 = createMockCommand('gcp:deploy', CommandKind.USER_FILE);
+      const user2 = createMockCommand('gcp.deploy', CommandKind.USER_FILE);
       const extension = {
         ...createMockCommand('deploy', CommandKind.EXTENSION_FILE),
         extensionName: 'gcp',
@@ -171,7 +171,7 @@ describe('SlashCommandResolver', () => {
         extension,
       ]);
 
-      expect(finalCommands.find((c) => c.name === 'gcp:deploy1')).toBeDefined();
+      expect(finalCommands.find((c) => c.name === 'gcp.deploy1')).toBeDefined();
     });
 
     it('should prefix skills with extension name when they conflict with built-in', () => {
@@ -185,37 +185,7 @@ describe('SlashCommandResolver', () => {
 
       const names = finalCommands.map((c) => c.name);
       expect(names).toContain('chat');
-      expect(names).toContain('google-workspace:chat');
-    });
-
-    it('should ALWAYS prefix extension skills even if no conflict exists', () => {
-      const skill = {
-        ...createMockCommand('chat', CommandKind.SKILL),
-        extensionName: 'google-workspace',
-      };
-
-      const { finalCommands } = SlashCommandResolver.resolve([skill]);
-
-      const names = finalCommands.map((c) => c.name);
-      expect(names).toContain('google-workspace:chat');
-      expect(names).not.toContain('chat');
-    });
-
-    it('should use numeric suffixes if prefixed skill names collide', () => {
-      const skill1 = {
-        ...createMockCommand('chat', CommandKind.SKILL),
-        extensionName: 'google-workspace',
-      };
-      const skill2 = {
-        ...createMockCommand('chat', CommandKind.SKILL),
-        extensionName: 'google-workspace',
-      };
-
-      const { finalCommands } = SlashCommandResolver.resolve([skill1, skill2]);
-
-      const names = finalCommands.map((c) => c.name);
-      expect(names).toContain('google-workspace:chat');
-      expect(names).toContain('google-workspace:chat1');
+      expect(names).toContain('google-workspace.chat');
     });
 
     it('should NOT prefix skills with "skill" when extension name is missing', () => {

packages/cli/src/services/SlashCommandResolver.ts

@@ -47,17 +47,7 @@ export class SlashCommandResolver {
       const originalName = cmd.name;
       let finalName = originalName;
 
-      const shouldAlwaysPrefix =
-        cmd.kind === CommandKind.SKILL && !!cmd.extensionName;
-
-      if (shouldAlwaysPrefix) {
-        finalName = this.getRenamedName(
-          originalName,
-          this.getPrefix(cmd),
-          registry.commandMap,
-          cmd.kind,
-        );
-      } else if (registry.firstEncounters.has(originalName)) {
+      if (registry.firstEncounters.has(originalName)) {
         // We've already seen a command with this name, so resolve the conflict.
         finalName = this.handleConflict(cmd, registry);
       } else {
@@ -103,7 +93,6 @@ export class SlashCommandResolver {
       incoming.name,
       this.getPrefix(incoming),
       registry.commandMap,
-      incoming.kind,
     );
     this.trackConflict(
       registry.conflictsMap,
@@ -143,7 +132,6 @@ export class SlashCommandResolver {
       currentOwner.name,
       this.getPrefix(currentOwner),
       registry.commandMap,
-      currentOwner.kind,
     );
 
     // Update the registry: remove the old name and add the owner under the new name.
@@ -168,12 +156,8 @@ export class SlashCommandResolver {
     name: string,
     prefix: string | undefined,
     commandMap: Map<string, SlashCommand>,
-    kind?: CommandKind,
   ): string {
-    const isExtensionPrefix =
-      kind === CommandKind.SKILL || kind === CommandKind.EXTENSION_FILE;
-    const separator = isExtensionPrefix ? ':' : '.';
-    const base = prefix ? `${prefix}${separator}${name}` : name;
+    const base = prefix ? `${prefix}.${name}` : name;
     let renamedName = base;
     let suffix = 1;
 

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

@@ -11,11 +11,7 @@ import os from 'node:os';
 import path from 'node:path';
 import fs from 'node:fs';
 import { AppContainer } from '../ui/AppContainer.js';
-import {
-  renderWithProviders,
-  type RenderInstance,
-  persistentStateMock,
-} from './render.js';
+import { renderWithProviders, type RenderInstance } from './render.js';
 import {
   makeFakeConfig,
   type Config,
@@ -166,7 +162,7 @@ export class AppRig {
   private sessionId: string;
 
   private pendingConfirmations = new Map<string, PendingConfirmation>();
-  private breakpointTools = new Set<string>();
+  private breakpointTools = new Set<string | undefined>();
   private lastAwaitedConfirmation: PendingConfirmation | undefined;
 
   /**
@@ -181,24 +177,9 @@ export class AppRig {
     );
     this.sessionId = `test-session-${uniqueId}`;
     activeRigs.set(this.sessionId, this);
-
-    // Pre-create the persistent state file to bypass the terminal setup prompt
-    const geminiDir = path.join(this.testDir, '.gemini');
-    if (!fs.existsSync(geminiDir)) {
-      fs.mkdirSync(geminiDir, { recursive: true });
-    }
-    fs.writeFileSync(
-      path.join(geminiDir, 'state.json'),
-      JSON.stringify({ terminalSetupPromptShown: true }),
-    );
   }
 
   async initialize() {
-    persistentStateMock.setData({
-      terminalSetupPromptShown: true,
-      tipsShown: 10,
-    });
-
     this.setupEnvironment();
     resetSettingsCacheForTesting();
     this.settings = this.createRigSettings();
@@ -245,8 +226,6 @@ export class AppRig {
   private setupEnvironment() {
     // Stub environment variables to avoid interference from developer's machine
     vi.stubEnv('GEMINI_CLI_HOME', this.testDir);
-    vi.stubEnv('TERM_PROGRAM', 'other');
-    vi.stubEnv('VSCODE_GIT_IPC_HANDLE', '');
     if (this.options.fakeResponsesPath) {
       vi.stubEnv('GEMINI_API_KEY', 'test-api-key');
       MockShellExecutionService.setPassthrough(false);
@@ -312,6 +291,7 @@ export class AppRig {
 
       const newContentGeneratorConfig = {
         authType: authMethod,
+
         proxy: gcConfig.getProxy(),
         apiKey: process.env['GEMINI_API_KEY'] || 'test-api-key',
       };
@@ -446,7 +426,11 @@ export class AppRig {
     MockShellExecutionService.setMockCommands(commands);
   }
 
-  setToolPolicy(toolName: string, decision: PolicyDecision, priority = 10) {
+  setToolPolicy(
+    toolName: string | undefined,
+    decision: PolicyDecision,
+    priority = 10,
+  ) {
     if (!this.config) throw new Error('AppRig not initialized');
     this.config.getPolicyEngine().addRule({
       toolName,
@@ -456,20 +440,27 @@ export class AppRig {
     });
   }
 
-  setBreakpoint(toolName: string | string[]) {
+  setBreakpoint(toolName: string | string[] | undefined) {
     if (Array.isArray(toolName)) {
       for (const name of toolName) {
         this.setBreakpoint(name);
       }
     } else {
-      this.setToolPolicy(toolName, PolicyDecision.ASK_USER, 100);
+      // Use undefined toolName to create a global rule if '*' is provided
+      const actualToolName = toolName === '*' ? undefined : toolName;
+      this.setToolPolicy(actualToolName, PolicyDecision.ASK_USER, 100);
       this.breakpointTools.add(toolName);
     }
   }
 
-  removeToolPolicy(toolName: string, source = 'AppRig Override') {
+  removeToolPolicy(toolName?: string, source = 'AppRig Override') {
     if (!this.config) throw new Error('AppRig not initialized');
-    this.config.getPolicyEngine().removeRulesForTool(toolName, source);
+    // Map '*' back to undefined for policy removal
+    const actualToolName = toolName === '*' ? undefined : toolName;
+    this.config
+      .getPolicyEngine()
+
+      .removeRulesForTool(actualToolName as string, source);
     this.breakpointTools.delete(toolName);
   }
 

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

@@ -79,7 +79,7 @@ export async function toMatchSvgSnapshot(
 }
 
 function toHaveOnlyValidCharacters(this: Assertion, buffer: TextBuffer) {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-type-assertion, @typescript-eslint/no-unsafe-assignment
   const { isNot } = this as any;
   let pass = true;
   const invalidLines: Array<{ line: number; content: string }> = [];
@@ -108,6 +108,7 @@ function toHaveOnlyValidCharacters(this: Assertion, buffer: TextBuffer) {
   };
 }
 
+// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 expect.extend({
   toHaveOnlyValidCharacters,
   toMatchSvgSnapshot,

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

@@ -37,12 +37,14 @@ export const createMockCommandContext = (
     },
     services: {
       agentContext: null,
+
       settings: {
         merged: defaultMergedSettings,
         setValue: vi.fn(),
         forScope: vi.fn().mockReturnValue({ settings: {} }),
       } as unknown as LoadedSettings,
       git: undefined as GitService | undefined,
+
       logger: {
         log: vi.fn(),
         logMessage: vi.fn(),
@@ -51,6 +53,7 @@ export const createMockCommandContext = (
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } as any, // Cast because Logger is a class.
     },
+
     ui: {
       addItem: vi.fn(),
       clear: vi.fn(),
@@ -69,6 +72,7 @@ export const createMockCommandContext = (
     } as any,
     session: {
       sessionShellAllowlist: new Set<string>(),
+
       stats: {
         sessionStartTime: new Date(),
         lastPromptTokenCount: 0,
@@ -94,6 +98,7 @@ export const createMockCommandContext = (
     for (const key in source) {
       if (Object.prototype.hasOwnProperty.call(source, key)) {
         const sourceValue = source[key];
+
         const targetValue = output[key];
 
         if (
@@ -104,6 +109,7 @@ export const createMockCommandContext = (
           output[key] = merge(targetValue, sourceValue);
         } else {
           // If not, we do a direct assignment. This preserves Date objects and others.
+
           output[key] = sourceValue;
         }
       }

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

@@ -44,7 +44,6 @@ export const createMockConfig = (overrides: Partial<Config> = {}): Config =>
     getDeleteSession: vi.fn(() => undefined),
     setSessionId: vi.fn(),
     getSessionId: vi.fn().mockReturnValue('mock-session-id'),
-    getWorktreeSettings: vi.fn(() => undefined),
     getContentGeneratorConfig: vi.fn(() => ({ authType: 'google' })),
     getAcpMode: vi.fn(() => false),
     isBrowserLaunchSuppressed: vi.fn(() => false),

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

@@ -12,18 +12,24 @@ import { waitFor } from './async.js';
 
 describe('render', () => {
   it('should render a component', async () => {
-    const { lastFrame, unmount } = await render(<Text>Hello World</Text>);
+    const { lastFrame, waitUntilReady, unmount } = render(
+      <Text>Hello World</Text>,
+    );
+    await waitUntilReady();
     expect(lastFrame()).toBe('Hello World\n');
     unmount();
   });
 
   it('should support rerender', async () => {
-    const { lastFrame, rerender, waitUntilReady, unmount } = await render(
+    const { lastFrame, rerender, waitUntilReady, unmount } = render(
       <Text>Hello</Text>,
     );
+    await waitUntilReady();
     expect(lastFrame()).toBe('Hello\n');
 
-    await act(async () => rerender(<Text>World</Text>));
+    await act(async () => {
+      rerender(<Text>World</Text>);
+    });
     await waitUntilReady();
     expect(lastFrame()).toBe('World\n');
     unmount();
@@ -36,8 +42,10 @@ describe('render', () => {
       return <Text>Hello</Text>;
     }
 
-    const { unmount } = await render(<TestComponent />);
+    const { unmount, waitUntilReady } = render(<TestComponent />);
+    await waitUntilReady();
     unmount();
+
     expect(cleanupMock).toHaveBeenCalled();
   });
 });
@@ -46,27 +54,36 @@ describe('renderHook', () => {
   it('should rerender with previous props when called without arguments', async () => {
     const useTestHook = ({ value }: { value: number }) => {
       const [count, setCount] = useState(0);
-      useEffect(() => setCount((c) => c + 1), [value]);
+      useEffect(() => {
+        setCount((c) => c + 1);
+      }, [value]);
       return { count, value };
     };
 
-    const { result, rerender, waitUntilReady, unmount } = await renderHook(
+    const { result, rerender, waitUntilReady, unmount } = renderHook(
       useTestHook,
-      { initialProps: { value: 1 } },
+      {
+        initialProps: { value: 1 },
+      },
     );
+    await waitUntilReady();
 
     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 act(async () => {
+      rerender({ value: 2 });
+    });
     await waitUntilReady();
     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 act(async () => {
+      rerender();
+    });
     await waitUntilReady();
     expect(result.current.value).toBe(2);
     // Count should not increase because value didn't change
@@ -81,11 +98,14 @@ describe('renderHook', () => {
     };
 
     const { result, rerender, waitUntilReady, unmount } =
-      await renderHook(useTestHook);
+      renderHook(useTestHook);
+    await waitUntilReady();
 
     expect(result.current.count).toBe(0);
 
-    await act(async () => rerender());
+    await act(async () => {
+      rerender();
+    });
     await waitUntilReady();
     expect(result.current.count).toBe(0);
     unmount();
@@ -93,14 +113,19 @@ describe('renderHook', () => {
 
   it('should update props if undefined is passed explicitly', async () => {
     const useTestHook = (val: string | undefined) => val;
-    const { result, rerender, waitUntilReady, unmount } = await renderHook(
+    const { result, rerender, waitUntilReady, unmount } = renderHook(
       useTestHook,
-      { initialProps: 'initial' },
+      {
+        initialProps: 'initial' as string | undefined,
+      },
     );
+    await waitUntilReady();
 
     expect(result.current).toBe('initial');
 
-    await act(async () => rerender(undefined));
+    await act(async () => {
+      rerender(undefined);
+    });
     await waitUntilReady();
     expect(result.current).toBeUndefined();
     unmount();

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

@@ -257,9 +257,13 @@ class XtermStdout extends EventEmitter {
           return currentFrame !== '';
         }
 
-        // If Ink expects nothing (no new static content and no dynamic output),
-        // we consider it a match because the terminal buffer will just hold the historical static content.
-        if (expectedFrame === '') {
+        // 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;
         }
 
@@ -267,8 +271,8 @@ class XtermStdout extends EventEmitter {
           return false;
         }
 
-        // If the terminal is empty but Ink expects something, it's not a match.
-        if (currentFrame === '') {
+        // If Ink expects nothing but terminal has content, or vice-versa, it's NOT a match.
+        if (expectedFrame === '' || currentFrame === '') {
           return false;
         }
 
@@ -376,21 +380,15 @@ export type RenderInstance = {
   capturedOverflowActions: OverflowActions | undefined;
 };
 
-export type RenderWithProvidersInstance = RenderInstance & {
-  simulateClick: (
-    col: number,
-    row: number,
-    button?: 0 | 1 | 2,
-  ) => Promise<void>;
-};
-
 const instances: InkInstance[] = [];
 
-export const render = async (
+// Wrapper around ink's render that ensures act() is called and uses Xterm for output
+export const render = (
   tree: React.ReactElement,
   terminalWidth?: number,
-): Promise<
-  Omit<RenderInstance, 'capturedOverflowState' | 'capturedOverflowActions'>
+): Omit<
+  RenderInstance,
+  'capturedOverflowState' | 'capturedOverflowActions'
 > => {
   const cols = terminalWidth ?? 100;
   // We use 1000 rows to avoid windows with incorrect snapshots if a correct
@@ -439,8 +437,6 @@ export const render = async (
 
   instances.push(instance);
 
-  await stdout.waitUntilReady();
-
   return {
     rerender: (newTree: React.ReactElement) => {
       act(() => {
@@ -626,7 +622,15 @@ export const renderWithProviders = async (
     };
     appState?: AppState;
   } = {},
-): Promise<RenderWithProvidersInstance> => {
+): Promise<
+  RenderInstance & {
+    simulateClick: (
+      col: number,
+      row: number,
+      button?: 0 | 1 | 2,
+    ) => Promise<void>;
+  }
+> => {
   const baseState: UIState = new Proxy(
     { ...baseMockUiState, ...providedUiState },
     {
@@ -665,7 +669,7 @@ export const renderWithProviders = async (
     );
   }
 
-  const mainAreaWidth = providedUiState?.mainAreaWidth ?? terminalWidth;
+  const mainAreaWidth = terminalWidth;
 
   const finalUiState = {
     ...baseState,
@@ -747,10 +751,7 @@ export const renderWithProviders = async (
     </AppContext.Provider>
   );
 
-  const renderResult = await render(
-    wrapWithProviders(component),
-    terminalWidth,
-  );
+  const renderResult = render(wrapWithProviders(component), terminalWidth);
 
   return {
     ...renderResult,
@@ -764,20 +765,21 @@ export const renderWithProviders = async (
   };
 };
 
-export async function renderHook<Result, Props>(
+export function renderHook<Result, Props>(
   renderCallback: (props: Props) => Result,
   options?: {
     initialProps?: Props;
     wrapper?: React.ComponentType<{ children: React.ReactNode }>;
   },
-): Promise<{
+): {
   result: { current: Result };
   rerender: (props?: Props) => void;
   unmount: () => void;
   waitUntilReady: () => Promise<void>;
   generateSvg: () => string;
-}> {
+} {
   const result = { current: undefined as unknown as Result };
+
   let currentProps = options?.initialProps as Props;
 
   function TestComponent({
@@ -798,15 +800,17 @@ export async function renderHook<Result, Props>(
   let waitUntilReady: () => Promise<void> = async () => {};
   let generateSvg: () => string = () => '';
 
-  const renderResult = await render(
-    <Wrapper>
-      <TestComponent renderCallback={renderCallback} props={currentProps} />
-    </Wrapper>,
-  );
-  inkRerender = renderResult.rerender;
-  unmount = renderResult.unmount;
-  waitUntilReady = renderResult.waitUntilReady;
-  generateSvg = renderResult.generateSvg;
+  act(() => {
+    const renderResult = render(
+      <Wrapper>
+        <TestComponent renderCallback={renderCallback} props={currentProps} />
+      </Wrapper>,
+    );
+    inkRerender = renderResult.rerender;
+    unmount = renderResult.unmount;
+    waitUntilReady = renderResult.waitUntilReady;
+    generateSvg = renderResult.generateSvg;
+  });
 
   function rerender(props?: Props) {
     if (arguments.length > 0) {
@@ -860,7 +864,7 @@ export async function renderHookWithProviders<Result, Props>(
 
   const Wrapper = options.wrapper || (({ children }) => <>{children}</>);
 
-  let renderResult: RenderWithProvidersInstance;
+  let renderResult: ReturnType<typeof render>;
 
   await act(async () => {
     renderResult = await renderWithProviders(

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

@@ -46,6 +46,7 @@ export const createMockSettings = (
     workspace,
     isTrusted,
     errors,
+
     merged: mergedOverride,
     ...settingsOverrides
   } = overrides;
@@ -60,6 +61,7 @@ export const createMockSettings = (
       settings: settingsOverrides,
       originalSettings: settingsOverrides,
     },
+
     (workspace as any) || { path: '', settings: {}, originalSettings: {} },
     isTrusted ?? true,
     errors || [],

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

@@ -94,10 +94,14 @@ describe('App', () => {
   };
 
   it('should render main content and composer when not quitting', async () => {
-    const { lastFrame, unmount } = await renderWithProviders(<App />, {
-      uiState: mockUIState,
-      settings: createMockSettings({ ui: { useAlternateBuffer: false } }),
-    });
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+      <App />,
+      {
+        uiState: mockUIState,
+        settings: createMockSettings({ ui: { useAlternateBuffer: false } }),
+      },
+    );
+    await waitUntilReady();
 
     expect(lastFrame()).toContain('Tips for getting started');
     expect(lastFrame()).toContain('Notifications');
@@ -111,10 +115,14 @@ describe('App', () => {
       quittingMessages: [{ id: 1, type: 'user', text: 'test' }],
     } as UIState;
 
-    const { lastFrame, unmount } = await renderWithProviders(<App />, {
-      uiState: quittingUIState,
-      settings: createMockSettings({ ui: { useAlternateBuffer: false } }),
-    });
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+      <App />,
+      {
+        uiState: quittingUIState,
+        settings: createMockSettings({ ui: { useAlternateBuffer: false } }),
+      },
+    );
+    await waitUntilReady();
 
     expect(lastFrame()).toContain('Quitting...');
     unmount();
@@ -128,10 +136,14 @@ describe('App', () => {
       pendingHistoryItems: [{ type: 'user', text: 'pending item' }],
     } as UIState;
 
-    const { lastFrame, unmount } = await renderWithProviders(<App />, {
-      uiState: quittingUIState,
-      settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
-    });
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+      <App />,
+      {
+        uiState: quittingUIState,
+        settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
+      },
+    );
+    await waitUntilReady();
 
     expect(lastFrame()).toContain('HistoryItemDisplay');
     expect(lastFrame()).toContain('Quitting...');
@@ -144,10 +156,14 @@ describe('App', () => {
       dialogsVisible: true,
     } as UIState;
 
-    const { lastFrame, unmount } = await renderWithProviders(<App />, {
-      uiState: dialogUIState,
-      settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
-    });
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+      <App />,
+      {
+        uiState: dialogUIState,
+        settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
+      },
+    );
+    await waitUntilReady();
 
     expect(lastFrame()).toContain('Tips for getting started');
     expect(lastFrame()).toContain('Notifications');
@@ -167,10 +183,14 @@ describe('App', () => {
         [stateKey]: true,
       } as UIState;
 
-      const { lastFrame, unmount } = await renderWithProviders(<App />, {
-        uiState,
-        settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
-      });
+      const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+        <App />,
+        {
+          uiState,
+          settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
+        },
+      );
+      await waitUntilReady();
 
       expect(lastFrame()).toContain(`Press Ctrl+${key} again to exit.`);
       unmount();
@@ -180,10 +200,14 @@ describe('App', () => {
   it('should render ScreenReaderAppLayout when screen reader is enabled', async () => {
     (useIsScreenReaderEnabled as Mock).mockReturnValue(true);
 
-    const { lastFrame, unmount } = await renderWithProviders(<App />, {
-      uiState: mockUIState,
-      settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
-    });
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+      <App />,
+      {
+        uiState: mockUIState,
+        settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
+      },
+    );
+    await waitUntilReady();
 
     expect(lastFrame()).toContain('Notifications');
     expect(lastFrame()).toContain('Footer');
@@ -195,10 +219,14 @@ describe('App', () => {
   it('should render DefaultAppLayout when screen reader is not enabled', async () => {
     (useIsScreenReaderEnabled as Mock).mockReturnValue(false);
 
-    const { lastFrame, unmount } = await renderWithProviders(<App />, {
-      uiState: mockUIState,
-      settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
-    });
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+      <App />,
+      {
+        uiState: mockUIState,
+        settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
+      },
+    );
+    await waitUntilReady();
 
     expect(lastFrame()).toContain('Tips for getting started');
     expect(lastFrame()).toContain('Notifications');
@@ -246,11 +274,15 @@ describe('App', () => {
     vi.spyOn(configWithExperiment, 'isTrustedFolder').mockReturnValue(true);
     vi.spyOn(configWithExperiment, 'getIdeMode').mockReturnValue(false);
 
-    const { lastFrame, unmount } = await renderWithProviders(<App />, {
-      uiState: stateWithConfirmingTool,
-      config: configWithExperiment,
-      settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
-    });
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+      <App />,
+      {
+        uiState: stateWithConfirmingTool,
+        config: configWithExperiment,
+        settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
+      },
+    );
+    await waitUntilReady();
 
     expect(lastFrame()).toContain('Tips for getting started');
     expect(lastFrame()).toContain('Notifications');
@@ -263,20 +295,28 @@ describe('App', () => {
   describe('Snapshots', () => {
     it('renders default layout correctly', async () => {
       (useIsScreenReaderEnabled as Mock).mockReturnValue(false);
-      const { lastFrame, unmount } = await renderWithProviders(<App />, {
-        uiState: mockUIState,
-        settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
-      });
+      const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+        <App />,
+        {
+          uiState: mockUIState,
+          settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
+        },
+      );
+      await waitUntilReady();
       expect(lastFrame()).toMatchSnapshot();
       unmount();
     });
 
     it('renders screen reader layout correctly', async () => {
       (useIsScreenReaderEnabled as Mock).mockReturnValue(true);
-      const { lastFrame, unmount } = await renderWithProviders(<App />, {
-        uiState: mockUIState,
-        settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
-      });
+      const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+        <App />,
+        {
+          uiState: mockUIState,
+          settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
+        },
+      );
+      await waitUntilReady();
       expect(lastFrame()).toMatchSnapshot();
       unmount();
     });
@@ -286,10 +326,14 @@ describe('App', () => {
         ...mockUIState,
         dialogsVisible: true,
       } as UIState;
-      const { lastFrame, unmount } = await renderWithProviders(<App />, {
-        uiState: dialogUIState,
-        settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
-      });
+      const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+        <App />,
+        {
+          uiState: dialogUIState,
+          settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
+        },
+      );
+      await waitUntilReady();
       expect(lastFrame()).toMatchSnapshot();
       unmount();
     });

packages/cli/src/ui/AppContainer.tsx

@@ -30,6 +30,8 @@ import {
 import { ConfigContext } from './contexts/ConfigContext.js';
 import {
   type HistoryItem,
+  type HistoryItemWithoutId,
+  type HistoryItemToolGroup,
   AuthState,
   type ConfirmationRequest,
   type PermissionConfirmationRequest,
@@ -79,6 +81,7 @@ import {
   type AgentsDiscoveredPayload,
   ChangeAuthRequestedError,
   ProjectIdRequiredError,
+  CoreToolCallStatus,
   buildUserSteeringHintPrompt,
   logBillingEvent,
   ApiKeyUpdatedEvent,
@@ -167,11 +170,29 @@ import { useIsHelpDismissKey } from './utils/shortcutsHelp.js';
 import { useSuspend } from './hooks/useSuspend.js';
 import { useRunEventNotifications } from './hooks/useRunEventNotifications.js';
 import { isNotificationsEnabled } from '../utils/terminalNotifications.js';
-import {
-  isToolExecuting,
-  isToolAwaitingConfirmation,
-  getAllToolCalls,
-} from './utils/historyUtils.js';
+
+function isToolExecuting(pendingHistoryItems: HistoryItemWithoutId[]) {
+  return pendingHistoryItems.some((item) => {
+    if (item && item.type === 'tool_group') {
+      return item.tools.some(
+        (tool) => CoreToolCallStatus.Executing === tool.status,
+      );
+    }
+    return false;
+  });
+}
+
+function isToolAwaitingConfirmation(
+  pendingHistoryItems: HistoryItemWithoutId[],
+) {
+  return pendingHistoryItems
+    .filter((item): item is HistoryItemToolGroup => item.type === 'tool_group')
+    .some((item) =>
+      item.tools.some(
+        (tool) => CoreToolCallStatus.AwaitingApproval === tool.status,
+      ),
+    );
+}
 
 interface AppContainerProps {
   config: Config;
@@ -700,10 +721,7 @@ export const AppContainer = (props: AppContainerProps) => {
 
   // Derive auth state variables for backward compatibility with UIStateContext
   const isAuthDialogOpen = authState === AuthState.Updating;
-  // TODO: Consider handling other auth types that should also skip the blocking screen
-  const isAuthenticating =
-    authState === AuthState.Unauthenticated &&
-    settings.merged.security.auth.selectedType !== AuthType.USE_GEMINI;
+  const isAuthenticating = authState === AuthState.Unauthenticated;
 
   // Session browser and resume functionality
   const isGeminiClientInitialized = config.getGeminiClient()?.isInitialized();
@@ -1133,16 +1151,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
     consumePendingHints,
   );
 
-  const pendingHistoryItems = useMemo(
-    () => [...pendingSlashCommandHistoryItems, ...pendingGeminiHistoryItems],
-    [pendingSlashCommandHistoryItems, pendingGeminiHistoryItems],
-  );
-
-  const hasPendingToolConfirmation = useMemo(
-    () => isToolAwaitingConfirmation(pendingHistoryItems),
-    [pendingHistoryItems],
-  );
-
   toggleBackgroundShellRef.current = toggleBackgroundShell;
   isBackgroundShellVisibleRef.current = isBackgroundShellVisible;
   backgroundShellsRef.current = backgroundShells;
@@ -1214,6 +1222,10 @@ Logging in with Google... Restarting Gemini CLI to continue.
 
   cancelHandlerRef.current = useCallback(
     (shouldRestorePrompt: boolean = true) => {
+      const pendingHistoryItems = [
+        ...pendingSlashCommandHistoryItems,
+        ...pendingGeminiHistoryItems,
+      ];
       if (isToolAwaitingConfirmation(pendingHistoryItems)) {
         return; // Don't clear - user may be composing a follow-up message
       }
@@ -1247,7 +1259,8 @@ Logging in with Google... Restarting Gemini CLI to continue.
       inputHistory,
       getQueuedMessagesText,
       clearQueue,
-      pendingHistoryItems,
+      pendingSlashCommandHistoryItems,
+      pendingGeminiHistoryItems,
     ],
   );
 
@@ -1283,7 +1296,10 @@ Logging in with Google... Restarting Gemini CLI to continue.
       const isIdle = streamingState === StreamingState.Idle;
       const isAgentRunning =
         streamingState === StreamingState.Responding ||
-        isToolExecuting(pendingHistoryItems);
+        isToolExecuting([
+          ...pendingSlashCommandHistoryItems,
+          ...pendingGeminiHistoryItems,
+        ]);
 
       if (isSlash && isAgentRunning) {
         const { commandToExecute } = parseSlashCommand(
@@ -1303,8 +1319,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
         return;
       }
 
-      const isMcpOrConfigReady = isConfigInitialized && isMcpReady;
-      if ((isSlash && isConfigInitialized) || (isIdle && isMcpOrConfigReady)) {
+      if (isSlash || (isIdle && isMcpReady)) {
         if (!isSlash) {
           const permissions = await checkPermissions(submittedValue, config);
           if (permissions.length > 0) {
@@ -1327,12 +1342,10 @@ Logging in with Google... Restarting Gemini CLI to continue.
         void submitQuery(submittedValue);
       } else {
         // Check messageQueue.length === 0 to only notify on the first queued item
-        if (isIdle && !isMcpOrConfigReady && messageQueue.length === 0) {
+        if (isIdle && !isMcpReady && messageQueue.length === 0) {
           coreEvents.emitFeedback(
             'info',
-            !isConfigInitialized
-              ? 'Initializing... Prompts will be queued.'
-              : 'Waiting for MCP servers to initialize... Slash commands are still available and prompts will be queued.',
+            'Waiting for MCP servers to initialize... Slash commands are still available and prompts will be queued.',
           );
         }
         addMessage(submittedValue);
@@ -1348,7 +1361,8 @@ Logging in with Google... Restarting Gemini CLI to continue.
       isMcpReady,
       streamingState,
       messageQueue.length,
-      pendingHistoryItems,
+      pendingSlashCommandHistoryItems,
+      pendingGeminiHistoryItems,
       config,
       constrainHeight,
       setConstrainHeight,
@@ -1356,7 +1370,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
       refreshStatic,
       reset,
       handleHintSubmit,
-      isConfigInitialized,
       triggerExpandHint,
     ],
   );
@@ -1387,28 +1400,16 @@ Logging in with Google... Restarting Gemini CLI to continue.
    * - Any future streaming states not explicitly allowed
    */
   const isInputActive =
+    isConfigInitialized &&
     !initError &&
     !isProcessing &&
     !isResuming &&
+    !!slashCommands &&
     (streamingState === StreamingState.Idle ||
-      streamingState === StreamingState.Responding ||
-      streamingState === StreamingState.WaitingForConfirmation) &&
-    !proQuotaRequest &&
-    !copyModeEnabled;
+      streamingState === StreamingState.Responding) &&
+    !proQuotaRequest;
 
   const [controlsHeight, setControlsHeight] = useState(0);
-  const [lastNonCopyControlsHeight, setLastNonCopyControlsHeight] = useState(0);
-
-  useLayoutEffect(() => {
-    if (!copyModeEnabled && controlsHeight > 0) {
-      setLastNonCopyControlsHeight(controlsHeight);
-    }
-  }, [copyModeEnabled, controlsHeight]);
-
-  const stableControlsHeight =
-    copyModeEnabled && lastNonCopyControlsHeight > 0
-      ? lastNonCopyControlsHeight
-      : controlsHeight;
 
   useLayoutEffect(() => {
     if (mainControlsRef.current) {
@@ -1418,12 +1419,12 @@ Logging in with Google... Restarting Gemini CLI to continue.
         setControlsHeight(roundedHeight);
       }
     }
-  }, [buffer, terminalWidth, terminalHeight, controlsHeight, isInputActive]);
+  }, [buffer, terminalWidth, terminalHeight, controlsHeight]);
 
-  // Compute available terminal height based on stable controls measurement
+  // Compute available terminal height based on controls measurement
   const availableTerminalHeight = Math.max(
     0,
-    terminalHeight - stableControlsHeight - backgroundShellHeight - 1,
+    terminalHeight - controlsHeight - backgroundShellHeight - 1,
   );
 
   config.setShellExecutionConfig({
@@ -1672,13 +1673,17 @@ Logging in with Google... Restarting Gemini CLI to continue.
     [handleSlashCommand, settings],
   );
 
+  const { elapsedTime, currentLoadingPhrase } = useLoadingIndicator({
+    streamingState,
+    shouldShowFocusHint,
+    retryStatus,
+    loadingPhrasesMode: settings.merged.ui.loadingPhrases,
+    customWittyPhrases: settings.merged.ui.customWittyPhrases,
+    errorVerbosity: settings.merged.ui.errorVerbosity,
+  });
+
   const handleGlobalKeypress = useCallback(
     (key: Key): boolean => {
-      // Debug log keystrokes if enabled
-      if (settings.merged.general.debugKeystrokeLogging) {
-        debugLogger.log('[DEBUG] Keystroke:', JSON.stringify(key));
-      }
-
       if (shortcutsHelpVisible && isHelpDismissKey(key)) {
         setShortcutsHelpVisible(false);
       }
@@ -1697,10 +1702,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
         handleCtrlCPress();
         return true;
       } else if (keyMatchers[Command.EXIT](key)) {
-        // If the input field is non-empty, do not exit.
-        if (bufferRef.current.text.length > 0) {
-          return false;
-        }
         handleCtrlDPress();
         return true;
       } else if (keyMatchers[Command.SUSPEND_APP](key)) {
@@ -1861,7 +1862,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
       activePtyId,
       handleSuspend,
       embeddedShellFocused,
-      settings.merged.general.debugKeystrokeLogging,
       refreshStatic,
       setCopyModeEnabled,
       tabFocusTimeoutRef,
@@ -2022,6 +2022,16 @@ Logging in with Google... Restarting Gemini CLI to continue.
     authState === AuthState.AwaitingApiKeyInput ||
     !!newAgents;
 
+  const pendingHistoryItems = useMemo(
+    () => [...pendingSlashCommandHistoryItems, ...pendingGeminiHistoryItems],
+    [pendingSlashCommandHistoryItems, pendingGeminiHistoryItems],
+  );
+
+  const hasPendingToolConfirmation = useMemo(
+    () => isToolAwaitingConfirmation(pendingHistoryItems),
+    [pendingHistoryItems],
+  );
+
   const hasConfirmUpdateExtensionRequests =
     confirmUpdateExtensionRequests.length > 0;
   const hasLoopDetectionConfirmationRequest =
@@ -2039,48 +2049,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
     !!emptyWalletRequest ||
     !!customDialog;
 
-  const loadingPhrases = settings.merged.ui.loadingPhrases;
-  const showStatusTips = loadingPhrases === 'tips' || loadingPhrases === 'all';
-  const showStatusWit = loadingPhrases === 'witty' || loadingPhrases === 'all';
-
-  const showLoadingIndicator =
-    (!embeddedShellFocused || isBackgroundShellVisible) &&
-    streamingState === StreamingState.Responding &&
-    !hasPendingActionRequired;
-
-  let estimatedStatusLength = 0;
-  if (activeHooks.length > 0 && settings.merged.hooksConfig.notifications) {
-    const hookLabel =
-      activeHooks.length > 1 ? 'Executing Hooks' : 'Executing Hook';
-    const hookNames = activeHooks
-      .map(
-        (h) =>
-          h.name +
-          (h.index && h.total && h.total > 1 ? ` (${h.index}/${h.total})` : ''),
-      )
-      .join(', ');
-    estimatedStatusLength = hookLabel.length + hookNames.length + 10;
-  } else if (showLoadingIndicator) {
-    const thoughtText = thought?.subject || 'Waiting for model...';
-    estimatedStatusLength = thoughtText.length + 25;
-  } else if (hasPendingActionRequired) {
-    estimatedStatusLength = 35;
-  }
-
-  const maxLength = terminalWidth - estimatedStatusLength - 5;
-
-  const { elapsedTime, currentLoadingPhrase, currentTip, currentWittyPhrase } =
-    useLoadingIndicator({
-      streamingState,
-      shouldShowFocusHint,
-      retryStatus,
-      showTips: showStatusTips,
-      showWit: showStatusWit,
-      customWittyPhrases: settings.merged.ui.customWittyPhrases,
-      errorVerbosity: settings.merged.ui.errorVerbosity,
-      maxLength,
-    });
-
   const allowPlanMode =
     config.isPlanEnabled() &&
     streamingState === StreamingState.Idle &&
@@ -2153,7 +2121,12 @@ Logging in with Google... Restarting Gemini CLI to continue.
   ]);
 
   const allToolCalls = useMemo(
-    () => getAllToolCalls(pendingHistoryItems),
+    () =>
+      pendingHistoryItems
+        .filter(
+          (item): item is HistoryItemToolGroup => item.type === 'tool_group',
+        )
+        .flatMap((item) => item.tools),
     [pendingHistoryItems],
   );
 
@@ -2261,8 +2234,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
       isFocused,
       elapsedTime,
       currentLoadingPhrase,
-      currentTip,
-      currentWittyPhrase,
       historyRemountKey,
       activeHooks,
       messageQueue,
@@ -2282,7 +2253,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
       contextFileNames,
       errorCount,
       availableTerminalHeight,
-      stableControlsHeight,
       mainAreaWidth,
       staticAreaMaxItemHeight,
       staticExtraHeight,
@@ -2321,7 +2291,11 @@ Logging in with Google... Restarting Gemini CLI to continue.
       newAgents,
       showIsExpandableHint,
       hintMode:
-        config.isModelSteeringEnabled() && isToolExecuting(pendingHistoryItems),
+        config.isModelSteeringEnabled() &&
+        isToolExecuting([
+          ...pendingSlashCommandHistoryItems,
+          ...pendingGeminiHistoryItems,
+        ]),
       hintBuffer: '',
     }),
     [
@@ -2387,8 +2361,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
       isFocused,
       elapsedTime,
       currentLoadingPhrase,
-      currentTip,
-      currentWittyPhrase,
       historyRemountKey,
       activeHooks,
       messageQueue,
@@ -2404,7 +2376,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
       contextFileNames,
       errorCount,
       availableTerminalHeight,
-      stableControlsHeight,
       mainAreaWidth,
       staticAreaMaxItemHeight,
       staticExtraHeight,

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

@@ -42,7 +42,6 @@ describe('IdeIntegrationNudge', () => {
   beforeEach(() => {
     vi.mocked(debugLogger.warn).mockImplementation((...args) => {
       if (
-        // eslint-disable-next-line no-restricted-syntax
         typeof args[0] === 'string' &&
         /was not wrapped in act/.test(args[0])
       ) {
@@ -54,9 +53,10 @@ describe('IdeIntegrationNudge', () => {
   });
 
   it('renders correctly with default options', async () => {
-    const { lastFrame, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <IdeIntegrationNudge {...defaultProps} />,
     );
+    await waitUntilReady();
     const frame = lastFrame();
 
     expect(frame).toContain('Do you want to connect VS Code to Gemini CLI?');
@@ -72,6 +72,8 @@ describe('IdeIntegrationNudge', () => {
       <IdeIntegrationNudge {...defaultProps} onComplete={onComplete} />,
     );
 
+    await waitUntilReady();
+
     // "Yes" is the first option and selected by default usually.
     await act(async () => {
       stdin.write('\r');
@@ -91,6 +93,8 @@ describe('IdeIntegrationNudge', () => {
       <IdeIntegrationNudge {...defaultProps} onComplete={onComplete} />,
     );
 
+    await waitUntilReady();
+
     // Navigate down to "No (esc)"
     await act(async () => {
       stdin.write('\u001B[B'); // Down arrow
@@ -115,6 +119,8 @@ describe('IdeIntegrationNudge', () => {
       <IdeIntegrationNudge {...defaultProps} onComplete={onComplete} />,
     );
 
+    await waitUntilReady();
+
     // Navigate down to "No, don't ask again"
     await act(async () => {
       stdin.write('\u001B[B'); // Down arrow
@@ -144,6 +150,8 @@ describe('IdeIntegrationNudge', () => {
       <IdeIntegrationNudge {...defaultProps} onComplete={onComplete} />,
     );
 
+    await waitUntilReady();
+
     // Press Escape
     await act(async () => {
       stdin.write('\u001B');
@@ -170,6 +178,8 @@ describe('IdeIntegrationNudge', () => {
         <IdeIntegrationNudge {...defaultProps} onComplete={onComplete} />,
       );
 
+    await waitUntilReady();
+
     const frame = lastFrame();
 
     expect(frame).toContain(

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

@@ -1,179 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { cleanup, renderWithProviders } from '../test-utils/render.js';
-import { createMockSettings } from '../test-utils/settings.js';
-import { App } from './App.js';
-import {
-  CoreToolCallStatus,
-  ApprovalMode,
-  makeFakeConfig,
-} from '@google/gemini-cli-core';
-import { type UIState } from './contexts/UIStateContext.js';
-import type { SerializableConfirmationDetails } from '@google/gemini-cli-core';
-import { act } from 'react';
-import { StreamingState } from './types.js';
-
-vi.mock('ink', async (importOriginal) => {
-  const original = await importOriginal<typeof import('ink')>();
-  return {
-    ...original,
-    useIsScreenReaderEnabled: vi.fn(() => false),
-  };
-});
-
-vi.mock('./components/GeminiSpinner.js', () => ({
-  GeminiSpinner: () => null,
-}));
-
-vi.mock('./components/CliSpinner.js', () => ({
-  CliSpinner: () => null,
-}));
-
-// Mock hooks to align with codebase style, even if App uses UIState directly
-vi.mock('./hooks/useGeminiStream.js');
-vi.mock('./hooks/useHistoryManager.js');
-vi.mock('./hooks/useQuotaAndFallback.js');
-vi.mock('./hooks/useThemeCommand.js');
-vi.mock('./auth/useAuth.js');
-vi.mock('./hooks/useEditorSettings.js');
-vi.mock('./hooks/useSettingsCommand.js');
-vi.mock('./hooks/useModelCommand.js');
-vi.mock('./hooks/slashCommandProcessor.js');
-vi.mock('./hooks/useConsoleMessages.js');
-vi.mock('./hooks/useTerminalSize.js', () => ({
-  useTerminalSize: vi.fn(() => ({ columns: 100, rows: 30 })),
-}));
-
-describe('Full Terminal Tool Confirmation Snapshot', () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-  });
-
-  afterEach(() => {
-    cleanup();
-    vi.restoreAllMocks();
-  });
-
-  it('renders tool confirmation box in the frame of the entire terminal', async () => {
-    // Generate a large diff to warrant truncation
-    let largeDiff =
-      '--- a/packages/cli/src/ui/components/InputPrompt.tsx\n+++ b/packages/cli/src/ui/components/InputPrompt.tsx\n@@ -1,100 +1,105 @@\n';
-    for (let i = 1; i <= 60; i++) {
-      largeDiff += ` const line${i} = true;\n`;
-    }
-    largeDiff += '- return kittyProtocolSupporte...;\n';
-    largeDiff += '+ return kittyProtocolSupporte...;\n';
-    largeDiff += '  buffer: TextBuffer;\n';
-    largeDiff += '  onSubmit: (value: string) => void;';
-
-    const confirmationDetails: SerializableConfirmationDetails = {
-      type: 'edit',
-      title: 'Edit packages/.../InputPrompt.tsx',
-      fileName: 'InputPrompt.tsx',
-      filePath: 'packages/.../InputPrompt.tsx',
-      fileDiff: largeDiff,
-      originalContent: 'old',
-      newContent: 'new',
-      isModifying: false,
-    };
-
-    const toolCalls = [
-      {
-        callId: 'call-1-modify-selected',
-        name: 'Edit',
-        description:
-          'packages/.../InputPrompt.tsx:   return kittyProtocolSupporte... =>   return kittyProtocolSupporte...',
-        status: CoreToolCallStatus.AwaitingApproval,
-        resultDisplay: '',
-        confirmationDetails,
-      },
-    ];
-
-    const mockUIState = {
-      history: [
-        {
-          id: 1,
-          type: 'user',
-          text: 'Can you edit InputPrompt.tsx for me?',
-        },
-      ],
-      mainAreaWidth: 99,
-      availableTerminalHeight: 36,
-      streamingState: StreamingState.WaitingForConfirmation,
-      constrainHeight: true,
-      isConfigInitialized: true,
-      cleanUiDetailsVisible: true,
-      quota: {
-        userTier: 'PRO',
-        stats: {
-          limits: {},
-          usage: {},
-        },
-        proQuotaRequest: null,
-        validationRequest: null,
-      },
-      pendingHistoryItems: [
-        {
-          id: 2,
-          type: 'tool_group',
-          tools: toolCalls,
-        },
-      ],
-      showApprovalModeIndicator: ApprovalMode.DEFAULT,
-      sessionStats: {
-        lastPromptTokenCount: 175400,
-        contextPercentage: 3,
-      },
-      buffer: { text: '' },
-      messageQueue: [],
-      activeHooks: [],
-      contextFileNames: [],
-      rootUiRef: { current: null },
-    } as unknown as UIState;
-
-    const mockConfig = makeFakeConfig();
-    mockConfig.getUseAlternateBuffer = () => true;
-    mockConfig.isTrustedFolder = () => true;
-    mockConfig.getDisableAlwaysAllow = () => false;
-    mockConfig.getIdeMode = () => false;
-    mockConfig.getTargetDir = () => '/directory';
-
-    const { waitUntilReady, lastFrame, generateSvg, unmount } =
-      await renderWithProviders(<App />, {
-        uiState: mockUIState,
-        config: mockConfig,
-        settings: createMockSettings({
-          merged: {
-            ui: {
-              useAlternateBuffer: true,
-              theme: 'default',
-              showUserIdentity: false,
-              showShortcutsHint: false,
-              footer: {
-                hideContextPercentage: false,
-                hideTokens: false,
-                hideModel: false,
-              },
-            },
-            security: {
-              enablePermanentToolApproval: true,
-            },
-          },
-        }),
-      });
-
-    await waitUntilReady();
-
-    // Give it a moment to render
-    await act(async () => {
-      await new Promise((resolve) => setTimeout(resolve, 500));
-    });
-
-    await expect({ lastFrame, generateSvg }).toMatchSvgSnapshot();
-    unmount();
-  });
-});

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

@@ -2,13 +2,10 @@
 
 exports[`App > Snapshots > renders default layout correctly 1`] = `
 "
- ▝▜▄      ▗█▀▀▜▙▝█▛▀▀▌▜██▖▟██▘▜█▘▜██▖▝█▛▝█▛
-   ▝▜▄    █▌     █▙▟  ▐█▝█▛▐█ ▐█ ▐█▝█▖█▌ █▌
-  ▗▟▀     ▜▙ ▝█▛ █▌▝ ▖▐█   ▐█ ▐█ ▐█ ▝██▌ █▌
- ▝▀        ▀▀▀▀▘▝▀▀▀▀▘▀▀▘  ▀▀▘▀▀▘▀▀▘ ▝▀▀▝▀▀
-
- Gemini CLI v1.2.3
-
+  ▝▜▄     Gemini CLI v1.2.3
+    ▝▜▄
+   ▗▟▀ 
+  ▝▀    
 
 
 Tips for getting started:
@@ -37,8 +34,11 @@ Tips for getting started:
 
 
 
-Notifications
 
+
+
+
+Notifications
 Composer
 "
 `;
@@ -47,13 +47,10 @@ exports[`App > Snapshots > renders screen reader layout correctly 1`] = `
 "Notifications
 Footer
 
- ▝▜▄      ▗█▀▀▜▙▝█▛▀▀▌▜██▖▟██▘▜█▘▜██▖▝█▛▝█▛
-   ▝▜▄    █▌     █▙▟  ▐█▝█▛▐█ ▐█ ▐█▝█▖█▌ █▌
-  ▗▟▀     ▜▙ ▝█▛ █▌▝ ▖▐█   ▐█ ▐█ ▐█ ▝██▌ █▌
- ▝▀        ▀▀▀▀▘▝▀▀▀▀▘▀▀▘  ▀▀▘▀▀▘▀▀▘ ▝▀▀▝▀▀
-
- Gemini CLI v1.2.3
-
+  ▝▜▄     Gemini CLI v1.2.3
+    ▝▜▄
+   ▗▟▀ 
+  ▝▀    
 
 
 Tips for getting started:
@@ -67,12 +64,13 @@ Composer
 
 exports[`App > Snapshots > renders with dialogs visible 1`] = `
 "
- ▝▜▄      ▗█▀▀▜▙▝█▛▀▀▌▜██▖▟██▘▜█▘▜██▖▝█▛▝█▛
-   ▝▜▄    █▌     █▙▟  ▐█▝█▛▐█ ▐█ ▐█▝█▖█▌ █▌
-  ▗▟▀     ▜▙ ▝█▛ █▌▝ ▖▐█   ▐█ ▐█ ▐█ ▝██▌ █▌
- ▝▀        ▀▀▀▀▘▝▀▀▀▀▘▀▀▘  ▀▀▘▀▀▘▀▀▘ ▝▀▀▝▀▀
+  ▝▜▄     Gemini CLI v1.2.3
+    ▝▜▄
+   ▗▟▀ 
+  ▝▀    
+
+
 
- Gemini CLI v1.2.3
 
 
 
@@ -103,20 +101,16 @@ exports[`App > Snapshots > renders with dialogs visible 1`] = `
 
 
 Notifications
-
 DialogManager
 "
 `;
 
 exports[`App > should render ToolConfirmationQueue along with Composer when tool is confirming and experiment is on 1`] = `
 "
- ▝▜▄      ▗█▀▀▜▙▝█▛▀▀▌▜██▖▟██▘▜█▘▜██▖▝█▛▝█▛
-   ▝▜▄    █▌     █▙▟  ▐█▝█▛▐█ ▐█ ▐█▝█▖█▌ █▌
-  ▗▟▀     ▜▙ ▝█▛ █▌▝ ▖▐█   ▐█ ▐█ ▐█ ▝██▌ █▌
- ▝▀        ▀▀▀▀▘▝▀▀▀▀▘▀▀▘  ▀▀▘▀▀▘▀▀▘ ▝▀▀▝▀▀
-
- Gemini CLI v1.2.3
-
+  ▝▜▄     Gemini CLI v1.2.3
+    ▝▜▄
+   ▗▟▀ 
+  ▝▀    
 
 
 Tips for getting started:
@@ -145,8 +139,11 @@ HistoryItemDisplay
 
 
 
-Notifications
 
+
+
+
+Notifications
 Composer
 "
 `;

packages/cli/src/ui/__snapshots__/ToolConfirmationFullFrame-Full-Terminal-Tool-Confirmation-Snapshot-renders-tool-confirmation-box-in-the-frame-of-the-entire-terminal.snap.svg

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

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

@@ -1,43 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`Full Terminal Tool Confirmation Snapshot > renders tool confirmation box in the frame of the entire terminal 1`] = `
-"▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
- > Can you edit InputPrompt.tsx for me?                                                             
-▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
-╭─────────────────────────────────────────────────────────────────────────────────────────────────╮
-│ Action Required                                                                                 │
-│                                                                                                 │
-│ ?  Edit packages/.../InputPrompt.tsx:   return kittyProtocolSupporte... =>   return kittyProto… │
-│                                                                                                 │
-│ ... first 44 lines hidden (Ctrl+O to show) ...                                                  │
-│ 45   const line45 = true;                                                                       │
-│ 46   const line46 = true;                                                                       │
-│ 47   const line47 = true;                                                                       │█
-│ 48   const line48 = true;                                                                       │█
-│ 49   const line49 = true;                                                                       │█
-│ 50   const line50 = true;                                                                       │█
-│ 51   const line51 = true;                                                                       │█
-│ 52   const line52 = true;                                                                       │█
-│ 53   const line53 = true;                                                                       │█
-│ 54   const line54 = true;                                                                       │█
-│ 55   const line55 = true;                                                                       │█
-│ 56   const line56 = true;                                                                       │█
-│ 57   const line57 = true;                                                                       │█
-│ 58   const line58 = true;                                                                       │█
-│ 59   const line59 = true;                                                                       │█
-│ 60   const line60 = true;                                                                       │█
-│ 61 -  return kittyProtocolSupporte...;                                                          │█
-│ 61 +  return kittyProtocolSupporte...;                                                          │█
-│ 62    buffer: TextBuffer;                                                                       │█
-│ 63    onSubmit: (value: string) => void;                                                        │█
-│ Apply this change?                                                                              │█
-│                                                                                                 │█
-│ ● 1. Allow once                                                                                 │█
-│   2. Allow for this session                                                                     │█
-│   3. Allow for this file in all future sessions                                                 │█
-│   4. Modify with external editor                                                                │█
-│   5. No, suggest changes (esc)                                                                  │█
-│                                                                                                 │█
-╰─────────────────────────────────────────────────────────────────────────────────────────────────╯█
-"
-`;

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

@@ -73,21 +73,23 @@ describe('ApiAuthDialog', () => {
   });
 
   it('renders correctly', async () => {
-    const { lastFrame, unmount } = await render(
+    const { lastFrame, waitUntilReady, unmount } = render(
       <ApiAuthDialog onSubmit={onSubmit} onCancel={onCancel} />,
     );
+    await waitUntilReady();
     expect(lastFrame()).toMatchSnapshot();
     unmount();
   });
 
   it('renders with a defaultValue', async () => {
-    const { unmount } = await render(
+    const { waitUntilReady, unmount } = render(
       <ApiAuthDialog
         onSubmit={onSubmit}
         onCancel={onCancel}
         defaultValue="test-key"
       />,
     );
+    await waitUntilReady();
     expect(mockedUseTextBuffer).toHaveBeenCalledWith(
       expect.objectContaining({
         initialText: 'test-key',
@@ -111,9 +113,10 @@ describe('ApiAuthDialog', () => {
     'calls $expectedCall.name when $keyName is pressed',
     async ({ keyName, sequence, expectedCall, args }) => {
       mockBuffer.text = 'submitted-key'; // Set for the onSubmit case
-      const { unmount } = await render(
+      const { waitUntilReady, unmount } = render(
         <ApiAuthDialog onSubmit={onSubmit} onCancel={onCancel} />,
       );
+      await waitUntilReady();
       // 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];
@@ -133,22 +136,24 @@ describe('ApiAuthDialog', () => {
   );
 
   it('displays an error message', async () => {
-    const { lastFrame, unmount } = await render(
+    const { lastFrame, waitUntilReady, unmount } = 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 { unmount } = await render(
+    const { waitUntilReady, unmount } = render(
       <ApiAuthDialog onSubmit={onSubmit} onCancel={onCancel} />,
     );
+    await waitUntilReady();
     // Call 0 is ApiAuthDialog (isActive: true)
     // Call 1 is TextInput (isActive: true, priority: true)
     const keypressHandler = mockedUseKeypress.mock.calls[0][0];

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

@@ -143,9 +143,10 @@ describe('AuthDialog', () => {
         for (const [key, value] of Object.entries(env)) {
           vi.stubEnv(key, value as string);
         }
-        const { unmount } = await renderWithProviders(
+        const { waitUntilReady, unmount } = await renderWithProviders(
           <AuthDialog {...props} />,
         );
+        await waitUntilReady();
         const items = mockedRadioButtonSelect.mock.calls[0][0].items;
         for (const item of shouldContain) {
           expect(items).toContainEqual(item);
@@ -160,7 +161,10 @@ describe('AuthDialog', () => {
 
   it('filters auth types when enforcedType is set', async () => {
     props.settings.merged.security.auth.enforcedType = AuthType.USE_GEMINI;
-    const { unmount } = await renderWithProviders(<AuthDialog {...props} />);
+    const { waitUntilReady, unmount } = await renderWithProviders(
+      <AuthDialog {...props} />,
+    );
+    await waitUntilReady();
     const items = mockedRadioButtonSelect.mock.calls[0][0].items;
     expect(items).toHaveLength(1);
     expect(items[0].value).toBe(AuthType.USE_GEMINI);
@@ -169,7 +173,10 @@ describe('AuthDialog', () => {
 
   it('sets initial index to 0 when enforcedType is set', async () => {
     props.settings.merged.security.auth.enforcedType = AuthType.USE_GEMINI;
-    const { unmount } = await renderWithProviders(<AuthDialog {...props} />);
+    const { waitUntilReady, unmount } = await renderWithProviders(
+      <AuthDialog {...props} />,
+    );
+    await waitUntilReady();
     const { initialIndex } = mockedRadioButtonSelect.mock.calls[0][0];
     expect(initialIndex).toBe(0);
     unmount();
@@ -206,7 +213,10 @@ describe('AuthDialog', () => {
       },
     ])('selects initial auth type $desc', async ({ setup, expected }) => {
       setup();
-      const { unmount } = await renderWithProviders(<AuthDialog {...props} />);
+      const { waitUntilReady, unmount } = await renderWithProviders(
+        <AuthDialog {...props} />,
+      );
+      await waitUntilReady();
       const { items, initialIndex } = mockedRadioButtonSelect.mock.calls[0][0];
       expect(items[initialIndex].value).toBe(expected);
       unmount();
@@ -216,7 +226,10 @@ describe('AuthDialog', () => {
   describe('handleAuthSelect', () => {
     it('calls onAuthError if validation fails', async () => {
       mockedValidateAuthMethod.mockReturnValue('Invalid method');
-      const { unmount } = await renderWithProviders(<AuthDialog {...props} />);
+      const { waitUntilReady, unmount } = await renderWithProviders(
+        <AuthDialog {...props} />,
+      );
+      await waitUntilReady();
       const { onSelect: handleAuthSelect } =
         mockedRadioButtonSelect.mock.calls[0][0];
       handleAuthSelect(AuthType.USE_GEMINI);
@@ -232,7 +245,10 @@ describe('AuthDialog', () => {
 
     it('sets auth context with requiresRestart: true for LOGIN_WITH_GOOGLE', async () => {
       mockedValidateAuthMethod.mockReturnValue(null);
-      const { unmount } = await renderWithProviders(<AuthDialog {...props} />);
+      const { waitUntilReady, unmount } = await renderWithProviders(
+        <AuthDialog {...props} />,
+      );
+      await waitUntilReady();
       const { onSelect: handleAuthSelect } =
         mockedRadioButtonSelect.mock.calls[0][0];
       await handleAuthSelect(AuthType.LOGIN_WITH_GOOGLE);
@@ -245,7 +261,10 @@ describe('AuthDialog', () => {
 
     it('sets auth context with empty object for other auth types', async () => {
       mockedValidateAuthMethod.mockReturnValue(null);
-      const { unmount } = await renderWithProviders(<AuthDialog {...props} />);
+      const { waitUntilReady, unmount } = await renderWithProviders(
+        <AuthDialog {...props} />,
+      );
+      await waitUntilReady();
       const { onSelect: handleAuthSelect } =
         mockedRadioButtonSelect.mock.calls[0][0];
       await handleAuthSelect(AuthType.USE_GEMINI);
@@ -254,34 +273,40 @@ describe('AuthDialog', () => {
       unmount();
     });
 
-    it('always shows API key dialog even when env var is present', async () => {
+    it('skips API key dialog on initial setup if env var is present', async () => {
       mockedValidateAuthMethod.mockReturnValue(null);
       vi.stubEnv('GEMINI_API_KEY', 'test-key-from-env');
       // props.settings.merged.security.auth.selectedType is undefined here, simulating initial setup
 
-      const { unmount } = await renderWithProviders(<AuthDialog {...props} />);
+      const { waitUntilReady, unmount } = await renderWithProviders(
+        <AuthDialog {...props} />,
+      );
+      await waitUntilReady();
       const { onSelect: handleAuthSelect } =
         mockedRadioButtonSelect.mock.calls[0][0];
       await handleAuthSelect(AuthType.USE_GEMINI);
 
       expect(props.setAuthState).toHaveBeenCalledWith(
-        AuthState.AwaitingApiKeyInput,
+        AuthState.Unauthenticated,
       );
       unmount();
     });
 
-    it('always shows API key dialog even when env var is empty string', async () => {
+    it('skips API key dialog if env var is present but empty', async () => {
       mockedValidateAuthMethod.mockReturnValue(null);
       vi.stubEnv('GEMINI_API_KEY', ''); // Empty string
       // props.settings.merged.security.auth.selectedType is undefined here
 
-      const { unmount } = await renderWithProviders(<AuthDialog {...props} />);
+      const { waitUntilReady, unmount } = await renderWithProviders(
+        <AuthDialog {...props} />,
+      );
+      await waitUntilReady();
       const { onSelect: handleAuthSelect } =
         mockedRadioButtonSelect.mock.calls[0][0];
       await handleAuthSelect(AuthType.USE_GEMINI);
 
       expect(props.setAuthState).toHaveBeenCalledWith(
-        AuthState.AwaitingApiKeyInput,
+        AuthState.Unauthenticated,
       );
       unmount();
     });
@@ -291,7 +316,10 @@ describe('AuthDialog', () => {
       // process.env['GEMINI_API_KEY'] is not set
       // props.settings.merged.security.auth.selectedType is undefined here, simulating initial setup
 
-      const { unmount } = await renderWithProviders(<AuthDialog {...props} />);
+      const { waitUntilReady, unmount } = await renderWithProviders(
+        <AuthDialog {...props} />,
+      );
+      await waitUntilReady();
       const { onSelect: handleAuthSelect } =
         mockedRadioButtonSelect.mock.calls[0][0];
       await handleAuthSelect(AuthType.USE_GEMINI);
@@ -302,20 +330,23 @@ describe('AuthDialog', () => {
       unmount();
     });
 
-    it('always shows API key dialog on re-auth even if env var is present', async () => {
+    it('skips API key dialog on re-auth if env var is present (cannot edit)', async () => {
       mockedValidateAuthMethod.mockReturnValue(null);
       vi.stubEnv('GEMINI_API_KEY', 'test-key-from-env');
-      // Simulate switching from a different auth method (e.g., Google Login → API key)
+      // Simulate that the user has already authenticated once
       props.settings.merged.security.auth.selectedType =
         AuthType.LOGIN_WITH_GOOGLE;
 
-      const { unmount } = await renderWithProviders(<AuthDialog {...props} />);
+      const { waitUntilReady, unmount } = await renderWithProviders(
+        <AuthDialog {...props} />,
+      );
+      await waitUntilReady();
       const { onSelect: handleAuthSelect } =
         mockedRadioButtonSelect.mock.calls[0][0];
       await handleAuthSelect(AuthType.USE_GEMINI);
 
       expect(props.setAuthState).toHaveBeenCalledWith(
-        AuthState.AwaitingApiKeyInput,
+        AuthState.Unauthenticated,
       );
       unmount();
     });
@@ -329,7 +360,10 @@ describe('AuthDialog', () => {
       vi.mocked(props.config.isBrowserLaunchSuppressed).mockReturnValue(true);
       mockedValidateAuthMethod.mockReturnValue(null);
 
-      const { unmount } = await renderWithProviders(<AuthDialog {...props} />);
+      const { waitUntilReady, unmount } = await renderWithProviders(
+        <AuthDialog {...props} />,
+      );
+      await waitUntilReady();
       const { onSelect: handleAuthSelect } =
         mockedRadioButtonSelect.mock.calls[0][0];
       await act(async () => {
@@ -349,9 +383,10 @@ describe('AuthDialog', () => {
 
   it('displays authError when provided', async () => {
     props.authError = 'Something went wrong';
-    const { lastFrame, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <AuthDialog {...props} />,
     );
+    await waitUntilReady();
     expect(lastFrame()).toContain('Something went wrong');
     unmount();
   });
@@ -394,7 +429,10 @@ describe('AuthDialog', () => {
       },
     ])('$desc', async ({ setup, expectations }) => {
       setup();
-      const { unmount } = await renderWithProviders(<AuthDialog {...props} />);
+      const { waitUntilReady, unmount } = await renderWithProviders(
+        <AuthDialog {...props} />,
+      );
+      await waitUntilReady();
       const keypressHandler = mockedUseKeypress.mock.calls[0][0];
       keypressHandler({ name: 'escape' });
       expectations(props);
@@ -404,27 +442,30 @@ describe('AuthDialog', () => {
 
   describe('Snapshots', () => {
     it('renders correctly with default props', async () => {
-      const { lastFrame, unmount } = await renderWithProviders(
+      const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
         <AuthDialog {...props} />,
       );
+      await waitUntilReady();
       expect(lastFrame()).toMatchSnapshot();
       unmount();
     });
 
     it('renders correctly with auth error', async () => {
       props.authError = 'Something went wrong';
-      const { lastFrame, unmount } = await renderWithProviders(
+      const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
         <AuthDialog {...props} />,
       );
+      await waitUntilReady();
       expect(lastFrame()).toMatchSnapshot();
       unmount();
     });
 
     it('renders correctly with enforced auth type', async () => {
       props.settings.merged.security.auth.enforcedType = AuthType.USE_GEMINI;
-      const { lastFrame, unmount } = await renderWithProviders(
+      const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
         <AuthDialog {...props} />,
       );
+      await waitUntilReady();
       expect(lastFrame()).toMatchSnapshot();
       unmount();
     });