Changelog for v0.38.2 (#25593)

Co-authored-by: gemini-cli-robot <224641728+gemini-cli-robot@users.noreply.github.com>

.gemini/settings.json

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

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

@@ -85,17 +85,25 @@ accessible.
 
 - **Callouts**: Use GitHub-flavored markdown alerts to highlight important
   information. To ensure the formatting is preserved by `npm run format`, place
-  an empty line, then the `<!-- prettier-ignore -->` comment directly before
-  the callout block. The callout type (`[!TYPE]`) should be on the first line,
-  followed by a newline, and then the content, with each subsequent line of
-  content starting with `>`. Available types are `NOTE`, `TIP`, `IMPORTANT`,
-  `WARNING`, and `CAUTION`.
+  an empty line, then a prettier ignore comment directly before the callout
+  block. Use `<!-- prettier-ignore -->` for standard Markdown files (`.md`) and
+  `{/* prettier-ignore */}` for MDX files (`.mdx`). The callout type (`[!TYPE]`)
+  should be on the first line, followed by a newline, and then the content, with
+  each subsequent line of content starting with `>`. Available types are `NOTE`,
+  `TIP`, `IMPORTANT`, `WARNING`, and `CAUTION`.
 
-  Example:
+  Example (.md):
 
 <!-- prettier-ignore -->
 > [!NOTE]
 > This is an example of a multi-line note that will be preserved
+> by Prettier.
+
+  Example (.mdx):
+
+{/* prettier-ignore */}
+> [!NOTE]
+> This is an example of a multi-line note that will be preserved
 > by Prettier.
 
 ### Links
@@ -118,6 +126,7 @@ accessible.
 <!-- prettier-ignore -->
 > [!NOTE]
 > This is an experimental feature currently under active development.
+(Note: Use `{/* prettier-ignore */}` if editing an `.mdx` file.)
 
 - **Headings:** Use hierarchical headings to support the user journey.
 - **Procedures:**

.github/workflows/agent-session-drift-check.yml

@@ -0,0 +1,132 @@
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
+
+name: 'Agent Session Drift Check'
+
+on:
+  pull_request:
+    branches:
+      - 'main'
+      - 'release/**'
+    paths:
+      - 'packages/cli/src/nonInteractiveCli.ts'
+      - 'packages/cli/src/nonInteractiveCliAgentSession.ts'
+
+concurrency:
+  group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
+jobs:
+  check-drift:
+    name: 'Check Agent Session Drift'
+    runs-on: 'ubuntu-latest'
+    if: "github.repository == 'google-gemini/gemini-cli'"
+    permissions:
+      contents: 'read'
+      pull-requests: 'write'
+    steps:
+      - name: 'Detect drift and comment'
+        uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea' # ratchet:actions/github-script@v8
+        with:
+          script: |-
+            // === Pair configuration — append here to cover more pairs ===
+            const PAIRS = [
+              {
+                legacy: 'packages/cli/src/nonInteractiveCli.ts',
+                session: 'packages/cli/src/nonInteractiveCliAgentSession.ts',
+                label: 'non-interactive CLI',
+              },
+              // Future pairs can be added here. Remember to also add both
+              // paths to the `paths:` filter at the top of this workflow.
+              // Example:
+              // {
+              //   legacy: 'packages/core/src/agents/local-invocation.ts',
+              //   session: 'packages/core/src/agents/local-session-invocation.ts',
+              //   label: 'local subagent invocation',
+              // },
+            ];
+            // ============================================================
+
+            const prNumber = context.payload.pull_request.number;
+            const { owner, repo } = context.repo;
+
+            // Use the API to list changed files — no checkout/git diff needed.
+            const files = await github.paginate(github.rest.pulls.listFiles, {
+              owner,
+              repo,
+              pull_number: prNumber,
+              per_page: 100,
+            });
+            const changed = new Set(files.map((f) => f.filename));
+
+            const warnings = [];
+            for (const { legacy, session, label } of PAIRS) {
+              const legacyChanged = changed.has(legacy);
+              const sessionChanged = changed.has(session);
+              if (legacyChanged && !sessionChanged) {
+                warnings.push(
+                  `**${label}**: \`${legacy}\` was modified but \`${session}\` was not.`,
+                );
+              } else if (!legacyChanged && sessionChanged) {
+                warnings.push(
+                  `**${label}**: \`${session}\` was modified but \`${legacy}\` was not.`,
+                );
+              }
+            }
+
+            const MARKER = '<!-- agent-session-drift-check -->';
+
+            // Look up our existing drift comment (for upsert/cleanup).
+            const comments = await github.paginate(github.rest.issues.listComments, {
+              owner,
+              repo,
+              issue_number: prNumber,
+              per_page: 100,
+            });
+            const existing = comments.find(
+              (c) => c.user?.type === 'Bot' && c.body?.includes(MARKER),
+            );
+
+            if (warnings.length === 0) {
+              core.info('No drift detected.');
+              // If drift was previously flagged and is now resolved, remove the comment.
+              if (existing) {
+                await github.rest.issues.deleteComment({
+                  owner,
+                  repo,
+                  comment_id: existing.id,
+                });
+                core.info(`Deleted stale drift comment ${existing.id}.`);
+              }
+              return;
+            }
+
+            const body = [
+              MARKER,
+              '### ⚠️ Invocation Drift Warning',
+              '',
+              'The following file pairs should generally be kept in sync during the AgentSession migration:',
+              '',
+              ...warnings.map((w) => `- ${w}`),
+              '',
+              'If this is intentional (e.g., a bug fix specific to one implementation), you can ignore this comment.',
+              '',
+              '_This check will be removed once the legacy implementations are deleted._',
+            ].join('\n');
+
+            if (existing) {
+              core.info(`Updating existing drift comment ${existing.id}.`);
+              await github.rest.issues.updateComment({
+                owner,
+                repo,
+                comment_id: existing.id,
+                body,
+              });
+            } else {
+              core.info('Creating new drift comment.');
+              await github.rest.issues.createComment({
+                owner,
+                repo,
+                issue_number: prNumber,
+                body,
+              });
+            }

.github/workflows/chained_e2e.yml

@@ -183,7 +183,7 @@ jobs:
     needs:
       - 'merge_queue_skipper'
       - 'parse_run_context'
-    runs-on: 'macos-latest'
+    runs-on: 'macos-latest-large'
     if: |
       github.repository == 'google-gemini/gemini-cli' && always() && (needs.merge_queue_skipper.result !='success' || needs.merge_queue_skipper.outputs.skip != 'true')
     steps:

.github/workflows/ci.yml

@@ -102,6 +102,12 @@ jobs:
       - name: 'Run yamllint'
         run: 'node scripts/lint.js --yamllint'
 
+      - name: 'Build project for typecheck'
+        run: 'npm run build'
+
+      - name: 'Run typecheck'
+        run: 'npm run typecheck'
+
       - name: 'Run Prettier'
         run: 'node scripts/lint.js --prettier'
 
@@ -224,7 +230,7 @@ jobs:
 
   test_mac:
     name: 'Test (Mac) - ${{ matrix.node-version }}, ${{ matrix.shard }}'
-    runs-on: 'macos-latest'
+    runs-on: 'macos-latest-large'
     needs:
       - 'merge_queue_skipper'
     if: "github.repository == 'google-gemini/gemini-cli' && needs.merge_queue_skipper.outputs.skip == 'false'"

.github/workflows/deflake.yml

@@ -77,7 +77,7 @@ jobs:
 
   deflake_e2e_mac:
     name: 'E2E Test (macOS)'
-    runs-on: 'macos-latest'
+    runs-on: 'macos-latest-large'
     if: "github.repository == 'google-gemini/gemini-cli'"
     steps:
       - name: 'Checkout'

.prettierignore

@@ -22,3 +22,4 @@ Thumbs.db
 .pytest_cache
 **/SKILL.md
 packages/sdk/test-data/*.json
+*.mdx

CONTRIBUTING.md

@@ -110,7 +110,9 @@ assign or unassign the issue as requested, provided the conditions are met
 (e.g., an issue must be unassigned to be assigned).
 
 Please note that you can have a maximum of 3 issues assigned to you at any given
-time.
+time and that only
+[issues labeled "help wanted"](https://github.com/google-gemini/gemini-cli/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22help%20wanted%22)
+may be self-assigned.
 
 ### Pull request guidelines
 

docs/changelogs/index.md

@@ -18,6 +18,27 @@ on GitHub.
 | [Preview](preview.md) | Experimental features ready for early feedback. |
 | [Stable](latest.md)   | Stable, recommended for general use.            |
 
+## Announcements: v0.38.0 - 2026-04-14
+
+- **Chapters Narrative Flow:** Group agent interactions into "Chapters" based on
+  intent and tool usage for better session structure
+  ([#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).
+- **Context Compression Service:** Advanced context management to efficiently
+  distill conversation history
+  ([#24483](https://github.com/google-gemini/gemini-cli/pull/24483) by
+  @joshualitt).
+- **UI Flicker & UX Enhancements:** Solved rendering flicker with "Terminal
+  Buffer" mode and introduced selective topic expansion
+  ([#24512](https://github.com/google-gemini/gemini-cli/pull/24512) by
+  @jacob314, [#24793](https://github.com/google-gemini/gemini-cli/pull/24793) by
+  @Abhijit-2592).
+- **Persistent Policy Approvals:** Implemented context-aware persistent
+  approvals for tool execution
+  ([#23257](https://github.com/google-gemini/gemini-cli/pull/23257) by @jerop).
+
 ## Announcements: v0.37.0 - 2026-04-08
 
 - **Dynamic Sandbox Expansion:** Implemented dynamic sandbox expansion and

docs/changelogs/latest.md

@@ -1,6 +1,6 @@
-# Latest stable release: v0.37.1
+# Latest stable release: v0.38.2
 
-Released: April 09, 2026
+Released: April 17, 2026
 
 For most users, our latest stable release is the recommended release. Install
 the latest stable version with:
@@ -11,415 +11,264 @@ 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.
+- **Chapters Narrative Flow:** Introduced tool-based topic grouping ("Chapters")
+  to provide better session structure and narrative continuity in long-running
+  tasks.
+- **Context Compression Service:** Implemented a dedicated service for advanced
+  context management, efficiently distilling conversation history to preserve
+  focus and tokens.
+- **Enhanced UI Stability & UX:** Introduced a new "Terminal Buffer" mode to
+  solve rendering flicker, along with selective topic expansion and improved
+  tool confirmation layouts.
+- **Context-Aware Policy Approvals:** Users can now grant persistent,
+  context-aware approvals for tools, significantly reducing manual confirmation
+  overhead for trusted workflows.
+- **Background Process Monitoring:** New tools for monitoring and inspecting
+  background shell processes, providing better visibility into asynchronous
+  tasks.
 
 ## What's Changed
 
-- fix(acp): handle all InvalidStreamError types gracefully in prompt
-  [#24540](https://github.com/google-gemini/gemini-cli/pull/24540)
-- feat(acp): add support for /about command
-  [#24649](https://github.com/google-gemini/gemini-cli/pull/24649)
-- feat(acp): add /help command
-  [#24839](https://github.com/google-gemini/gemini-cli/pull/24839)
-- 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
-  [#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
-  [#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
+- fix(patch): cherry-pick 14b2f35 to release/v0.38.1-pr-24974 to patch version
+  v0.38.1 and create version 0.38.2 by @gemini-cli-robot in
+  [#25585](https://github.com/google-gemini/gemini-cli/pull/25585)
+- fix(patch): cherry-pick 050c303 to release/v0.38.0-pr-25317 to patch version
+  v0.38.0 and create version 0.38.1 by @gemini-cli-robot in
+  [#25466](https://github.com/google-gemini/gemini-cli/pull/25466)
+- 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
-  [#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
+  [#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
+  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
+  @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
-  [#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
-  @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
-  @gemini-cli-robot in
-  [#24842](https://github.com/google-gemini/gemini-cli/pull/24842)
+  [#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
+  @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)
 
 **Full Changelog**:
-https://github.com/google-gemini/gemini-cli/compare/v0.36.0...v0.37.1
+https://github.com/google-gemini/gemini-cli/compare/v0.38.0...v0.38.2

docs/changelogs/preview.md

@@ -1,6 +1,6 @@
-# Preview release: v0.38.0-preview.0
+# Preview release: v0.39.0-preview.0
 
-Released: April 08, 2026
+Released: April 14, 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,245 @@ 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.
+- **Refactored Subagents and Unified Tooling:** Consolidate subagent tools into
+  a single `invoke_subagent` tool, removed legacy wrapping tools, and improved
+  turn limits for codebase investigator.
+- **Advanced Memory and Skill Management:** Introduced `/memory` inbox for
+  reviewing extracted skills and added skill patching support, enhancing agent
+  learning and persistence.
+- **Expanded Test and Evaluation Infrastructure:** Added memory and CPU
+  performance integration test harnesses and generalized evaluation
+  infrastructure for better suite organization.
+- **Sandbox and Security Hardening:** Centralized sandbox paths for Linux and
+  macOS, enforced read-only security for async git worktree resolution, and
+  optimized Windows sandbox initialization.
+- **Enhanced CLI UX and UI Stability:** Improved scroll momentum, added a
+  `debugRainbow` setting, and resolved various memory leaks and PTY exhaustion
+  issues for a smoother terminal experience.
 
 ## 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
-  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
-  @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
+- refactor(plan): simplify policy priorities and consolidate read-only rules by
+  @ruomengz in [#24849](https://github.com/google-gemini/gemini-cli/pull/24849)
+- feat(test-utils): add memory usage integration test harness by @sripasg in
+  [#24876](https://github.com/google-gemini/gemini-cli/pull/24876)
+- feat(memory): add /memory inbox command for reviewing extracted skills 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
-  @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
+  [#24544](https://github.com/google-gemini/gemini-cli/pull/24544)
+- chore(release): bump version to 0.39.0-nightly.20260408.e77b22e63 by
+  @gemini-cli-robot in
+  [#24939](https://github.com/google-gemini/gemini-cli/pull/24939)
+- fix(core): ensure robust sandbox cleanup in all process execution paths by
+  @ehedlund in [#24763](https://github.com/google-gemini/gemini-cli/pull/24763)
+- chore: update ink version to 6.6.8 by @jacob314 in
+  [#24934](https://github.com/google-gemini/gemini-cli/pull/24934)
+- Changelog for v0.38.0-preview.0 by @gemini-cli-robot in
+  [#24938](https://github.com/google-gemini/gemini-cli/pull/24938)
+- chore: ignore conductor directory by @JayadityaGit in
+  [#22128](https://github.com/google-gemini/gemini-cli/pull/22128)
+- Changelog for v0.37.0 by @gemini-cli-robot in
+  [#24940](https://github.com/google-gemini/gemini-cli/pull/24940)
+- feat(plan): require user confirmation for activate_skill in Plan Mode by
+  @ruomengz in [#24946](https://github.com/google-gemini/gemini-cli/pull/24946)
+- feat(test-utils): add CPU performance integration test harness by @sripasg in
+  [#24951](https://github.com/google-gemini/gemini-cli/pull/24951)
+- fix(cli-ui): enable Ctrl+Backspace for word deletion in Windows Terminal by
+  @dogukanozen in
+  [#21447](https://github.com/google-gemini/gemini-cli/pull/21447)
+- test(sdk): add unit tests for GeminiCliSession by @AdamyaSingh7 in
+  [#21897](https://github.com/google-gemini/gemini-cli/pull/21897)
+- fix(core): resolve windows symlink bypass and stabilize sandbox integration
+  tests by @ehedlund in
+  [#24834](https://github.com/google-gemini/gemini-cli/pull/24834)
+- fix(cli): restore file path display in edit and write tool confirmations by
+  @jwhelangoog in
+  [#24974](https://github.com/google-gemini/gemini-cli/pull/24974)
+- feat(core): refine shell tool description display logic by @jwhelangoog in
+  [#24903](https://github.com/google-gemini/gemini-cli/pull/24903)
+- fix(core): dynamic session ID injection to resolve resume bugs by @scidomino
+  in [#24972](https://github.com/google-gemini/gemini-cli/pull/24972)
+- Update ink version to 6.6.9 by @jacob314 in
+  [#24980](https://github.com/google-gemini/gemini-cli/pull/24980)
+- Generalize evals infra to support more types of evals, organization and
+  queuing of named suites by @gundermanc in
+  [#24941](https://github.com/google-gemini/gemini-cli/pull/24941)
+- fix(cli): optimize startup with lightweight parent process by @sehoon38 in
+  [#24667](https://github.com/google-gemini/gemini-cli/pull/24667)
+- refactor(sandbox): use centralized sandbox paths in macOS Seatbelt
+  implementation by @ehedlund in
+  [#24984](https://github.com/google-gemini/gemini-cli/pull/24984)
+- feat(cli): refine tool output formatting for compact mode by @jwhelangoog in
+  [#24677](https://github.com/google-gemini/gemini-cli/pull/24677)
+- fix(sdk): skip broken sendStream tests to unblock nightly by @SandyTao520 in
+  [#25000](https://github.com/google-gemini/gemini-cli/pull/25000)
+- refactor(core): use centralized path resolution for Linux sandbox by @ehedlund
+  in [#24985](https://github.com/google-gemini/gemini-cli/pull/24985)
+- Support ctrl+shift+g by @jacob314 in
+  [#25035](https://github.com/google-gemini/gemini-cli/pull/25035)
+- feat(core): refactor subagent tool to unified invoke_subagent tool by
+  @abhipatel12 in
+  [#24489](https://github.com/google-gemini/gemini-cli/pull/24489)
+- fix(core): add explicit git identity env vars to prevent sandbox checkpointing
+  error by @mrpmohiburrahman in
+  [#19775](https://github.com/google-gemini/gemini-cli/pull/19775)
+- fix: respect hideContextPercentage when FooterConfigDialog is closed without
+  changes by @chernistry in
+  [#24773](https://github.com/google-gemini/gemini-cli/pull/24773)
+- fix(cli): suppress unhandled AbortError logs during request cancellation by
+  @euxaristia in
+  [#22621](https://github.com/google-gemini/gemini-cli/pull/22621)
+- Automated documentation audit by @g-samroberts in
+  [#24567](https://github.com/google-gemini/gemini-cli/pull/24567)
+- feat(cli): implement useAgentStream hook by @mbleigh in
+  [#24292](https://github.com/google-gemini/gemini-cli/pull/24292)
+- refactor(plan) Clean default plan toml by @ruomengz in
+  [#25037](https://github.com/google-gemini/gemini-cli/pull/25037)
+- refactor(core): remove legacy subagent wrapping tools by @abhipatel12 in
+  [#25053](https://github.com/google-gemini/gemini-cli/pull/25053)
+- fix(core): honor retryDelay in RetryInfo for 503 errors by @yunaseoul in
+  [#25057](https://github.com/google-gemini/gemini-cli/pull/25057)
+- fix(core): remediate subagent memory leaks using AbortSignal in MessageBus by
+  @abhipatel12 in
+  [#25048](https://github.com/google-gemini/gemini-cli/pull/25048)
+- feat(cli): wire up useAgentStream in AppContainer by @mbleigh in
+  [#24297](https://github.com/google-gemini/gemini-cli/pull/24297)
+- feat(core): migrate chat recording to JSONL streaming by @spencer426 in
+  [#23749](https://github.com/google-gemini/gemini-cli/pull/23749)
+- fix(core): clear 5-minute timeouts in oauth flow to prevent memory leaks by
+  @spencer426 in
+  [#24968](https://github.com/google-gemini/gemini-cli/pull/24968)
+- fix(sandbox): centralize async git worktree resolution and enforce read-only
+  security by @ehedlund in
+  [#25040](https://github.com/google-gemini/gemini-cli/pull/25040)
+- feat(test): add high-volume shell test and refine perf harness by @sripasg in
+  [#24983](https://github.com/google-gemini/gemini-cli/pull/24983)
+- fix(core): silently handle EPERM when listing dir structure by @scidomino in
+  [#25066](https://github.com/google-gemini/gemini-cli/pull/25066)
+- Changelog for v0.37.1 by @gemini-cli-robot in
+  [#25055](https://github.com/google-gemini/gemini-cli/pull/25055)
+- fix: decode Uint8Array and multi-byte UTF-8 in API error messages by
+  @kimjune01 in [#23341](https://github.com/google-gemini/gemini-cli/pull/23341)
+- Automated documentation audit results by @g-samroberts in
+  [#22755](https://github.com/google-gemini/gemini-cli/pull/22755)
+- debugging(ui): add optional debugRainbow setting by @jacob314 in
+  [#25088](https://github.com/google-gemini/gemini-cli/pull/25088)
+- fix: resolve lifecycle memory leaks by cleaning up listeners and root closures
   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
+  [#25049](https://github.com/google-gemini/gemini-cli/pull/25049)
+- docs(cli): updates f12 description to be more precise by @JayadityaGit in
+  [#15816](https://github.com/google-gemini/gemini-cli/pull/15816)
+- fix(cli): mark /settings as unsafe to run concurrently by @jacob314 in
+  [#25061](https://github.com/google-gemini/gemini-cli/pull/25061)
+- fix(core): remove buffer slice to prevent OOM on large output streams by
+  @spencer426 in
+  [#25094](https://github.com/google-gemini/gemini-cli/pull/25094)
+- feat(core): persist subagent agentId in tool call records by @abhipatel12 in
+  [#25092](https://github.com/google-gemini/gemini-cli/pull/25092)
+- chore(core): increase codebase investigator turn limits to 50 by @abhipatel12
+  in [#25125](https://github.com/google-gemini/gemini-cli/pull/25125)
+- refactor(core): consolidate execute() arguments into ExecuteOptions by
+  @mbleigh in [#25101](https://github.com/google-gemini/gemini-cli/pull/25101)
+- feat(core): add Strategic Re-evaluation guidance to system prompt by
+  @aishaneeshah in
+  [#25062](https://github.com/google-gemini/gemini-cli/pull/25062)
+- fix(core): preserve shell execution config fields on update by
+  @jasonmatthewsuhari in
+  [#25113](https://github.com/google-gemini/gemini-cli/pull/25113)
+- docs: add vi shortcuts and clarify MCP sandbox setup by @chrisjcthomas in
+  [#21679](https://github.com/google-gemini/gemini-cli/pull/21679)
+- fix(cli): pass session id to interactive shell executions by
+  @jasonmatthewsuhari in
+  [#25114](https://github.com/google-gemini/gemini-cli/pull/25114)
+- fix(cli): resolve text sanitization data loss due to C1 control characters by
+  @euxaristia in
+  [#22624](https://github.com/google-gemini/gemini-cli/pull/22624)
+- feat(core): add large memory regression test by @cynthialong0-0 in
+  [#25059](https://github.com/google-gemini/gemini-cli/pull/25059)
+- fix(core): resolve PTY exhaustion and orphan MCP subprocess leaks by
+  @spencer426 in
+  [#25079](https://github.com/google-gemini/gemini-cli/pull/25079)
+- chore(deps): update vulnerable dependencies via npm audit fix by @scidomino in
+  [#25140](https://github.com/google-gemini/gemini-cli/pull/25140)
+- perf(sandbox): optimize Windows sandbox initialization via native ACL
+  application by @ehedlund in
+  [#25077](https://github.com/google-gemini/gemini-cli/pull/25077)
+- chore: switch from keytar to @github/keytar by @cocosheng-g in
+  [#25143](https://github.com/google-gemini/gemini-cli/pull/25143)
+- fix: improve audio MIME normalization and validation in file reads by
+  @junaiddshaukat in
+  [#21636](https://github.com/google-gemini/gemini-cli/pull/21636)
+- docs: Update docs-audit to include changes in PR body by @g-samroberts in
+  [#25153](https://github.com/google-gemini/gemini-cli/pull/25153)
+- docs: correct documentation for enforced authentication type by @cocosheng-g
+  in [#25142](https://github.com/google-gemini/gemini-cli/pull/25142)
+- fix(cli): exclude update_topic from confirmation queue count by @Abhijit-2592
+  in [#24945](https://github.com/google-gemini/gemini-cli/pull/24945)
+- Memory fix for trace's streamWrapper. by @anthraxmilkshake in
+  [#25089](https://github.com/google-gemini/gemini-cli/pull/25089)
+- fix(core): fix quota footer for non-auto models and improve display by
+  @jackwotherspoon in
+  [#25121](https://github.com/google-gemini/gemini-cli/pull/25121)
+- docs(contributing): clarify self-assignment policy for issues by @jmr in
+  [#23087](https://github.com/google-gemini/gemini-cli/pull/23087)
+- feat(core): add skill patching support with /memory inbox integration by
+  @SandyTao520 in
+  [#25148](https://github.com/google-gemini/gemini-cli/pull/25148)
+- Stop suppressing thoughts and text in model response by @gundermanc in
+  [#25073](https://github.com/google-gemini/gemini-cli/pull/25073)
+- fix(release): prefix git hash in nightly versions to prevent semver
+  normalization by @SandyTao520 in
+  [#25304](https://github.com/google-gemini/gemini-cli/pull/25304)
+- feat(cli): extract QuotaContext and resolve infinite render loop by @Adib234
+  in [#24959](https://github.com/google-gemini/gemini-cli/pull/24959)
+- refactor(core): extract and centralize sandbox path utilities by @ehedlund in
+  [#25305](https://github.com/google-gemini/gemini-cli/pull/25305)
+- feat(ui): added enhancements to scroll momentum by @devr0306 in
+  [#24447](https://github.com/google-gemini/gemini-cli/pull/24447)
+- fix(core): replace custom binary detection with isbinaryfile to correctly
+  handle UTF-8 (U+FFFD) by @Anjaligarhwal in
+  [#25297](https://github.com/google-gemini/gemini-cli/pull/25297)
+- feat(agent): implement tool-controlled display protocol (Steps 2-3) by
+  @mbleigh in [#25134](https://github.com/google-gemini/gemini-cli/pull/25134)
+- Stop showing scrollbar unless we are in terminalBuffer mode by @jacob314 in
+  [#25320](https://github.com/google-gemini/gemini-cli/pull/25320)
+- feat: support auth block in MCP servers config in agents by @TanmayVartak in
+  [#24770](https://github.com/google-gemini/gemini-cli/pull/24770)
+- fix(core): expose GEMINI_PLANS_DIR to hook environment by @Adib234 in
+  [#25296](https://github.com/google-gemini/gemini-cli/pull/25296)
+- feat(core): implement silent fallback for Plan Mode model routing by @jerop in
+  [#25317](https://github.com/google-gemini/gemini-cli/pull/25317)
+- fix: correct redirect count increment in fetchJson by @KevinZhao in
+  [#24896](https://github.com/google-gemini/gemini-cli/pull/24896)
+- fix(core): prevent secondary crash in ModelRouterService finally block 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)
+  [#25333](https://github.com/google-gemini/gemini-cli/pull/25333)
+- feat(core): introduce decoupled ContextManager and Sidecar architecture by
+  @joshualitt in
+  [#24752](https://github.com/google-gemini/gemini-cli/pull/24752)
+- docs(core): update generalist agent documentation by @abhipatel12 in
+  [#25325](https://github.com/google-gemini/gemini-cli/pull/25325)
+- chore(mcp): check MCP error code over brittle string match by @jackwotherspoon
+  in [#25381](https://github.com/google-gemini/gemini-cli/pull/25381)
+- feat(plan): update plan mode prompt to allow showing plan content by @ruomengz
+  in [#25058](https://github.com/google-gemini/gemini-cli/pull/25058)
+- test(core): improve sandbox integration test coverage and fix OS-specific
+  failures by @ehedlund in
+  [#25307](https://github.com/google-gemini/gemini-cli/pull/25307)
+- fix(core): use debug level for keychain fallback logging by @ehedlund in
+  [#25398](https://github.com/google-gemini/gemini-cli/pull/25398)
+- feat(test): add a performance test in asian language by @cynthialong0-0 in
+  [#25392](https://github.com/google-gemini/gemini-cli/pull/25392)
+- feat(cli): enable mouse clicking for cursor positioning in AskUser multi-line
+  answers by @Adib234 in
+  [#24630](https://github.com/google-gemini/gemini-cli/pull/24630)
+- fix(core): detect kmscon terminal as supporting true color by @claygeo in
+  [#25282](https://github.com/google-gemini/gemini-cli/pull/25282)
+- ci: add agent session drift check workflow by @adamfweidman in
+  [#25389](https://github.com/google-gemini/gemini-cli/pull/25389)
+- use macos-latest-large runner where applicable. by @scidomino in
+  [#25413](https://github.com/google-gemini/gemini-cli/pull/25413)
+- Changelog for v0.37.2 by @gemini-cli-robot in
+  [#25336](https://github.com/google-gemini/gemini-cli/pull/25336)
 
 **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.38.0-preview.0...v0.39.0-preview.0

docs/cli/auto-memory.md

@@ -0,0 +1,143 @@
+# Auto Memory
+
+Auto Memory is an experimental feature that mines your past Gemini CLI sessions
+in the background and turns recurring workflows into reusable
+[Agent Skills](./skills.md). You review, accept, or discard each extracted skill
+before it becomes available to future sessions.
+
+<!-- prettier-ignore -->
+> [!NOTE]
+> This is an experimental feature currently under active development.
+
+## Overview
+
+Every session you run with Gemini CLI is recorded locally as a transcript. Auto
+Memory scans those transcripts for procedural patterns that recur across
+sessions, then drafts each pattern as a `SKILL.md` file in a project-local
+inbox. You inspect the draft, decide whether it captures real expertise, and
+promote it to your global or workspace skills directory if you want it.
+
+You'll use Auto Memory when you want to:
+
+- **Capture team workflows** that you find yourself walking the agent through
+  more than once.
+- **Codify hard-won fixes** for project-specific landmines so future sessions
+  avoid them.
+- **Bootstrap a skills library** without writing every `SKILL.md` by hand.
+
+Auto Memory complements—but does not replace—the
+[`save_memory` tool](../tools/memory.md), which captures single facts into
+`GEMINI.md`. Auto Memory captures multi-step procedures into skills.
+
+## Prerequisites
+
+- Gemini CLI installed and authenticated.
+- At least 10 user messages across recent, idle sessions in the project. Auto
+  Memory ignores active or trivial sessions.
+
+## How to enable Auto Memory
+
+Auto Memory is off by default. Enable it in your settings file:
+
+1.  Open your global settings file at `~/.gemini/settings.json`. If you only
+    want Auto Memory in one project, edit `.gemini/settings.json` in that
+    project instead.
+
+2.  Add the experimental flag:
+
+    ```json
+    {
+      "experimental": {
+        "autoMemory": true
+      }
+    }
+    ```
+
+3.  Restart Gemini CLI. The flag requires a restart because the extraction
+    service starts during session boot.
+
+## How Auto Memory works
+
+Auto Memory runs as a background task on session startup. It does not block the
+UI, consume your interactive turns, or surface tool prompts.
+
+1.  **Eligibility scan.** The service indexes recent sessions from
+    `~/.gemini/tmp/<project>/chats/`. Sessions are eligible only if they have
+    been idle for at least three hours and contain at least 10 user messages.
+2.  **Lock acquisition.** A lock file in the project's memory directory
+    coordinates across multiple CLI instances so extraction runs at most once at
+    a time.
+3.  **Sub-agent extraction.** A specialized sub-agent (named `confucius`)
+    reviews the session index, reads any sessions that look like they contain
+    repeated procedural workflows, and drafts new `SKILL.md` files. Its
+    instructions tell it to default to creating zero skills unless the evidence
+    is strong, so most runs produce no inbox items.
+4.  **Patch validation.** If the sub-agent proposes edits to skills outside the
+    inbox (for example, an existing global skill), it writes a unified diff
+    `.patch` file. Auto Memory dry-runs each patch and discards any that do not
+    apply cleanly.
+5.  **Notification.** When a run produces new skills or patches, Gemini CLI
+    surfaces an inline message telling you how many items are waiting.
+
+## How to review extracted skills
+
+Use the `/memory inbox` slash command to open the inbox dialog at any time:
+
+**Command:** `/memory inbox`
+
+The dialog lists each draft skill with its name, description, and source
+sessions. From there you can:
+
+- **Read** the full `SKILL.md` body before deciding.
+- **Promote** a skill to your user (`~/.gemini/skills/`) or workspace
+  (`.gemini/skills/`) directory.
+- **Discard** a skill you do not want.
+- **Apply** or reject a `.patch` proposal against an existing skill.
+
+Promoted skills become discoverable in the next session and follow the standard
+[skill discovery precedence](./skills.md#skill-discovery-tiers).
+
+## How to disable Auto Memory
+
+To turn off background extraction, set the flag back to `false` in your settings
+file and restart Gemini CLI:
+
+```json
+{
+  "experimental": {
+    "autoMemory": false
+  }
+}
+```
+
+Disabling the flag stops the background service immediately on the next session
+start. Existing inbox items remain on disk; you can either drain them with
+`/memory inbox` first or remove the project memory directory manually.
+
+## Data and privacy
+
+- Auto Memory only reads session files that already exist locally on your
+  machine. Nothing is uploaded to Gemini outside the normal API calls the
+  extraction sub-agent makes during its run.
+- The sub-agent is instructed to redact secrets, tokens, and credentials it
+  encounters and to never copy large tool outputs verbatim.
+- Drafted skills live in your project's memory directory until you promote or
+  discard them. They are not automatically loaded into any session.
+
+## Limitations
+
+- The sub-agent runs on a preview Gemini Flash model. Extraction quality depends
+  on the model's ability to recognize durable patterns versus one-off incidents.
+- Auto Memory does not extract skills from the current session. It only
+  considers sessions that have been idle for three hours or more.
+- Inbox items are stored per project. Skills extracted in one workspace are not
+  visible from another until you promote them to the user-scope skills
+  directory.
+
+## Next steps
+
+- Learn how skills are discovered and activated in [Agent Skills](./skills.md).
+- Explore the [memory management tutorial](./tutorials/memory-management.md) for
+  the complementary `save_memory` and `GEMINI.md` workflows.
+- Review the experimental settings catalog in
+  [Settings](./settings.md#experimental).

docs/cli/enterprise.md

@@ -507,7 +507,7 @@ events. For more information, see the [telemetry documentation](./telemetry.md).
 You can enforce a specific authentication method for all users by setting the
 `security.auth.enforcedType` in the system-level `settings.json` file. This
 prevents users from choosing a different authentication method. See the
-[Authentication docs](../get-started/authentication.md) for more details.
+[Authentication docs](../get-started/authentication.mdx) for more details.
 
 **Example:** Enforce the use of Google login for all users.
 

docs/cli/plan-mode.md

@@ -130,7 +130,9 @@ These are the only allowed tools:
   [`cli_help`](../core/subagents.md#cli-help-agent)
 - **Interaction:** [`ask_user`](../tools/ask-user.md)
 - **MCP tools (Read):** Read-only [MCP tools](../tools/mcp-server.md) (for
-  example, `github_read_issue`, `postgres_read_schema`) are allowed.
+  example, `github_read_issue`, `postgres_read_schema`) and core
+  [MCP resource tools](../tools/mcp-resources.md) (`list_mcp_resources`,
+  `read_mcp_resource`) are allowed.
 - **Planning (Write):**
   [`write_file`](../tools/file-system.md#3-write_file-writefile) and
   [`replace`](../tools/file-system.md#6-replace-edit) only allowed for `.md`
@@ -327,8 +329,12 @@ Storage whenever Gemini CLI exits Plan Mode to start the implementation.
 
 ```bash
 #!/usr/bin/env bash
-# Extract the plan path from the tool input JSON
-plan_path=$(jq -r '.tool_input.plan_path // empty')
+# Extract the plan filename from the tool input JSON
+plan_filename=$(jq -r '.tool_input.plan_filename // empty')
+plan_filename=$(basename -- "$plan_filename")
+
+# Construct the absolute path using the GEMINI_PLANS_DIR environment variable
+plan_path="$GEMINI_PLANS_DIR/$plan_filename"
 
 if [ -f "$plan_path" ]; then
   # Generate a unique filename using a timestamp
@@ -441,6 +447,10 @@ on the current phase of your task:
     switches to a high-speed **Flash** model. This provides a faster, more
     responsive experience during the implementation of the plan.
 
+If the high-reasoning model is unavailable or you don't have access to it,
+Gemini CLI automatically and silently falls back to a faster model to ensure
+your workflow isn't interrupted.
+
 This behavior is enabled by default to provide the best balance of quality and
 performance. You can disable this automatic switching in your settings:
 

docs/cli/settings.md

@@ -24,20 +24,22 @@ they appear in the UI.
 
 ### General
 
-| UI Label                | Setting                            | Description                                                                                                                                                                                                                                                   | Default     |
-| ----------------------- | ---------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------- |
-| Vim Mode                | `general.vimMode`                  | Enable Vim keybindings                                                                                                                                                                                                                                        | `false`     |
-| Default Approval Mode   | `general.defaultApprovalMode`      | The default approval mode for tool execution. 'default' prompts for approval, 'auto_edit' auto-approves edit tools, and 'plan' is read-only mode. YOLO mode (auto-approve all actions) can only be enabled via command line (--yolo or --approval-mode=yolo). | `"default"` |
-| Enable Auto Update      | `general.enableAutoUpdate`         | Enable automatic updates.                                                                                                                                                                                                                                     | `true`      |
-| Enable Notifications    | `general.enableNotifications`      | Enable run-event notifications for action-required prompts and session completion.                                                                                                                                                                            | `false`     |
-| Enable Plan Mode        | `general.plan.enabled`             | Enable Plan Mode for read-only safety during planning.                                                                                                                                                                                                        | `true`      |
-| Plan Directory          | `general.plan.directory`           | The directory where planning artifacts are stored. If not specified, defaults to the system temporary directory. A custom directory requires a policy to allow write access in Plan Mode.                                                                     | `undefined` |
-| Plan Model Routing      | `general.plan.modelRouting`        | Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pro for the planning phase and Flash for the implementation phase.                                                                                                          | `true`      |
-| Retry Fetch Errors      | `general.retryFetchErrors`         | Retry on "exception TypeError: fetch failed sending request" errors.                                                                                                                                                                                          | `true`      |
-| Max Chat Model Attempts | `general.maxAttempts`              | Maximum number of attempts for requests to the main chat model. Cannot exceed 10.                                                                                                                                                                             | `10`        |
-| Debug Keystroke Logging | `general.debugKeystrokeLogging`    | Enable debug logging of keystrokes to the console.                                                                                                                                                                                                            | `false`     |
-| Enable Session Cleanup  | `general.sessionRetention.enabled` | Enable automatic session cleanup                                                                                                                                                                                                                              | `true`      |
-| Keep chat history       | `general.sessionRetention.maxAge`  | Automatically delete chats older than this time period (e.g., "30d", "7d", "24h", "1w")                                                                                                                                                                       | `"30d"`     |
+| UI Label                      | Setting                            | Description                                                                                                                                                                                                                                                   | Default     |
+| ----------------------------- | ---------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------- |
+| Vim Mode                      | `general.vimMode`                  | Enable Vim keybindings                                                                                                                                                                                                                                        | `false`     |
+| Default Approval Mode         | `general.defaultApprovalMode`      | The default approval mode for tool execution. 'default' prompts for approval, 'auto_edit' auto-approves edit tools, and 'plan' is read-only mode. YOLO mode (auto-approve all actions) can only be enabled via command line (--yolo or --approval-mode=yolo). | `"default"` |
+| Enable Auto Update            | `general.enableAutoUpdate`         | Enable automatic updates.                                                                                                                                                                                                                                     | `true`      |
+| Enable Terminal Notifications | `general.enableNotifications`      | Enable terminal run-event notifications for action-required prompts and session completion.                                                                                                                                                                   | `false`     |
+| Terminal Notification Method  | `general.notificationMethod`       | How to send terminal notifications.                                                                                                                                                                                                                           | `"auto"`    |
+| Enable Plan Mode              | `general.plan.enabled`             | Enable Plan Mode for read-only safety during planning.                                                                                                                                                                                                        | `true`      |
+| Plan Directory                | `general.plan.directory`           | The directory where planning artifacts are stored. If not specified, defaults to the system temporary directory. A custom directory requires a policy to allow write access in Plan Mode.                                                                     | `undefined` |
+| Plan Model Routing            | `general.plan.modelRouting`        | Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pro for the planning phase and Flash for the implementation phase.                                                                                                          | `true`      |
+| Retry Fetch Errors            | `general.retryFetchErrors`         | Retry on "exception TypeError: fetch failed sending request" errors.                                                                                                                                                                                          | `true`      |
+| Max Chat Model Attempts       | `general.maxAttempts`              | Maximum number of attempts for requests to the main chat model. Cannot exceed 10.                                                                                                                                                                             | `10`        |
+| Debug Keystroke Logging       | `general.debugKeystrokeLogging`    | Enable debug logging of keystrokes to the console.                                                                                                                                                                                                            | `false`     |
+| Enable Session Cleanup        | `general.sessionRetention.enabled` | Enable automatic session cleanup                                                                                                                                                                                                                              | `true`      |
+| Keep chat history             | `general.sessionRetention.maxAge`  | Automatically delete chats older than this time period (e.g., "30d", "7d", "24h", "1w")                                                                                                                                                                       | `"30d"`     |
+| Topic & Update Narration      | `general.topicUpdateNarration`     | Enable the Topic & Update communication model for reduced chattiness and structured progress reporting.                                                                                                                                                       | `true`      |
 
 ### Output
 
@@ -159,17 +161,19 @@ they appear in the UI.
 
 ### Experimental
 
-| UI Label                                             | Setting                             | Description                                                                                                                                               | Default |
-| ---------------------------------------------------- | ----------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
-| Enable Git Worktrees                                 | `experimental.worktrees`            | Enable automated Git worktree management for parallel work.                                                                                               | `false` |
-| Use OSC 52 Paste                                     | `experimental.useOSC52Paste`        | Use OSC 52 for pasting. This may be more robust than the default system when using remote terminal sessions (if your terminal is configured to allow it). | `false` |
-| Use OSC 52 Copy                                      | `experimental.useOSC52Copy`         | Use OSC 52 for copying. This may be more robust than the default system when using remote terminal sessions (if your terminal is configured to allow it). | `false` |
-| Model Steering                                       | `experimental.modelSteering`        | Enable model steering (user hints) to guide the model during tool execution.                                                                              | `false` |
-| Direct Web Fetch                                     | `experimental.directWebFetch`       | Enable web fetch behavior that bypasses LLM summarization.                                                                                                | `false` |
-| Memory Manager Agent                                 | `experimental.memoryManager`        | Replace the built-in save_memory tool with a memory manager subagent that supports adding, removing, de-duplicating, and organizing memories.             | `false` |
-| Use the generalist profile to manage agent contexts. | `experimental.generalistProfile`    | Suitable for general coding and software development tasks.                                                                                               | `false` |
-| Enable Context Management                            | `experimental.contextManagement`    | Enable logic for context management.                                                                                                                      | `false` |
-| Topic & Update Narration                             | `experimental.topicUpdateNarration` | Enable the experimental Topic & Update communication model for reduced chattiness and structured progress reporting.                                      | `false` |
+| UI Label                                             | Setting                                         | Description                                                                                                                                               | Default |
+| ---------------------------------------------------- | ----------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| Enable Git Worktrees                                 | `experimental.worktrees`                        | Enable automated Git worktree management for parallel work.                                                                                               | `false` |
+| Use OSC 52 Paste                                     | `experimental.useOSC52Paste`                    | Use OSC 52 for pasting. This may be more robust than the default system when using remote terminal sessions (if your terminal is configured to allow it). | `false` |
+| Use OSC 52 Copy                                      | `experimental.useOSC52Copy`                     | Use OSC 52 for copying. This may be more robust than the default system when using remote terminal sessions (if your terminal is configured to allow it). | `false` |
+| Model Steering                                       | `experimental.modelSteering`                    | Enable model steering (user hints) to guide the model during tool execution.                                                                              | `false` |
+| Direct Web Fetch                                     | `experimental.directWebFetch`                   | Enable web fetch behavior that bypasses LLM summarization.                                                                                                | `false` |
+| Enable Gemma Model Router                            | `experimental.gemmaModelRouter.enabled`         | Enable the Gemma Model Router (experimental). Requires a local endpoint serving Gemma via the Gemini API using LiteRT-LM shim.                            | `false` |
+| Auto-start LiteRT Server                             | `experimental.gemmaModelRouter.autoStartServer` | Automatically start the LiteRT-LM server when Gemini CLI starts and the Gemma router is enabled.                                                          | `false` |
+| Memory Manager Agent                                 | `experimental.memoryManager`                    | Replace the built-in save_memory tool with a memory manager subagent that supports adding, removing, de-duplicating, and organizing memories.             | `false` |
+| Auto Memory                                          | `experimental.autoMemory`                       | Automatically extract reusable skills from past sessions in the background. Review results with /memory inbox.                                            | `false` |
+| Use the generalist profile to manage agent contexts. | `experimental.generalistProfile`                | Suitable for general coding and software development tasks.                                                                                               | `false` |
+| Enable Context Management                            | `experimental.contextManagement`                | Enable logic for context management.                                                                                                                      | `false` |
 
 ### Skills
 

docs/cli/system-prompt.md

@@ -24,7 +24,7 @@ project-specific behavior or create a customized persona.
 
 You can set the environment variable temporarily in your shell, or persist it
 via a `.gemini/.env` file. See
-[Persisting Environment Variables](../get-started/authentication.md#persisting-environment-variables).
+[Persisting Environment Variables](../get-started/authentication.mdx#persisting-environment-variables).
 
 - Use the project default path (`.gemini/system.md`):
   - `GEMINI_SYSTEM_MD=true` or `GEMINI_SYSTEM_MD=1`
@@ -51,7 +51,7 @@ error with: `missing system prompt file '<path>'`.
   - Create `.gemini/system.md`, then add to `.gemini/.env`:
     - `GEMINI_SYSTEM_MD=1`
 - Use a custom file under your home directory:
-  - `GEMINI_SYSTEM_MD=~/prompts/SYSTEM.md gemini`
+  - `GEMINI_SYSTEM_MD=~/prompts/system.md gemini`
 
 ## UI indicator
 
@@ -102,17 +102,17 @@ safety and workflow rules.
 
 This creates the file and writes the current built‑in system prompt to it.
 
-## Best practices: SYSTEM.md vs GEMINI.md
+## Best practices: system.md vs GEMINI.md
 
-- SYSTEM.md (firmware):
+- system.md (firmware):
   - Non‑negotiable operational rules: safety, tool‑use protocols, approvals, and
     mechanics that keep the CLI reliable.
   - Stable across tasks and projects (or per project when needed).
 - GEMINI.md (strategy):
   - Persona, goals, methodologies, and project/domain context.
-  - Evolves per task; relies on SYSTEM.md for safe execution.
+  - Evolves per task; relies on system.md for safe execution.
 
-Keep SYSTEM.md minimal but complete for safety and tool operation. Keep
+Keep system.md minimal but complete for safety and tool operation. Keep
 GEMINI.md focused on high‑level guidance and project specifics.
 
 ## Troubleshooting

docs/cli/tutorials/memory-management.md

@@ -124,3 +124,5 @@ immediately. Force a reload with:
 - Explore the [Command reference](../../reference/commands.md) for more
   `/memory` options.
 - Read the technical spec for [Project context](../../cli/gemini-md.md).
+- Try the experimental [Auto Memory](../auto-memory.md) feature to extract
+  reusable skills from your past sessions automatically.

docs/core/subagents.md

@@ -87,11 +87,23 @@ Gemini CLI comes with the following built-in subagents:
 
 ### Generalist Agent
 
-- **Name:** `generalist_agent`
-- **Purpose:** Route tasks to the appropriate specialized subagent.
-- **When to use:** Implicitly used by the main agent for routing. Not directly
-  invoked by the user.
-- **Configuration:** Enabled by default. No specific configuration options.
+- **Name:** `generalist`
+- **Purpose:** A general, all-purpose subagent that uses the inherited tool
+  access and configurations from the main agent. Useful for executing broad,
+  resource-heavy subtasks in an isolated conversation, optimizing your main
+  agent's context by returning only the final result of that given task.
+- **When to use:** Use this agent when a task requires many steps, handles large
+  volumes of information, or requires the same full capabilities as the main
+  agent. It is ideal for:
+  - **Multi-file modifications:** Applying refactors or fixing errors across
+    several files at once.
+  - **High-volume execution:** Running commands or tests that produce extensive
+    terminal output.
+  - **Action-oriented research:** Investigations where the agent needs to both
+    search code and run commands or make edits to find a solution. By delegating
+    these tasks, you prevent your main conversation from becoming cluttered or
+    slow. You can invoke it explicitly using `@generalist`.
+- **Configuration:** Enabled by default.
 
 ### Browser Agent (experimental)
 

docs/get-started/authentication.mdx

@@ -1,10 +1,11 @@
+import { Tabs, TabItem } from '@astrojs/starlight/components';
+
 # Gemini CLI authentication setup
 
 To use Gemini CLI, you'll need to authenticate with Google. This guide helps you
 quickly find the best way to sign in based on your account type and how you're
 using the CLI.
 
-<!-- prettier-ignore -->
 > [!TIP]
 > Looking for a high-level comparison of all available subscriptions?
 > To compare features and find the right quota for your needs, see our
@@ -23,7 +24,7 @@ Select the authentication method that matches your situation in the table below:
 | Organization users with a company, school, or Google Workspace account | [Sign in with Google](#login-google)                             | [Yes](#set-gcp)                                             |
 | AI Studio user with a Gemini API key                                   | [Use Gemini API Key](#gemini-api)                                | No                                                          |
 | Google Cloud Vertex AI user                                            | [Vertex AI](#vertex-ai)                                          | [Yes](#set-gcp)                                             |
-| [Headless mode](#headless)                                             | [Use Gemini API Key](#gemini-api) or<br> [Vertex AI](#vertex-ai) | No (for Gemini API Key)<br> [Yes](#set-gcp) (for Vertex AI) |
+| [Headless mode](#headless)                                             | [Use Gemini API Key](#gemini-api) or<br /> [Vertex AI](#vertex-ai) | No (for Gemini API Key)<br /> [Yes](#set-gcp) (for Vertex AI) |
 
 ### What is my Google account type?
 
@@ -84,19 +85,24 @@ To authenticate and use Gemini CLI with a Gemini API key:
 
 2. Set the `GEMINI_API_KEY` environment variable to your key. For example:
 
-   **macOS/Linux**
+   <Tabs>
+     <TabItem label="macOS/Linux">
 
-   ```bash
-   # Replace YOUR_GEMINI_API_KEY with the key from AI Studio
-   export GEMINI_API_KEY="YOUR_GEMINI_API_KEY"
-   ```
+     ```bash
+      # Replace YOUR_GEMINI_API_KEY with the key from AI Studio
+      export GEMINI_API_KEY="YOUR_GEMINI_API_KEY"
+     ```
 
-   **Windows (PowerShell)**
+     </TabItem>
+     <TabItem label="Windows (PowerShell)">
 
-   ```powershell
-   # Replace YOUR_GEMINI_API_KEY with the key from AI Studio
-   $env:GEMINI_API_KEY="YOUR_GEMINI_API_KEY"
-   ```
+     ```powershell
+      # Replace YOUR_GEMINI_API_KEY with the key from AI Studio
+      $env:GEMINI_API_KEY="YOUR_GEMINI_API_KEY"
+     ```
+
+     </TabItem>
+   </Tabs>
 
    To make this setting persistent, see
    [Persisting Environment Variables](#persisting-vars).
@@ -109,7 +115,6 @@ To authenticate and use Gemini CLI with a Gemini API key:
 
 4. Select **Use Gemini API key**.
 
-<!-- prettier-ignore -->
 > [!WARNING]
 > Treat API keys, especially for services like Gemini, as sensitive
 > credentials. Protect them to prevent unauthorized access and potential misuse
@@ -131,21 +136,26 @@ or the location where you want to run your jobs.
 
 For example:
 
-**macOS/Linux**
+<Tabs>
+  <TabItem label="macOS/Linux">
 
-```bash
+  ```bash
 # Replace with your project ID and desired location (for example, us-central1)
 export GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"
 export GOOGLE_CLOUD_LOCATION="YOUR_PROJECT_LOCATION"
-```
+  ```
 
-**Windows (PowerShell)**
+  </TabItem>
+  <TabItem label="Windows (PowerShell)">
 
-```powershell
+  ```powershell
 # Replace with your project ID and desired location (for example, us-central1)
 $env:GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"
 $env:GOOGLE_CLOUD_LOCATION="YOUR_PROJECT_LOCATION"
-```
+  ```
+
+  </TabItem>
+</Tabs>
 
 To make any Vertex AI environment variable settings persistent, see
 [Persisting Environment Variables](#persisting-vars).
@@ -157,17 +167,22 @@ Consider this authentication method if you have Google Cloud CLI installed.
 If you have previously set `GOOGLE_API_KEY` or `GEMINI_API_KEY`, you must unset
 them to use ADC.
 
-**macOS/Linux**
+<Tabs>
+  <TabItem label="macOS/Linux">
 
-```bash
+  ```bash
 unset GOOGLE_API_KEY GEMINI_API_KEY
-```
+  ```
 
-**Windows (PowerShell)**
+  </TabItem>
+  <TabItem label="Windows (PowerShell)">
 
-```powershell
+  ```powershell
 Remove-Item Env:\GOOGLE_API_KEY, Env:\GEMINI_API_KEY -ErrorAction Ignore
-```
+  ```
+
+  </TabItem>
+</Tabs>
 
 1. Verify you have a Google Cloud project and Vertex AI API is enabled.
 
@@ -195,17 +210,22 @@ pipelines, or if your organization restricts user-based ADC or API key creation.
 If you have previously set `GOOGLE_API_KEY` or `GEMINI_API_KEY`, you must unset
 them:
 
-**macOS/Linux**
+<Tabs>
+  <TabItem label="macOS/Linux">
 
-```bash
+  ```bash
 unset GOOGLE_API_KEY GEMINI_API_KEY
-```
+  ```
 
-**Windows (PowerShell)**
+  </TabItem>
+  <TabItem label="Windows (PowerShell)">
 
-```powershell
+  ```powershell
 Remove-Item Env:\GOOGLE_API_KEY, Env:\GEMINI_API_KEY -ErrorAction Ignore
-```
+  ```
+
+  </TabItem>
+</Tabs>
 
 1.  [Create a service account and key](https://cloud.google.com/iam/docs/keys-create-delete)
     and download the provided JSON file. Assign the "Vertex AI User" role to the
@@ -214,19 +234,24 @@ Remove-Item Env:\GOOGLE_API_KEY, Env:\GEMINI_API_KEY -ErrorAction Ignore
 2.  Set the `GOOGLE_APPLICATION_CREDENTIALS` environment variable to the JSON
     file's absolute path. For example:
 
-    **macOS/Linux**
+    <Tabs>
+      <TabItem label="macOS/Linux">
 
-    ```bash
-    # Replace /path/to/your/keyfile.json with the actual path
-    export GOOGLE_APPLICATION_CREDENTIALS="/path/to/your/keyfile.json"
-    ```
+      ```bash
+        # Replace /path/to/your/keyfile.json with the actual path
+        export GOOGLE_APPLICATION_CREDENTIALS="/path/to/your/keyfile.json"
+      ```
 
-    **Windows (PowerShell)**
+      </TabItem>
+      <TabItem label="Windows (PowerShell)">
 
-    ```powershell
-    # Replace C:\path\to\your\keyfile.json with the actual path
-    $env:GOOGLE_APPLICATION_CREDENTIALS="C:\path\to\your\keyfile.json"
-    ```
+      ```powershell
+        # Replace C:\path\to\your\keyfile.json with the actual path
+        $env:GOOGLE_APPLICATION_CREDENTIALS="C:\path\to\your\keyfile.json"
+      ```
+
+      </TabItem>
+    </Tabs>
 
 3.  [Configure your Google Cloud Project](#set-gcp).
 
@@ -238,7 +263,6 @@ Remove-Item Env:\GOOGLE_API_KEY, Env:\GEMINI_API_KEY -ErrorAction Ignore
 
 5.  Select **Vertex AI**.
 
-<!-- prettier-ignore -->
 > [!WARNING]
 > Protect your service account key file as it gives access to
 > your resources.
@@ -250,19 +274,24 @@ Remove-Item Env:\GOOGLE_API_KEY, Env:\GEMINI_API_KEY -ErrorAction Ignore
 
 2.  Set the `GOOGLE_API_KEY` environment variable:
 
-    **macOS/Linux**
+    <Tabs>
+      <TabItem label="macOS/Linux">
 
-    ```bash
-    # Replace YOUR_GOOGLE_API_KEY with your Vertex AI API key
-    export GOOGLE_API_KEY="YOUR_GOOGLE_API_KEY"
-    ```
+      ```bash
+        # Replace YOUR_GOOGLE_API_KEY with your Vertex AI API key
+        export GOOGLE_API_KEY="YOUR_GOOGLE_API_KEY"
+      ```
 
-    **Windows (PowerShell)**
+      </TabItem>
+      <TabItem label="Windows (PowerShell)">
 
-    ```powershell
-    # Replace YOUR_GOOGLE_API_KEY with your Vertex AI API key
-    $env:GOOGLE_API_KEY="YOUR_GOOGLE_API_KEY"
-    ```
+      ```powershell
+        # Replace YOUR_GOOGLE_API_KEY with your Vertex AI API key
+        $env:GOOGLE_API_KEY="YOUR_GOOGLE_API_KEY"
+      ```
+
+      </TabItem>
+    </Tabs>
 
     If you see errors like `"API keys are not supported by this API..."`, your
     organization might restrict API key usage for this service. Try the other
@@ -280,7 +309,6 @@ Remove-Item Env:\GOOGLE_API_KEY, Env:\GEMINI_API_KEY -ErrorAction Ignore
 
 ## Set your Google Cloud project <a id="set-gcp"></a>
 
-<!-- prettier-ignore -->
 > [!IMPORTANT]
 > Most individual Google accounts (free and paid) don't require a
 > Google Cloud project for authentication.
@@ -308,19 +336,24 @@ To configure Gemini CLI to use a Google Cloud project, do the following:
 
     For example, to set the `GOOGLE_CLOUD_PROJECT_ID` variable:
 
-    **macOS/Linux**
+    <Tabs>
+      <TabItem label="macOS/Linux">
 
-    ```bash
-    # Replace YOUR_PROJECT_ID with your actual Google Cloud project ID
-    export GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"
-    ```
+      ```bash
+        # Replace YOUR_PROJECT_ID with your actual Google Cloud project ID
+        export GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"
+      ```
 
-    **Windows (PowerShell)**
+      </TabItem>
+      <TabItem label="Windows (PowerShell)">
 
-    ```powershell
-    # Replace YOUR_PROJECT_ID with your actual Google Cloud project ID
-    $env:GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"
-    ```
+      ```powershell
+        # Replace YOUR_PROJECT_ID with your actual Google Cloud project ID
+        $env:GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"
+      ```
+
+      </TabItem>
+    </Tabs>
 
     To make this setting persistent, see
     [Persisting Environment Variables](#persisting-vars).
@@ -333,21 +366,29 @@ persist them with the following methods:
 1.  **Add your environment variables to your shell configuration file:** Append
     the environment variable commands to your shell's startup file.
 
-    **macOS/Linux** (for example, `~/.bashrc`, `~/.zshrc`, or `~/.profile`):
+    <Tabs>
+      <TabItem label="macOS/Linux">
 
-    ```bash
-    echo 'export GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"' >> ~/.bashrc
-    source ~/.bashrc
-    ```
+      (for example, `~/.bashrc`, `~/.zshrc`, or `~/.profile`):
 
-    **Windows (PowerShell)** (for example, `$PROFILE`):
+      ```bash
+        echo 'export GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"' >> ~/.bashrc
+        source ~/.bashrc
+      ```
 
-    ```powershell
-    Add-Content -Path $PROFILE -Value '$env:GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"'
-    . $PROFILE
-    ```
+      </TabItem>
+      <TabItem label="Windows (PowerShell)">
+
+      (for example, `$PROFILE`):
+
+      ```powershell
+        Add-Content -Path $PROFILE -Value '$env:GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"'
+        . $PROFILE
+      ```
+
+      </TabItem>
+    </Tabs>
 
-<!-- prettier-ignore -->
 > [!WARNING]
 > Be aware that when you export API keys or service account
 > paths in your shell configuration file, any process launched from that
@@ -361,25 +402,30 @@ persist them with the following methods:
 
     Example for user-wide settings:
 
-    **macOS/Linux**
+    <Tabs>
+      <TabItem label="macOS/Linux">
 
-    ```bash
-    mkdir -p ~/.gemini
-    cat >> ~/.gemini/.env <<'EOF'
-    GOOGLE_CLOUD_PROJECT="your-project-id"
-    # Add other variables like GEMINI_API_KEY as needed
-    EOF
-    ```
+      ```bash
+        mkdir -p ~/.gemini
+        cat >> ~/.gemini/.env <<'EOF'
+        GOOGLE_CLOUD_PROJECT="your-project-id"
+        # Add other variables like GEMINI_API_KEY as needed
+        EOF
+      ```
 
-    **Windows (PowerShell)**
+      </TabItem>
+      <TabItem label="Windows (PowerShell)">
 
-    ```powershell
-    New-Item -ItemType Directory -Force -Path "$env:USERPROFILE\.gemini"
-    @"
-    GOOGLE_CLOUD_PROJECT="your-project-id"
-    # Add other variables like GEMINI_API_KEY as needed
-    "@ | Out-File -FilePath "$env:USERPROFILE\.gemini\.env" -Encoding utf8 -Append
-    ```
+      ```powershell
+        New-Item -ItemType Directory -Force -Path "$env:USERPROFILE\.gemini"
+        @"
+        GOOGLE_CLOUD_PROJECT="your-project-id"
+        # Add other variables like GEMINI_API_KEY as needed
+        "@ | Out-File -FilePath "$env:USERPROFILE\.gemini\.env" -Encoding utf8 -Append
+      ```
+
+      </TabItem>
+    </Tabs>
 
 Variables are loaded from the first file found, not merged.
 

docs/get-started/index.md

@@ -24,7 +24,8 @@ Once Gemini CLI is installed, run Gemini CLI from your command line:
 gemini
 ```
 
-For more installation options, see [Gemini CLI Installation](./installation.md).
+For more installation options, see
+[Gemini CLI Installation](./installation.mdx).
 
 ## Authenticate
 
@@ -46,7 +47,7 @@ cases, you can log in with your existing Google account:
 
 Certain account types may require you to configure a Google Cloud project. For
 more information, including other authentication methods, see
-[Gemini CLI Authentication Setup](./authentication.md).
+[Gemini CLI Authentication Setup](./authentication.mdx).
 
 ## Configure
 

docs/get-started/installation.md

@@ -1,181 +0,0 @@
-# Gemini CLI installation, execution, and releases
-
-This document provides an overview of Gemini CLI's system requirements,
-installation methods, and release types.
-
-## Recommended system specifications
-
-- **Operating System:**
-  - macOS 15+
-  - Windows 11 24H2+
-  - Ubuntu 20.04+
-- **Hardware:**
-  - "Casual" usage: 4GB+ RAM (short sessions, common tasks and edits)
-  - "Power" usage: 16GB+ RAM (long sessions, large codebases, deep context)
-- **Runtime:** Node.js 20.0.0+
-- **Shell:** Bash, Zsh, or PowerShell
-- **Location:**
-  [Gemini Code Assist supported locations](https://developers.google.com/gemini-code-assist/resources/available-locations#americas)
-- **Internet connection required**
-
-## Install Gemini CLI
-
-We recommend most users install Gemini CLI using one of the following
-installation methods:
-
-- npm
-- Homebrew
-- MacPorts
-- Anaconda
-
-Note that Gemini CLI comes pre-installed on
-[**Cloud Shell**](https://docs.cloud.google.com/shell/docs) and
-[**Cloud Workstations**](https://cloud.google.com/workstations).
-
-### Install globally with npm
-
-```bash
-npm install -g @google/gemini-cli
-```
-
-### Install globally with Homebrew (macOS/Linux)
-
-```bash
-brew install gemini-cli
-```
-
-### Install globally with MacPorts (macOS)
-
-```bash
-sudo port install gemini-cli
-```
-
-### Install with Anaconda (for restricted environments)
-
-```bash
-# Create and activate a new environment
-conda create -y -n gemini_env -c conda-forge nodejs
-conda activate gemini_env
-
-# Install Gemini CLI globally via npm (inside the environment)
-npm install -g @google/gemini-cli
-```
-
-## Run Gemini CLI
-
-For most users, we recommend running Gemini CLI with the `gemini` command:
-
-```bash
-gemini
-```
-
-For a list of options and additional commands, see the
-[CLI cheatsheet](../cli/cli-reference.md).
-
-You can also run Gemini CLI using one of the following advanced methods:
-
-- Run instantly with npx. You can run Gemini CLI without permanent installation.
-- In a sandbox. This method offers increased security and isolation.
-- From the source. This is recommended for contributors to the project.
-
-### Run instantly with npx
-
-```bash
-# Using npx (no installation required)
-npx @google/gemini-cli
-```
-
-You can also execute the CLI directly from the main branch on GitHub, which is
-helpful for testing features still in development:
-
-```bash
-npx https://github.com/google-gemini/gemini-cli
-```
-
-### Run in a sandbox (Docker/Podman)
-
-For security and isolation, Gemini CLI can be run inside a container. This is
-the default way that the CLI executes tools that might have side effects.
-
-- **Directly from the registry:** You can run the published sandbox image
-  directly. This is useful for environments where you only have Docker and want
-  to run the CLI.
-  ```bash
-  # Run the published sandbox image
-  docker run --rm -it us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.1.1
-  ```
-- **Using the `--sandbox` flag:** If you have Gemini CLI installed locally
-  (using the standard installation described above), you can instruct it to run
-  inside the sandbox container.
-  ```bash
-  gemini --sandbox -y -p "your prompt here"
-  ```
-
-### Run from source (recommended for Gemini CLI contributors)
-
-Contributors to the project will want to run the CLI directly from the source
-code.
-
-- **Development mode:** This method provides hot-reloading and is useful for
-  active development.
-  ```bash
-  # From the root of the repository
-  npm run start
-  ```
-- **Production mode (React optimizations):** This method runs the CLI with React
-  production mode enabled, which is useful for testing performance without
-  development overhead.
-  ```bash
-  # From the root of the repository
-  npm run start:prod
-  ```
-- **Production-like mode (linked package):** This method simulates a global
-  installation by linking your local package. It's useful for testing a local
-  build in a production workflow.
-
-  ```bash
-  # Link the local cli package to your global node_modules
-  npm link packages/cli
-
-  # Now you can run your local version using the `gemini` command
-  gemini
-  ```
-
-## Releases
-
-Gemini CLI has three release channels: nightly, preview, and stable. For most
-users, we recommend the stable release, which is the default installation.
-
-### Stable
-
-New stable releases are published each week. The stable release is the promotion
-of last week's `preview` release along with any bug fixes. The stable release
-uses `latest` tag, but omitting the tag also installs the latest stable release
-by default:
-
-```bash
-# Both commands install the latest stable release.
-npm install -g @google/gemini-cli
-npm install -g @google/gemini-cli@latest
-```
-
-### Preview
-
-New preview releases will be published each week. These releases are not fully
-vetted and may contain regressions or other outstanding issues. Try out the
-preview release by using the `preview` tag:
-
-```bash
-npm install -g @google/gemini-cli@preview
-```
-
-### Nightly
-
-Nightly releases are published every day. The nightly release includes all
-changes from the main branch at time of release. It should be assumed there are
-pending validations and issues. You can help test the latest changes by
-installing with the `nightly` tag:
-
-```bash
-npm install -g @google/gemini-cli@nightly
-```

docs/get-started/installation.mdx

@@ -0,0 +1,201 @@
+import { Tabs, TabItem } from '@astrojs/starlight/components';
+
+# Gemini CLI installation, execution, and releases
+
+This document provides an overview of Gemini CLI's system requirements,
+installation methods, and release types.
+
+## Recommended system specifications
+
+- **Operating System:**
+  - macOS 15+
+  - Windows 11 24H2+
+  - Ubuntu 20.04+
+- **Hardware:**
+  - "Casual" usage: 4GB+ RAM (short sessions, common tasks and edits)
+  - "Power" usage: 16GB+ RAM (long sessions, large codebases, deep context)
+- **Runtime:** Node.js 20.0.0+
+- **Shell:** Bash, Zsh, or PowerShell
+- **Location:**
+  [Gemini Code Assist supported locations](https://developers.google.com/gemini-code-assist/resources/available-locations#americas)
+- **Internet connection required**
+
+## Install Gemini CLI
+
+We recommend most users install Gemini CLI using one of the following
+installation methods. Note that Gemini CLI comes pre-installed on
+[**Cloud Shell**](https://docs.cloud.google.com/shell/docs) and
+[**Cloud Workstations**](https://cloud.google.com/workstations).
+
+<Tabs>
+  <TabItem label="npm">
+
+  Install globally with npm:
+
+  ```bash
+  npm install -g @google/gemini-cli
+  ```
+
+  </TabItem>
+  <TabItem label="Homebrew (macOS/Linux)">
+
+  Install globally with Homebrew:
+
+  ```bash
+  brew install gemini-cli
+  ```
+
+  </TabItem>
+  <TabItem label="MacPorts (macOS)">
+
+  Install globally with MacPorts:
+
+  ```bash
+  sudo port install gemini-cli
+  ```
+
+  </TabItem>
+  <TabItem label="Anaconda">
+
+  Install with Anaconda (for restricted environments):
+
+  ```bash
+  # Create and activate a new environment
+  conda create -y -n gemini_env -c conda-forge nodejs
+  conda activate gemini_env
+
+  # Install Gemini CLI globally via npm (inside the environment)
+  npm install -g @google/gemini-cli
+  ```
+
+  </TabItem>
+</Tabs>
+
+## Run Gemini CLI
+
+For most users, we recommend running Gemini CLI with the `gemini` command:
+
+```bash
+gemini
+```
+
+For a list of options and additional commands, see the
+[CLI cheatsheet](../cli/cli-reference.md).
+
+You can also run Gemini CLI using one of the following advanced methods:
+
+<Tabs>
+  <TabItem label="npx">
+
+  Run instantly with npx. You can run Gemini CLI without permanent installation.
+
+  ```bash
+  # Using npx (no installation required)
+  npx @google/gemini-cli
+  ```
+
+  You can also execute the CLI directly from the main branch on GitHub, which is
+  helpful for testing features still in development:
+
+  ```bash
+  npx https://github.com/google-gemini/gemini-cli
+  ```
+
+  </TabItem>
+  <TabItem label="Docker/Podman Sandbox">
+
+  For security and isolation, Gemini CLI can be run inside a container. This is
+  the default way that the CLI executes tools that might have side effects.
+
+  - **Directly from the registry:** You can run the published sandbox image
+    directly. This is useful for environments where you only have Docker and want
+    to run the CLI.
+    ```bash
+    # Run the published sandbox image
+    docker run --rm -it us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.1.1
+    ```
+  - **Using the `--sandbox` flag:** If you have Gemini CLI installed locally
+    (using the standard installation described above), you can instruct it to run
+    inside the sandbox container.
+    ```bash
+    gemini --sandbox -y -p "your prompt here"
+    ```
+
+  </TabItem>
+  <TabItem label="From source">
+
+  Contributors to the project will want to run the CLI directly from the source
+  code.
+
+  - **Development mode:** This method provides hot-reloading and is useful for
+    active development.
+    ```bash
+    # From the root of the repository
+    npm run start
+    ```
+  - **Production mode (React optimizations):** This method runs the CLI with React
+    production mode enabled, which is useful for testing performance without
+    development overhead.
+    ```bash
+    # From the root of the repository
+    npm run start:prod
+    ```
+  - **Production-like mode (linked package):** This method simulates a global
+    installation by linking your local package. It's useful for testing a local
+    build in a production workflow.
+
+    ```bash
+    # Link the local cli package to your global node_modules
+    npm link packages/cli
+
+    # Now you can run your local version using the `gemini` command
+    gemini
+    ```
+
+  </TabItem>
+</Tabs>
+
+## Releases
+
+Gemini CLI has three release channels: stable, preview, and nightly. For most
+users, we recommend the stable release, which is the default installation.
+
+<Tabs>
+  <TabItem label="Stable">
+
+  Stable releases are published each week. A stable release is created from the
+  previous week's preview release along with any bug fixes. The stable release
+  uses the `latest` tag. Omitting the tag also installs the latest stable
+  release by default.
+
+  ```bash
+  # Both commands install the latest stable release.
+  npm install -g @google/gemini-cli
+  npm install -g @google/gemini-cli@latest
+  ```
+
+  </TabItem>
+  <TabItem label="Preview">
+
+  New preview releases will be published each week. These releases are not fully
+  vetted and may contain regressions or other outstanding issues. Try out the
+  preview release by using the `preview` tag:
+
+  ```bash
+  npm install -g @google/gemini-cli@preview
+  ```
+
+  </TabItem>
+  <TabItem label="Nightly">
+
+  Nightly releases are published every day. The nightly release includes all
+  changes from the main branch at time of release. It should be assumed there are
+  pending validations and issues. You can help test the latest changes by
+  installing with the `nightly` tag:
+
+  ```bash
+  npm install -g @google/gemini-cli@nightly
+  ```
+
+  </TabItem>
+</Tabs>

docs/hooks/index.md

@@ -138,6 +138,7 @@ multiple layers in the following order of precedence (highest to lowest):
 Hooks are executed with a sanitized environment.
 
 - `GEMINI_PROJECT_DIR`: The absolute path to the project root.
+- `GEMINI_PLANS_DIR`: The absolute path to the plans directory.
 - `GEMINI_SESSION_ID`: The unique ID for the current session.
 - `GEMINI_CWD`: The current working directory.
 - `CLAUDE_PROJECT_DIR`: (Alias) Provided for compatibility.

docs/index.md

@@ -15,9 +15,9 @@ npm install -g @google/gemini-cli
 Jump in to Gemini CLI.
 
 - **[Quickstart](./get-started/index.md):** Your first session with Gemini CLI.
-- **[Installation](./get-started/installation.md):** How to install Gemini CLI
+- **[Installation](./get-started/installation.mdx):** How to install Gemini CLI
   on your system.
-- **[Authentication](./get-started/authentication.md):** Setup instructions for
+- **[Authentication](./get-started/authentication.mdx):** Setup instructions for
   personal and enterprise accounts.
 - **[CLI cheatsheet](./cli/cli-reference.md):** A quick reference for common
   commands and options.

docs/reference/configuration.md

@@ -134,10 +134,15 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `true`
 
 - **`general.enableNotifications`** (boolean):
-  - **Description:** Enable run-event notifications for action-required prompts
-    and session completion.
+  - **Description:** Enable terminal run-event notifications for action-required
+    prompts and session completion.
   - **Default:** `false`
 
+- **`general.notificationMethod`** (enum):
+  - **Description:** How to send terminal notifications.
+  - **Default:** `"auto"`
+  - **Values:** `"auto"`, `"osc9"`, `"osc777"`, `"bell"`
+
 - **`general.checkpointing.enabled`** (boolean):
   - **Description:** Enable session checkpointing for recovery
   - **Default:** `false`
@@ -193,6 +198,11 @@ their corresponding top-level category object in your `settings.json` file.
   - **Description:** Minimum retention period (safety limit, defaults to "1d")
   - **Default:** `"1d"`
 
+- **`general.topicUpdateNarration`** (boolean):
+  - **Description:** Enable the Topic & Update communication model for reduced
+    chattiness and structured progress reporting.
+  - **Default:** `true`
+
 #### `output`
 
 - **`output.format`** (enum):
@@ -1701,6 +1711,18 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `false`
   - **Requires restart:** Yes
 
+- **`experimental.gemmaModelRouter.autoStartServer`** (boolean):
+  - **Description:** Automatically start the LiteRT-LM server when Gemini CLI
+    starts and the Gemma router is enabled.
+  - **Default:** `false`
+  - **Requires restart:** Yes
+
+- **`experimental.gemmaModelRouter.binaryPath`** (string):
+  - **Description:** Custom path to the LiteRT-LM binary. Leave empty to use the
+    default location (~/.gemini/bin/litert/).
+  - **Default:** `""`
+  - **Requires restart:** Yes
+
 - **`experimental.gemmaModelRouter.classifier.host`** (string):
   - **Description:** The host of the classifier.
   - **Default:** `"http://localhost:9379"`
@@ -1719,6 +1741,12 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `false`
   - **Requires restart:** Yes
 
+- **`experimental.autoMemory`** (boolean):
+  - **Description:** Automatically extract reusable skills from past sessions in
+    the background. Review results with /memory inbox.
+  - **Default:** `false`
+  - **Requires restart:** Yes
+
 - **`experimental.generalistProfile`** (boolean):
   - **Description:** Suitable for general coding and software development tasks.
   - **Default:** `false`
@@ -1730,8 +1758,7 @@ their corresponding top-level category object in your `settings.json` file.
   - **Requires restart:** Yes
 
 - **`experimental.topicUpdateNarration`** (boolean):
-  - **Description:** Enable the experimental Topic & Update communication model
-    for reduced chattiness and structured progress reporting.
+  - **Description:** Deprecated: Use general.topicUpdateNarration instead.
   - **Default:** `false`
 
 #### `skills`
@@ -2070,7 +2097,7 @@ within your user's home folder.
 Environment variables are a common way to configure applications, especially for
 sensitive information like API keys or for settings that might change between
 environments. For authentication setup, see the
-[Authentication documentation](../get-started/authentication.md) which covers
+[Authentication documentation](../get-started/authentication.mdx) which covers
 all available authentication methods.
 
 The CLI automatically loads environment variables from an `.env` file. The
@@ -2091,7 +2118,7 @@ the `advanced.excludedEnvVars` setting in your `settings.json` file.
 - **`GEMINI_API_KEY`**:
   - Your API key for the Gemini API.
   - One of several available
-    [authentication methods](../get-started/authentication.md).
+    [authentication methods](../get-started/authentication.mdx).
   - Set this in your shell profile (for example, `~/.bashrc`, `~/.zshrc`) or an
     `.env` file.
 - **`GEMINI_MODEL`**:
@@ -2148,6 +2175,21 @@ the `advanced.excludedEnvVars` setting in your `settings.json` file.
   - When set, overrides the default API version used by the SDK.
   - Example: `export GOOGLE_GENAI_API_VERSION="v1"` (Windows PowerShell:
     `$env:GOOGLE_GENAI_API_VERSION="v1"`)
+- **`GOOGLE_GEMINI_BASE_URL`**:
+  - Overrides the default base URL for Gemini API requests (when using
+    `gemini-api-key` authentication).
+  - Must be a valid URL. For security, it must use HTTPS unless pointing to
+    `localhost` (or `127.0.0.1` / `[::1]`).
+  - Example: `export GOOGLE_GEMINI_BASE_URL="https://my-proxy.com"` (Windows
+    PowerShell: `$env:GOOGLE_GEMINI_BASE_URL="https://my-proxy.com"`)
+- **`GOOGLE_VERTEX_BASE_URL`**:
+  - Overrides the default base URL for Vertex AI API requests (when using
+    `vertex-ai` authentication).
+  - Must be a valid URL. For security, it must use HTTPS unless pointing to
+    `localhost` (or `127.0.0.1` / `[::1]`).
+  - Example: `export GOOGLE_VERTEX_BASE_URL="https://my-vertex-proxy.com"`
+    (Windows PowerShell:
+    `$env:GOOGLE_VERTEX_BASE_URL="https://my-vertex-proxy.com"`)
 - **`OTLP_GOOGLE_CLOUD_PROJECT`**:
   - Your Google Cloud Project ID for Telemetry in Google Cloud
   - Example: `export OTLP_GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"` (Windows

docs/reference/policy-engine.md

@@ -120,6 +120,12 @@ There are three possible decisions a rule can enforce:
 
 ### Priority system and tiers
 
+> [!WARNING] The **Workspace** tier (project-level policies) is currently
+> non-functional. Defining policies in a workspace's `.gemini/policies`
+> directory will not have any effect. See
+> [issue #18186](https://github.com/google-gemini/gemini-cli/issues/18186). Use
+> User or Admin policies instead.
+
 The policy engine uses a sophisticated priority system to resolve conflicts when
 multiple rules match a single tool call. The core principle is simple: **the
 rule with the highest priority wins**.
@@ -127,13 +133,13 @@ rule with the highest priority wins**.
 To provide a clear hierarchy, policies are organized into three tiers. Each tier
 has a designated number that forms the base of the final priority calculation.
 
-| Tier      | Base | Description                                                                       |
-| :-------- | :--- | :-------------------------------------------------------------------------------- |
-| Default   | 1    | Built-in policies that ship with Gemini CLI.                                      |
-| Extension | 2    | Policies defined in extensions.                                                   |
-| Workspace | 3    | Policies defined in the current workspace's configuration directory.              |
-| User      | 4    | Custom policies defined by the user.                                              |
-| Admin     | 5    | Policies managed by an administrator (for example, in an enterprise environment). |
+| Tier      | Base | Description                                                                                   |
+| :-------- | :--- | :-------------------------------------------------------------------------------------------- |
+| Default   | 1    | Built-in policies that ship with Gemini CLI.                                                  |
+| Extension | 2    | Policies defined in extensions.                                                               |
+| Workspace | 3    | **(Currently disabled)** Policies defined in the current workspace's configuration directory. |
+| User      | 4    | Custom policies defined by the user.                                                          |
+| Admin     | 5    | Policies managed by an administrator (for example, in an enterprise environment).             |
 
 Within a TOML policy file, you assign a priority value from **0 to 999**. The
 engine transforms this into a final priority using the following formula:
@@ -214,11 +220,11 @@ User, and (if configured) Admin directories.
 
 ### Policy locations
 
-| Tier          | Type   | Location                                  |
-| :------------ | :----- | :---------------------------------------- |
-| **User**      | Custom | `~/.gemini/policies/*.toml`               |
-| **Workspace** | Custom | `$WORKSPACE_ROOT/.gemini/policies/*.toml` |
-| **Admin**     | System | _See below (OS specific)_                 |
+| Tier          | Type   | Location                                                 |
+| :------------ | :----- | :------------------------------------------------------- |
+| **User**      | Custom | `~/.gemini/policies/*.toml`                              |
+| **Workspace** | Custom | **(Disabled)** `$WORKSPACE_ROOT/.gemini/policies/*.toml` |
+| **Admin**     | System | _See below (OS specific)_                                |
 
 #### System-wide policies (Admin)
 

docs/reference/tools.md

@@ -92,6 +92,28 @@ each tool.
 | [`ask_user`](../tools/ask-user.md) | `Communicate` | Requests clarification or missing information via an interactive dialog.               |
 | [`write_todos`](../tools/todos.md) | `Other`       | Maintains an internal list of subtasks. The model uses this to track its own progress. |
 
+### Task Tracker (Experimental)
+
+<!-- prettier-ignore -->
+> [!NOTE]
+> This is an experimental feature currently under active development. Enable via `experimental.taskTracker`.
+
+| Tool                                            | Kind    | Description                                                                 |
+| :---------------------------------------------- | :------ | :-------------------------------------------------------------------------- |
+| [`tracker_create_task`](../tools/tracker.md)    | `Other` | Creates a new task in the experimental tracker.                             |
+| [`tracker_update_task`](../tools/tracker.md)    | `Other` | Updates an existing task's status, description, or dependencies.            |
+| [`tracker_get_task`](../tools/tracker.md)       | `Other` | Retrieves the full details of a specific task.                              |
+| [`tracker_list_tasks`](../tools/tracker.md)     | `Other` | Lists tasks in the tracker, optionally filtered by status, type, or parent. |
+| [`tracker_add_dependency`](../tools/tracker.md) | `Other` | Adds a dependency between two tasks, ensuring topological execution.        |
+| [`tracker_visualize`](../tools/tracker.md)      | `Other` | Renders an ASCII tree visualization of the current task graph.              |
+
+### MCP
+
+| Tool                                              | Kind     | Description                                                            |
+| :------------------------------------------------ | :------- | :--------------------------------------------------------------------- |
+| [`list_mcp_resources`](../tools/mcp-resources.md) | `Search` | Lists all available resources exposed by connected MCP servers.        |
+| [`read_mcp_resource`](../tools/mcp-resources.md)  | `Read`   | Reads the content of a specific Model Context Protocol (MCP) resource. |
+
 ### Memory
 
 | Tool                                             | Kind    | Description                                                                          |

docs/sidebar.json

@@ -96,6 +96,11 @@
             ]
           },
           { "label": "Agent Skills", "slug": "docs/cli/skills" },
+          {
+            "label": "Auto Memory",
+            "badge": "🔬",
+            "slug": "docs/cli/auto-memory"
+          },
           { "label": "Checkpointing", "slug": "docs/cli/checkpointing" },
           { "label": "Headless mode", "slug": "docs/cli/headless" },
           {
@@ -122,7 +127,14 @@
               }
             ]
           },
-          { "label": "MCP servers", "slug": "docs/tools/mcp-server" },
+          {
+            "label": "MCP servers",
+            "collapsed": true,
+            "items": [
+              { "label": "Overview", "slug": "docs/tools/mcp-server" },
+              { "label": "Resource tools", "slug": "docs/tools/mcp-resources" }
+            ]
+          },
           { "label": "Model routing", "slug": "docs/cli/model-routing" },
           { "label": "Model selection", "slug": "docs/cli/model" },
           {

docs/tools/mcp-resources.md

@@ -0,0 +1,44 @@
+# MCP resource tools
+
+MCP resource tools let Gemini CLI discover and retrieve data from contextual
+resources exposed by Model Context Protocol (MCP) servers.
+
+## 1. `list_mcp_resources` (ListMcpResources)
+
+`list_mcp_resources` retrieves a list of all available resources from connected
+MCP servers. This is primarily a discovery tool that helps the model understand
+what external data sources are available for reference.
+
+- **Tool name:** `list_mcp_resources`
+- **Display name:** List MCP Resources
+- **Kind:** `Search`
+- **File:** `list-mcp-resources.ts`
+- **Parameters:**
+  - `serverName` (string, optional): An optional filter to list resources from a
+    specific server.
+- **Behavior:**
+  - Iterates through all connected MCP servers.
+  - Fetches the list of resources each server exposes.
+  - Formats the results into a plain-text list of URIs and descriptions.
+- **Output (`llmContent`):** A formatted list of available resources, including
+  their URI, server name, and optional description.
+- **Confirmation:** No. This is a read-only discovery tool.
+
+## 2. `read_mcp_resource` (ReadMcpResource)
+
+`read_mcp_resource` retrieves the content of a specific resource identified by
+its URI.
+
+- **Tool name:** `read_mcp_resource`
+- **Display name:** Read MCP Resource
+- **Kind:** `Read`
+- **File:** `read-mcp-resource.ts`
+- **Parameters:**
+  - `uri` (string, required): The URI of the MCP resource to read.
+- **Behavior:**
+  - Locates the resource and its associated server by URI.
+  - Calls the server's `resources/read` method.
+  - Processes the response, extracting text or binary data.
+- **Output (`llmContent`):** The content of the resource. For binary data, it
+  returns a placeholder indicating the data type.
+- **Confirmation:** No. This is a read-only retrieval tool.

docs/tools/mcp-server.md

@@ -64,7 +64,8 @@ Gemini CLI supports three MCP transport types:
 
 Some MCP servers expose contextual “resources” in addition to the tools and
 prompts. Gemini CLI discovers these automatically and gives you the possibility
-to reference them in the chat.
+to reference them in the chat. For more information on the tools used to
+interact with these resources, see [MCP resource tools](mcp-resources.md).
 
 ### Discovery and listing
 

docs/tools/tracker.md

@@ -0,0 +1,61 @@
+# Tracker tools (`tracker_*`)
+
+<!-- prettier-ignore -->
+> [!NOTE]
+> This is an experimental feature currently under active development.
+
+The `tracker_*` tools allow the Gemini agent to maintain an internal, persistent
+graph of tasks and dependencies for multi-step requests. This suite of tools
+provides a more robust and granular way to manage execution plans than the
+legacy `write_todos` tool.
+
+## Technical reference
+
+The agent uses these tools to manage its execution plan, decompose complex goals
+into actionable sub-tasks, and provide real-time progress updates to the CLI
+interface. The task state is stored in the `.gemini/tmp/tracker/<session-id>`
+directory, allowing the agent to manage its plan for the current session.
+
+### Available Tools
+
+- `tracker_create_task`: Creates a new task in the tracker. You can specify a
+  title, description, and task type (`epic`, `task`, `bug`).
+- `tracker_update_task`: Updates an existing task's status (`open`,
+  `in_progress`, `blocked`, `closed`), description, or dependencies.
+- `tracker_get_task`: Retrieves the full details of a specific task by its
+  6-character hex ID.
+- `tracker_list_tasks`: Lists tasks in the tracker, optionally filtered by
+  status, type, or parent ID.
+- `tracker_add_dependency`: Adds a dependency between two tasks, ensuring
+  topological execution.
+- `tracker_visualize`: Renders an ASCII tree visualization of the current task
+  graph.
+
+## Technical behavior
+
+- **Interface:** Updates the progress indicator and task tree above the CLI
+  input prompt.
+- **Persistence:** Task state is saved automatically to the
+  `.gemini/tmp/tracker/<session-id>` directory. Task states are session-specific
+  and do not persist across different sessions.
+- **Dependencies:** Tasks can depend on other tasks, forming a directed acyclic
+  graph (DAG). The agent must resolve dependencies before starting blocked
+  tasks.
+- **Interaction:** Users can view the current state of the tracker by asking the
+  agent to visualize it, or by running `gemini-cli` commands if implemented.
+
+## Use cases
+
+- Coordinating multi-file refactoring projects.
+- Breaking down a mission into a hierarchy of epics and tasks for better
+  visibility.
+- Tracking bugs and feature requests directly within the context of an active
+  codebase.
+- Providing visibility into the agent's current focus and remaining work.
+
+## Next steps
+
+- Follow the [Task planning tutorial](../cli/tutorials/task-planning.md) for
+  usage details and migration from the legacy todo list.
+- Learn about [Session management](../cli/session-management.md) for context on
+  persistent state.

evals/background_processes.eval.ts

@@ -11,6 +11,8 @@ import path from 'node:path';
 
 describe('Background Process Monitoring', () => {
   evalTest('USUALLY_PASSES', {
+    suiteName: 'default',
+    suiteType: 'behavioral',
     name: 'should naturally use read output tool to find token',
     prompt:
       "Run the script using 'bash generate_token.sh'. It will emit a token after a short delay and continue running. Find the token and tell me what it is.",
@@ -50,6 +52,8 @@ sleep 100
   });
 
   evalTest('USUALLY_PASSES', {
+    suiteName: 'default',
+    suiteType: 'behavioral',
     name: 'should naturally use list tool to verify multiple processes',
     prompt:
       "Start three background processes that run 'sleep 100', 'sleep 200', and 'sleep 300' respectively. Verify that all three are currently running.",

evals/cli_help_delegation.eval.ts

@@ -17,9 +17,17 @@ describe('CliHelpAgent Delegation', () => {
     timeout: 60000,
     assert: async (rig, _result) => {
       const toolLogs = rig.readToolLogs();
-      const toolCallIndex = toolLogs.findIndex(
-        (log) => log.toolRequest.name === 'cli_help',
-      );
+      const toolCallIndex = toolLogs.findIndex((log) => {
+        if (log.toolRequest.name === 'invoke_agent') {
+          try {
+            const args = JSON.parse(log.toolRequest.args);
+            return args.agent_name === 'cli_help';
+          } catch {
+            return false;
+          }
+        }
+        return false;
+      });
       expect(toolCallIndex).toBeGreaterThan(-1);
       expect(toolCallIndex).toBeLessThan(5); // Called within first 5 turns
     },

evals/component-test-helper.ts

@@ -16,6 +16,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import os from 'node:os';
 import { randomUUID } from 'node:crypto';
+import { vi } from 'vitest';
 import {
   Config,
   type ConfigParameters,
@@ -52,6 +53,7 @@ export interface ComponentEvalCase extends BaseEvalCase {
 export class ComponentRig {
   public config: Config | undefined;
   public testDir: string;
+  public homeDir: string;
   public sessionId: string;
 
   constructor(
@@ -61,6 +63,9 @@ export class ComponentRig {
     this.testDir = fs.mkdtempSync(
       path.join(os.tmpdir(), `gemini-component-rig-${uniqueId.slice(0, 8)}-`),
     );
+    this.homeDir = fs.mkdtempSync(
+      path.join(os.tmpdir(), `gemini-component-home-${uniqueId.slice(0, 8)}-`),
+    );
     this.sessionId = `test-session-${uniqueId}`;
   }
 
@@ -89,12 +94,23 @@ export class ComponentRig {
     this.config = makeFakeConfig(configParams);
     await this.config.initialize();
 
-    // Refresh auth using USE_GEMINI to initialize the real BaseLlmClient
+    // Refresh auth using USE_GEMINI to initialize the real BaseLlmClient.
+    // This must happen BEFORE stubbing GEMINI_CLI_HOME because OAuth credential
+    // lookup resolves through homedir() → GEMINI_CLI_HOME.
     await this.config.refreshAuth(AuthType.USE_GEMINI);
+
+    // Isolate storage paths (session files, skills, extraction state) by
+    // pointing GEMINI_CLI_HOME at a per-test temp directory.  Storage resolves
+    // global paths through `homedir()` which reads this env var.  This is set
+    // after auth so credential lookup uses the real home directory.
+    vi.stubEnv('GEMINI_CLI_HOME', this.homeDir);
   }
 
   async cleanup() {
+    await this.config?.dispose();
+    vi.unstubAllEnvs();
     fs.rmSync(this.testDir, { recursive: true, force: true });
+    fs.rmSync(this.homeDir, { recursive: true, force: true });
   }
 }
 

evals/generalist_agent.eval.ts

@@ -26,11 +26,22 @@ describe('generalist_agent', () => {
     prompt:
       'Please use the generalist agent to create a file called "generalist_test_file.txt" containing exactly the following text: success',
     assert: async (rig) => {
-      // 1) Verify the generalist agent was invoked
-      const foundToolCall = await rig.waitForToolCall('generalist');
+      // 1) Verify the generalist agent was invoked via invoke_agent
+      const foundToolCall = await rig.waitForToolCall(
+        'invoke_agent',
+        undefined,
+        (args) => {
+          try {
+            const parsed = JSON.parse(args);
+            return parsed.agent_name === 'generalist';
+          } catch {
+            return false;
+          }
+        },
+      );
       expect(
         foundToolCall,
-        'Expected to find a tool call for generalist agent',
+        'Expected to find an invoke_agent tool call for generalist agent',
       ).toBeTruthy();
 
       // 2) Verify the file was created as expected

evals/plan_mode.eval.ts

@@ -298,6 +298,8 @@ describe('plan_mode', () => {
   });
 
   evalTest('ALWAYS_PASSES', {
+    suiteName: 'default',
+    suiteType: 'behavioral',
     name: 'should transition from plan mode to normal execution and create a plan file from scratch',
     params: {
       settings,
@@ -333,7 +335,7 @@ describe('plan_mode', () => {
 
       expect(
         planWrite?.toolRequest.success,
-        `Expected write_file to succeed, but got error: ${planWrite?.toolRequest.error}`,
+        `Expected write_file to succeed, but got error: ${(planWrite?.toolRequest as any).error}`,
       ).toBe(true);
 
       assertModelHasOutput(result);
@@ -341,6 +343,8 @@ describe('plan_mode', () => {
   });
 
   evalTest('USUALLY_PASSES', {
+    suiteName: 'default',
+    suiteType: 'behavioral',
     name: 'should not exit plan mode or draft before informal agreement',
     approvalMode: ApprovalMode.PLAN,
     params: {

evals/save_memory.eval.ts

@@ -145,22 +145,30 @@ describe('save_memory', () => {
     },
   });
 
-  const ignoringDbSchemaLocation =
-    "Agent ignores workspace's database schema location";
+  const savingDbSchemaLocationAsProjectMemory =
+    'Agent saves workspace database schema location as project memory';
   evalTest('USUALLY_PASSES', {
     suiteName: 'default',
     suiteType: 'behavioral',
-    name: ignoringDbSchemaLocation,
+    name: savingDbSchemaLocationAsProjectMemory,
     prompt: `The database schema for this workspace is located in \`db/schema.sql\`.`,
     assert: async (rig, result) => {
-      await rig.waitForTelemetryReady();
-      const wasToolCalled = rig
-        .readToolLogs()
-        .some((log) => log.toolRequest.name === 'save_memory');
+      const wasToolCalled = await rig.waitForToolCall(
+        'save_memory',
+        undefined,
+        (args) => {
+          try {
+            const params = JSON.parse(args);
+            return params.scope === 'project';
+          } catch {
+            return false;
+          }
+        },
+      );
       expect(
         wasToolCalled,
-        'save_memory should not be called for workspace-specific information',
-      ).toBe(false);
+        'Expected save_memory to be called with scope="project" for workspace-specific information',
+      ).toBe(true);
 
       assertModelHasOutput(result);
     },
@@ -188,42 +196,59 @@ describe('save_memory', () => {
     },
   });
 
-  const ignoringBuildArtifactLocation =
-    'Agent ignores workspace build artifact location';
+  const savingBuildArtifactLocationAsProjectMemory =
+    'Agent saves workspace build artifact location as project memory';
   evalTest('USUALLY_PASSES', {
     suiteName: 'default',
     suiteType: 'behavioral',
-    name: ignoringBuildArtifactLocation,
+    name: savingBuildArtifactLocationAsProjectMemory,
     prompt: `In this workspace, build artifacts are stored in the \`dist/artifacts\` directory.`,
     assert: async (rig, result) => {
-      await rig.waitForTelemetryReady();
-      const wasToolCalled = rig
-        .readToolLogs()
-        .some((log) => log.toolRequest.name === 'save_memory');
+      const wasToolCalled = await rig.waitForToolCall(
+        'save_memory',
+        undefined,
+        (args) => {
+          try {
+            const params = JSON.parse(args);
+            return params.scope === 'project';
+          } catch {
+            return false;
+          }
+        },
+      );
       expect(
         wasToolCalled,
-        'save_memory should not be called for workspace-specific information',
-      ).toBe(false);
+        'Expected save_memory to be called with scope="project" for workspace-specific information',
+      ).toBe(true);
 
       assertModelHasOutput(result);
     },
   });
 
-  const ignoringMainEntryPoint = "Agent ignores workspace's main entry point";
+  const savingMainEntryPointAsProjectMemory =
+    'Agent saves workspace main entry point as project memory';
   evalTest('USUALLY_PASSES', {
     suiteName: 'default',
     suiteType: 'behavioral',
-    name: ignoringMainEntryPoint,
+    name: savingMainEntryPointAsProjectMemory,
     prompt: `The main entry point for this workspace is \`src/index.js\`.`,
     assert: async (rig, result) => {
-      await rig.waitForTelemetryReady();
-      const wasToolCalled = rig
-        .readToolLogs()
-        .some((log) => log.toolRequest.name === 'save_memory');
+      const wasToolCalled = await rig.waitForToolCall(
+        'save_memory',
+        undefined,
+        (args) => {
+          try {
+            const params = JSON.parse(args);
+            return params.scope === 'project';
+          } catch {
+            return false;
+          }
+        },
+      );
       expect(
         wasToolCalled,
-        'save_memory should not be called for workspace-specific information',
-      ).toBe(false);
+        'Expected save_memory to be called with scope="project" for workspace-specific information',
+      ).toBe(true);
 
       assertModelHasOutput(result);
     },
@@ -317,13 +342,13 @@ describe('save_memory', () => {
       'Please save any persistent preferences or facts about me from our conversation to memory.',
     assert: async (rig, result) => {
       const wasToolCalled = await rig.waitForToolCall(
-        'save_memory',
+        'invoke_agent',
         undefined,
-        (args) => /vitest/i.test(args),
+        (args) => /save_memory/i.test(args) && /vitest/i.test(args),
       );
       expect(
         wasToolCalled,
-        'Expected save_memory to be called with the Vitest preference from the conversation history',
+        'Expected invoke_agent to be called with save_memory agent and the Vitest preference from the conversation history',
       ).toBe(true);
 
       assertModelHasOutput(result);
@@ -379,8 +404,15 @@ describe('save_memory', () => {
     ],
     prompt: 'Please save the preferences I mentioned earlier to memory.',
     assert: async (rig, result) => {
-      const wasToolCalled = await rig.waitForToolCall('save_memory');
-      expect(wasToolCalled, 'Expected save_memory to be called').toBe(true);
+      const wasToolCalled = await rig.waitForToolCall(
+        'invoke_agent',
+        undefined,
+        (args) => /save_memory/i.test(args),
+      );
+      expect(
+        wasToolCalled,
+        'Expected invoke_agent to be called with save_memory agent',
+      ).toBe(true);
 
       assertModelHasOutput(result);
     },

evals/skill_extraction.eval.ts

@@ -0,0 +1,349 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import fsp from 'node:fs/promises';
+import path from 'node:path';
+import { describe, expect } from 'vitest';
+import {
+  type Config,
+  ApprovalMode,
+  SESSION_FILE_PREFIX,
+  getProjectHash,
+  startMemoryService,
+} from '@google/gemini-cli-core';
+import { componentEvalTest } from './component-test-helper.js';
+
+interface SeedSession {
+  sessionId: string;
+  summary: string;
+  userTurns: string[];
+  timestampOffsetMinutes: number;
+}
+
+interface MessageRecord {
+  id: string;
+  timestamp: string;
+  type: string;
+  content: Array<{ text: string }>;
+}
+
+const WORKSPACE_FILES = {
+  'package.json': JSON.stringify(
+    {
+      name: 'skill-extraction-eval',
+      private: true,
+      scripts: {
+        build: 'echo build',
+        lint: 'echo lint',
+        test: 'echo test',
+      },
+    },
+    null,
+    2,
+  ),
+  'README.md': `# Skill Extraction Eval
+
+This workspace exists to exercise background skill extraction from prior chats.
+`,
+};
+
+function buildMessages(userTurns: string[]): MessageRecord[] {
+  const baseTime = new Date(Date.now() - 6 * 60 * 60 * 1000).toISOString();
+  return userTurns.flatMap((text, index) => [
+    {
+      id: `u${index + 1}`,
+      timestamp: baseTime,
+      type: 'user',
+      content: [{ text }],
+    },
+    {
+      id: `a${index + 1}`,
+      timestamp: baseTime,
+      type: 'gemini',
+      content: [{ text: `Acknowledged: ${index + 1}` }],
+    },
+  ]);
+}
+
+async function seedSessions(
+  config: Config,
+  sessions: SeedSession[],
+): Promise<void> {
+  const chatsDir = path.join(config.storage.getProjectTempDir(), 'chats');
+  await fsp.mkdir(chatsDir, { recursive: true });
+
+  const projectRoot = config.storage.getProjectRoot();
+
+  for (const session of sessions) {
+    const timestamp = new Date(
+      Date.now() - session.timestampOffsetMinutes * 60 * 1000,
+    )
+      .toISOString()
+      .slice(0, 16)
+      .replace(/:/g, '-');
+    const filename = `${SESSION_FILE_PREFIX}${timestamp}-${session.sessionId.slice(0, 8)}.json`;
+    const conversation = {
+      sessionId: session.sessionId,
+      projectHash: getProjectHash(projectRoot),
+      summary: session.summary,
+      startTime: new Date(Date.now() - 7 * 60 * 60 * 1000).toISOString(),
+      lastUpdated: new Date(Date.now() - 4 * 60 * 60 * 1000).toISOString(),
+      messages: buildMessages(session.userTurns),
+    };
+
+    await fsp.writeFile(
+      path.join(chatsDir, filename),
+      JSON.stringify(conversation, null, 2),
+    );
+  }
+}
+
+async function runExtractionAndReadState(config: Config): Promise<{
+  state: { runs: Array<{ sessionIds: string[]; skillsCreated: string[] }> };
+  skillsDir: string;
+}> {
+  await startMemoryService(config);
+
+  const memoryDir = config.storage.getProjectMemoryTempDir();
+  const skillsDir = config.storage.getProjectSkillsMemoryDir();
+  const statePath = path.join(memoryDir, '.extraction-state.json');
+
+  const raw = await fsp.readFile(statePath, 'utf-8');
+  const state = JSON.parse(raw) as {
+    runs?: Array<{ sessionIds?: string[]; skillsCreated?: string[] }>;
+  };
+  if (!Array.isArray(state.runs) || state.runs.length === 0) {
+    throw new Error('Skill extraction finished without writing any run state');
+  }
+
+  return {
+    state: {
+      runs: state.runs.map((run) => ({
+        sessionIds: Array.isArray(run.sessionIds) ? run.sessionIds : [],
+        skillsCreated: Array.isArray(run.skillsCreated)
+          ? run.skillsCreated
+          : [],
+      })),
+    },
+    skillsDir,
+  };
+}
+
+async function readSkillBodies(skillsDir: string): Promise<string[]> {
+  try {
+    const entries = await fsp.readdir(skillsDir, { withFileTypes: true });
+    const skillDirs = entries.filter((entry) => entry.isDirectory());
+    const bodies = await Promise.all(
+      skillDirs.map((entry) =>
+        fsp.readFile(path.join(skillsDir, entry.name, 'SKILL.md'), 'utf-8'),
+      ),
+    );
+    return bodies;
+  } catch {
+    return [];
+  }
+}
+
+/**
+ * Shared configOverrides for all skill extraction component evals.
+ * - experimentalAutoMemory: enables the Auto Memory skill extraction pipeline.
+ * - approvalMode: YOLO auto-approves tool calls (write_file, read_file) so the
+ *   background agent can execute without interactive confirmation.
+ */
+const EXTRACTION_CONFIG_OVERRIDES = {
+  experimentalAutoMemory: true,
+  approvalMode: ApprovalMode.YOLO,
+};
+
+describe('Skill Extraction', () => {
+  componentEvalTest('USUALLY_PASSES', {
+    suiteName: 'skill-extraction',
+    suiteType: 'component-level',
+    name: 'ignores one-off incidents even when session summaries look similar',
+    files: WORKSPACE_FILES,
+    timeout: 180000,
+    configOverrides: EXTRACTION_CONFIG_OVERRIDES,
+    setup: async (config) => {
+      await seedSessions(config, [
+        {
+          sessionId: 'incident-login-redirect',
+          summary: 'Debug login redirect loop in staging',
+          timestampOffsetMinutes: 420,
+          userTurns: [
+            'We only need a one-off fix for incident INC-4412 on branch hotfix/login-loop.',
+            'The exact failing string is ERR_REDIRECT_4412 and this workaround is incident-specific.',
+            'Patch packages/auth/src/redirect.ts just for this branch and do not generalize it.',
+            'The thing that worked was deleting the stale staging cookie before retrying.',
+            'This is not a normal workflow and should not become a reusable instruction.',
+            'It only reproduced against the 2026-04-08 staging rollout.',
+            'After the cookie clear, the branch-specific redirect logic passed.',
+            'Do not turn this incident writeup into a standing process.',
+            'Yes, the hotfix worked for this exact redirect-loop incident.',
+            'Close out INC-4412 once the staging login succeeds again.',
+          ],
+        },
+        {
+          sessionId: 'incident-login-timeout',
+          summary: 'Debug login callback timeout in staging',
+          timestampOffsetMinutes: 360,
+          userTurns: [
+            'This is another one-off staging incident, this time TICKET-991 for callback timeout.',
+            'The exact failing string is ERR_CALLBACK_TIMEOUT_991 and it is unrelated to the redirect loop.',
+            'The temporary fix was rotating the staging secret and deleting a bad feature-flag row.',
+            'Do not write a generic login-debugging playbook from this.',
+            'This only applied to the callback timeout during the April rollout.',
+            'The successful fix was specific to the stale secret in staging.',
+            'It does not define a durable repo workflow for future tasks.',
+            'After rotating the secret, the callback timeout stopped reproducing.',
+            'Treat this as incident response only, not a reusable skill.',
+            'Once staging passed again, we closed TICKET-991.',
+          ],
+        },
+      ]);
+    },
+    assert: async (config) => {
+      const { state, skillsDir } = await runExtractionAndReadState(config);
+      const skillBodies = await readSkillBodies(skillsDir);
+
+      expect(state.runs).toHaveLength(1);
+      expect(state.runs[0].sessionIds).toHaveLength(2);
+      expect(state.runs[0].skillsCreated).toEqual([]);
+      expect(skillBodies).toEqual([]);
+    },
+  });
+
+  componentEvalTest('USUALLY_PASSES', {
+    suiteName: 'skill-extraction',
+    suiteType: 'component-level',
+    name: 'extracts a repeated project-specific workflow into a skill',
+    files: WORKSPACE_FILES,
+    timeout: 180000,
+    configOverrides: EXTRACTION_CONFIG_OVERRIDES,
+    setup: async (config) => {
+      await seedSessions(config, [
+        {
+          sessionId: 'settings-docs-regen-1',
+          summary: 'Update settings docs after adding a config option',
+          timestampOffsetMinutes: 420,
+          userTurns: [
+            'When we add a new config option, we have to regenerate the settings docs in a specific order.',
+            'The sequence that worked was npm run predocs:settings, npm run schema:settings, then npm run docs:settings.',
+            'Do not hand-edit generated settings docs.',
+            'If predocs is skipped, the generated schema docs miss the new defaults.',
+            'Update the source first, then run that generation sequence.',
+            'After regenerating, verify the schema output and docs changed together.',
+            'We used this same sequence the last time we touched settings docs.',
+            'That ordered workflow passed and produced the expected generated files.',
+            'Please keep the exact command order because reversing it breaks the output.',
+            'Yes, the generated settings docs were correct after those three commands.',
+          ],
+        },
+        {
+          sessionId: 'settings-docs-regen-2',
+          summary: 'Regenerate settings schema docs for another new setting',
+          timestampOffsetMinutes: 360,
+          userTurns: [
+            'We are touching another setting, so follow the same settings-doc regeneration workflow again.',
+            'Run npm run predocs:settings before npm run schema:settings and npm run docs:settings.',
+            'The project keeps generated settings docs in sync through those commands, not manual edits.',
+            'Skipping predocs caused stale defaults in the generated output before.',
+            'Change the source, then execute the same three commands in order.',
+            'Verify both the schema artifact and docs update together after regeneration.',
+            'This is the recurring workflow we use whenever a setting changes.',
+            'The exact order worked again on this second settings update.',
+            'Please preserve that ordering constraint for future settings changes.',
+            'Confirmed: the settings docs regenerated correctly with the same command sequence.',
+          ],
+        },
+      ]);
+    },
+    assert: async (config) => {
+      const { state, skillsDir } = await runExtractionAndReadState(config);
+      const skillBodies = await readSkillBodies(skillsDir);
+      const combinedSkills = skillBodies.join('\n\n');
+
+      expect(state.runs).toHaveLength(1);
+      expect(state.runs[0].sessionIds).toHaveLength(2);
+      expect(state.runs[0].skillsCreated.length).toBeGreaterThanOrEqual(1);
+      expect(skillBodies.length).toBeGreaterThanOrEqual(1);
+      expect(combinedSkills).toContain('npm run predocs:settings');
+      expect(combinedSkills).toContain('npm run schema:settings');
+      expect(combinedSkills).toContain('npm run docs:settings');
+      expect(combinedSkills).toMatch(/Verification/i);
+
+      // Verify the extraction agent activated skill-creator for design guidance.
+      expect(config.getSkillManager().isSkillActive('skill-creator')).toBe(
+        true,
+      );
+    },
+  });
+
+  componentEvalTest('USUALLY_PASSES', {
+    suiteName: 'skill-extraction',
+    suiteType: 'component-level',
+    name: 'extracts a repeated multi-step migration workflow with ordering constraints',
+    files: WORKSPACE_FILES,
+    timeout: 180000,
+    configOverrides: EXTRACTION_CONFIG_OVERRIDES,
+    setup: async (config) => {
+      await seedSessions(config, [
+        {
+          sessionId: 'db-migration-v12',
+          summary: 'Run database migration for v12 schema update',
+          timestampOffsetMinutes: 420,
+          userTurns: [
+            'Every time we change the database schema we follow a specific migration workflow.',
+            'First run npm run db:check to verify no pending migrations conflict.',
+            'Then run npm run db:migrate to apply the new migration files.',
+            'After migration, always run npm run db:validate to confirm schema integrity.',
+            'If db:validate fails, immediately run npm run db:rollback before anything else.',
+            'Never skip db:check — last time we did, two migrations collided and corrupted the index.',
+            'The ordering is critical: check, migrate, validate. Reversing migrate and validate caused silent data loss before.',
+            'This v12 migration passed after following that exact sequence.',
+            'We use this same three-step workflow every time the schema changes.',
+            'Confirmed: db:check, db:migrate, db:validate completed successfully for v12.',
+          ],
+        },
+        {
+          sessionId: 'db-migration-v13',
+          summary: 'Run database migration for v13 schema update',
+          timestampOffsetMinutes: 360,
+          userTurns: [
+            'New schema change for v13, following the same database migration workflow as before.',
+            'Start with npm run db:check to ensure no conflicting pending migrations.',
+            'Then npm run db:migrate to apply the v13 migration files.',
+            'Then npm run db:validate to confirm the schema is consistent.',
+            'If validation fails, run npm run db:rollback immediately — do not attempt manual fixes.',
+            'We learned the hard way that skipping db:check causes index corruption.',
+            'The check-migrate-validate order is mandatory for every schema change.',
+            'This is the same recurring workflow we used for v12 and earlier migrations.',
+            'The v13 migration passed with the same three-step sequence.',
+            'Confirmed: the standard db migration workflow succeeded again for v13.',
+          ],
+        },
+      ]);
+    },
+    assert: async (config) => {
+      const { state, skillsDir } = await runExtractionAndReadState(config);
+      const skillBodies = await readSkillBodies(skillsDir);
+      const combinedSkills = skillBodies.join('\n\n');
+
+      expect(state.runs).toHaveLength(1);
+      expect(state.runs[0].sessionIds).toHaveLength(2);
+      expect(state.runs[0].skillsCreated.length).toBeGreaterThanOrEqual(1);
+      expect(skillBodies.length).toBeGreaterThanOrEqual(1);
+      expect(combinedSkills).toContain('npm run db:check');
+      expect(combinedSkills).toContain('npm run db:migrate');
+      expect(combinedSkills).toContain('npm run db:validate');
+      expect(combinedSkills).toMatch(/rollback/i);
+
+      // Verify the extraction agent activated skill-creator for design guidance.
+      expect(config.getSkillManager().isSkillActive('skill-creator')).toBe(
+        true,
+      );
+    },
+  });
+});

evals/subtask_delegation.eval.ts

@@ -0,0 +1,131 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe, expect } from 'vitest';
+import { TRACKER_CREATE_TASK_TOOL_NAME } from '@google/gemini-cli-core';
+import { evalTest, TEST_AGENTS } from './test-helper.js';
+
+describe('subtask delegation eval test cases', () => {
+  /**
+   * Checks that the main agent can correctly decompose a complex, sequential
+   * task into subtasks using the task tracker and delegate each to the appropriate expert subagent.
+   *
+   * The task requires:
+   * 1. Reading requirements (researcher)
+   * 2. Implementing logic (developer)
+   * 3. Documenting (doc expert)
+   */
+  evalTest('USUALLY_PASSES', {
+    suiteName: 'default',
+    suiteType: 'behavioral',
+    name: 'should delegate sequential subtasks to relevant experts using the task tracker',
+    params: {
+      settings: {
+        experimental: {
+          enableAgents: true,
+          taskTracker: true,
+        },
+      },
+    },
+    prompt:
+      'Please read the requirements in requirements.txt using a researcher, then implement the requested logic in src/logic.ts using a developer, and finally document the implementation in docs/logic.md using a documentation expert.',
+    files: {
+      '.gemini/agents/researcher.md': `---
+name: researcher
+description: Expert in reading files and extracting requirements.
+tools:
+  - read_file
+---
+You are the researcher. Read the provided file and extract requirements.`,
+      '.gemini/agents/developer.md': `---
+name: developer
+description: Expert in implementing logic in TypeScript.
+tools:
+  - write_file
+---
+You are the developer. Implement the requested logic in the specified file.`,
+      '.gemini/agents/doc-expert.md': `---
+name: doc-expert
+description: Expert in writing technical documentation.
+tools:
+  - write_file
+---
+You are the doc expert. Document the provided implementation clearly.`,
+      'requirements.txt':
+        'Implement a function named "calculateSum" that adds two numbers.',
+    },
+    assert: async (rig, _result) => {
+      // Verify tracker tasks were created
+      const wasCreateCalled = await rig.waitForToolCall(
+        TRACKER_CREATE_TASK_TOOL_NAME,
+      );
+      expect(wasCreateCalled).toBe(true);
+
+      const toolLogs = rig.readToolLogs();
+      const createCalls = toolLogs.filter(
+        (l) => l.toolRequest.name === TRACKER_CREATE_TASK_TOOL_NAME,
+      );
+      expect(createCalls.length).toBeGreaterThanOrEqual(3);
+
+      await rig.expectToolCallSuccess([
+        'researcher',
+        'developer',
+        'doc-expert',
+      ]);
+
+      const logicFile = rig.readFile('src/logic.ts');
+      const docFile = rig.readFile('docs/logic.md');
+
+      expect(logicFile).toContain('calculateSum');
+      expect(docFile).toBeTruthy();
+    },
+  });
+
+  /**
+   * Checks that the main agent can delegate a batch of independent subtasks
+   * to multiple subagents in parallel using the task tracker to manage state.
+   */
+  evalTest('USUALLY_PASSES', {
+    suiteName: 'default',
+    suiteType: 'behavioral',
+    name: 'should delegate independent subtasks to specialists using the task tracker',
+    params: {
+      settings: {
+        experimental: {
+          enableAgents: true,
+          taskTracker: true,
+        },
+      },
+    },
+    prompt:
+      'Please update the project for internationalization (i18n), audit the security of the current code, and update the CSS to use a blue theme. Use specialized experts for each task.',
+    files: {
+      ...TEST_AGENTS.I18N_AGENT.asFile(),
+      ...TEST_AGENTS.SECURITY_AGENT.asFile(),
+      ...TEST_AGENTS.CSS_AGENT.asFile(),
+      'index.ts': 'console.log("Hello World");',
+    },
+    assert: async (rig, _result) => {
+      // Verify tracker tasks were created
+      const wasCreateCalled = await rig.waitForToolCall(
+        TRACKER_CREATE_TASK_TOOL_NAME,
+      );
+      expect(wasCreateCalled).toBe(true);
+
+      const toolLogs = rig.readToolLogs();
+      const createCalls = toolLogs.filter(
+        (l) => l.toolRequest.name === TRACKER_CREATE_TASK_TOOL_NAME,
+      );
+      expect(createCalls.length).toBeGreaterThanOrEqual(3);
+
+      await rig.expectToolCallSuccess([
+        TEST_AGENTS.I18N_AGENT.name,
+        TEST_AGENTS.SECURITY_AGENT.name,
+        TEST_AGENTS.CSS_AGENT.name,
+      ]);
+    },
+  });
+});

