@google/gemini-cli-a2a-server 0.23.0-preview.2 → 0.24.0-nightly.20251227.37be16243

package/dist/a2a-server.mjs

@@ -8766,15 +8766,15 @@ var require_file = __commonJS({
       _incFile(callback) {
         debug2("_incFile", this.filename);
         const ext2 = path75.extname(this._basename);
-        const basename15 = path75.basename(this._basename, ext2);
+        const basename14 = path75.basename(this._basename, ext2);
         const tasks = [];
         if (this.zippedArchive) {
           tasks.push(
             function(cb) {
               const num = this._created > 0 && !this.tailable ? this._created : "";
               this._compressFile(
-                path75.join(this.dirname, `${basename15}${num}${ext2}`),
-                path75.join(this.dirname, `${basename15}${num}${ext2}.gz`),
+                path75.join(this.dirname, `${basename14}${num}${ext2}`),
+                path75.join(this.dirname, `${basename14}${num}${ext2}.gz`),
                 cb
               );
             }.bind(this)
@@ -8784,9 +8784,9 @@ var require_file = __commonJS({
           function(cb) {
             if (!this.tailable) {
               this._created += 1;
-              this._checkMaxFilesIncrementing(ext2, basename15, cb);
+              this._checkMaxFilesIncrementing(ext2, basename14, cb);
             } else {
-              this._checkMaxFilesTailable(ext2, basename15, cb);
+              this._checkMaxFilesTailable(ext2, basename14, cb);
             }
           }.bind(this)
         );
@@ -8800,9 +8800,9 @@ var require_file = __commonJS({
        */
       _getFile() {
         const ext2 = path75.extname(this._basename);
-        const basename15 = path75.basename(this._basename, ext2);
+        const basename14 = path75.basename(this._basename, ext2);
         const isRotation = this.rotationFormat ? this.rotationFormat() : this._created;
-        return !this.tailable && this._created ? `${basename15}${isRotation}${ext2}` : `${basename15}${ext2}`;
+        return !this.tailable && this._created ? `${basename14}${isRotation}${ext2}` : `${basename14}${ext2}`;
       }
       /**
        * Increment the number of files created or checked by this instance.
@@ -8812,14 +8812,14 @@ var require_file = __commonJS({
        * @returns {undefined}
        * @private
        */
-      _checkMaxFilesIncrementing(ext2, basename15, callback) {
+      _checkMaxFilesIncrementing(ext2, basename14, callback) {
         if (!this.maxFiles || this._created < this.maxFiles) {
           return setImmediate(callback);
         }
         const oldest = this._created - this.maxFiles;
         const isOldest = oldest !== 0 ? oldest : "";
         const isZipped = this.zippedArchive ? ".gz" : "";
-        const filePath = `${basename15}${isOldest}${ext2}${isZipped}`;
+        const filePath = `${basename14}${isOldest}${ext2}${isZipped}`;
         const target = path75.join(this.dirname, filePath);
         fs66.unlink(target, callback);
       }
@@ -8834,7 +8834,7 @@ var require_file = __commonJS({
        * @returns {undefined}
        * @private
        */
-      _checkMaxFilesTailable(ext2, basename15, callback) {
+      _checkMaxFilesTailable(ext2, basename14, callback) {
         const tasks = [];
         if (!this.maxFiles) {
           return;
@@ -8842,21 +8842,21 @@ var require_file = __commonJS({
         const isZipped = this.zippedArchive ? ".gz" : "";
         for (let x2 = this.maxFiles - 1; x2 > 1; x2--) {
           tasks.push(function(i4, cb) {
-            let fileName = `${basename15}${i4 - 1}${ext2}${isZipped}`;
+            let fileName = `${basename14}${i4 - 1}${ext2}${isZipped}`;
             const tmppath = path75.join(this.dirname, fileName);
             fs66.exists(tmppath, (exists2) => {
               if (!exists2) {
                 return cb(null);
               }
-              fileName = `${basename15}${i4}${ext2}${isZipped}`;
+              fileName = `${basename14}${i4}${ext2}${isZipped}`;
               fs66.rename(tmppath, path75.join(this.dirname, fileName), cb);
             });
           }.bind(this, x2));
         }
         asyncSeries(tasks, () => {
           fs66.rename(
-            path75.join(this.dirname, `${basename15}${ext2}${isZipped}`),
-            path75.join(this.dirname, `${basename15}1${ext2}${isZipped}`),
+            path75.join(this.dirname, `${basename14}${ext2}${isZipped}`),
+            path75.join(this.dirname, `${basename14}1${ext2}${isZipped}`),
             callback
           );
         });
@@ -33263,8 +33263,8 @@ var require_view = __commonJS({
     var debug2 = require_src()("express:view");
     var path75 = __require("node:path");
     var fs66 = __require("node:fs");
-    var dirname17 = path75.dirname;
-    var basename15 = path75.basename;
+    var dirname18 = path75.dirname;
+    var basename14 = path75.basename;
     var extname3 = path75.extname;
     var join29 = path75.join;
     var resolve14 = path75.resolve;
@@ -33302,8 +33302,8 @@ var require_view = __commonJS({
       for (var i4 = 0; i4 < roots.length && !path76; i4++) {
         var root = roots[i4];
         var loc = resolve14(root, name4);
-        var dir = dirname17(loc);
-        var file = basename15(loc);
+        var dir = dirname18(loc);
+        var file = basename14(loc);
         path76 = this.resolve(dir, file);
       }
       return path76;
@@ -33333,7 +33333,7 @@ var require_view = __commonJS({
       if (stat3 && stat3.isFile()) {
         return path76;
       }
-      path76 = join29(dir, basename15(file, ext2), "index" + ext2);
+      path76 = join29(dir, basename14(file, ext2), "index" + ext2);
       stat3 = tryStat(path76);
       if (stat3 && stat3.isFile()) {
         return path76;
@@ -36625,7 +36625,7 @@ var require_content_disposition = __commonJS({
     "use strict";
     module2.exports = contentDisposition;
     module2.exports.parse = parse10;
-    var basename15 = __require("path").basename;
+    var basename14 = __require("path").basename;
     var Buffer11 = require_safe_buffer().Buffer;
     var ENCODE_URL_ATTR_CHAR_REGEXP = /[\x00-\x20"'()*,/:;<=>?@[\\\]{}\x7f]/g;
     var HEX_ESCAPE_REGEXP = /%[0-9A-Fa-f]{2}/;
@@ -36661,9 +36661,9 @@ var require_content_disposition = __commonJS({
       if (typeof fallback === "string" && NON_LATIN1_REGEXP.test(fallback)) {
         throw new TypeError("fallback must be ISO-8859-1 string");
       }
-      var name4 = basename15(filename);
+      var name4 = basename14(filename);
       var isQuotedString = TEXT_REGEXP.test(name4);
-      var fallbackName = typeof fallback !== "string" ? fallback && getlatin1(name4) : basename15(fallback);
+      var fallbackName = typeof fallback !== "string" ? fallback && getlatin1(name4) : basename14(fallback);
       var hasFallback = typeof fallbackName === "string" && fallbackName !== name4;
       if (hasFallback || !isQuotedString || HEX_ESCAPE_REGEXP.test(name4)) {
         params["filename*"] = name4;
@@ -45813,8 +45813,8 @@ var require_view2 = __commonJS({
     var debug2 = require_src4()("express:view");
     var path75 = __require("path");
     var fs66 = __require("fs");
-    var dirname17 = path75.dirname;
-    var basename15 = path75.basename;
+    var dirname18 = path75.dirname;
+    var basename14 = path75.basename;
     var extname3 = path75.extname;
     var join29 = path75.join;
     var resolve14 = path75.resolve;
@@ -45852,8 +45852,8 @@ var require_view2 = __commonJS({
       for (var i4 = 0; i4 < roots.length && !path76; i4++) {
         var root = roots[i4];
         var loc = resolve14(root, name4);
-        var dir = dirname17(loc);
-        var file = basename15(loc);
+        var dir = dirname18(loc);
+        var file = basename14(loc);
         path76 = this.resolve(dir, file);
       }
       return path76;
@@ -45869,7 +45869,7 @@ var require_view2 = __commonJS({
       if (stat3 && stat3.isFile()) {
         return path76;
       }
-      path76 = join29(dir, basename15(file, ext2), "index" + ext2);
+      path76 = join29(dir, basename14(file, ext2), "index" + ext2);
       stat3 = tryStat(path76);
       if (stat3 && stat3.isFile()) {
         return path76;
@@ -45892,7 +45892,7 @@ var require_content_disposition2 = __commonJS({
     "use strict";
     module2.exports = contentDisposition;
     module2.exports.parse = parse10;
-    var basename15 = __require("path").basename;
+    var basename14 = __require("path").basename;
     var Buffer11 = require_safe_buffer().Buffer;
     var ENCODE_URL_ATTR_CHAR_REGEXP = /[\x00-\x20"'()*,/:;<=>?@[\\\]{}\x7f]/g;
     var HEX_ESCAPE_REGEXP = /%[0-9A-Fa-f]{2}/;
@@ -45928,9 +45928,9 @@ var require_content_disposition2 = __commonJS({
       if (typeof fallback === "string" && NON_LATIN1_REGEXP.test(fallback)) {
         throw new TypeError("fallback must be ISO-8859-1 string");
       }
-      var name4 = basename15(filename);
+      var name4 = basename14(filename);
       var isQuotedString = TEXT_REGEXP.test(name4);
-      var fallbackName = typeof fallback !== "string" ? fallback && getlatin1(name4) : basename15(fallback);
+      var fallbackName = typeof fallback !== "string" ? fallback && getlatin1(name4) : basename14(fallback);
       var hasFallback = typeof fallbackName === "string" && fallbackName !== name4;
       if (hasFallback || !isQuotedString || HEX_ESCAPE_REGEXP.test(name4)) {
         params["filename*"] = name4;
@@ -68416,8 +68416,8 @@ var require_graceful_fs = __commonJS({
         }
       }
       var fs$writeFile = fs67.writeFile;
-      fs67.writeFile = writeFile6;
-      function writeFile6(path75, data, options2, cb) {
+      fs67.writeFile = writeFile5;
+      function writeFile5(path75, data, options2, cb) {
         if (typeof options2 === "function")
           cb = options2, options2 = null;
         return go$writeFile(path75, data, options2, cb);
@@ -69769,7 +69769,7 @@ var require_jsonfile = __commonJS({
       return obj;
     }
     var readFile8 = universalify.fromPromise(_readFile);
-    function readFileSync9(file, options2 = {}) {
+    function readFileSync10(file, options2 = {}) {
       if (typeof options2 === "string") {
         options2 = { encoding: options2 };
       }
@@ -69793,17 +69793,17 @@ var require_jsonfile = __commonJS({
       const str = stringify5(obj, options2);
       await universalify.fromCallback(fs66.writeFile)(file, str, options2);
     }
-    var writeFile6 = universalify.fromPromise(_writeFile);
-    function writeFileSync5(file, obj, options2 = {}) {
+    var writeFile5 = universalify.fromPromise(_writeFile);
+    function writeFileSync6(file, obj, options2 = {}) {
       const fs66 = options2.fs || _fs;
       const str = stringify5(obj, options2);
       return fs66.writeFileSync(file, str, options2);
     }
     module2.exports = {
       readFile: readFile8,
-      readFileSync: readFileSync9,
-      writeFile: writeFile6,
-      writeFileSync: writeFileSync5
+      readFileSync: readFileSync10,
+      writeFile: writeFile5,
+      writeFileSync: writeFileSync6
     };
   }
 });
@@ -153014,8 +153014,8 @@ var require_sync = __commonJS({
       }
       return x2;
     };
-    var defaultReadPackageSync = function defaultReadPackageSync2(readFileSync9, pkgfile) {
-      var body2 = readFileSync9(pkgfile);
+    var defaultReadPackageSync = function defaultReadPackageSync2(readFileSync10, pkgfile) {
+      var body2 = readFileSync10(pkgfile);
       try {
         var pkg2 = JSON.parse(body2);
         return pkg2;
@@ -153035,7 +153035,7 @@ var require_sync = __commonJS({
       }
       var opts = normalizeOptions2(x2, options2);
       var isFile3 = opts.isFile || defaultIsFile;
-      var readFileSync9 = opts.readFileSync || fs66.readFileSync;
+      var readFileSync10 = opts.readFileSync || fs66.readFileSync;
       var isDirectory = opts.isDirectory || defaultIsDir;
       var realpathSync4 = opts.realpathSync || defaultRealpathSync;
       var readPackageSync2 = opts.readPackageSync || defaultReadPackageSync;
@@ -153092,7 +153092,7 @@ var require_sync = __commonJS({
         if (!isFile3(pkgfile)) {
           return loadpkg(path75.dirname(dir));
         }
-        var pkg2 = readPackageSync2(readFileSync9, pkgfile);
+        var pkg2 = readPackageSync2(readFileSync10, pkgfile);
         if (pkg2 && opts.packageFilter) {
           pkg2 = opts.packageFilter(
             pkg2,
@@ -153106,7 +153106,7 @@ var require_sync = __commonJS({
         var pkgfile = path75.join(maybeRealpathSync(realpathSync4, x3, opts), "/package.json");
         if (isFile3(pkgfile)) {
           try {
-            var pkg2 = readPackageSync2(readFileSync9, pkgfile);
+            var pkg2 = readPackageSync2(readFileSync10, pkgfile);
           } catch (e3) {
           }
           if (pkg2 && opts.packageFilter) {
@@ -249909,8 +249909,8 @@ var require_snapshot_utils = __commonJS({
 var require_snapshot_recorder = __commonJS({
   "node_modules/undici/lib/mock/snapshot-recorder.js"(exports2, module2) {
     "use strict";
-    var { writeFile: writeFile6, readFile: readFile8, mkdir: mkdir7 } = __require("node:fs/promises");
-    var { dirname: dirname17, resolve: resolve14 } = __require("node:path");
+    var { writeFile: writeFile5, readFile: readFile8, mkdir: mkdir7 } = __require("node:fs/promises");
+    var { dirname: dirname18, resolve: resolve14 } = __require("node:path");
     var { setTimeout: setTimeout4, clearTimeout: clearTimeout2 } = __require("node:timers");
     var { InvalidArgumentError, UndiciError } = require_errors7();
     var { hashId, isUrlExcludedFactory, normalizeHeaders: normalizeHeaders2, createHeaderFilters } = require_snapshot_utils();
@@ -250134,12 +250134,12 @@ var require_snapshot_recorder = __commonJS({
           throw new InvalidArgumentError("Snapshot path is required");
         }
         const resolvedPath = resolve14(path75);
-        await mkdir7(dirname17(resolvedPath), { recursive: true });
+        await mkdir7(dirname18(resolvedPath), { recursive: true });
         const data = Array.from(this.#snapshots.entries()).map(([hash, snapshot]) => ({
           hash,
           snapshot
         }));
-        await writeFile6(resolvedPath, JSON.stringify(data, null, 2), { flush: true });
+        await writeFile5(resolvedPath, JSON.stringify(data, null, 2), { flush: true });
       }
       /**
        * Clears all recorded snapshots
@@ -269000,6 +269000,97 @@ var require_xterm_headless = __commonJS({
   }
 });
 
+// node_modules/fast-levenshtein/levenshtein.js
+var require_levenshtein = __commonJS({
+  "node_modules/fast-levenshtein/levenshtein.js"(exports2, module2) {
+    (function() {
+      "use strict";
+      var collator;
+      try {
+        collator = typeof Intl !== "undefined" && typeof Intl.Collator !== "undefined" ? Intl.Collator("generic", { sensitivity: "base" }) : null;
+      } catch (err2) {
+        console.log("Collator could not be initialized and wouldn't be used");
+      }
+      var prevRow = [], str2Char = [];
+      var Levenshtein = {
+        /**
+         * Calculate levenshtein distance of the two strings.
+         *
+         * @param str1 String the first string.
+         * @param str2 String the second string.
+         * @param [options] Additional options.
+         * @param [options.useCollator] Use `Intl.Collator` for locale-sensitive string comparison.
+         * @return Integer the levenshtein distance (0 and above).
+         */
+        get: function(str1, str2, options2) {
+          var useCollator = options2 && collator && options2.useCollator;
+          var str1Len = str1.length, str2Len = str2.length;
+          if (str1Len === 0) return str2Len;
+          if (str2Len === 0) return str1Len;
+          var curCol, nextCol, i4, j, tmp;
+          for (i4 = 0; i4 < str2Len; ++i4) {
+            prevRow[i4] = i4;
+            str2Char[i4] = str2.charCodeAt(i4);
+          }
+          prevRow[str2Len] = str2Len;
+          var strCmp;
+          if (useCollator) {
+            for (i4 = 0; i4 < str1Len; ++i4) {
+              nextCol = i4 + 1;
+              for (j = 0; j < str2Len; ++j) {
+                curCol = nextCol;
+                strCmp = 0 === collator.compare(str1.charAt(i4), String.fromCharCode(str2Char[j]));
+                nextCol = prevRow[j] + (strCmp ? 0 : 1);
+                tmp = curCol + 1;
+                if (nextCol > tmp) {
+                  nextCol = tmp;
+                }
+                tmp = prevRow[j + 1] + 1;
+                if (nextCol > tmp) {
+                  nextCol = tmp;
+                }
+                prevRow[j] = curCol;
+              }
+              prevRow[j] = nextCol;
+            }
+          } else {
+            for (i4 = 0; i4 < str1Len; ++i4) {
+              nextCol = i4 + 1;
+              for (j = 0; j < str2Len; ++j) {
+                curCol = nextCol;
+                strCmp = str1.charCodeAt(i4) === str2Char[j];
+                nextCol = prevRow[j] + (strCmp ? 0 : 1);
+                tmp = curCol + 1;
+                if (nextCol > tmp) {
+                  nextCol = tmp;
+                }
+                tmp = prevRow[j + 1] + 1;
+                if (nextCol > tmp) {
+                  nextCol = tmp;
+                }
+                prevRow[j] = curCol;
+              }
+              prevRow[j] = nextCol;
+            }
+          }
+          return nextCol;
+        }
+      };
+      if (typeof define !== "undefined" && define !== null && define.amd) {
+        define(function() {
+          return Levenshtein;
+        });
+      } else if (typeof module2 !== "undefined" && module2 !== null && typeof exports2 !== "undefined" && module2.exports === exports2) {
+        module2.exports = Levenshtein;
+      } else if (typeof self !== "undefined" && typeof self.postMessage === "function" && typeof self.importScripts === "function") {
+        self.Levenshtein = Levenshtein;
+      } else if (typeof window !== "undefined" && window !== null) {
+        window.Levenshtein = Levenshtein;
+      }
+    })();
+  }
+});
+
 // node_modules/deepmerge/dist/cjs.js
 var require_cjs2 = __commonJS({
   "node_modules/deepmerge/dist/cjs.js"(exports2, module2) {
@@ -269103,97 +269194,6 @@ var require_cjs2 = __commonJS({
   }
 });
 
-// node_modules/fast-levenshtein/levenshtein.js
-var require_levenshtein = __commonJS({
-  "node_modules/fast-levenshtein/levenshtein.js"(exports2, module2) {
-    (function() {
-      "use strict";
-      var collator;
-      try {
-        collator = typeof Intl !== "undefined" && typeof Intl.Collator !== "undefined" ? Intl.Collator("generic", { sensitivity: "base" }) : null;
-      } catch (err2) {
-        console.log("Collator could not be initialized and wouldn't be used");
-      }
-      var prevRow = [], str2Char = [];
-      var Levenshtein = {
-        /**
-         * Calculate levenshtein distance of the two strings.
-         *
-         * @param str1 String the first string.
-         * @param str2 String the second string.
-         * @param [options] Additional options.
-         * @param [options.useCollator] Use `Intl.Collator` for locale-sensitive string comparison.
-         * @return Integer the levenshtein distance (0 and above).
-         */
-        get: function(str1, str2, options2) {
-          var useCollator = options2 && collator && options2.useCollator;
-          var str1Len = str1.length, str2Len = str2.length;
-          if (str1Len === 0) return str2Len;
-          if (str2Len === 0) return str1Len;
-          var curCol, nextCol, i4, j, tmp;
-          for (i4 = 0; i4 < str2Len; ++i4) {
-            prevRow[i4] = i4;
-            str2Char[i4] = str2.charCodeAt(i4);
-          }
-          prevRow[str2Len] = str2Len;
-          var strCmp;
-          if (useCollator) {
-            for (i4 = 0; i4 < str1Len; ++i4) {
-              nextCol = i4 + 1;
-              for (j = 0; j < str2Len; ++j) {
-                curCol = nextCol;
-                strCmp = 0 === collator.compare(str1.charAt(i4), String.fromCharCode(str2Char[j]));
-                nextCol = prevRow[j] + (strCmp ? 0 : 1);
-                tmp = curCol + 1;
-                if (nextCol > tmp) {
-                  nextCol = tmp;
-                }
-                tmp = prevRow[j + 1] + 1;
-                if (nextCol > tmp) {
-                  nextCol = tmp;
-                }
-                prevRow[j] = curCol;
-              }
-              prevRow[j] = nextCol;
-            }
-          } else {
-            for (i4 = 0; i4 < str1Len; ++i4) {
-              nextCol = i4 + 1;
-              for (j = 0; j < str2Len; ++j) {
-                curCol = nextCol;
-                strCmp = str1.charCodeAt(i4) === str2Char[j];
-                nextCol = prevRow[j] + (strCmp ? 0 : 1);
-                tmp = curCol + 1;
-                if (nextCol > tmp) {
-                  nextCol = tmp;
-                }
-                tmp = prevRow[j + 1] + 1;
-                if (nextCol > tmp) {
-                  nextCol = tmp;
-                }
-                prevRow[j] = curCol;
-              }
-              prevRow[j] = nextCol;
-            }
-          }
-          return nextCol;
-        }
-      };
-      if (typeof define !== "undefined" && define !== null && define.amd) {
-        define(function() {
-          return Levenshtein;
-        });
-      } else if (typeof module2 !== "undefined" && module2 !== null && typeof exports2 !== "undefined" && module2.exports === exports2) {
-        module2.exports = Levenshtein;
-      } else if (typeof self !== "undefined" && typeof self.postMessage === "function" && typeof self.importScripts === "function") {
-        self.Levenshtein = Levenshtein;
-      } else if (typeof window !== "undefined" && window !== null) {
-        window.Levenshtein = Levenshtein;
-      }
-    })();
-  }
-});
-
 // node_modules/@kwsites/file-exists/dist/src/index.js
 var require_src62 = __commonJS({
   "node_modules/@kwsites/file-exists/dist/src/index.js"(exports2) {
@@ -275221,7 +275221,7 @@ var A2AExpressApp = class {
   }
 };
 
-// packages/a2a-server/node_modules/uuid/dist/esm/stringify.js
+// packages/a2a-server/node_modules/uuid/dist-node/stringify.js
 var byteToHex2 = [];
 for (let i4 = 0; i4 < 256; ++i4) {
   byteToHex2.push((i4 + 256).toString(16).slice(1));
@@ -275230,8 +275230,8 @@ function unsafeStringify2(arr, offset = 0) {
   return (byteToHex2[arr[offset + 0]] + byteToHex2[arr[offset + 1]] + byteToHex2[arr[offset + 2]] + byteToHex2[arr[offset + 3]] + "-" + byteToHex2[arr[offset + 4]] + byteToHex2[arr[offset + 5]] + "-" + byteToHex2[arr[offset + 6]] + byteToHex2[arr[offset + 7]] + "-" + byteToHex2[arr[offset + 8]] + byteToHex2[arr[offset + 9]] + "-" + byteToHex2[arr[offset + 10]] + byteToHex2[arr[offset + 11]] + byteToHex2[arr[offset + 12]] + byteToHex2[arr[offset + 13]] + byteToHex2[arr[offset + 14]] + byteToHex2[arr[offset + 15]]).toLowerCase();
 }
 
-// packages/a2a-server/node_modules/uuid/dist/esm/rng.js
-import { randomFillSync as randomFillSync2 } from "crypto";
+// packages/a2a-server/node_modules/uuid/dist-node/rng.js
+import { randomFillSync as randomFillSync2 } from "node:crypto";
 var rnds8Pool2 = new Uint8Array(256);
 var poolPtr2 = rnds8Pool2.length;
 function rng2() {
@@ -275242,15 +275242,12 @@ function rng2() {
   return rnds8Pool2.slice(poolPtr2, poolPtr2 += 16);
 }
 
-// packages/a2a-server/node_modules/uuid/dist/esm/native.js
-import { randomUUID as randomUUID2 } from "crypto";
+// packages/a2a-server/node_modules/uuid/dist-node/native.js
+import { randomUUID as randomUUID2 } from "node:crypto";
 var native_default2 = { randomUUID: randomUUID2 };
 
-// packages/a2a-server/node_modules/uuid/dist/esm/v4.js
-function v42(options2, buf, offset) {
-  if (native_default2.randomUUID && !buf && !options2) {
-    return native_default2.randomUUID();
-  }
+// packages/a2a-server/node_modules/uuid/dist-node/v4.js
+function _v4(options2, buf, offset) {
   options2 = options2 || {};
   const rnds = options2.random ?? options2.rng?.() ?? rng2();
   if (rnds.length < 16) {
@@ -275270,6 +275267,12 @@ function v42(options2, buf, offset) {
   }
   return unsafeStringify2(rnds);
 }
+function v42(options2, buf, offset) {
+  if (native_default2.randomUUID && !buf && !options2) {
+    return native_default2.randomUUID();
+  }
+  return _v4(options2, buf, offset);
+}
 var v4_default2 = v42;
 
 // node_modules/@google-cloud/storage/build/esm/src/nodejs-common/service.js
@@ -309407,7 +309410,142 @@ function getResponseText(response) {
   return null;
 }
 
+// packages/core/dist/src/config/models.js
+var PREVIEW_GEMINI_MODEL = "gemini-3-pro-preview";
+var PREVIEW_GEMINI_FLASH_MODEL = "gemini-3-flash-preview";
+var DEFAULT_GEMINI_MODEL = "gemini-2.5-pro";
+var DEFAULT_GEMINI_FLASH_MODEL = "gemini-2.5-flash";
+var DEFAULT_GEMINI_FLASH_LITE_MODEL = "gemini-2.5-flash-lite";
+var PREVIEW_GEMINI_MODEL_AUTO = "auto-gemini-3";
+var DEFAULT_GEMINI_MODEL_AUTO = "auto-gemini-2.5";
+var GEMINI_MODEL_ALIAS_AUTO = "auto";
+var GEMINI_MODEL_ALIAS_PRO = "pro";
+var GEMINI_MODEL_ALIAS_FLASH = "flash";
+var GEMINI_MODEL_ALIAS_FLASH_LITE = "flash-lite";
+var DEFAULT_GEMINI_EMBEDDING_MODEL = "gemini-embedding-001";
+var DEFAULT_THINKING_MODE = 8192;
+function resolveModel(requestedModel, previewFeaturesEnabled = false) {
+  switch (requestedModel) {
+    case PREVIEW_GEMINI_MODEL_AUTO: {
+      return PREVIEW_GEMINI_MODEL;
+    }
+    case DEFAULT_GEMINI_MODEL_AUTO: {
+      return DEFAULT_GEMINI_MODEL;
+    }
+    case GEMINI_MODEL_ALIAS_PRO: {
+      return previewFeaturesEnabled ? PREVIEW_GEMINI_MODEL : DEFAULT_GEMINI_MODEL;
+    }
+    case GEMINI_MODEL_ALIAS_FLASH: {
+      return previewFeaturesEnabled ? PREVIEW_GEMINI_FLASH_MODEL : DEFAULT_GEMINI_FLASH_MODEL;
+    }
+    case GEMINI_MODEL_ALIAS_FLASH_LITE: {
+      return DEFAULT_GEMINI_FLASH_LITE_MODEL;
+    }
+    default: {
+      return requestedModel;
+    }
+  }
+}
+function resolveClassifierModel(requestedModel, modelAlias, previewFeaturesEnabled = false) {
+  if (modelAlias === GEMINI_MODEL_ALIAS_FLASH) {
+    if (requestedModel === DEFAULT_GEMINI_MODEL_AUTO || requestedModel === DEFAULT_GEMINI_MODEL) {
+      return DEFAULT_GEMINI_FLASH_MODEL;
+    }
+    if (requestedModel === PREVIEW_GEMINI_MODEL_AUTO || requestedModel === PREVIEW_GEMINI_MODEL) {
+      return PREVIEW_GEMINI_FLASH_MODEL;
+    }
+    return resolveModel(GEMINI_MODEL_ALIAS_FLASH, previewFeaturesEnabled);
+  }
+  return resolveModel(requestedModel, previewFeaturesEnabled);
+}
+function isPreviewModel(model) {
+  return model === PREVIEW_GEMINI_MODEL || model === PREVIEW_GEMINI_FLASH_MODEL || model === PREVIEW_GEMINI_MODEL_AUTO;
+}
+function isGemini2Model(model) {
+  return /^gemini-2(\.|$)/.test(model);
+}
+function supportsMultimodalFunctionResponse(model) {
+  return model.startsWith("gemini-3-");
+}
+
 // packages/core/dist/src/utils/generateContentResponseUtilities.js
+function createFunctionResponsePart(callId, toolName, output) {
+  return {
+    functionResponse: {
+      id: callId,
+      name: toolName,
+      response: { output }
+    }
+  };
+}
+function toParts2(input) {
+  const parts2 = [];
+  for (const part of Array.isArray(input) ? input : [input]) {
+    if (typeof part === "string") {
+      parts2.push({ text: part });
+    } else if (part) {
+      parts2.push(part);
+    }
+  }
+  return parts2;
+}
+function convertToFunctionResponse(toolName, callId, llmContent, model) {
+  if (typeof llmContent === "string") {
+    return [createFunctionResponsePart(callId, toolName, llmContent)];
+  }
+  const parts2 = toParts2(llmContent);
+  const textParts = [];
+  const inlineDataParts = [];
+  const fileDataParts = [];
+  for (const part2 of parts2) {
+    if (part2.text !== void 0) {
+      textParts.push(part2.text);
+    } else if (part2.inlineData) {
+      inlineDataParts.push(part2);
+    } else if (part2.fileData) {
+      fileDataParts.push(part2);
+    } else if (part2.functionResponse) {
+      if (parts2.length > 1) {
+        debugLogger.warn("convertToFunctionResponse received multiple parts with a functionResponse. Only the functionResponse will be used, other parts will be ignored");
+      }
+      return [
+        {
+          functionResponse: {
+            id: callId,
+            name: toolName,
+            response: part2.functionResponse.response
+          }
+        }
+      ];
+    }
+  }
+  const part = {
+    functionResponse: {
+      id: callId,
+      name: toolName,
+      response: textParts.length > 0 ? { output: textParts.join("\n") } : {}
+    }
+  };
+  const isMultimodalFRSupported = supportsMultimodalFunctionResponse(model);
+  const siblingParts = [...fileDataParts];
+  if (inlineDataParts.length > 0) {
+    if (isMultimodalFRSupported) {
+      part.functionResponse.parts = inlineDataParts;
+    } else {
+      siblingParts.push(...inlineDataParts);
+    }
+  }
+  if (textParts.length === 0 && (inlineDataParts.length > 0 || fileDataParts.length > 0)) {
+    const totalBinaryItems = inlineDataParts.length + fileDataParts.length;
+    part.functionResponse.response = {
+      output: `Binary content provided (${totalBinaryItems} item(s)).`
+    };
+  }
+  if (siblingParts.length > 0) {
+    return [part, ...siblingParts];
+  }
+  return [part];
+}
 function getCitations(resp) {
   return (resp.candidates?.[0]?.citationMetadata?.citations ?? []).filter((citation) => citation.uri !== void 0).map((citation) => {
     if (citation.title) {
@@ -309781,7 +309919,7 @@ var DeclarativeTool = class {
    * A convenience method that builds and executes the tool in one step.
    * Never throws.
    * @param params The raw, untrusted parameters from the model.
-   * @params abortSignal a signal to abort.
+   * @param abortSignal a signal to abort.
    * @returns The result of the tool execution.
    */
   async validateBuildAndExecute(params, abortSignal) {
@@ -310224,7 +310362,7 @@ var __filename = fileURLToPath4(import.meta.url);
 var __dirname3 = path20.dirname(__filename);
 async function getVersion() {
   const pkgJson = await getPackageJson(__dirname3);
-  return "0.23.0-preview.2";
+  return "0.24.0-nightly.20251227.37be16243";
 }
 
 // packages/core/dist/src/code_assist/experiments/client_metadata.js
@@ -310360,7 +310498,7 @@ var CodeAssistServer = class {
     await this.recordCodeAssistMetrics({
       project: this.projectId,
       metadata: await getClientMetadata(),
-      metrics: [{ conversationOffered }]
+      metrics: [{ conversationOffered, timestamp: (/* @__PURE__ */ new Date()).toISOString() }]
     });
   }
   async recordConversationInteraction(interaction) {
@@ -310370,7 +310508,12 @@ var CodeAssistServer = class {
     await this.recordCodeAssistMetrics({
       project: this.projectId,
       metadata: await getClientMetadata(),
-      metrics: [{ conversationInteraction: interaction }]
+      metrics: [
+        {
+          conversationInteraction: interaction,
+          timestamp: (/* @__PURE__ */ new Date()).toISOString()
+        }
+      ]
     });
   }
   async recordCodeAssistMetrics(request3) {
@@ -310944,8 +311087,8 @@ function sanitizeHookName(hookName) {
   }
   if (command.includes("/") || command.includes("\\")) {
     const pathParts = command.split(/[/\\]/);
-    const basename15 = pathParts[pathParts.length - 1];
-    return basename15 || "unknown-command";
+    const basename14 = pathParts[pathParts.length - 1];
+    return basename14 || "unknown-command";
   }
   return command;
 }
@@ -312995,8 +313138,8 @@ var Float64Vector = import_vector.default.Float64Vector;
 var PointerVector = import_vector.default.PointerVector;
 
 // packages/core/dist/src/generated/git-commit.js
-var GIT_COMMIT_INFO = "bc40695ce";
-var CLI_VERSION = "0.23.0-preview.2";
+var GIT_COMMIT_INFO = "37be16243";
+var CLI_VERSION = "0.24.0-nightly.20251227.37be16243";
 
 // packages/core/dist/src/ide/detect-ide.js
 var IDE_DEFINITIONS = {
@@ -316199,7 +316342,7 @@ async function createContentGenerator(config3, gcConfig, sessionId2) {
       return FakeContentGenerator.fromFile(gcConfig.fakeResponses);
     }
     const version4 = await getVersion();
-    const model = getEffectiveModel(gcConfig.getModel(), gcConfig.getPreviewFeatures());
+    const model = resolveModel(gcConfig.getModel(), gcConfig.getPreviewFeatures());
     const customHeadersEnv = process.env["GEMINI_CLI_CUSTOM_HEADERS"] || void 0;
     const userAgent = `GeminiCLI/${version4}/${model} (${process.platform}; ${process.arch})`;
     const customHeadersMap = parseCustomHeaders(customHeadersEnv);
@@ -318948,6 +319091,55 @@ async function fileExists(filePath) {
     return false;
   }
 }
+async function saveTruncatedContent(content, callId, projectTempDir, threshold, truncateLines) {
+  if (content.length <= threshold) {
+    return { content };
+  }
+  let lines = content.split("\n");
+  let fileContent = content;
+  if (lines.length <= truncateLines) {
+    const wrapWidth = 120;
+    const wrappedLines = [];
+    for (const line of lines) {
+      if (line.length > wrapWidth) {
+        for (let i4 = 0; i4 < line.length; i4 += wrapWidth) {
+          wrappedLines.push(line.substring(i4, i4 + wrapWidth));
+        }
+      } else {
+        wrappedLines.push(line);
+      }
+    }
+    lines = wrappedLines;
+    fileContent = lines.join("\n");
+  }
+  const head = Math.floor(truncateLines / 5);
+  const beginning = lines.slice(0, head);
+  const end = lines.slice(-(truncateLines - head));
+  const truncatedContent = beginning.join("\n") + "\n... [CONTENT TRUNCATED] ...\n" + end.join("\n");
+  const safeFileName = `${path26.basename(callId)}.output`;
+  const outputFile = path26.join(projectTempDir, safeFileName);
+  try {
+    await fsPromises3.writeFile(outputFile, fileContent);
+    return {
+      content: `Tool output was too large and has been truncated.
+The full output has been saved to: ${outputFile}
+To read the complete output, use the ${READ_FILE_TOOL_NAME} tool with the absolute file path above. For large files, you can use the offset and limit parameters to read specific sections:
+- ${READ_FILE_TOOL_NAME} tool with offset=0, limit=100 to see the first 100 lines
+- ${READ_FILE_TOOL_NAME} tool with offset=N to skip N lines from the beginning
+- ${READ_FILE_TOOL_NAME} tool with limit=M to read only M lines at a time
+The truncated output below shows the beginning and end of the content. The marker '... [CONTENT TRUNCATED] ...' indicates where content was removed.
+This allows you to efficiently examine different parts of the output without loading the entire file.
+Truncated part of the output:
+${truncatedContent}`,
+      outputFile
+    };
+  } catch (_error) {
+    return {
+      content: truncatedContent + `
+[Note: Could not save full output to file]`
+    };
+  }
+}
 
 // packages/core/dist/src/utils/language-detection.js
 import * as path27 from "node:path";
@@ -353021,6 +353213,8 @@ var IdeClient = class _IdeClient {
       noProxy: [existingNoProxy, "127.0.0.1"].filter(Boolean).join(",")
     });
     const undiciPromise = Promise.resolve().then(() => __toESM(require_undici(), 1));
+    undiciPromise.catch(() => {
+    });
     return async (url5, init3) => {
       const { fetch: fetchFn } = await undiciPromise;
       const fetchOptions = {
@@ -354164,67 +354358,6 @@ function classifyFailureKind(error2) {
   return "unknown";
 }
 
-// packages/core/dist/src/config/models.js
-var PREVIEW_GEMINI_MODEL = "gemini-3-pro-preview";
-var PREVIEW_GEMINI_FLASH_MODEL = "gemini-3-flash-preview";
-var DEFAULT_GEMINI_MODEL = "gemini-2.5-pro";
-var DEFAULT_GEMINI_FLASH_MODEL = "gemini-2.5-flash";
-var DEFAULT_GEMINI_FLASH_LITE_MODEL = "gemini-2.5-flash-lite";
-var PREVIEW_GEMINI_MODEL_AUTO = "auto-gemini-3";
-var DEFAULT_GEMINI_MODEL_AUTO = "auto-gemini-2.5";
-var GEMINI_MODEL_ALIAS_AUTO = "auto";
-var GEMINI_MODEL_ALIAS_PRO = "pro";
-var GEMINI_MODEL_ALIAS_FLASH = "flash";
-var GEMINI_MODEL_ALIAS_FLASH_LITE = "flash-lite";
-var DEFAULT_GEMINI_EMBEDDING_MODEL = "gemini-embedding-001";
-var DEFAULT_THINKING_MODE = 8192;
-function resolveModel(requestedModel, previewFeaturesEnabled = false) {
-  switch (requestedModel) {
-    case PREVIEW_GEMINI_MODEL_AUTO: {
-      return PREVIEW_GEMINI_MODEL;
-    }
-    case DEFAULT_GEMINI_MODEL_AUTO: {
-      return DEFAULT_GEMINI_MODEL;
-    }
-    case GEMINI_MODEL_ALIAS_PRO: {
-      return previewFeaturesEnabled ? PREVIEW_GEMINI_MODEL : DEFAULT_GEMINI_MODEL;
-    }
-    case GEMINI_MODEL_ALIAS_FLASH: {
-      return previewFeaturesEnabled ? PREVIEW_GEMINI_FLASH_MODEL : DEFAULT_GEMINI_FLASH_MODEL;
-    }
-    case GEMINI_MODEL_ALIAS_FLASH_LITE: {
-      return DEFAULT_GEMINI_FLASH_LITE_MODEL;
-    }
-    default: {
-      return requestedModel;
-    }
-  }
-}
-function resolveClassifierModel(requestedModel, modelAlias, previewFeaturesEnabled = false) {
-  if (modelAlias === GEMINI_MODEL_ALIAS_FLASH) {
-    if (requestedModel === DEFAULT_GEMINI_MODEL_AUTO || requestedModel === DEFAULT_GEMINI_MODEL) {
-      return DEFAULT_GEMINI_FLASH_MODEL;
-    }
-    if (requestedModel === PREVIEW_GEMINI_MODEL_AUTO || requestedModel === PREVIEW_GEMINI_MODEL) {
-      return PREVIEW_GEMINI_FLASH_MODEL;
-    }
-    return resolveModel(GEMINI_MODEL_ALIAS_FLASH, previewFeaturesEnabled);
-  }
-  return resolveModel(requestedModel, previewFeaturesEnabled);
-}
-function getEffectiveModel(requestedModel, previewFeaturesEnabled) {
-  return resolveModel(requestedModel, previewFeaturesEnabled);
-}
-function isPreviewModel(model) {
-  return model === PREVIEW_GEMINI_MODEL || model === PREVIEW_GEMINI_FLASH_MODEL || model === PREVIEW_GEMINI_MODEL_AUTO;
-}
-function isGemini2Model(model) {
-  return /^gemini-2(\.|$)/.test(model);
-}
-function supportsMultimodalFunctionResponse(model) {
-  return model.startsWith("gemini-3-");
-}
-
 // packages/core/dist/src/availability/policyCatalog.js
 var DEFAULT_ACTIONS = {
   terminal: "prompt",
@@ -354373,9 +354506,6 @@ function applyAvailabilityTransition(getContext, failureKind) {
 // packages/core/dist/src/fallback/handler.js
 var UPGRADE_URL_PAGE = "https://goo.gle/set-up-gemini-code-assist";
 async function handleFallback(config3, failedModel, authType, error2) {
-  return handlePolicyDrivenFallback(config3, failedModel, authType, error2);
-}
-async function handlePolicyDrivenFallback(config3, failedModel, authType, error2) {
   if (authType !== AuthType2.LOGIN_WITH_GOOGLE) {
     return null;
   }
@@ -355099,10 +355229,10 @@ function correctPath(filePath, config3) {
   }
   const workspaceContext = config3.getWorkspaceContext();
   const searchPaths = workspaceContext.getDirectories();
-  const basename15 = path48.basename(filePath);
+  const basename14 = path48.basename(filePath);
   const normalizedTarget = filePath.replace(/\\/g, "/");
   const foundFiles = searchPaths.flatMap((searchPath) => bfsFileSearchSync(searchPath, {
-    fileName: basename15,
+    fileName: basename14,
     maxDirs: 50,
     // Capped to avoid deep hangs
     fileService: config3.getFileService(),
@@ -360686,6 +360816,136 @@ function convertColorToHex(color, colorMode, defaultColor) {
   return defaultColor;
 }
 
+// packages/core/dist/src/services/environmentSanitization.js
+function sanitizeEnvironment(processEnv, config3) {
+  if (!config3.enableEnvironmentVariableRedaction) {
+    return { ...processEnv };
+  }
+  const results = {};
+  const allowedSet = new Set((config3.allowedEnvironmentVariables || []).map((k) => k.toUpperCase()));
+  const blockedSet = new Set((config3.blockedEnvironmentVariables || []).map((k) => k.toUpperCase()));
+  const isStrictSanitization = !!processEnv["GITHUB_SHA"];
+  for (const key in processEnv) {
+    const value = processEnv[key];
+    if (!shouldRedactEnvironmentVariable(key, value, allowedSet, blockedSet, isStrictSanitization)) {
+      results[key] = value;
+    }
+  }
+  return results;
+}
+var ALWAYS_ALLOWED_ENVIRONMENT_VARIABLES = /* @__PURE__ */ new Set([
+  // Cross-platform
+  "PATH",
+  // Windows specific
+  "SYSTEMROOT",
+  "COMSPEC",
+  "PATHEXT",
+  "WINDIR",
+  "TEMP",
+  "TMP",
+  "USERPROFILE",
+  "SYSTEMDRIVE",
+  // Unix/Linux/macOS specific
+  "HOME",
+  "LANG",
+  "SHELL",
+  "TMPDIR",
+  "USER",
+  "LOGNAME",
+  // GitHub Action-related variables
+  "ADDITIONAL_CONTEXT",
+  "AVAILABLE_LABELS",
+  "BRANCH_NAME",
+  "DESCRIPTION",
+  "EVENT_NAME",
+  "GITHUB_ENV",
+  "IS_PULL_REQUEST",
+  "ISSUES_TO_TRIAGE",
+  "ISSUE_BODY",
+  "ISSUE_NUMBER",
+  "ISSUE_TITLE",
+  "PULL_REQUEST_NUMBER",
+  "REPOSITORY",
+  "TITLE",
+  "TRIGGERING_ACTOR"
+]);
+var NEVER_ALLOWED_ENVIRONMENT_VARIABLES = /* @__PURE__ */ new Set([
+  "CLIENT_ID",
+  "DB_URI",
+  "CONNECTION_STRING",
+  "AWS_DEFAULT_REGION",
+  "AZURE_CLIENT_ID",
+  "AZURE_TENANT_ID",
+  "SLACK_WEBHOOK_URL",
+  "TWILIO_ACCOUNT_SID",
+  "DATABASE_URL",
+  "GOOGLE_CLOUD_PROJECT",
+  "GOOGLE_CLOUD_ACCOUNT",
+  "FIREBASE_PROJECT_ID"
+]);
+var NEVER_ALLOWED_NAME_PATTERNS = [
+  /TOKEN/i,
+  /SECRET/i,
+  /PASSWORD/i,
+  /PASSWD/i,
+  /KEY/i,
+  /AUTH/i,
+  /CREDENTIAL/i,
+  /CREDS/i,
+  /PRIVATE/i,
+  /CERT/i
+];
+var NEVER_ALLOWED_VALUE_PATTERNS = [
+  /-----BEGIN (RSA|OPENSSH|EC|PGP) PRIVATE KEY-----/i,
+  /-----BEGIN CERTIFICATE-----/i,
+  // Credentials in URL
+  /(https?|ftp|smtp):\/\/[^:]+:[^@]+@/i,
+  // GitHub tokens (classic, fine-grained, OAuth, etc.)
+  /(ghp|gho|ghu|ghs|ghr|github_pat)_[a-zA-Z0-9_]{36,}/i,
+  // Google API keys
+  /AIzaSy[a-zA-Z0-9_\\-]{33}/i,
+  // Amazon AWS Access Key ID
+  /AKIA[A-Z0-9]{16}/i,
+  // Generic OAuth/JWT tokens
+  /eyJ[a-zA-Z0-9_-]*\.[a-zA-Z0-9_-]*\.[a-zA-Z0-9_-]*/i,
+  // Stripe API keys
+  /(s|r)k_(live|test)_[0-9a-zA-Z]{24}/i,
+  // Slack tokens (bot, user, etc.)
+  /xox[abpr]-[a-zA-Z0-9-]+/i
+];
+function shouldRedactEnvironmentVariable(key, value, allowedSet, blockedSet, isStrictSanitization = false) {
+  key = key.toUpperCase();
+  value = value?.toUpperCase();
+  if (allowedSet?.has(key)) {
+    return false;
+  }
+  if (blockedSet?.has(key)) {
+    return true;
+  }
+  if (ALWAYS_ALLOWED_ENVIRONMENT_VARIABLES.has(key) || key.startsWith("GEMINI_CLI_")) {
+    return false;
+  }
+  if (NEVER_ALLOWED_ENVIRONMENT_VARIABLES.has(key)) {
+    return true;
+  }
+  if (isStrictSanitization) {
+    return true;
+  }
+  for (const pattern of NEVER_ALLOWED_NAME_PATTERNS) {
+    if (pattern.test(key)) {
+      return true;
+    }
+  }
+  if (value) {
+    for (const pattern of NEVER_ALLOWED_VALUE_PATTERNS) {
+      if (pattern.test(value)) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
 // packages/core/dist/src/services/shellExecutionService.js
 var { Terminal } = import_headless.default;
 var SIGKILL_TIMEOUT_MS = 200;
@@ -360730,64 +360990,6 @@ var getFullBufferText = (terminal) => {
   }
   return lines.join("\n");
 };
-function getSanitizedEnv() {
-  const isRunningInGithub = process.env["GITHUB_SHA"] || process.env["SURFACE"] === "Github";
-  if (!isRunningInGithub) {
-    return { ...process.env };
-  }
-  const env2 = {};
-  const essentialVars = [
-    // Cross-platform
-    "PATH",
-    // Windows specific
-    "Path",
-    "SYSTEMROOT",
-    "SystemRoot",
-    "COMSPEC",
-    "ComSpec",
-    "PATHEXT",
-    "WINDIR",
-    "TEMP",
-    "TMP",
-    "USERPROFILE",
-    "SYSTEMDRIVE",
-    "SystemDrive",
-    // Unix/Linux/macOS specific
-    "HOME",
-    "LANG",
-    "SHELL",
-    "TMPDIR",
-    "USER",
-    "LOGNAME",
-    // GitHub Action-related variables
-    "ADDITIONAL_CONTEXT",
-    "AVAILABLE_LABELS",
-    "BRANCH_NAME",
-    "DESCRIPTION",
-    "EVENT_NAME",
-    "GITHUB_ENV",
-    "IS_PULL_REQUEST",
-    "ISSUES_TO_TRIAGE",
-    "ISSUE_BODY",
-    "ISSUE_NUMBER",
-    "ISSUE_TITLE",
-    "PULL_REQUEST_NUMBER",
-    "REPOSITORY",
-    "TITLE",
-    "TRIGGERING_ACTOR"
-  ];
-  for (const key of essentialVars) {
-    if (process.env[key] !== void 0) {
-      env2[key] = process.env[key];
-    }
-  }
-  for (const key in process.env) {
-    if (key.startsWith("GEMINI_CLI_")) {
-      env2[key] = process.env[key];
-    }
-  }
-  return env2;
-}
 var ShellExecutionService = class {
   static activePtys = /* @__PURE__ */ new Map();
   /**
@@ -360810,7 +361012,7 @@ var ShellExecutionService = class {
         }
       }
     }
-    return this.childProcessFallback(commandToExecute, cwd, onOutputEvent, abortSignal);
+    return this.childProcessFallback(commandToExecute, cwd, onOutputEvent, abortSignal, shellExecutionConfig.sanitizationConfig);
   }
   static appendAndTruncate(currentBuffer, chunk2, maxSize) {
     const chunkLength = chunk2.length;
@@ -360829,7 +361031,7 @@ var ShellExecutionService = class {
     const truncatedBuffer = currentBuffer.substring(charsToTrim);
     return { newBuffer: truncatedBuffer + chunk2, truncated: true };
   }
-  static childProcessFallback(commandToExecute, cwd, onOutputEvent, abortSignal) {
+  static childProcessFallback(commandToExecute, cwd, onOutputEvent, abortSignal, sanitizationConfig) {
     try {
       const isWindows5 = os16.platform() === "win32";
       const { executable, argsPrefix, shell } = getShellConfiguration();
@@ -360842,7 +361044,7 @@ var ShellExecutionService = class {
         shell: false,
         detached: !isWindows5,
         env: {
-          ...getSanitizedEnv(),
+          ...sanitizeEnvironment(process.env, sanitizationConfig),
           GEMINI_CLI: "1",
           TERM: "xterm-256color",
           PAGER: "cat",
@@ -361011,7 +361213,7 @@ var ShellExecutionService = class {
         cols,
         rows,
         env: {
-          ...getSanitizedEnv(),
+          ...sanitizeEnvironment(process.env, shellExecutionConfig.sanitizationConfig),
           GEMINI_CLI: "1",
           TERM: "xterm-256color",
           PAGER: shellExecutionConfig.pager ?? "cat",
@@ -361314,6 +361516,24 @@ var ShellExecutionService = class {
 };
 
 // packages/core/dist/src/utils/tool-utils.js
+var import_fast_levenshtein = __toESM(require_levenshtein(), 1);
+function getToolSuggestion(unknownToolName, allToolNames, topN = 3) {
+  const matches = allToolNames.map((toolName) => ({
+    name: toolName,
+    distance: import_fast_levenshtein.default.get(unknownToolName, toolName)
+  }));
+  matches.sort((a2, b) => a2.distance - b.distance);
+  const topNResults = matches.slice(0, topN);
+  if (topNResults.length === 0) {
+    return "";
+  }
+  const suggestedNames = topNResults.map((match2) => `"${match2.name}"`).join(", ");
+  if (topNResults.length > 1) {
+    return ` Did you mean one of: ${suggestedNames}?`;
+  } else {
+    return ` Did you mean ${suggestedNames}?`;
+  }
+}
 function doesToolInvocationMatch(toolOrToolName, invocation, patterns) {
   let toolNames;
   if (isTool(toolOrToolName)) {
@@ -361508,7 +361728,12 @@ var ShellToolInvocation = class extends BaseToolInvocation {
     return description;
   }
   getPolicyUpdateOptions(outcome) {
-    if (outcome === ToolConfirmationOutcome.ProceedAlwaysAndSave) {
+    if (outcome === ToolConfirmationOutcome.ProceedAlwaysAndSave || outcome === ToolConfirmationOutcome.ProceedAlways) {
+      const command = stripShellWrapper(this.params.command);
+      const rootCommands = [...new Set(getCommandRoots(command))];
+      if (rootCommands.length > 0) {
+        return { commandPrefix: rootCommands };
+      }
       return { commandPrefix: this.params.command };
     }
     return void 0;
@@ -361615,7 +361840,11 @@ var ShellToolInvocation = class extends BaseToolInvocation {
           updateOutput(cumulativeOutput);
           lastUpdateTime = Date.now();
         }
-      }, combinedController.signal, this.config.getEnableInteractiveShell(), { ...shellExecutionConfig, pager: "cat" });
+      }, combinedController.signal, this.config.getEnableInteractiveShell(), {
+        ...shellExecutionConfig,
+        pager: "cat",
+        sanitizationConfig: shellExecutionConfig?.sanitizationConfig ?? this.config.sanitizationConfig
+      });
       if (pid && setPidCallback) {
         setPidCallback(pid);
       }
@@ -367694,11 +367923,6 @@ My setup is complete. I will provide my first command in the next turn.
   ];
 }
 
-// packages/core/dist/src/core/coreToolScheduler.js
-import * as fs48 from "node:fs/promises";
-import * as path53 from "node:path";
-var import_fast_levenshtein = __toESM(require_levenshtein(), 1);
-
 // packages/core/dist/src/hooks/hookTranslator.js
 var HookTranslator = class {
 };
@@ -367868,6 +368092,13 @@ var HookTranslatorGenAIv1 = class extends HookTranslator {
 var defaultHookTranslator = new HookTranslatorGenAIv1();
 
 // packages/core/dist/src/hooks/types.js
+var ConfigSource;
+(function(ConfigSource2) {
+  ConfigSource2["Project"] = "project";
+  ConfigSource2["User"] = "user";
+  ConfigSource2["System"] = "system";
+  ConfigSource2["Extensions"] = "extensions";
+})(ConfigSource || (ConfigSource = {}));
 var HookEventName;
 (function(HookEventName2) {
   HookEventName2["BeforeTool"] = "BeforeTool";
@@ -367886,6 +368117,11 @@ var HookType;
 (function(HookType2) {
   HookType2["Command"] = "command";
 })(HookType || (HookType = {}));
+function getHookKey(hook) {
+  const name4 = hook.name || "";
+  const command = hook.command || "";
+  return `${name4}:${command}`;
+}
 function createHookOutput(eventName, data) {
   switch (eventName) {
     case "BeforeModel":
@@ -367969,32 +368205,6 @@ var DefaultHookOutput = class {
   }
 };
 var BeforeToolHookOutput = class extends DefaultHookOutput {
-  /**
-   * Get the effective blocking reason, considering compatibility fields
-   */
-  getEffectiveReason() {
-    if (this.hookSpecificOutput) {
-      if ("permissionDecisionReason" in this.hookSpecificOutput) {
-        const compatReason = this.hookSpecificOutput["permissionDecisionReason"];
-        if (typeof compatReason === "string") {
-          return compatReason;
-        }
-      }
-    }
-    return super.getEffectiveReason();
-  }
-  /**
-   * Check if this output represents a blocking decision, considering compatibility fields
-   */
-  isBlockingDecision() {
-    if (this.hookSpecificOutput && "permissionDecision" in this.hookSpecificOutput) {
-      const compatDecision = this.hookSpecificOutput["permissionDecision"];
-      if (compatDecision === "block" || compatDecision === "deny") {
-        return true;
-      }
-    }
-    return super.isBlockingDecision();
-  }
 };
 var BeforeModelHookOutput = class extends DefaultHookOutput {
   /**
@@ -368271,83 +368481,6 @@ async function executeToolWithHooks(invocation, toolName, signal, messageBus, ho
 }
 
 // packages/core/dist/src/core/coreToolScheduler.js
-function createFunctionResponsePart(callId, toolName, output) {
-  return {
-    functionResponse: {
-      id: callId,
-      name: toolName,
-      response: { output }
-    }
-  };
-}
-function convertToFunctionResponse(toolName, callId, llmContent, model) {
-  if (typeof llmContent === "string") {
-    return [createFunctionResponsePart(callId, toolName, llmContent)];
-  }
-  const parts2 = toParts2(llmContent);
-  const textParts = [];
-  const inlineDataParts = [];
-  const fileDataParts = [];
-  for (const part2 of parts2) {
-    if (part2.text !== void 0) {
-      textParts.push(part2.text);
-    } else if (part2.inlineData) {
-      inlineDataParts.push(part2);
-    } else if (part2.fileData) {
-      fileDataParts.push(part2);
-    } else if (part2.functionResponse) {
-      if (parts2.length > 1) {
-        debugLogger.warn("convertToFunctionResponse received multiple parts with a functionResponse. Only the functionResponse will be used, other parts will be ignored");
-      }
-      return [
-        {
-          functionResponse: {
-            id: callId,
-            name: toolName,
-            response: part2.functionResponse.response
-          }
-        }
-      ];
-    }
-  }
-  const part = {
-    functionResponse: {
-      id: callId,
-      name: toolName,
-      response: textParts.length > 0 ? { output: textParts.join("\n") } : {}
-    }
-  };
-  const isMultimodalFRSupported = supportsMultimodalFunctionResponse(model);
-  const siblingParts = [...fileDataParts];
-  if (inlineDataParts.length > 0) {
-    if (isMultimodalFRSupported) {
-      part.functionResponse.parts = inlineDataParts;
-    } else {
-      siblingParts.push(...inlineDataParts);
-    }
-  }
-  if (textParts.length === 0 && (inlineDataParts.length > 0 || fileDataParts.length > 0)) {
-    const totalBinaryItems = inlineDataParts.length + fileDataParts.length;
-    part.functionResponse.response = {
-      output: `Binary content provided (${totalBinaryItems} item(s)).`
-    };
-  }
-  if (siblingParts.length > 0) {
-    return [part, ...siblingParts];
-  }
-  return [part];
-}
-function toParts2(input) {
-  const parts2 = [];
-  for (const part of Array.isArray(input) ? input : [input]) {
-    if (typeof part === "string") {
-      parts2.push({ text: part });
-    } else if (part) {
-      parts2.push(part);
-    }
-  }
-  return parts2;
-}
 var createErrorResponse = (request3, error2, errorType) => ({
   callId: request3.callId,
   error: error2,
@@ -368364,55 +368497,6 @@ var createErrorResponse = (request3, error2, errorType) => ({
   errorType,
   contentLength: error2.message.length
 });
-async function truncateAndSaveToFile(content, callId, projectTempDir, threshold, truncateLines) {
-  if (content.length <= threshold) {
-    return { content };
-  }
-  let lines = content.split("\n");
-  let fileContent = content;
-  if (lines.length <= truncateLines) {
-    const wrapWidth = 120;
-    const wrappedLines = [];
-    for (const line of lines) {
-      if (line.length > wrapWidth) {
-        for (let i4 = 0; i4 < line.length; i4 += wrapWidth) {
-          wrappedLines.push(line.substring(i4, i4 + wrapWidth));
-        }
-      } else {
-        wrappedLines.push(line);
-      }
-    }
-    lines = wrappedLines;
-    fileContent = lines.join("\n");
-  }
-  const head = Math.floor(truncateLines / 5);
-  const beginning = lines.slice(0, head);
-  const end = lines.slice(-(truncateLines - head));
-  const truncatedContent = beginning.join("\n") + "\n... [CONTENT TRUNCATED] ...\n" + end.join("\n");
-  const safeFileName = `${path53.basename(callId)}.output`;
-  const outputFile = path53.join(projectTempDir, safeFileName);
-  try {
-    await fs48.writeFile(outputFile, fileContent);
-    return {
-      content: `Tool output was too large and has been truncated.
-The full output has been saved to: ${outputFile}
-To read the complete output, use the ${READ_FILE_TOOL_NAME} tool with the absolute file path above. For large files, you can use the offset and limit parameters to read specific sections:
-- ${READ_FILE_TOOL_NAME} tool with offset=0, limit=100 to see the first 100 lines
-- ${READ_FILE_TOOL_NAME} tool with offset=N to skip N lines from the beginning
-- ${READ_FILE_TOOL_NAME} tool with limit=M to read only M lines at a time
-The truncated output below shows the beginning and end of the content. The marker '... [CONTENT TRUNCATED] ...' indicates where content was removed.
-This allows you to efficiently examine different parts of the output without loading the entire file.
-Truncated part of the output:
-${truncatedContent}`,
-      outputFile
-    };
-  } catch (_error) {
-    return {
-      content: truncatedContent + `
-[Note: Could not save full output to file]`
-    };
-  }
-}
 var CoreToolScheduler = class _CoreToolScheduler {
   // Static WeakMap to track which MessageBus instances already have a handler subscribed
   // This prevents duplicate subscriptions when multiple CoreToolScheduler instances are created
@@ -368606,31 +368690,6 @@ var CoreToolScheduler = class _CoreToolScheduler {
       return new Error(String(e3));
     }
   }
-  /**
-   * Generates a suggestion string for a tool name that was not found in the registry.
-   * It finds the closest matches based on Levenshtein distance.
-   * @param unknownToolName The tool name that was not found.
-   * @param topN The number of suggestions to return. Defaults to 3.
-   * @returns A suggestion string like " Did you mean 'tool'?" or " Did you mean one of: 'tool1', 'tool2'?", or an empty string if no suggestions are found.
-   */
-  getToolSuggestion(unknownToolName, topN = 3) {
-    const allToolNames = this.config.getToolRegistry().getAllToolNames();
-    const matches = allToolNames.map((toolName) => ({
-      name: toolName,
-      distance: import_fast_levenshtein.default.get(unknownToolName, toolName)
-    }));
-    matches.sort((a2, b) => a2.distance - b.distance);
-    const topNResults = matches.slice(0, topN);
-    if (topNResults.length === 0) {
-      return "";
-    }
-    const suggestedNames = topNResults.map((match2) => `"${match2.name}"`).join(", ");
-    if (topNResults.length > 1) {
-      return ` Did you mean one of: ${suggestedNames}?`;
-    } else {
-      return ` Did you mean ${suggestedNames}?`;
-    }
-  }
   schedule(request3, signal) {
     return runInDevTraceSpan({ name: "schedule" }, async ({ metadata: spanMetadata }) => {
       spanMetadata.input = request3;
@@ -368687,7 +368746,7 @@ var CoreToolScheduler = class _CoreToolScheduler {
       const newToolCalls = requestsToProcess.map((reqInfo) => {
         const toolInstance = this.config.getToolRegistry().getTool(reqInfo.name);
         if (!toolInstance) {
-          const suggestion = this.getToolSuggestion(reqInfo.name);
+          const suggestion = getToolSuggestion(reqInfo.name, this.config.getToolRegistry().getAllToolNames());
           const errorMessage = `Tool "${reqInfo.name}" not found in registry. Tools must use the exact names that are registered.${suggestion}`;
           return {
             status: "error",
@@ -368902,7 +368961,7 @@ var CoreToolScheduler = class _CoreToolScheduler {
                 const originalContentLength = content.length;
                 const threshold = this.config.getTruncateToolOutputThreshold();
                 const lines = this.config.getTruncateToolOutputLines();
-                const truncatedResult = await truncateAndSaveToFile(content, callId, this.config.storage.getProjectTempDir(), threshold, lines);
+                const truncatedResult = await saveTruncatedContent(content, callId, this.config.storage.getProjectTempDir(), threshold, lines);
                 content = truncatedResult.content;
                 outputFile = truncatedResult.outputFile;
                 if (outputFile) {
@@ -369071,8 +369130,8 @@ function parseThought(rawText) {
 }
 
 // packages/core/dist/src/services/chatRecordingService.js
-import path54 from "node:path";
-import fs49 from "node:fs";
+import path53 from "node:path";
+import fs48 from "node:fs";
 import { randomUUID as randomUUID5 } from "node:crypto";
 var SESSION_FILE_PREFIX = "session-";
 var ChatRecordingService = class {
@@ -369102,11 +369161,11 @@ var ChatRecordingService = class {
         });
         this.cachedLastConvData = null;
       } else {
-        const chatsDir = path54.join(this.config.storage.getProjectTempDir(), "chats");
-        fs49.mkdirSync(chatsDir, { recursive: true });
+        const chatsDir = path53.join(this.config.storage.getProjectTempDir(), "chats");
+        fs48.mkdirSync(chatsDir, { recursive: true });
         const timestamp = (/* @__PURE__ */ new Date()).toISOString().slice(0, 16).replace(/:/g, "-");
         const filename = `${SESSION_FILE_PREFIX}${timestamp}-${this.sessionId.slice(0, 8)}.json`;
-        this.conversationFile = path54.join(chatsDir, filename);
+        this.conversationFile = path53.join(chatsDir, filename);
         this.writeConversation({
           sessionId: this.sessionId,
           projectHash: this.projectHash,
@@ -369276,7 +369335,7 @@ var ChatRecordingService = class {
    */
   readConversation() {
     try {
-      this.cachedLastConvData = fs49.readFileSync(this.conversationFile, "utf8");
+      this.cachedLastConvData = fs48.readFileSync(this.conversationFile, "utf8");
       return JSON.parse(this.cachedLastConvData);
     } catch (error2) {
       if (error2.code !== "ENOENT") {
@@ -369305,7 +369364,7 @@ var ChatRecordingService = class {
         conversation.lastUpdated = (/* @__PURE__ */ new Date()).toISOString();
         const newContent = JSON.stringify(conversation, null, 2);
         this.cachedLastConvData = newContent;
-        fs49.writeFileSync(this.conversationFile, newContent);
+        fs48.writeFileSync(this.conversationFile, newContent);
       }
     } catch (error2) {
       debugLogger.error("Error writing conversation file.", error2);
@@ -369360,9 +369419,9 @@ var ChatRecordingService = class {
    */
   deleteSession(sessionId2) {
     try {
-      const chatsDir = path54.join(this.config.storage.getProjectTempDir(), "chats");
-      const sessionPath = path54.join(chatsDir, `${sessionId2}.json`);
-      fs49.unlinkSync(sessionPath);
+      const chatsDir = path53.join(this.config.storage.getProjectTempDir(), "chats");
+      const sessionPath = path53.join(chatsDir, `${sessionId2}.json`);
+      fs48.unlinkSync(sessionPath);
     } catch (error2) {
       debugLogger.error("Error deleting session file.", error2);
       throw error2;
@@ -370202,8 +370261,8 @@ ${[...this.pendingCitations].sort().join("\n")}`
 };
 
 // packages/core/dist/src/core/prompts.js
-import path55 from "node:path";
-import fs50 from "node:fs";
+import path54 from "node:path";
+import fs49 from "node:fs";
 import os18 from "node:os";
 import process21 from "node:process";
 
@@ -370523,7 +370582,7 @@ function resolvePathFromEnv(envVar) {
       if (customPath === "~") {
         customPath = home;
       } else {
-        customPath = path55.join(home, customPath.slice(2));
+        customPath = path54.join(home, customPath.slice(2));
       }
     } catch (error2) {
       debugLogger.warn(`Could not resolve home directory for path: ${trimmedEnvVar}`, error2);
@@ -370532,20 +370591,20 @@ function resolvePathFromEnv(envVar) {
   }
   return {
     isSwitch: false,
-    value: path55.resolve(customPath),
+    value: path54.resolve(customPath),
     isDisabled: false
   };
 }
 function getCoreSystemPrompt(config3, userMemory) {
   let systemMdEnabled = false;
-  let systemMdPath = path55.resolve(path55.join(GEMINI_DIR, "system.md"));
+  let systemMdPath = path54.resolve(path54.join(GEMINI_DIR, "system.md"));
   const systemMdResolution = resolvePathFromEnv(process21.env["GEMINI_SYSTEM_MD"]);
   if (systemMdResolution.value && !systemMdResolution.isDisabled) {
     systemMdEnabled = true;
     if (!systemMdResolution.isSwitch) {
       systemMdPath = systemMdResolution.value;
     }
-    if (!fs50.existsSync(systemMdPath)) {
+    if (!fs49.existsSync(systemMdPath)) {
       throw new Error(`missing system prompt file '${systemMdPath}'`);
     }
   }
@@ -370558,7 +370617,7 @@ function getCoreSystemPrompt(config3, userMemory) {
   const interactiveMode = config3.isInteractiveShellEnabled();
   let basePrompt;
   if (systemMdEnabled) {
-    basePrompt = fs50.readFileSync(systemMdPath, "utf8");
+    basePrompt = fs49.readFileSync(systemMdPath, "utf8");
   } else {
     const promptConfig = {
       preamble: `You are ${interactiveMode ? "an interactive " : "a non-interactive "}CLI agent specializing in software engineering tasks. Your primary goal is to help users safely and efficiently, adhering strictly to the following instructions and utilizing your available tools.`,
@@ -370764,8 +370823,8 @@ Your core function is efficient and safe assistance. Balance extreme conciseness
   const writeSystemMdResolution = resolvePathFromEnv(process21.env["GEMINI_WRITE_SYSTEM_MD"]);
   if (writeSystemMdResolution.value && !writeSystemMdResolution.isDisabled) {
     const writePath = writeSystemMdResolution.isSwitch ? systemMdPath : writeSystemMdResolution.value;
-    fs50.mkdirSync(path55.dirname(writePath), { recursive: true });
-    fs50.writeFileSync(writePath, basePrompt);
+    fs49.mkdirSync(path54.dirname(writePath), { recursive: true });
+    fs49.writeFileSync(writePath, basePrompt);
   }
   const memorySuffix = userMemory && userMemory.trim().length > 0 ? `
 
@@ -371723,7 +371782,7 @@ var GeminiClient = class {
       };
     }
   }
-  _getEffectiveModelForCurrentTurn() {
+  _getActiveModelForCurrentTurn() {
     if (this.currentSequenceModel) {
       return this.currentSequenceModel;
     }
@@ -371766,7 +371825,7 @@ var GeminiClient = class {
     if (!boundedTurns) {
       return new Turn(this.getChat(), prompt_id);
     }
-    const modelForLimitCheck = this._getEffectiveModelForCurrentTurn();
+    const modelForLimitCheck = this._getActiveModelForCurrentTurn();
     const estimatedRequestTokenCount = await calculateRequestTokenCount(request3, this.getContentGeneratorOrFail(), modelForLimitCheck);
     const remainingTokenCount = tokenLimit(modelForLimitCheck) - this.getChat().getLastPromptTokenCount();
     if (estimatedRequestTokenCount > remainingTokenCount * 0.95) {
@@ -371933,7 +371992,7 @@ var GeminiClient = class {
     }
   }
   async tryCompressChat(prompt_id, force = false) {
-    const model = this._getEffectiveModelForCurrentTurn();
+    const model = this._getActiveModelForCurrentTurn();
     const { newHistory, info: info2 } = await this.compressionService.compress(this.getChat(), prompt_id, force, model, this.config, this.hasFailedCompressionAttempt);
     if (info2.compressionStatus === CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT) {
       this.hasFailedCompressionAttempt = this.hasFailedCompressionAttempt || !force;
@@ -371950,8 +372009,8 @@ var GeminiClient = class {
 
 // packages/core/dist/src/utils/gitIgnoreParser.js
 var import_ignore4 = __toESM(require_ignore(), 1);
-import * as fs51 from "node:fs";
-import * as path56 from "node:path";
+import * as fs50 from "node:fs";
+import * as path55 from "node:path";
 var GitIgnoreParser = class {
   extraPatterns;
   projectRoot;
@@ -371960,7 +372019,7 @@ var GitIgnoreParser = class {
   processedExtraPatterns = [];
   constructor(projectRoot, extraPatterns) {
     this.extraPatterns = extraPatterns;
-    this.projectRoot = path56.resolve(projectRoot);
+    this.projectRoot = path55.resolve(projectRoot);
     if (this.extraPatterns) {
       this.processedExtraPatterns = this.processPatterns(this.extraPatterns, ".");
     }
@@ -371968,12 +372027,12 @@ var GitIgnoreParser = class {
   loadPatternsForFile(patternsFilePath) {
     let content;
     try {
-      content = fs51.readFileSync(patternsFilePath, "utf-8");
+      content = fs50.readFileSync(patternsFilePath, "utf-8");
     } catch (_error) {
       return [];
     }
-    const isExcludeFile = patternsFilePath.endsWith(path56.join(".git", "info", "exclude"));
-    const relativeBaseDir = isExcludeFile ? "." : path56.dirname(path56.relative(this.projectRoot, patternsFilePath)).split(path56.sep).join(path56.posix.sep);
+    const isExcludeFile = patternsFilePath.endsWith(path55.join(".git", "info", "exclude"));
+    const relativeBaseDir = isExcludeFile ? "." : path55.dirname(path55.relative(this.projectRoot, patternsFilePath)).split(path55.sep).join(path55.posix.sep);
     const rawPatterns = content.split("\n");
     return this.processPatterns(rawPatterns, relativeBaseDir);
   }
@@ -371993,9 +372052,9 @@ var GitIgnoreParser = class {
       let newPattern = p;
       if (relativeBaseDir && relativeBaseDir !== ".") {
         if (!isAnchoredInFile && !p.includes("/")) {
-          newPattern = path56.posix.join("**", p);
+          newPattern = path55.posix.join("**", p);
         }
-        newPattern = path56.posix.join(relativeBaseDir, newPattern);
+        newPattern = path55.posix.join(relativeBaseDir, newPattern);
         if (!newPattern.startsWith("/")) {
           newPattern = "/" + newPattern;
         }
@@ -372013,13 +372072,13 @@ var GitIgnoreParser = class {
     if (!filePath || typeof filePath !== "string") {
       return false;
     }
-    const absoluteFilePath = path56.resolve(this.projectRoot, filePath);
+    const absoluteFilePath = path55.resolve(this.projectRoot, filePath);
     if (!absoluteFilePath.startsWith(this.projectRoot)) {
       return false;
     }
     try {
-      const resolved = path56.resolve(this.projectRoot, filePath);
-      const relativePath = path56.relative(this.projectRoot, resolved);
+      const resolved = path55.resolve(this.projectRoot, filePath);
+      const relativePath = path55.relative(this.projectRoot, resolved);
       if (relativePath === "" || relativePath.startsWith("..")) {
         return false;
       }
@@ -372030,19 +372089,19 @@ var GitIgnoreParser = class {
       const ig = (0, import_ignore4.default)();
       ig.add(".git");
       if (this.globalPatterns === void 0) {
-        const excludeFile = path56.join(this.projectRoot, ".git", "info", "exclude");
-        this.globalPatterns = fs51.existsSync(excludeFile) ? this.loadPatternsForFile(excludeFile) : [];
+        const excludeFile = path55.join(this.projectRoot, ".git", "info", "exclude");
+        this.globalPatterns = fs50.existsSync(excludeFile) ? this.loadPatternsForFile(excludeFile) : [];
       }
       ig.add(this.globalPatterns);
-      const pathParts = relativePath.split(path56.sep);
+      const pathParts = relativePath.split(path55.sep);
       const dirsToVisit = [this.projectRoot];
       let currentAbsDir = this.projectRoot;
       for (let i4 = 0; i4 < pathParts.length - 1; i4++) {
-        currentAbsDir = path56.join(currentAbsDir, pathParts[i4]);
+        currentAbsDir = path55.join(currentAbsDir, pathParts[i4]);
         dirsToVisit.push(currentAbsDir);
       }
       for (const dir of dirsToVisit) {
-        const relativeDir = path56.relative(this.projectRoot, dir);
+        const relativeDir = path55.relative(this.projectRoot, dir);
         if (relativeDir) {
           const normalizedRelativeDir = relativeDir.replace(/\\/g, "/");
           const igPlusExtras = (0, import_ignore4.default)().add(ig).add(this.processedExtraPatterns);
@@ -372056,8 +372115,8 @@ var GitIgnoreParser = class {
             ig.add(patterns);
           }
         } else {
-          const gitignorePath = path56.join(dir, ".gitignore");
-          if (fs51.existsSync(gitignorePath)) {
+          const gitignorePath = path55.join(dir, ".gitignore");
+          if (fs50.existsSync(gitignorePath)) {
             const patterns = this.loadPatternsForFile(gitignorePath);
             this.cache.set(dir, patterns);
             ig.add(patterns);
@@ -372077,14 +372136,14 @@ var GitIgnoreParser = class {
 };
 
 // packages/core/dist/src/services/fileDiscoveryService.js
-import * as path57 from "node:path";
+import * as path56 from "node:path";
 var FileDiscoveryService = class {
   gitIgnoreFilter = null;
   geminiIgnoreFilter = null;
   combinedIgnoreFilter = null;
   projectRoot;
   constructor(projectRoot) {
-    this.projectRoot = path57.resolve(projectRoot);
+    this.projectRoot = path56.resolve(projectRoot);
     if (isGitRepository(this.projectRoot)) {
       this.gitIgnoreFilter = new GitIgnoreParser(this.projectRoot);
     }
@@ -372136,8 +372195,8 @@ var FileDiscoveryService = class {
 };
 
 // packages/core/dist/src/services/gitService.js
-import * as fs52 from "node:fs/promises";
-import * as path58 from "node:path";
+import * as fs51 from "node:fs/promises";
+import * as path57 from "node:path";
 
 // node_modules/simple-git/dist/esm/index.js
 var import_file_exists = __toESM(require_dist8(), 1);
@@ -376665,7 +376724,7 @@ var GitService = class {
   projectRoot;
   storage;
   constructor(projectRoot, storage2) {
-    this.projectRoot = path58.resolve(projectRoot);
+    this.projectRoot = path57.resolve(projectRoot);
     this.storage = storage2;
   }
   getHistoryDir() {
@@ -376696,34 +376755,39 @@ var GitService = class {
    */
   async setupShadowGitRepository() {
     const repoDir = this.getHistoryDir();
-    const gitConfigPath = path58.join(repoDir, ".gitconfig");
-    await fs52.mkdir(repoDir, { recursive: true });
+    const gitConfigPath = path57.join(repoDir, ".gitconfig");
+    await fs51.mkdir(repoDir, { recursive: true });
     const gitConfigContent = "[user]\n  name = Gemini CLI\n  email = gemini-cli@google.com\n[commit]\n  gpgsign = false\n";
-    await fs52.writeFile(gitConfigPath, gitConfigContent);
+    await fs51.writeFile(gitConfigPath, gitConfigContent);
     const repo = simpleGit(repoDir);
-    const isRepoDefined = await repo.checkIsRepo(CheckRepoActions.IS_REPO_ROOT);
+    let isRepoDefined = false;
+    try {
+      isRepoDefined = await repo.checkIsRepo(CheckRepoActions.IS_REPO_ROOT);
+    } catch (error2) {
+      debugLogger.debug(`checkIsRepo failed, will initialize repository: ${error2 instanceof Error ? error2.message : String(error2)}`);
+    }
     if (!isRepoDefined) {
       await repo.init(false, {
         "--initial-branch": "main"
       });
       await repo.commit("Initial commit", { "--allow-empty": null });
     }
-    const userGitIgnorePath = path58.join(this.projectRoot, ".gitignore");
-    const shadowGitIgnorePath = path58.join(repoDir, ".gitignore");
+    const userGitIgnorePath = path57.join(this.projectRoot, ".gitignore");
+    const shadowGitIgnorePath = path57.join(repoDir, ".gitignore");
     let userGitIgnoreContent = "";
     try {
-      userGitIgnoreContent = await fs52.readFile(userGitIgnorePath, "utf-8");
+      userGitIgnoreContent = await fs51.readFile(userGitIgnorePath, "utf-8");
     } catch (error2) {
       if (isNodeError(error2) && error2.code !== "ENOENT") {
         throw error2;
       }
     }
-    await fs52.writeFile(shadowGitIgnorePath, userGitIgnoreContent);
+    await fs51.writeFile(shadowGitIgnorePath, userGitIgnoreContent);
   }
   get shadowGitRepository() {
     const repoDir = this.getHistoryDir();
     return simpleGit(this.projectRoot).env({
-      GIT_DIR: path58.join(repoDir, ".git"),
+      GIT_DIR: path57.join(repoDir, ".git"),
       GIT_WORK_TREE: this.projectRoot,
       // Prevent git from using the user's global git config.
       HOME: repoDir,
@@ -376785,13 +376849,13 @@ function shouldAttemptBrowserLaunch() {
 }
 
 // packages/core/dist/src/services/fileSystemService.js
-import fs53 from "node:fs/promises";
+import fs52 from "node:fs/promises";
 var StandardFileSystemService = class {
   async readTextFile(filePath) {
-    return fs53.readFile(filePath, "utf-8");
+    return fs52.readFile(filePath, "utf-8");
   }
   async writeTextFile(filePath, content) {
-    await fs53.writeFile(filePath, content, "utf-8");
+    await fs52.writeFile(filePath, content, "utf-8");
   }
 };
 
@@ -377112,7 +377176,7 @@ var OverrideStrategy = class {
     if (overrideModel === DEFAULT_GEMINI_MODEL_AUTO || overrideModel === PREVIEW_GEMINI_MODEL_AUTO)
       return null;
     return {
-      model: getEffectiveModel(overrideModel, config3.getPreviewFeatures()),
+      model: resolveModel(overrideModel, config3.getPreviewFeatures()),
       metadata: {
         source: this.name,
         latencyMs: 0,
@@ -377548,14 +377612,14 @@ var DEFAULT_MODEL_CONFIGS = {
 };
 
 // packages/core/dist/src/utils/memoryDiscovery.js
-import * as fs55 from "node:fs/promises";
+import * as fs54 from "node:fs/promises";
 import * as fsSync2 from "node:fs";
-import * as path60 from "node:path";
+import * as path59 from "node:path";
 import { homedir as homedir4 } from "node:os";
 
 // packages/core/dist/src/utils/memoryImportProcessor.js
-import * as fs54 from "node:fs/promises";
-import * as path59 from "node:path";
+import * as fs53 from "node:fs/promises";
+import * as path58 from "node:path";
 
 // node_modules/marked/lib/marked.esm.js
 function _getDefaults() {
@@ -379703,23 +379767,23 @@ var logger4 = {
   error: (...args2) => debugLogger.error("[ERROR] [ImportProcessor]", ...args2)
 };
 async function findProjectRoot(startDir) {
-  let currentDir = path59.resolve(startDir);
+  let currentDir = path58.resolve(startDir);
   while (true) {
-    const gitPath = path59.join(currentDir, ".git");
+    const gitPath = path58.join(currentDir, ".git");
     try {
-      const stats = await fs54.lstat(gitPath);
+      const stats = await fs53.lstat(gitPath);
       if (stats.isDirectory()) {
         return currentDir;
       }
     } catch {
     }
-    const parentDir = path59.dirname(currentDir);
+    const parentDir = path58.dirname(currentDir);
     if (parentDir === currentDir) {
       break;
     }
     currentDir = parentDir;
   }
-  return path59.resolve(startDir);
+  return path58.resolve(startDir);
 }
 function hasMessage(err2) {
   return typeof err2 === "object" && err2 !== null && "message" in err2 && typeof err2.message === "string";
@@ -379808,7 +379872,7 @@ async function processImports(content, basePath, debugMode = false, importState
     const flatFiles = [];
     const processedFiles = /* @__PURE__ */ new Set();
     async function processFlat(fileContent, fileBasePath, filePath, depth) {
-      const normalizedPath = path59.normalize(filePath);
+      const normalizedPath = path58.normalize(filePath);
       if (processedFiles.has(normalizedPath))
         return;
       processedFiles.add(normalizedPath);
@@ -379823,14 +379887,14 @@ async function processImports(content, basePath, debugMode = false, importState
         if (!validateImportPath(importPath, fileBasePath, [projectRoot || ""])) {
           continue;
         }
-        const fullPath = path59.resolve(fileBasePath, importPath);
-        const normalizedFullPath = path59.normalize(fullPath);
+        const fullPath = path58.resolve(fileBasePath, importPath);
+        const normalizedFullPath = path58.normalize(fullPath);
         if (processedFiles.has(normalizedFullPath))
           continue;
         try {
-          await fs54.access(fullPath);
-          const importedContent = await fs54.readFile(fullPath, "utf-8");
-          await processFlat(importedContent, path59.dirname(fullPath), normalizedFullPath, depth + 1);
+          await fs53.access(fullPath);
+          const importedContent = await fs53.readFile(fullPath, "utf-8");
+          await processFlat(importedContent, path58.dirname(fullPath), normalizedFullPath, depth + 1);
         } catch (error2) {
           if (debugMode) {
             logger4.warn(`Failed to import ${fullPath}: ${hasMessage(error2) ? error2.message : "Unknown error"}`);
@@ -379838,7 +379902,7 @@ async function processImports(content, basePath, debugMode = false, importState
         }
       }
     }
-    const rootPath = path59.normalize(importState.currentFile || path59.resolve(basePath));
+    const rootPath = path58.normalize(importState.currentFile || path58.resolve(basePath));
     await processFlat(content, basePath, rootPath, 0);
     const flatContent = flatFiles.map((f3) => `--- File: ${f3.path} ---
 ${f3.content.trim()}
@@ -379865,14 +379929,14 @@ ${f3.content.trim()}
       result += `<!-- Import failed: ${importPath} - Path traversal attempt -->`;
       continue;
     }
-    const fullPath = path59.resolve(basePath, importPath);
+    const fullPath = path58.resolve(basePath, importPath);
     if (importState.processedFiles.has(fullPath)) {
       result += `<!-- File already processed: ${importPath} -->`;
       continue;
     }
     try {
-      await fs54.access(fullPath);
-      const fileContent = await fs54.readFile(fullPath, "utf-8");
+      await fs53.access(fullPath);
+      const fileContent = await fs53.readFile(fullPath, "utf-8");
       const newImportState = {
         ...importState,
         processedFiles: new Set(importState.processedFiles),
@@ -379880,7 +379944,7 @@ ${f3.content.trim()}
         currentFile: fullPath
       };
       newImportState.processedFiles.add(fullPath);
-      const imported = await processImports(fileContent, path59.dirname(fullPath), debugMode, newImportState, projectRoot, importFormat);
+      const imported = await processImports(fileContent, path58.dirname(fullPath), debugMode, newImportState, projectRoot, importFormat);
       result += `<!-- Imported from: ${importPath} -->
 ${imported.content}
 <!-- End of import from: ${importPath} -->`;
@@ -379909,7 +379973,7 @@ function validateImportPath(importPath, basePath, allowedDirectories) {
   if (/^(file|https?):\/\//.test(importPath)) {
     return false;
   }
-  const resolvedPath = path59.resolve(basePath, importPath);
+  const resolvedPath = path58.resolve(basePath, importPath);
   return allowedDirectories.some((allowedDir) => isSubpath(allowedDir, resolvedPath));
 }
 
@@ -379924,11 +379988,11 @@ var logger5 = {
   error: (...args2) => console.error("[ERROR] [MemoryDiscovery]", ...args2)
 };
 async function findProjectRoot2(startDir) {
-  let currentDir = path60.resolve(startDir);
+  let currentDir = path59.resolve(startDir);
   while (true) {
-    const gitPath = path60.join(currentDir, ".git");
+    const gitPath = path59.join(currentDir, ".git");
     try {
-      const stats = await fs55.lstat(gitPath);
+      const stats = await fs54.lstat(gitPath);
       if (stats.isDirectory()) {
         return currentDir;
       }
@@ -379944,7 +380008,7 @@ async function findProjectRoot2(startDir) {
         }
       }
     }
-    const parentDir = path60.dirname(currentDir);
+    const parentDir = path59.dirname(currentDir);
     if (parentDir === currentDir) {
       return null;
     }
@@ -379980,17 +380044,17 @@ async function getGeminiMdFilePathsInternalForEachDir(dir, userHomePath, debugMo
   const allPaths = /* @__PURE__ */ new Set();
   const geminiMdFilenames = getAllGeminiMdFilenames();
   for (const geminiMdFilename of geminiMdFilenames) {
-    const resolvedHome = path60.resolve(userHomePath);
-    const globalMemoryPath = path60.join(resolvedHome, GEMINI_DIR, geminiMdFilename);
+    const resolvedHome = path59.resolve(userHomePath);
+    const globalMemoryPath = path59.join(resolvedHome, GEMINI_DIR, geminiMdFilename);
     try {
-      await fs55.access(globalMemoryPath, fsSync2.constants.R_OK);
+      await fs54.access(globalMemoryPath, fsSync2.constants.R_OK);
       allPaths.add(globalMemoryPath);
       if (debugMode)
         logger5.debug(`Found readable global ${geminiMdFilename}: ${globalMemoryPath}`);
     } catch {
     }
     if (dir && folderTrust) {
-      const resolvedCwd = path60.resolve(dir);
+      const resolvedCwd = path59.resolve(dir);
       if (debugMode)
         logger5.debug(`Searching for ${geminiMdFilename} starting from CWD: ${resolvedCwd}`);
       const projectRoot = await findProjectRoot2(resolvedCwd);
@@ -379998,14 +380062,14 @@ async function getGeminiMdFilePathsInternalForEachDir(dir, userHomePath, debugMo
         logger5.debug(`Determined project root: ${projectRoot ?? "None"}`);
       const upwardPaths = [];
       let currentDir = resolvedCwd;
-      const ultimateStopDir = projectRoot ? path60.dirname(projectRoot) : path60.dirname(resolvedHome);
-      while (currentDir && currentDir !== path60.dirname(currentDir)) {
-        if (currentDir === path60.join(resolvedHome, GEMINI_DIR)) {
+      const ultimateStopDir = projectRoot ? path59.dirname(projectRoot) : path59.dirname(resolvedHome);
+      while (currentDir && currentDir !== path59.dirname(currentDir)) {
+        if (currentDir === path59.join(resolvedHome, GEMINI_DIR)) {
           break;
         }
-        const potentialPath = path60.join(currentDir, geminiMdFilename);
+        const potentialPath = path59.join(currentDir, geminiMdFilename);
         try {
-          await fs55.access(potentialPath, fsSync2.constants.R_OK);
+          await fs54.access(potentialPath, fsSync2.constants.R_OK);
           if (potentialPath !== globalMemoryPath) {
             upwardPaths.unshift(potentialPath);
           }
@@ -380014,7 +380078,7 @@ async function getGeminiMdFilePathsInternalForEachDir(dir, userHomePath, debugMo
         if (currentDir === ultimateStopDir) {
           break;
         }
-        currentDir = path60.dirname(currentDir);
+        currentDir = path59.dirname(currentDir);
       }
       upwardPaths.forEach((p) => allPaths.add(p));
       const mergedOptions = {
@@ -380046,8 +380110,8 @@ async function readGeminiMdFiles(filePaths, debugMode, importFormat = "tree") {
     const batch = filePaths.slice(i4, i4 + CONCURRENT_LIMIT);
     const batchPromises = batch.map(async (filePath) => {
       try {
-        const content = await fs55.readFile(filePath, "utf-8");
-        const processedResult = await processImports(content, path60.dirname(filePath), debugMode, void 0, void 0, importFormat);
+        const content = await fs54.readFile(filePath, "utf-8");
+        const processedResult = await processImports(content, path59.dirname(filePath), debugMode, void 0, void 0, importFormat);
         if (debugMode)
           logger5.debug(`Successfully read and processed imports: ${filePath} (Length: ${processedResult.content.length})`);
         return { filePath, content: processedResult.content };
@@ -380081,7 +380145,7 @@ function concatenateInstructions(instructionContents, currentWorkingDirectoryFor
     if (trimmedContent.length === 0) {
       return null;
     }
-    const displayPath = path60.isAbsolute(item.filePath) ? path60.relative(currentWorkingDirectoryForDisplay, item.filePath) : item.filePath;
+    const displayPath = path59.isAbsolute(item.filePath) ? path59.relative(currentWorkingDirectoryForDisplay, item.filePath) : item.filePath;
     return `--- Context from: ${displayPath} ---
 ${trimmedContent}
 --- End of Context from: ${displayPath} ---`;
@@ -380091,9 +380155,9 @@ async function loadGlobalMemory(debugMode = false) {
   const userHome = homedir4();
   const geminiMdFilenames = getAllGeminiMdFilenames();
   const accessChecks = geminiMdFilenames.map(async (filename) => {
-    const globalPath = path60.join(userHome, GEMINI_DIR, filename);
+    const globalPath = path59.join(userHome, GEMINI_DIR, filename);
     try {
-      await fs55.access(globalPath, fsSync2.constants.R_OK);
+      await fs54.access(globalPath, fsSync2.constants.R_OK);
       if (debugMode) {
         logger5.debug(`Found global memory file: ${globalPath}`);
       }
@@ -380114,10 +380178,10 @@ async function loadGlobalMemory(debugMode = false) {
 }
 async function findUpwardGeminiFiles(startDir, stopDir, debugMode) {
   const upwardPaths = [];
-  let currentDir = path60.resolve(startDir);
-  const resolvedStopDir = path60.resolve(stopDir);
+  let currentDir = path59.resolve(startDir);
+  const resolvedStopDir = path59.resolve(stopDir);
   const geminiMdFilenames = getAllGeminiMdFilenames();
-  const globalGeminiDir = path60.join(homedir4(), GEMINI_DIR);
+  const globalGeminiDir = path59.join(homedir4(), GEMINI_DIR);
   if (debugMode) {
     logger5.debug(`Starting upward search from ${currentDir} stopping at ${resolvedStopDir}`);
   }
@@ -380126,9 +380190,9 @@ async function findUpwardGeminiFiles(startDir, stopDir, debugMode) {
       break;
     }
     const accessChecks = geminiMdFilenames.map(async (filename) => {
-      const potentialPath = path60.join(currentDir, filename);
+      const potentialPath = path59.join(currentDir, filename);
       try {
-        await fs55.access(potentialPath, fsSync2.constants.R_OK);
+        await fs54.access(potentialPath, fsSync2.constants.R_OK);
         return potentialPath;
       } catch {
         return null;
@@ -380136,17 +380200,17 @@ async function findUpwardGeminiFiles(startDir, stopDir, debugMode) {
     });
     const foundPathsInDir = (await Promise.all(accessChecks)).filter((p) => p !== null);
     upwardPaths.unshift(...foundPathsInDir);
-    if (currentDir === resolvedStopDir || currentDir === path60.dirname(currentDir)) {
+    if (currentDir === resolvedStopDir || currentDir === path59.dirname(currentDir)) {
       break;
     }
-    currentDir = path60.dirname(currentDir);
+    currentDir = path59.dirname(currentDir);
   }
   return upwardPaths;
 }
 async function loadEnvironmentMemory(trustedRoots, extensionLoader, debugMode = false) {
   const allPaths = /* @__PURE__ */ new Set();
   const traversalPromises = trustedRoots.map(async (root) => {
-    const resolvedRoot = path60.resolve(root);
+    const resolvedRoot = path59.resolve(root);
     if (debugMode) {
       logger5.debug(`Loading environment memory for trusted root: ${resolvedRoot} (Stopping exactly here)`);
     }
@@ -380166,8 +380230,8 @@ async function loadEnvironmentMemory(trustedRoots, extensionLoader, debugMode =
   };
 }
 async function loadServerHierarchicalMemory(currentWorkingDirectory, includeDirectoriesToReadGemini, debugMode, fileService, extensionLoader, folderTrust, importFormat = "tree", fileFilteringOptions, maxDirs = 200) {
-  const realCwd = await fs55.realpath(path60.resolve(currentWorkingDirectory));
-  const realHome = await fs55.realpath(path60.resolve(homedir4()));
+  const realCwd = await fs54.realpath(path59.resolve(currentWorkingDirectory));
+  const realHome = await fs54.realpath(path59.resolve(homedir4()));
   const isHomeDirectory = realCwd === realHome;
   currentWorkingDirectory = isHomeDirectory ? "" : currentWorkingDirectory;
   if (debugMode)
@@ -380203,10 +380267,10 @@ async function refreshServerHierarchicalMemory(config3) {
   return result;
 }
 async function loadJitSubdirectoryMemory(targetPath, trustedRoots, alreadyLoadedPaths, debugMode = false) {
-  const resolvedTarget = path60.resolve(targetPath);
+  const resolvedTarget = path59.resolve(targetPath);
   let bestRoot = null;
   for (const root of trustedRoots) {
-    const resolvedRoot = path60.resolve(root);
+    const resolvedRoot = path59.resolve(root);
     if (resolvedTarget.startsWith(resolvedRoot) && (!bestRoot || resolvedRoot.length > bestRoot.length)) {
       bestRoot = resolvedRoot;
     }
@@ -380302,8 +380366,8 @@ var ContextManager = class {
 };
 
 // packages/core/dist/src/utils/workspaceContext.js
-import * as fs56 from "node:fs";
-import * as path61 from "node:path";
+import * as fs55 from "node:fs";
+import * as path60 from "node:path";
 var WorkspaceContext = class {
   targetDir;
   directories = /* @__PURE__ */ new Set();
@@ -380360,15 +380424,15 @@ var WorkspaceContext = class {
     }
   }
   resolveAndValidateDir(directory) {
-    const absolutePath = path61.resolve(this.targetDir, directory);
-    if (!fs56.existsSync(absolutePath)) {
+    const absolutePath = path60.resolve(this.targetDir, directory);
+    if (!fs55.existsSync(absolutePath)) {
       throw new Error(`Directory does not exist: ${absolutePath}`);
     }
-    const stats = fs56.statSync(absolutePath);
+    const stats = fs55.statSync(absolutePath);
     if (!stats.isDirectory()) {
       throw new Error(`Path is not a directory: ${absolutePath}`);
     }
-    return fs56.realpathSync(absolutePath);
+    return fs55.realpathSync(absolutePath);
   }
   /**
    * Gets a copy of all workspace directories.
@@ -380415,7 +380479,7 @@ var WorkspaceContext = class {
    */
   fullyResolvedPath(pathToCheck) {
     try {
-      return fs56.realpathSync(path61.resolve(this.targetDir, pathToCheck));
+      return fs55.realpathSync(path60.resolve(this.targetDir, pathToCheck));
     } catch (e3) {
       if (isNodeError(e3) && e3.code === "ENOENT" && e3.path && // realpathSync does not set e.path correctly for symlinks to
       // non-existent files.
@@ -380432,15 +380496,15 @@ var WorkspaceContext = class {
    * @returns True if the path is within the root directory, false otherwise
    */
   isPathWithinRoot(pathToCheck, rootDirectory) {
-    const relative5 = path61.relative(rootDirectory, pathToCheck);
-    return !relative5.startsWith(`..${path61.sep}`) && relative5 !== ".." && !path61.isAbsolute(relative5);
+    const relative5 = path60.relative(rootDirectory, pathToCheck);
+    return !relative5.startsWith(`..${path60.sep}`) && relative5 !== ".." && !path60.isAbsolute(relative5);
   }
   /**
    * Checks if a file path is a symbolic link that points to a file.
    */
   isFileSymlink(filePath) {
     try {
-      return !fs56.readlinkSync(filePath).endsWith("/");
+      return !fs55.readlinkSync(filePath).endsWith("/");
     } catch (_error) {
       return false;
     }
@@ -380633,7 +380697,12 @@ var SafetyCheckDecision;
 })(SafetyCheckDecision || (SafetyCheckDecision = {}));
 
 // packages/core/dist/src/policy/policy-engine.js
-function ruleMatches(rule, toolCall, stringifiedArgs, serverName) {
+function ruleMatches(rule, toolCall, stringifiedArgs, serverName, currentApprovalMode) {
+  if (rule.modes && rule.modes.length > 0) {
+    if (!rule.modes.includes(currentApprovalMode)) {
+      return false;
+    }
+  }
   if (rule.toolName) {
     if (rule.toolName.endsWith("__*")) {
       const prefix = rule.toolName.slice(0, -3);
@@ -380676,6 +380745,7 @@ var PolicyEngine = class {
   nonInteractive;
   checkerRunner;
   allowHooks;
+  approvalMode;
   constructor(config3 = {}, checkerRunner) {
     this.rules = (config3.rules ?? []).sort((a2, b) => (b.priority ?? 0) - (a2.priority ?? 0));
     this.checkers = (config3.checkers ?? []).sort((a2, b) => (b.priority ?? 0) - (a2.priority ?? 0));
@@ -380684,6 +380754,19 @@ var PolicyEngine = class {
     this.nonInteractive = config3.nonInteractive ?? false;
     this.checkerRunner = checkerRunner;
     this.allowHooks = config3.allowHooks ?? true;
+    this.approvalMode = config3.approvalMode ?? ApprovalMode.DEFAULT;
+  }
+  /**
+   * Update the current approval mode.
+   */
+  setApprovalMode(mode) {
+    this.approvalMode = mode;
+  }
+  /**
+   * Get the current approval mode.
+   */
+  getApprovalMode() {
+    return this.approvalMode;
   }
   /**
    * Check if a tool call is allowed based on the configured policies.
@@ -380698,7 +380781,7 @@ var PolicyEngine = class {
     let matchedRule;
     let decision;
     for (const rule of this.rules) {
-      if (ruleMatches(rule, toolCall, stringifiedArgs, serverName)) {
+      if (ruleMatches(rule, toolCall, stringifiedArgs, serverName, this.approvalMode)) {
         debugLogger.debug(`[PolicyEngine.check] MATCHED rule: toolName=${rule.toolName}, decision=${rule.decision}, priority=${rule.priority}, argsPattern=${rule.argsPattern?.source || "none"}`);
         if (toolCall.name && SHELL_TOOL_NAMES.includes(toolCall.name) && rule.decision === PolicyDecision.ALLOW) {
           const command = toolCall.args?.command;
@@ -380744,7 +380827,7 @@ var PolicyEngine = class {
     }
     if (decision !== PolicyDecision.DENY && this.checkerRunner) {
       for (const checkerRule of this.checkers) {
-        if (ruleMatches(checkerRule, toolCall, stringifiedArgs, serverName)) {
+        if (ruleMatches(checkerRule, toolCall, stringifiedArgs, serverName, this.approvalMode)) {
           debugLogger.debug(`[PolicyEngine.check] Running safety checker: ${checkerRule.checker.name}`);
           try {
             const result = await this.checkerRunner.runChecker(toolCall, checkerRule.checker);
@@ -380865,14 +380948,88 @@ var PolicyEngine = class {
   }
 };
 
+// packages/core/dist/src/hooks/trustedHooks.js
+import * as fs56 from "node:fs";
+import * as path61 from "node:path";
+var TrustedHooksManager = class {
+  configPath;
+  trustedHooks = {};
+  constructor() {
+    this.configPath = path61.join(Storage2.getGlobalGeminiDir(), "trusted_hooks.json");
+    this.load();
+  }
+  load() {
+    try {
+      if (fs56.existsSync(this.configPath)) {
+        const content = fs56.readFileSync(this.configPath, "utf-8");
+        this.trustedHooks = JSON.parse(content);
+      }
+    } catch (error2) {
+      debugLogger.warn("Failed to load trusted hooks config", error2);
+      this.trustedHooks = {};
+    }
+  }
+  save() {
+    try {
+      const dir = path61.dirname(this.configPath);
+      if (!fs56.existsSync(dir)) {
+        fs56.mkdirSync(dir, { recursive: true });
+      }
+      fs56.writeFileSync(this.configPath, JSON.stringify(this.trustedHooks, null, 2));
+    } catch (error2) {
+      debugLogger.warn("Failed to save trusted hooks config", error2);
+    }
+  }
+  /**
+   * Get untrusted hooks for a project
+   * @param projectPath Absolute path to the project root
+   * @param hooks The hooks configuration to check
+   * @returns List of untrusted hook commands/names
+   */
+  getUntrustedHooks(projectPath, hooks) {
+    const trustedKeys = new Set(this.trustedHooks[projectPath] || []);
+    const untrusted = [];
+    for (const eventName of Object.keys(hooks)) {
+      const definitions = hooks[eventName];
+      if (!Array.isArray(definitions))
+        continue;
+      for (const def2 of definitions) {
+        if (!def2 || !Array.isArray(def2.hooks))
+          continue;
+        for (const hook of def2.hooks) {
+          const key = getHookKey(hook);
+          if (!trustedKeys.has(key)) {
+            untrusted.push(hook.name || hook.command || "unknown-hook");
+          }
+        }
+      }
+    }
+    return Array.from(new Set(untrusted));
+  }
+  /**
+   * Trust all provided hooks for a project
+   */
+  trustHooks(projectPath, hooks) {
+    const currentTrusted = new Set(this.trustedHooks[projectPath] || []);
+    for (const eventName of Object.keys(hooks)) {
+      const definitions = hooks[eventName];
+      if (!Array.isArray(definitions))
+        continue;
+      for (const def2 of definitions) {
+        if (!def2 || !Array.isArray(def2.hooks))
+          continue;
+        for (const hook of def2.hooks) {
+          currentTrusted.add(getHookKey(hook));
+        }
+      }
+    }
+    this.trustedHooks[projectPath] = Array.from(currentTrusted);
+    this.save();
+  }
+};
+
 // packages/core/dist/src/hooks/hookRegistry.js
-var ConfigSource;
-(function(ConfigSource2) {
-  ConfigSource2["Project"] = "project";
-  ConfigSource2["User"] = "user";
-  ConfigSource2["System"] = "system";
-  ConfigSource2["Extensions"] = "extensions";
-})(ConfigSource || (ConfigSource = {}));
+init_events();
 var HookRegistry = class {
   config;
   entries = [];
@@ -380923,13 +381080,43 @@ var HookRegistry = class {
   getHookName(entry) {
     return entry.config.name || entry.config.command || "unknown-command";
   }
+  /**
+   * Check for untrusted project hooks and warn the user
+   */
+  checkProjectHooksTrust() {
+    const projectHooks = this.config.getProjectHooks();
+    if (!projectHooks)
+      return;
+    try {
+      const trustedHooksManager = new TrustedHooksManager();
+      const untrusted = trustedHooksManager.getUntrustedHooks(this.config.getProjectRoot(), projectHooks);
+      if (untrusted.length > 0) {
+        const message = `WARNING: The following project-level hooks have been detected in this workspace:
+${untrusted.map((h3) => `  - ${h3}`).join("\n")}
+
+These hooks will be executed. If you did not configure these hooks or do not trust this project,
+please review the project settings (.gemini/settings.json) and remove them.`;
+        coreEvents.emitFeedback("warning", message);
+        trustedHooksManager.trustHooks(this.config.getProjectRoot(), projectHooks);
+      }
+    } catch (error2) {
+      debugLogger.warn("Failed to check project hooks trust", error2);
+    }
+  }
   /**
    * Process hooks from the config that was already loaded by the CLI
    */
   processHooksFromConfig() {
+    if (this.config.isTrustedFolder()) {
+      this.checkProjectHooksTrust();
+    }
     const configHooks = this.config.getHooks();
     if (configHooks) {
-      this.processHooksConfiguration(configHooks, ConfigSource.Project);
+      if (this.config.isTrustedFolder()) {
+        this.processHooksConfiguration(configHooks, ConfigSource.Project);
+      } else {
+        debugLogger.warn("Project hooks disabled because the folder is not trusted.");
+      }
     }
     const extensions = this.config.getExtensions() || [];
     for (const extension of extensions) {
@@ -380972,6 +381159,7 @@ var HookRegistry = class {
           config: hookConfig
         });
         const isDisabled = disabledHooks.includes(hookName);
+        hookConfig.source = source;
         this.entries.push({
           config: hookConfig,
           source,
@@ -381032,13 +381220,26 @@ var EXIT_CODE_SUCCESS = 0;
 var EXIT_CODE_BLOCKING_ERROR = 2;
 var EXIT_CODE_NON_BLOCKING_ERROR = 1;
 var HookRunner = class {
-  constructor() {
+  config;
+  constructor(config3) {
+    this.config = config3;
   }
   /**
    * Execute a single hook
    */
   async executeHook(hookConfig, eventName, input) {
     const startTime = Date.now();
+    if (hookConfig.source === ConfigSource.Project && !this.config.isTrustedFolder()) {
+      const errorMessage = "Security: Blocked execution of project hook in untrusted folder";
+      debugLogger.warn(errorMessage);
+      return {
+        hookConfig,
+        eventName,
+        success: false,
+        error: new Error(errorMessage),
+        duration: 0
+      };
+    }
     try {
       return await this.executeCommandHook(hookConfig, eventName, input, startTime);
     } catch (error2) {
@@ -381135,7 +381336,7 @@ var HookRunner = class {
       const shellConfig = getShellConfiguration();
       const command = this.expandCommand(hookConfig.command, input, shellConfig.shell);
       const env2 = {
-        ...process.env,
+        ...sanitizeEnvironment(process.env, this.config.sanitizationConfig),
         GEMINI_PROJECT_DIR: input.cwd,
         CLAUDE_PROJECT_DIR: input.cwd
         // For compatibility
@@ -381561,7 +381762,7 @@ var HookPlanner = class {
     const seen = /* @__PURE__ */ new Set();
     const deduplicated = [];
     for (const entry of entries2) {
-      const key = this.getHookKey(entry);
+      const key = getHookKey(entry.config);
       if (!seen.has(key)) {
         seen.add(key);
         deduplicated.push(entry);
@@ -381571,14 +381772,6 @@ var HookPlanner = class {
     }
     return deduplicated;
   }
-  /**
-   * Generate a unique key for a hook entry
-   */
-  getHookKey(entry) {
-    const name4 = entry.config.name || "";
-    const command = entry.config.command || "";
-    return `${name4}:${command}`;
-  }
 };
 
 // packages/core/dist/src/hooks/hookEventHandler.js
@@ -382059,7 +382252,7 @@ var HookSystem = class {
     const logger6 = import_api_logs2.logs.getLogger(SERVICE_NAME);
     const messageBus = config3.getMessageBus();
     this.hookRegistry = new HookRegistry(config3);
-    this.hookRunner = new HookRunner();
+    this.hookRunner = new HookRunner(config3);
     this.hookAggregator = new HookAggregator();
     this.hookPlanner = new HookPlanner(this.hookRegistry);
     this.hookEventHandler = new HookEventHandler(config3, logger6, this.hookPlanner, this.hookRunner, this.hookAggregator, messageBus);
@@ -384714,7 +384907,7 @@ var ServiceAccountImpersonationProvider = class {
 };
 
 // packages/core/dist/src/tools/mcp-client.js
-import { basename as basename12 } from "node:path";
+import { basename as basename11 } from "node:path";
 import { pathToFileURL } from "node:url";
 
 // packages/core/dist/src/mcp/oauth-provider.js
@@ -385534,7 +385727,7 @@ var McpClient = class {
     }
     this.updateStatus(MCPServerStatus.CONNECTING);
     try {
-      this.client = await connectToMcpServer(this.serverName, this.serverConfig, this.debugMode, this.workspaceContext);
+      this.client = await connectToMcpServer(this.serverName, this.serverConfig, this.debugMode, this.workspaceContext, this.cliConfig.sanitizationConfig);
       this.registerNotificationHandlers();
       const originalOnError = this.client.onerror;
       this.client.onerror = (error2) => {
@@ -386086,7 +386279,7 @@ async function retryWithOAuth(client, serverName, config3, accessToken, httpRetu
     }
   }
 }
-async function connectToMcpServer(mcpServerName, mcpServerConfig, debugMode, workspaceContext) {
+async function connectToMcpServer(mcpServerName, mcpServerConfig, debugMode, workspaceContext, sanitizationConfig) {
   const mcpClient = new Client({
     name: "gemini-cli-mcp-client",
     version: "0.0.1"
@@ -386104,7 +386297,7 @@ async function connectToMcpServer(mcpServerName, mcpServerConfig, debugMode, wor
     for (const dir of workspaceContext.getDirectories()) {
       roots.push({
         uri: pathToFileURL(dir).toString(),
-        name: basename12(dir)
+        name: basename11(dir)
       });
     }
     return {
@@ -386131,7 +386324,7 @@ async function connectToMcpServer(mcpServerName, mcpServerConfig, debugMode, wor
   let httpReturned404 = false;
   let sseError = null;
   try {
-    const transport = await createTransport(mcpServerName, mcpServerConfig, debugMode);
+    const transport = await createTransport(mcpServerName, mcpServerConfig, debugMode, sanitizationConfig);
     try {
       await mcpClient.connect(transport, {
         timeout: mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC
@@ -386286,7 +386479,7 @@ function createUrlTransport(mcpServerName, mcpServerConfig, transportOptions) {
   }
   throw new Error(`No URL configured for MCP server '${mcpServerName}'`);
 }
-async function createTransport(mcpServerName, mcpServerConfig, debugMode) {
+async function createTransport(mcpServerName, mcpServerConfig, debugMode, sanitizationConfig) {
   const noUrl = !mcpServerConfig.url && !mcpServerConfig.httpUrl;
   if (noUrl) {
     if (mcpServerConfig.authProviderType === AuthProviderType.GOOGLE_CREDENTIALS) {
@@ -386329,7 +386522,7 @@ async function createTransport(mcpServerName, mcpServerConfig, debugMode) {
       command: mcpServerConfig.command,
       args: mcpServerConfig.args || [],
       env: {
-        ...process.env,
+        ...sanitizeEnvironment(process.env, sanitizationConfig),
         ...mcpServerConfig.env || {}
       },
       cwd: mcpServerConfig.cwd,
@@ -386604,6 +386797,9 @@ var Config = class {
   mcpClientManager;
   allowedMcpServers;
   blockedMcpServers;
+  allowedEnvironmentVariables;
+  blockedEnvironmentVariables;
+  enableEnvironmentVariableRedaction;
   promptRegistry;
   resourceRegistry;
   agentRegistry;
@@ -386628,7 +386824,6 @@ var Config = class {
   userMemory;
   geminiMdFileCount;
   geminiMdFilePaths;
-  approvalMode;
   showMemoryUsage;
   accessibility;
   telemetrySettings;
@@ -386700,10 +386895,12 @@ var Config = class {
   pendingIncludeDirectories;
   enableHooks;
   hooks;
+  projectHooks;
   disabledHooks;
   experiments;
   experimentsPromise;
   hookSystem;
+  onModelChange;
   enableAgents;
   experimentalJitContext;
   contextManager;
@@ -386728,10 +386925,12 @@ var Config = class {
     this.mcpServers = params.mcpServers;
     this.allowedMcpServers = params.allowedMcpServers ?? [];
     this.blockedMcpServers = params.blockedMcpServers ?? [];
+    this.allowedEnvironmentVariables = params.allowedEnvironmentVariables ?? [];
+    this.blockedEnvironmentVariables = params.blockedEnvironmentVariables ?? [];
+    this.enableEnvironmentVariableRedaction = params.enableEnvironmentVariableRedaction ?? false;
     this.userMemory = params.userMemory ?? "";
     this.geminiMdFileCount = params.geminiMdFileCount ?? 0;
     this.geminiMdFilePaths = params.geminiMdFilePaths ?? [];
-    this.approvalMode = params.approvalMode ?? ApprovalMode.DEFAULT;
     this.showMemoryUsage = params.showMemoryUsage ?? false;
     this.accessibility = params.accessibility ?? {};
     this.telemetrySettings = {
@@ -386787,7 +386986,8 @@ var Config = class {
       terminalWidth: params.shellExecutionConfig?.terminalWidth ?? 80,
       terminalHeight: params.shellExecutionConfig?.terminalHeight ?? 24,
       showColor: params.shellExecutionConfig?.showColor ?? false,
-      pager: params.shellExecutionConfig?.pager ?? "cat"
+      pager: params.shellExecutionConfig?.pager ?? "cat",
+      sanitizationConfig: this.sanitizationConfig
     };
     this.truncateToolOutputThreshold = params.truncateToolOutputThreshold ?? DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD;
     this.truncateToolOutputLines = params.truncateToolOutputLines ?? DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES;
@@ -386820,7 +387020,10 @@ var Config = class {
     this.enablePromptCompletion = params.enablePromptCompletion ?? false;
     this.fileExclusions = new FileExclusions(this);
     this.eventEmitter = params.eventEmitter;
-    this.policyEngine = new PolicyEngine(params.policyEngineConfig);
+    this.policyEngine = new PolicyEngine({
+      ...params.policyEngineConfig,
+      approvalMode: params.approvalMode ?? params.policyEngineConfig?.approvalMode
+    });
     this.messageBus = new MessageBus(this.policyEngine, this.debugMode);
     this.outputSettings = {
       format: params.output?.format ?? OutputFormat.TEXT
@@ -386828,7 +387031,9 @@ var Config = class {
     this.retryFetchErrors = params.retryFetchErrors ?? false;
     this.disableYoloMode = params.disableYoloMode ?? false;
     this.hooks = params.hooks;
+    this.projectHooks = params.projectHooks;
     this.experiments = params.experiments;
+    this.onModelChange = params.onModelChange;
     if (params.contextFileName) {
       setGeminiMdFilename(params.contextFileName);
     }
@@ -386992,11 +387197,14 @@ var Config = class {
   getModel() {
     return this.model;
   }
-  setModel(newModel) {
+  setModel(newModel, isFallbackModel = false) {
     if (this.model !== newModel || this._activeModel !== newModel) {
       this.model = newModel;
       this._activeModel = newModel;
       coreEvents.emitModelChanged(newModel);
+      if (this.onModelChange && !isFallbackModel) {
+        this.onModelChange(newModel);
+      }
     }
     this.modelAvailabilityService.reset();
   }
@@ -387152,6 +387360,13 @@ var Config = class {
   getBlockedMcpServers() {
     return this.blockedMcpServers;
   }
+  get sanitizationConfig() {
+    return {
+      allowedEnvironmentVariables: this.allowedEnvironmentVariables,
+      blockedEnvironmentVariables: this.blockedEnvironmentVariables,
+      enableEnvironmentVariableRedaction: this.enableEnvironmentVariableRedaction
+    };
+  }
   setMcpServers(mcpServers) {
     this.mcpServers = mcpServers;
   }
@@ -387198,13 +387413,13 @@ var Config = class {
     this.geminiMdFilePaths = paths;
   }
   getApprovalMode() {
-    return this.approvalMode;
+    return this.policyEngine.getApprovalMode();
   }
   setApprovalMode(mode) {
     if (!this.isTrustedFolder() && mode !== ApprovalMode.DEFAULT) {
       throw new Error("Cannot enable privileged approval modes in an untrusted folder.");
     }
-    this.approvalMode = mode;
+    this.policyEngine.setApprovalMode(mode);
   }
   isYoloModeDisabled() {
     return this.disableYoloMode || !this.isTrustedFolder();
@@ -387455,7 +387670,8 @@ var Config = class {
       terminalWidth: config3.terminalWidth ?? this.shellExecutionConfig.terminalWidth,
       terminalHeight: config3.terminalHeight ?? this.shellExecutionConfig.terminalHeight,
       showColor: config3.showColor ?? this.shellExecutionConfig.showColor,
-      pager: config3.pager ?? this.shellExecutionConfig.pager
+      pager: config3.pager ?? this.shellExecutionConfig.pager,
+      sanitizationConfig: config3.sanitizationConfig ?? this.shellExecutionConfig.sanitizationConfig
     };
   }
   getScreenReader() {
@@ -387592,6 +387808,12 @@ var Config = class {
   getHooks() {
     return this.hooks;
   }
+  /**
+   * Get project-specific hooks configuration
+   */
+  getProjectHooks() {
+    return this.projectHooks;
+  }
   /**
    * Get disabled hooks list
    */
@@ -387668,7 +387890,7 @@ var PolicyRuleSchema = external_exports.object({
   }).int({ message: "priority must be an integer" }).min(0, { message: "priority must be >= 0" }).max(999, {
     message: "priority must be <= 999 to prevent tier overflow. Priorities >= 1000 would jump to the next tier."
   }),
-  modes: external_exports.array(external_exports.string()).optional()
+  modes: external_exports.array(external_exports.nativeEnum(ApprovalMode)).optional()
 });
 var SafetyCheckerRuleSchema = external_exports.object({
   toolName: external_exports.union([external_exports.string(), external_exports.array(external_exports.string())]).optional(),
@@ -387677,7 +387899,7 @@ var SafetyCheckerRuleSchema = external_exports.object({
   commandPrefix: external_exports.union([external_exports.string(), external_exports.array(external_exports.string())]).optional(),
   commandRegex: external_exports.string().optional(),
   priority: external_exports.number().int().default(0),
-  modes: external_exports.array(external_exports.string()).optional(),
+  modes: external_exports.array(external_exports.nativeEnum(ApprovalMode)).optional(),
   checker: external_exports.discriminatedUnion("type", [
     external_exports.object({
       type: external_exports.literal("in-process"),