@google/gemini-cli 0.65.0-preview.0 → 0.66.0-nightly.20261017.ged96faedf

package/bundle/docs/changelogs/index.md

@@ -18,6 +18,28 @@ on GitHub.
 | [Preview](preview.md) | Experimental features ready for early feedback. |
 | [Stable](latest.md)   | Stable, recommended for general use.            |
 
+## Announcements: v0.64.0 - 2026-10-13
+
+- **Atomic Operations & State Persistence:** Serialized file tool operations
+  with atomic writes and introduced atomic CLI state persistence with automatic
+  recovery from backup on corruption
+  ([#29499](https://github.com/google-gemini/gemini-cli/pull/29499) by
+  @elberthc-byte,
+  [#29558](https://github.com/google-gemini/gemini-cli/pull/29558) by
+  @urielefrenvirtusa).
+- **Chat Recording Optimization:** Implemented append-only delta patching and
+  bounded history windowing in ChatRecordingService to optimize memory and disk
+  efficiency during long-running sessions
+  ([#29568](https://github.com/google-gemini/gemini-cli/pull/29568) by
+  @jvargassanchez-dot).
+- **CLI Interaction & Input Robustness:** Resolved `@file:line` references,
+  prevented CPU hangs on `@` in code blocks, and ensured Ctrl+C emergency aborts
+  reliably reach cancellation handlers
+  ([#29581](https://github.com/google-gemini/gemini-cli/pull/29581) by
+  @jesussamuel-byte,
+  [#29586](https://github.com/google-gemini/gemini-cli/pull/29586) by
+  @urielefrenvirtusa).
+
 ## Announcements: v0.63.0 - 2026-10-06
 
 - **Autonomous Plan Execution:** Enabled autonomous plan execution in

package/bundle/docs/changelogs/latest.md

@@ -1,6 +1,6 @@
-# Latest stable release: v0.63.0
+# Latest stable release: v0.64.0
 
-Released: October 6, 2026
+Released: October 13, 2026
 
 For most users, our latest stable release is the recommended release. Install
 the latest stable version with:
@@ -11,62 +11,72 @@ npm install -g @google/gemini-cli
 
 ## Highlights
 
-- **Autonomous Plan Execution:** Enabled autonomous plan execution in
-  non-interactive mode, allowing automated agent workflows to run multi-step
-  plans without requiring interactive user confirmation.
-- **Memory Lifecycle & Output Bounding:** Bounded tool output sizes and
-  optimized the memory lifecycle in long-running agent loops to prevent memory
-  exhaustion, while formatting full output when truncation is disabled.
-- **Authentication Resilience:** Prevented infinite authentication loops caused
-  by file contention, headless keyring environments, and supervisor state drops,
-  ensuring reliable credential handling across environments.
-- **CLI & Connection Recovery UX:** Displayed a retry progress indicator during
-  connection recovery, restored paused stdin after capability detection, and
-  ensured automatic temporary directory cleanup upon background shell execution
-  exit.
+- **Atomic File Operations & State Recovery:** Serialized file tool operations
+  with atomic writes and introduced atomic CLI state persistence with automatic
+  recovery from backup on corruption.
+- **Chat Recording Optimization:** Implemented append-only delta patching and
+  bounded history windowing in ChatRecordingService to optimize memory and disk
+  efficiency during long-running sessions.
+- **CLI Input & Reference Resolution:** Added support for resolving `@file:line`
+  references, resolved CPU hangs and quote swallowing on `@` symbols within code
+  blocks, and prevented ghost text wrap hangs.
+- **Terminal UI & Interaction Stability:** Ensured Ctrl+C emergency aborts
+  reliably reach active cancellation handlers, made selection list confirmation
+  with Enter and Spacebar dependable, preserved scroll positions, and fixed
+  Windows ConPTY IME cursor forwarding.
 
 ## What's Changed
 
-- fix(cli): display retry progress indicator during connection recovery (#28340)
-  by @amelidev in
-  [#29468](https://github.com/google-gemini/gemini-cli/pull/29468)
-- Changelog for v0.61.0-preview.1 by @gemini-cli-robot in
-  [#29469](https://github.com/google-gemini/gemini-cli/pull/29469)
-- Changelog for v0.61.0 by @gemini-cli-robot in
-  [#29472](https://github.com/google-gemini/gemini-cli/pull/29472)
-- fix(cli): distinguish missing MCP enablement config from malformed JSON by
-  @jesussamuel-byte in
-  [#29446](https://github.com/google-gemini/gemini-cli/pull/29446)
-- fix(cli): restore paused stdin after capability detection by @ugorla-dev in
-  [#29487](https://github.com/google-gemini/gemini-cli/pull/29487)
-- fix(core): bound tool output size and optimize memory lifecycle in
-  long-running agent loops by @diegogodinezr in
-  [#29451](https://github.com/google-gemini/gemini-cli/pull/29451)
-- fix(core): remove invalid diff.external override by @urielefrenvirtusa in
-  [#29467](https://github.com/google-gemini/gemini-cli/pull/29467)
-- chore(release): bump version to 0.63.0-nightly.20260923.gf50ba8608 by
+- refactor(a2a-server): implement V1 to V2 settings migration logic by
+  @jvargassanchez-dot in
+  [#29450](https://github.com/google-gemini/gemini-cli/pull/29450)
+- fix(acp): bridge PromptResponse.usage and emit usage_update notifications
+  (#29389) by @elberthc-byte in
+  [#29549](https://github.com/google-gemini/gemini-cli/pull/29549)
+- Changelog for v0.63.0-preview.0 by @gemini-cli-robot in
+  [#29565](https://github.com/google-gemini/gemini-cli/pull/29565)
+- fix(cli): propagate resolved folder trust state in headless mode (#29031) by
+  @amelidev in [#29528](https://github.com/google-gemini/gemini-cli/pull/29528)
+- chore(release): bump version to 0.64.0-nightly.20260929.gd75234cae by
   @gemini-cli-robot in
-  [#29471](https://github.com/google-gemini/gemini-cli/pull/29471)
-- Changelog for v0.62.0-preview.0 by @gemini-cli-robot in
-  [#29470](https://github.com/google-gemini/gemini-cli/pull/29470)
-- fix(core): clean up temporary directory when background shell execution exits
-  by @jesussamuel-byte in
-  [#29437](https://github.com/google-gemini/gemini-cli/pull/29437)
-- fix(acp): resolve session before config initialization and avoid same-minute
-  filename collisions by @jesussamuel-byte in
-  [#29463](https://github.com/google-gemini/gemini-cli/pull/29463)
-- fix(core): align policy redirection gates, path validation, and workflow
-  parsing by @DavidAPierce in
-  [#29506](https://github.com/google-gemini/gemini-cli/pull/29506)
-- fix(auth): prevent infinite auth loop from file contention, headless keyring,
-  and supervisor state drops (#28341) by @villahernandez-coder in
-  [#29448](https://github.com/google-gemini/gemini-cli/pull/29448)
-- fix(core): enable autonomous plan execution in non-interactive mode by
+  [#29567](https://github.com/google-gemini/gemini-cli/pull/29567)
+- fix(cli): prevent CPU hang and quote swallowing on @ within code (#29434) by
+  @elberthc-byte in
+  [#29557](https://github.com/google-gemini/gemini-cli/pull/29557)
+- fix(core): serialize file tool operations and make writes atomic (#29078) by
+  @elberthc-byte in
+  [#29499](https://github.com/google-gemini/gemini-cli/pull/29499)
+- fix(core): implement append-only delta patching and bounded history windowing
+  in ChatRecordingService by @jvargassanchez-dot in
+  [#29568](https://github.com/google-gemini/gemini-cli/pull/29568)
+- fix(cli): persist state atomically and recover from backup on corruption by
   @urielefrenvirtusa in
-  [#29539](https://github.com/google-gemini/gemini-cli/pull/29539)
-- fix(core): disable truncation when maxChars <= 0 in formatTruncatedToolOutput
-  by @diegogodinezr in
-  [#29542](https://github.com/google-gemini/gemini-cli/pull/29542)
+  [#29558](https://github.com/google-gemini/gemini-cli/pull/29558)
+- fix(cli): ensure Ctrl+C emergency abort reaches cancellation handler during
+  active operations by @urielefrenvirtusa in
+  [#29586](https://github.com/google-gemini/gemini-cli/pull/29586)
+- fix(cli): resolve @file:line references and prevent ghost text wrap hang by
+  @jesussamuel-byte in
+  [#29581](https://github.com/google-gemini/gemini-cli/pull/29581)
+- fix(ui): ensure Windows ConPTY forwards IME cursor position by
+  @jesussamuel-byte in
+  [#29560](https://github.com/google-gemini/gemini-cli/pull/29560)
+- fix(cli): retry directory removal on Windows locking errors during extension
+  updates by @jesussamuel-byte in
+  [#29540](https://github.com/google-gemini/gemini-cli/pull/29540)
+- fix(acp): resolve session by exact id and handle listener cleanup on session
+  failure by @diegogodinezr in
+  [#29580](https://github.com/google-gemini/gemini-cli/pull/29580)
+- fix(cli): preserve scroll position and partition pending height budget by
+  @luisfelipe-alt in
+  [#29520](https://github.com/google-gemini/gemini-cli/pull/29520)
+- fix(cli): ensure Enter and Spacebar reliably confirm selection list options by
+  @ugorla-dev in
+  [#29502](https://github.com/google-gemini/gemini-cli/pull/29502)
+- fix(patch): cherry-pick 2ce1a69 to release/v0.64.0-preview.0-pr-29672 to patch
+  version v0.64.0-preview.0 and create version 0.64.0-preview.1 by
+  @gemini-cli-robot in
+  [#29696](https://github.com/google-gemini/gemini-cli/pull/29696)
 
 **Full Changelog**:
-https://github.com/google-gemini/gemini-cli/compare/v0.62.0...v0.63.0
+https://github.com/google-gemini/gemini-cli/compare/v0.63.0...v0.64.0

package/bundle/docs/changelogs/preview.md

@@ -1,6 +1,6 @@
-# Preview release: v0.64.0-preview.0
+# Preview release: v0.65.0-preview.0
 
-Released: October 6, 2026
+Released: October 13, 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,67 +13,103 @@ npm install -g @google/gemini-cli@preview
 
 ## Highlights
 
-- **Atomic File Operations & State Recovery**: Serialized file tool operations
-  with atomic writes and introduced atomic CLI state persistence with automatic
-  recovery from backup on corruption.
-- **Chat Recording Optimization**: Implemented append-only delta patching and
-  bounded history windowing in ChatRecordingService to optimize memory and disk
-  efficiency during long-running sessions.
-- **CLI Input & Reference Resolution**: Added support for resolving `@file:line`
-  references, resolved CPU hangs and quote swallowing on `@` symbols within code
-  blocks, and prevented ghost text wrap hangs.
-- **Terminal UI & Interaction Stability**: Ensured Ctrl+C emergency aborts reach
-  active cancellation handlers, made selection list confirmation with Enter and
-  Spacebar reliable, and fixed Windows ConPTY IME cursor forwarding.
+- **Custom Telemetry Headers**: Added support for configuring custom OTLP
+  headers in telemetry settings, enabling authentication and header
+  customization for OpenTelemetry collectors.
+- **File System Performance & Traversal**: Optimized ignore pattern filtering
+  with subtree pruning to accelerate directory scanning, deferred recursive file
+  reads for `@<directory>` references, and improved empty file handling across
+  multi-byte encodings.
+- **Session Resilience & State Integrity**: Prevented session poisoning during
+  rapid Ctrl+C interruptions, preserved resumed session history on quick exits,
+  and eliminated duplicate tool response turns upon resuming sessions.
+- **Authentication & Workspace Security**: Enforced read-only workspace settings
+  in untrusted directories, aligned OAuth callback parameter validation with RFC
+  9207 metadata, and resolved infinite authentication retry loops.
+- **Terminal UI & Interactive Stability**: Resolved interactive mode hangs on
+  Enter keypresses, prevented unnecessary terminal clears and scroll resets when
+  expanding output with Ctrl+O, and restored debounced static UI refreshes on
+  terminal width changes.
 
 ## What's Changed
 
-- refactor(a2a-server): implement V1 to V2 settings migration logic by
+- fix(cli): enforce read-only workspace settings in untrusted folders by
   @jvargassanchez-dot in
-  [#29450](https://github.com/google-gemini/gemini-cli/pull/29450)
-- fix(acp): bridge PromptResponse.usage and emit usage_update notifications
-  (#29389) by @elberthc-byte in
-  [#29549](https://github.com/google-gemini/gemini-cli/pull/29549)
-- Changelog for v0.63.0-preview.0 by @gemini-cli-robot in
-  [#29565](https://github.com/google-gemini/gemini-cli/pull/29565)
-- fix(cli): propagate resolved folder trust state in headless mode (#29031) by
-  @amelidev in [#29528](https://github.com/google-gemini/gemini-cli/pull/29528)
-- chore(release): bump version to 0.64.0-nightly.20260929.gd75234cae by
+  [#29583](https://github.com/google-gemini/gemini-cli/pull/29583)
+- fix(core): avoid duplicate tool response turns when resuming sessions by
+  @diegogodinezr in
+  [#29618](https://github.com/google-gemini/gemini-cli/pull/29618)
+- fix(core): prevent deletion of resumed session history on quick exit (#29198)
+  by @villahernandez-coder in
+  [#29584](https://github.com/google-gemini/gemini-cli/pull/29584)
+- Changelog for v0.64.0-preview.0 by @gemini-cli-robot in
+  [#29656](https://github.com/google-gemini/gemini-cli/pull/29656)
+- Changelog for v0.63.0 by @gemini-cli-robot in
+  [#29659](https://github.com/google-gemini/gemini-cli/pull/29659)
+- fix(core): align OAuth callback iss parameter validation with RFC 9207
+  metadata by @luisfelipe-alt in
+  [#29616](https://github.com/google-gemini/gemini-cli/pull/29616)
+- fix(cli): prevent unnecessary terminal clears and scroll resets when expanding
+  with Ctrl+O by @jesussamuel-byte in
+  [#29640](https://github.com/google-gemini/gemini-cli/pull/29640)
+- chore(release): bump version to 0.65.0-nightly.20261006.gfb972b2f8 by
   @gemini-cli-robot in
-  [#29567](https://github.com/google-gemini/gemini-cli/pull/29567)
-- fix(cli): prevent CPU hang and quote swallowing on @ within code (#29434) by
-  @elberthc-byte in
-  [#29557](https://github.com/google-gemini/gemini-cli/pull/29557)
-- fix(core): serialize file tool operations and make writes atomic (#29078) by
+  [#29657](https://github.com/google-gemini/gemini-cli/pull/29657)
+- fix(ci): add missing loop in unassign-inactive-assignees workflow by
+  @ugorla-dev in
+  [#29609](https://github.com/google-gemini/gemini-cli/pull/29609)
+- fix(core): enforce terminal user turn invariant and normalize request contents
+  by @luisfelipe-alt in
+  [#29612](https://github.com/google-gemini/gemini-cli/pull/29612)
+- `feat(telemetry): support custom OTLP headers in telemetry configuration` by
+  @jesussamuel-byte in
+  [#29641](https://github.com/google-gemini/gemini-cli/pull/29641)
+- fix(auth): prevent infinite verification and OAuth retry loops by
+  @villahernandez-coder in
+  [#29655](https://github.com/google-gemini/gemini-cli/pull/29655)
+- fix(cli): handle JSON parse and response stream errors in fetchJson by
+  @jesussamuel-byte in
+  [#29658](https://github.com/google-gemini/gemini-cli/pull/29658)
+- fix(core): preserve line terminators in truncateString by @diegogodinezr in
+  [#29673](https://github.com/google-gemini/gemini-cli/pull/29673)
+- fix(vscode-ide-companion): make IdeServer.stop() resolve while MCP sessions
+  are open by @elberthc-byte in
+  [#29674](https://github.com/google-gemini/gemini-cli/pull/29674)
+- fix(core): retain ask_user question text in the tool result display by
   @elberthc-byte in
-  [#29499](https://github.com/google-gemini/gemini-cli/pull/29499)
-- fix(core): implement append-only delta patching and bounded history windowing
-  in ChatRecordingService by @jvargassanchez-dot in
-  [#29568](https://github.com/google-gemini/gemini-cli/pull/29568)
-- fix(cli): persist state atomically and recover from backup on corruption by
+  [#29677](https://github.com/google-gemini/gemini-cli/pull/29677)
+- fix(core): eliminate false positives on untrusted command flags and compound
+  loops by @DavidAPierce in
+  [#29672](https://github.com/google-gemini/gemini-cli/pull/29672)
+- fix(cli): clear cached credentials when re-selecting Google login by
   @urielefrenvirtusa in
-  [#29558](https://github.com/google-gemini/gemini-cli/pull/29558)
-- fix(cli): ensure Ctrl+C emergency abort reaches cancellation handler during
-  active operations by @urielefrenvirtusa in
-  [#29586](https://github.com/google-gemini/gemini-cli/pull/29586)
-- fix(cli): resolve @file:line references and prevent ghost text wrap hang by
+  [#29643](https://github.com/google-gemini/gemini-cli/pull/29643)
+- fix(cli): resolve hang on Enter keypress in interactive mode (#23297) by
+  @elberthc-byte in
+  [#29476](https://github.com/google-gemini/gemini-cli/pull/29476)
+- perf(core): optimize ignore filtering and enable subtree pruning (#29077) by
+  @amelidev in [#29582](https://github.com/google-gemini/gemini-cli/pull/29582)
+- fix(a2a-server): isolate tool rejection to active call in sequential batches
+  by @jvargassanchez-dot in
+  [#29683](https://github.com/google-gemini/gemini-cli/pull/29683)
+- fix(cli): skip eager recursive file reading for @<directory> references by
+  @jvargassanchez-dot in
+  [#29617](https://github.com/google-gemini/gemini-cli/pull/29617)
+- fix(cli): keep loading other extensions when one fails the allowlist check by
   @jesussamuel-byte in
-  [#29581](https://github.com/google-gemini/gemini-cli/pull/29581)
-- fix(ui): ensure Windows ConPTY forwards IME cursor position by
+  [#29720](https://github.com/google-gemini/gemini-cli/pull/29720)
+- fix(cli): correct reverse search highlight index for expanding unicode
+  characters by @diegogodinezr in
+  [#29699](https://github.com/google-gemini/gemini-cli/pull/29699)
+- fix(core): treat whitespace-only UTF-16 and UTF-32 files as empty by
   @jesussamuel-byte in
-  [#29560](https://github.com/google-gemini/gemini-cli/pull/29560)
-- fix(cli): retry directory removal on Windows locking errors during extension
-  updates by @jesussamuel-byte in
-  [#29540](https://github.com/google-gemini/gemini-cli/pull/29540)
-- fix(acp): resolve session by exact id and handle listener cleanup on session
-  failure by @diegogodinezr in
-  [#29580](https://github.com/google-gemini/gemini-cli/pull/29580)
-- fix(cli): preserve scroll position and partition pending height budget by
-  @luisfelipe-alt in
-  [#29520](https://github.com/google-gemini/gemini-cli/pull/29520)
-- fix(cli): ensure Enter and Spacebar reliably confirm selection list options by
-  @ugorla-dev in
-  [#29502](https://github.com/google-gemini/gemini-cli/pull/29502)
+  [#29722](https://github.com/google-gemini/gemini-cli/pull/29722)
+- fix(cli): restore debounced static UI refresh on terminal width changes by
+  @jvargassanchez-dot in
+  [#29644](https://github.com/google-gemini/gemini-cli/pull/29644)
+- fix(cli): prevent session poisoning on rapid Ctrl-C interruption by
+  @villahernandez-coder in
+  [#29728](https://github.com/google-gemini/gemini-cli/pull/29728)
 
 **Full Changelog**:
-https://github.com/google-gemini/gemini-cli/compare/v0.63.0-preview.0...v0.64.0-preview.0
+https://github.com/google-gemini/gemini-cli/compare/v0.64.0-preview.1...v0.65.0-preview.0

package/bundle/docs/reference/configuration.md

@@ -66,9 +66,14 @@ variables using `$VAR_NAME`, `${VAR_NAME}`, or `${VAR_NAME:-DEFAULT_VALUE}`
 syntax. These variables will be automatically resolved when the settings are
 loaded. For example, if you have an environment variable `MY_API_TOKEN`, you
 could use it in `settings.json` like this: `"apiKey": "$MY_API_TOKEN"`. If you
-want to provide a fallback value, use `${MY_API_TOKEN:-default-token}`.
-Additionally, each extension can have its own `.env` file in its directory,
-which will be loaded automatically.
+want to provide a fallback value, use `${MY_API_TOKEN:-default-token}`. You can
+reference variables from your shell environment as well as variables loaded from
+[`.env` files](#environment-variables-and-env-files). The settings that control
+how `.env` files are loaded, such as `security.folderTrust.enabled`,
+`advanced.ignoreLocalEnv`, `advanced.excludedEnvVars`, and `tools.sandbox`, are
+evaluated before any `.env` file is loaded, so they can only reference variables
+from your shell environment. Additionally, each extension can have its own
+`.env` file in its directory, which will be loaded automatically.
 
 **Note for Enterprise Users:** For guidance on deploying and managing Gemini CLI
 in a corporate environment, see the

package/bundle/docs/reference/keyboard-shortcuts.md

@@ -152,7 +152,7 @@ You can add alternative keybindings or remove default keybindings by creating a
 
 The configuration uses a JSON array of objects, similar to VS Code's keybinding
 schema. Each object must specify a `command` from the reference tables above and
-a `key` combination.
+a `key` combination or an array of `keys`.
 
 ```json
 [
@@ -165,6 +165,16 @@ a `key` combination.
     "command": "-app.toggleYolo",
     "key": "ctrl+y"
   },
+  {
+    // unbind multiple keys in a single entry
+    "command": "-input.newline",
+    "keys": ["alt+enter", "ctrl+enter", "shift+enter", "ctrl+j"]
+  },
+  {
+    // bind multiple keys in a single entry
+    "command": "input.newline",
+    "keys": ["enter", "shift+enter"]
+  },
   {
     "command": "input.submit",
     "key": "ctrl+y"
@@ -187,9 +197,13 @@ a `key` combination.
 ]
 ```
 
-- **Unbinding** To remove an existing or default keybinding, prefix a minus sign
-  (`-`) to the `command` name.
-- **No Auto-unbinding** The same key can be bound to multiple commands in
+- **Unbinding**: To remove an existing or default keybinding, prefix a minus
+  sign (`-`) to the `command` name. You can unbind multiple keys in a single
+  entry using `keys`.
+- **Multiple Keys**: You can provide an array of key combinations using `keys`
+  instead of (or in addition to) `key`. The first key in `keys` acts as the
+  primary shortcut displayed in the UI.
+- **No Auto-unbinding**: The same key can be bound to multiple commands in
   different contexts at the same time. Therefore, creating a binding does not
   automatically unbind the key from other commands.
 - **Explicit Modifiers**: Key matching is explicit. For example, a binding for

package/bundle/{gemini-5TUKZVGS.js → gemini-6MH55Y7F.js}

@@ -2,7 +2,7 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
 import {
   startCommand,
   startServer
-} from "./chunk-F6AJM4WN.js";
+} from "./chunk-DPV3ZEOC.js";
 import {
   BuiltinCommandLoader,
   CommandService,
@@ -35,7 +35,6 @@ import {
   promptForSetting,
   renderSkillActionFeedback,
   requestConsentNonInteractive,
-  require_semver,
   skillsConsentString,
   startAutoMemoryIfEnabled,
   statusCommand,
@@ -46,11 +45,11 @@ import {
   updateExtension,
   validateAuthMethod,
   validateContextFilePath
-} from "./chunk-WTRK3NVX.js";
+} from "./chunk-IGOTAEJY.js";
 import {
   exitCli,
   require_source
-} from "./chunk-H2CZXS7F.js";
+} from "./chunk-R4KPURFC.js";
 import {
   appEvents
 } from "./chunk-5PS3AYFU.js";
@@ -89,11 +88,12 @@ import {
   resolveGemmaConfig,
   saveModelChange,
   stripAnsi
-} from "./chunk-2WVLIJA5.js";
+} from "./chunk-H4U2CWBQ.js";
 import {
-  RELAUNCH_EXIT_CODE
-} from "./chunk-4DCA4L53.js";
-import "./chunk-NL7ZHGCH.js";
+  RELAUNCH_EXIT_CODE,
+  require_semver
+} from "./chunk-R6XDLHLP.js";
+import "./chunk-MH4KAY5W.js";
 import {
   cleanupCheckpoints,
   registerCleanup,
@@ -102,7 +102,7 @@ import {
   runExitCleanup,
   runSyncCleanup,
   setupSignalHandlers
-} from "./chunk-RPHDSDL6.js";
+} from "./chunk-UTTFPWGQ.js";
 import {
   ASK_USER_TOOL_NAME,
   ApprovalMode,
@@ -257,7 +257,7 @@ import {
   updatePolicy,
   writeToStderr,
   writeToStdout
-} from "./chunk-K7AA35SP.js";
+} from "./chunk-YPLMNSM4.js";
 import "./chunk-664ZODQF.js";
 import "./chunk-IUUIT4SU.js";
 import "./chunk-L6PII3GR.js";
@@ -7876,7 +7876,7 @@ async function loadSandboxConfig(settings, argv) {
   }
   const command2 = getSandboxCommand(sandboxValue);
   const packageJson = await getPackageJson(__dirname3);
-  const image = process.env["GEMINI_SANDBOX_IMAGE"] ?? "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.65.0-preview.0" ?? customImage ?? packageJson?.config?.sandboxImageUri;
+  const image = process.env["GEMINI_SANDBOX_IMAGE"] ?? "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.66.0-nightly.20261017.ged96faedf" ?? customImage ?? packageJson?.config?.sandboxImageUri;
   const isNative = command2 === "windows-native" || command2 === "sandbox-exec" || command2 === "lxc";
   return command2 && (image || isNative) ? { enabled: true, allowedPaths, networkAccess, command: command2, image } : void 0;
 }
@@ -11547,7 +11547,7 @@ async function runNonInteractive({
       }
     });
     if (process.env["GEMINI_CLI_ACTIVITY_LOG_TARGET"]) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-WP2OPVPB.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-6XOCGTLC.js");
       setupInitialActivityLogger(config);
     }
     const { stdout: workingStdout } = createWorkingStdio();
@@ -12057,7 +12057,7 @@ async function runNonInteractive2(params) {
       }
     });
     if (process.env["GEMINI_CLI_ACTIVITY_LOG_TARGET"]) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-WP2OPVPB.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-6XOCGTLC.js");
       setupInitialActivityLogger(config);
     }
     const { stdout: workingStdout } = createWorkingStdio();
@@ -17084,11 +17084,27 @@ var SlashCommandConflictHandler = class {
       clearTimeout(this.flushTimeout);
       this.flushTimeout = null;
     }
+    this.pendingConflicts = [];
+    this.notifiedConflicts.clear();
+  }
+  getConflictKey(c) {
+    const sourceId = c.loserExtensionName || c.loserMcpServerName || c.loserKind;
+    return `${c.name}:${sourceId}:${c.renamedTo}`;
   }
   handleConflicts(payload) {
+    const currentConflictKeys = new Set(
+      payload.conflicts.map((c) => this.getConflictKey(c))
+    );
+    for (const key of this.notifiedConflicts) {
+      if (!currentConflictKeys.has(key)) {
+        this.notifiedConflicts.delete(key);
+      }
+    }
+    this.pendingConflicts = this.pendingConflicts.filter(
+      (c) => currentConflictKeys.has(this.getConflictKey(c))
+    );
     const newConflicts = payload.conflicts.filter((c) => {
-      const sourceId = c.loserExtensionName || c.loserMcpServerName || c.loserKind;
-      const key = `${c.name}:${sourceId}:${c.renamedTo}`;
+      const key = this.getConflictKey(c);
       if (this.notifiedConflicts.has(key)) {
         return false;
       }
@@ -17098,6 +17114,9 @@ var SlashCommandConflictHandler = class {
     if (newConflicts.length > 0) {
       this.pendingConflicts.push(...newConflicts);
       this.scheduleFlush();
+    } else if (this.pendingConflicts.length === 0 && this.flushTimeout) {
+      clearTimeout(this.flushTimeout);
+      this.flushTimeout = null;
     }
   }
   scheduleFlush() {
@@ -17435,7 +17454,7 @@ async function resolveSessionId(resumeArg, sessionIdArg, sessionFileArg) {
   }
 }
 async function startInteractiveUI(config, settings, startupWarnings, workspaceRoot = process.cwd(), resumedSessionData, initializationResult) {
-  const { startInteractiveUI: doStartUI } = await import("./interactiveCli-E3PUPYMZ.js");
+  const { startInteractiveUI: doStartUI } = await import("./interactiveCli-YEXCUIFZ.js");
   await doStartUI(
     config,
     settings,
@@ -17644,7 +17663,7 @@ ${finalArgs[promptIndex + 1]}`;
     await config.storage.initialize();
     adminControlsListner.setConfig(config);
     if (config.isInteractive() && settings.merged.general.devtools) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-WP2OPVPB.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-6XOCGTLC.js");
       setupInitialActivityLogger(config);
     }
     registerTelemetryConfig(config);
@@ -17703,7 +17722,7 @@ ${finalArgs[promptIndex + 1]}`;
     const initAppHandle = startupProfiler.start("initialize_app");
     const initializationResult = await initializeApp(config, settings);
     initAppHandle?.end();
-    import("./liteRtServerManager-JCTYJBV5.js").then(({ LiteRtServerManager }) => {
+    import("./liteRtServerManager-PD2N3GLD.js").then(({ LiteRtServerManager }) => {
       const mergedGemma = settings.merged.experimental?.gemmaModelRouter;
       if (!mergedGemma) return;
       const userGemma = settings.forScope("User" /* User */).settings.experimental?.gemmaModelRouter;