fix(core): add timeout to tree-sitter initialization to prevent hanging

.gemini/settings.json

@@ -2,6 +2,7 @@
   "experimental": {
     "extensionReloading": true,
     "modelSteering": true,
+    "memoryManager": false,
     "topicUpdateNarration": true
   },
   "general": {

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

@@ -162,7 +162,5 @@ instructions for the other section.
 
 ## Finalize
 
-- After making changes, if `npm run format` fails, it may be necessary to run
-  `npm install` first to ensure all formatting dependencies are available.
-  Then, run `npm run format` to ensure consistency.
+- After making changes, run `npm run format` ONLY to ensure consistency.
 - Delete any temporary files created during the process.

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

@@ -1,7 +1,7 @@
 ---
 name: docs-writer
 description:
-  Always use this skill when the task involves writing, reviewing, or editing
+  Always use this skill when the task involves writing, reviewing, or editing 
   files in the `/docs` directory or any `.md` files in the repository.
 ---
 
@@ -24,7 +24,7 @@ approach.
 
 - **Perspective and tense:** Address the reader as "you." Use active voice and
   present tense (e.g., "The API returns...").
-- **Tone:** Professional, friendly, and direct.
+- **Tone:** Professional, friendly, and direct. 
 - **Clarity:** Use simple vocabulary. Avoid jargon, slang, and marketing hype.
 - **Global Audience:** Write in standard US English. Avoid idioms and cultural
   references.
@@ -47,8 +47,8 @@ Write precisely to ensure your instructions are unambiguous.
   "foo" or "bar."
 - **Quota and limit terminology:** For any content involving resource capacity
   or using the word "quota" or "limit", strictly adhere to the guidelines in
-  the `quota-limit-style-guide.md` resource file. Generally, Use "quota" for
-  the administrative bucket and "limit" for the numerical ceiling.
+  the `quota-limit-style-guide.md` resource file. Generally, Use "quota" for the
+  administrative bucket and "limit" for the numerical ceiling.
 
 ### Formatting and syntax
 Apply consistent formatting to make documentation visually organized and
@@ -120,7 +120,7 @@ accessible.
 > This is an experimental feature currently under active development.
 
 - **Headings:** Use hierarchical headings to support the user journey.
-- **Procedures:**
+- **Procedures:** 
   - Introduce lists of steps with a complete sentence.
   - Start each step with an imperative verb.
   - Number sequential steps; use bullets for non-sequential lists.
@@ -134,7 +134,7 @@ accessible.
 
 ## Phase 2: Preparation
 Before modifying any documentation, thoroughly investigate the request and the
-surrounding context.
+surrounding context. 
 
 1.  **Clarify:** Understand the core request. Differentiate between writing new
     content and editing existing content. If the request is ambiguous (e.g.,
@@ -145,8 +145,6 @@ surrounding context.
 4.  **Connect:** Identify all referencing pages if changing behavior. Check if
     `docs/sidebar.json` needs updates.
 5.  **Plan:** Create a step-by-step plan before making changes.
-6.  **Audit Docset:** If asked to audit the documentation, follow the procedural
-    guide in [docs-auditing.md](./references/docs-auditing.md).
 
 ## Phase 3: Execution
 Implement your plan by either updating existing files or creating new ones
@@ -159,7 +157,7 @@ documentation.
 
 - **Gaps:** Identify areas where the documentation is incomplete or no longer
   reflects existing code.
-- **Structure:** Apply "Structure (New Docs)" rules (BLUF, headings, etc.) when
+- **Structure:** Apply "Structure (New Docs)" rules (BLUF, headings, etc.) when 
   adding new sections to existing pages.
 - **Headers**: If you change a header, you must check for links that lead to
   that header and update them.
@@ -170,16 +168,15 @@ documentation.
   documents.
 
 ## Phase 4: Verification and finalization
-Perform a final quality check to ensure that all changes are correctly
-formatted and that all links are functional.
+Perform a final quality check to ensure that all changes are correctly formatted
+and that all links are functional.
 
 1.  **Accuracy:** Ensure content accurately reflects the implementation and
   technical behavior.
 2.  **Self-review:** Re-read changes for formatting, correctness, and flow.
-3.  **Link check:** Verify all new and existing links leading to or from
-    modified pages. If you changed a header, ensure that any links that lead to
-    it are updated.
-4.  **Format:** If `npm run format` fails, it may be necessary to run `npm
-    install` first to ensure all formatting dependencies are available. Once all
-    changes are complete, ask to execute `npm run format` to ensure consistent
-    formatting across the project. If the user confirms, execute the command.
+3.  **Link check:** Verify all new and existing links leading to or from modified
+    pages. If you changed a header, ensure that any links that lead to it are
+    updated.
+4.  **Format:** Once all changes are complete, ask to execute `npm run format`
+    to ensure consistent formatting across the project. If the user confirms,
+    execute the command.

.gemini/skills/docs-writer/references/docs-auditing.md

@@ -1,195 +0,0 @@
-# Procedural Guide: Auditing the Docset
-
-This guide outlines the process for auditing the Gemini CLI documentation for
-correctness and adherence to style guidelines. This process involves both an
-"Editor" and "Technical Writer" phase.
-
-## Objective
-
-To ensure all public-facing documentation is accurate, up-to-date, adheres to
-the Gemini CLI documentation style guide, and reflects the current state of the
-codebase.
-
-## Phase 1: Editor Audit
-
-**Role:** The editor is responsible for identifying potential issues based on
-style guide violations and technical inaccuracies.
-
-### Steps
-
-1.  **Identify Documentation Scope:**
-    - Read `docs/sidebar.json` to get a list of all viewable documentation
-      pages.
-    - For each entry with a `slug`, convert it into a file path (e.g., `docs` ->
-      `docs/index.md`, `docs/get-started` -> `docs/get-started.md`). Ignore
-      entries with `link` properties.
-
-2.  **Prepare Audit Results File:**
-    - Create a new Markdown file named `audit-results-[YYYY-MM-DD].md` (e.g.,
-      `audit-results-2026-03-13.md`). This file will contain all identified
-      violations and recommendations.
-
-3.  **Retrieve Style Guidelines:**
-    - Familiarize yourself with the `docs-writer` skill instructions and the
-      included style guidelines.
-
-4.  **Audit Each Document:**
-    - For each documentation file identified in Step 1, read its content.
-    - **Review against Style Guide:**
-      - **Voice and Tone Violations:**
-        - **Unprofessional Tone:** Identify phrasing that is overly casual,
-          defensive, or lacks a professional and friendly demeanor.
-        - **Indirectness or Vagueness:** Identify sentences that are
-          unnecessarily wordy or fail to be concise and direct.
-        - **Incorrect Pronoun:** Identify any use of third-person pronouns
-          (e.g., "we," "they," "the user") when referring to the reader, instead
-          of the second-person pronoun **"you"**.
-        - **Passive Voice:** Identify sentences written in the passive voice.
-        - **Incorrect Tense:** Identify the use of past or future tense verbs,
-          instead of the **present tense**.
-        - **Poor Vocabulary:** Identify the use of jargon, slang, or overly
-          informal language.
-      - **Language and Grammar Violations:**
-        - **Lack of Conciseness:** Identify unnecessarily long phrases or
-          sentences.
-        - **Punctuation Errors:** Identify incorrect or missing punctuation.
-        - **Ambiguous Dates:** Identify dates that could be misinterpreted
-          (e.g., "next Monday" instead of "April 15, 2026").
-        - **Abbreviation Usage:** Identify the use of abbreviations that should
-          be spelled out (e.g., "e.g." instead of "for example").
-        - **Terminology:** Check for incorrect or inconsistent use of
-          product-specific terms (e.g., "quota" vs. "limit").
-      - **Formatting and Syntax Violations:**
-        - **Missing Overview:** Check for the absence of a brief overview
-          paragraph at the start of the document.
-        - **Line Length:** Identify any lines of text that exceed **80
-          characters** (text wrap violation).
-        - **Casing:** Identify incorrect casing for headings, titles, or named
-          entities (e.g., product names like `Gemini CLI`).
-        - **List Formatting:** Identify incorrectly formatted lists (e.g.,
-          inconsistent indentation or numbering).
-        - **Incorrect Emphasis:** Identify incorrect use of bold text (should
-          only be used for UI elements) or code font (should be used for code,
-          file names, or command-line input).
-        - **Link Quality:** Identify links with non-descriptive anchor text
-          (e.g., "click here").
-        - **Image Alt Text:** Identify images with missing or poor-quality
-          (non-descriptive) alt text.
-      - **Structure Violations:**
-        - **Missing BLUF:** Check for the absence of a "Bottom Line Up Front"
-          summary at the start of complex sections or documents.
-        - **Experimental Feature Notes:** Identify experimental features that
-          are not clearly labeled with a standard note.
-        - **Heading Hierarchy:** Check for skipped heading levels (e.g., going
-          from `##` to `####`).
-        - **Procedure Clarity:** Check for procedural steps that do not start
-          with an imperative verb or where a condition is placed _after_ the
-          instruction.
-        - **Element Misuse:** Identify the incorrect or inappropriate use of
-          special elements (e.g., Notes, Warnings, Cautions).
-        - **Table of Contents:** Identify the presence of a dynamically
-          generated or manually included table of contents.
-        - **Missing Next Steps:** Check for procedural documents that lack a
-          "Next steps" section (if applicable).
-    - **Verify Code Accuracy (if applicable):**
-      - If the document contains code snippets (e.g., shell commands, API calls,
-        file paths, Docker image versions), use `grep_search` and `read_file`
-        within the `packages/` directory (or other relevant parts of the
-        codebase) to ensure the code is still accurate and up-to-date. Pay close
-        attention to version numbers, package names, and command syntax.
-    - **Record Findings:** For each **violation** or inaccuracy found:
-      - Note the file path.
-      - Describe the violation (e.g., "Violation (Language and Grammar): Uses
-        'e.g.'").
-      - Provide a clear and actionable recommendation to correct the issue.
-        (e.g., "Recommendation: Replace 'e.g.' with 'for example'." or
-        "Recommendation: Replace '...' with '...' in active voice.).
-      - Append these findings to `audit-results-[YYYY-MM-DD].md`.
-
-## Phase 2: Software Engineer Audit
-
-**Role:** The software engineer is responsible for finding undocumented features
-by auditing the codebase and recent changelogs, and passing these findings to
-the technical writer.
-
-### Steps
-
-1.  **Proactive Codebase Audit:**
-    - Audit high-signal areas of the codebase to identify undocumented features.
-      You MUST review:
-      - `packages/cli/src/commands/`
-      - `packages/core/src/tools/`
-      - `packages/cli/src/config/settings.ts`
-
-2.  **Review Recent Updates:**
-    - Check recent changelogs in stable and announcements within the
-      documentation to see if newly introduced features are documented properly.
-
-3.  **Evaluate and Record Findings:**
-    - Determine if these features are adequately covered in the docs. They do
-      not need to be documented word for word, but major features that customers
-      should care about probably should have an article.
-    - Append your findings to the `audit-results-[YYYY-MM-DD].md` file,
-      providing a brief description of the feature and where it should be
-      documented.
-
-## Phase 3: Technical Writer Implementation
-
-**Role:** The technical writer handles input from both the editor and the
-software engineer, makes appropriate decisions about what to change, and
-implements the approved changes.
-
-### Steps
-
-1.  **Review Audit Results:**
-    - Read `audit-results-[YYYY-MM-DD].md` to understand all identified issues,
-      undocumented features, and recommendations from both the Editor and
-      Software Engineer phases.
-
-2.  **Make Decisions and Log Reasoning:**
-    - Create or update an implementation log (e.g.,
-      `audit-implementation-log-[YYYY-MM-DD].md`).
-    - Make sure the logs are updated for all steps, documenting your reasoning
-      for each recommendation (why it was accepted, modified, or rejected). This
-      is required for a final check by a human in the PR.
-
-3.  **Implement Changes:**
-    - For each approved recommendation:
-      - Read the target documentation file.
-      - Apply the recommended change using the `replace` tool. Pay close
-        attention to `old_string` for exact matches, including whitespace and
-        newlines. For multiple occurrences of the same simple string (e.g.,
-        "e.g."), use `allow_multiple: true`.
-      - **String replacement safeguards:** When applying these fixes across the
-        docset, you must verify the following:
-        - **Preserve Code Blocks:** Explicitly verify that no code blocks,
-          inline code snippets, terminal commands, or file paths have been
-          erroneously capitalized or modified.
-        - **Preserve Literal Strings:** Never alter the wording of literal error
-          messages, UI quotes, or system logs. For example, if a style rule says
-          to remove the word "please", you must NOT remove it if it appears
-          inside a quoted error message (e.g.,
-          `Error: Please contact your administrator`).
-        - **Verify Sentence Casing:** When removing filler words (like "please")
-          from the beginning of a sentence or list item, always verify that the
-          new first word of the sentence is properly capitalized.
-      - For structural changes (e.g., adding an overview paragraph), use
-        `replace` or `write_file` as appropriate.
-      - For broken links, determine the correct new path or update the link
-        text.
-      - For creating new files (e.g., `docs/get-started.md` to fix a broken
-        link, or a new feature article), use `write_file`.
-
-4.  **Execute Auto-Generation Scripts:**
-    - Some documentation pages are auto-generated from the codebase and should
-      be updated using npm scripts rather than manual edits. After implementing
-      manual changes (especially if you edited settings or configurations based
-      on SWE recommendations), ensure you run:
-      - `npm run docs:settings` to generate/update the configuration reference.
-      - `npm run docs:keybindings` to generate/update the keybindings reference.
-
-5.  **Format Code:**
-    - **Dependencies:** If `npm run format` fails, it may be necessary to run
-      `npm install` first to ensure all formatting dependencies are available.
-    - After all changes have been implemented, run `npm run format` to ensure
-      consistent formatting across the project.

.github/workflows/chained_e2e.yml

@@ -335,8 +335,6 @@ jobs:
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
           GEMINI_MODEL: 'gemini-3-pro-preview'
-          # Only run always passes behavioral tests.
-          EVAL_SUITE_TYPE: 'behavioral'
           # Disable Vitest internal retries to avoid double-retrying;
           # custom retry logic is handled in evals/test-helper.ts
           VITEST_RETRY: 0

.github/workflows/docs-audit.yml

@@ -1,50 +0,0 @@
-name: 'Weekly Docs Audit'
-
-on:
-  schedule:
-    # Runs every Monday at 00:00 UTC
-    - cron: '0 0 * * MON'
-  workflow_dispatch:
-
-jobs:
-  audit-docs:
-    runs-on: 'ubuntu-latest'
-    permissions:
-      contents: 'write'
-      pull-requests: 'write'
-
-    steps:
-      - name: 'Checkout repository'
-        uses: 'actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5'
-        with:
-          fetch-depth: 0
-          ref: 'main'
-
-      - name: 'Set up Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020'
-        with:
-          node-version: '20'
-
-      - name: 'Run Docs Audit with Gemini'
-        uses: 'google-github-actions/run-gemini-cli@a3bf79042542528e91937b3a3a6fbc4967ee3c31'
-        with:
-          gemini_api_key: '${{ secrets.GEMINI_API_KEY }}'
-          prompt: |
-            Activate the 'docs-writer' skill.
-
-            **Task:** Execute the docs audit procedure, as defined in your 'docs-auditing.md' reference.
-
-      - name: 'Create Pull Request with Audit Results'
-        uses: 'peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c'
-        with:
-          token: '${{ secrets.GEMINI_CLI_ROBOT_GITHUB_PAT }}'
-          commit-message: 'docs: weekly audit results for ${{ github.run_id }}'
-          title: 'Docs Audit for Week of ${{ github.event.schedule }}'
-          body: |
-            This PR contains the auto-generated documentation audit for the week. It includes a new `audit-results-*.md` file with findings and any direct fixes applied by the agent.
-
-            Please review the suggestions and merge.
-          branch: 'docs-audit-${{ github.run_id }}'
-          base: 'main'
-          team-reviewers: 'gemini-cli-docs, gemini-cli-maintainers'
-          delete-branch: true

.github/workflows/evals-nightly.yml

@@ -5,18 +5,10 @@ on:
     - cron: '0 1 * * *' # Runs at 1 AM every day
   workflow_dispatch:
     inputs:
-      suite_type:
-        description: 'Suite type to run'
-        type: 'choice'
-        options:
-          - 'behavioral'
-          - 'component-level'
-          - 'hero-scenario'
-        default: 'behavioral'
-      suite_name:
-        description: 'Specific suite name to run'
-        required: false
-        type: 'string'
+      run_all:
+        description: 'Run all evaluations (including usually passing)'
+        type: 'boolean'
+        default: true
       test_name_pattern:
         description: 'Test name pattern or file name'
         required: false
@@ -67,9 +59,7 @@ jobs:
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
           GEMINI_MODEL: '${{ matrix.model }}'
-          RUN_EVALS: 'true'
-          EVAL_SUITE_TYPE: "${{ github.event.inputs.suite_type || 'behavioral' }}"
-          EVAL_SUITE_NAME: '${{ github.event.inputs.suite_name }}'
+          RUN_EVALS: "${{ github.event.inputs.run_all != 'false' }}"
           TEST_NAME_PATTERN: '${{ github.event.inputs.test_name_pattern }}'
           # Disable Vitest internal retries to avoid double-retrying;
           # custom retry logic is handled in evals/test-helper.ts

.github/workflows/perf-nightly.yml

@@ -1,33 +0,0 @@
-name: 'Performance Tests: Nightly'
-
-on:
-  schedule:
-    - cron: '0 3 * * *' # Runs at 3 AM every day
-  workflow_dispatch: # Allow manual trigger
-
-permissions:
-  contents: 'read'
-
-jobs:
-  perf-test:
-    name: 'Run Performance Usage Tests'
-    runs-on: 'gemini-cli-ubuntu-16-core'
-    if: "github.repository == 'google-gemini/gemini-cli'"
-    steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
-
-      - name: 'Set up Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'npm'
-
-      - name: 'Install dependencies'
-        run: 'npm ci'
-
-      - name: 'Build project'
-        run: 'npm run build'
-
-      - name: 'Run Performance Tests'
-        run: 'npm run test:perf'

.gitignore

@@ -48,7 +48,6 @@ packages/cli/src/generated/
 packages/core/src/generated/
 packages/devtools/src/_client-assets.ts
 .integration-tests/
-.perf-tests/
 packages/vscode-ide-companion/*.vsix
 packages/cli/download-ripgrep*/
 
@@ -65,6 +64,3 @@ gemini-debug.log
 evals/logs/
 
 temp_agents/
-
-# conductor extension and planning directories
-conductor/

GEMINI.md

@@ -44,13 +44,8 @@ powerful tool for developers.
 - **Test Commands:**
   - **Unit (All):** `npm run test`
   - **Integration (E2E):** `npm run test:e2e`
-  - > **NOTE**: Please run the memory and perf tests locally **only if** you are
-    > implementing changes related to those test areas. Otherwise skip these
-    > tests locally and rely on CI to run them on nightly builds.
   - **Memory (Nightly):** `npm run test:memory` (Runs memory regression tests
     against baselines. Excluded from `preflight`, run nightly.)
-  - **Performance (Nightly):** `npm run test:perf` (Runs CPU performance
-    regression tests against baselines. Excluded from `preflight`, run nightly.)
   - **Workspace-Specific:** `npm test -w <pkg> -- <path>` (Note: `<path>` must
     be relative to the workspace root, e.g.,
     `-w @google/gemini-cli-core -- src/routing/modelRouterService.test.ts`)

docs/changelogs/index.md

@@ -18,27 +18,6 @@ on GitHub.
 | [Preview](preview.md) | Experimental features ready for early feedback. |
 | [Stable](latest.md)   | Stable, recommended for general use.            |
 
-## Announcements: v0.37.0 - 2026-04-08
-
-- **Dynamic Sandbox Expansion:** Implemented dynamic sandbox expansion and
-  worktree support for Linux and Windows, improving developer workflows in
-  isolated environments
-  ([#23692](https://github.com/google-gemini/gemini-cli/pull/23692) by @galz10,
-  [#23691](https://github.com/google-gemini/gemini-cli/pull/23691) by
-  @scidomino).
-- **Chapters Narrative Flow:** Introduced tool-based topic grouping ("Chapters")
-  to provide better session structure and narrative continuity
-  ([#23150](https://github.com/google-gemini/gemini-cli/pull/23150) by
-  @Abhijit-2592,
-  [#24079](https://github.com/google-gemini/gemini-cli/pull/24079) by
-  @gundermanc).
-- **Advanced Browser Capabilities:** Enhanced the browser agent with persistent
-  sessions and dynamic tool discovery
-  ([#21306](https://github.com/google-gemini/gemini-cli/pull/21306) by
-  @kunal-10-cloud,
-  [#23805](https://github.com/google-gemini/gemini-cli/pull/23805) by
-  @cynthialong0-0).
-
 ## Announcements: v0.36.0 - 2026-04-01
 
 - **Multi-Registry Architecture and Sandboxing:** Introduced a multi-registry

docs/changelogs/latest.md

@@ -1,6 +1,6 @@
-# Latest stable release: v0.37.0
+# Latest stable release: v0.36.0
 
-Released: April 08, 2026
+Released: April 1, 2026
 
 For most users, our latest stable release is the recommended release. Install
 the latest stable version with:
@@ -11,409 +11,372 @@ npm install -g @google/gemini-cli
 
 ## Highlights
 
-- **Dynamic Sandbox Expansion:** Implemented dynamic sandbox expansion and
-  worktree support for both Linux and Windows, enhancing development flexibility
-  in restricted environments.
-- **Tool-Based Topic Grouping (Chapters):** Introduced "Chapters" to logically
-  group agent interactions based on tool usage and intent, providing a clearer
-  narrative flow in long sessions.
-- **Enhanced Browser Agent:** Added persistent session management, dynamic
-  read-only tool discovery, and sandbox-aware initialization for the browser
-  agent.
-- **Security & Permission Hardening:** Implemented secret visibility lockdown
-  for environment files and integrated integrity controls for Windows
-  sandboxing.
+- **Multi-Registry Architecture and Tool Isolation:** Introduced a
+  multi-registry architecture for subagents and implemented strict sandboxing
+  for macOS (Seatbelt) and Windows to enhance security and isolation.
+- **Improved Subagent Coordination:** Enhanced subagents with local execution
+  capabilities, JIT context injection (upward traversal capped at git root), and
+  resilient tool rejection with contextual feedback.
+- **Enhanced UI and UX:** Implemented a refreshed UX for the Composer layout,
+  improved terminal fallback warnings, and resolved various UI flickering and
+  state persistence issues.
+- **Git Worktree Support:** Added support for Git worktrees to enable isolated
+  parallel sessions within the same repository.
+- **Plan Mode Improvements:** Plan mode now supports non-interactive execution
+  and includes hardened sandbox path resolution to prevent hallucinations.
 
 ## What's Changed
 
-- feat(evals): centralize test agents into test-utils for reuse by @Samee24 in
-  [#23616](https://github.com/google-gemini/gemini-cli/pull/23616)
-- revert: chore(config): disable agents by default by @abhipatel12 in
-  [#23672](https://github.com/google-gemini/gemini-cli/pull/23672)
-- fix(plan): update telemetry attribute keys and add timestamp by @Adib234 in
-  [#23685](https://github.com/google-gemini/gemini-cli/pull/23685)
-- fix(core): prevent premature MCP discovery completion by @jackwotherspoon in
-  [#23637](https://github.com/google-gemini/gemini-cli/pull/23637)
-- feat(browser): add maxActionsPerTask for browser agent setting by
-  @cynthialong0-0 in
-  [#23216](https://github.com/google-gemini/gemini-cli/pull/23216)
-- fix(core): improve agent loader error formatting for empty paths by
-  @adamfweidman in
-  [#23690](https://github.com/google-gemini/gemini-cli/pull/23690)
-- fix(cli): only show updating spinner when auto-update is in progress by
-  @scidomino in [#23709](https://github.com/google-gemini/gemini-cli/pull/23709)
-- Refine onboarding metrics to log the duration explicitly and use the tier
-  name. by @yunaseoul in
-  [#23678](https://github.com/google-gemini/gemini-cli/pull/23678)
-- chore(tools): add toJSON to tools and invocations to reduce logging verbosity
-  by @alisa-alisa in
-  [#22899](https://github.com/google-gemini/gemini-cli/pull/22899)
-- fix(cli): stabilize copy mode to prevent flickering and cursor resets by
+- Changelog for v0.33.2 by @gemini-cli-robot in
+  [#22730](https://github.com/google-gemini/gemini-cli/pull/22730)
+- feat(core): multi-registry architecture and tool filtering for subagents by
+  @akh64bit in [#22712](https://github.com/google-gemini/gemini-cli/pull/22712)
+- Changelog for v0.34.0-preview.4 by @gemini-cli-robot in
+  [#22752](https://github.com/google-gemini/gemini-cli/pull/22752)
+- fix(devtools): use theme-aware text colors for console warnings and errors by
+  @SandyTao520 in
+  [#22181](https://github.com/google-gemini/gemini-cli/pull/22181)
+- Add support for dynamic model Resolution to ModelConfigService by @kevinjwang1
+  in [#22578](https://github.com/google-gemini/gemini-cli/pull/22578)
+- chore(release): bump version to 0.36.0-nightly.20260317.2f90b4653 by
+  @gemini-cli-robot in
+  [#22858](https://github.com/google-gemini/gemini-cli/pull/22858)
+- fix(cli): use active sessionId in useLogger and improve resume robustness by
   @mattKorwel in
-  [#22584](https://github.com/google-gemini/gemini-cli/pull/22584)
-- fix(test): move flaky ctrl-c-exit test to non-blocking suite by @mattKorwel in
-  [#23732](https://github.com/google-gemini/gemini-cli/pull/23732)
-- feat(skills): add ci skill for automated failure replication by @mattKorwel in
-  [#23720](https://github.com/google-gemini/gemini-cli/pull/23720)
-- feat(sandbox): implement forbiddenPaths for OS-specific sandbox managers by
-  @ehedlund in [#23282](https://github.com/google-gemini/gemini-cli/pull/23282)
-- fix(core): conditionally expose additional_permissions in shell tool by
-  @galz10 in [#23729](https://github.com/google-gemini/gemini-cli/pull/23729)
-- refactor(core): standardize OS-specific sandbox tests and extract linux helper
-  methods by @ehedlund in
-  [#23715](https://github.com/google-gemini/gemini-cli/pull/23715)
-- format recently added script by @scidomino in
-  [#23739](https://github.com/google-gemini/gemini-cli/pull/23739)
-- fix(ui): prevent over-eager slash subcommand completion by @keithguerin in
-  [#20136](https://github.com/google-gemini/gemini-cli/pull/20136)
-- Fix dynamic model routing for gemini 3.1 pro to customtools model by
-  @kevinjwang1 in
-  [#23641](https://github.com/google-gemini/gemini-cli/pull/23641)
-- feat(core): support inline agentCardJson for remote agents by @adamfweidman in
-  [#23743](https://github.com/google-gemini/gemini-cli/pull/23743)
-- fix(cli): skip console log/info in headless mode by @cynthialong0-0 in
-  [#22739](https://github.com/google-gemini/gemini-cli/pull/22739)
-- test(core): install bubblewrap on Linux CI for sandbox integration tests by
-  @ehedlund in [#23583](https://github.com/google-gemini/gemini-cli/pull/23583)
-- docs(reference): split tools table into category sections by @sheikhlimon in
-  [#21516](https://github.com/google-gemini/gemini-cli/pull/21516)
-- fix(browser): detect embedded URLs in query params to prevent allowedDomains
-  bypass by @tony-shi in
-  [#23225](https://github.com/google-gemini/gemini-cli/pull/23225)
-- fix(browser): add proxy bypass constraint to domain restriction system prompt
-  by @tony-shi in
-  [#23229](https://github.com/google-gemini/gemini-cli/pull/23229)
-- fix(policy): relax write_file argsPattern in plan mode to allow paths without
-  session ID by @Adib234 in
-  [#23695](https://github.com/google-gemini/gemini-cli/pull/23695)
-- docs: fix grammar in CONTRIBUTING and numbering in sandbox docs by
-  @splint-disk-8i in
-  [#23448](https://github.com/google-gemini/gemini-cli/pull/23448)
-- fix(acp): allow attachments by adding a permission prompt by @sripasg in
-  [#23680](https://github.com/google-gemini/gemini-cli/pull/23680)
-- fix(core): thread AbortSignal to chat compression requests (#20405) by
-  @SH20RAJ in [#20778](https://github.com/google-gemini/gemini-cli/pull/20778)
-- feat(core): implement Windows sandbox dynamic expansion Phase 1 and 2.1 by
-  @scidomino in [#23691](https://github.com/google-gemini/gemini-cli/pull/23691)
-- Add note about root privileges in sandbox docs by @diodesign in
-  [#23314](https://github.com/google-gemini/gemini-cli/pull/23314)
-- docs(core): document agent_card_json string literal options for remote agents
-  by @adamfweidman in
-  [#23797](https://github.com/google-gemini/gemini-cli/pull/23797)
-- fix(cli): resolve TTY hang on headless environments by unconditionally
-  resuming process.stdin before React Ink launch by @cocosheng-g in
-  [#23673](https://github.com/google-gemini/gemini-cli/pull/23673)
-- fix(ui): cleanup estimated string length hacks in composer by @keithguerin in
-  [#23694](https://github.com/google-gemini/gemini-cli/pull/23694)
-- feat(browser): dynamically discover read-only tools by @cynthialong0-0 in
-  [#23805](https://github.com/google-gemini/gemini-cli/pull/23805)
-- docs: clarify policy requirement for `general.plan.directory` in settings
-  schema by @jerop in
-  [#23784](https://github.com/google-gemini/gemini-cli/pull/23784)
-- Revert "perf(cli): optimize --version startup time (#23671)" by @scidomino in
-  [#23812](https://github.com/google-gemini/gemini-cli/pull/23812)
-- don't silence errors from wombat by @scidomino in
-  [#23822](https://github.com/google-gemini/gemini-cli/pull/23822)
-- fix(ui): prevent escape key from cancelling requests in shell mode by
-  @PrasannaPal21 in
-  [#21245](https://github.com/google-gemini/gemini-cli/pull/21245)
-- Changelog for v0.36.0-preview.0 by @gemini-cli-robot in
-  [#23702](https://github.com/google-gemini/gemini-cli/pull/23702)
-- feat(core,ui): Add experiment-gated support for gemini flash 3.1 lite by
-  @chrstnb in [#23794](https://github.com/google-gemini/gemini-cli/pull/23794)
-- Changelog for v0.36.0-preview.3 by @gemini-cli-robot in
-  [#23827](https://github.com/google-gemini/gemini-cli/pull/23827)
-- new linting check: github-actions-pinning by @alisa-alisa in
-  [#23808](https://github.com/google-gemini/gemini-cli/pull/23808)
-- fix(cli): show helpful guidance when no skills are available by @Niralisj in
-  [#23785](https://github.com/google-gemini/gemini-cli/pull/23785)
-- fix: Chat logs and errors handle tail tool calls correctly by @googlestrobe in
-  [#22460](https://github.com/google-gemini/gemini-cli/pull/22460)
-- Don't try removing a tag from a non-existent release. by @scidomino in
-  [#23830](https://github.com/google-gemini/gemini-cli/pull/23830)
-- fix(cli): allow ask question dialog to take full window height by @jacob314 in
-  [#23693](https://github.com/google-gemini/gemini-cli/pull/23693)
-- fix(core): strip leading underscores from error types in telemetry by
-  @yunaseoul in [#23824](https://github.com/google-gemini/gemini-cli/pull/23824)
-- Changelog for v0.35.0 by @gemini-cli-robot in
-  [#23819](https://github.com/google-gemini/gemini-cli/pull/23819)
-- feat(evals): add reliability harvester and 500/503 retry support by
+  [#22606](https://github.com/google-gemini/gemini-cli/pull/22606)
+- fix(cli): expand tilde in policy paths from settings.json by @abhipatel12 in
+  [#22772](https://github.com/google-gemini/gemini-cli/pull/22772)
+- fix(core): add actionable warnings for terminal fallbacks (#14426) by
+  @spencer426 in
+  [#22211](https://github.com/google-gemini/gemini-cli/pull/22211)
+- feat(tracker): integrate task tracker protocol into core system prompt by
+  @anj-s in [#22442](https://github.com/google-gemini/gemini-cli/pull/22442)
+- chore: add posttest build hooks and fix missing dependencies by @NTaylorMullen
+  in [#22865](https://github.com/google-gemini/gemini-cli/pull/22865)
+- feat(a2a): add agent acknowledgment command and enhance registry discovery by
   @alisa-alisa in
-  [#23626](https://github.com/google-gemini/gemini-cli/pull/23626)
-- feat(sandbox): dynamic Linux sandbox expansion and worktree support by @galz10
-  in [#23692](https://github.com/google-gemini/gemini-cli/pull/23692)
-- Merge examples of use into quickstart documentation by @diodesign in
-  [#23319](https://github.com/google-gemini/gemini-cli/pull/23319)
-- fix(cli): prioritize primary name matches in slash command search by @sehoon38
-  in [#23850](https://github.com/google-gemini/gemini-cli/pull/23850)
-- Changelog for v0.35.1 by @gemini-cli-robot in
-  [#23840](https://github.com/google-gemini/gemini-cli/pull/23840)
-- fix(browser): keep input blocker active across navigations by @kunal-10-cloud
-  in [#22562](https://github.com/google-gemini/gemini-cli/pull/22562)
-- feat(core): new skill to look for duplicated code while reviewing PRs by
-  @devr0306 in [#23704](https://github.com/google-gemini/gemini-cli/pull/23704)
-- fix(core): replace hardcoded non-interactive ASK_USER denial with explicit
-  policy rules by @ruomengz in
-  [#23668](https://github.com/google-gemini/gemini-cli/pull/23668)
-- fix(plan): after exiting plan mode switches model to a flash model by @Adib234
-  in [#23885](https://github.com/google-gemini/gemini-cli/pull/23885)
-- feat(gcp): add development worker infrastructure by @mattKorwel in
-  [#23814](https://github.com/google-gemini/gemini-cli/pull/23814)
-- fix(a2a-server): A2A server should execute ask policies in interactive mode by
-  @kschaab in [#23831](https://github.com/google-gemini/gemini-cli/pull/23831)
-- feat(core): define TrajectoryProvider interface by @sehoon38 in
-  [#23050](https://github.com/google-gemini/gemini-cli/pull/23050)
-- Docs: Update quotas and pricing by @jkcinouye in
-  [#23835](https://github.com/google-gemini/gemini-cli/pull/23835)
-- fix(core): allow disabling environment variable redaction by @galz10 in
-  [#23927](https://github.com/google-gemini/gemini-cli/pull/23927)
-- feat(cli): enable notifications cross-platform via terminal bell fallback by
-  @genneth in [#21618](https://github.com/google-gemini/gemini-cli/pull/21618)
-- feat(sandbox): implement secret visibility lockdown for env files by
-  @DavidAPierce in
-  [#23712](https://github.com/google-gemini/gemini-cli/pull/23712)
-- fix(core): remove shell outputChunks buffer caching to prevent memory bloat
-  and sanitize prompt input by @spencer426 in
-  [#23751](https://github.com/google-gemini/gemini-cli/pull/23751)
-- feat(core): implement persistent browser session management by @kunal-10-cloud
-  in [#21306](https://github.com/google-gemini/gemini-cli/pull/21306)
-- refactor(core): delegate sandbox denial parsing to SandboxManager by
-  @scidomino in [#23928](https://github.com/google-gemini/gemini-cli/pull/23928)
-- dep(update) Update Ink version to 6.5.0 by @jacob314 in
-  [#23843](https://github.com/google-gemini/gemini-cli/pull/23843)
-- Docs: Update 'docs-writer' skill for relative links by @jkcinouye in
-  [#21463](https://github.com/google-gemini/gemini-cli/pull/21463)
-- Changelog for v0.36.0-preview.4 by @gemini-cli-robot in
-  [#23935](https://github.com/google-gemini/gemini-cli/pull/23935)
-- fix(acp): Update allow approval policy flow for ACP clients to fix config
-  persistence and compatible with TUI by @sripasg in
-  [#23818](https://github.com/google-gemini/gemini-cli/pull/23818)
-- Changelog for v0.35.2 by @gemini-cli-robot in
-  [#23960](https://github.com/google-gemini/gemini-cli/pull/23960)
-- ACP integration documents by @g-samroberts in
-  [#22254](https://github.com/google-gemini/gemini-cli/pull/22254)
-- fix(core): explicitly set error names to avoid bundling renaming issues by
-  @yunaseoul in [#23913](https://github.com/google-gemini/gemini-cli/pull/23913)
-- feat(core): subagent isolation and cleanup hardening by @abhipatel12 in
-  [#23903](https://github.com/google-gemini/gemini-cli/pull/23903)
-- disable extension-reload test by @scidomino in
-  [#24018](https://github.com/google-gemini/gemini-cli/pull/24018)
-- feat(core): add forbiddenPaths to GlobalSandboxOptions and refactor
-  createSandboxManager by @ehedlund in
-  [#23936](https://github.com/google-gemini/gemini-cli/pull/23936)
-- refactor(core): improve ignore resolution and fix directory-matching bug by
-  @ehedlund in [#23816](https://github.com/google-gemini/gemini-cli/pull/23816)
-- revert(core): support custom base URL via env vars by @spencer426 in
-  [#23976](https://github.com/google-gemini/gemini-cli/pull/23976)
-- Increase memory limited for eslint. by @jacob314 in
-  [#24022](https://github.com/google-gemini/gemini-cli/pull/24022)
-- fix(acp): prevent crash on empty response in ACP mode by @sripasg in
-  [#23952](https://github.com/google-gemini/gemini-cli/pull/23952)
-- feat(core): Land `AgentHistoryProvider`. by @joshualitt in
-  [#23978](https://github.com/google-gemini/gemini-cli/pull/23978)
-- fix(core): switch to subshells for shell tool wrapping to fix heredocs and
-  edge cases by @abhipatel12 in
-  [#24024](https://github.com/google-gemini/gemini-cli/pull/24024)
-- Debug command. by @jacob314 in
-  [#23851](https://github.com/google-gemini/gemini-cli/pull/23851)
-- Changelog for v0.36.0-preview.5 by @gemini-cli-robot in
-  [#24046](https://github.com/google-gemini/gemini-cli/pull/24046)
-- Fix test flakes by globally mocking ink-spinner by @jacob314 in
-  [#24044](https://github.com/google-gemini/gemini-cli/pull/24044)
-- Enable network access in sandbox configuration by @galz10 in
-  [#24055](https://github.com/google-gemini/gemini-cli/pull/24055)
-- feat(context): add configurable memoryBoundaryMarkers setting by @SandyTao520
-  in [#24020](https://github.com/google-gemini/gemini-cli/pull/24020)
-- feat(core): implement windows sandbox expansion and denial detection by
-  @scidomino in [#24027](https://github.com/google-gemini/gemini-cli/pull/24027)
-- fix(core): resolve ACP Operation Aborted Errors in grep_search by @ivanporty
-  in [#23821](https://github.com/google-gemini/gemini-cli/pull/23821)
-- fix(hooks): prevent SessionEnd from firing twice in non-interactive mode by
-  @krishdef7 in [#22139](https://github.com/google-gemini/gemini-cli/pull/22139)
-- Re-word intro to Gemini 3 page. by @g-samroberts in
-  [#24069](https://github.com/google-gemini/gemini-cli/pull/24069)
-- fix(cli): resolve layout contention and flashing loop in StatusRow by
-  @keithguerin in
-  [#24065](https://github.com/google-gemini/gemini-cli/pull/24065)
-- fix(sandbox): implement Windows Mandatory Integrity Control for GeminiSandbox
-  by @galz10 in [#24057](https://github.com/google-gemini/gemini-cli/pull/24057)
-- feat(core): implement tool-based topic grouping (Chapters) by @Abhijit-2592 in
-  [#23150](https://github.com/google-gemini/gemini-cli/pull/23150)
-- feat(cli): support 'tab to queue' for messages while generating by @gundermanc
-  in [#24052](https://github.com/google-gemini/gemini-cli/pull/24052)
-- feat(core): agnostic background task UI with CompletionBehavior by
-  @adamfweidman in
-  [#22740](https://github.com/google-gemini/gemini-cli/pull/22740)
-- UX for topic narration tool by @gundermanc in
-  [#24079](https://github.com/google-gemini/gemini-cli/pull/24079)
-- fix: shellcheck warnings in scripts by @scidomino in
-  [#24035](https://github.com/google-gemini/gemini-cli/pull/24035)
-- test(evals): add comprehensive subagent delegation evaluations by @abhipatel12
-  in [#24132](https://github.com/google-gemini/gemini-cli/pull/24132)
-- fix(a2a-server): prioritize ADC before evaluating headless constraints for
-  auth initialization by @spencer426 in
-  [#23614](https://github.com/google-gemini/gemini-cli/pull/23614)
-- Text can be added after /plan command by @rambleraptor in
-  [#22833](https://github.com/google-gemini/gemini-cli/pull/22833)
-- fix(cli): resolve missing F12 logs via global console store by @scidomino in
-  [#24235](https://github.com/google-gemini/gemini-cli/pull/24235)
-- fix broken tests by @scidomino in
-  [#24279](https://github.com/google-gemini/gemini-cli/pull/24279)
-- fix(evals): add update_topic behavioral eval by @gundermanc in
-  [#24223](https://github.com/google-gemini/gemini-cli/pull/24223)
-- feat(core): Unified Context Management and Tool Distillation. by @joshualitt
-  in [#24157](https://github.com/google-gemini/gemini-cli/pull/24157)
-- Default enable narration for the team. by @gundermanc in
-  [#24224](https://github.com/google-gemini/gemini-cli/pull/24224)
-- fix(core): ensure default agents provide tools and use model-specific schemas
-  by @abhipatel12 in
-  [#24268](https://github.com/google-gemini/gemini-cli/pull/24268)
-- feat(cli): show Flash Lite Preview model regardless of user tier by @sehoon38
-  in [#23904](https://github.com/google-gemini/gemini-cli/pull/23904)
-- feat(cli): implement compact tool output by @jwhelangoog in
-  [#20974](https://github.com/google-gemini/gemini-cli/pull/20974)
-- Add security settings for tool sandboxing by @galz10 in
-  [#23923](https://github.com/google-gemini/gemini-cli/pull/23923)
-- chore(test-utils): switch integration tests to use PREVIEW_GEMINI_MODEL by
-  @sehoon38 in [#24276](https://github.com/google-gemini/gemini-cli/pull/24276)
-- feat(core): enable topic update narration for legacy models by @Abhijit-2592
-  in [#24241](https://github.com/google-gemini/gemini-cli/pull/24241)
-- feat(core): add project-level memory scope to save_memory tool by @SandyTao520
-  in [#24161](https://github.com/google-gemini/gemini-cli/pull/24161)
-- test(integration): fix plan mode write denial test false positive by @sehoon38
-  in [#24299](https://github.com/google-gemini/gemini-cli/pull/24299)
-- feat(plan): support `Plan` mode in untrusted folders by @Adib234 in
-  [#17586](https://github.com/google-gemini/gemini-cli/pull/17586)
-- fix(core): enable mid-stream retries for all models and re-enable compression
-  test by @sehoon38 in
-  [#24302](https://github.com/google-gemini/gemini-cli/pull/24302)
-- Changelog for v0.36.0-preview.6 by @gemini-cli-robot in
-  [#24082](https://github.com/google-gemini/gemini-cli/pull/24082)
-- Changelog for v0.35.3 by @gemini-cli-robot in
-  [#24083](https://github.com/google-gemini/gemini-cli/pull/24083)
-- feat(cli): add auth info to footer by @sehoon38 in
-  [#24042](https://github.com/google-gemini/gemini-cli/pull/24042)
-- fix(browser): reset action counter for each agent session and let it ignore
-  internal actions by @cynthialong0-0 in
-  [#24228](https://github.com/google-gemini/gemini-cli/pull/24228)
-- feat(plan): promote planning feature to stable by @ruomengz in
-  [#24282](https://github.com/google-gemini/gemini-cli/pull/24282)
-- fix(browser): terminate subagent immediately on domain restriction violations
-  by @gsquared94 in
-  [#24313](https://github.com/google-gemini/gemini-cli/pull/24313)
-- feat(cli): add UI to update extensions by @ruomengz in
-  [#23682](https://github.com/google-gemini/gemini-cli/pull/23682)
-- Fix(browser): terminate immediately for "browser is already running" error by
-  @cynthialong0-0 in
-  [#24233](https://github.com/google-gemini/gemini-cli/pull/24233)
-- docs: Add 'plan' option to approval mode in CLI reference by @YifanRuan in
-  [#24134](https://github.com/google-gemini/gemini-cli/pull/24134)
-- fix(core): batch macOS seatbelt rules into a profile file to prevent ARG_MAX
-  errors by @ehedlund in
-  [#24255](https://github.com/google-gemini/gemini-cli/pull/24255)
-- fix(core): fix race condition between browser agent and main closing process
-  by @cynthialong0-0 in
-  [#24340](https://github.com/google-gemini/gemini-cli/pull/24340)
-- perf(build): optimize build scripts for parallel execution and remove
-  redundant checks by @sehoon38 in
-  [#24307](https://github.com/google-gemini/gemini-cli/pull/24307)
-- ci: install bubblewrap on Linux for release workflows by @ehedlund in
-  [#24347](https://github.com/google-gemini/gemini-cli/pull/24347)
-- chore(release): allow bundling for all builds, including stable by @sehoon38
-  in [#24305](https://github.com/google-gemini/gemini-cli/pull/24305)
-- Revert "Add security settings for tool sandboxing" by @jerop in
-  [#24357](https://github.com/google-gemini/gemini-cli/pull/24357)
-- docs: update subagents docs to not be experimental by @abhipatel12 in
-  [#24343](https://github.com/google-gemini/gemini-cli/pull/24343)
-- fix(core): implement **read and **write commands in sandbox managers by
-  @galz10 in [#24283](https://github.com/google-gemini/gemini-cli/pull/24283)
-- don't try to remove tags in dry run by @scidomino in
-  [#24356](https://github.com/google-gemini/gemini-cli/pull/24356)
-- fix(config): disable JIT context loading by default by @SandyTao520 in
-  [#24364](https://github.com/google-gemini/gemini-cli/pull/24364)
-- test(sandbox): add integration test for dynamic permission expansion by
-  @galz10 in [#24359](https://github.com/google-gemini/gemini-cli/pull/24359)
-- docs(policy): remove unsupported mcpName wildcard edge case by @abhipatel12 in
-  [#24133](https://github.com/google-gemini/gemini-cli/pull/24133)
-- docs: fix broken GEMINI.md link in CONTRIBUTING.md by @Panchal-Tirth in
-  [#24182](https://github.com/google-gemini/gemini-cli/pull/24182)
-- feat(core): infrastructure for event-driven subagent history by @abhipatel12
-  in [#23914](https://github.com/google-gemini/gemini-cli/pull/23914)
-- fix(core): resolve Plan Mode deadlock during plan file creation due to sandbox
-  restrictions by @DavidAPierce in
-  [#24047](https://github.com/google-gemini/gemini-cli/pull/24047)
-- fix(core): fix browser agent UX issues and improve E2E test reliability by
-  @gsquared94 in
-  [#24312](https://github.com/google-gemini/gemini-cli/pull/24312)
-- fix(ui): wrap topic and intent fields in TopicMessage by @jwhelangoog in
-  [#24386](https://github.com/google-gemini/gemini-cli/pull/24386)
-- refactor(core): Centralize context management logic into src/context by
-  @joshualitt in
-  [#24380](https://github.com/google-gemini/gemini-cli/pull/24380)
-- fix(core): pin AuthType.GATEWAY to use Gemini 3.1 Pro/Flash Lite by default by
-  @sripasg in [#24375](https://github.com/google-gemini/gemini-cli/pull/24375)
-- feat(ui): add Tokyo Night theme by @danrneal in
-  [#24054](https://github.com/google-gemini/gemini-cli/pull/24054)
-- fix(cli): refactor test config loading and mock debugLogger in test-setup by
-  @mattKorwel in
-  [#24389](https://github.com/google-gemini/gemini-cli/pull/24389)
-- Set memoryManager to false in settings.json by @mattKorwel in
-  [#24393](https://github.com/google-gemini/gemini-cli/pull/24393)
-- ink 6.6.3 by @jacob314 in
-  [#24372](https://github.com/google-gemini/gemini-cli/pull/24372)
-- fix(core): resolve subagent chat recording gaps and directory inheritance by
+  [#22389](https://github.com/google-gemini/gemini-cli/pull/22389)
+- fix(cli): automatically add all VSCode workspace folders to Gemini context by
+  @sakshisemalti in
+  [#21380](https://github.com/google-gemini/gemini-cli/pull/21380)
+- feat: add 'blocked' status to tasks and todos by @anj-s in
+  [#22735](https://github.com/google-gemini/gemini-cli/pull/22735)
+- refactor(cli): remove extra newlines in ShellToolMessage.tsx by @NTaylorMullen
+  in [#22868](https://github.com/google-gemini/gemini-cli/pull/22868)
+- fix(cli): lazily load settings in onModelChange to prevent stale closure data
+  loss by @KumarADITHYA123 in
+  [#20403](https://github.com/google-gemini/gemini-cli/pull/20403)
+- feat(core): subagent local execution and tool isolation by @akh64bit in
+  [#22718](https://github.com/google-gemini/gemini-cli/pull/22718)
+- fix(cli): resolve subagent grouping and UI state persistence by @abhipatel12
+  in [#22252](https://github.com/google-gemini/gemini-cli/pull/22252)
+- refactor(ui): extract SessionBrowser search and navigation components by
   @abhipatel12 in
-  [#24368](https://github.com/google-gemini/gemini-cli/pull/24368)
-- fix(cli): cap shell output at 10 MB to prevent RangeError crash by @ProthamD
-  in [#24168](https://github.com/google-gemini/gemini-cli/pull/24168)
-- feat(plan): conditionally add enter/exit plan mode tools based on current mode
-  by @ruomengz in
-  [#24378](https://github.com/google-gemini/gemini-cli/pull/24378)
-- feat(core): prioritize discussion before formal plan approval by @jerop in
-  [#24423](https://github.com/google-gemini/gemini-cli/pull/24423)
-- fix(ui): add accelerated scrolling on alternate buffer mode by @devr0306 in
-  [#23940](https://github.com/google-gemini/gemini-cli/pull/23940)
-- feat(core): populate sandbox forbidden paths with project ignore file contents
-  by @ehedlund in
-  [#24038](https://github.com/google-gemini/gemini-cli/pull/24038)
-- fix(core): ensure blue border overlay and input blocker to act correctly
-  depending on browser agent activities by @cynthialong0-0 in
-  [#24385](https://github.com/google-gemini/gemini-cli/pull/24385)
-- fix(ui): removed additional vertical padding for tables by @devr0306 in
-  [#24381](https://github.com/google-gemini/gemini-cli/pull/24381)
-- fix(build): upload full bundle directory archive to GitHub releases by
-  @sehoon38 in [#24403](https://github.com/google-gemini/gemini-cli/pull/24403)
-- fix(build): wire bundle:browser-mcp into bundle pipeline by @gsquared94 in
-  [#24424](https://github.com/google-gemini/gemini-cli/pull/24424)
-- feat(browser): add sandbox-aware browser agent initialization by @gsquared94
-  in [#24419](https://github.com/google-gemini/gemini-cli/pull/24419)
-- feat(core): enhance tracker task schemas for detailed titles and descriptions
-  by @anj-s in [#23902](https://github.com/google-gemini/gemini-cli/pull/23902)
-- refactor(core): Unified context management settings schema by @joshualitt in
-  [#24391](https://github.com/google-gemini/gemini-cli/pull/24391)
-- feat(core): update browser agent prompt to check open pages first when
-  bringing up by @cynthialong0-0 in
-  [#24431](https://github.com/google-gemini/gemini-cli/pull/24431)
-- fix(acp) refactor(core,cli): centralize model discovery logic in
-  ModelConfigService by @sripasg in
-  [#24392](https://github.com/google-gemini/gemini-cli/pull/24392)
-- Changelog for v0.36.0-preview.7 by @gemini-cli-robot in
-  [#24346](https://github.com/google-gemini/gemini-cli/pull/24346)
-- fix: update task tracker storage location in system prompt by @anj-s in
-  [#24034](https://github.com/google-gemini/gemini-cli/pull/24034)
-- feat(browser): supersede stale snapshots to reclaim context-window tokens by
+  [#22377](https://github.com/google-gemini/gemini-cli/pull/22377)
+- fix: updates Docker image reference for GitHub MCP server by @jhhornn in
+  [#22938](https://github.com/google-gemini/gemini-cli/pull/22938)
+- refactor(cli): group subagent trajectory deletion and use native filesystem
+  testing by @abhipatel12 in
+  [#22890](https://github.com/google-gemini/gemini-cli/pull/22890)
+- refactor(cli): simplify keypress and mouse providers and update tests by
+  @scidomino in [#22853](https://github.com/google-gemini/gemini-cli/pull/22853)
+- Changelog for v0.34.0 by @gemini-cli-robot in
+  [#22860](https://github.com/google-gemini/gemini-cli/pull/22860)
+- test(cli): simplify createMockSettings calls by @scidomino in
+  [#22952](https://github.com/google-gemini/gemini-cli/pull/22952)
+- feat(ui): format multi-line banner warnings with a bold title by @keithguerin
+  in [#22955](https://github.com/google-gemini/gemini-cli/pull/22955)
+- Docs: Remove references to stale Gemini CLI file structure info by
+  @g-samroberts in
+  [#22976](https://github.com/google-gemini/gemini-cli/pull/22976)
+- feat(ui): remove write todo list tool from UI tips by @aniruddhaadak80 in
+  [#22281](https://github.com/google-gemini/gemini-cli/pull/22281)
+- Fix issue where subagent thoughts are appended. by @gundermanc in
+  [#22975](https://github.com/google-gemini/gemini-cli/pull/22975)
+- Feat/browser privacy consent by @kunal-10-cloud in
+  [#21119](https://github.com/google-gemini/gemini-cli/pull/21119)
+- fix(core): explicitly map execution context in LocalAgentExecutor by @akh64bit
+  in [#22949](https://github.com/google-gemini/gemini-cli/pull/22949)
+- feat(plan): support plan mode in non-interactive mode by @ruomengz in
+  [#22670](https://github.com/google-gemini/gemini-cli/pull/22670)
+- feat(core): implement strict macOS sandboxing using Seatbelt allowlist by
+  @ehedlund in [#22832](https://github.com/google-gemini/gemini-cli/pull/22832)
+- docs: add additional notes by @abhipatel12 in
+  [#23008](https://github.com/google-gemini/gemini-cli/pull/23008)
+- fix(cli): resolve duplicate footer on tool cancel via ESC (#21743) by
+  @ruomengz in [#21781](https://github.com/google-gemini/gemini-cli/pull/21781)
+- Changelog for v0.35.0-preview.1 by @gemini-cli-robot in
+  [#23012](https://github.com/google-gemini/gemini-cli/pull/23012)
+- fix(ui): fix flickering on small terminal heights by @devr0306 in
+  [#21416](https://github.com/google-gemini/gemini-cli/pull/21416)
+- fix(acp): provide more meta in tool_call_update by @Mervap in
+  [#22663](https://github.com/google-gemini/gemini-cli/pull/22663)
+- docs: add FAQ entry for checking Gemini CLI version by @surajsahani in
+  [#21271](https://github.com/google-gemini/gemini-cli/pull/21271)
+- feat(core): resilient subagent tool rejection with contextual feedback by
+  @abhipatel12 in
+  [#22951](https://github.com/google-gemini/gemini-cli/pull/22951)
+- fix(cli): correctly handle auto-update for standalone binaries by @bdmorgan in
+  [#23038](https://github.com/google-gemini/gemini-cli/pull/23038)
+- feat(core): add content-utils by @adamfweidman in
+  [#22984](https://github.com/google-gemini/gemini-cli/pull/22984)
+- fix: circumvent genai sdk requirement for api key when using gateway auth via
+  ACP by @sripasg in
+  [#23042](https://github.com/google-gemini/gemini-cli/pull/23042)
+- fix(core): don't persist browser consent sentinel in non-interactive mode by
+  @jasonmatthewsuhari in
+  [#23073](https://github.com/google-gemini/gemini-cli/pull/23073)
+- fix(core): narrow browser agent description to prevent stealing URL tasks from
+  web_fetch by @gsquared94 in
+  [#23086](https://github.com/google-gemini/gemini-cli/pull/23086)
+- feat(cli): Partial threading of AgentLoopContext. by @joshualitt in
+  [#22978](https://github.com/google-gemini/gemini-cli/pull/22978)
+- fix(browser-agent): enable "Allow all server tools" session policy by
+  @cynthialong0-0 in
+  [#22343](https://github.com/google-gemini/gemini-cli/pull/22343)
+- refactor(cli): integrate real config loading into async test utils by
+  @scidomino in [#23040](https://github.com/google-gemini/gemini-cli/pull/23040)
+- feat(core): inject memory and JIT context into subagents by @abhipatel12 in
+  [#23032](https://github.com/google-gemini/gemini-cli/pull/23032)
+- Fix logging and virtual list. by @jacob314 in
+  [#23080](https://github.com/google-gemini/gemini-cli/pull/23080)
+- feat(core): cap JIT context upward traversal at git root by @SandyTao520 in
+  [#23074](https://github.com/google-gemini/gemini-cli/pull/23074)
+- Docs: Minor style updates from initial docs audit. by @g-samroberts in
+  [#22872](https://github.com/google-gemini/gemini-cli/pull/22872)
+- feat(core): add experimental memory manager agent to replace save_memory tool
+  by @SandyTao520 in
+  [#22726](https://github.com/google-gemini/gemini-cli/pull/22726)
+- Changelog for v0.35.0-preview.2 by @gemini-cli-robot in
+  [#23142](https://github.com/google-gemini/gemini-cli/pull/23142)
+- Update website issue template for label and title by @g-samroberts in
+  [#23036](https://github.com/google-gemini/gemini-cli/pull/23036)
+- fix: upgrade ACP SDK from 0.12 to 0.16.1 by @sripasg in
+  [#23132](https://github.com/google-gemini/gemini-cli/pull/23132)
+- Update callouts to work on github. by @g-samroberts in
+  [#22245](https://github.com/google-gemini/gemini-cli/pull/22245)
+- feat: ACP: Add token usage metadata to the `send` method's return value by
+  @sripasg in [#23148](https://github.com/google-gemini/gemini-cli/pull/23148)
+- fix(plan): clarify that plan mode policies are combined with normal mode by
+  @ruomengz in [#23158](https://github.com/google-gemini/gemini-cli/pull/23158)
+- Add ModelChain support to ModelConfigService and make ModelDialog dynamic by
+  @kevinjwang1 in
+  [#22914](https://github.com/google-gemini/gemini-cli/pull/22914)
+- Ensure that copied extensions are writable in the user's local directory by
+  @kevinjwang1 in
+  [#23016](https://github.com/google-gemini/gemini-cli/pull/23016)
+- feat(core): implement native Windows sandboxing by @mattKorwel in
+  [#21807](https://github.com/google-gemini/gemini-cli/pull/21807)
+- feat(core): add support for admin-forced MCP server installations by
   @gsquared94 in
-  [#24440](https://github.com/google-gemini/gemini-cli/pull/24440)
-- docs(core): add subagent tool isolation draft doc by @akh64bit in
-  [#23275](https://github.com/google-gemini/gemini-cli/pull/23275)
-- fix(patch): cherry-pick 64c928f to release/v0.37.0-preview.0-pr-23257 to patch
-  version v0.37.0-preview.0 and create version 0.37.0-preview.1 by
+  [#23163](https://github.com/google-gemini/gemini-cli/pull/23163)
+- chore(lint): ignore .gemini directory and recursive node_modules by
+  @mattKorwel in
+  [#23211](https://github.com/google-gemini/gemini-cli/pull/23211)
+- feat(cli): conditionally exclude ask_user tool in ACP mode by @nmcnamara-eng
+  in [#23045](https://github.com/google-gemini/gemini-cli/pull/23045)
+- feat(core): introduce AgentSession and rename stream events to agent events by
+  @mbleigh in [#23159](https://github.com/google-gemini/gemini-cli/pull/23159)
+- feat(worktree): add Git worktree support for isolated parallel sessions by
+  @jerop in [#22973](https://github.com/google-gemini/gemini-cli/pull/22973)
+- Add support for linking in the extension registry by @kevinjwang1 in
+  [#23153](https://github.com/google-gemini/gemini-cli/pull/23153)
+- feat(extensions): add --skip-settings flag to install command by @Ratish1 in
+  [#17212](https://github.com/google-gemini/gemini-cli/pull/17212)
+- feat(telemetry): track if session is running in a Git worktree by @jerop in
+  [#23265](https://github.com/google-gemini/gemini-cli/pull/23265)
+- refactor(core): use absolute paths in GEMINI.md context markers by
+  @SandyTao520 in
+  [#23135](https://github.com/google-gemini/gemini-cli/pull/23135)
+- fix(core): add sanitization to sub agent thoughts and centralize utilities by
+  @devr0306 in [#22828](https://github.com/google-gemini/gemini-cli/pull/22828)
+- feat(core): refine User-Agent for VS Code traffic (unified format) by
+  @sehoon38 in [#23256](https://github.com/google-gemini/gemini-cli/pull/23256)
+- Fix schema for ModelChains by @kevinjwang1 in
+  [#23284](https://github.com/google-gemini/gemini-cli/pull/23284)
+- test(cli): refactor tests for async render utilities by @scidomino in
+  [#23252](https://github.com/google-gemini/gemini-cli/pull/23252)
+- feat(core): add security prompt for browser agent by @cynthialong0-0 in
+  [#23241](https://github.com/google-gemini/gemini-cli/pull/23241)
+- refactor(ide): replace dynamic undici import with static fetch import by
+  @cocosheng-g in
+  [#23268](https://github.com/google-gemini/gemini-cli/pull/23268)
+- test(cli): address unresolved feedback from PR #23252 by @scidomino in
+  [#23303](https://github.com/google-gemini/gemini-cli/pull/23303)
+- feat(browser): add sensitive action controls and read-only noise reduction by
+  @cynthialong0-0 in
+  [#22867](https://github.com/google-gemini/gemini-cli/pull/22867)
+- Disabling failing test while investigating by @alisa-alisa in
+  [#23311](https://github.com/google-gemini/gemini-cli/pull/23311)
+- fix broken extension link in hooks guide by @Indrapal-70 in
+  [#21728](https://github.com/google-gemini/gemini-cli/pull/21728)
+- fix(core): fix agent description indentation by @abhipatel12 in
+  [#23315](https://github.com/google-gemini/gemini-cli/pull/23315)
+- Wrap the text under TOML rule for easier readability in policy-engine.md… by
+  @CogitationOps in
+  [#23076](https://github.com/google-gemini/gemini-cli/pull/23076)
+- fix(extensions): revert broken extension removal behavior by @ehedlund in
+  [#23317](https://github.com/google-gemini/gemini-cli/pull/23317)
+- feat(core): set up onboarding telemetry by @yunaseoul in
+  [#23118](https://github.com/google-gemini/gemini-cli/pull/23118)
+- Retry evals on API error. by @gundermanc in
+  [#23322](https://github.com/google-gemini/gemini-cli/pull/23322)
+- fix(evals): remove tool restrictions and add compile-time guards by
+  @SandyTao520 in
+  [#23312](https://github.com/google-gemini/gemini-cli/pull/23312)
+- fix(hooks): support 'ask' decision for BeforeTool hooks by @gundermanc in
+  [#21146](https://github.com/google-gemini/gemini-cli/pull/21146)
+- feat(browser): add warning message for session mode 'existing' by
+  @cynthialong0-0 in
+  [#23288](https://github.com/google-gemini/gemini-cli/pull/23288)
+- chore(lint): enforce zero warnings and cleanup syntax restrictions by
+  @alisa-alisa in
+  [#22902](https://github.com/google-gemini/gemini-cli/pull/22902)
+- fix(cli): add Esc instruction to HooksDialog footer by @abhipatel12 in
+  [#23258](https://github.com/google-gemini/gemini-cli/pull/23258)
+- Disallow and suppress misused spread operator. by @gundermanc in
+  [#23294](https://github.com/google-gemini/gemini-cli/pull/23294)
+- fix(core): refine CliHelpAgent description for better delegation by
+  @abhipatel12 in
+  [#23310](https://github.com/google-gemini/gemini-cli/pull/23310)
+- fix(core): enable global session and persistent approval for web_fetch by
+  @NTaylorMullen in
+  [#23295](https://github.com/google-gemini/gemini-cli/pull/23295)
+- fix(plan): add state transition override to prevent plan mode freeze by
+  @Adib234 in [#23020](https://github.com/google-gemini/gemini-cli/pull/23020)
+- fix(cli): record skill activation tool calls in chat history by @NTaylorMullen
+  in [#23203](https://github.com/google-gemini/gemini-cli/pull/23203)
+- fix(core): ensure subagent tool updates apply configuration overrides
+  immediately by @abhipatel12 in
+  [#23161](https://github.com/google-gemini/gemini-cli/pull/23161)
+- fix(cli): resolve flicker at boundaries of list in BaseSelectionList by
+  @jackwotherspoon in
+  [#23298](https://github.com/google-gemini/gemini-cli/pull/23298)
+- test(cli): force generic terminal in tests to fix snapshot failures by
+  @abhipatel12 in
+  [#23499](https://github.com/google-gemini/gemini-cli/pull/23499)
+- Evals: PR Guidance adding workflow by @alisa-alisa in
+  [#23164](https://github.com/google-gemini/gemini-cli/pull/23164)
+- feat(core): refactor SandboxManager to a stateless architecture and introduce
+  explicit Deny interface by @ehedlund in
+  [#23141](https://github.com/google-gemini/gemini-cli/pull/23141)
+- feat(core): add event-translator and update agent types by @adamfweidman in
+  [#22985](https://github.com/google-gemini/gemini-cli/pull/22985)
+- perf(cli): parallelize and background startup cleanup tasks by @sehoon38 in
+  [#23545](https://github.com/google-gemini/gemini-cli/pull/23545)
+- fix: "allow always" for commands with paths by @scidomino in
+  [#23558](https://github.com/google-gemini/gemini-cli/pull/23558)
+- fix(cli): prevent terminal escape sequences from leaking on exit by
+  @mattKorwel in
+  [#22682](https://github.com/google-gemini/gemini-cli/pull/22682)
+- feat(cli): implement full "GEMINI CLI" logo for logged-out state by
+  @keithguerin in
+  [#22412](https://github.com/google-gemini/gemini-cli/pull/22412)
+- fix(plan): reserve minimum height for selection list in AskUserDialog by
+  @ruomengz in [#23280](https://github.com/google-gemini/gemini-cli/pull/23280)
+- fix(core): harden AgentSession replay semantics by @adamfweidman in
+  [#23548](https://github.com/google-gemini/gemini-cli/pull/23548)
+- test(core): migrate hook tests to scheduler by @abhipatel12 in
+  [#23496](https://github.com/google-gemini/gemini-cli/pull/23496)
+- chore(config): disable agents by default by @abhipatel12 in
+  [#23546](https://github.com/google-gemini/gemini-cli/pull/23546)
+- fix(ui): make tool confirmations take up entire terminal height by @devr0306
+  in [#22366](https://github.com/google-gemini/gemini-cli/pull/22366)
+- fix(core): prevent redundant remote agent loading on model switch by
+  @adamfweidman in
+  [#23576](https://github.com/google-gemini/gemini-cli/pull/23576)
+- refactor(core): update production type imports from coreToolScheduler by
+  @abhipatel12 in
+  [#23498](https://github.com/google-gemini/gemini-cli/pull/23498)
+- feat(cli): always prefix extension skills with colon separator by
+  @NTaylorMullen in
+  [#23566](https://github.com/google-gemini/gemini-cli/pull/23566)
+- fix(core): properly support allowRedirect in policy engine by @scidomino in
+  [#23579](https://github.com/google-gemini/gemini-cli/pull/23579)
+- fix(cli): prevent subcommand shadowing and skip auth for commands by
+  @mattKorwel in
+  [#23177](https://github.com/google-gemini/gemini-cli/pull/23177)
+- fix(test): move flaky tests to non-blocking suite by @mattKorwel in
+  [#23259](https://github.com/google-gemini/gemini-cli/pull/23259)
+- Changelog for v0.35.0-preview.3 by @gemini-cli-robot in
+  [#23574](https://github.com/google-gemini/gemini-cli/pull/23574)
+- feat(skills): add behavioral-evals skill with fixing and promoting guides by
+  @abhipatel12 in
+  [#23349](https://github.com/google-gemini/gemini-cli/pull/23349)
+- refactor(core): delete obsolete coreToolScheduler by @abhipatel12 in
+  [#23502](https://github.com/google-gemini/gemini-cli/pull/23502)
+- Changelog for v0.35.0-preview.4 by @gemini-cli-robot in
+  [#23581](https://github.com/google-gemini/gemini-cli/pull/23581)
+- feat(core): add LegacyAgentSession by @adamfweidman in
+  [#22986](https://github.com/google-gemini/gemini-cli/pull/22986)
+- feat(test-utils): add TestMcpServerBuilder and support in TestRig by
+  @abhipatel12 in
+  [#23491](https://github.com/google-gemini/gemini-cli/pull/23491)
+- fix(core)!: Force policy config to specify toolName by @kschaab in
+  [#23330](https://github.com/google-gemini/gemini-cli/pull/23330)
+- eval(save_memory): add multi-turn interactive evals for memoryManager by
+  @SandyTao520 in
+  [#23572](https://github.com/google-gemini/gemini-cli/pull/23572)
+- fix(telemetry): patch memory leak and enforce logPrompts privacy by
+  @spencer426 in
+  [#23281](https://github.com/google-gemini/gemini-cli/pull/23281)
+- perf(cli): background IDE client to speed up initialization by @sehoon38 in
+  [#23603](https://github.com/google-gemini/gemini-cli/pull/23603)
+- fix(cli): prevent Ctrl+D exit when input buffer is not empty by @wtanaka in
+  [#23306](https://github.com/google-gemini/gemini-cli/pull/23306)
+- fix: ACP: separate conversational text from execute tool command title by
+  @sripasg in [#23179](https://github.com/google-gemini/gemini-cli/pull/23179)
+- feat(evals): add behavioral evaluations for subagent routing by @Samee24 in
+  [#23272](https://github.com/google-gemini/gemini-cli/pull/23272)
+- refactor(cli,core): foundational layout, identity management, and type safety
+  by @jwhelangoog in
+  [#23286](https://github.com/google-gemini/gemini-cli/pull/23286)
+- fix(core): accurately reflect subagent tool failure in UI by @abhipatel12 in
+  [#23187](https://github.com/google-gemini/gemini-cli/pull/23187)
+- Changelog for v0.35.0-preview.5 by @gemini-cli-robot in
+  [#23606](https://github.com/google-gemini/gemini-cli/pull/23606)
+- feat(ui): implement refreshed UX for Composer layout by @jwhelangoog in
+  [#21212](https://github.com/google-gemini/gemini-cli/pull/21212)
+- fix: API key input dialog user interaction when selected Gemini API Key by
+  @kartikangiras in
+  [#21057](https://github.com/google-gemini/gemini-cli/pull/21057)
+- docs: update `/mcp refresh` to `/mcp reload` by @adamfweidman in
+  [#23631](https://github.com/google-gemini/gemini-cli/pull/23631)
+- Implementation of sandbox "Write-Protected" Governance Files by @DavidAPierce
+  in [#23139](https://github.com/google-gemini/gemini-cli/pull/23139)
+- feat(sandbox): dynamic macOS sandbox expansion and worktree support by @galz10
+  in [#23301](https://github.com/google-gemini/gemini-cli/pull/23301)
+- fix(acp): Pass the cwd to `AcpFileSystemService` to avoid looping failures in
+  asking for perms to write plan md file by @sripasg in
+  [#23612](https://github.com/google-gemini/gemini-cli/pull/23612)
+- fix(plan): sandbox path resolution in Plan Mode to prevent hallucinations by
+  @Adib234 in [#22737](https://github.com/google-gemini/gemini-cli/pull/22737)
+- feat(ui): allow immediate user input during startup by @sehoon38 in
+  [#23661](https://github.com/google-gemini/gemini-cli/pull/23661)
+- refactor(sandbox): reorganize Windows sandbox files by @galz10 in
+  [#23645](https://github.com/google-gemini/gemini-cli/pull/23645)
+- fix(core): improve remote agent streaming UI and UX by @adamfweidman in
+  [#23633](https://github.com/google-gemini/gemini-cli/pull/23633)
+- perf(cli): optimize --version startup time by @sehoon38 in
+  [#23671](https://github.com/google-gemini/gemini-cli/pull/23671)
+- refactor(core): stop gemini CLI from producing unsafe casts by @gundermanc in
+  [#23611](https://github.com/google-gemini/gemini-cli/pull/23611)
+- use enableAutoUpdate in test rig by @scidomino in
+  [#23681](https://github.com/google-gemini/gemini-cli/pull/23681)
+- feat(core): change user-facing auth type from oauth2 to oauth by @adamfweidman
+  in [#23639](https://github.com/google-gemini/gemini-cli/pull/23639)
+- chore(deps): fix npm audit vulnerabilities by @scidomino in
+  [#23679](https://github.com/google-gemini/gemini-cli/pull/23679)
+- test(evals): fix overlapping act() deadlock in app-test-helper by @Adib234 in
+  [#23666](https://github.com/google-gemini/gemini-cli/pull/23666)
+- fix(patch): cherry-pick 055ff92 to release/v0.36.0-preview.0-pr-23672 to patch
+  version v0.36.0-preview.0 and create version 0.36.0-preview.1 by
   @gemini-cli-robot in
-  [#24561](https://github.com/google-gemini/gemini-cli/pull/24561)
-- fix(patch): cherry-pick cb7f7d6 to release/v0.37.0-preview.1-pr-24342 to patch
-  version v0.37.0-preview.1 and create version 0.37.0-preview.2 by
+  [#23723](https://github.com/google-gemini/gemini-cli/pull/23723)
+- fix(patch): cherry-pick 765fb67 to release/v0.36.0-preview.5-pr-24055 to patch
+  version v0.36.0-preview.5 and create version 0.36.0-preview.6 by
   @gemini-cli-robot in
-  [#24842](https://github.com/google-gemini/gemini-cli/pull/24842)
+  [#24061](https://github.com/google-gemini/gemini-cli/pull/24061)
 
 **Full Changelog**:
-https://github.com/google-gemini/gemini-cli/compare/v0.36.0...v0.37.0
+https://github.com/google-gemini/gemini-cli/compare/v0.35.3...v0.36.0

docs/changelogs/preview.md

@@ -1,6 +1,6 @@
-# Preview release: v0.38.0-preview.0
+# Preview release: v0.37.0-preview.2
 
-Released: April 08, 2026
+Released: April 07, 2026
 
 Our preview release includes the latest, new, and experimental features. This
 release may not be as stable as our [latest weekly release](latest.md).
@@ -13,256 +13,414 @@ npm install -g @google/gemini-cli@preview
 
 ## Highlights
 
-- **Context Management:** Introduced a Context Compression Service to optimize
-  context window usage and landed a background memory service for skill
-  extraction.
-- **Enhanced Security:** Implemented context-aware persistent policy approvals
-  for smarter tool permissions and enabled `web_fetch` in plan mode with user
-  confirmation.
-- **Workflow Monitoring:** Added background process monitoring and inspection
-  tools for better visibility into long-running tasks.
-- **UI/UX Refinements:** Enhanced the tool confirmation UI, selection layout,
-  and added support for selective topic expansion and click-to-expand.
-- **Core Stability:** Improved sandbox reliability on Linux and Windows,
-  resolved shebang compatibility issues, and fixed various crashes in the CLI
-  and core services.
+- **Plan Mode Enhancements**: Plan now includes support for untrusted folders,
+  prioritized pre-approval discussions, and a resolve for sandbox-related
+  deadlocks during file creation.
+- **Browser Agent Evolved**: Significant updates to the browser agent, including
+  persistent session management, dynamic discovery of read-only tools,
+  sandbox-aware initialization, and automated reclamation of stale snapshots to
+  optimize context window usage.
+- **Advanced Sandbox Security**: Implementation of dynamic sandbox expansion for
+  both Linux and Windows, alongside secret visibility lockdown for environment
+  files and OS-specific forbidden path support.
+- **Unified Core Architecture**: Centralized context management and a new
+  `ModelConfigService` for unified model discovery, complemented by the
+  introduction of `AgentHistoryProvider` and tool-based topic grouping
+  (Chapters).
+- **UI/UX & Performance Improvements**: New Tokyo Night theme, "tab to queue"
+  message support, and compact tool output formatting, plus optimized build
+  scripts and improved layout stability for TUI components.
 
 ## What's Changed
 
-- fix(cli): refresh slash command list after /skills reload by @NTaylorMullen in
-  [#24454](https://github.com/google-gemini/gemini-cli/pull/24454)
-- Update README.md for links. by @g-samroberts in
-  [#22759](https://github.com/google-gemini/gemini-cli/pull/22759)
-- fix(core): ensure complete_task tool calls are recorded in chat history by
-  @abhipatel12 in
-  [#24437](https://github.com/google-gemini/gemini-cli/pull/24437)
-- feat(policy): explicitly allow web_fetch in plan mode with ask_user by
-  @Adib234 in [#24456](https://github.com/google-gemini/gemini-cli/pull/24456)
-- fix(core): refactor linux sandbox to fix ARG_MAX crashes by @ehedlund in
-  [#24286](https://github.com/google-gemini/gemini-cli/pull/24286)
-- feat(config): add experimental.adk.agentSessionNoninteractiveEnabled setting
+- fix(patch): cherry-pick cb7f7d6 to release/v0.37.0-preview.1-pr-24342 to patch
+  version v0.37.0-preview.1 and create version 0.37.0-preview.2 by
+  @gemini-cli-robot in
+  [#24842](https://github.com/google-gemini/gemini-cli/pull/24842)
+- fix(patch): cherry-pick 64c928f to release/v0.37.0-preview.0-pr-23257 to patch
+  version v0.37.0-preview.0 and create version 0.37.0-preview.1 by
+  @gemini-cli-robot in
+  [#24561](https://github.com/google-gemini/gemini-cli/pull/24561)
+- feat(evals): centralize test agents into test-utils for reuse by @Samee24 in
+  [#23616](https://github.com/google-gemini/gemini-cli/pull/23616)
+- revert: chore(config): disable agents by default by @abhipatel12 in
+  [#23672](https://github.com/google-gemini/gemini-cli/pull/23672)
+- fix(plan): update telemetry attribute keys and add timestamp by @Adib234 in
+  [#23685](https://github.com/google-gemini/gemini-cli/pull/23685)
+- fix(core): prevent premature MCP discovery completion by @jackwotherspoon in
+  [#23637](https://github.com/google-gemini/gemini-cli/pull/23637)
+- feat(browser): add maxActionsPerTask for browser agent setting by
+  @cynthialong0-0 in
+  [#23216](https://github.com/google-gemini/gemini-cli/pull/23216)
+- fix(core): improve agent loader error formatting for empty paths by
+  @adamfweidman in
+  [#23690](https://github.com/google-gemini/gemini-cli/pull/23690)
+- fix(cli): only show updating spinner when auto-update is in progress by
+  @scidomino in [#23709](https://github.com/google-gemini/gemini-cli/pull/23709)
+- Refine onboarding metrics to log the duration explicitly and use the tier
+  name. by @yunaseoul in
+  [#23678](https://github.com/google-gemini/gemini-cli/pull/23678)
+- chore(tools): add toJSON to tools and invocations to reduce logging verbosity
+  by @alisa-alisa in
+  [#22899](https://github.com/google-gemini/gemini-cli/pull/22899)
+- fix(cli): stabilize copy mode to prevent flickering and cursor resets by
+  @mattKorwel in
+  [#22584](https://github.com/google-gemini/gemini-cli/pull/22584)
+- fix(test): move flaky ctrl-c-exit test to non-blocking suite by @mattKorwel in
+  [#23732](https://github.com/google-gemini/gemini-cli/pull/23732)
+- feat(skills): add ci skill for automated failure replication by @mattKorwel in
+  [#23720](https://github.com/google-gemini/gemini-cli/pull/23720)
+- feat(sandbox): implement forbiddenPaths for OS-specific sandbox managers by
+  @ehedlund in [#23282](https://github.com/google-gemini/gemini-cli/pull/23282)
+- fix(core): conditionally expose additional_permissions in shell tool by
+  @galz10 in [#23729](https://github.com/google-gemini/gemini-cli/pull/23729)
+- refactor(core): standardize OS-specific sandbox tests and extract linux helper
+  methods by @ehedlund in
+  [#23715](https://github.com/google-gemini/gemini-cli/pull/23715)
+- format recently added script by @scidomino in
+  [#23739](https://github.com/google-gemini/gemini-cli/pull/23739)
+- fix(ui): prevent over-eager slash subcommand completion by @keithguerin in
+  [#20136](https://github.com/google-gemini/gemini-cli/pull/20136)
+- Fix dynamic model routing for gemini 3.1 pro to customtools model by
+  @kevinjwang1 in
+  [#23641](https://github.com/google-gemini/gemini-cli/pull/23641)
+- feat(core): support inline agentCardJson for remote agents by @adamfweidman in
+  [#23743](https://github.com/google-gemini/gemini-cli/pull/23743)
+- fix(cli): skip console log/info in headless mode by @cynthialong0-0 in
+  [#22739](https://github.com/google-gemini/gemini-cli/pull/22739)
+- test(core): install bubblewrap on Linux CI for sandbox integration tests by
+  @ehedlund in [#23583](https://github.com/google-gemini/gemini-cli/pull/23583)
+- docs(reference): split tools table into category sections by @sheikhlimon in
+  [#21516](https://github.com/google-gemini/gemini-cli/pull/21516)
+- fix(browser): detect embedded URLs in query params to prevent allowedDomains
+  bypass by @tony-shi in
+  [#23225](https://github.com/google-gemini/gemini-cli/pull/23225)
+- fix(browser): add proxy bypass constraint to domain restriction system prompt
+  by @tony-shi in
+  [#23229](https://github.com/google-gemini/gemini-cli/pull/23229)
+- fix(policy): relax write_file argsPattern in plan mode to allow paths without
+  session ID by @Adib234 in
+  [#23695](https://github.com/google-gemini/gemini-cli/pull/23695)
+- docs: fix grammar in CONTRIBUTING and numbering in sandbox docs by
+  @splint-disk-8i in
+  [#23448](https://github.com/google-gemini/gemini-cli/pull/23448)
+- fix(acp): allow attachments by adding a permission prompt by @sripasg in
+  [#23680](https://github.com/google-gemini/gemini-cli/pull/23680)
+- fix(core): thread AbortSignal to chat compression requests (#20405) by
+  @SH20RAJ in [#20778](https://github.com/google-gemini/gemini-cli/pull/20778)
+- feat(core): implement Windows sandbox dynamic expansion Phase 1 and 2.1 by
+  @scidomino in [#23691](https://github.com/google-gemini/gemini-cli/pull/23691)
+- Add note about root privileges in sandbox docs by @diodesign in
+  [#23314](https://github.com/google-gemini/gemini-cli/pull/23314)
+- docs(core): document agent_card_json string literal options for remote agents
   by @adamfweidman in
-  [#24439](https://github.com/google-gemini/gemini-cli/pull/24439)
-- Changelog for v0.36.0-preview.8 by @gemini-cli-robot in
-  [#24453](https://github.com/google-gemini/gemini-cli/pull/24453)
-- feat(cli): change default loadingPhrases to 'off' to hide tips by @keithguerin
-  in [#24342](https://github.com/google-gemini/gemini-cli/pull/24342)
-- fix(cli): ensure agent stops when all declinable tools are cancelled by
-  @NTaylorMullen in
-  [#24479](https://github.com/google-gemini/gemini-cli/pull/24479)
-- fix(core): enhance sandbox usability and fix build error by @galz10 in
-  [#24460](https://github.com/google-gemini/gemini-cli/pull/24460)
-- Terminal Serializer Optimization by @jacob314 in
-  [#24485](https://github.com/google-gemini/gemini-cli/pull/24485)
-- Auto configure memory. by @jacob314 in
-  [#24474](https://github.com/google-gemini/gemini-cli/pull/24474)
-- Unused error variables in catch block are not allowed by @alisa-alisa in
-  [#24487](https://github.com/google-gemini/gemini-cli/pull/24487)
-- feat(core): add background memory service for skill extraction by @SandyTao520
-  in [#24274](https://github.com/google-gemini/gemini-cli/pull/24274)
-- feat: implement high-signal PR regression check for evaluations by
+  [#23797](https://github.com/google-gemini/gemini-cli/pull/23797)
+- fix(cli): resolve TTY hang on headless environments by unconditionally
+  resuming process.stdin before React Ink launch by @cocosheng-g in
+  [#23673](https://github.com/google-gemini/gemini-cli/pull/23673)
+- fix(ui): cleanup estimated string length hacks in composer by @keithguerin in
+  [#23694](https://github.com/google-gemini/gemini-cli/pull/23694)
+- feat(browser): dynamically discover read-only tools by @cynthialong0-0 in
+  [#23805](https://github.com/google-gemini/gemini-cli/pull/23805)
+- docs: clarify policy requirement for `general.plan.directory` in settings
+  schema by @jerop in
+  [#23784](https://github.com/google-gemini/gemini-cli/pull/23784)
+- Revert "perf(cli): optimize --version startup time (#23671)" by @scidomino in
+  [#23812](https://github.com/google-gemini/gemini-cli/pull/23812)
+- don't silence errors from wombat by @scidomino in
+  [#23822](https://github.com/google-gemini/gemini-cli/pull/23822)
+- fix(ui): prevent escape key from cancelling requests in shell mode by
+  @PrasannaPal21 in
+  [#21245](https://github.com/google-gemini/gemini-cli/pull/21245)
+- Changelog for v0.36.0-preview.0 by @gemini-cli-robot in
+  [#23702](https://github.com/google-gemini/gemini-cli/pull/23702)
+- feat(core,ui): Add experiment-gated support for gemini flash 3.1 lite by
+  @chrstnb in [#23794](https://github.com/google-gemini/gemini-cli/pull/23794)
+- Changelog for v0.36.0-preview.3 by @gemini-cli-robot in
+  [#23827](https://github.com/google-gemini/gemini-cli/pull/23827)
+- new linting check: github-actions-pinning by @alisa-alisa in
+  [#23808](https://github.com/google-gemini/gemini-cli/pull/23808)
+- fix(cli): show helpful guidance when no skills are available by @Niralisj in
+  [#23785](https://github.com/google-gemini/gemini-cli/pull/23785)
+- fix: Chat logs and errors handle tail tool calls correctly by @googlestrobe in
+  [#22460](https://github.com/google-gemini/gemini-cli/pull/22460)
+- Don't try removing a tag from a non-existent release. by @scidomino in
+  [#23830](https://github.com/google-gemini/gemini-cli/pull/23830)
+- fix(cli): allow ask question dialog to take full window height by @jacob314 in
+  [#23693](https://github.com/google-gemini/gemini-cli/pull/23693)
+- fix(core): strip leading underscores from error types in telemetry by
+  @yunaseoul in [#23824](https://github.com/google-gemini/gemini-cli/pull/23824)
+- Changelog for v0.35.0 by @gemini-cli-robot in
+  [#23819](https://github.com/google-gemini/gemini-cli/pull/23819)
+- feat(evals): add reliability harvester and 500/503 retry support by
   @alisa-alisa in
-  [#23937](https://github.com/google-gemini/gemini-cli/pull/23937)
-- Fix shell output display by @jacob314 in
-  [#24490](https://github.com/google-gemini/gemini-cli/pull/24490)
-- fix(ui): resolve unwanted vertical spacing around various tool output
-  treatments by @jwhelangoog in
-  [#24449](https://github.com/google-gemini/gemini-cli/pull/24449)
-- revert(cli): bring back input box and footer visibility in copy mode by
-  @sehoon38 in [#24504](https://github.com/google-gemini/gemini-cli/pull/24504)
-- fix(cli): prevent crash in AnsiOutputText when handling non-array data by
-  @sehoon38 in [#24498](https://github.com/google-gemini/gemini-cli/pull/24498)
-- feat(cli): support default values for environment variables by @ruomengz in
-  [#24469](https://github.com/google-gemini/gemini-cli/pull/24469)
-- Implement background process monitoring and inspection tools by @cocosheng-g
-  in [#23799](https://github.com/google-gemini/gemini-cli/pull/23799)
-- docs(browser-agent): update stale browser agent documentation by @gsquared94
-  in [#24463](https://github.com/google-gemini/gemini-cli/pull/24463)
-- fix: enable browser_agent in integration tests and add localhost fixture tests
-  by @gsquared94 in
-  [#24523](https://github.com/google-gemini/gemini-cli/pull/24523)
-- fix(browser): handle computer-use model detection for analyze_screenshot by
-  @gsquared94 in
-  [#24502](https://github.com/google-gemini/gemini-cli/pull/24502)
-- feat(core): Land ContextCompressionService by @joshualitt in
-  [#24483](https://github.com/google-gemini/gemini-cli/pull/24483)
-- feat(core): scope subagent workspace directories via AsyncLocalStorage by
-  @SandyTao520 in
-  [#24445](https://github.com/google-gemini/gemini-cli/pull/24445)
-- Update ink version to 6.6.7 by @jacob314 in
-  [#24514](https://github.com/google-gemini/gemini-cli/pull/24514)
-- fix(acp): handle all InvalidStreamError types gracefully in prompt by @sripasg
-  in [#24540](https://github.com/google-gemini/gemini-cli/pull/24540)
-- Fix crash when vim editor is not found in PATH on Windows by
-  @Nagajyothi-tammisetti in
-  [#22423](https://github.com/google-gemini/gemini-cli/pull/22423)
-- fix(core): move project memory dir under tmp directory by @SandyTao520 in
-  [#24542](https://github.com/google-gemini/gemini-cli/pull/24542)
-- Enable 'Other' option for yesno question type by @ruomengz in
-  [#24545](https://github.com/google-gemini/gemini-cli/pull/24545)
-- fix(cli): clear stale retry/loading state after cancellation (#21096) by
-  @Aaxhirrr in [#21960](https://github.com/google-gemini/gemini-cli/pull/21960)
-- Changelog for v0.37.0-preview.0 by @gemini-cli-robot in
-  [#24464](https://github.com/google-gemini/gemini-cli/pull/24464)
-- feat(core): implement context-aware persistent policy approvals by @jerop in
-  [#23257](https://github.com/google-gemini/gemini-cli/pull/23257)
-- docs: move agent disabling instructions and update remote agent status by
-  @jackwotherspoon in
-  [#24559](https://github.com/google-gemini/gemini-cli/pull/24559)
-- feat(cli): migrate nonInteractiveCli to LegacyAgentSession by @adamfweidman in
-  [#22987](https://github.com/google-gemini/gemini-cli/pull/22987)
-- fix(core): unsafe type assertions in Core File System #19712 by
-  @aniketsaurav18 in
-  [#19739](https://github.com/google-gemini/gemini-cli/pull/19739)
-- fix(ui): hide model quota in /stats and refactor quota display by @danzaharia1
-  in [#24206](https://github.com/google-gemini/gemini-cli/pull/24206)
-- Changelog for v0.36.0 by @gemini-cli-robot in
-  [#24558](https://github.com/google-gemini/gemini-cli/pull/24558)
-- Changelog for v0.37.0-preview.1 by @gemini-cli-robot in
-  [#24568](https://github.com/google-gemini/gemini-cli/pull/24568)
-- docs: add missing .md extensions to internal doc links by @ishaan-arora-1 in
-  [#24145](https://github.com/google-gemini/gemini-cli/pull/24145)
-- fix(ui): fixed table styling by @devr0306 in
-  [#24565](https://github.com/google-gemini/gemini-cli/pull/24565)
-- fix(core): pass includeDirectories to sandbox configuration by @galz10 in
-  [#24573](https://github.com/google-gemini/gemini-cli/pull/24573)
-- feat(ui): enable "TerminalBuffer" mode to solve flicker by @jacob314 in
-  [#24512](https://github.com/google-gemini/gemini-cli/pull/24512)
-- docs: clarify release coordination by @scidomino in
-  [#24575](https://github.com/google-gemini/gemini-cli/pull/24575)
-- fix(core): remove broken PowerShell translation and fix native \_\_write in
-  Windows sandbox by @scidomino in
-  [#24571](https://github.com/google-gemini/gemini-cli/pull/24571)
-- Add instructions for how to start react in prod and force react to prod mode
-  by @jacob314 in
-  [#24590](https://github.com/google-gemini/gemini-cli/pull/24590)
-- feat(cli): minimalist sandbox status labels by @galz10 in
-  [#24582](https://github.com/google-gemini/gemini-cli/pull/24582)
-- Feat/browser agent metrics by @kunal-10-cloud in
-  [#24210](https://github.com/google-gemini/gemini-cli/pull/24210)
-- test: fix Windows CI execution and resolve exposed platform failures by
-  @ehedlund in [#24476](https://github.com/google-gemini/gemini-cli/pull/24476)
-- feat(core,cli): prioritize summary for topics (#24608) by @Abhijit-2592 in
-  [#24609](https://github.com/google-gemini/gemini-cli/pull/24609)
-- show color by @jacob314 in
-  [#24613](https://github.com/google-gemini/gemini-cli/pull/24613)
-- feat(cli): enable compact tool output by default (#24509) by @jwhelangoog in
-  [#24510](https://github.com/google-gemini/gemini-cli/pull/24510)
-- fix(core): inject skill system instructions into subagent prompts if activated
-  by @abhipatel12 in
-  [#24620](https://github.com/google-gemini/gemini-cli/pull/24620)
-- fix(core): improve windows sandbox reliability and fix integration tests by
-  @ehedlund in [#24480](https://github.com/google-gemini/gemini-cli/pull/24480)
-- fix(core): ensure sandbox approvals are correctly persisted and matched for
-  proactive expansions by @galz10 in
-  [#24577](https://github.com/google-gemini/gemini-cli/pull/24577)
-- feat(cli) Scrollbar for input prompt by @jacob314 in
-  [#21992](https://github.com/google-gemini/gemini-cli/pull/21992)
-- Do not run pr-eval workflow when no steering changes detected by @alisa-alisa
-  in [#24621](https://github.com/google-gemini/gemini-cli/pull/24621)
-- Fix restoration of topic headers. by @gundermanc in
-  [#24650](https://github.com/google-gemini/gemini-cli/pull/24650)
-- feat(core): discourage update topic tool for simple tasks by @Samee24 in
-  [#24640](https://github.com/google-gemini/gemini-cli/pull/24640)
-- fix(core): ensure global temp directory is always in sandbox allowed paths by
-  @galz10 in [#24638](https://github.com/google-gemini/gemini-cli/pull/24638)
-- fix(core): detect uninitialized lines by @jacob314 in
-  [#24646](https://github.com/google-gemini/gemini-cli/pull/24646)
-- docs: update sandboxing documentation and toolSandboxing settings by @galz10
-  in [#24655](https://github.com/google-gemini/gemini-cli/pull/24655)
-- feat(cli): enhance tool confirmation UI and selection layout by @galz10 in
-  [#24376](https://github.com/google-gemini/gemini-cli/pull/24376)
-- feat(acp): add support for `/about` command by @sripasg in
-  [#24649](https://github.com/google-gemini/gemini-cli/pull/24649)
-- feat(cli): add role specific metrics to /stats by @cynthialong0-0 in
-  [#24659](https://github.com/google-gemini/gemini-cli/pull/24659)
-- split context by @jacob314 in
-  [#24623](https://github.com/google-gemini/gemini-cli/pull/24623)
-- fix(cli): remove -S from shebang to fix Windows and BSD execution by
-  @scidomino in [#24756](https://github.com/google-gemini/gemini-cli/pull/24756)
-- Fix issue where topic headers can be posted back to back by @gundermanc in
-  [#24759](https://github.com/google-gemini/gemini-cli/pull/24759)
-- fix(core): handle partial llm_request in BeforeModel hook override by
-  @krishdef7 in [#22326](https://github.com/google-gemini/gemini-cli/pull/22326)
-- fix(ui): improve narration suppression and reduce flicker by @gundermanc in
-  [#24635](https://github.com/google-gemini/gemini-cli/pull/24635)
-- fix(ui): fixed auth race condition causing logo to flicker by @devr0306 in
-  [#24652](https://github.com/google-gemini/gemini-cli/pull/24652)
-- fix(browser): remove premature browser cleanup after subagent invocation by
-  @gsquared94 in
-  [#24753](https://github.com/google-gemini/gemini-cli/pull/24753)
-- Revert "feat(core,cli): prioritize summary for topics (#24608)" by
-  @Abhijit-2592 in
-  [#24777](https://github.com/google-gemini/gemini-cli/pull/24777)
-- relax tool sandboxing overrides for plan mode to match defaults. by
+  [#23626](https://github.com/google-gemini/gemini-cli/pull/23626)
+- feat(sandbox): dynamic Linux sandbox expansion and worktree support by @galz10
+  in [#23692](https://github.com/google-gemini/gemini-cli/pull/23692)
+- Merge examples of use into quickstart documentation by @diodesign in
+  [#23319](https://github.com/google-gemini/gemini-cli/pull/23319)
+- fix(cli): prioritize primary name matches in slash command search by @sehoon38
+  in [#23850](https://github.com/google-gemini/gemini-cli/pull/23850)
+- Changelog for v0.35.1 by @gemini-cli-robot in
+  [#23840](https://github.com/google-gemini/gemini-cli/pull/23840)
+- fix(browser): keep input blocker active across navigations by @kunal-10-cloud
+  in [#22562](https://github.com/google-gemini/gemini-cli/pull/22562)
+- feat(core): new skill to look for duplicated code while reviewing PRs by
+  @devr0306 in [#23704](https://github.com/google-gemini/gemini-cli/pull/23704)
+- fix(core): replace hardcoded non-interactive ASK_USER denial with explicit
+  policy rules by @ruomengz in
+  [#23668](https://github.com/google-gemini/gemini-cli/pull/23668)
+- fix(plan): after exiting plan mode switches model to a flash model by @Adib234
+  in [#23885](https://github.com/google-gemini/gemini-cli/pull/23885)
+- feat(gcp): add development worker infrastructure by @mattKorwel in
+  [#23814](https://github.com/google-gemini/gemini-cli/pull/23814)
+- fix(a2a-server): A2A server should execute ask policies in interactive mode by
+  @kschaab in [#23831](https://github.com/google-gemini/gemini-cli/pull/23831)
+- feat(core): define TrajectoryProvider interface by @sehoon38 in
+  [#23050](https://github.com/google-gemini/gemini-cli/pull/23050)
+- Docs: Update quotas and pricing by @jkcinouye in
+  [#23835](https://github.com/google-gemini/gemini-cli/pull/23835)
+- fix(core): allow disabling environment variable redaction by @galz10 in
+  [#23927](https://github.com/google-gemini/gemini-cli/pull/23927)
+- feat(cli): enable notifications cross-platform via terminal bell fallback by
+  @genneth in [#21618](https://github.com/google-gemini/gemini-cli/pull/21618)
+- feat(sandbox): implement secret visibility lockdown for env files by
   @DavidAPierce in
-  [#24762](https://github.com/google-gemini/gemini-cli/pull/24762)
-- fix(cli): respect global environment variable allowlist by @scidomino in
-  [#24767](https://github.com/google-gemini/gemini-cli/pull/24767)
-- fix(cli): ensure skills list outputs to stdout in non-interactive environments
-  by @spencer426 in
-  [#24566](https://github.com/google-gemini/gemini-cli/pull/24566)
-- Add an eval for and fix unsafe cloning behavior. by @gundermanc in
-  [#24457](https://github.com/google-gemini/gemini-cli/pull/24457)
-- fix(policy): allow complete_task in plan mode by @abhipatel12 in
-  [#24771](https://github.com/google-gemini/gemini-cli/pull/24771)
-- feat(telemetry): add browser agent clearcut metrics by @gsquared94 in
-  [#24688](https://github.com/google-gemini/gemini-cli/pull/24688)
-- feat(cli): support selective topic expansion and click-to-expand by
-  @Abhijit-2592 in
-  [#24793](https://github.com/google-gemini/gemini-cli/pull/24793)
-- temporarily disable sandbox integration test on windows by @ehedlund in
-  [#24786](https://github.com/google-gemini/gemini-cli/pull/24786)
-- Remove flakey test by @scidomino in
-  [#24837](https://github.com/google-gemini/gemini-cli/pull/24837)
-- Alisa/approve button by @alisa-alisa in
-  [#24645](https://github.com/google-gemini/gemini-cli/pull/24645)
-- feat(hooks): display hook system messages in UI by @mbleigh in
-  [#24616](https://github.com/google-gemini/gemini-cli/pull/24616)
-- fix(core): propagate BeforeModel hook model override end-to-end by @krishdef7
-  in [#24784](https://github.com/google-gemini/gemini-cli/pull/24784)
-- chore: fix formatting for behavioral eval skill reference file by @abhipatel12
-  in [#24846](https://github.com/google-gemini/gemini-cli/pull/24846)
-- fix: use directory junctions on Windows for skill linking by @enjoykumawat in
-  [#24823](https://github.com/google-gemini/gemini-cli/pull/24823)
-- fix(cli): prevent multiple banner increments on remount by @sehoon38 in
-  [#24843](https://github.com/google-gemini/gemini-cli/pull/24843)
-- feat(acp): add /help command by @sripasg in
-  [#24839](https://github.com/google-gemini/gemini-cli/pull/24839)
-- fix(core): remove tmux alternate buffer warning by @jackwotherspoon in
-  [#24852](https://github.com/google-gemini/gemini-cli/pull/24852)
-- Improve sandbox error matching and caching by @DavidAPierce in
-  [#24550](https://github.com/google-gemini/gemini-cli/pull/24550)
-- feat(core): add agent protocol UI types and experimental flag by @mbleigh in
-  [#24275](https://github.com/google-gemini/gemini-cli/pull/24275)
-- feat(core): use experiment flags for default fetch timeouts by @yunaseoul in
-  [#24261](https://github.com/google-gemini/gemini-cli/pull/24261)
-- Revert "fix(ui): improve narration suppression and reduce flicker (#2… by
-  @gundermanc in
-  [#24857](https://github.com/google-gemini/gemini-cli/pull/24857)
-- refactor(cli): remove duplication in interactive shell awaiting input hint by
-  @JayadityaGit in
-  [#24801](https://github.com/google-gemini/gemini-cli/pull/24801)
-- refactor(core): make LegacyAgentSession dependencies optional by @mbleigh in
-  [#24287](https://github.com/google-gemini/gemini-cli/pull/24287)
-- Changelog for v0.37.0-preview.2 by @gemini-cli-robot in
-  [#24848](https://github.com/google-gemini/gemini-cli/pull/24848)
-- fix(cli): always show shell command description or actual command by @jacob314
-  in [#24774](https://github.com/google-gemini/gemini-cli/pull/24774)
-- Added flag for ept size and increased default size by @devr0306 in
-  [#24859](https://github.com/google-gemini/gemini-cli/pull/24859)
-- fix(core): dispose Scheduler to prevent McpProgress listener leak by
-  @Anjaligarhwal in
-  [#24870](https://github.com/google-gemini/gemini-cli/pull/24870)
-- fix(cli): switch default back to terminalBuffer=false and fix regressions
-  introduced for that mode by @jacob314 in
-  [#24873](https://github.com/google-gemini/gemini-cli/pull/24873)
-- feat(cli): switch to ctrl+g from ctrl-x by @jacob314 in
-  [#24861](https://github.com/google-gemini/gemini-cli/pull/24861)
-- fix: isolate concurrent browser agent instances by @gsquared94 in
-  [#24794](https://github.com/google-gemini/gemini-cli/pull/24794)
-- docs: update MCP server OAuth redirect port documentation by @adamfweidman in
-  [#24844](https://github.com/google-gemini/gemini-cli/pull/24844)
+  [#23712](https://github.com/google-gemini/gemini-cli/pull/23712)
+- fix(core): remove shell outputChunks buffer caching to prevent memory bloat
+  and sanitize prompt input by @spencer426 in
+  [#23751](https://github.com/google-gemini/gemini-cli/pull/23751)
+- feat(core): implement persistent browser session management by @kunal-10-cloud
+  in [#21306](https://github.com/google-gemini/gemini-cli/pull/21306)
+- refactor(core): delegate sandbox denial parsing to SandboxManager by
+  @scidomino in [#23928](https://github.com/google-gemini/gemini-cli/pull/23928)
+- dep(update) Update Ink version to 6.5.0 by @jacob314 in
+  [#23843](https://github.com/google-gemini/gemini-cli/pull/23843)
+- Docs: Update 'docs-writer' skill for relative links by @jkcinouye in
+  [#21463](https://github.com/google-gemini/gemini-cli/pull/21463)
+- Changelog for v0.36.0-preview.4 by @gemini-cli-robot in
+  [#23935](https://github.com/google-gemini/gemini-cli/pull/23935)
+- fix(acp): Update allow approval policy flow for ACP clients to fix config
+  persistence and compatible with TUI by @sripasg in
+  [#23818](https://github.com/google-gemini/gemini-cli/pull/23818)
+- Changelog for v0.35.2 by @gemini-cli-robot in
+  [#23960](https://github.com/google-gemini/gemini-cli/pull/23960)
+- ACP integration documents by @g-samroberts in
+  [#22254](https://github.com/google-gemini/gemini-cli/pull/22254)
+- fix(core): explicitly set error names to avoid bundling renaming issues by
+  @yunaseoul in [#23913](https://github.com/google-gemini/gemini-cli/pull/23913)
+- feat(core): subagent isolation and cleanup hardening by @abhipatel12 in
+  [#23903](https://github.com/google-gemini/gemini-cli/pull/23903)
+- disable extension-reload test by @scidomino in
+  [#24018](https://github.com/google-gemini/gemini-cli/pull/24018)
+- feat(core): add forbiddenPaths to GlobalSandboxOptions and refactor
+  createSandboxManager by @ehedlund in
+  [#23936](https://github.com/google-gemini/gemini-cli/pull/23936)
+- refactor(core): improve ignore resolution and fix directory-matching bug by
+  @ehedlund in [#23816](https://github.com/google-gemini/gemini-cli/pull/23816)
+- revert(core): support custom base URL via env vars by @spencer426 in
+  [#23976](https://github.com/google-gemini/gemini-cli/pull/23976)
+- Increase memory limited for eslint. by @jacob314 in
+  [#24022](https://github.com/google-gemini/gemini-cli/pull/24022)
+- fix(acp): prevent crash on empty response in ACP mode by @sripasg in
+  [#23952](https://github.com/google-gemini/gemini-cli/pull/23952)
+- feat(core): Land `AgentHistoryProvider`. by @joshualitt in
+  [#23978](https://github.com/google-gemini/gemini-cli/pull/23978)
+- fix(core): switch to subshells for shell tool wrapping to fix heredocs and
+  edge cases by @abhipatel12 in
+  [#24024](https://github.com/google-gemini/gemini-cli/pull/24024)
+- Debug command. by @jacob314 in
+  [#23851](https://github.com/google-gemini/gemini-cli/pull/23851)
+- Changelog for v0.36.0-preview.5 by @gemini-cli-robot in
+  [#24046](https://github.com/google-gemini/gemini-cli/pull/24046)
+- Fix test flakes by globally mocking ink-spinner by @jacob314 in
+  [#24044](https://github.com/google-gemini/gemini-cli/pull/24044)
+- Enable network access in sandbox configuration by @galz10 in
+  [#24055](https://github.com/google-gemini/gemini-cli/pull/24055)
+- feat(context): add configurable memoryBoundaryMarkers setting by @SandyTao520
+  in [#24020](https://github.com/google-gemini/gemini-cli/pull/24020)
+- feat(core): implement windows sandbox expansion and denial detection by
+  @scidomino in [#24027](https://github.com/google-gemini/gemini-cli/pull/24027)
+- fix(core): resolve ACP Operation Aborted Errors in grep_search by @ivanporty
+  in [#23821](https://github.com/google-gemini/gemini-cli/pull/23821)
+- fix(hooks): prevent SessionEnd from firing twice in non-interactive mode by
+  @krishdef7 in [#22139](https://github.com/google-gemini/gemini-cli/pull/22139)
+- Re-word intro to Gemini 3 page. by @g-samroberts in
+  [#24069](https://github.com/google-gemini/gemini-cli/pull/24069)
+- fix(cli): resolve layout contention and flashing loop in StatusRow by
+  @keithguerin in
+  [#24065](https://github.com/google-gemini/gemini-cli/pull/24065)
+- fix(sandbox): implement Windows Mandatory Integrity Control for GeminiSandbox
+  by @galz10 in [#24057](https://github.com/google-gemini/gemini-cli/pull/24057)
+- feat(core): implement tool-based topic grouping (Chapters) by @Abhijit-2592 in
+  [#23150](https://github.com/google-gemini/gemini-cli/pull/23150)
+- feat(cli): support 'tab to queue' for messages while generating by @gundermanc
+  in [#24052](https://github.com/google-gemini/gemini-cli/pull/24052)
+- feat(core): agnostic background task UI with CompletionBehavior by
+  @adamfweidman in
+  [#22740](https://github.com/google-gemini/gemini-cli/pull/22740)
+- UX for topic narration tool by @gundermanc in
+  [#24079](https://github.com/google-gemini/gemini-cli/pull/24079)
+- fix: shellcheck warnings in scripts by @scidomino in
+  [#24035](https://github.com/google-gemini/gemini-cli/pull/24035)
+- test(evals): add comprehensive subagent delegation evaluations by @abhipatel12
+  in [#24132](https://github.com/google-gemini/gemini-cli/pull/24132)
+- fix(a2a-server): prioritize ADC before evaluating headless constraints for
+  auth initialization by @spencer426 in
+  [#23614](https://github.com/google-gemini/gemini-cli/pull/23614)
+- Text can be added after /plan command by @rambleraptor in
+  [#22833](https://github.com/google-gemini/gemini-cli/pull/22833)
+- fix(cli): resolve missing F12 logs via global console store by @scidomino in
+  [#24235](https://github.com/google-gemini/gemini-cli/pull/24235)
+- fix broken tests by @scidomino in
+  [#24279](https://github.com/google-gemini/gemini-cli/pull/24279)
+- fix(evals): add update_topic behavioral eval by @gundermanc in
+  [#24223](https://github.com/google-gemini/gemini-cli/pull/24223)
+- feat(core): Unified Context Management and Tool Distillation. by @joshualitt
+  in [#24157](https://github.com/google-gemini/gemini-cli/pull/24157)
+- Default enable narration for the team. by @gundermanc in
+  [#24224](https://github.com/google-gemini/gemini-cli/pull/24224)
+- fix(core): ensure default agents provide tools and use model-specific schemas
+  by @abhipatel12 in
+  [#24268](https://github.com/google-gemini/gemini-cli/pull/24268)
+- feat(cli): show Flash Lite Preview model regardless of user tier by @sehoon38
+  in [#23904](https://github.com/google-gemini/gemini-cli/pull/23904)
+- feat(cli): implement compact tool output by @jwhelangoog in
+  [#20974](https://github.com/google-gemini/gemini-cli/pull/20974)
+- Add security settings for tool sandboxing by @galz10 in
+  [#23923](https://github.com/google-gemini/gemini-cli/pull/23923)
+- chore(test-utils): switch integration tests to use PREVIEW_GEMINI_MODEL by
+  @sehoon38 in [#24276](https://github.com/google-gemini/gemini-cli/pull/24276)
+- feat(core): enable topic update narration for legacy models by @Abhijit-2592
+  in [#24241](https://github.com/google-gemini/gemini-cli/pull/24241)
+- feat(core): add project-level memory scope to save_memory tool by @SandyTao520
+  in [#24161](https://github.com/google-gemini/gemini-cli/pull/24161)
+- test(integration): fix plan mode write denial test false positive by @sehoon38
+  in [#24299](https://github.com/google-gemini/gemini-cli/pull/24299)
+- feat(plan): support `Plan` mode in untrusted folders by @Adib234 in
+  [#17586](https://github.com/google-gemini/gemini-cli/pull/17586)
+- fix(core): enable mid-stream retries for all models and re-enable compression
+  test by @sehoon38 in
+  [#24302](https://github.com/google-gemini/gemini-cli/pull/24302)
+- Changelog for v0.36.0-preview.6 by @gemini-cli-robot in
+  [#24082](https://github.com/google-gemini/gemini-cli/pull/24082)
+- Changelog for v0.35.3 by @gemini-cli-robot in
+  [#24083](https://github.com/google-gemini/gemini-cli/pull/24083)
+- feat(cli): add auth info to footer by @sehoon38 in
+  [#24042](https://github.com/google-gemini/gemini-cli/pull/24042)
+- fix(browser): reset action counter for each agent session and let it ignore
+  internal actions by @cynthialong0-0 in
+  [#24228](https://github.com/google-gemini/gemini-cli/pull/24228)
+- feat(plan): promote planning feature to stable by @ruomengz in
+  [#24282](https://github.com/google-gemini/gemini-cli/pull/24282)
+- fix(browser): terminate subagent immediately on domain restriction violations
+  by @gsquared94 in
+  [#24313](https://github.com/google-gemini/gemini-cli/pull/24313)
+- feat(cli): add UI to update extensions by @ruomengz in
+  [#23682](https://github.com/google-gemini/gemini-cli/pull/23682)
+- Fix(browser): terminate immediately for "browser is already running" error by
+  @cynthialong0-0 in
+  [#24233](https://github.com/google-gemini/gemini-cli/pull/24233)
+- docs: Add 'plan' option to approval mode in CLI reference by @YifanRuan in
+  [#24134](https://github.com/google-gemini/gemini-cli/pull/24134)
+- fix(core): batch macOS seatbelt rules into a profile file to prevent ARG_MAX
+  errors by @ehedlund in
+  [#24255](https://github.com/google-gemini/gemini-cli/pull/24255)
+- fix(core): fix race condition between browser agent and main closing process
+  by @cynthialong0-0 in
+  [#24340](https://github.com/google-gemini/gemini-cli/pull/24340)
+- perf(build): optimize build scripts for parallel execution and remove
+  redundant checks by @sehoon38 in
+  [#24307](https://github.com/google-gemini/gemini-cli/pull/24307)
+- ci: install bubblewrap on Linux for release workflows by @ehedlund in
+  [#24347](https://github.com/google-gemini/gemini-cli/pull/24347)
+- chore(release): allow bundling for all builds, including stable by @sehoon38
+  in [#24305](https://github.com/google-gemini/gemini-cli/pull/24305)
+- Revert "Add security settings for tool sandboxing" by @jerop in
+  [#24357](https://github.com/google-gemini/gemini-cli/pull/24357)
+- docs: update subagents docs to not be experimental by @abhipatel12 in
+  [#24343](https://github.com/google-gemini/gemini-cli/pull/24343)
+- fix(core): implement **read and **write commands in sandbox managers by
+  @galz10 in [#24283](https://github.com/google-gemini/gemini-cli/pull/24283)
+- don't try to remove tags in dry run by @scidomino in
+  [#24356](https://github.com/google-gemini/gemini-cli/pull/24356)
+- fix(config): disable JIT context loading by default by @SandyTao520 in
+  [#24364](https://github.com/google-gemini/gemini-cli/pull/24364)
+- test(sandbox): add integration test for dynamic permission expansion by
+  @galz10 in [#24359](https://github.com/google-gemini/gemini-cli/pull/24359)
+- docs(policy): remove unsupported mcpName wildcard edge case by @abhipatel12 in
+  [#24133](https://github.com/google-gemini/gemini-cli/pull/24133)
+- docs: fix broken GEMINI.md link in CONTRIBUTING.md by @Panchal-Tirth in
+  [#24182](https://github.com/google-gemini/gemini-cli/pull/24182)
+- feat(core): infrastructure for event-driven subagent history by @abhipatel12
+  in [#23914](https://github.com/google-gemini/gemini-cli/pull/23914)
+- fix(core): resolve Plan Mode deadlock during plan file creation due to sandbox
+  restrictions by @DavidAPierce in
+  [#24047](https://github.com/google-gemini/gemini-cli/pull/24047)
+- fix(core): fix browser agent UX issues and improve E2E test reliability by
+  @gsquared94 in
+  [#24312](https://github.com/google-gemini/gemini-cli/pull/24312)
+- fix(ui): wrap topic and intent fields in TopicMessage by @jwhelangoog in
+  [#24386](https://github.com/google-gemini/gemini-cli/pull/24386)
+- refactor(core): Centralize context management logic into src/context by
+  @joshualitt in
+  [#24380](https://github.com/google-gemini/gemini-cli/pull/24380)
+- fix(core): pin AuthType.GATEWAY to use Gemini 3.1 Pro/Flash Lite by default by
+  @sripasg in [#24375](https://github.com/google-gemini/gemini-cli/pull/24375)
+- feat(ui): add Tokyo Night theme by @danrneal in
+  [#24054](https://github.com/google-gemini/gemini-cli/pull/24054)
+- fix(cli): refactor test config loading and mock debugLogger in test-setup by
+  @mattKorwel in
+  [#24389](https://github.com/google-gemini/gemini-cli/pull/24389)
+- Set memoryManager to false in settings.json by @mattKorwel in
+  [#24393](https://github.com/google-gemini/gemini-cli/pull/24393)
+- ink 6.6.3 by @jacob314 in
+  [#24372](https://github.com/google-gemini/gemini-cli/pull/24372)
+- fix(core): resolve subagent chat recording gaps and directory inheritance by
+  @abhipatel12 in
+  [#24368](https://github.com/google-gemini/gemini-cli/pull/24368)
+- fix(cli): cap shell output at 10 MB to prevent RangeError crash by @ProthamD
+  in [#24168](https://github.com/google-gemini/gemini-cli/pull/24168)
+- feat(plan): conditionally add enter/exit plan mode tools based on current mode
+  by @ruomengz in
+  [#24378](https://github.com/google-gemini/gemini-cli/pull/24378)
+- feat(core): prioritize discussion before formal plan approval by @jerop in
+  [#24423](https://github.com/google-gemini/gemini-cli/pull/24423)
+- fix(ui): add accelerated scrolling on alternate buffer mode by @devr0306 in
+  [#23940](https://github.com/google-gemini/gemini-cli/pull/23940)
+- feat(core): populate sandbox forbidden paths with project ignore file contents
+  by @ehedlund in
+  [#24038](https://github.com/google-gemini/gemini-cli/pull/24038)
+- fix(core): ensure blue border overlay and input blocker to act correctly
+  depending on browser agent activities by @cynthialong0-0 in
+  [#24385](https://github.com/google-gemini/gemini-cli/pull/24385)
+- fix(ui): removed additional vertical padding for tables by @devr0306 in
+  [#24381](https://github.com/google-gemini/gemini-cli/pull/24381)
+- fix(build): upload full bundle directory archive to GitHub releases by
+  @sehoon38 in [#24403](https://github.com/google-gemini/gemini-cli/pull/24403)
+- fix(build): wire bundle:browser-mcp into bundle pipeline by @gsquared94 in
+  [#24424](https://github.com/google-gemini/gemini-cli/pull/24424)
+- feat(browser): add sandbox-aware browser agent initialization by @gsquared94
+  in [#24419](https://github.com/google-gemini/gemini-cli/pull/24419)
+- feat(core): enhance tracker task schemas for detailed titles and descriptions
+  by @anj-s in [#23902](https://github.com/google-gemini/gemini-cli/pull/23902)
+- refactor(core): Unified context management settings schema by @joshualitt in
+  [#24391](https://github.com/google-gemini/gemini-cli/pull/24391)
+- feat(core): update browser agent prompt to check open pages first when
+  bringing up by @cynthialong0-0 in
+  [#24431](https://github.com/google-gemini/gemini-cli/pull/24431)
+- fix(acp) refactor(core,cli): centralize model discovery logic in
+  ModelConfigService by @sripasg in
+  [#24392](https://github.com/google-gemini/gemini-cli/pull/24392)
+- Changelog for v0.36.0-preview.7 by @gemini-cli-robot in
+  [#24346](https://github.com/google-gemini/gemini-cli/pull/24346)
+- fix: update task tracker storage location in system prompt by @anj-s in
+  [#24034](https://github.com/google-gemini/gemini-cli/pull/24034)
+- feat(browser): supersede stale snapshots to reclaim context-window tokens by
+  @gsquared94 in
+  [#24440](https://github.com/google-gemini/gemini-cli/pull/24440)
+- docs(core): add subagent tool isolation draft doc by @akh64bit in
+  [#23275](https://github.com/google-gemini/gemini-cli/pull/23275)
 
 **Full Changelog**:
-https://github.com/google-gemini/gemini-cli/compare/v0.37.0-preview.2...v0.38.0-preview.0
+https://github.com/google-gemini/gemini-cli/compare/v0.36.0-preview.8...v0.37.0-preview.2

docs/cli/settings.md

@@ -153,9 +153,9 @@ they appear in the UI.
 
 ### Advanced
 
-| UI Label                          | Setting                        | Description                                                                                                                                                                                                           | Default |
-| --------------------------------- | ------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
-| Auto Configure Max Old Space Size | `advanced.autoConfigureMemory` | Automatically configure Node.js memory limits. Note: Because memory is allocated during the initial process boot, this setting is only read from the global user settings file and ignores workspace-level overrides. | `true`  |
+| UI Label                          | Setting                        | Description                                   | Default |
+| --------------------------------- | ------------------------------ | --------------------------------------------- | ------- |
+| Auto Configure Max Old Space Size | `advanced.autoConfigureMemory` | Automatically configure Node.js memory limits | `true`  |
 
 ### Experimental
 

docs/core/subagents.md

@@ -521,24 +521,6 @@ field.
 }
 ```
 
-#### Safety policies (TOML)
-
-You can restrict access to specific subagents using the CLI's **Policy Engine**.
-Subagents are treated as virtual tool names for policy matching purposes.
-
-To govern access to a subagent, create a `.toml` file in your policy directory
-(e.g., `~/.gemini/policies/`):
-
-```toml
-[[rule]]
-toolName = "codebase_investigator"
-decision = "deny"
-deny_message = "Deep codebase analysis is restricted for this session."
-```
-
-For more information on setting up fine-grained safety guardrails, see the
-[Policy Engine reference](../reference/policy-engine.md#special-syntax-for-subagents).
-
 ### Optimizing your subagent
 
 The main agent's system prompt encourages it to use an expert subagent when one

docs/integration-tests.md

@@ -157,48 +157,6 @@ The harness (`MemoryTestHarness` in `packages/test-utils`):
 - Compares against baselines with a 10% tolerance.
 - Can analyze sustained leaks across 3 snapshots using `analyzeSnapshots()`.
 
-## Performance regression tests
-
-Performance regression tests are designed to detect wall-clock time, CPU usage,
-and event loop delay regressions across key CLI scenarios. They are located in
-the `perf-tests` directory.
-
-These tests are distinct from standard integration tests because they measure
-performance metrics and compare it against committed baselines.
-
-### Running performance tests
-
-Performance tests are not run as part of the default `npm run test` or
-`npm run test:e2e` commands. They are run nightly in CI but can be run manually:
-
-```bash
-npm run test:perf
-```
-
-### Updating baselines
-
-If you intentionally change behavior that affects performance, you may need to
-update the baselines. Set the `UPDATE_PERF_BASELINES` environment variable to
-`true`:
-
-```bash
-UPDATE_PERF_BASELINES=true npm run test:perf
-```
-
-This will run the tests multiple times (with warmup), apply IQR outlier
-filtering, and overwrite `perf-tests/baselines.json`. You should review the
-changes and commit the updated baseline file.
-
-### How it works
-
-The harness (`PerfTestHarness` in `packages/test-utils`):
-
-- Measures wall-clock time using `performance.now()`.
-- Measures CPU usage using `process.cpuUsage()`.
-- Monitors event loop delay using `perf_hooks.monitorEventLoopDelay()`.
-- Applies IQR (Interquartile Range) filtering to remove outlier samples.
-- Compares against baselines with a 15% tolerance.
-
 ## Diagnostics
 
 The integration test runner provides several options for diagnostics to help

docs/reference/configuration.md

@@ -1578,10 +1578,7 @@ their corresponding top-level category object in your `settings.json` file.
 #### `advanced`
 
 - **`advanced.autoConfigureMemory`** (boolean):
-  - **Description:** Automatically configure Node.js memory limits. Note:
-    Because memory is allocated during the initial process boot, this setting is
-    only read from the global user settings file and ignores workspace-level
-    overrides.
+  - **Description:** Automatically configure Node.js memory limits
   - **Default:** `true`
   - **Requires restart:** Yes
 

docs/reference/keyboard-shortcuts.md

@@ -91,7 +91,7 @@ available combinations.
 | `input.submit`                       | Submit the current prompt.                                                | `Enter`                                                                             |
 | `input.queueMessage`                 | Queue the current prompt to be processed after the current task finishes. | `Tab`                                                                               |
 | `input.newline`                      | Insert a newline without submitting.                                      | `Ctrl+Enter`<br />`Cmd/Win+Enter`<br />`Alt+Enter`<br />`Shift+Enter`<br />`Ctrl+J` |
-| `input.openExternalEditor`           | Open the current prompt or the plan in an external editor.                | `Ctrl+G`<br />`Ctrl+Shift+G`                                                        |
+| `input.openExternalEditor`           | Open the current prompt or the plan in an external editor.                | `Ctrl+G`                                                                            |
 | `input.deprecatedOpenExternalEditor` | Deprecated command to open external editor.                               | `Ctrl+X`                                                                            |
 | `input.paste`                        | Paste from the clipboard.                                                 | `Ctrl+V`<br />`Cmd/Win+V`<br />`Alt+V`                                              |
 

docs/reference/policy-engine.md

@@ -438,33 +438,6 @@ decision = "ask_user"
 priority = 10
 ```
 
-### Special syntax for subagents
-
-You can secure and govern subagents using standard policy rules by treating the
-subagent's name as the `toolName`.
-
-When the main agent invokes a subagent (e.g., using the unified `invoke_agent`
-tool), the Policy Engine automatically treats the target `agent_name` as a
-virtual tool alias for rule matching.
-
-**Example:**
-
-This rule denies access to the `codebase_investigator` subagent.
-
-```toml
-[[rule]]
-toolName = "codebase_investigator"
-decision = "deny"
-priority = 500
-deny_message = "Deep codebase analysis is restricted for this session."
-```
-
-- **Backward Compatibility**: Any rules written targeting historical 1:1
-  subagent tool names will continue to match transparently.
-- **Context differentiation**: To create rules based on **who** is calling a
-  tool, use the `subagent` field instead. See
-  [TOML rule schema](#toml-rule-schema).
-
 ## Default policies
 
 The Gemini CLI ships with a set of default policies to provide a safe

evals/answer-vs-act.eval.ts

@@ -19,8 +19,6 @@ describe('Answer vs. ask eval', () => {
    * automatically modify the file, but instead asks for permission.
    */
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should not edit files when asked to inspect for bugs',
     prompt: 'Inspect app.ts for bugs',
     files: FILES,
@@ -44,8 +42,6 @@ describe('Answer vs. ask eval', () => {
    * does modify the file.
    */
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should edit files when asked to fix bug',
     prompt: 'Fix the bug in app.ts - it should add numbers not subtract',
     files: FILES,
@@ -70,8 +66,6 @@ describe('Answer vs. ask eval', () => {
    * automatically modify the file, but instead asks for permission.
    */
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should not edit when asking "any bugs"',
     prompt: 'Any bugs in app.ts?',
     files: FILES,
@@ -95,8 +89,6 @@ describe('Answer vs. ask eval', () => {
    * automatically modify the file.
    */
   evalTest('ALWAYS_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should not edit files when asked a general question',
     prompt: 'How does app.ts work?',
     files: FILES,
@@ -120,8 +112,6 @@ describe('Answer vs. ask eval', () => {
    * automatically modify the file.
    */
   evalTest('ALWAYS_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should not edit files when asked about style',
     prompt: 'Is app.ts following good style?',
     files: FILES,
@@ -145,8 +135,6 @@ describe('Answer vs. ask eval', () => {
    * the agent does NOT automatically modify the file.
    */
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should not edit files when user notes an issue',
     prompt: 'The add function subtracts numbers.',
     files: FILES,

evals/app-test-helper.ts

@@ -10,14 +10,10 @@ import {
   runEval,
   prepareLogDir,
   symlinkNodeModules,
-  withEvalRetries,
-  prepareWorkspace,
-  type BaseEvalCase,
-  EVAL_MODEL,
-  logUsageMetrics,
 } from './test-helper.js';
 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
@@ -33,13 +29,15 @@ interface EvalConfigOverrides {
   allowedTools?: never;
   /** Restricting tools via mainAgentTools in evals is forbidden. */
   mainAgentTools?: never;
-
   [key: string]: unknown;
 }
 
-export interface AppEvalCase extends BaseEvalCase {
+export interface AppEvalCase {
+  name: string;
   configOverrides?: EvalConfigOverrides;
   prompt: string;
+  timeout?: number;
+  files?: Record<string, string>;
   setup?: (rig: AppRig) => Promise<void>;
   assert: (rig: AppRig, output: string) => Promise<void>;
 }
@@ -50,65 +48,56 @@ export interface AppEvalCase extends BaseEvalCase {
  */
 export function appEvalTest(policy: EvalPolicy, evalCase: AppEvalCase) {
   const fn = async () => {
-    await withEvalRetries(evalCase.name, async () => {
-      const rig = new AppRig({
-        configOverrides: {
-          model: EVAL_MODEL,
-          ...evalCase.configOverrides,
-        },
-      });
-
-      const { logDir, sanitizedName } = await prepareLogDir(evalCase.name);
-      const logFile = path.join(logDir, `${sanitizedName}.log`);
-      let isSuccess = false;
-
-      try {
-        await rig.initialize();
-
-        const testDir = rig.getTestDir();
-        symlinkNodeModules(testDir);
-
-        // Setup initial files
-        if (evalCase.files) {
-          // Note: AppRig does not use a separate homeDir, so we use testDir twice
-          await prepareWorkspace(testDir, testDir, evalCase.files);
-        }
-
-        // Run custom setup if provided (e.g. for breakpoints)
-        if (evalCase.setup) {
-          await evalCase.setup(rig);
-        }
-
-        // Render the app!
-        await rig.render();
-
-        // Wait for initial ready state
-        await rig.waitForIdle();
-
-        // Send the initial prompt
-        await rig.sendMessage(evalCase.prompt);
-
-        // Run assertion. Interaction-heavy tests can do their own waiting/steering here.
-        const output = rig.getStaticOutput();
-        await evalCase.assert(rig, output);
-        isSuccess = true;
-      } catch (e) {
-        isSuccess = false;
-        throw e;
-      } finally {
-        const metrics = rig.getUsageMetrics();
-        if (metrics.turns > 0) {
-          logUsageMetrics(evalCase.name, metrics, isSuccess);
-        }
-
-        const output = rig.getStaticOutput();
-        if (output) {
-          await fs.promises.writeFile(logFile, output);
-        }
-        await rig.unmount();
-      }
+    const rig = new AppRig({
+      configOverrides: {
+        model: DEFAULT_GEMINI_MODEL,
+        ...evalCase.configOverrides,
+      },
     });
+
+    const { logDir, sanitizedName } = await prepareLogDir(evalCase.name);
+    const logFile = path.join(logDir, `${sanitizedName}.log`);
+
+    try {
+      await rig.initialize();
+
+      const testDir = rig.getTestDir();
+      symlinkNodeModules(testDir);
+
+      // Setup initial files
+      if (evalCase.files) {
+        for (const [filePath, content] of Object.entries(evalCase.files)) {
+          const fullPath = path.join(testDir, filePath);
+          fs.mkdirSync(path.dirname(fullPath), { recursive: true });
+          fs.writeFileSync(fullPath, content);
+        }
+      }
+
+      // Run custom setup if provided (e.g. for breakpoints)
+      if (evalCase.setup) {
+        await evalCase.setup(rig);
+      }
+
+      // Render the app!
+      await rig.render();
+
+      // Wait for initial ready state
+      await rig.waitForIdle();
+
+      // Send the initial prompt
+      await rig.sendMessage(evalCase.prompt);
+
+      // Run assertion. Interaction-heavy tests can do their own waiting/steering here.
+      const output = rig.getStaticOutput();
+      await evalCase.assert(rig, output);
+    } finally {
+      const output = rig.getStaticOutput();
+      if (output) {
+        await fs.promises.writeFile(logFile, output);
+      }
+      await rig.unmount();
+    }
   };
 
-  runEval(policy, evalCase, fn, (evalCase.timeout ?? 60000) + 10000);
+  runEval(policy, evalCase.name, fn, (evalCase.timeout ?? 60000) + 10000);
 }

evals/ask_user.eval.ts

@@ -5,21 +5,17 @@
  */
 
 import { describe, expect } from 'vitest';
-import { ApprovalMode, isRecord } from '@google/gemini-cli-core';
-import { appEvalTest, type AppEvalCase } from './app-test-helper.js';
-import { type EvalPolicy } from './test-helper.js';
+import { appEvalTest, AppEvalCase } from './app-test-helper.js';
+import { EvalPolicy } from './test-helper.js';
 
 function askUserEvalTest(policy: EvalPolicy, evalCase: AppEvalCase) {
-  const existingGeneral = evalCase.configOverrides?.['general'];
-  const generalBase = isRecord(existingGeneral) ? existingGeneral : {};
-
   return appEvalTest(policy, {
     ...evalCase,
     configOverrides: {
       ...evalCase.configOverrides,
-      approvalMode: ApprovalMode.DEFAULT,
       general: {
-        ...generalBase,
+        ...evalCase.configOverrides?.general,
+        approvalMode: 'default',
         enableAutoUpdate: false,
         enableAutoUpdateNotification: false,
       },
@@ -32,8 +28,6 @@ function askUserEvalTest(policy: EvalPolicy, evalCase: AppEvalCase) {
 
 describe('ask_user', () => {
   askUserEvalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'Agent uses AskUser tool to present multiple choice options',
     prompt: `Use the ask_user tool to ask me what my favorite color is. Provide 3 options: red, green, or blue.`,
     setup: async (rig) => {
@@ -49,8 +43,6 @@ describe('ask_user', () => {
   });
 
   askUserEvalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'Agent uses AskUser tool to clarify ambiguous requirements',
     files: {
       'package.json': JSON.stringify({ name: 'my-app', version: '1.0.0' }),
@@ -69,8 +61,6 @@ describe('ask_user', () => {
   });
 
   askUserEvalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'Agent uses AskUser tool before performing significant ambiguous rework',
     files: {
       'packages/core/src/index.ts': '// index\nexport const version = "1.0.0";',
@@ -92,8 +82,8 @@ describe('ask_user', () => {
       ]);
       expect(confirmation, 'Expected a tool call confirmation').toBeDefined();
 
-      if (confirmation?.toolName === 'enter_plan_mode') {
-        await rig.resolveTool('enter_plan_mode');
+      if (confirmation?.name === 'enter_plan_mode') {
+        rig.acceptConfirmation('enter_plan_mode');
         confirmation = await rig.waitForPendingConfirmation('ask_user');
       }
 
@@ -111,8 +101,6 @@ describe('ask_user', () => {
   // updates to clarify that shell command confirmation is handled by the UI.
   // See fix: https://github.com/google-gemini/gemini-cli/pull/20504
   askUserEvalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'Agent does NOT use AskUser to confirm shell commands',
     files: {
       'package.json': JSON.stringify({

evals/automated-tool-use.eval.ts

@@ -14,8 +14,6 @@ describe('Automated tool use', () => {
    * a repro by guiding the agent into using the existing deficient script.
    */
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should use automated tools (eslint --fix) to fix code style issues',
     files: {
       'package.json': JSON.stringify(
@@ -104,8 +102,6 @@ describe('Automated tool use', () => {
    * instead of trying to edit the files itself.
    */
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should use automated tools (prettier --write) to fix formatting issues',
     files: {
       'package.json': JSON.stringify(

evals/cli_help_delegation.eval.ts

@@ -3,8 +3,6 @@ import { evalTest } from './test-helper.js';
 
 describe('CliHelpAgent Delegation', () => {
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should delegate to cli_help agent for subagent creation questions',
     params: {
       settings: {

evals/component-test-helper.ts

@@ -1,136 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import {
-  type EvalPolicy,
-  runEval,
-  prepareLogDir,
-  withEvalRetries,
-  prepareWorkspace,
-  type BaseEvalCase,
-} from './test-helper.js';
-import fs from 'node:fs';
-import path from 'node:path';
-import os from 'node:os';
-import { randomUUID } from 'node:crypto';
-import {
-  Config,
-  type ConfigParameters,
-  AuthType,
-  ApprovalMode,
-  createPolicyEngineConfig,
-  ExtensionLoader,
-  IntegrityDataStatus,
-  makeFakeConfig,
-  type GeminiCLIExtension,
-} from '@google/gemini-cli-core';
-import { createMockSettings } from '../packages/cli/src/test-utils/settings.js';
-
-// A minimal mock ExtensionManager to bypass integrity checks
-class MockExtensionManager extends ExtensionLoader {
-  override getExtensions(): GeminiCLIExtension[] {
-    return [];
-  }
-  setRequestConsent = (): void => {};
-  setRequestSetting = (): void => {};
-  integrityManager = {
-    verifyExtensionIntegrity: async (): Promise<IntegrityDataStatus> =>
-      IntegrityDataStatus.VERIFIED,
-    storeExtensionIntegrity: async (): Promise<void> => undefined,
-  };
-}
-
-export interface ComponentEvalCase extends BaseEvalCase {
-  configOverrides?: Partial<ConfigParameters>;
-  setup?: (config: Config) => Promise<void>;
-  assert: (config: Config) => Promise<void>;
-}
-
-export class ComponentRig {
-  public config: Config | undefined;
-  public testDir: string;
-  public sessionId: string;
-
-  constructor(
-    private options: { configOverrides?: Partial<ConfigParameters> } = {},
-  ) {
-    const uniqueId = randomUUID();
-    this.testDir = fs.mkdtempSync(
-      path.join(os.tmpdir(), `gemini-component-rig-${uniqueId.slice(0, 8)}-`),
-    );
-    this.sessionId = `test-session-${uniqueId}`;
-  }
-
-  async initialize() {
-    const settings = createMockSettings();
-    const policyEngineConfig = await createPolicyEngineConfig(
-      settings.merged,
-      ApprovalMode.DEFAULT,
-    );
-
-    const configParams: ConfigParameters = {
-      sessionId: this.sessionId,
-      targetDir: this.testDir,
-      cwd: this.testDir,
-      debugMode: false,
-      model: 'test-model',
-      interactive: false,
-      approvalMode: ApprovalMode.DEFAULT,
-      policyEngineConfig,
-      enableEventDrivenScheduler: false, // Don't need scheduler for direct component tests
-      extensionLoader: new MockExtensionManager(),
-      useAlternateBuffer: false,
-      ...this.options.configOverrides,
-    };
-
-    this.config = makeFakeConfig(configParams);
-    await this.config.initialize();
-
-    // Refresh auth using USE_GEMINI to initialize the real BaseLlmClient
-    await this.config.refreshAuth(AuthType.USE_GEMINI);
-  }
-
-  async cleanup() {
-    fs.rmSync(this.testDir, { recursive: true, force: true });
-  }
-}
-
-/**
- * A helper for running behavioral evaluations directly against backend components.
- * It provides a fully initialized Config with real API access, bypassing the UI.
- */
-export function componentEvalTest(
-  policy: EvalPolicy,
-  evalCase: ComponentEvalCase,
-) {
-  const fn = async () => {
-    await withEvalRetries(evalCase.name, async () => {
-      const rig = new ComponentRig({
-        configOverrides: evalCase.configOverrides,
-      });
-
-      await prepareLogDir(evalCase.name);
-
-      try {
-        await rig.initialize();
-
-        if (evalCase.files) {
-          await prepareWorkspace(rig.testDir, rig.testDir, evalCase.files);
-        }
-
-        if (evalCase.setup) {
-          await evalCase.setup(rig.config!);
-        }
-
-        await evalCase.assert(rig.config!);
-      } finally {
-        await rig.cleanup();
-      }
-    });
-  };
-
-  runEval(policy, evalCase, fn, (evalCase.timeout ?? 60000) + 10000);
-}

evals/concurrency-safety.eval.ts

@@ -20,8 +20,6 @@ You are the mutation agent. Do the mutation requested.
 
 describe('concurrency safety eval test cases', () => {
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'mutation agents are run in parallel when explicitly requested',
     params: {
       settings: {

evals/edit-locations-eval.eval.ts

@@ -13,8 +13,6 @@ describe('Edits location eval', () => {
    * instead of creating a new one.
    */
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should update existing test file instead of creating a new one',
     files: {
       'package.json': JSON.stringify(

evals/frugalReads.eval.ts

@@ -15,8 +15,6 @@ describe('Frugal reads eval', () => {
    * nearby ranges into a single contiguous read to save tool calls.
    */
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should use ranged read when nearby lines are targeted',
     files: {
       'package.json': JSON.stringify({
@@ -137,8 +135,6 @@ describe('Frugal reads eval', () => {
    * apart to avoid the need to read the whole file.
    */
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should use ranged read when targets are far apart',
     files: {
       'package.json': JSON.stringify({
@@ -208,8 +204,6 @@ describe('Frugal reads eval', () => {
    * (e.g.: 10), as it's more efficient than many small ranged reads.
    */
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should read the entire file when there are many matches',
     files: {
       'package.json': JSON.stringify({

evals/frugalSearch.eval.ts

@@ -13,6 +13,18 @@ import { evalTest } from './test-helper.js';
  * This ensures the agent doesn't flood the context window with unnecessary search results.
  */
 describe('Frugal Search', () => {
+  const getGrepParams = (call: any): any => {
+    let args = call.toolRequest.args;
+    if (typeof args === 'string') {
+      try {
+        args = JSON.parse(args);
+      } catch (e) {
+        // Ignore parse errors
+      }
+    }
+    return args;
+  };
+
   /**
    * Ensure that the agent makes use of either grep or ranged reads in fulfilling this task.
    * The task is specifically phrased to not evoke "view" or "search" specifically because
@@ -21,8 +33,6 @@ describe('Frugal Search', () => {
    * ranged reads.
    */
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should use grep or ranged read for large files',
     prompt: 'What year was legacy_processor.ts written?',
     files: {

evals/generalist_agent.eval.ts

@@ -11,8 +11,6 @@ import fs from 'node:fs/promises';
 
 describe('generalist_agent', () => {
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should be able to use generalist agent by explicitly asking the main agent to invoke it',
     params: {
       settings: {

evals/generalist_delegation.eval.ts

@@ -11,8 +11,6 @@ describe('generalist_delegation', () => {
   // --- Positive Evals (Should Delegate) ---
 
   appEvalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should delegate batch error fixing to generalist agent',
     configOverrides: {
       agents: {
@@ -56,8 +54,6 @@ describe('generalist_delegation', () => {
   });
 
   appEvalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should autonomously delegate complex batch task to generalist agent',
     configOverrides: {
       agents: {
@@ -98,8 +94,6 @@ describe('generalist_delegation', () => {
   // --- Negative Evals (Should NOT Delegate - Assertive Handling) ---
 
   appEvalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should NOT delegate simple read and fix to generalist agent',
     configOverrides: {
       agents: {
@@ -134,8 +128,6 @@ describe('generalist_delegation', () => {
   });
 
   appEvalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should NOT delegate simple direct question to generalist agent',
     configOverrides: {
       agents: {

evals/gitRepo.eval.ts

@@ -26,8 +26,6 @@ describe('git repo eval', () => {
    * be more consistent.
    */
   evalTest('ALWAYS_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should not git add commit changes unprompted',
     prompt:
       'Finish this up for me by just making a targeted fix for the bug in index.ts. Do not build, install anything, or add tests',
@@ -57,8 +55,6 @@ describe('git repo eval', () => {
    * instructed to not do so by default.
    */
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should git commit changes when prompted',
     prompt:
       'Make a targeted fix for the bug in index.ts without building, installing anything, or adding tests. Then, commit your changes.',

evals/global-setup.ts

@@ -1,133 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import fs from 'node:fs';
-import path from 'node:path';
-import os from 'node:os';
-import { randomUUID } from 'node:crypto';
-
-let usageLogPath: string;
-
-export function setup() {
-  const tmpDir = os.tmpdir();
-  usageLogPath = path.join(tmpDir, `gemini-usage-${randomUUID()}.jsonl`);
-  process.env['GEMINI_EVAL_USAGE_LOG'] = usageLogPath;
-}
-
-export function teardown() {
-  if (usageLogPath && fs.existsSync(usageLogPath)) {
-    try {
-      generateAndPrintReport(usageLogPath);
-    } catch (e) {
-      console.error('Failed to generate usage report', e);
-    } finally {
-      try {
-        fs.unlinkSync(usageLogPath);
-      } catch {
-        // Ignore cleanup errors
-      }
-    }
-  }
-}
-
-/**
- * Formats a number with human-readable suffixes (K, M).
- */
-function formatNumber(num: number): string {
-  if (num >= 1000000) {
-    return (num / 1000000).toFixed(1).replace(/\.0$/, '') + 'M';
-  }
-  if (num >= 1000) {
-    return (num / 1000).toFixed(1).replace(/\.0$/, '') + 'K';
-  }
-  return num.toString();
-}
-
-function generateAndPrintReport(logPath: string) {
-  const lines = fs
-    .readFileSync(logPath, 'utf-8')
-    .trim()
-    .split('\n')
-    .filter(Boolean);
-  if (lines.length === 0) return;
-  const entries = lines
-    .map((line) => {
-      try {
-        return JSON.parse(line);
-      } catch {
-        return null;
-      }
-    })
-    .filter(Boolean);
-
-  const stats: Record<
-    string,
-    {
-      turns: number;
-      input: number;
-      output: number;
-      cached: number;
-      total: number;
-      passed: boolean;
-    }
-  > = {};
-  let totalTurns = 0;
-  let totalInput = 0;
-  let totalOutput = 0;
-  let totalCached = 0;
-  let grandTotal = 0;
-
-  for (const entry of entries) {
-    const key = `${entry.testName} (${entry.model})`;
-    if (!stats[key]) {
-      stats[key] = {
-        turns: 0,
-        input: 0,
-        output: 0,
-        cached: 0,
-        total: 0,
-        passed: true,
-      };
-    }
-    stats[key].turns += entry.turns || 0;
-    stats[key].input += entry.input || 0;
-    stats[key].output += entry.output || 0;
-    stats[key].cached += entry.cached || 0;
-    stats[key].total += entry.total || 0;
-    // If any attempt failed for this test/model combo in this run, mark as failed
-    if (entry.passed === false) {
-      stats[key].passed = false;
-    }
-
-    totalTurns += entry.turns || 0;
-    totalInput += entry.input || 0;
-    totalOutput += entry.output || 0;
-    totalCached += entry.cached || 0;
-    grandTotal += entry.total || 0;
-  }
-
-  console.log('\n📊 Behavioral Eval Usage Report');
-  console.log('===============================');
-
-  const sortedKeys = Object.keys(stats).sort();
-  for (const key of sortedKeys) {
-    const s = stats[key];
-    const status = s.passed ? '✅' : '❌';
-    console.log(`${status} ${key}`);
-    console.log(
-      `  > turns: ${s.turns}, input: ${formatNumber(s.input)}, output: ${formatNumber(s.output)}, cached: ${formatNumber(s.cached)}, total: ${formatNumber(s.total)}`,
-    );
-  }
-
-  console.log('\n📈 Suite Totals');
-  console.log('--------------');
-  console.log(`Total Turns:   ${totalTurns}`);
-  console.log(`Input Tokens:  ${formatNumber(totalInput)}`);
-  console.log(`Output Tokens: ${formatNumber(totalOutput)}`);
-  console.log(`Cached Tokens: ${formatNumber(totalCached)}`);
-  console.log(`Total Tokens:  ${formatNumber(grandTotal)}`);
-  console.log('');
-}

evals/grep_search_functionality.eval.ts

@@ -15,8 +15,6 @@ describe('grep_search_functionality', () => {
   const TEST_PREFIX = 'Grep Search Functionality: ';
 
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should find a simple string in a file',
     files: {
       'test.txt': `hello
@@ -35,8 +33,6 @@ describe('grep_search_functionality', () => {
   });
 
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should perform a case-sensitive search',
     files: {
       'test.txt': `Hello
@@ -67,8 +63,6 @@ describe('grep_search_functionality', () => {
   });
 
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should return only file names when names_only is used',
     files: {
       'file1.txt': 'match me',
@@ -99,8 +93,6 @@ describe('grep_search_functionality', () => {
   });
 
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should search only within the specified include_pattern glob',
     files: {
       'file.js': 'my_function();',
@@ -131,8 +123,6 @@ describe('grep_search_functionality', () => {
   });
 
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should search within a specific subdirectory',
     files: {
       'src/main.js': 'unique_string_1',
@@ -163,8 +153,6 @@ describe('grep_search_functionality', () => {
   });
 
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should report no matches correctly',
     files: {
       'file.txt': 'nothing to see here',

evals/hierarchical_memory.eval.ts

@@ -5,14 +5,13 @@
  */
 
 import { describe, expect } from 'vitest';
-import { evalTest, assertModelHasOutput } from './test-helper.js';
+import { evalTest } from './test-helper.js';
+import { assertModelHasOutput } from '../integration-tests/test-helper.js';
 
 describe('Hierarchical Memory', () => {
   const conflictResolutionTest =
     'Agent follows hierarchy for contradictory instructions';
   evalTest('ALWAYS_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: conflictResolutionTest,
     params: {
       settings: {
@@ -49,8 +48,6 @@ What is my favorite fruit? Tell me just the name of the fruit.`,
 
   const provenanceAwarenessTest = 'Agent is aware of memory provenance';
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: provenanceAwarenessTest,
     params: {
       settings: {
@@ -90,8 +87,6 @@ Provide the answer as an XML block like this:
 
   const extensionVsGlobalTest = 'Extension memory wins over Global memory';
   evalTest('ALWAYS_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: extensionVsGlobalTest,
     params: {
       settings: {

evals/interactive-hang.eval.ts

@@ -8,8 +8,6 @@ describe('interactive_commands', () => {
    * intervention.
    */
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should not use interactive commands',
     prompt: 'Execute tests.',
     files: {
@@ -51,8 +49,6 @@ describe('interactive_commands', () => {
    * Validates that the agent uses non-interactive flags when scaffolding a new project.
    */
   evalTest('ALWAYS_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should use non-interactive flags when scaffolding a new app',
     prompt: 'Create a new react application named my-app using vite.',
     assert: async (rig, result) => {

evals/model_steering.eval.ts

@@ -5,14 +5,14 @@
  */
 
 import { describe, expect } from 'vitest';
+import { act } from 'react';
 import path from 'node:path';
 import fs from 'node:fs';
 import { appEvalTest } from './app-test-helper.js';
+import { PolicyDecision } from '@google/gemini-cli-core';
 
 describe('Model Steering Behavioral Evals', () => {
   appEvalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'Corrective Hint: Model switches task based on hint during tool turn',
     configOverrides: {
       modelSteering: true,
@@ -52,8 +52,6 @@ describe('Model Steering Behavioral Evals', () => {
   });
 
   appEvalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'Suggestive Hint: Model incorporates user guidance mid-stream',
     configOverrides: {
       modelSteering: true,

evals/plan_mode.eval.ts

@@ -33,8 +33,6 @@ describe('plan_mode', () => {
       .filter(Boolean);
 
   evalTest('ALWAYS_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should refuse file modification when in plan mode',
     approvalMode: ApprovalMode.PLAN,
     params: {
@@ -70,8 +68,6 @@ describe('plan_mode', () => {
   });
 
   evalTest('ALWAYS_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should refuse saving new documentation to the repo when in plan mode',
     approvalMode: ApprovalMode.PLAN,
     params: {
@@ -109,8 +105,6 @@ describe('plan_mode', () => {
   });
 
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should enter plan mode when asked to create a plan',
     approvalMode: ApprovalMode.DEFAULT,
     params: {
@@ -128,8 +122,6 @@ describe('plan_mode', () => {
   });
 
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should exit plan mode when plan is complete and implementation is requested',
     approvalMode: ApprovalMode.PLAN,
     params: {
@@ -177,8 +169,6 @@ describe('plan_mode', () => {
   });
 
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should allow file modification in plans directory when in plan mode',
     approvalMode: ApprovalMode.PLAN,
     params: {
@@ -211,8 +201,6 @@ describe('plan_mode', () => {
   });
 
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should create a plan in plan mode and implement it for a refactoring task',
     params: {
       settings,

evals/redundant_casts.eval.ts

@@ -11,8 +11,6 @@ import fs from 'node:fs/promises';
 
 describe('redundant_casts', () => {
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should not add redundant or unsafe casts when modifying typescript code',
     files: {
       'src/cast_example.ts': `

evals/sandbox_recovery.eval.ts

@@ -3,8 +3,6 @@ import { evalTest } from './test-helper.js';
 
 describe('Sandbox recovery', () => {
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     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.',

evals/save_memory.eval.ts

@@ -5,18 +5,16 @@
  */
 
 import { describe, expect } from 'vitest';
+import { evalTest } from './test-helper.js';
 import {
-  evalTest,
   assertModelHasOutput,
   checkModelOutputContent,
-} from './test-helper.js';
+} from '../integration-tests/test-helper.js';
 
 describe('save_memory', () => {
   const TEST_PREFIX = 'Save memory test: ';
   const rememberingFavoriteColor = "Agent remembers user's favorite color";
   evalTest('ALWAYS_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: rememberingFavoriteColor,
 
     prompt: `remember that my favorite color is  blue.
@@ -37,8 +35,6 @@ describe('save_memory', () => {
   });
   const rememberingCommandRestrictions = 'Agent remembers command restrictions';
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: rememberingCommandRestrictions,
 
     prompt: `I don't want you to ever run npm commands.`,
@@ -58,8 +54,6 @@ describe('save_memory', () => {
 
   const rememberingWorkflow = 'Agent remembers workflow preferences';
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: rememberingWorkflow,
 
     prompt: `I want you to always lint after building.`,
@@ -80,8 +74,6 @@ describe('save_memory', () => {
   const ignoringTemporaryInformation =
     'Agent ignores temporary conversation details';
   evalTest('ALWAYS_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: ignoringTemporaryInformation,
 
     prompt: `I'm going to get a coffee.`,
@@ -105,8 +97,6 @@ describe('save_memory', () => {
 
   const rememberingPetName = "Agent remembers user's pet's name";
   evalTest('ALWAYS_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: rememberingPetName,
 
     prompt: `Please remember that my dog's name is Buddy.`,
@@ -126,8 +116,6 @@ describe('save_memory', () => {
 
   const rememberingCommandAlias = 'Agent remembers custom command aliases';
   evalTest('ALWAYS_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: rememberingCommandAlias,
 
     prompt: `When I say 'start server', you should run 'npm run dev'.`,
@@ -148,8 +136,6 @@ describe('save_memory', () => {
   const ignoringDbSchemaLocation =
     "Agent ignores workspace's database schema location";
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: ignoringDbSchemaLocation,
     prompt: `The database schema for this workspace is located in \`db/schema.sql\`.`,
     assert: async (rig, result) => {
@@ -169,8 +155,6 @@ describe('save_memory', () => {
   const rememberingCodingStyle =
     "Agent remembers user's coding style preference";
   evalTest('ALWAYS_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: rememberingCodingStyle,
 
     prompt: `I prefer to use tabs instead of spaces for indentation.`,
@@ -191,8 +175,6 @@ describe('save_memory', () => {
   const ignoringBuildArtifactLocation =
     'Agent ignores workspace build artifact location';
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: ignoringBuildArtifactLocation,
     prompt: `In this workspace, build artifacts are stored in the \`dist/artifacts\` directory.`,
     assert: async (rig, result) => {
@@ -211,8 +193,6 @@ describe('save_memory', () => {
 
   const ignoringMainEntryPoint = "Agent ignores workspace's main entry point";
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: ignoringMainEntryPoint,
     prompt: `The main entry point for this workspace is \`src/index.js\`.`,
     assert: async (rig, result) => {
@@ -231,8 +211,6 @@ describe('save_memory', () => {
 
   const rememberingBirthday = "Agent remembers user's birthday";
   evalTest('ALWAYS_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: rememberingBirthday,
 
     prompt: `My birthday is on June 15th.`,
@@ -253,8 +231,6 @@ describe('save_memory', () => {
   const proactiveMemoryFromLongSession =
     'Agent saves preference from earlier in conversation history';
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: proactiveMemoryFromLongSession,
     params: {
       settings: {
@@ -333,8 +309,6 @@ describe('save_memory', () => {
   const memoryManagerRoutingPreferences =
     'Agent routes global and project preferences to memory';
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: memoryManagerRoutingPreferences,
     params: {
       settings: {

evals/shell-efficiency.eval.ts

@@ -21,8 +21,6 @@ describe('Shell Efficiency', () => {
   };
 
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should use --silent/--quiet flags when installing packages',
     prompt: 'Install the "lodash" package using npm.',
     assert: async (rig) => {
@@ -52,8 +50,6 @@ describe('Shell Efficiency', () => {
   });
 
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should use --no-pager with git commands',
     prompt: 'Show the git log.',
     assert: async (rig) => {
@@ -77,8 +73,6 @@ describe('Shell Efficiency', () => {
   });
 
   evalTest('ALWAYS_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should NOT use efficiency flags when enableShellOutputEfficiency is disabled',
     params: {
       settings: {

evals/subagents.eval.ts

@@ -9,46 +9,10 @@ import path from 'node:path';
 
 import { describe, expect } from 'vitest';
 
-import { AGENT_TOOL_NAME } from '@google/gemini-cli-core';
-import { evalTest, TEST_AGENTS, TestRig } from './test-helper.js';
+import { evalTest, TEST_AGENTS } from './test-helper.js';
 
 const INDEX_TS = 'export const add = (a: number, b: number) => a + b;\n';
 
-/**
- * Helper to verify that a specific subagent was successfully invoked via the unified tool.
- */
-async function expectSubagentCall(rig: TestRig, agentName: string) {
-  await rig.expectToolCallSuccess(
-    [AGENT_TOOL_NAME],
-    undefined,
-    (args: string) => {
-      try {
-        const parsed = JSON.parse(args);
-        return parsed.agent_name === agentName;
-      } catch {
-        return false;
-      }
-    },
-  );
-}
-
-/**
- * Helper to check if a subagent (either via unified tool or direct name) was called.
- */
-function isSubagentCalled(toolLogs: any[], agentName: string): boolean {
-  return toolLogs.some((l) => {
-    if (l.toolRequest.name === AGENT_TOOL_NAME) {
-      try {
-        const args = JSON.parse(l.toolRequest.args);
-        return args.agent_name === agentName;
-      } catch {
-        return false;
-      }
-    }
-    return l.toolRequest.name === agentName;
-  });
-}
-
 // A minimal package.json is used to provide a realistic workspace anchor.
 // This prevents the agent from making incorrect assumptions about the environment
 // and helps it properly navigate or act as if it is in a standard Node.js project.
@@ -81,8 +45,6 @@ describe('subagent eval test cases', () => {
    * This tests the system prompt's subagent specific clauses.
    */
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should delegate to user provided agent with relevant expertise',
     params: {
       settings: {
@@ -98,7 +60,7 @@ describe('subagent eval test cases', () => {
       'README.md': 'TODO: update the README.\n',
     },
     assert: async (rig, _result) => {
-      await expectSubagentCall(rig, TEST_AGENTS.DOCS_AGENT.name);
+      await rig.expectToolCallSuccess([TEST_AGENTS.DOCS_AGENT.name]);
     },
   });
 
@@ -107,8 +69,6 @@ describe('subagent eval test cases', () => {
    * subagents are available. This helps catch orchestration overuse.
    */
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should avoid delegating trivial direct edit work',
     params: {
       settings: {
@@ -135,10 +95,14 @@ describe('subagent eval test cases', () => {
       }>;
 
       expect(updatedIndex).toContain('export const sum =');
-      expect(isSubagentCalled(toolLogs, TEST_AGENTS.DOCS_AGENT.name)).toBe(
+      expect(
+        toolLogs.some(
+          (l) => l.toolRequest.name === TEST_AGENTS.DOCS_AGENT.name,
+        ),
+      ).toBe(false);
+      expect(toolLogs.some((l) => l.toolRequest.name === 'generalist')).toBe(
         false,
       );
-      expect(isSubagentCalled(toolLogs, 'generalist')).toBe(false);
     },
   });
 
@@ -149,8 +113,6 @@ describe('subagent eval test cases', () => {
    * This is meant to codify the "overusing Generalist" failure mode.
    */
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should prefer relevant specialist over generalist',
     params: {
       settings: {
@@ -172,11 +134,13 @@ describe('subagent eval test cases', () => {
     },
     assert: async (rig, _result) => {
       const toolLogs = rig.readToolLogs() as Array<{
-        toolRequest: { name: string; args: string };
+        toolRequest: { name: string };
       }>;
 
-      await expectSubagentCall(rig, TEST_AGENTS.TESTING_AGENT.name);
-      expect(isSubagentCalled(toolLogs, 'generalist')).toBe(false);
+      await rig.expectToolCallSuccess([TEST_AGENTS.TESTING_AGENT.name]);
+      expect(toolLogs.some((l) => l.toolRequest.name === 'generalist')).toBe(
+        false,
+      );
     },
   });
 
@@ -185,8 +149,6 @@ describe('subagent eval test cases', () => {
    * naturally spans docs and tests, so multiple specialists should be used.
    */
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should use multiple relevant specialists for multi-surface task',
     params: {
       settings: {
@@ -211,15 +173,18 @@ describe('subagent eval test cases', () => {
     },
     assert: async (rig, _result) => {
       const toolLogs = rig.readToolLogs() as Array<{
-        toolRequest: { name: string; args: string };
+        toolRequest: { name: string };
       }>;
       const readme = readProjectFile(rig, 'README.md');
 
-      await expectSubagentCall(rig, TEST_AGENTS.DOCS_AGENT.name);
-      await expectSubagentCall(rig, TEST_AGENTS.TESTING_AGENT.name);
-
+      await rig.expectToolCallSuccess([
+        TEST_AGENTS.DOCS_AGENT.name,
+        TEST_AGENTS.TESTING_AGENT.name,
+      ]);
       expect(readme).not.toContain('TODO: update the README.');
-      expect(isSubagentCalled(toolLogs, 'generalist')).toBe(false);
+      expect(toolLogs.some((l) => l.toolRequest.name === 'generalist')).toBe(
+        false,
+      );
     },
   });
 
@@ -228,8 +193,6 @@ describe('subagent eval test cases', () => {
    * from a large pool of available subagents (10 total).
    */
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should select the correct subagent from a pool of 10 different agents',
     prompt: 'Please add a new SQL table migration for a user profile.',
     files: {
@@ -246,11 +209,14 @@ describe('subagent eval test cases', () => {
       'package.json': MOCK_PACKAGE_JSON,
     },
     assert: async (rig, _result) => {
-      const toolLogs = rig.readToolLogs();
-      await expectSubagentCall(rig, TEST_AGENTS.DATABASE_AGENT.name);
+      const toolLogs = rig.readToolLogs() as Array<{
+        toolRequest: { name: string };
+      }>;
+      await rig.expectToolCallSuccess(['database-agent']);
 
       // Ensure the generalist and other irrelevant specialists were not invoked
       const uncalledAgents = [
+        'generalist',
         TEST_AGENTS.DOCS_AGENT.name,
         TEST_AGENTS.TESTING_AGENT.name,
         TEST_AGENTS.CSS_AGENT.name,
@@ -263,9 +229,10 @@ describe('subagent eval test cases', () => {
       ];
 
       for (const agentName of uncalledAgents) {
-        expect(isSubagentCalled(toolLogs, agentName)).toBe(false);
+        expect(toolLogs.some((l) => l.toolRequest.name === agentName)).toBe(
+          false,
+        );
       }
-      expect(isSubagentCalled(toolLogs, 'generalist')).toBe(false);
     },
   });
 
@@ -276,8 +243,6 @@ describe('subagent eval test cases', () => {
    * This test includes stress tests the subagent delegation with ~80 tools.
    */
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should select the correct subagent from a pool of 10 different agents with MCP tools present',
     prompt: 'Please add a new SQL table migration for a user profile.',
     setup: async (rig) => {
@@ -297,11 +262,14 @@ describe('subagent eval test cases', () => {
       'package.json': MOCK_PACKAGE_JSON,
     },
     assert: async (rig, _result) => {
-      const toolLogs = rig.readToolLogs();
-      await expectSubagentCall(rig, TEST_AGENTS.DATABASE_AGENT.name);
+      const toolLogs = rig.readToolLogs() as Array<{
+        toolRequest: { name: string };
+      }>;
+      await rig.expectToolCallSuccess(['database-agent']);
 
       // Ensure the generalist and other irrelevant specialists were not invoked
       const uncalledAgents = [
+        'generalist',
         TEST_AGENTS.DOCS_AGENT.name,
         TEST_AGENTS.TESTING_AGENT.name,
         TEST_AGENTS.CSS_AGENT.name,
@@ -314,9 +282,10 @@ describe('subagent eval test cases', () => {
       ];
 
       for (const agentName of uncalledAgents) {
-        expect(isSubagentCalled(toolLogs, agentName)).toBe(false);
+        expect(toolLogs.some((l) => l.toolRequest.name === agentName)).toBe(
+          false,
+        );
       }
-      expect(isSubagentCalled(toolLogs, 'generalist')).toBe(false);
     },
   });
 });

evals/test-helper.test.ts

@@ -49,8 +49,6 @@ describe('evalTest reliability logic', () => {
 
     // Execute the test function directly
     await internalEvalTest({
-      suiteName: 'test',
-      suiteType: 'behavioral',
       name: 'test-api-failure',
       prompt: 'do something',
       assert: async () => {},
@@ -85,8 +83,6 @@ describe('evalTest reliability logic', () => {
     // Expect the test function to throw immediately
     await expect(
       internalEvalTest({
-        suiteName: 'test',
-        suiteType: 'behavioral',
         name: 'test-logic-failure',
         prompt: 'do something',
         assert: async () => {
@@ -112,8 +108,6 @@ describe('evalTest reliability logic', () => {
       .mockResolvedValueOnce('Success');
 
     await internalEvalTest({
-      suiteName: 'test',
-      suiteType: 'behavioral',
       name: 'test-recovery',
       prompt: 'do something',
       assert: async () => {},
@@ -141,8 +135,6 @@ describe('evalTest reliability logic', () => {
     );
 
     await internalEvalTest({
-      suiteName: 'test',
-      suiteType: 'behavioral',
       name: 'test-api-503',
       prompt: 'do something',
       assert: async () => {},
@@ -170,8 +162,6 @@ describe('evalTest reliability logic', () => {
     try {
       await expect(
         internalEvalTest({
-          suiteName: 'test',
-          suiteType: 'behavioral',
           name: 'test-absolute-path',
           prompt: 'do something',
           files: {
@@ -200,8 +190,6 @@ describe('evalTest reliability logic', () => {
     try {
       await expect(
         internalEvalTest({
-          suiteName: 'test',
-          suiteType: 'behavioral',
           name: 'test-traversal',
           prompt: 'do something',
           files: {

evals/test-helper.ts

@@ -16,19 +16,10 @@ import {
   Storage,
   getProjectHash,
   SESSION_FILE_PREFIX,
-  PREVIEW_GEMINI_FLASH_MODEL,
-  getErrorMessage,
 } from '@google/gemini-cli-core';
 
 export * from '@google/gemini-cli-test-utils';
 
-/**
- * The default model used for all evaluations.
- * Can be overridden by setting the GEMINI_MODEL environment variable.
- */
-export const EVAL_MODEL =
-  process.env['GEMINI_MODEL'] || PREVIEW_GEMINI_FLASH_MODEL;
-
 // Indicates the consistency expectation for this test.
 // - ALWAYS_PASSES - Means that the test is expected to pass 100% of the time. These
 //   These tests are typically trivial and test basic functionality with unambiguous
@@ -48,49 +39,19 @@ export const EVAL_MODEL =
 export type EvalPolicy = 'ALWAYS_PASSES' | 'USUALLY_PASSES';
 
 export function evalTest(policy: EvalPolicy, evalCase: EvalCase) {
-  runEval(policy, evalCase, () => internalEvalTest(evalCase));
+  runEval(
+    policy,
+    evalCase.name,
+    () => internalEvalTest(evalCase),
+    evalCase.timeout,
+  );
 }
 
-export async function withEvalRetries(
-  name: string,
-  attemptFn: (attempt: number) => Promise<void>,
-) {
+export async function internalEvalTest(evalCase: EvalCase) {
   const maxRetries = 3;
   let attempt = 0;
 
   while (attempt <= maxRetries) {
-    try {
-      await attemptFn(attempt);
-      return; // Success! Exit the retry loop.
-    } catch (error: unknown) {
-      const errorMessage = getErrorMessage(error);
-      const errorCode = getApiErrorCode(errorMessage);
-
-      if (errorCode) {
-        const status = attempt < maxRetries ? 'RETRY' : 'SKIP';
-        logReliabilityEvent(name, attempt, status, errorCode, errorMessage);
-
-        if (attempt < maxRetries) {
-          attempt++;
-          console.warn(
-            `[Eval] Attempt ${attempt} failed with ${errorCode} Error. Retrying...`,
-          );
-          continue; // Retry
-        }
-
-        console.warn(
-          `[Eval] '${name}' failed after ${maxRetries} retries due to persistent API errors. Skipping failure to avoid blocking PR.`,
-        );
-        return; // Gracefully exit without failing the test
-      }
-
-      throw error; // Real failure
-    }
-  }
-}
-
-export async function internalEvalTest(evalCase: EvalCase) {
-  await withEvalRetries(evalCase.name, async () => {
     const rig = new TestRig();
     const { logDir, sanitizedName } = await prepareLogDir(evalCase.name);
     const activityLogFile = path.join(logDir, `${sanitizedName}.jsonl`);
@@ -98,21 +59,14 @@ export async function internalEvalTest(evalCase: EvalCase) {
     let isSuccess = false;
 
     try {
-      const setupOptions = {
-        ...evalCase.params,
-        settings: {
-          model: { name: EVAL_MODEL },
-          ...evalCase.params?.settings,
-        },
-      };
-      rig.setup(evalCase.name, setupOptions);
+      rig.setup(evalCase.name, evalCase.params);
 
       if (evalCase.setup) {
         await evalCase.setup(rig);
       }
 
       if (evalCase.files) {
-        await prepareWorkspace(rig.testDir!, rig.homeDir!, evalCase.files);
+        await setupTestFiles(rig, evalCase.files);
       }
 
       symlinkNodeModules(rig.testDir || '');
@@ -185,15 +139,38 @@ export async function internalEvalTest(evalCase: EvalCase) {
 
       await evalCase.assert(rig, result);
       isSuccess = true;
-    } catch (e) {
-      isSuccess = false;
-      throw e;
-    } finally {
-      const metrics = rig.getUsageMetrics();
-      if (metrics.turns > 0) {
-        logUsageMetrics(evalCase.name, metrics, isSuccess);
+      return; // Success! Exit the retry loop.
+    } catch (error: unknown) {
+      const errorMessage =
+        error instanceof Error ? error.message : String(error);
+      const errorCode = getApiErrorCode(errorMessage);
+
+      if (errorCode) {
+        const status = attempt < maxRetries ? 'RETRY' : 'SKIP';
+        logReliabilityEvent(
+          evalCase.name,
+          attempt,
+          status,
+          errorCode,
+          errorMessage,
+        );
+
+        if (attempt < maxRetries) {
+          attempt++;
+          console.warn(
+            `[Eval] Attempt ${attempt} failed with ${errorCode} Error. Retrying...`,
+          );
+          continue; // Retry
+        }
+
+        console.warn(
+          `[Eval] '${evalCase.name}' failed after ${maxRetries} retries due to persistent API errors. Skipping failure to avoid blocking PR.`,
+        );
+        return; // Gracefully exit without failing the test
       }
 
+      throw error; // Real failure
+    } finally {
       if (isSuccess) {
         await fs.promises.unlink(activityLogFile).catch((err) => {
           if (err.code !== 'ENOENT') throw err;
@@ -211,7 +188,7 @@ export async function internalEvalTest(evalCase: EvalCase) {
       );
       await rig.cleanup();
     }
-  });
+  }
 }
 
 function getApiErrorCode(message: string): '500' | '503' | undefined {
@@ -249,7 +226,7 @@ function logReliabilityEvent(
   const reliabilityLog = {
     timestamp: new Date().toISOString(),
     testName,
-    model: process.env['GEMINI_MODEL'] || 'unknown',
+    model: process.env.GEMINI_MODEL || 'unknown',
     attempt,
     status,
     errorCode,
@@ -268,41 +245,6 @@ function logReliabilityEvent(
   }
 }
 
-/**
- * Log usage metrics for individual eval runs.
- */
-export function logUsageMetrics(
-  testName: string,
-  metrics: {
-    turns: number;
-    input: number;
-    output: number;
-    cached: number;
-    total: number;
-  },
-  passed: boolean,
-) {
-  const usageLog = {
-    timestamp: new Date().toISOString(),
-    testName,
-    model: EVAL_MODEL,
-    passed,
-    ...metrics,
-  };
-
-  try {
-    const logPath =
-      process.env['GEMINI_EVAL_USAGE_LOG'] ||
-      path.resolve(process.cwd(), 'evals/logs/usage-metrics.jsonl');
-
-    const logDir = path.dirname(logPath);
-    fs.mkdirSync(logDir, { recursive: true });
-    fs.appendFileSync(logPath, JSON.stringify(usageLog) + '\n');
-  } catch (logError) {
-    console.error('Failed to write usage log:', logError);
-  }
-}
-
 /**
  * Helper to setup test files and git repository.
  *
@@ -310,13 +252,9 @@ export function logUsageMetrics(
  * intentionally uses synchronous filesystem and child_process operations
  * for simplicity and to ensure sequential environment preparation.
  */
-export async function prepareWorkspace(
-  testDir: string,
-  homeDir: string,
-  files: Record<string, string>,
-) {
+async function setupTestFiles(rig: TestRig, files: Record<string, string>) {
   const acknowledgedAgents: Record<string, Record<string, string>> = {};
-  const projectRoot = fs.realpathSync(testDir);
+  const projectRoot = fs.realpathSync(rig.testDir!);
 
   for (const [filePath, content] of Object.entries(files)) {
     if (filePath.includes('..') || path.isAbsolute(filePath)) {
@@ -352,7 +290,7 @@ export async function prepareWorkspace(
 
   if (Object.keys(acknowledgedAgents).length > 0) {
     const ackPath = path.join(
-      homeDir,
+      rig.homeDir!,
       '.gemini',
       'acknowledgments',
       'agents.json',
@@ -361,7 +299,7 @@ export async function prepareWorkspace(
     fs.writeFileSync(ackPath, JSON.stringify(acknowledgedAgents, null, 2));
   }
 
-  const execOptions = { cwd: testDir, stdio: 'ignore' as const };
+  const execOptions = { cwd: rig.testDir!, stdio: 'inherit' as const };
   execSync('git init --initial-branch=main', execOptions);
   execSync('git config user.email "test@example.com"', execOptions);
   execSync('git config user.name "Test User"', execOptions);
@@ -382,30 +320,14 @@ export async function prepareWorkspace(
  */
 export function runEval(
   policy: EvalPolicy,
-  evalCase: BaseEvalCase,
+  name: string,
   fn: () => Promise<void>,
-  timeoutOverride?: number,
+  timeout?: number,
 ) {
-  const { name, timeout, suiteName, suiteType } = evalCase;
-  const targetSuiteType = process.env['EVAL_SUITE_TYPE'];
-  const targetSuiteName = process.env['EVAL_SUITE_NAME'];
-
-  const meta = { suiteType, suiteName };
-
-  const skipBySuiteType =
-    targetSuiteType && suiteType && suiteType !== targetSuiteType;
-  const skipBySuiteName =
-    targetSuiteName && suiteName && suiteName !== targetSuiteName;
-
-  const options = { timeout: timeoutOverride ?? timeout, meta };
-  if (
-    (policy === 'USUALLY_PASSES' && !process.env['RUN_EVALS']) ||
-    skipBySuiteType ||
-    skipBySuiteName
-  ) {
-    it.skip(name, options, fn);
+  if (policy === 'USUALLY_PASSES' && !process.env['RUN_EVALS']) {
+    it.skip(name, fn);
   } else {
-    it(name, options, fn);
+    it(name, fn, timeout);
   }
 }
 
@@ -444,20 +366,15 @@ interface ForbiddenToolSettings {
   };
 }
 
-export interface BaseEvalCase {
-  suiteName: string;
-  suiteType: 'behavioral' | 'component-level' | 'hero-scenario';
+export interface EvalCase {
   name: string;
-  timeout?: number;
-  files?: Record<string, string>;
-}
-
-export interface EvalCase extends BaseEvalCase {
   params?: {
     settings?: ForbiddenToolSettings & Record<string, unknown>;
     [key: string]: unknown;
   };
   prompt: string;
+  timeout?: number;
+  files?: Record<string, string>;
   setup?: (rig: TestRig) => Promise<void> | void;
   /** Conversation history to pre-load via --resume. Each entry is a message object with type, content, etc. */
   messages?: Record<string, unknown>[];

evals/tool_output_masking.eval.ts

@@ -31,8 +31,6 @@ describe('Tool Output Masking Behavioral Evals', () => {
    * It should recognize the <tool_output_masked> tag and use a tool to read the file.
    */
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should attempt to read the redirected full output file when information is masked',
     params: {
       security: {
@@ -169,8 +167,6 @@ Output too large. Full output available at: ${outputFilePath}
    * Scenario: Information is in the preview.
    */
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should NOT read the full output file when the information is already in the preview',
     params: {
       security: {

evals/tracker.eval.ts

@@ -25,8 +25,6 @@ const FILES = {
 
 describe('tracker_mode', () => {
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should manage tasks in the tracker when explicitly requested during a bug fix',
     params: {
       settings: { experimental: { taskTracker: true } },
@@ -80,8 +78,6 @@ describe('tracker_mode', () => {
   });
 
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should implicitly create tasks when asked to build a feature plan',
     params: {
       settings: { experimental: { taskTracker: true } },

evals/validation_fidelity.eval.ts

@@ -9,8 +9,6 @@ import { evalTest } from './test-helper.js';
 
 describe('validation_fidelity', () => {
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should perform exhaustive validation autonomously when guided by system instructions',
     files: {
       'src/types.ts': `

evals/validation_fidelity_pre_existing_errors.eval.ts

@@ -9,8 +9,6 @@ import { evalTest } from './test-helper.js';
 
 describe('validation_fidelity_pre_existing_errors', () => {
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should handle pre-existing project errors gracefully during validation',
     files: {
       'src/math.ts': `

evals/vitest.config.ts

@@ -16,7 +16,6 @@ export default defineConfig({
   },
   test: {
     testTimeout: 300000, // 5 minutes
-    globalSetup: [path.resolve(__dirname, 'global-setup.ts')],
     reporters: ['default', 'json'],
     outputFile: {
       json: 'evals/logs/report.json',
@@ -25,10 +24,7 @@ export default defineConfig({
     environment: 'node',
     globals: true,
     alias: {
-      '@google/gemini-cli-core': path.resolve(
-        __dirname,
-        '../packages/core/index.ts',
-      ),
+      react: path.resolve(__dirname, '../node_modules/react'),
     },
     setupFiles: [path.resolve(__dirname, '../packages/cli/test-setup.ts')],
     server: {

integration-tests/browser-agent-localhost.dynamic.responses

@@ -1,4 +1,4 @@
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll check the dynamic content page on the localhost server."},{"functionCall":{"name":"invoke_agent","args":{"agent_name":"browser_agent","prompt":"Navigate to http://127.0.0.1:18923/dynamic.html, wait for the dynamic content to load, then capture the accessibility tree and report what content appeared"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":40,"totalTokenCount":140}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll check the dynamic content page on the localhost server."},{"functionCall":{"name":"browser_agent","args":{"task":"Navigate to http://127.0.0.1:18923/dynamic.html, wait for the dynamic content to load, then capture the accessibility tree and report what content appeared"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":40,"totalTokenCount":140}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"navigate_page","args":{"url":"http://127.0.0.1:18923/dynamic.html"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":20,"totalTokenCount":120}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"wait_for","args":{"selector":"#dynamic-content","state":"visible","timeout":5000}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":150,"candidatesTokenCount":25,"totalTokenCount":175}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"take_snapshot","args":{}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":180,"candidatesTokenCount":15,"totalTokenCount":195}}]}

integration-tests/browser-agent-localhost.form.responses

@@ -1,4 +1,4 @@
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll fill out the contact form on the localhost server."},{"functionCall":{"name":"invoke_agent","args":{"agent_name":"browser_agent","prompt":"Navigate to http://127.0.0.1:18923/form.html, fill in the name field with 'Test User', the email field with 'test@example.com', the message field with 'Hello World', and submit the form"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":50,"totalTokenCount":150}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll fill out the contact form on the localhost server."},{"functionCall":{"name":"browser_agent","args":{"task":"Navigate to http://127.0.0.1:18923/form.html, fill in the name field with 'Test User', the email field with 'test@example.com', the message field with 'Hello World', and submit the form"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":50,"totalTokenCount":150}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"navigate_page","args":{"url":"http://127.0.0.1:18923/form.html"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":20,"totalTokenCount":120}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"fill","args":{"selector":"#name","value":"Test User"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":150,"candidatesTokenCount":25,"totalTokenCount":175}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"fill","args":{"selector":"#email","value":"test@example.com"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":180,"candidatesTokenCount":25,"totalTokenCount":205}}]}

integration-tests/browser-agent-localhost.multistep.responses

@@ -1,4 +1,4 @@
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll go through the multi-step flow on the localhost server."},{"functionCall":{"name":"invoke_agent","args":{"agent_name":"browser_agent","prompt":"Navigate to http://127.0.0.1:18923/multi-step/step1.html, fill in 'testuser' as the username, click Next, then on step 2 select 'Option B' and click Finish. Report the final result page content."}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":50,"totalTokenCount":150}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll go through the multi-step flow on the localhost server."},{"functionCall":{"name":"browser_agent","args":{"task":"Navigate to http://127.0.0.1:18923/multi-step/step1.html, fill in 'testuser' as the username, click Next, then on step 2 select 'Option B' and click Finish. Report the final result page content."}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":50,"totalTokenCount":150}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"navigate_page","args":{"url":"http://127.0.0.1:18923/multi-step/step1.html"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":20,"totalTokenCount":120}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"fill","args":{"selector":"#username","value":"testuser"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":150,"candidatesTokenCount":25,"totalTokenCount":175}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"click","args":{"selector":"#next-btn"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":180,"candidatesTokenCount":20,"totalTokenCount":200}}]}

integration-tests/browser-agent-localhost.navigate.responses

@@ -1,4 +1,4 @@
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll navigate to the localhost page and read its content using the browser agent."},{"functionCall":{"name":"invoke_agent","args":{"agent_name":"browser_agent","prompt":"Navigate to http://127.0.0.1:18923/index.html and tell me the page title and list all links on the page"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":40,"totalTokenCount":140}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll navigate to the localhost page and read its content using the browser agent."},{"functionCall":{"name":"browser_agent","args":{"task":"Navigate to http://127.0.0.1:18923/index.html and tell me the page title and list all links on the page"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":40,"totalTokenCount":140}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"navigate_page","args":{"url":"http://127.0.0.1:18923/index.html"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":20,"totalTokenCount":120}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"take_snapshot","args":{}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":150,"candidatesTokenCount":20,"totalTokenCount":170}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"complete_task","args":{"result":{"success":true,"summary":"Page title is 'Test Fixture - Home'. Found 3 links: Contact Form (/form.html), Multi-Step Flow (/multi-step/step1.html), Dynamic Content (/dynamic.html)."}}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":200,"candidatesTokenCount":40,"totalTokenCount":240}}]}

integration-tests/browser-agent-localhost.screenshot.responses

@@ -1,4 +1,4 @@
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll take a screenshot of the localhost test page."},{"functionCall":{"name":"invoke_agent","args":{"agent_name":"browser_agent","prompt":"Navigate to http://127.0.0.1:18923/index.html and take a screenshot of the page"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":35,"totalTokenCount":135}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll take a screenshot of the localhost test page."},{"functionCall":{"name":"browser_agent","args":{"task":"Navigate to http://127.0.0.1:18923/index.html and take a screenshot of the page"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":35,"totalTokenCount":135}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"navigate_page","args":{"url":"http://127.0.0.1:18923/index.html"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":20,"totalTokenCount":120}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"take_screenshot","args":{}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":150,"candidatesTokenCount":15,"totalTokenCount":165}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"complete_task","args":{"result":{"success":true,"summary":"Screenshot captured of the localhost test fixture home page showing the heading, navigation links, and footer.","data":{"screenshotTaken":true}}}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":200,"candidatesTokenCount":40,"totalTokenCount":240}}]}

integration-tests/browser-agent-localhost.test.ts

@@ -54,9 +54,7 @@ describe('browser-agent-localhost', () => {
 
     const toolLogs = rig.readToolLogs();
     const browserAgentCall = toolLogs.find(
-      (t) =>
-        t.toolRequest.name === 'invoke_agent' &&
-        JSON.parse(t.toolRequest.args).agent_name === 'browser_agent',
+      (t) => t.toolRequest.name === 'browser_agent',
     );
     expect(
       browserAgentCall,
@@ -81,9 +79,7 @@ describe('browser-agent-localhost', () => {
 
     const toolLogs = rig.readToolLogs();
     const browserAgentCall = toolLogs.find(
-      (t) =>
-        t.toolRequest.name === 'invoke_agent' &&
-        JSON.parse(t.toolRequest.args).agent_name === 'browser_agent',
+      (t) => t.toolRequest.name === 'browser_agent',
     );
     expect(
       browserAgentCall,
@@ -108,9 +104,7 @@ describe('browser-agent-localhost', () => {
 
     const toolLogs = rig.readToolLogs();
     const browserAgentCall = toolLogs.find(
-      (t) =>
-        t.toolRequest.name === 'invoke_agent' &&
-        JSON.parse(t.toolRequest.args).agent_name === 'browser_agent',
+      (t) => t.toolRequest.name === 'browser_agent',
     );
     expect(
       browserAgentCall,
@@ -135,9 +129,7 @@ describe('browser-agent-localhost', () => {
 
     const toolLogs = rig.readToolLogs();
     const browserAgentCall = toolLogs.find(
-      (t) =>
-        t.toolRequest.name === 'invoke_agent' &&
-        JSON.parse(t.toolRequest.args).agent_name === 'browser_agent',
+      (t) => t.toolRequest.name === 'browser_agent',
     );
     expect(
       browserAgentCall,
@@ -162,9 +154,7 @@ describe('browser-agent-localhost', () => {
 
     const toolLogs = rig.readToolLogs();
     const browserCalls = toolLogs.filter(
-      (t) =>
-        t.toolRequest.name === 'invoke_agent' &&
-        JSON.parse(t.toolRequest.args).agent_name === 'browser_agent',
+      (t) => t.toolRequest.name === 'browser_agent',
     );
     expect(browserCalls.length).toBeGreaterThan(0);
   });

integration-tests/browser-agent.cleanup.responses

@@ -1,4 +1,4 @@
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll open https://example.com and check the page title for you."},{"functionCall":{"name":"invoke_agent","args":{"agent_name":"browser_agent","prompt":"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'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":[{"functionCall":{"name":"navigate_page","args":{"url":"https://example.com"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":20,"totalTokenCount":120}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"take_snapshot","args":{}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":150,"candidatesTokenCount":20,"totalTokenCount":170}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"complete_task","args":{"result":{"success":true,"summary":"The page title is 'Example Domain'."}}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":200,"candidatesTokenCount":30,"totalTokenCount":230}}]}

integration-tests/browser-agent.concurrent.responses

@@ -1,4 +1,4 @@
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll launch two browser agents concurrently to check both repositories."},{"functionCall":{"name":"invoke_agent","args":{"agent_name":"browser_agent","prompt":"Navigate to https://example.com and get the page title"}}},{"functionCall":{"name":"invoke_agent","args":{"agent_name":"browser_agent","prompt":"Navigate to https://example.com and get the page title"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":50,"totalTokenCount":150}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll launch two browser agents concurrently to check both repositories."},{"functionCall":{"name":"browser_agent","args":{"task":"Navigate to https://example.com and get the page title"}}},{"functionCall":{"name":"browser_agent","args":{"task":"Navigate to https://example.com and get the page title"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":50,"totalTokenCount":150}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"navigate_page","args":{"url":"https://example.com"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":20,"totalTokenCount":120}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"navigate_page","args":{"url":"https://example.com"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":20,"totalTokenCount":120}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"take_snapshot","args":{}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":150,"candidatesTokenCount":15,"totalTokenCount":165}}]}

integration-tests/browser-agent.interaction.responses

@@ -1,4 +1,4 @@
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll navigate to https://example.com and analyze the links on the page."},{"functionCall":{"name":"invoke_agent","args":{"agent_name":"browser_agent","prompt":"Go to https://example.com and find all links on the page, then describe them"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":40,"totalTokenCount":140}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll navigate to https://example.com and analyze the links on the page."},{"functionCall":{"name":"browser_agent","args":{"task":"Go to https://example.com and find all links on the page, then describe them"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":40,"totalTokenCount":140}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"navigate_page","args":{"url":"https://example.com"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":20,"totalTokenCount":120}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"take_snapshot","args":{}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":150,"candidatesTokenCount":20,"totalTokenCount":170}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"complete_task","args":{"result":{"success":true,"summary":"Found one link on https://example.com: 'More information...' linking to the IANA website for details about reserved domains."}}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":200,"candidatesTokenCount":40,"totalTokenCount":240}}]}

integration-tests/browser-agent.navigate-snapshot.responses

@@ -1,4 +1,4 @@
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll help you open https://example.com and analyze the page. Let me use the browser agent to navigate and capture the page information."},{"functionCall":{"name":"invoke_agent","args":{"agent_name":"browser_agent","prompt":"Navigate to https://example.com and capture the accessibility tree to get the page title and main content"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":50,"totalTokenCount":150}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll help you open https://example.com and analyze the page. Let me use the browser agent to navigate and capture the page information."},{"functionCall":{"name":"browser_agent","args":{"task":"Navigate to https://example.com and capture the accessibility tree to get the page title and main content"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":50,"totalTokenCount":150}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"navigate_page","args":{"url":"https://example.com"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":30,"totalTokenCount":130}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"take_snapshot","args":{}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":150,"candidatesTokenCount":20,"totalTokenCount":170}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"complete_task","args":{"result":{"success":true,"summary":"Successfully navigated to https://example.com. The page title is 'Example Domain' and the main content states: 'This domain is for use in illustrative examples in documents.'"}}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":200,"candidatesTokenCount":40,"totalTokenCount":240}}]}

integration-tests/browser-agent.persistent-session.responses

@@ -1,26 +1,8 @@
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I will invoke the browser agent to get the page title of example.com."}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":10491,"candidatesTokenCount":16,"totalTokenCount":10587,"promptTokensDetails":[{"modality":"TEXT","tokenCount":10491}],"thoughtsTokenCount":80}},{"candidates":[{"content":{"parts":[{"functionCall":{"name":"invoke_agent","args":{"prompt":"Navigate to example.com and return the page title.","agent_name":"browser_agent"},"id":"1zgnzmz8"},"thoughtSignature":"EpgDCpUDAb4+9vtATVUpO7R/Du3cyW+qLtXqHV5MxjoY/uOyN6tesv96PEfcvXarQ/u24REH9DCw2AIG00h9WM2jRtfgbU544f4lEQn0dLEkAJCQaiBcxx8yPND+qKmwq8PFHo6ESQs3nssi3XOqfiA7YMxxY2vEx4GDZfieEeS/nyTe3F7A7dEoMnE2VnMWRVdAAW1F2K2ZeDQZSDrJxtelkn0dGd/MS0R6iNDENWg9QWJQlok4xttspRJFLS5BvkvnkBcUWQFQlo60AQb1Vbo8MQvV8WHUPORRePj4iW3IyxOohmb7uMfDo7UiRyv3Li8AAga7+oSUU9HSf5XZrjSL0juzJpYxxCqnIuj1/ZIY5SBSwGAWKuLQwmbo433bKij9HnY8n/MeNiDgwMiBX56mNlAOIqVLR9Qskod14H4hB+xAbvFy8j8hwf3hksLGjhM9BTBlcBQ2dbor5OUmZ/C7XsnLZvnhw+in7ji2tHz/68/4gmIN08khU1BRvfZdxtX8eQoVLcCfvwkGX7/drD9bM0TrjZuWXh9o"}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":10491,"candidatesTokenCount":52,"totalTokenCount":10623,"promptTokensDetails":[{"modality":"TEXT","tokenCount":10491}],"thoughtsTokenCount":80}},{"candidates":[{"content":{"parts":[{"text":""}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":10491,"candidatesTokenCount":52,"totalTokenCount":10623,"cachedContentTokenCount":8126,"promptTokensDetails":[{"modality":"TEXT","tokenCount":10491}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":8126}],"thoughtsTokenCount":80}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"list_pages","args":{"wait_for_previous":true},"id":"q9a8dwir"},"thoughtSignature":"Et4DCtsDAb4+9vtRa6LmDS0G8Z6sSxYi8TMEuRycQ7Zi/yYxo5sLhVJnIqMZdJiq+q2ZgvFiS9xxX6rrUTj+a5eEN2UrHC5MmzKVu9TSMs/Vd1XV9ayzef54tmsLy7PDb5Ja1ZPo8iRHIvnleWw/JgcwckXRPO/NwAyFfmYQ9lM93nRbZxnQQ12jBjS9R0f+TkGZyy26HDLl09w0psqNW8fwCm+nWc+Ouf8V/Gu6QOTh+VBZo+JP0HbMm25IHc7BlKoMtKNj9C0BVTVXyEzKelCiciR3VcfqdqdMmaVK8UXWGtcEnwyaObbtOPlav0sTFhHZsmV6P4HKUFoiYM/An2p66sGA4YwZYnhTsSXmbxb2pVNQWTjVJaRyJOsBnAiA5sxqqR/exo84YDsvBzGJ/1Y99Q/vHRNWVKgwfV8k5mkV7zLxJmh5oILaEHGYCVriVd/v419qWUZv3QAu0vcWwoqc65SZtfkG1JKMfrPuWXk8i1s2dSYwGg7tCtL8laocy0+l14ga8sxAsmvWAnVUQCANTxyvQDFuEMReyr2cjQjQXohbm2Q02wGXvkYXT9UW15V+KTdt8DmR28x0mZBseIJOAjmx9ZyaGibOMc72UbS+tf93RVGRO3Fey60+uhQvGA=="}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":8627,"candidatesTokenCount":18,"totalTokenCount":8742,"promptTokensDetails":[{"modality":"TEXT","tokenCount":8627}],"thoughtsTokenCount":97}},{"candidates":[{"content":{"parts":[{"text":""}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":8627,"candidatesTokenCount":18,"totalTokenCount":8742,"cachedContentTokenCount":8066,"promptTokensDetails":[{"modality":"TEXT","tokenCount":8627}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":8066}],"thoughtsTokenCount":97}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"new_page","args":{"url":"http://example.com","wait_for_previous":true},"id":"q8jik45z"},"thoughtSignature":"EokFCoYFAb4+9vtsenxLqqQxdEMBTS84fPfG1xsGHJ6JckbLR97g7mCgljX8/CJ1z+uvP6l7W4264EE9XzgkhYVWK40uD2/HSBRetjIAKPB2RgX0/fjj1xDNMUoQ78W2Dg3WUTyT9VFI6RzHkW/Fu9fKCRm0jGVV6zvEnXJzbITkRoxe+F/AOOz31fZwBczgz1+qCoKi1TKclEK/gVcXbsf9z36+Ufz1yoOr0gRlDO0UjaDW+G7uV3ojB70KzA1IK3bYcsSUGQJKJBzBbst8OPYPuNRQbhlmp7jub5wgT1yXChpkP/0UgNXGKI4E/dzCvZlefcVvZNE3LiODSy/yS/jqcHk3ftVneKsReikKxFveYoPPl0U0+gpt87HRpDqkrUuAyK3+5lDqXn1q7WRE133lc6ZCTVka1QzH5Ovd/L4nk9n+hHDSxtefwED6s3sNjbKoAdFedr2xkZp+Kjd0vNeM6ryYkc9oWumrcrw9lQbYqluDlDx7J29B9p8BxJSFdoUjh6Bkx0WTHR8vwXUxOWh+ptgZlPlhj7k9qzUNQXZGizwoSE/EduYLux8X6uok2DX3pTABOJ9Cy9K1soVIeOGW+KPtkQoCOgHkSZ+CHX6b5By0DQzgPyqD2m+vAl7cbIYaOXRHFoBc/P7+7FbTeUJl8/C/XvpJ8feXKiB9d48uf9NARA5NRsT1q24Qvmsj2cXGEqJlpWxUWhbAn074dApx+pavchReA2B1AF71DI8K9OtoEh1x0njUQ1Wlfysuwo/0rq7nkXWz84vE6DQ0V5YMnOn5RYxMUcgSFHpWhhGkwoJRTw2MA5VT+NjTTzmjCxPklsu018ZafYGci8mIfqRf663nBjulz3qxyA=="}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":8669,"candidatesTokenCount":28,"totalTokenCount":8841,"promptTokensDetails":[{"modality":"TEXT","tokenCount":8669}],"thoughtsTokenCount":144}},{"candidates":[{"content":{"parts":[{"text":""}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":8766,"candidatesTokenCount":28,"totalTokenCount":8938,"cachedContentTokenCount":8059,"promptTokensDetails":[{"modality":"TEXT","tokenCount":8766}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":8059}],"thoughtsTokenCount":144}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"navigate_page","args":{"wait_for_previous":true,"url":"https://example.com","type":"url"},"id":"chnx16bz"},"thoughtSignature":"Et4DCtsDAb4+9vunBo00wroGvRnP/utICWzc0KfwQAhL4ReRSPB5X18M7/F2wrQNz4jGT9I5S8hnAUJlpFqiJT51c4AodbVSzm9Xy1Z+yPZ8nl73dMEoGvDDNSo3BYBEA8nGpub4iemIFGHm1int/IKrtC2H7QnnnMfdtsKJHNInaXhS6RUHEC0mlSPBS15+Y6QDKDPGqbm2zI/AsRKNa+lQ4FtRyep85yKzjquQkLjh2f/NKDz+Ur8FQvGyOXAPwJF6xE4OpciShNrAilEaWmc/D0XJ3k7X6L2mrKjs3E1kD/HzaZNh7DrN+yc7sbwmKyfzIjtuD7/9RWaFwr19imxR1rmXafssWFxesYR+LVjek0EHMNBXga/4jbY4WW+aN/Fcr+/yIvguT4XGuTjq9aWkQ4ZjInKzePi623saNK69/Jv8qr2+gtOPeHpuqnA8R/Gm+C+3FFLDzlfkZHSiW4JFqrtegZwihyBxxKtNWy4QHGajrJ4iH8jh5O95nOLpiSu/0ifl6havb4gtiCf71hEH/NNAhv8WAcyHhcjfjGQTY6XzIYOLv7nFKjmszzcKwbqFqE4mX/CRjnKABJAx6WeZD5BkrOz+oXNJSonJmttXOjY10KOMvvrJ5NpWMTmpfg=="}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":8726,"candidatesTokenCount":34,"totalTokenCount":8855,"promptTokensDetails":[{"modality":"TEXT","tokenCount":8726}],"thoughtsTokenCount":95}},{"candidates":[{"content":{"parts":[{"text":""}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":8967,"candidatesTokenCount":34,"totalTokenCount":9096,"cachedContentTokenCount":8053,"promptTokensDetails":[{"modality":"TEXT","tokenCount":8967}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":8053}],"thoughtsTokenCount":95}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"navigate_page","args":{"wait_for_previous":true,"url":"http://example.com","type":"url"},"id":"dh6nh7uc"},"thoughtSignature":"EqkFCqYFAb4+9vt7hpma0fd/eZEmeYjbwxo6ESmIHiPzZ+MZPJfsSgUlrXp6Af/94mxXL3Nwc+FPDJ5JNaOhQ+/kFjYryOE7oXPUXb0ytTSW7zNxqFlUFVA55SaTsL5OIRLQ3uy9tUJogHBIOgWI7KXipmI1v+IIR8szhGyVCs8Ie+kAS7JczmtNPZAPXAFQGTnXB4zo1mRxTBennBrS48ptuFh0wSFRTeKJ+0LX0c8mh1QKd9yVoN51syU6Z6Q9T557aelXF2KAZFgR+daNvZW3dMTE5FTV9iQR4hJlrYu+eyukPIBljBUFBP+5wDcrs4lWVI2sfOlXDQE1yfZTlOGSCBQYZ46XbVdAF00Vw+seeulRvEgo8s8ocmZdn5+yRqgonxAJSiySeYM+nIscJA3YZQpuZVdS/SrHLO/ilIEV6jyg1xrAc7Rcy5gViENkTI2MZvSFpyVxr01vO+WbCiRavEbdaTppGoGcSJM02qlPwbH2tGgXk0ennSd6AbNLAHX+9QkkCjb6tQc6f8nv3GHa3U3Tie38I9NZ5e22gn4xZTpgZ3iWeGN5BNxO1DnB0HO3TBkf0g8jMMOt0cSehW37/603ItlOCwCpUjWr6d0g88u0HXsRHebdxqDWebHs57RchcYteKda+MJvmCxWgoB4GT3xwa+lgkS+MSLIQgjdEAXHnUJ+iTWixUpnWsm9DQYxPy3nylpUD6Ohmu2/kw80NoVLL6dD8oCDEVa255EqJvTCfTUMvOCrLpFVObto4bLAdfkTBj/cyqdDFeWa+mqnt2g/GNryWW7JHa7SMBplmcNIGMjMa5FRalko0owgySklPNbMzmc2w+PXwxjaezEzITt2vdOZ3GZGpio8DznTfPdLcaDXLljhYvk8KVO7Ex42J9WJiFxRsqrp"}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":8823,"candidatesTokenCount":34,"totalTokenCount":9004,"promptTokensDetails":[{"modality":"TEXT","tokenCount":8823}],"thoughtsTokenCount":147}},{"candidates":[{"content":{"parts":[{"text":""}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":9159,"candidatesTokenCount":34,"totalTokenCount":9340,"cachedContentTokenCount":8047,"promptTokensDetails":[{"modality":"TEXT","tokenCount":9159}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":8047}],"thoughtsTokenCount":147}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"take_snapshot","args":{"wait_for_previous":true},"id":"prantos8"},"thoughtSignature":"EogECoUEAb4+9vs2VKT5xUS9DU5U+/45Ty62Y8FY+X9StlepMysDdL7n3ce4fR7jA3v6MINt6Tcd52eU1+ZO5t4eqNwOOB0kngJ/QLVAFl8Izm1J/+D6Mqs+U3gSRJ8BsRUxBXdBFieHhNuQh76nPL4rEfBWIRlusG09H8So9++loPfjlSX+9Pcb99sG3RdVT2ZXQg6GMq15x+iGr62tz8DZCB5xnTEPE3LfwhJutlJtDbK/kbzOs7ureURbR1MQ/3/36Igl8mii3DV3PIIPIeo5CuByB1Ha6aJ/JWHV+ssmeBeE0oczCt7xC5VhHXM9j8JgUKx/sKrC+aecYSDe6oAFSpoUfMUUVPcpzTuIp0WoW5YDe9wvt/49o5pwWgRcjIlWdpYMrM83dMIG1BvD7qNU/OCsK9m0bxd40nvfmtj0PQxKMHDtBHw/RfvM85iHNrzPsHY+ZcI6y79sthxxoNdBllfgHBDi54EDSl551jgnAC90KoozJryBMCP5ZKWPgtsPoXhvbNOnyz/9HlME7p31RbA03/3NwjS8V01G8YDtG1HrmEZKtlrIW/G19DjBVlhoEuYpkKUmX57ck0rbxW4egvwDcQjcQX7QaJIWwyIUvhseImIObGLBxVuSBP1Jjef9nelxWG20k+BafZbHVg1jMPCiKJpreD7relu4L2Y0yk8ChGG3Sx2luw=="}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":8920,"candidatesTokenCount":18,"totalTokenCount":9060,"promptTokensDetails":[{"modality":"TEXT","tokenCount":8920}],"thoughtsTokenCount":122}},{"candidates":[{"content":{"parts":[{"text":""}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":9403,"candidatesTokenCount":18,"totalTokenCount":9543,"cachedContentTokenCount":8043,"promptTokensDetails":[{"modality":"TEXT","tokenCount":9403}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":8043}],"thoughtsTokenCount":122}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"click","args":{"wait_for_previous":true,"uid":"1_12"},"id":"r79qt569"},"thoughtSignature":"EogCCoUCAb4+9vt60822Xp/P+yQ5WNfvAKPF0LS6q0a47hBm0WrzbxwEB/HBzw14/ywGVT0tGNCypHm6ZWVht+ZgHJoxA2WtHDOdRbdjsvvmJaIBIjI3wPSiVc2dm2S9qVKlCER5uMwhW5aHbgmax/F0TSHej+g1P4+uOq2cJeAZ3iqgCcyROYji/O/eKWIBqaB6Wu10KtUvj0M9Dd+K0GkPpjNIvw17IS2jUxu/yPPZ9m6CSSFrdhaA7R4YXaE4L6qISdcdBxgsiSRkI/m+0f3J2/1jPk24y6GjrWEiejKCpfMw+sHTnTaEABh8Unih31eRkR7/WmcyGu9/IUMXREEo3W3ddIGFgCS0"}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":9210,"candidatesTokenCount":25,"totalTokenCount":9275,"promptTokensDetails":[{"modality":"TEXT","tokenCount":9210}],"thoughtsTokenCount":40}},{"candidates":[{"content":{"parts":[{"text":""}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":9815,"candidatesTokenCount":25,"totalTokenCount":9880,"cachedContentTokenCount":8041,"promptTokensDetails":[{"modality":"TEXT","tokenCount":9815}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":8041}],"thoughtsTokenCount":40}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"take_snapshot","args":{"wait_for_previous":true},"id":"3f6suk04"},"thoughtSignature":"EpEBCo4BAb4+9vvrysVAn4EZuigwkHrOkiDNXb0u0bGnAPKivQ0/NoR5aEg2NSa74y1Llo7ifzocwWsiqG+q0erh7yiacc0ypevnjpkJ9nfDrNOVoGZIz+OusBXs3AqPmMaNOiFCYFgOnNXIJNiZwkNSjrdSR7yr9T1L/+MfiXSS8Qy5ySSrlWyjjY/EBK0/vp4VHg=="}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":9251,"candidatesTokenCount":18,"totalTokenCount":9287,"promptTokensDetails":[{"modality":"TEXT","tokenCount":9251}],"thoughtsTokenCount":18}},{"candidates":[{"content":{"parts":[{"text":""}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":9896,"candidatesTokenCount":18,"totalTokenCount":9932,"cachedContentTokenCount":8034,"promptTokensDetails":[{"modality":"TEXT","tokenCount":9896}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":8034}],"thoughtsTokenCount":18}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"click","args":{"wait_for_previous":true,"uid":"2_3"},"id":"4hcr39ek"},"thoughtSignature":"EpoBCpcBAb4+9vtqGpRZfxSRRNqP+Yla/FpN5SRI6mbuvYI3+uUz6bG0Z3yxd6JeCbYM0+JCfyXOCbwZzRrdyf+cGGs0LjFlsRNEHbgjCzoGhN9dZdFzbHvFuXZMwaeCKP5BIWKtHjCPrtEwfsBO+HUnUqV5XeBB9zEfA8fgoPZm5y27ip8eyeYKtQarCXvaX9nIqygKNqGzxb/L4Q=="}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":9666,"candidatesTokenCount":24,"totalTokenCount":9714,"promptTokensDetails":[{"modality":"TEXT","tokenCount":9666}],"thoughtsTokenCount":24}},{"candidates":[{"content":{"parts":[{"text":""}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":10329,"candidatesTokenCount":24,"totalTokenCount":10377,"cachedContentTokenCount":8033,"promptTokensDetails":[{"modality":"TEXT","tokenCount":10329}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":8033}],"thoughtsTokenCount":24}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"take_snapshot","args":{"wait_for_previous":true},"id":"a7323k6z"},"thoughtSignature":"EoABCn4Bvj72+wrxMO/2uA1RwpvzkuM4xNaslnr/+xfZy/iqwCHZyR5bvsFfsovWYzjzolMLSmvVdGYx/bw6F1ewM3LohjPmEXdiLFI1fEBxNK0166QB6XdOGucHJbItjxzekY2hTYcMJTZWLArFaCl5+wxhLWXAE/zkj3TInmRSPRc="}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":9469,"candidatesTokenCount":18,"totalTokenCount":9503,"promptTokensDetails":[{"modality":"TEXT","tokenCount":9469}],"thoughtsTokenCount":16}},{"candidates":[{"content":{"parts":[{"text":""}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":10156,"candidatesTokenCount":18,"totalTokenCount":10190,"cachedContentTokenCount":8022,"promptTokensDetails":[{"modality":"TEXT","tokenCount":10156}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":8022}],"thoughtsTokenCount":16}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"complete_task","args":{"result":{"success":true,"summary":"Successfully navigated to example.com and found the page title: \"Example Domain\""},"wait_for_previous":true},"id":"81koewoz"},"thoughtSignature":"EoYBCoMBAb4+9vsiO1ru68XCJ6gZ+FKthHSwWAdj1b92U7qX4bVZ5j2kaNJFs3EYNsAdZHtkWLKLugPhFT1j9DXaptDYSfnbBbY/gEH5PW0RizHMI9VUQ6rvAyjrfUNh5ga7RuIEeRy3y0uCrglSx0JCOj2gtXG5kwGJDqT6YqTKjXvk3R0DRLg="}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":9606,"candidatesTokenCount":45,"totalTokenCount":9665,"promptTokensDetails":[{"modality":"TEXT","tokenCount":9606}],"thoughtsTokenCount":14}},{"candidates":[{"content":{"parts":[{"text":""}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":10309,"candidatesTokenCount":45,"totalTokenCount":10368,"cachedContentTokenCount":8017,"promptTokensDetails":[{"modality":"TEXT","tokenCount":10309}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":8017}],"thoughtsTokenCount":14}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I will invoke the browser agent a"}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":10603,"candidatesTokenCount":7,"totalTokenCount":10649,"promptTokensDetails":[{"modality":"TEXT","tokenCount":10603}],"thoughtsTokenCount":39}},{"candidates":[{"content":{"parts":[{"text":" second time to check for links on example.com."}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":10603,"candidatesTokenCount":19,"totalTokenCount":10661,"promptTokensDetails":[{"modality":"TEXT","tokenCount":10603}],"thoughtsTokenCount":39}},{"candidates":[{"content":{"parts":[{"functionCall":{"name":"invoke_agent","args":{"prompt":"Navigate to example.com and list all the links on the page.","agent_name":"browser_agent"},"id":"rn9rpbw6"},"thoughtSignature":"EosCCogCAb4+9vt0QmjCmkrGoIi1HLtLRARGxmKpP3a2ZF8HrZLv4bfHC1a7d5a1BlPllShIkkAjL1RZmTe9tjpulNV7xsavrWINRdkfrNqC/on1h+F3nhQAa3HBbf4AWWH/AHmVPlUsVDr19hq4NLLL3hxFg04Fb1YEgRDHrjWOs3Oy9SmzdG+MiWv5GFVUM6spjOujO76dKzHZGe7chmMsmE8NhjQ9c/lbWUoXBxJ/72Qs+mRQHpd3p1ufkL0UV8bFtfyJdLTF4iJ/R5kJiqsEN1FtS3PpQaQHsmby7ytEjPX29ps7xp6NO1i/je9p3u+tGXEpnomqdJJ4SvdDJm4XyqO9HTIQxC3jg7mi"}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":10603,"candidatesTokenCount":58,"totalTokenCount":10700,"promptTokensDetails":[{"modality":"TEXT","tokenCount":10603}],"thoughtsTokenCount":39}},{"candidates":[{"content":{"parts":[{"text":""}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":10683,"candidatesTokenCount":58,"totalTokenCount":10780,"cachedContentTokenCount":8119,"promptTokensDetails":[{"modality":"TEXT","tokenCount":10683}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":8119}],"thoughtsTokenCount":39}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"list_pages","args":{"wait_for_previous":true},"id":"vqfkekqm"},"thoughtSignature":"ErUGCrIGAb4+9vuVZfEoGpZh5UgzOffyNf9rzbFR/OyyQKQAOC8OtObFsJJvFgYIEXxBrnqRr8ijpJpQN0T5ibim+epO1Wos/ToAQwbioOjIxAdT9som9mndJSoBmA8D9HtxM6XjZzwf9qoMY2k2lUZjmk1BXRl7nFMtZ/cMQfFAkt2FUYZ64p2Y7xdY3ohweiMXFGbjjWvwCA1akSFa3JkVnfjHXlB3Yl9adrrL2V4h5OunJHbIqbyGxJPqBLyhrrhQbfrEtiVxVR09qqx2F2t3FMxXhMt1PmzhGB/2gAtlezUIvKdAT/c8h0Q4KPNueQP64UwxmKebfUmk6oDqrQG3sP2yF9fIcrqaiSv/DCecr/JYJv2E7Y79zDJV1FsKPKOn2cnpnmy9BgeXK0i2TCuaSm0XWK72EFHcMjqpBb/S5Y+U4DarGHnKGPd9YJ/I+D9NrxUNfJTmZw8wP6RQR0daiPX+APgdQOYXJOtLSXRY6lzS+oGKund7/hLhpHdcLto+UobcFEfNyJGG5+OHheKXCOqCWO602Rx4GFLTOYK/qea/R0QwFLgYZfJhjVIeeEsQvexxX9q/MGvtrilqqMEtHhAe+5QhamgUII8CcDK/15O7rgBbpQxXI+GPOJYMu5O0JMV7jC57DOeDCnslmyTlsqQtN3D5lhL1OKWSHjZmqHiRiSQGx23CdgNQF1ctsSKpB1GdXYqH9N+7TO90p+x0Wqbkfw0yJAF9TKHH9BJYciPSULjFcOLSFWqotQd31fTXur8eNv/fdk7kJZsfqxX50M41bBhwT4ydvy+Q1ao5Nu9TXRF6kGDtcdbeZOzDWZP+2akUH2glgqWSy4i97HG4H+UHqDXMpUtWzVFiJw0NcY6Pdt3XNbT5hO6mSO/A7ZhR8N4RSyw0Nh1eRzZSqu79valUfi+ykuB9s3w4duMmMNpGpHOMNVu+ol2ltY6zrwhFz5TCvo/zXmabLc6kEYu1C1xazAQLGFjxRVpcN8Qft4eN3KZRou5zy3Dp4PtQ+KiX3JfMb2wnuXWZ1CoUNfFnVi0Y5VpzeF7M8Yzi+ZarzcE5XEFSROl3VfxeVZyFlxgZObU83K0="}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":8630,"candidatesTokenCount":18,"totalTokenCount":8823,"promptTokensDetails":[{"modality":"TEXT","tokenCount":8630}],"thoughtsTokenCount":175}},{"candidates":[{"content":{"parts":[{"text":""}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":8630,"candidatesTokenCount":18,"totalTokenCount":8823,"cachedContentTokenCount":8066,"promptTokensDetails":[{"modality":"TEXT","tokenCount":8630}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":8066}],"thoughtsTokenCount":175}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"navigate_page","args":{"type":"url","url":"https://example.com","wait_for_previous":true},"id":"dsy0oh63"},"thoughtSignature":"ErECCq4CAb4+9vuQlylaFlrtKtYp1EGoDqb9nhSmJ9IPYvmFcBku92rqL1WJU3x2CeLvj0tww69yEodZQSSIJw/4hPtWzLlr3P362ITxFIgvgpzAue5AIjH6EbXJmAcEO8i+I8TV8QneJQiula5HBUdncCTqKycdrjyCKVbAcV1nnkNxbPagAiuumgOaWGPPmE4d+W4Xgbq695Rov0xR0ijSeknqkcf14JKqZqpyuGdMYSDxQhveQS7o4UgrsUhQOgEVc53XqfV5tMjhC7Agpb3WN7zoDUmIAzgbnoG6ha2mJOQ2x3jSRUozLq6fIQ2oZSmb7eajvcGqUxtXp4n4z9cdLpBuHlPB8hfiCxNN0RP60uvaqBtvAFBNfVCbk1eZdxnnvpwQdqp3Ue7H4lzJ9tDBey8="}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":8672,"candidatesTokenCount":34,"totalTokenCount":8765,"promptTokensDetails":[{"modality":"TEXT","tokenCount":8672}],"thoughtsTokenCount":59}},{"candidates":[{"content":{"parts":[{"text":""}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":8847,"candidatesTokenCount":34,"totalTokenCount":8940,"cachedContentTokenCount":8060,"promptTokensDetails":[{"modality":"TEXT","tokenCount":8847}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":8060}],"thoughtsTokenCount":59}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"navigate_page","args":{"type":"url","wait_for_previous":true,"url":"http://example.com"},"id":"spfjmlgz"},"thoughtSignature":"EqIECp8EAb4+9vs3KbfYgD6JCpaYYtFFyQdv6a7TPEL2cMQCTkaO/7k7goC17ok0NkX13S9xoQmLqXDqDwMnLZd4BcJVZoqeBysjLEOKA6AcP7ZCFPX/84VTtMgvB123l2x5GcXq/9yDmSLqy9B4U+u4cEtdfArQUuFWPh+bGqOCdxlrncTv6c2yReLXSLYUiQMNcV2f51g+giKIeG6Gsdp/RQNVTi1RrVIun4sY6t7Pdogrp2hGXP1VuQDCwzyuHcVPfvVh8oMKdPUywrdaJvzH2/L4F9OoNpmfJkjJZtYdPLFzoDm5uzFV7jNiwvYpeL1/EnpB1nbh2in/i3Q0MH60pf6ik7r4ebcdA9FQ0zjQoRxH3zqTYIH1QaeokwpaHkfKNj/8+Ke1mmmmTf8XNs/cZ4t2EQO3Wp/SVtGbIYq4LvbdZfMhIpFX1dHlAQlo+52xffABzfkqki5Rt7V4+V/9FpARvkBX3/lmK/tr7aVxsne8CRv6JKMtPbjnkKYhm7IeKKt9tEP9ZGDJ9+0kUVBmxnWbmn0cO8PE9vpfrISEakjC4H0YuLWo/ra56t8MJ6aUJNjTHkN5nH6cQuIB8V5vOne534SKs8O4tM7StnYJxneczLe8L6cpk2Wp4W4KWter51N/sr5xpKbo0lN5nq13EoXGe0cSAN8ze0O8LNMmPjrfDcDEZfHlsQPvmwO+w9A9nBU8ObUGDQddKaznrbIhSafH"}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":8763,"candidatesTokenCount":34,"totalTokenCount":8906,"promptTokensDetails":[{"modality":"TEXT","tokenCount":8763}],"thoughtsTokenCount":109}},{"candidates":[{"content":{"parts":[{"text":""}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":8997,"candidatesTokenCount":34,"totalTokenCount":9140,"cachedContentTokenCount":8054,"promptTokensDetails":[{"modality":"TEXT","tokenCount":8997}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":8054}],"thoughtsTokenCount":109}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"new_page","args":{"url":"http://example.com","wait_for_previous":true},"id":"xa6m1ifg"},"thoughtSignature":"EooGCocGAb4+9vvfzf5F8NnOVWM1Ge5dkpHWzgAx7E3Tjv2BgvQHBaPEtUN22F5ps7pVx8VvtFR773quXuQQFnjAVSgKK7//8P561JvXkK+nl7rh1s01RDLHUE92hemwAcre1xBftHfGlLADiPg3hXKFLyZpXYMWoy5+RY2Vo3FR0jIG6rpThHg7dfb1OhOLGP9d+hgmcpwozn1UVle0ncg/mVHd+uK6jEKt7b6IZAbyNBLUykYPoxCZKtbHYuZyOL55HksF35CD3x4AAn1qOhV/tARjLEWpxLsrnO5ten76un2Guw8pnsFCB0SmZye9Qnr5eSfYc/fs6GE41dRfDyc3+BOSlJWjoxxyRzNfQjAfS2m0SUQ6o6+EtlXqkjCfNnR0moA3HVYTIXlf1QMownc6HOX37OswmwaVf/YfVGxfQM02ysWycgmapGefKkZim4qmdAHqZuEwXn5qCnG1asbPQSLqxIOpBrEEZsiCTpkvtSd3+4oED0jBmEq3x4IU8uW23ujPcsrwppmwLSCyPYx+09xhPdHruywtGAvEhRDzfHYSnW3ZTiu0ZBKKRmPwcKMBn37Z/GjjjeI8HGPCVtP5dbB0vlTsNuNe8lYSWy3H3dOFUIqfsATu6by9QA0SBmvN8/CMgkHlAgofrbhv27XOIQMFzamUmj3bsEXZR5RvCbQ5T0OLM+4y32B0VT9lIhSLijKDo1XaoQ1Erj66RIcv3jvrseTmIFTr8T0tkUkOqir7p1udfbtxWh66kHTd++JAevEJC5HZcmC7MmvGux7gK3NRhhteJ4qOIM+KGW17BukpOOcJxBH3rW8tEJalC30WdqoMM+TBKbxVqBBByU12TeGnEYOxghxnXmPhMOzuwUyTqLUTBCemaQuXowwNArJozzewcw/uY3lSsu0lEy8YCC+BARMmh85jT6JBvvMMThKcNhtul4gBIkOfLDqUjQcFvMs1QBU+kpQP9oHpXluxkY5cdANPG1cU94GJN7PoycJcRju9Vf2Goej+P6ZE+BkPM3f5lQQqBgiLLg=="}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":8854,"candidatesTokenCount":28,"totalTokenCount":9044,"promptTokensDetails":[{"modality":"TEXT","tokenCount":8854}],"thoughtsTokenCount":162}},{"candidates":[{"content":{"parts":[{"text":""}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":9197,"candidatesTokenCount":28,"totalTokenCount":9387,"cachedContentTokenCount":8048,"promptTokensDetails":[{"modality":"TEXT","tokenCount":9197}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":8048}],"thoughtsTokenCount":162}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"new_page","args":{"url":"https://www.example.com","wait_for_previous":true},"id":"1pxqeqmn"},"thoughtSignature":"Eo4FCosFAb4+9vtx8s8Eo2HJhknUEkVg9w/xZwt/pceuH9eggBkeyIgJbskQCQ32xHqgSXrz5d9p0tiVjYrPFA6h2CVfQP2GFJE4BGGG+QD2cHMweol7asWRXQIM7NiQF+asQE43IYEhBl0EQ0QM9C2/kiQIMyCmXVF6N643ZBjwHFlM72t6spatjj6+z2Ep/B8MycvQoFw5RAvVegJsu1O+Ep8yCZNyCUcx/2Z4bTAt+Grnzwl0o9QI6TDg7kuNWCc4AFnbOGRofB0C5emwEpnDaDH7mS6TujFpoDwoCawuEUYQm5geS17rraeRdXB02uqjadjINgxhDCWzjv/yehLGIYL09KlhsA828Vs8xT8dz3TWaHJB8dS2xAxnL8qHd+Bp6geWa9SRpDZUDAJMfpI2TRHDSba5i1yuUyLFtDdRFEgBUweyupSmJzziG6W3Bhu+F2PF1FlR1/ksUUONqxMOWMqVdJTLg+a+nXlPcR1KOZ7+3JeuIbZTRjZV+ZHm2XBQ1kyKCI51kXepPnwQX8bn2Wo4WpkDk0S4y1USHDhpd9hRslldl41s4YCEnH9P+D70JK++Y2ZD4gQxnSdpsEAUXvRGw6q4ubMKP9XxMyaIx1lhDy/g1/f5MG7qP4gzX3O7Rz4ByU3Ghm9HqX7gn2aXjkjqjr0fM7tKPRAOmzOuTObVm+FKYmxHy1VbnoMfDBj0OaTuKPkTKsvkIhXg3sTaP8soKAwtXj5UYaZ3KDSECjuEyb4+W7N6QEfwkuYUAnlbPcpgARuzMBo8Xjysu8hQqsyoWTqHW6fjI7LZ43Ykj9wqgaokuHuIB7rm5UzCjbEzKmpvPLSrmtDTwiSed177A62h6si0AaW0BcXyAuYS"}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":8911,"candidatesTokenCount":30,"totalTokenCount":9079,"promptTokensDetails":[{"modality":"TEXT","tokenCount":8911}],"thoughtsTokenCount":138}},{"candidates":[{"content":{"parts":[{"text":""}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":9416,"candidatesTokenCount":30,"totalTokenCount":9584,"cachedContentTokenCount":8043,"promptTokensDetails":[{"modality":"TEXT","tokenCount":9416}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":8043}],"thoughtsTokenCount":138}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"**Clarifying Domain Inclusion**\n\nOkay, so I'm stuck on this domain thing. I thought I understood the instruction regarding allowed domains, specifically example.com and potential subdomains. It seems the domain provided, www.example.com, might not be explicitly included. I need to be certain whether the original instruction's wording covers www as a subdomain, or if the lack of \"*.\" before \"example.com\" means it is not included at all. It's a key point!\n\n\n","thought":true}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":8968,"totalTokenCount":8968,"promptTokensDetails":[{"modality":"TEXT","tokenCount":8968}]}},{"candidates":[{"content":{"parts":[{"functionCall":{"name":"take_snapshot","args":{"wait_for_previous":true},"id":"5fmzjlk4"},"thoughtSignature":"EvQKCvEKAb4+9vv30yZpPMefi7d59ylbOlqo4l3zUITcJFaN2TTkHVNQ3CdIxDGsx5Dg+S5zyakF5xi8Zn67ye/SAG5lA1TalA6GcEy6ukrFQrwTCcYfqRqJv4mA+Pczi+ugSu1SBmsVRJQ2+kAmU7SLapEgUaGfm6TRh+hjougIpe19FKu0/1eln0DM1Fd0CL1mUWswwMFBt1ZkkyTLF8rSGNNQM7mNG2k8pxj0XqIzulfFbSuq+1hE5SCTsETTdCRf6OpeYgUL0VhhC+0uvtJsdE/PDLLDdwve94nNbqzcG1C85c33laM+DooXpdTvAjlZi8kaJqgcM9dAiRvIJKmtGy0NBkViSQDljLw0WwgzxaPFN18ivLdoxaCipI/m9zDyO6mWvhzzt7w2oF43FEUly0B7rjf4fIOkyq98URLpmW4wYn7r5ZwbZGhiIzDZhD3mXJvkvmqBRL7v37w6sqFSl0nscLXCV+DHgQ0AjE3I3z8RoAHBus0fMqi76gMs1YY9atCzLg1/f1BsBuOx2Ev2sU2Jkr9SNMnxcH2f1WgGIvzJYYt4rZ//hnYIRYHqY7IidID0VZOq5KQG8OWr4n1SM+RP0MkGsS77xL6yhJFHjrFfPJJ3R1RD7HfSvpJsdftuttTjnraEjiJALsMnOo3FgF3MnXeNdOMLHxkjQq4czgVOwdaCq/UHFYPJ8Zug/L+7SZFwjVp4uuIrM4BNnXbs5/tZZZ9KGm1PBBqI/OERfcYjKhpA/xD4EHzLCYGxJxEYHSUfqRVMvJOQme6A0cyRfZzYyrda5O7P0pNtG6/4WhoPC11+PYyXBuAuMlxpUwjaOTaOwJTit6p0uy27h9bhl22LiSKf5ylHEz4jEgOYUD9WJVucot2R43L1j7M1emcRpcyZrxRB8tKkA1XzXAH/m+l3QbCfJWDEbt48muTEqGjUax0Z9Ft3iJhDEZCntg/5OR43HNpHtLPNftUjyeUWyh1uQOAUSMxLbG4vHISFedkt8K52LpGi0wYhEVTyRVGjhJULE9QEw7AQ5mt3DaBCZN1bfIRvpBz4efvH/z6NMeE+3ohgFoCRTo2iJ+dsshwDbKn05KZTSh+t/oxX/xzi332J6Jhvu/PiEWKsrUYdZnuigPogVi4l2pss9L3wrKBWB7MQg9tOSky1kRMGM1beFYIWyzikml1hx2zKQbHaOfpfL9xW0MoOILfV/ihe+WNbiGiGthj8NKTh/YrAnK9hnrHeSgQcB9v8L0aeit+iwCxoXV4gF54xb4CT5LACF+iW3YOGD5z5vc+HXcLtzFX+GfIgm8dbRQDwTXEaXIpXyulLLtRqCEiFxbe52wDT+e6CpXS3r4Ulsvvt1faCsf77eIj6M2EnugH9wPDNuRCMXkPff5P9F08RUobz5V9v9BC9mYPGRPTkwST/bZsFSz8MHHXUYPNgHkI3tGAi82R36XrzMDNa/0c1ri1747Mc18qStloO5WTnABXEhEO40Wourh07CyMSD8w6p/SHhepW87JqZ3oDwxPyP1Fc512U8Qsnas5k/z4IxWxoIQFTooG8omLHLI9vfnZ3FDpQf4IAgDsG4gsvrb/EicMFqF4EwO+crcW0oudVpk0a2KycBytniisXSazITx+nw6gO3ZSvoGsgrudn75Bb8W4KoWeIKrNi/iKkPrdzmj7dC6JcmpylPfZKr6r9ESwhFGEZIK/JaPK/MxkcbL0RcLA0ugYtY5A6uOZJTCCrTMV6h0FfoxmTCTagjjZhWyU59K5BNWOOrIVXJRd0XEa+Dh6foFvnQD7Wgq3zRG2BwZ0QQ7rFulcpqs1bLcPkGU8vw/hbVQ71q76OYh3ACz5XJdgOPSpk5M4+5SsMQQ=="}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":8968,"candidatesTokenCount":18,"totalTokenCount":9293,"promptTokensDetails":[{"modality":"TEXT","tokenCount":8968}],"thoughtsTokenCount":307}},{"candidates":[{"content":{"parts":[{"text":""}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":9611,"candidatesTokenCount":18,"totalTokenCount":9936,"cachedContentTokenCount":8038,"promptTokensDetails":[{"modality":"TEXT","tokenCount":9611}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":8038}],"thoughtsTokenCount":307}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"click","args":{"wait_for_previous":true,"uid":"1_12"},"id":"w39u7j53"},"thoughtSignature":"ErkBCrYBAb4+9vs4gIpgWxIubEi40hUOpqyqvtfJ8qAW3Yz1wJHpce3xFhJwbOc/wiY7AIIvAYAjG0e5+/Y1KrlsGbrUrTK1oDN+yOvei7feK2qXLJVNArii8e7n2MYmgLJM+LXH67m/fxTR9m9rZ6a2RzGpFkjKmXfEk95I+Yx2HYam0DrWc2g/mm3tkXp5FcEG1jx7KNBTv+/uLC/0wR11Emp+vR6tEhtbcv6AIbqqVc+ptmr8HWuZIys="}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":9258,"candidatesTokenCount":25,"totalTokenCount":9310,"promptTokensDetails":[{"modality":"TEXT","tokenCount":9258}],"thoughtsTokenCount":27}},{"candidates":[{"content":{"parts":[{"text":""}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":10208,"candidatesTokenCount":25,"totalTokenCount":10260,"cachedContentTokenCount":8039,"promptTokensDetails":[{"modality":"TEXT","tokenCount":10208}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":8039}],"thoughtsTokenCount":27}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"take_snapshot","args":{"wait_for_previous":true},"id":"qzaod8vn"},"thoughtSignature":"En4KfAG+Pvb7Wx5fC3gw1Fn9qKx0pll+kkEOEIlaOD5/OJJAFZvLbkJkxdd4qP7+X6FxWf1vFrn8uoWUQxUCK3y/E1KTOMDEKozi7ApeB5W36/iVvHI/MbELdTDQrk4unKqMvcPTHDR55qHDVcS25FyIpqCHQL3OiodSKgK5//0="}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":9299,"candidatesTokenCount":18,"totalTokenCount":9333,"promptTokensDetails":[{"modality":"TEXT","tokenCount":9299}],"thoughtsTokenCount":16}},{"candidates":[{"content":{"parts":[{"text":""}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":10276,"candidatesTokenCount":18,"totalTokenCount":10310,"cachedContentTokenCount":8032,"promptTokensDetails":[{"modality":"TEXT","tokenCount":10276}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":8032}],"thoughtsTokenCount":16}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"click","args":{"uid":"2_3","wait_for_previous":true},"id":"izwyu21z"},"thoughtSignature":"EpgBCpUBAb4+9vtf3WpNBe9YcImIFf1HzOHJQ6WIKuadA3qMRbi5n6DAl9v+HkdpYL1tB/5bVGJJ5yDhoTjgAPuMfzk9H0DS+T/NoQjwRBPS6pMMNdVeY0O7Qckwc1oXVzZEMO1mOLHxItYQBeEhQIRme2/ISq6ObWvtEAP/2wazYsPB9m5+suOXNVQhtv0lAtgFwka/O08mhRI="}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":9714,"candidatesTokenCount":24,"totalTokenCount":9759,"promptTokensDetails":[{"modality":"TEXT","tokenCount":9714}],"thoughtsTokenCount":21}},{"candidates":[{"content":{"parts":[{"text":""}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":10707,"candidatesTokenCount":24,"totalTokenCount":10752,"cachedContentTokenCount":8031,"promptTokensDetails":[{"modality":"TEXT","tokenCount":10707}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":8031}],"thoughtsTokenCount":21}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"wait_for","args":{"wait_for_previous":true,"text":["Example Domain"]},"id":"u9v4ngts"},"thoughtSignature":"ErwBCrkBAb4+9vtgNuXwkrEU13cJ58BYZBhnQ2xlGVufQgMl26Hbwc4zUciWIrWI+SUaunKBgnut6tmnGA3SYJAZ0wePJLnh3bCRJBcmX0aNEsResAIXD0nmC4tcDQnuWuFHNeb8XzfVxiZcBsnjqNVcZtQ7rT01GAKzOKvfIYKhfoFkwv7spv5A6LUefkHphnu7+5BJYrpBvEN+5xzOZmlNXuUprxVsfbOnopzrPYDZ7YrWZr+R6Y5W0LJ5afI="}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":9517,"candidatesTokenCount":25,"totalTokenCount":9568,"promptTokensDetails":[{"modality":"TEXT","tokenCount":9517}],"thoughtsTokenCount":26}},{"candidates":[{"content":{"parts":[{"text":""}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":10531,"candidatesTokenCount":25,"totalTokenCount":10582,"cachedContentTokenCount":8021,"promptTokensDetails":[{"modality":"TEXT","tokenCount":10531}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":8021}],"thoughtsTokenCount":26}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"take_snapshot","args":{"wait_for_previous":true},"id":"en5wzv6a"},"thoughtSignature":"ErMBCrABAb4+9vsFi8H2zIOww5bzPlC6nM9VohFXg2gw1IGPsI9e8UzwMm8f6OpzofLx5b3+W73OYCBaGJD0ubRJeIP4yA3kjvaSm89FyjQg/oc3Ktu2WosK2nKynOzk3FoLN3fOMfMWfxKOxV7k5TBnKwGhnEn0WGGaKF2YiAap5ADC3KCIWP5dsJKRHP11AuLlvTvvgptxX1WqqsyXMijvLXbnrdfETWI6b7LtOiUgsTHfS3Q="}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":9565,"candidatesTokenCount":18,"totalTokenCount":9608,"promptTokensDetails":[{"modality":"TEXT","tokenCount":9565}],"thoughtsTokenCount":25}},{"candidates":[{"content":{"parts":[{"text":""}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":10605,"candidatesTokenCount":18,"totalTokenCount":10648,"cachedContentTokenCount":8015,"promptTokensDetails":[{"modality":"TEXT","tokenCount":10605}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":8015}],"thoughtsTokenCount":25}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"**Analyzing the Links**\n\nI've located a link labeled \"Learn more\" pointing to `https://iana.org/domains/example`. The snapshot confirms the link's details. Now I'm checking for more links.\n\n\n","thought":true}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":9702,"totalTokenCount":9702,"promptTokensDetails":[{"modality":"TEXT","tokenCount":9702}]}},{"candidates":[{"content":{"parts":[{"functionCall":{"name":"evaluate_script","args":{"wait_for_previous":true,"function":"() => {\n  return Array.from(document.querySelectorAll('a')).map(a => ({\n    text: a.innerText,\n    href: a.href\n  }));\n}"},"id":"2lza53qd"},"thoughtSignature":"EsEKCr4KAb4+9vsWUS0PkhIa2yvkC55YPdwXqKNqo3xIfQKKzxDHESpY2YU6kAxaRkt1zqhfYpPYu/huUGWy6kBrgHFM44wdwN+FEG1zpNJK8HqckU/YhT7oXzZxHxbmZJo2haXL5OWUY2Uwx3TiDfhhp9rf6zk5Px+rD9dz7CuxCzIGcX4mjaidEsya/1q4kWs7k2UtSOseWxLHO5TYXHrih7cDQtVj1Jl3Fnw+ERjPKDb0vcz27IrW+GAmFVLqR+F2eNrtuKDdNLs2OMy+FtUrtv7PLFBym9IzX2JWNRJFl3vuyaLjEymnSGzvvwEFyRSvN4Gj6TK5H/Q0yTtcHyzP+AxNvxz2wkDwAm7zm7oMx819hnK3SrWCudvywY8DtXw0g9ta+jJziV+nMFM74osTeO05NKRnvSTBgmnjlpdI9R6OVXlxnQtqvSOeyeK56H9/OK7mpDWMZDqJNMvf24yUFLuw99gUm2rLeA+XhCL2RS+bha8QMhdqp/4x+c5ucGVbHKgDZ28TCm6TlKaolDuSuL5yfBuZ2iSV+ZgicCX8Mlqsd7yHBuGv3Db4pZ4XfjC2omWX6g4usQRa8O/lYd93bXWcy/yieJfIkXwk7RHYRmst4ZqholBteXtUF4yAkniwNGdgbJcNnsaNA29rQlX3mD4/L/dOsgAXO9tsMq7JzwPFIekq+Wn0zJxg+aAc2FWaczqi/a20fpNbRfBBWuBjfiYbadPCpWAwyGpXmZt7XUUPSMkSzjfolGXCiJlSOwp4jrWn2Msmsm2mXkd5/gqjNoSK5LV6gBjkiapD1949glo/rDWwVj9LC3j9C+m+Mqzg0P3qk2kIK2aSWToqpWCQluhgZgv1BJt/VyLdSDMtNZj49i7Oue+22PVrwaD7r0exLfS9mBRKJJs2pegZuMfaDKWycCUBQfLGAJhzKlBCXDAPmtFKx348h3JaRyTT3skpfSuKb8MBgGjS0XLaVs8ZpPT31Yxwn9LFvifovB1cEprBvBmjuyCnSVLr6V+p9tJRi+7hVC1fbrz5ntp6DFcxIfebmPLfQGgtUa1evlfhgzkkjEq89qPxmRbFNGtkfZfeD3nX3XjJIbpqdc96X2Yh3L8jvW3XxtxBeV8fuqgsZAt2FaURh5WXaSLKxhtSt5mRRIIlSVZt3HijQjkfQzUqUaC63sD5WKE6tmjhtBdI5aZPUgM7997Fr+lr9gqS+9UEy4h8hbf9x66k6daFuyVBSPSmF9T2S8WHIZbAxtfyx/npxn4nh6xFUE/lIX45pVOQlgsgvcfzQX271syjpOTXqz5wJDC4wKIM5raW7bQZyokEijPihc28c0nELGZfaU1tMP0fgfGNlWNXNQfah/+HfIglZlc8PIoRNfzuZCCesXMwmb9sIEe9tRFFzIbfjf1PW3rIb0Gnjwy+2epZfNkVc06L1wv47LHkNIBbkYCakrcCPAYRbSvDZAKuH9Vzkip+LzpluZkF+Hdsrs8gY+3i0zAc02pnZjkBOJeftxcVRORSE1CgiW6FN9XNmLsbBEpEjhWRgYAfciv+x2WOwbPpJ+fRjyQz62JgQpkvZqegNFpInv4mDdg29mk4MmGg4EM1oeX0W5VG4T8/0kQ5wdlV5h/mOHINqR7kkQ4Bm25ytLuOLssSyMFw5avlPMGZRwlt/Go1Y4LTmDQRgoRg4Ec8+uWoePSfn9aLnocwUwxK4SAs4crKnlADI4wXGiG9H/Xo+SGvOcfRLLwAzoWaoyb66p3raNaVcf5IH5cFifejn8Au/98eWRaPhKJRIhBddfaZUw=="}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":9702,"candidatesTokenCount":64,"totalTokenCount":10078,"promptTokensDetails":[{"modality":"TEXT","tokenCount":9702}],"thoughtsTokenCount":312}},{"candidates":[{"content":{"parts":[{"text":""}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":10767,"candidatesTokenCount":64,"totalTokenCount":11143,"cachedContentTokenCount":8010,"promptTokensDetails":[{"modality":"TEXT","tokenCount":10767}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":8010}],"thoughtsTokenCount":312}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"**Clarifying My Findings**\n\nI confirmed there is only one link on the page, the \"Learn more\" link. Initially, my process was a bit unclear, but I am now certain of the task's instructions.\n\n\n","thought":true}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":9450,"totalTokenCount":9450,"promptTokensDetails":[{"modality":"TEXT","tokenCount":9450}]}},{"candidates":[{"content":{"parts":[{"functionCall":{"name":"complete_task","args":{"result":{"success":true,"summary":"The following link was found on the example.com page:\n- [Learn more](https://iana.org/domains/example)"},"wait_for_previous":true},"id":"1lqryjfq"},"thoughtSignature":"EqcLCqQLAb4+9vsoMELp6+SQ6kd9D/ukBfYl5MDkq0Jxufu/S3yvYHVsVlAcRFrpZb0HYZY1aIhGDLZ1JaSK680/g305h6UD7WKKuZAGHBBcr5GyNYYVmCpY8H39kTqdFMkcxtxYjPFB6lcZeTjLHGsMVmat08+PEE9caApuROHonZXlyZZ4wbmg4lI26b6h6LiB+kUAMAUAIN1WBexXEXj+gl+8HgSwqi/ntQYWa5WPpixNk1eiFQJmk5+0lFVrGxWoknDIQ+mc4AgvXbI794FvIrpdBwiQZ5wD3IYkU0sbUN239TiLp2MAYY6qshHeL0JhkTsjIG9GOwVWFft4BSHDu9pVQJiY1ApCo7rhDoz1CjFtjavoC090vffmKU2SCKzRvF2lhSFzxk4urWmn469GjuvK71GVAsRCsqPwBctXDbBsK3rWjLDNzqOZ9BHP7K/mQ0LwmIXs/Rs/CJeTctgC9lg1Q6eFgStQMOjP94EdudvH2sCjg46iM+U8RZXm1b63Zri7f/Y0gnUvGzb+IvtVSkj2yEbACBpwEAvICY+0meToSDHy6XDiAGjCintSaoAhu3/2kJZRh3INvvLrS2qtO78AUZWO6M5Pzub4ckKcuzwJPPGQr9Q5qZbRyzqdjlR51D9WujLdHVNMcusjUnbCO2sDWOxsUQlibU3GFQrhMJ7Ka4wKXWso4umPsRtcP06n+8ZbQXg9dl3yA/Qvg2wwv7hQ99tXXOKG6hRAPEEetkYxw1iQ7tFJaJciyh28pv606RfM8U/e/0ug/g+olpZJPkY+21W7Lj/MrEK6CRUd03+pMBXwUdEwPKMCM0DkQPi/7vRMwBk2cMJ8Yk8ICx+sGlnSg1Ff/z9XMDKEadXQcPJ4Pt4/m+R1VuJ+Du9WXs4dFE92FsQ/FGjduEYtisARIpTJzAkigFlm1+lzLUs+5ACgzK79Y+O4a8ATvkYmOTex2nJiuTNq+cCPLi4cMnrSQb8wPx8sq6cIJERrhqmo6C2dlel7iwuk/8CnJo1rMCwCtTbJ995aJAoEpRkiBzMF7WG7abFT1q5NvHJ2KQV64/iRrqZU/Tiv6I6iDswafiKmFbdTovc9i5ALsdOali3X8RCKkW2aWMXpKxeIOiVOpzR+CcCw0e9CTM4YU2dLOb0BlhFOFVxGxRBycInLCblUaFtM/ulik5xUS7glGRT/jzsf17igtl/+bbV/t76tcslYOjQScXbKJr3REYN0qqK2hFgxnhXoN9IeD/nOWaDFMP2VJc5N/h1gsIA0Ac9PSgz/jNB0XPQ/CrhgauOUacXQ3otwEJuliEagYhu9n01xJuHIZubZ3AuEJ5pIFMvtWuAKSeSq8McCPCJKJgivk5jDsdTKKu8rZ6/RjC+qu/NyGr0QYmmVrhTk/cpHihRT+x4IadkwBmkBS/q+DXeSlpML27YAXEe1jzsNeG7uzBuatUlZDR6rpumDGFCQBSUPWgBHWrWqNvrcQrCFtex9ZEY202JpJXVsQZRBAYcxQkknDMLU54+QpORSA5CW2E2ERUaBi1s1RmmixlOP+b6slJG+VwZ0xOHhl5FfaK4Or7c0E0tImttduArpRTIbODy/5OwxPY28fHxHL/VZRl0u63wJXSl/Tsl7hY0bagZguYrV+Xpx2O+fSMdgPG5Kj4qaYJVrv4Zri+UOUmwCT1ralRhbsbPXcvuHLMDDPD7uqvrK/ZTF5lWb55TtlmrUtiGnNqw7LS1vIGbgHQrRbV8hG5fG6MN0ooac7T1L0l6FjSJjVCPvqKTmle4UYPknTK9Y11CRnymcUP1tzThEKSnazM8o7CtKkZk6fAugSk6LMAgwLoCvaOvrVpzH78zilWPWuCSGLeh5ltl0dE2wDrb1gA6Ctbcm1jqX6jUuquOFz07UuogZlP6OqhIY6sqkm0o0Q+gkU4TwtIi/fA=="}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":9450,"candidatesTokenCount":57,"totalTokenCount":9846,"promptTokensDetails":[{"modality":"TEXT","tokenCount":9450}],"thoughtsTokenCount":339}},{"candidates":[{"content":{"parts":[{"text":""}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":10827,"candidatesTokenCount":57,"totalTokenCount":11223,"cachedContentTokenCount":8004,"promptTokensDetails":[{"modality":"TEXT","tokenCount":10827}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":8004}],"thoughtsTokenCount":339}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"The"}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":10731,"candidatesTokenCount":1,"totalTokenCount":10798,"promptTokensDetails":[{"modality":"TEXT","tokenCount":10731}],"thoughtsTokenCount":66}},{"candidates":[{"content":{"parts":[{"text":" page title of example.com is \"Example Domain\". The link found on the page is:\n- [Learn more](https://www"}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":10850,"candidatesTokenCount":29,"totalTokenCount":10945,"cachedContentTokenCount":8113,"promptTokensDetails":[{"modality":"TEXT","tokenCount":10850}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":8113}],"thoughtsTokenCount":66}},{"candidates":[{"content":{"parts":[{"text":".iana.org/domains/example)"}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":10850,"candidatesTokenCount":38,"totalTokenCount":10954,"cachedContentTokenCount":8113,"promptTokensDetails":[{"modality":"TEXT","tokenCount":10850}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":8113}],"thoughtsTokenCount":66}},{"candidates":[{"content":{"parts":[{"text":"","thoughtSignature":"EtsCCtgCAb4+9vsG6jAGgwWyEfGwT99Cs3RhM4EVEyjTlze2DxNUtsRE7mMenqfZcQie9h4+kTEKjQM20PXBD/IFsUIEozrdJbLJhm9CpVQlqG1yBh2q8q/43jRmb8A2T/JcjCr+3raGAOkRHgiBlTkdvcAAQdHhVa9S+WyI1mtHOZ/Caa2Zx9bgKFB7GEmHQud+39HwlwL8ZZMy/yfHNk8C1PYfwnEvvBGiqe2wL6w+BdMx1X+2uixe62VwwxBx8tLvVV7U+RTagCH8xLAl8AZUtFYuOOh9cdeNjLYtSmajVp5NQyybriDy5J1+zmmBW0EGrunTZ6YZOBI/NJaogboeuNrX51l4I1bWYHzrgY5yeeclxhYgYSPs/RcW0lxcJwIlH5FwZBVkVra14U/RvAiL8/PxTTVROtp//zZLNgEav6S+KEiTqEV7yzwd797WkDG9NIAyBX235WpRVTc="}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":10850,"candidatesTokenCount":38,"totalTokenCount":10954,"cachedContentTokenCount":8113,"promptTokensDetails":[{"modality":"TEXT","tokenCount":10850}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":8113}],"thoughtsTokenCount":66}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll browse to example.com twice to verify the content. Let me first check the page title, then check the links on the page."},{"functionCall":{"name":"browser_agent","args":{"task":"Navigate to https://example.com and tell me the page title using the accessibility tree"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":50,"totalTokenCount":150}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"navigate_page","args":{"url":"https://example.com"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":30,"totalTokenCount":130}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"take_snapshot","args":{}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":150,"candidatesTokenCount":20,"totalTokenCount":170}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"complete_task","args":{"result":{"success":true,"summary":"Page title is 'Example Domain'."}}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":200,"candidatesTokenCount":40,"totalTokenCount":240}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"The page title is 'Example Domain'. Now let me check the links on the page."},{"functionCall":{"name":"browser_agent","args":{"task":"Take a snapshot of the accessibility tree on the currently open page and tell me about any links"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":200,"candidatesTokenCount":50,"totalTokenCount":250}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"take_snapshot","args":{}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":150,"candidatesTokenCount":20,"totalTokenCount":170}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"complete_task","args":{"result":{"success":true,"summary":"Found a link 'More information...' pointing to iana.org."}}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":200,"candidatesTokenCount":40,"totalTokenCount":240}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I browsed example.com twice using persistent browser sessions:\n\n1. **First visit**: Page title is 'Example Domain'\n2. **Second visit**: Found a link 'More information...' pointing to iana.org\n\nThe browser stayed open between both visits, confirming persistent session management works correctly."}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":300,"candidatesTokenCount":60,"totalTokenCount":360}}]}

integration-tests/browser-agent.screenshot.responses

@@ -1,4 +1,4 @@
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll navigate to https://example.com and take a screenshot for you."},{"functionCall":{"name":"invoke_agent","args":{"agent_name":"browser_agent","prompt":"Navigate to https://example.com and take a screenshot of the page"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":40,"totalTokenCount":140}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll navigate to https://example.com and take a screenshot for you."},{"functionCall":{"name":"browser_agent","args":{"task":"Navigate to https://example.com and take a screenshot of the page"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":40,"totalTokenCount":140}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"navigate_page","args":{"url":"https://example.com"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":20,"totalTokenCount":120}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"take_screenshot","args":{}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":150,"candidatesTokenCount":20,"totalTokenCount":170}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"complete_task","args":{"result":{"success":true,"summary":"Successfully navigated to https://example.com and captured a screenshot. The page shows the Example Domain header with explanatory text."}}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":200,"candidatesTokenCount":40,"totalTokenCount":240}}]}

integration-tests/browser-agent.sequential.responses

@@ -1,4 +1,4 @@
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll help you navigate to https://example.com and perform both operations - capturing the accessibility tree and taking a screenshot."},{"functionCall":{"name":"invoke_agent","args":{"agent_name":"browser_agent","prompt":"Navigate to https://example.com, take a snapshot of the accessibility tree, then take a screenshot"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":45,"totalTokenCount":145}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll help you navigate to https://example.com and perform both operations - capturing the accessibility tree and taking a screenshot."},{"functionCall":{"name":"browser_agent","args":{"task":"Navigate to https://example.com, take a snapshot of the accessibility tree, then take a screenshot"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":45,"totalTokenCount":145}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"navigate_page","args":{"url":"https://example.com"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":20,"totalTokenCount":120}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"take_snapshot","args":{}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":150,"candidatesTokenCount":20,"totalTokenCount":170}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"take_screenshot","args":{}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":200,"candidatesTokenCount":20,"totalTokenCount":220}}]}

integration-tests/browser-agent.test.ts

@@ -98,9 +98,7 @@ describe.skipIf(!chromeAvailable)('browser-agent', () => {
 
     const toolLogs = rig.readToolLogs();
     const browserAgentCall = toolLogs.find(
-      (t) =>
-        t.toolRequest.name === 'invoke_agent' &&
-        JSON.parse(t.toolRequest.args).agent_name === 'browser_agent',
+      (t) => t.toolRequest.name === 'browser_agent',
     );
     expect(
       browserAgentCall,
@@ -132,9 +130,7 @@ describe.skipIf(!chromeAvailable)('browser-agent', () => {
 
     const toolLogs = rig.readToolLogs();
     const browserCalls = toolLogs.filter(
-      (t) =>
-        t.toolRequest.name === 'invoke_agent' &&
-        JSON.parse(t.toolRequest.args).agent_name === 'browser_agent',
+      (t) => t.toolRequest.name === 'browser_agent',
     );
     expect(browserCalls.length).toBeGreaterThan(0);
 
@@ -165,9 +161,7 @@ describe.skipIf(!chromeAvailable)('browser-agent', () => {
 
     const toolLogs = rig.readToolLogs();
     const browserAgentCall = toolLogs.find(
-      (t) =>
-        t.toolRequest.name === 'invoke_agent' &&
-        JSON.parse(t.toolRequest.args).agent_name === 'browser_agent',
+      (t) => t.toolRequest.name === 'browser_agent',
     );
     expect(
       browserAgentCall,
@@ -227,9 +221,7 @@ describe.skipIf(!chromeAvailable)('browser-agent', () => {
 
     const toolLogs = rig.readToolLogs();
     const browserCalls = toolLogs.filter(
-      (t) =>
-        t.toolRequest.name === 'invoke_agent' &&
-        JSON.parse(t.toolRequest.args).agent_name === 'browser_agent',
+      (t) => t.toolRequest.name === 'browser_agent',
     );
     expect(browserCalls.length).toBeGreaterThan(0);
 
@@ -253,21 +245,18 @@ describe.skipIf(!chromeAvailable)('browser-agent', () => {
           browser: {
             headless: true,
             sessionMode: 'isolated',
-            allowedDomains: ['example.com'],
           },
         },
       },
     });
 
     const result = await rig.run({
-      args: 'First, ask the browser agent to get the page title of example.com. After you receive that response, you MUST invoke the browser agent a second time to check for links on the page.',
+      args: 'Browse to example.com twice: first get the page title, then check for links.',
     });
 
     const toolLogs = rig.readToolLogs();
     const browserCalls = toolLogs.filter(
-      (t) =>
-        t.toolRequest.name === 'invoke_agent' &&
-        JSON.parse(t.toolRequest.args).agent_name === 'browser_agent',
+      (t) => t.toolRequest.name === 'browser_agent',
     );
 
     // Both browser_agent invocations must succeed — if the browser was
@@ -348,9 +337,7 @@ describe.skipIf(!chromeAvailable)('browser-agent', () => {
 
     const toolLogs = rig.readToolLogs();
     const browserCalls = toolLogs.filter(
-      (t) =>
-        t.toolRequest.name === 'invoke_agent' &&
-        JSON.parse(t.toolRequest.args).agent_name === 'browser_agent',
+      (t) => t.toolRequest.name === 'browser_agent',
     );
 
     // Both browser_agent invocations should have been called

integration-tests/browser-policy.responses

@@ -1,4 +1,4 @@
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll help you with that."},{"functionCall":{"name":"invoke_agent","args":{"agent_name":"browser_agent","prompt":"Open https://example.com and check if there is a heading"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":50,"totalTokenCount":150}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll help you with that."},{"functionCall":{"name":"browser_agent","args":{"task":"Open https://example.com and check if there is a heading"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":50,"totalTokenCount":150}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"new_page","args":{"url":"https://example.com"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":50,"totalTokenCount":150}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"take_snapshot","args":{}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":50,"totalTokenCount":150}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"complete_task","args":{"success":true,"summary":"SUCCESS_POLICY_TEST_COMPLETED"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":50,"totalTokenCount":150}}]}

integration-tests/browser-policy.test.ts

@@ -112,8 +112,7 @@ describe.skipIf(!chromeAvailable)('browser-policy', () => {
         `
 [[rule]]
 name = "Force confirm browser_agent"
-toolName = "invoke_agent"
-argsPattern = "\\"agent_name\\":\\\\s*\\"browser_agent\\""
+toolName = "browser_agent"
 decision = "ask_user"
 priority = 200
 `,

integration-tests/globalSetup.ts

@@ -14,7 +14,6 @@ import { join, dirname, extname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { canUseRipgrep } from '../packages/core/src/tools/ripGrep.js';
 import { disableMouseTracking } from '@google/gemini-cli-core';
-import { isolateTestEnv } from '../packages/test-utils/src/env-setup.js';
 import { createServer, type Server } from 'node:http';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -89,8 +88,15 @@ export async function setup() {
   runDir = join(integrationTestsDir, `${Date.now()}`);
   await mkdir(runDir, { recursive: true });
 
-  // Isolate environment variables
-  isolateTestEnv(runDir);
+  // Set the home directory to the test run directory to avoid conflicts
+  // with the user's local config.
+  process.env['HOME'] = runDir;
+  if (process.platform === 'win32') {
+    process.env['USERPROFILE'] = runDir;
+  }
+  // We also need to set the config dir explicitly, since the code might
+  // construct the path before the HOME env var is set.
+  process.env['GEMINI_CONFIG_DIR'] = join(runDir, '.gemini');
 
   // Download ripgrep to avoid race conditions in parallel tests
   const available = await canUseRipgrep();
@@ -121,6 +127,10 @@ export async function setup() {
   }
 
   process.env['INTEGRATION_TEST_FILE_DIR'] = runDir;
+  process.env['GEMINI_CLI_INTEGRATION_TEST'] = 'true';
+  // Force file storage to avoid keychain prompts/hangs in CI, especially on macOS
+  process.env['GEMINI_FORCE_FILE_STORAGE'] = 'true';
+  process.env['TELEMETRY_LOG_FILE'] = join(runDir, 'telemetry.log');
 
   if (process.env['KEEP_OUTPUT']) {
     console.log(`Keeping output for test run in: ${runDir}`);

package-lock.json

@@ -1,17 +1,17 @@
 {
   "name": "@google/gemini-cli",
-  "version": "0.39.0-nightly.20260408.e77b22e63",
+  "version": "0.36.0-nightly.20260317.2f90b4653",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@google/gemini-cli",
-      "version": "0.39.0-nightly.20260408.e77b22e63",
+      "version": "0.36.0-nightly.20260317.2f90b4653",
       "workspaces": [
         "packages/*"
       ],
       "dependencies": {
-        "ink": "npm:@jrichman/ink@6.6.9",
+        "ink": "npm:@jrichman/ink@6.6.7",
         "latest-version": "^9.0.0",
         "node-fetch-native": "^1.6.7",
         "proper-lockfile": "^4.1.2",
@@ -36,7 +36,6 @@
         "@types/ws": "^8.18.1",
         "@vitest/coverage-v8": "^3.1.1",
         "@vitest/eslint-plugin": "^1.3.4",
-        "asciichart": "^1.5.25",
         "cross-env": "^7.0.3",
         "depcheck": "^1.4.7",
         "domexception": "^4.0.0",
@@ -447,7 +446,8 @@
       "version": "2.11.0",
       "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-2.11.0.tgz",
       "integrity": "sha512-sBXGT13cpmPR5BMgHE6UEEfEaShh5Ror6rfN3yEK5si7QVrtZg8LEPQb0VVhiLRUslD2yLnXtnRzG035J/mZXQ==",
-      "license": "(Apache-2.0 AND BSD-3-Clause)"
+      "license": "(Apache-2.0 AND BSD-3-Clause)",
+      "peer": true
     },
     "node_modules/@bundled-es-modules/cookie": {
       "version": "2.0.1",
@@ -1450,6 +1450,7 @@
       "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.13.4.tgz",
       "integrity": "sha512-GsFaMXCkMqkKIvwCQjCrwH+GHbPKBjhwo/8ZuUkWHqbI73Kky9I+pQltrlT0+MWpedCoosda53lgjYfyEPgxBg==",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "@grpc/proto-loader": "^0.7.13",
         "@js-sdsl/ordered-map": "^4.4.2"
@@ -2156,6 +2157,7 @@
       "integrity": "sha512-t54CUOsFMappY1Jbzb7fetWeO0n6K0k/4+/ZpkS+3Joz8I4VcvY9OiEBFRYISqaI2fq5sCiPtAjRDOzVYG8m+Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@octokit/auth-token": "^6.0.0",
         "@octokit/graphql": "^9.0.2",
@@ -2336,6 +2338,7 @@
       "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz",
       "integrity": "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==",
       "license": "Apache-2.0",
+      "peer": true,
       "engines": {
         "node": ">=8.0.0"
       }
@@ -2385,6 +2388,7 @@
       "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-2.5.0.tgz",
       "integrity": "sha512-ka4H8OM6+DlUhSAZpONu0cPBtPPTQKxbxVzC4CzVx5+K4JnroJVBtDzLAMx4/3CDTJXRvVFhpFjtl4SaiTNoyQ==",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "@opentelemetry/semantic-conventions": "^1.29.0"
       },
@@ -2759,6 +2763,7 @@
       "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-2.5.0.tgz",
       "integrity": "sha512-F8W52ApePshpoSrfsSk1H2yJn9aKjCrbpQF1M9Qii0GHzbfVeFUB+rc3X4aggyZD8x9Gu3Slua+s6krmq6Dt8g==",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "@opentelemetry/core": "2.5.0",
         "@opentelemetry/semantic-conventions": "^1.29.0"
@@ -2792,6 +2797,7 @@
       "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics/-/sdk-metrics-2.5.0.tgz",
       "integrity": "sha512-BeJLtU+f5Gf905cJX9vXFQorAr6TAfK3SPvTFqP+scfIpDQEJfRaGJWta7sJgP+m4dNtBf9y3yvBKVAZZtJQVA==",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "@opentelemetry/core": "2.5.0",
         "@opentelemetry/resources": "2.5.0"
@@ -2846,6 +2852,7 @@
       "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-2.5.0.tgz",
       "integrity": "sha512-VzRf8LzotASEyNDUxTdaJ9IRJ1/h692WyArDBInf5puLCjxbICD6XkHgpuudis56EndyS7LYFmtTMny6UABNdQ==",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "@opentelemetry/core": "2.5.0",
         "@opentelemetry/resources": "2.5.0",
@@ -4082,6 +4089,7 @@
       "integrity": "sha512-6mDvHUFSjyT2B2yeNx2nUgMxh9LtOWvkhIU3uePn2I2oyNymUAX1NIsdgviM4CH+JSrp2D2hsMvJOkxY+0wNRA==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "csstype": "^3.0.2"
       }
@@ -4356,6 +4364,7 @@
       "integrity": "sha512-6sMvZePQrnZH2/cJkwRpkT7DxoAWh+g6+GFRK6bV3YQo7ogi3SX5rgF6099r5Q53Ma5qeT7LGmOmuIutF4t3lA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.35.0",
         "@typescript-eslint/types": "8.35.0",
@@ -5229,6 +5238,7 @@
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -7369,7 +7379,8 @@
       "version": "0.0.1581282",
       "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1581282.tgz",
       "integrity": "sha512-nv7iKtNZQshSW2hKzYNr46nM/Cfh5SEvE2oV0/SEGgc9XupIY5ggf84Cz8eJIkBce7S3bmTAauFD6aysMpnqsQ==",
-      "license": "BSD-3-Clause"
+      "license": "BSD-3-Clause",
+      "peer": true
     },
     "node_modules/dezalgo": {
       "version": "1.0.4",
@@ -7953,6 +7964,7 @@
       "integrity": "sha512-GsGizj2Y1rCWDu6XoEekL3RLilp0voSePurjZIkxL3wlm5o5EC9VpgaP7lrCvjnkuLvzFBQWB3vWB3K5KQTveQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -8470,6 +8482,7 @@
       "resolved": "https://registry.npmjs.org/express/-/express-5.2.1.tgz",
       "integrity": "sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "accepts": "^2.0.0",
         "body-parser": "^2.2.1",
@@ -9782,6 +9795,7 @@
       "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.7.tgz",
       "integrity": "sha512-jq9l1DM0zVIvsm3lv9Nw9nlJnMNPOcAtsbsgiUhWcFzPE99Gvo6yRTlszSLLYacMeQ6quHD6hMfId8crVHvexw==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=16.9.0"
       }
@@ -10056,10 +10070,11 @@
     },
     "node_modules/ink": {
       "name": "@jrichman/ink",
-      "version": "6.6.9",
-      "resolved": "https://registry.npmjs.org/@jrichman/ink/-/ink-6.6.9.tgz",
-      "integrity": "sha512-RL9sSiLQZECnjbmBwjIHOp8yVGdWF7C/uifg7ISv/e+F3nLNsfl7FdUFQs8iZARFMJAYxMFpxW6OW+HSt9drwQ==",
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/@jrichman/ink/-/ink-6.6.7.tgz",
+      "integrity": "sha512-bDzQLpLzK/dn9Ur/Ku88ZZR9totVcMGrGYAgPHidsAAbe9NKztU1fggj/iu0wRp5g1kBeALb3cfagFGdDxAU1w==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "ansi-escapes": "^7.0.0",
         "ansi-styles": "^6.2.3",
@@ -13833,6 +13848,7 @@
       "resolved": "https://registry.npmjs.org/react/-/react-19.2.4.tgz",
       "integrity": "sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -13843,6 +13859,7 @@
       "integrity": "sha512-ePrwPfxAnB+7hgnEr8vpKxL9cmnp7F322t8oqcPshbIQQhDKgFDW4tjhF2wjVbdXF9O/nyuy3sQWd9JGpiLPvA==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "shell-quote": "^1.6.1",
         "ws": "^7"
@@ -15992,6 +16009,7 @@
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -16214,7 +16232,8 @@
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-      "license": "0BSD"
+      "license": "0BSD",
+      "peer": true
     },
     "node_modules/tsx": {
       "version": "4.20.3",
@@ -16222,6 +16241,7 @@
       "integrity": "sha512-qjbnuR9Tr+FJOMBqJCW5ehvIo/buZq7vH7qD7JziU98h6l3qGy0a/yPFjwO+y0/T7GFpNgNAvEcPPVfyT8rrPQ==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "esbuild": "~0.25.0",
         "get-tsconfig": "^4.7.5"
@@ -16387,6 +16407,7 @@
       "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
       "devOptional": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -16609,6 +16630,7 @@
       "resolved": "https://registry.npmjs.org/vite/-/vite-7.2.2.tgz",
       "integrity": "sha512-BxAKBWmIbrDgrokdGZH1IgkIk/5mMHDreLDmCJ0qpyJaAteP8NvMhkwr/ZCQNqNH97bw/dANTE9PDzqwJghfMQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "esbuild": "^0.25.0",
         "fdir": "^6.5.0",
@@ -16722,6 +16744,7 @@
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -16734,6 +16757,7 @@
       "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.2.4.tgz",
       "integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/chai": "^5.2.2",
         "@vitest/expect": "3.2.4",
@@ -17381,6 +17405,7 @@
       "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
       "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
       "license": "MIT",
+      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
@@ -17396,7 +17421,7 @@
     },
     "packages/a2a-server": {
       "name": "@google/gemini-cli-a2a-server",
-      "version": "0.39.0-nightly.20260408.e77b22e63",
+      "version": "0.36.0-nightly.20260317.2f90b4653",
       "dependencies": {
         "@a2a-js/sdk": "0.3.11",
         "@google-cloud/storage": "^7.16.0",
@@ -17511,7 +17536,7 @@
     },
     "packages/cli": {
       "name": "@google/gemini-cli",
-      "version": "0.39.0-nightly.20260408.e77b22e63",
+      "version": "0.36.0-nightly.20260317.2f90b4653",
       "license": "Apache-2.0",
       "dependencies": {
         "@agentclientprotocol/sdk": "^0.16.1",
@@ -17533,7 +17558,7 @@
         "fzf": "^0.5.2",
         "glob": "^12.0.0",
         "highlight.js": "^11.11.1",
-        "ink": "npm:@jrichman/ink@6.6.9",
+        "ink": "npm:@jrichman/ink@6.6.7",
         "ink-gradient": "^3.0.0",
         "ink-spinner": "^5.0.0",
         "latest-version": "^9.0.0",
@@ -17683,7 +17708,7 @@
     },
     "packages/core": {
       "name": "@google/gemini-cli-core",
-      "version": "0.39.0-nightly.20260408.e77b22e63",
+      "version": "0.36.0-nightly.20260317.2f90b4653",
       "license": "Apache-2.0",
       "dependencies": {
         "@a2a-js/sdk": "0.3.11",
@@ -17824,6 +17849,7 @@
       "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.14.3.tgz",
       "integrity": "sha512-Iq8QQQ/7X3Sac15oB6p0FmUg/klxQvXLeileoqrTRGJYLV+/9tubbr9ipz0GKHjmXVsgFPo/+W+2cA8eNcR+XA==",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "@grpc/proto-loader": "^0.8.0",
         "@js-sdsl/ordered-map": "^4.4.2"
@@ -17927,6 +17953,7 @@
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -17949,7 +17976,7 @@
     },
     "packages/devtools": {
       "name": "@google/gemini-cli-devtools",
-      "version": "0.39.0-nightly.20260408.e77b22e63",
+      "version": "0.36.0-nightly.20260317.2f90b4653",
       "license": "Apache-2.0",
       "dependencies": {
         "ws": "^8.16.0"
@@ -17964,7 +17991,7 @@
     },
     "packages/sdk": {
       "name": "@google/gemini-cli-sdk",
-      "version": "0.39.0-nightly.20260408.e77b22e63",
+      "version": "0.36.0-nightly.20260317.2f90b4653",
       "license": "Apache-2.0",
       "dependencies": {
         "@google/gemini-cli-core": "file:../core",
@@ -17981,7 +18008,7 @@
     },
     "packages/test-utils": {
       "name": "@google/gemini-cli-test-utils",
-      "version": "0.39.0-nightly.20260408.e77b22e63",
+      "version": "0.36.0-nightly.20260317.2f90b4653",
       "license": "Apache-2.0",
       "dependencies": {
         "@google/gemini-cli-core": "file:../core",
@@ -17999,7 +18026,7 @@
     },
     "packages/vscode-ide-companion": {
       "name": "gemini-cli-vscode-ide-companion",
-      "version": "0.39.0-nightly.20260408.e77b22e63",
+      "version": "0.36.0-nightly.20260317.2f90b4653",
       "license": "LICENSE",
       "dependencies": {
         "@modelcontextprotocol/sdk": "^1.23.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/gemini-cli",
-  "version": "0.39.0-nightly.20260408.e77b22e63",
+  "version": "0.36.0-nightly.20260317.2f90b4653",
   "engines": {
     "node": ">=20.0.0"
   },
@@ -14,7 +14,7 @@
     "url": "git+https://github.com/google-gemini/gemini-cli.git"
   },
   "config": {
-    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.39.0-nightly.20260408.e77b22e63"
+    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.36.0-nightly.20260317.2f90b4653"
   },
   "scripts": {
     "start": "cross-env NODE_ENV=development node scripts/start.js",
@@ -53,8 +53,6 @@
     "test:integration:sandbox:none": "cross-env GEMINI_SANDBOX=false vitest run --root ./integration-tests",
     "test:memory": "vitest run --root ./memory-tests",
     "test:memory:update-baselines": "cross-env UPDATE_MEMORY_BASELINES=true vitest run --root ./memory-tests",
-    "test:perf": "vitest run --root ./perf-tests",
-    "test:perf:update-baselines": "cross-env UPDATE_PERF_BASELINES=true vitest run --root ./perf-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": "cross-env NODE_OPTIONS=\"--max-old-space-size=8192\" eslint . --cache --max-warnings 0",
@@ -73,7 +71,7 @@
     "pre-commit": "node scripts/pre-commit.js"
   },
   "overrides": {
-    "ink": "npm:@jrichman/ink@6.6.9",
+    "ink": "npm:@jrichman/ink@6.6.7",
     "wrap-ansi": "9.0.2",
     "cliui": {
       "wrap-ansi": "7.0.0"
@@ -107,7 +105,6 @@
     "@types/ws": "^8.18.1",
     "@vitest/coverage-v8": "^3.1.1",
     "@vitest/eslint-plugin": "^1.3.4",
-    "asciichart": "^1.5.25",
     "cross-env": "^7.0.3",
     "depcheck": "^1.4.7",
     "domexception": "^4.0.0",
@@ -142,7 +139,7 @@
     "yargs": "^17.7.2"
   },
   "dependencies": {
-    "ink": "npm:@jrichman/ink@6.6.9",
+    "ink": "npm:@jrichman/ink@6.6.7",
     "latest-version": "^9.0.0",
     "node-fetch-native": "^1.6.7",
     "proper-lockfile": "^4.1.2",

packages/a2a-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/gemini-cli-a2a-server",
-  "version": "0.39.0-nightly.20260408.e77b22e63",
+  "version": "0.36.0-nightly.20260317.2f90b4653",
   "description": "Gemini CLI A2A Server",
   "repository": {
     "type": "git",

packages/cli/index.ts

@@ -6,9 +6,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { spawn } from 'node:child_process';
-import os from 'node:os';
-import v8 from 'node:v8';
+import { main } from './src/gemini.js';
+import { FatalError, writeToStderr } from '@google/gemini-cli-core';
+import { runExitCleanup } from './src/utils/cleanup.js';
 
 // --- Global Entry Point ---
 
@@ -28,162 +28,44 @@ 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) {
-    process.stderr.write(error.stack + '\n');
+    writeToStderr(error.stack + '\n');
   } else {
-    process.stderr.write(String(error) + '\n');
+    writeToStderr(String(error) + '\n');
   }
   process.exit(1);
 });
 
-async function getMemoryNodeArgs(): Promise<string[]> {
-  let autoConfigureMemory = true;
+main().catch(async (error) => {
+  // Set a timeout to force exit if cleanup hangs
+  const cleanupTimeout = setTimeout(() => {
+    writeToStderr('Cleanup timed out, forcing exit...\n');
+    process.exit(1);
+  }, 5000);
+
   try {
-    const { readFileSync } = await import('node:fs');
-    const { join } = await import('node:path');
-    // Respect GEMINI_CLI_HOME environment variable, falling back to os.homedir()
-    const baseDir =
-      process.env['GEMINI_CLI_HOME'] || join(os.homedir(), '.gemini');
-    const settingsPath = join(baseDir, 'settings.json');
-    const rawSettings = readFileSync(settingsPath, 'utf8');
-    const settings = JSON.parse(rawSettings);
-    if (settings?.advanced?.autoConfigureMemory === false) {
-      autoConfigureMemory = false;
-    }
-  } catch {
-    // ignore
-  }
-
-  if (autoConfigureMemory) {
-    const totalMemoryMB = os.totalmem() / (1024 * 1024);
-    const heapStats = v8.getHeapStatistics();
-    const currentMaxOldSpaceSizeMb = Math.floor(
-      heapStats.heap_size_limit / 1024 / 1024,
+    await runExitCleanup();
+  } catch (cleanupError) {
+    writeToStderr(
+      `Error during final cleanup: ${cleanupError instanceof Error ? cleanupError.message : String(cleanupError)}\n`,
     );
-    const targetMaxOldSpaceSizeInMB = Math.floor(totalMemoryMB * 0.5);
-
-    if (targetMaxOldSpaceSizeInMB > currentMaxOldSpaceSizeMb) {
-      return [`--max-old-space-size=${targetMaxOldSpaceSizeInMB}`];
-    }
+  } finally {
+    clearTimeout(cleanupTimeout);
   }
 
-  return [];
-}
-
-async function run() {
-  if (!process.env['GEMINI_CLI_NO_RELAUNCH'] && !process.env['SANDBOX']) {
-    // --- Lightweight Parent Process / Daemon ---
-    // We avoid importing heavy dependencies here to save ~1.5s of startup time.
-
-    const nodeArgs: string[] = [...process.execArgv];
-    const scriptArgs = process.argv.slice(2);
-
-    const memoryArgs = await getMemoryNodeArgs();
-    nodeArgs.push(...memoryArgs);
-
-    const script = process.argv[1];
-    nodeArgs.push(script);
-    nodeArgs.push(...scriptArgs);
-
-    const newEnv = { ...process.env, GEMINI_CLI_NO_RELAUNCH: 'true' };
-    const RELAUNCH_EXIT_CODE = 199;
-    let latestAdminSettings: unknown = undefined;
-
-    // Prevent the parent process from exiting prematurely on signals.
-    // The child process will receive the same signals and handle its own cleanup.
-    for (const sig of ['SIGINT', 'SIGTERM', 'SIGHUP']) {
-      process.on(sig as NodeJS.Signals, () => {});
+  if (error instanceof FatalError) {
+    let errorMessage = error.message;
+    if (!process.env['NO_COLOR']) {
+      errorMessage = `\x1b[31m${errorMessage}\x1b[0m`;
     }
+    writeToStderr(errorMessage + '\n');
+    process.exit(error.exitCode);
+  }
 
-    const runner = () => {
-      process.stdin.pause();
-
-      const child = spawn(process.execPath, nodeArgs, {
-        stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
-        env: newEnv,
-      });
-
-      if (latestAdminSettings) {
-        child.send({ type: 'admin-settings', settings: latestAdminSettings });
-      }
-
-      child.on('message', (msg: { type?: string; settings?: unknown }) => {
-        if (msg.type === 'admin-settings-update' && msg.settings) {
-          latestAdminSettings = msg.settings;
-        }
-      });
-
-      return new Promise<number>((resolve) => {
-        child.on('error', (err) => {
-          process.stderr.write(
-            'Error: Failed to start child process: ' + err.message + '\n',
-          );
-          resolve(1);
-        });
-        child.on('close', (code) => {
-          process.stdin.resume();
-          resolve(code ?? 1);
-        });
-      });
-    };
-
-    while (true) {
-      try {
-        const exitCode = await runner();
-        if (exitCode !== RELAUNCH_EXIT_CODE) {
-          process.exit(exitCode);
-        }
-      } catch (error: unknown) {
-        process.stdin.resume();
-        process.stderr.write(
-          `Fatal error: Failed to relaunch the CLI process.\n${error instanceof Error ? (error.stack ?? error.message) : String(error)}\n`,
-        );
-        process.exit(1);
-      }
-    }
+  writeToStderr('An unexpected critical error occurred:');
+  if (error instanceof Error) {
+    writeToStderr(error.stack + '\n');
   } else {
-    // --- Heavy Child Process ---
-    // Now we can safely import everything.
-    const { main } = await import('./src/gemini.js');
-    const { FatalError, writeToStderr } = await import(
-      '@google/gemini-cli-core'
-    );
-    const { runExitCleanup } = await import('./src/utils/cleanup.js');
-
-    main().catch(async (error: unknown) => {
-      // Set a timeout to force exit if cleanup hangs
-      const cleanupTimeout = setTimeout(() => {
-        writeToStderr('Cleanup timed out, forcing exit...\n');
-        process.exit(1);
-      }, 5000);
-
-      try {
-        await runExitCleanup();
-      } catch (cleanupError: unknown) {
-        writeToStderr(
-          `Error during final cleanup: ${cleanupError instanceof Error ? cleanupError.message : String(cleanupError)}\n`,
-        );
-      } finally {
-        clearTimeout(cleanupTimeout);
-      }
-
-      if (error instanceof FatalError) {
-        let errorMessage = error.message;
-        if (!process.env['NO_COLOR']) {
-          errorMessage = `\x1b[31m${errorMessage}\x1b[0m`;
-        }
-        writeToStderr(errorMessage + '\n');
-        process.exit(error.exitCode);
-      }
-
-      writeToStderr('An unexpected critical error occurred:');
-      if (error instanceof Error) {
-        writeToStderr(error.stack + '\n');
-      } else {
-        writeToStderr(String(error) + '\n');
-      }
-      process.exit(1);
-    });
+    writeToStderr(String(error) + '\n');
   }
-}
-
-run();
+  process.exit(1);
+});

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/gemini-cli",
-  "version": "0.39.0-nightly.20260408.e77b22e63",
+  "version": "0.36.0-nightly.20260317.2f90b4653",
   "description": "Gemini CLI",
   "license": "Apache-2.0",
   "repository": {
@@ -27,7 +27,7 @@
     "dist"
   ],
   "config": {
-    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.39.0-nightly.20260408.e77b22e63"
+    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.36.0-nightly.20260317.2f90b4653"
   },
   "dependencies": {
     "@agentclientprotocol/sdk": "^0.16.1",
@@ -49,7 +49,7 @@
     "fzf": "^0.5.2",
     "glob": "^12.0.0",
     "highlight.js": "^11.11.1",
-    "ink": "npm:@jrichman/ink@6.6.9",
+    "ink": "npm:@jrichman/ink@6.6.7",
     "ink-gradient": "^3.0.0",
     "ink-spinner": "^5.0.0",
     "latest-version": "^9.0.0",

packages/cli/src/acp/acpClient.ts

@@ -372,7 +372,7 @@ export class GeminiAgent {
       mcpServers,
     );
 
-    const sessionSelector = new SessionSelector(config.storage);
+    const sessionSelector = new SessionSelector(config);
     const { sessionData, sessionPath } =
       await sessionSelector.resolveSession(sessionId);
 

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

@@ -6,7 +6,6 @@
 
 import {
   addMemory,
-  listInboxSkills,
   listMemoryFiles,
   refreshMemory,
   showMemory,
@@ -31,7 +30,6 @@ export class MemoryCommand implements Command {
     new RefreshMemoryCommand(),
     new ListMemoryCommand(),
     new AddMemoryCommand(),
-    new InboxMemoryCommand(),
   ];
   readonly requiresWorkspace = true;
 
@@ -124,39 +122,3 @@ export class AddMemoryCommand implements Command {
     }
   }
 }
-
-export class InboxMemoryCommand implements Command {
-  readonly name = 'memory inbox';
-  readonly description =
-    'Lists skills extracted from past sessions that are pending review.';
-
-  async execute(
-    context: CommandContext,
-    _: string[],
-  ): Promise<CommandExecutionResponse> {
-    if (!context.agentContext.config.isMemoryManagerEnabled()) {
-      return {
-        name: this.name,
-        data: 'The memory inbox requires the experimental memory manager. Enable it with: experimental.memoryManager = true in settings.',
-      };
-    }
-
-    const skills = await listInboxSkills(context.agentContext.config);
-
-    if (skills.length === 0) {
-      return { name: this.name, data: 'No extracted skills in inbox.' };
-    }
-
-    const lines = skills.map((s) => {
-      const date = s.extractedAt
-        ? ` (extracted: ${new Date(s.extractedAt).toLocaleDateString()})`
-        : '';
-      return `- **${s.name}**: ${s.description}${date}`;
-    });
-
-    return {
-      name: this.name,
-      data: `Skill inbox (${skills.length}):\n${lines.join('\n')}`,
-    };
-  }
-}

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

@@ -153,49 +153,5 @@ describe('footerItems', () => {
       expect(state.orderedIds).toContain('auth');
       expect(state.selectedIds.has('auth')).toBe(true);
     });
-
-    it('includes context-used in selectedIds when hideContextPercentage is false and items is undefined', () => {
-      const settings = createMockSettings({
-        ui: {
-          footer: {
-            hideContextPercentage: false,
-          },
-        },
-      }).merged;
-
-      const state = resolveFooterState(settings);
-      expect(state.selectedIds.has('context-used')).toBe(true);
-      expect(state.orderedIds).toContain('context-used');
-    });
-
-    it('does not include context-used in selectedIds when hideContextPercentage is true (default)', () => {
-      const settings = createMockSettings({
-        ui: {
-          footer: {
-            hideContextPercentage: true,
-          },
-        },
-      }).merged;
-
-      const state = resolveFooterState(settings);
-      expect(state.selectedIds.has('context-used')).toBe(false);
-      // context-used should still be in orderedIds (as unselected)
-      expect(state.orderedIds).toContain('context-used');
-    });
-
-    it('persisted items array takes precedence over hideContextPercentage', () => {
-      const settings = createMockSettings({
-        ui: {
-          footer: {
-            items: ['workspace', 'model-name'],
-            hideContextPercentage: false,
-          },
-        },
-      }).merged;
-
-      const state = resolveFooterState(settings);
-      // items array explicitly omits context-used, so it should not be selected
-      expect(state.selectedIds.has('context-used')).toBe(false);
-    });
   });
 });

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

@@ -67,11 +67,6 @@ describe('Policy Engine Integration Tests', () => {
       expect(
         (await engine.check({ name: 'unknown_tool' }, undefined)).decision,
       ).toBe(PolicyDecision.ASK_USER);
-
-      // invoke_agent should be allowed by default (via agents.toml)
-      expect(
-        (await engine.check({ name: 'invoke_agent' }, undefined)).decision,
-      ).toBe(PolicyDecision.ALLOW);
     });
 
     it('should handle MCP server wildcard patterns correctly', async () => {
@@ -355,37 +350,9 @@ describe('Policy Engine Integration Tests', () => {
         (await engine.check({ name: 'get_internal_docs' }, undefined)).decision,
       ).toBe(PolicyDecision.ALLOW);
       expect(
-        (
-          await engine.check(
-            { name: 'invoke_agent', args: { agent_name: 'cli_help' } },
-            undefined,
-          )
-        ).decision,
+        (await engine.check({ name: 'cli_help' }, undefined)).decision,
       ).toBe(PolicyDecision.ALLOW);
 
-      // codebase_investigator should be allowed in Plan mode
-      expect(
-        (
-          await engine.check(
-            {
-              name: 'invoke_agent',
-              args: { agent_name: 'codebase_investigator' },
-            },
-            undefined,
-          )
-        ).decision,
-      ).toBe(PolicyDecision.ALLOW);
-
-      // Unknown agents should be denied in Plan mode (via catch-all)
-      expect(
-        (
-          await engine.check(
-            { name: 'invoke_agent', args: { agent_name: 'unknown_agent' } },
-            undefined,
-          )
-        ).decision,
-      ).toBe(PolicyDecision.DENY);
-
       // Other tools should be denied via catch all
       expect(
         (await engine.check({ name: 'replace' }, undefined)).decision,

packages/cli/src/config/settingsSchema.ts

@@ -1907,8 +1907,7 @@ const SETTINGS_SCHEMA = {
         category: 'Advanced',
         requiresRestart: true,
         default: true,
-        description:
-          'Automatically configure Node.js memory limits. Note: Because memory is allocated during the initial process boot, this setting is only read from the global user settings file and ignores workspace-level overrides.',
+        description: 'Automatically configure Node.js memory limits',
         showInDialog: true,
       },
       dnsResolutionOrder: {

packages/cli/src/gemini.test.tsx

@@ -304,25 +304,6 @@ describe('gemini.tsx main function', () => {
     vi.restoreAllMocks();
   });
 
-  it('should suppress AbortError and not open debug console', async () => {
-    const debugLoggerErrorSpy = vi.spyOn(debugLogger, 'error');
-    const debugLoggerLogSpy = vi.spyOn(debugLogger, 'log');
-    const abortError = new DOMException(
-      'The operation was aborted.',
-      'AbortError',
-    );
-
-    setupUnhandledRejectionHandler();
-    process.emit('unhandledRejection', abortError, Promise.resolve());
-
-    await new Promise(process.nextTick);
-
-    expect(debugLoggerErrorSpy).not.toHaveBeenCalled();
-    expect(debugLoggerLogSpy).toHaveBeenCalledWith(
-      expect.stringContaining('Suppressed unhandled AbortError'),
-    );
-  });
-
   it('should log unhandled promise rejections and open debug console on first error', async () => {
     const processExitSpy = vi
       .spyOn(process, 'exit')

packages/cli/src/gemini.tsx

@@ -13,7 +13,7 @@ import {
   type OutputPayload,
   type ConsoleLogPayload,
   type UserFeedbackPayload,
-  createSessionId,
+  sessionId,
   logUserPrompt,
   AuthType,
   UserPromptEvent,
@@ -33,7 +33,6 @@ import {
   type AdminControlsSettings,
   debugLogger,
   isHeadlessMode,
-  Storage,
 } from '@google/gemini-cli-core';
 
 import { loadCliConfig, parseArguments } from './config/config.js';
@@ -81,7 +80,10 @@ import { validateNonInteractiveAuth } from './validateNonInterActiveAuth.js';
 import { appEvents, AppEvent } from './utils/events.js';
 import { SessionError, SessionSelector } from './utils/sessionUtils.js';
 
-import { relaunchOnExitCode } from './utils/relaunch.js';
+import {
+  relaunchAppInChildProcess,
+  relaunchOnExitCode,
+} from './utils/relaunch.js';
 import { loadSandboxConfig } from './config/sandboxConfig.js';
 import { deleteSession, listSessions } from './utils/sessions.js';
 import { createPolicyUpdater } from './config/policy.js';
@@ -164,14 +166,6 @@ export function getNodeMemoryArgs(isDebugMode: boolean): string[] {
 export function setupUnhandledRejectionHandler() {
   let unhandledRejectionOccurred = false;
   process.on('unhandledRejection', (reason, _promise) => {
-    // AbortError is expected when the user cancels a request (e.g. pressing ESC).
-    // It may surface as an unhandled rejection due to async timing in the
-    // streaming pipeline, but it is not a bug.
-    if (reason instanceof Error && reason.name === 'AbortError') {
-      debugLogger.log(`Suppressed unhandled AbortError: ${reason.message}`);
-      return;
-    }
-
     const errorMessage = `=========================================
 This is an unexpected error. Please file a bug report using the /bug tool.
 CRITICAL: Unhandled Promise Rejection!
@@ -191,39 +185,6 @@ ${reason.stack}`
   });
 }
 
-export async function resolveSessionId(resumeArg: string | undefined): Promise<{
-  sessionId: string;
-  resumedSessionData?: ResumedSessionData;
-}> {
-  if (!resumeArg) {
-    return { sessionId: createSessionId() };
-  }
-
-  const storage = new Storage(process.cwd());
-  await storage.initialize();
-
-  try {
-    const { sessionData, sessionPath } = await new SessionSelector(
-      storage,
-    ).resolveSession(resumeArg);
-    return {
-      sessionId: sessionData.sessionId,
-      resumedSessionData: { conversation: sessionData, filePath: sessionPath },
-    };
-  } catch (error) {
-    if (error instanceof SessionError && error.code === 'NO_SESSIONS_FOUND') {
-      coreEvents.emitFeedback('warning', error.message);
-      return { sessionId: createSessionId() };
-    }
-    coreEvents.emitFeedback(
-      'error',
-      `Error resuming session: ${error instanceof Error ? error.message : 'Unknown error'}`,
-    );
-    await runExitCleanup();
-    process.exit(ExitCodes.FATAL_INPUT_ERROR);
-  }
-}
-
 export async function startInteractiveUI(
   config: Config,
   settings: LoadedSettings,
@@ -319,8 +280,6 @@ export async function main() {
 
   const argv = await argvPromise;
 
-  const { sessionId, resumedSessionData } = await resolveSessionId(argv.resume);
-
   if (
     (argv.allowedTools && argv.allowedTools.length > 0) ||
     (settings.merged.tools?.allowed && settings.merged.tools.allowed.length > 0)
@@ -444,12 +403,6 @@ export async function main() {
   // Set remote admin settings if returned from CCPA.
   if (remoteAdminSettings) {
     settings.setRemoteAdminSettings(remoteAdminSettings);
-    if (process.send) {
-      process.send({
-        type: 'admin-settings-update',
-        settings: remoteAdminSettings,
-      });
-    }
   }
 
   // Run deferred command now that we have admin settings.
@@ -507,6 +460,10 @@ export async function main() {
       );
       await runExitCleanup();
       process.exit(ExitCodes.SUCCESS);
+    } else {
+      // Relaunch app so we always have a child process that can be internally
+      // restarted if needed.
+      await relaunchAppInChildProcess(memoryArgs, [], remoteAdminSettings);
     }
   }
 
@@ -642,6 +599,40 @@ export async function main() {
       })),
     ];
 
+    // Handle --resume flag
+    let resumedSessionData: ResumedSessionData | undefined = undefined;
+    if (argv.resume) {
+      const sessionSelector = new SessionSelector(config);
+      try {
+        const result = await sessionSelector.resolveSession(argv.resume);
+        resumedSessionData = {
+          conversation: result.sessionData,
+          filePath: result.sessionPath,
+        };
+        // Use the existing session ID to continue recording to the same session
+        config.setSessionId(resumedSessionData.conversation.sessionId);
+      } catch (error) {
+        if (
+          error instanceof SessionError &&
+          error.code === 'NO_SESSIONS_FOUND'
+        ) {
+          // No sessions to resume — start a fresh session with a warning
+          startupWarnings.push({
+            id: 'resume-no-sessions',
+            message: error.message,
+            priority: WarningPriority.High,
+          });
+        } else {
+          coreEvents.emitFeedback(
+            'error',
+            `Error resuming session: ${error instanceof Error ? error.message : 'Unknown error'}`,
+          );
+          await runExitCleanup();
+          process.exit(ExitCodes.FATAL_INPUT_ERROR);
+        }
+      }
+    }
+
     cliStartupHandle?.end();
 
     // Render UI, passing necessary config values. Check that there is no command line question.

packages/cli/src/gemini_cleanup.test.tsx

@@ -73,7 +73,6 @@ vi.mock('./config/config.js', () => ({
     getSandbox: vi.fn(() => false),
     getQuestion: vi.fn(() => ''),
     isInteractive: () => false,
-    getSessionId: vi.fn().mockReturnValue('test-session-id'),
     storage: { initialize: vi.fn().mockResolvedValue(undefined) },
   } as unknown as Config),
   parseArguments: vi.fn().mockResolvedValue({}),
@@ -214,7 +213,6 @@ describe('gemini.tsx main function cleanup', () => {
       getSandbox: vi.fn(() => false),
       getDebugMode: vi.fn(() => false),
       getPolicyEngine: vi.fn(),
-      getSessionId: vi.fn().mockReturnValue('test-session-id'),
       getMessageBus: () => ({ subscribe: vi.fn() }),
       getEnableHooks: vi.fn(() => false),
       getHookSystem: () => undefined,
@@ -275,7 +273,6 @@ describe('gemini.tsx main function cleanup', () => {
     vi.mocked(loadCliConfig).mockResolvedValue(
       buildMockConfig({
         getHookSystem: vi.fn(() => mockHookSystem),
-        getSessionId: vi.fn().mockReturnValue('test-session-id'),
       }),
     );
 

packages/cli/src/interactiveCli.tsx

@@ -107,7 +107,7 @@ export async function startInteractiveUI(
               <TerminalProvider>
                 <ScrollProvider>
                   <OverflowProvider>
-                    <SessionStatsProvider sessionId={config.getSessionId()}>
+                    <SessionStatsProvider>
                       <VimModeProvider>
                         <AppContainer
                           config={config}

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

@@ -36,10 +36,6 @@ import {
   CoreToolCallStatus,
   IntegrityDataStatus,
 } from '@google/gemini-cli-core';
-import {
-  getUsageMetrics,
-  type UsageMetrics,
-} from '@google/gemini-cli-test-utils';
 import {
   type MockShellCommand,
   MockShellExecutionService,
@@ -481,14 +477,6 @@ export class AppRig {
     return this.testDir;
   }
 
-  /**
-   * Scans the session recordings and extracts aggregate token usage and turn counts.
-   * This provides an empirical measure of the agent's efficiency and cost.
-   */
-  getUsageMetrics(): UsageMetrics {
-    return getUsageMetrics(this.testDir);
-  }
-
   getPendingConfirmations() {
     return Array.from(this.pendingConfirmations.values());
   }

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

@@ -731,7 +731,7 @@ export const renderWithProviders = async (
             <UIStateContext.Provider value={finalUiState}>
               <VimModeProvider>
                 <ShellFocusContext.Provider value={shellFocus}>
-                  <SessionStatsProvider sessionId={config.getSessionId()}>
+                  <SessionStatsProvider>
                     <StreamingContext.Provider
                       value={finalUiState.streamingState}
                     >

packages/cli/src/ui/AppContainer.tsx

@@ -444,7 +444,7 @@ export const AppContainer = (props: AppContainerProps) => {
 
   const [isConfigInitialized, setConfigInitialized] = useState(false);
 
-  const logger = useLogger(config);
+  const logger = useLogger(config.storage);
   const { inputHistory, addInput, initializeFromLogger } =
     useInputHistoryStore();
 

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

@@ -14,8 +14,7 @@
     <text x="0" y="19" fill="#000000" textLength="900" lengthAdjust="spacingAndGlyphs">▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄</text>
     <text x="0" y="53" fill="#333333" textLength="891" lengthAdjust="spacingAndGlyphs">╭─────────────────────────────────────────────────────────────────────────────────────────────────╮</text>
     <text x="0" y="70" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="70" fill="#ffffaf" textLength="63" lengthAdjust="spacingAndGlyphs" font-weight="bold">? Edit </text>
-    <text x="81" y="70" fill="#ffffff" textLength="783" lengthAdjust="spacingAndGlyphs">packages/.../InputPrompt.tsx:   return kittyProtocolSupporte... =&gt;   return kittyProto…</text>
+    <text x="18" y="70" fill="#ffffaf" textLength="54" lengthAdjust="spacingAndGlyphs" font-weight="bold">? Edit</text>
     <text x="882" y="70" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="87" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="18" y="87" fill="#333333" textLength="855" lengthAdjust="spacingAndGlyphs">╭─────────────────────────────────────────────────────────────────────────────────────────────╮</text>

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

@@ -5,7 +5,7 @@ exports[`Full Terminal Tool Confirmation Snapshot > renders tool confirmation bo
 ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
 
 ╭─────────────────────────────────────────────────────────────────────────────────────────────────╮
-│ ? Edit packages/.../InputPrompt.tsx:   return kittyProtocolSupporte... =>   return kittyProto…  │
+│ ? Edit                                                                                          │
 │ ╭─────────────────────────────────────────────────────────────────────────────────────────────╮ │
 │ │ ... first 42 lines hidden (Ctrl+O to show) ...                                              │ │
 │ │ 43   const line43 = true;                                                                   │ │

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

@@ -9,7 +9,7 @@ import open from 'open';
 import path from 'node:path';
 import { bugCommand } from './bugCommand.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import { getVersion, type Config } from '@google/gemini-cli-core';
+import { getVersion } from '@google/gemini-cli-core';
 import { GIT_COMMIT_INFO } from '../../generated/git-commit.js';
 import { formatBytes } from '../utils/formatters.js';
 
@@ -89,8 +89,7 @@ describe('bugCommand', () => {
             getBugCommand: () => undefined,
             getIdeMode: () => true,
             getContentGeneratorConfig: () => ({ authType: 'oauth-personal' }),
-            getSessionId: vi.fn().mockReturnValue('test-session-id'),
-          } as unknown as Config,
+          },
           geminiClient: {
             getChat: () => ({
               getHistory: () => [],
@@ -138,8 +137,7 @@ describe('bugCommand', () => {
             storage: {
               getProjectTempDir: () => '/tmp/gemini',
             },
-            getSessionId: vi.fn().mockReturnValue('test-session-id'),
-          } as unknown as Config,
+          },
           geminiClient: {
             getChat: () => ({
               getHistory: () => history,
@@ -184,8 +182,7 @@ describe('bugCommand', () => {
             getBugCommand: () => ({ urlTemplate: customTemplate }),
             getIdeMode: () => true,
             getContentGeneratorConfig: () => ({ authType: 'vertex-ai' }),
-            getSessionId: vi.fn().mockReturnValue('test-session-id'),
-          } as unknown as Config,
+          },
           geminiClient: {
             getChat: () => ({
               getHistory: () => [],

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

@@ -16,6 +16,7 @@ import { GIT_COMMIT_INFO } from '../../generated/git-commit.js';
 import { formatBytes } from '../utils/formatters.js';
 import {
   IdeClient,
+  sessionId,
   getVersion,
   INITIAL_HISTORY_LENGTH,
   debugLogger,
@@ -58,7 +59,7 @@ export const bugCommand: SlashCommand = {
     let info = `
 * **CLI Version:** ${cliVersion}
 * **Git Commit:** ${GIT_COMMIT_INFO}
-* **Session ID:** ${config?.getSessionId() || 'Unknown'}
+* **Session ID:** ${sessionId}
 * **Operating System:** ${osVersion}
 * **Sandbox Environment:** ${sandboxEnv}
 * **Model Version:** ${modelVersion}

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

@@ -457,78 +457,4 @@ describe('memoryCommand', () => {
       );
     });
   });
-
-  describe('/memory inbox', () => {
-    let inboxCommand: SlashCommand;
-
-    beforeEach(() => {
-      inboxCommand = memoryCommand.subCommands!.find(
-        (cmd) => cmd.name === 'inbox',
-      )!;
-      expect(inboxCommand).toBeDefined();
-    });
-
-    it('should return custom_dialog when config is available and flag is enabled', () => {
-      if (!inboxCommand.action) throw new Error('Command has no action');
-
-      const mockConfig = {
-        reloadSkills: vi.fn(),
-        isMemoryManagerEnabled: vi.fn().mockReturnValue(true),
-      };
-      const context = createMockCommandContext({
-        services: {
-          agentContext: { config: mockConfig },
-        },
-        ui: {
-          removeComponent: vi.fn(),
-          reloadCommands: vi.fn(),
-        },
-      });
-
-      const result = inboxCommand.action(context, '');
-
-      expect(result).toHaveProperty('type', 'custom_dialog');
-      expect(result).toHaveProperty('component');
-    });
-
-    it('should return info message when memory manager is disabled', () => {
-      if (!inboxCommand.action) throw new Error('Command has no action');
-
-      const mockConfig = {
-        isMemoryManagerEnabled: vi.fn().mockReturnValue(false),
-      };
-      const context = createMockCommandContext({
-        services: {
-          agentContext: { config: mockConfig },
-        },
-      });
-
-      const result = inboxCommand.action(context, '');
-
-      expect(result).toEqual({
-        type: 'message',
-        messageType: 'info',
-        content:
-          'The memory inbox requires the experimental memory manager. Enable it with: experimental.memoryManager = true in settings.',
-      });
-    });
-
-    it('should return error when config is not loaded', () => {
-      if (!inboxCommand.action) throw new Error('Command has no action');
-
-      const context = createMockCommandContext({
-        services: {
-          agentContext: null,
-        },
-      });
-
-      const result = inboxCommand.action(context, '');
-
-      expect(result).toEqual({
-        type: 'message',
-        messageType: 'error',
-        content: 'Config not loaded.',
-      });
-    });
-  });
 });

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

@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React from 'react';
 import {
   addMemory,
   listMemoryFiles,
@@ -14,11 +13,9 @@ import {
 import { MessageType } from '../types.js';
 import {
   CommandKind,
-  type OpenCustomDialogActionReturn,
   type SlashCommand,
   type SlashCommandActionReturn,
 } from './types.js';
-import { SkillInboxDialog } from '../components/SkillInboxDialog.js';
 
 export const memoryCommand: SlashCommand = {
   name: 'memory',
@@ -127,45 +124,5 @@ export const memoryCommand: SlashCommand = {
         );
       },
     },
-    {
-      name: 'inbox',
-      description:
-        'Review skills extracted from past sessions and move them to global or project skills',
-      kind: CommandKind.BUILT_IN,
-      autoExecute: true,
-      action: (
-        context,
-      ): OpenCustomDialogActionReturn | SlashCommandActionReturn | void => {
-        const config = context.services.agentContext?.config;
-        if (!config) {
-          return {
-            type: 'message',
-            messageType: 'error',
-            content: 'Config not loaded.',
-          };
-        }
-
-        if (!config.isMemoryManagerEnabled()) {
-          return {
-            type: 'message',
-            messageType: 'info',
-            content:
-              'The memory inbox requires the experimental memory manager. Enable it with: experimental.memoryManager = true in settings.',
-          };
-        }
-
-        return {
-          type: 'custom_dialog',
-          component: React.createElement(SkillInboxDialog, {
-            config,
-            onClose: () => context.ui.removeComponent(),
-            onReloadSkills: async () => {
-              await config.reloadSkills();
-              context.ui.reloadCommands();
-            },
-          }),
-        };
-      },
-    },
   ],
 };

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

@@ -158,7 +158,6 @@ Implement a comprehensive authentication system with multiple providers.
           getIdeMode: () => false,
           isTrustedFolder: () => true,
           getPreferredEditor: () => undefined,
-          getSessionId: () => 'test-session-id',
           storage: {
             getPlansDir: () => mockPlansDir,
           },
@@ -465,7 +464,6 @@ Implement a comprehensive authentication system with multiple providers.
                 getTargetDir: () => mockTargetDir,
                 getIdeMode: () => false,
                 isTrustedFolder: () => true,
-                getSessionId: () => 'test-session-id',
                 storage: {
                   getPlansDir: () => mockPlansDir,
                 },

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

@@ -82,7 +82,6 @@ const mockConfigPlain = {
   getExtensionRegistryURI: () => undefined,
   getContentGeneratorConfig: () => ({ authType: undefined }),
   getSandboxEnabled: () => false,
-  getSessionId: () => 'test-session-id',
 };
 
 const mockConfig = mockConfigPlain as unknown as Config;

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

@@ -13,11 +13,7 @@ import { useUIState } from '../contexts/UIStateContext.js';
 import { useKeypress, type Key } from '../hooks/useKeypress.js';
 import { Command } from '../key/keyMatchers.js';
 import { FooterRow, type FooterRowItem } from './Footer.js';
-import {
-  ALL_ITEMS,
-  resolveFooterState,
-  deriveItemsFromLegacySettings,
-} from '../../config/footerItems.js';
+import { ALL_ITEMS, resolveFooterState } from '../../config/footerItems.js';
 import { SettingScope } from '../../config/settings.js';
 import { BaseSelectionList } from './shared/BaseSelectionList.js';
 import type { SelectionListItem } from '../hooks/useSelectionList.js';
@@ -141,16 +137,17 @@ export const FooterConfigDialog: React.FC<FooterConfigDialogProps> = ({
   const handleSaveAndClose = useCallback(() => {
     const finalItems = orderedIds.filter((id: string) => selectedIds.has(id));
     const currentSetting = settings.merged.ui?.footer?.items;
-    // When items haven't been explicitly set yet (legacy mode), compare against
-    // the legacy-derived items to avoid persisting items and silently overriding
-    // legacy boolean settings like hideContextPercentage.
-    const effectiveCurrent =
-      currentSetting ?? deriveItemsFromLegacySettings(settings.merged);
-    if (JSON.stringify(finalItems) !== JSON.stringify(effectiveCurrent)) {
+    if (JSON.stringify(finalItems) !== JSON.stringify(currentSetting)) {
       setSetting(SettingScope.User, 'ui.footer.items', finalItems);
     }
     onClose?.();
-  }, [orderedIds, selectedIds, setSetting, settings.merged, onClose]);
+  }, [
+    orderedIds,
+    selectedIds,
+    setSetting,
+    settings.merged.ui?.footer?.items,
+    onClose,
+  ]);
 
   const handleResetToDefaults = useCallback(() => {
     setSetting(SettingScope.User, 'ui.footer.items', undefined);

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

@@ -124,7 +124,7 @@ describe('<HistoryItemDisplay />', () => {
       duration: '1s',
     };
     const { lastFrame, unmount } = await renderWithProviders(
-      <SessionStatsProvider sessionId="test-session-id">
+      <SessionStatsProvider>
         <HistoryItemDisplay {...baseItem} item={item} />
       </SessionStatsProvider>,
     );
@@ -157,7 +157,7 @@ describe('<HistoryItemDisplay />', () => {
       type: 'model_stats',
     };
     const { lastFrame, unmount } = await renderWithProviders(
-      <SessionStatsProvider sessionId="test-session-id">
+      <SessionStatsProvider>
         <HistoryItemDisplay {...baseItem} item={item} />
       </SessionStatsProvider>,
     );
@@ -173,7 +173,7 @@ describe('<HistoryItemDisplay />', () => {
       type: 'tool_stats',
     };
     const { lastFrame, unmount } = await renderWithProviders(
-      <SessionStatsProvider sessionId="test-session-id">
+      <SessionStatsProvider>
         <HistoryItemDisplay {...baseItem} item={item} />
       </SessionStatsProvider>,
     );
@@ -190,7 +190,7 @@ describe('<HistoryItemDisplay />', () => {
       duration: '1s',
     };
     const { lastFrame, unmount } = await renderWithProviders(
-      <SessionStatsProvider sessionId="test-session-id">
+      <SessionStatsProvider>
         <HistoryItemDisplay {...baseItem} item={item} />
       </SessionStatsProvider>,
     );

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

@@ -86,7 +86,6 @@ describe('<ModelDialog />', () => {
     getProModelNoAccess: mockGetProModelNoAccess,
     getProModelNoAccessSync: mockGetProModelNoAccessSync,
     getLastRetrievedQuota: () => ({ buckets: [] }),
-    getSessionId: () => 'test-session-id',
   };
 
   beforeEach(() => {

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

@@ -44,7 +44,7 @@ enum TerminalKeys {
   LEFT_ARROW = '\u001B[D',
   RIGHT_ARROW = '\u001B[C',
   ESCAPE = '\u001B',
-  BACKSPACE = '\x7f',
+  BACKSPACE = '\u0008',
   CTRL_P = '\u0010',
   CTRL_N = '\u000E',
 }

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

@@ -1,187 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { act } from 'react';
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-import type { Config, InboxSkill } from '@google/gemini-cli-core';
-import {
-  dismissInboxSkill,
-  listInboxSkills,
-  moveInboxSkill,
-} from '@google/gemini-cli-core';
-import { waitFor } from '../../test-utils/async.js';
-import { renderWithProviders } from '../../test-utils/render.js';
-import { SkillInboxDialog } from './SkillInboxDialog.js';
-
-vi.mock('@google/gemini-cli-core', async (importOriginal) => {
-  const original =
-    await importOriginal<typeof import('@google/gemini-cli-core')>();
-
-  return {
-    ...original,
-    dismissInboxSkill: vi.fn(),
-    listInboxSkills: vi.fn(),
-    moveInboxSkill: vi.fn(),
-    getErrorMessage: vi.fn((error: unknown) =>
-      error instanceof Error ? error.message : String(error),
-    ),
-  };
-});
-
-const mockListInboxSkills = vi.mocked(listInboxSkills);
-const mockMoveInboxSkill = vi.mocked(moveInboxSkill);
-const mockDismissInboxSkill = vi.mocked(dismissInboxSkill);
-
-const inboxSkill: InboxSkill = {
-  dirName: 'inbox-skill',
-  name: 'Inbox Skill',
-  description: 'A test skill',
-  extractedAt: '2025-01-15T10:00:00Z',
-};
-
-describe('SkillInboxDialog', () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    mockListInboxSkills.mockResolvedValue([inboxSkill]);
-    mockMoveInboxSkill.mockResolvedValue({
-      success: true,
-      message: 'Moved "inbox-skill" to ~/.gemini/skills.',
-    });
-    mockDismissInboxSkill.mockResolvedValue({
-      success: true,
-      message: 'Dismissed "inbox-skill" from inbox.',
-    });
-  });
-
-  it('disables the project destination when the workspace is untrusted', async () => {
-    const config = {
-      isTrustedFolder: vi.fn().mockReturnValue(false),
-    } as unknown as Config;
-    const onReloadSkills = vi.fn().mockResolvedValue(undefined);
-    const { lastFrame, stdin, unmount, waitUntilReady } = await act(async () =>
-      renderWithProviders(
-        <SkillInboxDialog
-          config={config}
-          onClose={vi.fn()}
-          onReloadSkills={onReloadSkills}
-        />,
-      ),
-    );
-
-    await waitFor(() => {
-      expect(lastFrame()).toContain('Inbox Skill');
-    });
-
-    await act(async () => {
-      stdin.write('\r');
-      await waitUntilReady();
-    });
-
-    await waitFor(() => {
-      const frame = lastFrame();
-      expect(frame).toContain('Project');
-      expect(frame).toContain('unavailable until this workspace is trusted');
-    });
-
-    await act(async () => {
-      stdin.write('\x1b[B');
-      await waitUntilReady();
-    });
-
-    await act(async () => {
-      stdin.write('\r');
-      await waitUntilReady();
-    });
-
-    await waitFor(() => {
-      expect(mockDismissInboxSkill).toHaveBeenCalledWith(config, 'inbox-skill');
-    });
-    expect(mockMoveInboxSkill).not.toHaveBeenCalled();
-    expect(onReloadSkills).not.toHaveBeenCalled();
-
-    unmount();
-  });
-
-  it('shows inline feedback when moving a skill throws', async () => {
-    mockMoveInboxSkill.mockRejectedValue(new Error('permission denied'));
-
-    const config = {
-      isTrustedFolder: vi.fn().mockReturnValue(true),
-    } as unknown as Config;
-    const { lastFrame, stdin, unmount, waitUntilReady } = await act(async () =>
-      renderWithProviders(
-        <SkillInboxDialog
-          config={config}
-          onClose={vi.fn()}
-          onReloadSkills={vi.fn().mockResolvedValue(undefined)}
-        />,
-      ),
-    );
-
-    await waitFor(() => {
-      expect(lastFrame()).toContain('Inbox Skill');
-    });
-
-    await act(async () => {
-      stdin.write('\r');
-      await waitUntilReady();
-    });
-
-    await act(async () => {
-      stdin.write('\r');
-      await waitUntilReady();
-    });
-
-    await waitFor(() => {
-      const frame = lastFrame();
-      expect(frame).toContain('Move "Inbox Skill"');
-      expect(frame).toContain('Failed to install skill: permission denied');
-    });
-
-    unmount();
-  });
-
-  it('shows inline feedback when reloading skills fails after a move', async () => {
-    const config = {
-      isTrustedFolder: vi.fn().mockReturnValue(true),
-    } as unknown as Config;
-    const onReloadSkills = vi
-      .fn()
-      .mockRejectedValue(new Error('reload hook failed'));
-    const { lastFrame, stdin, unmount, waitUntilReady } = await act(async () =>
-      renderWithProviders(
-        <SkillInboxDialog
-          config={config}
-          onClose={vi.fn()}
-          onReloadSkills={onReloadSkills}
-        />,
-      ),
-    );
-
-    await waitFor(() => {
-      expect(lastFrame()).toContain('Inbox Skill');
-    });
-
-    await act(async () => {
-      stdin.write('\r');
-      await waitUntilReady();
-    });
-
-    await act(async () => {
-      stdin.write('\r');
-      await waitUntilReady();
-    });
-
-    await waitFor(() => {
-      expect(lastFrame()).toContain(
-        'Moved "inbox-skill" to ~/.gemini/skills. Failed to reload skills: reload hook failed',
-      );
-    });
-    expect(onReloadSkills).toHaveBeenCalledTimes(1);
-
-    unmount();
-  });
-});

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

@@ -1,378 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import type React from 'react';
-import { useState, useMemo, useCallback, useEffect } from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { useKeypress } from '../hooks/useKeypress.js';
-import { Command } from '../key/keyMatchers.js';
-import { useKeyMatchers } from '../hooks/useKeyMatchers.js';
-import { BaseSelectionList } from './shared/BaseSelectionList.js';
-import type { SelectionListItem } from '../hooks/useSelectionList.js';
-import { DialogFooter } from './shared/DialogFooter.js';
-import {
-  type Config,
-  type InboxSkill,
-  type InboxSkillDestination,
-  getErrorMessage,
-  listInboxSkills,
-  moveInboxSkill,
-  dismissInboxSkill,
-} from '@google/gemini-cli-core';
-
-type Phase = 'list' | 'action';
-
-interface DestinationChoice {
-  destination: InboxSkillDestination | 'dismiss';
-  label: string;
-  description: string;
-}
-
-const DESTINATION_CHOICES: DestinationChoice[] = [
-  {
-    destination: 'global',
-    label: 'Global',
-    description: '~/.gemini/skills — available in all projects',
-  },
-  {
-    destination: 'project',
-    label: 'Project',
-    description: '.gemini/skills — available in this workspace',
-  },
-  {
-    destination: 'dismiss',
-    label: 'Dismiss',
-    description: 'Delete from inbox',
-  },
-];
-
-function formatDate(isoString: string): string {
-  try {
-    const date = new Date(isoString);
-    return date.toLocaleDateString(undefined, {
-      year: 'numeric',
-      month: 'short',
-      day: 'numeric',
-    });
-  } catch {
-    return isoString;
-  }
-}
-
-interface SkillInboxDialogProps {
-  config: Config;
-  onClose: () => void;
-  onReloadSkills: () => Promise<void>;
-}
-
-export const SkillInboxDialog: React.FC<SkillInboxDialogProps> = ({
-  config,
-  onClose,
-  onReloadSkills,
-}) => {
-  const keyMatchers = useKeyMatchers();
-  const isTrustedFolder = config.isTrustedFolder();
-  const [phase, setPhase] = useState<Phase>('list');
-  const [skills, setSkills] = useState<InboxSkill[]>([]);
-  const [loading, setLoading] = useState(true);
-  const [selectedSkill, setSelectedSkill] = useState<InboxSkill | null>(null);
-  const [feedback, setFeedback] = useState<{
-    text: string;
-    isError: boolean;
-  } | null>(null);
-
-  // Load inbox skills on mount
-  useEffect(() => {
-    let cancelled = false;
-    void (async () => {
-      try {
-        const result = await listInboxSkills(config);
-        if (!cancelled) {
-          setSkills(result);
-          setLoading(false);
-        }
-      } catch {
-        if (!cancelled) {
-          setSkills([]);
-          setLoading(false);
-        }
-      }
-    })();
-    return () => {
-      cancelled = true;
-    };
-  }, [config]);
-
-  const skillItems: Array<SelectionListItem<InboxSkill>> = useMemo(
-    () =>
-      skills.map((skill) => ({
-        key: skill.dirName,
-        value: skill,
-      })),
-    [skills],
-  );
-
-  const destinationItems: Array<SelectionListItem<DestinationChoice>> = useMemo(
-    () =>
-      DESTINATION_CHOICES.map((choice) => {
-        if (choice.destination === 'project' && !isTrustedFolder) {
-          return {
-            key: choice.destination,
-            value: {
-              ...choice,
-              description:
-                '.gemini/skills — unavailable until this workspace is trusted',
-            },
-            disabled: true,
-          };
-        }
-
-        return {
-          key: choice.destination,
-          value: choice,
-        };
-      }),
-    [isTrustedFolder],
-  );
-
-  const handleSelectSkill = useCallback((skill: InboxSkill) => {
-    setSelectedSkill(skill);
-    setFeedback(null);
-    setPhase('action');
-  }, []);
-
-  const handleSelectDestination = useCallback(
-    (choice: DestinationChoice) => {
-      if (!selectedSkill) return;
-
-      if (choice.destination === 'project' && !config.isTrustedFolder()) {
-        setFeedback({
-          text: 'Project skills are unavailable until this workspace is trusted.',
-          isError: true,
-        });
-        return;
-      }
-
-      setFeedback(null);
-
-      void (async () => {
-        try {
-          let result: { success: boolean; message: string };
-          if (choice.destination === 'dismiss') {
-            result = await dismissInboxSkill(config, selectedSkill.dirName);
-          } else {
-            result = await moveInboxSkill(
-              config,
-              selectedSkill.dirName,
-              choice.destination,
-            );
-          }
-
-          setFeedback({ text: result.message, isError: !result.success });
-
-          if (!result.success) {
-            return;
-          }
-
-          // Remove the skill from the local list.
-          setSkills((prev) =>
-            prev.filter((skill) => skill.dirName !== selectedSkill.dirName),
-          );
-          setSelectedSkill(null);
-          setPhase('list');
-
-          if (choice.destination === 'dismiss') {
-            return;
-          }
-
-          try {
-            await onReloadSkills();
-          } catch (error) {
-            setFeedback({
-              text: `${result.message} Failed to reload skills: ${getErrorMessage(error)}`,
-              isError: true,
-            });
-          }
-        } catch (error) {
-          const operation =
-            choice.destination === 'dismiss'
-              ? 'dismiss skill'
-              : 'install skill';
-          setFeedback({
-            text: `Failed to ${operation}: ${getErrorMessage(error)}`,
-            isError: true,
-          });
-        }
-      })();
-    },
-    [config, selectedSkill, onReloadSkills],
-  );
-
-  useKeypress(
-    (key) => {
-      if (keyMatchers[Command.ESCAPE](key)) {
-        if (phase === 'action') {
-          setPhase('list');
-          setSelectedSkill(null);
-          setFeedback(null);
-        } else {
-          onClose();
-        }
-        return true;
-      }
-      return false;
-    },
-    { isActive: true, priority: true },
-  );
-
-  if (loading) {
-    return (
-      <Box
-        flexDirection="column"
-        borderStyle="round"
-        borderColor={theme.border.default}
-        paddingX={2}
-        paddingY={1}
-      >
-        <Text>Loading inbox…</Text>
-      </Box>
-    );
-  }
-
-  if (skills.length === 0 && !feedback) {
-    return (
-      <Box
-        flexDirection="column"
-        borderStyle="round"
-        borderColor={theme.border.default}
-        paddingX={2}
-        paddingY={1}
-      >
-        <Text bold>Skill Inbox</Text>
-        <Box marginTop={1}>
-          <Text color={theme.text.secondary}>
-            No extracted skills in inbox.
-          </Text>
-        </Box>
-        <DialogFooter primaryAction="Esc to close" cancelAction="" />
-      </Box>
-    );
-  }
-
-  return (
-    <Box
-      flexDirection="column"
-      borderStyle="round"
-      borderColor={theme.border.default}
-      paddingX={2}
-      paddingY={1}
-      width="100%"
-    >
-      {phase === 'list' ? (
-        <>
-          <Text bold>
-            Skill Inbox ({skills.length} skill{skills.length !== 1 ? 's' : ''})
-          </Text>
-          <Text color={theme.text.secondary}>
-            Skills extracted from past sessions. Select one to move or dismiss.
-          </Text>
-
-          <Box flexDirection="column" marginTop={1}>
-            <BaseSelectionList<InboxSkill>
-              items={skillItems}
-              onSelect={handleSelectSkill}
-              isFocused={true}
-              showNumbers={true}
-              showScrollArrows={true}
-              maxItemsToShow={8}
-              renderItem={(item, { titleColor }) => (
-                <Box flexDirection="column" minHeight={2}>
-                  <Text color={titleColor} bold>
-                    {item.value.name}
-                  </Text>
-                  <Box flexDirection="row">
-                    <Text color={theme.text.secondary} wrap="wrap">
-                      {item.value.description}
-                    </Text>
-                    {item.value.extractedAt && (
-                      <Text color={theme.text.secondary}>
-                        {' · '}
-                        {formatDate(item.value.extractedAt)}
-                      </Text>
-                    )}
-                  </Box>
-                </Box>
-              )}
-            />
-          </Box>
-
-          {feedback && (
-            <Box marginTop={1}>
-              <Text
-                color={
-                  feedback.isError ? theme.status.error : theme.status.success
-                }
-              >
-                {feedback.isError ? '✗ ' : '✓ '}
-                {feedback.text}
-              </Text>
-            </Box>
-          )}
-
-          <DialogFooter
-            primaryAction="Enter to select"
-            cancelAction="Esc to close"
-          />
-        </>
-      ) : (
-        <>
-          <Text bold>Move &quot;{selectedSkill?.name}&quot;</Text>
-          <Text color={theme.text.secondary}>
-            Choose where to install this skill.
-          </Text>
-
-          <Box flexDirection="column" marginTop={1}>
-            <BaseSelectionList<DestinationChoice>
-              items={destinationItems}
-              onSelect={handleSelectDestination}
-              isFocused={true}
-              showNumbers={true}
-              renderItem={(item, { titleColor }) => (
-                <Box flexDirection="column" minHeight={2}>
-                  <Text color={titleColor} bold>
-                    {item.value.label}
-                  </Text>
-                  <Text color={theme.text.secondary}>
-                    {item.value.description}
-                  </Text>
-                </Box>
-              )}
-            />
-          </Box>
-
-          {feedback && (
-            <Box marginTop={1}>
-              <Text
-                color={
-                  feedback.isError ? theme.status.error : theme.status.success
-                }
-              >
-                {feedback.isError ? '✗ ' : '✓ '}
-                {feedback.text}
-              </Text>
-            </Box>
-          )}
-
-          <DialogFooter
-            primaryAction="Enter to confirm"
-            cancelAction="Esc to go back"
-          />
-        </>
-      )}
-    </Box>
-  );
-};

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

@@ -55,7 +55,6 @@ describe('ToolConfirmationQueue', () => {
     getFileSystemService: () => ({
       readFile: vi.fn().mockResolvedValue('Plan content'),
     }),
-    getSessionId: () => 'test-session-id',
     storage: {
       getPlansDir: () => '/mock/temp/plans',
     },
@@ -67,44 +66,6 @@ describe('ToolConfirmationQueue', () => {
     vi.clearAllMocks();
   });
 
-  it('explicitly renders the tool description (containing filename) for edit confirmations', async () => {
-    const confirmingTool = {
-      tool: {
-        callId: 'call-1',
-        name: 'Edit',
-        description: 'Editing src/main.ts',
-        status: CoreToolCallStatus.AwaitingApproval,
-        confirmationDetails: {
-          type: 'edit' as const,
-          title: 'Confirm edit',
-          fileName: 'main.ts',
-          filePath: '/src/main.ts',
-          fileDiff: '--- a/main.ts\n+++ b/main.ts\n@@ -1 +1 @@\n-old\n+new',
-          originalContent: 'old',
-          newContent: 'new',
-        },
-      },
-      index: 1,
-      total: 1,
-    };
-
-    const { lastFrame, unmount } = await renderWithProviders(
-      <ToolConfirmationQueue
-        confirmingTool={confirmingTool as unknown as ConfirmingToolState}
-      />,
-      {
-        config: mockConfig,
-        uiState: {
-          terminalWidth: 80,
-        },
-      },
-    );
-
-    const output = lastFrame();
-    expect(output).toContain('Editing src/main.ts');
-    unmount();
-  });
-
   it('renders the confirming tool with progress indicator', async () => {
     const confirmingTool = {
       tool: {

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

@@ -98,9 +98,9 @@ export const ToolConfirmationQueue: React.FC<ToolConfirmationQueueProps> = ({
           <Box flexDirection="row" flexShrink={1} overflow="hidden">
             <Text color={theme.status.warning} bold>
               ? {toolLabel}
-              {!!tool.description && '  '}
+              {!isEdit && !!tool.description && '  '}
             </Text>
-            {!!tool.description && (
+            {!isEdit && !!tool.description && (
               <Box flexShrink={1} overflow="hidden">
                 <Text color={theme.text.primary} wrap="truncate-end">
                   {tool.description}