evals/tracker.eval.ts

@@ -119,6 +119,8 @@ describe('tracker_mode', () => {
   });
 
   evalTest('USUALLY_PASSES', {
+    suiteName: 'default',
+    suiteType: 'behavioral',
     name: 'should correctly identify the task tracker storage location from the system prompt',
     params: {
       settings: { experimental: { taskTracker: true } },

evals/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "noEmit": true,
+    "paths": {
+      "@google/gemini-cli-core": ["../packages/core/index.ts"],
+      "@google/gemini-cli": ["../packages/cli/index.ts"]
+    }
+  },
+  "include": ["**/*.ts"],
+  "exclude": ["logs"],
+  "references": [{ "path": "../packages/core" }, { "path": "../packages/cli" }]
+}

evals/unsafe-cloning.eval.ts

@@ -7,6 +7,8 @@
 import { evalTest, TestRig } from './test-helper.js';
 
 evalTest('USUALLY_PASSES', {
+  suiteName: 'default',
+  suiteType: 'behavioral',
   name: 'Reproduction: Agent uses Object.create() for cloning/delegation',
   prompt:
     'Create a utility function `createScopedConfig(config: Config, additionalDirectories: string[]): Config` in `packages/core/src/config/scoped-config.ts` that returns a new Config instance. This instance should override `getWorkspaceContext()` to include the additional directories, but delegate all other method calls (like `isPathAllowed` or `validatePathAccess`) to the original config. Note that `Config` is a complex class with private state and cannot be easily shallow-copied or reconstructed.',

evals/update_topic.eval.ts

@@ -21,6 +21,8 @@ describe('update_topic_behavior', () => {
    * more than 1/4 turns.
    */
   evalTest('USUALLY_PASSES', {
+    suiteName: 'default',
+    suiteType: 'behavioral',
     name: 'update_topic should be used at start, end and middle for complex tasks',
     prompt: `Create a simple users REST API using Express. 
 1. Initialize a new npm project and install express.
@@ -41,7 +43,7 @@ describe('update_topic_behavior', () => {
         2,
       ),
       '.gemini/settings.json': JSON.stringify({
-        experimental: {
+        general: {
           topicUpdateNarration: true,
         },
       }),
@@ -117,13 +119,15 @@ describe('update_topic_behavior', () => {
   });
 
   evalTest('USUALLY_PASSES', {
+    suiteName: 'default',
+    suiteType: 'behavioral',
     name: 'update_topic should NOT be used for informational coding tasks (Obvious)',
     approvalMode: 'default',
     prompt:
       'Explain the difference between Map and Object in JavaScript and provide a performance-focused code snippet for each.',
     files: {
       '.gemini/settings.json': JSON.stringify({
-        experimental: {
+        general: {
           topicUpdateNarration: true,
         },
       }),
@@ -142,6 +146,8 @@ describe('update_topic_behavior', () => {
   });
 
   evalTest('USUALLY_PASSES', {
+    suiteName: 'default',
+    suiteType: 'behavioral',
     name: 'update_topic should NOT be used for surgical symbol searches (Grey Area)',
     approvalMode: 'default',
     prompt:
@@ -150,7 +156,7 @@ describe('update_topic_behavior', () => {
       'packages/core/src/tools/tool-names.ts':
         "export const UPDATE_TOPIC_TOOL_NAME = 'update_topic';",
       '.gemini/settings.json': JSON.stringify({
-        experimental: {
+        general: {
           topicUpdateNarration: true,
         },
       }),
@@ -169,6 +175,8 @@ describe('update_topic_behavior', () => {
   });
 
   evalTest('USUALLY_PASSES', {
+    suiteName: 'default',
+    suiteType: 'behavioral',
     name: 'update_topic should be used for medium complexity multi-step tasks',
     prompt:
       'Refactor the `users-api` project. Move the routing logic from src/app.ts into a new file src/routes.ts, and update app.ts to use the new routes file.',
@@ -196,7 +204,7 @@ app.post('/users', (req, res) => {
 export default app;
       `,
       '.gemini/settings.json': JSON.stringify({
-        experimental: {
+        general: {
           topicUpdateNarration: true,
         },
       }),
@@ -212,7 +220,9 @@ export default app;
       expect(topicCalls.length).toBeGreaterThanOrEqual(2);
 
       // Verify it actually did the refactoring to ensure it didn't just fail immediately
-      expect(fs.existsSync(path.join(rig.testDir, 'src/routes.ts'))).toBe(true);
+      expect(fs.existsSync(path.join(rig.testDir!, 'src/routes.ts'))).toBe(
+        true,
+      );
     },
   });
 
@@ -224,6 +234,8 @@ export default app;
    * the prompt change that improves the behavior.
    */
   evalTest('USUALLY_PASSES', {
+    suiteName: 'default',
+    suiteType: 'behavioral',
     name: 'update_topic should not be called twice in a row',
     prompt: `
       We need to build a C compiler.
@@ -237,7 +249,7 @@ export default app;
     files: {
       'package.json': JSON.stringify({ name: 'test-project' }),
       '.gemini/settings.json': JSON.stringify({
-        experimental: {
+        general: {
           topicUpdateNarration: true,
         },
       }),

integration-tests/concurrency-limit.test.ts

@@ -39,7 +39,11 @@ describe('web-fetch rate limiting', () => {
     const rateLimitedCalls = toolLogs.filter(
       (log) =>
         log.toolRequest.name === 'web_fetch' &&
-        log.toolRequest.error?.includes('Rate limit exceeded'),
+        (
+          ('error' in log.toolRequest
+            ? (log.toolRequest as unknown as Record<string, string>)['error']
+            : '') as string
+        )?.includes('Rate limit exceeded'),
     );
 
     expect(rateLimitedCalls.length).toBeGreaterThan(0);

integration-tests/hooks-system.test.ts

@@ -164,7 +164,8 @@ describe.skipIf(skipFlaky)(
         );
         expect(blockHook).toBeDefined();
         expect(
-          blockHook?.hookCall.stdout + blockHook?.hookCall.stderr,
+          (blockHook?.hookCall.stdout || '') +
+            (blockHook?.hookCall.stderr || ''),
         ).toContain(blockMsg);
       });
 

integration-tests/mcp-list-resources.responses

@@ -0,0 +1,2 @@
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"list_mcp_resources","args":{}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":10,"candidatesTokenCount":10,"totalTokenCount":20}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"Here are the resources: test://resource1"}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":10,"candidatesTokenCount":10,"totalTokenCount":20}}]}

integration-tests/mcp-read-resource.responses

@@ -0,0 +1,2 @@
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"read_mcp_resource","args":{"uri":"test://resource1"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":10,"candidatesTokenCount":10,"totalTokenCount":20}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"The content is: content of resource 1"}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":10,"candidatesTokenCount":10,"totalTokenCount":20}}]}

integration-tests/mcp-resources.responses

@@ -0,0 +1,4 @@
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"list_mcp_resources","args":{}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":10,"candidatesTokenCount":10,"totalTokenCount":20}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"Here are the resources: test://resource1"}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":10,"candidatesTokenCount":10,"totalTokenCount":20}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"read_mcp_resource","args":{"uri":"test://resource1"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":10,"candidatesTokenCount":10,"totalTokenCount":20}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"The content is: content of resource 1"}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":10,"candidatesTokenCount":10,"totalTokenCount":20}}]}

integration-tests/mcp-resources.test.ts

@@ -0,0 +1,178 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { TestRig } from './test-helper.js';
+import { join, dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import fs from 'node:fs';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+describe('mcp-resources-integration', () => {
+  let rig: TestRig;
+
+  beforeEach(() => {
+    rig = new TestRig();
+  });
+
+  afterEach(async () => await rig.cleanup());
+
+  it('should list mcp resources', async () => {
+    await rig.setup('mcp-list-resources-test', {
+      settings: {
+        model: {
+          name: 'gemini-3-flash-preview',
+        },
+      },
+      fakeResponsesPath: join(__dirname, 'mcp-list-resources.responses'),
+    });
+
+    // Workaround for ProjectRegistry save issue
+    const userGeminiDir = join(rig.homeDir!, '.gemini');
+    fs.writeFileSync(join(userGeminiDir, 'projects.json'), '{"projects":{}}');
+
+    // Add a dummy server to get setup done
+    rig.addTestMcpServer('resource-server', {
+      name: 'resource-server',
+      tools: [],
+    });
+
+    // Overwrite the script with resource support
+    const scriptPath = join(rig.testDir!, 'test-mcp-resource-server.mjs');
+    const scriptContent = `
+import { Server } from '@modelcontextprotocol/sdk/server/index.js';
+import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
+import {
+  ListResourcesRequestSchema,
+} from '@modelcontextprotocol/sdk/types.js';
+
+const server = new Server(
+  {
+    name: 'resource-server',
+    version: '1.0.0',
+  },
+  {
+    capabilities: {
+      resources: {},
+    },
+  },
+);
+
+server.setRequestHandler(ListResourcesRequestSchema, async () => {
+  return {
+    resources: [
+      {
+        uri: 'test://resource1',
+        name: 'Resource 1',
+        mimeType: 'text/plain',
+        description: 'A test resource',
+      }
+    ],
+  };
+});
+
+const transport = new StdioServerTransport();
+await server.connect(transport);
+`;
+    fs.writeFileSync(scriptPath, scriptContent);
+
+    const output = await rig.run({
+      args: 'List all available MCP resources.',
+      env: { GEMINI_API_KEY: 'dummy' },
+    });
+
+    const foundCall = await rig.waitForToolCall('list_mcp_resources');
+    expect(foundCall).toBeTruthy();
+    expect(output).toContain('test://resource1');
+  }, 60000);
+
+  it('should read mcp resource', async () => {
+    await rig.setup('mcp-read-resource-test', {
+      settings: {
+        model: {
+          name: 'gemini-3-flash-preview',
+        },
+      },
+      fakeResponsesPath: join(__dirname, 'mcp-read-resource.responses'),
+    });
+
+    // Workaround for ProjectRegistry save issue
+    const userGeminiDir = join(rig.homeDir!, '.gemini');
+    fs.writeFileSync(join(userGeminiDir, 'projects.json'), '{"projects":{}}');
+
+    // Add a dummy server to get setup done
+    rig.addTestMcpServer('resource-server', {
+      name: 'resource-server',
+      tools: [],
+    });
+
+    // Overwrite the script with resource support
+    const scriptPath = join(rig.testDir!, 'test-mcp-resource-server.mjs');
+    const scriptContent = `
+import { Server } from '@modelcontextprotocol/sdk/server/index.js';
+import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
+import {
+  ListResourcesRequestSchema,
+  ReadResourceRequestSchema,
+} from '@modelcontextprotocol/sdk/types.js';
+
+const server = new Server(
+  {
+    name: 'resource-server',
+    version: '1.0.0',
+  },
+  {
+    capabilities: {
+      resources: {},
+    },
+  },
+);
+
+// Need to provide list resources so the tool is active!
+server.setRequestHandler(ListResourcesRequestSchema, async () => {
+  return {
+    resources: [
+      {
+        uri: 'test://resource1',
+        name: 'Resource 1',
+        mimeType: 'text/plain',
+        description: 'A test resource',
+      }
+    ],
+  };
+});
+
+server.setRequestHandler(ReadResourceRequestSchema, async (request) => {
+  if (request.params.uri === 'test://resource1') {
+    return {
+      contents: [
+        {
+          uri: 'test://resource1',
+          mimeType: 'text/plain',
+          text: 'This is the content of resource 1',
+        }
+      ],
+    };
+  }
+  throw new Error('Resource not found');
+});
+
+const transport = new StdioServerTransport();
+await server.connect(transport);
+`;
+    fs.writeFileSync(scriptPath, scriptContent);
+
+    const output = await rig.run({
+      args: 'Read the MCP resource test://resource1.',
+      env: { GEMINI_API_KEY: 'dummy' },
+    });
+
+    const foundCall = await rig.waitForToolCall('read_mcp_resource');
+    expect(foundCall).toBeTruthy();
+    expect(output).toContain('content of resource 1');
+  }, 60000);
+});

integration-tests/plan-mode.test.ts

@@ -108,7 +108,7 @@ describe('Plan Mode', () => {
     ).toBeDefined();
     expect(
       planWrite?.toolRequest.success,
-      `Expected write_file to succeed, but it failed with error: ${planWrite?.toolRequest.error}`,
+      `Expected write_file to succeed, but it failed with error: ${'error' in (planWrite?.toolRequest || {}) ? (planWrite?.toolRequest as unknown as Record<string, string>)['error'] : 'unknown'}`,
     ).toBe(true);
   });
 
@@ -221,7 +221,7 @@ describe('Plan Mode', () => {
     ).toBeDefined();
     expect(
       planWrite?.toolRequest.success,
-      `Expected write_file to succeed, but it failed with error: ${planWrite?.toolRequest.error}`,
+      `Expected write_file to succeed, but it failed with error: ${'error' in (planWrite?.toolRequest || {}) ? (planWrite?.toolRequest as unknown as Record<string, string>)['error'] : 'unknown'}`,
     ).toBe(true);
   });
   it('should switch from a pro model to a flash model after exiting plan mode', async () => {
@@ -270,13 +270,24 @@ describe('Plan Mode', () => {
     );
 
     const apiRequests = rig.readAllApiRequest();
-    const modelNames = apiRequests.map((r) => r.attributes?.model || 'unknown');
+    const modelNames = apiRequests.map(
+      (r) =>
+        ('model' in (r.attributes || {})
+          ? (r.attributes as unknown as Record<string, string>)['model']
+          : 'unknown') || 'unknown',
+    );
 
     const proRequests = apiRequests.filter((r) =>
-      r.attributes?.model?.includes('pro'),
+      ('model' in (r.attributes || {})
+        ? (r.attributes as unknown as Record<string, string>)['model']
+        : 'unknown'
+      )?.includes('pro'),
     );
     const flashRequests = apiRequests.filter((r) =>
-      r.attributes?.model?.includes('flash'),
+      ('model' in (r.attributes || {})
+        ? (r.attributes as unknown as Record<string, string>)['model']
+        : 'unknown'
+      )?.includes('flash'),
     );
 
     expect(

integration-tests/tsconfig.json

@@ -5,5 +5,9 @@
     "allowJs": true
   },
   "include": ["**/*.ts"],
-  "references": [{ "path": "../packages/core" }]
+  "references": [
+    { "path": "../packages/core" },
+    { "path": "../packages/test-utils" },
+    { "path": "../packages/cli" }
+  ]
 }

memory-tests/memory-usage.test.ts

@@ -489,8 +489,12 @@ async function generateSharedLargeChatData(tempDir: string) {
 
   // Wait for streams to finish
   await Promise.all([
-    new Promise((res) => activeResponsesStream.on('finish', res)),
-    new Promise((res) => resumeResponsesStream.on('finish', res)),
+    new Promise((res) =>
+      activeResponsesStream.on('finish', () => res(undefined)),
+    ),
+    new Promise((res) =>
+      resumeResponsesStream.on('finish', () => res(undefined)),
+    ),
   ]);
 
   return {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/gemini-cli",
-  "version": "0.39.0-nightly.20260408.e77b22e63",
+  "version": "0.40.0-nightly.20260414.g5b1f7375a",
   "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.40.0-nightly.20260414.g5b1f7375a"
   },
   "scripts": {
     "start": "cross-env NODE_ENV=development node scripts/start.js",
@@ -62,7 +62,7 @@
     "lint:ci": "npm run lint:all",
     "lint:all": "node scripts/lint.js",
     "format": "prettier --experimental-cli --write .",
-    "typecheck": "npm run typecheck --workspaces --if-present",
+    "typecheck": "npm run typecheck --workspaces --if-present && tsc -b evals/tsconfig.json integration-tests/tsconfig.json memory-tests/tsconfig.json",
     "preflight": "npm run clean && npm ci && npm run format && npm run build && npm run lint:ci && npm run typecheck && npm run test:ci",
     "prepare": "husky && npm run bundle",
     "prepare:package": "node scripts/prepare-package.js",
@@ -94,6 +94,7 @@
   ],
   "devDependencies": {
     "@agentclientprotocol/sdk": "^0.16.1",
+    "read-package-up": "^11.0.0",
     "@octokit/rest": "^22.0.0",
     "@types/marked": "^5.0.2",
     "@types/mime-types": "^3.0.1",
@@ -137,6 +138,7 @@
     "strip-ansi": "^7.1.2",
     "ts-prune": "^0.10.3",
     "tsx": "^4.20.3",
+    "typescript": "^5.8.3",
     "typescript-eslint": "^8.30.1",
     "vitest": "^3.2.4",
     "yargs": "^17.7.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.40.0-nightly.20260414.g5b1f7375a",
   "description": "Gemini CLI A2A Server",
   "repository": {
     "type": "git",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/gemini-cli",
-  "version": "0.39.0-nightly.20260408.e77b22e63",
+  "version": "0.40.0-nightly.20260414.g5b1f7375a",
   "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.40.0-nightly.20260414.g5b1f7375a"
   },
   "dependencies": {
     "@agentclientprotocol/sdk": "^0.16.1",

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

@@ -7,6 +7,7 @@
 import {
   addMemory,
   listInboxSkills,
+  listInboxPatches,
   listMemoryFiles,
   refreshMemory,
   showMemory,
@@ -134,29 +135,41 @@ export class InboxMemoryCommand implements Command {
     context: CommandContext,
     _: string[],
   ): Promise<CommandExecutionResponse> {
-    if (!context.agentContext.config.isMemoryManagerEnabled()) {
+    if (!context.agentContext.config.isAutoMemoryEnabled()) {
       return {
         name: this.name,
-        data: 'The memory inbox requires the experimental memory manager. Enable it with: experimental.memoryManager = true in settings.',
+        data: 'The memory inbox requires Auto Memory. Enable it with: experimental.autoMemory = true in settings.',
       };
     }
 
-    const skills = await listInboxSkills(context.agentContext.config);
+    const [skills, patches] = await Promise.all([
+      listInboxSkills(context.agentContext.config),
+      listInboxPatches(context.agentContext.config),
+    ]);
 
-    if (skills.length === 0) {
-      return { name: this.name, data: 'No extracted skills in inbox.' };
+    if (skills.length === 0 && patches.length === 0) {
+      return { name: this.name, data: 'No items in inbox.' };
     }
 
-    const lines = skills.map((s) => {
+    const lines: string[] = [];
+    for (const s of skills) {
       const date = s.extractedAt
         ? ` (extracted: ${new Date(s.extractedAt).toLocaleDateString()})`
         : '';
-      return `- **${s.name}**: ${s.description}${date}`;
-    });
+      lines.push(`- **${s.name}**: ${s.description}${date}`);
+    }
+    for (const p of patches) {
+      const targets = p.entries.map((e) => e.targetPath).join(', ');
+      const date = p.extractedAt
+        ? ` (extracted: ${new Date(p.extractedAt).toLocaleDateString()})`
+        : '';
+      lines.push(`- **${p.name}** (update): patches ${targets}${date}`);
+    }
 
+    const total = skills.length + patches.length;
     return {
       name: this.name,
-      data: `Skill inbox (${skills.length}):\n${lines.join('\n')}`,
+      data: `Memory inbox (${total}):\n${lines.join('\n')}`,
     };
   }
 }

packages/cli/src/commands/gemma.ts

@@ -0,0 +1,33 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import type { CommandModule, Argv } from 'yargs';
+import { initializeOutputListenersAndFlush } from '../gemini.js';
+import { defer } from '../deferred.js';
+import { setupCommand } from './gemma/setup.js';
+import { startCommand } from './gemma/start.js';
+import { stopCommand } from './gemma/stop.js';
+import { statusCommand } from './gemma/status.js';
+import { logsCommand } from './gemma/logs.js';
+
+export const gemmaCommand: CommandModule = {
+  command: 'gemma',
+  describe: 'Manage local Gemma model routing',
+  builder: (yargs: Argv) =>
+    yargs
+      .middleware((argv) => {
+        initializeOutputListenersAndFlush();
+        argv['isCommand'] = true;
+      })
+      .command(defer(setupCommand, 'gemma'))
+      .command(defer(startCommand, 'gemma'))
+      .command(defer(stopCommand, 'gemma'))
+      .command(defer(statusCommand, 'gemma'))
+      .command(defer(logsCommand, 'gemma'))
+      .demandCommand(1, 'You need at least one command before continuing.')
+      .version(false),
+  handler: () => {},
+};

packages/cli/src/commands/gemma/constants.ts

@@ -0,0 +1,45 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import path from 'node:path';
+import { Storage } from '@google/gemini-cli-core';
+
+export const LITERT_RELEASE_VERSION = 'v0.9.0-alpha03';
+export const LITERT_RELEASE_BASE_URL =
+  'https://github.com/google-ai-edge/LiteRT-LM/releases/download';
+export const GEMMA_MODEL_NAME = 'gemma3-1b-gpu-custom';
+export const DEFAULT_PORT = 9379;
+export const HEALTH_CHECK_TIMEOUT_MS = 5000;
+export const LITERT_API_VERSION = 'v1beta';
+export const SERVER_START_WAIT_MS = 3000;
+
+export const PLATFORM_BINARY_MAP: Record<string, string> = {
+  'darwin-arm64': 'lit.macos_arm64',
+  'linux-x64': 'lit.linux_x86_64',
+  'win32-x64': 'lit.windows_x86_64.exe',
+};
+
+// SHA-256 hashes for the official LiteRT-LM v0.9.0-alpha03 release binaries.
+export const PLATFORM_BINARY_SHA256: Record<string, string> = {
+  'lit.macos_arm64':
+    '9e826a2634f2e8b220ad0f1e1b5c139e0b47cb172326e3b7d46d31382f49478e',
+  'lit.linux_x86_64':
+    '66601df8a07f08244b188e9fcab0bf4a16562fe76d8d47e49f40273d57541ee8',
+  'lit.windows_x86_64.exe':
+    'de82d2829d2fb1cbdb318e2d8a78dc2f9659ff14cb11b2894d1f30e0bfde2bf6',
+};
+
+export function getLiteRtBinDir(): string {
+  return path.join(Storage.getGlobalGeminiDir(), 'bin', 'litert');
+}
+
+export function getPidFilePath(): string {
+  return path.join(Storage.getGlobalTempDir(), 'litert-server.pid');
+}
+
+export function getLogFilePath(): string {
+  return path.join(Storage.getGlobalTempDir(), 'litert-server.log');
+}

packages/cli/src/commands/gemma/logs.test.ts

@@ -0,0 +1,186 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import fs from 'node:fs';
+import type { ChildProcess } from 'node:child_process';
+import { EventEmitter } from 'node:events';
+import os from 'node:os';
+import path from 'node:path';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { spawn } from 'node:child_process';
+import { exitCli } from '../utils.js';
+import { getLogFilePath } from './constants.js';
+import { logsCommand, readLastLines } from './logs.js';
+
+vi.mock('@google/gemini-cli-core', async (importOriginal) => {
+  const { mockCoreDebugLogger } = await import(
+    '../../test-utils/mockDebugLogger.js'
+  );
+  return mockCoreDebugLogger(
+    await importOriginal<typeof import('@google/gemini-cli-core')>(),
+    {
+      stripAnsi: false,
+    },
+  );
+});
+
+vi.mock('node:child_process', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('node:child_process')>();
+  return {
+    ...actual,
+    spawn: vi.fn(),
+  };
+});
+
+vi.mock('../utils.js', () => ({
+  exitCli: vi.fn(),
+}));
+
+vi.mock('./constants.js', () => ({
+  getLogFilePath: vi.fn(),
+}));
+
+function createMockChild(): ChildProcess {
+  return Object.assign(new EventEmitter(), {
+    kill: vi.fn(),
+  }) as unknown as ChildProcess;
+}
+
+async function flushMicrotasks() {
+  await Promise.resolve();
+  await Promise.resolve();
+}
+
+describe('readLastLines', () => {
+  const tempFiles: string[] = [];
+
+  afterEach(async () => {
+    await Promise.all(
+      tempFiles
+        .splice(0)
+        .map((filePath) => fs.promises.rm(filePath, { force: true })),
+    );
+  });
+
+  it('returns only the requested tail lines without reading the whole file eagerly', async () => {
+    const filePath = path.join(
+      os.tmpdir(),
+      `gemma-logs-${Date.now()}-${Math.random().toString(36).slice(2)}.log`,
+    );
+    tempFiles.push(filePath);
+
+    const content = Array.from({ length: 2000 }, (_, i) => `line-${i + 1}`)
+      .join('\n')
+      .concat('\n');
+    await fs.promises.writeFile(filePath, content, 'utf-8');
+
+    await expect(readLastLines(filePath, 3)).resolves.toBe(
+      'line-1998\nline-1999\nline-2000\n',
+    );
+  });
+
+  it('returns an empty string when zero lines are requested', async () => {
+    const filePath = path.join(
+      os.tmpdir(),
+      `gemma-logs-${Date.now()}-${Math.random().toString(36).slice(2)}.log`,
+    );
+    tempFiles.push(filePath);
+    await fs.promises.writeFile(filePath, 'line-1\nline-2\n', 'utf-8');
+
+    await expect(readLastLines(filePath, 0)).resolves.toBe('');
+  });
+});
+
+describe('logsCommand', () => {
+  const originalPlatform = process.platform;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    Object.defineProperty(process, 'platform', {
+      value: 'linux',
+      configurable: true,
+    });
+    vi.mocked(getLogFilePath).mockReturnValue('/tmp/gemma.log');
+    vi.spyOn(fs.promises, 'access').mockResolvedValue(undefined);
+  });
+
+  afterEach(() => {
+    Object.defineProperty(process, 'platform', {
+      value: originalPlatform,
+      configurable: true,
+    });
+    vi.restoreAllMocks();
+  });
+
+  it('waits for the tail process to close before exiting in follow mode', async () => {
+    const child = createMockChild();
+    vi.mocked(spawn).mockReturnValue(child);
+
+    let resolved = false;
+    const handlerPromise = (
+      logsCommand.handler as (argv: Record<string, unknown>) => Promise<void>
+    )({}).then(() => {
+      resolved = true;
+    });
+
+    await flushMicrotasks();
+
+    expect(spawn).toHaveBeenCalledWith(
+      'tail',
+      ['-f', '-n', '20', '/tmp/gemma.log'],
+      { stdio: 'inherit' },
+    );
+    expect(resolved).toBe(false);
+    expect(exitCli).not.toHaveBeenCalled();
+
+    child.emit('close', 0);
+    await handlerPromise;
+
+    expect(exitCli).toHaveBeenCalledWith(0);
+  });
+
+  it('uses one-shot tail output when follow is disabled', async () => {
+    const child = createMockChild();
+    vi.mocked(spawn).mockReturnValue(child);
+
+    const handlerPromise = (
+      logsCommand.handler as (argv: Record<string, unknown>) => Promise<void>
+    )({ follow: false });
+
+    await flushMicrotasks();
+
+    expect(spawn).toHaveBeenCalledWith('tail', ['-n', '20', '/tmp/gemma.log'], {
+      stdio: 'inherit',
+    });
+
+    child.emit('close', 0);
+    await handlerPromise;
+
+    expect(exitCli).toHaveBeenCalledWith(0);
+  });
+
+  it('follows from the requested line count when both --lines and --follow are set', async () => {
+    const child = createMockChild();
+    vi.mocked(spawn).mockReturnValue(child);
+
+    const handlerPromise = (
+      logsCommand.handler as (argv: Record<string, unknown>) => Promise<void>
+    )({ lines: 5, follow: true });
+
+    await flushMicrotasks();
+
+    expect(spawn).toHaveBeenCalledWith(
+      'tail',
+      ['-f', '-n', '5', '/tmp/gemma.log'],
+      { stdio: 'inherit' },
+    );
+
+    child.emit('close', 0);
+    await handlerPromise;
+
+    expect(exitCli).toHaveBeenCalledWith(0);
+  });
+});

packages/cli/src/commands/gemma/logs.ts

@@ -0,0 +1,200 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import type { CommandModule } from 'yargs';
+import fs from 'node:fs';
+import { spawn, type ChildProcess } from 'node:child_process';
+import { debugLogger } from '@google/gemini-cli-core';
+import { exitCli } from '../utils.js';
+import { getLogFilePath } from './constants.js';
+
+export async function readLastLines(
+  filePath: string,
+  count: number,
+): Promise<string> {
+  if (count <= 0) {
+    return '';
+  }
+
+  const CHUNK_SIZE = 64 * 1024;
+  const fileHandle = await fs.promises.open(filePath, fs.constants.O_RDONLY);
+
+  try {
+    const stats = await fileHandle.stat();
+    if (stats.size === 0) {
+      return '';
+    }
+
+    const chunks: Buffer[] = [];
+    let totalBytes = 0;
+    let newlineCount = 0;
+    let position = stats.size;
+
+    while (position > 0 && newlineCount <= count) {
+      const readSize = Math.min(CHUNK_SIZE, position);
+      position -= readSize;
+
+      const buffer = Buffer.allocUnsafe(readSize);
+      const { bytesRead } = await fileHandle.read(
+        buffer,
+        0,
+        readSize,
+        position,
+      );
+
+      if (bytesRead === 0) {
+        break;
+      }
+
+      const chunk =
+        bytesRead === readSize ? buffer : buffer.subarray(0, bytesRead);
+      chunks.unshift(chunk);
+      totalBytes += chunk.length;
+
+      for (const byte of chunk) {
+        if (byte === 0x0a) {
+          newlineCount += 1;
+        }
+      }
+    }
+
+    const content = Buffer.concat(chunks, totalBytes).toString('utf-8');
+    const lines = content.split('\n');
+
+    if (position > 0 && lines.length > 0) {
+      const boundary = Buffer.allocUnsafe(1);
+      const { bytesRead } = await fileHandle.read(boundary, 0, 1, position - 1);
+      if (bytesRead === 1 && boundary[0] !== 0x0a) {
+        lines.shift();
+      }
+    }
+
+    if (lines.length > 0 && lines[lines.length - 1] === '') {
+      lines.pop();
+    }
+
+    if (lines.length === 0) {
+      return '';
+    }
+
+    return lines.slice(-count).join('\n') + '\n';
+  } finally {
+    await fileHandle.close();
+  }
+}
+
+interface LogsArgs {
+  lines?: number;
+  follow?: boolean;
+}
+
+function waitForChild(child: ChildProcess): Promise<number> {
+  return new Promise((resolve, reject) => {
+    child.once('error', reject);
+    child.once('close', (code) => resolve(code ?? 1));
+  });
+}
+
+async function runTail(logPath: string, lines: number, follow: boolean) {
+  const tailArgs = follow
+    ? ['-f', '-n', String(lines), logPath]
+    : ['-n', String(lines), logPath];
+  const child = spawn('tail', tailArgs, { stdio: 'inherit' });
+
+  if (!follow) {
+    return waitForChild(child);
+  }
+
+  const handleSigint = () => {
+    child.kill('SIGTERM');
+  };
+  process.once('SIGINT', handleSigint);
+
+  try {
+    return await waitForChild(child);
+  } finally {
+    process.off('SIGINT', handleSigint);
+  }
+}
+
+export const logsCommand: CommandModule<object, LogsArgs> = {
+  command: 'logs',
+  describe: 'View LiteRT-LM server logs',
+  builder: (yargs) =>
+    yargs
+      .option('lines', {
+        alias: 'n',
+        type: 'number',
+        description: 'Show the last N lines and exit (omit to follow live)',
+      })
+      .option('follow', {
+        alias: 'f',
+        type: 'boolean',
+        description:
+          'Follow log output (defaults to true when --lines is omitted)',
+      }),
+  handler: async (argv) => {
+    const logPath = getLogFilePath();
+
+    try {
+      await fs.promises.access(logPath, fs.constants.F_OK);
+    } catch {
+      debugLogger.log(`No log file found at ${logPath}`);
+      debugLogger.log(
+        'Is the LiteRT server running? Start it with: gemini gemma start',
+      );
+      await exitCli(1);
+      return;
+    }
+
+    const lines = argv.lines;
+    const follow = argv.follow ?? lines === undefined;
+    const requestedLines = lines ?? 20;
+
+    if (follow && process.platform === 'win32') {
+      debugLogger.log(
+        'Live log following is not supported on Windows. Use --lines N to view recent logs.',
+      );
+      await exitCli(1);
+      return;
+    }
+
+    if (process.platform === 'win32') {
+      process.stdout.write(await readLastLines(logPath, requestedLines));
+      await exitCli(0);
+      return;
+    }
+
+    try {
+      if (follow) {
+        debugLogger.log(`Tailing ${logPath} (Ctrl+C to stop)\n`);
+      }
+      const exitCode = await runTail(logPath, requestedLines, follow);
+      await exitCli(exitCode);
+    } catch (error) {
+      if (
+        error instanceof Error &&
+        'code' in error &&
+        error.code === 'ENOENT'
+      ) {
+        if (!follow) {
+          process.stdout.write(await readLastLines(logPath, requestedLines));
+          await exitCli(0);
+        } else {
+          debugLogger.error(
+            '"tail" command not found. Use --lines N to view recent logs without tail.',
+          );
+          await exitCli(1);
+        }
+      } else {
+        debugLogger.error(
+          `Failed to read log output: ${error instanceof Error ? error.message : String(error)}`,
+        );
+        await exitCli(1);
+      }
+    }
+  },
+};

packages/cli/src/commands/gemma/platform.test.ts

@@ -0,0 +1,162 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import fs from 'node:fs';
+import path from 'node:path';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { SettingScope } from '../../config/settings.js';
+import { getLiteRtBinDir } from './constants.js';
+
+const mockLoadSettings = vi.hoisted(() => vi.fn());
+
+vi.mock('../../config/settings.js', () => ({
+  loadSettings: mockLoadSettings,
+  SettingScope: {
+    User: 'User',
+  },
+}));
+
+import {
+  getBinaryPath,
+  isExpectedLiteRtServerCommand,
+  isBinaryInstalled,
+  readServerProcessInfo,
+  resolveGemmaConfig,
+} from './platform.js';
+
+describe('gemma platform helpers', () => {
+  function createMockSettings(
+    userGemmaSettings?: object,
+    mergedGemmaSettings?: object,
+  ) {
+    return {
+      merged: {
+        experimental: {
+          gemmaModelRouter: mergedGemmaSettings,
+        },
+      },
+      forScope: vi.fn((scope: SettingScope) => {
+        if (scope !== SettingScope.User) {
+          throw new Error(`Unexpected scope ${scope}`);
+        }
+        return {
+          settings: {
+            experimental: {
+              gemmaModelRouter: userGemmaSettings,
+            },
+          },
+        };
+      }),
+    };
+  }
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    mockLoadSettings.mockReturnValue(createMockSettings());
+  });
+
+  it('prefers the configured binary path from settings', () => {
+    mockLoadSettings.mockReturnValue(
+      createMockSettings({ binaryPath: '/custom/lit' }),
+    );
+
+    expect(getBinaryPath('lit.test')).toBe('/custom/lit');
+  });
+
+  it('ignores workspace overrides for the configured binary path', () => {
+    mockLoadSettings.mockReturnValue(
+      createMockSettings(
+        { binaryPath: '/user/lit' },
+        { binaryPath: '/workspace/evil' },
+      ),
+    );
+
+    expect(getBinaryPath('lit.test')).toBe('/user/lit');
+  });
+
+  it('falls back to the default install location when no custom path is set', () => {
+    expect(getBinaryPath('lit.test')).toBe(
+      path.join(getLiteRtBinDir(), 'lit.test'),
+    );
+  });
+
+  it('resolves the configured port and binary path from settings', () => {
+    mockLoadSettings.mockReturnValue(
+      createMockSettings(
+        { binaryPath: '/custom/lit' },
+        {
+          enabled: true,
+          classifier: {
+            host: 'http://localhost:8123/v1beta',
+          },
+        },
+      ),
+    );
+
+    expect(resolveGemmaConfig(9379)).toEqual({
+      settingsEnabled: true,
+      configuredPort: 8123,
+      configuredBinaryPath: '/custom/lit',
+    });
+  });
+
+  it('checks binary installation using the resolved binary path', () => {
+    mockLoadSettings.mockReturnValue(
+      createMockSettings({ binaryPath: '/custom/lit' }),
+    );
+    vi.spyOn(fs, 'existsSync').mockReturnValue(true);
+
+    expect(isBinaryInstalled()).toBe(true);
+    expect(fs.existsSync).toHaveBeenCalledWith('/custom/lit');
+  });
+
+  it('parses structured server process info from the pid file', () => {
+    vi.spyOn(fs, 'readFileSync').mockReturnValue(
+      JSON.stringify({
+        pid: 1234,
+        binaryPath: '/custom/lit',
+        port: 8123,
+      }),
+    );
+
+    expect(readServerProcessInfo()).toEqual({
+      pid: 1234,
+      binaryPath: '/custom/lit',
+      port: 8123,
+    });
+  });
+
+  it('parses legacy pid-only files for backward compatibility', () => {
+    vi.spyOn(fs, 'readFileSync').mockReturnValue('4321');
+
+    expect(readServerProcessInfo()).toEqual({
+      pid: 4321,
+    });
+  });
+
+  it('matches only the expected LiteRT serve command', () => {
+    expect(
+      isExpectedLiteRtServerCommand('/custom/lit serve --port=8123 --verbose', {
+        binaryPath: '/custom/lit',
+        port: 8123,
+      }),
+    ).toBe(true);
+
+    expect(
+      isExpectedLiteRtServerCommand('/custom/lit run --port=8123', {
+        binaryPath: '/custom/lit',
+        port: 8123,
+      }),
+    ).toBe(false);
+
+    expect(
+      isExpectedLiteRtServerCommand('/custom/lit serve --port=9000', {
+        binaryPath: '/custom/lit',
+        port: 8123,
+      }),
+    ).toBe(false);
+  });
+});

packages/cli/src/commands/gemma/platform.ts

@@ -0,0 +1,316 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { loadSettings, SettingScope } from '../../config/settings.js';
+import fs from 'node:fs';
+import path from 'node:path';
+import { execFileSync } from 'node:child_process';
+import {
+  PLATFORM_BINARY_MAP,
+  LITERT_RELEASE_BASE_URL,
+  LITERT_RELEASE_VERSION,
+  getLiteRtBinDir,
+  GEMMA_MODEL_NAME,
+  HEALTH_CHECK_TIMEOUT_MS,
+  LITERT_API_VERSION,
+  getPidFilePath,
+} from './constants.js';
+
+export interface PlatformInfo {
+  key: string;
+  binaryName: string;
+}
+
+export interface GemmaConfigStatus {
+  settingsEnabled: boolean;
+  configuredPort: number;
+  configuredBinaryPath?: string;
+}
+
+export interface LiteRtServerProcessInfo {
+  pid: number;
+  binaryPath?: string;
+  port?: number;
+}
+
+function getUserConfiguredBinaryPath(
+  workspaceDir = process.cwd(),
+): string | undefined {
+  try {
+    const userGemmaSettings = loadSettings(workspaceDir).forScope(
+      SettingScope.User,
+    ).settings.experimental?.gemmaModelRouter;
+    return userGemmaSettings?.binaryPath?.trim() || undefined;
+  } catch {
+    return undefined;
+  }
+}
+
+function parsePortFromHost(
+  host: string | undefined,
+  fallbackPort: number,
+): number {
+  if (!host) {
+    return fallbackPort;
+  }
+
+  try {
+    const url = new URL(host);
+    const port = Number(url.port);
+    return Number.isFinite(port) && port > 0 ? port : fallbackPort;
+  } catch {
+    const match = host.match(/:(\d+)/);
+    if (!match) {
+      return fallbackPort;
+    }
+    const port = parseInt(match[1], 10);
+    return Number.isFinite(port) && port > 0 ? port : fallbackPort;
+  }
+}
+
+export function resolveGemmaConfig(fallbackPort: number): GemmaConfigStatus {
+  let settingsEnabled = false;
+  let configuredPort = fallbackPort;
+  const configuredBinaryPath = getUserConfiguredBinaryPath();
+  try {
+    const settings = loadSettings(process.cwd());
+    const gemmaSettings = settings.merged.experimental?.gemmaModelRouter;
+    settingsEnabled = gemmaSettings?.enabled === true;
+    configuredPort = parsePortFromHost(
+      gemmaSettings?.classifier?.host,
+      fallbackPort,
+    );
+  } catch {
+    // ignore — settings may fail to load outside a workspace
+  }
+  return { settingsEnabled, configuredPort, configuredBinaryPath };
+}
+
+export function detectPlatform(): PlatformInfo | null {
+  const key = `${process.platform}-${process.arch}`;
+  const binaryName = PLATFORM_BINARY_MAP[key];
+  if (!binaryName) {
+    return null;
+  }
+  return { key, binaryName };
+}
+
+export function getBinaryPath(binaryName?: string): string | null {
+  const configuredBinaryPath = getUserConfiguredBinaryPath();
+  if (configuredBinaryPath) {
+    return configuredBinaryPath;
+  }
+
+  const name = binaryName ?? detectPlatform()?.binaryName;
+  if (!name) return null;
+  return path.join(getLiteRtBinDir(), name);
+}
+
+export function getBinaryDownloadUrl(binaryName: string): string {
+  return `${LITERT_RELEASE_BASE_URL}/${LITERT_RELEASE_VERSION}/${binaryName}`;
+}
+
+export function isBinaryInstalled(binaryPath = getBinaryPath()): boolean {
+  if (!binaryPath) return false;
+  return fs.existsSync(binaryPath);
+}
+
+export function isModelDownloaded(binaryPath: string): boolean {
+  try {
+    const output = execFileSync(binaryPath, ['list'], {
+      encoding: 'utf-8',
+      timeout: 10000,
+    });
+    return output.includes(GEMMA_MODEL_NAME);
+  } catch {
+    return false;
+  }
+}
+
+export async function isServerRunning(port: number): Promise<boolean> {
+  try {
+    const controller = new AbortController();
+    const timeout = setTimeout(
+      () => controller.abort(),
+      HEALTH_CHECK_TIMEOUT_MS,
+    );
+    const response = await fetch(
+      `http://localhost:${port}/${LITERT_API_VERSION}/models/${GEMMA_MODEL_NAME}:generateContent`,
+      { method: 'POST', signal: controller.signal },
+    );
+    clearTimeout(timeout);
+    // A 400 (bad request) confirms the route exists — the server recognises
+    // the model endpoint.  Only a 404 means "wrong server / wrong model".
+    return response.status !== 404;
+  } catch {
+    return false;
+  }
+}
+
+function isLiteRtServerProcessInfo(
+  value: unknown,
+): value is LiteRtServerProcessInfo {
+  if (!value || typeof value !== 'object') {
+    return false;
+  }
+
+  const isPositiveInteger = (candidate: unknown): candidate is number =>
+    typeof candidate === 'number' &&
+    Number.isInteger(candidate) &&
+    candidate > 0;
+  const isNonEmptyString = (candidate: unknown): candidate is string =>
+    typeof candidate === 'string' && candidate.length > 0;
+
+  const pid: unknown = Object.getOwnPropertyDescriptor(value, 'pid')?.value;
+  if (!isPositiveInteger(pid)) {
+    return false;
+  }
+
+  const binaryPath: unknown = Object.getOwnPropertyDescriptor(
+    value,
+    'binaryPath',
+  )?.value;
+  if (binaryPath !== undefined && !isNonEmptyString(binaryPath)) {
+    return false;
+  }
+
+  const port: unknown = Object.getOwnPropertyDescriptor(value, 'port')?.value;
+  if (port !== undefined && !isPositiveInteger(port)) {
+    return false;
+  }
+
+  return true;
+}
+
+export function readServerProcessInfo(): LiteRtServerProcessInfo | null {
+  const pidPath = getPidFilePath();
+  try {
+    const content = fs.readFileSync(pidPath, 'utf-8').trim();
+    if (!content) {
+      return null;
+    }
+
+    if (/^\d+$/.test(content)) {
+      return { pid: parseInt(content, 10) };
+    }
+
+    const parsed = JSON.parse(content) as unknown;
+    return isLiteRtServerProcessInfo(parsed) ? parsed : null;
+  } catch {
+    return null;
+  }
+}
+
+export function writeServerProcessInfo(
+  processInfo: LiteRtServerProcessInfo,
+): void {
+  fs.writeFileSync(getPidFilePath(), JSON.stringify(processInfo), 'utf-8');
+}
+
+export function readServerPid(): number | null {
+  return readServerProcessInfo()?.pid ?? null;
+}
+
+function normalizeProcessValue(value: string): string {
+  const normalized = value.replace(/\0/g, ' ').trim();
+  if (process.platform === 'win32') {
+    return normalized.replace(/\\/g, '/').replace(/\s+/g, ' ').toLowerCase();
+  }
+  return normalized.replace(/\s+/g, ' ');
+}
+
+function readProcessCommandLine(pid: number): string | null {
+  try {
+    if (process.platform === 'linux') {
+      const output = fs.readFileSync(`/proc/${pid}/cmdline`, 'utf-8');
+      return output.trim() ? output : null;
+    }
+
+    if (process.platform === 'win32') {
+      const output = execFileSync(
+        'powershell.exe',
+        [
+          '-NoProfile',
+          '-Command',
+          `(Get-CimInstance Win32_Process -Filter "ProcessId = ${pid}").CommandLine`,
+        ],
+        {
+          encoding: 'utf-8',
+          timeout: 5000,
+        },
+      );
+      return output.trim() || null;
+    }
+
+    const output = execFileSync('ps', ['-p', String(pid), '-o', 'command='], {
+      encoding: 'utf-8',
+      timeout: 5000,
+    });
+    return output.trim() || null;
+  } catch {
+    return null;
+  }
+}
+
+export function isExpectedLiteRtServerCommand(
+  commandLine: string,
+  options: {
+    binaryPath?: string | null;
+    port?: number;
+  },
+): boolean {
+  const normalizedCommandLine = normalizeProcessValue(commandLine);
+  if (!normalizedCommandLine) {
+    return false;
+  }
+
+  if (!/(^|\s|")serve(\s|$)/.test(normalizedCommandLine)) {
+    return false;
+  }
+
+  if (
+    options.port !== undefined &&
+    !normalizedCommandLine.includes(`--port=${options.port}`)
+  ) {
+    return false;
+  }
+
+  if (!options.binaryPath) {
+    return true;
+  }
+
+  const normalizedBinaryPath = normalizeProcessValue(options.binaryPath);
+  const normalizedBinaryName = normalizeProcessValue(
+    path.basename(options.binaryPath),
+  );
+  return (
+    normalizedCommandLine.includes(normalizedBinaryPath) ||
+    normalizedCommandLine.includes(normalizedBinaryName)
+  );
+}
+
+export function isExpectedLiteRtServerProcess(
+  pid: number,
+  options: {
+    binaryPath?: string | null;
+    port?: number;
+  },
+): boolean {
+  const commandLine = readProcessCommandLine(pid);
+  if (!commandLine) {
+    return false;
+  }
+  return isExpectedLiteRtServerCommand(commandLine, options);
+}
+
+export function isProcessRunning(pid: number): boolean {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}

packages/cli/src/commands/gemma/setup.test.ts

@@ -0,0 +1,60 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { afterEach, describe, expect, it } from 'vitest';
+import { PLATFORM_BINARY_MAP, PLATFORM_BINARY_SHA256 } from './constants.js';
+import { computeFileSha256, verifyFileSha256 } from './setup.js';
+
+describe('gemma setup checksum helpers', () => {
+  const tempFiles: string[] = [];
+
+  afterEach(async () => {
+    await Promise.all(
+      tempFiles
+        .splice(0)
+        .map((filePath) => fs.promises.rm(filePath, { force: true })),
+    );
+  });
+
+  it('has a pinned checksum for every supported LiteRT binary', () => {
+    expect(Object.keys(PLATFORM_BINARY_SHA256).sort()).toEqual(
+      Object.values(PLATFORM_BINARY_MAP).sort(),
+    );
+  });
+
+  it('computes the sha256 for a downloaded file', async () => {
+    const filePath = path.join(
+      os.tmpdir(),
+      `gemma-setup-${Date.now()}-${Math.random().toString(36).slice(2)}`,
+    );
+    tempFiles.push(filePath);
+    await fs.promises.writeFile(filePath, 'hello world', 'utf-8');
+
+    await expect(computeFileSha256(filePath)).resolves.toBe(
+      'b94d27b9934d3e08a52e52d7da7dabfac484efe37a5380ee9088f7ace2efcde9',
+    );
+  });
+
+  it('verifies whether a file matches the expected sha256', async () => {
+    const filePath = path.join(
+      os.tmpdir(),
+      `gemma-setup-${Date.now()}-${Math.random().toString(36).slice(2)}`,
+    );
+    tempFiles.push(filePath);
+    await fs.promises.writeFile(filePath, 'hello world', 'utf-8');
+
+    await expect(
+      verifyFileSha256(
+        filePath,
+        'b94d27b9934d3e08a52e52d7da7dabfac484efe37a5380ee9088f7ace2efcde9',
+      ),
+    ).resolves.toBe(true);
+    await expect(verifyFileSha256(filePath, 'deadbeef')).resolves.toBe(false);
+  });
+});

packages/cli/src/commands/gemma/setup.ts

@@ -0,0 +1,504 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import type { CommandModule } from 'yargs';
+import { createHash } from 'node:crypto';
+import fs from 'node:fs';
+import path from 'node:path';
+import { execFileSync, spawn as nodeSpawn } from 'node:child_process';
+import chalk from 'chalk';
+import { debugLogger } from '@google/gemini-cli-core';
+import { loadSettings, SettingScope } from '../../config/settings.js';
+import { exitCli } from '../utils.js';
+import {
+  DEFAULT_PORT,
+  GEMMA_MODEL_NAME,
+  PLATFORM_BINARY_SHA256,
+} from './constants.js';
+import {
+  detectPlatform,
+  getBinaryDownloadUrl,
+  getBinaryPath,
+  isBinaryInstalled,
+  isModelDownloaded,
+} from './platform.js';
+import { startServer } from './start.js';
+import readline from 'node:readline';
+
+const log = (msg: string) => debugLogger.log(msg);
+const logError = (msg: string) => debugLogger.error(msg);
+
+async function promptYesNo(question: string): Promise<boolean> {
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout,
+  });
+  return new Promise((resolve) => {
+    rl.question(`${question} (y/N): `, (answer) => {
+      rl.close();
+      resolve(
+        answer.trim().toLowerCase() === 'y' ||
+          answer.trim().toLowerCase() === 'yes',
+      );
+    });
+  });
+}
+
+function formatBytes(bytes: number): string {
+  if (bytes < 1024) return `${bytes} B`;
+  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
+  return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
+}
+
+function renderProgress(downloaded: number, total: number | null): void {
+  const barWidth = 30;
+  if (total && total > 0) {
+    const pct = Math.min(downloaded / total, 1);
+    const filled = Math.round(barWidth * pct);
+    const bar = '█'.repeat(filled) + '░'.repeat(barWidth - filled);
+    const pctStr = (pct * 100).toFixed(0).padStart(3);
+    process.stderr.write(
+      `\r  [${bar}] ${pctStr}% ${formatBytes(downloaded)} / ${formatBytes(total)}`,
+    );
+  } else {
+    process.stderr.write(`\r  Downloaded ${formatBytes(downloaded)}`);
+  }
+}
+
+async function downloadFile(url: string, destPath: string): Promise<void> {
+  const tmpPath = destPath + '.downloading';
+  if (fs.existsSync(tmpPath)) {
+    fs.unlinkSync(tmpPath);
+  }
+
+  const response = await fetch(url, { redirect: 'follow' });
+  if (!response.ok) {
+    throw new Error(
+      `Download failed: HTTP ${response.status} ${response.statusText}`,
+    );
+  }
+  if (!response.body) {
+    throw new Error('Download failed: No response body');
+  }
+
+  const contentLength = response.headers.get('content-length');
+  const totalBytes = contentLength ? parseInt(contentLength, 10) : null;
+  let downloadedBytes = 0;
+
+  const fileStream = fs.createWriteStream(tmpPath);
+  const reader = response.body.getReader();
+
+  try {
+    for (;;) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      const writeOk = fileStream.write(value);
+      if (!writeOk) {
+        await new Promise<void>((resolve) => fileStream.once('drain', resolve));
+      }
+      downloadedBytes += value.byteLength;
+      renderProgress(downloadedBytes, totalBytes);
+    }
+  } finally {
+    fileStream.end();
+    process.stderr.write('\r' + ' '.repeat(80) + '\r');
+  }
+
+  await new Promise<void>((resolve, reject) => {
+    fileStream.on('finish', resolve);
+    fileStream.on('error', reject);
+  });
+
+  fs.renameSync(tmpPath, destPath);
+}
+
+export async function computeFileSha256(filePath: string): Promise<string> {
+  const hash = createHash('sha256');
+  const fileStream = fs.createReadStream(filePath);
+
+  return new Promise((resolve, reject) => {
+    fileStream.on('data', (chunk) => {
+      hash.update(chunk);
+    });
+    fileStream.on('error', reject);
+    fileStream.on('end', () => {
+      resolve(hash.digest('hex'));
+    });
+  });
+}
+
+export async function verifyFileSha256(
+  filePath: string,
+  expectedHash: string,
+): Promise<boolean> {
+  const actualHash = await computeFileSha256(filePath);
+  return actualHash === expectedHash;
+}
+
+function spawnInherited(command: string, args: string[]): Promise<number> {
+  return new Promise((resolve, reject) => {
+    const child = nodeSpawn(command, args, {
+      stdio: 'inherit',
+    });
+    child.on('close', (code) => resolve(code ?? 1));
+    child.on('error', reject);
+  });
+}
+
+interface SetupArgs {
+  port: number;
+  skipModel: boolean;
+  start: boolean;
+  force: boolean;
+  consent: boolean;
+}
+
+async function handleSetup(argv: SetupArgs): Promise<number> {
+  const { port, force } = argv;
+  let settingsUpdated = false;
+  let serverStarted = false;
+  let autoStartServer = true;
+
+  log('');
+  log(chalk.bold('Gemma Local Model Routing Setup'));
+  log(chalk.dim('─'.repeat(40)));
+  log('');
+
+  const platform = detectPlatform();
+  if (!platform) {
+    logError(
+      chalk.red(`Unsupported platform: ${process.platform}-${process.arch}`),
+    );
+    logError(
+      'LiteRT-LM binaries are available for: macOS (ARM64), Linux (x86_64), Windows (x86_64)',
+    );
+    return 1;
+  }
+  log(chalk.dim(`  Platform: ${platform.key} → ${platform.binaryName}`));
+
+  if (!argv.consent) {
+    log('');
+    log('This will download and install the LiteRT-LM runtime and the');
+    log(
+      `Gemma model (${GEMMA_MODEL_NAME}, ~1 GB). By proceeding, you agree to the`,
+    );
+    log('Gemma Terms of Use: https://ai.google.dev/gemma/terms');
+    log('');
+
+    const accepted = await promptYesNo('Do you want to continue?');
+    if (!accepted) {
+      log('Setup cancelled.');
+      return 0;
+    }
+  }
+
+  const binaryPath = getBinaryPath(platform.binaryName)!;
+  const alreadyInstalled = isBinaryInstalled();
+
+  if (alreadyInstalled && !force) {
+    log('');
+    log(chalk.green('  ✓ LiteRT-LM binary already installed at:'));
+    log(chalk.dim(`    ${binaryPath}`));
+  } else {
+    log('');
+    log('  Downloading LiteRT-LM binary...');
+    const downloadUrl = getBinaryDownloadUrl(platform.binaryName);
+    debugLogger.log(`Downloading from: ${downloadUrl}`);
+
+    try {
+      const binDir = path.dirname(binaryPath);
+      fs.mkdirSync(binDir, { recursive: true });
+      await downloadFile(downloadUrl, binaryPath);
+      log(chalk.green('  ✓ Binary downloaded successfully'));
+    } catch (error) {
+      logError(
+        chalk.red(
+          `  ✗ Failed to download binary: ${error instanceof Error ? error.message : String(error)}`,
+        ),
+      );
+      logError('  Check your internet connection and try again.');
+      return 1;
+    }
+
+    const expectedHash = PLATFORM_BINARY_SHA256[platform.binaryName];
+    if (!expectedHash) {
+      logError(
+        chalk.red(
+          `  ✗ No checksum is configured for ${platform.binaryName}. Refusing to install the binary.`,
+        ),
+      );
+      try {
+        fs.rmSync(binaryPath, { force: true });
+      } catch {
+        // ignore
+      }
+      return 1;
+    }
+
+    try {
+      const checksumVerified = await verifyFileSha256(binaryPath, expectedHash);
+      if (!checksumVerified) {
+        logError(
+          chalk.red(
+            '  ✗ Downloaded binary checksum did not match the expected release hash.',
+          ),
+        );
+        try {
+          fs.rmSync(binaryPath, { force: true });
+        } catch {
+          // ignore
+        }
+        return 1;
+      }
+      log(chalk.green('  ✓ Binary checksum verified'));
+    } catch (error) {
+      logError(
+        chalk.red(
+          `  ✗ Failed to verify binary checksum: ${error instanceof Error ? error.message : String(error)}`,
+        ),
+      );
+      try {
+        fs.rmSync(binaryPath, { force: true });
+      } catch {
+        // ignore
+      }
+      return 1;
+    }
+
+    if (process.platform !== 'win32') {
+      try {
+        fs.chmodSync(binaryPath, 0o755);
+      } catch (error) {
+        logError(
+          chalk.red(
+            `  ✗ Failed to set executable permission: ${error instanceof Error ? error.message : String(error)}`,
+          ),
+        );
+        return 1;
+      }
+    }
+
+    if (process.platform === 'darwin') {
+      try {
+        execFileSync('xattr', ['-d', 'com.apple.quarantine', binaryPath], {
+          stdio: 'ignore',
+        });
+        log(chalk.green('  ✓ macOS quarantine attribute removed'));
+      } catch {
+        // Expected if the attribute doesn't exist.
+      }
+    }
+  }
+
+  if (!argv.skipModel) {
+    const modelAlreadyDownloaded = isModelDownloaded(binaryPath);
+    if (modelAlreadyDownloaded && !force) {
+      log('');
+      log(chalk.green(`  ✓ Model ${GEMMA_MODEL_NAME} already downloaded`));
+    } else {
+      log('');
+      log(`  Downloading model ${GEMMA_MODEL_NAME}...`);
+      log(chalk.dim('  You may be prompted to accept the Gemma Terms of Use.'));
+      log('');
+
+      const exitCode = await spawnInherited(binaryPath, [
+        'pull',
+        GEMMA_MODEL_NAME,
+      ]);
+      if (exitCode !== 0) {
+        logError('');
+        logError(
+          chalk.red(`  ✗ Model download failed (exit code ${exitCode})`),
+        );
+        return 1;
+      }
+      log('');
+      log(chalk.green(`  ✓ Model ${GEMMA_MODEL_NAME} downloaded`));
+    }
+  }
+
+  log('');
+  log('  Configuring settings...');
+  try {
+    const settings = loadSettings(process.cwd());
+
+    // User scope: security-sensitive settings that must not be overridable
+    // by workspace configs (prevents arbitrary binary execution).
+    const existingUserGemma =
+      settings.forScope(SettingScope.User).settings.experimental
+        ?.gemmaModelRouter ?? {};
+    autoStartServer = existingUserGemma.autoStartServer ?? true;
+    const existingUserExperimental =
+      settings.forScope(SettingScope.User).settings.experimental ?? {};
+    settings.setValue(SettingScope.User, 'experimental', {
+      ...existingUserExperimental,
+      gemmaModelRouter: {
+        autoStartServer,
+        ...(existingUserGemma.binaryPath !== undefined
+          ? { binaryPath: existingUserGemma.binaryPath }
+          : {}),
+      },
+    });
+
+    // Workspace scope: project-isolated settings so the local model only
+    // runs for this specific project, saving resources globally.
+    const existingWorkspaceGemma =
+      settings.forScope(SettingScope.Workspace).settings.experimental
+        ?.gemmaModelRouter ?? {};
+    const existingWorkspaceExperimental =
+      settings.forScope(SettingScope.Workspace).settings.experimental ?? {};
+    settings.setValue(SettingScope.Workspace, 'experimental', {
+      ...existingWorkspaceExperimental,
+      gemmaModelRouter: {
+        ...existingWorkspaceGemma,
+        enabled: true,
+        classifier: {
+          ...existingWorkspaceGemma.classifier,
+          host: `http://localhost:${port}`,
+          model: GEMMA_MODEL_NAME,
+        },
+      },
+    });
+
+    log(chalk.green('  ✓ Settings updated'));
+    log(chalk.dim('    User (~/.gemini/settings.json): autoStartServer'));
+    log(
+      chalk.dim('    Workspace (.gemini/settings.json): enabled, classifier'),
+    );
+    settingsUpdated = true;
+  } catch (error) {
+    logError(
+      chalk.red(
+        `  ✗ Failed to update settings: ${error instanceof Error ? error.message : String(error)}`,
+      ),
+    );
+    logError(
+      '  You can manually add the configuration to ~/.gemini/settings.json',
+    );
+  }
+
+  if (argv.start) {
+    log('');
+    log('  Starting LiteRT server...');
+    serverStarted = await startServer(binaryPath, port);
+    if (serverStarted) {
+      log(chalk.green(`  ✓ Server started on port ${port}`));
+    } else {
+      log(
+        chalk.yellow(
+          `  ! Server may not have started correctly. Check: gemini gemma status`,
+        ),
+      );
+    }
+  }
+
+  const routingActive = settingsUpdated && serverStarted;
+  const setupSucceeded = settingsUpdated && (!argv.start || serverStarted);
+  log('');
+  log(chalk.dim('─'.repeat(40)));
+  if (routingActive) {
+    log(chalk.bold.green('  Setup complete! Local model routing is active.'));
+  } else if (settingsUpdated) {
+    log(
+      chalk.bold.green('  Setup complete! Local model routing is configured.'),
+    );
+  } else {
+    log(
+      chalk.bold.yellow(
+        '  Setup incomplete. Manual settings changes are still required.',
+      ),
+    );
+  }
+  log('');
+  log('  How it works: Every request is classified by the local Gemma model.');
+  log(
+    '  Simple tasks (file reads, quick edits) route to ' +
+      chalk.cyan('Flash') +
+      ' for speed.',
+  );
+  log(
+    '  Complex tasks (debugging, architecture) route to ' +
+      chalk.cyan('Pro') +
+      ' for quality.',
+  );
+  log('  This happens automatically — just use the CLI as usual.');
+  log('');
+  if (!settingsUpdated) {
+    log(
+      chalk.yellow(
+        '  Fix the settings update above, then rerun "gemini gemma status".',
+      ),
+    );
+    log('');
+  } else if (!argv.start) {
+    log(chalk.yellow('  Note: Run "gemini gemma start" to start the server.'));
+    if (autoStartServer) {
+      log(
+        chalk.yellow(
+          '  Or restart the CLI to auto-start it on the next launch.',
+        ),
+      );
+    }
+    log('');
+  } else if (!serverStarted) {
+    log(
+      chalk.yellow(
+        '  Review the server logs and rerun "gemini gemma start" after fixing the issue.',
+      ),
+    );
+    log('');
+  }
+  log('  Useful commands:');
+  log(chalk.dim('    gemini gemma status   Check routing status'));
+  log(chalk.dim('    gemini gemma start    Start the LiteRT server'));
+  log(chalk.dim('    gemini gemma stop     Stop the LiteRT server'));
+  log(chalk.dim('    /gemma               Check status inside a session'));
+  log('');
+
+  return setupSucceeded ? 0 : 1;
+}
+
+export const setupCommand: CommandModule = {
+  command: 'setup',
+  describe: 'Download and configure Gemma local model routing',
+  builder: (yargs) =>
+    yargs
+      .option('port', {
+        type: 'number',
+        default: DEFAULT_PORT,
+        description: 'Port for the LiteRT server',
+      })
+      .option('skip-model', {
+        type: 'boolean',
+        default: false,
+        description: 'Skip model download (binary only)',
+      })
+      .option('start', {
+        type: 'boolean',
+        default: true,
+        description: 'Start the server after setup',
+      })
+      .option('force', {
+        type: 'boolean',
+        default: false,
+        description: 'Re-download binary and model even if already present',
+      })
+      .option('consent', {
+        type: 'boolean',
+        default: false,
+        description: 'Skip interactive consent prompt (implies acceptance)',
+      }),
+  handler: async (argv) => {
+    const exitCode = await handleSetup({
+      port: Number(argv['port']),
+      skipModel: Boolean(argv['skipModel']),
+      start: Boolean(argv['start']),
+      force: Boolean(argv['force']),
+      consent: Boolean(argv['consent']),
+    });
+    await exitCli(exitCode);
+  },
+};

packages/cli/src/commands/gemma/start.ts

@@ -0,0 +1,123 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import type { CommandModule } from 'yargs';
+import fs from 'node:fs';
+import path from 'node:path';
+import { spawn } from 'node:child_process';
+import chalk from 'chalk';
+import { debugLogger } from '@google/gemini-cli-core';
+import { exitCli } from '../utils.js';
+import {
+  DEFAULT_PORT,
+  getPidFilePath,
+  getLogFilePath,
+  getLiteRtBinDir,
+  SERVER_START_WAIT_MS,
+} from './constants.js';
+import {
+  getBinaryPath,
+  isBinaryInstalled,
+  isServerRunning,
+  resolveGemmaConfig,
+  writeServerProcessInfo,
+} from './platform.js';
+
+export async function startServer(
+  binaryPath: string,
+  port: number,
+): Promise<boolean> {
+  const alreadyRunning = await isServerRunning(port);
+  if (alreadyRunning) {
+    debugLogger.log(`LiteRT server already running on port ${port}`);
+    return true;
+  }
+
+  const logPath = getLogFilePath();
+  fs.mkdirSync(getLiteRtBinDir(), { recursive: true });
+  const tmpDir = path.dirname(getPidFilePath());
+  fs.mkdirSync(tmpDir, { recursive: true });
+
+  const logFd = fs.openSync(logPath, 'a');
+
+  try {
+    const child = spawn(binaryPath, ['serve', `--port=${port}`, '--verbose'], {
+      detached: true,
+      stdio: ['ignore', logFd, logFd],
+    });
+
+    if (child.pid) {
+      writeServerProcessInfo({
+        pid: child.pid,
+        binaryPath,
+        port,
+      });
+    }
+
+    child.unref();
+  } finally {
+    fs.closeSync(logFd);
+  }
+
+  await new Promise((resolve) => setTimeout(resolve, SERVER_START_WAIT_MS));
+  return isServerRunning(port);
+}
+
+export const startCommand: CommandModule = {
+  command: 'start',
+  describe: 'Start the LiteRT-LM server',
+  builder: (yargs) =>
+    yargs.option('port', {
+      type: 'number',
+      description: 'Port for the LiteRT server',
+    }),
+  handler: async (argv) => {
+    let port: number | undefined;
+    if (argv['port'] !== undefined) {
+      port = Number(argv['port']);
+    }
+
+    if (!port) {
+      const { configuredPort } = resolveGemmaConfig(DEFAULT_PORT);
+      port = configuredPort;
+    }
+
+    const binaryPath = getBinaryPath();
+    if (!binaryPath || !isBinaryInstalled(binaryPath)) {
+      debugLogger.error(
+        chalk.red(
+          'LiteRT-LM binary not found. Run "gemini gemma setup" first.',
+        ),
+      );
+      await exitCli(1);
+      return;
+    }
+
+    const alreadyRunning = await isServerRunning(port);
+    if (alreadyRunning) {
+      debugLogger.log(
+        chalk.green(`LiteRT server is already running on port ${port}.`),
+      );
+      await exitCli(0);
+      return;
+    }
+
+    debugLogger.log(`Starting LiteRT server on port ${port}...`);
+
+    const started = await startServer(binaryPath, port);
+    if (started) {
+      debugLogger.log(chalk.green(`LiteRT server started on port ${port}.`));
+      debugLogger.log(chalk.dim(`Logs: ${getLogFilePath()}`));
+      await exitCli(0);
+    } else {
+      debugLogger.error(
+        chalk.red('Server may not have started correctly. Check logs:'),
+      );
+      debugLogger.error(chalk.dim(`  ${getLogFilePath()}`));
+      await exitCli(1);
+    }
+  },
+};

packages/cli/src/commands/gemma/status.ts

@@ -0,0 +1,165 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import type { CommandModule } from 'yargs';
+import chalk from 'chalk';
+import { DEFAULT_PORT, GEMMA_MODEL_NAME } from './constants.js';
+import {
+  detectPlatform,
+  getBinaryPath,
+  isBinaryInstalled,
+  isModelDownloaded,
+  isServerRunning,
+  readServerPid,
+  isProcessRunning,
+  resolveGemmaConfig,
+} from './platform.js';
+import { exitCli } from '../utils.js';
+
+export interface GemmaStatusResult {
+  binaryInstalled: boolean;
+  binaryPath: string | null;
+  modelDownloaded: boolean;
+  serverRunning: boolean;
+  serverPid: number | null;
+  settingsEnabled: boolean;
+  port: number;
+  allPassing: boolean;
+}
+
+export async function checkGemmaStatus(
+  port?: number,
+): Promise<GemmaStatusResult> {
+  const { settingsEnabled, configuredPort } = resolveGemmaConfig(DEFAULT_PORT);
+
+  const effectivePort = port ?? configuredPort;
+  const binaryPath = getBinaryPath();
+  const binaryInstalled = isBinaryInstalled(binaryPath);
+  const modelDownloaded =
+    binaryInstalled && binaryPath ? isModelDownloaded(binaryPath) : false;
+  const serverRunning = await isServerRunning(effectivePort);
+  const pid = readServerPid();
+  const serverPid = pid && isProcessRunning(pid) ? pid : null;
+
+  const allPassing =
+    binaryInstalled && modelDownloaded && serverRunning && settingsEnabled;
+
+  return {
+    binaryInstalled,
+    binaryPath,
+    modelDownloaded,
+    serverRunning,
+    serverPid,
+    settingsEnabled,
+    port: effectivePort,
+    allPassing,
+  };
+}
+
+export function formatGemmaStatus(status: GemmaStatusResult): string {
+  const check = (ok: boolean) => (ok ? chalk.green('✓') : chalk.red('✗'));
+
+  const lines: string[] = [
+    '',
+    chalk.bold('Gemma Local Model Routing Status'),
+    chalk.dim('─'.repeat(40)),
+    '',
+  ];
+
+  if (status.binaryInstalled) {
+    lines.push(`  Binary:    ${check(true)} Installed (${status.binaryPath})`);
+  } else {
+    const platform = detectPlatform();
+    if (platform) {
+      lines.push(`  Binary:    ${check(false)} Not installed`);
+      lines.push(chalk.dim(`             Run: gemini gemma setup`));
+    } else {
+      lines.push(
+        `  Binary:    ${check(false)} Unsupported platform (${process.platform}-${process.arch})`,
+      );
+    }
+  }
+
+  if (status.modelDownloaded) {
+    lines.push(`  Model:     ${check(true)} ${GEMMA_MODEL_NAME} downloaded`);
+  } else {
+    lines.push(`  Model:     ${check(false)} ${GEMMA_MODEL_NAME} not found`);
+    if (status.binaryInstalled) {
+      lines.push(
+        chalk.dim(
+          `             Run: ${status.binaryPath} pull ${GEMMA_MODEL_NAME}`,
+        ),
+      );
+    } else {
+      lines.push(chalk.dim(`             Run: gemini gemma setup`));
+    }
+  }
+
+  if (status.serverRunning) {
+    const pidInfo = status.serverPid ? ` (PID ${status.serverPid})` : '';
+    lines.push(
+      `  Server:    ${check(true)} Running on port ${status.port}${pidInfo}`,
+    );
+  } else {
+    lines.push(
+      `  Server:    ${check(false)} Not running on port ${status.port}`,
+    );
+    lines.push(chalk.dim(`             Run: gemini gemma start`));
+  }
+
+  if (status.settingsEnabled) {
+    lines.push(`  Settings:  ${check(true)} Enabled in settings.json`);
+  } else {
+    lines.push(`  Settings:  ${check(false)} Not enabled in settings.json`);
+    lines.push(
+      chalk.dim(
+        `             Run: gemini gemma setup (auto-configures settings)`,
+      ),
+    );
+  }
+
+  lines.push('');
+
+  if (status.allPassing) {
+    lines.push(chalk.green('  Routing is active — no action needed.'));
+    lines.push('');
+    lines.push(
+      chalk.dim(
+        '  Simple requests → Flash (fast) | Complex requests → Pro (powerful)',
+      ),
+    );
+    lines.push(chalk.dim('  This happens automatically on every request.'));
+  } else {
+    lines.push(
+      chalk.yellow(
+        '  Some checks failed. Run "gemini gemma setup" for guided installation.',
+      ),
+    );
+  }
+
+  lines.push('');
+  return lines.join('\n');
+}
+
+export const statusCommand: CommandModule = {
+  command: 'status',
+  describe: 'Check Gemma local model routing status',
+  builder: (yargs) =>
+    yargs.option('port', {
+      type: 'number',
+      description: 'Port to check for the LiteRT server',
+    }),
+  handler: async (argv) => {
+    let port: number | undefined;
+    if (argv['port'] !== undefined) {
+      port = Number(argv['port']);
+    }
+    const status = await checkGemmaStatus(port);
+    const output = formatGemmaStatus(status);
+    process.stdout.write(output);
+    await exitCli(status.allPassing ? 0 : 1);
+  },
+};

packages/cli/src/commands/gemma/stop.test.ts

@@ -0,0 +1,112 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import fs from 'node:fs';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+const mockGetBinaryPath = vi.hoisted(() => vi.fn());
+const mockIsExpectedLiteRtServerProcess = vi.hoisted(() => vi.fn());
+const mockIsProcessRunning = vi.hoisted(() => vi.fn());
+const mockIsServerRunning = vi.hoisted(() => vi.fn());
+const mockReadServerPid = vi.hoisted(() => vi.fn());
+const mockReadServerProcessInfo = vi.hoisted(() => vi.fn());
+const mockResolveGemmaConfig = vi.hoisted(() => vi.fn());
+
+vi.mock('@google/gemini-cli-core', async (importOriginal) => {
+  const { mockCoreDebugLogger } = await import(
+    '../../test-utils/mockDebugLogger.js'
+  );
+  return mockCoreDebugLogger(
+    await importOriginal<typeof import('@google/gemini-cli-core')>(),
+    {
+      stripAnsi: false,
+    },
+  );
+});
+
+vi.mock('./constants.js', () => ({
+  DEFAULT_PORT: 9379,
+  getPidFilePath: vi.fn(() => '/tmp/litert-server.pid'),
+}));
+
+vi.mock('./platform.js', () => ({
+  getBinaryPath: mockGetBinaryPath,
+  isExpectedLiteRtServerProcess: mockIsExpectedLiteRtServerProcess,
+  isProcessRunning: mockIsProcessRunning,
+  isServerRunning: mockIsServerRunning,
+  readServerPid: mockReadServerPid,
+  readServerProcessInfo: mockReadServerProcessInfo,
+  resolveGemmaConfig: mockResolveGemmaConfig,
+}));
+
+vi.mock('../utils.js', () => ({
+  exitCli: vi.fn(),
+}));
+
+import { stopServer } from './stop.js';
+
+describe('gemma stop command', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.useFakeTimers();
+    mockGetBinaryPath.mockReturnValue('/custom/lit');
+    mockResolveGemmaConfig.mockReturnValue({ configuredPort: 9379 });
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
+    vi.restoreAllMocks();
+  });
+
+  it('refuses to signal a pid that does not match the expected LiteRT server', async () => {
+    mockReadServerProcessInfo.mockReturnValue({
+      pid: 1234,
+      binaryPath: '/custom/lit',
+      port: 8123,
+    });
+    mockIsProcessRunning.mockReturnValue(true);
+    mockIsExpectedLiteRtServerProcess.mockReturnValue(false);
+
+    const killSpy = vi.spyOn(process, 'kill').mockImplementation(() => true);
+
+    await expect(stopServer(8123)).resolves.toBe('unexpected-process');
+    expect(killSpy).not.toHaveBeenCalled();
+  });
+
+  it('stops the verified LiteRT server and removes the pid file', async () => {
+    mockReadServerProcessInfo.mockReturnValue({
+      pid: 1234,
+      binaryPath: '/custom/lit',
+      port: 8123,
+    });
+    mockIsProcessRunning.mockReturnValueOnce(true).mockReturnValueOnce(false);
+    mockIsExpectedLiteRtServerProcess.mockReturnValue(true);
+
+    const unlinkSpy = vi.spyOn(fs, 'unlinkSync').mockImplementation(() => {});
+    const killSpy = vi.spyOn(process, 'kill').mockImplementation(() => true);
+
+    const stopPromise = stopServer(8123);
+    await vi.runAllTimersAsync();
+
+    await expect(stopPromise).resolves.toBe('stopped');
+    expect(killSpy).toHaveBeenCalledWith(1234, 'SIGTERM');
+    expect(unlinkSpy).toHaveBeenCalledWith('/tmp/litert-server.pid');
+  });
+
+  it('cleans up a stale pid file when the recorded process is no longer running', async () => {
+    mockReadServerProcessInfo.mockReturnValue({
+      pid: 1234,
+      binaryPath: '/custom/lit',
+      port: 8123,
+    });
+    mockIsProcessRunning.mockReturnValue(false);
+
+    const unlinkSpy = vi.spyOn(fs, 'unlinkSync').mockImplementation(() => {});
+
+    await expect(stopServer(8123)).resolves.toBe('not-running');
+    expect(unlinkSpy).toHaveBeenCalledWith('/tmp/litert-server.pid');
+  });
+});

