@google/gemini-cli-a2a-server 0.44.0-nightly.20260521.g57c42a5c4 → 0.44.0

package/dist/a2a-server.mjs

@@ -6856,7 +6856,7 @@ var require_file = __commonJS({
       stat(callback) {
         const target = this._getFile();
         const fullpath = path98.join(this.dirname, target);
-        fs89.stat(fullpath, (err2, stat6) => {
+        fs89.stat(fullpath, (err2, stat7) => {
           if (err2 && err2.code === "ENOENT") {
             debug2("ENOENT\xA0ok", fullpath);
             this.filename = target;
@@ -6866,11 +6866,11 @@ var require_file = __commonJS({
             debug2(`err ${err2.code} ${fullpath}`);
             return callback(err2);
           }
-          if (!stat6 || this._needsNewFile(stat6.size)) {
+          if (!stat7 || this._needsNewFile(stat7.size)) {
             return this._incFile(() => this.stat(callback));
           }
           this.filename = target;
-          callback(null, stat6.size);
+          callback(null, stat7.size);
         });
       }
       /**
@@ -31345,13 +31345,13 @@ var require_view = __commonJS({
     View.prototype.resolve = function resolve24(dir, file) {
       var ext2 = this.ext;
       var path99 = join40(dir, file);
-      var stat6 = tryStat(path99);
-      if (stat6 && stat6.isFile()) {
+      var stat7 = tryStat(path99);
+      if (stat7 && stat7.isFile()) {
         return path99;
       }
       path99 = join40(dir, basename12(file, ext2), "index" + ext2);
-      stat6 = tryStat(path99);
-      if (stat6 && stat6.isFile()) {
+      stat7 = tryStat(path99);
+      if (stat7 && stat7.isFile()) {
         return path99;
       }
     };
@@ -31400,9 +31400,9 @@ var require_etag = __commonJS({
       }
       return obj && typeof obj === "object" && "ctime" in obj && toString2.call(obj.ctime) === "[object Date]" && "mtime" in obj && toString2.call(obj.mtime) === "[object Date]" && "ino" in obj && typeof obj.ino === "number" && "size" in obj && typeof obj.size === "number";
     }
-    function stattag(stat6) {
-      var mtime = stat6.mtime.getTime().toString(16);
-      var size = stat6.size.toString(16);
+    function stattag(stat7) {
+      var mtime = stat7.mtime.getTime().toString(16);
+      var size = stat7.size.toString(16);
       return '"' + size + "-" + mtime + '"';
     }
   }
@@ -35211,8 +35211,8 @@ var require_send = __commonJS({
       this.sendFile(path99);
       return res;
     };
-    SendStream.prototype.send = function send2(path99, stat6) {
-      var len = stat6.size;
+    SendStream.prototype.send = function send2(path99, stat7) {
+      var len = stat7.size;
       var options = this.options;
       var opts = {};
       var res = this.res;
@@ -35224,7 +35224,7 @@ var require_send = __commonJS({
         return;
       }
       debug2('pipe "%s"', path99);
-      this.setHeader(path99, stat6);
+      this.setHeader(path99, stat7);
       this.type(path99);
       if (this.isConditionalGET()) {
         if (this.isPreconditionFailure()) {
@@ -35280,16 +35280,16 @@ var require_send = __commonJS({
       var i4 = 0;
       var self2 = this;
       debug2('stat "%s"', path99);
-      fs89.stat(path99, function onstat(err2, stat6) {
+      fs89.stat(path99, function onstat(err2, stat7) {
         var pathEndsWithSep = path99[path99.length - 1] === sep8;
         if (err2 && err2.code === "ENOENT" && !extname2(path99) && !pathEndsWithSep) {
           return next(err2);
         }
         if (err2) return self2.onStatError(err2);
-        if (stat6.isDirectory()) return self2.redirect(path99);
+        if (stat7.isDirectory()) return self2.redirect(path99);
         if (pathEndsWithSep) return self2.error(404);
-        self2.emit("file", path99, stat6);
-        self2.send(path99, stat6);
+        self2.emit("file", path99, stat7);
+        self2.send(path99, stat7);
       });
       function next(err2) {
         if (self2._extensions.length <= i4) {
@@ -35297,11 +35297,11 @@ var require_send = __commonJS({
         }
         var p3 = path99 + "." + self2._extensions[i4++];
         debug2('stat "%s"', p3);
-        fs89.stat(p3, function(err3, stat6) {
+        fs89.stat(p3, function(err3, stat7) {
           if (err3) return next(err3);
-          if (stat6.isDirectory()) return next();
-          self2.emit("file", p3, stat6);
-          self2.send(p3, stat6);
+          if (stat7.isDirectory()) return next();
+          self2.emit("file", p3, stat7);
+          self2.send(p3, stat7);
         });
       }
     };
@@ -35315,11 +35315,11 @@ var require_send = __commonJS({
         }
         var p3 = join40(path99, self2._index[i4]);
         debug2('stat "%s"', p3);
-        fs89.stat(p3, function(err3, stat6) {
+        fs89.stat(p3, function(err3, stat7) {
           if (err3) return next(err3);
-          if (stat6.isDirectory()) return next();
-          self2.emit("file", p3, stat6);
-          self2.send(p3, stat6);
+          if (stat7.isDirectory()) return next();
+          self2.emit("file", p3, stat7);
+          self2.send(p3, stat7);
         });
       }
       next();
@@ -35350,9 +35350,9 @@ var require_send = __commonJS({
       debug2("content-type %s", type3);
       res.setHeader("Content-Type", type3);
     };
-    SendStream.prototype.setHeader = function setHeader(path99, stat6) {
+    SendStream.prototype.setHeader = function setHeader(path99, stat7) {
       var res = this.res;
-      this.emit("headers", res, path99, stat6);
+      this.emit("headers", res, path99, stat7);
       if (this._acceptRanges && !res.getHeader("Accept-Ranges")) {
         debug2("accept ranges");
         res.setHeader("Accept-Ranges", "bytes");
@@ -35366,12 +35366,12 @@ var require_send = __commonJS({
         res.setHeader("Cache-Control", cacheControl);
       }
       if (this._lastModified && !res.getHeader("Last-Modified")) {
-        var modified = stat6.mtime.toUTCString();
+        var modified = stat7.mtime.toUTCString();
         debug2("modified %s", modified);
         res.setHeader("Last-Modified", modified);
       }
       if (this._etag && !res.getHeader("ETag")) {
-        var val = etag(stat6);
+        var val = etag(stat7);
         debug2("etag %s", val);
         res.setHeader("ETag", val);
       }
@@ -45891,7 +45891,7 @@ var require_src5 = __commonJS({
     var jws = require_jws();
     var path98 = __require("path");
     var util_1 = __require("util");
-    var readFile11 = fs89.readFile ? (0, util_1.promisify)(fs89.readFile) : async () => {
+    var readFile12 = fs89.readFile ? (0, util_1.promisify)(fs89.readFile) : async () => {
       throw new ErrorWithCode("use key rather than keyFile.", "MISSING_CREDENTIALS");
     };
     var GOOGLE_TOKEN_URL = "https://www.googleapis.com/oauth2/v4/token";
@@ -45980,7 +45980,7 @@ var require_src5 = __commonJS({
         const ext2 = path98.extname(keyFile);
         switch (ext2) {
           case ".json": {
-            const key = await readFile11(keyFile, "utf8");
+            const key = await readFile12(keyFile, "utf8");
             const body2 = JSON.parse(key);
             const privateKey = body2.private_key;
             const clientEmail = body2.client_email;
@@ -45992,7 +45992,7 @@ var require_src5 = __commonJS({
           case ".der":
           case ".crt":
           case ".pem": {
-            const privateKey = await readFile11(keyFile, "utf8");
+            const privateKey = await readFile12(keyFile, "utf8");
             return { privateKey };
           }
           case ".p12":
@@ -47449,7 +47449,7 @@ var require_filesubjecttokensupplier = __commonJS({
     exports2.FileSubjectTokenSupplier = void 0;
     var util_1 = __require("util");
     var fs89 = __require("fs");
-    var readFile11 = (0, util_1.promisify)((_a4 = fs89.readFile) !== null && _a4 !== void 0 ? _a4 : () => {
+    var readFile12 = (0, util_1.promisify)((_a4 = fs89.readFile) !== null && _a4 !== void 0 ? _a4 : () => {
     });
     var realpath2 = (0, util_1.promisify)((_b = fs89.realpath) !== null && _b !== void 0 ? _b : () => {
     });
@@ -47486,7 +47486,7 @@ var require_filesubjecttokensupplier = __commonJS({
           throw err2;
         }
         let subjectToken;
-        const rawText = await readFile11(parsedFilePath, { encoding: "utf8" });
+        const rawText = await readFile12(parsedFilePath, { encoding: "utf8" });
         if (this.formatType === "text") {
           subjectToken = rawText;
         } else if (this.formatType === "json" && this.subjectTokenFieldName) {
@@ -53528,8 +53528,8 @@ var require_graceful_fs = __commonJS({
       fs90.createReadStream = createReadStream6;
       fs90.createWriteStream = createWriteStream5;
       var fs$readFile = fs90.readFile;
-      fs90.readFile = readFile11;
-      function readFile11(path98, options, cb) {
+      fs90.readFile = readFile12;
+      function readFile12(path98, options, cb) {
         if (typeof options === "function")
           cb = options, options = null;
         return go$readFile(path98, options, cb);
@@ -53705,7 +53705,7 @@ var require_graceful_fs = __commonJS({
       }
       function ReadStream$open() {
         var that = this;
-        open4(that.path, that.flags, that.mode, function(err2, fd) {
+        open5(that.path, that.flags, that.mode, function(err2, fd) {
           if (err2) {
             if (that.autoClose)
               that.destroy();
@@ -53725,7 +53725,7 @@ var require_graceful_fs = __commonJS({
       }
       function WriteStream$open() {
         var that = this;
-        open4(that.path, that.flags, that.mode, function(err2, fd) {
+        open5(that.path, that.flags, that.mode, function(err2, fd) {
           if (err2) {
             that.destroy();
             that.emit("error", err2);
@@ -53742,8 +53742,8 @@ var require_graceful_fs = __commonJS({
         return new fs90.WriteStream(path98, options);
       }
       var fs$open = fs90.open;
-      fs90.open = open4;
-      function open4(path98, flags2, mode, cb) {
+      fs90.open = open5;
+      function open5(path98, flags2, mode, cb) {
         if (typeof mode === "function")
           cb = mode, mode = null;
         return go$open(path98, flags2, mode, cb);
@@ -54185,7 +54185,7 @@ var require_copy = __commonJS({
     var { mkdirs } = require_mkdirs();
     var { pathExists: pathExists2 } = require_path_exists();
     var { utimesMillis } = require_utimes();
-    var stat6 = require_stat();
+    var stat7 = require_stat();
     async function copy(src, dest, opts = {}) {
       if (typeof opts === "function") {
         opts = { filter: opts };
@@ -54199,8 +54199,8 @@ var require_copy = __commonJS({
           "fs-extra-WARN0001"
         );
       }
-      const { srcStat, destStat } = await stat6.checkPaths(src, dest, "copy", opts);
-      await stat6.checkParentPaths(src, srcStat, dest, "copy");
+      const { srcStat, destStat } = await stat7.checkPaths(src, dest, "copy", opts);
+      await stat7.checkParentPaths(src, srcStat, dest, "copy");
       const include = await runFilter(src, dest, opts);
       if (!include) return;
       const destParent = path98.dirname(dest);
@@ -54262,7 +54262,7 @@ var require_copy = __commonJS({
         promises10.push(
           runFilter(srcItem, destItem, opts).then((include) => {
             if (include) {
-              return stat6.checkPaths(srcItem, destItem, "copy", opts).then(({ destStat: destStat2 }) => {
+              return stat7.checkPaths(srcItem, destItem, "copy", opts).then(({ destStat: destStat2 }) => {
                 return getStatsAndPerformCopy(destStat2, srcItem, destItem, opts);
               });
             }
@@ -54292,10 +54292,10 @@ var require_copy = __commonJS({
       if (opts.dereference) {
         resolvedDest = path98.resolve(process.cwd(), resolvedDest);
       }
-      if (stat6.isSrcSubdir(resolvedSrc, resolvedDest)) {
+      if (stat7.isSrcSubdir(resolvedSrc, resolvedDest)) {
         throw new Error(`Cannot copy '${resolvedSrc}' to a subdirectory of itself, '${resolvedDest}'.`);
       }
-      if (stat6.isSrcSubdir(resolvedDest, resolvedSrc)) {
+      if (stat7.isSrcSubdir(resolvedDest, resolvedSrc)) {
         throw new Error(`Cannot overwrite '${resolvedDest}' with '${resolvedSrc}'.`);
       }
       await fs89.unlink(dest);
@@ -54313,7 +54313,7 @@ var require_copy_sync = __commonJS({
     var path98 = __require("path");
     var mkdirsSync = require_mkdirs().mkdirsSync;
     var utimesMillisSync = require_utimes().utimesMillisSync;
-    var stat6 = require_stat();
+    var stat7 = require_stat();
     function copySync(src, dest, opts) {
       if (typeof opts === "function") {
         opts = { filter: opts };
@@ -54328,8 +54328,8 @@ var require_copy_sync = __commonJS({
           "fs-extra-WARN0002"
         );
       }
-      const { srcStat, destStat } = stat6.checkPathsSync(src, dest, "copy", opts);
-      stat6.checkParentPathsSync(src, srcStat, dest, "copy");
+      const { srcStat, destStat } = stat7.checkPathsSync(src, dest, "copy", opts);
+      stat7.checkParentPathsSync(src, srcStat, dest, "copy");
       if (opts.filter && !opts.filter(src, dest)) return;
       const destParent = path98.dirname(dest);
       if (!fs89.existsSync(destParent)) mkdirsSync(destParent);
@@ -54403,7 +54403,7 @@ var require_copy_sync = __commonJS({
       const srcItem = path98.join(src, item);
       const destItem = path98.join(dest, item);
       if (opts.filter && !opts.filter(srcItem, destItem)) return;
-      const { destStat } = stat6.checkPathsSync(srcItem, destItem, "copy", opts);
+      const { destStat } = stat7.checkPathsSync(srcItem, destItem, "copy", opts);
       return getStats(destStat, srcItem, destItem, opts);
     }
     function onLink(destStat, src, dest, opts) {
@@ -54424,10 +54424,10 @@ var require_copy_sync = __commonJS({
         if (opts.dereference) {
           resolvedDest = path98.resolve(process.cwd(), resolvedDest);
         }
-        if (stat6.isSrcSubdir(resolvedSrc, resolvedDest)) {
+        if (stat7.isSrcSubdir(resolvedSrc, resolvedDest)) {
           throw new Error(`Cannot copy '${resolvedSrc}' to a subdirectory of itself, '${resolvedDest}'.`);
         }
-        if (stat6.isSrcSubdir(resolvedDest, resolvedSrc)) {
+        if (stat7.isSrcSubdir(resolvedDest, resolvedSrc)) {
           throw new Error(`Cannot overwrite '${resolvedDest}' with '${resolvedSrc}'.`);
         }
         return copyLink(resolvedSrc, dest);
@@ -54897,7 +54897,7 @@ var require_jsonfile = __commonJS({
       }
       return obj;
     }
-    var readFile11 = universalify.fromPromise(_readFile);
+    var readFile12 = universalify.fromPromise(_readFile);
     function readFileSync10(file, options = {}) {
       if (typeof options === "string") {
         options = { encoding: options };
@@ -54929,7 +54929,7 @@ var require_jsonfile = __commonJS({
       return fs89.writeFileSync(file, str2, options);
     }
     module2.exports = {
-      readFile: readFile11,
+      readFile: readFile12,
       readFileSync: readFileSync10,
       writeFile: writeFile9,
       writeFileSync: writeFileSync7
@@ -55038,11 +55038,11 @@ var require_move = __commonJS({
     var { remove: remove3 } = require_remove();
     var { mkdirp } = require_mkdirs();
     var { pathExists: pathExists2 } = require_path_exists();
-    var stat6 = require_stat();
+    var stat7 = require_stat();
     async function move(src, dest, opts = {}) {
       const overwrite = opts.overwrite || opts.clobber || false;
-      const { srcStat, isChangingCase = false } = await stat6.checkPaths(src, dest, "move", opts);
-      await stat6.checkParentPaths(src, srcStat, dest, "move");
+      const { srcStat, isChangingCase = false } = await stat7.checkPaths(src, dest, "move", opts);
+      await stat7.checkParentPaths(src, srcStat, dest, "move");
       const destParent = path98.dirname(dest);
       const parsedParentPath = path98.parse(destParent);
       if (parsedParentPath.root !== destParent) {
@@ -55089,12 +55089,12 @@ var require_move_sync = __commonJS({
     var copySync = require_copy2().copySync;
     var removeSync = require_remove().removeSync;
     var mkdirpSync = require_mkdirs().mkdirpSync;
-    var stat6 = require_stat();
+    var stat7 = require_stat();
     function moveSync(src, dest, opts) {
       opts = opts || {};
       const overwrite = opts.overwrite || opts.clobber || false;
-      const { srcStat, isChangingCase = false } = stat6.checkPathsSync(src, dest, "move", opts);
-      stat6.checkParentPathsSync(src, srcStat, dest, "move");
+      const { srcStat, isChangingCase = false } = stat7.checkPathsSync(src, dest, "move", opts);
+      stat7.checkParentPathsSync(src, srcStat, dest, "move");
       if (!isParentRoot(dest)) mkdirpSync(path98.dirname(dest));
       return doRename(src, dest, overwrite, isChangingCase);
     }
@@ -65590,8 +65590,8 @@ var require_lib8 = __commonJS({
     }
     async function isBinaryFile2(file, size) {
       if (isString2(file)) {
-        const stat6 = await statAsync(file);
-        isStatFile(stat6);
+        const stat7 = await statAsync(file);
+        isStatFile(stat7);
         const fileDescriptor = await openAsync(file, "r");
         const allocBuffer = Buffer.alloc(MAX_BYTES + UTF8_BOUNDARY_RESERVE);
         return new Promise((fulfill, reject) => {
@@ -65618,8 +65618,8 @@ var require_lib8 = __commonJS({
     exports2.isBinaryFile = isBinaryFile2;
     function isBinaryFileSync(file, size) {
       if (isString2(file)) {
-        const stat6 = fs89.statSync(file);
-        isStatFile(stat6);
+        const stat7 = fs89.statSync(file);
+        isStatFile(stat7);
         const fileDescriptor = fs89.openSync(file, "r");
         const allocBuffer = Buffer.alloc(MAX_BYTES + UTF8_BOUNDARY_RESERVE);
         const bytesRead = fs89.readSync(fileDescriptor, allocBuffer, 0, MAX_BYTES + UTF8_BOUNDARY_RESERVE, 0);
@@ -65700,8 +65700,8 @@ var require_lib8 = __commonJS({
     function isString2(x3) {
       return typeof x3 === "string";
     }
-    function isStatFile(stat6) {
-      if (!stat6.isFile()) {
+    function isStatFile(stat7) {
+      if (!stat7.isFile()) {
         throw new Error(`Path provided was not a file!`);
       }
     }
@@ -66456,8 +66456,8 @@ function robustRealpath(p3, visited = /* @__PURE__ */ new Set()) {
   } catch (e3) {
     if (e3 && typeof e3 === "object" && "code" in e3 && (e3.code === "ENOENT" || e3.code === "EISDIR" || e3.code === "ENAMETOOLONG" || e3.code === "ENOTDIR")) {
       try {
-        const stat6 = fs6.lstatSync(p3);
-        if (stat6.isSymbolicLink()) {
+        const stat7 = fs6.lstatSync(p3);
+        if (stat7.isSymbolicLink()) {
           const target = fs6.readlinkSync(p3);
           const resolvedTarget = path2.resolve(path2.dirname(p3), target);
           return robustRealpath(resolvedTarget, visited);
@@ -66503,10 +66503,11 @@ function toPathKey(p3) {
 }
 function isTrustedSystemPath(filePath) {
   const normPath = normalizePath(filePath);
+  const isHermeticEnv = !!process.env["TEST_SRCDIR"] || !!process.env["TEST_WORKSPACE"] || !!process.env["BAZEL_TEST"] || !!process.env["RUNFILES_DIR"];
   const normCwd = normalizePath(process.cwd());
   const isRoot = normCwd === "/" || /^[a-zA-Z]:[\\/]?$/.test(normCwd);
   if (!isRoot && isSubpath(normCwd, normPath)) {
-    return false;
+    return isHermeticEnv;
   }
   const platform10 = process.platform;
   if (platform10 === "win32") {
@@ -66525,7 +66526,10 @@ function isTrustedSystemPath(filePath) {
       "/opt/homebrew/Cellar",
       "/usr/local/Cellar",
       "/usr/sbin",
-      "/sbin"
+      "/sbin",
+      // 1P internal hermetic execution paths
+      "/google/bin",
+      "/google/src/cloud"
     ].map((p3) => normalizePath(p3));
     return trustedPrefixes.some((prefix) => normPath === prefix || normPath.startsWith(prefix + "/"));
   }
@@ -66967,11 +66971,11 @@ var require_mtime_precision = __commonJS({
     function probe(file, fs89, callback) {
       const cachedPrecision = fs89[cacheSymbol];
       if (cachedPrecision) {
-        return fs89.stat(file, (err2, stat6) => {
+        return fs89.stat(file, (err2, stat7) => {
           if (err2) {
             return callback(err2);
           }
-          callback(null, stat6.mtime, cachedPrecision);
+          callback(null, stat7.mtime, cachedPrecision);
         });
       }
       const mtime = new Date(Math.ceil(Date.now() / 1e3) * 1e3 + 5);
@@ -66979,13 +66983,13 @@ var require_mtime_precision = __commonJS({
         if (err2) {
           return callback(err2);
         }
-        fs89.stat(file, (err3, stat6) => {
+        fs89.stat(file, (err3, stat7) => {
           if (err3) {
             return callback(err3);
           }
-          const precision = stat6.mtime.getTime() % 1e3 === 0 ? "s" : "ms";
+          const precision = stat7.mtime.getTime() % 1e3 === 0 ? "s" : "ms";
           Object.defineProperty(fs89, cacheSymbol, { value: precision });
-          callback(null, stat6.mtime, precision);
+          callback(null, stat7.mtime, precision);
         });
       });
     }
@@ -67039,14 +67043,14 @@ var require_lockfile = __commonJS({
         if (options.stale <= 0) {
           return callback(Object.assign(new Error("Lock file is already being held"), { code: "ELOCKED", file }));
         }
-        options.fs.stat(lockfilePath, (err3, stat6) => {
+        options.fs.stat(lockfilePath, (err3, stat7) => {
           if (err3) {
             if (err3.code === "ENOENT") {
               return acquireLock(file, { ...options, stale: 0 }, callback);
             }
             return callback(err3);
           }
-          if (!isLockStale(stat6, options)) {
+          if (!isLockStale(stat7, options)) {
             return callback(Object.assign(new Error("Lock file is already being held"), { code: "ELOCKED", file }));
           }
           removeLock(file, options, (err4) => {
@@ -67058,8 +67062,8 @@ var require_lockfile = __commonJS({
         });
       });
     }
-    function isLockStale(stat6, options) {
-      return stat6.mtime.getTime() < Date.now() - options.stale;
+    function isLockStale(stat7, options) {
+      return stat7.mtime.getTime() < Date.now() - options.stale;
     }
     function removeLock(file, options, callback) {
       options.fs.rmdir(getLockFile(file, options), (err2) => {
@@ -67077,7 +67081,7 @@ var require_lockfile = __commonJS({
       lock4.updateDelay = lock4.updateDelay || options.update;
       lock4.updateTimeout = setTimeout(() => {
         lock4.updateTimeout = null;
-        options.fs.stat(lock4.lockfilePath, (err2, stat6) => {
+        options.fs.stat(lock4.lockfilePath, (err2, stat7) => {
           const isOverThreshold = lock4.lastUpdate + options.stale < Date.now();
           if (err2) {
             if (err2.code === "ENOENT" || isOverThreshold) {
@@ -67086,7 +67090,7 @@ var require_lockfile = __commonJS({
             lock4.updateDelay = 1e3;
             return updateLock(file, options);
           }
-          const isMtimeOurs = lock4.mtime.getTime() === stat6.mtime.getTime();
+          const isMtimeOurs = lock4.mtime.getTime() === stat7.mtime.getTime();
           if (!isMtimeOurs) {
             return setLockAsCompromised(
               file,
@@ -67211,11 +67215,11 @@ var require_lockfile = __commonJS({
         if (err2) {
           return callback(err2);
         }
-        options.fs.stat(getLockFile(file2, options), (err3, stat6) => {
+        options.fs.stat(getLockFile(file2, options), (err3, stat7) => {
           if (err3) {
             return err3.code === "ENOENT" ? callback(null, false) : callback(err3);
           }
-          return callback(null, !isLockStale(stat6, options));
+          return callback(null, !isLockStale(stat7, options));
         });
       });
     }
@@ -68998,12 +69002,23 @@ import fs11 from "node:fs";
 import path9 from "node:path";
 import { spawn, spawnSync } from "node:child_process";
 import * as readline from "node:readline";
+function stripHupGuard(command) {
+  const trimmed2 = command.trimStart();
+  const prefix = `${BASH_HUP_GUARD} `;
+  if (trimmed2.startsWith(prefix)) {
+    return trimmed2.slice(prefix.length);
+  }
+  if (trimmed2 === BASH_HUP_GUARD) {
+    return "";
+  }
+  return command;
+}
 async function getCommandName(command, args2) {
   await initializeShellParsers();
   const fullCmd = [command, ...args2].join(" ");
   const stripped = stripShellWrapper(fullCmd);
   const roots = getCommandRoots(stripped).filter((r4) => r4 !== "shopt" && r4 !== "set");
-  if (roots.length > 0) {
+  if (roots.length === 1) {
     return roots[0];
   }
   return path9.basename(command);
@@ -69369,13 +69384,14 @@ function parseCommandDetails(command) {
 }
 function getShellConfiguration() {
   if (isWindows()) {
+    const powershellArgsPrefix = ["-NoProfile", "-NonInteractive", "-Command"];
     const comSpec = process.env["ComSpec"];
     if (comSpec) {
       const executable = comSpec.toLowerCase();
       if (executable.endsWith("powershell.exe") || executable.endsWith("pwsh.exe")) {
         return {
           executable: comSpec,
-          argsPrefix: ["-NoProfile", "-Command"],
+          argsPrefix: powershellArgsPrefix,
           shell: "powershell"
         };
       }
@@ -69390,7 +69406,7 @@ function getShellConfiguration() {
     }
     return {
       executable: "powershell.exe",
-      argsPrefix: ["-NoProfile", "-Command"],
+      argsPrefix: powershellArgsPrefix,
       shell: "powershell"
     };
   }
@@ -69466,14 +69482,17 @@ function getCommandRoots(command) {
 function stripShellWrapper(command) {
   const pattern = /^\s*(?:(?:(?:\S+\/)?(?:sh|bash|zsh))\s+-c|cmd\.exe\s+\/c|powershell(?:\.exe)?\s+(?:-NoProfile\s+)?-Command|pwsh(?:\.exe)?\s+(?:-NoProfile\s+)?-Command)\s+/i;
   const match2 = command.match(pattern);
+  let result2;
   if (match2) {
     let newCommand = command.substring(match2[0].length).trim();
     if (newCommand.startsWith('"') && newCommand.endsWith('"') || newCommand.startsWith("'") && newCommand.endsWith("'")) {
       newCommand = newCommand.substring(1, newCommand.length - 1);
     }
-    return newCommand;
+    result2 = newCommand;
+  } else {
+    result2 = command.trim();
   }
-  return command.trim();
+  return stripHupGuard(result2);
 }
 async function* execStreaming(command, args2, options) {
   const sandboxManager = options?.sandboxManager ?? new NoopSandboxManager();
@@ -69673,7 +69692,7 @@ function detectPowerShellSubstitution(command) {
   }
   return false;
 }
-var import_shell_quote, SHELL_TOOL_NAMES, bashLanguage, treeSitterInitialization, treeSitterInitializationError, ShellParserInitializationError, POWERSHELL_COMMAND_ENV, PARSE_TIMEOUT_MICROS, POWERSHELL_PARSER_SCRIPT, REDIRECTION_NAMES, isWindows, spawnAsync, POWERSHELL_KEYWORD_RE;
+var import_shell_quote, BASH_HUP_GUARD, SHELL_TOOL_NAMES, bashLanguage, treeSitterInitialization, treeSitterInitializationError, ShellParserInitializationError, POWERSHELL_COMMAND_ENV, PARSE_TIMEOUT_MICROS, POWERSHELL_PARSER_SCRIPT, REDIRECTION_NAMES, isWindows, spawnAsync, POWERSHELL_KEYWORD_RE;
 var init_shell_utils = __esm({
   "packages/core/dist/src/utils/shell-utils.js"() {
     "use strict";
@@ -69682,6 +69701,7 @@ var init_shell_utils = __esm({
     init_fileUtils();
     init_debugLogger();
     init_sandboxManager();
+    BASH_HUP_GUARD = `trap '' HUP;`;
     SHELL_TOOL_NAMES = ["run_shell_command", "ShellTool"];
     bashLanguage = null;
     treeSitterInitialization = null;
@@ -70472,7 +70492,7 @@ async function getCommandName2(req) {
   const fullCmd = [req.command, ...req.args].join(" ");
   const stripped = stripShellWrapper(fullCmd);
   const roots = getCommandRoots(stripped).filter((r4) => r4 !== "shopt" && r4 !== "set");
-  if (roots.length > 0) {
+  if (roots.length === 1) {
     return roots[0];
   }
   return path12.basename(req.command);
@@ -72288,8 +72308,8 @@ async function buildBwrapArgs(options) {
     if (!fs13.existsSync(p3))
       continue;
     try {
-      const stat6 = fs13.statSync(p3);
-      if (stat6.isDirectory()) {
+      const stat7 = fs13.statSync(p3);
+      if (stat7.isDirectory()) {
         mounts.push({ type: "--tmpfs-ro", dest: p3 });
       } else {
         mounts.push({ type: "--ro-bind", src: "/dev/null", dest: p3 });
@@ -79157,21 +79177,21 @@ var init_from = __esm({
     init_fetch_blob();
     ({ stat } = fs20);
     blobFromSync = (path98, type2) => fromBlob(statSync(path98), path98, type2);
-    blobFrom = (path98, type2) => stat(path98).then((stat6) => fromBlob(stat6, path98, type2));
-    fileFrom = (path98, type2) => stat(path98).then((stat6) => fromFile(stat6, path98, type2));
+    blobFrom = (path98, type2) => stat(path98).then((stat7) => fromBlob(stat7, path98, type2));
+    fileFrom = (path98, type2) => stat(path98).then((stat7) => fromFile(stat7, path98, type2));
     fileFromSync = (path98, type2) => fromFile(statSync(path98), path98, type2);
-    fromBlob = (stat6, path98, type2 = "") => new fetch_blob_default([new BlobDataItem({
+    fromBlob = (stat7, path98, type2 = "") => new fetch_blob_default([new BlobDataItem({
       path: path98,
-      size: stat6.size,
-      lastModified: stat6.mtimeMs,
+      size: stat7.size,
+      lastModified: stat7.mtimeMs,
       start: 0
     })], { type: type2 });
-    fromFile = (stat6, path98, type2 = "") => new file_default([new BlobDataItem({
+    fromFile = (stat7, path98, type2 = "") => new file_default([new BlobDataItem({
       path: path98,
-      size: stat6.size,
-      lastModified: stat6.mtimeMs,
+      size: stat7.size,
+      lastModified: stat7.mtimeMs,
       start: 0
-    })], basename3(path98), { type: type2, lastModified: stat6.mtimeMs });
+    })], basename3(path98), { type: type2, lastModified: stat7.mtimeMs });
     BlobDataItem = class _BlobDataItem {
       #path;
       #start;
@@ -83909,7 +83929,7 @@ var require_src15 = __commonJS({
         });
       };
     }
-    var readFile11 = fs89.readFile ? (0, _util.promisify)(fs89.readFile) : /* @__PURE__ */ _asyncToGenerator(/* @__PURE__ */ _regenerator().m(function _callee() {
+    var readFile12 = fs89.readFile ? (0, _util.promisify)(fs89.readFile) : /* @__PURE__ */ _asyncToGenerator(/* @__PURE__ */ _regenerator().m(function _callee() {
       return _regenerator().w(function(_context) {
         while (1) switch (_context.n) {
           case 0:
@@ -84049,7 +84069,7 @@ var require_src15 = __commonJS({
                   break;
                 case 1:
                   _context2.n = 2;
-                  return readFile11(keyFile, "utf8");
+                  return readFile12(keyFile, "utf8");
                 case 2:
                   key = _context2.v;
                   body2 = JSON.parse(key);
@@ -84067,7 +84087,7 @@ var require_src15 = __commonJS({
                   });
                 case 4:
                   _context2.n = 5;
-                  return readFile11(keyFile, "utf8");
+                  return readFile12(keyFile, "utf8");
                 case 5:
                   _privateKey = _context2.v;
                   return _context2.a(2, {
@@ -85664,7 +85684,7 @@ var require_filesubjecttokensupplier2 = __commonJS({
     exports2.FileSubjectTokenSupplier = void 0;
     var util_1 = __require("util");
     var fs89 = __require("fs");
-    var readFile11 = (0, util_1.promisify)(fs89.readFile ?? (() => {
+    var readFile12 = (0, util_1.promisify)(fs89.readFile ?? (() => {
     }));
     var realpath2 = (0, util_1.promisify)(fs89.realpath ?? (() => {
     }));
@@ -85704,7 +85724,7 @@ var require_filesubjecttokensupplier2 = __commonJS({
           throw err2;
         }
         let subjectToken;
-        const rawText = await readFile11(parsedFilePath, { encoding: "utf8" });
+        const rawText = await readFile12(parsedFilePath, { encoding: "utf8" });
         if (this.formatType === "text") {
           subjectToken = rawText;
         } else if (this.formatType === "json" && this.subjectTokenFieldName) {
@@ -90493,7 +90513,7 @@ var require_websocket = __commonJS({
     var http5 = __require("http");
     var net2 = __require("net");
     var tls = __require("tls");
-    var { randomBytes: randomBytes5, createHash: createHash17 } = __require("crypto");
+    var { randomBytes: randomBytes5, createHash: createHash18 } = __require("crypto");
     var { Duplex, Readable: Readable7 } = __require("stream");
     var { URL: URL10 } = __require("url");
     var PerMessageDeflate = require_permessage_deflate();
@@ -91150,7 +91170,7 @@ var require_websocket = __commonJS({
           abortHandshake(websocket, socket, "Invalid Upgrade header");
           return;
         }
-        const digest = createHash17("sha1").update(key + GUID).digest("base64");
+        const digest = createHash18("sha1").update(key + GUID).digest("base64");
         if (res.headers["sec-websocket-accept"] !== digest) {
           abortHandshake(websocket, socket, "Invalid Sec-WebSocket-Accept header");
           return;
@@ -91429,7 +91449,7 @@ var require_stream3 = __commonJS({
       };
       duplex._final = function(callback) {
         if (ws3.readyState === ws3.CONNECTING) {
-          ws3.once("open", function open4() {
+          ws3.once("open", function open5() {
             duplex._final(callback);
           });
           return;
@@ -91450,7 +91470,7 @@ var require_stream3 = __commonJS({
       };
       duplex._write = function(chunk, encoding, callback) {
         if (ws3.readyState === ws3.CONNECTING) {
-          ws3.once("open", function open4() {
+          ws3.once("open", function open5() {
             duplex._write(chunk, encoding, callback);
           });
           return;
@@ -91517,7 +91537,7 @@ var require_websocket_server = __commonJS({
     var EventEmitter11 = __require("events");
     var http5 = __require("http");
     var { Duplex } = __require("stream");
-    var { createHash: createHash17 } = __require("crypto");
+    var { createHash: createHash18 } = __require("crypto");
     var extension = require_extension();
     var PerMessageDeflate = require_permessage_deflate();
     var subprotocol = require_subprotocol();
@@ -91814,7 +91834,7 @@ var require_websocket_server = __commonJS({
           );
         }
         if (this._state > RUNNING) return abortHandshake(socket, 503);
-        const digest = createHash17("sha1").update(key + GUID).digest("base64");
+        const digest = createHash18("sha1").update(key + GUID).digest("base64");
         const headers = [
           "HTTP/1.1 101 Switching Protocols",
           "Upgrade: websocket",
@@ -168491,14 +168511,14 @@ var require_require_in_the_middle = __commonJS({
           moduleName = parsedPath.name;
           basedir = parsedPath.dir;
         } else {
-          const stat6 = moduleDetailsFromPath(filename);
-          if (stat6 === void 0) {
+          const stat7 = moduleDetailsFromPath(filename);
+          if (stat7 === void 0) {
             debug2("could not parse filename: %s", filename);
             return exports3;
           }
-          moduleName = stat6.name;
-          basedir = stat6.basedir;
-          const fullModuleName = resolveModuleName(stat6);
+          moduleName = stat7.name;
+          basedir = stat7.basedir;
+          const fullModuleName = resolveModuleName(stat7);
           debug2("resolved filename to module: %s (id: %s, resolved: %s, basedir: %s)", moduleName, id, fullModuleName, basedir);
           let matchFound = false;
           if (hasWhitelist) {
@@ -168560,9 +168580,9 @@ var require_require_in_the_middle = __commonJS({
         }
       }
     };
-    function resolveModuleName(stat6) {
-      const normalizedPath = path98.sep !== "/" ? stat6.path.split(path98.sep).join("/") : stat6.path;
-      return path98.posix.join(stat6.name, normalizedPath).replace(normalize7, "");
+    function resolveModuleName(stat7) {
+      const normalizedPath = path98.sep !== "/" ? stat7.path.split(path98.sep).join("/") : stat7.path;
+      return path98.posix.join(stat7.name, normalizedPath).replace(normalize7, "");
     }
   }
 });
@@ -211631,8 +211651,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 = "57c42a5c4";
-    CLI_VERSION = "0.44.0-nightly.20260521.g57c42a5c4";
+    GIT_COMMIT_INFO = "b82ca5f8d";
+    CLI_VERSION = "0.44.0";
   }
 });
 
@@ -218328,7 +218348,7 @@ var require_discovery = __commonJS({
     var util5 = __require("util");
     var apirequest_1 = require_apirequest();
     var endpoint_1 = require_endpoint();
-    var readFile11 = util5.promisify(fs89.readFile);
+    var readFile12 = util5.promisify(fs89.readFile);
     var Discovery = class {
       /**
        * Discovery for discovering API endpoints
@@ -218415,7 +218435,7 @@ var require_discovery = __commonJS({
           const parts2 = resolve23.parse(apiDiscoveryUrl);
           if (apiDiscoveryUrl && !parts2.protocol) {
             this.log("Reading from file " + apiDiscoveryUrl);
-            const file = await readFile11(apiDiscoveryUrl, { encoding: "utf8" });
+            const file = await readFile12(apiDiscoveryUrl, { encoding: "utf8" });
             return this.makeEndpoint(JSON.parse(file));
           } else {
             this.log("Requesting " + apiDiscoveryUrl);
@@ -239391,7 +239411,7 @@ var require_metadata5 = __commonJS({
     var gcpMetadata = require_src4();
     var google_auth_library_1 = require_src6();
     var util_1 = __require("util");
-    var readFile11 = (0, util_1.promisify)(fs89.readFile);
+    var readFile12 = (0, util_1.promisify)(fs89.readFile);
     function zoneFromQualifiedZone(qualified) {
       return qualified.split("/").pop();
     }
@@ -239460,7 +239480,7 @@ var require_metadata5 = __commonJS({
       const location = zoneFromQualifiedZone(qualifiedZone);
       let namespace = "";
       try {
-        namespace = await readFile11(exports2.KUBERNETES_NAMESPACE_ID_PATH, "utf8");
+        namespace = await readFile12(exports2.KUBERNETES_NAMESPACE_ID_PATH, "utf8");
       } catch (err2) {
       }
       return {
@@ -282254,9 +282274,23 @@ var init_thoughtUtils = __esm({
   }
 });
 
+// packages/core/dist/src/services/chatRecordingTypes.js
+var SESSION_FILE_PREFIX, MAX_TOOL_OUTPUT_SIZE;
+var init_chatRecordingTypes = __esm({
+  "packages/core/dist/src/services/chatRecordingTypes.js"() {
+    "use strict";
+    init_thoughtUtils();
+    SESSION_FILE_PREFIX = "session-";
+    MAX_TOOL_OUTPUT_SIZE = 50 * 1024;
+  }
+});
+
 // packages/core/dist/src/utils/sessionOperations.js
 import * as fs33 from "node:fs/promises";
 import path27 from "node:path";
+function isSessionIdRecord(record2) {
+  return record2 !== null && typeof record2 === "object" && "sessionId" in record2 && typeof record2.sessionId === "string";
+}
 function validateAndSanitizeSessionId(sessionId) {
   if (!sessionId || sessionId === "." || sessionId === "..") {
     throw new Error(`Invalid sessionId: ${sessionId}`);
@@ -282282,11 +282316,14 @@ async function deleteSessionArtifactsAsync(sessionId, tempDir) {
       if (err2.code !== "ENOENT")
         throw err2;
     });
-    const sessionDir = path27.join(tempDir, safeSessionId);
-    await fs33.rm(sessionDir, { recursive: true, force: true }).catch((err2) => {
-      if (err2.code !== "ENOENT")
-        throw err2;
-    });
+    const hasSeparator = safeSessionId.includes(path27.sep) || safeSessionId.includes("/") || safeSessionId.includes("\\");
+    if (!hasSeparator && !RESERVED_SESSION_DIR_NAMES.has(safeSessionId.toLowerCase())) {
+      const sessionDir = path27.join(tempDir, safeSessionId);
+      await fs33.rm(sessionDir, { recursive: true, force: true }).catch((err2) => {
+        if (err2.code !== "ENOENT")
+          throw err2;
+      });
+    }
   } catch (error2) {
     debugLogger.error(`Error deleting session artifacts for ${sessionId}:`, error2);
   }
@@ -282319,25 +282356,116 @@ async function deleteSubagentSessionDirAndArtifactsAsync(parentSessionId, chatsD
     });
   }
 }
-var LOGS_DIR, TOOL_OUTPUTS_DIR2;
+function deriveSessionShortId(sessionIdOrBasename) {
+  let shortId = sessionIdOrBasename;
+  if (sessionIdOrBasename.startsWith(SESSION_FILE_PREFIX)) {
+    const withoutExt = sessionIdOrBasename.replace(/\.jsonl?$/, "");
+    const parts2 = withoutExt.split("-");
+    shortId = parts2[parts2.length - 1];
+  } else if (sessionIdOrBasename.length >= 8) {
+    shortId = sessionIdOrBasename.slice(0, 8);
+  } else {
+    throw new Error("Invalid sessionId or basename provided for deletion");
+  }
+  if (shortId.length !== 8) {
+    throw new Error("Derived shortId must be exactly 8 characters");
+  }
+  return shortId;
+}
+async function getMatchingSessionFiles(chatsDir, shortId) {
+  const files = await fs33.readdir(chatsDir);
+  return files.filter((f4) => f4.startsWith(SESSION_FILE_PREFIX) && (f4.endsWith(`-${shortId}.json`) || f4.endsWith(`-${shortId}.jsonl`)));
+}
+async function deleteSessionFileAndArtifacts(chatsDir, file, tempDir) {
+  const filePath = path27.join(chatsDir, file);
+  let fullSessionId;
+  try {
+    const CHUNK_SIZE = 4096;
+    const buffer = Buffer.alloc(CHUNK_SIZE);
+    let firstLine;
+    let fd;
+    try {
+      fd = await fs33.open(filePath, "r");
+      const { bytesRead } = await fd.read(buffer, 0, CHUNK_SIZE, 0);
+      if (bytesRead > 0) {
+        const contentChunk = buffer.toString("utf8", 0, bytesRead);
+        const newlineIndex = contentChunk.indexOf("\n");
+        firstLine = newlineIndex !== -1 ? contentChunk.substring(0, newlineIndex) : contentChunk;
+        try {
+          const content = JSON.parse(firstLine);
+          if (isSessionIdRecord(content)) {
+            fullSessionId = content.sessionId;
+          }
+        } catch {
+        }
+      }
+    } finally {
+      if (fd !== void 0) {
+        await fd.close();
+      }
+    }
+    if (!fullSessionId) {
+      try {
+        const fileContent = await fs33.readFile(filePath, "utf8");
+        const parsed = JSON.parse(fileContent);
+        if (isSessionIdRecord(parsed)) {
+          fullSessionId = parsed.sessionId;
+        }
+      } catch {
+      }
+    }
+    if (fullSessionId) {
+      await deleteSessionArtifactsAsync(fullSessionId, tempDir);
+      await deleteSubagentSessionDirAndArtifactsAsync(fullSessionId, chatsDir, tempDir);
+    }
+  } catch (error2) {
+    if (!isNodeError(error2) || error2.code !== "ENOENT") {
+      debugLogger.error(`Error deleting artifacts for session file ${file}:`, error2);
+    }
+  } finally {
+    try {
+      await fs33.unlink(filePath);
+    } catch (error2) {
+      if (isNodeError(error2) && error2.code !== "ENOENT") {
+        debugLogger.error(`Error unlinking session file ${file}:`, error2);
+      }
+    }
+  }
+}
+async function deleteStoredSession(config3, sessionIdOrBasename) {
+  try {
+    const tempDir = config3.storage.getProjectTempDir();
+    const chatsDir = path27.join(tempDir, "chats");
+    const shortId = deriveSessionShortId(sessionIdOrBasename);
+    const chatsDirStat = await fs33.stat(chatsDir).catch(() => null);
+    if (!chatsDirStat || !chatsDirStat.isDirectory()) {
+      return;
+    }
+    const matchingFiles = await getMatchingSessionFiles(chatsDir, shortId);
+    for (const file of matchingFiles) {
+      await deleteSessionFileAndArtifacts(chatsDir, file, tempDir);
+    }
+  } catch (error2) {
+    debugLogger.error("Error deleting session file.", error2);
+    throw error2;
+  }
+}
+var LOGS_DIR, TOOL_OUTPUTS_DIR2, CHATS_DIR, RESERVED_SESSION_DIR_NAMES;
 var init_sessionOperations = __esm({
   "packages/core/dist/src/utils/sessionOperations.js"() {
     "use strict";
     init_fileUtils();
     init_debugLogger();
+    init_errors2();
+    init_chatRecordingTypes();
     LOGS_DIR = "logs";
     TOOL_OUTPUTS_DIR2 = "tool-outputs";
-  }
-});
-
-// packages/core/dist/src/services/chatRecordingTypes.js
-var SESSION_FILE_PREFIX, MAX_TOOL_OUTPUT_SIZE;
-var init_chatRecordingTypes = __esm({
-  "packages/core/dist/src/services/chatRecordingTypes.js"() {
-    "use strict";
-    init_thoughtUtils();
-    SESSION_FILE_PREFIX = "session-";
-    MAX_TOOL_OUTPUT_SIZE = 50 * 1024;
+    CHATS_DIR = "chats";
+    RESERVED_SESSION_DIR_NAMES = /* @__PURE__ */ new Set([
+      CHATS_DIR,
+      LOGS_DIR,
+      TOOL_OUTPUTS_DIR2
+    ]);
   }
 });
 
@@ -282370,9 +282498,6 @@ function isPartialMetadataRecord(record2) {
 function isTextPart(part) {
   return isStringProperty(part, "text");
 }
-function isSessionIdRecord(record2) {
-  return isStringProperty(record2, "sessionId");
-}
 async function loadConversationRecord(filePath, options) {
   if (!fs34.existsSync(filePath)) {
     return null;
@@ -282460,12 +282585,61 @@ async function loadConversationRecord(filePath, options) {
             isTrackingMemoryScratchpadFreshness = Boolean(record2.$set.memoryScratchpad);
             memoryScratchpadIsStale = false;
           }
+          if (hasProperty(record2.$set, "messages") && Array.isArray(record2.$set.messages)) {
+            messagesMap.clear();
+            if (options?.metadataOnly) {
+              messageIds.length = 0;
+              messageKinds.clear();
+            }
+            for (const msg of record2.$set.messages) {
+              if (isMessageRecord(msg)) {
+                const id = msg.id;
+                const isUser = msg.type === "user";
+                const isUserOrAssistant = msg.type === "user" || msg.type === "gemini";
+                if (options?.metadataOnly) {
+                  messageIds.push(id);
+                  messageKinds.set(id, { isUser, isUserOrAssistant });
+                } else {
+                  messagesMap.set(id, msg);
+                }
+                if (!firstUserMessageStr && isUser && msg.content && (Array.isArray(msg.content) || typeof msg.content === "string")) {
+                  if (Array.isArray(msg.content)) {
+                    firstUserMessageStr = msg.content.map((p3) => isTextPart(p3) ? p3.text : "").join("");
+                  } else {
+                    firstUserMessageStr = msg.content;
+                  }
+                }
+              }
+            }
+          }
           metadata2 = {
             ...metadata2,
             ...record2.$set
           };
         } else if (isPartialMetadataRecord(record2)) {
           metadata2 = { ...metadata2, ...record2 };
+          if (hasProperty(record2, "messages") && Array.isArray(record2.messages)) {
+            for (const msg of record2.messages) {
+              if (isMessageRecord(msg)) {
+                const id = msg.id;
+                const isUser = msg.type === "user";
+                const isUserOrAssistant = msg.type === "user" || msg.type === "gemini";
+                if (options?.metadataOnly) {
+                  messageIds.push(id);
+                  messageKinds.set(id, { isUser, isUserOrAssistant });
+                } else {
+                  messagesMap.set(id, msg);
+                }
+                if (!firstUserMessageStr && isUser && msg.content && (Array.isArray(msg.content) || typeof msg.content === "string")) {
+                  if (Array.isArray(msg.content)) {
+                    firstUserMessageStr = msg.content.map((p3) => isTextPart(p3) ? p3.text : "").join("");
+                  } else {
+                    firstUserMessageStr = msg.content;
+                  }
+                }
+              }
+            }
+          }
         }
       } catch {
       }
@@ -282473,9 +282647,8 @@ async function loadConversationRecord(filePath, options) {
     if (!metadata2.sessionId || !metadata2.projectHash) {
       return await parseLegacyRecordFallback(filePath, options);
     }
-    const metadataMessages = Array.isArray(metadata2.messages) ? metadata2.messages : [];
-    const loadedMessages = metadataMessages.length > 0 ? metadataMessages : Array.from(messagesMap.values());
-    const metadataFirstUserMessage = metadataMessages.find((message) => message.type === "user") ?? null;
+    const loadedMessages = Array.from(messagesMap.values());
+    const metadataFirstUserMessage = loadedMessages.find((message) => message.type === "user") ?? null;
     let fallbackFirstUserMessage = firstUserMessageStr;
     if (!fallbackFirstUserMessage && metadataFirstUserMessage) {
       const rawContent = metadataFirstUserMessage.content;
@@ -282497,11 +282670,11 @@ async function loadConversationRecord(filePath, options) {
       directories: metadata2.directories,
       kind: metadata2.kind,
       messages: options?.metadataOnly ? [] : loadedMessages,
-      messageCount: options?.metadataOnly ? metadataMessages.length || messageIds.length : loadedMessages.length,
-      userMessageCount: options?.metadataOnly && metadataMessages.length > 0 ? metadataMessages.filter((m3) => m3.type === "user").length : userMessageCount,
+      messageCount: options?.metadataOnly ? loadedMessages.length || messageIds.length : loadedMessages.length,
+      userMessageCount,
       memoryScratchpadIsStale: isTrackingMemoryScratchpadFreshness ? memoryScratchpadIsStale : void 0,
       firstUserMessage: fallbackFirstUserMessage,
-      hasUserOrAssistantMessage: options?.metadataOnly && metadataMessages.length > 0 ? metadataMessages.some((m3) => m3.type === "user" || m3.type === "gemini") : hasUserOrAssistant
+      hasUserOrAssistantMessage: hasUserOrAssistant
     };
   } catch (error2) {
     debugLogger.error("Error loading conversation record from JSONL:", error2);
@@ -282862,98 +283035,7 @@ var init_chatRecordingService = __esm({
        * @throws {Error} If shortId validation fails.
        */
       async deleteSession(sessionIdOrBasename) {
-        try {
-          const tempDir = this.context.config.storage.getProjectTempDir();
-          const chatsDir = path28.join(tempDir, "chats");
-          const shortId = this.deriveShortId(sessionIdOrBasename);
-          if (!await fs34.promises.stat(chatsDir).catch(() => null)) {
-            return;
-          }
-          const matchingFiles = await this.getMatchingSessionFiles(chatsDir, shortId);
-          for (const file of matchingFiles) {
-            await this.deleteSessionAndArtifacts(chatsDir, file, tempDir);
-          }
-        } catch (error2) {
-          debugLogger.error("Error deleting session file.", error2);
-          throw error2;
-        }
-      }
-      deriveShortId(sessionIdOrBasename) {
-        let shortId = sessionIdOrBasename;
-        if (sessionIdOrBasename.startsWith(SESSION_FILE_PREFIX)) {
-          const withoutExt = sessionIdOrBasename.replace(/\.jsonl?$/, "");
-          const parts2 = withoutExt.split("-");
-          shortId = parts2[parts2.length - 1];
-        } else if (sessionIdOrBasename.length >= 8) {
-          shortId = sessionIdOrBasename.slice(0, 8);
-        } else {
-          throw new Error("Invalid sessionId or basename provided for deletion");
-        }
-        if (shortId.length !== 8) {
-          throw new Error("Derived shortId must be exactly 8 characters");
-        }
-        return shortId;
-      }
-      async getMatchingSessionFiles(chatsDir, shortId) {
-        const files = await fs34.promises.readdir(chatsDir);
-        return files.filter((f4) => f4.startsWith(SESSION_FILE_PREFIX) && (f4.endsWith(`-${shortId}.json`) || f4.endsWith(`-${shortId}.jsonl`)));
-      }
-      /**
-       * Deletes a single session file and its associated logs, tool-outputs, and directory.
-       */
-      async deleteSessionAndArtifacts(chatsDir, file, tempDir) {
-        const filePath = path28.join(chatsDir, file);
-        let fullSessionId;
-        try {
-          const CHUNK_SIZE = 4096;
-          const buffer = Buffer.alloc(CHUNK_SIZE);
-          let firstLine;
-          let fd;
-          try {
-            fd = await fs34.promises.open(filePath, "r");
-            const { bytesRead } = await fd.read(buffer, 0, CHUNK_SIZE, 0);
-            if (bytesRead > 0) {
-              const contentChunk = buffer.toString("utf8", 0, bytesRead);
-              const newlineIndex = contentChunk.indexOf("\n");
-              firstLine = newlineIndex !== -1 ? contentChunk.substring(0, newlineIndex) : contentChunk;
-              try {
-                const content = JSON.parse(firstLine);
-                if (isSessionIdRecord(content)) {
-                  fullSessionId = content.sessionId;
-                }
-              } catch {
-              }
-            }
-          } finally {
-            if (fd !== void 0) {
-              await fd.close();
-            }
-          }
-          if (!fullSessionId) {
-            try {
-              const fileContent = await fs34.promises.readFile(filePath, "utf8");
-              const parsed = JSON.parse(fileContent);
-              if (isSessionIdRecord(parsed)) {
-                fullSessionId = parsed.sessionId;
-              }
-            } catch {
-            }
-          }
-          if (fullSessionId) {
-            await deleteSessionArtifactsAsync(fullSessionId, tempDir);
-            await deleteSubagentSessionDirAndArtifactsAsync(fullSessionId, chatsDir, tempDir);
-          }
-        } catch (error2) {
-          debugLogger.error(`Error deleting artifacts for session file ${file}:`, error2);
-        } finally {
-          try {
-            await fs34.promises.unlink(filePath);
-          } catch (error2) {
-            if (isNodeError(error2) && error2.code !== "ENOENT") {
-              debugLogger.error(`Error unlinking session file ${file}:`, error2);
-            }
-          }
-        }
+        return deleteStoredSession(this.context.config, sessionIdOrBasename);
       }
       /**
        * Asynchronously deletes the current session's chat file and tool outputs.
@@ -301850,15 +301932,15 @@ var require_windows = __commonJS({
       }
       return false;
     }
-    function checkStat(stat6, path98, options) {
-      if (!stat6.isSymbolicLink() && !stat6.isFile()) {
+    function checkStat(stat7, path98, options) {
+      if (!stat7.isSymbolicLink() && !stat7.isFile()) {
         return false;
       }
       return checkPathExt(path98, options);
     }
     function isexe(path98, options, cb) {
-      fs89.stat(path98, function(er2, stat6) {
-        cb(er2, er2 ? false : checkStat(stat6, path98, options));
+      fs89.stat(path98, function(er2, stat7) {
+        cb(er2, er2 ? false : checkStat(stat7, path98, options));
       });
     }
     function sync2(path98, options) {
@@ -301874,20 +301956,20 @@ var require_mode = __commonJS({
     isexe.sync = sync2;
     var fs89 = __require("fs");
     function isexe(path98, options, cb) {
-      fs89.stat(path98, function(er2, stat6) {
-        cb(er2, er2 ? false : checkStat(stat6, options));
+      fs89.stat(path98, function(er2, stat7) {
+        cb(er2, er2 ? false : checkStat(stat7, options));
       });
     }
     function sync2(path98, options) {
       return checkStat(fs89.statSync(path98), options);
     }
-    function checkStat(stat6, options) {
-      return stat6.isFile() && checkMode(stat6, options);
+    function checkStat(stat7, options) {
+      return stat7.isFile() && checkMode(stat7, options);
     }
-    function checkMode(stat6, options) {
-      var mod = stat6.mode;
-      var uid = stat6.uid;
-      var gid = stat6.gid;
+    function checkMode(stat7, options) {
+      var mod = stat7.mode;
+      var uid = stat7.uid;
+      var gid = stat7.gid;
       var myUid = options.uid !== void 0 ? options.uid : process.getuid && process.getuid();
       var myGid = options.gid !== void 0 ? options.gid : process.getgid && process.getgid();
       var u2 = parseInt("100", 8);
@@ -316002,7 +316084,7 @@ var require_snapshot_utils = __commonJS({
 var require_snapshot_recorder = __commonJS({
   "node_modules/undici/lib/mock/snapshot-recorder.js"(exports2, module2) {
     "use strict";
-    var { writeFile: writeFile9, readFile: readFile11, mkdir: mkdir11 } = __require("node:fs/promises");
+    var { writeFile: writeFile9, readFile: readFile12, mkdir: mkdir11 } = __require("node:fs/promises");
     var { dirname: dirname23, resolve: resolve23 } = __require("node:path");
     var { setTimeout: setTimeout2, clearTimeout: clearTimeout2 } = __require("node:timers");
     var { InvalidArgumentError, UndiciError } = require_errors7();
@@ -316204,7 +316286,7 @@ var require_snapshot_recorder = __commonJS({
           throw new InvalidArgumentError("Snapshot path is required");
         }
         try {
-          const data = await readFile11(resolve23(path98), "utf8");
+          const data = await readFile12(resolve23(path98), "utf8");
           const parsed = JSON.parse(data);
           if (Array.isArray(parsed)) {
             this.#snapshots.clear();
@@ -327566,9 +327648,9 @@ var require_picocolors = __commonJS({
     var argv = p3.argv || [];
     var env = p3.env || {};
     var isColorSupported = !(!!env.NO_COLOR || argv.includes("--no-color")) && (!!env.FORCE_COLOR || argv.includes("--color") || p3.platform === "win32" || (p3.stdout || {}).isTTY && env.TERM !== "dumb" || !!env.CI);
-    var formatter = (open4, close, replace = open4) => (input) => {
-      let string4 = "" + input, index = string4.indexOf(close, open4.length);
-      return ~index ? open4 + replaceClose(string4, close, replace, index) + close : open4 + string4 + close;
+    var formatter = (open5, close, replace = open5) => (input) => {
+      let string4 = "" + input, index = string4.indexOf(close, open5.length);
+      return ~index ? open5 + replaceClose(string4, close, replace, index) + close : open5 + string4 + close;
     };
     var replaceClose = (string4, close, replace, index) => {
       let result2 = "", cursor = 0;
@@ -332595,7 +332677,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.44.0-nightly.20260521.g57c42a5c4";
+    return "0.44.0";
   })();
   return versionPromise;
 }
@@ -333735,8 +333817,13 @@ async function handleFallback(config3, failedModel, authType, error2) {
       return void 0;
     return { service: availability, policy: failedPolicy };
   };
+  const activeModel = config3.getActiveModel();
   let fallbackModel;
   if (!candidates.length) {
+    if (failedModel !== activeModel && availability.snapshot(activeModel).available) {
+      applyAvailabilityTransition(getAvailabilityContext, failureKind);
+      return processIntent(config3, "retry_always", activeModel, failedModel);
+    }
     fallbackModel = failedModel;
   } else {
     const selection = availability.selectFirstAvailable(candidates.map((policy) => policy.model));
@@ -333748,9 +333835,10 @@ async function handleFallback(config3, failedModel, authType, error2) {
     }
     fallbackModel = selectedFallbackModel;
     const action = resolvePolicyAction(failureKind, selectedPolicy);
-    if (action === "silent") {
+    if (action === "silent" || fallbackModel === activeModel && failedModel !== activeModel) {
       applyAvailabilityTransition(getAvailabilityContext, failureKind);
-      return processIntent(config3, "retry_always", fallbackModel);
+      const overrideFailedModel = failedModel !== activeModel ? failedModel : void 0;
+      return processIntent(config3, "retry_always", fallbackModel, overrideFailedModel);
     }
     const recommendation = {
       ...selection,
@@ -333771,7 +333859,7 @@ async function handleFallback(config3, failedModel, authType, error2) {
     if (intent === "retry_always" || intent === "retry_once") {
       applyAvailabilityTransition(getAvailabilityContext, failureKind);
     }
-    return await processIntent(config3, intent, fallbackModel);
+    return await processIntent(config3, intent, fallbackModel, failedModel !== activeModel ? failedModel : void 0);
   } catch (handlerError) {
     debugLogger.error("Fallback handler failed:", handlerError);
     return null;
@@ -333788,10 +333876,10 @@ async function handleUpgrade() {
     debugLogger.warn("Failed to open browser automatically:", getErrorMessage(error2));
   }
 }
-async function processIntent(config3, intent, fallbackModel) {
+async function processIntent(config3, intent, fallbackModel, failedModel) {
   switch (intent) {
     case "retry_always":
-      config3.activateFallbackMode(fallbackModel);
+      config3.activateFallbackMode(fallbackModel, failedModel);
       return true;
     case "retry_once":
       return true;
@@ -339630,8 +339718,8 @@ var init_fileDiscoveryService = __esm({
         const paths = [];
         if (this.gitIgnoreFilter && this.defaultFilterFileOptions.respectGitIgnore) {
           const gitIgnorePath = path50.join(this.projectRoot, ".gitignore");
-          const stat6 = fs46.statSync(gitIgnorePath, { throwIfNoEntry: false });
-          if (stat6?.isFile()) {
+          const stat7 = fs46.statSync(gitIgnorePath, { throwIfNoEntry: false });
+          if (stat7?.isFile()) {
             paths.push(gitIgnorePath);
           }
         }
@@ -341750,10 +341838,10 @@ var init_esm7 = __esm({
           }
           return filtered.join("/");
         }).join("|");
-        const [open4, close] = set2.length > 1 ? ["(?:", ")"] : ["", ""];
-        re3 = "^" + open4 + re3 + close + "$";
+        const [open5, close] = set2.length > 1 ? ["(?:", ")"] : ["", ""];
+        re3 = "^" + open5 + re3 + close + "$";
         if (this.partial) {
-          re3 = "^(?:\\/|" + open4 + re3.slice(1, -1) + close + ")$";
+          re3 = "^(?:\\/|" + open5 + re3.slice(1, -1) + close + ")$";
         }
         if (this.negate)
           re3 = "^(?!" + re3 + ").+$";
@@ -347642,9 +347730,13 @@ async function resolveRipgrepPath() {
     const arch3 = os27.arch();
     const binName = `rg-${platform10}-${arch3}${platform10 === "win32" ? ".exe" : ""}`;
     const candidatePaths = [
-      // 1. SEA runtime layout: everything is flattened into the root dir
+      // 1. SEA runtime layout (Flattened): everything is in the root dir
+      path54.resolve(__dirname6, binName),
+      // 2. SEA runtime layout (Subdirectory): bundled into a vendor/ripgrep dir
       path54.resolve(__dirname6, "vendor/ripgrep", binName),
-      // 2. Dev/Dist layout: packages/core/dist/tools/ripGrep.js -> packages/core/vendor/ripgrep
+      // 3. Dev/Dist layout (Actual): dist/src/tools/ripGrep.js -> packages/core/vendor/ripgrep
+      path54.resolve(__dirname6, "../../../vendor/ripgrep", binName),
+      // 4. Dev/Dist layout (Assumed/Bundled): dist/tools/ripGrep.js -> packages/core/vendor/ripgrep
       path54.resolve(__dirname6, "../../vendor/ripgrep", binName)
     ];
     for (const candidate of candidatePaths) {
@@ -352934,6 +353026,17 @@ function injectUtf8CodepageForPty(command, shell, isWindows2, usingPty) {
   }
   return command;
 }
+function ensureHupIgnored(command, shell) {
+  if (shell !== "bash") {
+    return command;
+  }
+  const trimmed2 = command.trimStart();
+  const prefix = `${BASH_HUP_GUARD} `;
+  if (trimmed2.startsWith(prefix) || trimmed2 === BASH_HUP_GUARD) {
+    return command;
+  }
+  return `${BASH_HUP_GUARD} ${command}`;
+}
 var import_headless2, Terminal, MAX_CHILD_PROCESS_BUFFER_SIZE, GEMINI_CLI_IDENTIFICATION_ENV_VAR, GEMINI_CLI_IDENTIFICATION_ENV_VAR_VALUE, SCROLLBACK_LIMIT, BASH_SHOPT_OPTIONS, BASH_SHOPT_GUARD, findLastContentLine, getFullBufferText, writeBufferToLogStream, ShellExecutionService;
 var init_shellExecutionService = __esm({
   "packages/core/dist/src/services/shellExecutionService.js"() {
@@ -353123,8 +353226,9 @@ ${truncated}`;
           executable = "cmd.exe";
         }
         const resolvedExecutable = resolveExecutable(executable) ?? executable;
-        const guardedCommand = ensurePromptvarsDisabled(commandToExecute, shell);
-        const finalCommand = injectUtf8CodepageForPty(guardedCommand, shell, isWindows2, usingPty);
+        const promptGuarded = ensurePromptvarsDisabled(commandToExecute, shell);
+        const hupGuarded = !isWindows2 ? ensureHupIgnored(promptGuarded, shell) : promptGuarded;
+        const finalCommand = injectUtf8CodepageForPty(hupGuarded, shell, isWindows2, usingPty);
         const spawnArgs = [...argsPrefix, finalCommand];
         const gitConfigKeys = [];
         if (!isInteractive) {
@@ -353481,13 +353585,23 @@ ${truncated}`;
           const prepared = await this.prepareExecution(commandToExecute, cwd, shellExecutionConfig, true, true);
           cmdCleanup = prepared.cleanup;
           const { program: finalExecutable, args: finalArgs, env: finalEnv, cwd: finalCwd } = prepared;
+          const isWindowsPlatform = os29.platform() === "win32";
           const ptyProcess = ptyInfo.module.spawn(finalExecutable, finalArgs, {
             cwd: finalCwd,
             name: "xterm-256color",
             cols,
             rows,
             env: finalEnv,
-            handleFlowControl: true
+            // handleFlowControl intercepts XON/XOFF (Ctrl+S/Q) and prevents them
+            // from reaching the child.  On Windows, the flag can interfere with
+            // ConPTY's internal input routing and cause interactive TUI tools to
+            // miss key events, so we disable it there.
+            handleFlowControl: !isWindowsPlatform,
+            // On Windows, explicitly request ConPTY (introduced in Windows 10 1809).
+            // Without this, @lydell/node-pty may silently fall back to WinPTY, which
+            // has known incompatibilities with interactive Node.js TUI applications
+            // that rely on VT-sequence-based arrow-key navigation.
+            ...isWindowsPlatform ? { useConpty: true } : {}
           });
           spawnedPty = ptyProcess;
           const ptyPid = Number(ptyProcess.pid);
@@ -353523,6 +353637,9 @@ ${truncated}`;
               });
             },
             isActive: () => {
+              if (_ShellExecutionService.activePtys.has(ptyPid)) {
+                return true;
+              }
               try {
                 return process.kill(ptyPid, 0);
               } catch {
@@ -354146,15 +354263,16 @@ var init_shell = __esm({
         this.context = context2;
       }
       /**
-       * Wraps a command in a subshell `()` to capture background process IDs (PIDs) using pgrep.
-       * Uses newlines to prevent breaking heredocs or trailing comments.
+       * Wraps a command in a subshell to capture background process IDs (PIDs)
+       * using an EXIT trap. Uses newlines to prevent breaking heredocs or trailing
+       * comments.
        *
        * @param command The raw command string to execute.
        * @param tempFilePath Path to the temporary file where PIDs will be written.
        * @param isWindows Whether the current platform is Windows (if true, the command is returned as-is).
        * @returns The wrapped command string.
        */
-      wrapCommandForPgrep(command, tempFilePath, isWindows2) {
+      wrapCommandForBackgroundPIDs(command, tempFilePath, isWindows2) {
         if (isWindows2) {
           return command;
         }
@@ -354166,10 +354284,13 @@ var init_shell = __esm({
           trimmed2 += " ";
         }
         const escapedTempFilePath = escapeShellArg(tempFilePath, "bash");
-        return `(
+        return `_bgpids_file=${escapedTempFilePath}
+(
+  trap 'jobs -p > "$_bgpids_file"' EXIT
 ${trimmed2}
 )
-__code=$?; pgrep -g 0 >${escapedTempFilePath} 2>&1; exit $__code;`;
+__code=$?
+exit $__code`;
       }
       getContextualDetails() {
         let details = "";
@@ -354415,8 +354536,8 @@ __code=$?; pgrep -g 0 >${escapedTempFilePath} 2>&1; exit $__code;`;
         const onAbort = () => combinedController.abort();
         try {
           tempDir = fs53.mkdtempSync(path60.join(os31.tmpdir(), "gemini-shell-"));
-          tempFilePath = path60.join(tempDir, "pgrep.tmp");
-          const commandToExecute = this.wrapCommandForPgrep(strippedCommand, tempFilePath, isWindows2);
+          tempFilePath = path60.join(tempDir, "bgpids.tmp");
+          const commandToExecute = this.wrapCommandForBackgroundPIDs(strippedCommand, tempFilePath, isWindows2);
           const cwd = this.params.dir_path ? path60.resolve(this.context.config.getTargetDir(), this.params.dir_path) : this.context.config.getTargetDir();
           const validationError = this.context.config.validatePathAccess(cwd);
           if (validationError) {
@@ -354528,7 +354649,7 @@ __code=$?; pgrep -g 0 >${escapedTempFilePath} 2>&1; exit $__code;`;
             if (shouldUpdate && !this.params.is_background) {
               flushOutput();
             }
-          }, combinedController.signal, this.context.config.getEnableInteractiveShell(), {
+          }, combinedController.signal, this.context.config.isInteractiveShellEnabled(), {
             ...shellExecutionConfig,
             sessionId: this.context.config?.getSessionId?.() ?? "default",
             pager: "cat",
@@ -354590,14 +354711,14 @@ ${cumulativeOutput}`,
               tempFileExists = false;
             }
             if (tempFileExists) {
-              const pgrepContent = await fsPromises9.readFile(tempFilePath, "utf8");
-              const pgrepLines = pgrepContent.split("\n").map((line) => line.trim()).filter(Boolean);
-              for (const line of pgrepLines) {
+              const backgroundPIDContent = await fsPromises9.readFile(tempFilePath, "utf8");
+              const backgroundPIDLines = backgroundPIDContent.split("\n").map((line) => line.trim()).filter(Boolean);
+              for (const line of backgroundPIDLines) {
                 if (!/^\d+$/.test(line)) {
                   if (line.includes("sysmond service not found") || line.includes("Cannot get process list") || line.includes("sysmon request failed")) {
                     continue;
                   }
-                  debugLogger.error(`pgrep: ${line}`);
+                  debugLogger.error(`background pid output: ${line}`);
                 }
                 const pid2 = Number(line);
                 if (pid2 !== result2.pid) {
@@ -354606,7 +354727,7 @@ ${cumulativeOutput}`,
               }
             } else {
               if (!signal.aborted && !result2.backgrounded) {
-                debugLogger.error("missing pgrep output");
+                debugLogger.error("missing background pid output");
               }
             }
           }
@@ -354837,7 +354958,7 @@ ${result2.output}`;
       constructor(context2, messageBus) {
         void initializeShellParsers().catch(() => {
         });
-        const definition = getShellDefinition(context2.config.getEnableInteractiveShell(), context2.config.getEnableShellOutputEfficiency(), context2.config.getSandboxEnabled());
+        const definition = getShellDefinition(context2.config.isInteractiveShellEnabled(), context2.config.getEnableShellOutputEfficiency(), context2.config.getSandboxEnabled());
         super(
           _ShellTool.Name,
           "Shell",
@@ -354865,7 +354986,7 @@ ${result2.output}`;
         return new ShellToolInvocation(this.context, params, messageBus, _toolName, _toolDisplayName);
       }
       getSchema(modelId) {
-        const definition = getShellDefinition(this.context.config.getEnableInteractiveShell(), this.context.config.getEnableShellOutputEfficiency(), this.context.config.getSandboxEnabled());
+        const definition = getShellDefinition(this.context.config.isInteractiveShellEnabled(), this.context.config.getEnableShellOutputEfficiency(), this.context.config.getSandboxEnabled());
         return resolveToolDeclaration(definition, modelId);
       }
     };
@@ -361306,39 +361427,24 @@ var init_agentChatHistory = __esm({
     "use strict";
     AgentChatHistory = class {
       history = [];
-      listeners = /* @__PURE__ */ new Set();
       constructor(initialTurns = []) {
         this.history = [...initialTurns];
       }
-      subscribe(listener) {
-        this.listeners.add(listener);
-        listener({ type: "SYNC_FULL", payload: this.history });
-        return () => this.listeners.delete(listener);
-      }
-      notify(type2, payload) {
-        const event = { type: type2, payload };
-        for (const listener of this.listeners) {
-          listener(event);
-        }
-      }
       /**
        * Adds a new turn to the history.
        * Every turn must have a durable ID, usually provided by the ChatRecordingService.
        */
       push(turn) {
         this.history.push(turn);
-        this.notify("PUSH", [turn]);
       }
       /**
        * Overwrites the entire history with a new list of turns.
        */
-      set(turns, options = {}) {
+      set(turns) {
         this.history = [...turns];
-        this.notify(options.silent ? "SILENT_SYNC" : "SYNC_FULL", this.history);
       }
       clear() {
         this.history = [];
-        this.notify("CLEAR", []);
       }
       get() {
         return this.history;
@@ -361439,12 +361545,12 @@ function pairToolsAndEnforceSignatures(history, sentinels) {
         const nextTurn = work[i4 + 1];
         const missing = [];
         for (const call of callParts) {
-          const id = call.functionCall.id || "undefined";
+          const id = call.functionCall.id;
           const name3 = call.functionCall.name || "unknown";
           const hasResponse = nextTurn?.content.role === "user" && nextTurn.content.parts?.some((p3) => p3.functionResponse?.id === id && p3.functionResponse?.name === name3);
           if (!hasResponse) {
             debugLogger.log(`[HistoryHardener] Call id='${id}' (name='${name3}') has no matching response in next turn.`);
-            missing.push({ id, name: name3 });
+            missing.push({ id: id || "", name: name3 });
           }
         }
         if (missing.length > 0) {
@@ -361464,7 +361570,7 @@ function pairToolsAndEnforceSignatures(history, sentinels) {
             targetUserTurn.content.parts.push({
               functionResponse: {
                 name: m3.name,
-                id: m3.id,
+                id: m3.id || void 0,
                 response: {
                   error: sentinels.lostToolResponse
                 }
@@ -361589,10 +361695,13 @@ function enforceRoleConstraints(history, sentinels) {
 function scrubHistory(history) {
   return history.map((turn) => ({
     id: turn.id,
-    content: {
-      role: turn.content.role,
-      parts: (turn.content.parts || []).map((p3) => scrubPart(p3))
-    }
+    content: scrubContents([turn.content])[0]
+  }));
+}
+function scrubContents(contents) {
+  return contents.map((content) => ({
+    role: content.role,
+    parts: (content.parts || []).map((p3) => scrubPart(p3))
   }));
 }
 function isThoughtPart(part) {
@@ -361668,6 +361777,59 @@ var init_geminiRequest = __esm({
   }
 });
 
+// packages/core/dist/src/utils/sessionUtils.js
+function ensureStableToolIds(history) {
+  for (let i4 = 0; i4 < history.length; i4++) {
+    const turn = history[i4];
+    const parts2 = turn.content.parts || [];
+    for (let partIdx = 0; partIdx < parts2.length; partIdx++) {
+      const part = parts2[partIdx];
+      if (part.functionCall && !part.functionCall.id) {
+        const name3 = part.functionCall.name;
+        const nextTurn = history[i4 + 1];
+        let pairedId;
+        if (nextTurn?.content.role === "user") {
+          const matchingResp = nextTurn.content.parts?.find((p3) => p3.functionResponse && p3.functionResponse.name === name3 && !p3.functionResponse.id);
+          if (matchingResp) {
+            pairedId = `synth_${name3}_${deriveStableId([turn.id, i4.toString(), partIdx.toString()])}`;
+            part.functionCall.id = pairedId;
+            matchingResp.functionResponse.id = pairedId;
+          }
+        }
+        if (!part.functionCall.id) {
+          part.functionCall.id = `synth_${name3}_${deriveStableId([turn.id, i4.toString(), partIdx.toString()])}`;
+        }
+      }
+      if (part.functionResponse && !part.functionResponse.id) {
+        const name3 = part.functionResponse.name;
+        const prevTurn = history[i4 - 1];
+        if (prevTurn?.content.role === "model") {
+          const matchingCall = prevTurn.content.parts?.find((p3) => p3.functionCall && p3.functionCall.name === name3 && !p3.functionCall.id);
+          if (matchingCall) {
+            const pairedId = `synth_${name3}_${deriveStableId([prevTurn.id, (i4 - 1).toString(), partIdx.toString()])}`;
+            matchingCall.functionCall.id = pairedId;
+            part.functionResponse.id = pairedId;
+          }
+        }
+        if (!part.functionResponse.id) {
+          part.functionResponse.id = `synth_orph_${name3}_${deriveStableId([turn.id, i4.toString(), partIdx.toString()])}`;
+        }
+      }
+    }
+  }
+}
+var init_sessionUtils = __esm({
+  "packages/core/dist/src/utils/sessionUtils.js"() {
+    "use strict";
+    init_node();
+    init_chatRecordingService();
+    init_geminiRequest();
+    init_geminiRequest();
+    init_agentChatHistory();
+    init_cryptoUtils();
+  }
+});
+
 // packages/core/dist/src/core/geminiChat.js
 import { randomUUID as randomUUID7 } from "node:crypto";
 function isIndexedPart(part) {
@@ -361792,12 +361954,11 @@ var init_geminiChat = __esm({
     init_handler();
     init_messageInspectors();
     init_historyHardening();
-    init_geminiRequest();
+    init_sessionUtils();
     init_generateContentResponseUtilities();
     init_tokenCalculation();
     init_policyHelpers();
     init_events();
-    init_debugLogger();
     (function(StreamEventType2) {
       StreamEventType2["CHUNK"] = "chunk";
       StreamEventType2["RETRY"] = "retry";
@@ -361873,6 +362034,7 @@ var init_geminiChat = __esm({
           initialHistory = [];
         }
         this.agentHistory = new AgentChatHistory(initialHistory);
+        ensureStableToolIds(this.agentHistory.get());
         this.chatRecordingService = new ChatRecordingService(context2);
         this.lastPromptTokenCount = estimateTokenCountSync(this.agentHistory.flatMap((c4) => c4.content.parts || []));
       }
@@ -361915,7 +362077,7 @@ var init_geminiChat = __esm({
        * }
        * ```
        */
-      async sendMessageStream(modelConfigKey, message, prompt_id, signal, role, displayContent) {
+      async sendMessageStream(modelConfigKey, message, prompt_id, signal, role, displayContent, apiHistoryOverride) {
         await this.sendPromise;
         let streamDoneResolver;
         const streamDonePromise = new Promise((resolve23) => {
@@ -361924,6 +362086,7 @@ var init_geminiChat = __esm({
         this.sendPromise = streamDonePromise;
         let userContent = createUserContent(message);
         const { model } = this.context.config.modelConfigService.getResolvedConfig(modelConfigKey);
+        const isContextManagementEnabled = this.context.config.isContextManagementEnabled();
         if (!isFunctionResponse(userContent)) {
           const userMessageParts = userContent.parts || [];
           const userMessageContent = partListUnionToString(userMessageParts);
@@ -361935,46 +362098,68 @@ var init_geminiChat = __esm({
               finalDisplayContent = displayParts;
             }
           }
-          const id = this.chatRecordingService.recordMessage({
-            model,
-            type: "user",
-            content: userMessageParts,
-            displayContent: finalDisplayContent
-          });
-          this.agentHistory.push({ id, content: userContent });
+          if (!isContextManagementEnabled) {
+            const id = this.chatRecordingService.recordMessage({
+              model,
+              type: "user",
+              content: userMessageParts,
+              displayContent: finalDisplayContent
+            });
+            this.agentHistory.push({ id, content: userContent });
+          } else {
+            const history = this.agentHistory.get();
+            const lastTurn = history[history.length - 1];
+            if (!lastTurn || partListUnionToString(lastTurn.content.parts || []) !== userMessageContent) {
+              const id = this.chatRecordingService.recordMessage({
+                model,
+                type: "user",
+                content: userMessageParts,
+                displayContent: finalDisplayContent
+              });
+              this.agentHistory.push({ id, content: userContent });
+            }
+          }
         } else {
           const id = this.chatRecordingService.recordSyntheticMessage("user", userContent.parts || []);
-          const binaryParts = this.extractBinaryInjections(userContent.parts);
-          if (binaryParts) {
-            this.agentHistory.push({ id, content: userContent });
-            const modelId = this.chatRecordingService.recordSyntheticMessage("gemini", [
-              {
-                text: "Binary content received. Proceeding with analysis.",
-                thought: true,
-                thoughtSignature: SYNTHETIC_THOUGHT_SIGNATURE2
-              }
-            ]);
-            this.agentHistory.push({
-              id: modelId,
-              content: {
-                role: "model",
-                parts: [
-                  {
-                    text: "Binary content received. Proceeding with analysis.",
-                    thought: true,
-                    thoughtSignature: SYNTHETIC_THOUGHT_SIGNATURE2
-                  }
-                ]
-              }
-            });
-            const binaryId = this.chatRecordingService.recordSyntheticMessage("info", binaryParts);
-            userContent = {
-              role: "user",
-              parts: binaryParts
-            };
-            this.agentHistory.push({ id: binaryId, content: userContent });
+          if (!isContextManagementEnabled) {
+            const binaryParts = this.extractBinaryInjections(userContent.parts);
+            if (binaryParts) {
+              this.agentHistory.push({ id, content: userContent });
+              const modelId = this.chatRecordingService.recordSyntheticMessage("gemini", [
+                {
+                  text: "Binary content received. Proceeding with analysis.",
+                  thought: true,
+                  thoughtSignature: SYNTHETIC_THOUGHT_SIGNATURE2
+                }
+              ]);
+              this.agentHistory.push({
+                id: modelId,
+                content: {
+                  role: "model",
+                  parts: [
+                    {
+                      text: "Binary content received. Proceeding with analysis.",
+                      thought: true,
+                      thoughtSignature: SYNTHETIC_THOUGHT_SIGNATURE2
+                    }
+                  ]
+                }
+              });
+              const binaryId = this.chatRecordingService.recordSyntheticMessage("info", binaryParts);
+              userContent = {
+                role: "user",
+                parts: binaryParts
+              };
+              this.agentHistory.push({ id: binaryId, content: userContent });
+            } else {
+              this.agentHistory.push({ id, content: userContent });
+            }
           } else {
-            this.agentHistory.push({ id, content: userContent });
+            const history = this.agentHistory.get();
+            const lastTurn = history[history.length - 1];
+            if (!lastTurn || partListUnionToString(lastTurn.content.parts || []) !== partListUnionToString(userContent.parts || [])) {
+              this.agentHistory.push({ id, content: userContent });
+            }
           }
         }
         const requestHistory = this.getHistoryTurns(true);
@@ -361989,7 +362174,7 @@ var init_geminiChat = __esm({
                 }
                 const currentConfigKey = attempt > 0 ? { ...modelConfigKey, isRetry: true } : modelConfigKey;
                 isConnectionPhase = true;
-                const stream2 = await this.makeApiCallAndProcessStream(currentConfigKey, requestHistory, prompt_id, signal, role);
+                const stream2 = await this.makeApiCallAndProcessStream(currentConfigKey, requestHistory, prompt_id, signal, role, apiHistoryOverride);
                 isConnectionPhase = false;
                 for await (const chunk of stream2) {
                   yield { type: StreamEventType.CHUNK, value: chunk };
@@ -362072,11 +362257,11 @@ var init_geminiChat = __esm({
         }
         return binaryParts.length > 0 ? binaryParts : void 0;
       }
-      async makeApiCallAndProcessStream(modelConfigKey, requestHistory, prompt_id, abortSignal, role) {
+      async makeApiCallAndProcessStream(modelConfigKey, requestHistory, prompt_id, abortSignal, role, apiHistoryOverride) {
         const scrubbedHistory = this.context.config.isContextManagementEnabled() ? scrubHistory([...requestHistory]) : [...requestHistory];
         const scrubbedContents = scrubbedHistory.map((h3) => h3.content);
-        const contentsForPreviewModel = this.ensureActiveLoopHasThoughtSignatures(scrubbedContents);
-        const requestContents = scrubbedContents;
+        const requestContents = apiHistoryOverride ? scrubContents(apiHistoryOverride) : scrubbedContents;
+        const contentsForPreviewModel = this.ensureActiveLoopHasThoughtSignatures(requestContents);
         const { model: availabilityFinalModel, config: newAvailabilityConfig, maxAttempts: availabilityMaxAttempts } = applyModelSelection(this.context.config, modelConfigKey);
         let lastModelToUse = availabilityFinalModel;
         let currentGenerateContentConfig = newAvailabilityConfig;
@@ -362246,8 +362431,9 @@ var init_geminiChat = __esm({
           const id = this.chatRecordingService.recordSyntheticMessage(content.role === "user" ? "user" : "gemini", content.parts || []);
           this.agentHistory.push({ id, content });
         }
+        ensureStableToolIds(this.agentHistory.get());
       }
-      setHistory(history, options = {}) {
+      setHistory(history) {
         const wrappedHistory = history.map((item) => {
           if ("id" in item && "content" in item) {
             return item;
@@ -362255,7 +362441,8 @@ var init_geminiChat = __esm({
           const id = this.chatRecordingService.recordSyntheticMessage(item.role === "user" ? "user" : "gemini", item.parts || []);
           return { id, content: item };
         });
-        this.agentHistory.set(wrappedHistory, options);
+        ensureStableToolIds(wrappedHistory);
+        this.agentHistory.set(wrappedHistory);
         this.lastPromptTokenCount = estimateTokenCountSync(this.agentHistory.flatMap((c4) => c4.content.parts || []));
         this.chatRecordingService.updateMessagesFromHistory(this.agentHistory.get());
       }
@@ -362368,7 +362555,6 @@ This error was probably caused by cyclic schema references in one of the followi
                   if (!id2) {
                     id2 = `synth_${this.context.promptId}_${Date.now()}_${this.callCounter++}`;
                     callIndexToId.set(globalIndex, id2);
-                    debugLogger.log(`[GeminiChat] Assigned synthetic ID: ${id2} to tool at index ${globalIndex}: ${fnCall.name}`);
                   }
                   fnCall.id = id2;
                 }
@@ -362439,7 +362625,6 @@ This error was probably caused by cyclic schema references in one of the followi
         const finalFunctionCalls = this.context.config.isContextManagementEnabled() ? Array.from(finalFunctionCallsMap.values()) : legacyFunctionCalls;
         let currentCallSourceIndex = -1;
         if (this.context.config.isContextManagementEnabled()) {
-          debugLogger.log(`[GeminiChat] Starting consolidation for ${modelResponseParts.length} raw parts and ${finalFunctionCalls.length} assembled function calls.`);
           for (const part of modelResponseParts) {
             if (part.functionCall) {
               const partIndex = isIndexedPart(part) ? part.callIndex : void 0;
@@ -362707,9 +362892,10 @@ var init_turn = __esm({
         this.prompt_id = prompt_id;
       }
       // The run method yields simpler events suitable for server logic
-      async *run(modelConfigKey, req, signal, displayContent, role = LlmRole.MAIN) {
+      async *run(modelConfigKey, req, signal, options = {}) {
+        const { displayContent, role = LlmRole.MAIN, apiHistoryOverride } = options;
         try {
-          const responseStream = await this.chat.sendMessageStream(modelConfigKey, req, this.prompt_id, signal, role, displayContent);
+          const responseStream = await this.chat.sendMessageStream(modelConfigKey, req, this.prompt_id, signal, role, displayContent, apiHistoryOverride);
           for await (const streamEvent of responseStream) {
             if (signal?.aborted) {
               yield { type: GeminiEventType.UserCancelled };
@@ -364719,12 +364905,23 @@ ${environmentMemory}
   return initialParts;
 }
 async function getInitialChatHistory(config3, extraHistory) {
+  const envId = deriveStableId(["environment-context"]);
+  if (extraHistory && extraHistory.length > 0) {
+    const first2 = extraHistory[0];
+    const firstId = "id" in first2 ? first2.id : void 0;
+    if (firstId === envId) {
+      return [...extraHistory];
+    }
+  }
   const envParts = await getEnvironmentContext(config3);
   const envContextString = envParts.map((part) => part.text || "").join("\n\n");
   return [
     {
-      role: "user",
-      parts: [{ text: envContextString }]
+      id: deriveStableId(["environment-context"]),
+      content: {
+        role: "user",
+        parts: [{ text: envContextString }]
+      }
     },
     ...extraHistory ?? []
   ];
@@ -364733,6 +364930,7 @@ var init_environmentContext = __esm({
   "packages/core/dist/src/utils/environmentContext.js"() {
     "use strict";
     init_getFolderStructure();
+    init_cryptoUtils();
   }
 });
 
@@ -374127,6 +374325,9 @@ var init_modelConfigService = __esm({
       registerRuntimeModelOverride(override) {
         this.runtimeOverrides.push(override);
       }
+      clearRuntimeOverrides() {
+        this.runtimeOverrides.length = 0;
+      }
       /**
        * Resolves a model configuration by merging settings from aliases and applying overrides.
        *
@@ -377890,6 +378091,9 @@ function createStateSnapshotProcessor(id, env, options) {
           const targetIds = new Set(targets.map((t4) => t4.id));
           const isValid2 = consumedIds.every((id2) => targetIds.has(id2));
           if (isValid2) {
+            env.tracer.logEvent("StateSnapshotProcessor", "Snapshot Spliced from Inbox", {
+              snapshotText: newText
+            });
             debugLogger.log(`[StateSnapshotProcessor] Successfully spliced PROPOSED_SNAPSHOT from Inbox into Graph. Consumed ${consumedIds.length} nodes.`);
             const newId = deriveStableId(consumedIds);
             const snapshotNode = {
@@ -377952,6 +378156,9 @@ function createStateSnapshotProcessor(id, env, options) {
           maxSummaryTurns: options.maxSummaryTurns,
           maxStateTokens: options.maxStateTokens
         });
+        env.tracer.logEvent("StateSnapshotProcessor", "Snapshot Synthesized", {
+          snapshotText
+        });
         const consumedIds = nodesToSummarize.map((n2) => n2.id);
         if (baselineIdToConsume && !consumedIds.includes(baselineIdToConsume)) {
           consumedIds.push(baselineIdToConsume);
@@ -378054,6 +378261,9 @@ function createStateSnapshotAsyncProcessor(id, env, options) {
           maxSummaryTurns: options.maxSummaryTurns,
           maxStateTokens: options.maxStateTokens
         });
+        env.tracer.logEvent("StateSnapshotAsyncProcessor", "Snapshot Synthesized", {
+          snapshotText
+        });
         const newConsumedIds = [
           ...previousConsumedIds,
           ...targets.map((t4) => t4.id)
@@ -378189,8 +378399,8 @@ var init_profiles = __esm({
       name: "Stress Test",
       config: {
         budget: {
-          retainedTokens: 4e3,
-          maxTokens: 1e4
+          retainedTokens: 1500,
+          maxTokens: 5e3
         },
         processorOptions: {
           ToolMasking: {
@@ -378482,49 +378692,118 @@ var init_inbox = __esm({
 });
 
 // packages/core/dist/src/context/graph/toGraph.js
+import { createHash as createHash15 } from "node:crypto";
 function isTextPart2(part) {
   return typeof part.text === "string";
 }
+function isInlineDataPart(part) {
+  return typeof part.inlineData === "object" && part.inlineData !== null && typeof part.inlineData.data === "string";
+}
+function isFileDataPart(part) {
+  return typeof part.fileData === "object" && part.fileData !== null && typeof part.fileData.fileUri === "string";
+}
 function isFunctionCallPart(part) {
   return typeof part.functionCall === "object" && part.functionCall !== null && typeof part.functionCall.name === "string";
 }
 function isFunctionResponsePart(part) {
   return typeof part.functionResponse === "object" && part.functionResponse !== null && typeof part.functionResponse.name === "string";
 }
-var ContextGraphBuilder;
+function isExecutableCodePart(part) {
+  return typeof part.executableCode === "object" && part.executableCode !== null && typeof part.executableCode.code === "string" && typeof part.executableCode.language === "string";
+}
+function isCodeExecutionResultPart(part) {
+  return typeof part.codeExecutionResult === "object" && part.codeExecutionResult !== null && typeof part.codeExecutionResult.output === "string" && typeof part.codeExecutionResult.outcome === "string";
+}
+function getStableId(obj, idService, turnSalt = "", partIdx = 0) {
+  let id = idService.get(obj);
+  if (id)
+    return id;
+  const cachedHash = PART_HASH_CACHE.get(obj);
+  if (cachedHash) {
+    id = `${cachedHash}_${turnSalt}_${partIdx}`;
+    idService.set(obj, id);
+    return id;
+  }
+  const part = obj;
+  let contentHash;
+  if (isTextPart2(part)) {
+    contentHash = createHash15("sha256").update(part.text).digest("hex");
+    id = `text_${contentHash}_${turnSalt}_${partIdx}`;
+  } else if (isInlineDataPart(part)) {
+    contentHash = createHash15("sha256").update(part.inlineData.data).digest("hex");
+    id = `media_${contentHash}_${turnSalt}_${partIdx}`;
+  } else if (isFileDataPart(part)) {
+    contentHash = createHash15("sha256").update(part.fileData.fileUri).digest("hex");
+    id = `file_${contentHash}_${turnSalt}_${partIdx}`;
+  } else if (isFunctionCallPart(part)) {
+    if (part.functionCall.id) {
+      id = `call_${part.functionCall.id}`;
+    } else {
+      contentHash = createHash15("sha256").update(`call:${part.functionCall.name}:${JSON.stringify(part.functionCall.args)}`).digest("hex");
+      id = `call_h_${contentHash}_${turnSalt}_${partIdx}`;
+    }
+  } else if (isFunctionResponsePart(part)) {
+    if (part.functionResponse.id) {
+      id = `resp_${part.functionResponse.id}`;
+    } else {
+      contentHash = createHash15("sha256").update(`resp:${part.functionResponse.name}:${JSON.stringify(part.functionResponse.response)}`).digest("hex");
+      id = `resp_h_${contentHash}_${turnSalt}_${partIdx}`;
+    }
+  } else if (isExecutableCodePart(part)) {
+    contentHash = createHash15("sha256").update(`exec:${part.executableCode.language}:${part.executableCode.code}`).digest("hex");
+    id = `exec_${contentHash}_${turnSalt}_${partIdx}`;
+  } else if (isCodeExecutionResultPart(part)) {
+    contentHash = createHash15("sha256").update(`result:${part.codeExecutionResult.outcome}:${part.codeExecutionResult.output}`).digest("hex");
+    id = `result_${contentHash}_${turnSalt}_${partIdx}`;
+  }
+  if (contentHash) {
+    PART_HASH_CACHE.set(obj, contentHash);
+  }
+  if (!id) {
+    if (turnSalt && partIdx === -1) {
+      id = `turn_${turnSalt}`;
+    } else {
+      id = `${turnSalt}_f_${partIdx}`;
+    }
+  }
+  idService.set(obj, id);
+  return id;
+}
+var PART_HASH_CACHE, ContextGraphBuilder;
 var init_toGraph = __esm({
   "packages/core/dist/src/context/graph/toGraph.js"() {
     "use strict";
     init_types15();
     init_debugLogger();
     init_snapshotGenerator();
+    init_cryptoUtils();
+    init_sessionUtils();
+    PART_HASH_CACHE = /* @__PURE__ */ new WeakMap();
     ContextGraphBuilder = class {
       idService;
       constructor(idService) {
         this.idService = idService;
       }
       processHistory(history) {
+        ensureStableToolIds(history);
         const nodes = [];
         for (let turnIdx = 0; turnIdx < history.length; turnIdx++) {
           const turn = history[turnIdx];
           const msg = turn.content;
           if (!msg.parts)
             continue;
-          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")) {
-              debugLogger.log("[ContextGraphBuilder] Skipping legacy environment header turn from graph.");
-              continue;
-            }
-          }
           const turnSalt = turn.id;
-          const turnId = `turn_${turnSalt}`;
+          const turnId = turnSalt.startsWith("turn_") ? turnSalt : `turn_${turnSalt}`;
           if (msg.role === "user") {
             for (let partIdx = 0; partIdx < msg.parts.length; partIdx++) {
               const part = msg.parts[partIdx];
-              const apiId = isFunctionResponsePart(part) && typeof part.functionResponse.id === "string" ? part.functionResponse.id : isFunctionCallPart(part) && typeof part.functionCall.id === "string" ? part.functionCall.id : void 0;
+              const envTurnId = deriveStableId(["environment-context"]);
+              if (isTextPart2(part) && part.text.trim().startsWith("<session_context>") && turnSalt !== envTurnId) {
+                debugLogger.log("[ContextGraphBuilder] Skipping legacy environment header turn from graph.");
+                continue;
+              }
               const isSnapshot = isTextPart2(part) && isSnapshotState(part.text);
-              const id = apiId ? `${apiId}_${turnSalt}_${partIdx}` : `${turnSalt}_${partIdx}`;
+              const id = getStableId(part, this.idService, turnSalt, partIdx);
               const node = {
                 id,
                 timestamp: Date.now(),
@@ -378534,13 +378813,11 @@ var init_toGraph = __esm({
                 turnId
               };
               nodes.push(node);
-              this.idService.set(part, id);
             }
           } else if (msg.role === "model") {
             for (let partIdx = 0; partIdx < msg.parts.length; partIdx++) {
               const part = msg.parts[partIdx];
-              const apiId = isFunctionCallPart(part) && typeof part.functionCall.id === "string" ? part.functionCall.id : void 0;
-              const id = apiId ? `${apiId}_${turnSalt}_${partIdx}` : `${turnSalt}_${partIdx}`;
+              const id = getStableId(part, this.idService, turnSalt, partIdx);
               const node = {
                 id,
                 timestamp: Date.now(),
@@ -378550,7 +378827,6 @@ var init_toGraph = __esm({
                 turnId
               };
               nodes.push(node);
-              this.idService.set(part, id);
             }
           }
         }
@@ -378632,8 +378908,8 @@ var init_mapper = __esm({
       constructor() {
         this.builder = new ContextGraphBuilder(this.idService);
       }
-      applyEvent(event) {
-        return this.builder.processHistory(event.payload);
+      sync(turns) {
+        return this.builder.processHistory(turns);
       }
       fromGraph(nodes) {
         return fromGraph(nodes, this.idService);
@@ -378933,20 +379209,17 @@ var init_orchestrator = __esm({
       pipelines;
       asyncPipelines;
       env;
-      eventBus;
       tracer;
       activeTimers = [];
       pendingPipelines = /* @__PURE__ */ new Map();
       pipelineMutex = /* @__PURE__ */ new Map();
       pipelineScheduled = /* @__PURE__ */ new Set();
       nodeProvider;
-      constructor(pipelines, asyncPipelines, env, eventBus, tracer) {
+      constructor(pipelines, asyncPipelines, env, tracer) {
         this.pipelines = pipelines;
         this.asyncPipelines = asyncPipelines;
         this.env = env;
-        this.eventBus = eventBus;
         this.tracer = tracer;
-        this.setupTriggers();
       }
       /**
        * Sets the provider for the latest live nodes.
@@ -378969,105 +379242,6 @@ var init_orchestrator = __esm({
       isNodeAllowed(node, triggerTargets, protectedTurnIds = /* @__PURE__ */ new Set()) {
         return triggerTargets.has(node.id) && !protectedTurnIds.has(node.id) && !protectedTurnIds.has(node.turnId);
       }
-      setupTriggers() {
-        const bindTriggers = (pipelines, executeFn) => {
-          for (const pipeline3 of pipelines) {
-            for (const trigger of pipeline3.triggers) {
-              if (typeof trigger === "object" && trigger.type === "timer") {
-                const timer = setInterval(() => {
-                }, trigger.intervalMs);
-                this.activeTimers.push(timer);
-              } else if (trigger === "retained_exceeded" || trigger === "nodes_aged_out") {
-                this.eventBus.onConsolidationNeeded((event) => {
-                  void executeFn(pipeline3, event.nodes, event.targetNodeIds, /* @__PURE__ */ new Set());
-                });
-              } else if (trigger === "new_message" || trigger === "nodes_added") {
-                this.eventBus.onChunkReceived((event) => {
-                  void executeFn(pipeline3, event.nodes, event.targetNodeIds, /* @__PURE__ */ new Set());
-                });
-              }
-            }
-          }
-        };
-        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;
-              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(`Sync 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);
-            }
-          });
-        };
-        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) {
-          clearInterval(timer);
-        }
-      }
       async executeTriggerSync(trigger, nodes, triggerTargets, protectedTurnIds = /* @__PURE__ */ new Set()) {
         this.tracer.logEvent("Orchestrator", "Strategy Intent", {
           trigger,
@@ -379107,117 +379281,57 @@ var init_orchestrator = __esm({
             }
           }
         }
+        void this.executeTriggerAsync(trigger, currentBuffer.nodes, triggerTargets);
         this.env.inbox.drainConsumed(inboxSnapshot.getConsumedIds());
         return currentBuffer.nodes;
       }
-      async executePipelineAsync(pipeline3, nodes, triggerTargets, protectedTurnIds = /* @__PURE__ */ new Set()) {
-        this.tracer.logEvent("Orchestrator", `Triggering async pipeline: ${pipeline3.name}`, {
-          triggerTargets: triggerTargets.size,
-          totalNodes: nodes.length
-        });
-        if (!nodes || nodes.length === 0)
-          return;
-        let currentBuffer = ContextWorkingBufferImpl.initialize(nodes);
-        const inboxSnapshot = new InboxSnapshotImpl(this.env.inbox.getMessages() || []);
-        for (const processor of pipeline3.processors) {
-          try {
-            this.tracer.logEvent("Orchestrator", `Executing processor: ${processor.id} (async)`, { nodeCountBefore: currentBuffer.nodes.length });
-            const allowedTargets = currentBuffer.nodes.filter((n2) => this.isNodeAllowed(n2, triggerTargets, protectedTurnIds));
-            const returnedNodes = await processor.process({
-              buffer: currentBuffer,
-              targets: allowedTargets,
-              inbox: inboxSnapshot
-            });
-            currentBuffer = currentBuffer.applyProcessorResult(processor.id, allowedTargets, returnedNodes);
-            const addedNodes = returnedNodes.filter((n2) => !allowedTargets.some((at2) => at2.id === n2.id));
-            const removedNodes = allowedTargets.filter((at2) => !returnedNodes.some((n2) => n2.id === at2.id));
-            this.tracer.logEvent("Orchestrator", "Transformation Lineage (Async)", {
-              processorId: processor.id,
-              inputNodeCount: allowedTargets.length,
-              outputNodeCount: returnedNodes.length,
-              removedNodeIds: removedNodes.map((n2) => n2.id),
-              addedNodes: addedNodes.map((n2) => ({
-                id: n2.id,
-                replacesId: n2.replacesId,
-                abstractsIds: n2.abstractsIds,
-                approxTokens: this.env.tokenCalculator.calculateConcreteListTokens([
-                  n2
-                ])
-              }))
-            });
-            this.eventBus.emitProcessorResult({
-              processorId: processor.id,
-              targets: allowedTargets,
-              returnedNodes
-            });
-          } catch (error2) {
-            debugLogger.error(`Pipeline ${pipeline3.name} failed async at ${processor.id}:`, error2);
-            return;
-          }
+      async executeTriggerAsync(trigger, nodes, triggerTargets) {
+        const asyncPipelines = this.asyncPipelines.filter((p3) => p3.triggers.includes(trigger));
+        for (const pipeline3 of asyncPipelines) {
+          void this.handleAsyncExecution(pipeline3, nodes, triggerTargets);
         }
-        this.env.inbox.drainConsumed(inboxSnapshot.getConsumedIds());
       }
-    };
-  }
-});
-
-// packages/core/dist/src/context/historyObserver.js
-var HistoryObserver;
-var init_historyObserver = __esm({
-  "packages/core/dist/src/context/historyObserver.js"() {
-    "use strict";
-    HistoryObserver = class {
-      chatHistory;
-      eventBus;
-      tracer;
-      graphMapper;
-      unsubscribeHistory;
-      seenNodeIds = /* @__PURE__ */ new Set();
-      constructor(chatHistory, eventBus, tracer, graphMapper) {
-        this.chatHistory = chatHistory;
-        this.eventBus = eventBus;
-        this.tracer = tracer;
-        this.graphMapper = graphMapper;
-      }
-      processEvent = (event) => {
-        if (event.type === "CLEAR") {
-          this.seenNodeIds.clear();
-        }
-        if (event.type === "SILENT_SYNC") {
+      async handleAsyncExecution(pipeline3, nodes, targets) {
+        if (this.pipelineScheduled.has(pipeline3.name)) {
           return;
         }
-        const fullHistory = this.chatHistory.get();
-        const nodes = this.graphMapper.applyEvent({
-          ...event,
-          payload: fullHistory
-        });
-        const newNodes = /* @__PURE__ */ new Set();
-        for (const node of nodes) {
-          if (!this.seenNodeIds.has(node.id)) {
-            newNodes.add(node.id);
-            this.seenNodeIds.add(node.id);
+        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));
+            if (latestTargets.length === 0)
+              return;
+            debugLogger.log(`[Orchestrator] Executing async pipeline ${pipeline3.name}`);
+            const inboxSnapshot = new InboxSnapshotImpl(this.env.inbox.getMessages() || []);
+            for (const processor of pipeline3.processors) {
+              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);
           }
-        }
-        this.tracer.logEvent("HistoryObserver", `Rebuilt pristine graph from ${event.type} event`, { nodesSize: nodes.length, newNodesCount: newNodes.size });
-        this.eventBus.emitPristineHistoryUpdated({
-          nodes,
-          newNodes
         });
-      };
-      start() {
-        if (this.unsubscribeHistory) {
-          this.unsubscribeHistory();
-        }
-        this.unsubscribeHistory = this.chatHistory.subscribe(this.processEvent);
-        const existing = this.chatHistory.get();
-        if (existing && existing.length > 0) {
-          this.processEvent({ type: "SYNC_FULL", payload: existing });
-        }
       }
-      stop() {
-        if (this.unsubscribeHistory) {
-          this.unsubscribeHistory();
-          this.unsubscribeHistory = void 0;
+      shutdown() {
+        for (const timer of this.activeTimers) {
+          clearInterval(timer);
         }
       }
     };
@@ -379259,7 +379373,8 @@ var init_tokenCalibration = __esm({
 });
 
 // packages/core/dist/src/context/graph/render.js
-async function render2(nodes, orchestrator, sidecar, tracer, env, advancedTokenCalculator, protectionReasons = /* @__PURE__ */ new Map(), header, previewNodeIds = /* @__PURE__ */ new Set()) {
+async function render2(nodes, orchestrator, sidecar, tracer, env, advancedTokenCalculator, options = {}) {
+  const { protectionReasons = /* @__PURE__ */ new Map(), header, lateBindPrompt } = options;
   let headerTokens = 0;
   let headerBaseUnits = 0;
   if (header) {
@@ -379267,22 +379382,28 @@ async function render2(nodes, orchestrator, sidecar, tracer, env, advancedTokenC
     headerTokens = costs.tokens;
     headerBaseUnits = costs.baseUnits;
   }
+  const lastTurnId = nodes[nodes.length - 1]?.turnId;
   if (!sidecar.config.budget) {
-    const visibleNodes2 = nodes.filter((n2) => !previewNodeIds.has(n2.id));
-    const contents2 = env.graphMapper.fromGraph(visibleNodes2);
+    const allVisibleNodes2 = nodes;
+    const managedNodes2 = lateBindPrompt && lastTurnId ? allVisibleNodes2.filter((n2) => n2.turnId !== lastTurnId) : allVisibleNodes2;
+    const pendingNodes2 = lateBindPrompt && lastTurnId ? allVisibleNodes2.filter((n2) => n2.turnId === lastTurnId) : [];
+    const history2 = env.graphMapper.fromGraph(managedNodes2);
+    const pendingHistory2 = env.graphMapper.fromGraph(pendingNodes2);
     tracer.logEvent("Render", "Render Context to LLM (No Budget)", {
-      renderedContext: contents2
+      renderedContext: history2,
+      pendingContext: pendingHistory2
     });
-    const baseUnits = advancedTokenCalculator.getRawBaseUnits(nodes) + headerBaseUnits;
+    const baseUnits = advancedTokenCalculator.getRawBaseUnits(allVisibleNodes2) + headerBaseUnits;
     return {
-      history: contents2,
+      history: history2,
+      pendingHistory: pendingHistory2,
       didApplyManagement: false,
       baseUnits,
       processedNodes: nodes
     };
   }
   const maxTokens = sidecar.config.budget.maxTokens;
-  const { tokens: graphTokens, baseUnits: graphBaseUnits } = advancedTokenCalculator.calculateTokensAndBaseUnits(nodes);
+  const { tokens: graphTokens } = advancedTokenCalculator.calculateTokensAndBaseUnits(nodes);
   const currentTokens = graphTokens + headerTokens;
   const protectedIds = new Set(protectionReasons.keys());
   tracer.logEvent("Render", "Budget Audit", {
@@ -379302,21 +379423,30 @@ async function render2(nodes, orchestrator, sidecar, tracer, env, advancedTokenC
   });
   if (currentTokens <= maxTokens) {
     tracer.logEvent("Render", `View is within maxTokens (${currentTokens} <= ${maxTokens}). Returning view.`);
-    const visibleNodes2 = nodes.filter((n2) => !previewNodeIds.has(n2.id));
-    const contents2 = env.graphMapper.fromGraph(visibleNodes2);
+    const allVisibleNodes2 = nodes;
+    const managedNodes2 = lateBindPrompt && lastTurnId ? allVisibleNodes2.filter((n2) => n2.turnId !== lastTurnId) : allVisibleNodes2;
+    const pendingNodes2 = lateBindPrompt && lastTurnId ? allVisibleNodes2.filter((n2) => n2.turnId === lastTurnId) : [];
+    const history2 = env.graphMapper.fromGraph(managedNodes2);
+    const pendingHistory2 = env.graphMapper.fromGraph(pendingNodes2);
     tracer.logEvent("Render", "Render Context for LLM", {
-      renderedContext: contents2
+      renderedContext: history2,
+      pendingContext: pendingHistory2
     });
-    performCalibration(env, visibleNodes2, contents2.map((h3) => h3.content));
+    performCalibration(env, allVisibleNodes2, [
+      ...history2.map((h3) => h3.content),
+      ...pendingHistory2.map((h3) => h3.content)
+    ]);
     return {
-      history: contents2,
+      history: history2,
+      pendingHistory: pendingHistory2,
       didApplyManagement: false,
-      baseUnits: graphBaseUnits + headerBaseUnits,
+      baseUnits: advancedTokenCalculator.getRawBaseUnits(allVisibleNodes2) + headerBaseUnits,
       processedNodes: nodes
     };
   }
   const targetDelta = currentTokens - sidecar.config.budget.retainedTokens;
   tracer.logEvent("Render", `View exceeds maxTokens (${currentTokens} > ${maxTokens}). Hitting Synchronous Pressure Barrier.`, { targetDelta });
+  debugLogger.log(`Context Manager Synchronous Barrier triggered: View at ${currentTokens} tokens (limit: ${maxTokens}).`);
   const agedOutNodes = /* @__PURE__ */ new Set();
   let rollingTokens = 0;
   for (let i4 = nodes.length - 1; i4 >= 0; i4--) {
@@ -379328,6 +379458,13 @@ async function render2(nodes, orchestrator, sidecar, tracer, env, advancedTokenC
       agedOutNodes.add(node.id);
     }
   }
+  if (lateBindPrompt && lastTurnId) {
+    for (const node of nodes) {
+      if (node.turnId === lastTurnId) {
+        agedOutNodes.delete(node.id);
+      }
+    }
+  }
   const processedNodes = await orchestrator.executeTriggerSync("gc_backstop", nodes, agedOutNodes, protectedIds);
   const skipList = /* @__PURE__ */ new Set();
   for (const node of processedNodes) {
@@ -379336,22 +379473,33 @@ async function render2(nodes, orchestrator, sidecar, tracer, env, advancedTokenC
         skipList.add(id);
     }
   }
-  const visibleNodes = processedNodes.filter((n2) => !skipList.has(n2.id) && !previewNodeIds.has(n2.id));
-  const contents = env.graphMapper.fromGraph(visibleNodes);
+  const allVisibleNodes = processedNodes.filter((n2) => !skipList.has(n2.id));
+  const managedNodes = lateBindPrompt && lastTurnId ? allVisibleNodes.filter((n2) => n2.turnId !== lastTurnId) : allVisibleNodes;
+  const pendingNodes = lateBindPrompt && lastTurnId ? allVisibleNodes.filter((n2) => n2.turnId === lastTurnId) : [];
+  const history = env.graphMapper.fromGraph(managedNodes);
+  const pendingHistory = env.graphMapper.fromGraph(pendingNodes);
+  const finalTokens = advancedTokenCalculator.calculateConcreteListTokens(allVisibleNodes);
   tracer.logEvent("Render", "Render Sanitized Context for LLM", {
-    renderedContextSanitized: contents
+    renderedContextSanitized: history,
+    pendingContextSanitized: pendingHistory
   });
-  performCalibration(env, visibleNodes, contents.map((h3) => h3.content));
+  debugLogger.log(`Context Manager finished. Final actual token count: ${finalTokens}.`);
+  performCalibration(env, allVisibleNodes, [
+    ...history.map((h3) => h3.content),
+    ...pendingHistory.map((h3) => h3.content)
+  ]);
   return {
-    history: contents,
+    history,
+    pendingHistory,
     didApplyManagement: true,
-    baseUnits: advancedTokenCalculator.getRawBaseUnits(visibleNodes) + headerBaseUnits,
+    baseUnits: advancedTokenCalculator.getRawBaseUnits(allVisibleNodes) + headerBaseUnits,
     processedNodes
   };
 }
 var init_render = __esm({
   "packages/core/dist/src/context/graph/render.js"() {
     "use strict";
+    init_debugLogger();
     init_tokenCalibration();
   }
 });
@@ -379392,24 +379540,25 @@ var ContextManager;
 var init_contextManager = __esm({
   "packages/core/dist/src/context/contextManager.js"() {
     "use strict";
-    init_historyObserver();
     init_render();
     init_contextWorkingBuffer();
     init_debugLogger();
+    init_cryptoUtils();
     init_historyHardening();
     init_invariantChecker();
     ContextManager = class {
       sidecar;
       env;
       tracer;
+      chatHistory;
       advancedTokenCalculator;
       headerProvider;
-      // The master state containing the pristine graph and current active graph.
+      // Master state containing the pristine graph and current active graph.
       buffer = ContextWorkingBufferImpl.initialize([]);
       eventBus;
-      // Internal sub-components
       orchestrator;
-      historyObserver;
+      // Track what IDs have been evaluated for triggers to prevent redundant processing
+      evaluatedNodeIds = /* @__PURE__ */ new Set();
       // Hysteresis tracking to prevent utility call churn
       lastTriggeredDeficit = 0;
       // Cache for Anomaly 3 (Redundant Renders)
@@ -379419,16 +379568,12 @@ var init_contextManager = __esm({
         this.sidecar = sidecar;
         this.env = env;
         this.tracer = tracer;
+        this.chatHistory = chatHistory;
         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) => {
-          this.buffer = this.buffer.syncPristineHistory(event.nodes);
-          this.evaluateTriggers(event.newNodes);
-        });
         this.eventBus.onProcessorResult((event) => {
           const currentIds = new Set(this.buffer.nodes.map((n2) => n2.id));
           const allTargetsPresent = event.targets.every((t4) => currentIds.has(t4.id));
@@ -379438,7 +379583,6 @@ var init_contextManager = __esm({
           }
           this.buffer = this.buffer.applyProcessorResult(event.processorId, event.targets, event.returnedNodes);
         });
-        this.historyObserver.start();
       }
       /**
        * Returns a promise that resolves when all currently executing async pipelines have finished.
@@ -379451,29 +379595,22 @@ var init_contextManager = __esm({
        */
       shutdown() {
         this.orchestrator.shutdown();
-        this.historyObserver.stop();
       }
       /**
        * Evaluates if the current working buffer exceeds configured budget thresholds,
        * firing consolidation events if necessary.
        */
-      evaluateTriggers(newNodes) {
+      async evaluateTriggers(newNodes) {
         if (!this.sidecar.config.budget)
           return;
         if (newNodes.size > 0) {
-          this.eventBus.emitChunkReceived({
-            nodes: this.buffer.nodes,
-            targetNodeIds: newNodes
-          });
+          await this.orchestrator.executeTriggerSync("new_message", this.buffer.nodes, newNodes);
         }
         const currentTokens = this.env.tokenCalculator.calculateConcreteListTokens(this.buffer.nodes);
         if (currentTokens > this.sidecar.config.budget.retainedTokens) {
           const agedOutNodes = /* @__PURE__ */ new Set();
           let rollingTokens = 0;
           const protectedIds = this.getProtectedNodeIds(this.buffer.nodes);
-          if (protectedIds.size > 0) {
-            debugLogger.log(`[ContextManager] Pinning ${protectedIds.size} nodes (recent_turn or external_active_task) to prevent truncation.`);
-          }
           for (let i4 = this.buffer.nodes.length - 1; i4 >= 0; i4--) {
             const node = this.buffer.nodes[i4];
             const priorTokens = rollingTokens;
@@ -379496,32 +379633,25 @@ var init_contextManager = __esm({
             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,
-                targetDeficit,
-                targetNodeIds: agedOutNodes
-              });
+              await this.orchestrator.executeTriggerSync("nodes_aged_out", this.buffer.nodes, agedOutNodes, new Set(protectedIds.keys()));
             }
           } else {
             this.lastTriggeredDeficit = 0;
           }
         }
       }
-      /**
-       * Identifies 'pinned' nodes that should not be truncated.
-       * This includes:
-       * 1. The entire last turn (Recent context).
-       * 2. Active tool calls (calls without responses in the graph).
-       */
       getProtectedNodeIds(nodes, extraProtectedIds = /* @__PURE__ */ new Set()) {
         const protectionMap = /* @__PURE__ */ new Map();
         if (nodes.length === 0)
           return protectionMap;
         const lastNode = nodes[nodes.length - 1];
         const lastTurnId = lastNode.turnId;
+        const envTurnId = `turn_${deriveStableId(["environment-context"])}`;
         for (const node of nodes) {
           if (node.turnId === lastTurnId) {
             protectionMap.set(node.id, "recent_turn");
+          } else if (node.turnId === envTurnId) {
+            protectionMap.set(node.id, "environment_context");
           }
         }
         for (const id of extraProtectedIds) {
@@ -379529,11 +379659,6 @@ var init_contextManager = __esm({
         }
         return protectionMap;
       }
-      /**
-       * Retrieves the raw, uncompressed Episodic Context Graph graph.
-       * Useful for internal tool rendering (like the trace viewer).
-       * Note: This is an expensive, deep clone operation.
-       */
       getPristineGraph() {
         const pristineSet = /* @__PURE__ */ new Map();
         for (const node of this.buffer.nodes) {
@@ -379544,31 +379669,32 @@ var init_contextManager = __esm({
         }
         return Array.from(pristineSet.values()).sort((a, b3) => a.timestamp - b3.timestamp);
       }
-      /**
-       * Generates a virtual view of the pristine graph, substituting in variants
-       * up to the configured token budget.
-       * This is the view that will eventually be projected back to the LLM.
-       */
       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.
+       * Generates a virtual view of the pristine graph, substituting in variants
+       * up to the configured token budget.
        */
       async renderHistory(pendingRequest, activeTaskIds = /* @__PURE__ */ new Set(), abortSignal) {
         this.tracer.logEvent("ContextManager", "Starting rendering of LLM context");
+        const currentHistory = this.chatHistory.get();
+        const pristineNodes = this.env.graphMapper.sync(currentHistory);
+        this.buffer = this.buffer.syncPristineHistory(pristineNodes);
+        const newPrimalNodes = /* @__PURE__ */ new Set();
+        for (const node of pristineNodes) {
+          if (!this.evaluatedNodeIds.has(node.id)) {
+            newPrimalNodes.add(node.id);
+            this.evaluatedNodeIds.add(node.id);
+          }
+        }
         let previewNodes = [];
         if (pendingRequest) {
-          previewNodes = this.env.graphMapper.applyEvent({
-            type: "PUSH",
-            payload: [pendingRequest]
-          });
+          previewNodes = this.env.graphMapper.sync([pendingRequest]);
+          const previewNodeIds2 = new Set(previewNodes.map((n2) => n2.id));
+          previewNodes = await this.orchestrator.executeTriggerSync("new_message", previewNodes, previewNodeIds2);
         }
+        await this.evaluateTriggers(newPrimalNodes);
         const hotStartPromise = (async () => {
           if (!this.hasPerformedHotStart) {
             this.hasPerformedHotStart = true;
@@ -379596,68 +379722,70 @@ var init_contextManager = __esm({
           return this.lastRenderCache.result;
         }
         const protectionReasons = this.getProtectedNodeIds(nodes, activeTaskIds);
-        const renderResult = await render2(nodes, this.orchestrator, this.sidecar, this.tracer, this.env, this.advancedTokenCalculator, protectionReasons, header, previewNodeIds);
-        const { history: renderedHistory, didApplyManagement, baseUnits, processedNodes } = renderResult;
+        const renderResult = await render2(nodes, this.orchestrator, this.sidecar, this.tracer, this.env, this.advancedTokenCalculator, {
+          protectionReasons,
+          header,
+          lateBindPrompt: !!pendingRequest
+        });
+        const { history: renderedHistory, pendingHistory, didApplyManagement, baseUnits, processedNodes } = renderResult;
         if (didApplyManagement) {
           this.buffer = this.buffer.applyProcessorResult("sync_backstop", this.buffer.nodes, processedNodes.filter((n2) => !previewNodeIds.has(n2.id)));
         }
         checkContextInvariants(this.buffer.nodes, "RenderHistory");
         this.tracer.logEvent("ContextManager", "Finished rendering");
-        const fullHistoryToHarden = pendingRequest ? [...renderedHistory, pendingRequest] : renderedHistory;
-        const hardenedHistory = hardenHistory(fullHistoryToHarden, {
+        const allHistory = [...renderedHistory, ...pendingHistory];
+        const hardenedAllHistory = hardenHistory(allHistory, {
           sentinels: this.sidecar.sentinels
         });
-        if (pendingRequest) {
-          const last2 = hardenedHistory[hardenedHistory.length - 1];
-          if (last2 && last2.content.parts) {
-            const numPartsToRemove = pendingRequest.content.parts?.length || 0;
-            if (numPartsToRemove > 0 && last2.content.parts.length > numPartsToRemove) {
-              last2.content.parts.splice(-numPartsToRemove);
-            } else {
-              hardenedHistory.pop();
-            }
-          } else {
-            hardenedHistory.pop();
+        const firstPendingId = pendingHistory[0]?.id;
+        let splitIndex = renderedHistory.length;
+        if (firstPendingId) {
+          const foundIndex = hardenedAllHistory.findIndex((h3) => h3.id === firstPendingId);
+          if (foundIndex !== -1) {
+            splitIndex = foundIndex;
           }
         }
-        const apiHistory = hardenedHistory.map((h3) => h3.content);
+        const apiHistory = hardenedAllHistory.slice(0, splitIndex).map((h3) => h3.content);
+        const pendingApiHistory = hardenedAllHistory.slice(splitIndex).map((h3) => h3.content);
         if (header) {
           apiHistory.unshift(header);
         }
         const result2 = {
-          history: hardenedHistory,
+          history: renderedHistory,
           apiHistory,
+          pendingApiHistory,
           didApplyManagement,
           baseUnits,
           processedNodes
         };
-        this.lastRenderCache = { nodesHash: totalHash, result: result2 };
+        this.lastRenderCache = {
+          nodesHash: totalHash,
+          result: result2
+        };
         return result2;
       }
       async performHotStartCalibration(nodes, abortSignal) {
+        const history = this.env.graphMapper.fromGraph(nodes);
+        const contents = history.map((h3) => h3.content);
         try {
-          this.tracer.logEvent("ContextManager", "Performing Hot Start Token Calibration");
-          const contents = this.env.graphMapper.fromGraph(nodes);
-          const rawContents = contents.map((h3) => h3.content);
-          const header = this.headerProvider ? await this.headerProvider() : void 0;
-          const combinedHistory = header ? [header, ...rawContents] : rawContents;
-          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
+          const { totalTokens } = await this.env.llmClient.countTokens({
+            modelConfigKey: { model: "context-calibrator" },
+            contents,
+            abortSignal
+          });
+          if (totalTokens !== void 0) {
+            this.env.eventBus.emitTokenGroundTruth({
+              actualTokens: totalTokens,
+              promptBaseUnits: this.advancedTokenCalculator.getRawBaseUnits(nodes)
             });
-            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 });
+        } catch (e3) {
+          debugLogger.warn("[ContextManager] Hot start calibration failed", e3);
         }
       }
+      getEnvironment() {
+        return this.env;
+      }
     };
   }
 });
@@ -380146,11 +380274,8 @@ async function initializeContextManager(config3, chat, lastPromptId) {
   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, calculator, async () => {
-    const parts2 = await getEnvironmentContext(config3);
-    return { role: "user", parts: parts2 };
-  });
+  const orchestrator = new PipelineOrchestrator(sidecarProfile.buildPipelines(env), sidecarProfile.buildAsyncPipelines(env), env, tracer);
+  return new ContextManager(sidecarProfile, env, tracer, orchestrator, chat.agentHistory, calculator);
 }
 var init_initializer = __esm({
   "packages/core/dist/src/context/initializer.js"() {
@@ -380170,7 +380295,6 @@ var init_initializer = __esm({
     init_stateSnapshotProcessor();
     init_stateSnapshotAsyncProcessor();
     init_rollingSummaryProcessor();
-    init_environmentContext();
     init_adaptiveTokenCalculator();
     init_loggingContentGenerator();
     init_behaviorRegistry();
@@ -380415,7 +380539,7 @@ var init_client4 = __esm({
         const toolRegistry = this.context.toolRegistry;
         const toolDeclarations = toolRegistry.getFunctionDeclarations();
         const tools = [{ functionDeclarations: toolDeclarations }];
-        const history = this.config.getContextManagementConfig().enabled ? extraHistory ?? [] : await getInitialChatHistory(this.config, extraHistory);
+        const history = await getInitialChatHistory(this.config, extraHistory);
         try {
           const systemMemory = this.config.getSystemInstructionMemory();
           const systemInstruction = getCoreSystemPrompt3(this.config, systemMemory);
@@ -380576,18 +380700,21 @@ var init_client4 = __esm({
         }
         const modelForLimitCheck = this._getActiveModelForCurrentTurn();
         let currentBaseUnits = 0;
+        let apiHistoryOverride = void 0;
         if (this.config.getContextManagementConfig().enabled) {
           if (this.contextManager) {
             const rawPendingRequest = createUserContent(request);
             const pendingRequest = {
-              id: this.getChatRecordingService()?.recordSyntheticMessage("user", rawPendingRequest.parts || []) || randomUUID12(),
+              id: randomUUID12(),
               content: rawPendingRequest
             };
-            const { history: newHistory, didApplyManagement, baseUnits } = await this.contextManager.renderHistory(pendingRequest, void 0, signal);
+            const { history: newHistory, apiHistory, pendingApiHistory, baseUnits } = await this.contextManager.renderHistory(pendingRequest, void 0, signal);
             currentBaseUnits = baseUnits;
-            if (didApplyManagement) {
-              this.getChat().setHistory(newHistory, { silent: true });
-            }
+            const finalPendingContent = pendingApiHistory.length > 0 ? pendingApiHistory[0] : rawPendingRequest;
+            apiHistoryOverride = [...apiHistory, finalPendingContent];
+            this.getChat().setHistory(newHistory);
+            displayContent = rawPendingRequest.parts || [];
+            request = finalPendingContent.parts || [];
           } else {
             const newHistory = await this.agentHistoryProvider.manageHistory(this.getHistory(), signal);
             if (newHistory.length !== this.getHistory().length) {
@@ -380664,7 +380791,11 @@ var init_client4 = __esm({
         }
         this.currentSequenceModel = modelToUse;
         await this.setTools(modelToUse);
-        const resultStream = turn.run(modelConfigKey, request, signal, displayContent);
+        const resultStream = turn.run(modelConfigKey, request, signal, {
+          displayContent,
+          role: LlmRole.MAIN,
+          apiHistoryOverride
+        });
         let isError = false;
         let loopDetectedAbort = false;
         let loopRecoverResult;
@@ -382416,12 +382547,13 @@ var init_message_bus = __esm({
     MessageBus = class _MessageBus extends EventEmitter7 {
       policyEngine;
       debug;
+      isTrusted;
       listenerToAbortCleanup = /* @__PURE__ */ new WeakMap();
-      constructor(policyEngine, debug2 = false) {
+      constructor(policyEngine, debug2 = false, isTrusted = true) {
         super();
         this.policyEngine = policyEngine;
         this.debug = debug2;
-        this.debug = debug2;
+        this.isTrusted = isTrusted;
       }
       isValidMessage(message) {
         if (!message || !message.type) {
@@ -382437,13 +382569,15 @@ var init_message_bus = __esm({
       }
       /**
        * Derives a child message bus scoped to a specific subagent.
+       * Derived buses are untrusted.
        */
       derive(subagentName) {
-        const bus = new _MessageBus(this.policyEngine, this.debug);
+        const bus = new _MessageBus(this.policyEngine, this.debug, false);
         bus.publish = async (message) => {
           if (message.type === MessageBusType.TOOL_CONFIRMATION_REQUEST) {
+            const { forcedDecision: _forcedDecision, subagent: _subagent, serverName: _serverName, toolAnnotations: _toolAnnotations, details: _details, ...otherFields } = message;
             return this.publish({
-              ...message,
+              ...otherFields,
               subagent: message.subagent ? `${subagentName}/${message.subagent}` : subagentName
             });
           }
@@ -382469,7 +382603,7 @@ var init_message_bus = __esm({
           }
           if (message.type === MessageBusType.TOOL_CONFIRMATION_REQUEST) {
             const { decision: policyDecision } = await this.policyEngine.check(message.toolCall, message.serverName, message.toolAnnotations, message.subagent);
-            const decision = message.forcedDecision ?? policyDecision;
+            const decision = (this.isTrusted ? message.forcedDecision : void 0) ?? policyDecision;
             switch (decision) {
               case PolicyDecision.ALLOW:
                 this.emitMessage({
@@ -388212,12 +388346,12 @@ var require_src59 = __commonJS({
     function check2(path98, isFile, isDirectory) {
       log(`checking %s`, path98);
       try {
-        const stat6 = fs_1.statSync(path98);
-        if (stat6.isFile() && isFile) {
+        const stat7 = fs_1.statSync(path98);
+        if (stat7.isFile() && isFile) {
           log(`[OK] path represents a file`);
           return true;
         }
-        if (stat6.isDirectory() && isDirectory) {
+        if (stat7.isDirectory() && isDirectory) {
           log(`[OK] path represents a directory`);
           return true;
         }
@@ -393173,7 +393307,7 @@ var init_esm18 = __esm({
 // packages/core/dist/src/services/gitService.js
 import * as fs68 from "node:fs/promises";
 import * as path77 from "node:path";
-var SHADOW_REPO_AUTHOR_NAME, SHADOW_REPO_AUTHOR_EMAIL, SHADOW_REPO_GIT_OPTIONS, GitService;
+var SHADOW_REPO_AUTHOR_NAME, SHADOW_REPO_AUTHOR_EMAIL, SHADOW_REPO_UNSAFE_OPTIONS, SHADOW_REPO_GIT_OPTIONS, GitService;
 var init_gitService = __esm({
   "packages/core/dist/src/services/gitService.js"() {
     "use strict";
@@ -393184,29 +393318,30 @@ var init_gitService = __esm({
     init_environmentSanitization();
     SHADOW_REPO_AUTHOR_NAME = "Gemini CLI";
     SHADOW_REPO_AUTHOR_EMAIL = "gemini-cli@google.com";
+    SHADOW_REPO_UNSAFE_OPTIONS = {
+      allowUnsafeAlias: true,
+      allowUnsafeAskPass: true,
+      allowUnsafeConfigEnvCount: true,
+      allowUnsafeConfigPaths: true,
+      allowUnsafeCredentialHelper: true,
+      allowUnsafeCustomBinary: true,
+      allowUnsafeDiffExternal: true,
+      allowUnsafeDiffTextConv: true,
+      allowUnsafeEditor: true,
+      allowUnsafeFilter: true,
+      allowUnsafeFsMonitor: true,
+      allowUnsafeGitProxy: true,
+      allowUnsafeGpgProgram: true,
+      allowUnsafeHooksPath: true,
+      allowUnsafeMergeDriver: true,
+      allowUnsafePack: true,
+      allowUnsafePager: true,
+      allowUnsafeProtocolOverride: true,
+      allowUnsafeSshCommand: true,
+      allowUnsafeTemplateDir: true
+    };
     SHADOW_REPO_GIT_OPTIONS = {
-      unsafe: {
-        allowUnsafeAlias: true,
-        allowUnsafeAskPass: true,
-        allowUnsafeConfigEnvCount: true,
-        allowUnsafeConfigPaths: true,
-        allowUnsafeCredentialHelper: true,
-        allowUnsafeCustomBinary: true,
-        allowUnsafeDiffExternal: true,
-        allowUnsafeDiffTextConv: true,
-        allowUnsafeEditor: true,
-        allowUnsafeFilter: true,
-        allowUnsafeFsMonitor: true,
-        allowUnsafeGitProxy: true,
-        allowUnsafeGpgProgram: true,
-        allowUnsafeHooksPath: true,
-        allowUnsafeMergeDriver: true,
-        allowUnsafePack: true,
-        allowUnsafePager: true,
-        allowUnsafeProtocolOverride: true,
-        allowUnsafeSshCommand: true,
-        allowUnsafeTemplateDir: true
-      }
+      unsafe: SHADOW_REPO_UNSAFE_OPTIONS
     };
     GitService = class _GitService {
       projectRoot;
@@ -396350,8 +396485,8 @@ async function loadJitSubdirectoryMemory(targetPath, trustedRoots, alreadyLoaded
   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 stat6 = await fs71.stat(resolvedTarget);
-    if (stat6.isFile()) {
+    const stat7 = await fs71.stat(resolvedTarget);
+    if (stat7.isFile()) {
       startDir = path79.dirname(resolvedTarget);
     }
   } catch {
@@ -399406,6 +399541,66 @@ var init_admin_controls = __esm({
   }
 });
 
+// packages/core/dist/src/utils/path-validator.js
+function validatePath(pathStr) {
+  if (!pathStr || typeof pathStr !== "string") {
+    return { isValid: false, error: "Path must be a non-empty string." };
+  }
+  if (/[\n\r\0\t]/.test(pathStr)) {
+    return {
+      isValid: false,
+      error: "Path contains invalid characters (newlines or control characters)."
+    };
+  }
+  const logMarkerRegexes = [
+    /(^|[/\\])AssertionError:/,
+    /(^|[/\\])FAIL /,
+    /(^|[/\\])✓ /,
+    /(^|[/\\])× /,
+    /(^|[/\\])TestingLibraryElementError:/
+  ];
+  for (const regex2 of logMarkerRegexes) {
+    if (regex2.test(pathStr)) {
+      return {
+        isValid: false,
+        error: "Path appears to be a misinterpreted log fragment."
+      };
+    }
+  }
+  if (pathStr.includes('"') || pathStr.includes("...")) {
+    if (pathStr.length > 20) {
+      return {
+        isValid: false,
+        error: "Path contains suspicious characters (double quotes or ellipses) and is too long to be a simple filename."
+      };
+    }
+  }
+  if (pathStr.length > MAX_PATH_LENGTH) {
+    return {
+      isValid: false,
+      error: `Path is too long (maximum ${MAX_PATH_LENGTH} characters).`
+    };
+  }
+  const components = pathStr.split(/[/\\]/);
+  for (const component of components) {
+    if (component.length > MAX_COMPONENT_LENGTH) {
+      return {
+        isValid: false,
+        error: `Path component "${component.substring(0, 20)}..." is too long (maximum ${MAX_COMPONENT_LENGTH} characters).`
+      };
+    }
+  }
+  return { isValid: true };
+}
+var MAX_PATH_LENGTH, MAX_COMPONENT_LENGTH;
+var init_path_validator = __esm({
+  "packages/core/dist/src/utils/path-validator.js"() {
+    "use strict";
+    MAX_PATH_LENGTH = 4096;
+    MAX_COMPONENT_LENGTH = 255;
+  }
+});
+
 // packages/core/dist/src/config/injectionService.js
 var InjectionService;
 var init_injectionService = __esm({
@@ -401478,11 +401673,11 @@ var init_dist5 = __esm({
             return;
           }
           const decoder = new TextDecoder(), reader = body2.getReader();
-          let open4 = true;
+          let open5 = true;
           do {
             const { done, value } = await reader.read();
-            value && __privateGet(this, _parser).feed(decoder.decode(value, { stream: !done })), done && (open4 = false, __privateGet(this, _parser).reset(), __privateMethod(this, _EventSource_instances, scheduleReconnect_fn).call(this));
-          } while (open4);
+            value && __privateGet(this, _parser).feed(decoder.decode(value, { stream: !done })), done && (open5 = false, __privateGet(this, _parser).reset(), __privateMethod(this, _EventSource_instances, scheduleReconnect_fn).call(this));
+          } while (open5);
         }), __privateAdd(this, _onFetchError, (err2) => {
           __privateSet(this, _controller, void 0), !(err2.name === "AbortError" || err2.type === "aborted") && __privateMethod(this, _EventSource_instances, scheduleReconnect_fn).call(this, flattenError2(err2));
         }), __privateAdd(this, _onEvent, (event) => {
@@ -402068,13 +402263,13 @@ var init_sa_impersonation_provider = __esm({
   }
 });
 
-// packages/core/dist/src/tools/xcode-mcp-fix-transport.js
+// packages/core/dist/src/tools/mcp-compliance-transport.js
 import { EventEmitter as EventEmitter9 } from "node:events";
-var XcodeMcpBridgeFixTransport;
-var init_xcode_mcp_fix_transport = __esm({
-  "packages/core/dist/src/tools/xcode-mcp-fix-transport.js"() {
+var McpComplianceTransport;
+var init_mcp_compliance_transport = __esm({
+  "packages/core/dist/src/tools/mcp-compliance-transport.js"() {
     "use strict";
-    XcodeMcpBridgeFixTransport = class extends EventEmitter9 {
+    McpComplianceTransport = class extends EventEmitter9 {
       transport;
       constructor(transport) {
         super();
@@ -402784,7 +402979,8 @@ async function createTransportWithOAuth(mcpServerName, mcpServerConfig, accessTo
     const transportOptions = {
       requestInit: createTransportRequestInit(mcpServerConfig, headers, cliConfig.sanitizationConfig)
     };
-    return createUrlTransport(mcpServerName, mcpServerConfig, transportOptions);
+    const transport = createUrlTransport(mcpServerName, mcpServerConfig, transportOptions);
+    return transport ? new McpComplianceTransport(transport) : null;
   } catch (error2) {
     cliConfig.emitMcpDiagnostic("error", `Failed to create OAuth transport for server '${mcpServerName}': ${getErrorMessage(error2)}`, error2, mcpServerName);
     return null;
@@ -403237,7 +403433,7 @@ async function createTransport(mcpServerName, mcpServerConfig, debugMode, cliCon
       requestInit: createTransportRequestInit(mcpServerConfig, headers, cliConfig.sanitizationConfig),
       authProvider
     };
-    return createUrlTransport(mcpServerName, mcpServerConfig, transportOptions);
+    return new McpComplianceTransport(createUrlTransport(mcpServerName, mcpServerConfig, transportOptions));
   }
   if (mcpServerConfig.command) {
     if (!cliConfig.isTrustedFolder()) {
@@ -403263,21 +403459,15 @@ async function createTransport(mcpServerName, mcpServerConfig, debugMode, cliCon
         finalEnv[key] = expandEnvVars(value, expansionEnv);
       }
     }
-    let transport = new StdioClientTransport({
+    const transport = new McpComplianceTransport(new StdioClientTransport({
       command: mcpServerConfig.command,
       args: mcpServerConfig.args || [],
       env: finalEnv,
       cwd: mcpServerConfig.cwd,
       stderr: "pipe"
-    });
-    if (mcpServerConfig.command === "xcrun" && mcpServerConfig.args?.includes("mcpbridge")) {
-      transport = new XcodeMcpBridgeFixTransport(transport);
-    }
+    }));
     if (debugMode) {
-      const underlyingTransport = transport instanceof XcodeMcpBridgeFixTransport ? (
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-type-assertion
-        transport.transport
-      ) : transport;
+      const underlyingTransport = transport instanceof McpComplianceTransport ? transport.transport : transport;
       if (underlyingTransport instanceof StdioClientTransport && underlyingTransport.stderr) {
         underlyingTransport.stderr.on("data", (data) => {
           const stderrStr = data.toString().trim();
@@ -403327,7 +403517,7 @@ var init_mcp_client = __esm({
     init_google_auth_provider();
     init_sa_impersonation_provider();
     init_mcp_tool();
-    init_xcode_mcp_fix_transport();
+    init_mcp_compliance_transport();
     init_oauth_token_storage();
     init_oauth_provider();
     init_stored_token_provider();
@@ -403859,7 +404049,7 @@ var init_mcp_client = __esm({
 });
 
 // packages/core/dist/src/tools/mcp-client-manager.js
-import { createHash as createHash16 } from "node:crypto";
+import { createHash as createHash17 } from "node:crypto";
 var McpClientManager;
 var init_mcp_client_manager = __esm({
   "packages/core/dist/src/tools/mcp-client-manager.js"() {
@@ -404076,7 +404266,7 @@ var init_mcp_client_manager = __esm({
           config: rest,
           extensionId: extension?.id
         };
-        return createHash16("sha256").update(stableStringify(keyData)).digest("hex");
+        return createHash17("sha256").update(stableStringify(keyData)).digest("hex");
       }
       /**
        * Merges two MCP configurations. The second configuration (override)
@@ -409085,6 +409275,7 @@ var init_config4 = __esm({
     init_startupProfiler();
     init_admin_controls();
     init_paths();
+    init_path_validator();
     init_injectionService();
     init_executionLifecycleService();
     init_config3();
@@ -409250,6 +409441,7 @@ var init_config4 = __esm({
       folderTrust;
       ideMode;
       _activeModel;
+      fallbackOverrides = /* @__PURE__ */ new Map();
       maxSessionTurns;
       listSessions;
       deleteSession;
@@ -409777,6 +409969,8 @@ var init_config4 = __esm({
       }
       async refreshAuth(authMethod, apiKey, baseUrl, customHeaders) {
         this.modelAvailabilityService.reset();
+        this.fallbackOverrides.clear();
+        this.modelConfigService.clearRuntimeOverrides();
         if (this.contentGeneratorConfig?.authType === AuthType2.USE_GEMINI && authMethod !== AuthType2.USE_GEMINI) {
           this._geminiClient.stripThoughtsFromHistory();
         }
@@ -409946,6 +410140,8 @@ var init_config4 = __esm({
         this._sessionId = sessionId;
         this.storage.setSessionId(sessionId);
         this.trackerService = void 0;
+        this.fallbackOverrides.clear();
+        this.modelConfigService.clearRuntimeOverrides();
         this.approvedPlanPath = void 0;
         this.topicState.reset();
         this.skillManager.reset();
@@ -410021,13 +410217,34 @@ var init_config4 = __esm({
         }
         this.modelAvailabilityService.reset();
       }
-      activateFallbackMode(model) {
-        this.setModel(model, true);
+      activateFallbackMode(model, failedModel) {
+        if (this.getActiveModel() !== model) {
+          this.setModel(model, true);
+        }
+        if (failedModel) {
+          for (const [source, target] of this.fallbackOverrides.entries()) {
+            if (target === failedModel) {
+              this.fallbackOverrides.set(source, model);
+              this.modelConfigService.registerRuntimeModelOverride({
+                match: { model: source },
+                modelConfig: { model }
+              });
+            }
+          }
+          this.fallbackOverrides.set(failedModel, model);
+          this.modelConfigService.registerRuntimeModelOverride({
+            match: { model: failedModel },
+            modelConfig: { model }
+          });
+        }
         const authType = this.getContentGeneratorConfig()?.authType;
         if (authType) {
           logFlashFallback(this, new FlashFallbackEvent(authType));
         }
       }
+      getFallbackOverride(model) {
+        return this.fallbackOverrides.get(model);
+      }
       getActiveModel() {
         return this._activeModel ?? this.model;
       }
@@ -410972,6 +411189,10 @@ ${sections.join("\n")}
        * @returns An error message string if the path is disallowed, null otherwise.
        */
       validatePathAccess(absolutePath, checkType = "write") {
+        const pathValidation = validatePath(absolutePath);
+        if (!pathValidation.isValid) {
+          return `Invalid path: ${pathValidation.error}`;
+        }
         if (checkType === "write" && hasScopedAutoMemoryExtractionWriteAccess()) {
           const resolvedPath = resolveToRealPath(absolutePath);
           if (this.isScopedAutoMemoryExtractionWritePathAllowed(absolutePath, resolvedPath)) {
@@ -412881,6 +413102,16 @@ var init_exitCodes = __esm({
   }
 });
 
+// packages/core/dist/src/utils/atCommandUtils.js
+var init_atCommandUtils = __esm({
+  "packages/core/dist/src/utils/atCommandUtils.js"() {
+    "use strict";
+    init_path_validator();
+    init_config4();
+    init_errors2();
+  }
+});
+
 // packages/core/dist/src/utils/tool-visibility.js
 var init_tool_visibility = __esm({
   "packages/core/dist/src/utils/tool-visibility.js"() {
@@ -413867,16 +414098,16 @@ var require_parse11 = __commonJS({
         const analysis = analyzeRepeatedExtglob(body2, opts);
         if ((token2.type === "plus" || token2.type === "star") && analysis.risky) {
           const safeOutput = analysis.safeOutput ? (token2.output ? "" : ONE_CHAR) + (opts.capture ? `(${analysis.safeOutput})` : analysis.safeOutput) : void 0;
-          const open4 = tokens[token2.tokensIndex];
-          open4.type = "text";
-          open4.value = literal3;
-          open4.output = safeOutput || utils.escapeRegex(literal3);
+          const open5 = tokens[token2.tokensIndex];
+          open5.type = "text";
+          open5.value = literal3;
+          open5.output = safeOutput || utils.escapeRegex(literal3);
           for (let i4 = token2.tokensIndex + 1; i4 < tokens.length; i4++) {
             tokens[i4].value = "";
             tokens[i4].output = "";
             delete tokens[i4].suffix;
           }
-          state.output = token2.output + open4.output;
+          state.output = token2.output + open5.output;
           state.backtrack = true;
           push({ type: "paren", extglob: true, value, output: "" });
           decrement("parens");
@@ -414096,15 +414327,15 @@ var require_parse11 = __commonJS({
         }
         if (value === "{" && opts.nobrace !== true) {
           increment("braces");
-          const open4 = {
+          const open5 = {
             type: "brace",
             value,
             output: "(",
             outputIndex: state.output.length,
             tokensIndex: state.tokens.length
           };
-          braces.push(open4);
-          push(open4);
+          braces.push(open5);
+          push(open5);
           continue;
         }
         if (value === "}") {
@@ -414869,12 +415100,12 @@ var require_resolve_symlink = __commonJS({
       fs_1.default.realpath(path98, (error2, resolvedPath) => {
         if (error2)
           return queue.dequeue(suppressErrors ? null : error2, state);
-        fs_1.default.stat(resolvedPath, (error3, stat6) => {
+        fs_1.default.stat(resolvedPath, (error3, stat7) => {
           if (error3)
             return queue.dequeue(suppressErrors ? null : error3, state);
-          if (stat6.isDirectory() && isRecursive(path98, resolvedPath, state))
+          if (stat7.isDirectory() && isRecursive(path98, resolvedPath, state))
             return queue.dequeue(null, state);
-          callback(stat6, resolvedPath);
+          callback(stat7, resolvedPath);
           queue.dequeue(null, state);
         });
       });
@@ -414884,10 +415115,10 @@ var require_resolve_symlink = __commonJS({
       queue.enqueue();
       try {
         const resolvedPath = fs_1.default.realpathSync(path98);
-        const stat6 = fs_1.default.statSync(resolvedPath);
-        if (stat6.isDirectory() && isRecursive(path98, resolvedPath, state))
+        const stat7 = fs_1.default.statSync(resolvedPath);
+        if (stat7.isDirectory() && isRecursive(path98, resolvedPath, state))
           return;
-        callback(stat6, resolvedPath);
+        callback(stat7, resolvedPath);
       } catch (e3) {
         if (!suppressErrors)
           throw e3;
@@ -415186,8 +415417,8 @@ var require_walker = __commonJS({
             this.walkDirectory(this.state, path98, path98, depth - 1, this.walk);
           } else if (this.resolveSymlink && entry.isSymbolicLink()) {
             let path98 = joinPath.joinPathWithBasePath(entry.name, directoryPath);
-            this.resolveSymlink(path98, this.state, (stat6, resolvedPath) => {
-              if (stat6.isDirectory()) {
+            this.resolveSymlink(path98, this.state, (stat7, resolvedPath) => {
+              if (stat7.isDirectory()) {
                 resolvedPath = (0, utils_1.normalizePath)(resolvedPath, this.state.options);
                 if (exclude && exclude(entry.name, useRealPaths ? resolvedPath : path98 + pathSeparator))
                   return;
@@ -415559,17 +415790,6 @@ var init_apiConversionUtils = __esm({
   }
 });
 
-// packages/core/dist/src/utils/sessionUtils.js
-var init_sessionUtils = __esm({
-  "packages/core/dist/src/utils/sessionUtils.js"() {
-    "use strict";
-    init_node();
-    init_chatRecordingService();
-    init_geminiRequest();
-    init_agentChatHistory();
-  }
-});
-
 // node_modules/strip-json-comments/index.js
 var require_strip_json_comments = __commonJS({
   "node_modules/strip-json-comments/index.js"(exports2, module2) {
@@ -416360,6 +416580,8 @@ var init_src2 = __esm({
     init_planUtils();
     init_approvalModeUtils();
     init_fileDiffUtils();
+    init_path_validator();
+    init_atCommandUtils();
     init_retry();
     init_shell_utils();
     init_types2();