@google/gemini-cli-a2a-server 0.42.0-preview.1 → 0.43.0-preview.0

package/dist/a2a-server.mjs

@@ -28586,7 +28586,7 @@ var require_object_inspect = __commonJS({
       if (isBoolean2(obj)) {
         return markBoxed(booleanValueOf.call(obj));
       }
-      if (isString(obj)) {
+      if (isString2(obj)) {
         return markBoxed(inspect2(String(obj)));
       }
       if (typeof window !== "undefined" && obj === window) {
@@ -28635,7 +28635,7 @@ var require_object_inspect = __commonJS({
     function isError(obj) {
       return toStr(obj) === "[object Error]" && canTrustToString(obj);
     }
-    function isString(obj) {
+    function isString2(obj) {
       return toStr(obj) === "[object String]" && canTrustToString(obj);
     }
     function isNumber3(obj) {
@@ -36123,7 +36123,7 @@ var require_express = __commonJS({
   "node_modules/express/lib/express.js"(exports2, module2) {
     "use strict";
     var bodyParser = require_body_parser();
-    var EventEmitter10 = __require("node:events").EventEmitter;
+    var EventEmitter11 = __require("node:events").EventEmitter;
     var mixin = require_merge_descriptors();
     var proto = require_application();
     var Router = require_router();
@@ -36134,7 +36134,7 @@ var require_express = __commonJS({
       var app = function(req2, res2, next) {
         app.handle(req2, res2, next);
       };
-      mixin(app, EventEmitter10.prototype, false);
+      mixin(app, EventEmitter11.prototype, false);
       mixin(app, proto, false);
       app.request = Object.create(req, {
         app: { configurable: true, enumerable: true, writable: true, value: app }
@@ -54326,8 +54326,8 @@ var require_copy_sync = __commonJS({
       return getStats(destStat, src, dest, opts);
     }
     function getStats(destStat, src, dest, opts) {
-      const statSync5 = opts.dereference ? fs87.statSync : fs87.lstatSync;
-      const srcStat = statSync5(src);
+      const statSync6 = opts.dereference ? fs87.statSync : fs87.lstatSync;
+      const srcStat = statSync6(src);
       if (srcStat.isDirectory()) return onDir(srcStat, destStat, src, dest, opts);
       else if (srcStat.isFile() || srcStat.isCharacterDevice() || srcStat.isBlockDevice()) return onFile(srcStat, destStat, src, dest, opts);
       else if (srcStat.isSymbolicLink()) return onLink(destStat, src, dest, opts);
@@ -65579,7 +65579,7 @@ var require_lib8 = __commonJS({
       return numMessages > 0;
     }
     async function isBinaryFile2(file, size) {
-      if (isString(file)) {
+      if (isString2(file)) {
         const stat5 = await statAsync(file);
         isStatFile(stat5);
         const fileDescriptor = await openAsync(file, "r");
@@ -65607,7 +65607,7 @@ var require_lib8 = __commonJS({
     }
     exports2.isBinaryFile = isBinaryFile2;
     function isBinaryFileSync(file, size) {
-      if (isString(file)) {
+      if (isString2(file)) {
         const stat5 = fs87.statSync(file);
         isStatFile(stat5);
         const fileDescriptor = fs87.openSync(file, "r");
@@ -65687,7 +65687,7 @@ var require_lib8 = __commonJS({
       }
       return false;
     }
-    function isString(x2) {
+    function isString2(x2) {
       return typeof x2 === "string";
     }
     function isStatFile(stat5) {
@@ -96165,7 +96165,7 @@ var require_extension = __commonJS({
 var require_websocket = __commonJS({
   "node_modules/ws/lib/websocket.js"(exports2, module2) {
     "use strict";
-    var EventEmitter10 = __require("events");
+    var EventEmitter11 = __require("events");
     var https2 = __require("https");
     var http5 = __require("http");
     var net2 = __require("net");
@@ -96197,7 +96197,7 @@ var require_websocket = __commonJS({
     var protocolVersions = [8, 13];
     var readyStates = ["CONNECTING", "OPEN", "CLOSING", "CLOSED"];
     var subprotocolRegex = /^[!#$%&'*+\-.0-9A-Z^_`|a-z~]+$/;
-    var WebSocket2 = class _WebSocket extends EventEmitter10 {
+    var WebSocket2 = class _WebSocket extends EventEmitter11 {
       /**
        * Create a new `WebSocket`.
        *
@@ -97191,7 +97191,7 @@ var require_subprotocol = __commonJS({
 var require_websocket_server = __commonJS({
   "node_modules/ws/lib/websocket-server.js"(exports2, module2) {
     "use strict";
-    var EventEmitter10 = __require("events");
+    var EventEmitter11 = __require("events");
     var http5 = __require("http");
     var { Duplex } = __require("stream");
     var { createHash: createHash17 } = __require("crypto");
@@ -97204,7 +97204,7 @@ var require_websocket_server = __commonJS({
     var RUNNING = 0;
     var CLOSING = 1;
     var CLOSED2 = 2;
-    var WebSocketServer2 = class extends EventEmitter10 {
+    var WebSocketServer2 = class extends EventEmitter11 {
       /**
        * Create a `WebSocketServer` instance.
        *
@@ -113158,14 +113158,16 @@ function makeRelative(targetPath, rootDirectory) {
 function getProjectHash(projectRoot) {
   return crypto9.createHash("sha256").update(projectRoot).digest("hex");
 }
+function toAbsolutePath(p2) {
+  const isWindows2 = process.platform === "win32";
+  const pathModule = isWindows2 ? path3.win32 : path3;
+  return pathModule.resolve(p2).replace(/\\/g, "/");
+}
 function normalizePath(p2) {
+  const absolute = toAbsolutePath(p2);
   const platform9 = process.platform;
-  const isWindows2 = platform9 === "win32";
-  const pathModule = isWindows2 ? path3.win32 : path3;
-  const resolved = pathModule.resolve(p2);
-  const normalized = resolved.replace(/\\/g, "/");
-  const isCaseInsensitive = isWindows2 || platform9 === "darwin";
-  return isCaseInsensitive ? normalized.toLowerCase() : normalized;
+  const isCaseInsensitive = platform9 === "win32" || platform9 === "darwin";
+  return isCaseInsensitive ? absolute.toLowerCase() : absolute;
 }
 function isSubpath(parentPath, childPath) {
   const platform9 = process.platform;
@@ -114307,9 +114309,9 @@ function parseResponseData(error2) {
   return void 0;
 }
 function isAuthenticationError(error2) {
-  if (error2 && typeof error2 === "object" && "code" in error2 && typeof error2.code === "number") {
-    const errorCode = error2.code;
-    if (errorCode === 401) {
+  if (error2 && typeof error2 === "object" && "code" in error2) {
+    const errorCode = error2["code"];
+    if (typeof errorCode === "number" && errorCode === 401) {
       return true;
     }
   }
@@ -114392,13 +114394,17 @@ import { randomUUID as randomUUID4 } from "node:crypto";
 import * as fs9 from "node:fs";
 import * as path4 from "node:path";
 import * as os3 from "node:os";
-var import_proper_lockfile, PROJECT_ROOT_FILE, LOCK_TIMEOUT_MS, LOCK_RETRY_DELAY_MS, ProjectRegistry;
+var import_proper_lockfile, registryDataSchema, PROJECT_ROOT_FILE, LOCK_TIMEOUT_MS, LOCK_RETRY_DELAY_MS, ProjectRegistry;
 var init_projectRegistry = __esm({
   "packages/core/dist/src/config/projectRegistry.js"() {
     "use strict";
     import_proper_lockfile = __toESM(require_proper_lockfile(), 1);
+    init_zod();
     init_debugLogger();
     init_errors2();
+    registryDataSchema = external_exports.object({
+      projects: external_exports.record(external_exports.string(), external_exports.string().regex(/^[a-z0-9-]+$/))
+    });
     PROJECT_ROOT_FILE = ".project_root";
     LOCK_TIMEOUT_MS = 1e4;
     LOCK_RETRY_DELAY_MS = 100;
@@ -114429,7 +114435,12 @@ var init_projectRegistry = __esm({
       async loadData() {
         try {
           const content = await fs9.promises.readFile(this.registryPath, "utf8");
-          return JSON.parse(content);
+          const parsed = JSON.parse(content);
+          if (this.isValidRegistryData(parsed)) {
+            return parsed;
+          }
+          debugLogger.warn(`Project registry at ${this.registryPath} has an invalid schema, resetting to empty.`);
+          return { projects: {} };
         } catch (error2) {
           if (isNodeError(error2) && error2.code === "ENOENT") {
             return { projects: {} };
@@ -114670,6 +114681,9 @@ var init_projectRegistry = __esm({
       slugify(text) {
         return text.toLowerCase().replace(/[^a-z0-9]/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "") || "project";
       }
+      isValidRegistryData(data) {
+        return registryDataSchema.safeParse(data).success;
+      }
     };
   }
 });
@@ -115696,7 +115710,7 @@ function isProModel(model, config3) {
 }
 function isGemini3Model(model, config3) {
   if (config3?.getExperimentalDynamicModelConfiguration?.() === true) {
-    const resolved2 = resolveModel(model);
+    const resolved2 = resolveModel(model, false, false, false, true, config3);
     return config3.modelConfigService.getModelDefinition(resolved2)?.family === "gemini-3";
   }
   const resolved = resolveModel(model);
@@ -117627,11 +117641,13 @@ var init_default_legacy = __esm({
             },
             [READ_FILE_PARAM_START_LINE]: {
               description: "Optional: The 1-based line number to start reading from.",
-              type: "number"
+              type: "integer",
+              minimum: 1
             },
             [READ_FILE_PARAM_END_LINE]: {
               description: "Optional: The 1-based line number to end reading at (inclusive).",
-              type: "number"
+              type: "integer",
+              minimum: 1
             }
           },
           required: [PARAM_FILE_PATH]
@@ -117733,7 +117749,8 @@ var init_default_legacy = __esm({
             },
             [GREP_PARAM_CONTEXT]: {
               description: "Show this many lines of context around each match (equivalent to grep -C). Defaults to 0 if omitted.",
-              type: "integer"
+              type: "integer",
+              minimum: 0
             },
             [GREP_PARAM_AFTER]: {
               description: "Show this many lines after each match (equivalent to grep -A). Defaults to 0 if omitted.",
@@ -118267,11 +118284,13 @@ var init_gemini_3 = __esm({
             },
             [READ_FILE_PARAM_START_LINE]: {
               description: "Optional: The 1-based line number to start reading from.",
-              type: "number"
+              type: "integer",
+              minimum: 1
             },
             [READ_FILE_PARAM_END_LINE]: {
               description: "Optional: The 1-based line number to end reading at (inclusive).",
-              type: "number"
+              type: "integer",
+              minimum: 1
             }
           },
           required: [PARAM_FILE_PATH]
@@ -118279,7 +118298,7 @@ var init_gemini_3 = __esm({
       },
       write_file: {
         name: WRITE_FILE_TOOL_NAME,
-        description: `Writes the complete content to a file, automatically creating missing parent directories. Overwrites existing files. The user has the ability to modify 'content' before it is saved. Best for new or small files; use '${EDIT_TOOL_NAME}' for targeted edits to large files.`,
+        description: `Writes the complete content to a file, automatically creating missing parent directories. Overwrites existing files. The user has the ability to modify 'content' before it is saved. Best for new or small files; use '${EDIT_TOOL_NAME}' for targeted edits to large files to minimize token usage and simplify reviews.`,
         parametersJsonSchema: {
           type: "object",
           properties: {
@@ -118371,7 +118390,8 @@ var init_gemini_3 = __esm({
             },
             [GREP_PARAM_CONTEXT]: {
               description: "Show this many lines of context around each match (equivalent to grep -C). Defaults to 0 if omitted.",
-              type: "integer"
+              type: "integer",
+              minimum: 0
             },
             [GREP_PARAM_AFTER]: {
               description: "Show this many lines after each match (equivalent to grep -A). Defaults to 0 if omitted.",
@@ -118469,7 +118489,7 @@ var init_gemini_3 = __esm({
       run_shell_command: (enableInteractiveShell, enableEfficiency, enableToolSandboxing) => getShellDeclaration(enableInteractiveShell, enableEfficiency, enableToolSandboxing),
       replace: {
         name: EDIT_TOOL_NAME,
-        description: `Replaces text within a file. By default, the tool expects to find and replace exactly ONE occurrence of \`old_string\`. If you want to replace multiple occurrences of the exact same string, set \`allow_multiple\` to true. This tool requires providing significant context around the change to ensure precise targeting.
+        description: `Replaces text within a file. By default, the tool expects to find and replace exactly ONE occurrence of \`old_string\`. If you want to replace multiple occurrences of the exact same string, set \`allow_multiple\` to true. This tool is preferred for surgical edits to existing files as it minimizes token usage, simplifies code reviews, and avoids accidental deletions. This tool requires providing significant context around the change to ensure precise targeting.
 The user has the ability to modify the \`new_string\` content. If modified, this will be stated in the response.`,
         parametersJsonSchema: {
           type: "object",
@@ -119821,6 +119841,8 @@ var init_ignorePatterns = __esm({
       "**/*.bz2",
       "**/*.rar",
       "**/*.7z",
+      "**/*.pak",
+      "**/*.rpa",
       "**/*.doc",
       "**/*.docx",
       "**/*.xls",
@@ -120777,8 +120799,14 @@ function escapeShellArg(arg, shell) {
   }
   switch (shell) {
     case "powershell":
+      if (/^[a-zA-Z0-9\-_.]+$/.test(arg)) {
+        return arg;
+      }
       return `'${arg.replace(/'/g, "''")}'`;
     case "cmd":
+      if (/^[a-zA-Z0-9\-_.]+$/.test(arg)) {
+        return arg;
+      }
       return `"${arg.replace(/"/g, '""')}"`;
     case "bash":
     default:
@@ -128063,7 +128091,8 @@ function recordModelRoutingMetrics(config3, event) {
     "routing.approval_mode": event.approval_mode
   };
   if (event.reasoning) {
-    attributes["routing.reasoning"] = event.reasoning;
+    const isStrictTelemetry = process.env["GEMINI_STRICT_TELEMETRY_LIMITS"] === "true";
+    attributes["routing.reasoning"] = isStrictTelemetry && event.reasoning.length > 1e3 ? event.reasoning.substring(0, 1e3) + "..." : event.reasoning;
   }
   if (event.enable_numerical_routing !== void 0) {
     attributes["routing.enable_numerical_routing"] = event.enable_numerical_routing;
@@ -128073,9 +128102,10 @@ function recordModelRoutingMetrics(config3, event) {
   }
   modelRoutingLatencyHistogram.record(event.routing_latency_ms, attributes);
   if (event.failed) {
+    const isStrictTelemetry = process.env["GEMINI_STRICT_TELEMETRY_LIMITS"] === "true";
     modelRoutingFailureCounter.add(1, {
       ...attributes,
-      "routing.error_message": event.error_message
+      "routing.error_message": isStrictTelemetry && event.error_message && event.error_message.length > 1e3 ? event.error_message.substring(0, 1e3) + "..." : event.error_message
     });
   }
 }
@@ -133049,7 +133079,7 @@ var init_keychainService = __esm({
           if (await this.isKeychainFunctional(keychainModule)) {
             return keychainModule;
           }
-          debugLogger.debug("Keychain functional verification failed");
+          debugLogger.debug("Keychain functional verification failed or timed out");
           return null;
         } catch (error2) {
           const message = error2 instanceof Error ? error2.message : String(error2);
@@ -133070,13 +133100,22 @@ var init_keychainService = __esm({
         return null;
       }
       // Performs a set-get-delete cycle to verify keychain functionality.
+      // Capped with a 2s timeout so a non-responsive Secret Service (common on
+      // headless Linux: WSL/SSH/Docker without gnome-keyring or D-Bus) falls back
+      // to FileKeychain instead of hanging the CLI indefinitely.
       async isKeychainFunctional(keychain) {
         const testAccount = `${KEYCHAIN_TEST_PREFIX}${crypto12.randomBytes(8).toString("hex")}`;
         const testPassword = "test";
-        await keychain.setPassword(this.serviceName, testAccount, testPassword);
-        const retrieved = await keychain.getPassword(this.serviceName, testAccount);
-        const deleted = await keychain.deletePassword(this.serviceName, testAccount);
-        return deleted && retrieved === testPassword;
+        const probe = async () => {
+          await keychain.setPassword(this.serviceName, testAccount, testPassword);
+          const retrieved = await keychain.getPassword(this.serviceName, testAccount);
+          const deleted = await keychain.deletePassword(this.serviceName, testAccount);
+          return deleted && retrieved === testPassword;
+        };
+        return Promise.race([
+          probe(),
+          new Promise((resolve24) => setTimeout(() => resolve24(false), 2e3).unref())
+        ]);
       }
       /**
        * MacOS-specific check to detect if a default keychain is available.
@@ -133588,7 +133627,8 @@ async function triggerPostAuthCallbacks(tokens) {
     refresh_token: tokens.refresh_token ?? void 0,
     // Ensure null is not passed
     type: "authorized_user",
-    client_email: userAccountManager2.getCachedGoogleAccount() ?? void 0
+    client_email: userAccountManager2.getCachedGoogleAccount() ?? void 0,
+    quota_project_id: process.env["GOOGLE_CLOUD_QUOTA_PROJECT"] || process.env["GOOGLE_CLOUD_PROJECT"] || process.env["GOOGLE_CLOUD_PROJECT_ID"]
   };
   authEvents.emit("post_auth", jwtInput);
 }
@@ -140934,18 +140974,18 @@ var require_base64 = __commonJS({
 var require_eventemitter = __commonJS({
   "node_modules/@protobufjs/eventemitter/index.js"(exports2, module2) {
     "use strict";
-    module2.exports = EventEmitter10;
-    function EventEmitter10() {
+    module2.exports = EventEmitter11;
+    function EventEmitter11() {
       this._listeners = {};
     }
-    EventEmitter10.prototype.on = function on3(evt, fn2, ctx) {
+    EventEmitter11.prototype.on = function on3(evt, fn2, ctx) {
       (this._listeners[evt] || (this._listeners[evt] = [])).push({
         fn: fn2,
         ctx: ctx || this
       });
       return this;
     };
-    EventEmitter10.prototype.off = function off(evt, fn2) {
+    EventEmitter11.prototype.off = function off(evt, fn2) {
       if (evt === void 0)
         this._listeners = {};
       else {
@@ -140962,7 +141002,7 @@ var require_eventemitter = __commonJS({
       }
       return this;
     };
-    EventEmitter10.prototype.emit = function emit(evt) {
+    EventEmitter11.prototype.emit = function emit(evt) {
       var listeners = this._listeners[evt];
       if (listeners) {
         var args2 = [], i3 = 1;
@@ -141419,7 +141459,7 @@ var require_minimal = __commonJS({
     function isInteger3(value) {
       return typeof value === "number" && isFinite(value) && Math.floor(value) === value;
     };
-    util5.isString = function isString(value) {
+    util5.isString = function isString2(value) {
       return typeof value === "string" || value instanceof String;
     };
     util5.isObject = function isObject5(value) {
@@ -159920,7 +159960,7 @@ var require_minimal2 = __commonJS({
     function isInteger3(value) {
       return typeof value === "number" && isFinite(value) && Math.floor(value) === value;
     };
-    util5.isString = function isString(value) {
+    util5.isString = function isString2(value) {
       return typeof value === "string" || value instanceof String;
     };
     util5.isObject = function isObject5(value) {
@@ -209438,8 +209478,8 @@ var GIT_COMMIT_INFO, CLI_VERSION;
 var init_git_commit = __esm({
   "packages/core/dist/src/generated/git-commit.js"() {
     "use strict";
-    GIT_COMMIT_INFO = "246f98459";
-    CLI_VERSION = "0.42.0-preview.1";
+    GIT_COMMIT_INFO = "022e8baef";
+    CLI_VERSION = "0.43.0-preview.0";
   }
 });
 
@@ -279504,6 +279544,22 @@ var require_src57 = __commonJS({
 });
 
 // packages/core/dist/src/telemetry/gcp-exporters.js
+function truncateLogPayload(payload, limit = 2e5) {
+  if (typeof payload === "string") {
+    return payload.length > limit ? payload.substring(0, limit) + "... (truncated due to size)" : payload;
+  }
+  if (Array.isArray(payload)) {
+    return payload.map((item) => truncateLogPayload(item, limit));
+  }
+  if (payload !== null && typeof payload === "object") {
+    const truncatedObj = {};
+    for (const [key, value] of Object.entries(payload)) {
+      truncatedObj[key] = truncateLogPayload(value, limit);
+    }
+    return truncatedObj;
+  }
+  return payload;
+}
 var import_google_auth_library9, import_opentelemetry_cloud_trace_exporter, import_opentelemetry_cloud_monitoring_exporter, import_logging, import_core5, GcpTraceExporter, GcpMetricExporter, GcpLogExporter;
 var init_gcp_exporters = __esm({
   "packages/core/dist/src/telemetry/gcp-exporters.js"() {
@@ -279530,6 +279586,18 @@ var init_gcp_exporters = __esm({
           prefix: "custom.googleapis.com/gemini_cli"
         });
       }
+      export(metrics2, resultCallback) {
+        super.export(metrics2, (result2) => {
+          if (result2.code === import_core5.ExportResultCode.FAILED && result2.error) {
+            const errorMessage = result2.error.message || String(result2.error);
+            if (process.env["GEMINI_STRICT_TELEMETRY_LIMITS"] === "true" && errorMessage.includes("written more frequently than the maximum sampling period")) {
+              resultCallback({ code: import_core5.ExportResultCode.SUCCESS });
+              return;
+            }
+          }
+          resultCallback(result2);
+        });
+      }
     };
     GcpLogExporter = class {
       logging;
@@ -279542,20 +279610,46 @@ var init_gcp_exporters = __esm({
       export(logs3, resultCallback) {
         try {
           const entries = logs3.map((log) => {
-            const entry = this.log.entry({
-              severity: this.mapSeverityToCloudLogging(log.severityNumber),
-              timestamp: new Date((0, import_core5.hrTimeToMilliseconds)(log.hrTime)),
-              resource: {
-                type: "global",
-                labels: {
-                  project_id: this.logging.projectId
-                }
-              }
-            }, {
+            const rawPayload = {
               ...log.attributes,
               ...log.resource?.attributes,
               message: log.body
-            });
+            };
+            const isStrictTelemetry = process.env["GEMINI_STRICT_TELEMETRY_LIMITS"] === "true";
+            let finalPayload = rawPayload;
+            if (isStrictTelemetry) {
+              let safePayload = truncateLogPayload(rawPayload, 1e4);
+              let payloadString = JSON.stringify(safePayload);
+              if (payloadString && payloadString.length > 1e5) {
+                safePayload = truncateLogPayload(rawPayload, 2e3);
+                payloadString = JSON.stringify(safePayload);
+                if (payloadString && payloadString.length > 1e5) {
+                  safePayload = truncateLogPayload(rawPayload, 5e3);
+                  payloadString = JSON.stringify(safePayload);
+                  if (payloadString && payloadString.length > 1e5) {
+                    safePayload = {
+                      _warning: "Payload heavily truncated due to strict limits",
+                      data: payloadString.substring(0, 5e4) + "... (truncated)"
+                    };
+                  }
+                }
+              }
+              finalPayload = safePayload;
+            }
+            const entry = this.log.entry(
+              {
+                severity: this.mapSeverityToCloudLogging(log.severityNumber),
+                timestamp: new Date((0, import_core5.hrTimeToMilliseconds)(log.hrTime)),
+                resource: {
+                  type: "global",
+                  labels: {
+                    project_id: this.logging.projectId
+                  }
+                }
+              },
+              // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+              finalPayload
+            );
             return entry;
           });
           const writePromise = this.log.write(entries).then(() => {
@@ -301947,10 +302041,10 @@ var require_wrap_handler = __commonJS({
 var require_dispatcher = __commonJS({
   "node_modules/undici/lib/dispatcher/dispatcher.js"(exports2, module2) {
     "use strict";
-    var EventEmitter10 = __require("node:events");
+    var EventEmitter11 = __require("node:events");
     var WrapHandler = require_wrap_handler();
     var wrapInterceptor = (dispatch) => (opts, handler) => dispatch(opts, WrapHandler.wrap(handler));
-    var Dispatcher = class extends EventEmitter10 {
+    var Dispatcher = class extends EventEmitter11 {
       dispatch() {
         throw new Error("not implemented");
       }
@@ -309228,7 +309322,7 @@ var require_socks5_utils = __commonJS({
 var require_socks5_client = __commonJS({
   "node_modules/undici/lib/core/socks5-client.js"(exports2, module2) {
     "use strict";
-    var { EventEmitter: EventEmitter10 } = __require("node:events");
+    var { EventEmitter: EventEmitter11 } = __require("node:events");
     var { Buffer: Buffer5 } = __require("node:buffer");
     var { InvalidArgumentError, Socks5ProxyError } = require_errors7();
     var { debuglog } = __require("node:util");
@@ -309271,7 +309365,7 @@ var require_socks5_client = __commonJS({
       ERROR: "error",
       CLOSED: "closed"
     };
-    var Socks5Client = class extends EventEmitter10 {
+    var Socks5Client = class extends EventEmitter11 {
       constructor(socket, options = {}) {
         super();
         if (!socket) {
@@ -315647,9 +315741,9 @@ var require_memory_cache_store = __commonJS({
   "node_modules/undici/lib/cache/memory-cache-store.js"(exports2, module2) {
     "use strict";
     var { Writable: Writable3 } = __require("node:stream");
-    var { EventEmitter: EventEmitter10 } = __require("node:events");
+    var { EventEmitter: EventEmitter11 } = __require("node:events");
     var { assertCacheKey, assertCacheValue } = require_cache();
-    var MemoryCacheStore = class extends EventEmitter10 {
+    var MemoryCacheStore = class extends EventEmitter11 {
       #maxCount = 1024;
       #maxSize = 104857600;
       // 100MB
@@ -329508,7 +329602,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.42.0-preview.1";
+    return "0.43.0-preview.0";
   })();
   return versionPromise;
 }
@@ -330453,18 +330547,30 @@ var init_policyCatalog = __esm({
   }
 });
 
+// packages/core/dist/src/utils/modelUtils.js
+function normalizeModelId(modelId) {
+  return modelId.startsWith("models/") ? modelId.slice(7) : modelId;
+}
+var init_modelUtils = __esm({
+  "packages/core/dist/src/utils/modelUtils.js"() {
+    "use strict";
+  }
+});
+
 // packages/core/dist/src/availability/policyHelpers.js
 function resolvePolicyChain(config3, preferredModel, wrapsAround = false) {
-  const modelFromConfig = preferredModel ?? config3.getActiveModel?.() ?? config3.getModel();
-  const configuredModel = config3.getModel();
+  const normalizedPreferredModel = preferredModel ? normalizeModelId(preferredModel) : void 0;
+  const modelFromConfig = normalizeModelId(normalizedPreferredModel ?? config3.getActiveModel?.() ?? config3.getModel());
+  const configuredModel = normalizeModelId(config3.getModel());
   let chain2;
   const useGemini31 = config3.getGemini31LaunchedSync?.() ?? false;
   const useGemini31FlashLite = config3.getGemini31FlashLiteLaunchedSync?.() ?? false;
   const useCustomToolModel = config3.getUseCustomToolModelSync?.() ?? false;
   const hasAccessToPreview = config3.getHasAccessToPreviewModel?.() ?? true;
-  const resolvedModel = resolveModel(modelFromConfig, useGemini31, useGemini31FlashLite, useCustomToolModel, hasAccessToPreview, config3);
-  const isAutoPreferred = preferredModel ? isAutoModel(preferredModel, config3) : false;
+  const resolvedModel = normalizeModelId(resolveModel(modelFromConfig, useGemini31, useGemini31FlashLite, useCustomToolModel, hasAccessToPreview, config3));
+  const isAutoPreferred = normalizedPreferredModel ? isAutoModel(normalizedPreferredModel, config3) : false;
   const isAutoConfigured = isAutoModel(configuredModel, config3);
+  const effectiveWrapsAround = wrapsAround || isAutoPreferred || isAutoConfigured || isGemini3Model(resolvedModel, config3);
   if (config3.getExperimentalDynamicModelConfiguration?.() === true) {
     const context2 = {
       useGemini3_1: useGemini31,
@@ -330473,13 +330579,13 @@ function resolvePolicyChain(config3, preferredModel, wrapsAround = false) {
     };
     if (resolvedModel === DEFAULT_GEMINI_FLASH_LITE_MODEL) {
       chain2 = config3.modelConfigService.resolveChain("lite", context2);
-    } else if (isGemini3Model(resolvedModel, config3) || isAutoPreferred || isAutoConfigured) {
+    } else if (isGemini3Model(normalizeModelId(resolvedModel), config3) || isAutoPreferred || isAutoConfigured) {
       if (isAutoConfigured && config3.modelConfigService.getModelChain(configuredModel)) {
         chain2 = config3.modelConfigService.resolveChain(configuredModel, context2);
       }
       if (!chain2) {
         const isAutoSelection = isAutoPreferred || isAutoConfigured;
-        const previewEnabled = hasAccessToPreview && (isGemini3Model(resolvedModel, config3) || preferredModel === PREVIEW_GEMINI_MODEL_AUTO || configuredModel === PREVIEW_GEMINI_MODEL_AUTO);
+        const previewEnabled = hasAccessToPreview && (isGemini3Model(resolvedModel, config3) || normalizedPreferredModel === PREVIEW_GEMINI_MODEL_AUTO || configuredModel === PREVIEW_GEMINI_MODEL_AUTO);
         const autoPrefix = isAutoSelection ? "auto-" : "";
         const chainKey = previewEnabled ? "preview" : "default";
         chain2 = config3.modelConfigService.resolveChain(`${autoPrefix}${chainKey}`, context2);
@@ -330488,14 +330594,14 @@ function resolvePolicyChain(config3, preferredModel, wrapsAround = false) {
     if (!chain2) {
       chain2 = createSingleModelChain(modelFromConfig);
     }
-    chain2 = applyDynamicSlicing(chain2, resolvedModel, wrapsAround);
+    chain2 = applyDynamicSlicing(chain2, resolvedModel, effectiveWrapsAround);
   } else {
     if (resolvedModel === DEFAULT_GEMINI_FLASH_LITE_MODEL) {
       chain2 = getFlashLitePolicyChain();
     } else if (isGemini3Model(resolvedModel, config3) || isAutoPreferred || isAutoConfigured) {
       const isAutoSelection = isAutoPreferred || isAutoConfigured;
       if (hasAccessToPreview) {
-        const previewEnabled = isGemini3Model(resolvedModel, config3) || preferredModel === PREVIEW_GEMINI_MODEL_AUTO || configuredModel === PREVIEW_GEMINI_MODEL_AUTO;
+        const previewEnabled = isGemini3Model(resolvedModel, config3) || normalizedPreferredModel === PREVIEW_GEMINI_MODEL_AUTO || configuredModel === PREVIEW_GEMINI_MODEL_AUTO;
         chain2 = getModelPolicyChain({
           previewEnabled,
           isAutoSelection,
@@ -330517,7 +330623,7 @@ function resolvePolicyChain(config3, preferredModel, wrapsAround = false) {
     } else {
       chain2 = createSingleModelChain(modelFromConfig);
     }
-    chain2 = applyDynamicSlicing(chain2, resolvedModel, wrapsAround);
+    chain2 = applyDynamicSlicing(chain2, resolvedModel, effectiveWrapsAround);
   }
   if (config3?.getApprovalMode?.() === ApprovalMode.PLAN) {
     return chain2.map((policy) => ({
@@ -330528,14 +330634,16 @@ function resolvePolicyChain(config3, preferredModel, wrapsAround = false) {
   return chain2;
 }
 function applyDynamicSlicing(chain2, resolvedModel, wrapsAround) {
-  const activeIndex = chain2.findIndex((policy) => policy.model === resolvedModel);
+  const normalizedResolved = normalizeModelId(resolvedModel);
+  const activeIndex = chain2.findIndex((policy) => normalizeModelId(policy.model) === normalizedResolved);
   if (activeIndex !== -1) {
     return wrapsAround ? [...chain2.slice(activeIndex), ...chain2.slice(0, activeIndex)] : [...chain2.slice(activeIndex)];
   }
   return [createDefaultPolicy(resolvedModel, { isLastResort: true })];
 }
 function buildFallbackPolicyContext(chain2, failedModel, wrapsAround = false) {
-  const index = chain2.findIndex((policy) => policy.model === failedModel);
+  const normalizedFailed = normalizeModelId(failedModel);
+  const index = chain2.findIndex((policy) => normalizeModelId(policy.model) === normalizedFailed);
   if (index === -1) {
     return { failedPolicy: void 0, candidates: chain2 };
   }
@@ -330614,6 +330722,7 @@ var init_policyHelpers = __esm({
     "use strict";
     init_policyCatalog();
     init_models();
+    init_modelUtils();
     init_types2();
   }
 });
@@ -331186,6 +331295,15 @@ var init_baseLlmClient = __esm({
         }
         return text;
       }
+      async countTokens(options) {
+        const model = options.modelConfigKey ? this.config.modelConfigService.getResolvedConfig(options.modelConfigKey).model : this.config.getActiveModel();
+        const result2 = await this.contentGenerator.countTokens({
+          model,
+          contents: options.contents,
+          config: options.abortSignal ? { abortSignal: options.abortSignal } : void 0
+        });
+        return { totalTokens: result2.totalTokens || 0 };
+      }
       async generateContent(options) {
         const { modelConfigKey, contents, systemInstruction, abortSignal, promptId, role, maxAttempts } = options;
         const shouldRetryOnContent = (response) => {
@@ -331890,6 +332008,9 @@ function getErrorReplaceResult(params, occurrences, finalOldString, finalNewStri
   }
   return error2;
 }
+function fileDiffToSummary(diff, editData) {
+  return diff.diffStat ? `${diff.diffStat.model_added_lines} added, ${diff.diffStat.model_removed_lines} removed` : `${editData.occurrences} replacements`;
+}
 function stripWhitespace(str2) {
   return str2.replace(/\s/g, "");
 }
@@ -332399,8 +332520,20 @@ ${snippet2}`);
           if (jitContext) {
             llmContent = appendJitContext(llmContent, jitContext);
           }
+          const resultSummary = typeof displayResult === "string" ? displayResult : fileDiffToSummary(displayResult, editData);
           return {
             llmContent,
+            display: {
+              name: this._toolDisplayName,
+              description: this.getDescription(),
+              resultSummary,
+              result: {
+                type: "diff",
+                path: this.resolvedPath,
+                beforeText: editData.currentContent ?? "",
+                afterText: editData.newContent
+              }
+            },
             returnDisplay: displayResult
           };
         } catch (error2) {
@@ -332860,6 +332993,17 @@ ${snippet2}`);
           }
           return {
             llmContent,
+            display: {
+              name: WRITE_FILE_DISPLAY_NAME,
+              description: this.getDescription(),
+              resultSummary: diffStat ? `${diffStat.model_added_lines} added, ${diffStat.model_removed_lines} removed` : "Written",
+              result: {
+                type: "diff",
+                path: this.resolvedPath,
+                beforeText: correctedContentResult.originalContent ?? "",
+                afterText: correctedContentResult.correctedContent
+              }
+            },
             returnDisplay: displayResult
           };
         } catch (error2) {
@@ -333554,6 +333698,9 @@ var init_cache = __esm({
 // packages/core/dist/src/code_assist/setup.js
 async function setupUser(client, config3, httpOptions = {}) {
   const projectId = process.env["GOOGLE_CLOUD_PROJECT"] || process.env["GOOGLE_CLOUD_PROJECT_ID"] || void 0;
+  if (projectId && /^\d+$/.test(projectId)) {
+    throw new InvalidNumericProjectIdError(projectId);
+  }
   const projectCache = userDataCache.getOrCreate(client, () => createCache({
     storage: "map",
     defaultTtl: 3e4
@@ -333700,7 +333847,7 @@ function validateLoadCodeAssistResponse(res) {
     }
   }
 }
-var ProjectIdRequiredError, ValidationCancelledError, IneligibleTierError, userDataCache;
+var ProjectIdRequiredError, InvalidNumericProjectIdError, ValidationCancelledError, IneligibleTierError, userDataCache;
 var init_setup = __esm({
   "packages/core/dist/src/code_assist/setup.js"() {
     "use strict";
@@ -333717,6 +333864,12 @@ var init_setup = __esm({
         this.name = "ProjectIdRequiredError";
       }
     };
+    InvalidNumericProjectIdError = class extends Error {
+      constructor(projectId) {
+        super(`Invalid Google Cloud Project ID: "${projectId}". The GOOGLE_CLOUD_PROJECT (or GOOGLE_CLOUD_PROJECT_ID) environment variable must be set to your string-based Project ID (e.g., "my-project-123"), not your numeric Project Number. Please update your environment variables.`);
+        this.name = "InvalidNumericProjectIdError";
+      }
+    };
     ValidationCancelledError = class extends Error {
       constructor() {
         super("User cancelled account validation");
@@ -333740,13 +333893,26 @@ var init_setup = __esm({
 
 // packages/core/dist/src/utils/quotaErrorDetection.js
 function isApiError(error2) {
-  return typeof error2 === "object" && error2 !== null && "error" in error2 && // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-  typeof error2.error === "object" && // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-  "message" in error2.error;
+  if (typeof error2 !== "object" || error2 === null || !("error" in error2)) {
+    return false;
+  }
+  const errorProp = error2.error;
+  if (typeof errorProp !== "object" || errorProp === null) {
+    return false;
+  }
+  return "code" in errorProp && typeof errorProp.code === "number" && "message" in errorProp && typeof errorProp.message === "string" && "status" in errorProp && typeof errorProp.status === "string";
 }
 function isStructuredError(error2) {
-  return typeof error2 === "object" && error2 !== null && "message" in error2 && // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-  typeof error2.message === "string";
+  if (typeof error2 !== "object" || error2 === null || !("message" in error2)) {
+    return false;
+  }
+  if (typeof error2.message !== "string") {
+    return false;
+  }
+  if ("status" in error2 && typeof error2.status !== "number") {
+    return false;
+  }
+  return true;
 }
 var init_quotaErrorDetection = __esm({
   "packages/core/dist/src/utils/quotaErrorDetection.js"() {
@@ -333760,9 +333926,10 @@ function estimateTextTokens(text, charsPerToken) {
     return text.length / charsPerToken;
   }
   let tokens = 0;
+  const asciiTokensPerChar = 1 / charsPerToken;
   for (let i3 = 0; i3 < text.length; i3++) {
     if (text.charCodeAt(i3) <= 127) {
-      tokens += ASCII_TOKENS_PER_CHAR;
+      tokens += asciiTokensPerChar;
     } else {
       tokens += NON_ASCII_TOKENS_PER_CHAR;
     }
@@ -334424,10 +334591,6 @@ function validateBaseUrl(baseUrl) {
   }
 }
 async function createContentGeneratorConfig(config3, authType, apiKey, baseUrl, customHeaders, vertexAiRouting) {
-  const geminiApiKey = apiKey || process.env["GEMINI_API_KEY"] || await loadApiKey() || void 0;
-  const googleApiKey = process.env["GOOGLE_API_KEY"] || void 0;
-  const googleCloudProject = process.env["GOOGLE_CLOUD_PROJECT"] || process.env["GOOGLE_CLOUD_PROJECT_ID"] || void 0;
-  const googleCloudLocation = process.env["GOOGLE_CLOUD_LOCATION"] || void 0;
   const contentGeneratorConfig = {
     authType,
     proxy: config3?.getProxy(),
@@ -334438,6 +334601,10 @@ async function createContentGeneratorConfig(config3, authType, apiKey, baseUrl,
   if (authType === AuthType2.LOGIN_WITH_GOOGLE || authType === AuthType2.COMPUTE_ADC) {
     return contentGeneratorConfig;
   }
+  const geminiApiKey = apiKey || process.env["GEMINI_API_KEY"] || await loadApiKey() || void 0;
+  const googleApiKey = process.env["GOOGLE_API_KEY"] || void 0;
+  const googleCloudProject = process.env["GOOGLE_CLOUD_PROJECT"] || process.env["GOOGLE_CLOUD_PROJECT_ID"] || void 0;
+  const googleCloudLocation = process.env["GOOGLE_CLOUD_LOCATION"] || void 0;
   if (authType === AuthType2.USE_GEMINI && geminiApiKey) {
     contentGeneratorConfig.apiKey = geminiApiKey;
     contentGeneratorConfig.vertexai = false;
@@ -335478,6 +335645,11 @@ ${directoryContent}`;
           }
           return {
             llmContent: resultMessage,
+            display: {
+              name: LS_DISPLAY_NAME,
+              description: this.getDescription(),
+              resultSummary: displayMessage
+            },
             returnDisplay: {
               summary: displayMessage,
               files: entries.map((entry) => `${entry.isDirectory ? "[DIR] " : ""}${entry.name}`)
@@ -335733,8 +335905,8 @@ var require_ignore = __commonJS({
       (prev, [matcher, replacer]) => prev.replace(matcher, replacer.bind(pattern)),
       pattern
     );
-    var isString = (subject) => typeof subject === "string";
-    var checkPattern = (pattern) => pattern && isString(pattern) && !REGEX_TEST_BLANK_LINE.test(pattern) && !REGEX_INVALID_TRAILING_BACKSLASH.test(pattern) && pattern.indexOf("#") !== 0;
+    var isString2 = (subject) => typeof subject === "string";
+    var checkPattern = (pattern) => pattern && isString2(pattern) && !REGEX_TEST_BLANK_LINE.test(pattern) && !REGEX_INVALID_TRAILING_BACKSLASH.test(pattern) && pattern.indexOf("#") !== 0;
     var splitPattern = (pattern) => pattern.split(REGEX_SPLITALL_CRLF).filter(Boolean);
     var IgnoreRule = class {
       constructor(pattern, mark, body2, ignoreCase, negative, prefix) {
@@ -335801,7 +335973,7 @@ var require_ignore = __commonJS({
           this._added = true;
           return;
         }
-        if (isString(pattern)) {
+        if (isString2(pattern)) {
           pattern = {
             pattern
           };
@@ -335816,7 +335988,7 @@ var require_ignore = __commonJS({
       add(pattern) {
         this._added = false;
         makeArray(
-          isString(pattern) ? splitPattern(pattern) : pattern
+          isString2(pattern) ? splitPattern(pattern) : pattern
         ).forEach(this._add, this);
         return this._added;
       }
@@ -335858,7 +336030,7 @@ var require_ignore = __commonJS({
       throw new Ctor(message);
     };
     var checkPath = (path95, originalPath, doThrow) => {
-      if (!isString(path95)) {
+      if (!isString2(path95)) {
         return doThrow(
           `path must be a string, but got \`${originalPath}\``,
           TypeError
@@ -336189,7 +336361,7 @@ var init_ignoreFileParser = __esm({
         return this.patterns;
       }
       getIgnoreFilePaths() {
-        return this.fileNames.slice().reverse().map((fileName) => path47.join(this.projectRoot, fileName)).filter((filePath) => fs46.existsSync(filePath));
+        return this.fileNames.slice().reverse().map((fileName) => path47.join(this.projectRoot, fileName)).filter((filePath) => fs46.statSync(filePath, { throwIfNoEntry: false })?.isFile() ?? false);
       }
       /**
        * Returns true if at least one ignore file exists and has patterns.
@@ -336405,7 +336577,8 @@ var init_fileDiscoveryService = __esm({
         const paths = [];
         if (this.gitIgnoreFilter && this.defaultFilterFileOptions.respectGitIgnore) {
           const gitIgnorePath = path49.join(this.projectRoot, ".gitignore");
-          if (fs48.existsSync(gitIgnorePath)) {
+          const stat5 = fs48.statSync(gitIgnorePath, { throwIfNoEntry: false });
+          if (stat5?.isFile()) {
             paths.push(gitIgnorePath);
           }
         }
@@ -336511,8 +336684,15 @@ ${result2.llmContent}`;
             llmContent = appendJitContextToParts(llmContent, jitContext);
           }
         }
+        const displayResultSummary = result2.isTruncated ? `${result2.linesShown[0]}-${result2.linesShown[1]} of ${result2.originalLineCount}` : lines !== void 0 ? `${lines} lines` : void 0;
         return {
           llmContent,
+          display: {
+            name: READ_FILE_DISPLAY_NAME,
+            description: this.getDescription(),
+            resultSummary: displayResultSummary,
+            result: { type: "text", text: result2.returnDisplay || "" }
+          },
           returnDisplay: result2.returnDisplay || ""
         };
       }
@@ -336535,12 +336715,6 @@ ${result2.llmContent}`;
         if (validationError) {
           return validationError;
         }
-        if (params.start_line !== void 0 && params.start_line < 1) {
-          return "start_line must be at least 1";
-        }
-        if (params.end_line !== void 0 && params.end_line < 1) {
-          return "end_line must be at least 1";
-        }
         if (params.start_line !== void 0 && params.end_line !== void 0 && params.start_line > params.end_line) {
           return "start_line cannot be greater than end_line";
         }
@@ -344065,7 +344239,19 @@ var init_grep = __esm({
           } else {
             searchLocationDescription = `in path "${searchDirDisplay}"`;
           }
-          return await formatGrepResults(allMatches, this.params, searchLocationDescription, totalMaxMatches);
+          const result2 = await formatGrepResults(allMatches, this.params, searchLocationDescription, totalMaxMatches);
+          return {
+            ...result2,
+            display: {
+              name: this._toolDisplayName,
+              description: this.getDescription(),
+              resultSummary: result2.returnDisplay.summary,
+              result: {
+                type: "text",
+                text: result2.llmContent.split("\n---\n").slice(1).join("\n---\n")
+              }
+            }
+          };
         } catch (error2) {
           debugLogger.warn(`Error during GrepLogic execution: ${error2}`);
           const errorMessage = getErrorMessage(error2);
@@ -344544,7 +344730,19 @@ var init_ripGrep = __esm({
           const matchCount = allMatches.filter((m3) => !m3.isContext).length;
           allMatches = await this.enrichWithRipgrepAutoContext(allMatches, matchCount, totalMaxMatches, searchDirAbs, timeoutController.signal);
           const searchLocationDescription = `in path "${searchDirDisplay}"`;
-          return await formatGrepResults(allMatches, this.params, searchLocationDescription, totalMaxMatches);
+          const result2 = await formatGrepResults(allMatches, this.params, searchLocationDescription, totalMaxMatches);
+          return {
+            ...result2,
+            display: {
+              name: this._toolDisplayName,
+              description: this.getDescription(),
+              resultSummary: result2.returnDisplay.summary,
+              result: {
+                type: "text",
+                text: result2.llmContent.split("\n---\n").slice(1).join("\n---\n")
+              }
+            }
+          };
         } catch (error2) {
           debugLogger.warn(`Error during GrepLogic execution: ${error2}`);
           const errorMessage = getErrorMessage(error2);
@@ -357219,8 +357417,18 @@ ${result2.output}`;
               ...executionError
             };
           }
+          const displayResultSummary = result2.backgrounded ? `PID: ${result2.pid}` : result2.exitCode !== null && result2.exitCode !== 0 ? `Exit Code: ${result2.exitCode}` : void 0;
           return {
             llmContent,
+            display: {
+              name: "Shell",
+              description: this.getDescription(),
+              resultSummary: displayResultSummary,
+              result: typeof returnDisplay === "string" ? { type: "text", text: returnDisplay } : (
+                // TODO: Add support for terminal display type (AnsiOutput)
+                void 0
+              )
+            },
             returnDisplay,
             data,
             ...executionError
@@ -363637,6 +363845,11 @@ Strategic Intent: ${strategicIntent.trim()}`;
         }
         return {
           llmContent,
+          display: {
+            format: "notice",
+            name: title || UPDATE_TOPIC_DISPLAY_NAME,
+            description: this.getDescription()
+          },
           returnDisplay
         };
       }
@@ -364072,6 +364285,37 @@ function isSchemaDepthError(errorMessage) {
 function isInvalidArgumentError(errorMessage) {
   return errorMessage.includes("Request contains an invalid argument");
 }
+function stripToolCallIdPrefixes(contents) {
+  return contents.map((content) => ({
+    ...content,
+    parts: (content.parts || []).map((part) => {
+      const newPart = { ...part };
+      if (newPart.functionCall) {
+        const fc = newPart.functionCall;
+        const name3 = fc.name?.trim() || "generic_tool";
+        if (fc.id && fc.id.startsWith(`${name3}__`)) {
+          newPart.functionCall = {
+            name: fc.name,
+            args: fc.args,
+            id: fc.id.substring(name3.length + 2)
+          };
+        }
+      }
+      if (newPart.functionResponse) {
+        const fr2 = newPart.functionResponse;
+        const name3 = fr2.name?.trim() || "generic_tool";
+        if (fr2.id && fr2.id.startsWith(`${name3}__`)) {
+          newPart.functionResponse = {
+            name: fr2.name,
+            response: fr2.response,
+            id: fr2.id.substring(name3.length + 2)
+          };
+        }
+      }
+      return newPart;
+    })
+  }));
+}
 var StreamEventType, MID_STREAM_RETRY_OPTIONS, SYNTHETIC_THOUGHT_SIGNATURE2, InvalidStreamError, AgentExecutionStoppedError, AgentExecutionBlockedError, GeminiChat;
 var init_geminiChat = __esm({
   "packages/core/dist/src/core/geminiChat.js"() {
@@ -364155,6 +364399,9 @@ var init_geminiChat = __esm({
         this.chatRecordingService = new ChatRecordingService(context2);
         this.lastPromptTokenCount = estimateTokenCountSync(this.agentHistory.flatMap((c2) => c2.parts || []));
       }
+      get loopContext() {
+        return this.context;
+      }
       async initialize(resumedSessionData, kind = "main") {
         await this.chatRecordingService.initialize(resumedSessionData, kind);
       }
@@ -364412,9 +364659,10 @@ var init_geminiChat = __esm({
           lastModelToUse = modelToUse;
           lastConfig = config3;
           lastContentsToUse = contentsToUse;
+          const finalContents = stripToolCallIdPrefixes(contentsToUse);
           return this.context.config.getContentGenerator().generateContentStream({
             model: modelToUse,
-            contents: contentsToUse,
+            contents: finalContents,
             config: config3
           }, prompt_id, role);
         };
@@ -364583,7 +364831,9 @@ This error was probably caused by cyclic schema references in one of the followi
         const finalFunctionCallsMap = /* @__PURE__ */ new Map();
         const legacyFunctionCalls = [];
         const callIndexToId = /* @__PURE__ */ new Map();
+        let runningFunctionCallCounter = 0;
         for await (const chunk of streamResponse) {
+          const currentChunkStartCounter = runningFunctionCallCounter;
           const candidateWithReason = chunk?.candidates?.find((candidate) => candidate.finishReason);
           if (candidateWithReason) {
             finishReason = candidateWithReason.finishReason;
@@ -364592,18 +364842,30 @@ This error was probably caused by cyclic schema references in one of the followi
             if (this.context.config.isContextManagementEnabled()) {
               for (let i3 = 0; i3 < chunk.functionCalls.length; i3++) {
                 const fnCall = chunk.functionCalls[i3];
+                const globalIndex = currentChunkStartCounter + i3;
                 if (!fnCall.id) {
-                  let id = callIndexToId.get(i3);
+                  let id = callIndexToId.get(globalIndex);
                   if (!id) {
                     id = `synth_${this.context.promptId}_${Date.now()}_${this.callCounter++}`;
-                    callIndexToId.set(i3, id);
-                    debugLogger.log(`[GeminiChat] Assigned synthetic ID: ${id} to tool at index ${i3}: ${fnCall.name}`);
+                    callIndexToId.set(globalIndex, id);
+                    debugLogger.log(`[GeminiChat] Assigned synthetic ID: ${id} to tool at index ${globalIndex}: ${fnCall.name}`);
                   }
                   fnCall.id = id;
                 }
+                const name3 = fnCall.name?.trim() || "generic_tool";
+                if (fnCall.id && !fnCall.id.startsWith(`${name3}__`)) {
+                  fnCall.id = `${name3}__${fnCall.id}`;
+                }
                 finalFunctionCallsMap.set(fnCall.id, fnCall);
               }
+              runningFunctionCallCounter += chunk.functionCalls.length;
             } else {
+              for (const fnCall of chunk.functionCalls) {
+                const name3 = fnCall.name?.trim() || "generic_tool";
+                if (fnCall.id && !fnCall.id.startsWith(`${name3}__`)) {
+                  fnCall.id = `${name3}__${fnCall.id}`;
+                }
+              }
               legacyFunctionCalls.push(...chunk.functionCalls);
             }
           }
@@ -364617,13 +364879,18 @@ This error was probably caused by cyclic schema references in one of the followi
               if (content.parts.some((part) => part.functionCall)) {
                 hasToolCall = true;
               }
+              let localFunctionCallCounter = 0;
               modelResponseParts.push(...content.parts.filter((part) => !part.thought).map((part) => {
                 if (!this.context.config.isContextManagementEnabled()) {
                   return part;
                 }
+                let callIndex;
+                if (part.functionCall) {
+                  callIndex = currentChunkStartCounter + localFunctionCallCounter++;
+                }
                 return {
                   ...part,
-                  callIndex: chunk.functionCalls?.findIndex((fc) => fc.name === part.functionCall?.name)
+                  callIndex
                 };
               }));
             }
@@ -364767,6 +365034,41 @@ This error was probably caused by cyclic schema references in one of the followi
   }
 });
 
+// packages/core/dist/src/agent/tool-display-utils.js
+function populateToolDisplay({ name: name3, invocation, resultDisplay, displayName, display: prevDisplay }) {
+  const display = {
+    name: displayName || name3,
+    description: invocation?.getDescription?.(),
+    ...prevDisplay
+  };
+  if (resultDisplay !== void 0 && display.result === void 0) {
+    display.result = toolResultDisplayToDisplayContent(resultDisplay);
+  }
+  return display;
+}
+function toolResultDisplayToDisplayContent(resultDisplay) {
+  if (typeof resultDisplay === "string") {
+    return { type: "text", text: resultDisplay };
+  }
+  if (typeof resultDisplay === "object" && resultDisplay !== null && "fileDiff" in resultDisplay && "newContent" in resultDisplay) {
+    return {
+      type: "diff",
+      path: resultDisplay.filePath || resultDisplay.fileName,
+      beforeText: resultDisplay.originalContent ?? "",
+      afterText: resultDisplay.newContent
+    };
+  }
+  return {
+    type: "text",
+    text: JSON.stringify(resultDisplay)
+  };
+}
+var init_tool_display_utils = __esm({
+  "packages/core/dist/src/agent/tool-display-utils.js"() {
+    "use strict";
+  }
+});
+
 // packages/core/dist/src/core/turn.js
 var GeminiEventType, CompressionStatus, Turn;
 var init_turn = __esm({
@@ -364780,6 +365082,7 @@ var init_turn = __esm({
     init_thoughtUtils();
     init_generateContentResponseUtilities();
     init_types7();
+    init_tool_display_utils();
     init_types5();
     (function(GeminiEventType2) {
       GeminiEventType2["Content"] = "content";
@@ -364934,13 +365237,33 @@ ${[...this.pendingCitations].sort().join("\n")}`
         }
       }
       handlePendingFunctionCall(fnCall, traceId) {
-        const name3 = fnCall.name || "undefined_tool_name";
+        const name3 = fnCall.name?.trim() || "generic_tool";
         const args2 = fnCall.args || {};
-        const callId = fnCall.id ?? (this.chat.context.config.isContextManagementEnabled() ? `synth_${this.prompt_id}_${Date.now()}_${this.callCounter++}` : `${name3}_${Date.now()}_${this.callCounter++}`);
+        const rawCallId = fnCall.id ?? (this.chat.context.config.isContextManagementEnabled() ? `synth_${this.prompt_id}_${Date.now()}_${this.callCounter++}` : `${name3}_${Date.now()}_${this.callCounter++}`);
+        const callId = rawCallId.startsWith(`${name3}__`) ? rawCallId : `${name3}__${rawCallId}`;
+        fnCall.id = callId;
+        const tool = this.chat.loopContext.toolRegistry.getTool(name3);
+        let display;
+        if (tool) {
+          let invocation;
+          try {
+            invocation = tool.build(args2);
+          } catch {
+          }
+          display = populateToolDisplay({
+            name: name3,
+            invocation,
+            displayName: tool.displayName
+          });
+          if (!display.description) {
+            display.description = tool.description;
+          }
+        }
         const toolCallRequest = {
           callId,
           name: name3,
           args: args2,
+          display,
           isClientInitiated: false,
           prompt_id: this.prompt_id,
           traceId
@@ -365086,7 +365409,7 @@ Use the following guidelines to optimize your search and read patterns.
 - Prefer using tools like ${GREP_TOOL_NAME} to identify points of interest instead of reading lots of files individually.
 - If you need to read multiple ranges in a file, do so parallel, in as few turns as possible.
 - It is more important to reduce extra turns, but please also try to minimize unnecessarily large file reads and search results, when doing so doesn't result in extra turns. Do this by always providing conservative limits and scopes to tools like ${READ_FILE_TOOL_NAME} and ${GREP_TOOL_NAME}.
-- ${READ_FILE_TOOL_NAME} fails if ${EDIT_PARAM_OLD_STRING} is ambiguous, causing extra turns. Take care to read enough with ${READ_FILE_TOOL_NAME} and ${GREP_TOOL_NAME} to make the edit unambiguous.
+- ${EDIT_TOOL_NAME} fails if ${EDIT_PARAM_OLD_STRING} is ambiguous, causing extra turns. Take care to read enough with ${READ_FILE_TOOL_NAME} and ${GREP_TOOL_NAME} to make the edit unambiguous.
 - You can compensate for the risk of missing results with scoped or limited searches by doing multiple searches in parallel.
 - Your primary goal is still to do your best quality work. Efficiency is an important, but secondary concern.
 </guidelines>
@@ -367643,7 +367966,7 @@ function getRemoteAgentTargetUrl(def) {
   }
   return void 0;
 }
-var AgentTerminateMode, DEFAULT_QUERY_STRING, DEFAULT_MAX_TURNS, DEFAULT_MAX_TIME_MINUTES, SubagentActivityErrorType, SUBAGENT_REJECTED_ERROR_PREFIX, SUBAGENT_CANCELLED_ERROR_MESSAGE;
+var AgentTerminateMode, DEFAULT_QUERY_STRING, DEFAULT_MAX_TURNS, DEFAULT_MAX_TIME_MINUTES, SubagentActivityErrorType, SUBAGENT_REJECTED_ERROR_PREFIX, SUBAGENT_CANCELLED_ERROR_MESSAGE, SubagentState;
 var init_types14 = __esm({
   "packages/core/dist/src/agents/types.js"() {
     "use strict";
@@ -367665,6 +367988,12 @@ var init_types14 = __esm({
     })(SubagentActivityErrorType || (SubagentActivityErrorType = {}));
     SUBAGENT_REJECTED_ERROR_PREFIX = "User rejected this operation.";
     SUBAGENT_CANCELLED_ERROR_MESSAGE = "Request cancelled.";
+    (function(SubagentState2) {
+      SubagentState2["RUNNING"] = "running";
+      SubagentState2["COMPLETED"] = "completed";
+      SubagentState2["ERROR"] = "error";
+      SubagentState2["CANCELLED"] = "cancelled";
+    })(SubagentState || (SubagentState = {}));
   }
 });
 
@@ -377158,8 +377487,10 @@ var init_state_manager = __esm({
         const call = this.activeCalls.get(callId);
         if (!call || call.status === CoreToolCallStatus.Error)
           return;
+        const display = call.request.display ? { ...call.request.display } : { name: call.request.name };
+        display.description = newInvocation.getDescription();
         this.activeCalls.set(callId, this.patchCall(call, {
-          request: { ...call.request, args: newArgs },
+          request: { ...call.request, args: newArgs, display },
           invocation: newInvocation
         }));
         this.emitUpdate();
@@ -379616,54 +379947,297 @@ var init_nodeDistillationProcessor = __esm({
   }
 });
 
+// packages/core/dist/src/context/utils/formatNodesForLlm.js
+function getSemanticToolWrapper(toolName) {
+  if (toolName.includes("search") || toolName.includes("grep"))
+    return `SEARCH RESULTS`;
+  if (toolName.includes("list") || toolName.includes("dir"))
+    return `WORKSPACE STRUCTURE`;
+  if (toolName.includes("shell") || toolName.includes("cmd"))
+    return `SHELL EXECUTION`;
+  if (toolName.includes("read") || toolName.includes("fetch"))
+    return `FILE/WEB CONTENT`;
+  return `TOOL RESPONSE`;
+}
+function formatNodesForLlm(nodes, options = {}) {
+  const maxToolChars = options.maxToolResponseChars ?? 2e3;
+  let transcript = "";
+  const uniqueTurns = Array.from(new Set(nodes.map((n2) => n2.turnId).filter(Boolean)));
+  for (const node of nodes) {
+    const payload = node.payload;
+    let nodeContent = "";
+    if (payload.text) {
+      nodeContent = payload.text;
+    } else if (payload.functionCall) {
+      nodeContent = `CALL: ${payload.functionCall.name}(${JSON.stringify(payload.functionCall.args)})`;
+    } else if (payload.functionResponse) {
+      const toolName = payload.functionResponse.name || "unknown_tool";
+      const rawResponse = JSON.stringify(payload.functionResponse.response);
+      const semanticWrapper = getSemanticToolWrapper(toolName);
+      let formattedResponse = rawResponse;
+      if (rawResponse.length > maxToolChars) {
+        const half = Math.floor(maxToolChars / 2);
+        const truncatedCount = rawResponse.length - maxToolChars;
+        formattedResponse = `${rawResponse.substring(0, half)}... [TRUNCATED ${truncatedCount} chars] ...${rawResponse.substring(rawResponse.length - half)}`;
+      }
+      nodeContent = `[${semanticWrapper} (${toolName})]: ${formattedResponse}`;
+    } else {
+      nodeContent = JSON.stringify(payload);
+    }
+    const role = (node.role || "system").toUpperCase();
+    let turnMarker = "";
+    if (node.turnId) {
+      const idx = uniqueTurns.indexOf(node.turnId);
+      if (idx !== -1) {
+        const relativeIdx = idx - (uniqueTurns.length - 1);
+        turnMarker = `[Turn ${relativeIdx}] `;
+      }
+    }
+    transcript += `${turnMarker}[${role}] [${node.type}]: ${nodeContent}
+`;
+  }
+  return transcript;
+}
+var init_formatNodesForLlm = __esm({
+  "packages/core/dist/src/context/utils/formatNodesForLlm.js"() {
+    "use strict";
+  }
+});
+
 // packages/core/dist/src/context/utils/snapshotGenerator.js
+import { randomUUID as randomUUID12 } from "node:crypto";
+function isStringArray(value) {
+  return Array.isArray(value) && value.every((item) => typeof item === "string");
+}
+function isNumberArray(value) {
+  return Array.isArray(value) && value.every((item) => typeof item === "number");
+}
+function isTaskArray(value) {
+  return Array.isArray(value) && value.every((item) => {
+    if (!isRecord(item))
+      return false;
+    const id = item["id"];
+    const desc = item["description"];
+    return typeof id === "string" && typeof desc === "string";
+  });
+}
+function isString(value) {
+  return typeof value === "string";
+}
+function findLatestSnapshotBaseline(targets) {
+  const lastSnapshotNode = [...targets].reverse().find((n2) => n2.type === NodeType.SNAPSHOT && n2.payload.text);
+  if (lastSnapshotNode?.payload.text) {
+    return {
+      text: lastSnapshotNode.payload.text,
+      abstractsIds: lastSnapshotNode.abstractsIds ? [...lastSnapshotNode.abstractsIds] : [],
+      id: lastSnapshotNode.id
+    };
+  }
+  return void 0;
+}
 var SnapshotGenerator;
 var init_snapshotGenerator = __esm({
   "packages/core/dist/src/context/utils/snapshotGenerator.js"() {
     "use strict";
+    init_types15();
     init_llmRole();
+    init_formatNodesForLlm();
+    init_markdownUtils();
     SnapshotGenerator = class {
       env;
       constructor(env) {
         this.env = env;
       }
-      async synthesizeSnapshot(nodes, systemInstruction) {
-        const systemPrompt = systemInstruction ?? `You are an expert Context Memory Manager. You will be provided with a raw transcript of older conversation turns between a user and an AI assistant.
-Your task is to synthesize these turns into a single, dense, factual snapshot that preserves all critical context, preferences, active tasks, and factual knowledge.
+      async synthesizeSnapshot(nodes, previousStateJson, options = {}) {
+        const emptyState = {
+          active_tasks: [],
+          discovered_facts: [],
+          constraints_and_preferences: [],
+          recent_arc: []
+        };
+        let previousState = emptyState;
+        if (previousStateJson) {
+          try {
+            const parsed = JSON.parse(previousStateJson);
+            if (isRecord(parsed)) {
+              let loadedArc = [];
+              if (isStringArray(parsed["recent_arc"])) {
+                loadedArc = parsed["recent_arc"];
+              } else if (isString(parsed["summary"]) && parsed["summary"]) {
+                loadedArc = [parsed["summary"]];
+              }
+              previousState = {
+                active_tasks: isTaskArray(parsed["active_tasks"]) ? parsed["active_tasks"] : [],
+                discovered_facts: isStringArray(parsed["discovered_facts"]) ? parsed["discovered_facts"] : [],
+                constraints_and_preferences: isStringArray(parsed["constraints_and_preferences"]) ? parsed["constraints_and_preferences"] : [],
+                recent_arc: loadedArc
+              };
+            }
+          } catch {
+          }
+        }
+        let pressureWarning = "";
+        const stateString = JSON.stringify(previousState);
+        const estimatedTokens = this.env.tokenCalculator.estimateTokensForString(stateString);
+        const maxTokens = options.maxStateTokens ?? 4e3;
+        if (estimatedTokens > maxTokens * 0.8) {
+          pressureWarning = `
 
-Discard conversational filler, pleasantries, and redundant back-and-forth iterations. Output ONLY the raw factual snapshot, formatted compactly. Do not include markdown wrappers, prefixes like "Here is the snapshot", or conversational elements.`;
-        let userPromptText = "TRANSCRIPT TO SNAPSHOT:\n\n";
-        for (const node of nodes) {
-          const payload = node.payload;
-          let nodeContent = "";
-          if (payload.text) {
-            nodeContent = payload.text;
-          } else if (payload.functionCall) {
-            nodeContent = `CALL: ${payload.functionCall.name}(${JSON.stringify(payload.functionCall.args)})`;
-          } else if (payload.functionResponse) {
-            nodeContent = `RESPONSE: ${JSON.stringify(payload.functionResponse.response)}`;
-          }
-          userPromptText += `[${node.type}]: ${nodeContent}
-`;
+[CRITICAL WARNING]: The Master State is currently at ${(estimatedTokens / maxTokens * 100).toFixed(0)}% of its maximum capacity! You MUST aggressively prune obsolete, irrelevant, or overly granular facts and constraints using \`obsolete_fact_indices\` and \`obsolete_constraint_indices\`.`;
         }
-        const response = await this.env.llmClient.generateContent({
-          role: LlmRole.UTILITY_STATE_SNAPSHOT_PROCESSOR,
-          modelConfigKey: { model: "gemini-3-flash-base" },
-          contents: [{ role: "user", parts: [{ text: userPromptText }] }],
-          systemInstruction: { role: "system", parts: [{ text: systemPrompt }] },
-          promptId: this.env.promptId,
-          abortSignal: new AbortController().signal
-        });
-        const candidate = response.candidates?.[0];
-        const textPart = candidate?.content?.parts?.[0];
-        return textPart?.text || "";
+        const systemPrompt = `You are an expert Context Memory Manager. You maintain the long-term "Master State" of the AI agent's memory.
+You will be provided with the CURRENT Master State and a raw transcript of new conversation turns.
+Your task is to generate a JSON Delta Patch representing what has changed in the transcript.${pressureWarning}
+
+CRITICAL OPERATIONAL RULES:
+1. FACTS: Extract explicit empirical facts (file paths, exact error codes, specific configs).
+2. PRUNING: Keep facts dense. Use obsolete indices to aggressively delete facts that are no longer relevant to the current objective.
+3. TASKS: Add any new active user requests to "new_tasks".
+4. TASK RESOLUTION: A task may ONLY be placed in "resolved_task_ids" if a success message or explicit confirmation was provided in the transcript. If the task was being worked on but no final confirmation exists, it MUST remain active. Do not prematurely resolve tasks.`;
+        const userPromptText = `CURRENT MASTER STATE:
+${JSON.stringify(previousState, null, 2)}
+
+TRANSCRIPT OF NEW TURNS:
+${formatNodesForLlm(nodes)}`;
+        const patchSchema = {
+          type: "object",
+          properties: {
+            new_facts: {
+              type: "array",
+              items: { type: "string" },
+              description: "New specific, empirical facts discovered in this transcript chunk."
+            },
+            new_constraints: {
+              type: "array",
+              items: { type: "string" },
+              description: "New specific rules or instructions provided by the user in this chunk."
+            },
+            new_tasks: {
+              type: "array",
+              items: {
+                type: "object",
+                properties: {
+                  description: {
+                    type: "string",
+                    description: "The task goal/description."
+                  }
+                }
+              }
+            },
+            resolved_task_ids: {
+              type: "array",
+              items: { type: "string" },
+              description: "IDs of tasks from the CURRENT MASTER STATE that were explicitly completed or abandoned in this transcript chunk."
+            },
+            obsolete_fact_indices: {
+              type: "array",
+              items: { type: "number" },
+              description: "Array indices of facts from CURRENT MASTER STATE that are no longer true or relevant and should be deleted."
+            },
+            obsolete_constraint_indices: {
+              type: "array",
+              items: { type: "number" },
+              description: "Array indices of constraints from CURRENT MASTER STATE that are no longer true or relevant and should be deleted."
+            },
+            chronological_summary: {
+              type: "string",
+              description: "A 1-2 sentence summary of the mechanical actions taken in this transcript chunk."
+            }
+          }
+        };
+        let patch = {};
+        try {
+          const result2 = await this.env.llmClient.generateJson({
+            role: LlmRole.UTILITY_STATE_SNAPSHOT_PROCESSOR,
+            modelConfigKey: { model: "context-snapshotter" },
+            contents: [{ role: "user", parts: [{ text: userPromptText }] }],
+            systemInstruction: { role: "system", parts: [{ text: systemPrompt }] },
+            schema: patchSchema,
+            promptId: this.env.promptId,
+            abortSignal: new AbortController().signal
+          });
+          if (isRecord(result2)) {
+            patch = result2;
+          }
+        } catch {
+          return JSON.stringify(previousState);
+        }
+        const newState = {
+          active_tasks: [...previousState.active_tasks],
+          discovered_facts: [...previousState.discovered_facts],
+          constraints_and_preferences: [
+            ...previousState.constraints_and_preferences
+          ],
+          recent_arc: [...previousState.recent_arc]
+        };
+        const resolvedIds = patch["resolved_task_ids"];
+        if (isStringArray(resolvedIds)) {
+          const resolvedSet = new Set(resolvedIds);
+          newState.active_tasks = newState.active_tasks.filter((t3) => !resolvedSet.has(t3.id));
+        }
+        const obsFacts = patch["obsolete_fact_indices"];
+        if (isNumberArray(obsFacts)) {
+          const dropSet = new Set(obsFacts);
+          newState.discovered_facts = newState.discovered_facts.filter((_2, i3) => !dropSet.has(i3));
+        }
+        const obsConstraints = patch["obsolete_constraint_indices"];
+        if (isNumberArray(obsConstraints)) {
+          const dropSet = new Set(obsConstraints);
+          newState.constraints_and_preferences = newState.constraints_and_preferences.filter((_2, i3) => !dropSet.has(i3));
+        }
+        const newTasks = patch["new_tasks"];
+        if (Array.isArray(newTasks)) {
+          for (const t3 of newTasks) {
+            if (isRecord(t3)) {
+              const desc = t3["description"];
+              if (typeof desc === "string" && desc) {
+                newState.active_tasks.push({
+                  id: `task_${randomUUID12().slice(0, 8)}`,
+                  description: desc
+                });
+              }
+            }
+          }
+        }
+        const newFacts = patch["new_facts"];
+        if (isStringArray(newFacts)) {
+          newState.discovered_facts.push(...newFacts);
+        }
+        const newConstraints = patch["new_constraints"];
+        if (isStringArray(newConstraints)) {
+          newState.constraints_and_preferences.push(...newConstraints);
+        }
+        const chronoSummary = patch["chronological_summary"];
+        if (typeof chronoSummary === "string" && chronoSummary) {
+          newState.recent_arc.push(chronoSummary);
+          const maxTurns = options.maxSummaryTurns ?? 5;
+          if (newState.recent_arc.length > maxTurns) {
+            newState.recent_arc = newState.recent_arc.slice(-maxTurns);
+          }
+        }
+        let currentTokens = this.env.tokenCalculator.estimateTokensForString(JSON.stringify(newState));
+        while (currentTokens > maxTokens) {
+          if (newState.discovered_facts.length > 0) {
+            newState.discovered_facts.shift();
+          } else if (newState.constraints_and_preferences.length > 0) {
+            newState.constraints_and_preferences.shift();
+          } else if (newState.recent_arc.length > 0) {
+            newState.recent_arc.shift();
+          } else if (newState.active_tasks.length > 0) {
+            newState.active_tasks.shift();
+          } else {
+            break;
+          }
+          currentTokens = this.env.tokenCalculator.estimateTokensForString(JSON.stringify(newState));
+        }
+        return JSON.stringify(newState);
       }
     };
   }
 });
 
 // packages/core/dist/src/context/processors/stateSnapshotProcessor.js
-import { randomUUID as randomUUID12 } from "node:crypto";
+import { randomUUID as randomUUID13 } from "node:crypto";
 function createStateSnapshotProcessor(id, env, options) {
   const generator = new SnapshotGenerator(env);
   return {
@@ -379684,7 +380258,7 @@ function createStateSnapshotProcessor(id, env, options) {
           const targetIds = new Set(targets.map((t3) => t3.id));
           const isValid2 = consumedIds.every((id2) => targetIds.has(id2));
           if (isValid2) {
-            const newId = randomUUID12();
+            const newId = randomUUID13();
             const snapshotNode = {
               id: newId,
               turnId: newId,
@@ -379725,9 +380299,29 @@ function createStateSnapshotProcessor(id, env, options) {
       }
       if (nodesToSummarize.length < 2)
         return targets;
+      let previousStateJson = void 0;
+      let baselineIdToConsume = void 0;
+      const baseline = findLatestSnapshotBaseline(targets);
+      if (baseline) {
+        previousStateJson = baseline.text;
+        const summaryIdx = nodesToSummarize.findIndex((n2) => n2.id === baseline.id);
+        if (summaryIdx !== -1) {
+          baselineIdToConsume = baseline.id;
+          nodesToSummarize.splice(summaryIdx, 1);
+        }
+      } else {
+        debugLogger.log("[StateSnapshotProcessor] No previous snapshot found in context graph. Initializing new Master State baseline.");
+      }
       try {
-        const snapshotText = await generator.synthesizeSnapshot(nodesToSummarize, options.systemInstruction);
-        const newId = randomUUID12();
+        const snapshotText = await generator.synthesizeSnapshot(nodesToSummarize, previousStateJson, {
+          maxSummaryTurns: options.maxSummaryTurns,
+          maxStateTokens: options.maxStateTokens
+        });
+        const newId = randomUUID13();
+        const consumedIds = nodesToSummarize.map((n2) => n2.id);
+        if (baselineIdToConsume && !consumedIds.includes(baselineIdToConsume)) {
+          consumedIds.push(baselineIdToConsume);
+        }
         const snapshotNode = {
           id: newId,
           turnId: newId,
@@ -379735,9 +380329,8 @@ function createStateSnapshotProcessor(id, env, options) {
           timestamp: nodesToSummarize[nodesToSummarize.length - 1].timestamp,
           role: "user",
           payload: { text: snapshotText },
-          abstractsIds: nodesToSummarize.map((n2) => n2.id)
+          abstractsIds: [...consumedIds]
         };
-        const consumedIds = nodesToSummarize.map((n2) => n2.id);
         const returnedNodes = targets.filter((t3) => !consumedIds.includes(t3.id));
         const firstRemovedIdx = targets.findIndex((t3) => consumedIds.includes(t3.id));
         if (firstRemovedIdx !== -1) {
@@ -379771,7 +380364,9 @@ var init_stateSnapshotProcessor = __esm({
         },
         freeTokensTarget: { type: "number", nullable: true },
         model: { type: "string", nullable: true },
-        systemInstruction: { type: "string", nullable: true }
+        systemInstruction: { type: "string", nullable: true },
+        maxSummaryTurns: { type: "number", nullable: true },
+        maxStateTokens: { type: "number", nullable: true }
       },
       required: []
     };
@@ -379779,7 +380374,6 @@ var init_stateSnapshotProcessor = __esm({
 });
 
 // packages/core/dist/src/context/processors/stateSnapshotAsyncProcessor.js
-import { randomUUID as randomUUID13 } from "node:crypto";
 function createStateSnapshotAsyncProcessor(id, env, options) {
   const generator = new SnapshotGenerator(env);
   return {
@@ -379789,9 +380383,10 @@ function createStateSnapshotAsyncProcessor(id, env, options) {
       if (targets.length === 0)
         return;
       try {
-        let nodesToSummarize = [...targets];
         let previousConsumedIds = [];
         const processorType = options.type ?? "point-in-time";
+        const nodesToSummarize = [...targets];
+        let previousStateJson = void 0;
         if (processorType === "accumulate") {
           const proposedSnapshots = inbox.getMessages("PROPOSED_SNAPSHOT");
           const accumulateSnapshots = proposedSnapshots.filter((s5) => s5.payload.type === "accumulate");
@@ -379800,19 +380395,29 @@ function createStateSnapshotAsyncProcessor(id, env, options) {
             inbox.consume(latest.id);
             env.inbox.drainConsumed(/* @__PURE__ */ new Set([latest.id]));
             previousConsumedIds = latest.payload.consumedIds;
-            const snapshotId = randomUUID13();
-            const previousStateNode = {
-              id: snapshotId,
-              turnId: snapshotId,
-              type: NodeType.SNAPSHOT,
-              timestamp: latest.timestamp,
-              role: "user",
-              payload: { text: latest.payload.newText }
-            };
-            nodesToSummarize = [previousStateNode, ...targets];
+            previousStateJson = latest.payload.newText;
+          } else {
+            const baseline = findLatestSnapshotBaseline(targets);
+            if (baseline) {
+              previousStateJson = baseline.text;
+              previousConsumedIds = [...baseline.abstractsIds];
+            } else {
+              debugLogger.log("[StateSnapshotAsyncProcessor] No previous snapshot found in Inbox or Graph. Initializing new Master State baseline in background.");
+            }
+          }
+        }
+        if (previousStateJson) {
+          const summaryIdx = nodesToSummarize.findIndex((n2) => n2.type === NodeType.SNAPSHOT && n2.payload.text === previousStateJson);
+          if (summaryIdx !== -1) {
+            nodesToSummarize.splice(summaryIdx, 1);
           }
         }
-        const snapshotText = await generator.synthesizeSnapshot(nodesToSummarize, options.systemInstruction);
+        if (nodesToSummarize.length === 0)
+          return;
+        const snapshotText = await generator.synthesizeSnapshot(nodesToSummarize, previousStateJson, {
+          maxSummaryTurns: options.maxSummaryTurns,
+          maxStateTokens: options.maxStateTokens
+        });
         const newConsumedIds = [
           ...previousConsumedIds,
           ...targets.map((t3) => t3.id)
@@ -379833,9 +380438,9 @@ var StateSnapshotAsyncProcessorOptionsSchema;
 var init_stateSnapshotAsyncProcessor = __esm({
   "packages/core/dist/src/context/processors/stateSnapshotAsyncProcessor.js"() {
     "use strict";
-    init_types15();
     init_snapshotGenerator();
     init_debugLogger();
+    init_types15();
     StateSnapshotAsyncProcessorOptionsSchema = {
       type: "object",
       properties: {
@@ -379844,7 +380449,9 @@ var init_stateSnapshotAsyncProcessor = __esm({
           enum: ["accumulate", "point-in-time"],
           nullable: true
         },
-        systemInstruction: { type: "string", nullable: true }
+        systemInstruction: { type: "string", nullable: true },
+        maxSummaryTurns: { type: "number", nullable: true },
+        maxStateTokens: { type: "number", nullable: true }
       },
       required: []
     };
@@ -379920,7 +380527,9 @@ var init_profiles = __esm({
             triggers: ["gc_backstop"],
             processors: [
               createStateSnapshotProcessor("StateSnapshotSync", env, resolveProcessorOptions(config3, "StateSnapshotSync", {
-                target: "max"
+                target: "max",
+                maxStateTokens: 4e3,
+                maxSummaryTurns: 5
               }))
             ]
           }
@@ -379932,7 +380541,9 @@ var init_profiles = __esm({
           triggers: ["nodes_aged_out"],
           processors: [
             createStateSnapshotAsyncProcessor("StateSnapshotAsync", env, resolveProcessorOptions(config3, "StateSnapshotAsync", {
-              type: "accumulate"
+              type: "accumulate",
+              maxStateTokens: 4e3,
+              maxSummaryTurns: 5
             }))
           ]
         }
@@ -380157,6 +380768,12 @@ var init_eventBus = __esm({
   "packages/core/dist/src/context/eventBus.js"() {
     "use strict";
     ContextEventBus = class extends EventEmitter6 {
+      emitTokenGroundTruth(event) {
+        this.emit("TOKEN_GROUND_TRUTH", event);
+      }
+      onTokenGroundTruth(listener) {
+        this.on("TOKEN_GROUND_TRUTH", listener);
+      }
       emitPristineHistoryUpdated(event) {
         this.emit("PRISTINE_HISTORY_UPDATED", event);
       }
@@ -380185,156 +380802,6 @@ var init_eventBus = __esm({
   }
 });
 
-// packages/core/dist/src/context/utils/contextTokenCalculator.js
-var ContextTokenCalculator;
-var init_contextTokenCalculator = __esm({
-  "packages/core/dist/src/context/utils/contextTokenCalculator.js"() {
-    "use strict";
-    init_tokenCalculation();
-    ContextTokenCalculator = class {
-      charsPerToken;
-      registry;
-      tokenCache = /* @__PURE__ */ new Map();
-      constructor(charsPerToken, registry2) {
-        this.charsPerToken = charsPerToken;
-        this.registry = registry2;
-      }
-      /**
-       * Estimates tokens for a simple string based on character count.
-       * Fast, but inherently inaccurate compared to real model tokenization.
-       */
-      estimateTokensForString(text) {
-        return Math.ceil(text.length / this.charsPerToken);
-      }
-      /**
-       * Fast, simple heuristic conversion from tokens to expected character length.
-       * Useful for calculating truncation thresholds.
-       */
-      tokensToChars(tokens) {
-        return tokens * this.charsPerToken;
-      }
-      /**
-       * Pre-calculates and caches the token cost of a newly minted node.
-       * Because nodes are immutable, this cost never changes for this node ID.
-       */
-      /**
-       * Removes cached token counts for any nodes that are no longer in the given live set.
-       * This prevents unbounded memory growth during long sessions.
-       */
-      garbageCollectCache(liveNodeIds) {
-        for (const [id] of this.tokenCache) {
-          if (!liveNodeIds.has(id)) {
-            this.tokenCache.delete(id);
-          }
-        }
-      }
-      cacheNodeTokens(node) {
-        const behavior = this.registry.get(node.type);
-        const parts2 = behavior.getEstimatableParts(node);
-        const tokens = this.estimateTokensForParts(parts2);
-        this.tokenCache.set(node.id, tokens);
-        return tokens;
-      }
-      /**
-       * Retrieves the token cost of a single node from the cache.
-       * If it misses the cache, it computes it and caches it.
-       */
-      getTokenCost(node) {
-        const cached2 = this.tokenCache.get(node.id);
-        if (cached2 !== void 0)
-          return cached2;
-        return this.cacheNodeTokens(node);
-      }
-      /**
-       * Calculates a detailed breakdown of tokens by category for a list of nodes.
-       * Useful for calibration tracing and debugging overestimation.
-       */
-      calculateTokenBreakdown(nodes) {
-        const breakdown = { total: 0, text: 0, media: 0, tool: 0, overhead: 0 };
-        const seenIds = /* @__PURE__ */ new Set();
-        const seenTurnIds = /* @__PURE__ */ new Set();
-        for (const node of nodes) {
-          if (seenIds.has(node.id))
-            continue;
-          seenIds.add(node.id);
-          if (node.turnId) {
-            if (!seenTurnIds.has(node.turnId)) {
-              seenTurnIds.add(node.turnId);
-              breakdown.overhead += MSG_OVERHEAD_TOKENS;
-              breakdown.total += MSG_OVERHEAD_TOKENS;
-            }
-          }
-          const cost = this.getTokenCost(node);
-          breakdown.total += cost;
-          const behavior = this.registry.get(node.type);
-          const parts2 = behavior.getEstimatableParts(node);
-          for (const part of parts2) {
-            if (typeof part.text === "string") {
-              breakdown.text += estimateTokenCountSync([part], 0, this.charsPerToken);
-            } else if (part.inlineData?.mimeType?.startsWith("image/") || part.fileData?.mimeType?.startsWith("image/")) {
-              breakdown.media += estimateTokenCountSync([part], 0, this.charsPerToken);
-            } else if (part.functionCall || part.functionResponse) {
-              breakdown.tool += estimateTokenCountSync([part], 0, this.charsPerToken);
-            } else {
-              breakdown.overhead += estimateTokenCountSync([part], 0, this.charsPerToken);
-            }
-          }
-        }
-        return breakdown;
-      }
-      /**
-       * Fast calculation for a flat array of ConcreteNodes (The Nodes).
-       * It relies entirely on the O(1) sidecar token cache.
-       */
-      calculateConcreteListTokens(nodes) {
-        let tokens = 0;
-        const seenIds = /* @__PURE__ */ new Set();
-        const seenTurnIds = /* @__PURE__ */ new Set();
-        for (const node of nodes) {
-          if (!seenIds.has(node.id)) {
-            seenIds.add(node.id);
-            tokens += this.getTokenCost(node);
-            if (node.turnId) {
-              if (!seenTurnIds.has(node.turnId)) {
-                seenTurnIds.add(node.turnId);
-                tokens += MSG_OVERHEAD_TOKENS;
-              }
-            }
-          }
-        }
-        return tokens;
-      }
-      /**
-       * Calculates the token cost for a single Gemini Content object.
-       */
-      calculateContentTokens(content) {
-        return this.estimateTokensForParts(content.parts || []) + MSG_OVERHEAD_TOKENS;
-      }
-      /**
-       * Slower, precise estimation for a Gemini Content/Part graph.
-       * Deeply inspects the nested structure and uses the base tokenization math.
-       */
-      partTokenCache = /* @__PURE__ */ new WeakMap();
-      estimateTokensForParts(parts2) {
-        let total = 0;
-        for (const part of parts2) {
-          if (part !== null && typeof part === "object") {
-            let cost = this.partTokenCache.get(part);
-            if (cost === void 0) {
-              cost = estimateTokenCountSync([part], 0, this.charsPerToken);
-              this.partTokenCache.set(part, cost);
-            }
-            total += cost;
-          } else {
-            total += estimateTokenCountSync([part], 0, this.charsPerToken);
-          }
-        }
-        return total;
-      }
-    };
-  }
-});
-
 // packages/core/dist/src/context/pipeline/inbox.js
 import { randomUUID as randomUUID15 } from "node:crypto";
 var LiveInbox, InboxSnapshotImpl;
@@ -380378,94 +380845,6 @@ var init_inbox = __esm({
   }
 });
 
-// packages/core/dist/src/context/graph/behaviorRegistry.js
-var NodeBehaviorRegistry;
-var init_behaviorRegistry = __esm({
-  "packages/core/dist/src/context/graph/behaviorRegistry.js"() {
-    "use strict";
-    NodeBehaviorRegistry = class {
-      behaviors = /* @__PURE__ */ new Map();
-      register(behavior) {
-        this.behaviors.set(behavior.type, behavior);
-      }
-      get(type2) {
-        const behavior = this.behaviors.get(type2);
-        if (!behavior) {
-          throw new Error(`Unregistered Node type: ${type2}`);
-        }
-        return behavior;
-      }
-    };
-  }
-});
-
-// packages/core/dist/src/context/graph/builtinBehaviors.js
-function registerBuiltInBehaviors(registry2) {
-  registry2.register(UserPromptBehavior);
-  registry2.register(AgentThoughtBehavior);
-  registry2.register(ToolExecutionBehavior);
-  registry2.register(MaskedToolBehavior);
-  registry2.register(AgentYieldBehavior);
-  registry2.register(SystemEventBehavior);
-  registry2.register(SnapshotBehavior);
-  registry2.register(RollingSummaryBehavior);
-}
-var UserPromptBehavior, AgentThoughtBehavior, ToolExecutionBehavior, MaskedToolBehavior, AgentYieldBehavior, SystemEventBehavior, SnapshotBehavior, RollingSummaryBehavior;
-var init_builtinBehaviors = __esm({
-  "packages/core/dist/src/context/graph/builtinBehaviors.js"() {
-    "use strict";
-    init_types15();
-    UserPromptBehavior = {
-      type: NodeType.USER_PROMPT,
-      getEstimatableParts(node) {
-        return [node.payload];
-      }
-    };
-    AgentThoughtBehavior = {
-      type: NodeType.AGENT_THOUGHT,
-      getEstimatableParts(node) {
-        return [node.payload];
-      }
-    };
-    ToolExecutionBehavior = {
-      type: NodeType.TOOL_EXECUTION,
-      getEstimatableParts(node) {
-        return [node.payload];
-      }
-    };
-    MaskedToolBehavior = {
-      type: NodeType.MASKED_TOOL,
-      getEstimatableParts(node) {
-        return [node.payload];
-      }
-    };
-    AgentYieldBehavior = {
-      type: NodeType.AGENT_YIELD,
-      getEstimatableParts() {
-        return [];
-      }
-    };
-    SystemEventBehavior = {
-      type: NodeType.SYSTEM_EVENT,
-      getEstimatableParts(node) {
-        return [node.payload];
-      }
-    };
-    SnapshotBehavior = {
-      type: NodeType.SNAPSHOT,
-      getEstimatableParts(node) {
-        return [node.payload];
-      }
-    };
-    RollingSummaryBehavior = {
-      type: NodeType.ROLLING_SUMMARY,
-      getEstimatableParts(node) {
-        return [node.payload];
-      }
-    };
-  }
-});
-
 // packages/core/dist/src/context/graph/toGraph.js
 import { randomUUID as randomUUID16, createHash as createHash14 } from "node:crypto";
 function isTextPart2(part) {
@@ -380541,9 +380920,9 @@ var init_toGraph = __esm({
           const msg = history[turnIdx];
           if (!msg.parts)
             continue;
-          if (turnIdx === 0 && msg.role === "user" && msg.parts.length === 1) {
+          if (msg.role === "user" && msg.parts.length === 1) {
             const text = msg.parts[0].text;
-            if (text?.startsWith("<session_context>") && text?.includes("This is the Gemini CLI.")) {
+            if (text?.startsWith("<session_context>") && text?.includes("This is the Gemini CLI")) {
               debugLogger.log("[ContextGraphBuilder] Skipping legacy environment header turn from graph.");
               continue;
             }
@@ -380653,10 +381032,7 @@ var ContextEnvironmentImpl;
 var init_environmentImpl = __esm({
   "packages/core/dist/src/context/pipeline/environmentImpl.js"() {
     "use strict";
-    init_contextTokenCalculator();
     init_inbox();
-    init_behaviorRegistry();
-    init_builtinBehaviors();
     init_mapper();
     ContextEnvironmentImpl = class {
       llmClientProvider;
@@ -380668,10 +381044,11 @@ var init_environmentImpl = __esm({
       charsPerToken;
       eventBus;
       tokenCalculator;
-      inbox;
       behaviorRegistry;
+      renderOptions;
+      inbox;
       graphMapper;
-      constructor(llmClientProvider, sessionId, promptId, traceDir, projectTempDir, tracer, charsPerToken, eventBus) {
+      constructor(llmClientProvider, sessionId, promptId, traceDir, projectTempDir, tracer, charsPerToken, eventBus, tokenCalculator, behaviorRegistry, renderOptions) {
         this.llmClientProvider = llmClientProvider;
         this.sessionId = sessionId;
         this.promptId = promptId;
@@ -380680,9 +381057,9 @@ var init_environmentImpl = __esm({
         this.tracer = tracer;
         this.charsPerToken = charsPerToken;
         this.eventBus = eventBus;
-        this.behaviorRegistry = new NodeBehaviorRegistry();
-        registerBuiltInBehaviors(this.behaviorRegistry);
-        this.tokenCalculator = new ContextTokenCalculator(this.charsPerToken, this.behaviorRegistry);
+        this.tokenCalculator = tokenCalculator;
+        this.behaviorRegistry = behaviorRegistry;
+        this.renderOptions = renderOptions;
         this.inbox = new LiveInbox();
         this.graphMapper = new ContextGraphMapper();
       }
@@ -380726,30 +381103,6 @@ var init_contextWorkingBuffer = __esm({
         }
         return new _ContextWorkingBufferImpl(pristineNodes, pristineMap, initialProvenance, []);
       }
-      /**
-       * Appends newly observed pristine nodes (e.g. from a user message) to the working buffer.
-       * Ensures they are tracked in the pristine map and point to themselves in provenance.
-       */
-      appendPristineNodes(newNodes) {
-        if (newNodes.length === 0)
-          return this;
-        const newPristineMap = new Map(this.pristineNodesMap);
-        const newProvenanceMap = new Map(this.provenanceMap);
-        const existingIds = new Set(this.nodes.map((n2) => n2.id));
-        const nodesToAdd = [];
-        const batchIds = /* @__PURE__ */ new Set();
-        for (const node of newNodes) {
-          if (!existingIds.has(node.id) && !batchIds.has(node.id)) {
-            newPristineMap.set(node.id, node);
-            newProvenanceMap.set(node.id, /* @__PURE__ */ new Set([node.id]));
-            nodesToAdd.push(node);
-            batchIds.add(node.id);
-          }
-        }
-        if (nodesToAdd.length === 0)
-          return this;
-        return new _ContextWorkingBufferImpl([...this.nodes, ...nodesToAdd], newPristineMap, newProvenanceMap, [...this.history]);
-      }
       /**
        * Generates an entirely new buffer instance by calculating the delta between the processor's input and output.
        */
@@ -380827,10 +381180,90 @@ var init_contextWorkingBuffer = __esm({
         finalPristineMap = prunedPristineMap;
         return new _ContextWorkingBufferImpl(newGraph, finalPristineMap, newProvenanceMap, [...this.history, mutation]);
       }
-      /** Removes nodes from the working buffer that were completely dropped from the upstream pristine history */
-      prunePristineNodes(retainedIds) {
-        const newGraph = this.nodes.filter((n2) => retainedIds.has(n2.id) || !this.pristineNodesMap.has(n2.id));
+      /**
+       * Rebuilds the working buffer in the exact chronological order of the authoritative pristine history,
+       * while preserving injected/summarized nodes at their relative positions.
+       */
+      syncPristineHistory(authoritativePristineNodes) {
+        const newPristineMap = new Map(this.pristineNodesMap);
         const newProvenanceMap = new Map(this.provenanceMap);
+        const authoritativeIds = new Set(authoritativePristineNodes.map((n2) => n2.id));
+        for (const node of authoritativePristineNodes) {
+          if (!newPristineMap.has(node.id)) {
+            newPristineMap.set(node.id, node);
+            newProvenanceMap.set(node.id, /* @__PURE__ */ new Set([node.id]));
+          }
+        }
+        const survivingCurrentNodes = this.nodes.filter((n2) => {
+          if (authoritativeIds.has(n2.id))
+            return true;
+          if (!this.pristineNodesMap.has(n2.id))
+            return true;
+          const roots = newProvenanceMap.get(n2.id);
+          return !roots || roots.size === 0;
+        }).filter((n2) => {
+          if (!authoritativeIds.has(n2.id) && !this.pristineNodesMap.has(n2.id)) {
+            const roots = newProvenanceMap.get(n2.id);
+            if (roots && roots.size > 0) {
+              for (const root of roots) {
+                if (!authoritativeIds.has(root)) {
+                  return false;
+                }
+              }
+            }
+          }
+          return true;
+        });
+        const coveredPristineIds = /* @__PURE__ */ new Set();
+        for (const node of survivingCurrentNodes) {
+          if (!authoritativeIds.has(node.id)) {
+            const roots = newProvenanceMap.get(node.id);
+            if (roots) {
+              for (const root of roots) {
+                coveredPristineIds.add(root);
+              }
+            }
+          }
+        }
+        const pristineIndexMap = new Map(authoritativePristineNodes.map((n2, idx) => [n2.id, idx]));
+        const getPristineIndex = (nodeId) => {
+          const roots = newProvenanceMap.get(nodeId);
+          if (!roots || roots.size === 0)
+            return -1;
+          let maxIndex = -1;
+          for (const root of roots) {
+            const idx = pristineIndexMap.get(root);
+            if (idx !== void 0 && idx > maxIndex) {
+              maxIndex = idx;
+            }
+          }
+          return maxIndex;
+        };
+        const nodeOrder = new Array();
+        for (let i3 = 0; i3 < authoritativePristineNodes.length; i3++) {
+          const node = authoritativePristineNodes[i3];
+          if (!coveredPristineIds.has(node.id)) {
+            nodeOrder.push({ node, sortKey: i3, originalIndex: -1 });
+          }
+        }
+        for (let i3 = 0; i3 < survivingCurrentNodes.length; i3++) {
+          const node = survivingCurrentNodes[i3];
+          if (!authoritativeIds.has(node.id)) {
+            const baseSortKey = getPristineIndex(node.id);
+            nodeOrder.push({
+              node,
+              sortKey: baseSortKey === -1 ? -1 : baseSortKey + 0.5,
+              // Interleave after pristine roots, or at start if injected
+              originalIndex: i3
+            });
+          }
+        }
+        nodeOrder.sort((a, b2) => {
+          if (a.sortKey !== b2.sortKey)
+            return a.sortKey - b2.sortKey;
+          return a.originalIndex - b2.originalIndex;
+        });
+        const newGraph = nodeOrder.map((item) => item.node);
         const reachablePristineIds = /* @__PURE__ */ new Set();
         const reachableCurrentIds = /* @__PURE__ */ new Set();
         for (const node of newGraph) {
@@ -380838,7 +381271,7 @@ var init_contextWorkingBuffer = __esm({
           const roots = newProvenanceMap.get(node.id);
           if (roots) {
             for (const root of roots) {
-              if (retainedIds.has(root) || !this.pristineNodesMap.has(root)) {
+              if (authoritativeIds.has(root) || !this.pristineNodesMap.has(root)) {
                 reachablePristineIds.add(root);
               }
             }
@@ -380851,7 +381284,7 @@ var init_contextWorkingBuffer = __esm({
         }
         const prunedPristineMap = /* @__PURE__ */ new Map();
         for (const id of reachablePristineIds) {
-          const node = this.pristineNodesMap.get(id);
+          const node = newPristineMap.get(id);
           if (node)
             prunedPristineMap.set(id, node);
         }
@@ -380887,6 +381320,7 @@ var init_orchestrator = __esm({
       activeTimers = [];
       pendingPipelines = /* @__PURE__ */ new Map();
       pipelineMutex = /* @__PURE__ */ new Map();
+      pipelineScheduled = /* @__PURE__ */ new Set();
       nodeProvider;
       constructor(pipelines, asyncPipelines, env, eventBus, tracer) {
         this.pipelines = pipelines;
@@ -380927,25 +381361,37 @@ var init_orchestrator = __esm({
                 this.activeTimers.push(timer);
               } else if (trigger === "retained_exceeded" || trigger === "nodes_aged_out") {
                 this.eventBus.onConsolidationNeeded((event) => {
-                  executeFn(pipeline3, event.nodes, event.targetNodeIds, /* @__PURE__ */ new Set());
+                  void executeFn(pipeline3, event.nodes, event.targetNodeIds, /* @__PURE__ */ new Set());
                 });
               } else if (trigger === "new_message" || trigger === "nodes_added") {
                 this.eventBus.onChunkReceived((event) => {
-                  executeFn(pipeline3, event.nodes, event.targetNodeIds, /* @__PURE__ */ new Set());
+                  void executeFn(pipeline3, event.nodes, event.targetNodeIds, /* @__PURE__ */ new Set());
                 });
               }
             }
           }
         };
-        bindTriggers(this.pipelines, (pipeline3, nodes, targets, protectedIds) => {
+        const handleSyncExecution = async (pipeline3, nodes, targets, protectedIds) => {
+          if (this.pipelineScheduled.has(pipeline3.name)) {
+            debugLogger.log(`[Orchestrator] Pipeline ${pipeline3.name} already scheduled (sync), dropping.`);
+            return;
+          }
+          this.pipelineScheduled.add(pipeline3.name);
           const existing = this.pipelineMutex.get(pipeline3.name) || Promise.resolve();
           const nextPromise = (async () => {
             try {
               await existing;
-              const latestNodes = this.nodeProvider();
+              this.pipelineScheduled.delete(pipeline3.name);
+              const latestNodes = this.nodeProvider ? this.nodeProvider() : nodes;
+              const latestTargets = latestNodes.filter((n2) => targets.has(n2.id));
+              debugLogger.log(`[Orchestrator] Executing sync pipeline ${pipeline3.name} with ${latestTargets.length} latest targets.`);
+              if (latestTargets.length === 0) {
+                debugLogger.log(`[Orchestrator] No latest targets for sync pipeline ${pipeline3.name}, returning.`);
+                return;
+              }
               await this.executePipelineAsync(pipeline3, latestNodes, new Set(targets), new Set(protectedIds));
             } catch (e3) {
-              debugLogger.error(`Pipeline chain ${pipeline3.name} failed:`, e3);
+              debugLogger.error(`Sync pipeline chain ${pipeline3.name} failed:`, e3);
             }
           })();
           this.pipelineMutex.set(pipeline3.name, nextPromise);
@@ -380957,18 +381403,47 @@ var init_orchestrator = __esm({
               this.pipelineMutex.delete(pipeline3.name);
             }
           });
-        });
-        bindTriggers(this.asyncPipelines, (pipeline3, nodes, targetIds) => {
-          const inboxSnapshot = new InboxSnapshotImpl(this.env.inbox.getMessages() || []);
-          const targets = nodes.filter((n2) => targetIds.has(n2.id));
-          for (const processor of pipeline3.processors) {
-            processor.process({
-              targets,
-              inbox: inboxSnapshot,
-              buffer: ContextWorkingBufferImpl.initialize(nodes)
-            }).catch((e3) => debugLogger.error(`AsyncProcessor ${processor.name} failed:`, e3));
+        };
+        const handleAsyncExecution = async (pipeline3, nodes, targets) => {
+          if (this.pipelineScheduled.has(pipeline3.name)) {
+            debugLogger.log(`[Orchestrator] Pipeline ${pipeline3.name} already scheduled (async), dropping.`);
+            return;
           }
-        });
+          this.pipelineScheduled.add(pipeline3.name);
+          const existing = this.pipelineMutex.get(pipeline3.name) || Promise.resolve();
+          const nextPromise = (async () => {
+            try {
+              await existing;
+              this.pipelineScheduled.delete(pipeline3.name);
+              const latestNodes = this.nodeProvider ? this.nodeProvider() : nodes;
+              const latestTargets = latestNodes.filter((n2) => targets.has(n2.id));
+              debugLogger.log(`[Orchestrator] Executing async pipeline ${pipeline3.name} with ${latestTargets.length} latest targets.`);
+              const inboxSnapshot = new InboxSnapshotImpl(this.env.inbox.getMessages() || []);
+              for (const processor of pipeline3.processors) {
+                debugLogger.log(`[Orchestrator] Running async processor ${processor.id}`);
+                await processor.process({
+                  targets: latestTargets,
+                  inbox: inboxSnapshot,
+                  buffer: ContextWorkingBufferImpl.initialize(latestNodes)
+                });
+              }
+              this.env.inbox.drainConsumed(inboxSnapshot.getConsumedIds());
+            } catch (e3) {
+              debugLogger.error(`Async pipeline chain ${pipeline3.name} failed:`, e3);
+            }
+          })();
+          this.pipelineMutex.set(pipeline3.name, nextPromise);
+          const pipelineId = `${pipeline3.name}_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
+          this.pendingPipelines.set(pipelineId, nextPromise);
+          void nextPromise.finally(() => {
+            this.pendingPipelines.delete(pipelineId);
+            if (this.pipelineMutex.get(pipeline3.name) === nextPromise) {
+              this.pipelineMutex.delete(pipeline3.name);
+            }
+          });
+        };
+        bindTriggers(this.pipelines, (pipeline3, nodes, targets, protectedIds) => handleSyncExecution(pipeline3, nodes, targets, protectedIds));
+        bindTriggers(this.asyncPipelines, (pipeline3, nodes, targets) => handleAsyncExecution(pipeline3, nodes, targets));
       }
       shutdown() {
         for (const timer of this.activeTimers) {
@@ -381131,17 +381606,60 @@ var init_historyObserver = __esm({
   }
 });
 
+// packages/core/dist/src/context/utils/tokenCalibration.js
+function performCalibration(env, finalNodes, finalContents) {
+  if (!env.renderOptions?.calibrateTokenCalculation) {
+    return;
+  }
+  void (async () => {
+    try {
+      const exactResp = await env.llmClient.countTokens({
+        contents: finalContents
+      });
+      const exactTokens = typeof exactResp.totalTokens === "number" ? exactResp.totalTokens : 0;
+      const estimatedTokens = env.tokenCalculator.calculateConcreteListTokens(finalNodes);
+      const delta = Math.abs(exactTokens - estimatedTokens);
+      const tolerance = Math.max(exactTokens, estimatedTokens) * 0.2;
+      env.tracer.logEvent("Render", "Token Calibration Measurement", {
+        exactTokens,
+        estimatedTokens,
+        delta,
+        isWithinTolerance: delta <= tolerance
+      });
+      if (delta > tolerance) {
+        debugLogger.error(`[Token Calibration] Large deviation detected: exact ${exactTokens} vs estimated ${estimatedTokens} (delta: ${delta})`);
+      }
+    } catch {
+    }
+  })();
+}
+var init_tokenCalibration = __esm({
+  "packages/core/dist/src/context/utils/tokenCalibration.js"() {
+    "use strict";
+    init_debugLogger();
+  }
+});
+
 // packages/core/dist/src/context/graph/render.js
-async function render2(nodes, orchestrator, sidecar, tracer, env, protectionReasons = /* @__PURE__ */ new Map(), headerTokens = 0) {
+async function render2(nodes, orchestrator, sidecar, tracer, env, advancedTokenCalculator, protectionReasons = /* @__PURE__ */ new Map(), header, previewNodeIds = /* @__PURE__ */ new Set()) {
+  let headerTokens = 0;
+  let headerBaseUnits = 0;
+  if (header) {
+    const costs = advancedTokenCalculator.calculateContentTokensAndBaseUnits(header);
+    headerTokens = costs.tokens;
+    headerBaseUnits = costs.baseUnits;
+  }
   if (!sidecar.config.budget) {
-    const contents2 = env.graphMapper.fromGraph(nodes);
+    const visibleNodes2 = nodes.filter((n2) => !previewNodeIds.has(n2.id));
+    const contents2 = env.graphMapper.fromGraph(visibleNodes2);
     tracer.logEvent("Render", "Render Context to LLM (No Budget)", {
       renderedContext: contents2
     });
-    return { history: contents2, didApplyManagement: false };
+    const baseUnits = advancedTokenCalculator.getRawBaseUnits(nodes) + headerBaseUnits;
+    return { history: contents2, didApplyManagement: false, baseUnits };
   }
   const maxTokens = sidecar.config.budget.maxTokens;
-  const graphTokens = env.tokenCalculator.calculateConcreteListTokens(nodes);
+  const { tokens: graphTokens, baseUnits: graphBaseUnits } = advancedTokenCalculator.calculateTokensAndBaseUnits(nodes);
   const currentTokens = graphTokens + headerTokens;
   const protectedIds = new Set(protectionReasons.keys());
   tracer.logEvent("Render", "Budget Audit", {
@@ -381161,11 +381679,17 @@ async function render2(nodes, orchestrator, sidecar, tracer, env, protectionReas
   });
   if (currentTokens <= maxTokens) {
     tracer.logEvent("Render", `View is within maxTokens (${currentTokens} <= ${maxTokens}). Returning view.`);
-    const contents2 = env.graphMapper.fromGraph(nodes);
+    const visibleNodes2 = nodes.filter((n2) => !previewNodeIds.has(n2.id));
+    const contents2 = env.graphMapper.fromGraph(visibleNodes2);
     tracer.logEvent("Render", "Render Context for LLM", {
       renderedContext: contents2
     });
-    return { history: contents2, didApplyManagement: false };
+    performCalibration(env, visibleNodes2, contents2);
+    return {
+      history: contents2,
+      didApplyManagement: false,
+      baseUnits: graphBaseUnits + headerBaseUnits
+    };
   }
   const targetDelta = currentTokens - sidecar.config.budget.retainedTokens;
   tracer.logEvent("Render", `View exceeds maxTokens (${currentTokens} > ${maxTokens}). Hitting Synchronous Pressure Barrier.`, { targetDelta });
@@ -381173,9 +381697,10 @@ async function render2(nodes, orchestrator, sidecar, tracer, env, protectionReas
   let rollingTokens = 0;
   for (let i3 = nodes.length - 1; i3 >= 0; i3--) {
     const node = nodes[i3];
+    const priorTokens = rollingTokens;
     const nodeTokens = env.tokenCalculator.calculateConcreteListTokens([node]);
     rollingTokens += nodeTokens;
-    if (rollingTokens > sidecar.config.budget.retainedTokens) {
+    if (priorTokens > sidecar.config.budget.retainedTokens) {
       agedOutNodes.add(node.id);
     }
   }
@@ -381187,16 +381712,22 @@ async function render2(nodes, orchestrator, sidecar, tracer, env, protectionReas
         skipList.add(id);
     }
   }
-  const visibleNodes = processedNodes.filter((n2) => !skipList.has(n2.id));
+  const visibleNodes = processedNodes.filter((n2) => !skipList.has(n2.id) && !previewNodeIds.has(n2.id));
   const contents = env.graphMapper.fromGraph(visibleNodes);
   tracer.logEvent("Render", "Render Sanitized Context for LLM", {
     renderedContextSanitized: contents
   });
-  return { history: contents, didApplyManagement: true };
+  performCalibration(env, visibleNodes, contents);
+  return {
+    history: contents,
+    didApplyManagement: true,
+    baseUnits: advancedTokenCalculator.getRawBaseUnits(visibleNodes) + headerBaseUnits
+  };
 }
 var init_render = __esm({
   "packages/core/dist/src/context/graph/render.js"() {
     "use strict";
+    init_tokenCalibration();
   }
 });
 
@@ -381247,6 +381778,7 @@ var init_contextManager = __esm({
       sidecar;
       env;
       tracer;
+      advancedTokenCalculator;
       headerProvider;
       // The master state containing the pristine graph and current active graph.
       buffer = ContextWorkingBufferImpl.initialize([]);
@@ -381254,24 +381786,23 @@ var init_contextManager = __esm({
       // Internal sub-components
       orchestrator;
       historyObserver;
+      // Hysteresis tracking to prevent utility call churn
+      lastTriggeredDeficit = 0;
       // Cache for Anomaly 3 (Redundant Renders)
       lastRenderCache;
-      constructor(sidecar, env, tracer, orchestrator, chatHistory, headerProvider) {
+      hasPerformedHotStart = false;
+      constructor(sidecar, env, tracer, orchestrator, chatHistory, advancedTokenCalculator, headerProvider) {
         this.sidecar = sidecar;
         this.env = env;
         this.tracer = tracer;
+        this.advancedTokenCalculator = advancedTokenCalculator;
         this.headerProvider = headerProvider;
         this.eventBus = env.eventBus;
         this.orchestrator = orchestrator;
         this.orchestrator.setNodeProvider(() => this.buffer.nodes);
         this.historyObserver = new HistoryObserver(chatHistory, this.env.eventBus, this.tracer, this.env.graphMapper);
         this.eventBus.onPristineHistoryUpdated((event) => {
-          const newIds = new Set(event.nodes.map((n2) => n2.id));
-          const addedNodes = event.nodes.filter((n2) => event.newNodes.has(n2.id));
-          this.buffer = this.buffer.prunePristineNodes(newIds);
-          if (addedNodes.length > 0) {
-            this.buffer = this.buffer.appendPristineNodes(addedNodes);
-          }
+          this.buffer = this.buffer.syncPristineHistory(event.nodes);
           this.evaluateTriggers(event.newNodes);
         });
         this.eventBus.onProcessorResult((event) => {
@@ -381315,10 +381846,11 @@ var init_contextManager = __esm({
           }
           for (let i3 = this.buffer.nodes.length - 1; i3 >= 0; i3--) {
             const node = this.buffer.nodes[i3];
+            const priorTokens = rollingTokens;
             rollingTokens += this.env.tokenCalculator.calculateConcreteListTokens([
               node
             ]);
-            if (rollingTokens > this.sidecar.config.budget.retainedTokens) {
+            if (priorTokens > this.sidecar.config.budget.retainedTokens) {
               if (!protectedIds.has(node.id)) {
                 agedOutNodes.add(node.id);
               }
@@ -381326,8 +381858,13 @@ var init_contextManager = __esm({
           }
           if (agedOutNodes.size > 0) {
             const targetDeficit = currentTokens - this.sidecar.config.budget.retainedTokens;
+            if (targetDeficit < this.lastTriggeredDeficit) {
+              this.lastTriggeredDeficit = targetDeficit;
+            }
             const threshold = this.sidecar.config.budget.coalescingThresholdTokens || 0;
-            if (targetDeficit >= threshold) {
+            const growthSinceLast = targetDeficit - this.lastTriggeredDeficit;
+            if (targetDeficit >= threshold && (growthSinceLast >= threshold || this.lastTriggeredDeficit === 0)) {
+              this.lastTriggeredDeficit = targetDeficit;
               this.env.tokenCalculator.garbageCollectCache(new Set(this.buffer.nodes.map((n2) => n2.id)));
               this.eventBus.emitConsolidationNeeded({
                 nodes: this.buffer.nodes,
@@ -381335,6 +381872,8 @@ var init_contextManager = __esm({
                 targetNodeIds: agedOutNodes
               });
             }
+          } else {
+            this.lastTriggeredDeficit = 0;
           }
         }
       }
@@ -381391,24 +381930,42 @@ var init_contextManager = __esm({
       getNodes() {
         return [...this.buffer.nodes];
       }
+      getEnvironment() {
+        return this.env;
+      }
       /**
        * Executes the final 'gc_backstop' pipeline if necessary, enforcing the token budget,
        * and maps the Episodic Context Graph back into a raw Gemini Content[] array for transmission.
        * This is the primary method called by the agent framework before sending a request.
        */
-      async renderHistory(pendingRequest, activeTaskIds = /* @__PURE__ */ new Set()) {
+      async renderHistory(pendingRequest, activeTaskIds = /* @__PURE__ */ new Set(), abortSignal) {
         this.tracer.logEvent("ContextManager", "Starting rendering of LLM context");
-        await this.orchestrator.waitForPipelines();
-        let nodes = this.buffer.nodes;
+        let previewNodes = [];
         if (pendingRequest) {
-          const previewNodes = this.env.graphMapper.applyEvent({
+          previewNodes = this.env.graphMapper.applyEvent({
             type: "PUSH",
             payload: [pendingRequest]
           });
+        }
+        const hotStartPromise = (async () => {
+          if (!this.hasPerformedHotStart) {
+            this.hasPerformedHotStart = true;
+            if (this.buffer.nodes.length > 0) {
+              const nodesForHotStart = [...this.buffer.nodes, ...previewNodes];
+              await this.performHotStartCalibration(nodesForHotStart, abortSignal);
+            }
+          }
+        })();
+        await Promise.all([this.orchestrator.waitForPipelines(), hotStartPromise]);
+        let nodes = this.buffer.nodes;
+        const previewNodeIds = /* @__PURE__ */ new Set();
+        if (previewNodes.length > 0) {
+          for (const n2 of previewNodes) {
+            previewNodeIds.add(n2.id);
+          }
           nodes = [...nodes, ...previewNodes];
         }
         const header = this.headerProvider ? await this.headerProvider() : void 0;
-        const headerTokens = header ? this.env.tokenCalculator.calculateContentTokens(header) : 0;
         const graphHash = nodes.map((n2) => n2.id).join("|");
         const headerHash = header ? JSON.stringify(header.parts) : "no-header";
         const totalHash = `${graphHash}::${headerHash}`;
@@ -381417,7 +381974,7 @@ var init_contextManager = __esm({
           return this.lastRenderCache.result;
         }
         const protectionReasons = this.getProtectedNodeIds(nodes, activeTaskIds);
-        const { history: renderedHistory, didApplyManagement } = await render2(nodes, this.orchestrator, this.sidecar, this.tracer, this.env, protectionReasons, headerTokens);
+        const { history: renderedHistory, didApplyManagement, baseUnits } = await render2(nodes, this.orchestrator, this.sidecar, this.tracer, this.env, this.advancedTokenCalculator, protectionReasons, header, previewNodeIds);
         checkContextInvariants(this.buffer.nodes, "RenderHistory");
         this.tracer.logEvent("ContextManager", "Finished rendering");
         const combinedHistory = header ? [header, ...renderedHistory] : renderedHistory;
@@ -381425,11 +381982,35 @@ var init_contextManager = __esm({
           history: hardenHistory(combinedHistory, {
             sentinels: this.sidecar.sentinels
           }),
-          didApplyManagement
+          didApplyManagement,
+          baseUnits
         };
         this.lastRenderCache = { nodesHash: totalHash, result: result2 };
         return result2;
       }
+      async performHotStartCalibration(nodes, abortSignal) {
+        try {
+          this.tracer.logEvent("ContextManager", "Performing Hot Start Token Calibration");
+          const contents = this.env.graphMapper.fromGraph(nodes);
+          const header = this.headerProvider ? await this.headerProvider() : void 0;
+          const combinedHistory = header ? [header, ...contents] : contents;
+          const baseUnits = this.advancedTokenCalculator.getRawBaseUnits(nodes) + (header ? this.advancedTokenCalculator.getRawBaseUnitsForContent(header) : 0);
+          if (combinedHistory.length > 0) {
+            const result2 = await this.env.llmClient.countTokens({
+              contents: combinedHistory,
+              abortSignal
+            });
+            if (result2.totalTokens > 0) {
+              this.env.eventBus.emitTokenGroundTruth({
+                actualTokens: result2.totalTokens,
+                promptBaseUnits: baseUnits
+              });
+            }
+          }
+        } catch (error2) {
+          this.tracer.logEvent("ContextManager", "Hot Start Token Calibration Failed (Ignored)", { error: error2 });
+        }
+      }
     };
   }
 });
@@ -381462,6 +382043,7 @@ var init_rollingSummaryProcessor = __esm({
     init_types15();
     init_debugLogger();
     init_llmRole();
+    init_formatNodesForLlm();
     RollingSummaryProcessorOptionsSchema = {
       type: "object",
       properties: {
@@ -381479,6 +382061,365 @@ var init_rollingSummaryProcessor = __esm({
   }
 });
 
+// packages/core/dist/src/context/utils/contextTokenCalculator.js
+var StaticTokenCalculator;
+var init_contextTokenCalculator = __esm({
+  "packages/core/dist/src/context/utils/contextTokenCalculator.js"() {
+    "use strict";
+    init_tokenCalculation();
+    StaticTokenCalculator = class {
+      charsPerToken;
+      registry;
+      tokenCache = /* @__PURE__ */ new Map();
+      constructor(charsPerToken, registry2) {
+        this.charsPerToken = charsPerToken;
+        this.registry = registry2;
+      }
+      /**
+       * Estimates tokens for a simple string based on character count.
+       * Fast, but inherently inaccurate compared to real model tokenization.
+       */
+      estimateTokensForString(text) {
+        return Math.ceil(text.length / this.charsPerToken);
+      }
+      /**
+       * Fast, simple heuristic conversion from tokens to expected character length.
+       * Useful for calculating truncation thresholds.
+       */
+      tokensToChars(tokens) {
+        return tokens * this.charsPerToken;
+      }
+      /**
+       * Pre-calculates and caches the token cost of a newly minted node.
+       * Because nodes are immutable, this cost never changes for this node ID.
+       */
+      /**
+       * Removes cached token counts for any nodes that are no longer in the given live set.
+       * This prevents unbounded memory growth during long sessions.
+       */
+      garbageCollectCache(liveNodeIds) {
+        for (const [id] of this.tokenCache) {
+          if (!liveNodeIds.has(id)) {
+            this.tokenCache.delete(id);
+          }
+        }
+      }
+      cacheNodeTokens(node) {
+        const behavior = this.registry.get(node.type);
+        const parts2 = behavior.getEstimatableParts(node);
+        const tokens = this.estimateTokensForParts(parts2);
+        this.tokenCache.set(node.id, tokens);
+        return tokens;
+      }
+      /**
+       * Retrieves the token cost of a single node from the cache.
+       * If it misses the cache, it computes it and caches it.
+       */
+      getTokenCost(node) {
+        const cached2 = this.tokenCache.get(node.id);
+        if (cached2 !== void 0)
+          return cached2;
+        return this.cacheNodeTokens(node);
+      }
+      /**
+       * Calculates a detailed breakdown of tokens by category for a list of nodes.
+       * Useful for calibration tracing and debugging overestimation.
+       */
+      calculateTokenBreakdown(nodes) {
+        const breakdown = { total: 0, text: 0, media: 0, tool: 0, overhead: 0 };
+        const seenIds = /* @__PURE__ */ new Set();
+        const seenTurnIds = /* @__PURE__ */ new Set();
+        for (const node of nodes) {
+          if (seenIds.has(node.id))
+            continue;
+          seenIds.add(node.id);
+          if (node.turnId) {
+            if (!seenTurnIds.has(node.turnId)) {
+              seenTurnIds.add(node.turnId);
+              breakdown.overhead += MSG_OVERHEAD_TOKENS;
+              breakdown.total += MSG_OVERHEAD_TOKENS;
+            }
+          }
+          const cost = this.getTokenCost(node);
+          breakdown.total += cost;
+          const behavior = this.registry.get(node.type);
+          const parts2 = behavior.getEstimatableParts(node);
+          for (const part of parts2) {
+            if (typeof part.text === "string") {
+              breakdown.text += estimateTokenCountSync([part], 0, this.charsPerToken);
+            } else if (part.inlineData?.mimeType?.startsWith("image/") || part.fileData?.mimeType?.startsWith("image/")) {
+              breakdown.media += estimateTokenCountSync([part], 0, this.charsPerToken);
+            } else if (part.functionCall || part.functionResponse) {
+              breakdown.tool += estimateTokenCountSync([part], 0, this.charsPerToken);
+            } else {
+              breakdown.overhead += estimateTokenCountSync([part], 0, this.charsPerToken);
+            }
+          }
+        }
+        return breakdown;
+      }
+      /**
+       * For the static calculator, Raw Base Units are exactly the same as the final tokens,
+       * because there is no dynamic learned weight (the multiplier is effectively 1.0).
+       */
+      getRawBaseUnits(nodes) {
+        return this.calculateConcreteListTokens(nodes);
+      }
+      getRawBaseUnitsForContent(content) {
+        return this.calculateContentTokens(content);
+      }
+      calculateTokensAndBaseUnits(nodes) {
+        const baseUnits = this.calculateConcreteListTokens(nodes);
+        return { tokens: baseUnits, baseUnits };
+      }
+      calculateContentTokensAndBaseUnits(content) {
+        const baseUnits = this.calculateContentTokens(content);
+        return { tokens: baseUnits, baseUnits };
+      }
+      /**
+       * Fast calculation for a flat array of ConcreteNodes (The Nodes).
+       * It relies entirely on the O(1) sidecar token cache.
+       */
+      calculateConcreteListTokens(nodes) {
+        let tokens = 0;
+        const seenIds = /* @__PURE__ */ new Set();
+        const seenTurnIds = /* @__PURE__ */ new Set();
+        for (const node of nodes) {
+          if (!seenIds.has(node.id)) {
+            seenIds.add(node.id);
+            tokens += this.getTokenCost(node);
+            if (node.turnId) {
+              if (!seenTurnIds.has(node.turnId)) {
+                seenTurnIds.add(node.turnId);
+                tokens += MSG_OVERHEAD_TOKENS;
+              }
+            }
+          }
+        }
+        return tokens;
+      }
+      /**
+       * Calculates the token cost for a single Gemini Content object.
+       */
+      calculateContentTokens(content) {
+        return this.estimateTokensForParts(content.parts || []) + MSG_OVERHEAD_TOKENS;
+      }
+      /**
+       * Slower, precise estimation for a Gemini Content/Part graph.
+       * Deeply inspects the nested structure and uses the base tokenization math.
+       */
+      partTokenCache = /* @__PURE__ */ new WeakMap();
+      estimateTokensForParts(parts2) {
+        let total = 0;
+        for (const part of parts2) {
+          if (part !== null && typeof part === "object") {
+            let cost = this.partTokenCache.get(part);
+            if (cost === void 0) {
+              cost = estimateTokenCountSync([part], 0, this.charsPerToken);
+              this.partTokenCache.set(part, cost);
+            }
+            total += cost;
+          } else {
+            total += estimateTokenCountSync([part], 0, this.charsPerToken);
+          }
+        }
+        return total;
+      }
+    };
+  }
+});
+
+// packages/core/dist/src/context/utils/adaptiveTokenCalculator.js
+var AdaptiveTokenCalculator;
+var init_adaptiveTokenCalculator = __esm({
+  "packages/core/dist/src/context/utils/adaptiveTokenCalculator.js"() {
+    "use strict";
+    init_contextTokenCalculator();
+    init_debugLogger();
+    AdaptiveTokenCalculator = class {
+      learnedWeight = 1;
+      baseCalculator;
+      constructor(charsPerToken, registry2, eventBus) {
+        this.baseCalculator = new StaticTokenCalculator(charsPerToken, registry2);
+        eventBus.onTokenGroundTruth((event) => {
+          this.handleGroundTruth(event.actualTokens, event.promptBaseUnits);
+        });
+      }
+      handleGroundTruth(actualTokens, promptBaseUnits) {
+        if (promptBaseUnits <= 0)
+          return;
+        const targetWeight = actualTokens / promptBaseUnits;
+        const oldWeight = this.learnedWeight;
+        const learningRate = 0.2;
+        const newWeight = oldWeight * (1 - learningRate) + targetWeight * learningRate;
+        this.learnedWeight = Math.max(0.5, Math.min(newWeight, 2));
+        debugLogger.log(`[AdaptiveTokenCalculator] Learned weight updated to ${this.learnedWeight.toFixed(3)} (API Tokens: ${actualTokens}, Base Units: ${promptBaseUnits}, Target Ratio: ${targetWeight.toFixed(3)})`);
+      }
+      /**
+       * Retrieves the current learned weight multiplier.
+       */
+      getLearnedWeight() {
+        return this.learnedWeight;
+      }
+      /**
+       * Returns the exact, unweighted Base Heuristic Units for the graph.
+       * This is used exactly once per interaction to capture the baseline sent to the API.
+       */
+      getRawBaseUnits(nodes) {
+        return this.baseCalculator.calculateConcreteListTokens(nodes);
+      }
+      /**
+       * Returns the exact, unweighted Base Heuristic Units for a raw content chunk.
+       */
+      getRawBaseUnitsForContent(content) {
+        return this.baseCalculator.calculateContentTokens(content);
+      }
+      calculateTokensAndBaseUnits(nodes) {
+        const baseUnits = this.baseCalculator.calculateConcreteListTokens(nodes);
+        return {
+          tokens: Math.round(baseUnits * this.learnedWeight),
+          baseUnits
+        };
+      }
+      calculateContentTokensAndBaseUnits(content) {
+        const baseUnits = this.baseCalculator.calculateContentTokens(content);
+        return {
+          tokens: Math.round(baseUnits * this.learnedWeight),
+          baseUnits
+        };
+      }
+      // --- Delegation and Weighting ---
+      garbageCollectCache(liveNodeIds) {
+        this.baseCalculator.garbageCollectCache(liveNodeIds);
+      }
+      cacheNodeTokens(node) {
+        return this.baseCalculator.cacheNodeTokens(node);
+      }
+      calculateTokenBreakdown(nodes) {
+        const raw = this.baseCalculator.calculateTokenBreakdown(nodes);
+        return {
+          text: Math.round(raw.text * this.learnedWeight),
+          media: Math.round(raw.media * this.learnedWeight),
+          tool: Math.round(raw.tool * this.learnedWeight),
+          overhead: Math.round(raw.overhead * this.learnedWeight),
+          total: Math.round(raw.total * this.learnedWeight)
+        };
+      }
+      estimateTokensForParts(parts2) {
+        const baseUnits = this.baseCalculator.estimateTokensForParts(parts2);
+        return Math.round(baseUnits * this.learnedWeight);
+      }
+      getTokenCost(node) {
+        const baseUnits = this.baseCalculator.getTokenCost(node);
+        return Math.round(baseUnits * this.learnedWeight);
+      }
+      calculateConcreteListTokens(nodes) {
+        const baseUnits = this.baseCalculator.calculateConcreteListTokens(nodes);
+        return Math.round(baseUnits * this.learnedWeight);
+      }
+      calculateContentTokens(content) {
+        const baseUnits = this.baseCalculator.calculateContentTokens(content);
+        return Math.round(baseUnits * this.learnedWeight);
+      }
+      estimateTokensForString(text) {
+        const baseUnits = this.baseCalculator.estimateTokensForString(text);
+        return Math.round(baseUnits * this.learnedWeight);
+      }
+      tokensToChars(tokens) {
+        return this.baseCalculator.tokensToChars(tokens / this.learnedWeight);
+      }
+    };
+  }
+});
+
+// packages/core/dist/src/context/graph/behaviorRegistry.js
+var NodeBehaviorRegistry;
+var init_behaviorRegistry = __esm({
+  "packages/core/dist/src/context/graph/behaviorRegistry.js"() {
+    "use strict";
+    NodeBehaviorRegistry = class {
+      behaviors = /* @__PURE__ */ new Map();
+      register(behavior) {
+        this.behaviors.set(behavior.type, behavior);
+      }
+      get(type2) {
+        const behavior = this.behaviors.get(type2);
+        if (!behavior) {
+          throw new Error(`Unregistered Node type: ${type2}`);
+        }
+        return behavior;
+      }
+    };
+  }
+});
+
+// packages/core/dist/src/context/graph/builtinBehaviors.js
+function registerBuiltInBehaviors(registry2) {
+  registry2.register(UserPromptBehavior);
+  registry2.register(AgentThoughtBehavior);
+  registry2.register(ToolExecutionBehavior);
+  registry2.register(MaskedToolBehavior);
+  registry2.register(AgentYieldBehavior);
+  registry2.register(SystemEventBehavior);
+  registry2.register(SnapshotBehavior);
+  registry2.register(RollingSummaryBehavior);
+}
+var UserPromptBehavior, AgentThoughtBehavior, ToolExecutionBehavior, MaskedToolBehavior, AgentYieldBehavior, SystemEventBehavior, SnapshotBehavior, RollingSummaryBehavior;
+var init_builtinBehaviors = __esm({
+  "packages/core/dist/src/context/graph/builtinBehaviors.js"() {
+    "use strict";
+    init_types15();
+    UserPromptBehavior = {
+      type: NodeType.USER_PROMPT,
+      getEstimatableParts(node) {
+        return [node.payload];
+      }
+    };
+    AgentThoughtBehavior = {
+      type: NodeType.AGENT_THOUGHT,
+      getEstimatableParts(node) {
+        return [node.payload];
+      }
+    };
+    ToolExecutionBehavior = {
+      type: NodeType.TOOL_EXECUTION,
+      getEstimatableParts(node) {
+        return [node.payload];
+      }
+    };
+    MaskedToolBehavior = {
+      type: NodeType.MASKED_TOOL,
+      getEstimatableParts(node) {
+        return [node.payload];
+      }
+    };
+    AgentYieldBehavior = {
+      type: NodeType.AGENT_YIELD,
+      getEstimatableParts() {
+        return [];
+      }
+    };
+    SystemEventBehavior = {
+      type: NodeType.SYSTEM_EVENT,
+      getEstimatableParts(node) {
+        return [node.payload];
+      }
+    };
+    SnapshotBehavior = {
+      type: NodeType.SNAPSHOT,
+      getEstimatableParts(node) {
+        return [node.payload];
+      }
+    };
+    RollingSummaryBehavior = {
+      type: NodeType.ROLLING_SUMMARY,
+      getEstimatableParts(node) {
+        return [node.payload];
+      }
+    };
+  }
+});
+
 // packages/core/dist/src/context/initializer.js
 async function initializeContextManager(config3, chat, lastPromptId) {
   const isV1Enabled = config3.getContextManagementConfig().enabled;
@@ -381528,9 +382469,15 @@ async function initializeContextManager(config3, chat, lastPromptId) {
     sessionId: lastPromptId
   });
   const eventBus = new ContextEventBus();
-  const env = new ContextEnvironmentImpl(() => config3.getBaseLlmClient(), config3.getSessionId(), lastPromptId, logDir, projectTempDir, tracer, 4, eventBus);
+  const charsPerToken = 3;
+  const behaviorRegistry = new NodeBehaviorRegistry();
+  registerBuiltInBehaviors(behaviorRegistry);
+  const calculator = new AdaptiveTokenCalculator(charsPerToken, behaviorRegistry, eventBus);
+  const env = new ContextEnvironmentImpl(() => config3.getBaseLlmClient(), config3.getSessionId(), lastPromptId, logDir, projectTempDir, tracer, charsPerToken, eventBus, calculator, behaviorRegistry, {
+    calibrateTokenCalculation: !!process.env["GEMINI_CONTEXT_CALIBRATE_TOKEN_CALCULATIONS"]
+  });
   const orchestrator = new PipelineOrchestrator(sidecarProfile.buildPipelines(env), sidecarProfile.buildAsyncPipelines(env), env, eventBus, tracer);
-  return new ContextManager(sidecarProfile, env, tracer, orchestrator, chat.agentHistory, async () => {
+  return new ContextManager(sidecarProfile, env, tracer, orchestrator, chat.agentHistory, calculator, async () => {
     const parts2 = await getEnvironmentContext(config3);
     return { role: "user", parts: parts2 };
   });
@@ -381554,6 +382501,9 @@ var init_initializer = __esm({
     init_stateSnapshotAsyncProcessor();
     init_rollingSummaryProcessor();
     init_environmentContext();
+    init_adaptiveTokenCalculator();
+    init_behaviorRegistry();
+    init_builtinBehaviors();
   }
 });
 
@@ -381953,10 +382903,12 @@ var init_client4 = __esm({
           return turn;
         }
         const modelForLimitCheck = this._getActiveModelForCurrentTurn();
+        let currentBaseUnits = 0;
         if (this.config.getContextManagementConfig().enabled) {
           if (this.contextManager) {
             const pendingRequest = createUserContent(request);
-            const { history: newHistory, didApplyManagement } = await this.contextManager.renderHistory(pendingRequest);
+            const { history: newHistory, didApplyManagement, baseUnits } = await this.contextManager.renderHistory(pendingRequest, void 0, signal);
+            currentBaseUnits = baseUnits;
             if (didApplyManagement) {
               this.getChat().setHistory(newHistory, { silent: true });
             }
@@ -382056,6 +383008,15 @@ var init_client4 = __esm({
             break;
           }
           yield event;
+          if (event.type === GeminiEventType.Finished && this.contextManager) {
+            const usageMetadata = event.value.usageMetadata;
+            if (usageMetadata && usageMetadata.promptTokenCount !== void 0) {
+              this.contextManager.getEnvironment().eventBus.emitTokenGroundTruth({
+                actualTokens: usageMetadata.promptTokenCount,
+                promptBaseUnits: currentBaseUnits
+              });
+            }
+          }
           this.updateTelemetryTokenCount();
           if (event.type === GeminiEventType.Error) {
             isError = true;
@@ -382576,7 +383537,7 @@ var init_tool_executor = __esm({
               completedToolCall = await this.createSuccessResult(call, toolResult);
             } else {
               const displayText = typeof toolResult.returnDisplay === "string" ? toolResult.returnDisplay : void 0;
-              completedToolCall = this.createErrorResult(call, new Error(toolResult.error.message), toolResult.error.type, displayText, toolResult.tailToolCallRequest);
+              completedToolCall = this.createErrorResult(call, new Error(toolResult.error.message), toolResult.error.type, displayText, toolResult.tailToolCallRequest, toolResult.display);
             }
           } catch (executionError) {
             spanMetadata.error = executionError;
@@ -382674,6 +383635,7 @@ var init_tool_executor = __esm({
           response: {
             callId: call.request.callId,
             responseParts,
+            display: toolResult?.display,
             resultDisplay: toolResult?.returnDisplay,
             error: void 0,
             errorType: void 0,
@@ -382696,6 +383658,7 @@ var init_tool_executor = __esm({
         const successResponse = {
           callId,
           responseParts: response,
+          display: toolResult.display,
           resultDisplay: toolResult.returnDisplay,
           error: void 0,
           errorType: void 0,
@@ -382720,8 +383683,8 @@ var init_tool_executor = __esm({
           tailToolCallRequest: toolResult.tailToolCallRequest
         };
       }
-      createErrorResult(call, error2, errorType, returnDisplay, tailToolCallRequest) {
-        const response = this.createErrorResponse(call.request, error2, errorType, returnDisplay);
+      createErrorResult(call, error2, errorType, returnDisplay, tailToolCallRequest, display) {
+        const response = this.createErrorResponse(call.request, error2, errorType, returnDisplay, display);
         const startTime = "startTime" in call ? call.startTime : void 0;
         return {
           status: CoreToolCallStatus.Error,
@@ -382735,11 +383698,12 @@ var init_tool_executor = __esm({
           tailToolCallRequest
         };
       }
-      createErrorResponse(request, error2, errorType, returnDisplay) {
+      createErrorResponse(request, error2, errorType, returnDisplay, display) {
         const displayText = returnDisplay ?? error2.message;
         return {
           callId: request.callId,
           error: error2,
+          display,
           responseParts: [
             {
               functionResponse: {
@@ -382833,6 +383797,7 @@ var init_scheduler = __esm({
     init_trace3();
     init_loggers();
     init_types7();
+    init_tool_display_utils();
     init_types3();
     init_toolCallContext();
     init_events();
@@ -383044,6 +384009,16 @@ var init_scheduler = __esm({
         }, () => {
           try {
             const invocation = tool.build(request.args);
+            if (!request.display) {
+              request.display = populateToolDisplay({
+                name: tool.name,
+                invocation,
+                displayName: tool.displayName
+              });
+              if (!request.display.description) {
+                request.display.description = tool.description;
+              }
+            }
             return {
               status: CoreToolCallStatus.Validating,
               request,
@@ -384066,6 +385041,7 @@ var init_local_executor = __esm({
     init_errors2();
     init_utils6();
     init_models();
+    init_mnemonist();
     init_thoughtUtils();
     init_debugLogger();
     init_registry();
@@ -384089,6 +385065,7 @@ var init_local_executor = __esm({
       compressionService;
       parentCallId;
       hasFailedCompressionAttempt = false;
+      cache;
       get executionContext() {
         return {
           config: this.context.config,
@@ -384206,6 +385183,7 @@ var init_local_executor = __esm({
         this.onActivity = onActivity;
         this.compressionService = new ChatCompressionService();
         this.parentCallId = parentCallId;
+        this.cache = new import_lru_cache.default(10);
         this.agentId = Math.random().toString(36).slice(2, 8);
       }
       /**
@@ -384406,7 +385384,14 @@ var init_local_executor = __esm({
           try {
             const initialHints = this.context.config.injectionService.getInjectionsAfter(startIndex, "user_steering");
             const formattedInitialHints = formatUserHintsForModel(initialHints);
-            const environmentMemory = this.context.config.isJitContextEnabled?.() ? this.context.config.getSessionMemory() : this.context.config.getEnvironmentMemory();
+            let environmentMemory;
+            if (this.context.config.isJitContextEnabled?.()) {
+              environmentMemory = this.definition.includeExtensionContext === false ? this.context.config.getSessionMemory({
+                includeExtensionContext: false
+              }) : this.context.config.getSessionMemory();
+            } else {
+              environmentMemory = this.context.config.getEnvironmentMemory();
+            }
             const initialParts = [];
             if (environmentMemory) {
               initialParts.push({ text: environmentMemory });
@@ -384609,22 +385594,26 @@ var init_local_executor = __esm({
         const requestedModel = resolvedConfig.model;
         let modelToUse;
         if (isAutoModel(requestedModel)) {
-          try {
-            const routingContext = {
-              history: chat.getHistory(
-                /*curated=*/
-                true
-              ),
-              request: message.parts || [],
-              signal,
-              requestedModel
-            };
-            const router = this.context.config.getModelRouterService();
-            const decision = await router.route(routingContext);
-            modelToUse = decision.model;
-          } catch (error2) {
-            debugLogger.warn(`Error during model routing: ${error2}`);
-            modelToUse = DEFAULT_GEMINI_MODEL;
+          modelToUse = this.cache.get("modelToUse");
+          if (!modelToUse) {
+            try {
+              const routingContext = {
+                history: chat.getHistory(
+                  /*curated=*/
+                  true
+                ),
+                request: message.parts || [],
+                signal,
+                requestedModel
+              };
+              const router = this.context.config.getModelRouterService();
+              const decision = await router.route(routingContext);
+              modelToUse = decision.model;
+            } catch (error2) {
+              debugLogger.warn(`Error during model routing: ${error2}`);
+              modelToUse = DEFAULT_GEMINI_MODEL;
+            }
+            this.cache.set("modelToUse", modelToUse);
           }
         } else {
           modelToUse = requestedModel;
@@ -384833,12 +385822,14 @@ var init_local_executor = __esm({
           const part = syncResults.get(callId);
           if (part) {
             toolResponseParts.push(part);
+            continue;
           }
-        }
-        if (functionCalls.length > 0 && toolResponseParts.length === 0 && !taskCompleted) {
-          toolResponseParts.push({
-            text: "All tool calls failed or were unauthorized. Please analyze the errors and try an alternative approach."
-          });
+          const isAborted2 = signal.aborted;
+          const isTaskComplete = functionCall.name === COMPLETE_TASK_TOOL_NAME && taskCompleted;
+          if (isAborted2 || isTaskComplete) {
+            continue;
+          }
+          throw new Error(`[LocalAgentExecutor] Critical System Failure: Tool execution result was lost/dropped by the scheduler for callId ${callId} (${functionCall.name}). This indicates an internal race condition or scheduler bug.`);
         }
         return {
           nextMessage: { role: "user", parts: toolResponseParts },
@@ -385164,7 +386155,7 @@ var init_local_invocation = __esm({
               isSubagentProgress: true,
               agentName: this.definition.name,
               recentActivity: [],
-              state: "running"
+              state: SubagentState.RUNNING
             };
             updateOutput(initialProgress);
           }
@@ -385176,14 +386167,14 @@ var init_local_invocation = __esm({
               case "THOUGHT_CHUNK": {
                 const text = String(activity.data["text"]);
                 const lastItem = recentActivity[recentActivity.length - 1];
-                if (lastItem && lastItem.type === "thought" && lastItem.status === "running") {
+                if (lastItem && lastItem.type === "thought" && lastItem.status === SubagentState.RUNNING) {
                   lastItem.content = sanitizeThoughtContent(text);
                 } else {
                   recentActivity.push({
                     id: randomUUID18(),
                     type: "thought",
                     content: sanitizeThoughtContent(text),
-                    status: "running"
+                    status: SubagentState.RUNNING
                   });
                 }
                 updated = true;
@@ -385205,7 +386196,7 @@ var init_local_invocation = __esm({
                   displayName,
                   description,
                   args: args2,
-                  status: "running"
+                  status: SubagentState.RUNNING
                 });
                 updated = true;
                 const latestTool = recentActivity[recentActivity.length - 1];
@@ -385219,8 +386210,8 @@ var init_local_invocation = __esm({
                 const data = activity.data["data"];
                 const isError = isToolActivityError(data);
                 for (let i3 = recentActivity.length - 1; i3 >= 0; i3--) {
-                  if (recentActivity[i3].type === "tool_call" && recentActivity[i3].content === name3 && recentActivity[i3].status === "running") {
-                    recentActivity[i3].status = isError ? "error" : "completed";
+                  if (recentActivity[i3].type === "tool_call" && recentActivity[i3].content === name3 && recentActivity[i3].status === SubagentState.RUNNING) {
+                    recentActivity[i3].status = isError ? SubagentState.ERROR : SubagentState.COMPLETED;
                     updated = true;
                     this.publishActivity(recentActivity[i3]);
                     break;
@@ -385237,16 +386228,16 @@ var init_local_invocation = __esm({
                 const toolName = activity.data["name"] ? String(activity.data["name"]) : void 0;
                 if (toolName && (isCancellation || isRejection)) {
                   for (let i3 = recentActivity.length - 1; i3 >= 0; i3--) {
-                    if (recentActivity[i3].type === "tool_call" && recentActivity[i3].content === toolName && recentActivity[i3].status === "running") {
-                      recentActivity[i3].status = "cancelled";
+                    if (recentActivity[i3].type === "tool_call" && recentActivity[i3].content === toolName && recentActivity[i3].status === SubagentState.RUNNING) {
+                      recentActivity[i3].status = SubagentState.CANCELLED;
                       updated = true;
                       break;
                     }
                   }
                 } else if (toolName) {
                   for (let i3 = recentActivity.length - 1; i3 >= 0; i3--) {
-                    if (recentActivity[i3].type === "tool_call" && recentActivity[i3].content === toolName && recentActivity[i3].status === "running") {
-                      recentActivity[i3].status = "error";
+                    if (recentActivity[i3].type === "tool_call" && recentActivity[i3].content === toolName && recentActivity[i3].status === SubagentState.RUNNING) {
+                      recentActivity[i3].status = SubagentState.ERROR;
                       updated = true;
                       break;
                     }
@@ -385256,7 +386247,7 @@ var init_local_invocation = __esm({
                   id: randomUUID18(),
                   type: "thought",
                   content: isCancellation || isRejection ? sanitizedError : `Error: ${sanitizedError}`,
-                  status: isCancellation || isRejection ? "cancelled" : "error"
+                  status: isCancellation || isRejection ? SubagentState.CANCELLED : SubagentState.ERROR
                 });
                 updated = true;
                 break;
@@ -385270,7 +386261,7 @@ var init_local_invocation = __esm({
                 agentName: this.definition.name,
                 recentActivity: [...recentActivity],
                 // Copy to avoid mutation issues
-                state: "running"
+                state: SubagentState.RUNNING
               };
               updateOutput(progress2);
             }
@@ -385282,7 +386273,7 @@ var init_local_invocation = __esm({
               isSubagentProgress: true,
               agentName: this.definition.name,
               recentActivity: [...recentActivity],
-              state: "cancelled"
+              state: SubagentState.CANCELLED
             };
             if (updateOutput) {
               updateOutput(progress2);
@@ -385295,7 +386286,7 @@ var init_local_invocation = __esm({
             isSubagentProgress: true,
             agentName: this.definition.name,
             recentActivity: [...recentActivity],
-            state: "completed",
+            state: SubagentState.COMPLETED,
             result: output.result,
             terminateReason: output.terminate_reason
           };
@@ -385316,18 +386307,18 @@ ${output.result}`;
           debugLogger.error(`Subagent '${this.definition.name}' failed:`, error2);
           const isAbort = error2 instanceof Error && error2.name === "AbortError" || errorMessage.includes("Aborted");
           for (const item of recentActivity) {
-            if (item.status === "running") {
-              item.status = isAbort ? "cancelled" : "error";
+            if (item.status === SubagentState.RUNNING) {
+              item.status = isAbort ? SubagentState.CANCELLED : SubagentState.ERROR;
             }
           }
           if (!isAbort) {
             const lastActivity = recentActivity[recentActivity.length - 1];
-            if (!lastActivity || lastActivity.status !== "error") {
+            if (!lastActivity || lastActivity.status !== SubagentState.ERROR) {
               recentActivity.push({
                 id: randomUUID18(),
                 type: "thought",
                 content: `Error: ${errorMessage}`,
-                status: "error"
+                status: SubagentState.ERROR
               });
             }
           }
@@ -385335,7 +386326,7 @@ ${output.result}`;
             isSubagentProgress: true,
             agentName: this.definition.name,
             recentActivity: [...recentActivity],
-            state: isAbort ? "cancelled" : "error"
+            state: isAbort ? SubagentState.CANCELLED : SubagentState.ERROR
           };
           if (updateOutput) {
             updateOutput(progress);
@@ -385452,6 +386443,7 @@ var AUTH_REQUIRED_MSG, A2AResultReassembler;
 var init_a2aUtils = __esm({
   "packages/core/dist/src/agents/a2aUtils.js"() {
     "use strict";
+    init_types14();
     AUTH_REQUIRED_MSG = `[Authorization Required] The agent has indicated it requires authorization to proceed. Please follow the agent's instructions.`;
     A2AResultReassembler = class {
       messageLog = [];
@@ -385547,7 +386539,7 @@ var init_a2aUtils = __esm({
             id: "auth-required",
             type: "thought",
             content: AUTH_REQUIRED_MSG,
-            status: "running"
+            status: SubagentState.RUNNING
           });
         }
         this.messageLog.forEach((msg, index) => {
@@ -385555,7 +386547,7 @@ var init_a2aUtils = __esm({
             id: `msg-${index}`,
             type: "thought",
             content: msg.trim(),
-            status: "completed"
+            status: SubagentState.COMPLETED
           });
         });
         if (items.length === 0 && !isAuthRequired) {
@@ -385563,7 +386555,7 @@ var init_a2aUtils = __esm({
             id: "pending",
             type: "thought",
             content: "Working...",
-            status: "running"
+            status: SubagentState.RUNNING
           });
         }
         return items;
@@ -385670,13 +386662,13 @@ var init_remote_invocation = __esm({
             updateOutput({
               isSubagentProgress: true,
               agentName,
-              state: "running",
+              state: SubagentState.RUNNING,
               recentActivity: [
                 {
                   id: "pending",
                   type: "thought",
                   content: "Working...",
-                  status: "running"
+                  status: SubagentState.RUNNING
                 }
               ]
             });
@@ -385707,7 +386699,7 @@ var init_remote_invocation = __esm({
               updateOutput({
                 isSubagentProgress: true,
                 agentName,
-                state: "running",
+                state: SubagentState.RUNNING,
                 recentActivity: reassembler.toActivityItems(),
                 result: reassembler.toString()
               });
@@ -385727,7 +386719,7 @@ ${JSON.stringify(finalResponse, null, 2)}`);
           const finalProgress = {
             isSubagentProgress: true,
             agentName,
-            state: "completed",
+            state: SubagentState.COMPLETED,
             result: finalOutput,
             recentActivity: reassembler.toActivityItems()
           };
@@ -385747,7 +386739,7 @@ ${errorMessage}` : errorMessage;
           const errorProgress = {
             isSubagentProgress: true,
             agentName,
-            state: "error",
+            state: SubagentState.ERROR,
             result: fullDisplay,
             recentActivity: reassembler.toActivityItems()
           };
@@ -387352,7 +388344,7 @@ var init_browserAgentInvocation = __esm({
               isSubagentProgress: true,
               agentName: this.agentName,
               recentActivity: [],
-              state: "running"
+              state: SubagentState.RUNNING
             };
             updateOutput(initialProgress);
           }
@@ -387362,7 +388354,7 @@ var init_browserAgentInvocation = __esm({
               id: randomUUID19(),
               type: "thought",
               content: sanitizedMsg,
-              status: "completed"
+              status: SubagentState.COMPLETED
             });
             if (recentActivity.length > MAX_RECENT_ACTIVITY) {
               recentActivity = recentActivity.slice(-MAX_RECENT_ACTIVITY);
@@ -387371,7 +388363,7 @@ var init_browserAgentInvocation = __esm({
               isSubagentProgress: true,
               agentName: this.agentName,
               recentActivity: [...recentActivity],
-              state: "running"
+              state: SubagentState.RUNNING
             });
           } : void 0;
           const result2 = await createBrowserAgentDefinition(this.config, this.messageBus, printOutput);
@@ -387387,14 +388379,14 @@ var init_browserAgentInvocation = __esm({
               case "THOUGHT_CHUNK": {
                 const text = String(activity.data["text"]);
                 const lastItem = recentActivity[recentActivity.length - 1];
-                if (lastItem && lastItem.type === "thought" && lastItem.status === "running") {
+                if (lastItem && lastItem.type === "thought" && lastItem.status === SubagentState.RUNNING) {
                   lastItem.content = sanitizeThoughtContent(text);
                 } else {
                   recentActivity.push({
                     id: randomUUID19(),
                     type: "thought",
                     content: sanitizeThoughtContent(text),
-                    status: "running"
+                    status: SubagentState.RUNNING
                   });
                 }
                 updated = true;
@@ -387413,7 +388405,7 @@ var init_browserAgentInvocation = __esm({
                   displayName,
                   description,
                   args: args2,
-                  status: "running"
+                  status: SubagentState.RUNNING
                 });
                 updated = true;
                 break;
@@ -387423,8 +388415,8 @@ var init_browserAgentInvocation = __esm({
                 const data = activity.data["data"];
                 const isError = isToolActivityError(data);
                 for (let i3 = recentActivity.length - 1; i3 >= 0; i3--) {
-                  if (recentActivity[i3].type === "tool_call" && callId != null && recentActivity[i3].id === callId && recentActivity[i3].status === "running") {
-                    recentActivity[i3].status = isError ? "error" : "completed";
+                  if (recentActivity[i3].type === "tool_call" && callId != null && recentActivity[i3].id === callId && recentActivity[i3].status === SubagentState.RUNNING) {
+                    recentActivity[i3].status = isError ? SubagentState.ERROR : SubagentState.COMPLETED;
                     updated = true;
                     break;
                   }
@@ -387435,10 +388427,10 @@ var init_browserAgentInvocation = __esm({
                 const error2 = String(activity.data["error"]);
                 const isCancellation = error2 === "Request cancelled.";
                 const callId = activity.data["callId"] ? String(activity.data["callId"]) : void 0;
-                const newStatus = isCancellation ? "cancelled" : "error";
+                const newStatus = isCancellation ? SubagentState.CANCELLED : SubagentState.ERROR;
                 if (callId) {
                   for (let i3 = recentActivity.length - 1; i3 >= 0; i3--) {
-                    if (recentActivity[i3].type === "tool_call" && recentActivity[i3].id === callId && recentActivity[i3].status === "running") {
+                    if (recentActivity[i3].type === "tool_call" && recentActivity[i3].id === callId && recentActivity[i3].status === SubagentState.RUNNING) {
                       recentActivity[i3].status = newStatus;
                       updated = true;
                       break;
@@ -387446,7 +388438,7 @@ var init_browserAgentInvocation = __esm({
                   }
                 } else {
                   for (const item of recentActivity) {
-                    if (item.type === "tool_call" && item.status === "running") {
+                    if (item.type === "tool_call" && item.status === SubagentState.RUNNING) {
                       item.status = newStatus;
                       updated = true;
                     }
@@ -387473,7 +388465,7 @@ var init_browserAgentInvocation = __esm({
                 isSubagentProgress: true,
                 agentName: this.agentName,
                 recentActivity: [...recentActivity],
-                state: "running"
+                state: SubagentState.RUNNING
               };
               updateOutput(progress2);
             }
@@ -387492,11 +388484,11 @@ Result:
 ${output.result}`;
           let progressState;
           if (output.terminate_reason === AgentTerminateMode.ABORTED) {
-            progressState = "cancelled";
+            progressState = SubagentState.CANCELLED;
           } else if (output.terminate_reason === AgentTerminateMode.GOAL) {
-            progressState = "completed";
+            progressState = SubagentState.COMPLETED;
           } else {
-            progressState = "error";
+            progressState = SubagentState.ERROR;
           }
           const progress = {
             isSubagentProgress: true,
@@ -387518,15 +388510,15 @@ ${output.result}`;
           const isAbort = error2 instanceof Error && error2.name === "AbortError" || rawErrorMessage.includes("Aborted");
           const errorMessage = sanitizeErrorMessage(rawErrorMessage);
           for (const item of recentActivity) {
-            if (item.status === "running") {
-              item.status = isAbort ? "cancelled" : "error";
+            if (item.status === SubagentState.RUNNING) {
+              item.status = isAbort ? SubagentState.CANCELLED : SubagentState.ERROR;
             }
           }
           const progress = {
             isSubagentProgress: true,
             agentName: this.agentName,
             recentActivity: [...recentActivity],
-            state: isAbort ? "cancelled" : "error"
+            state: isAbort ? SubagentState.CANCELLED : SubagentState.ERROR
           };
           if (updateOutput) {
             updateOutput(progress);
@@ -392847,6 +393839,7 @@ var init_gitService = __esm({
     init_shell_utils();
     init_esm18();
     init_debugLogger();
+    init_environmentSanitization();
     SHADOW_REPO_AUTHOR_NAME = "Gemini CLI";
     SHADOW_REPO_AUTHOR_EMAIL = "gemini-cli@google.com";
     GitService = class _GitService {
@@ -392883,9 +393876,15 @@ var init_gitService = __esm({
         const gitConfigPath = path75.join(repoDir, ".gitconfig");
         const systemConfigPath = path75.join(repoDir, ".gitconfig_system_empty");
         return {
+          ...sanitizeEnvironment(process.env, getSecureSanitizationConfig({
+            enableEnvironmentVariableRedaction: true
+          })),
           // Prevent git from using the user's global git config.
           GIT_CONFIG_GLOBAL: gitConfigPath,
           GIT_CONFIG_SYSTEM: systemConfigPath,
+          // Ensure we don't inherit isolation-breaking variables from the user environment.
+          GIT_DIR: void 0,
+          GIT_WORK_TREE: void 0,
           // Explicitly provide identity to prevent "Author identity unknown" errors
           // inside sandboxed environments like Docker where the gitconfig might not
           // be picked up properly.
@@ -392940,9 +393939,9 @@ var init_gitService = __esm({
       get shadowGitRepository() {
         const repoDir = this.getHistoryDir();
         return simpleGit(this.projectRoot).env({
+          ...this.getShadowRepoEnv(repoDir),
           GIT_DIR: path75.join(repoDir, ".git"),
-          GIT_WORK_TREE: this.projectRoot,
-          ...this.getShadowRepoEnv(repoDir)
+          GIT_WORK_TREE: this.projectRoot
         });
       }
       async getCurrentCommitHash() {
@@ -393847,18 +394846,22 @@ var ModelAvailabilityService;
 var init_modelAvailabilityService = __esm({
   "packages/core/dist/src/availability/modelAvailabilityService.js"() {
     "use strict";
+    init_modelUtils();
     ModelAvailabilityService = class {
       health = /* @__PURE__ */ new Map();
-      markTerminal(model, reason) {
+      markTerminal(modelId, reason) {
+        const model = normalizeModelId(modelId);
         this.setState(model, {
           status: "terminal",
           reason
         });
       }
-      markHealthy(model) {
+      markHealthy(modelId) {
+        const model = normalizeModelId(modelId);
         this.clearState(model);
       }
-      markRetryOncePerTurn(model, attempts = 1) {
+      markRetryOncePerTurn(modelId, attempts = 1) {
+        const model = normalizeModelId(modelId);
         const currentState = this.health.get(model);
         if (currentState?.status === "terminal") {
           return;
@@ -393874,13 +394877,15 @@ var init_modelAvailabilityService = __esm({
           attempts
         });
       }
-      consumeStickyAttempt(model) {
+      consumeStickyAttempt(modelId) {
+        const model = normalizeModelId(modelId);
         const state = this.health.get(model);
         if (state?.status === "sticky_retry") {
           this.setState(model, { ...state, consumed: true });
         }
       }
-      snapshot(model) {
+      snapshot(modelId) {
+        const model = normalizeModelId(modelId);
         const state = this.health.get(model);
         if (!state) {
           return { available: true };
@@ -393893,9 +394898,10 @@ var init_modelAvailabilityService = __esm({
         }
         return { available: true };
       }
-      selectFirstAvailable(models) {
+      selectFirstAvailable(modelIds) {
         const skipped = [];
-        for (const model of models) {
+        for (const modelId of modelIds) {
+          const model = normalizeModelId(modelId);
           const snapshot = this.snapshot(model);
           if (snapshot.available) {
             const state = this.health.get(model);
@@ -394073,7 +395079,13 @@ ${formattedHistory}
           const routerResponse = ClassifierResponseSchema.parse(jsonResponse);
           const reasoning = routerResponse.reasoning;
           const latencyMs = Date.now() - startTime;
-          const selectedModel = resolveClassifierModel(context2.requestedModel ?? config3.getModel(), routerResponse.model_choice);
+          const [useGemini3_1, useGemini3_1FlashLite, useCustomToolModel, hasAccessToPreview] = await Promise.all([
+            config3.getGemini31Launched(),
+            config3.getGemini31FlashLiteLaunched(),
+            config3.getUseCustomToolModel(),
+            config3.getHasAccessToPreviewModel?.() ?? true
+          ]);
+          const selectedModel = resolveClassifierModel(context2.requestedModel ?? config3.getModel(), routerResponse.model_choice, useGemini3_1, useGemini3_1FlashLite, useCustomToolModel, hasAccessToPreview, config3);
           return {
             model: selectedModel,
             metadata: {
@@ -394125,6 +395137,7 @@ var init_classifierStrategy = __esm({
     init_node();
     init_messageInspectors();
     init_debugLogger();
+    init_modelUtils();
     init_types7();
     HISTORY_TURNS_FOR_CONTEXT2 = 4;
     HISTORY_SEARCH_WINDOW2 = 20;
@@ -394251,7 +395264,13 @@ Respond *only* in JSON format according to the following schema. Do not include
             config3.getGemini31FlashLiteLaunched(),
             config3.getUseCustomToolModel()
           ]);
-          const selectedModel = resolveClassifierModel(model, routerResponse.model_choice, useGemini3_1, useGemini3_1FlashLite, useCustomToolModel, config3.getHasAccessToPreviewModel?.() ?? true, config3);
+          const selectedModel = normalizeModelId(resolveClassifierModel(normalizeModelId(model), routerResponse.model_choice, useGemini3_1, useGemini3_1FlashLite, useCustomToolModel, config3.getHasAccessToPreviewModel?.() ?? true, config3));
+          const service = config3.getModelAvailabilityService();
+          const snapshot = service.snapshot(selectedModel);
+          if (!snapshot.available) {
+            debugLogger.warn(`[Routing] Classifier selected unavailable model ${selectedModel} (${snapshot.reason}). Bypassing.`);
+            return null;
+          }
           return {
             model: selectedModel,
             metadata: {
@@ -394278,7 +395297,9 @@ var init_numericalClassifierStrategy = __esm({
     init_promptIdContext();
     init_models();
     init_node();
+    init_messageInspectors();
     init_debugLogger();
+    init_modelUtils();
     init_types7();
     HISTORY_TURNS_FOR_CONTEXT3 = 8;
     FLASH_MODEL3 = "flash";
@@ -394361,7 +395382,15 @@ Model: {"complexity_reasoning": "High-level architecture and strategic planning.
             return null;
           }
           const promptId = getPromptIdWithFallback("classifier-router");
-          const finalHistory = context2.history.slice(-HISTORY_TURNS_FOR_CONTEXT3);
+          const candidateSlice = context2.history.slice(-HISTORY_TURNS_FOR_CONTEXT3);
+          let firstTextIndex = -1;
+          for (let i3 = 0; i3 < candidateSlice.length; i3++) {
+            if (!isFunctionCall(candidateSlice[i3]) && !isFunctionResponse(candidateSlice[i3])) {
+              firstTextIndex = i3;
+              break;
+            }
+          }
+          const finalHistory = firstTextIndex === -1 ? [] : candidateSlice.slice(firstTextIndex);
           const requestParts = Array.isArray(context2.request) ? context2.request : [context2.request];
           const sanitizedRequest = requestParts.map((part) => {
             if (typeof part === "string") {
@@ -394389,7 +395418,13 @@ Model: {"complexity_reasoning": "High-level architecture and strategic planning.
             config3.getGemini31FlashLiteLaunched(),
             config3.getUseCustomToolModel()
           ]);
-          const selectedModel = resolveClassifierModel(model, modelAlias, useGemini3_1, useGemini3_1FlashLite, useCustomToolModel, config3.getHasAccessToPreviewModel?.() ?? true, config3);
+          const selectedModel = normalizeModelId(resolveClassifierModel(normalizeModelId(model), modelAlias, useGemini3_1, useGemini3_1FlashLite, useCustomToolModel, config3.getHasAccessToPreviewModel?.() ?? true, config3));
+          const service = config3.getModelAvailabilityService();
+          const snapshot = service.snapshot(selectedModel);
+          if (!snapshot.available) {
+            debugLogger.warn(`[Routing] Numerical classifier selected unavailable model ${selectedModel} (${snapshot.reason}). Bypassing.`);
+            return null;
+          }
           const latencyMs = Date.now() - startTime;
           return {
             model: selectedModel,
@@ -394562,12 +395597,14 @@ var init_approvalModeStrategy = __esm({
         const startTime = Date.now();
         const approvalMode = config3.getApprovalMode();
         const approvedPlanPath = config3.getApprovedPlanPath();
-        const [useGemini3_1, useCustomToolModel] = await Promise.all([
+        const [useGemini3_1, useGemini3_1FlashLite, useCustomToolModel, hasAccessToPreview] = await Promise.all([
           config3.getGemini31Launched(),
-          config3.getUseCustomToolModel()
+          config3.getGemini31FlashLiteLaunched(),
+          config3.getUseCustomToolModel(),
+          config3.getHasAccessToPreviewModel()
         ]);
         if (approvalMode === ApprovalMode.PLAN) {
-          const proModel = resolveClassifierModel(model, GEMINI_MODEL_ALIAS_PRO, useGemini3_1, useCustomToolModel);
+          const proModel = resolveClassifierModel(model, GEMINI_MODEL_ALIAS_PRO, useGemini3_1, useGemini3_1FlashLite, useCustomToolModel, hasAccessToPreview, config3);
           return {
             model: proModel,
             metadata: {
@@ -394577,7 +395614,7 @@ var init_approvalModeStrategy = __esm({
             }
           };
         } else if (approvedPlanPath) {
-          const flashModel = resolveClassifierModel(model, GEMINI_MODEL_ALIAS_FLASH, useGemini3_1, useCustomToolModel);
+          const flashModel = resolveClassifierModel(model, GEMINI_MODEL_ALIAS_FLASH, useGemini3_1, useGemini3_1FlashLite, useCustomToolModel, hasAccessToPreview, config3);
           return {
             model: flashModel,
             metadata: {
@@ -394910,6 +395947,19 @@ var init_defaultModelConfigs = __esm({
           extends: "gemini-3-flash-base",
           modelConfig: {}
         },
+        "context-snapshotter": {
+          extends: "gemini-3-flash-base",
+          modelConfig: {
+            generateContentConfig: {
+              thinkingConfig: {
+                thinkingLevel: ThinkingLevel.HIGH
+              },
+              temperature: 1,
+              topP: 0.95,
+              topK: 64
+            }
+          }
+        },
         "chat-compression-3-pro": {
           modelConfig: {
             model: "gemini-3-pro-preview"
@@ -395726,7 +396776,7 @@ async function findProjectRoot2(startDir, boundaryMarkers = [".git"]) {
   if (boundaryMarkers.length === 0) {
     return null;
   }
-  let currentDir = normalizePath(startDir);
+  let currentDir = toAbsolutePath(startDir);
   while (true) {
     for (const marker of boundaryMarkers) {
       if (path77.isAbsolute(marker) || marker.includes("..")) {
@@ -395750,7 +396800,7 @@ async function findProjectRoot2(startDir, boundaryMarkers = [".git"]) {
         }
       }
     }
-    const parentDir = normalizePath(path77.dirname(currentDir));
+    const parentDir = path77.dirname(currentDir);
     if (parentDir === currentDir) {
       return null;
     }
@@ -395791,9 +396841,11 @@ async function getGeminiMdFilePathsInternalForEachDir(dir, userHomePath, fileSer
   const projectPaths = /* @__PURE__ */ new Set();
   const geminiMdFilenames = getAllGeminiMdFilenames();
   for (const geminiMdFilename of geminiMdFilenames) {
-    const resolvedHome = normalizePath(userHomePath);
-    const globalGeminiDir = normalizePath(path77.join(resolvedHome, GEMINI_DIR));
-    const globalMemoryPath = normalizePath(path77.join(globalGeminiDir, geminiMdFilename));
+    const resolvedHome = toAbsolutePath(userHomePath);
+    const globalGeminiDir = toAbsolutePath(path77.join(resolvedHome, GEMINI_DIR));
+    const globalMemoryPath = toAbsolutePath(path77.join(globalGeminiDir, geminiMdFilename));
+    const globalMemoryKey = normalizePath(globalMemoryPath);
+    const globalGeminiDirKey = normalizePath(globalGeminiDir);
     try {
       await fs72.access(globalMemoryPath, fsSync4.constants.R_OK);
       globalPaths.add(globalMemoryPath);
@@ -395801,29 +396853,29 @@ async function getGeminiMdFilePathsInternalForEachDir(dir, userHomePath, fileSer
     } catch {
     }
     if (dir && folderTrust) {
-      const resolvedCwd = normalizePath(dir);
+      const resolvedCwd = toAbsolutePath(dir);
       debugLogger.debug("[DEBUG] [MemoryDiscovery] Searching for", geminiMdFilename, "starting from CWD:", resolvedCwd);
       const projectRoot = await findProjectRoot2(resolvedCwd, boundaryMarkers);
       debugLogger.debug("[DEBUG] [MemoryDiscovery] Determined project root:", projectRoot ?? "None");
       const upwardPaths = [];
       let currentDir = resolvedCwd;
-      const ultimateStopDir = projectRoot ? normalizePath(path77.dirname(projectRoot)) : normalizePath(path77.dirname(resolvedHome));
-      while (currentDir && currentDir !== normalizePath(path77.dirname(currentDir))) {
-        if (currentDir === globalGeminiDir) {
+      const ultimateStopDirKey = projectRoot ? normalizePath(path77.dirname(projectRoot)) : normalizePath(path77.dirname(resolvedHome));
+      while (currentDir && currentDir !== path77.dirname(currentDir)) {
+        if (normalizePath(currentDir) === globalGeminiDirKey) {
           break;
         }
-        const potentialPath = normalizePath(path77.join(currentDir, geminiMdFilename));
+        const potentialPath = toAbsolutePath(path77.join(currentDir, geminiMdFilename));
         try {
           await fs72.access(potentialPath, fsSync4.constants.R_OK);
-          if (potentialPath !== globalMemoryPath) {
+          if (normalizePath(potentialPath) !== globalMemoryKey) {
             upwardPaths.unshift(potentialPath);
           }
         } catch {
         }
-        if (currentDir === ultimateStopDir) {
+        if (normalizePath(currentDir) === ultimateStopDirKey) {
           break;
         }
-        currentDir = normalizePath(path77.dirname(currentDir));
+        currentDir = path77.dirname(currentDir);
       }
       upwardPaths.forEach((p2) => projectPaths.add(p2));
       const mergedOptions = {
@@ -395838,7 +396890,7 @@ async function getGeminiMdFilePathsInternalForEachDir(dir, userHomePath, fileSer
       });
       downwardPaths.sort();
       for (const dPath of downwardPaths) {
-        projectPaths.add(normalizePath(dPath));
+        projectPaths.add(toAbsolutePath(dPath));
       }
     }
   }
@@ -395901,7 +396953,7 @@ async function getGlobalMemoryPaths() {
   const userHome = homedir();
   const geminiMdFilenames = getAllGeminiMdFilenames();
   const accessChecks = geminiMdFilenames.map(async (filename) => {
-    const globalPath = normalizePath(path77.join(userHome, GEMINI_DIR, filename));
+    const globalPath = toAbsolutePath(path77.join(userHome, GEMINI_DIR, filename));
     try {
       await fs72.access(globalPath, fsSync4.constants.R_OK);
       debugLogger.debug("[DEBUG] [MemoryDiscovery] Found global memory file:", globalPath);
@@ -395913,7 +396965,7 @@ async function getGlobalMemoryPaths() {
   return (await Promise.all(accessChecks)).filter((p2) => p2 !== null);
 }
 async function getUserProjectMemoryPaths(projectMemoryDir) {
-  const preferredMemoryPath = normalizePath(path77.join(projectMemoryDir, PROJECT_MEMORY_INDEX_FILENAME));
+  const preferredMemoryPath = toAbsolutePath(path77.join(projectMemoryDir, PROJECT_MEMORY_INDEX_FILENAME));
   try {
     await fs72.access(preferredMemoryPath, fsSync4.constants.R_OK);
     debugLogger.debug("[DEBUG] [MemoryDiscovery] Found user project memory index:", preferredMemoryPath);
@@ -395922,7 +396974,7 @@ async function getUserProjectMemoryPaths(projectMemoryDir) {
   }
   const geminiMdFilenames = getAllGeminiMdFilenames();
   const accessChecks = geminiMdFilenames.map(async (filename) => {
-    const legacyMemoryPath = normalizePath(path77.join(projectMemoryDir, filename));
+    const legacyMemoryPath = toAbsolutePath(path77.join(projectMemoryDir, filename));
     try {
       await fs72.access(legacyMemoryPath, fsSync4.constants.R_OK);
       debugLogger.debug("[DEBUG] [MemoryDiscovery] Found legacy user project memory file:", legacyMemoryPath);
@@ -395934,21 +396986,29 @@ async function getUserProjectMemoryPaths(projectMemoryDir) {
   return (await Promise.all(accessChecks)).filter((p2) => p2 !== null);
 }
 function getExtensionMemoryPaths(extensionLoader) {
-  const extensionPaths = extensionLoader.getExtensions().filter((ext2) => ext2.isActive).flatMap((ext2) => ext2.contextFiles).map((p2) => normalizePath(p2));
-  return Array.from(new Set(extensionPaths)).sort();
+  const extensionPaths = extensionLoader.getExtensions().filter((ext2) => ext2.isActive).flatMap((ext2) => ext2.contextFiles).map((p2) => toAbsolutePath(p2));
+  const seenKeys = /* @__PURE__ */ new Set();
+  const unique = [];
+  for (const p2 of extensionPaths) {
+    const key = normalizePath(p2);
+    if (seenKeys.has(key))
+      continue;
+    seenKeys.add(key);
+    unique.push(p2);
+  }
+  return unique.sort();
 }
 async function getEnvironmentMemoryPaths(trustedRoots, boundaryMarkers = [".git"]) {
-  const allPaths = /* @__PURE__ */ new Set();
   const traversalPromises = trustedRoots.map(async (root) => {
-    const resolvedRoot = normalizePath(root);
+    const resolvedRoot = toAbsolutePath(root);
     const gitRoot = await findProjectRoot2(resolvedRoot, boundaryMarkers);
-    const ceiling = gitRoot ? normalizePath(gitRoot) : resolvedRoot;
+    const ceiling = gitRoot ?? resolvedRoot;
     debugLogger.debug("[DEBUG] [MemoryDiscovery] Loading environment memory for trusted root:", resolvedRoot, "(Stopping at", gitRoot ? `git root: ${ceiling})` : `trusted root: ${ceiling} \u2014 no git root found)`);
     return findUpwardGeminiFiles(resolvedRoot, ceiling);
   });
   const pathArrays = await Promise.all(traversalPromises);
-  pathArrays.flat().forEach((p2) => allPaths.add(p2));
-  return Array.from(allPaths).sort();
+  const { paths: unique } = await deduplicatePathsByFileIdentity(pathArrays.flat());
+  return unique.sort();
 }
 function categorizeAndConcatenate(paths, contentsMap) {
   const getConcatenated = (pList) => concatenateInstructions(pList.map((p2) => contentsMap.get(p2)).filter((c2) => !!c2));
@@ -395961,17 +397021,17 @@ function categorizeAndConcatenate(paths, contentsMap) {
 }
 async function findUpwardGeminiFiles(startDir, stopDir) {
   const upwardPaths = [];
-  let currentDir = normalizePath(startDir);
-  const resolvedStopDir = normalizePath(stopDir);
+  let currentDir = toAbsolutePath(startDir);
+  const resolvedStopDirKey = normalizePath(stopDir);
   const geminiMdFilenames = getAllGeminiMdFilenames();
-  const globalGeminiDir = normalizePath(path77.join(homedir(), GEMINI_DIR));
-  debugLogger.debug("[DEBUG] [MemoryDiscovery] Starting upward search from", currentDir, "stopping at", resolvedStopDir);
+  const globalGeminiDirKey = normalizePath(path77.join(homedir(), GEMINI_DIR));
+  debugLogger.debug("[DEBUG] [MemoryDiscovery] Starting upward search from", currentDir, "stopping at", stopDir);
   while (true) {
-    if (currentDir === globalGeminiDir) {
+    if (normalizePath(currentDir) === globalGeminiDirKey) {
       break;
     }
     const accessChecks = geminiMdFilenames.map(async (filename) => {
-      const potentialPath = normalizePath(path77.join(currentDir, filename));
+      const potentialPath = toAbsolutePath(path77.join(currentDir, filename));
       try {
         await fs72.access(potentialPath, fsSync4.constants.R_OK);
         return potentialPath;
@@ -395981,8 +397041,9 @@ async function findUpwardGeminiFiles(startDir, stopDir) {
     });
     const foundPathsInDir = (await Promise.all(accessChecks)).filter((p2) => p2 !== null);
     upwardPaths.unshift(...foundPathsInDir);
-    const parentDir = normalizePath(path77.dirname(currentDir));
-    if (currentDir === resolvedStopDir || currentDir === parentDir) {
+    const parentDir = path77.dirname(currentDir);
+    const currentKey = normalizePath(currentDir);
+    if (currentKey === resolvedStopDirKey || currentDir === parentDir) {
       break;
     }
     currentDir = parentDir;
@@ -396049,13 +397110,16 @@ async function refreshServerHierarchicalMemory(config3) {
   return result2;
 }
 async function loadJitSubdirectoryMemory(targetPath, trustedRoots, alreadyLoadedPaths, alreadyLoadedIdentities, boundaryMarkers = [".git"]) {
-  const resolvedTarget = normalizePath(targetPath);
+  const resolvedTarget = toAbsolutePath(targetPath);
   let bestRoot = null;
+  let bestRootKeyLength = -1;
   for (const root of trustedRoots) {
     if (isSubpath(root, targetPath)) {
-      const resolvedRoot = normalizePath(root);
-      if (!bestRoot || resolvedRoot.length > bestRoot.length) {
+      const resolvedRoot = toAbsolutePath(root);
+      const rootKeyLength = normalizePath(resolvedRoot).length;
+      if (rootKeyLength > bestRootKeyLength) {
         bestRoot = resolvedRoot;
+        bestRootKeyLength = rootKeyLength;
       }
     }
   }
@@ -396064,16 +397128,16 @@ async function loadJitSubdirectoryMemory(targetPath, trustedRoots, alreadyLoaded
     return { files: [], fileIdentities: [] };
   }
   const gitRoot = await findProjectRoot2(bestRoot, boundaryMarkers);
-  const resolvedCeiling = gitRoot ? normalizePath(gitRoot) : bestRoot;
+  const resolvedCeiling = gitRoot ?? bestRoot;
   debugLogger.debug("[DEBUG] [MemoryDiscovery] Loading JIT memory for", resolvedTarget, `(Trusted root: ${bestRoot}, Ceiling: ${resolvedCeiling}${gitRoot ? " [git root]" : " [trusted root, no git]"})`);
   let startDir = resolvedTarget;
   try {
     const stat5 = await fs72.stat(resolvedTarget);
     if (stat5.isFile()) {
-      startDir = normalizePath(path77.dirname(resolvedTarget));
+      startDir = path77.dirname(resolvedTarget);
     }
   } catch {
-    startDir = normalizePath(path77.dirname(resolvedTarget));
+    startDir = path77.dirname(resolvedTarget);
   }
   const potentialPaths = await findUpwardGeminiFiles(startDir, resolvedCeiling);
   if (potentialPaths.length === 0) {
@@ -398368,7 +399432,7 @@ var init_hookEventHandler = __esm({
           const hookType = this.getHookTypeFromResult(result2);
           const hookCallEvent = new HookCallEvent(eventName, hookType, hookName, { ...input }, result2.duration, result2.success, result2.output ? { ...result2.output } : void 0, result2.exitCode, result2.stdout, result2.stderr, result2.error?.message);
           logHookCall(this.context.config, hookCallEvent);
-          if (result2.output?.systemMessage && result2.outputFormat === "json") {
+          if (result2.output?.systemMessage) {
             coreEvents.emitHookSystemMessage({
               hookName,
               eventName,
@@ -402408,21 +403472,29 @@ async function connectToMcpServer(clientVersion, mcpServerName, mcpServerConfig,
   }
 }
 function createUrlTransport(mcpServerName, mcpServerConfig, transportOptions) {
+  const baseFetch = transportOptions.fetch ?? globalThis.fetch;
+  const httpOptions = {
+    ...transportOptions,
+    fetch: async (url5, init2) => {
+      const res = await baseFetch(url5, init2);
+      return init2?.method === "GET" && res.status === 404 ? new Response(null, { status: 405, statusText: "Method Not Allowed" }) : res;
+    }
+  };
   if (mcpServerConfig.httpUrl) {
     if (mcpServerConfig.url) {
       debugLogger.warn(`MCP server '${mcpServerName}': Both 'httpUrl' and 'url' are configured. Using deprecated 'httpUrl'. Please migrate to 'url' with 'type: "http"'.`);
     }
-    return new StreamableHTTPClientTransport(new URL(mcpServerConfig.httpUrl), transportOptions);
+    return new StreamableHTTPClientTransport(new URL(mcpServerConfig.httpUrl), httpOptions);
   }
   if (mcpServerConfig.url && mcpServerConfig.type) {
     if (mcpServerConfig.type === "http") {
-      return new StreamableHTTPClientTransport(new URL(mcpServerConfig.url), transportOptions);
+      return new StreamableHTTPClientTransport(new URL(mcpServerConfig.url), httpOptions);
     } else if (mcpServerConfig.type === "sse") {
       return new SSEClientTransport(new URL(mcpServerConfig.url), transportOptions);
     }
   }
   if (mcpServerConfig.url) {
-    return new StreamableHTTPClientTransport(new URL(mcpServerConfig.url), transportOptions);
+    return new StreamableHTTPClientTransport(new URL(mcpServerConfig.url), httpOptions);
   }
   throw new Error(`No URL configured for MCP server '${mcpServerName}'`);
 }
@@ -423026,7 +424098,15 @@ var init_config4 = __esm({
           this.workspaceContext.addDirectory(dir);
         }
         if (this.planEnabled) {
-          const plansDir = this.storage.getPlansDir();
+          let plansDir;
+          try {
+            plansDir = this.storage.getPlansDir();
+          } catch (error2) {
+            const errorMessage = error2 instanceof Error ? error2.message : String(error2);
+            coreEvents.emitFeedback("warning", "Invalid custom plans directory: " + errorMessage + ". Falling back to default project temp directory.", error2);
+            this.storage.setCustomPlansDir(void 0);
+            plansDir = this.storage.getPlansDir();
+          }
           try {
             await fs80.promises.access(plansDir);
             this.workspaceContext.addDirectory(plansDir);
@@ -423746,12 +424826,13 @@ var init_config4 = __esm({
        * user message when JIT is enabled. Returns empty string when JIT is
        * disabled (Tier 2 memory is already in the system instruction).
        */
-      getSessionMemory() {
+      getSessionMemory(options) {
         if (!this.experimentalJitContext || !this.memoryContextManager) {
           return "";
         }
         const sections = [];
-        const extension = this.memoryContextManager.getExtensionMemory();
+        const includeExtensionContext = options?.includeExtensionContext ?? true;
+        const extension = includeExtensionContext ? this.memoryContextManager.getExtensionMemory() : "";
         const project = this.memoryContextManager.getEnvironmentMemory();
         if (extension?.trim()) {
           sections.push(`<extension_context>
@@ -424166,16 +425247,32 @@ ${sections.join("\n")}
       setIdeMode(value) {
         this.ideMode = value;
       }
-      isScopedMemoryInboxPatchPathAllowed(absolutePath, resolvedPath, inboxRoot) {
+      isScopedMemoryInboxPatchPathAllowed(absolutePath, resolvedPath, inboxRoot, checkType = "write") {
         if (!hasScopedMemoryInboxAccess()) {
           return false;
         }
         const normalizedPath = path86.resolve(absolutePath);
+        const resolvedMemoryRoot = resolveToRealPath(this.storage.getProjectMemoryTempDir());
+        if (checkType === "read") {
+          const resolvedInboxRoot = resolveToRealPath(inboxRoot);
+          const normalizedInboxRoot = path86.resolve(inboxRoot);
+          if (resolvedPath === resolvedInboxRoot || normalizedPath === normalizedInboxRoot) {
+            return isSubpath(resolvedMemoryRoot, resolvedPath);
+          }
+          for (const kind of ["private", "global"]) {
+            const kindRoot = path86.join(inboxRoot, kind);
+            const resolvedKindRoot = resolveToRealPath(kindRoot);
+            const normalizedKindRoot = path86.resolve(kindRoot);
+            if (resolvedPath === resolvedKindRoot || normalizedPath === normalizedKindRoot || isSubpath(resolvedKindRoot, resolvedPath) || isSubpath(normalizedKindRoot, normalizedPath)) {
+              return isSubpath(resolvedMemoryRoot, resolvedPath);
+            }
+          }
+          return false;
+        }
         const isCanonicalPatchPath = ["private", "global"].some((kind) => normalizedPath === path86.resolve(inboxRoot, kind, "extraction.patch"));
         if (!isCanonicalPatchPath) {
           return false;
         }
-        const resolvedMemoryRoot = resolveToRealPath(this.storage.getProjectMemoryTempDir());
         return isSubpath(resolvedMemoryRoot, resolvedPath);
       }
       isScopedAutoMemoryExtractionWritePathAllowed(absolutePath, resolvedPath) {
@@ -424205,7 +425302,9 @@ ${sections.join("\n")}
        * the auto-memory extraction agent and the `/memory inbox` review flow. The
        * main agent is denied access to it even though it falls inside the project
        * temp dir; the extraction agent receives a narrow execution-scoped exception
-       * for `.inbox/{private,global}/extraction.patch`.
+       * for *writes* to `.inbox/{private,global}/extraction.patch`. Scoped *read*
+       * access to the wider `.inbox/{private,global}/` subtree is granted in
+       * `validatePathAccess` so the extractor can enumerate prior patches.
        *
        * @param absolutePath The absolute path to check.
        * @returns true if the path is allowed, false otherwise.
@@ -424257,6 +425356,12 @@ ${sections.join("\n")}
           if (this.getWorkspaceContext().isPathReadable(absolutePath)) {
             return null;
           }
+          if (hasScopedMemoryInboxAccess()) {
+            const inboxRoot = path86.join(this.storage.getProjectMemoryTempDir(), ".inbox");
+            if (this.isScopedMemoryInboxPatchPathAllowed(absolutePath, resolveToRealPath(absolutePath), inboxRoot, "read")) {
+              return null;
+            }
+          }
         }
         if (this.isPathAllowed(absolutePath)) {
           return null;
@@ -424583,10 +425688,10 @@ ${sections.join("\n")}
         return this.gemmaModelRouter;
       }
       getAgentSessionNoninteractiveEnabled() {
-        return this.agentSessionNoninteractiveEnabled;
+        return process15.env["GEMINI_CLI_EXP_AGENT"] === "true" || this.agentSessionNoninteractiveEnabled;
       }
       getAgentSessionInteractiveEnabled() {
-        return this.agentSessionInteractiveEnabled;
+        return process15.env["GEMINI_CLI_EXP_AGENT"] === "true" || this.agentSessionInteractiveEnabled;
       }
       /**
        * Get override settings for a specific agent.
@@ -425331,13 +426436,13 @@ var require_implementation2 = __commonJS({
         var isObject5 = object3 !== null && typeof object3 === "object";
         var isFunction = toStr.call(object3) === "[object Function]";
         var isArguments = isArgs(object3);
-        var isString = isObject5 && toStr.call(object3) === "[object String]";
+        var isString2 = isObject5 && toStr.call(object3) === "[object String]";
         var theKeys = [];
         if (!isObject5 && !isFunction && !isArguments) {
           throw new TypeError("Object.keys called on a non-object");
         }
         var skipProto = hasProtoEnumBug && isFunction;
-        if (isString && object3.length > 0 && !has.call(object3, 0)) {
+        if (isString2 && object3.length > 0 && !has.call(object3, 0)) {
           for (var i3 = 0; i3 < object3.length; ++i3) {
             theKeys.push(String(i3));
           }
@@ -425964,6 +427069,7 @@ var init_memoryPatchUtils = __esm({
   "packages/core/dist/src/services/memoryPatchUtils.js"() {
     "use strict";
     init_storage();
+    init_memoryTool();
     init_errors2();
     init_debugLogger();
     init_paths();
@@ -426104,10 +427210,10 @@ var init_memory2 = __esm({
     init_storage();
     init_memory();
     init_skillLoader();
-    init_memoryTool();
     init_memoryPatchUtils();
     init_memoryService();
     init_memoryDiscovery();
+    init_memoryPatchUtils();
   }
 });
 
@@ -428993,13 +430099,7 @@ var init_agent_session = __esm({
 var init_content_utils = __esm({
   "packages/core/dist/src/agent/content-utils.js"() {
     "use strict";
-  }
-});
-
-// packages/core/dist/src/agent/tool-display-utils.js
-var init_tool_display_utils = __esm({
-  "packages/core/dist/src/agent/tool-display-utils.js"() {
-    "use strict";
+    init_debugLogger();
   }
 });
 
@@ -429552,12 +430652,13 @@ var init_src2 = __esm({
     init_storage();
     init_hooks();
     init_types13();
-    init_types14();
     init_stdio();
     init_terminal();
     init_worktreeService();
     init_responseFormatter();
     init_types19();
+    init_snapshotGenerator();
+    init_types15();
     init_profiles2();
     init_profiles();
     init_trust();
@@ -430190,10 +431291,10 @@ var JsonRpcTransportHandler = class {
     }
     if ("id" in rpcRequest) {
       const id = rpcRequest.id;
-      const isString = typeof id === "string";
+      const isString2 = typeof id === "string";
       const isInteger3 = typeof id === "number" && Number.isInteger(id);
       const isNull2 = id === null;
-      if (!isString && !isInteger3 && !isNull2) {
+      if (!isString2 && !isInteger3 && !isNull2) {
         return false;
       }
     }
@@ -446723,6 +447824,7 @@ function loadInstallMetadata(extensionDir) {
 
 // packages/a2a-server/src/agent/task.ts
 init_dist4();
+import { EventEmitter as EventEmitter10 } from "node:events";
 import * as fs84 from "node:fs/promises";
 import * as path91 from "node:path";
 var Task4 = class _Task {
@@ -446752,8 +447854,8 @@ var Task4 = class _Task {
   pendingOutcomes = /* @__PURE__ */ new Map();
   // toolCallId --> outcome
   toolsAlreadyConfirmed = /* @__PURE__ */ new Set();
-  toolCompletionPromise;
-  toolCompletionNotifier;
+  toolUpdateEmitter = new EventEmitter10();
+  cancellationError;
   constructor(id, contextId, config3, eventBus, autoExecute = false) {
     this.id = id;
     this.contextId = contextId;
@@ -446765,7 +447867,6 @@ var Task4 = class _Task {
     this.taskState = "submitted";
     this.eventBus = eventBus;
     this.completedToolCalls = [];
-    this._resetToolCompletionPromise();
     this.autoExecute = autoExecute;
     this.config.setFallbackModelHandler(
       // For a2a-server, we want to automatically switch to the fallback model
@@ -446809,20 +447910,9 @@ var Task4 = class _Task {
     };
     return metadata2;
   }
-  _resetToolCompletionPromise() {
-    this.toolCompletionPromise = new Promise((resolve24, reject) => {
-      this.toolCompletionNotifier = { resolve: resolve24, reject };
-    });
-    if (this.pendingToolCalls.size === 0 && this.toolCompletionNotifier) {
-      this.toolCompletionNotifier.resolve();
-    }
-  }
   _registerToolCall(toolCallId, status2) {
-    const wasEmpty = this.pendingToolCalls.size === 0;
     this.pendingToolCalls.set(toolCallId, status2);
-    if (wasEmpty) {
-      this._resetToolCompletionPromise();
-    }
+    this.toolUpdateEmitter.emit("update");
     logger.info(
       `[Task] Registered tool call: ${toolCallId}. Pending: ${this.pendingToolCalls.size}`
     );
@@ -446830,22 +447920,42 @@ var Task4 = class _Task {
   _resolveToolCall(toolCallId) {
     if (this.pendingToolCalls.has(toolCallId)) {
       this.pendingToolCalls.delete(toolCallId);
+      this.toolUpdateEmitter.emit("update");
       logger.info(
         `[Task] Resolved tool call: ${toolCallId}. Pending: ${this.pendingToolCalls.size}`
       );
-      if (this.pendingToolCalls.size === 0 && this.toolCompletionNotifier) {
-        this.toolCompletionNotifier.resolve();
+    }
+  }
+  isAwaitingApprovalOnly() {
+    if (this.pendingToolCalls.size === 0) {
+      return false;
+    }
+    for (const [callId, status2] of this.pendingToolCalls.entries()) {
+      if (status2 !== CoreToolCallStatus.AwaitingApproval || this.toolsAlreadyConfirmed.has(callId)) {
+        return false;
       }
     }
+    return true;
   }
   async waitForPendingTools() {
-    if (this.pendingToolCalls.size === 0) {
-      return Promise.resolve();
+    while (this.pendingToolCalls.size > 0 && !this.isAwaitingApprovalOnly()) {
+      if (this.cancellationError) {
+        const error2 = this.cancellationError;
+        this.cancellationError = void 0;
+        throw error2;
+      }
+      logger.info(
+        `[Task] Waiting for ${this.pendingToolCalls.size} pending tool(s)...`
+      );
+      await new Promise(
+        (resolve24) => this.toolUpdateEmitter.once("update", resolve24)
+      );
+    }
+    if (this.cancellationError) {
+      const error2 = this.cancellationError;
+      this.cancellationError = void 0;
+      throw error2;
     }
-    logger.info(
-      `[Task] Waiting for ${this.pendingToolCalls.size} pending tool(s)...`
-    );
-    await this.toolCompletionPromise;
   }
   cancelPendingTools(reason) {
     if (this.pendingToolCalls.size > 0) {
@@ -446853,13 +447963,12 @@ var Task4 = class _Task {
         `[Task] Cancelling all ${this.pendingToolCalls.size} pending tool calls. Reason: ${reason}`
       );
     }
-    if (this.toolCompletionNotifier) {
-      this.toolCompletionNotifier.reject(new Error(reason));
-    }
+    this.cancellationError = new Error(reason);
     this.pendingToolCalls.clear();
     this.pendingCorrelationIds.clear();
+    this.toolsAlreadyConfirmed.clear();
     this.scheduler.cancelAll();
-    this._resetToolCompletionPromise();
+    this.toolUpdateEmitter.emit("update");
   }
   _createTextMessage(text, role = "agent") {
     return {
@@ -447070,8 +448179,8 @@ var Task4 = class _Task {
         /*final*/
         true
       );
-      if (!wasAlreadyInputRequired && this.toolCompletionNotifier) {
-        this.toolCompletionNotifier.resolve();
+      if (!wasAlreadyInputRequired) {
+        this.toolUpdateEmitter.emit("update");
       }
     }
   }
@@ -447336,6 +448445,7 @@ var Task4 = class _Task {
     const callId = part.data["callId"];
     const outcomeString = part.data["outcome"];
     this.toolsAlreadyConfirmed.add(callId);
+    this.toolUpdateEmitter.emit("update");
     let confirmationOutcome;
     if (outcomeString === "proceed_once") {
       confirmationOutcome = ToolConfirmationOutcome.ProceedOnce;
@@ -447499,7 +448609,6 @@ var Task4 = class _Task {
       const confirmationHandled = await this._handleToolConfirmationPart(part);
       if (confirmationHandled) {
         anyConfirmationHandled = true;
-        this._resetToolCompletionPromise();
         continue;
       }
       if (part.kind === "text") {