packages/cli/src/commands/gemma/stop.ts

@@ -0,0 +1,155 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import type { CommandModule } from 'yargs';
+import fs from 'node:fs';
+import chalk from 'chalk';
+import { debugLogger } from '@google/gemini-cli-core';
+import { exitCli } from '../utils.js';
+import { DEFAULT_PORT, getPidFilePath } from './constants.js';
+import {
+  getBinaryPath,
+  isExpectedLiteRtServerProcess,
+  isProcessRunning,
+  isServerRunning,
+  readServerPid,
+  readServerProcessInfo,
+  resolveGemmaConfig,
+} from './platform.js';
+
+export type StopServerResult =
+  | 'stopped'
+  | 'not-running'
+  | 'unexpected-process'
+  | 'failed';
+
+export async function stopServer(
+  expectedPort?: number,
+): Promise<StopServerResult> {
+  const processInfo = readServerProcessInfo();
+  const pidPath = getPidFilePath();
+
+  if (!processInfo) {
+    return 'not-running';
+  }
+
+  const { pid } = processInfo;
+  if (!isProcessRunning(pid)) {
+    debugLogger.log(
+      `Stale PID file found (PID ${pid} is not running), removing ${pidPath}`,
+    );
+    try {
+      fs.unlinkSync(pidPath);
+    } catch {
+      // ignore
+    }
+    return 'not-running';
+  }
+
+  const binaryPath = processInfo.binaryPath ?? getBinaryPath();
+  const port = processInfo.port ?? expectedPort;
+  if (!isExpectedLiteRtServerProcess(pid, { binaryPath, port })) {
+    debugLogger.warn(
+      `Refusing to stop PID ${pid} because it does not match the expected LiteRT server process.`,
+    );
+    return 'unexpected-process';
+  }
+
+  try {
+    process.kill(pid, 'SIGTERM');
+  } catch {
+    return 'failed';
+  }
+
+  await new Promise((resolve) => setTimeout(resolve, 1000));
+
+  if (isProcessRunning(pid)) {
+    try {
+      process.kill(pid, 'SIGKILL');
+    } catch {
+      // ignore
+    }
+    await new Promise((resolve) => setTimeout(resolve, 500));
+    if (isProcessRunning(pid)) {
+      return 'failed';
+    }
+  }
+
+  try {
+    fs.unlinkSync(pidPath);
+  } catch {
+    // ignore
+  }
+
+  return 'stopped';
+}
+
+export const stopCommand: CommandModule = {
+  command: 'stop',
+  describe: 'Stop the LiteRT-LM server',
+  builder: (yargs) =>
+    yargs.option('port', {
+      type: 'number',
+      description: 'Port where the LiteRT server is running',
+    }),
+  handler: async (argv) => {
+    let port: number | undefined;
+    if (argv['port'] !== undefined) {
+      port = Number(argv['port']);
+    }
+
+    if (!port) {
+      const { configuredPort } = resolveGemmaConfig(DEFAULT_PORT);
+      port = configuredPort;
+    }
+
+    const processInfo = readServerProcessInfo();
+    const pid = processInfo?.pid ?? readServerPid();
+
+    if (pid !== null && isProcessRunning(pid)) {
+      debugLogger.log(`Stopping LiteRT server (PID ${pid})...`);
+      const result = await stopServer(port);
+      if (result === 'stopped') {
+        debugLogger.log(chalk.green('LiteRT server stopped.'));
+        await exitCli(0);
+      } else if (result === 'unexpected-process') {
+        debugLogger.error(
+          chalk.red(
+            `Refusing to stop PID ${pid} because it does not match the expected LiteRT server process.`,
+          ),
+        );
+        debugLogger.error(
+          chalk.dim(
+            'Remove the stale pid file after verifying the process, or stop the process manually.',
+          ),
+        );
+        await exitCli(1);
+      } else {
+        debugLogger.error(chalk.red('Failed to stop LiteRT server.'));
+        await exitCli(1);
+      }
+      return;
+    }
+
+    const running = await isServerRunning(port);
+    if (running) {
+      debugLogger.log(
+        chalk.yellow(
+          `A server is responding on port ${port}, but it was not started by "gemini gemma start".`,
+        ),
+      );
+      debugLogger.log(
+        chalk.dim(
+          'If you started it manually, stop it from the terminal where it is running.',
+        ),
+      );
+      await exitCli(1);
+    } else {
+      debugLogger.log('No LiteRT server is currently running.');
+      await exitCli(0);
+    }
+  },
+};

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

