Debug memory alloc

Co-authored-by: Mervap <megavaprold@gmail.com>
Co-authored-by: Sri Pasumarthi <sripas@google.com>

CONTRIBUTING.md

@@ -352,21 +352,6 @@ npm run lint
 - **Imports:** Pay special attention to import paths. The project uses ESLint to
   enforce restrictions on relative imports between packages.
 
-### Project structure
-
-- `packages/`: Contains the individual sub-packages of the project.
-  - `a2a-server`: A2A server implementation for the Gemini CLI. (Experimental)
-  - `cli/`: The command-line interface.
-  - `core/`: The core backend logic for the Gemini CLI.
-  - `test-utils` Utilities for creating and cleaning temporary file systems for
-    testing.
-  - `vscode-ide-companion/`: The Gemini CLI Companion extension pairs with
-    Gemini CLI.
-- `docs/`: Contains all project documentation.
-- `scripts/`: Utility scripts for building, testing, and development tasks.
-
-For more detailed architecture, see `docs/architecture.md`.
-
 ### Debugging
 
 #### VS Code

README.md

@@ -314,7 +314,6 @@ gemini
 
 - [**Headless Mode (Scripting)**](./docs/cli/headless.md) - Use Gemini CLI in
   automated workflows.
-- [**Architecture Overview**](./docs/architecture.md) - How Gemini CLI works.
 - [**IDE Integration**](./docs/ide-integration/index.md) - VS Code companion.
 - [**Sandboxing & Security**](./docs/cli/sandbox.md) - Safe execution
   environments.

docs/changelogs/preview.md

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

docs/cli/plan-mode.md