@@ -338,6 +338,7 @@ describe('parseArguments', () => {
       { cmd: 'skill list', expected: true },
       { cmd: 'hooks migrate', expected: true },
       { cmd: 'hook migrate', expected: true },
+      { cmd: 'gemma status', expected: true },
       { cmd: 'some query', expected: undefined },
       { cmd: 'hello world', expected: undefined },
     ])(
@@ -758,6 +759,12 @@ describe('parseArguments', () => {
     const argv = await parseArguments(settings);
     expect(argv.isCommand).toBe(true);
   });
+
+  it('should set isCommand to true for gemma command', async () => {
+    process.argv = ['node', 'script.js', 'gemma', 'status'];
+    const argv = await parseArguments(createTestMergedSettings());
+    expect(argv.isCommand).toBe(true);
+  });
 });
 
 describe('loadCliConfig', () => {
@@ -3030,6 +3037,8 @@ describe('loadCliConfig gemmaModelRouter', () => {
       experimental: {
         gemmaModelRouter: {
           enabled: true,
+          autoStartServer: false,
+          binaryPath: '/custom/lit',
           classifier: {
             host: 'http://custom:1234',
             model: 'custom-gemma',
@@ -3040,6 +3049,8 @@ describe('loadCliConfig gemmaModelRouter', () => {
     const config = await loadCliConfig(settings, 'test-session', argv);
     expect(config.getGemmaModelRouterEnabled()).toBe(true);
     const gemmaSettings = config.getGemmaModelRouterSettings();
+    expect(gemmaSettings.autoStartServer).toBe(false);
+    expect(gemmaSettings.binaryPath).toBe('/custom/lit');
     expect(gemmaSettings.classifier?.host).toBe('http://custom:1234');
     expect(gemmaSettings.classifier?.model).toBe('custom-gemma');
   });
@@ -3057,6 +3068,8 @@ describe('loadCliConfig gemmaModelRouter', () => {
     const config = await loadCliConfig(settings, 'test-session', argv);
     expect(config.getGemmaModelRouterEnabled()).toBe(true);
     const gemmaSettings = config.getGemmaModelRouterSettings();
+    expect(gemmaSettings.autoStartServer).toBe(false);
+    expect(gemmaSettings.binaryPath).toBe('');
     expect(gemmaSettings.classifier?.host).toBe('http://localhost:9379');
     expect(gemmaSettings.classifier?.model).toBe('gemma3-1b-gpu-custom');
   });

packages/cli/src/config/config.ts

@@ -13,6 +13,7 @@ import { mcpCommand } from '../commands/mcp.js';
 import { extensionsCommand } from '../commands/extensions.js';
 import { skillsCommand } from '../commands/skills.js';
 import { hooksCommand } from '../commands/hooks.js';
+import { gemmaCommand } from '../commands/gemma.js';
 import {
   setGeminiMdFilename as setServerGeminiMdFilename,
   getCurrentGeminiMdFilename,
@@ -181,6 +182,7 @@ export async function parseArguments(
         extensionsCommand,
         skillsCommand,
         hooksCommand,
+        gemmaCommand,
       ];
 
       const subcommands = commandModules.flatMap((mod) => {
@@ -260,6 +262,7 @@ export async function parseArguments(
   yargsInstance.command(extensionsCommand);
   yargsInstance.command(skillsCommand);
   yargsInstance.command(hooksCommand);
+  yargsInstance.command(gemmaCommand);
 
   yargsInstance
     .command('$0 [query..]', 'Launch Gemini CLI', (yargsInstance) =>
@@ -990,9 +993,12 @@ export async function loadCliConfig(
     disabledSkills: settings.skills?.disabled,
     experimentalJitContext: settings.experimental?.jitContext,
     experimentalMemoryManager: settings.experimental?.memoryManager,
+    experimentalAutoMemory: settings.experimental?.autoMemory,
     contextManagement,
     modelSteering: settings.experimental?.modelSteering,
-    topicUpdateNarration: settings.experimental?.topicUpdateNarration,
+    topicUpdateNarration:
+      settings.general?.topicUpdateNarration ??
+      settings.experimental?.topicUpdateNarration,
     noBrowser: !!process.env['NO_BROWSER'],
     summarizeToolOutput: settings.model?.summarizeToolOutput,
     ideMode,

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

@@ -62,6 +62,7 @@ describe('fetchJson', () => {
       const res = new EventEmitter() as IncomingMessage;
       res.statusCode = 302;
       res.headers = { location: 'https://example.com/final' };
+      res.resume = vi.fn();
       (callback as (res: IncomingMessage) => void)(res);
       res.emit('end');
       return new EventEmitter() as ClientRequest;
@@ -85,6 +86,7 @@ describe('fetchJson', () => {
       const res = new EventEmitter() as IncomingMessage;
       res.statusCode = 301;
       res.headers = { location: 'https://example.com/final-permanent' };
+      res.resume = vi.fn();
       (callback as (res: IncomingMessage) => void)(res);
       res.emit('end');
       return new EventEmitter() as ClientRequest;

packages/cli/src/config/extensions/github_fetch.ts

@@ -31,7 +31,11 @@ export async function fetchJson<T>(
           if (!res.headers.location) {
             return reject(new Error('No location header in redirect response'));
           }
-          fetchJson<T>(res.headers.location, redirectCount++)
+          res.resume();
+          fetchJson<T>(
+            new URL(res.headers.location, url).toString(),
+            redirectCount + 1,
+          )
             .then(resolve)
             .catch(reject);
           return;

packages/cli/src/config/footerItems.ts

@@ -34,8 +34,8 @@ export const ALL_ITEMS = [
   },
   {
     id: 'quota',
-    header: '/stats',
-    description: 'Remaining usage on daily limit (not shown when unavailable)',
+    header: 'quota',
+    description: 'Percentage of daily limit used (not shown when unavailable)',
   },
   {
     id: 'memory-usage',

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

@@ -471,11 +471,33 @@ describe('SettingsSchema', () => {
       expect(enabled.category).toBe('Experimental');
       expect(enabled.default).toBe(false);
       expect(enabled.requiresRestart).toBe(true);
-      expect(enabled.showInDialog).toBe(false);
+      expect(enabled.showInDialog).toBe(true);
       expect(enabled.description).toBe(
         'Enable the Gemma Model Router (experimental). Requires a local endpoint serving Gemma via the Gemini API using LiteRT-LM shim.',
       );
 
+      const autoStartServer = gemmaModelRouter.properties.autoStartServer;
+      expect(autoStartServer).toBeDefined();
+      expect(autoStartServer.type).toBe('boolean');
+      expect(autoStartServer.category).toBe('Experimental');
+      expect(autoStartServer.default).toBe(false);
+      expect(autoStartServer.requiresRestart).toBe(true);
+      expect(autoStartServer.showInDialog).toBe(true);
+      expect(autoStartServer.description).toBe(
+        'Automatically start the LiteRT-LM server when Gemini CLI starts and the Gemma router is enabled.',
+      );
+
+      const binaryPath = gemmaModelRouter.properties.binaryPath;
+      expect(binaryPath).toBeDefined();
+      expect(binaryPath.type).toBe('string');
+      expect(binaryPath.category).toBe('Experimental');
+      expect(binaryPath.default).toBe('');
+      expect(binaryPath.requiresRestart).toBe(true);
+      expect(binaryPath.showInDialog).toBe(false);
+      expect(binaryPath.description).toBe(
+        'Custom path to the LiteRT-LM binary. Leave empty to use the default location (~/.gemini/bin/litert/).',
+      );
+
       const classifier = gemmaModelRouter.properties.classifier;
       expect(classifier).toBeDefined();
       expect(classifier.type).toBe('object');

packages/cli/src/config/settingsSchema.ts

@@ -256,14 +256,29 @@ const SETTINGS_SCHEMA = {
       },
       enableNotifications: {
         type: 'boolean',
-        label: 'Enable Notifications',
+        label: 'Enable Terminal Notifications',
         category: 'General',
         requiresRestart: false,
         default: false,
         description:
-          'Enable run-event notifications for action-required prompts and session completion.',
+          'Enable terminal run-event notifications for action-required prompts and session completion.',
         showInDialog: true,
       },
+      notificationMethod: {
+        type: 'enum',
+        label: 'Terminal Notification Method',
+        category: 'General',
+        requiresRestart: false,
+        default: 'auto',
+        description: 'How to send terminal notifications.',
+        showInDialog: true,
+        options: [
+          { value: 'auto', label: 'Auto' },
+          { value: 'osc9', label: 'OSC 9' },
+          { value: 'osc777', label: 'OSC 777' },
+          { value: 'bell', label: 'Bell' },
+        ],
+      },
       checkpointing: {
         type: 'object',
         label: 'Checkpointing',
@@ -403,6 +418,16 @@ const SETTINGS_SCHEMA = {
         },
         description: 'Settings for automatic session cleanup.',
       },
+      topicUpdateNarration: {
+        type: 'boolean',
+        label: 'Topic & Update Narration',
+        category: 'General',
+        requiresRestart: false,
+        default: true,
+        description:
+          'Enable the Topic & Update communication model for reduced chattiness and structured progress reporting.',
+        showInDialog: true,
+      },
     },
   },
   output: {
@@ -2144,6 +2169,26 @@ const SETTINGS_SCHEMA = {
             default: false,
             description:
               'Enable the Gemma Model Router (experimental). Requires a local endpoint serving Gemma via the Gemini API using LiteRT-LM shim.',
+            showInDialog: true,
+          },
+          autoStartServer: {
+            type: 'boolean',
+            label: 'Auto-start LiteRT Server',
+            category: 'Experimental',
+            requiresRestart: true,
+            default: false,
+            description:
+              'Automatically start the LiteRT-LM server when Gemini CLI starts and the Gemma router is enabled.',
+            showInDialog: true,
+          },
+          binaryPath: {
+            type: 'string',
+            label: 'LiteRT Binary Path',
+            category: 'Experimental',
+            requiresRestart: true,
+            default: '',
+            description:
+              'Custom path to the LiteRT-LM binary. Leave empty to use the default location (~/.gemini/bin/litert/).',
             showInDialog: false,
           },
           classifier: {
@@ -2188,6 +2233,16 @@ const SETTINGS_SCHEMA = {
           'Replace the built-in save_memory tool with a memory manager subagent that supports adding, removing, de-duplicating, and organizing memories.',
         showInDialog: true,
       },
+      autoMemory: {
+        type: 'boolean',
+        label: 'Auto Memory',
+        category: 'Experimental',
+        requiresRestart: true,
+        default: false,
+        description:
+          'Automatically extract reusable skills from past sessions in the background. Review results with /memory inbox.',
+        showInDialog: true,
+      },
       generalistProfile: {
         type: 'boolean',
         label: 'Use the generalist profile to manage agent contexts.',
@@ -2213,9 +2268,8 @@ const SETTINGS_SCHEMA = {
         category: 'Experimental',
         requiresRestart: false,
         default: false,
-        description:
-          'Enable the experimental Topic & Update communication model for reduced chattiness and structured progress reporting.',
-        showInDialog: true,
+        description: 'Deprecated: Use general.topicUpdateNarration instead.',
+        showInDialog: false,
       },
     },
   },

packages/cli/src/gemini.tsx

@@ -612,6 +612,23 @@ export async function main() {
     const initializationResult = await initializeApp(config, settings);
     initAppHandle?.end();
 
+    import('./services/liteRtServerManager.js')
+      .then(({ LiteRtServerManager }) => {
+        const mergedGemma = settings.merged.experimental?.gemmaModelRouter;
+        if (!mergedGemma) return;
+        // Security: binaryPath and autoStartServer must come from user-scoped
+        // settings only to prevent workspace configs from triggering arbitrary
+        // binary execution.
+        const userGemma = settings.forScope(SettingScope.User).settings
+          .experimental?.gemmaModelRouter;
+        return LiteRtServerManager.ensureRunning({
+          ...mergedGemma,
+          binaryPath: userGemma?.binaryPath,
+          autoStartServer: userGemma?.autoStartServer,
+        });
+      })
+      .catch((e) => debugLogger.warn('LiteRT auto-start import failed:', e));
+
     if (
       settings.merged.security.auth.selectedType ===
         AuthType.LOGIN_WITH_GOOGLE &&

packages/cli/src/interactiveCli.tsx

@@ -151,7 +151,7 @@ export async function startInteractiveUI(
       isScreenReaderEnabled: config.getScreenReader(),
       onRender: ({ renderTime }: { renderTime: number }) => {
         if (renderTime > SLOW_RENDER_MS) {
-          recordSlowRender(config, renderTime);
+          recordSlowRender(config, Math.round(renderTime));
         }
         profiler.reportFrameRendered();
       },

packages/cli/src/nonInteractiveCliAgentSession.ts

@@ -37,6 +37,7 @@ import {
   LegacyAgentSession,
   ToolErrorType,
   geminiPartsToContentParts,
+  displayContentToString,
   debugLogger,
 } from '@google/gemini-cli-core';
 
@@ -470,7 +471,8 @@ export async function runNonInteractive({
           case 'tool_response': {
             textOutput.ensureTrailingNewline();
             if (streamFormatter) {
-              const displayText = getTextContent(event.displayContent);
+              const display = event.display?.result;
+              const displayText = displayContentToString(display);
               const errorMsg = getTextContent(event.content) ?? 'Tool error';
               streamFormatter.emitEvent({
                 type: JsonStreamEventType.TOOL_RESULT,
@@ -490,7 +492,8 @@ export async function runNonInteractive({
               });
             }
             if (event.isError) {
-              const displayText = getTextContent(event.displayContent);
+              const display = event.display?.result;
+              const displayText = displayContentToString(display);
               const errorMsg = getTextContent(event.content) ?? 'Tool error';
 
               if (event.data?.['errorType'] === ToolErrorType.STOP_EXECUTION) {

packages/cli/src/services/BuiltinCommandLoader.ts

@@ -61,6 +61,7 @@ import { vimCommand } from '../ui/commands/vimCommand.js';
 import { setupGithubCommand } from '../ui/commands/setupGithubCommand.js';
 import { terminalSetupCommand } from '../ui/commands/terminalSetupCommand.js';
 import { upgradeCommand } from '../ui/commands/upgradeCommand.js';
+import { gemmaStatusCommand } from '../ui/commands/gemmaStatusCommand.js';
 
 /**
  * Loads the core, hard-coded slash commands that are an integral part
@@ -221,6 +222,7 @@ export class BuiltinCommandLoader implements ICommandLoader {
           : [skillsCommand]
         : []),
       settingsCommand,
+      gemmaStatusCommand,
       tasksCommand,
       vimCommand,
       setupGithubCommand,

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

@@ -88,7 +88,7 @@ describe('SkillCommandLoader', () => {
       type: 'tool',
       toolName: ACTIVATE_SKILL_TOOL_NAME,
       toolArgs: { name: 'test-skill' },
-      postSubmitPrompt: undefined,
+      postSubmitPrompt: 'Use the skill test-skill',
     });
   });
 

packages/cli/src/services/SkillCommandLoader.ts

@@ -46,7 +46,10 @@ export class SkillCommandLoader implements ICommandLoader {
           type: 'tool',
           toolName: ACTIVATE_SKILL_TOOL_NAME,
           toolArgs: { name: skill.name },
-          postSubmitPrompt: args.trim().length > 0 ? args.trim() : undefined,
+          postSubmitPrompt:
+            args.trim().length > 0
+              ? args.trim()
+              : `Use the skill ${skill.name}`,
         }),
       };
     });

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

@@ -0,0 +1,68 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import fs from 'node:fs';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import type { GemmaModelRouterSettings } from '@google/gemini-cli-core';
+
+const mockGetBinaryPath = vi.hoisted(() => vi.fn());
+const mockIsServerRunning = vi.hoisted(() => vi.fn());
+const mockStartServer = vi.hoisted(() => vi.fn());
+
+vi.mock('../commands/gemma/platform.js', () => ({
+  getBinaryPath: mockGetBinaryPath,
+  isServerRunning: mockIsServerRunning,
+}));
+
+vi.mock('../commands/gemma/start.js', () => ({
+  startServer: mockStartServer,
+}));
+
+import { LiteRtServerManager } from './liteRtServerManager.js';
+
+describe('LiteRtServerManager', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.spyOn(fs, 'existsSync').mockReturnValue(true);
+    mockIsServerRunning.mockResolvedValue(false);
+    mockStartServer.mockResolvedValue(true);
+  });
+
+  it('uses the configured custom binary path when auto-starting', async () => {
+    mockGetBinaryPath.mockReturnValue('/user/lit');
+
+    const settings: GemmaModelRouterSettings = {
+      enabled: true,
+      binaryPath: '/workspace/evil',
+      classifier: {
+        host: 'http://localhost:8123',
+      },
+    };
+
+    await LiteRtServerManager.ensureRunning(settings);
+
+    expect(mockGetBinaryPath).toHaveBeenCalledTimes(1);
+    expect(fs.existsSync).toHaveBeenCalledWith('/user/lit');
+    expect(mockStartServer).toHaveBeenCalledWith('/user/lit', 8123);
+  });
+
+  it('falls back to the default binary path when no custom path is configured', async () => {
+    mockGetBinaryPath.mockReturnValue('/default/lit');
+
+    const settings: GemmaModelRouterSettings = {
+      enabled: true,
+      classifier: {
+        host: 'http://localhost:9379',
+      },
+    };
+
+    await LiteRtServerManager.ensureRunning(settings);
+
+    expect(mockGetBinaryPath).toHaveBeenCalledTimes(1);
+    expect(fs.existsSync).toHaveBeenCalledWith('/default/lit');
+    expect(mockStartServer).toHaveBeenCalledWith('/default/lit', 9379);
+  });
+});

packages/cli/src/services/liteRtServerManager.ts

@@ -0,0 +1,59 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import fs from 'node:fs';
+import { debugLogger } from '@google/gemini-cli-core';
+import type { GemmaModelRouterSettings } from '@google/gemini-cli-core';
+import { getBinaryPath, isServerRunning } from '../commands/gemma/platform.js';
+import { DEFAULT_PORT } from '../commands/gemma/constants.js';
+
+export class LiteRtServerManager {
+  static async ensureRunning(
+    gemmaSettings: GemmaModelRouterSettings | undefined,
+  ): Promise<void> {
+    if (!gemmaSettings?.enabled) return;
+    if (gemmaSettings.autoStartServer === false) return;
+    const binaryPath = getBinaryPath();
+    if (!binaryPath || !fs.existsSync(binaryPath)) {
+      debugLogger.log(
+        '[LiteRtServerManager] Binary not installed, skipping auto-start. Run "gemini gemma setup".',
+      );
+      return;
+    }
+
+    const port =
+      parseInt(
+        gemmaSettings.classifier?.host?.match(/:(\d+)/)?.[1] ?? '',
+        10,
+      ) || DEFAULT_PORT;
+
+    const running = await isServerRunning(port);
+    if (running) {
+      debugLogger.log(
+        `[LiteRtServerManager] Server already running on port ${port}`,
+      );
+      return;
+    }
+
+    debugLogger.log(
+      `[LiteRtServerManager] Auto-starting LiteRT server on port ${port}...`,
+    );
+
+    try {
+      const { startServer } = await import('../commands/gemma/start.js');
+      const started = await startServer(binaryPath, port);
+      if (started) {
+        debugLogger.log(`[LiteRtServerManager] Server started on port ${port}`);
+      } else {
+        debugLogger.warn(
+          `[LiteRtServerManager] Server may not have started correctly on port ${port}`,
+        );
+      }
+    } catch (error) {
+      debugLogger.warn('[LiteRtServerManager] Auto-start failed:', error);
+    }
+  }
+}

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

@@ -39,11 +39,13 @@ export const createMockConfig = (overrides: Partial<Config> = {}): Config =>
       fireSessionStartEvent: vi.fn().mockResolvedValue(undefined),
     })),
     isMemoryManagerEnabled: vi.fn(() => false),
+    isAutoMemoryEnabled: vi.fn(() => false),
     getListExtensions: vi.fn(() => false),
     getExtensions: vi.fn(() => []),
     getListSessions: vi.fn(() => false),
     getDeleteSession: vi.fn(() => undefined),
     setSessionId: vi.fn(),
+    resetNewSessionState: vi.fn(),
     getSessionId: vi.fn().mockReturnValue('mock-session-id'),
     getWorktreeSettings: vi.fn(() => undefined),
     getContentGeneratorConfig: vi.fn(() => ({ authType: 'google' })),

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

@@ -602,6 +602,7 @@ const mockUIActions: UIActions = {
 
 import { type TextBuffer } from '../ui/components/shared/text-buffer.js';
 import { InputContext, type InputState } from '../ui/contexts/InputContext.js';
+import { QuotaContext, type QuotaState } from '../ui/contexts/QuotaContext.js';
 
 let capturedOverflowState: OverflowState | undefined;
 let capturedOverflowActions: OverflowActions | undefined;
@@ -619,6 +620,7 @@ export const renderWithProviders = async (
     shellFocus = true,
     settings = mockSettings,
     uiState: providedUiState,
+    quotaState: providedQuotaState,
     inputState: providedInputState,
     width,
     mouseEventsEnabled = false,
@@ -631,6 +633,7 @@ export const renderWithProviders = async (
     shellFocus?: boolean;
     settings?: LoadedSettings;
     uiState?: Partial<UIState>;
+    quotaState?: Partial<QuotaState>;
     inputState?: Partial<InputState>;
     width?: number;
     mouseEventsEnabled?: boolean;
@@ -666,6 +669,16 @@ export const renderWithProviders = async (
     },
   ) as UIState;
 
+  const quotaState: QuotaState = {
+    userTier: undefined,
+    stats: undefined,
+    proQuotaRequest: null,
+    validationRequest: null,
+    overageMenuRequest: null,
+    emptyWalletRequest: null,
+    ...providedQuotaState,
+  };
+
   const inputState = {
     buffer: { text: '' } as unknown as TextBuffer,
     userMessages: [],
@@ -727,65 +740,67 @@ export const renderWithProviders = async (
     <AppContext.Provider value={appState}>
       <ConfigContext.Provider value={config}>
         <SettingsContext.Provider value={settings}>
-          <InputContext.Provider value={inputState}>
-            <UIStateContext.Provider value={finalUiState}>
-              <VimModeProvider>
-                <ShellFocusContext.Provider value={shellFocus}>
-                  <SessionStatsProvider sessionId={config.getSessionId()}>
-                    <StreamingContext.Provider
-                      value={finalUiState.streamingState}
-                    >
-                      <UIActionsContext.Provider value={finalUIActions}>
-                        <OverflowProvider>
-                          <ToolActionsProvider
-                            config={config}
-                            toolCalls={allToolCalls}
-                            isExpanded={
-                              toolActions?.isExpanded ??
-                              vi.fn().mockReturnValue(false)
-                            }
-                            toggleExpansion={
-                              toolActions?.toggleExpansion ?? vi.fn()
-                            }
-                            toggleAllExpansion={
-                              toolActions?.toggleAllExpansion ?? vi.fn()
-                            }
-                          >
-                            <AskUserActionsProvider
-                              request={null}
-                              onSubmit={vi.fn()}
-                              onCancel={vi.fn()}
+          <QuotaContext.Provider value={quotaState}>
+            <InputContext.Provider value={inputState}>
+              <UIStateContext.Provider value={finalUiState}>
+                <VimModeProvider>
+                  <ShellFocusContext.Provider value={shellFocus}>
+                    <SessionStatsProvider sessionId={config.getSessionId()}>
+                      <StreamingContext.Provider
+                        value={finalUiState.streamingState}
+                      >
+                        <UIActionsContext.Provider value={finalUIActions}>
+                          <OverflowProvider>
+                            <ToolActionsProvider
+                              config={config}
+                              toolCalls={allToolCalls}
+                              isExpanded={
+                                toolActions?.isExpanded ??
+                                vi.fn().mockReturnValue(false)
+                              }
+                              toggleExpansion={
+                                toolActions?.toggleExpansion ?? vi.fn()
+                              }
+                              toggleAllExpansion={
+                                toolActions?.toggleAllExpansion ?? vi.fn()
+                              }
                             >
-                              <KeypressProvider>
-                                <MouseProvider
-                                  mouseEventsEnabled={mouseEventsEnabled}
-                                >
-                                  <TerminalProvider>
-                                    <ScrollProvider>
-                                      <ContextCapture>
-                                        <Box
-                                          width={terminalWidth}
-                                          flexShrink={0}
-                                          flexGrow={0}
-                                          flexDirection="column"
-                                        >
-                                          {comp}
-                                        </Box>
-                                      </ContextCapture>
-                                    </ScrollProvider>
-                                  </TerminalProvider>
-                                </MouseProvider>
-                              </KeypressProvider>
-                            </AskUserActionsProvider>
-                          </ToolActionsProvider>
-                        </OverflowProvider>
-                      </UIActionsContext.Provider>
-                    </StreamingContext.Provider>
-                  </SessionStatsProvider>
-                </ShellFocusContext.Provider>
-              </VimModeProvider>
-            </UIStateContext.Provider>
-          </InputContext.Provider>
+                              <AskUserActionsProvider
+                                request={null}
+                                onSubmit={vi.fn()}
+                                onCancel={vi.fn()}
+                              >
+                                <KeypressProvider>
+                                  <MouseProvider
+                                    mouseEventsEnabled={mouseEventsEnabled}
+                                  >
+                                    <TerminalProvider>
+                                      <ScrollProvider>
+                                        <ContextCapture>
+                                          <Box
+                                            width={terminalWidth}
+                                            flexShrink={0}
+                                            flexGrow={0}
+                                            flexDirection="column"
+                                          >
+                                            {comp}
+                                          </Box>
+                                        </ContextCapture>
+                                      </ScrollProvider>
+                                    </TerminalProvider>
+                                  </MouseProvider>
+                                </KeypressProvider>
+                              </AskUserActionsProvider>
+                            </ToolActionsProvider>
+                          </OverflowProvider>
+                        </UIActionsContext.Provider>
+                      </StreamingContext.Provider>
+                    </SessionStatsProvider>
+                  </ShellFocusContext.Provider>
+                </VimModeProvider>
+              </UIStateContext.Provider>
+            </InputContext.Provider>
+          </QuotaContext.Provider>
         </SettingsContext.Provider>
       </ConfigContext.Provider>
     </AppContext.Provider>

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

@@ -53,6 +53,7 @@ const mocks = vi.hoisted(() => ({
 const terminalNotificationsMocks = vi.hoisted(() => ({
   notifyViaTerminal: vi.fn().mockResolvedValue(true),
   isNotificationsEnabled: vi.fn(() => true),
+  getNotificationMethod: vi.fn(() => 'auto'),
   buildRunEventNotificationContent: vi.fn((event) => ({
     title: 'Mock Notification',
     subtitle: 'Mock Subtitle',
@@ -123,16 +124,19 @@ vi.mock('ink', async (importOriginal) => {
 });
 
 import { InputContext, type InputState } from './contexts/InputContext.js';
+import { QuotaContext, type QuotaState } from './contexts/QuotaContext.js';
 
 // Helper component will read the context values provided by AppContainer
 // so we can assert against them in our tests.
 let capturedUIState: UIState;
 let capturedInputState: InputState;
+let capturedQuotaState: QuotaState;
 let capturedUIActions: UIActions;
 let capturedOverflowActions: OverflowActions;
 function TestContextConsumer() {
   capturedUIState = useContext(UIStateContext)!;
   capturedInputState = useContext(InputContext)!;
+  capturedQuotaState = useContext(QuotaContext)!;
   capturedUIActions = useContext(UIActionsContext)!;
   capturedOverflowActions = useOverflowActions()!;
   return null;
@@ -191,6 +195,7 @@ vi.mock('./hooks/useShellInactivityStatus.js', () => ({
 vi.mock('../utils/terminalNotifications.js', () => ({
   notifyViaTerminal: terminalNotificationsMocks.notifyViaTerminal,
   isNotificationsEnabled: terminalNotificationsMocks.isNotificationsEnabled,
+  getNotificationMethod: terminalNotificationsMocks.getNotificationMethod,
   buildRunEventNotificationContent:
     terminalNotificationsMocks.buildRunEventNotificationContent,
 }));
@@ -1309,15 +1314,15 @@ describe('AppContainer State Management', () => {
   });
 
   describe('Quota and Fallback Integration', () => {
-    it('passes a null proQuotaRequest to UIStateContext by default', async () => {
+    it('passes a null proQuotaRequest to QuotaContext by default', async () => {
       // The default mock from beforeEach already sets proQuotaRequest to null
       const { unmount } = await act(async () => renderAppContainer());
       // Assert that the context value is as expected
-      expect(capturedUIState.quota.proQuotaRequest).toBeNull();
+      expect(capturedQuotaState.proQuotaRequest).toBeNull();
       unmount();
     });
 
-    it('passes a valid proQuotaRequest to UIStateContext when provided by the hook', async () => {
+    it('passes a valid proQuotaRequest to QuotaContext when provided by the hook', async () => {
       // Arrange: Create a mock request object that a UI dialog would receive
       const mockRequest = {
         failedModel: 'gemini-pro',
@@ -1332,7 +1337,7 @@ describe('AppContainer State Management', () => {
       // Act: Render the container
       const { unmount } = await act(async () => renderAppContainer());
       // Assert: The mock request is correctly passed through the context
-      expect(capturedUIState.quota.proQuotaRequest).toEqual(mockRequest);
+      expect(capturedQuotaState.proQuotaRequest).toEqual(mockRequest);
       unmount();
     });
 

packages/cli/src/ui/AppContainer.tsx

@@ -25,6 +25,7 @@ import {
 import { App } from './App.js';
 import { AppContext } from './contexts/AppContext.js';
 import { UIStateContext, type UIState } from './contexts/UIStateContext.js';
+import { QuotaContext } from './contexts/QuotaContext.js';
 import {
   UIActionsContext,
   type UIActions,
@@ -180,7 +181,10 @@ import { useTimedMessage } from './hooks/useTimedMessage.js';
 import { useIsHelpDismissKey } from './utils/shortcutsHelp.js';
 import { useSuspend } from './hooks/useSuspend.js';
 import { useRunEventNotifications } from './hooks/useRunEventNotifications.js';
-import { isNotificationsEnabled } from '../utils/terminalNotifications.js';
+import {
+  isNotificationsEnabled,
+  getNotificationMethod,
+} from '../utils/terminalNotifications.js';
 import {
   getLastTurnToolCallIds,
   isToolExecuting,
@@ -224,6 +228,7 @@ export const AppContainer = (props: AppContainerProps) => {
   const settings = useSettings();
   const { reset } = useOverflowActions()!;
   const notificationsEnabled = isNotificationsEnabled(settings);
+  const notificationMethod = getNotificationMethod(settings);
 
   const { setOptions, dumpCurrentFrame, startRecording, stopRecording } =
     useContext(InkAppContext);
@@ -481,8 +486,8 @@ export const AppContainer = (props: AppContainerProps) => {
       setConfigInitialized(true);
       startupProfiler.flush(config);
 
-      // Fire-and-forget memory service (skill extraction from past sessions)
-      if (config.isMemoryManagerEnabled()) {
+      // Fire-and-forget Auto Memory service (skill extraction from past sessions)
+      if (config.isAutoMemoryEnabled()) {
         startMemoryService(config).catch((e) => {
           debugLogger.error('Failed to start memory service:', e);
         });
@@ -972,6 +977,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       openAgentConfigDialog,
       openPermissionsDialog,
       quit: (messages: HistoryItem[]) => {
+        closeThemeDialog();
         setQuittingMessages(messages);
         setTimeout(async () => {
           await runExitCleanup();
@@ -1000,6 +1006,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
     [
       setAuthState,
       openThemeDialog,
+      closeThemeDialog,
       openEditorDialog,
       openSettingsDialog,
       openSessionBrowser,
@@ -2283,6 +2290,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
 
   useRunEventNotifications({
     notificationsEnabled,
+    notificationMethod,
     isFocused,
     hasReceivedFocusEvent,
     streamingState,
@@ -2401,6 +2409,26 @@ Logging in with Google... Restarting Gemini CLI to continue.
     ],
   );
 
+  const quotaState = useMemo(
+    () => ({
+      userTier,
+      stats: quotaStats,
+      proQuotaRequest,
+      validationRequest,
+      // G1 AI Credits dialog state
+      overageMenuRequest,
+      emptyWalletRequest,
+    }),
+    [
+      userTier,
+      quotaStats,
+      proQuotaRequest,
+      validationRequest,
+      overageMenuRequest,
+      emptyWalletRequest,
+    ],
+  );
+
   const uiState: UIState = useMemo(
     () => ({
       history: historyManager.history,
@@ -2473,15 +2501,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
       showApprovalModeIndicator,
       allowPlanMode,
       currentModel,
-      quota: {
-        userTier,
-        stats: quotaStats,
-        proQuotaRequest,
-        validationRequest,
-        // G1 AI Credits dialog state
-        overageMenuRequest,
-        emptyWalletRequest,
-      },
       contextFileNames,
       errorCount,
       availableTerminalHeight,
@@ -2592,12 +2611,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
       queueErrorMessage,
       showApprovalModeIndicator,
       allowPlanMode,
-      userTier,
-      quotaStats,
-      proQuotaRequest,
-      validationRequest,
-      overageMenuRequest,
-      emptyWalletRequest,
       contextFileNames,
       errorCount,
       availableTerminalHeight,
@@ -2816,34 +2829,36 @@ Logging in with Google... Restarting Gemini CLI to continue.
 
   return (
     <UIStateContext.Provider value={uiState}>
-      <InputContext.Provider value={inputState}>
-        <UIActionsContext.Provider value={uiActions}>
-          <ConfigContext.Provider value={config}>
-            <AppContext.Provider
-              value={{
-                version: props.version,
-                startupWarnings: props.startupWarnings || [],
-              }}
-            >
-              <ToolActionsProvider
-                config={config}
-                toolCalls={allToolCalls}
-                isExpanded={isExpanded}
-                toggleExpansion={toggleExpansion}
-                toggleAllExpansion={toggleAllExpansion}
+      <QuotaContext.Provider value={quotaState}>
+        <InputContext.Provider value={inputState}>
+          <UIActionsContext.Provider value={uiActions}>
+            <ConfigContext.Provider value={config}>
+              <AppContext.Provider
+                value={{
+                  version: props.version,
+                  startupWarnings: props.startupWarnings || [],
+                }}
               >
-                <ShellFocusContext.Provider value={isFocused}>
-                  <MouseProvider mouseEventsEnabled={mouseMode}>
-                    <ScrollProvider>
-                      <App key={`app-${forceRerenderKey}`} />
-                    </ScrollProvider>
-                  </MouseProvider>
-                </ShellFocusContext.Provider>
-              </ToolActionsProvider>
-            </AppContext.Provider>
-          </ConfigContext.Provider>
-        </UIActionsContext.Provider>
-      </InputContext.Provider>
+                <ToolActionsProvider
+                  config={config}
+                  toolCalls={allToolCalls}
+                  isExpanded={isExpanded}
+                  toggleExpansion={toggleExpansion}
+                  toggleAllExpansion={toggleAllExpansion}
+                >
+                  <ShellFocusContext.Provider value={isFocused}>
+                    <MouseProvider mouseEventsEnabled={mouseMode}>
+                      <ScrollProvider>
+                        <App key={`app-${forceRerenderKey}`} />
+                      </ScrollProvider>
+                    </MouseProvider>
+                  </ShellFocusContext.Provider>
+                </ToolActionsProvider>
+              </AppContext.Provider>
+            </ConfigContext.Provider>
+          </UIActionsContext.Provider>
+        </InputContext.Provider>
+      </QuotaContext.Provider>
     </UIStateContext.Provider>
   );
 };

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

@@ -11,9 +11,9 @@ import {
   CoreToolCallStatus,
   ApprovalMode,
   makeFakeConfig,
+  type SerializableConfirmationDetails,
 } from '@google/gemini-cli-core';
 import { type UIState } from './contexts/UIStateContext.js';
-import type { SerializableConfirmationDetails } from '@google/gemini-cli-core';
 import { act } from 'react';
 import { StreamingState } from './types.js';
 
@@ -107,15 +107,6 @@ describe('Full Terminal Tool Confirmation Snapshot', () => {
       constrainHeight: true,
       isConfigInitialized: true,
       cleanUiDetailsVisible: true,
-      quota: {
-        userTier: 'PRO',
-        stats: {
-          limits: {},
-          usage: {},
-        },
-        proQuotaRequest: null,
-        validationRequest: null,
-      },
       pendingHistoryItems: [
         {
           id: 2,
@@ -145,6 +136,13 @@ describe('Full Terminal Tool Confirmation Snapshot', () => {
     const { waitUntilReady, lastFrame, generateSvg, unmount } =
       await renderWithProviders(<App />, {
         uiState: mockUIState,
+        quotaState: {
+          userTier: 'PRO',
+          stats: {
+            remaining: 100,
+            limit: 1000,
+          },
+        },
         config: mockConfig,
         settings: createMockSettings({
           merged: {

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

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
+import { renderWithProviders } from '../../test-utils/render.js';
 import { waitFor } from '../../test-utils/async.js';
 import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
 import { ApiAuthDialog } from './ApiAuthDialog.js';
@@ -40,11 +40,16 @@ vi.mock('../components/shared/text-buffer.js', async (importOriginal) => {
   };
 });
 
-vi.mock('../contexts/UIStateContext.js', () => ({
-  useUIState: vi.fn(() => ({
-    terminalWidth: 80,
-  })),
-}));
+vi.mock('../contexts/UIStateContext.js', async (importOriginal) => {
+  const actual =
+    await importOriginal<typeof import('../contexts/UIStateContext.js')>();
+  return {
+    ...actual,
+    useUIState: vi.fn(() => ({
+      terminalWidth: 80,
+    })),
+  };
+});
 
 const mockedUseKeypress = useKeypress as Mock;
 const mockedUseTextBuffer = useTextBuffer as Mock;
@@ -73,7 +78,7 @@ describe('ApiAuthDialog', () => {
   });
 
   it('renders correctly', async () => {
-    const { lastFrame, unmount } = await render(
+    const { lastFrame, unmount } = await renderWithProviders(
       <ApiAuthDialog onSubmit={onSubmit} onCancel={onCancel} />,
     );
     expect(lastFrame()).toMatchSnapshot();
@@ -81,7 +86,7 @@ describe('ApiAuthDialog', () => {
   });
 
   it('renders with a defaultValue', async () => {
-    const { unmount } = await render(
+    const { unmount } = await renderWithProviders(
       <ApiAuthDialog
         onSubmit={onSubmit}
         onCancel={onCancel}
@@ -111,7 +116,7 @@ describe('ApiAuthDialog', () => {
     'calls $expectedCall.name when $keyName is pressed',
     async ({ keyName, sequence, expectedCall, args }) => {
       mockBuffer.text = 'submitted-key'; // Set for the onSubmit case
-      const { unmount } = await render(
+      const { unmount } = await renderWithProviders(
         <ApiAuthDialog onSubmit={onSubmit} onCancel={onCancel} />,
       );
       // calls[0] is the ApiAuthDialog's useKeypress (Ctrl+C handler)
@@ -133,7 +138,7 @@ describe('ApiAuthDialog', () => {
   );
 
   it('displays an error message', async () => {
-    const { lastFrame, unmount } = await render(
+    const { lastFrame, unmount } = await renderWithProviders(
       <ApiAuthDialog
         onSubmit={onSubmit}
         onCancel={onCancel}
@@ -146,7 +151,7 @@ describe('ApiAuthDialog', () => {
   });
 
   it('calls clearApiKey and clears buffer when Ctrl+C is pressed', async () => {
-    const { unmount } = await render(
+    const { unmount } = await renderWithProviders(
       <ApiAuthDialog onSubmit={onSubmit} onCancel={onCancel} />,
     );
     // Call 0 is ApiAuthDialog (isActive: true)

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

@@ -39,7 +39,7 @@ describe('clearCommand', () => {
         agentContext: {
           config: {
             getEnableHooks: vi.fn().mockReturnValue(false),
-            setSessionId: vi.fn(),
+            resetNewSessionState: vi.fn(),
             getMessageBus: vi.fn().mockReturnValue(undefined),
             getHookSystem: vi.fn().mockReturnValue({
               fireSessionEndEvent: vi.fn().mockResolvedValue(undefined),
@@ -74,6 +74,9 @@ describe('clearCommand', () => {
 
     expect(mockResetChat).toHaveBeenCalledTimes(1);
     expect(mockHintClear).toHaveBeenCalledTimes(1);
+    expect(
+      mockContext.services.agentContext?.config.resetNewSessionState,
+    ).toHaveBeenCalledTimes(1);
     expect(uiTelemetryService.clear).toHaveBeenCalled();
     expect(uiTelemetryService.clear).toHaveBeenCalledTimes(1);
     expect(mockContext.ui.clear).toHaveBeenCalledTimes(1);

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

@@ -39,7 +39,7 @@ export const clearCommand: SlashCommand = {
     let newSessionId: string | undefined;
     if (config) {
       newSessionId = randomUUID();
-      config.setSessionId(newSessionId);
+      config.resetNewSessionState(newSessionId);
     }
 
     if (geminiClient) {

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

@@ -0,0 +1,41 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { CommandKind, type SlashCommand } from './types.js';
+import { MessageType, type HistoryItemGemmaStatus } from '../types.js';
+import { checkGemmaStatus } from '../../commands/gemma/status.js';
+import { GEMMA_MODEL_NAME } from '../../commands/gemma/constants.js';
+
+export const gemmaStatusCommand: SlashCommand = {
+  name: 'gemma',
+  description: 'Check local Gemma model routing status',
+  kind: CommandKind.BUILT_IN,
+  autoExecute: true,
+  isSafeConcurrent: true,
+  action: async (context) => {
+    const port =
+      parseInt(
+        context.services.settings.merged.experimental?.gemmaModelRouter?.classifier?.host?.match(
+          /:(\d+)/,
+        )?.[1] ?? '',
+        10,
+      ) || undefined;
+    const status = await checkGemmaStatus(port);
+    const item: Omit<HistoryItemGemmaStatus, 'id'> = {
+      type: MessageType.GEMMA_STATUS,
+      binaryInstalled: status.binaryInstalled,
+      binaryPath: status.binaryPath,
+      modelName: GEMMA_MODEL_NAME,
+      modelDownloaded: status.modelDownloaded,
+      serverRunning: status.serverRunning,
+      serverPid: status.serverPid,
+      serverPort: status.port,
+      settingsEnabled: status.settingsEnabled,
+      allPassing: status.allPassing,
+    };
+    context.ui.addItem(item);
+  },
+};

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

@@ -473,7 +473,7 @@ describe('memoryCommand', () => {
 
       const mockConfig = {
         reloadSkills: vi.fn(),
-        isMemoryManagerEnabled: vi.fn().mockReturnValue(true),
+        isAutoMemoryEnabled: vi.fn().mockReturnValue(true),
       };
       const context = createMockCommandContext({
         services: {
@@ -491,11 +491,11 @@ describe('memoryCommand', () => {
       expect(result).toHaveProperty('component');
     });
 
-    it('should return info message when memory manager is disabled', () => {
+    it('should return info message when auto memory is disabled', () => {
       if (!inboxCommand.action) throw new Error('Command has no action');
 
       const mockConfig = {
-        isMemoryManagerEnabled: vi.fn().mockReturnValue(false),
+        isAutoMemoryEnabled: vi.fn().mockReturnValue(false),
       };
       const context = createMockCommandContext({
         services: {
@@ -509,7 +509,7 @@ describe('memoryCommand', () => {
         type: 'message',
         messageType: 'info',
         content:
-          'The memory inbox requires the experimental memory manager. Enable it with: experimental.memoryManager = true in settings.',
+          'The memory inbox requires Auto Memory. Enable it with: experimental.autoMemory = true in settings.',
       });
     });
 

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

@@ -145,12 +145,12 @@ export const memoryCommand: SlashCommand = {
           };
         }
 
-        if (!config.isMemoryManagerEnabled()) {
+        if (!config.isAutoMemoryEnabled()) {
           return {
             type: 'message',
             messageType: 'info',
             content:
-              'The memory inbox requires the experimental memory manager. Enable it with: experimental.memoryManager = true in settings.',
+              'The memory inbox requires Auto Memory. Enable it with: experimental.autoMemory = true in settings.',
           };
         }
 

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

@@ -13,7 +13,8 @@ import {
   useReducer,
   useContext,
 } from 'react';
-import { Box, Text } from 'ink';
+import { Box, Text, type DOMElement } from 'ink';
+import { useMouseClick } from '../hooks/useMouseClick.js';
 import { theme } from '../semantic-colors.js';
 import { checkExhaustive, type Question } from '@google/gemini-cli-core';
 import { BaseSelectionList } from './shared/BaseSelectionList.js';
@@ -85,6 +86,24 @@ function autoBoldIfPlain(text: string): string {
   return text;
 }
 
+const ClickableCheckbox: React.FC<{
+  isChecked: boolean;
+  onClick: () => void;
+}> = ({ isChecked, onClick }) => {
+  const ref = useRef<DOMElement>(null);
+  useMouseClick(ref, () => {
+    onClick();
+  });
+
+  return (
+    <Box ref={ref}>
+      <Text color={isChecked ? theme.status.success : theme.text.secondary}>
+        [{isChecked ? 'x' : ' '}]
+      </Text>
+    </Box>
+  );
+};
+
 interface AskUserDialogState {
   answers: { [key: string]: string };
   isEditingCustomOption: boolean;
@@ -919,13 +938,14 @@ const ChoiceQuestionView: React.FC<ChoiceQuestionViewProps> = ({
             return (
               <Box flexDirection="row">
                 {showCheck && (
-                  <Text
-                    color={
-                      isChecked ? theme.status.success : theme.text.secondary
-                    }
-                  >
-                    [{isChecked ? 'x' : ' '}]
-                  </Text>
+                  <ClickableCheckbox
+                    isChecked={isChecked}
+                    onClick={() => {
+                      if (!context.isSelected) {
+                        handleSelect(optionItem);
+                      }
+                    }}
+                  />
                 )}
                 <Text color={theme.text.primary}> </Text>
                 <TextInput
@@ -966,13 +986,14 @@ const ChoiceQuestionView: React.FC<ChoiceQuestionViewProps> = ({
             <Box flexDirection="column">
               <Box flexDirection="row">
                 {showCheck && (
-                  <Text
-                    color={
-                      isChecked ? theme.status.success : theme.text.secondary
-                    }
-                  >
-                    [{isChecked ? 'x' : ' '}]
-                  </Text>
+                  <ClickableCheckbox
+                    isChecked={isChecked}
+                    onClick={() => {
+                      if (!context.isSelected) {
+                        handleSelect(optionItem);
+                      }
+                    }}
+                  />
                 )}
                 <Text color={labelColor} bold={optionItem.type === 'done'}>
                   {' '}

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

@@ -201,12 +201,6 @@ const createMockUIState = (overrides: Partial<UIState> = {}): UIState =>
     isBackgroundTaskVisible: false,
     embeddedShellFocused: false,
     showIsExpandableHint: false,
-    quota: {
-      userTier: undefined,
-      stats: undefined,
-      proQuotaRequest: null,
-      validationRequest: null,
-    },
     ...overrides,
   }) as UIState;
 
@@ -245,6 +239,7 @@ const createMockConfig = (overrides = {}): Config =>
     ...overrides,
   }) as unknown as Config;
 
+import { QuotaContext, type QuotaState } from '../contexts/QuotaContext.js';
 import { InputContext, type InputState } from '../contexts/InputContext.js';
 
 const renderComposer = async (
@@ -253,6 +248,7 @@ const renderComposer = async (
   config = createMockConfig(),
   uiActions = createMockUIActions(),
   inputStateOverrides: Partial<InputState> = {},
+  quotaStateOverrides: Partial<QuotaState> = {},
 ) => {
   const inputState = {
     buffer: { text: '' } as unknown as TextBuffer,
@@ -266,16 +262,28 @@ const renderComposer = async (
     ...inputStateOverrides,
   };
 
+  const quotaState: QuotaState = {
+    userTier: undefined,
+    stats: undefined,
+    proQuotaRequest: null,
+    validationRequest: null,
+    overageMenuRequest: null,
+    emptyWalletRequest: null,
+    ...quotaStateOverrides,
+  };
+
   const result = await render(
     <ConfigContext.Provider value={config as unknown as Config}>
       <SettingsContext.Provider value={settings as unknown as LoadedSettings}>
-        <InputContext.Provider value={inputState}>
-          <UIStateContext.Provider value={uiState}>
-            <UIActionsContext.Provider value={uiActions}>
-              <Composer isFocused={true} />
-            </UIActionsContext.Provider>
-          </UIStateContext.Provider>
-        </InputContext.Provider>
+        <QuotaContext.Provider value={quotaState}>
+          <InputContext.Provider value={inputState}>
+            <UIStateContext.Provider value={uiState}>
+              <UIActionsContext.Provider value={uiActions}>
+                <Composer isFocused={true} />
+              </UIActionsContext.Provider>
+            </UIStateContext.Provider>
+          </InputContext.Provider>
+        </QuotaContext.Provider>
       </SettingsContext.Provider>
     </ConfigContext.Provider>,
   );

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

@@ -9,6 +9,7 @@ import { DialogManager } from './DialogManager.js';
 import { describe, it, expect, vi } from 'vitest';
 import { Text } from 'ink';
 import { type UIState } from '../contexts/UIStateContext.js';
+import { type QuotaState } from '../contexts/QuotaContext.js';
 import { type RestartReason } from '../hooks/useIdeTrustListener.js';
 import { type IdeInfo } from '@google/gemini-cli-core';
 
@@ -75,14 +76,6 @@ describe('DialogManager', () => {
     terminalWidth: 80,
     confirmUpdateExtensionRequests: [],
     showIdeRestartPrompt: false,
-    quota: {
-      userTier: undefined,
-      stats: undefined,
-      proQuotaRequest: null,
-      validationRequest: null,
-      overageMenuRequest: null,
-      emptyWalletRequest: null,
-    },
     shouldShowIdePrompt: false,
     isFolderTrustDialogOpen: false,
     loopDetectionConfirmationRequest: null,
@@ -112,7 +105,7 @@ describe('DialogManager', () => {
     unmount();
   });
 
-  const testCases: Array<[Partial<UIState>, string]> = [
+  const testCases: Array<[Partial<UIState>, string, Partial<QuotaState>?]> = [
     [
       {
         showIdeRestartPrompt: true,
@@ -121,23 +114,17 @@ describe('DialogManager', () => {
       'IdeTrustChangeDialog',
     ],
     [
+      {},
+      'ProQuotaDialog',
       {
-        quota: {
-          userTier: undefined,
-          stats: undefined,
-          proQuotaRequest: {
-            failedModel: 'a',
-            fallbackModel: 'b',
-            message: 'c',
-            isTerminalQuotaError: false,
-            resolve: vi.fn(),
-          },
-          validationRequest: null,
-          overageMenuRequest: null,
-          emptyWalletRequest: null,
+        proQuotaRequest: {
+          failedModel: 'a',
+          fallbackModel: 'b',
+          message: 'c',
+          isTerminalQuotaError: false,
+          resolve: vi.fn(),
         },
       },
-      'ProQuotaDialog',
     ],
     [
       {
@@ -195,7 +182,11 @@ describe('DialogManager', () => {
 
   it.each(testCases)(
     'renders %s when state is %o',
-    async (uiStateOverride, expectedComponent) => {
+    async (
+      uiStateOverride: Partial<UIState>,
+      expectedComponent: string,
+      quotaStateOverride?: Partial<QuotaState>,
+    ) => {
       const { lastFrame, unmount } = await renderWithProviders(
         <DialogManager {...defaultProps} />,
         {
@@ -203,6 +194,7 @@ describe('DialogManager', () => {
             ...baseUiState,
             ...uiStateOverride,
           } as Partial<UIState> as UIState,
+          quotaState: quotaStateOverride,
         },
       );
       expect(lastFrame()).toContain(expectedComponent);

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

@@ -27,6 +27,7 @@ import { PermissionsModifyTrustDialog } from './PermissionsModifyTrustDialog.js'
 import { ModelDialog } from './ModelDialog.js';
 import { theme } from '../semantic-colors.js';
 import { useUIState } from '../contexts/UIStateContext.js';
+import { useQuotaState } from '../contexts/QuotaContext.js';
 import { useUIActions } from '../contexts/UIActionsContext.js';
 import { useConfig } from '../contexts/ConfigContext.js';
 import { useSettings } from '../contexts/SettingsContext.js';
@@ -52,6 +53,7 @@ export const DialogManager = ({
   const settings = useSettings();
 
   const uiState = useUIState();
+  const quotaState = useQuotaState();
   const uiActions = useUIActions();
   const {
     constrainHeight,
@@ -74,54 +76,50 @@ export const DialogManager = ({
       />
     );
   }
-  if (uiState.quota.proQuotaRequest) {
+  if (quotaState.proQuotaRequest) {
     return (
       <ProQuotaDialog
-        failedModel={uiState.quota.proQuotaRequest.failedModel}
-        fallbackModel={uiState.quota.proQuotaRequest.fallbackModel}
-        message={uiState.quota.proQuotaRequest.message}
-        isTerminalQuotaError={
-          uiState.quota.proQuotaRequest.isTerminalQuotaError
-        }
-        isModelNotFoundError={
-          !!uiState.quota.proQuotaRequest.isModelNotFoundError
-        }
-        authType={uiState.quota.proQuotaRequest.authType}
+        failedModel={quotaState.proQuotaRequest.failedModel}
+        fallbackModel={quotaState.proQuotaRequest.fallbackModel}
+        message={quotaState.proQuotaRequest.message}
+        isTerminalQuotaError={quotaState.proQuotaRequest.isTerminalQuotaError}
+        isModelNotFoundError={!!quotaState.proQuotaRequest.isModelNotFoundError}
+        authType={quotaState.proQuotaRequest.authType}
         tierName={config?.getUserTierName()}
         onChoice={uiActions.handleProQuotaChoice}
       />
     );
   }
-  if (uiState.quota.validationRequest) {
+  if (quotaState.validationRequest) {
     return (
       <ValidationDialog
-        validationLink={uiState.quota.validationRequest.validationLink}
+        validationLink={quotaState.validationRequest.validationLink}
         validationDescription={
-          uiState.quota.validationRequest.validationDescription
+          quotaState.validationRequest.validationDescription
         }
-        learnMoreUrl={uiState.quota.validationRequest.learnMoreUrl}
+        learnMoreUrl={quotaState.validationRequest.learnMoreUrl}
         onChoice={uiActions.handleValidationChoice}
       />
     );
   }
-  if (uiState.quota.overageMenuRequest) {
+  if (quotaState.overageMenuRequest) {
     return (
       <OverageMenuDialog
-        failedModel={uiState.quota.overageMenuRequest.failedModel}
-        fallbackModel={uiState.quota.overageMenuRequest.fallbackModel}
-        resetTime={uiState.quota.overageMenuRequest.resetTime}
-        creditBalance={uiState.quota.overageMenuRequest.creditBalance}
+        failedModel={quotaState.overageMenuRequest.failedModel}
+        fallbackModel={quotaState.overageMenuRequest.fallbackModel}
+        resetTime={quotaState.overageMenuRequest.resetTime}
+        creditBalance={quotaState.overageMenuRequest.creditBalance}
         onChoice={uiActions.handleOverageMenuChoice}
       />
     );
   }
-  if (uiState.quota.emptyWalletRequest) {
+  if (quotaState.emptyWalletRequest) {
     return (
       <EmptyWalletDialog
-        failedModel={uiState.quota.emptyWalletRequest.failedModel}
-        fallbackModel={uiState.quota.emptyWalletRequest.fallbackModel}
-        resetTime={uiState.quota.emptyWalletRequest.resetTime}
-        onGetCredits={uiState.quota.emptyWalletRequest.onGetCredits}
+        failedModel={quotaState.emptyWalletRequest.failedModel}
+        fallbackModel={quotaState.emptyWalletRequest.fallbackModel}
+        resetTime={quotaState.emptyWalletRequest.resetTime}
+        onGetCredits={quotaState.emptyWalletRequest.onGetCredits}
         onChoice={uiActions.handleEmptyWalletChoice}
       />
     );

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

@@ -267,21 +267,16 @@ describe('<Footer />', () => {
       width: 120,
       uiState: {
         sessionStats: mockSessionStats,
-        quota: {
-          userTier: undefined,
-          stats: {
-            remaining: 15,
-            limit: 100,
-            resetTime: undefined,
-          },
-          proQuotaRequest: null,
-          validationRequest: null,
-          overageMenuRequest: null,
-          emptyWalletRequest: null,
+      },
+      quotaState: {
+        stats: {
+          remaining: 15,
+          limit: 100,
+          resetTime: undefined,
         },
       },
     });
-    expect(lastFrame()).toContain('85%');
+    expect(lastFrame()).toContain('85% used');
     expect(normalizeFrame(lastFrame())).toMatchSnapshot();
     unmount();
   });
@@ -292,21 +287,16 @@ describe('<Footer />', () => {
       width: 120,
       uiState: {
         sessionStats: mockSessionStats,
-        quota: {
-          userTier: undefined,
-          stats: {
-            remaining: 85,
-            limit: 100,
-            resetTime: undefined,
-          },
-          proQuotaRequest: null,
-          validationRequest: null,
-          overageMenuRequest: null,
-          emptyWalletRequest: null,
+      },
+      quotaState: {
+        stats: {
+          remaining: 85,
+          limit: 100,
+          resetTime: undefined,
         },
       },
     });
-    expect(normalizeFrame(lastFrame())).not.toContain('used');
+    expect(normalizeFrame(lastFrame())).toContain('15% used');
     expect(normalizeFrame(lastFrame())).toMatchSnapshot();
     unmount();
   });
@@ -317,17 +307,12 @@ describe('<Footer />', () => {
       width: 120,
       uiState: {
         sessionStats: mockSessionStats,
-        quota: {
-          userTier: undefined,
-          stats: {
-            remaining: 0,
-            limit: 100,
-            resetTime: undefined,
-          },
-          proQuotaRequest: null,
-          validationRequest: null,
-          overageMenuRequest: null,
-          emptyWalletRequest: null,
+      },
+      quotaState: {
+        stats: {
+          remaining: 0,
+          limit: 100,
+          resetTime: undefined,
         },
       },
     });