@@ -460,6 +460,26 @@ Manual deletion also removes all associated artifacts:
 If you use a [custom plans directory](#custom-plan-directory-and-policies),
 those files are not automatically deleted and must be managed manually.
 
+## Non-interactive execution
+
+When running Gemini CLI in non-interactive environments (such as headless
+scripts or CI/CD pipelines), Plan Mode optimizes for automated workflows:
+
+- **Automatic transitions:** The policy engine automatically approves the
+  `enter_plan_mode` and `exit_plan_mode` tools without prompting for user
+  confirmation.
+- **Automated implementation:** When exiting Plan Mode to execute the plan,
+  Gemini CLI automatically switches to
+  [YOLO mode](../reference/policy-engine.md#approval-modes) instead of the
+  standard Default mode. This allows the CLI to execute the implementation steps
+  automatically without hanging on interactive tool approvals.
+
+**Example:**
+
+```bash
+gemini --approval-mode plan -p "Analyze telemetry and suggest improvements"
+```
+
 [`plan.toml`]:
   https://github.com/google-gemini/gemini-cli/blob/main/packages/core/src/policy/policies/plan.toml
 [Conductor]: https://github.com/gemini-cli-extensions/conductor

docs/reference/policy-engine.md

@@ -90,6 +90,17 @@ If `argsPattern` is specified, the tool's arguments are converted to a stable
 JSON string, which is then tested against the provided regular expression. If
 the arguments don't match the pattern, the rule does not apply.
 
+#### Execution environment
+
+If `interactive` is specified, the rule will only apply if the CLI's execution
+environment matches the specified boolean value:
+
+- `true`: The rule applies only in interactive mode.
+- `false`: The rule applies only in non-interactive (headless) mode.
+
+If omitted, the rule applies to both interactive and non-interactive
+environments.
+
 ### Decisions
 
 There are three possible decisions a rule can enforce:
@@ -286,6 +297,10 @@ deny_message = "Deletion is permanent"
 
 # (Optional) An array of approval modes where this rule is active.
 modes = ["autoEdit"]
+
+# (Optional) A boolean to restrict the rule to interactive (true) or non-interactive (false) environments.
+# If omitted, the rule applies to both.
+interactive = true
 ```
 
 ### Using arrays (lists)
@@ -360,6 +375,8 @@ priority = 200
 Specify only the `mcpName` to apply a rule to every tool provided by that
 server.
 
+**Note:** This applies to all decision types (`allow`, `deny`, `ask_user`).
+
 ```toml
 # Denies all tools from the `untrusted-server` MCP
 [[rule]]

docs/resources/faq.md

@@ -58,6 +58,19 @@ your total token usage using the `/stats` command in Gemini CLI.
 
 ## Installation and updates
 
+### How do I check which version of Gemini CLI I'm currently running?
+
+You can check your current Gemini CLI version using one of these methods:
+
+- Run `gemini --version` or `gemini -v` from your terminal
+- Check the globally installed version using your package manager:
+  - npm: `npm list -g @google/gemini-cli`
+  - pnpm: `pnpm list -g @google/gemini-cli`
+  - yarn: `yarn global list @google/gemini-cli`
+  - bun: `bun pm ls -g @google/gemini-cli`
+  - homebrew: `brew list --versions gemini-cli`
+- Inside an active Gemini CLI session, use the `/about` command
+
 ### How do I update Gemini CLI to the latest version?
 
 If you installed it globally via `npm`, update it using the command

evals/plan_mode.eval.ts

@@ -18,6 +18,18 @@ describe('plan_mode', () => {
     experimental: { plan: true },
   };
 
+  const getWriteTargets = (logs: any[]) =>
+    logs
+      .filter((log) => ['write_file', 'replace'].includes(log.toolRequest.name))
+      .map((log) => {
+        try {
+          return JSON.parse(log.toolRequest.args).file_path as string;
+        } catch {
+          return '';
+        }
+      })
+      .filter(Boolean);
+
   evalTest('ALWAYS_PASSES', {
     name: 'should refuse file modification when in plan mode',
     approvalMode: ApprovalMode.PLAN,
@@ -32,27 +44,23 @@ describe('plan_mode', () => {
       await rig.waitForTelemetryReady();
       const toolLogs = rig.readToolLogs();
 
-      const writeTargets = toolLogs
-        .filter((log) =>
-          ['write_file', 'replace'].includes(log.toolRequest.name),
-        )
-        .map((log) => {
-          try {
-            return JSON.parse(log.toolRequest.args).file_path;
-          } catch {
-            return null;
-          }
-        });
+      const exitPlanIndex = toolLogs.findIndex(
+        (log) => log.toolRequest.name === 'exit_plan_mode',
+      );
+
+      const writeTargetsBeforeExitPlan = getWriteTargets(
+        toolLogs.slice(0, exitPlanIndex !== -1 ? exitPlanIndex : undefined),
+      );
 
       expect(
-        writeTargets,
+        writeTargetsBeforeExitPlan,
         'Should not attempt to modify README.md in plan mode',
       ).not.toContain('README.md');
 
       assertModelHasOutput(result);
       checkModelOutputContent(result, {
         expectedContent: [/plan mode|read-only|cannot modify|refuse|exiting/i],
-        testName: `${TEST_PREFIX}should refuse file modification`,
+        testName: `${TEST_PREFIX}should refuse file modification in plan mode`,
       });
     },
   });
@@ -69,24 +77,20 @@ describe('plan_mode', () => {
       await rig.waitForTelemetryReady();
       const toolLogs = rig.readToolLogs();
 
-      const writeTargets = toolLogs
-        .filter((log) =>
-          ['write_file', 'replace'].includes(log.toolRequest.name),
-        )
-        .map((log) => {
-          try {
-            return JSON.parse(log.toolRequest.args).file_path;
-          } catch {
-            return null;
-          }
-        });
+      const exitPlanIndex = toolLogs.findIndex(
+        (log) => log.toolRequest.name === 'exit_plan_mode',
+      );
+
+      const writeTargetsBeforeExit = getWriteTargets(
+        toolLogs.slice(0, exitPlanIndex !== -1 ? exitPlanIndex : undefined),
+      );
 
       // It should NOT write to the docs folder or any other repo path
-      const hasRepoWrite = writeTargets.some(
+      const hasRepoWriteBeforeExit = writeTargetsBeforeExit.some(
         (path) => path && !path.includes('/plans/'),
       );
       expect(
-        hasRepoWrite,
+        hasRepoWriteBeforeExit,
         'Should not attempt to create files in the repository while in plan mode',
       ).toBe(false);
 
@@ -166,4 +170,65 @@ describe('plan_mode', () => {
       assertModelHasOutput(result);
     },
   });
+
+  evalTest('USUALLY_PASSES', {
+    name: 'should create a plan in plan mode and implement it for a refactoring task',
+    params: {
+      settings,
+    },
+    files: {
+      'src/mathUtils.ts':
+        'export const sum = (a: number, b: number) => a + b;\nexport const multiply = (a: number, b: number) => a * b;',
+      'src/main.ts':
+        'import { sum } from "./mathUtils";\nconsole.log(sum(1, 2));',
+    },
+    prompt:
+      'I want to refactor our math utilities. Move the `sum` function from `src/mathUtils.ts` to a new file `src/basicMath.ts` and update `src/main.ts` to use the new file. Please create a detailed implementation plan first, then execute it.',
+    assert: async (rig, result) => {
+      const enterPlanCalled = await rig.waitForToolCall('enter_plan_mode');
+      expect(
+        enterPlanCalled,
+        'Expected enter_plan_mode tool to be called',
+      ).toBe(true);
+
+      const exitPlanCalled = await rig.waitForToolCall('exit_plan_mode');
+      expect(exitPlanCalled, 'Expected exit_plan_mode tool to be called').toBe(
+        true,
+      );
+
+      await rig.waitForTelemetryReady();
+      const toolLogs = rig.readToolLogs();
+
+      // Check if plan was written
+      const planWrite = toolLogs.find(
+        (log) =>
+          log.toolRequest.name === 'write_file' &&
+          log.toolRequest.args.includes('/plans/'),
+      );
+      expect(
+        planWrite,
+        'Expected a plan file to be written in the plans directory',
+      ).toBeDefined();
+
+      // Check for implementation files
+      const newFileWrite = toolLogs.find(
+        (log) =>
+          log.toolRequest.name === 'write_file' &&
+          log.toolRequest.args.includes('src/basicMath.ts'),
+      );
+      expect(
+        newFileWrite,
+        'Expected src/basicMath.ts to be created',
+      ).toBeDefined();
+
+      const mainUpdate = toolLogs.find(
+        (log) =>
+          ['write_file', 'replace'].includes(log.toolRequest.name) &&
+          log.toolRequest.args.includes('src/main.ts'),
+      );
+      expect(mainUpdate, 'Expected src/main.ts to be updated').toBeDefined();
+
+      assertModelHasOutput(result);
+    },
+  });
 });

integration-tests/browser-policy.responses

@@ -0,0 +1,5 @@
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll help you with that."},{"functionCall":{"name":"browser_agent","args":{"task":"Open https://example.com and check if there is a heading"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":50,"totalTokenCount":150}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"new_page","args":{"url":"https://example.com"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":50,"totalTokenCount":150}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"take_snapshot","args":{}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":50,"totalTokenCount":150}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"complete_task","args":{"success":true,"summary":"SUCCESS_POLICY_TEST_COMPLETED"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":50,"totalTokenCount":150}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"Task completed successfully. The page has the heading \"Example Domain\"."}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":200,"candidatesTokenCount":50,"totalTokenCount":250}}]}

integration-tests/browser-policy.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, poll } from './test-helper.js';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { execSync } from 'node:child_process';
+import { existsSync, writeFileSync, readFileSync, mkdirSync } from 'node:fs';
+import stripAnsi from 'strip-ansi';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const chromeAvailable = (() => {
+  try {
+    if (process.platform === 'darwin') {
+      execSync(
+        'test -d "/Applications/Google Chrome.app"  || test -d "/Applications/Chromium.app"',
+        {
+          stdio: 'ignore',
+        },
+      );
+    } else if (process.platform === 'linux') {
+      execSync(
+        'which google-chrome || which chromium-browser || which chromium',
+        { stdio: 'ignore' },
+      );
+    } else if (process.platform === 'win32') {
+      const chromePaths = [
+        'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe',
+        'C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe',
+        `${process.env['LOCALAPPDATA'] ?? ''}\\Google\\Chrome\\Application\\chrome.exe`,
+      ];
+      const found = chromePaths.some((p) => existsSync(p));
+      if (!found) {
+        execSync('where chrome || where chromium', { stdio: 'ignore' });
+      }
+    } else {
+      return false;
+    }
+    return true;
+  } catch {
+    return false;
+  }
+})();
+
+describe.skipIf(!chromeAvailable)('browser-policy', () => {
+  let rig: TestRig;
+
+  beforeEach(() => {
+    rig = new TestRig();
+  });
+
+  afterEach(async () => {
+    await rig.cleanup();
+  });
+
+  it('should skip confirmation when "Allow all server tools for this session" is chosen', async () => {
+    rig.setup('browser-policy-skip-confirmation', {
+      fakeResponsesPath: join(__dirname, 'browser-policy.responses'),
+      settings: {
+        agents: {
+          overrides: {
+            browser_agent: {
+              enabled: true,
+            },
+          },
+          browser: {
+            headless: true,
+            sessionMode: 'isolated',
+            allowedDomains: ['example.com'],
+          },
+        },
+      },
+    });
+
+    // Manually trust the folder to avoid the dialog and enable option 3
+    const geminiDir = join(rig.homeDir!, '.gemini');
+    mkdirSync(geminiDir, { recursive: true });
+
+    // Write to trustedFolders.json
+    const trustedFoldersPath = join(geminiDir, 'trustedFolders.json');
+    const trustedFolders = {
+      [rig.testDir!]: 'TRUST_FOLDER',
+    };
+    writeFileSync(trustedFoldersPath, JSON.stringify(trustedFolders, null, 2));
+
+    // Force confirmation for browser agent.
+    // NOTE: We don't force confirm browser tools here because "Allow all server tools"
+    // adds a rule with ALWAYS_ALLOW_PRIORITY (3.9x) which would be overshadowed by
+    // a rule in the user tier (4.x) like the one from this TOML.
+    // By removing the explicit mcp rule, the first MCP tool will still prompt
+    // due to default approvalMode = 'default', and then "Allow all" will correctly
+    // bypass subsequent tools.
+    const policyFile = join(rig.testDir!, 'force-confirm.toml');
+    writeFileSync(
+      policyFile,
+      `
+[[rule]]
+name = "Force confirm browser_agent"
+toolName = "browser_agent"
+decision = "ask_user"
+priority = 200
+`,
+    );
+
+    // Update settings.json in both project and home directories to point to the policy file
+    for (const baseDir of [rig.testDir!, rig.homeDir!]) {
+      const settingsPath = join(baseDir, '.gemini', 'settings.json');
+      if (existsSync(settingsPath)) {
+        const settings = JSON.parse(readFileSync(settingsPath, 'utf-8'));
+        settings.policyPaths = [policyFile];
+        // Ensure folder trust is enabled
+        settings.security = settings.security || {};
+        settings.security.folderTrust = settings.security.folderTrust || {};
+        settings.security.folderTrust.enabled = true;
+        writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
+      }
+    }
+
+    const run = await rig.runInteractive({
+      approvalMode: 'default',
+      env: {
+        GEMINI_CLI_INTEGRATION_TEST: 'true',
+      },
+    });
+
+    await run.sendKeys(
+      'Open https://example.com and check if there is a heading\r',
+    );
+    await run.sendKeys('\r');
+
+    // Handle confirmations.
+    // 1. Initial browser_agent delegation (likely only 3 options, so use option 1: Allow once)
+    await poll(
+      () => stripAnsi(run.output).toLowerCase().includes('action required'),
+      60000,
+      1000,
+    );
+    await run.sendKeys('1\r');
+    await new Promise((r) => setTimeout(r, 2000));
+
+    // Handle privacy notice
+    await poll(
+      () => stripAnsi(run.output).toLowerCase().includes('privacy notice'),
+      5000,
+      100,
+    );
+    await run.sendKeys('1\r');
+    await new Promise((r) => setTimeout(r, 5000));
+
+    // new_page (MCP tool, should have 4 options, use option 3: Allow all server tools)
+    await poll(
+      () => {
+        const stripped = stripAnsi(run.output).toLowerCase();
+        return (
+          stripped.includes('new_page') &&
+          stripped.includes('allow all server tools for this session')
+        );
+      },
+      60000,
+      1000,
+    );
+
+    // Select "Allow all server tools for this session" (option 3)
+    await run.sendKeys('3\r');
+    await new Promise((r) => setTimeout(r, 30000));
+
+    const output = stripAnsi(run.output).toLowerCase();
+
+    expect(output).toContain('browser_agent');
+    expect(output).toContain('completed successfully');
+  });
+});

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

@@ -177,6 +177,9 @@ describe('GeminiAgent', () => {
       getHasAccessToPreviewModel: vi.fn().mockReturnValue(false),
       getCheckpointingEnabled: vi.fn().mockReturnValue(false),
       getDisableAlwaysAllow: vi.fn().mockReturnValue(false),
+      get config() {
+        return this;
+      },
     } as unknown as Mocked<Awaited<ReturnType<typeof loadCliConfig>>>;
     mockSettings = {
       merged: {
@@ -656,6 +659,12 @@ describe('Session', () => {
       getGitService: vi.fn().mockResolvedValue({} as GitService),
       waitForMcpInit: vi.fn(),
       getDisableAlwaysAllow: vi.fn().mockReturnValue(false),
+      get config() {
+        return this;
+      },
+      get toolRegistry() {
+        return mockToolRegistry;
+      },
     } as unknown as Mocked<Config>;
     mockConnection = {
       sessionUpdate: vi.fn(),
@@ -894,6 +903,9 @@ describe('Session', () => {
         update: expect.objectContaining({
           sessionUpdate: 'tool_call_update',
           status: 'completed',
+          title: 'Test Tool',
+          locations: [],
+          kind: 'read',
         }),
       }),
     );
@@ -1306,6 +1318,18 @@ describe('Session', () => {
     expect(path.resolve).toHaveBeenCalled();
     expect(fs.stat).toHaveBeenCalled();
 
+    expect(mockConnection.sessionUpdate).toHaveBeenCalledWith(
+      expect.objectContaining({
+        update: expect.objectContaining({
+          sessionUpdate: 'tool_call_update',
+          status: 'completed',
+          title: 'Read files',
+          locations: [],
+          kind: 'read',
+        }),
+      }),
+    );
+
     // Verify ReadManyFilesTool was used (implicitly by checking if sendMessageStream was called with resolved content)
     // Since we mocked ReadManyFilesTool to return specific content, we can check the args passed to sendMessageStream
     expect(mockChat.sendMessageStream).toHaveBeenCalledWith(
@@ -1321,6 +1345,65 @@ describe('Session', () => {
     );
   });
 
+  it('should handle @path resolution error', async () => {
+    (path.resolve as unknown as Mock).mockReturnValue('/tmp/error.txt');
+    (fs.stat as unknown as Mock).mockResolvedValue({
+      isDirectory: () => false,
+    });
+    (isWithinRoot as unknown as Mock).mockReturnValue(true);
+
+    const MockReadManyFilesTool = ReadManyFilesTool as unknown as Mock;
+    MockReadManyFilesTool.mockImplementationOnce(() => ({
+      name: 'read_many_files',
+      kind: 'read',
+      build: vi.fn().mockReturnValue({
+        getDescription: () => 'Read files',
+        toolLocations: () => [],
+        execute: vi.fn().mockRejectedValue(new Error('File read failed')),
+      }),
+    }));
+
+    const stream = createMockStream([
+      {
+        type: StreamEventType.CHUNK,
+        value: { candidates: [] },
+      },
+    ]);
+    mockChat.sendMessageStream.mockResolvedValue(stream);
+
+    await expect(
+      session.prompt({
+        sessionId: 'session-1',
+        prompt: [
+          { type: 'text', text: 'Read' },
+          {
+            type: 'resource_link',
+            uri: 'file://error.txt',
+            mimeType: 'text/plain',
+            name: 'error.txt',
+          },
+        ],
+      }),
+    ).rejects.toThrow('File read failed');
+
+    expect(mockConnection.sessionUpdate).toHaveBeenCalledWith(
+      expect.objectContaining({
+        update: expect.objectContaining({
+          sessionUpdate: 'tool_call_update',
+          status: 'failed',
+          content: expect.arrayContaining([
+            expect.objectContaining({
+              content: expect.objectContaining({
+                text: expect.stringMatching(/File read failed/),
+              }),
+            }),
+          ]),
+          kind: 'read',
+        }),
+      }),
+    );
+  });
+
   it('should handle cancellation during prompt', async () => {
     let streamController: ReadableStreamDefaultController<unknown>;
     const stream = new ReadableStream({
@@ -1434,6 +1517,7 @@ describe('Session', () => {
               content: expect.objectContaining({ text: 'Tool failed' }),
             }),
           ]),
+          kind: 'read',
         }),
       }),
     );

packages/cli/src/acp/acpClient.ts

@@ -47,6 +47,7 @@ import {
   DEFAULT_GEMINI_MODEL_AUTO,
   PREVIEW_GEMINI_MODEL_AUTO,
   getDisplayString,
+  type AgentLoopContext,
 } from '@google/gemini-cli-core';
 import * as acp from '@agentclientprotocol/sdk';
 import { AcpFileSystemService } from './fileSystemService.js';
@@ -104,7 +105,7 @@ export class GeminiAgent {
   private customHeaders: Record<string, string> | undefined;
 
   constructor(
-    private config: Config,
+    private context: AgentLoopContext,
     private settings: LoadedSettings,
     private argv: CliArgs,
     private connection: acp.AgentSideConnection,
@@ -148,7 +149,7 @@ export class GeminiAgent {
       },
     ];
 
-    await this.config.initialize();
+    await this.context.config.initialize();
     const version = await getVersion();
     return {
       protocolVersion: acp.PROTOCOL_VERSION,
@@ -220,7 +221,7 @@ export class GeminiAgent {
       this.baseUrl = baseUrl;
       this.customHeaders = headers;
 
-      await this.config.refreshAuth(
+      await this.context.config.refreshAuth(
         method,
         apiKey ?? this.apiKey,
         baseUrl,
@@ -360,10 +361,7 @@ export class GeminiAgent {
       config.setFileSystemService(acpFileSystemService);
     }
 
-    const clientHistory = convertSessionToClientHistory(
-      sessionData.messages,
-      sessionData.lastCompressionIndex,
-    );
+    const clientHistory = convertSessionToClientHistory(sessionData.messages);
 
     const geminiClient = config.getGeminiClient();
     await geminiClient.initialize();
@@ -540,7 +538,7 @@ export class Session {
   constructor(
     private readonly id: string,
     private readonly chat: GeminiChat,
-    private readonly config: Config,
+    private readonly context: AgentLoopContext,
     private readonly connection: acp.AgentSideConnection,
     private readonly settings: LoadedSettings,
   ) {}
@@ -555,13 +553,15 @@ export class Session {
   }
 
   setMode(modeId: acp.SessionModeId): acp.SetSessionModeResponse {
-    const availableModes = buildAvailableModes(this.config.isPlanEnabled());
+    const availableModes = buildAvailableModes(
+      this.context.config.isPlanEnabled(),
+    );
     const mode = availableModes.find((m) => m.id === modeId);
     if (!mode) {
       throw new Error(`Invalid or unavailable mode: ${modeId}`);
     }
     // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-    this.config.setApprovalMode(mode.id as ApprovalMode);
+    this.context.config.setApprovalMode(mode.id as ApprovalMode);
     return {};
   }
 
@@ -582,7 +582,7 @@ export class Session {
   }
 
   setModel(modelId: acp.ModelId): acp.SetSessionModelResponse {
-    this.config.setModel(modelId);
+    this.context.config.setModel(modelId);
     return {};
   }
 
@@ -637,7 +637,7 @@ export class Session {
               }
             }
 
-            const tool = this.config.getToolRegistry().getTool(toolCall.name);
+            const tool = this.context.toolRegistry.getTool(toolCall.name);
 
             await this.sendUpdate({
               sessionUpdate: 'tool_call',
@@ -661,7 +661,7 @@ export class Session {
     const pendingSend = new AbortController();
     this.pendingPrompt = pendingSend;
 
-    await this.config.waitForMcpInit();
+    await this.context.config.waitForMcpInit();
 
     const promptId = Math.random().toString(16).slice(2);
     const chat = this.chat;
@@ -715,8 +715,8 @@ export class Session {
 
       try {
         const model = resolveModel(
-          this.config.getModel(),
-          (await this.config.getGemini31Launched?.()) ?? false,
+          this.context.config.getModel(),
+          (await this.context.config.getGemini31Launched?.()) ?? false,
         );
         const responseStream = await chat.sendMessageStream(
           { model },
@@ -807,9 +807,9 @@ export class Session {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     parts: Part[],
   ): Promise<boolean> {
-    const gitService = await this.config.getGitService();
+    const gitService = await this.context.config.getGitService();
     const commandContext = {
-      config: this.config,
+      agentContext: this.context,
       settings: this.settings,
       git: gitService,
       sendMessage: async (text: string) => {
@@ -845,7 +845,7 @@ export class Session {
     const errorResponse = (error: Error) => {
       const durationMs = Date.now() - startTime;
       logToolCall(
-        this.config,
+        this.context.config,
         new ToolCallEvent(
           undefined,
           fc.name ?? '',
@@ -875,7 +875,7 @@ export class Session {
       return errorResponse(new Error('Missing function name'));
     }
 
-    const toolRegistry = this.config.getToolRegistry();
+    const toolRegistry = this.context.toolRegistry;
     const tool = toolRegistry.getTool(fc.name);
 
     if (!tool) {
@@ -911,7 +911,10 @@ export class Session {
 
         const params: acp.RequestPermissionRequest = {
           sessionId: this.id,
-          options: toPermissionOptions(confirmationDetails, this.config),
+          options: toPermissionOptions(
+            confirmationDetails,
+            this.context.config,
+          ),
           toolCall: {
             toolCallId: callId,
             status: 'pending',
@@ -969,12 +972,15 @@ export class Session {
         sessionUpdate: 'tool_call_update',
         toolCallId: callId,
         status: 'completed',
+        title: invocation.getDescription(),
         content: content ? [content] : [],
+        locations: invocation.toolLocations(),
+        kind: toAcpToolKind(tool.kind),
       });
 
       const durationMs = Date.now() - startTime;
       logToolCall(
-        this.config,
+        this.context.config,
         new ToolCallEvent(
           undefined,
           fc.name ?? '',
@@ -988,7 +994,7 @@ export class Session {
         ),
       );
 
-      this.chat.recordCompletedToolCalls(this.config.getActiveModel(), [
+      this.chat.recordCompletedToolCalls(this.context.config.getActiveModel(), [
         {
           status: CoreToolCallStatus.Success,
           request: {
@@ -1006,8 +1012,8 @@ export class Session {
               fc.name,
               callId,
               toolResult.llmContent,
-              this.config.getActiveModel(),
-              this.config,
+              this.context.config.getActiveModel(),
+              this.context.config,
             ),
             resultDisplay: toolResult.returnDisplay,
             error: undefined,
@@ -1020,8 +1026,8 @@ export class Session {
         fc.name,
         callId,
         toolResult.llmContent,
-        this.config.getActiveModel(),
-        this.config,
+        this.context.config.getActiveModel(),
+        this.context.config,
       );
     } catch (e) {
       const error = e instanceof Error ? e : new Error(String(e));
@@ -1033,9 +1039,10 @@ export class Session {
         content: [
           { type: 'content', content: { type: 'text', text: error.message } },
         ],
+        kind: toAcpToolKind(tool.kind),
       });
 
-      this.chat.recordCompletedToolCalls(this.config.getActiveModel(), [
+      this.chat.recordCompletedToolCalls(this.context.config.getActiveModel(), [
         {
           status: CoreToolCallStatus.Error,
           request: {
@@ -1121,18 +1128,18 @@ export class Session {
     const atPathToResolvedSpecMap = new Map<string, string>();
 
     // Get centralized file discovery service
-    const fileDiscovery = this.config.getFileService();
+    const fileDiscovery = this.context.config.getFileService();
     const fileFilteringOptions: FilterFilesOptions =
-      this.config.getFileFilteringOptions();
+      this.context.config.getFileFilteringOptions();
 
     const pathSpecsToRead: string[] = [];
     const contentLabelsForDisplay: string[] = [];
     const ignoredPaths: string[] = [];
 
-    const toolRegistry = this.config.getToolRegistry();
+    const toolRegistry = this.context.toolRegistry;
     const readManyFilesTool = new ReadManyFilesTool(
-      this.config,
-      this.config.getMessageBus(),
+      this.context.config,
+      this.context.messageBus,
     );
     const globTool = toolRegistry.getTool('glob');
 
@@ -1151,8 +1158,11 @@ export class Session {
       let currentPathSpec = pathName;
       let resolvedSuccessfully = false;
       try {
-        const absolutePath = path.resolve(this.config.getTargetDir(), pathName);
-        if (isWithinRoot(absolutePath, this.config.getTargetDir())) {
+        const absolutePath = path.resolve(
+          this.context.config.getTargetDir(),
+          pathName,
+        );
+        if (isWithinRoot(absolutePath, this.context.config.getTargetDir())) {
           const stats = await fs.stat(absolutePath);
           if (stats.isDirectory()) {
             currentPathSpec = pathName.endsWith('/')
@@ -1172,7 +1182,7 @@ export class Session {
         }
       } catch (error) {
         if (isNodeError(error) && error.code === 'ENOENT') {
-          if (this.config.getEnableRecursiveFileSearch() && globTool) {
+          if (this.context.config.getEnableRecursiveFileSearch() && globTool) {
             this.debug(
               `Path ${pathName} not found directly, attempting glob search.`,
             );
@@ -1180,7 +1190,7 @@ export class Session {
               const globResult = await globTool.buildAndExecute(
                 {
                   pattern: `**/*${pathName}*`,
-                  path: this.config.getTargetDir(),
+                  path: this.context.config.getTargetDir(),
                 },
                 abortSignal,
               );
@@ -1194,7 +1204,7 @@ export class Session {
                 if (lines.length > 1 && lines[1]) {
                   const firstMatchAbsolute = lines[1].trim();
                   currentPathSpec = path.relative(
-                    this.config.getTargetDir(),
+                    this.context.config.getTargetDir(),
                     firstMatchAbsolute,
                   );
                   this.debug(
@@ -1327,7 +1337,10 @@ export class Session {
           sessionUpdate: 'tool_call_update',
           toolCallId: callId,
           status: 'completed',
+          title: invocation.getDescription(),
           content: content ? [content] : [],
+          locations: invocation.toolLocations(),
+          kind: toAcpToolKind(readManyFilesTool.kind),
         });
         if (Array.isArray(result.llmContent)) {
           const fileContentRegex = /^--- (.*?) ---\n\n([\s\S]*?)\n\n$/;
@@ -1371,6 +1384,7 @@ export class Session {
               },
             },
           ],
+          kind: toAcpToolKind(readManyFilesTool.kind),
         });
 
         throw error;
@@ -1405,7 +1419,7 @@ export class Session {
   }
 
   debug(msg: string) {
-    if (this.config.getDebugMode()) {
+    if (this.context.config.getDebugMode()) {
       debugLogger.warn(msg);
     }
   }

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

@@ -97,6 +97,9 @@ describe('GeminiAgent Session Resume', () => {
       getHasAccessToPreviewModel: vi.fn().mockReturnValue(false),
       getGemini31LaunchedSync: vi.fn().mockReturnValue(false),
       getCheckpointingEnabled: vi.fn().mockReturnValue(false),
+      get config() {
+        return this;
+      },
     } as unknown as Mocked<Config>;
     mockSettings = {
       merged: {
@@ -158,9 +161,10 @@ describe('GeminiAgent Session Resume', () => {
       ],
     };
 
-    mockConfig.getToolRegistry = vi.fn().mockReturnValue({
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    (mockConfig as any).toolRegistry = {
       getTool: vi.fn().mockReturnValue({ kind: 'read' }),
-    });
+    };
 
     (SessionSelector as unknown as Mock).mockImplementation(() => ({
       resolveSession: vi.fn().mockResolvedValue({

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

@@ -53,7 +53,7 @@ export class ListExtensionsCommand implements Command {
     context: CommandContext,
     _: string[],
   ): Promise<CommandExecutionResponse> {
-    const extensions = listExtensions(context.config);
+    const extensions = listExtensions(context.agentContext.config);
     const data = extensions.length ? extensions : 'No extensions installed.';
 
     return { name: this.name, data };
@@ -134,7 +134,7 @@ export class EnableExtensionCommand implements Command {
     args: string[],
   ): Promise<CommandExecutionResponse> {
     const enableContext = getEnableDisableContext(
-      context.config,
+      context.agentContext.config,
       args,
       'enable',
     );
@@ -156,7 +156,8 @@ export class EnableExtensionCommand implements Command {
 
         if (extension?.mcpServers) {
           const mcpEnablementManager = McpServerEnablementManager.getInstance();
-          const mcpClientManager = context.config.getMcpClientManager();
+          const mcpClientManager =
+            context.agentContext.config.getMcpClientManager();
           const enabledServers = await mcpEnablementManager.autoEnableServers(
             Object.keys(extension.mcpServers),
           );
@@ -191,7 +192,7 @@ export class DisableExtensionCommand implements Command {
     args: string[],
   ): Promise<CommandExecutionResponse> {
     const enableContext = getEnableDisableContext(
-      context.config,
+      context.agentContext.config,
       args,
       'disable',
     );
@@ -223,7 +224,7 @@ export class InstallExtensionCommand implements Command {
     context: CommandContext,
     args: string[],
   ): Promise<CommandExecutionResponse> {
-    const extensionLoader = context.config.getExtensionLoader();
+    const extensionLoader = context.agentContext.config.getExtensionLoader();
     if (!(extensionLoader instanceof ExtensionManager)) {
       return {
         name: this.name,
@@ -268,7 +269,7 @@ export class LinkExtensionCommand implements Command {
     context: CommandContext,
     args: string[],
   ): Promise<CommandExecutionResponse> {
-    const extensionLoader = context.config.getExtensionLoader();
+    const extensionLoader = context.agentContext.config.getExtensionLoader();
     if (!(extensionLoader instanceof ExtensionManager)) {
       return {
         name: this.name,
@@ -313,7 +314,7 @@ export class UninstallExtensionCommand implements Command {
     context: CommandContext,
     args: string[],
   ): Promise<CommandExecutionResponse> {
-    const extensionLoader = context.config.getExtensionLoader();
+    const extensionLoader = context.agentContext.config.getExtensionLoader();
     if (!(extensionLoader instanceof ExtensionManager)) {
       return {
         name: this.name,
@@ -369,7 +370,7 @@ export class RestartExtensionCommand implements Command {
     context: CommandContext,
     args: string[],
   ): Promise<CommandExecutionResponse> {
-    const extensionLoader = context.config.getExtensionLoader();
+    const extensionLoader = context.agentContext.config.getExtensionLoader();
     if (!(extensionLoader instanceof ExtensionManager)) {
       return { name: this.name, data: 'Cannot restart extensions.' };
     }
@@ -424,7 +425,7 @@ export class UpdateExtensionCommand implements Command {
     context: CommandContext,
     args: string[],
   ): Promise<CommandExecutionResponse> {
-    const extensionLoader = context.config.getExtensionLoader();
+    const extensionLoader = context.agentContext.config.getExtensionLoader();
     if (!(extensionLoader instanceof ExtensionManager)) {
       return { name: this.name, data: 'Cannot update extensions.' };
     }

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

@@ -22,7 +22,7 @@ export class InitCommand implements Command {
     context: CommandContext,
     _args: string[] = [],
   ): Promise<CommandExecutionResponse> {
-    const targetDir = context.config.getTargetDir();
+    const targetDir = context.agentContext.config.getTargetDir();
     if (!targetDir) {
       throw new Error('Command requires a workspace.');
     }

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

@@ -49,7 +49,7 @@ export class ShowMemoryCommand implements Command {
     context: CommandContext,
     _: string[],
   ): Promise<CommandExecutionResponse> {
-    const result = showMemory(context.config);
+    const result = showMemory(context.agentContext.config);
     return { name: this.name, data: result.content };
   }
 }
@@ -63,7 +63,7 @@ export class RefreshMemoryCommand implements Command {
     context: CommandContext,
     _: string[],
   ): Promise<CommandExecutionResponse> {
-    const result = await refreshMemory(context.config);
+    const result = await refreshMemory(context.agentContext.config);
     return { name: this.name, data: result.content };
   }
 }
@@ -76,7 +76,7 @@ export class ListMemoryCommand implements Command {
     context: CommandContext,
     _: string[],
   ): Promise<CommandExecutionResponse> {
-    const result = listMemoryFiles(context.config);
+    const result = listMemoryFiles(context.agentContext.config);
     return { name: this.name, data: result.content };
   }
 }
@@ -95,7 +95,7 @@ export class AddMemoryCommand implements Command {
       return { name: this.name, data: result.content };
     }
 
-    const toolRegistry = context.config.getToolRegistry();
+    const toolRegistry = context.agentContext.toolRegistry;
     const tool = toolRegistry.getTool(result.toolName);
     if (tool) {
       const abortController = new AbortController();
@@ -106,10 +106,10 @@ export class AddMemoryCommand implements Command {
       await tool.buildAndExecute(result.toolArgs, signal, undefined, {
         shellExecutionConfig: {
           sanitizationConfig: DEFAULT_SANITIZATION_CONFIG,
-          sandboxManager: context.config.sandboxManager,
+          sandboxManager: context.agentContext.sandboxManager,
         },
       });
-      await refreshMemory(context.config);
+      await refreshMemory(context.agentContext.config);
       return {
         name: this.name,
         data: `Added memory: "${textToAdd}"`,

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

@@ -29,7 +29,8 @@ export class RestoreCommand implements Command {
     context: CommandContext,
     args: string[],
   ): Promise<CommandExecutionResponse> {
-    const { config, git: gitService } = context;
+    const { agentContext: agentContext, git: gitService } = context;
+    const { config } = agentContext;
     const argsStr = args.join(' ');
 
     try {
@@ -116,7 +117,7 @@ export class ListCheckpointsCommand implements Command {
   readonly description = 'Lists all available checkpoints.';
 
   async execute(context: CommandContext): Promise<CommandExecutionResponse> {
-    const { config } = context;
+    const { config } = context.agentContext;
 
     try {
       if (!config.getCheckpointingEnabled()) {

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

@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config, GitService } from '@google/gemini-cli-core';
+import type { AgentLoopContext, GitService } from '@google/gemini-cli-core';
 import type { LoadedSettings } from '../../config/settings.js';
 
 export interface CommandContext {
-  config: Config;
+  agentContext: AgentLoopContext;
   settings: LoadedSettings;
   git?: GitService;
   sendMessage: (text: string) => Promise<void>;

packages/cli/src/config/config.ts

@@ -97,7 +97,6 @@ export interface CliArgs {
   rawOutput: boolean | undefined;
   acceptRawOutputRisk: boolean | undefined;
   isCommand: boolean | undefined;
-  forever: boolean | undefined;
 }
 
 /**
@@ -299,12 +298,6 @@ export async function parseArguments(
         .option('accept-raw-output-risk', {
           type: 'boolean',
           description: 'Suppress the security warning when using --raw-output.',
-        })
-        .option('forever', {
-          type: 'boolean',
-          description:
-            'Run as a long-running autonomous agent with auto-resume and schedule_work support.',
-          default: false,
         }),
     )
     // Register MCP subcommands
@@ -900,7 +893,6 @@ export async function loadCliConfig(
       };
     },
     enableConseca: settings.security?.enableConseca,
-    isForeverMode: !!argv.forever,
   });
 }
 

packages/cli/src/config/settingsSchema.ts

@@ -2312,18 +2312,6 @@ const SETTINGS_SCHEMA = {
         ref: 'HookDefinitionArray',
         mergeStrategy: MergeStrategy.CONCAT,
       },
-      Idle: {
-        type: 'array',
-        label: 'Idle Hooks',
-        category: 'Advanced',
-        requiresRestart: false,
-        default: [],
-        description:
-          'Hooks that execute after a period of inactivity. Can trigger maintenance tasks like memory consolidation.',
-        showInDialog: false,
-        ref: 'HookDefinitionArray',
-        mergeStrategy: MergeStrategy.CONCAT,
-      },
     },
     additionalProperties: {
       type: 'array',

packages/cli/src/external-listener.ts

@@ -1,453 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import http from 'node:http';
-import { writeFileSync, mkdirSync, unlinkSync } from 'node:fs';
-import { join } from 'node:path';
-import os from 'node:os';
-import crypto from 'node:crypto';
-import { appEvents, AppEvent } from './utils/events.js';
-
-// --- A2A Task management ---
-
-interface A2AResponseMessage {
-  kind: 'message';
-  role: 'agent';
-  parts: Array<{ kind: 'text'; text: string }>;
-  messageId: string;
-}
-
-interface A2ATask {
-  id: string;
-  contextId: string;
-  status: {
-    state: 'submitted' | 'working' | 'completed' | 'failed';
-    timestamp: string;
-    message?: A2AResponseMessage;
-  };
-}
-
-const tasks = new Map<string, A2ATask>();
-
-const TASK_CLEANUP_DELAY_MS = 10 * 60 * 1000; // 10 minutes
-const DEFAULT_BLOCKING_TIMEOUT_MS = 5 * 60 * 1000; // 5 minutes
-
-interface ResponseWaiter {
-  taskId: string;
-  resolve: (text: string) => void;
-}
-
-const responseWaiters: ResponseWaiter[] = [];
-
-// Queue for unsolicited responses (e.g. forever mode auto-resume output)
-const unsolicitedResponses: string[] = [];
-
-/**
- * Called by AppContainer when streaming transitions from non-Idle to Idle.
- * If there's a pending A2A task, resolves it. Otherwise queues as unsolicited.
- */
-export function notifyResponse(responseText: string): void {
-  if (!responseText) return;
-
-  const waiter = responseWaiters.shift();
-  if (!waiter) {
-    // No A2A task waiting — queue as unsolicited (forever mode, etc.)
-    unsolicitedResponses.push(responseText);
-    return;
-  }
-
-  const task = tasks.get(waiter.taskId);
-  if (task) {
-    task.status = {
-      state: 'completed',
-      timestamp: new Date().toISOString(),
-      message: {
-        kind: 'message',
-        role: 'agent',
-        parts: [{ kind: 'text', text: responseText }],
-        messageId: crypto.randomUUID(),
-      },
-    };
-    scheduleTaskCleanup(task.id);
-  }
-
-  waiter.resolve(responseText);
-}
-
-/**
- * Drain all unsolicited responses (from forever mode auto-resume, etc.).
- */
-export function drainUnsolicitedResponses(): string[] {
-  return unsolicitedResponses.splice(0, unsolicitedResponses.length);
-}
-
-/**
- * Returns true if there are any in-flight tasks waiting for a response.
- */
-export function hasPendingTasks(): boolean {
-  return responseWaiters.length > 0;
-}
-
-/**
- * Called when streaming starts (Idle -> non-Idle) to mark the oldest
- * submitted task as "working".
- */
-export function markTasksWorking(): void {
-  const waiter = responseWaiters[0];
-  if (!waiter) return;
-  const task = tasks.get(waiter.taskId);
-  if (task && task.status.state === 'submitted') {
-    task.status = {
-      state: 'working',
-      timestamp: new Date().toISOString(),
-    };
-  }
-}
-
-function scheduleTaskCleanup(taskId: string): void {
-  setTimeout(() => {
-    tasks.delete(taskId);
-  }, TASK_CLEANUP_DELAY_MS);
-}
-
-function createTask(): A2ATask {
-  const task: A2ATask = {
-    id: crypto.randomUUID(),
-    contextId: `session-${process.pid}`,
-    status: {
-      state: 'submitted',
-      timestamp: new Date().toISOString(),
-    },
-  };
-  tasks.set(task.id, task);
-  return task;
-}
-
-function formatTaskResult(task: A2ATask): object {
-  return {
-    kind: 'task',
-    id: task.id,
-    contextId: task.contextId,
-    status: task.status,
-  };
-}
-
-// --- JSON-RPC helpers ---
-
-interface JsonRpcRequest {
-  jsonrpc?: string;
-  id?: string | number | null;
-  method?: string;
-  params?: Record<string, unknown>;
-}
-
-function jsonRpcSuccess(id: string | number | null, result: object): object {
-  return { jsonrpc: '2.0', id, result };
-}
-
-function jsonRpcError(
-  id: string | number | null,
-  code: number,
-  message: string,
-): object {
-  return { jsonrpc: '2.0', id, error: { code, message } };
-}
-
-// --- HTTP utilities ---
-
-function getSessionsDir(): string {
-  return join(os.homedir(), '.gemini', 'sessions');
-}
-
-function getPortFilePath(): string {
-  return join(getSessionsDir(), `interactive-${process.pid}.port`);
-}
-
-function buildAgentCard(port: number): object {
-  return {
-    name: 'Gemini CLI Interactive Session',
-    url: `http://localhost:${port}/`,
-    protocolVersion: '0.3.0',
-    provider: { organization: 'Google', url: 'https://google.com' },
-    capabilities: { streaming: false, pushNotifications: false },
-    defaultInputModes: ['text'],
-    defaultOutputModes: ['text'],
-    skills: [
-      {
-        id: 'interactive_session',
-        name: 'Interactive Session',
-        description: 'Send messages to the live interactive Gemini CLI session',
-      },
-    ],
-  };
-}
-
-interface A2AMessagePart {
-  kind?: string;
-  text?: string;
-}
-
-function extractTextFromParts(
-  parts: A2AMessagePart[] | undefined,
-): string | null {
-  if (!Array.isArray(parts)) {
-    return null;
-  }
-  const texts: string[] = [];
-  for (const part of parts) {
-    if (part.kind === 'text' && typeof part.text === 'string') {
-      texts.push(part.text);
-    }
-  }
-  return texts.length > 0 ? texts.join('\n') : null;
-}
-
-function sendJson(
-  res: http.ServerResponse,
-  statusCode: number,
-  data: object,
-): void {
-  const body = JSON.stringify(data);
-  res.writeHead(statusCode, {
-    'Content-Type': 'application/json',
-    'Content-Length': Buffer.byteLength(body),
-  });
-  res.end(body);
-}
-
-function readBody(req: http.IncomingMessage): Promise<string> {
-  return new Promise((resolve, reject) => {
-    const chunks: Buffer[] = [];
-    let size = 0;
-    const maxSize = 1024 * 1024; // 1MB limit
-    req.on('data', (chunk: Buffer) => {
-      size += chunk.length;
-      if (size > maxSize) {
-        req.destroy();
-        reject(new Error('Request body too large'));
-        return;
-      }
-      chunks.push(chunk);
-    });
-    req.on('end', () => resolve(Buffer.concat(chunks).toString('utf-8')));
-    req.on('error', reject);
-  });
-}
-
-// --- JSON-RPC request handlers ---
-
-function handleMessageSend(
-  rpcId: string | number | null,
-  params: Record<string, unknown>,
-  res: http.ServerResponse,
-): void {
-  const messageVal = params['message'];
-  const message =
-    messageVal && typeof messageVal === 'object'
-      ? (messageVal as { role?: string; parts?: A2AMessagePart[] })
-      : undefined;
-  const text = extractTextFromParts(message?.parts);
-  if (!text) {
-    sendJson(
-      res,
-      200,
-      jsonRpcError(
-        rpcId,
-        -32602,
-        'Missing or empty text. Expected: params.message.parts with kind "text".',
-      ),
-    );
-    return;
-  }
-
-  const task = createTask();
-
-  // Inject message into the session
-  appEvents.emit(AppEvent.ExternalMessage, text);
-
-  // Block until response (standard A2A message/send semantics)
-  const timer = setTimeout(() => {
-    const idx = responseWaiters.findIndex((w) => w.taskId === task.id);
-    if (idx !== -1) {
-      responseWaiters.splice(idx, 1);
-    }
-    task.status = {
-      state: 'failed',
-      timestamp: new Date().toISOString(),
-    };
-    scheduleTaskCleanup(task.id);
-    sendJson(res, 200, jsonRpcError(rpcId, -32000, 'Request timed out'));
-  }, DEFAULT_BLOCKING_TIMEOUT_MS);
-
-  responseWaiters.push({
-    taskId: task.id,
-    resolve: () => {
-      clearTimeout(timer);
-      // Task is already updated in notifyResponse
-      const updatedTask = tasks.get(task.id);
-      sendJson(
-        res,
-        200,
-        jsonRpcSuccess(rpcId, formatTaskResult(updatedTask ?? task)),
-      );
-    },
-  });
-}
-
-function handleResponsesPoll(
-  rpcId: string | number | null,
-  res: http.ServerResponse,
-): void {
-  const responses = drainUnsolicitedResponses();
-  sendJson(res, 200, jsonRpcSuccess(rpcId, { responses }));
-}
-
-function handleTasksGet(
-  rpcId: string | number | null,
-  params: Record<string, unknown>,
-  res: http.ServerResponse,
-): void {
-  const taskId = params['id'];
-  if (typeof taskId !== 'string') {
-    sendJson(
-      res,
-      200,
-      jsonRpcError(rpcId, -32602, 'Missing or invalid params.id'),
-    );
-    return;
-  }
-
-  const task = tasks.get(taskId);
-  if (!task) {
-    sendJson(res, 200, jsonRpcError(rpcId, -32001, 'Task not found'));
-    return;
-  }
-
-  sendJson(res, 200, jsonRpcSuccess(rpcId, formatTaskResult(task)));
-}
-
-// --- Server ---
-
-export interface ExternalListenerResult {
-  port: number;
-  cleanup: () => void;
-}
-
-/**
- * Start an embedded HTTP server that accepts A2A-format JSON-RPC messages
- * and bridges them into the interactive session's message queue.
- */
-export function startExternalListener(options?: {
-  port?: number;
-}): Promise<ExternalListenerResult> {
-  const port = options?.port ?? 0;
-
-  return new Promise((resolve, reject) => {
-    const server = http.createServer(
-      (req: http.IncomingMessage, res: http.ServerResponse) => {
-        const url = new URL(req.url ?? '/', `http://localhost`);
-
-        // GET /.well-known/agent-card.json
-        if (
-          req.method === 'GET' &&
-          url.pathname === '/.well-known/agent-card.json'
-        ) {
-          const address = server.address();
-          const actualPort =
-            typeof address === 'object' && address ? address.port : port;
-          sendJson(res, 200, buildAgentCard(actualPort));
-          return;
-        }
-
-        // POST / — JSON-RPC 2.0 routing
-        if (req.method === 'POST' && url.pathname === '/') {
-          readBody(req)
-            .then((rawBody) => {
-              let parsed: JsonRpcRequest;
-              try {
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-                parsed = JSON.parse(rawBody) as JsonRpcRequest;
-              } catch {
-                sendJson(
-                  res,
-                  200,
-                  jsonRpcError(null, -32700, 'Parse error: invalid JSON'),
-                );
-                return;
-              }
-
-              const rpcId = parsed.id ?? null;
-              const method = parsed.method;
-              const params = parsed.params ?? {};
-
-              switch (method) {
-                case 'message/send':
-                  handleMessageSend(rpcId, params, res);
-                  break;
-                case 'tasks/get':
-                  handleTasksGet(rpcId, params, res);
-                  break;
-                case 'responses/poll':
-                  handleResponsesPoll(rpcId, res);
-                  break;
-                default:
-                  sendJson(
-                    res,
-                    200,
-                    jsonRpcError(
-                      rpcId,
-                      -32601,
-                      `Method not found: ${method ?? '(none)'}`,
-                    ),
-                  );
-              }
-            })
-            .catch(() => {
-              sendJson(
-                res,
-                200,
-                jsonRpcError(null, -32603, 'Failed to read request body'),
-              );
-            });
-          return;
-        }
-
-        // 404 for everything else
-        sendJson(res, 404, { error: 'Not found' });
-      },
-    );
-
-    server.listen(port, '127.0.0.1', () => {
-      const address = server.address();
-      const actualPort =
-        typeof address === 'object' && address ? address.port : port;
-
-      // Write port file
-      try {
-        const sessionsDir = getSessionsDir();
-        mkdirSync(sessionsDir, { recursive: true });
-        writeFileSync(getPortFilePath(), String(actualPort), 'utf-8');
-      } catch {
-        // Non-fatal: port file is a convenience, not a requirement
-      }
-
-      const cleanup = () => {
-        server.close();
-        try {
-          unlinkSync(getPortFilePath());
-        } catch {
-          // Ignore: file may already be deleted
-        }
-      };
-
-      resolve({ port: actualPort, cleanup });
-    });
-
-    server.on('error', (err) => {
-      reject(err);
-    });
-  });
-}

packages/cli/src/gemini.test.tsx

@@ -513,7 +513,6 @@ describe('gemini.tsx main function kitty protocol', () => {
       rawOutput: undefined,
       acceptRawOutputRisk: undefined,
       isCommand: undefined,
-      forever: undefined,
     });
 
     await act(async () => {

packages/cli/src/gemini.tsx

@@ -419,6 +419,14 @@ export async function main() {
     }
   }
 
+  if (settings.merged.advanced.autoConfigureMemory) {
+    const heapStats = v8.getHeapStatistics();
+    const currentMaxOldSpaceSizeMb = Math.floor(
+      heapStats.heap_size_limit / 1024 / 1024,
+    );
+    writeToStderr(`Allocated memory: ${currentMaxOldSpaceSizeMb} MB\n`);
+  }
+
   // We are now past the logic handling potentially launching a child process
   // to run Gemini CLI. It is now safe to perform expensive initialization that
   // may have side effects.

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

@@ -29,7 +29,7 @@ describe('Model Steering Integration', () => {
       configOverrides: { modelSteering: true },
     });
     await rig.initialize();
-    rig.render();
+    await rig.render();
     await rig.waitForIdle();
 
     rig.setToolPolicy('list_directory', PolicyDecision.ASK_USER);

packages/cli/src/interactiveCli.tsx

@@ -10,8 +10,6 @@ import { basename } from 'node:path';
 import { AppContainer } from './ui/AppContainer.js';
 import { ConsolePatcher } from './ui/utils/ConsolePatcher.js';
 import { registerCleanup, setupTtyCheck } from './utils/cleanup.js';
-import { startExternalListener } from './external-listener.js';
-import { appEvents, AppEvent } from './utils/events.js';
 import {
   type StartupWarning,
   type Config,
@@ -183,24 +181,6 @@ export async function startInteractiveUI(
 
   registerCleanup(() => instance.unmount());
 
-  // Auto-start A2A HTTP listener in Forever Mode
-  if (config.getIsForeverMode()) {
-    try {
-      const listener = await startExternalListener({ port: 0 });
-      registerCleanup(listener.cleanup);
-      appEvents.emit(AppEvent.A2AListenerStarted, listener.port);
-      coreEvents.emitFeedback(
-        'info',
-        `A2A endpoint listening on port ${listener.port}`,
-      );
-    } catch (err) {
-      coreEvents.emitFeedback(
-        'warning',
-        `Failed to start A2A listener: ${err instanceof Error ? err.message : String(err)}`,
-      );
-    }
-  }
-
   registerCleanup(setupTtyCheck());
 }
 

packages/cli/src/nonInteractiveCli.ts

@@ -222,7 +222,6 @@ export async function runNonInteractive({
         await geminiClient.resumeChat(
           convertSessionToClientHistory(
             resumedSessionData.conversation.messages,
-            resumedSessionData.conversation.lastCompressionIndex,
           ),
           resumedSessionData,
         );

packages/cli/src/nonInteractiveCliCommands.ts

@@ -65,9 +65,9 @@ export const handleSlashCommand = async (
 
       const logger = new Logger(config?.getSessionId() || '', config?.storage);
 
-      const context: CommandContext = {
+      const commandContext: CommandContext = {
         services: {
-          config,
+          agentContext: config,
           settings,
           git: undefined,
           logger,
@@ -84,7 +84,7 @@ export const handleSlashCommand = async (
         },
       };
 
-      const result = await commandToExecute.action(context, args);
+      const result = await commandToExecute.action(commandContext, args);
 
       if (result) {
         switch (result.type) {

packages/cli/src/services/prompt-processors/atFileProcessor.test.ts

@@ -31,11 +31,14 @@ describe('AtFileProcessor', () => {
 
     mockConfig = {
       // The processor only passes the config through, so we don't need a full mock.
+      get config() {
+        return this;
+      },
     } as unknown as Config;
 
     context = createMockCommandContext({
       services: {
-        config: mockConfig,
+        agentContext: mockConfig,
       },
     });
 
@@ -60,7 +63,7 @@ describe('AtFileProcessor', () => {
     const prompt: PartUnion[] = [{ text: 'Analyze @{file.txt}' }];
     const contextWithoutConfig = createMockCommandContext({
       services: {
-        config: null,
+        agentContext: null,
       },
     });
     const result = await processor.process(prompt, contextWithoutConfig);

packages/cli/src/services/prompt-processors/atFileProcessor.ts

@@ -25,7 +25,7 @@ export class AtFileProcessor implements IPromptProcessor {
     input: PromptPipelineContent,
     context: CommandContext,
   ): Promise<PromptPipelineContent> {
-    const config = context.services.config;
+    const config = context.services.agentContext?.config;
     if (!config) {
       return input;
     }

packages/cli/src/services/prompt-processors/shellProcessor.test.ts

@@ -89,6 +89,9 @@ describe('ShellProcessor', () => {
       getPolicyEngine: vi.fn().mockReturnValue({
         check: mockPolicyEngineCheck,
       }),
+      get config() {
+        return this as unknown as Config;
+      },
     };
 
     context = createMockCommandContext({
@@ -98,7 +101,7 @@ describe('ShellProcessor', () => {
         args: 'default args',
       },
       services: {
-        config: mockConfig as Config,
+        agentContext: mockConfig as Config,
       },
       session: {
         sessionShellAllowlist: new Set(),
@@ -120,7 +123,7 @@ describe('ShellProcessor', () => {
     const prompt: PromptPipelineContent = createPromptPipelineContent('!{ls}');
     const contextWithoutConfig = createMockCommandContext({
       services: {
-        config: null,
+        agentContext: null,
       },
     });
 

packages/cli/src/services/prompt-processors/shellProcessor.ts

@@ -74,7 +74,7 @@ export class ShellProcessor implements IPromptProcessor {
       ];
     }
 
-    const config = context.services.config;
+    const config = context.services.agentContext?.config;
     if (!config) {
       throw new Error(
         `Security configuration not loaded. Cannot verify shell command permissions for '${this.commandName}'. Aborting.`,

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

@@ -5,7 +5,6 @@
  */
 
 import { describe, it, afterEach, expect } from 'vitest';
-import { act } from 'react';
 import { AppRig } from './AppRig.js';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -31,7 +30,7 @@ describe('AppRig', () => {
       configOverrides: { modelSteering: true },
     });
     await rig.initialize();
-    rig.render();
+    await rig.render();
     await rig.waitForIdle();
 
     // Set breakpoints on the canonical tool names
@@ -69,12 +68,7 @@ describe('AppRig', () => {
     );
     rig = new AppRig({ fakeResponsesPath });
     await rig.initialize();
-    await act(async () => {
-      rig!.render();
-      // Allow async initializations (like banners) to settle within the act boundary
-      await new Promise((resolve) => setTimeout(resolve, 0));
-    });
-
+    await rig.render();
     // Wait for initial render
     await rig.waitForIdle();
 

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

@@ -11,7 +11,7 @@ import os from 'node:os';
 import path from 'node:path';
 import fs from 'node:fs';
 import { AppContainer } from '../ui/AppContainer.js';
-import { renderWithProviders } from './render.js';
+import { renderWithProviders, type RenderInstance } from './render.js';
 import {
   makeFakeConfig,
   type Config,
@@ -155,7 +155,7 @@ export interface PendingConfirmation {
 }
 
 export class AppRig {
-  private renderResult: ReturnType<typeof renderWithProviders> | undefined;
+  private renderResult: RenderInstance | undefined;
   private config: Config | undefined;
   private settings: LoadedSettings | undefined;
   private testDir: string;
@@ -393,12 +393,12 @@ export class AppRig {
     return isAnyToolActive || isAwaitingConfirmation;
   }
 
-  render() {
+  async render() {
     if (!this.config || !this.settings)
       throw new Error('AppRig not initialized');
 
-    act(() => {
-      this.renderResult = renderWithProviders(
+    await act(async () => {
+      this.renderResult = await renderWithProviders(
         <AppContainer
           config={this.config!}
           version="test-version"

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

@@ -46,15 +46,19 @@ describe('createMockCommandContext', () => {
 
     const overrides = {
       services: {
-        config: mockConfig,
+        agentContext: { config: mockConfig },
       },
     };
 
     const context = createMockCommandContext(overrides);
 
-    expect(context.services.config).toBeDefined();
-    expect(context.services.config?.getModel()).toBe('gemini-pro');
-    expect(context.services.config?.getProjectRoot()).toBe('/test/project');
+    expect(context.services.agentContext).toBeDefined();
+    expect(context.services.agentContext?.config?.getModel()).toBe(
+      'gemini-pro',
+    );
+    expect(context.services.agentContext?.config?.getProjectRoot()).toBe(
+      '/test/project',
+    );
 
     // Verify a default property on the same nested object is still there
     expect(context.services.logger).toBeDefined();

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

@@ -36,7 +36,7 @@ export const createMockCommandContext = (
       args: '',
     },
     services: {
-      config: null,
+      agentContext: null,
 
       settings: {
         merged: defaultMergedSettings,

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

@@ -173,14 +173,6 @@ export const createMockConfig = (overrides: Partial<Config> = {}): Config =>
     getHasAccessToPreviewModel: vi.fn().mockReturnValue(false),
     validatePathAccess: vi.fn().mockReturnValue(null),
     getUseAlternateBuffer: vi.fn().mockReturnValue(false),
-    getIsForeverMode: vi.fn().mockReturnValue(false),
-    getWorkScheduler: vi.fn().mockReturnValue({
-      on: vi.fn(),
-      off: vi.fn(),
-      serialize: vi.fn().mockReturnValue([]),
-      restore: vi.fn(),
-      dispose: vi.fn(),
-    }),
     ...overrides,
   }) as unknown as Config;
 

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

@@ -16,8 +16,6 @@ import { vi } from 'vitest';
 import stripAnsi from 'strip-ansi';
 import type React from 'react';
 import { act, useState } from 'react';
-import os from 'node:os';
-import path from 'node:path';
 import type { LoadedSettings } from '../config/settings.js';
 import { KeypressProvider } from '../ui/contexts/KeypressContext.js';
 import { SettingsContext } from '../ui/contexts/SettingsContext.js';
@@ -44,7 +42,7 @@ import {
   type OverflowState,
 } from '../ui/contexts/OverflowContext.js';
 
-import { makeFakeConfig, type Config } from '@google/gemini-cli-core';
+import { type Config } from '@google/gemini-cli-core';
 import { FakePersistentState } from './persistentStateFake.js';
 import { AppContext, type AppState } from '../ui/contexts/AppContext.js';
 import { createMockSettings } from './settings.js';
@@ -53,6 +51,7 @@ import { themeManager, DEFAULT_THEME } from '../ui/themes/theme-manager.js';
 import { DefaultLight } from '../ui/themes/builtin/light/default-light.js';
 import { pickDefaultThemeName } from '../ui/themes/theme.js';
 import { generateSvgForTerminal } from './svg.js';
+import { loadCliConfig, type CliArgs } from '../config/config.js';
 
 export const persistentStateMock = new FakePersistentState();
 
@@ -66,7 +65,9 @@ if (process.env['NODE_ENV'] === 'test') {
 }
 
 vi.mock('../utils/persistentState.js', () => ({
-  persistentState: persistentStateMock,
+  get persistentState() {
+    return persistentStateMock;
+  },
 }));
 
 vi.mock('../ui/utils/terminalUtils.js', () => ({
@@ -486,50 +487,6 @@ export const simulateClick = async (
   });
 };
 
-let mockConfigInternal: Config | undefined;
-
-const getMockConfigInternal = (): Config => {
-  if (!mockConfigInternal) {
-    mockConfigInternal = makeFakeConfig({
-      targetDir: os.tmpdir(),
-      enableEventDrivenScheduler: true,
-    });
-  }
-  return mockConfigInternal;
-};
-
-const configProxy = new Proxy({} as Config, {
-  get(_target, prop) {
-    if (prop === 'getTargetDir') {
-      return () =>
-        path.join(
-          path.parse(process.cwd()).root,
-          'Users',
-          'test',
-          'project',
-          'foo',
-          'bar',
-          'and',
-          'some',
-          'more',
-          'directories',
-          'to',
-          'make',
-          'it',
-          'long',
-        );
-    }
-    if (prop === 'getUseBackgroundColor') {
-      return () => true;
-    }
-    const internal = getMockConfigInternal();
-    if (prop in internal) {
-      return internal[prop as keyof typeof internal];
-    }
-    throw new Error(`mockConfig does not have property ${String(prop)}`);
-  },
-});
-
 export const mockSettings = createMockSettings();
 
 // A minimal mock UIState to satisfy the context provider.
@@ -639,7 +596,7 @@ const ContextCapture: React.FC<{ children: React.ReactNode }> = ({
   return <>{children}</>;
 };
 
-export const renderWithProviders = (
+export const renderWithProviders = async (
   component: React.ReactElement,
   {
     shellFocus = true,
@@ -647,8 +604,7 @@ export const renderWithProviders = (
     uiState: providedUiState,
     width,
     mouseEventsEnabled = false,
-
-    config = configProxy as unknown as Config,
+    config,
     uiActions,
     persistentState,
     appState = mockAppState,
@@ -666,13 +622,15 @@ export const renderWithProviders = (
     };
     appState?: AppState;
   } = {},
-): RenderInstance & {
-  simulateClick: (
-    col: number,
-    row: number,
-    button?: 0 | 1 | 2,
-  ) => Promise<void>;
-} => {
+): Promise<
+  RenderInstance & {
+    simulateClick: (
+      col: number,
+      row: number,
+      button?: 0 | 1 | 2,
+    ) => Promise<void>;
+  }
+> => {
   const baseState: UIState = new Proxy(
     { ...baseMockUiState, ...providedUiState },
     {
@@ -701,8 +659,15 @@ export const renderWithProviders = (
   persistentStateMock.mockClear();
 
   const terminalWidth = width ?? baseState.terminalWidth;
-  const finalSettings = settings;
-  const finalConfig = config;
+
+  if (!config) {
+    config = await loadCliConfig(
+      settings.merged,
+      'random-session-id',
+      {} as unknown as CliArgs,
+      { cwd: '/' },
+    );
+  }
 
   const mainAreaWidth = terminalWidth;
 
@@ -732,8 +697,8 @@ export const renderWithProviders = (
 
   const wrapWithProviders = (comp: React.ReactElement) => (
     <AppContext.Provider value={appState}>
-      <ConfigContext.Provider value={finalConfig}>
-        <SettingsContext.Provider value={finalSettings}>
+      <ConfigContext.Provider value={config}>
+        <SettingsContext.Provider value={settings}>
           <UIStateContext.Provider value={finalUiState}>
             <VimModeProvider>
               <ShellFocusContext.Provider value={shellFocus}>
@@ -744,7 +709,7 @@ export const renderWithProviders = (
                     <UIActionsContext.Provider value={finalUIActions}>
                       <OverflowProvider>
                         <ToolActionsProvider
-                          config={finalConfig}
+                          config={config}
                           toolCalls={allToolCalls}
                         >
                           <AskUserActionsProvider
@@ -863,7 +828,7 @@ export function renderHook<Result, Props>(
   return { result, rerender, unmount, waitUntilReady, generateSvg };
 }
 
-export function renderHookWithProviders<Result, Props>(
+export async function renderHookWithProviders<Result, Props>(
   renderCallback: (props: Props) => Result,
   options: {
     initialProps?: Props;
@@ -876,13 +841,13 @@ export function renderHookWithProviders<Result, Props>(
     mouseEventsEnabled?: boolean;
     config?: Config;
   } = {},
-): {
+): Promise<{
   result: { current: Result };
   rerender: (props?: Props) => void;
   unmount: () => void;
   waitUntilReady: () => Promise<void>;
   generateSvg: () => string;
-} {
+}> {
   const result = { current: undefined as unknown as Result };
 
   let setPropsFn: ((props: Props) => void) | undefined;
@@ -901,8 +866,8 @@ export function renderHookWithProviders<Result, Props>(
 
   let renderResult: ReturnType<typeof render>;
 
-  act(() => {
-    renderResult = renderWithProviders(
+  await act(async () => {
+    renderResult = await renderWithProviders(
       <Wrapper>
         {}
         <TestComponent initialProps={options.initialProps as Props} />

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

@@ -82,7 +82,6 @@ describe('App', () => {
       updateItem: vi.fn(),
       clearItems: vi.fn(),
       loadHistory: vi.fn(),
-      pruneItems: vi.fn(),
     },
     history: [],
     pendingHistoryItems: [],
@@ -95,11 +94,10 @@ describe('App', () => {
   };
 
   it('should render main content and composer when not quitting', async () => {
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <App />,
       {
         uiState: mockUIState,
-        config: makeFakeConfig({ useAlternateBuffer: false }),
         settings: createMockSettings({ ui: { useAlternateBuffer: false } }),
       },
     );
@@ -117,11 +115,10 @@ describe('App', () => {
       quittingMessages: [{ id: 1, type: 'user', text: 'test' }],
     } as UIState;
 
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <App />,
       {
         uiState: quittingUIState,
-        config: makeFakeConfig({ useAlternateBuffer: false }),
         settings: createMockSettings({ ui: { useAlternateBuffer: false } }),
       },
     );
@@ -139,11 +136,10 @@ describe('App', () => {
       pendingHistoryItems: [{ type: 'user', text: 'pending item' }],
     } as UIState;
 
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <App />,
       {
         uiState: quittingUIState,
-        config: makeFakeConfig({ useAlternateBuffer: true }),
         settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
       },
     );
@@ -160,11 +156,10 @@ describe('App', () => {
       dialogsVisible: true,
     } as UIState;
 
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <App />,
       {
         uiState: dialogUIState,
-        config: makeFakeConfig({ useAlternateBuffer: true }),
         settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
       },
     );
@@ -188,11 +183,10 @@ describe('App', () => {
         [stateKey]: true,
       } as UIState;
 
-      const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+      const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
         <App />,
         {
           uiState,
-          config: makeFakeConfig({ useAlternateBuffer: true }),
           settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
         },
       );
@@ -206,11 +200,10 @@ describe('App', () => {
   it('should render ScreenReaderAppLayout when screen reader is enabled', async () => {
     (useIsScreenReaderEnabled as Mock).mockReturnValue(true);
 
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <App />,
       {
         uiState: mockUIState,
-        config: makeFakeConfig({ useAlternateBuffer: true }),
         settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
       },
     );
@@ -226,11 +219,10 @@ describe('App', () => {
   it('should render DefaultAppLayout when screen reader is not enabled', async () => {
     (useIsScreenReaderEnabled as Mock).mockReturnValue(false);
 
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <App />,
       {
         uiState: mockUIState,
-        config: makeFakeConfig({ useAlternateBuffer: true }),
         settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
       },
     );
@@ -282,7 +274,7 @@ describe('App', () => {
     vi.spyOn(configWithExperiment, 'isTrustedFolder').mockReturnValue(true);
     vi.spyOn(configWithExperiment, 'getIdeMode').mockReturnValue(false);
 
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <App />,
       {
         uiState: stateWithConfirmingTool,
@@ -303,11 +295,10 @@ describe('App', () => {
   describe('Snapshots', () => {
     it('renders default layout correctly', async () => {
       (useIsScreenReaderEnabled as Mock).mockReturnValue(false);
-      const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+      const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
         <App />,
         {
           uiState: mockUIState,
-          config: makeFakeConfig({ useAlternateBuffer: true }),
           settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
         },
       );
@@ -318,11 +309,10 @@ describe('App', () => {
 
     it('renders screen reader layout correctly', async () => {
       (useIsScreenReaderEnabled as Mock).mockReturnValue(true);
-      const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+      const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
         <App />,
         {
           uiState: mockUIState,
-          config: makeFakeConfig({ useAlternateBuffer: true }),
           settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
         },
       );
@@ -336,11 +326,10 @@ describe('App', () => {
         ...mockUIState,
         dialogsVisible: true,
       } as UIState;
-      const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+      const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
         <App />,
         {
           uiState: dialogUIState,
-          config: makeFakeConfig({ useAlternateBuffer: true }),
           settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
         },
       );

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

@@ -212,7 +212,7 @@ import { useEditorSettings } from './hooks/useEditorSettings.js';
 import { useSettingsCommand } from './hooks/useSettingsCommand.js';
 import { useModelCommand } from './hooks/useModelCommand.js';
 import { useSlashCommandProcessor } from './hooks/slashCommandProcessor.js';
-import { useConsoleMessages } from './hooks/useConsoleMessages.js';
+import { useErrorCount } from './hooks/useConsoleMessages.js';
 import { useGeminiStream } from './hooks/useGeminiStream.js';
 import { useVim } from './hooks/vim.js';
 import { useFolderTrust } from './hooks/useFolderTrust.js';
@@ -294,7 +294,7 @@ describe('AppContainer State Management', () => {
   const mockedUseSettingsCommand = useSettingsCommand as Mock;
   const mockedUseModelCommand = useModelCommand as Mock;
   const mockedUseSlashCommandProcessor = useSlashCommandProcessor as Mock;
-  const mockedUseConsoleMessages = useConsoleMessages as Mock;
+  const mockedUseConsoleMessages = useErrorCount as Mock;
   const mockedUseGeminiStream = useGeminiStream as Mock;
   const mockedUseVim = useVim as Mock;
   const mockedUseFolderTrust = useFolderTrust as Mock;
@@ -396,9 +396,9 @@ describe('AppContainer State Management', () => {
       confirmationRequest: null,
     });
     mockedUseConsoleMessages.mockReturnValue({
-      consoleMessages: [],
+      errorCount: 0,
       handleNewMessage: vi.fn(),
-      clearConsoleMessages: vi.fn(),
+      clearErrorCount: vi.fn(),
     });
     mockedUseGeminiStream.mockReturnValue(DEFAULT_GEMINI_STREAM_MOCK);
     mockedUseVim.mockReturnValue({ handleInput: vi.fn() });

packages/cli/src/ui/AppContainer.tsx

@@ -103,7 +103,7 @@ import {
   useOverflowActions,
   useOverflowState,
 } from './contexts/OverflowContext.js';
-import { useConsoleMessages } from './hooks/useConsoleMessages.js';
+import { useErrorCount } from './hooks/useConsoleMessages.js';
 import { useTerminalSize } from './hooks/useTerminalSize.js';
 import { calculatePromptWidths } from './components/InputPrompt.js';
 import { calculateMainAreaWidth } from './utils/ui-sizing.js';
@@ -127,7 +127,6 @@ import { useFolderTrust } from './hooks/useFolderTrust.js';
 import { useIdeTrustListener } from './hooks/useIdeTrustListener.js';
 import { type IdeIntegrationNudgeResult } from './IdeIntegrationNudge.js';
 import { appEvents, AppEvent, TransientMessageType } from '../utils/events.js';
-import { notifyResponse, markTasksWorking } from '../external-listener.js';
 import { type UpdateObject } from './utils/updateCheck.js';
 import { setUpdateHandler } from '../utils/handleAutoUpdate.js';
 import { registerCleanup, runExitCleanup } from '../utils/cleanup.js';
@@ -553,8 +552,7 @@ export const AppContainer = (props: AppContainerProps) => {
     };
   }, [settings]);
 
-  const { consoleMessages, clearConsoleMessages: clearConsoleMessagesState } =
-    useConsoleMessages();
+  const { errorCount, clearErrorCount } = useErrorCount();
 
   const mainAreaWidth = calculateMainAreaWidth(terminalWidth, config);
   // Derive widths for InputPrompt using shared helper
@@ -1143,7 +1141,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
     terminalHeight,
     embeddedShellFocused,
     consumePendingHints,
-    historyManager.pruneItems,
   );
 
   toggleBackgroundShellRef.current = toggleBackgroundShell;
@@ -1215,89 +1212,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
     isMcpReady,
   });
 
-  // --- A2A listener integration ---
-  const [a2aListenerPort, setA2aListenerPort] = useState<number | null>(null);
-
-  useEffect(() => {
-    const handler = (port: number) => {
-      setA2aListenerPort(port);
-    };
-    appEvents.on(AppEvent.A2AListenerStarted, handler);
-    return () => {
-      appEvents.off(AppEvent.A2AListenerStarted, handler);
-    };
-  }, []);
-
-  // Bridge external messages from A2A HTTP listener to message queue
-  useEffect(() => {
-    const handler = (text: string) => {
-      addMessage(text);
-    };
-    appEvents.on(AppEvent.ExternalMessage, handler);
-    return () => {
-      appEvents.off(AppEvent.ExternalMessage, handler);
-    };
-  }, [addMessage]);
-
-  // Wire WorkScheduler: inject fired prompts and persist schedule changes
-  useEffect(() => {
-    const scheduler = config.getWorkScheduler();
-
-    const onFire = (prompt: string) => {
-      appEvents.emit(AppEvent.ExternalMessage, prompt);
-    };
-
-    const onChanged = () => {
-      // Persist pending items to the session file
-      const recordingService = config
-        .getGeminiClient()
-        ?.getChatRecordingService();
-      if (recordingService) {
-        recordingService.recordScheduledWork(scheduler.serialize());
-      }
-    };
-
-    scheduler.on('fire', onFire);
-    scheduler.on('changed', onChanged);
-    return () => {
-      scheduler.off('fire', onFire);
-      scheduler.off('changed', onChanged);
-    };
-  }, [config]);
-
-  // Track streaming state transitions for A2A response capture
-  const prevStreamingStateRef = useRef(streamingState);
-
-  useEffect(() => {
-    const prev = prevStreamingStateRef.current;
-    prevStreamingStateRef.current = streamingState;
-
-    // Mark tasks as "working" when streaming starts
-    if (
-      prev === StreamingState.Idle &&
-      streamingState !== StreamingState.Idle
-    ) {
-      markTasksWorking();
-    }
-
-    // Capture response when streaming ends (for A2A tasks or unsolicited output)
-    if (
-      prev !== StreamingState.Idle &&
-      streamingState === StreamingState.Idle
-    ) {
-      const history = historyManager.history;
-      const parts: string[] = [];
-      for (let i = history.length - 1; i >= 0; i--) {
-        const item = history[i];
-        if (item.type !== 'gemini' && item.type !== 'gemini_content') break;
-        if (typeof item.text === 'string' && item.text) {
-          parts.unshift(item.text);
-        }
-      }
-      notifyResponse(parts.join('\n'));
-    }
-  }, [streamingState, historyManager.history]);
-
   cancelHandlerRef.current = useCallback(
     (shouldRestorePrompt: boolean = true) => {
       const pendingHistoryItems = [
@@ -1457,11 +1371,11 @@ Logging in with Google... Restarting Gemini CLI to continue.
     // Explicitly hide the expansion hint and clear its x-second timer when clearing the screen.
     triggerExpandHint(null);
     historyManager.clearItems();
-    clearConsoleMessagesState();
+    clearErrorCount();
     refreshStatic();
   }, [
     historyManager,
-    clearConsoleMessagesState,
+    clearErrorCount,
     refreshStatic,
     reset,
     triggerExpandHint,
@@ -2068,22 +1982,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
     };
   }, [historyManager]);
 
-  const filteredConsoleMessages = useMemo(() => {
-    if (config.getDebugMode()) {
-      return consoleMessages;
-    }
-    return consoleMessages.filter((msg) => msg.type !== 'debug');
-  }, [consoleMessages, config]);
-
-  // Computed values
-  const errorCount = useMemo(
-    () =>
-      filteredConsoleMessages
-        .filter((msg) => msg.type === 'error')
-        .reduce((total, msg) => total + msg.count, 0),
-    [filteredConsoleMessages],
-  );
-
   const nightly = props.version.includes('nightly');
 
   const dialogsVisible =
@@ -2318,7 +2216,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
       constrainHeight,
       showErrorDetails,
       showFullTodos,
-      filteredConsoleMessages,
       ideContextState,
       renderMarkdown,
       ctrlCPressedOnce: ctrlCPressCount >= 1,
@@ -2385,7 +2282,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
       adminSettingsChanged,
       newAgents,
       showIsExpandableHint,
-      a2aListenerPort,
       hintMode:
         config.isModelSteeringEnabled() &&
         isToolExecuting([
@@ -2447,7 +2343,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
       constrainHeight,
       showErrorDetails,
       showFullTodos,
-      filteredConsoleMessages,
       ideContextState,
       renderMarkdown,
       ctrlCPressCount,
@@ -2514,7 +2409,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
       adminSettingsChanged,
       newAgents,
       showIsExpandableHint,
-      a2aListenerPort,
     ],
   );
 

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

@@ -53,7 +53,7 @@ describe('IdeIntegrationNudge', () => {
   });
 
   it('renders correctly with default options', async () => {
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <IdeIntegrationNudge {...defaultProps} />,
     );
     await waitUntilReady();
@@ -68,7 +68,7 @@ describe('IdeIntegrationNudge', () => {
 
   it('handles "Yes" selection', async () => {
     const onComplete = vi.fn();
-    const { stdin, waitUntilReady, unmount } = renderWithProviders(
+    const { stdin, waitUntilReady, unmount } = await renderWithProviders(
       <IdeIntegrationNudge {...defaultProps} onComplete={onComplete} />,
     );
 
@@ -89,7 +89,7 @@ describe('IdeIntegrationNudge', () => {
 
   it('handles "No" selection', async () => {
     const onComplete = vi.fn();
-    const { stdin, waitUntilReady, unmount } = renderWithProviders(
+    const { stdin, waitUntilReady, unmount } = await renderWithProviders(
       <IdeIntegrationNudge {...defaultProps} onComplete={onComplete} />,
     );
 
@@ -115,7 +115,7 @@ describe('IdeIntegrationNudge', () => {
 
   it('handles "Dismiss" selection', async () => {
     const onComplete = vi.fn();
-    const { stdin, waitUntilReady, unmount } = renderWithProviders(
+    const { stdin, waitUntilReady, unmount } = await renderWithProviders(
       <IdeIntegrationNudge {...defaultProps} onComplete={onComplete} />,
     );
 
@@ -146,7 +146,7 @@ describe('IdeIntegrationNudge', () => {
 
   it('handles Escape key press', async () => {
     const onComplete = vi.fn();
-    const { stdin, waitUntilReady, unmount } = renderWithProviders(
+    const { stdin, waitUntilReady, unmount } = await renderWithProviders(
       <IdeIntegrationNudge {...defaultProps} onComplete={onComplete} />,
     );
 
@@ -173,9 +173,10 @@ describe('IdeIntegrationNudge', () => {
     vi.stubEnv('GEMINI_CLI_IDE_WORKSPACE_PATH', '/tmp');
 
     const onComplete = vi.fn();
-    const { lastFrame, stdin, waitUntilReady, unmount } = renderWithProviders(
-      <IdeIntegrationNudge {...defaultProps} onComplete={onComplete} />,
-    );
+    const { lastFrame, stdin, waitUntilReady, unmount } =
+      await renderWithProviders(
+        <IdeIntegrationNudge {...defaultProps} onComplete={onComplete} />,
+      );
 
     await waitUntilReady();
 

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

@@ -143,7 +143,7 @@ describe('AuthDialog', () => {
         for (const [key, value] of Object.entries(env)) {
           vi.stubEnv(key, value as string);
         }
-        const { waitUntilReady, unmount } = renderWithProviders(
+        const { waitUntilReady, unmount } = await renderWithProviders(
           <AuthDialog {...props} />,
         );
         await waitUntilReady();
@@ -161,7 +161,7 @@ describe('AuthDialog', () => {
 
   it('filters auth types when enforcedType is set', async () => {
     props.settings.merged.security.auth.enforcedType = AuthType.USE_GEMINI;
-    const { waitUntilReady, unmount } = renderWithProviders(
+    const { waitUntilReady, unmount } = await renderWithProviders(
       <AuthDialog {...props} />,
     );
     await waitUntilReady();
@@ -173,7 +173,7 @@ describe('AuthDialog', () => {
 
   it('sets initial index to 0 when enforcedType is set', async () => {
     props.settings.merged.security.auth.enforcedType = AuthType.USE_GEMINI;
-    const { waitUntilReady, unmount } = renderWithProviders(
+    const { waitUntilReady, unmount } = await renderWithProviders(
       <AuthDialog {...props} />,
     );
     await waitUntilReady();
@@ -213,7 +213,7 @@ describe('AuthDialog', () => {
       },
     ])('selects initial auth type $desc', async ({ setup, expected }) => {
       setup();
-      const { waitUntilReady, unmount } = renderWithProviders(
+      const { waitUntilReady, unmount } = await renderWithProviders(
         <AuthDialog {...props} />,
       );
       await waitUntilReady();
@@ -226,7 +226,7 @@ describe('AuthDialog', () => {
   describe('handleAuthSelect', () => {
     it('calls onAuthError if validation fails', async () => {
       mockedValidateAuthMethod.mockReturnValue('Invalid method');
-      const { waitUntilReady, unmount } = renderWithProviders(
+      const { waitUntilReady, unmount } = await renderWithProviders(
         <AuthDialog {...props} />,
       );
       await waitUntilReady();
@@ -245,7 +245,7 @@ describe('AuthDialog', () => {
 
     it('sets auth context with requiresRestart: true for LOGIN_WITH_GOOGLE', async () => {
       mockedValidateAuthMethod.mockReturnValue(null);
-      const { waitUntilReady, unmount } = renderWithProviders(
+      const { waitUntilReady, unmount } = await renderWithProviders(
         <AuthDialog {...props} />,
       );
       await waitUntilReady();
@@ -261,7 +261,7 @@ describe('AuthDialog', () => {
 
     it('sets auth context with empty object for other auth types', async () => {
       mockedValidateAuthMethod.mockReturnValue(null);
-      const { waitUntilReady, unmount } = renderWithProviders(
+      const { waitUntilReady, unmount } = await renderWithProviders(
         <AuthDialog {...props} />,
       );
       await waitUntilReady();
@@ -278,7 +278,7 @@ describe('AuthDialog', () => {
       vi.stubEnv('GEMINI_API_KEY', 'test-key-from-env');
       // props.settings.merged.security.auth.selectedType is undefined here, simulating initial setup
 
-      const { waitUntilReady, unmount } = renderWithProviders(
+      const { waitUntilReady, unmount } = await renderWithProviders(
         <AuthDialog {...props} />,
       );
       await waitUntilReady();
@@ -297,7 +297,7 @@ describe('AuthDialog', () => {
       vi.stubEnv('GEMINI_API_KEY', ''); // Empty string
       // props.settings.merged.security.auth.selectedType is undefined here
 
-      const { waitUntilReady, unmount } = renderWithProviders(
+      const { waitUntilReady, unmount } = await renderWithProviders(
         <AuthDialog {...props} />,
       );
       await waitUntilReady();
@@ -316,7 +316,7 @@ describe('AuthDialog', () => {
       // process.env['GEMINI_API_KEY'] is not set
       // props.settings.merged.security.auth.selectedType is undefined here, simulating initial setup
 
-      const { waitUntilReady, unmount } = renderWithProviders(
+      const { waitUntilReady, unmount } = await renderWithProviders(
         <AuthDialog {...props} />,
       );
       await waitUntilReady();
@@ -337,7 +337,7 @@ describe('AuthDialog', () => {
       props.settings.merged.security.auth.selectedType =
         AuthType.LOGIN_WITH_GOOGLE;
 
-      const { waitUntilReady, unmount } = renderWithProviders(
+      const { waitUntilReady, unmount } = await renderWithProviders(
         <AuthDialog {...props} />,
       );
       await waitUntilReady();
@@ -360,7 +360,7 @@ describe('AuthDialog', () => {
       vi.mocked(props.config.isBrowserLaunchSuppressed).mockReturnValue(true);
       mockedValidateAuthMethod.mockReturnValue(null);
 
-      const { waitUntilReady, unmount } = renderWithProviders(
+      const { waitUntilReady, unmount } = await renderWithProviders(
         <AuthDialog {...props} />,
       );
       await waitUntilReady();
@@ -383,7 +383,7 @@ describe('AuthDialog', () => {
 
   it('displays authError when provided', async () => {
     props.authError = 'Something went wrong';
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <AuthDialog {...props} />,
     );
     await waitUntilReady();
@@ -429,7 +429,7 @@ describe('AuthDialog', () => {
       },
     ])('$desc', async ({ setup, expectations }) => {
       setup();
-      const { waitUntilReady, unmount } = renderWithProviders(
+      const { waitUntilReady, unmount } = await renderWithProviders(
         <AuthDialog {...props} />,
       );
       await waitUntilReady();
@@ -442,7 +442,7 @@ describe('AuthDialog', () => {
 
   describe('Snapshots', () => {
     it('renders correctly with default props', async () => {
-      const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+      const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
         <AuthDialog {...props} />,
       );
       await waitUntilReady();
@@ -452,7 +452,7 @@ describe('AuthDialog', () => {
 
     it('renders correctly with auth error', async () => {
       props.authError = 'Something went wrong';
-      const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+      const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
         <AuthDialog {...props} />,
       );
       await waitUntilReady();
@@ -462,7 +462,7 @@ describe('AuthDialog', () => {
 
     it('renders correctly with enforced auth type', async () => {
       props.settings.merged.security.auth.enforcedType = AuthType.USE_GEMINI;
-      const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+      const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
         <AuthDialog {...props} />,
       );
       await waitUntilReady();

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

@@ -73,7 +73,7 @@ describe('BannedAccountDialog', () => {
   });
 
   it('renders the suspension message from accountSuspensionInfo', async () => {
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <BannedAccountDialog
         accountSuspensionInfo={DEFAULT_SUSPENSION_INFO}
         onExit={onExit}
@@ -89,7 +89,7 @@ describe('BannedAccountDialog', () => {
   });
 
   it('renders menu options with appeal link text from response', async () => {
-    const { waitUntilReady, unmount } = renderWithProviders(
+    const { waitUntilReady, unmount } = await renderWithProviders(
       <BannedAccountDialog
         accountSuspensionInfo={DEFAULT_SUSPENSION_INFO}
         onExit={onExit}
@@ -109,7 +109,7 @@ describe('BannedAccountDialog', () => {
     const infoWithoutUrl: AccountSuspensionInfo = {
       message: 'Account suspended.',
     };
-    const { waitUntilReady, unmount } = renderWithProviders(
+    const { waitUntilReady, unmount } = await renderWithProviders(
       <BannedAccountDialog
         accountSuspensionInfo={infoWithoutUrl}
         onExit={onExit}
@@ -129,7 +129,7 @@ describe('BannedAccountDialog', () => {
       message: 'Account suspended.',
       appealUrl: 'https://example.com/appeal',
     };
-    const { waitUntilReady, unmount } = renderWithProviders(
+    const { waitUntilReady, unmount } = await renderWithProviders(
       <BannedAccountDialog
         accountSuspensionInfo={infoWithoutLinkText}
         onExit={onExit}
@@ -143,7 +143,7 @@ describe('BannedAccountDialog', () => {
   });
 
   it('opens browser when appeal option is selected', async () => {
-    const { waitUntilReady, unmount } = renderWithProviders(
+    const { waitUntilReady, unmount } = await renderWithProviders(
       <BannedAccountDialog
         accountSuspensionInfo={DEFAULT_SUSPENSION_INFO}
         onExit={onExit}
@@ -162,7 +162,7 @@ describe('BannedAccountDialog', () => {
 
   it('shows URL when browser cannot be launched', async () => {
     mockedShouldLaunchBrowser.mockReturnValue(false);
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <BannedAccountDialog
         accountSuspensionInfo={DEFAULT_SUSPENSION_INFO}
         onExit={onExit}
@@ -180,7 +180,7 @@ describe('BannedAccountDialog', () => {
   });
 
   it('calls onExit when "Exit" is selected', async () => {
-    const { waitUntilReady, unmount } = renderWithProviders(
+    const { waitUntilReady, unmount } = await renderWithProviders(
       <BannedAccountDialog
         accountSuspensionInfo={DEFAULT_SUSPENSION_INFO}
         onExit={onExit}
@@ -196,7 +196,7 @@ describe('BannedAccountDialog', () => {
   });
 
   it('calls onChangeAuth when "Change authentication" is selected', async () => {
-    const { waitUntilReady, unmount } = renderWithProviders(
+    const { waitUntilReady, unmount } = await renderWithProviders(
       <BannedAccountDialog
         accountSuspensionInfo={DEFAULT_SUSPENSION_INFO}
         onExit={onExit}
@@ -212,7 +212,7 @@ describe('BannedAccountDialog', () => {
   });
 
   it('exits on escape key', async () => {
-    const { waitUntilReady, unmount } = renderWithProviders(
+    const { waitUntilReady, unmount } = await renderWithProviders(
       <BannedAccountDialog
         accountSuspensionInfo={DEFAULT_SUSPENSION_INFO}
         onExit={onExit}
@@ -227,7 +227,7 @@ describe('BannedAccountDialog', () => {
   });
 
   it('renders snapshot correctly', async () => {
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <BannedAccountDialog
         accountSuspensionInfo={DEFAULT_SUSPENSION_INFO}
         onExit={onExit}

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

@@ -36,10 +36,12 @@ describe('aboutCommand', () => {
   beforeEach(() => {
     mockContext = createMockCommandContext({
       services: {
-        config: {
-          getModel: vi.fn(),
-          getIdeMode: vi.fn().mockReturnValue(true),
-          getUserTierName: vi.fn().mockReturnValue(undefined),
+        agentContext: {
+          config: {
+            getModel: vi.fn(),
+            getIdeMode: vi.fn().mockReturnValue(true),
+            getUserTierName: vi.fn().mockReturnValue(undefined),
+          },
         },
         settings: {
           merged: {
@@ -57,9 +59,10 @@ describe('aboutCommand', () => {
     } as unknown as CommandContext);
 
     vi.mocked(getVersion).mockResolvedValue('test-version');
-    vi.spyOn(mockContext.services.config!, 'getModel').mockReturnValue(
-      'test-model',
-    );
+    vi.spyOn(
+      mockContext.services.agentContext!.config,
+      'getModel',
+    ).mockReturnValue('test-model');
     process.env['GOOGLE_CLOUD_PROJECT'] = 'test-gcp-project';
     Object.defineProperty(process, 'platform', {
       value: 'test-os',
@@ -160,9 +163,9 @@ describe('aboutCommand', () => {
   });
 
   it('should display the tier when getUserTierName returns a value', async () => {
-    vi.mocked(mockContext.services.config!.getUserTierName).mockReturnValue(
-      'Enterprise Tier',
-    );
+    vi.mocked(
+      mockContext.services.agentContext!.config.getUserTierName,
+    ).mockReturnValue('Enterprise Tier');
     if (!aboutCommand.action) {
       throw new Error('The about command must have an action.');
     }

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

@@ -34,7 +34,8 @@ export const aboutCommand: SlashCommand = {
         process.env['SEATBELT_PROFILE'] || 'unknown'
       })`;
     }
-    const modelVersion = context.services.config?.getModel() || 'Unknown';
+    const modelVersion =
+      context.services.agentContext?.config.getModel() || 'Unknown';
     const cliVersion = await getVersion();
     const selectedAuthType =
       context.services.settings.merged.security.auth.selectedType || '';
@@ -48,7 +49,7 @@ export const aboutCommand: SlashCommand = {
     });
     const userEmail = cachedAccount ?? undefined;
 
-    const tier = context.services.config?.getUserTierName();
+    const tier = context.services.agentContext?.config.getUserTierName();
 
     const aboutItem: Omit<HistoryItemAbout, 'id'> = {
       type: MessageType.ABOUT,
@@ -68,7 +69,7 @@ export const aboutCommand: SlashCommand = {
 };
 
 async function getIdeClientName(context: CommandContext) {
-  if (!context.services.config?.getIdeMode()) {
+  if (!context.services.agentContext?.config.getIdeMode()) {
     return '';
   }
   const ideClient = await IdeClient.getInstance();

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

@@ -26,6 +26,7 @@ describe('agentsCommand', () => {
   let mockContext: ReturnType<typeof createMockCommandContext>;
   let mockConfig: {
     getAgentRegistry: ReturnType<typeof vi.fn>;
+    config: Config;
   };
 
   beforeEach(() => {
@@ -37,11 +38,14 @@ describe('agentsCommand', () => {
         getAllAgentNames: vi.fn().mockReturnValue([]),
         reload: vi.fn(),
       }),
+      get config() {
+        return this as unknown as Config;
+      },
     };
 
     mockContext = createMockCommandContext({
       services: {
-        config: mockConfig as unknown as Config,
+        agentContext: mockConfig as unknown as Config,
         settings: {
           workspace: { path: '/mock/path' },
           merged: { agents: { overrides: {} } },
@@ -53,7 +57,7 @@ describe('agentsCommand', () => {
   it('should show an error if config is not available', async () => {
     const contextWithoutConfig = createMockCommandContext({
       services: {
-        config: null,
+        agentContext: null,
       },
     });
 
@@ -226,7 +230,7 @@ describe('agentsCommand', () => {
 
   it('should show an error if config is not available for enable', async () => {
     const contextWithoutConfig = createMockCommandContext({
-      services: { config: null },
+      services: { agentContext: null },
     });
     const enableCommand = agentsCommand.subCommands?.find(
       (cmd) => cmd.name === 'enable',
@@ -332,7 +336,7 @@ describe('agentsCommand', () => {
 
   it('should show an error if config is not available for disable', async () => {
     const contextWithoutConfig = createMockCommandContext({
-      services: { config: null },
+      services: { agentContext: null },
     });
     const disableCommand = agentsCommand.subCommands?.find(
       (cmd) => cmd.name === 'disable',
@@ -433,7 +437,7 @@ describe('agentsCommand', () => {
 
     it('should show an error if config is not available', async () => {
       const contextWithoutConfig = createMockCommandContext({
-        services: { config: null },
+        services: { agentContext: null },
       });
       const configCommand = agentsCommand.subCommands?.find(
         (cmd) => cmd.name === 'config',

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

@@ -21,7 +21,7 @@ const agentsListCommand: SlashCommand = {
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: async (context: CommandContext) => {
-    const { config } = context.services;
+    const config = context.services.agentContext?.config;
     if (!config) {
       return {
         type: 'message',
@@ -61,7 +61,8 @@ async function enableAction(
   context: CommandContext,
   args: string,
 ): Promise<SlashCommandActionReturn | void> {
-  const { config, settings } = context.services;
+  const config = context.services.agentContext?.config;
+  const { settings } = context.services;
   if (!config) {
     return {
       type: 'message',
@@ -137,7 +138,8 @@ async function disableAction(
   context: CommandContext,
   args: string,
 ): Promise<SlashCommandActionReturn | void> {
-  const { config, settings } = context.services;
+  const config = context.services.agentContext?.config;
+  const { settings } = context.services;
   if (!config) {
     return {
       type: 'message',
@@ -216,7 +218,7 @@ async function configAction(
   context: CommandContext,
   args: string,
 ): Promise<SlashCommandActionReturn | void> {
-  const { config } = context.services;
+  const config = context.services.agentContext?.config;
   if (!config) {
     return {
       type: 'message',
@@ -266,7 +268,8 @@ async function configAction(
 }
 
 function completeAgentsToEnable(context: CommandContext, partialArg: string) {
-  const { config, settings } = context.services;
+  const config = context.services.agentContext?.config;
+  const { settings } = context.services;
   if (!config) return [];
 
   const overrides = settings.merged.agents.overrides;
@@ -278,7 +281,7 @@ function completeAgentsToEnable(context: CommandContext, partialArg: string) {
 }
 
 function completeAgentsToDisable(context: CommandContext, partialArg: string) {
-  const { config } = context.services;
+  const config = context.services.agentContext?.config;
   if (!config) return [];
 
   const agentRegistry = config.getAgentRegistry();
@@ -287,7 +290,7 @@ function completeAgentsToDisable(context: CommandContext, partialArg: string) {
 }
 
 function completeAllAgents(context: CommandContext, partialArg: string) {
-  const { config } = context.services;
+  const config = context.services.agentContext?.config;
   if (!config) return [];
 
   const agentRegistry = config.getAgentRegistry();
@@ -328,7 +331,7 @@ const agentsReloadCommand: SlashCommand = {
   description: 'Reload the agent registry',
   kind: CommandKind.BUILT_IN,
   action: async (context: CommandContext) => {
-    const { config } = context.services;
+    const config = context.services.agentContext?.config;
     const agentRegistry = config?.getAgentRegistry();
     if (!agentRegistry) {
       return {

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

@@ -9,6 +9,7 @@ import { authCommand } from './authCommand.js';
 import { type CommandContext } from './types.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
 import { SettingScope } from '../../config/settings.js';
+import type { GeminiClient } from '@google/gemini-cli-core';
 
 vi.mock('@google/gemini-cli-core', async () => {
   const actual = await vi.importActual('@google/gemini-cli-core');
@@ -24,8 +25,10 @@ describe('authCommand', () => {
   beforeEach(() => {
     mockContext = createMockCommandContext({
       services: {
-        config: {
-          getGeminiClient: vi.fn(),
+        agentContext: {
+          geminiClient: {
+            stripThoughtsFromHistory: vi.fn(),
+          },
         },
       },
     });
@@ -101,17 +104,19 @@ describe('authCommand', () => {
       const mockStripThoughts = vi.fn();
       const mockClient = {
         stripThoughtsFromHistory: mockStripThoughts,
-      } as unknown as ReturnType<
-        NonNullable<typeof mockContext.services.config>['getGeminiClient']
-      >;
-
-      if (mockContext.services.config) {
-        mockContext.services.config.getGeminiClient = vi.fn(() => mockClient);
+      } as unknown as GeminiClient;
+      if (mockContext.services.agentContext?.config) {
+        mockContext.services.agentContext.config.getGeminiClient = vi.fn(
+          () => mockClient,
+        );
       }
 
       await logoutCommand!.action!(mockContext, '');
 
-      expect(mockStripThoughts).toHaveBeenCalled();
+      expect(
+        mockContext.services.agentContext?.geminiClient
+          .stripThoughtsFromHistory,
+      ).toHaveBeenCalled();
     });
 
     it('should return logout action to signal explicit state change', async () => {
@@ -123,7 +128,7 @@ describe('authCommand', () => {
 
     it('should handle missing config gracefully', async () => {
       const logoutCommand = authCommand.subCommands?.[1];
-      mockContext.services.config = null;
+      mockContext.services.agentContext = null;
 
       const result = await logoutCommand!.action!(mockContext, '');
 

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

@@ -39,7 +39,7 @@ const authLogoutCommand: SlashCommand = {
       undefined,
     );
     // Strip thoughts from history instead of clearing completely
-    context.services.config?.getGeminiClient()?.stripThoughtsFromHistory();
+    context.services.agentContext?.geminiClient.stripThoughtsFromHistory();
     // Return logout action to signal explicit state change
     return {
       type: 'logout',

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

@@ -83,16 +83,18 @@ describe('bugCommand', () => {
   it('should generate the default GitHub issue URL', async () => {
     const mockContext = createMockCommandContext({
       services: {
-        config: {
-          getModel: () => 'gemini-pro',
-          getBugCommand: () => undefined,
-          getIdeMode: () => true,
-          getGeminiClient: () => ({
+        agentContext: {
+          config: {
+            getModel: () => 'gemini-pro',
+            getBugCommand: () => undefined,
+            getIdeMode: () => true,
+            getContentGeneratorConfig: () => ({ authType: 'oauth-personal' }),
+          },
+          geminiClient: {
             getChat: () => ({
               getHistory: () => [],
             }),
-          }),
-          getContentGeneratorConfig: () => ({ authType: 'oauth-personal' }),
+          },
         },
       },
     });
@@ -126,18 +128,20 @@ describe('bugCommand', () => {
     ];
     const mockContext = createMockCommandContext({
       services: {
-        config: {
-          getModel: () => 'gemini-pro',
-          getBugCommand: () => undefined,
-          getIdeMode: () => true,
-          getGeminiClient: () => ({
+        agentContext: {
+          config: {
+            getModel: () => 'gemini-pro',
+            getBugCommand: () => undefined,
+            getIdeMode: () => true,
+            getContentGeneratorConfig: () => ({ authType: 'vertex-ai' }),
+            storage: {
+              getProjectTempDir: () => '/tmp/gemini',
+            },
+          },
+          geminiClient: {
             getChat: () => ({
               getHistory: () => history,
             }),
-          }),
-          getContentGeneratorConfig: () => ({ authType: 'vertex-ai' }),
-          storage: {
-            getProjectTempDir: () => '/tmp/gemini',
           },
         },
       },
@@ -172,16 +176,18 @@ describe('bugCommand', () => {
       'https://internal.bug-tracker.com/new?desc={title}&details={info}';
     const mockContext = createMockCommandContext({
       services: {
-        config: {
-          getModel: () => 'gemini-pro',
-          getBugCommand: () => ({ urlTemplate: customTemplate }),
-          getIdeMode: () => true,
-          getGeminiClient: () => ({
+        agentContext: {
+          config: {
+            getModel: () => 'gemini-pro',
+            getBugCommand: () => ({ urlTemplate: customTemplate }),
+            getIdeMode: () => true,
+            getContentGeneratorConfig: () => ({ authType: 'vertex-ai' }),
+          },
+          geminiClient: {
             getChat: () => ({
               getHistory: () => [],
             }),
-          }),
-          getContentGeneratorConfig: () => ({ authType: 'vertex-ai' }),
+          },
         },
       },
     });

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

@@ -32,8 +32,8 @@ export const bugCommand: SlashCommand = {
   autoExecute: false,
   action: async (context: CommandContext, args?: string): Promise<void> => {
     const bugDescription = (args || '').trim();
-    const { config } = context.services;
-
+    const agentContext = context.services.agentContext;
+    const config = agentContext?.config;
     const osVersion = `${process.platform} ${process.version}`;
     let sandboxEnv = 'no sandbox';
     if (process.env['SANDBOX'] && process.env['SANDBOX'] !== 'sandbox-exec') {
@@ -73,7 +73,7 @@ export const bugCommand: SlashCommand = {
       info += `* **IDE Client:** ${ideClient}\n`;
     }
 
-    const chat = config?.getGeminiClient()?.getChat();
+    const chat = agentContext?.geminiClient?.getChat();
     const history = chat?.getHistory() || [];
     let historyFileMessage = '';
     let problemValue = bugDescription;
@@ -134,7 +134,7 @@ export const bugCommand: SlashCommand = {
 };
 
 async function getIdeClientName(context: CommandContext) {
-  if (!context.services.config?.getIdeMode()) {
+  if (!context.services.agentContext?.config.getIdeMode()) {
     return '';
   }
   const ideClient = await IdeClient.getInstance();

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

@@ -70,18 +70,19 @@ describe('chatCommand', () => {
 
     mockContext = createMockCommandContext({
       services: {
-        config: {
-          getProjectRoot: () => '/project/root',
-          getGeminiClient: () =>
-            ({
-              getChat: mockGetChat,
-            }) as unknown as GeminiClient,
-          storage: {
-            getProjectTempDir: () => '/project/root/.gemini/tmp/mockhash',
+        agentContext: {
+          config: {
+            getProjectRoot: () => '/project/root',
+            getContentGeneratorConfig: () => ({
+              authType: AuthType.LOGIN_WITH_GOOGLE,
+            }),
+            storage: {
+              getProjectTempDir: () => '/project/root/.gemini/tmp/mockhash',
+            },
           },
-          getContentGeneratorConfig: () => ({
-            authType: AuthType.LOGIN_WITH_GOOGLE,
-          }),
+          geminiClient: {
+            getChat: mockGetChat,
+          } as unknown as GeminiClient,
         },
         logger: {
           saveCheckpoint: mockSaveCheckpoint,
@@ -698,7 +699,11 @@ Hi there!`;
 
       beforeEach(() => {
         mockGetLatestApiRequest = vi.fn();
-        mockContext.services.config!.getLatestApiRequest =
+        if (!mockContext.services.agentContext!.config) {
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          (mockContext.services.agentContext!.config as any) = {};
+        }
+        mockContext.services.agentContext!.config.getLatestApiRequest =
           mockGetLatestApiRequest;
         vi.spyOn(process, 'cwd').mockReturnValue('/project/root');
         vi.spyOn(Date, 'now').mockReturnValue(1234567890);

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

@@ -35,7 +35,7 @@ const getSavedChatTags = async (
   context: CommandContext,
   mtSortDesc: boolean,
 ): Promise<ChatDetail[]> => {
-  const cfg = context.services.config;
+  const cfg = context.services.agentContext?.config;
   const geminiDir = cfg?.storage?.getProjectTempDir();
   if (!geminiDir) {
     return [];
@@ -103,7 +103,8 @@ const saveCommand: SlashCommand = {
       };
     }
 
-    const { logger, config } = context.services;
+    const { logger } = context.services;
+    const config = context.services.agentContext?.config;
     await logger.initialize();
 
     if (!context.overwriteConfirmed) {
@@ -125,7 +126,7 @@ const saveCommand: SlashCommand = {
       }
     }
 
-    const chat = config?.getGeminiClient()?.getChat();
+    const chat = context.services.agentContext?.geminiClient?.getChat();
     if (!chat) {
       return {
         type: 'message',
@@ -172,7 +173,8 @@ const resumeCheckpointCommand: SlashCommand = {
       };
     }
 
-    const { logger, config } = context.services;
+    const { logger } = context.services;
+    const config = context.services.agentContext?.config;
     await logger.initialize();
     const checkpoint = await logger.loadCheckpoint(tag);
     const conversation = checkpoint.history;
@@ -298,7 +300,7 @@ const shareCommand: SlashCommand = {
       };
     }
 
-    const chat = context.services.config?.getGeminiClient()?.getChat();
+    const chat = context.services.agentContext?.geminiClient?.getChat();
     if (!chat) {
       return {
         type: 'message',
@@ -344,7 +346,7 @@ export const debugCommand: SlashCommand = {
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: async (context): Promise<MessageActionReturn> => {
-    const req = context.services.config?.getLatestApiRequest();
+    const req = context.services.agentContext?.config.getLatestApiRequest();
     if (!req) {
       return {
         type: 'message',

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

@@ -36,24 +36,25 @@ describe('clearCommand', () => {
 
     mockContext = createMockCommandContext({
       services: {
-        config: {
-          getGeminiClient: () =>
-            ({
-              resetChat: mockResetChat,
-              getChat: () => ({
-                getChatRecordingService: mockGetChatRecordingService,
-              }),
-            }) as unknown as GeminiClient,
-          setSessionId: vi.fn(),
-          getEnableHooks: vi.fn().mockReturnValue(false),
-          getMessageBus: vi.fn().mockReturnValue(undefined),
-          getHookSystem: vi.fn().mockReturnValue({
-            fireSessionEndEvent: vi.fn().mockResolvedValue(undefined),
-            fireSessionStartEvent: vi.fn().mockResolvedValue(undefined),
-          }),
-          injectionService: {
-            clear: mockHintClear,
+        agentContext: {
+          config: {
+            getEnableHooks: vi.fn().mockReturnValue(false),
+            setSessionId: vi.fn(),
+            getMessageBus: vi.fn().mockReturnValue(undefined),
+            getHookSystem: vi.fn().mockReturnValue({
+              fireSessionEndEvent: vi.fn().mockResolvedValue(undefined),
+              fireSessionStartEvent: vi.fn().mockResolvedValue(undefined),
+            }),
+            injectionService: {
+              clear: mockHintClear,
+            },
           },
+          geminiClient: {
+            resetChat: mockResetChat,
+            getChat: () => ({
+              getChatRecordingService: mockGetChatRecordingService,
+            }),
+          } as unknown as GeminiClient,
         },
       },
     });
@@ -98,7 +99,7 @@ describe('clearCommand', () => {
 
     const nullConfigContext = createMockCommandContext({
       services: {
-        config: null,
+        agentContext: null,
       },
     });
 

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

@@ -20,8 +20,8 @@ export const clearCommand: SlashCommand = {
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: async (context, _args) => {
-    const geminiClient = context.services.config?.getGeminiClient();
-    const config = context.services.config;
+    const geminiClient = context.services.agentContext?.geminiClient;
+    const config = context.services.agentContext?.config;
 
     // Fire SessionEnd hook before clearing
     const hookSystem = config?.getHookSystem();

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

@@ -22,11 +22,10 @@ describe('compressCommand', () => {
     mockTryCompressChat = vi.fn();
     context = createMockCommandContext({
       services: {
-        config: {
-          getGeminiClient: () =>
-            ({
-              tryCompressChat: mockTryCompressChat,
-            }) as unknown as GeminiClient,
+        agentContext: {
+          geminiClient: {
+            tryCompressChat: mockTryCompressChat,
+          } as unknown as GeminiClient,
         },
       },
     });

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

@@ -39,9 +39,11 @@ export const compressCommand: SlashCommand = {
     try {
       ui.setPendingItem(pendingMessage);
       const promptId = `compress-${Date.now()}`;
-      const compressed = await context.services.config
-        ?.getGeminiClient()
-        ?.tryCompressChat(promptId, true);
+      const compressed =
+        await context.services.agentContext?.geminiClient?.tryCompressChat(
+          promptId,
+          true,
+        );
       if (compressed) {
         ui.addItem(
           {

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

@@ -29,10 +29,10 @@ describe('copyCommand', () => {
 
     mockContext = createMockCommandContext({
       services: {
-        config: {
-          getGeminiClient: () => ({
+        agentContext: {
+          geminiClient: {
             getChat: mockGetChat,
-          }),
+          },
         },
       },
     });
@@ -301,7 +301,7 @@ describe('copyCommand', () => {
     if (!copyCommand.action) throw new Error('Command has no action');
 
     const nullConfigContext = createMockCommandContext({
-      services: { config: null },
+      services: { agentContext: null },
     });
 
     const result = await copyCommand.action(nullConfigContext, '');

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

@@ -18,7 +18,7 @@ export const copyCommand: SlashCommand = {
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: async (context, _args): Promise<SlashCommandActionReturn | void> => {
-    const chat = context.services.config?.getGeminiClient()?.getChat();
+    const chat = context.services.agentContext?.geminiClient?.getChat();
     const history = chat?.getHistory();
 
     // Get the last message from the AI (model role)

packages/cli/src/ui/commands/directoryCommand.test.tsx

@@ -85,11 +85,14 @@ describe('directoryCommand', () => {
       getFileFilteringOptions: () => ({ ignore: [], include: [] }),
       setUserMemory: vi.fn(),
       setGeminiMdFileCount: vi.fn(),
+      get config() {
+        return this;
+      },
     } as unknown as Config;
 
     mockContext = {
       services: {
-        config: mockConfig,
+        agentContext: mockConfig,
         settings: {
           merged: {
             memoryDiscoveryMaxDirs: 1000,

packages/cli/src/ui/commands/directoryCommand.tsx

@@ -60,7 +60,7 @@ async function finishAddingDirectories(
   }
 
   if (added.length > 0) {
-    const gemini = config.getGeminiClient();
+    const gemini = config.geminiClient;
     if (gemini) {
       await gemini.addDirectoryContext();
 
@@ -110,9 +110,9 @@ export const directoryCommand: SlashCommand = {
 
         // Filter out existing directories
         let filteredSuggestions = suggestions;
-        if (context.services.config) {
+        if (context.services.agentContext?.config) {
           const workspaceContext =
-            context.services.config.getWorkspaceContext();
+            context.services.agentContext.config.getWorkspaceContext();
           const existingDirs = new Set(
             workspaceContext.getDirectories().map((dir) => path.resolve(dir)),
           );
@@ -144,11 +144,11 @@ export const directoryCommand: SlashCommand = {
       action: async (context: CommandContext, args: string) => {
         const {
           ui: { addItem },
-          services: { config, settings },
+          services: { agentContext, settings },
         } = context;
         const [...rest] = args.split(' ');
 
-        if (!config) {
+        if (!agentContext) {
           addItem({
             type: MessageType.ERROR,
             text: 'Configuration is not available.',
@@ -156,7 +156,7 @@ export const directoryCommand: SlashCommand = {
           return;
         }
 
-        if (config.isRestrictiveSandbox()) {
+        if (agentContext.config.isRestrictiveSandbox()) {
           return {
             type: 'message' as const,
             messageType: 'error' as const,
@@ -181,7 +181,7 @@ export const directoryCommand: SlashCommand = {
         const errors: string[] = [];
         const alreadyAdded: string[] = [];
 
-        const workspaceContext = config.getWorkspaceContext();
+        const workspaceContext = agentContext.config.getWorkspaceContext();
         const currentWorkspaceDirs = workspaceContext.getDirectories();
         const pathsToProcess: string[] = [];
 
@@ -252,7 +252,7 @@ export const directoryCommand: SlashCommand = {
                   trustedDirs={added}
                   errors={errors}
                   finishAddingDirectories={finishAddingDirectories}
-                  config={config}
+                  config={agentContext.config}
                   addItem={addItem}
                 />
               ),
@@ -264,7 +264,12 @@ export const directoryCommand: SlashCommand = {
           errors.push(...result.errors);
         }
 
-        await finishAddingDirectories(config, addItem, added, errors);
+        await finishAddingDirectories(
+          agentContext.config,
+          addItem,
+          added,
+          errors,
+        );
         return;
       },
     },
@@ -275,16 +280,16 @@ export const directoryCommand: SlashCommand = {
       action: async (context: CommandContext) => {
         const {
           ui: { addItem },
-          services: { config },
+          services: { agentContext },
         } = context;
-        if (!config) {
+        if (!agentContext) {
           addItem({
             type: MessageType.ERROR,
             text: 'Configuration is not available.',
           });
           return;
         }
-        const workspaceContext = config.getWorkspaceContext();
+        const workspaceContext = agentContext.config.getWorkspaceContext();
         const directories = workspaceContext.getDirectories();
         const directoryList = directories.map((dir) => `- ${dir}`).join('\n');
         addItem({

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

@@ -161,14 +161,16 @@ describe('extensionsCommand', () => {
 
     mockContext = createMockCommandContext({
       services: {
-        config: {
-          getExtensions: mockGetExtensions,
-          getExtensionLoader: vi.fn().mockReturnValue(mockExtensionLoader),
-          getWorkingDir: () => '/test/dir',
-          reloadSkills: mockReloadSkills,
-          getAgentRegistry: vi.fn().mockReturnValue({
-            reload: mockReloadAgents,
-          }),
+        agentContext: {
+          config: {
+            getExtensions: mockGetExtensions,
+            getExtensionLoader: vi.fn().mockReturnValue(mockExtensionLoader),
+            getWorkingDir: () => '/test/dir',
+            reloadSkills: mockReloadSkills,
+            getAgentRegistry: vi.fn().mockReturnValue({
+              reload: mockReloadAgents,
+            }),
+          },
         },
       },
       ui: {
@@ -917,7 +919,7 @@ describe('extensionsCommand', () => {
       expect(restartAction).not.toBeNull();
 
       mockRestartExtension = vi.fn();
-      mockContext.services.config!.getExtensionLoader = vi
+      mockContext.services.agentContext!.config.getExtensionLoader = vi
         .fn()
         .mockImplementation(() => ({
           getExtensions: mockGetExtensions,
@@ -927,7 +929,7 @@ describe('extensionsCommand', () => {
     });
 
     it('should show a message if no extensions are installed', async () => {
-      mockContext.services.config!.getExtensionLoader = vi
+      mockContext.services.agentContext!.config.getExtensionLoader = vi
         .fn()
         .mockImplementation(() => ({
           getExtensions: () => [],
@@ -1017,7 +1019,7 @@ describe('extensionsCommand', () => {
     });
 
     it('shows an error if no extension loader is available', async () => {
-      mockContext.services.config!.getExtensionLoader = vi.fn();
+      mockContext.services.agentContext!.config.getExtensionLoader = vi.fn();
 
       await restartAction!(mockContext, '--all');
 

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

@@ -54,8 +54,8 @@ function showMessageIfNoExtensions(
 }
 
 async function listAction(context: CommandContext) {
-  const extensions = context.services.config
-    ? listExtensions(context.services.config)
+  const extensions = context.services.agentContext?.config
+    ? listExtensions(context.services.agentContext.config)
     : [];
 
   if (showMessageIfNoExtensions(context, extensions)) {
@@ -88,8 +88,8 @@ function updateAction(context: CommandContext, args: string): Promise<void> {
     (resolve) => (resolveUpdateComplete = resolve),
   );
 
-  const extensions = context.services.config
-    ? listExtensions(context.services.config)
+  const extensions = context.services.agentContext?.config
+    ? listExtensions(context.services.agentContext.config)
     : [];
 
   if (showMessageIfNoExtensions(context, extensions)) {
@@ -128,7 +128,7 @@ function updateAction(context: CommandContext, args: string): Promise<void> {
       },
     });
     if (names?.length) {
-      const extensions = listExtensions(context.services.config!);
+      const extensions = listExtensions(context.services.agentContext!.config);
       for (const name of names) {
         const extension = extensions.find(
           (extension) => extension.name === name,
@@ -156,7 +156,8 @@ async function restartAction(
   context: CommandContext,
   args: string,
 ): Promise<void> {
-  const extensionLoader = context.services.config?.getExtensionLoader();
+  const extensionLoader =
+    context.services.agentContext?.config.getExtensionLoader();
   if (!extensionLoader) {
     context.ui.addItem({
       type: MessageType.ERROR,
@@ -235,8 +236,8 @@ async function restartAction(
 
   if (failures.length < extensionsToRestart.length) {
     try {
-      await context.services.config?.reloadSkills();
-      await context.services.config?.getAgentRegistry()?.reload();
+      await context.services.agentContext?.config.reloadSkills();
+      await context.services.agentContext?.config.getAgentRegistry()?.reload();
     } catch (error) {
       context.ui.addItem({
         type: MessageType.ERROR,
@@ -274,7 +275,8 @@ async function exploreAction(
   const useRegistryUI = settings.experimental?.extensionRegistry;
 
   if (useRegistryUI) {
-    const extensionManager = context.services.config?.getExtensionLoader();
+    const extensionManager =
+      context.services.agentContext?.config.getExtensionLoader();
     if (extensionManager instanceof ExtensionManager) {
       return {
         type: 'custom_dialog' as const,
@@ -331,7 +333,8 @@ function getEnableDisableContext(
   names: string[];
   scope: SettingScope;
 } | null {
-  const extensionLoader = context.services.config?.getExtensionLoader();
+  const extensionLoader =
+    context.services.agentContext?.config.getExtensionLoader();
   if (!(extensionLoader instanceof ExtensionManager)) {
     debugLogger.error(
       `Cannot ${context.invocation?.name} extensions in this environment`,
@@ -431,7 +434,8 @@ async function enableAction(context: CommandContext, args: string) {
 
     if (extension?.mcpServers) {
       const mcpEnablementManager = McpServerEnablementManager.getInstance();
-      const mcpClientManager = context.services.config?.getMcpClientManager();
+      const mcpClientManager =
+        context.services.agentContext?.config.getMcpClientManager();
       const enabledServers = await mcpEnablementManager.autoEnableServers(
         Object.keys(extension.mcpServers ?? {}),
       );
@@ -463,7 +467,8 @@ async function installAction(
   args: string,
   requestConsentOverride?: (consent: string) => Promise<boolean>,
 ) {
-  const extensionLoader = context.services.config?.getExtensionLoader();
+  const extensionLoader =
+    context.services.agentContext?.config.getExtensionLoader();
   if (!(extensionLoader instanceof ExtensionManager)) {
     debugLogger.error(
       `Cannot ${context.invocation?.name} extensions in this environment`,
@@ -529,7 +534,8 @@ async function installAction(
 }
 
 async function linkAction(context: CommandContext, args: string) {
-  const extensionLoader = context.services.config?.getExtensionLoader();
+  const extensionLoader =
+    context.services.agentContext?.config.getExtensionLoader();
   if (!(extensionLoader instanceof ExtensionManager)) {
     debugLogger.error(
       `Cannot ${context.invocation?.name} extensions in this environment`,
@@ -593,7 +599,8 @@ async function linkAction(context: CommandContext, args: string) {
 }
 
 async function uninstallAction(context: CommandContext, args: string) {
-  const extensionLoader = context.services.config?.getExtensionLoader();
+  const extensionLoader =
+    context.services.agentContext?.config.getExtensionLoader();
   if (!(extensionLoader instanceof ExtensionManager)) {
     debugLogger.error(
       `Cannot ${context.invocation?.name} extensions in this environment`,
@@ -692,7 +699,8 @@ async function configAction(context: CommandContext, args: string) {
     }
   }
 
-  const extensionManager = context.services.config?.getExtensionLoader();
+  const extensionManager =
+    context.services.agentContext?.config.getExtensionLoader();
   if (!(extensionManager instanceof ExtensionManager)) {
     debugLogger.error(
       `Cannot ${context.invocation?.name} extensions in this environment`,
@@ -729,7 +737,7 @@ export function completeExtensions(
   context: CommandContext,
   partialArg: string,
 ) {
-  let extensions = context.services.config?.getExtensions() ?? [];
+  let extensions = context.services.agentContext?.config.getExtensions() ?? [];
 
   if (context.invocation?.name === 'enable') {
     extensions = extensions.filter((ext) => !ext.isActive);

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

@@ -93,7 +93,7 @@ describe('hooksCommand', () => {
     // Create mock context with config and settings
     mockContext = createMockCommandContext({
       services: {
-        config: mockConfig,
+        agentContext: { config: mockConfig },
         settings: mockSettings,
       },
     });
@@ -141,7 +141,7 @@ describe('hooksCommand', () => {
     it('should return error when config is not loaded', async () => {
       const contextWithoutConfig = createMockCommandContext({
         services: {
-          config: null,
+          agentContext: null,
         },
       });
 
@@ -225,7 +225,7 @@ describe('hooksCommand', () => {
     it('should return error when config is not loaded', async () => {
       const contextWithoutConfig = createMockCommandContext({
         services: {
-          config: null,
+          agentContext: null,
         },
       });
 
@@ -338,7 +338,7 @@ describe('hooksCommand', () => {
     it('should return error when config is not loaded', async () => {
       const contextWithoutConfig = createMockCommandContext({
         services: {
-          config: null,
+          agentContext: null,
         },
       });
 
@@ -470,7 +470,7 @@ describe('hooksCommand', () => {
     it('should return empty array when config is not available', () => {
       const contextWithoutConfig = createMockCommandContext({
         services: {
-          config: null,
+          agentContext: null,
         },
       });
 
@@ -567,7 +567,7 @@ describe('hooksCommand', () => {
     it('should return error when config is not loaded', async () => {
       const contextWithoutConfig = createMockCommandContext({
         services: {
-          config: null,
+          agentContext: null,
         },
       });
 
@@ -691,7 +691,7 @@ describe('hooksCommand', () => {
     it('should return error when config is not loaded', async () => {
       const contextWithoutConfig = createMockCommandContext({
         services: {
-          config: null,
+          agentContext: null,
         },
       });
 

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

@@ -27,7 +27,8 @@ import { HooksDialog } from '../components/HooksDialog.js';
 function panelAction(
   context: CommandContext,
 ): MessageActionReturn | OpenCustomDialogActionReturn {
-  const { config } = context.services;
+  const agentContext = context.services.agentContext;
+  const config = agentContext?.config;
   if (!config) {
     return {
       type: 'message',
@@ -55,7 +56,8 @@ async function enableAction(
   context: CommandContext,
   args: string,
 ): Promise<void | MessageActionReturn> {
-  const { config } = context.services;
+  const agentContext = context.services.agentContext;
+  const config = agentContext?.config;
   if (!config) {
     return {
       type: 'message',
@@ -108,7 +110,8 @@ async function disableAction(
   context: CommandContext,
   args: string,
 ): Promise<void | MessageActionReturn> {
-  const { config } = context.services;
+  const agentContext = context.services.agentContext;
+  const config = agentContext?.config;
   if (!config) {
     return {
       type: 'message',
@@ -163,7 +166,8 @@ function completeEnabledHookNames(
   context: CommandContext,
   partialArg: string,
 ): string[] {
-  const { config } = context.services;
+  const agentContext = context.services.agentContext;
+  const config = agentContext?.config;
   if (!config) return [];
 
   const hookSystem = config.getHookSystem();
@@ -183,7 +187,8 @@ function completeDisabledHookNames(
   context: CommandContext,
   partialArg: string,
 ): string[] {
-  const { config } = context.services;
+  const agentContext = context.services.agentContext;
+  const config = agentContext?.config;
   if (!config) return [];
 
   const hookSystem = config.getHookSystem();
@@ -209,7 +214,8 @@ function getHookDisplayName(hook: HookRegistryEntry): string {
 async function enableAllAction(
   context: CommandContext,
 ): Promise<void | MessageActionReturn> {
-  const { config } = context.services;
+  const agentContext = context.services.agentContext;
+  const config = agentContext?.config;
   if (!config) {
     return {
       type: 'message',
@@ -280,7 +286,8 @@ async function enableAllAction(
 async function disableAllAction(
   context: CommandContext,
 ): Promise<void | MessageActionReturn> {
-  const { config } = context.services;
+  const agentContext = context.services.agentContext;
+  const config = agentContext?.config;
   if (!config) {
     return {
       type: 'message',

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

@@ -60,10 +60,12 @@ describe('ideCommand', () => {
         settings: {
           setValue: vi.fn(),
         },
-        config: {
-          getIdeMode: vi.fn(),
-          setIdeMode: vi.fn(),
-          getUsageStatisticsEnabled: vi.fn().mockReturnValue(false),
+        agentContext: {
+          config: {
+            getIdeMode: vi.fn(),
+            setIdeMode: vi.fn(),
+            getUsageStatisticsEnabled: vi.fn().mockReturnValue(false),
+          },
         },
       },
     } as unknown as CommandContext;

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

@@ -217,9 +217,13 @@ export const ideCommand = async (): Promise<SlashCommand> => {
         );
         // Poll for up to 5 seconds for the extension to activate.
         for (let i = 0; i < 10; i++) {
-          await setIdeModeAndSyncConnection(context.services.config!, true, {
-            logToConsole: false,
-          });
+          await setIdeModeAndSyncConnection(
+            context.services.agentContext!.config,
+            true,
+            {
+              logToConsole: false,
+            },
+          );
           if (
             ideClient.getConnectionStatus().status ===
             IDEConnectionStatus.Connected
@@ -262,7 +266,10 @@ export const ideCommand = async (): Promise<SlashCommand> => {
         'ide.enabled',
         true,
       );
-      await setIdeModeAndSyncConnection(context.services.config!, true);
+      await setIdeModeAndSyncConnection(
+        context.services.agentContext!.config,
+        true,
+      );
       const { messageType, content } = getIdeStatusMessage(ideClient);
       context.ui.addItem(
         {
@@ -285,7 +292,10 @@ export const ideCommand = async (): Promise<SlashCommand> => {
         'ide.enabled',
         false,
       );
-      await setIdeModeAndSyncConnection(context.services.config!, false);
+      await setIdeModeAndSyncConnection(
+        context.services.agentContext!.config,
+        false,
+      );
       const { messageType, content } = getIdeStatusMessage(ideClient);
       context.ui.addItem(
         {

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

@@ -31,8 +31,10 @@ describe('initCommand', () => {
     // Create a fresh mock context for each test
     mockContext = createMockCommandContext({
       services: {
-        config: {
-          getTargetDir: () => targetDir,
+        agentContext: {
+          config: {
+            getTargetDir: () => targetDir,
+          },
         },
       },
     });
@@ -94,7 +96,7 @@ describe('initCommand', () => {
     // Arrange: Create a context without config
     const noConfigContext = createMockCommandContext();
     if (noConfigContext.services) {
-      noConfigContext.services.config = null;
+      noConfigContext.services.agentContext = null;
     }
 
     // Act: Run the command's action

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

@@ -23,14 +23,14 @@ export const initCommand: SlashCommand = {
     context: CommandContext,
     _args: string,
   ): Promise<SlashCommandActionReturn> => {
-    if (!context.services.config) {
+    if (!context.services.agentContext?.config) {
       return {
         type: 'message',
         messageType: 'error',
         content: 'Configuration not available.',
       };
     }
-    const targetDir = context.services.config.getTargetDir();
+    const targetDir = context.services.agentContext.config.getTargetDir();
     const geminiMdPath = path.join(targetDir, 'GEMINI.md');
 
     const result = performInit(fs.existsSync(geminiMdPath));

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

@@ -119,7 +119,10 @@ describe('mcpCommand', () => {
 
     mockContext = createMockCommandContext({
       services: {
-        config: mockConfig,
+        agentContext: {
+          config: mockConfig,
+          toolRegistry: mockConfig.getToolRegistry(),
+        },
       },
     });
   });
@@ -132,7 +135,7 @@ describe('mcpCommand', () => {
     it('should show an error if config is not available', async () => {
       const contextWithoutConfig = createMockCommandContext({
         services: {
-          config: null,
+          agentContext: null,
         },
       });
 
@@ -146,7 +149,8 @@ describe('mcpCommand', () => {
     });
 
     it('should show an error if tool registry is not available', async () => {
-      mockConfig.getToolRegistry = vi.fn().mockReturnValue(undefined);
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (mockContext.services.agentContext as any).toolRegistry = undefined;
 
       const result = await mcpCommand.action!(mockContext, '');
 
@@ -196,9 +200,13 @@ describe('mcpCommand', () => {
         ...mockServer3Tools,
       ];
 
-      mockConfig.getToolRegistry = vi.fn().mockReturnValue({
+      const mockToolRegistry = {
         getAllTools: vi.fn().mockReturnValue(allTools),
-      });
+      };
+      mockConfig.getToolRegistry = vi.fn().mockReturnValue(mockToolRegistry);
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (mockContext.services.agentContext as any).toolRegistry =
+        mockToolRegistry;
 
       const resourcesByServer: Record<
         string,

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

@@ -42,8 +42,8 @@ const authCommand: SlashCommand = {
     args: string,
   ): Promise<MessageActionReturn> => {
     const serverName = args.trim();
-    const { config } = context.services;
-
+    const agentContext = context.services.agentContext;
+    const config = agentContext?.config;
     if (!config) {
       return {
         type: 'message',
@@ -138,7 +138,7 @@ const authCommand: SlashCommand = {
         await mcpClientManager.restartServer(serverName);
       }
       // Update the client with the new tools
-      const geminiClient = config.getGeminiClient();
+      const geminiClient = context.services.agentContext?.geminiClient;
       if (geminiClient?.isInitialized()) {
         await geminiClient.setTools();
       }
@@ -162,7 +162,8 @@ const authCommand: SlashCommand = {
     }
   },
   completion: async (context: CommandContext, partialArg: string) => {
-    const { config } = context.services;
+    const agentContext = context.services.agentContext;
+    const config = agentContext?.config;
     if (!config) return [];
 
     const mcpServers = config.getMcpClientManager()?.getMcpServers() || {};
@@ -177,7 +178,8 @@ const listAction = async (
   showDescriptions = false,
   showSchema = false,
 ): Promise<void | MessageActionReturn> => {
-  const { config } = context.services;
+  const agentContext = context.services.agentContext;
+  const config = agentContext?.config;
   if (!config) {
     return {
       type: 'message',
@@ -188,7 +190,7 @@ const listAction = async (
 
   config.setUserInteractedWithMcp();
 
-  const toolRegistry = config.getToolRegistry();
+  const toolRegistry = agentContext.toolRegistry;
   if (!toolRegistry) {
     return {
       type: 'message',
@@ -334,7 +336,8 @@ const reloadCommand: SlashCommand = {
   action: async (
     context: CommandContext,
   ): Promise<void | SlashCommandActionReturn> => {
-    const { config } = context.services;
+    const agentContext = context.services.agentContext;
+    const config = agentContext?.config;
     if (!config) {
       return {
         type: 'message',
@@ -360,7 +363,7 @@ const reloadCommand: SlashCommand = {
     await mcpClientManager.restart();
 
     // Update the client with the new tools
-    const geminiClient = config.getGeminiClient();
+    const geminiClient = agentContext.geminiClient;
     if (geminiClient?.isInitialized()) {
       await geminiClient.setTools();
     }
@@ -377,7 +380,8 @@ async function handleEnableDisable(
   args: string,
   enable: boolean,
 ): Promise<MessageActionReturn> {
-  const { config } = context.services;
+  const agentContext = context.services.agentContext;
+  const config = agentContext?.config;
   if (!config) {
     return {
       type: 'message',
@@ -465,8 +469,8 @@ async function handleEnableDisable(
     );
     await mcpClientManager.restart();
   }
-  if (config.getGeminiClient()?.isInitialized())
-    await config.getGeminiClient().setTools();
+  if (agentContext.geminiClient?.isInitialized())
+    await agentContext.geminiClient.setTools();
   context.ui.reloadCommands();
 
   return { type: 'message', messageType: 'info', content: msg };
@@ -477,7 +481,8 @@ async function getEnablementCompletion(
   partialArg: string,
   showEnabled: boolean,
 ): Promise<string[]> {
-  const { config } = context.services;
+  const agentContext = context.services.agentContext;
+  const config = agentContext?.config;
   if (!config) return [];
   const servers = Object.keys(
     config.getMcpClientManager()?.getMcpServers() || {},

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

@@ -102,10 +102,12 @@ describe('memoryCommand', () => {
 
       mockContext = createMockCommandContext({
         services: {
-          config: {
-            getUserMemory: mockGetUserMemory,
-            getGeminiMdFileCount: mockGetGeminiMdFileCount,
-            getExtensionLoader: () => new SimpleExtensionLoader([]),
+          agentContext: {
+            config: {
+              getUserMemory: mockGetUserMemory,
+              getGeminiMdFileCount: mockGetGeminiMdFileCount,
+              getExtensionLoader: () => new SimpleExtensionLoader([]),
+            },
           },
         },
       });
@@ -250,7 +252,7 @@ describe('memoryCommand', () => {
 
       mockContext = createMockCommandContext({
         services: {
-          config: mockConfig,
+          agentContext: { config: mockConfig },
           settings: {
             merged: {
               memoryDiscoveryMaxDirs: 1000,
@@ -268,7 +270,7 @@ describe('memoryCommand', () => {
       if (!reloadCommand.action) throw new Error('Command has no action');
 
       // Enable JIT in mock config
-      const config = mockContext.services.config;
+      const config = mockContext.services.agentContext?.config;
       if (!config) throw new Error('Config is undefined');
 
       vi.mocked(config.isJitContextEnabled).mockReturnValue(true);
@@ -370,7 +372,7 @@ describe('memoryCommand', () => {
       if (!reloadCommand.action) throw new Error('Command has no action');
 
       const nullConfigContext = createMockCommandContext({
-        services: { config: null },
+        services: { agentContext: null },
       });
 
       await expect(
@@ -413,8 +415,10 @@ describe('memoryCommand', () => {
       });
       mockContext = createMockCommandContext({
         services: {
-          config: {
-            getGeminiMdFilePaths: mockGetGeminiMdfilePaths,
+          agentContext: {
+            config: {
+              getGeminiMdFilePaths: mockGetGeminiMdfilePaths,
+            },
           },
         },
       });

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

@@ -29,7 +29,7 @@ export const memoryCommand: SlashCommand = {
       kind: CommandKind.BUILT_IN,
       autoExecute: true,
       action: async (context) => {
-        const config = context.services.config;
+        const config = context.services.agentContext?.config;
         if (!config) return;
         const result = showMemory(config);
 
@@ -81,7 +81,7 @@ export const memoryCommand: SlashCommand = {
         );
 
         try {
-          const config = context.services.config;
+          const config = context.services.agentContext?.config;
           if (config) {
             const result = await refreshMemory(config);
 
@@ -111,7 +111,7 @@ export const memoryCommand: SlashCommand = {
       kind: CommandKind.BUILT_IN,
       autoExecute: true,
       action: async (context) => {
-        const config = context.services.config;
+        const config = context.services.agentContext?.config;
         if (!config) return;
         const result = listMemoryFiles(config);
 

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

@@ -37,8 +37,11 @@ describe('modelCommand', () => {
     }
 
     const mockRefreshUserQuota = vi.fn();
-    mockContext.services.config = {
+    mockContext.services.agentContext = {
       refreshUserQuota: mockRefreshUserQuota,
+      get config() {
+        return this;
+      },
     } as unknown as Config;
 
     await modelCommand.action(mockContext, '');
@@ -66,8 +69,11 @@ describe('modelCommand', () => {
         (c) => c.name === 'manage',
       );
       const mockRefreshUserQuota = vi.fn();
-      mockContext.services.config = {
+      mockContext.services.agentContext = {
         refreshUserQuota: mockRefreshUserQuota,
+        get config() {
+          return this;
+        },
       } as unknown as Config;
 
       await manageCommand!.action!(mockContext, '');
@@ -84,7 +90,7 @@ describe('modelCommand', () => {
       expect(setCommand).toBeDefined();
 
       const mockSetModel = vi.fn();
-      mockContext.services.config = {
+      mockContext.services.agentContext = {
         setModel: mockSetModel,
         getHasAccessToPreviewModel: vi.fn().mockReturnValue(true),
         getUserId: vi.fn().mockReturnValue('test-user'),
@@ -98,6 +104,9 @@ describe('modelCommand', () => {
         getPolicyEngine: vi.fn().mockReturnValue({
           getApprovalMode: vi.fn().mockReturnValue('auto'),
         }),
+        get config() {
+          return this;
+        },
       } as unknown as Config;
 
       await setCommand!.action!(mockContext, 'gemini-pro');
@@ -116,7 +125,7 @@ describe('modelCommand', () => {
         (c) => c.name === 'set',
       );
       const mockSetModel = vi.fn();
-      mockContext.services.config = {
+      mockContext.services.agentContext = {
         setModel: mockSetModel,
         getHasAccessToPreviewModel: vi.fn().mockReturnValue(true),
         getUserId: vi.fn().mockReturnValue('test-user'),
@@ -130,6 +139,9 @@ describe('modelCommand', () => {
         getPolicyEngine: vi.fn().mockReturnValue({
           getApprovalMode: vi.fn().mockReturnValue('auto'),
         }),
+        get config() {
+          return this;
+        },
       } as unknown as Config;
 
       await setCommand!.action!(mockContext, 'gemini-pro --persist');

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

@@ -34,10 +34,10 @@ const setModelCommand: SlashCommand = {
     const modelName = parts[0];
     const persist = parts.includes('--persist');
 
-    if (context.services.config) {
-      context.services.config.setModel(modelName, !persist);
+    if (context.services.agentContext?.config) {
+      context.services.agentContext.config.setModel(modelName, !persist);
       const event = new ModelSlashCommandEvent(modelName);
-      logModelSlashCommand(context.services.config, event);
+      logModelSlashCommand(context.services.agentContext.config, event);
 
       context.ui.addItem({
         type: MessageType.INFO,
@@ -53,8 +53,8 @@ const manageModelCommand: SlashCommand = {
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: async (context: CommandContext) => {
-    if (context.services.config) {
-      await context.services.config.refreshUserQuota();
+    if (context.services.agentContext?.config) {
+      await context.services.agentContext.config.refreshUserQuota();
     }
     return {
       type: 'dialog',

packages/cli/src/ui/commands/oncallCommand.tsx

@@ -24,7 +24,8 @@ export const oncallCommand: SlashCommand = {
       kind: CommandKind.BUILT_IN,
       autoExecute: true,
       action: async (context, args): Promise<OpenCustomDialogActionReturn> => {
-        const { config } = context.services;
+        const agentContext = context.services.agentContext;
+        const config = agentContext?.config;
         if (!config) {
           throw new Error('Config not available');
         }
@@ -56,7 +57,8 @@ export const oncallCommand: SlashCommand = {
       kind: CommandKind.BUILT_IN,
       autoExecute: true,
       action: async (context, args): Promise<OpenCustomDialogActionReturn> => {
-        const { config } = context.services;
+        const agentContext = context.services.agentContext;
+        const config = agentContext?.config;
         if (!config) {
           throw new Error('Config not available');
         }

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

@@ -52,14 +52,16 @@ describe('planCommand', () => {
   beforeEach(() => {
     mockContext = createMockCommandContext({
       services: {
-        config: {
-          isPlanEnabled: vi.fn(),
-          setApprovalMode: vi.fn(),
-          getApprovedPlanPath: vi.fn(),
-          getApprovalMode: vi.fn(),
-          getFileSystemService: vi.fn(),
-          storage: {
-            getPlansDir: vi.fn().mockReturnValue('/mock/plans/dir'),
+        agentContext: {
+          config: {
+            isPlanEnabled: vi.fn(),
+            setApprovalMode: vi.fn(),
+            getApprovedPlanPath: vi.fn(),
+            getApprovalMode: vi.fn(),
+            getFileSystemService: vi.fn(),
+            storage: {
+              getPlansDir: vi.fn().mockReturnValue('/mock/plans/dir'),
+            },
           },
         },
       },
@@ -83,17 +85,19 @@ describe('planCommand', () => {
   });
 
   it('should switch to plan mode if enabled', async () => {
-    vi.mocked(mockContext.services.config!.isPlanEnabled).mockReturnValue(true);
-    vi.mocked(mockContext.services.config!.getApprovedPlanPath).mockReturnValue(
-      undefined,
-    );
+    vi.mocked(
+      mockContext.services.agentContext!.config.isPlanEnabled,
+    ).mockReturnValue(true);
+    vi.mocked(
+      mockContext.services.agentContext!.config.getApprovedPlanPath,
+    ).mockReturnValue(undefined);
 
     if (!planCommand.action) throw new Error('Action missing');
     await planCommand.action(mockContext, '');
 
-    expect(mockContext.services.config!.setApprovalMode).toHaveBeenCalledWith(
-      ApprovalMode.PLAN,
-    );
+    expect(
+      mockContext.services.agentContext!.config.setApprovalMode,
+    ).toHaveBeenCalledWith(ApprovalMode.PLAN);
     expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
       'info',
       'Switched to Plan Mode.',
@@ -102,10 +106,12 @@ describe('planCommand', () => {
 
   it('should display the approved plan from config', async () => {
     const mockPlanPath = '/mock/plans/dir/approved-plan.md';
-    vi.mocked(mockContext.services.config!.isPlanEnabled).mockReturnValue(true);
-    vi.mocked(mockContext.services.config!.getApprovedPlanPath).mockReturnValue(
-      mockPlanPath,
-    );
+    vi.mocked(
+      mockContext.services.agentContext!.config.isPlanEnabled,
+    ).mockReturnValue(true);
+    vi.mocked(
+      mockContext.services.agentContext!.config.getApprovedPlanPath,
+    ).mockReturnValue(mockPlanPath);
     vi.mocked(processSingleFileContent).mockResolvedValue({
       llmContent: '# Approved Plan Content',
       returnDisplay: '# Approved Plan Content',
@@ -128,7 +134,7 @@ describe('planCommand', () => {
     it('should copy the approved plan to clipboard', async () => {
       const mockPlanPath = '/mock/plans/dir/approved-plan.md';
       vi.mocked(
-        mockContext.services.config!.getApprovedPlanPath,
+        mockContext.services.agentContext!.config.getApprovedPlanPath,
       ).mockReturnValue(mockPlanPath);
       vi.mocked(readFileWithEncoding).mockResolvedValue('# Plan Content');
 
@@ -149,7 +155,7 @@ describe('planCommand', () => {
 
     it('should warn if no approved plan is found', async () => {
       vi.mocked(
-        mockContext.services.config!.getApprovedPlanPath,
+        mockContext.services.agentContext!.config.getApprovedPlanPath,
       ).mockReturnValue(undefined);
 
       const copySubCommand = planCommand.subCommands?.find(

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

@@ -22,7 +22,7 @@ import * as path from 'node:path';
 import { copyToClipboard } from '../utils/commandUtils.js';
 
 async function copyAction(context: CommandContext) {
-  const config = context.services.config;
+  const config = context.services.agentContext?.config;
   if (!config) {
     debugLogger.debug('Plan copy command: config is not available in context');
     return;
@@ -53,7 +53,7 @@ export const planCommand: SlashCommand = {
   kind: CommandKind.BUILT_IN,
   autoExecute: false,
   action: async (context) => {
-    const config = context.services.config;
+    const config = context.services.agentContext?.config;
     if (!config) {
       debugLogger.debug('Plan command: config is not available in context');
       return;

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

@@ -32,7 +32,7 @@ describe('policiesCommand', () => {
 
   describe('list subcommand', () => {
     it('should show error if config is missing', async () => {
-      mockContext.services.config = null;
+      mockContext.services.agentContext = null;
       const listCommand = policiesCommand.subCommands![0];
 
       await listCommand.action!(mockContext, '');
@@ -50,8 +50,11 @@ describe('policiesCommand', () => {
       const mockPolicyEngine = {
         getRules: vi.fn().mockReturnValue([]),
       };
-      mockContext.services.config = {
+      mockContext.services.agentContext = {
         getPolicyEngine: vi.fn().mockReturnValue(mockPolicyEngine),
+        get config() {
+          return this;
+        },
       } as unknown as Config;
 
       const listCommand = policiesCommand.subCommands![0];
@@ -85,8 +88,11 @@ describe('policiesCommand', () => {
       const mockPolicyEngine = {
         getRules: vi.fn().mockReturnValue(mockRules),
       };
-      mockContext.services.config = {
+      mockContext.services.agentContext = {
         getPolicyEngine: vi.fn().mockReturnValue(mockPolicyEngine),
+        get config() {
+          return this;
+        },
       } as unknown as Config;
 
       const listCommand = policiesCommand.subCommands![0];
@@ -142,8 +148,11 @@ describe('policiesCommand', () => {
       const mockPolicyEngine = {
         getRules: vi.fn().mockReturnValue(mockRules),
       };
-      mockContext.services.config = {
+      mockContext.services.agentContext = {
         getPolicyEngine: vi.fn().mockReturnValue(mockPolicyEngine),
+        get config() {
+          return this;
+        },
       } as unknown as Config;
 
       const listCommand = policiesCommand.subCommands![0];

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

@@ -51,7 +51,8 @@ const listPoliciesCommand: SlashCommand = {
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: async (context) => {
-    const { config } = context.services;
+    const agentContext = context.services.agentContext;
+    const config = agentContext?.config;
     if (!config) {
       context.ui.addItem(
         {

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

@@ -47,14 +47,17 @@ describe('restoreCommand', () => {
         getProjectTempCheckpointsDir: vi.fn().mockReturnValue(checkpointsDir),
         getProjectTempDir: vi.fn().mockReturnValue(geminiTempDir),
       },
-      getGeminiClient: vi.fn().mockReturnValue({
+      geminiClient: {
         setHistory: mockSetHistory,
-      }),
+      },
+      get config() {
+        return this;
+      },
     } as unknown as Config;
 
     mockContext = createMockCommandContext({
       services: {
-        config: mockConfig,
+        agentContext: mockConfig,
         git: mockGitService,
       },
     });

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

@@ -37,10 +37,11 @@ async function restoreAction(
   args: string,
 ): Promise<void | SlashCommandActionReturn> {
   const { services, ui } = context;
-  const { config, git: gitService } = services;
+  const { agentContext, git: gitService } = services;
   const { addItem, loadHistory } = ui;
 
-  const checkpointDir = config?.storage.getProjectTempCheckpointsDir();
+  const checkpointDir =
+    agentContext?.config.storage.getProjectTempCheckpointsDir();
 
   if (!checkpointDir) {
     return {
@@ -116,7 +117,7 @@ async function restoreAction(
       } else if (action.type === 'load_history' && loadHistory) {
         loadHistory(action.history);
         if (action.clientHistory) {
-          config?.getGeminiClient()?.setHistory(action.clientHistory);
+          agentContext!.geminiClient?.setHistory(action.clientHistory);
         }
       }
     }
@@ -140,8 +141,9 @@ async function completion(
   _partialArg: string,
 ): Promise<string[]> {
   const { services } = context;
-  const { config } = services;
-  const checkpointDir = config?.storage.getProjectTempCheckpointsDir();
+  const { agentContext } = services;
+  const checkpointDir =
+    agentContext?.config.storage.getProjectTempCheckpointsDir();
   if (!checkpointDir) {
     return [];
   }

packages/cli/src/ui/commands/rewindCommand.test.tsx

@@ -97,15 +97,17 @@ describe('rewindCommand', () => {
 
     mockContext = createMockCommandContext({
       services: {
-        config: {
-          getGeminiClient: () => ({
+        agentContext: {
+          geminiClient: {
             getChatRecordingService: mockGetChatRecordingService,
             setHistory: mockSetHistory,
             sendMessageStream: mockSendMessageStream,
-          }),
-          getSessionId: () => 'test-session-id',
-          getContextManager: () => ({ refresh: mockResetContext }),
-          getProjectRoot: mockGetProjectRoot,
+          },
+          config: {
+            getSessionId: () => 'test-session-id',
+            getContextManager: () => ({ refresh: mockResetContext }),
+            getProjectRoot: mockGetProjectRoot,
+          },
         },
       },
       ui: {
@@ -293,7 +295,12 @@ describe('rewindCommand', () => {
   it('should fail if client is not initialized', () => {
     const context = createMockCommandContext({
       services: {
-        config: { getGeminiClient: () => undefined },
+        agentContext: {
+          geminiClient: undefined,
+          get config() {
+            return this;
+          },
+        },
       },
     }) as unknown as CommandContext;
 
@@ -309,8 +316,11 @@ describe('rewindCommand', () => {
   it('should fail if recording service is unavailable', () => {
     const context = createMockCommandContext({
       services: {
-        config: {
-          getGeminiClient: () => ({ getChatRecordingService: () => undefined }),
+        agentContext: {
+          geminiClient: { getChatRecordingService: () => undefined },
+          get config() {
+            return this;
+          },
         },
       },
     }) as unknown as CommandContext;

packages/cli/src/ui/commands/rewindCommand.tsx

@@ -61,7 +61,7 @@ async function rewindConversation(
     client.setHistory(clientHistory as Content[]);
 
     // Reset context manager as we are rewinding history
-    await context.services.config?.getContextManager()?.refresh();
+    await context.services.agentContext?.config.getContextManager()?.refresh();
 
     // Update UI History
     // We generate IDs based on index for the rewind history
@@ -94,7 +94,8 @@ export const rewindCommand: SlashCommand = {
   description: 'Jump back to a specific message and restart the conversation',
   kind: CommandKind.BUILT_IN,
   action: (context) => {
-    const config = context.services.config;
+    const agentContext = context.services.agentContext;
+    const config = agentContext?.config;
     if (!config)
       return {
         type: 'message',
@@ -102,7 +103,7 @@ export const rewindCommand: SlashCommand = {
         content: 'Config not found',
       };
 
-    const client = config.getGeminiClient();
+    const client = agentContext.geminiClient;
     if (!client)
       return {
         type: 'message',

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

@@ -230,7 +230,7 @@ export const setupGithubCommand: SlashCommand = {
     }
 
     // Get the latest release tag from GitHub
-    const proxy = context?.services?.config?.getProxy();
+    const proxy = context?.services?.agentContext?.config.getProxy();
     const releaseTag = await getLatestGitHubRelease(proxy);
     const readmeUrl = `https://github.com/google-github-actions/run-gemini-cli/blob/${releaseTag}/README.md#quick-start`;
 

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

@@ -68,7 +68,7 @@ describe('skillsCommand', () => {
     ];
     context = createMockCommandContext({
       services: {
-        config: {
+        agentContext: {
           getSkillManager: vi.fn().mockReturnValue({
             getAllSkills: vi.fn().mockReturnValue(skills),
             getSkills: vi.fn().mockReturnValue(skills),
@@ -80,6 +80,9 @@ describe('skillsCommand', () => {
               ),
           }),
           getContentGenerator: vi.fn(),
+          get config() {
+            return this;
+          },
         } as unknown as Config,
         settings: {
           merged: createTestMergedSettings({ skills: { disabled: [] } }),
@@ -162,7 +165,8 @@ describe('skillsCommand', () => {
   });
 
   it('should filter built-in skills by default and show them with "all"', async () => {
-    const skillManager = context.services.config!.getSkillManager();
+    const skillManager =
+      context.services.agentContext!.config.getSkillManager();
     const mockSkills = [
       {
         name: 'regular',
@@ -452,7 +456,8 @@ describe('skillsCommand', () => {
     });
 
     it('should show error if skills are disabled by admin during disable', async () => {
-      const skillManager = context.services.config!.getSkillManager();
+      const skillManager =
+        context.services.agentContext!.config.getSkillManager();
       vi.mocked(skillManager.isAdminEnabled).mockReturnValue(false);
 
       const disableCmd = skillsCommand.subCommands!.find(
@@ -470,7 +475,8 @@ describe('skillsCommand', () => {
     });
 
     it('should show error if skills are disabled by admin during enable', async () => {
-      const skillManager = context.services.config!.getSkillManager();
+      const skillManager =
+        context.services.agentContext!.config.getSkillManager();
       vi.mocked(skillManager.isAdminEnabled).mockReturnValue(false);
 
       const enableCmd = skillsCommand.subCommands!.find(
@@ -497,8 +503,7 @@ describe('skillsCommand', () => {
       const reloadSkillsMock = vi.fn().mockImplementation(async () => {
         await new Promise((resolve) => setTimeout(resolve, 200));
       });
-      // @ts-expect-error Mocking reloadSkills
-      context.services.config.reloadSkills = reloadSkillsMock;
+      context.services.agentContext!.config.reloadSkills = reloadSkillsMock;
 
       const actionPromise = reloadCmd.action!(context, '');
 
@@ -537,15 +542,15 @@ describe('skillsCommand', () => {
         (s) => s.name === 'reload',
       )!;
       const reloadSkillsMock = vi.fn().mockImplementation(async () => {
-        const skillManager = context.services.config!.getSkillManager();
+        const skillManager =
+          context.services.agentContext!.config.getSkillManager();
         vi.mocked(skillManager.getSkills).mockReturnValue([
           { name: 'skill1' },
           { name: 'skill2' },
           { name: 'skill3' },
         ] as SkillDefinition[]);
       });
-      // @ts-expect-error Mocking reloadSkills
-      context.services.config.reloadSkills = reloadSkillsMock;
+      context.services.agentContext!.config.reloadSkills = reloadSkillsMock;
 
       await reloadCmd.action!(context, '');
 
@@ -562,13 +567,13 @@ describe('skillsCommand', () => {
         (s) => s.name === 'reload',
       )!;
       const reloadSkillsMock = vi.fn().mockImplementation(async () => {
-        const skillManager = context.services.config!.getSkillManager();
+        const skillManager =
+          context.services.agentContext!.config.getSkillManager();
         vi.mocked(skillManager.getSkills).mockReturnValue([
           { name: 'skill1' },
         ] as SkillDefinition[]);
       });
-      // @ts-expect-error Mocking reloadSkills
-      context.services.config.reloadSkills = reloadSkillsMock;
+      context.services.agentContext!.config.reloadSkills = reloadSkillsMock;
 
       await reloadCmd.action!(context, '');
 
@@ -585,14 +590,14 @@ describe('skillsCommand', () => {
         (s) => s.name === 'reload',
       )!;
       const reloadSkillsMock = vi.fn().mockImplementation(async () => {
-        const skillManager = context.services.config!.getSkillManager();
+        const skillManager =
+          context.services.agentContext!.config.getSkillManager();
         vi.mocked(skillManager.getSkills).mockReturnValue([
           { name: 'skill2' }, // skill1 removed, skill3 added
           { name: 'skill3' },
         ] as SkillDefinition[]);
       });
-      // @ts-expect-error Mocking reloadSkills
-      context.services.config.reloadSkills = reloadSkillsMock;
+      context.services.agentContext!.config.reloadSkills = reloadSkillsMock;
 
       await reloadCmd.action!(context, '');
 
@@ -608,7 +613,7 @@ describe('skillsCommand', () => {
       const reloadCmd = skillsCommand.subCommands!.find(
         (s) => s.name === 'reload',
       )!;
-      context.services.config = null;
+      context.services.agentContext = null;
 
       await reloadCmd.action!(context, '');
 
@@ -628,8 +633,7 @@ describe('skillsCommand', () => {
       const reloadSkillsMock = vi.fn().mockImplementation(async () => {
         await new Promise((_, reject) => setTimeout(() => reject(error), 200));
       });
-      // @ts-expect-error Mocking reloadSkills
-      context.services.config.reloadSkills = reloadSkillsMock;
+      context.services.agentContext!.config.reloadSkills = reloadSkillsMock;
 
       const actionPromise = reloadCmd.action!(context, '');
       await vi.advanceTimersByTimeAsync(100);
@@ -651,7 +655,8 @@ describe('skillsCommand', () => {
       const disableCmd = skillsCommand.subCommands!.find(
         (s) => s.name === 'disable',
       )!;
-      const skillManager = context.services.config!.getSkillManager();
+      const skillManager =
+        context.services.agentContext!.config.getSkillManager();
       const mockSkills = [
         {
           name: 'skill1',
@@ -681,7 +686,8 @@ describe('skillsCommand', () => {
       const enableCmd = skillsCommand.subCommands!.find(
         (s) => s.name === 'enable',
       )!;
-      const skillManager = context.services.config!.getSkillManager();
+      const skillManager =
+        context.services.agentContext!.config.getSkillManager();
       const mockSkills = [
         {
           name: 'skill1',

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

@@ -46,7 +46,7 @@ async function listAction(
     }
   }
 
-  const skillManager = context.services.config?.getSkillManager();
+  const skillManager = context.services.agentContext?.config.getSkillManager();
   if (!skillManager) {
     context.ui.addItem({
       type: MessageType.ERROR,
@@ -127,8 +127,8 @@ async function linkAction(
       text: `Successfully linked skills from "${sourcePath}" (${scope}).`,
     });
 
-    if (context.services.config) {
-      await context.services.config.reloadSkills();
+    if (context.services.agentContext?.config) {
+      await context.services.agentContext.config.reloadSkills();
     }
   } catch (error) {
     context.ui.addItem({
@@ -150,14 +150,14 @@ async function disableAction(
     });
     return;
   }
-  const skillManager = context.services.config?.getSkillManager();
+  const skillManager = context.services.agentContext?.config.getSkillManager();
   if (skillManager?.isAdminEnabled() === false) {
     context.ui.addItem(
       {
         type: MessageType.ERROR,
         text: getAdminErrorMessage(
           'Agent skills',
-          context.services.config ?? undefined,
+          context.services.agentContext?.config ?? undefined,
         ),
       },
       Date.now(),
@@ -211,14 +211,14 @@ async function enableAction(
     return;
   }
 
-  const skillManager = context.services.config?.getSkillManager();
+  const skillManager = context.services.agentContext?.config.getSkillManager();
   if (skillManager?.isAdminEnabled() === false) {
     context.ui.addItem(
       {
         type: MessageType.ERROR,
         text: getAdminErrorMessage(
           'Agent skills',
-          context.services.config ?? undefined,
+          context.services.agentContext?.config ?? undefined,
         ),
       },
       Date.now(),
@@ -246,7 +246,7 @@ async function enableAction(
 async function reloadAction(
   context: CommandContext,
 ): Promise<void | SlashCommandActionReturn> {
-  const config = context.services.config;
+  const config = context.services.agentContext?.config;
   if (!config) {
     context.ui.addItem({
       type: MessageType.ERROR,
@@ -333,7 +333,7 @@ function disableCompletion(
   context: CommandContext,
   partialArg: string,
 ): string[] {
-  const skillManager = context.services.config?.getSkillManager();
+  const skillManager = context.services.agentContext?.config.getSkillManager();
   if (!skillManager) {
     return [];
   }
@@ -347,7 +347,7 @@ function enableCompletion(
   context: CommandContext,
   partialArg: string,
 ): string[] {
-  const skillManager = context.services.config?.getSkillManager();
+  const skillManager = context.services.agentContext?.config.getSkillManager();
   if (!skillManager) {
     return [];
   }

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

@@ -43,12 +43,15 @@ describe('statsCommand', () => {
   it('should display general session stats when run with no subcommand', async () => {
     if (!statsCommand.action) throw new Error('Command has no action');
 
-    mockContext.services.config = {
+    mockContext.services.agentContext = {
       refreshUserQuota: vi.fn(),
       refreshAvailableCredits: vi.fn(),
       getUserTierName: vi.fn(),
       getUserPaidTier: vi.fn(),
       getModel: vi.fn(),
+      get config() {
+        return this;
+      },
     } as unknown as Config;
 
     await statsCommand.action(mockContext, '');
@@ -80,7 +83,7 @@ describe('statsCommand', () => {
       .fn()
       .mockReturnValue('2025-01-01T12:00:00Z');
 
-    mockContext.services.config = {
+    mockContext.services.agentContext = {
       refreshUserQuota: mockRefreshUserQuota,
       getUserTierName: mockGetUserTierName,
       getModel: mockGetModel,
@@ -89,6 +92,9 @@ describe('statsCommand', () => {
       getQuotaResetTime: mockGetQuotaResetTime,
       getUserPaidTier: vi.fn(),
       refreshAvailableCredits: vi.fn(),
+      get config() {
+        return this;
+      },
     } as unknown as Config;
 
     await statsCommand.action(mockContext, '');

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

@@ -29,8 +29,8 @@ function getUserIdentity(context: CommandContext) {
   const cachedAccount = userAccountManager.getCachedGoogleAccount();
   const userEmail = cachedAccount ?? undefined;
 
-  const tier = context.services.config?.getUserTierName();
-  const paidTier = context.services.config?.getUserPaidTier();
+  const tier = context.services.agentContext?.config.getUserTierName();
+  const paidTier = context.services.agentContext?.config.getUserPaidTier();
   const creditBalance = getG1CreditBalance(paidTier) ?? undefined;
 
   return { selectedAuthType, userEmail, tier, creditBalance };
@@ -50,7 +50,7 @@ async function defaultSessionView(context: CommandContext) {
 
   const { selectedAuthType, userEmail, tier, creditBalance } =
     getUserIdentity(context);
-  const currentModel = context.services.config?.getModel();
+  const currentModel = context.services.agentContext?.config.getModel();
 
   const statsItem: HistoryItemStats = {
     type: MessageType.STATS,
@@ -62,16 +62,19 @@ async function defaultSessionView(context: CommandContext) {
     creditBalance,
   };
 
-  if (context.services.config) {
+  if (context.services.agentContext?.config) {
     const [quota] = await Promise.all([
-      context.services.config.refreshUserQuota(),
-      context.services.config.refreshAvailableCredits(),
+      context.services.agentContext.config.refreshUserQuota(),
+      context.services.agentContext.config.refreshAvailableCredits(),
     ]);
     if (quota) {
       statsItem.quotas = quota;
-      statsItem.pooledRemaining = context.services.config.getQuotaRemaining();
-      statsItem.pooledLimit = context.services.config.getQuotaLimit();
-      statsItem.pooledResetTime = context.services.config.getQuotaResetTime();
+      statsItem.pooledRemaining =
+        context.services.agentContext.config.getQuotaRemaining();
+      statsItem.pooledLimit =
+        context.services.agentContext.config.getQuotaLimit();
+      statsItem.pooledResetTime =
+        context.services.agentContext.config.getQuotaResetTime();
     }
   }
 
@@ -107,10 +110,13 @@ export const statsCommand: SlashCommand = {
       isSafeConcurrent: true,
       action: (context: CommandContext) => {
         const { selectedAuthType, userEmail, tier } = getUserIdentity(context);
-        const currentModel = context.services.config?.getModel();
-        const pooledRemaining = context.services.config?.getQuotaRemaining();
-        const pooledLimit = context.services.config?.getQuotaLimit();
-        const pooledResetTime = context.services.config?.getQuotaResetTime();
+        const currentModel = context.services.agentContext?.config.getModel();
+        const pooledRemaining =
+          context.services.agentContext?.config.getQuotaRemaining();
+        const pooledLimit =
+          context.services.agentContext?.config.getQuotaLimit();
+        const pooledResetTime =
+          context.services.agentContext?.config.getQuotaResetTime();
         context.ui.addItem({
           type: MessageType.MODEL_STATS,
           selectedAuthType,

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

@@ -30,8 +30,8 @@ describe('toolsCommand', () => {
   it('should display an error if the tool registry is unavailable', async () => {
     const mockContext = createMockCommandContext({
       services: {
-        config: {
-          getToolRegistry: () => undefined,
+        agentContext: {
+          toolRegistry: undefined,
         },
       },
     });
@@ -48,10 +48,10 @@ describe('toolsCommand', () => {
   it('should display "No tools available" when none are found', async () => {
     const mockContext = createMockCommandContext({
       services: {
-        config: {
-          getToolRegistry: () => ({
+        agentContext: {
+          toolRegistry: {
             getAllTools: () => [] as Array<ToolBuilder<object, ToolResult>>,
-          }),
+          },
         },
       },
     });
@@ -69,8 +69,8 @@ describe('toolsCommand', () => {
   it('should list tools without descriptions by default (no args)', async () => {
     const mockContext = createMockCommandContext({
       services: {
-        config: {
-          getToolRegistry: () => ({ getAllTools: () => mockTools }),
+        agentContext: {
+          toolRegistry: { getAllTools: () => mockTools },
         },
       },
     });
@@ -90,8 +90,8 @@ describe('toolsCommand', () => {
   it('should list tools without descriptions when "list" arg is passed', async () => {
     const mockContext = createMockCommandContext({
       services: {
-        config: {
-          getToolRegistry: () => ({ getAllTools: () => mockTools }),
+        agentContext: {
+          toolRegistry: { getAllTools: () => mockTools },
         },
       },
     });
@@ -111,8 +111,8 @@ describe('toolsCommand', () => {
   it('should list tools with descriptions when "desc" arg is passed', async () => {
     const mockContext = createMockCommandContext({
       services: {
-        config: {
-          getToolRegistry: () => ({ getAllTools: () => mockTools }),
+        agentContext: {
+          toolRegistry: { getAllTools: () => mockTools },
         },
       },
     });
@@ -144,8 +144,8 @@ describe('toolsCommand', () => {
   it('subcommand "list" should display tools without descriptions', async () => {
     const mockContext = createMockCommandContext({
       services: {
-        config: {
-          getToolRegistry: () => ({ getAllTools: () => mockTools }),
+        agentContext: {
+          toolRegistry: { getAllTools: () => mockTools },
         },
       },
     });
@@ -165,8 +165,8 @@ describe('toolsCommand', () => {
   it('subcommand "desc" should display tools with descriptions', async () => {
     const mockContext = createMockCommandContext({
       services: {
-        config: {
-          getToolRegistry: () => ({ getAllTools: () => mockTools }),
+        agentContext: {
+          toolRegistry: { getAllTools: () => mockTools },
         },
       },
     });
@@ -196,8 +196,8 @@ describe('toolsCommand', () => {
 
     const mockContext = createMockCommandContext({
       services: {
-        config: {
-          getToolRegistry: () => ({ getAllTools: () => mockTools }),
+        agentContext: {
+          toolRegistry: { getAllTools: () => mockTools },
         },
       },
     });

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

@@ -15,7 +15,7 @@ async function listTools(
   context: CommandContext,
   showDescriptions: boolean,
 ): Promise<void> {
-  const toolRegistry = context.services.config?.getToolRegistry();
+  const toolRegistry = context.services.agentContext?.toolRegistry;
   if (!toolRegistry) {
     context.ui.addItem({
       type: MessageType.ERROR,

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

@@ -11,11 +11,11 @@ import type {
   ConfirmationRequest,
 } from '../types.js';
 import type {
-  Config,
   GitService,
   Logger,
   CommandActionReturn,
   AgentDefinition,
+  AgentLoopContext,
 } from '@google/gemini-cli-core';
 import type { LoadedSettings } from '../../config/settings.js';
 import type { UseHistoryManagerReturn } from '../hooks/useHistoryManager.js';
@@ -39,7 +39,7 @@ export interface CommandContext {
   // Core services and configuration
   services: {
     // TODO(abhipatel12): Ensure that config is never null.
-    config: Config | null;
+    agentContext: AgentLoopContext | null;
     settings: LoadedSettings;
     git: GitService | undefined;
     logger: Logger;

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

@@ -33,11 +33,13 @@ describe('upgradeCommand', () => {
     vi.clearAllMocks();
     mockContext = createMockCommandContext({
       services: {
-        config: {
-          getContentGeneratorConfig: vi.fn().mockReturnValue({
-            authType: AuthType.LOGIN_WITH_GOOGLE,
-          }),
-          getUserTierName: vi.fn().mockReturnValue(undefined),
+        agentContext: {
+          config: {
+            getContentGeneratorConfig: vi.fn().mockReturnValue({
+              authType: AuthType.LOGIN_WITH_GOOGLE,
+            }),
+            getUserTierName: vi.fn().mockReturnValue(undefined),
+          },
         },
       },
     } as unknown as CommandContext);
@@ -62,7 +64,7 @@ describe('upgradeCommand', () => {
 
   it('should return an error message when NOT logged in with Google', async () => {
     vi.mocked(
-      mockContext.services.config!.getContentGeneratorConfig,
+      mockContext.services.agentContext!.config.getContentGeneratorConfig,
     ).mockReturnValue({
       authType: AuthType.USE_GEMINI,
     });
@@ -118,9 +120,9 @@ describe('upgradeCommand', () => {
   });
 
   it('should return info message for ultra tiers', async () => {
-    vi.mocked(mockContext.services.config!.getUserTierName).mockReturnValue(
-      'Advanced Ultra',
-    );
+    vi.mocked(
+      mockContext.services.agentContext!.config.getUserTierName,
+    ).mockReturnValue('Advanced Ultra');
 
     if (!upgradeCommand.action) {
       throw new Error('The upgrade command must have an action.');

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

@@ -23,8 +23,8 @@ export const upgradeCommand: SlashCommand = {
   description: 'Upgrade your Gemini Code Assist tier for higher limits',
   autoExecute: true,
   action: async (context) => {
-    const authType =
-      context.services.config?.getContentGeneratorConfig()?.authType;
+    const config = context.services.agentContext?.config;
+    const authType = config?.getContentGeneratorConfig()?.authType;
     if (authType !== AuthType.LOGIN_WITH_GOOGLE) {
       // This command should ideally be hidden if not logged in with Google,
       // but we add a safety check here just in case.
@@ -36,7 +36,7 @@ export const upgradeCommand: SlashCommand = {
       };
     }
 
-    const tierName = context.services.config?.getUserTierName();
+    const tierName = config?.getUserTierName();
     if (isUltraTier(tierName)) {
       return {
         type: 'message',

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

@@ -25,7 +25,7 @@ describe('AboutBox', () => {
   };
 
   it('renders with required props', async () => {
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <AboutBox {...defaultProps} />,
     );
     await waitUntilReady();
@@ -46,7 +46,7 @@ describe('AboutBox', () => {
     ['tier', 'Enterprise', 'Tier'],
   ])('renders optional prop %s', async (prop, value, label) => {
     const props = { ...defaultProps, [prop]: value };
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <AboutBox {...props} />,
     );
     await waitUntilReady();
@@ -58,7 +58,7 @@ describe('AboutBox', () => {
 
   it('renders Auth Method with email when userEmail is provided', async () => {
     const props = { ...defaultProps, userEmail: 'test@example.com' };
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <AboutBox {...props} />,
     );
     await waitUntilReady();
@@ -69,7 +69,7 @@ describe('AboutBox', () => {
 
   it('renders Auth Method correctly when not oauth', async () => {
     const props = { ...defaultProps, selectedAuthType: 'api-key' };
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <AboutBox {...props} />,
     );
     await waitUntilReady();

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

@@ -17,7 +17,7 @@ describe('AdminSettingsChangedDialog', () => {
   });
 
   it('renders correctly', async () => {
-    const { lastFrame, waitUntilReady } = renderWithProviders(
+    const { lastFrame, waitUntilReady } = await renderWithProviders(
       <AdminSettingsChangedDialog />,
     );
     await waitUntilReady();
@@ -25,7 +25,7 @@ describe('AdminSettingsChangedDialog', () => {
   });
 
   it('restarts on "r" key press', async () => {
-    const { stdin, waitUntilReady } = renderWithProviders(
+    const { stdin, waitUntilReady } = await renderWithProviders(
       <AdminSettingsChangedDialog />,
       {
         uiActions: {
@@ -43,7 +43,7 @@ describe('AdminSettingsChangedDialog', () => {
   });
 
   it.each(['r', 'R'])('restarts on "%s" key press', async (key) => {
-    const { stdin, waitUntilReady } = renderWithProviders(
+    const { stdin, waitUntilReady } = await renderWithProviders(
       <AdminSettingsChangedDialog />,
       {
         uiActions: {

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

@@ -115,7 +115,7 @@ describe('AgentConfigDialog', () => {
     settings: LoadedSettings,
     definition: AgentDefinition = createMockAgentDefinition(),
   ) => {
-    const result = renderWithProviders(
+    const result = await renderWithProviders(
       <AgentConfigDialog
         agentName="test-agent"
         displayName="Test Agent"
@@ -323,7 +323,7 @@ describe('AgentConfigDialog', () => {
       const settings = createMockSettings();
       // Agent config has about 6 base items + 2 per tool
       // Render with very small height (20)
-      const { lastFrame, unmount } = renderWithProviders(
+      const { lastFrame, unmount } = await renderWithProviders(
         <AgentConfigDialog
           agentName="test-agent"
           displayName="Test Agent"

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

@@ -108,7 +108,7 @@ describe('AlternateBufferQuittingDisplay', () => {
 
   it('renders with active and pending tool messages', async () => {
     persistentStateMock.setData({ tipsShown: 0 });
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <AlternateBufferQuittingDisplay />,
       {
         uiState: {
@@ -125,7 +125,7 @@ describe('AlternateBufferQuittingDisplay', () => {
 
   it('renders with empty history and no pending items', async () => {
     persistentStateMock.setData({ tipsShown: 0 });
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <AlternateBufferQuittingDisplay />,
       {
         uiState: {
@@ -142,7 +142,7 @@ describe('AlternateBufferQuittingDisplay', () => {
 
   it('renders with history but no pending items', async () => {
     persistentStateMock.setData({ tipsShown: 0 });
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <AlternateBufferQuittingDisplay />,
       {
         uiState: {
@@ -159,7 +159,7 @@ describe('AlternateBufferQuittingDisplay', () => {
 
   it('renders with pending items but no history', async () => {
     persistentStateMock.setData({ tipsShown: 0 });
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <AlternateBufferQuittingDisplay />,
       {
         uiState: {
@@ -195,7 +195,7 @@ describe('AlternateBufferQuittingDisplay', () => {
         ],
       },
     ];
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <AlternateBufferQuittingDisplay />,
       {
         uiState: {
@@ -220,7 +220,7 @@ describe('AlternateBufferQuittingDisplay', () => {
       { id: 1, type: 'user', text: 'Hello Gemini' },
       { id: 2, type: 'gemini', text: 'Hello User!' },
     ];
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <AlternateBufferQuittingDisplay />,
       {
         uiState: {

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

@@ -35,7 +35,11 @@ export const AnsiOutputText: React.FC<AnsiOutputProps> = ({
       ? Math.min(availableHeightLimit, maxLines)
       : (availableHeightLimit ?? maxLines ?? DEFAULT_HEIGHT);
 
-  const lastLines = disableTruncation ? data : data.slice(-numLinesRetained);
+  const lastLines = disableTruncation
+    ? data
+    : numLinesRetained === 0
+      ? []
+      : data.slice(-numLinesRetained);
   return (
     <Box flexDirection="column" width={width} flexShrink={0} overflow="hidden">
       {lastLines.map((line: AnsiLine, lineIndex: number) => (

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

@@ -10,7 +10,6 @@ import {
 } from '../../test-utils/render.js';
 import { AppHeader } from './AppHeader.js';
 import { describe, it, expect, vi } from 'vitest';
-import { makeFakeConfig } from '@google/gemini-cli-core';
 import crypto from 'node:crypto';
 
 vi.mock('../utils/terminalSetup.js', () => ({
@@ -19,7 +18,6 @@ vi.mock('../utils/terminalSetup.js', () => ({
 
 describe('<AppHeader />', () => {
   it('should render the banner with default text', async () => {
-    const mockConfig = makeFakeConfig();
     const uiState = {
       history: [],
       bannerData: {
@@ -29,10 +27,9 @@ describe('<AppHeader />', () => {
       bannerVisible: true,
     };
 
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <AppHeader version="1.0.0" />,
       {
-        config: mockConfig,
         uiState,
       },
     );
@@ -44,7 +41,6 @@ describe('<AppHeader />', () => {
   });
 
   it('should render the banner with warning text', async () => {
-    const mockConfig = makeFakeConfig();
     const uiState = {
       history: [],
       bannerData: {
@@ -54,10 +50,9 @@ describe('<AppHeader />', () => {
       bannerVisible: true,
     };
 
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <AppHeader version="1.0.0" />,
       {
-        config: mockConfig,
         uiState,
       },
     );
@@ -69,7 +64,6 @@ describe('<AppHeader />', () => {
   });
 
   it('should not render the banner when no flags are set', async () => {
-    const mockConfig = makeFakeConfig();
     const uiState = {
       history: [],
       bannerData: {
@@ -78,10 +72,9 @@ describe('<AppHeader />', () => {
       },
     };
 
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <AppHeader version="1.0.0" />,
       {
-        config: mockConfig,
         uiState,
       },
     );
@@ -93,7 +86,6 @@ describe('<AppHeader />', () => {
   });
 
   it('should not render the default banner if shown count is 5 or more', async () => {
-    const mockConfig = makeFakeConfig();
     const uiState = {
       history: [],
       bannerData: {
@@ -111,10 +103,9 @@ describe('<AppHeader />', () => {
       },
     });
 
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <AppHeader version="1.0.0" />,
       {
-        config: mockConfig,
         uiState,
       },
     );
@@ -126,7 +117,6 @@ describe('<AppHeader />', () => {
   });
 
   it('should increment the version count when default banner is displayed', async () => {
-    const mockConfig = makeFakeConfig();
     const uiState = {
       history: [],
       bannerData: {
@@ -139,10 +129,9 @@ describe('<AppHeader />', () => {
     // and interfering with the expected persistentState.set call.
     persistentStateMock.setData({ tipsShown: 10 });
 
-    const { waitUntilReady, unmount } = renderWithProviders(
+    const { waitUntilReady, unmount } = await renderWithProviders(
       <AppHeader version="1.0.0" />,
       {
-        config: mockConfig,
         uiState,
       },
     );
@@ -161,7 +150,6 @@ describe('<AppHeader />', () => {
   });
 
   it('should render banner text with unescaped newlines', async () => {
-    const mockConfig = makeFakeConfig();
     const uiState = {
       history: [],
       bannerData: {
@@ -171,10 +159,9 @@ describe('<AppHeader />', () => {
       bannerVisible: true,
     };
 
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <AppHeader version="1.0.0" />,
       {
-        config: mockConfig,
         uiState,
       },
     );
@@ -185,7 +172,6 @@ describe('<AppHeader />', () => {
   });
 
   it('should render Tips when tipsShown is less than 10', async () => {
-    const mockConfig = makeFakeConfig();
     const uiState = {
       history: [],
       bannerData: {
@@ -197,10 +183,9 @@ describe('<AppHeader />', () => {
 
     persistentStateMock.setData({ tipsShown: 5 });
 
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <AppHeader version="1.0.0" />,
       {
-        config: mockConfig,
         uiState,
       },
     );
@@ -212,7 +197,6 @@ describe('<AppHeader />', () => {
   });
 
   it('should NOT render Tips when tipsShown is 10 or more', async () => {
-    const mockConfig = makeFakeConfig();
     const uiState = {
       bannerData: {
         defaultText: '',
@@ -222,10 +206,9 @@ describe('<AppHeader />', () => {
 
     persistentStateMock.setData({ tipsShown: 10 });
 
-    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
       <AppHeader version="1.0.0" />,
       {
-        config: mockConfig,
         uiState,
       },
     );
@@ -238,7 +221,6 @@ describe('<AppHeader />', () => {
   it('should show tips until they have been shown 10 times (persistence flow)', async () => {
     persistentStateMock.setData({ tipsShown: 9 });
 
-    const mockConfig = makeFakeConfig();
     const uiState = {
       history: [],
       bannerData: {
@@ -249,8 +231,7 @@ describe('<AppHeader />', () => {
     };
 
     // First session
-    const session1 = renderWithProviders(<AppHeader version="1.0.0" />, {
-      config: mockConfig,
+    const session1 = await renderWithProviders(<AppHeader version="1.0.0" />, {
       uiState,
     });
     await session1.waitUntilReady();
@@ -260,9 +241,10 @@ describe('<AppHeader />', () => {
     session1.unmount();
 
     // Second session - state is persisted in the fake
-    const session2 = renderWithProviders(<AppHeader version="1.0.0" />, {
-      config: mockConfig,
-    });
+    const session2 = await renderWithProviders(
+      <AppHeader version="1.0.0" />,
+      {},
+    );
     await session2.waitUntilReady();
 
     expect(session2.lastFrame()).not.toContain('Tips');

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

@@ -32,7 +32,7 @@ describe('AppHeader Icon Rendering', () => {
   it('renders the default icon in standard terminals', async () => {
     vi.mocked(isAppleTerminal).mockReturnValue(false);
 
-    const result = renderWithProviders(<AppHeader version="1.0.0" />);
+    const result = await renderWithProviders(<AppHeader version="1.0.0" />);
     await result.waitUntilReady();
 
     await expect(result).toMatchSvgSnapshot();
@@ -41,7 +41,7 @@ describe('AppHeader Icon Rendering', () => {
   it('renders the symmetric icon in Apple Terminal', async () => {
     vi.mocked(isAppleTerminal).mockReturnValue(true);
 
-    const result = renderWithProviders(<AppHeader version="1.0.0" />);
+    const result = await renderWithProviders(<AppHeader version="1.0.0" />);
     await result.waitUntilReady();
 
     await expect(result).toMatchSvgSnapshot();