@google/gemini-cli-a2a-server 0.21.0-nightly.20251210.d90356e8a → 0.21.0-nightly.20251212.54de67536

package/dist/a2a-server.mjs

@@ -8766,15 +8766,15 @@ var require_file = __commonJS({
       _incFile(callback) {
         debug2("_incFile", this.filename);
         const ext2 = path72.extname(this._basename);
-        const basename14 = path72.basename(this._basename, ext2);
+        const basename15 = path72.basename(this._basename, ext2);
         const tasks = [];
         if (this.zippedArchive) {
           tasks.push(
             function(cb) {
               const num = this._created > 0 && !this.tailable ? this._created : "";
               this._compressFile(
-                path72.join(this.dirname, `${basename14}${num}${ext2}`),
-                path72.join(this.dirname, `${basename14}${num}${ext2}.gz`),
+                path72.join(this.dirname, `${basename15}${num}${ext2}`),
+                path72.join(this.dirname, `${basename15}${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, basename14, cb);
+              this._checkMaxFilesIncrementing(ext2, basename15, cb);
             } else {
-              this._checkMaxFilesTailable(ext2, basename14, cb);
+              this._checkMaxFilesTailable(ext2, basename15, cb);
             }
           }.bind(this)
         );
@@ -8800,9 +8800,9 @@ var require_file = __commonJS({
        */
       _getFile() {
         const ext2 = path72.extname(this._basename);
-        const basename14 = path72.basename(this._basename, ext2);
+        const basename15 = path72.basename(this._basename, ext2);
         const isRotation = this.rotationFormat ? this.rotationFormat() : this._created;
-        return !this.tailable && this._created ? `${basename14}${isRotation}${ext2}` : `${basename14}${ext2}`;
+        return !this.tailable && this._created ? `${basename15}${isRotation}${ext2}` : `${basename15}${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, basename14, callback) {
+      _checkMaxFilesIncrementing(ext2, basename15, 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 = `${basename14}${isOldest}${ext2}${isZipped}`;
+        const filePath = `${basename15}${isOldest}${ext2}${isZipped}`;
         const target = path72.join(this.dirname, filePath);
         fs63.unlink(target, callback);
       }
@@ -8834,7 +8834,7 @@ var require_file = __commonJS({
        * @returns {undefined}
        * @private
        */
-      _checkMaxFilesTailable(ext2, basename14, callback) {
+      _checkMaxFilesTailable(ext2, basename15, 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 = `${basename14}${i4 - 1}${ext2}${isZipped}`;
+            let fileName = `${basename15}${i4 - 1}${ext2}${isZipped}`;
             const tmppath = path72.join(this.dirname, fileName);
             fs63.exists(tmppath, (exists2) => {
               if (!exists2) {
                 return cb(null);
               }
-              fileName = `${basename14}${i4}${ext2}${isZipped}`;
+              fileName = `${basename15}${i4}${ext2}${isZipped}`;
               fs63.rename(tmppath, path72.join(this.dirname, fileName), cb);
             });
           }.bind(this, x2));
         }
         asyncSeries(tasks, () => {
           fs63.rename(
-            path72.join(this.dirname, `${basename14}${ext2}${isZipped}`),
-            path72.join(this.dirname, `${basename14}1${ext2}${isZipped}`),
+            path72.join(this.dirname, `${basename15}${ext2}${isZipped}`),
+            path72.join(this.dirname, `${basename15}1${ext2}${isZipped}`),
             callback
           );
         });
@@ -33264,7 +33264,7 @@ var require_view = __commonJS({
     var path72 = __require("node:path");
     var fs63 = __require("node:fs");
     var dirname17 = path72.dirname;
-    var basename14 = path72.basename;
+    var basename15 = path72.basename;
     var extname3 = path72.extname;
     var join27 = path72.join;
     var resolve14 = path72.resolve;
@@ -33303,7 +33303,7 @@ var require_view = __commonJS({
         var root = roots[i4];
         var loc = resolve14(root, name4);
         var dir = dirname17(loc);
-        var file = basename14(loc);
+        var file = basename15(loc);
         path73 = this.resolve(dir, file);
       }
       return path73;
@@ -33333,7 +33333,7 @@ var require_view = __commonJS({
       if (stat3 && stat3.isFile()) {
         return path73;
       }
-      path73 = join27(dir, basename14(file, ext2), "index" + ext2);
+      path73 = join27(dir, basename15(file, ext2), "index" + ext2);
       stat3 = tryStat(path73);
       if (stat3 && stat3.isFile()) {
         return path73;
@@ -36625,7 +36625,7 @@ var require_content_disposition = __commonJS({
     "use strict";
     module2.exports = contentDisposition;
     module2.exports.parse = parse10;
-    var basename14 = __require("path").basename;
+    var basename15 = __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 = basename14(filename);
+      var name4 = basename15(filename);
       var isQuotedString = TEXT_REGEXP.test(name4);
-      var fallbackName = typeof fallback !== "string" ? fallback && getlatin1(name4) : basename14(fallback);
+      var fallbackName = typeof fallback !== "string" ? fallback && getlatin1(name4) : basename15(fallback);
       var hasFallback = typeof fallbackName === "string" && fallbackName !== name4;
       if (hasFallback || !isQuotedString || HEX_ESCAPE_REGEXP.test(name4)) {
         params["filename*"] = name4;
@@ -45825,7 +45825,7 @@ var require_view2 = __commonJS({
     var path72 = __require("path");
     var fs63 = __require("fs");
     var dirname17 = path72.dirname;
-    var basename14 = path72.basename;
+    var basename15 = path72.basename;
     var extname3 = path72.extname;
     var join27 = path72.join;
     var resolve14 = path72.resolve;
@@ -45864,7 +45864,7 @@ var require_view2 = __commonJS({
         var root = roots[i4];
         var loc = resolve14(root, name4);
         var dir = dirname17(loc);
-        var file = basename14(loc);
+        var file = basename15(loc);
         path73 = this.resolve(dir, file);
       }
       return path73;
@@ -45880,7 +45880,7 @@ var require_view2 = __commonJS({
       if (stat3 && stat3.isFile()) {
         return path73;
       }
-      path73 = join27(dir, basename14(file, ext2), "index" + ext2);
+      path73 = join27(dir, basename15(file, ext2), "index" + ext2);
       stat3 = tryStat(path73);
       if (stat3 && stat3.isFile()) {
         return path73;
@@ -45903,7 +45903,7 @@ var require_content_disposition2 = __commonJS({
     "use strict";
     module2.exports = contentDisposition;
     module2.exports.parse = parse10;
-    var basename14 = __require("path").basename;
+    var basename15 = __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}/;
@@ -45939,9 +45939,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 = basename14(filename);
+      var name4 = basename15(filename);
       var isQuotedString = TEXT_REGEXP.test(name4);
-      var fallbackName = typeof fallback !== "string" ? fallback && getlatin1(name4) : basename14(fallback);
+      var fallbackName = typeof fallback !== "string" ? fallback && getlatin1(name4) : basename15(fallback);
       var hasFallback = typeof fallbackName === "string" && fallbackName !== name4;
       if (hasFallback || !isQuotedString || HEX_ESCAPE_REGEXP.test(name4)) {
         params["filename*"] = name4;
@@ -147379,11 +147379,11 @@ var require_path_parse = __commonJS({
       };
     };
     var splitPathRe = /^((\/?)(?:[^\/]*\/)*)((\.{1,2}|[^\/]+?|)(\.[^.\/]*|))[\/]*$/;
-    var posix4 = {};
+    var posix3 = {};
     function posixSplitPath(filename) {
       return splitPathRe.exec(filename).slice(1);
     }
-    posix4.parse = function(pathString) {
+    posix3.parse = function(pathString) {
       if (typeof pathString !== "string") {
         throw new TypeError(
           "Parameter 'pathString' must be a string, not " + typeof pathString
@@ -147404,8 +147404,8 @@ var require_path_parse = __commonJS({
     if (isWindows5)
       module2.exports = win323.parse;
     else
-      module2.exports = posix4.parse;
-    module2.exports.posix = posix4.parse;
+      module2.exports = posix3.parse;
+    module2.exports.posix = posix3.parse;
     module2.exports.win32 = win323.parse;
   }
 });
@@ -148914,7 +148914,7 @@ var require_import_in_the_middle = __commonJS({
   "node_modules/import-in-the-middle/index.js"(exports2, module2) {
     var path72 = __require("path");
     var parse10 = require_module_details_from_path();
-    var { fileURLToPath: fileURLToPath13 } = __require("url");
+    var { fileURLToPath: fileURLToPath14 } = __require("url");
     var { MessageChannel } = __require("worker_threads");
     var {
       importHooks,
@@ -148993,7 +148993,7 @@ var require_import_in_the_middle = __commonJS({
         } else {
           if (name4.startsWith("file://")) {
             try {
-              name4 = fileURLToPath13(name4);
+              name4 = fileURLToPath14(name4);
             } catch (e3) {
             }
           }
@@ -149008,7 +149008,7 @@ var require_import_in_the_middle = __commonJS({
             if (moduleName2 === name4) {
               if (baseDir) {
                 if (internals) {
-                  name4 = name4 + path72.sep + path72.relative(baseDir, fileURLToPath13(filename));
+                  name4 = name4 + path72.sep + path72.relative(baseDir, fileURLToPath14(filename));
                 } else {
                   if (!getExperimentalPatchInternals() && !baseDir.endsWith(specifiers.get(filename))) continue;
                 }
@@ -272176,9 +272176,9 @@ var require_parse11 = __commonJS({
                 const idx = prev.value.lastIndexOf("[");
                 const pre = prev.value.slice(0, idx);
                 const rest2 = prev.value.slice(idx + 2);
-                const posix4 = POSIX_REGEX_SOURCE[rest2];
-                if (posix4) {
-                  prev.value = pre + posix4;
+                const posix3 = POSIX_REGEX_SOURCE[rest2];
+                if (posix3) {
+                  prev.value = pre + posix3;
                   state.backtrack = true;
                   advance();
                   if (!bos.output && tokens.indexOf(prev) === 1) {
@@ -272694,7 +272694,7 @@ var require_picomatch = __commonJS({
         throw new TypeError("Expected pattern to be a non-empty string");
       }
       const opts = options2 || {};
-      const posix4 = opts.windows;
+      const posix3 = opts.windows;
       const regex2 = isState ? picomatch2.compileRe(glob2, options2) : picomatch2.makeRe(glob2, options2, false, true);
       const state = regex2.state;
       delete regex2.state;
@@ -272704,8 +272704,8 @@ var require_picomatch = __commonJS({
         isIgnored = picomatch2(opts.ignore, ignoreOpts, returnState);
       }
       const matcher = (input, returnObject = false) => {
-        const { isMatch, match: match2, output } = picomatch2.test(input, regex2, options2, { glob: glob2, posix: posix4 });
-        const result = { glob: glob2, state, regex: regex2, posix: posix4, input, output, match: match2, isMatch };
+        const { isMatch, match: match2, output } = picomatch2.test(input, regex2, options2, { glob: glob2, posix: posix3 });
+        const result = { glob: glob2, state, regex: regex2, posix: posix3, input, output, match: match2, isMatch };
         if (typeof opts.onResult === "function") {
           opts.onResult(result);
         }
@@ -272730,7 +272730,7 @@ var require_picomatch = __commonJS({
       }
       return matcher;
     };
-    picomatch2.test = (input, regex2, options2, { glob: glob2, posix: posix4 } = {}) => {
+    picomatch2.test = (input, regex2, options2, { glob: glob2, posix: posix3 } = {}) => {
       if (typeof input !== "string") {
         throw new TypeError("Expected input to be a string");
       }
@@ -272738,7 +272738,7 @@ var require_picomatch = __commonJS({
         return { isMatch: false, output: "" };
       }
       const opts = options2 || {};
-      const format3 = opts.format || (posix4 ? utils.toPosixSlashes : null);
+      const format3 = opts.format || (posix3 ? utils.toPosixSlashes : null);
       let match2 = input === glob2;
       let output = match2 && format3 ? format3(input) : input;
       if (match2 === false) {
@@ -272747,7 +272747,7 @@ var require_picomatch = __commonJS({
       }
       if (match2 === false || opts.capture === true) {
         if (opts.matchBase === true || opts.basename === true) {
-          match2 = picomatch2.matchBase(input, regex2, options2, posix4);
+          match2 = picomatch2.matchBase(input, regex2, options2, posix3);
         } else {
           match2 = regex2.exec(output);
         }
@@ -309535,6 +309535,10 @@ var DiscoveredMCPToolInvocation = class _DiscoveredMCPToolInvocation extends Bas
     const functionResponse = rawResponseParts?.[0]?.functionResponse;
     const response = functionResponse?.response;
     if (response) {
+      const isErrorTop = response.isError;
+      if (isErrorTop === true || isErrorTop === "true") {
+        return true;
+      }
       const error2 = response?.error;
       const isError2 = error2?.isError;
       if (error2 && (isError2 === true || isError2 === "true")) {
@@ -309839,8 +309843,8 @@ function sanitizeHookName(hookName) {
   }
   if (command.includes("/") || command.includes("\\")) {
     const pathParts = command.split(/[/\\]/);
-    const basename14 = pathParts[pathParts.length - 1];
-    return basename14 || "unknown-command";
+    const basename15 = pathParts[pathParts.length - 1];
+    return basename15 || "unknown-command";
   }
   return command;
 }
@@ -311908,8 +311912,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 = "d90356e8a";
-var CLI_VERSION = "0.21.0-nightly.20251210.d90356e8a";
+var GIT_COMMIT_INFO = "54de67536";
+var CLI_VERSION = "0.21.0-nightly.20251212.54de67536";
 
 // packages/core/dist/src/ide/detect-ide.js
 var IDE_DEFINITIONS = {
@@ -315094,9 +315098,10 @@ async function createContentGenerator(config3, gcConfig, sessionId2) {
     if (gcConfig.fakeResponses) {
       return FakeContentGenerator.fromFile(gcConfig.fakeResponses);
     }
-    const version4 = "0.21.0-nightly.20251210.d90356e8a";
+    const version4 = await getVersion();
+    const model = getEffectiveModel(gcConfig.isInFallbackMode(), gcConfig.getModel(), gcConfig.getPreviewFeatures());
     const customHeadersEnv = process.env["GEMINI_CLI_CUSTOM_HEADERS"] || void 0;
-    const userAgent = `GeminiCLI/${version4} (${process.platform}; ${process.arch})`;
+    const userAgent = `GeminiCLI/${version4}/${model} (${process.platform}; ${process.arch})`;
     const customHeadersMap = parseCustomHeaders(customHeadersEnv);
     const apiKeyAuthMechanism = process.env["GEMINI_API_KEY_AUTH_MECHANISM"] || "x-goog-api-key";
     const baseHeaders = {
@@ -315669,6 +315674,7 @@ var READ_FILE_TOOL_NAME = "read_file";
 var LS_TOOL_NAME = "list_directory";
 var MEMORY_TOOL_NAME = "save_memory";
 var EDIT_TOOL_NAMES = /* @__PURE__ */ new Set([EDIT_TOOL_NAME, WRITE_FILE_TOOL_NAME]);
+var DELEGATE_TO_AGENT_TOOL_NAME = "delegate_to_agent";
 
 // packages/core/dist/src/tools/ls.js
 var LSToolInvocation = class extends BaseToolInvocation {
@@ -352380,8 +352386,8 @@ Expectation for required parameters:
 };
 
 // packages/core/dist/src/tools/smart-edit.js
-import * as fs42 from "node:fs";
-import * as path42 from "node:path";
+import * as fs43 from "node:fs";
+import * as path43 from "node:path";
 import * as crypto19 from "node:crypto";
 
 // packages/core/dist/src/utils/editor.js
@@ -352757,28 +352763,28 @@ function parseGoogleApiError(error2) {
   const code2 = currentError.code;
   const message = currentError.message;
   const errorDetails = currentError.details;
-  if (Array.isArray(errorDetails) && code2 && message) {
+  if (code2 && message) {
     const details = [];
-    for (const detail of errorDetails) {
-      if (detail && typeof detail === "object") {
-        const detailObj = detail;
-        const typeKey = Object.keys(detailObj).find((key) => key.trim() === "@type");
-        if (typeKey) {
-          if (typeKey !== "@type") {
-            detailObj["@type"] = detailObj[typeKey];
-            delete detailObj[typeKey];
+    if (Array.isArray(errorDetails)) {
+      for (const detail of errorDetails) {
+        if (detail && typeof detail === "object") {
+          const detailObj = detail;
+          const typeKey = Object.keys(detailObj).find((key) => key.trim() === "@type");
+          if (typeKey) {
+            if (typeKey !== "@type") {
+              detailObj["@type"] = detailObj[typeKey];
+              delete detailObj[typeKey];
+            }
+            details.push(detailObj);
           }
-          details.push(detailObj);
         }
       }
     }
-    if (details.length > 0) {
-      return {
-        code: code2,
-        message,
-        details
-      };
-    }
+    return {
+      code: code2,
+      message,
+      details
+    };
   }
   return null;
 }
@@ -352820,6 +352826,16 @@ function fromApiError(errorObj) {
       try {
         data = JSON.parse(data);
       } catch (_) {
+        if (typeof data === "string") {
+          const firstBrace = data.indexOf("{");
+          const lastBrace = data.lastIndexOf("}");
+          if (firstBrace !== -1 && lastBrace !== -1 && lastBrace > firstBrace) {
+            try {
+              data = JSON.parse(data.substring(firstBrace, lastBrace + 1));
+            } catch (__) {
+            }
+          }
+        }
       }
     }
     if (Array.isArray(data) && data.length > 0) {
@@ -352897,8 +352913,8 @@ function classifyGoogleError(error2) {
     const message = googleApiError?.message || (error2 instanceof Error ? error2.message : "Model not found");
     return new ModelNotFoundError(message, status);
   }
-  if (!googleApiError || googleApiError.code !== 429) {
-    const errorMessage = error2 instanceof Error ? error2.message : String(error2);
+  if (!googleApiError || googleApiError.code !== 429 || googleApiError.details.length === 0) {
+    const errorMessage = googleApiError?.message || (error2 instanceof Error ? error2.message : String(error2));
     const match2 = errorMessage.match(/Please retry in ([0-9.]+(?:ms|s))/);
     if (match2?.[1]) {
       const retryDelaySeconds = parseDurationInSeconds(match2[1]);
@@ -353652,17 +353668,133 @@ async function FixLLMEditWithInstruction(instruction, old_string, new_string, er
 }
 
 // packages/core/dist/src/utils/pathCorrector.js
-import * as fs41 from "node:fs";
+import * as fs42 from "node:fs";
+import * as path42 from "node:path";
+
+// packages/core/dist/src/utils/bfsFileSearch.js
+import * as fs41 from "node:fs/promises";
+import * as fsSync from "node:fs";
 import * as path41 from "node:path";
+var logger3 = {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  debug: (...args2) => debugLogger.debug("[DEBUG] [BfsFileSearch]", ...args2)
+};
+async function bfsFileSearch(rootDir, options2) {
+  const { ignoreDirs = [], maxDirs = Infinity, debug: debug2 = false } = options2;
+  const foundFiles = [];
+  const queue = [rootDir];
+  const visited = /* @__PURE__ */ new Set();
+  let scannedDirCount = 0;
+  let queueHead = 0;
+  const ignoreDirsSet = new Set(ignoreDirs);
+  const PARALLEL_BATCH_SIZE = 15;
+  while (queueHead < queue.length && scannedDirCount < maxDirs) {
+    const batchSize = Math.min(PARALLEL_BATCH_SIZE, maxDirs - scannedDirCount);
+    const currentBatch = [];
+    while (currentBatch.length < batchSize && queueHead < queue.length) {
+      const currentDir = queue[queueHead];
+      queueHead++;
+      if (!visited.has(currentDir)) {
+        visited.add(currentDir);
+        currentBatch.push(currentDir);
+      }
+    }
+    scannedDirCount += currentBatch.length;
+    if (currentBatch.length === 0)
+      continue;
+    if (debug2) {
+      logger3.debug(`Scanning [${scannedDirCount}/${maxDirs}]: batch of ${currentBatch.length}`);
+    }
+    const readPromises = currentBatch.map(async (currentDir) => {
+      try {
+        const entries2 = await fs41.readdir(currentDir, { withFileTypes: true });
+        return { currentDir, entries: entries2 };
+      } catch (error2) {
+        const message = error2?.message ?? "Unknown error";
+        debugLogger.warn(`[WARN] Skipping unreadable directory: ${currentDir} (${message})`);
+        if (debug2) {
+          logger3.debug(`Full error for ${currentDir}:`, error2);
+        }
+        return { currentDir, entries: [] };
+      }
+    });
+    const results = await Promise.all(readPromises);
+    for (const { currentDir, entries: entries2 } of results) {
+      processDirEntries(currentDir, entries2, options2, ignoreDirsSet, queue, foundFiles);
+    }
+  }
+  return foundFiles;
+}
+function bfsFileSearchSync(rootDir, options2) {
+  const { ignoreDirs = [], maxDirs = Infinity, debug: debug2 = false } = options2;
+  const foundFiles = [];
+  const queue = [rootDir];
+  const visited = /* @__PURE__ */ new Set();
+  let scannedDirCount = 0;
+  let queueHead = 0;
+  const ignoreDirsSet = new Set(ignoreDirs);
+  while (queueHead < queue.length && scannedDirCount < maxDirs) {
+    const currentDir = queue[queueHead];
+    queueHead++;
+    if (!visited.has(currentDir)) {
+      visited.add(currentDir);
+      scannedDirCount++;
+      if (debug2) {
+        logger3.debug(`Scanning Sync [${scannedDirCount}/${maxDirs}]: ${currentDir}`);
+      }
+      try {
+        const entries2 = fsSync.readdirSync(currentDir, { withFileTypes: true });
+        processDirEntries(currentDir, entries2, options2, ignoreDirsSet, queue, foundFiles);
+      } catch (error2) {
+        const message = error2?.message ?? "Unknown error";
+        debugLogger.warn(`[WARN] Skipping unreadable directory: ${currentDir} (${message})`);
+      }
+    }
+  }
+  return foundFiles;
+}
+function processDirEntries(currentDir, entries2, options2, ignoreDirsSet, queue, foundFiles) {
+  for (const entry of entries2) {
+    const fullPath = path41.join(currentDir, entry.name);
+    const isDirectory = entry.isDirectory();
+    const isMatchingFile = entry.isFile() && entry.name === options2.fileName;
+    if (!isDirectory && !isMatchingFile) {
+      continue;
+    }
+    if (isDirectory && ignoreDirsSet.has(entry.name)) {
+      continue;
+    }
+    if (options2.fileService?.shouldIgnoreFile(fullPath, {
+      respectGitIgnore: options2.fileFilteringOptions?.respectGitIgnore,
+      respectGeminiIgnore: options2.fileFilteringOptions?.respectGeminiIgnore
+    })) {
+      continue;
+    }
+    if (isDirectory) {
+      queue.push(fullPath);
+    } else {
+      foundFiles.push(fullPath);
+    }
+  }
+}
+
+// packages/core/dist/src/utils/pathCorrector.js
 function correctPath(filePath, config3) {
-  const directPath = path41.join(config3.getTargetDir(), filePath);
-  if (fs41.existsSync(directPath)) {
+  const directPath = path42.join(config3.getTargetDir(), filePath);
+  if (fs42.existsSync(directPath)) {
     return { success: true, correctedPath: directPath };
   }
   const workspaceContext = config3.getWorkspaceContext();
-  const fileSystem = config3.getFileSystemService();
   const searchPaths = workspaceContext.getDirectories();
-  const foundFiles = fileSystem.findFiles(filePath, searchPaths);
+  const basename15 = path42.basename(filePath);
+  const normalizedTarget = filePath.replace(/\\/g, "/");
+  const foundFiles = searchPaths.flatMap((searchPath) => bfsFileSearchSync(searchPath, {
+    fileName: basename15,
+    maxDirs: 50,
+    // Capped to avoid deep hangs
+    fileService: config3.getFileService(),
+    fileFilteringOptions: config3.getFileFilteringOptions()
+  })).filter((f3) => f3.replace(/\\/g, "/").endsWith(normalizedTarget));
   if (foundFiles.length === 0) {
     return {
       success: false,
@@ -354044,7 +354176,7 @@ var EditToolInvocation2 = class extends BaseToolInvocation {
       debugLogger.log(`Error: ${editData.error.display}`);
       return false;
     }
-    const fileName = path42.basename(this.params.file_path);
+    const fileName = path43.basename(this.params.file_path);
     const fileDiff = createPatch(fileName, editData.currentContent ?? "", editData.newContent, "Current", "Proposed", DEFAULT_DIFF_OPTIONS);
     const ideClient = await IdeClient.getInstance();
     const ideConfirmation = this.config.getIdeMode() && ideClient.isDiffingEnabled() ? ideClient.openDiff(this.params.file_path, editData.newContent) : void 0;
@@ -354128,7 +354260,7 @@ var EditToolInvocation2 = class extends BaseToolInvocation {
       if (editData.isNewFile) {
         displayResult = `Created ${shortenPath(makeRelative(this.params.file_path, this.config.getTargetDir()))}`;
       } else {
-        const fileName = path42.basename(this.params.file_path);
+        const fileName = path43.basename(this.params.file_path);
         const fileDiff = createPatch(
           fileName,
           editData.currentContent ?? "",
@@ -354173,9 +354305,9 @@ var EditToolInvocation2 = class extends BaseToolInvocation {
    * Creates parent directories if they don't exist
    */
   ensureParentDirectoriesExist(filePath) {
-    const dirName = path42.dirname(filePath);
-    if (!fs42.existsSync(dirName)) {
-      fs42.mkdirSync(dirName, { recursive: true });
+    const dirName = path43.dirname(filePath);
+    if (!fs43.existsSync(dirName)) {
+      fs43.mkdirSync(dirName, { recursive: true });
     }
   }
 };
@@ -354258,7 +354390,7 @@ A good instruction should concisely answer:
       return "The 'file_path' parameter must be non-empty.";
     }
     let filePath = params.file_path;
-    if (!path42.isAbsolute(filePath)) {
+    if (!path43.isAbsolute(filePath)) {
       const result = correctPath(filePath, this.config);
       if (!result.success) {
         return result.error;
@@ -354313,8 +354445,8 @@ A good instruction should concisely answer:
 };
 
 // packages/core/dist/src/tools/shell.js
-import fs43 from "node:fs";
-import path43 from "node:path";
+import fs44 from "node:fs";
+import path44 from "node:path";
 import os17, { EOL as EOL2 } from "node:os";
 import crypto20 from "node:crypto";
 
@@ -360043,7 +360175,7 @@ var ShellToolInvocation = class extends BaseToolInvocation {
     }
     const isWindows5 = os17.platform() === "win32";
     const tempFileName = `shell_pgrep_${crypto20.randomBytes(6).toString("hex")}.tmp`;
-    const tempFilePath = path43.join(os17.tmpdir(), tempFileName);
+    const tempFilePath = path44.join(os17.tmpdir(), tempFileName);
     const timeoutMs = this.config.getShellToolInactivityTimeout();
     const timeoutController = new AbortController();
     let timeoutTimer;
@@ -360056,7 +360188,7 @@ var ShellToolInvocation = class extends BaseToolInvocation {
           command += ";";
         return `{ ${command} }; __code=$?; pgrep -g 0 >${tempFilePath} 2>&1; exit $__code;`;
       })();
-      const cwd = this.params.dir_path ? path43.resolve(this.config.getTargetDir(), this.params.dir_path) : this.config.getTargetDir();
+      const cwd = this.params.dir_path ? path44.resolve(this.config.getTargetDir(), this.params.dir_path) : this.config.getTargetDir();
       let cumulativeOutput = "";
       let lastUpdateTime = Date.now();
       let isBinaryStream = false;
@@ -360115,8 +360247,8 @@ var ShellToolInvocation = class extends BaseToolInvocation {
       const result = await resultPromise;
       const backgroundPIDs = [];
       if (os17.platform() !== "win32") {
-        if (fs43.existsSync(tempFilePath)) {
-          const pgrepLines = fs43.readFileSync(tempFilePath, "utf8").split(EOL2).filter(Boolean);
+        if (fs44.existsSync(tempFilePath)) {
+          const pgrepLines = fs44.readFileSync(tempFilePath, "utf8").split(EOL2).filter(Boolean);
           for (const line of pgrepLines) {
             if (!/^\d+$/.test(line)) {
               debugLogger.error(`pgrep: ${line}`);
@@ -360208,8 +360340,8 @@ ${result.output}`;
         clearTimeout(timeoutTimer);
       signal.removeEventListener("abort", onAbort);
       timeoutController.signal.removeEventListener("abort", onAbort);
-      if (fs43.existsSync(tempFilePath)) {
-        fs43.unlinkSync(tempFilePath);
+      if (fs44.existsSync(tempFilePath)) {
+        fs44.unlinkSync(tempFilePath);
       }
     }
   }
@@ -360303,7 +360435,7 @@ var ShellTool = class _ShellTool extends BaseDeclarativeTool {
       return "Could not identify command root to obtain permission from user.";
     }
     if (params.dir_path) {
-      const resolvedPath = path43.resolve(this.config.getTargetDir(), params.dir_path);
+      const resolvedPath = path44.resolve(this.config.getTargetDir(), params.dir_path);
       const workspaceContext = this.config.getWorkspaceContext();
       if (!workspaceContext.isPathWithinWorkspace(resolvedPath)) {
         return `Directory '${resolvedPath}' is not within any of the registered workspace directories.`;
@@ -360317,8 +360449,8 @@ var ShellTool = class _ShellTool extends BaseDeclarativeTool {
 };
 
 // packages/core/dist/src/tools/write-file.js
-import fs44 from "node:fs";
-import path44 from "node:path";
+import fs45 from "node:fs";
+import path45 from "node:path";
 async function getCorrectedFileContent(config3, filePath, proposedContent, abortSignal) {
   let originalContent = "";
   let fileExists2 = false;
@@ -360359,7 +360491,7 @@ var WriteFileToolInvocation = class extends BaseToolInvocation {
   constructor(config3, params, messageBus, toolName, displayName) {
     super(params, messageBus, toolName, displayName);
     this.config = config3;
-    this.resolvedPath = path44.resolve(this.config.getTargetDir(), this.params.file_path);
+    this.resolvedPath = path45.resolve(this.config.getTargetDir(), this.params.file_path);
   }
   toolLocations() {
     return [{ path: this.resolvedPath }];
@@ -360378,7 +360510,7 @@ var WriteFileToolInvocation = class extends BaseToolInvocation {
     }
     const { originalContent, correctedContent } = correctedContentResult;
     const relativePath = makeRelative(this.resolvedPath, this.config.getTargetDir());
-    const fileName = path44.basename(this.resolvedPath);
+    const fileName = path45.basename(this.resolvedPath);
     const fileDiff = createPatch(
       fileName,
       originalContent,
@@ -360432,12 +360564,12 @@ var WriteFileToolInvocation = class extends BaseToolInvocation {
     const { originalContent, correctedContent: fileContent, fileExists: fileExists2 } = correctedContentResult;
     const isNewFile = !fileExists2 || correctedContentResult.error !== void 0 && !correctedContentResult.fileExists;
     try {
-      const dirName = path44.dirname(this.resolvedPath);
-      if (!fs44.existsSync(dirName)) {
-        fs44.mkdirSync(dirName, { recursive: true });
+      const dirName = path45.dirname(this.resolvedPath);
+      if (!fs45.existsSync(dirName)) {
+        fs45.mkdirSync(dirName, { recursive: true });
       }
       await this.config.getFileSystemService().writeTextFile(this.resolvedPath, fileContent);
-      const fileName = path44.basename(this.resolvedPath);
+      const fileName = path45.basename(this.resolvedPath);
       const currentContentForDiff = correctedContentResult.error ? "" : originalContent;
       const fileDiff = createPatch(fileName, currentContentForDiff, fileContent, "Original", "Written", DEFAULT_DIFF_OPTIONS);
       const originallyProposedContent = ai_proposed_content || content;
@@ -360450,7 +360582,7 @@ var WriteFileToolInvocation = class extends BaseToolInvocation {
       }
       const mimetype = getSpecificMimeType(this.resolvedPath);
       const programmingLanguage = getLanguageFromFilePath(this.resolvedPath);
-      const extension = path44.extname(this.resolvedPath);
+      const extension = path45.extname(this.resolvedPath);
       const operation = isNewFile ? FileOperation.CREATE : FileOperation.UPDATE;
       logFileOperation(this.config, new FileOperationEvent(WRITE_FILE_TOOL_NAME, operation, fileContent.split("\n").length, mimetype, extension, programmingLanguage));
       const displayResult = {
@@ -360525,15 +360657,15 @@ var WriteFileTool = class _WriteFileTool extends BaseDeclarativeTool {
     if (!filePath) {
       return `Missing or empty "file_path"`;
     }
-    const resolvedPath = path44.resolve(this.config.getTargetDir(), filePath);
+    const resolvedPath = path45.resolve(this.config.getTargetDir(), filePath);
     const workspaceContext = this.config.getWorkspaceContext();
     if (!workspaceContext.isPathWithinWorkspace(resolvedPath)) {
       const directories = workspaceContext.getDirectories();
       return `File path must be within one of the workspace directories: ${directories.join(", ")}`;
     }
     try {
-      if (fs44.existsSync(resolvedPath)) {
-        const stats = fs44.lstatSync(resolvedPath);
+      if (fs45.existsSync(resolvedPath)) {
+        const stats = fs45.lstatSync(resolvedPath);
         if (stats.isDirectory()) {
           return `Path is a directory, not a file: ${resolvedPath}`;
         }
@@ -365941,13 +366073,13 @@ var WebSearchTool = class _WebSearchTool extends BaseDeclarativeTool {
 };
 
 // packages/core/dist/src/utils/getFolderStructure.js
-import * as fs45 from "node:fs/promises";
-import * as path45 from "node:path";
+import * as fs46 from "node:fs/promises";
+import * as path46 from "node:path";
 var MAX_ITEMS = 200;
 var TRUNCATION_INDICATOR = "...";
 var DEFAULT_IGNORED_FOLDERS = /* @__PURE__ */ new Set(["node_modules", ".git", "dist"]);
 async function readFullStructure(rootPath, options2) {
-  const rootName = path45.basename(rootPath);
+  const rootName = path46.basename(rootPath);
   const rootNode = {
     name: rootName,
     path: rootPath,
@@ -365972,7 +366104,7 @@ async function readFullStructure(rootPath, options2) {
     }
     let entries2;
     try {
-      const rawEntries = await fs45.readdir(currentPath, { withFileTypes: true });
+      const rawEntries = await fs46.readdir(currentPath, { withFileTypes: true });
       entries2 = rawEntries.sort((a2, b) => a2.name.localeCompare(b.name));
     } catch (error2) {
       if (isNodeError(error2) && (error2.code === "EACCES" || error2.code === "ENOENT")) {
@@ -365997,7 +366129,7 @@ async function readFullStructure(rootPath, options2) {
           break;
         }
         const fileName = entry.name;
-        const filePath = path45.join(currentPath, fileName);
+        const filePath = path46.join(currentPath, fileName);
         if (options2.fileService?.shouldIgnoreFile(filePath, filterFileOptions)) {
           continue;
         }
@@ -366017,7 +366149,7 @@ async function readFullStructure(rootPath, options2) {
           break;
         }
         const subFolderName = entry.name;
-        const subFolderPath = path45.join(currentPath, subFolderName);
+        const subFolderPath = path46.join(currentPath, subFolderName);
         const isIgnored = options2.fileService?.shouldIgnoreFile(subFolderPath, filterFileOptions) ?? false;
         if (options2.ignoredFolders.has(subFolderName) || isIgnored) {
           const ignoredSubFolder = {
@@ -366055,7 +366187,7 @@ async function readFullStructure(rootPath, options2) {
 function formatStructure(node, currentIndent, isLastChildOfParent, isProcessingRootNode, builder) {
   const connector = isLastChildOfParent ? "\u2514\u2500\u2500\u2500" : "\u251C\u2500\u2500\u2500";
   if (!isProcessingRootNode || node.isIgnored) {
-    builder.push(`${currentIndent}${connector}${node.name}${path45.sep}${node.isIgnored ? TRUNCATION_INDICATOR : ""}`);
+    builder.push(`${currentIndent}${connector}${node.name}${path46.sep}${node.isIgnored ? TRUNCATION_INDICATOR : ""}`);
   }
   const indentForChildren = isProcessingRootNode ? "" : currentIndent + (isLastChildOfParent ? "    " : "\u2502   ");
   const fileCount = node.files.length;
@@ -366079,7 +366211,7 @@ function formatStructure(node, currentIndent, isLastChildOfParent, isProcessingR
   }
 }
 async function getFolderStructure(directory, options2) {
-  const resolvedPath = path45.resolve(directory);
+  const resolvedPath = path46.resolve(directory);
   const mergedOptions = {
     maxItems: options2?.maxItems ?? MAX_ITEMS,
     ignoredFolders: options2?.ignoredFolders ?? DEFAULT_IGNORED_FOLDERS,
@@ -366112,7 +366244,7 @@ async function getFolderStructure(directory, options2) {
     }
     return `${summary}
 
-${resolvedPath}${path45.sep}
+${resolvedPath}${path46.sep}
 ${structureLines.join("\n")}`;
   } catch (error2) {
     console.error(`Error getting folder structure for ${resolvedPath}:`, error2);
@@ -366193,8 +366325,8 @@ function getResponseTextFromParts(parts2) {
 }
 
 // packages/core/dist/src/core/coreToolScheduler.js
-import * as fs46 from "node:fs/promises";
-import * as path46 from "node:path";
+import * as fs47 from "node:fs/promises";
+import * as path47 from "node:path";
 var import_fast_levenshtein = __toESM(require_levenshtein(), 1);
 
 // packages/core/dist/src/hooks/hookTranslator.js
@@ -366860,10 +366992,10 @@ async function truncateAndSaveToFile(content, callId, projectTempDir, threshold,
   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 = `${path46.basename(callId)}.output`;
-  const outputFile = path46.join(projectTempDir, safeFileName);
+  const safeFileName = `${path47.basename(callId)}.output`;
+  const outputFile = path47.join(projectTempDir, safeFileName);
   try {
-    await fs46.writeFile(outputFile, fileContent);
+    await fs47.writeFile(outputFile, fileContent);
     return {
       content: `Tool output was too large and has been truncated.
 The full output has been saved to: ${outputFile}
@@ -367539,8 +367671,8 @@ function parseThought(rawText) {
 }
 
 // packages/core/dist/src/services/chatRecordingService.js
-import path47 from "node:path";
-import fs47 from "node:fs";
+import path48 from "node:path";
+import fs48 from "node:fs";
 import { randomUUID as randomUUID5 } from "node:crypto";
 var SESSION_FILE_PREFIX = "session-";
 var ChatRecordingService = class {
@@ -367570,11 +367702,11 @@ var ChatRecordingService = class {
         });
         this.cachedLastConvData = null;
       } else {
-        const chatsDir = path47.join(this.config.storage.getProjectTempDir(), "chats");
-        fs47.mkdirSync(chatsDir, { recursive: true });
+        const chatsDir = path48.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 = path47.join(chatsDir, filename);
+        this.conversationFile = path48.join(chatsDir, filename);
         this.writeConversation({
           sessionId: this.sessionId,
           projectHash: this.projectHash,
@@ -367744,7 +367876,7 @@ var ChatRecordingService = class {
    */
   readConversation() {
     try {
-      this.cachedLastConvData = fs47.readFileSync(this.conversationFile, "utf8");
+      this.cachedLastConvData = fs48.readFileSync(this.conversationFile, "utf8");
       return JSON.parse(this.cachedLastConvData);
     } catch (error2) {
       if (error2.code !== "ENOENT") {
@@ -367773,7 +367905,7 @@ var ChatRecordingService = class {
         conversation.lastUpdated = (/* @__PURE__ */ new Date()).toISOString();
         const newContent = JSON.stringify(conversation, null, 2);
         this.cachedLastConvData = newContent;
-        fs47.writeFileSync(this.conversationFile, newContent);
+        fs48.writeFileSync(this.conversationFile, newContent);
       }
     } catch (error2) {
       debugLogger.error("Error writing conversation file.", error2);
@@ -367816,14 +367948,21 @@ var ChatRecordingService = class {
       return null;
     }
   }
+  /**
+   * Gets the path to the current conversation file.
+   * Returns null if the service hasn't been initialized yet.
+   */
+  getConversationFilePath() {
+    return this.conversationFile;
+  }
   /**
    * Deletes a session file by session ID.
    */
   deleteSession(sessionId2) {
     try {
-      const chatsDir = path47.join(this.config.storage.getProjectTempDir(), "chats");
-      const sessionPath = path47.join(chatsDir, `${sessionId2}.json`);
-      fs47.unlinkSync(sessionPath);
+      const chatsDir = path48.join(this.config.storage.getProjectTempDir(), "chats");
+      const sessionPath = path48.join(chatsDir, `${sessionId2}.json`);
+      fs48.unlinkSync(sessionPath);
     } catch (error2) {
       debugLogger.error("Error deleting session file.", error2);
       throw error2;
@@ -368928,8 +369067,8 @@ function getCitations(resp) {
 }
 
 // packages/core/dist/src/core/prompts.js
-import path48 from "node:path";
-import fs48 from "node:fs";
+import path49 from "node:path";
+import fs49 from "node:fs";
 import os18 from "node:os";
 import process20 from "node:process";
 
@@ -369248,7 +369387,7 @@ function resolvePathFromEnv(envVar) {
       if (customPath === "~") {
         customPath = home;
       } else {
-        customPath = path48.join(home, customPath.slice(2));
+        customPath = path49.join(home, customPath.slice(2));
       }
     } catch (error2) {
       debugLogger.warn(`Could not resolve home directory for path: ${trimmedEnvVar}`, error2);
@@ -369257,20 +369396,20 @@ function resolvePathFromEnv(envVar) {
   }
   return {
     isSwitch: false,
-    value: path48.resolve(customPath),
+    value: path49.resolve(customPath),
     isDisabled: false
   };
 }
 function getCoreSystemPrompt(config3, userMemory) {
   let systemMdEnabled = false;
-  let systemMdPath = path48.resolve(path48.join(GEMINI_DIR, "system.md"));
+  let systemMdPath = path49.resolve(path49.join(GEMINI_DIR, "system.md"));
   const systemMdResolution = resolvePathFromEnv(process20.env["GEMINI_SYSTEM_MD"]);
   if (systemMdResolution.value && !systemMdResolution.isDisabled) {
     systemMdEnabled = true;
     if (!systemMdResolution.isSwitch) {
       systemMdPath = systemMdResolution.value;
     }
-    if (!fs48.existsSync(systemMdPath)) {
+    if (!fs49.existsSync(systemMdPath)) {
       throw new Error(`missing system prompt file '${systemMdPath}'`);
     }
   }
@@ -369283,7 +369422,7 @@ function getCoreSystemPrompt(config3, userMemory) {
   const interactiveMode = config3.isInteractiveShellEnabled();
   let basePrompt;
   if (systemMdEnabled) {
-    basePrompt = fs48.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.`,
@@ -369299,7 +369438,9 @@ function getCoreSystemPrompt(config3, userMemory) {
 - ${interactiveMode ? `**Confirm Ambiguity/Expansion:** Do not take significant actions beyond the clear scope of the request without confirming with the user. If asked *how* to do something, explain first, don't just do it.` : `**Handle Ambiguity/Expansion:** Do not take significant actions beyond the clear scope of the request.`}
 - **Explaining Changes:** After completing a code modification or file operation *do not* provide summaries unless asked.
 - **Do Not revert changes:** Do not revert changes to the codebase unless asked to do so by the user. Only revert changes made by you if they have resulted in an error or if the user has explicitly asked you to revert the changes.${mandatesVariant}${!interactiveMode ? `
-  - **Continue the work** You are not to interact with the user. Do your best to complete the task at hand, using your best judgement and avoid asking user for any additional information.` : ""}`,
+  - **Continue the work** You are not to interact with the user. Do your best to complete the task at hand, using your best judgement and avoid asking user for any additional information.` : ""}
+
+${config3.getAgentRegistry().getDirectoryContext()}`,
       primaryWorkflows_prefix: `
 # Primary Workflows
 
@@ -369313,15 +369454,15 @@ Use '${READ_FILE_TOOL_NAME}' to understand context and validate any assumptions
 
 ## Software Engineering Tasks
 When requested to perform tasks like fixing bugs, adding features, refactoring, or explaining code, follow this sequence:
-1. **Understand & Strategize:** Think about the user's request and the relevant codebase context. When the task involves **complex refactoring, codebase exploration or system-wide analysis**, your **first and primary tool** must be '${CodebaseInvestigatorAgent.name}'. Use it to build a comprehensive understanding of the code, its structure, and dependencies. For **simple, targeted searches** (like finding a specific function name, file path, or variable declaration), you should use '${GREP_TOOL_NAME}' or '${GLOB_TOOL_NAME}' directly.
-2. **Plan:** Build a coherent and grounded (based on the understanding in step 1) plan for how you intend to resolve the user's task. If '${CodebaseInvestigatorAgent.name}' was used, do not ignore the output of '${CodebaseInvestigatorAgent.name}', you must use it as the foundation of your plan. Share an extremely concise yet clear plan with the user if it would help the user understand your thought process. As part of the plan, you should use an iterative development process that includes writing unit tests to verify your changes. Use output logs or debug statements as part of this process to arrive at a solution.`,
+1. **Understand & Strategize:** Think about the user's request and the relevant codebase context. When the task involves **complex refactoring, codebase exploration or system-wide analysis**, your **first and primary action** must be to delegate to the '${CodebaseInvestigatorAgent.name}' agent using the '${DELEGATE_TO_AGENT_TOOL_NAME}' tool. Use it to build a comprehensive understanding of the code, its structure, and dependencies. For **simple, targeted searches** (like finding a specific function name, file path, or variable declaration), you should use '${GREP_TOOL_NAME}' or '${GLOB_TOOL_NAME}' directly.
+2. **Plan:** Build a coherent and grounded (based on the understanding in step 1) plan for how you intend to resolve the user's task. If '${CodebaseInvestigatorAgent.name}' was used, do not ignore the output of the agent, you must use it as the foundation of your plan. Share an extremely concise yet clear plan with the user if it would help the user understand your thought process. As part of the plan, you should use an iterative development process that includes writing unit tests to verify your changes. Use output logs or debug statements as part of this process to arrive at a solution.`,
       primaryWorkflows_prefix_ci_todo: `
 # Primary Workflows
 
 ## Software Engineering Tasks
 When requested to perform tasks like fixing bugs, adding features, refactoring, or explaining code, follow this sequence:
-1. **Understand & Strategize:** Think about the user's request and the relevant codebase context. When the task involves **complex refactoring, codebase exploration or system-wide analysis**, your **first and primary tool** must be '${CodebaseInvestigatorAgent.name}'. Use it to build a comprehensive understanding of the code, its structure, and dependencies. For **simple, targeted searches** (like finding a specific function name, file path, or variable declaration), you should use '${GREP_TOOL_NAME}' or '${GLOB_TOOL_NAME}' directly.
-2. **Plan:** Build a coherent and grounded (based on the understanding in step 1) plan for how you intend to resolve the user's task. If '${CodebaseInvestigatorAgent.name}' was used, do not ignore the output of '${CodebaseInvestigatorAgent.name}', you must use it as the foundation of your plan. For complex tasks, break them down into smaller, manageable subtasks and use the \`${WRITE_TODOS_TOOL_NAME}\` tool to track your progress. Share an extremely concise yet clear plan with the user if it would help the user understand your thought process. As part of the plan, you should use an iterative development process that includes writing unit tests to verify your changes. Use output logs or debug statements as part of this process to arrive at a solution.`,
+1. **Understand & Strategize:** Think about the user's request and the relevant codebase context. When the task involves **complex refactoring, codebase exploration or system-wide analysis**, your **first and primary action** must be to delegate to the '${CodebaseInvestigatorAgent.name}' agent using the '${DELEGATE_TO_AGENT_TOOL_NAME}' tool. Use it to build a comprehensive understanding of the code, its structure, and dependencies. For **simple, targeted searches** (like finding a specific function name, file path, or variable declaration), you should use '${GREP_TOOL_NAME}' or '${GLOB_TOOL_NAME}' directly.
+2. **Plan:** Build a coherent and grounded (based on the understanding in step 1) plan for how you intend to resolve the user's task. If '${CodebaseInvestigatorAgent.name}' was used, do not ignore the output of the agent, you must use it as the foundation of your plan. For complex tasks, break them down into smaller, manageable subtasks and use the \`${WRITE_TODOS_TOOL_NAME}\` tool to track your progress. Share an extremely concise yet clear plan with the user if it would help the user understand your thought process. As part of the plan, you should use an iterative development process that includes writing unit tests to verify your changes. Use output logs or debug statements as part of this process to arrive at a solution.`,
       primaryWorkflows_todo: `
 # Primary Workflows
 
@@ -369488,8 +369629,8 @@ Your core function is efficient and safe assistance. Balance extreme conciseness
   const writeSystemMdResolution = resolvePathFromEnv(process20.env["GEMINI_WRITE_SYSTEM_MD"]);
   if (writeSystemMdResolution.value && !writeSystemMdResolution.isDisabled) {
     const writePath = writeSystemMdResolution.isSwitch ? systemMdPath : writeSystemMdResolution.value;
-    fs48.mkdirSync(path48.dirname(writePath), { recursive: true });
-    fs48.writeFileSync(writePath, basePrompt);
+    fs49.mkdirSync(path49.dirname(writePath), { recursive: true });
+    fs49.writeFileSync(writePath, basePrompt);
   }
   const memorySuffix = userMemory && userMemory.trim().length > 0 ? `
 
@@ -370682,8 +370823,8 @@ var GeminiClient = class {
 
 // packages/core/dist/src/utils/gitIgnoreParser.js
 var import_ignore3 = __toESM(require_ignore(), 1);
-import * as fs49 from "node:fs";
-import * as path49 from "node:path";
+import * as fs50 from "node:fs";
+import * as path50 from "node:path";
 var GitIgnoreParser = class {
   extraPatterns;
   projectRoot;
@@ -370692,7 +370833,7 @@ var GitIgnoreParser = class {
   processedExtraPatterns = [];
   constructor(projectRoot, extraPatterns) {
     this.extraPatterns = extraPatterns;
-    this.projectRoot = path49.resolve(projectRoot);
+    this.projectRoot = path50.resolve(projectRoot);
     if (this.extraPatterns) {
       this.processedExtraPatterns = this.processPatterns(this.extraPatterns, ".");
     }
@@ -370700,12 +370841,12 @@ var GitIgnoreParser = class {
   loadPatternsForFile(patternsFilePath) {
     let content;
     try {
-      content = fs49.readFileSync(patternsFilePath, "utf-8");
+      content = fs50.readFileSync(patternsFilePath, "utf-8");
     } catch (_error) {
       return [];
     }
-    const isExcludeFile = patternsFilePath.endsWith(path49.join(".git", "info", "exclude"));
-    const relativeBaseDir = isExcludeFile ? "." : path49.dirname(path49.relative(this.projectRoot, patternsFilePath)).split(path49.sep).join(path49.posix.sep);
+    const isExcludeFile = patternsFilePath.endsWith(path50.join(".git", "info", "exclude"));
+    const relativeBaseDir = isExcludeFile ? "." : path50.dirname(path50.relative(this.projectRoot, patternsFilePath)).split(path50.sep).join(path50.posix.sep);
     const rawPatterns = content.split("\n");
     return this.processPatterns(rawPatterns, relativeBaseDir);
   }
@@ -370725,9 +370866,9 @@ var GitIgnoreParser = class {
       let newPattern = p;
       if (relativeBaseDir && relativeBaseDir !== ".") {
         if (!isAnchoredInFile && !p.includes("/")) {
-          newPattern = path49.posix.join("**", p);
+          newPattern = path50.posix.join("**", p);
         }
-        newPattern = path49.posix.join(relativeBaseDir, newPattern);
+        newPattern = path50.posix.join(relativeBaseDir, newPattern);
         if (!newPattern.startsWith("/")) {
           newPattern = "/" + newPattern;
         }
@@ -370745,13 +370886,13 @@ var GitIgnoreParser = class {
     if (!filePath || typeof filePath !== "string") {
       return false;
     }
-    const absoluteFilePath = path49.resolve(this.projectRoot, filePath);
+    const absoluteFilePath = path50.resolve(this.projectRoot, filePath);
     if (!absoluteFilePath.startsWith(this.projectRoot)) {
       return false;
     }
     try {
-      const resolved = path49.resolve(this.projectRoot, filePath);
-      const relativePath = path49.relative(this.projectRoot, resolved);
+      const resolved = path50.resolve(this.projectRoot, filePath);
+      const relativePath = path50.relative(this.projectRoot, resolved);
       if (relativePath === "" || relativePath.startsWith("..")) {
         return false;
       }
@@ -370762,19 +370903,19 @@ var GitIgnoreParser = class {
       const ig = (0, import_ignore3.default)();
       ig.add(".git");
       if (this.globalPatterns === void 0) {
-        const excludeFile = path49.join(this.projectRoot, ".git", "info", "exclude");
-        this.globalPatterns = fs49.existsSync(excludeFile) ? this.loadPatternsForFile(excludeFile) : [];
+        const excludeFile = path50.join(this.projectRoot, ".git", "info", "exclude");
+        this.globalPatterns = fs50.existsSync(excludeFile) ? this.loadPatternsForFile(excludeFile) : [];
       }
       ig.add(this.globalPatterns);
-      const pathParts = relativePath.split(path49.sep);
+      const pathParts = relativePath.split(path50.sep);
       const dirsToVisit = [this.projectRoot];
       let currentAbsDir = this.projectRoot;
       for (let i4 = 0; i4 < pathParts.length - 1; i4++) {
-        currentAbsDir = path49.join(currentAbsDir, pathParts[i4]);
+        currentAbsDir = path50.join(currentAbsDir, pathParts[i4]);
         dirsToVisit.push(currentAbsDir);
       }
       for (const dir of dirsToVisit) {
-        const relativeDir = path49.relative(this.projectRoot, dir);
+        const relativeDir = path50.relative(this.projectRoot, dir);
         if (relativeDir) {
           const normalizedRelativeDir = relativeDir.replace(/\\/g, "/");
           const igPlusExtras = (0, import_ignore3.default)().add(ig).add(this.processedExtraPatterns);
@@ -370788,8 +370929,8 @@ var GitIgnoreParser = class {
             ig.add(patterns);
           }
         } else {
-          const gitignorePath = path49.join(dir, ".gitignore");
-          if (fs49.existsSync(gitignorePath)) {
+          const gitignorePath = path50.join(dir, ".gitignore");
+          if (fs50.existsSync(gitignorePath)) {
             const patterns = this.loadPatternsForFile(gitignorePath);
             this.cache.set(dir, patterns);
             ig.add(patterns);
@@ -370810,21 +370951,21 @@ var GitIgnoreParser = class {
 
 // packages/core/dist/src/utils/geminiIgnoreParser.js
 var import_ignore4 = __toESM(require_ignore(), 1);
-import * as fs50 from "node:fs";
-import * as path50 from "node:path";
+import * as fs51 from "node:fs";
+import * as path51 from "node:path";
 var GeminiIgnoreParser = class {
   projectRoot;
   patterns = [];
   ig = (0, import_ignore4.default)();
   constructor(projectRoot) {
-    this.projectRoot = path50.resolve(projectRoot);
+    this.projectRoot = path51.resolve(projectRoot);
     this.loadPatterns();
   }
   loadPatterns() {
-    const patternsFilePath = path50.join(this.projectRoot, ".geminiignore");
+    const patternsFilePath = path51.join(this.projectRoot, ".geminiignore");
     let content;
     try {
-      content = fs50.readFileSync(patternsFilePath, "utf-8");
+      content = fs51.readFileSync(patternsFilePath, "utf-8");
     } catch (_error) {
       return;
     }
@@ -370841,8 +370982,8 @@ var GeminiIgnoreParser = class {
     if (filePath.startsWith("\\") || filePath === "/" || filePath.includes("\0")) {
       return false;
     }
-    const resolved = path50.resolve(this.projectRoot, filePath);
-    const relativePath = path50.relative(this.projectRoot, resolved);
+    const resolved = path51.resolve(this.projectRoot, filePath);
+    const relativePath = path51.relative(this.projectRoot, resolved);
     if (relativePath === "" || relativePath.startsWith("..")) {
       return false;
     }
@@ -370858,14 +370999,14 @@ var GeminiIgnoreParser = class {
 };
 
 // packages/core/dist/src/services/fileDiscoveryService.js
-import * as path51 from "node:path";
+import * as path52 from "node:path";
 var FileDiscoveryService = class {
   gitIgnoreFilter = null;
   geminiIgnoreFilter = null;
   combinedIgnoreFilter = null;
   projectRoot;
   constructor(projectRoot) {
-    this.projectRoot = path51.resolve(projectRoot);
+    this.projectRoot = path52.resolve(projectRoot);
     if (isGitRepository(this.projectRoot)) {
       this.gitIgnoreFilter = new GitIgnoreParser(this.projectRoot);
     }
@@ -370917,8 +371058,8 @@ var FileDiscoveryService = class {
 };
 
 // packages/core/dist/src/services/gitService.js
-import * as fs51 from "node:fs/promises";
-import * as path52 from "node:path";
+import * as fs52 from "node:fs/promises";
+import * as path53 from "node:path";
 
 // node_modules/simple-git/dist/esm/index.js
 var import_file_exists = __toESM(require_dist8(), 1);
@@ -375446,7 +375587,7 @@ var GitService = class {
   projectRoot;
   storage;
   constructor(projectRoot, storage2) {
-    this.projectRoot = path52.resolve(projectRoot);
+    this.projectRoot = path53.resolve(projectRoot);
     this.storage = storage2;
   }
   getHistoryDir() {
@@ -375477,10 +375618,10 @@ var GitService = class {
    */
   async setupShadowGitRepository() {
     const repoDir = this.getHistoryDir();
-    const gitConfigPath = path52.join(repoDir, ".gitconfig");
-    await fs51.mkdir(repoDir, { recursive: true });
+    const gitConfigPath = path53.join(repoDir, ".gitconfig");
+    await fs52.mkdir(repoDir, { recursive: true });
     const gitConfigContent = "[user]\n  name = Gemini CLI\n  email = gemini-cli@google.com\n[commit]\n  gpgsign = false\n";
-    await fs51.writeFile(gitConfigPath, gitConfigContent);
+    await fs52.writeFile(gitConfigPath, gitConfigContent);
     const repo = simpleGit(repoDir);
     const isRepoDefined = await repo.checkIsRepo(CheckRepoActions.IS_REPO_ROOT);
     if (!isRepoDefined) {
@@ -375489,22 +375630,22 @@ var GitService = class {
       });
       await repo.commit("Initial commit", { "--allow-empty": null });
     }
-    const userGitIgnorePath = path52.join(this.projectRoot, ".gitignore");
-    const shadowGitIgnorePath = path52.join(repoDir, ".gitignore");
+    const userGitIgnorePath = path53.join(this.projectRoot, ".gitignore");
+    const shadowGitIgnorePath = path53.join(repoDir, ".gitignore");
     let userGitIgnoreContent = "";
     try {
-      userGitIgnoreContent = await fs51.readFile(userGitIgnorePath, "utf-8");
+      userGitIgnoreContent = await fs52.readFile(userGitIgnorePath, "utf-8");
     } catch (error2) {
       if (isNodeError(error2) && error2.code !== "ENOENT") {
         throw error2;
       }
     }
-    await fs51.writeFile(shadowGitIgnorePath, userGitIgnoreContent);
+    await fs52.writeFile(shadowGitIgnorePath, userGitIgnoreContent);
   }
   get shadowGitRepository() {
     const repoDir = this.getHistoryDir();
     return simpleGit(this.projectRoot).env({
-      GIT_DIR: path52.join(repoDir, ".git"),
+      GIT_DIR: path53.join(repoDir, ".git"),
       GIT_WORK_TREE: this.projectRoot,
       // Prevent git from using the user's global git config.
       HOME: repoDir,
@@ -375566,23 +375707,13 @@ function shouldAttemptBrowserLaunch() {
 }
 
 // packages/core/dist/src/services/fileSystemService.js
-import fs52 from "node:fs/promises";
-import * as path53 from "node:path";
+import fs53 from "node:fs/promises";
 var StandardFileSystemService = class {
   async readTextFile(filePath) {
-    return fs52.readFile(filePath, "utf-8");
+    return fs53.readFile(filePath, "utf-8");
   }
   async writeTextFile(filePath, content) {
-    await fs52.writeFile(filePath, content, "utf-8");
-  }
-  findFiles(fileName, searchPaths) {
-    return searchPaths.flatMap((searchPath) => {
-      const pattern = path53.posix.join(searchPath, "**", fileName);
-      return globSync(pattern, {
-        nodir: true,
-        absolute: true
-      });
-    });
+    await fs53.writeFile(filePath, content, "utf-8");
   }
 };
 
@@ -375653,6 +375784,9 @@ var ModelAvailabilityService = class {
       }
     }
   }
+  reset() {
+    this.health.clear();
+  }
   setState(model, nextState) {
     this.health.set(model, nextState);
   }
@@ -376026,12 +376160,13 @@ var ModelConfigService = class {
   }
   internalGetResolvedConfig(context2) {
     const config3 = this.config || {};
-    const { aliases: aliases2 = {}, customAliases = {}, overrides = [] } = config3;
+    const { aliases: aliases2 = {}, customAliases = {}, overrides = [], customOverrides = [] } = config3;
     const allAliases = {
       ...aliases2,
       ...customAliases,
       ...this.runtimeAliases
     };
+    const allOverrides = [...overrides, ...customOverrides];
     let baseModel = context2.model;
     let resolvedConfig = {};
     if (allAliases[context2.model]) {
@@ -376044,7 +376179,7 @@ var ModelConfigService = class {
       ...context2,
       model: modelForMatching
     };
-    const matches = overrides.map((override, index) => {
+    const matches = allOverrides.map((override, index) => {
       const matchEntries = Object.entries(override.match);
       if (matchEntries.length === 0) {
         return null;
@@ -376319,93 +376454,28 @@ var DEFAULT_MODEL_CONFIGS = {
         model: "gemini-2.5-pro"
       }
     }
-  }
+  },
+  overrides: [
+    {
+      match: { model: "chat-base", isRetry: true },
+      modelConfig: {
+        generateContentConfig: {
+          temperature: 1
+        }
+      }
+    }
+  ]
 };
 
 // packages/core/dist/src/utils/memoryDiscovery.js
 import * as fs55 from "node:fs/promises";
-import * as fsSync from "node:fs";
-import * as path56 from "node:path";
+import * as fsSync2 from "node:fs";
+import * as path55 from "node:path";
 import { homedir as homedir4 } from "node:os";
 
-// packages/core/dist/src/utils/bfsFileSearch.js
-import * as fs53 from "node:fs/promises";
-import * as path54 from "node:path";
-var logger3 = {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  debug: (...args2) => debugLogger.debug("[DEBUG] [BfsFileSearch]", ...args2)
-};
-async function bfsFileSearch(rootDir, options2) {
-  const { fileName, ignoreDirs = [], maxDirs = Infinity, debug: debug2 = false, fileService } = options2;
-  const foundFiles = [];
-  const queue = [rootDir];
-  const visited = /* @__PURE__ */ new Set();
-  let scannedDirCount = 0;
-  let queueHead = 0;
-  const ignoreDirsSet = new Set(ignoreDirs);
-  const PARALLEL_BATCH_SIZE = 15;
-  while (queueHead < queue.length && scannedDirCount < maxDirs) {
-    const batchSize = Math.min(PARALLEL_BATCH_SIZE, maxDirs - scannedDirCount);
-    const currentBatch = [];
-    while (currentBatch.length < batchSize && queueHead < queue.length) {
-      const currentDir = queue[queueHead];
-      queueHead++;
-      if (!visited.has(currentDir)) {
-        visited.add(currentDir);
-        currentBatch.push(currentDir);
-      }
-    }
-    scannedDirCount += currentBatch.length;
-    if (currentBatch.length === 0)
-      continue;
-    if (debug2) {
-      logger3.debug(`Scanning [${scannedDirCount}/${maxDirs}]: batch of ${currentBatch.length}`);
-    }
-    const readPromises = currentBatch.map(async (currentDir) => {
-      try {
-        const entries2 = await fs53.readdir(currentDir, { withFileTypes: true });
-        return { currentDir, entries: entries2 };
-      } catch (error2) {
-        const message = error2?.message ?? "Unknown error";
-        debugLogger.warn(`[WARN] Skipping unreadable directory: ${currentDir} (${message})`);
-        if (debug2) {
-          logger3.debug(`Full error for ${currentDir}:`, error2);
-        }
-        return { currentDir, entries: [] };
-      }
-    });
-    const results = await Promise.all(readPromises);
-    for (const { currentDir, entries: entries2 } of results) {
-      for (const entry of entries2) {
-        const fullPath = path54.join(currentDir, entry.name);
-        const isDirectory = entry.isDirectory();
-        const isMatchingFile = entry.isFile() && entry.name === fileName;
-        if (!isDirectory && !isMatchingFile) {
-          continue;
-        }
-        if (isDirectory && ignoreDirsSet.has(entry.name)) {
-          continue;
-        }
-        if (fileService?.shouldIgnoreFile(fullPath, {
-          respectGitIgnore: options2.fileFilteringOptions?.respectGitIgnore,
-          respectGeminiIgnore: options2.fileFilteringOptions?.respectGeminiIgnore
-        })) {
-          continue;
-        }
-        if (isDirectory) {
-          queue.push(fullPath);
-        } else {
-          foundFiles.push(fullPath);
-        }
-      }
-    }
-  }
-  return foundFiles;
-}
-
 // packages/core/dist/src/utils/memoryImportProcessor.js
 import * as fs54 from "node:fs/promises";
-import * as path55 from "node:path";
+import * as path54 from "node:path";
 
 // node_modules/marked/lib/marked.esm.js
 function _getDefaults() {
@@ -378553,9 +378623,9 @@ var logger4 = {
   error: (...args2) => debugLogger.error("[ERROR] [ImportProcessor]", ...args2)
 };
 async function findProjectRoot(startDir) {
-  let currentDir = path55.resolve(startDir);
+  let currentDir = path54.resolve(startDir);
   while (true) {
-    const gitPath = path55.join(currentDir, ".git");
+    const gitPath = path54.join(currentDir, ".git");
     try {
       const stats = await fs54.lstat(gitPath);
       if (stats.isDirectory()) {
@@ -378563,13 +378633,13 @@ async function findProjectRoot(startDir) {
       }
     } catch {
     }
-    const parentDir = path55.dirname(currentDir);
+    const parentDir = path54.dirname(currentDir);
     if (parentDir === currentDir) {
       break;
     }
     currentDir = parentDir;
   }
-  return path55.resolve(startDir);
+  return path54.resolve(startDir);
 }
 function hasMessage(err2) {
   return typeof err2 === "object" && err2 !== null && "message" in err2 && typeof err2.message === "string";
@@ -378658,7 +378728,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 = path55.normalize(filePath);
+      const normalizedPath = path54.normalize(filePath);
       if (processedFiles.has(normalizedPath))
         return;
       processedFiles.add(normalizedPath);
@@ -378673,14 +378743,14 @@ async function processImports(content, basePath, debugMode = false, importState
         if (!validateImportPath(importPath, fileBasePath, [projectRoot || ""])) {
           continue;
         }
-        const fullPath = path55.resolve(fileBasePath, importPath);
-        const normalizedFullPath = path55.normalize(fullPath);
+        const fullPath = path54.resolve(fileBasePath, importPath);
+        const normalizedFullPath = path54.normalize(fullPath);
         if (processedFiles.has(normalizedFullPath))
           continue;
         try {
           await fs54.access(fullPath);
           const importedContent = await fs54.readFile(fullPath, "utf-8");
-          await processFlat(importedContent, path55.dirname(fullPath), normalizedFullPath, depth + 1);
+          await processFlat(importedContent, path54.dirname(fullPath), normalizedFullPath, depth + 1);
         } catch (error2) {
           if (debugMode) {
             logger4.warn(`Failed to import ${fullPath}: ${hasMessage(error2) ? error2.message : "Unknown error"}`);
@@ -378688,7 +378758,7 @@ async function processImports(content, basePath, debugMode = false, importState
         }
       }
     }
-    const rootPath = path55.normalize(importState.currentFile || path55.resolve(basePath));
+    const rootPath = path54.normalize(importState.currentFile || path54.resolve(basePath));
     await processFlat(content, basePath, rootPath, 0);
     const flatContent = flatFiles.map((f3) => `--- File: ${f3.path} ---
 ${f3.content.trim()}
@@ -378715,7 +378785,7 @@ ${f3.content.trim()}
       result += `<!-- Import failed: ${importPath} - Path traversal attempt -->`;
       continue;
     }
-    const fullPath = path55.resolve(basePath, importPath);
+    const fullPath = path54.resolve(basePath, importPath);
     if (importState.processedFiles.has(fullPath)) {
       result += `<!-- File already processed: ${importPath} -->`;
       continue;
@@ -378730,7 +378800,7 @@ ${f3.content.trim()}
         currentFile: fullPath
       };
       newImportState.processedFiles.add(fullPath);
-      const imported = await processImports(fileContent, path55.dirname(fullPath), debugMode, newImportState, projectRoot, importFormat);
+      const imported = await processImports(fileContent, path54.dirname(fullPath), debugMode, newImportState, projectRoot, importFormat);
       result += `<!-- Imported from: ${importPath} -->
 ${imported.content}
 <!-- End of import from: ${importPath} -->`;
@@ -378759,7 +378829,7 @@ function validateImportPath(importPath, basePath, allowedDirectories) {
   if (/^(file|https?):\/\//.test(importPath)) {
     return false;
   }
-  const resolvedPath = path55.resolve(basePath, importPath);
+  const resolvedPath = path54.resolve(basePath, importPath);
   return allowedDirectories.some((allowedDir) => isSubpath(allowedDir, resolvedPath));
 }
 
@@ -378774,9 +378844,9 @@ var logger5 = {
   error: (...args2) => console.error("[ERROR] [MemoryDiscovery]", ...args2)
 };
 async function findProjectRoot2(startDir) {
-  let currentDir = path56.resolve(startDir);
+  let currentDir = path55.resolve(startDir);
   while (true) {
-    const gitPath = path56.join(currentDir, ".git");
+    const gitPath = path55.join(currentDir, ".git");
     try {
       const stats = await fs55.lstat(gitPath);
       if (stats.isDirectory()) {
@@ -378794,7 +378864,7 @@ async function findProjectRoot2(startDir) {
         }
       }
     }
-    const parentDir = path56.dirname(currentDir);
+    const parentDir = path55.dirname(currentDir);
     if (parentDir === currentDir) {
       return null;
     }
@@ -378830,17 +378900,17 @@ async function getGeminiMdFilePathsInternalForEachDir(dir, userHomePath, debugMo
   const allPaths = /* @__PURE__ */ new Set();
   const geminiMdFilenames = getAllGeminiMdFilenames();
   for (const geminiMdFilename of geminiMdFilenames) {
-    const resolvedHome = path56.resolve(userHomePath);
-    const globalMemoryPath = path56.join(resolvedHome, GEMINI_DIR, geminiMdFilename);
+    const resolvedHome = path55.resolve(userHomePath);
+    const globalMemoryPath = path55.join(resolvedHome, GEMINI_DIR, geminiMdFilename);
     try {
-      await fs55.access(globalMemoryPath, fsSync.constants.R_OK);
+      await fs55.access(globalMemoryPath, fsSync2.constants.R_OK);
       allPaths.add(globalMemoryPath);
       if (debugMode)
         logger5.debug(`Found readable global ${geminiMdFilename}: ${globalMemoryPath}`);
     } catch {
     }
     if (dir && folderTrust) {
-      const resolvedCwd = path56.resolve(dir);
+      const resolvedCwd = path55.resolve(dir);
       if (debugMode)
         logger5.debug(`Searching for ${geminiMdFilename} starting from CWD: ${resolvedCwd}`);
       const projectRoot = await findProjectRoot2(resolvedCwd);
@@ -378848,14 +378918,14 @@ async function getGeminiMdFilePathsInternalForEachDir(dir, userHomePath, debugMo
         logger5.debug(`Determined project root: ${projectRoot ?? "None"}`);
       const upwardPaths = [];
       let currentDir = resolvedCwd;
-      const ultimateStopDir = projectRoot ? path56.dirname(projectRoot) : path56.dirname(resolvedHome);
-      while (currentDir && currentDir !== path56.dirname(currentDir)) {
-        if (currentDir === path56.join(resolvedHome, GEMINI_DIR)) {
+      const ultimateStopDir = projectRoot ? path55.dirname(projectRoot) : path55.dirname(resolvedHome);
+      while (currentDir && currentDir !== path55.dirname(currentDir)) {
+        if (currentDir === path55.join(resolvedHome, GEMINI_DIR)) {
           break;
         }
-        const potentialPath = path56.join(currentDir, geminiMdFilename);
+        const potentialPath = path55.join(currentDir, geminiMdFilename);
         try {
-          await fs55.access(potentialPath, fsSync.constants.R_OK);
+          await fs55.access(potentialPath, fsSync2.constants.R_OK);
           if (potentialPath !== globalMemoryPath) {
             upwardPaths.unshift(potentialPath);
           }
@@ -378864,7 +378934,7 @@ async function getGeminiMdFilePathsInternalForEachDir(dir, userHomePath, debugMo
         if (currentDir === ultimateStopDir) {
           break;
         }
-        currentDir = path56.dirname(currentDir);
+        currentDir = path55.dirname(currentDir);
       }
       upwardPaths.forEach((p) => allPaths.add(p));
       const mergedOptions = {
@@ -378897,7 +378967,7 @@ async function readGeminiMdFiles(filePaths, debugMode, importFormat = "tree") {
     const batchPromises = batch.map(async (filePath) => {
       try {
         const content = await fs55.readFile(filePath, "utf-8");
-        const processedResult = await processImports(content, path56.dirname(filePath), debugMode, void 0, void 0, importFormat);
+        const processedResult = await processImports(content, path55.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 };
@@ -378931,7 +379001,7 @@ function concatenateInstructions(instructionContents, currentWorkingDirectoryFor
     if (trimmedContent.length === 0) {
       return null;
     }
-    const displayPath = path56.isAbsolute(item.filePath) ? path56.relative(currentWorkingDirectoryForDisplay, item.filePath) : item.filePath;
+    const displayPath = path55.isAbsolute(item.filePath) ? path55.relative(currentWorkingDirectoryForDisplay, item.filePath) : item.filePath;
     return `--- Context from: ${displayPath} ---
 ${trimmedContent}
 --- End of Context from: ${displayPath} ---`;
@@ -378941,9 +379011,9 @@ async function loadGlobalMemory(debugMode = false) {
   const userHome = homedir4();
   const geminiMdFilenames = getAllGeminiMdFilenames();
   const accessChecks = geminiMdFilenames.map(async (filename) => {
-    const globalPath = path56.join(userHome, GEMINI_DIR, filename);
+    const globalPath = path55.join(userHome, GEMINI_DIR, filename);
     try {
-      await fs55.access(globalPath, fsSync.constants.R_OK);
+      await fs55.access(globalPath, fsSync2.constants.R_OK);
       if (debugMode) {
         logger5.debug(`Found global memory file: ${globalPath}`);
       }
@@ -378964,10 +379034,10 @@ async function loadGlobalMemory(debugMode = false) {
 }
 async function findUpwardGeminiFiles(startDir, stopDir, debugMode) {
   const upwardPaths = [];
-  let currentDir = path56.resolve(startDir);
-  const resolvedStopDir = path56.resolve(stopDir);
+  let currentDir = path55.resolve(startDir);
+  const resolvedStopDir = path55.resolve(stopDir);
   const geminiMdFilenames = getAllGeminiMdFilenames();
-  const globalGeminiDir = path56.join(homedir4(), GEMINI_DIR);
+  const globalGeminiDir = path55.join(homedir4(), GEMINI_DIR);
   if (debugMode) {
     logger5.debug(`Starting upward search from ${currentDir} stopping at ${resolvedStopDir}`);
   }
@@ -378976,9 +379046,9 @@ async function findUpwardGeminiFiles(startDir, stopDir, debugMode) {
       break;
     }
     const accessChecks = geminiMdFilenames.map(async (filename) => {
-      const potentialPath = path56.join(currentDir, filename);
+      const potentialPath = path55.join(currentDir, filename);
       try {
-        await fs55.access(potentialPath, fsSync.constants.R_OK);
+        await fs55.access(potentialPath, fsSync2.constants.R_OK);
         return potentialPath;
       } catch {
         return null;
@@ -378986,17 +379056,17 @@ async function findUpwardGeminiFiles(startDir, stopDir, debugMode) {
     });
     const foundPathsInDir = (await Promise.all(accessChecks)).filter((p) => p !== null);
     upwardPaths.unshift(...foundPathsInDir);
-    if (currentDir === resolvedStopDir || currentDir === path56.dirname(currentDir)) {
+    if (currentDir === resolvedStopDir || currentDir === path55.dirname(currentDir)) {
       break;
     }
-    currentDir = path56.dirname(currentDir);
+    currentDir = path55.dirname(currentDir);
   }
   return upwardPaths;
 }
 async function loadEnvironmentMemory(trustedRoots, extensionLoader, debugMode = false) {
   const allPaths = /* @__PURE__ */ new Set();
   const traversalPromises = trustedRoots.map(async (root) => {
-    const resolvedRoot = path56.resolve(root);
+    const resolvedRoot = path55.resolve(root);
     if (debugMode) {
       logger5.debug(`Loading environment memory for trusted root: ${resolvedRoot} (Stopping exactly here)`);
     }
@@ -379016,8 +379086,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(path56.resolve(currentWorkingDirectory));
-  const realHome = await fs55.realpath(path56.resolve(homedir4()));
+  const realCwd = await fs55.realpath(path55.resolve(currentWorkingDirectory));
+  const realHome = await fs55.realpath(path55.resolve(homedir4()));
   const isHomeDirectory = realCwd === realHome;
   currentWorkingDirectory = isHomeDirectory ? "" : currentWorkingDirectory;
   if (debugMode)
@@ -379053,10 +379123,10 @@ async function refreshServerHierarchicalMemory(config3) {
   return result;
 }
 async function loadJitSubdirectoryMemory(targetPath, trustedRoots, alreadyLoadedPaths, debugMode = false) {
-  const resolvedTarget = path56.resolve(targetPath);
+  const resolvedTarget = path55.resolve(targetPath);
   let bestRoot = null;
   for (const root of trustedRoots) {
-    const resolvedRoot = path56.resolve(root);
+    const resolvedRoot = path55.resolve(root);
     if (resolvedTarget.startsWith(resolvedRoot) && (!bestRoot || resolvedRoot.length > bestRoot.length)) {
       bestRoot = resolvedRoot;
     }
@@ -379152,7 +379222,7 @@ var ContextManager = class {
 
 // packages/core/dist/src/utils/workspaceContext.js
 import * as fs56 from "node:fs";
-import * as path57 from "node:path";
+import * as path56 from "node:path";
 var WorkspaceContext = class {
   targetDir;
   directories = /* @__PURE__ */ new Set();
@@ -379209,7 +379279,7 @@ var WorkspaceContext = class {
     }
   }
   resolveAndValidateDir(directory) {
-    const absolutePath = path57.resolve(this.targetDir, directory);
+    const absolutePath = path56.resolve(this.targetDir, directory);
     if (!fs56.existsSync(absolutePath)) {
       throw new Error(`Directory does not exist: ${absolutePath}`);
     }
@@ -379264,7 +379334,7 @@ var WorkspaceContext = class {
    */
   fullyResolvedPath(pathToCheck) {
     try {
-      return fs56.realpathSync(path57.resolve(this.targetDir, pathToCheck));
+      return fs56.realpathSync(path56.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.
@@ -379281,8 +379351,8 @@ var WorkspaceContext = class {
    * @returns True if the path is within the root directory, false otherwise
    */
   isPathWithinRoot(pathToCheck, rootDirectory) {
-    const relative5 = path57.relative(rootDirectory, pathToCheck);
-    return !relative5.startsWith(`..${path57.sep}`) && relative5 !== ".." && !path57.isAbsolute(relative5);
+    const relative5 = path56.relative(rootDirectory, pathToCheck);
+    return !relative5.startsWith(`..${path56.sep}`) && relative5 !== ".." && !path56.isAbsolute(relative5);
   }
   /**
    * Checks if a file path is a symbolic link that points to a file.
@@ -380709,10 +380779,10 @@ var HookEventHandler = class {
    * Create base hook input with common fields
    */
   createBaseInput(eventName) {
+    const transcriptPath = this.config.getGeminiClient()?.getChatRecordingService()?.getConversationFilePath() ?? "";
     return {
       session_id: this.config.getSessionId(),
-      transcript_path: "",
-      // TODO: Implement transcript path when supported
+      transcript_path: transcriptPath,
       cwd: this.config.getWorkingDir(),
       hook_event_name: eventName,
       timestamp: (/* @__PURE__ */ new Date()).toISOString()
@@ -381025,47 +381095,44 @@ var AgentRegistry = class {
   getAllDefinitions() {
     return Array.from(this.agents.values());
   }
-};
+  /**
+   * Returns a list of all registered agent names.
+   */
+  getAllAgentNames() {
+    return Array.from(this.agents.keys());
+  }
+  /**
+   * Generates a description for the delegate_to_agent tool.
+   * Unlike getDirectoryContext() which is for system prompts,
+   * this is formatted for tool descriptions.
+   */
+  getToolDescription() {
+    if (this.agents.size === 0) {
+      return "Delegates a task to a specialized sub-agent. No agents are currently available.";
+    }
+    const agentDescriptions = Array.from(this.agents.entries()).map(([name4, def2]) => `- **${name4}**: ${def2.description}`).join("\n");
+    return `Delegates a task to a specialized sub-agent.
 
-// packages/core/dist/src/agents/schema-utils.js
-function convertInputConfigToJsonSchema(inputConfig) {
-  const properties = {};
-  const required2 = [];
-  for (const [name4, definition] of Object.entries(inputConfig.inputs)) {
-    const schemaProperty = {
-      description: definition.description
-    };
-    switch (definition.type) {
-      case "string":
-      case "number":
-      case "integer":
-      case "boolean":
-        schemaProperty.type = definition.type;
-        break;
-      case "string[]":
-        schemaProperty.type = "array";
-        schemaProperty.items = { type: "string" };
-        break;
-      case "number[]":
-        schemaProperty.type = "array";
-        schemaProperty.items = { type: "number" };
-        break;
-      default: {
-        const exhaustiveCheck = definition.type;
-        throw new Error(`Unsupported input type '${exhaustiveCheck}' for parameter '${name4}'. Supported types: string, number, integer, boolean, string[], number[]`);
-      }
+Available agents:
+${agentDescriptions}`;
+  }
+  /**
+   * Generates a markdown "Phone Book" of available agents and their schemas.
+   * This MUST be injected into the System Prompt of the parent agent.
+   */
+  getDirectoryContext() {
+    if (this.agents.size === 0) {
+      return "No sub-agents are currently available.";
     }
-    properties[name4] = schemaProperty;
-    if (definition.required) {
-      required2.push(name4);
+    let context2 = "## Available Sub-Agents\n";
+    context2 += "Use `delegate_to_agent` for complex tasks requiring specialized analysis.\n\n";
+    for (const [name4, def2] of this.agents.entries()) {
+      context2 += `- **${name4}**: ${def2.description}
+`;
     }
+    return context2;
   }
-  return {
-    type: "object",
-    properties,
-    required: required2.length > 0 ? required2 : void 0
-  };
-}
+};
 
 // packages/core/dist/src/core/nonInteractiveToolExecutor.js
 async function executeToolCall(config3, toolCallRequest, abortSignal) {
@@ -381847,71 +381914,126 @@ Error: ${errorMessage}`,
   }
 };
 
-// packages/core/dist/src/agents/subagent-tool-wrapper.js
-var SubagentToolWrapper = class extends BaseDeclarativeTool {
-  definition;
+// packages/core/dist/src/agents/delegate-to-agent-tool.js
+var DelegateToAgentTool = class extends BaseDeclarativeTool {
+  registry;
   config;
-  /**
-   * Constructs the tool wrapper.
-   *
-   * The constructor dynamically generates the JSON schema for the tool's
-   * parameters based on the subagent's input configuration.
-   *
-   * @param definition The `AgentDefinition` of the subagent to wrap.
-   * @param config The runtime configuration, passed down to the subagent.
-   * @param messageBus Optional message bus for policy enforcement.
-   */
-  constructor(definition, config3, messageBus) {
-    const parameterSchema = convertInputConfigToJsonSchema(definition.inputConfig);
+  constructor(registry2, config3, messageBus) {
+    const definitions = registry2.getAllDefinitions();
+    let schema;
+    if (definitions.length === 0) {
+      schema = external_exports.object({
+        agent_name: external_exports.string().describe("No agents are currently available.")
+      });
+    } else {
+      const agentSchemas = definitions.map((def2) => {
+        const inputShape = {
+          agent_name: external_exports.literal(def2.name).describe(def2.description)
+        };
+        for (const [key, inputDef] of Object.entries(def2.inputConfig.inputs)) {
+          if (key === "agent_name") {
+            throw new Error(`Agent '${def2.name}' cannot have an input parameter named 'agent_name' as it is a reserved parameter for delegation.`);
+          }
+          let validator;
+          switch (inputDef.type) {
+            case "string":
+              validator = external_exports.string();
+              break;
+            case "number":
+              validator = external_exports.number();
+              break;
+            case "boolean":
+              validator = external_exports.boolean();
+              break;
+            case "integer":
+              validator = external_exports.number().int();
+              break;
+            case "string[]":
+              validator = external_exports.array(external_exports.string());
+              break;
+            case "number[]":
+              validator = external_exports.array(external_exports.number());
+              break;
+            default: {
+              const _exhaustiveCheck = inputDef.type;
+              void _exhaustiveCheck;
+              throw new Error(`Unhandled agent input type: '${inputDef.type}'`);
+            }
+          }
+          if (!inputDef.required) {
+            validator = validator.optional();
+          }
+          inputShape[key] = validator.describe(inputDef.description);
+        }
+        return external_exports.object(inputShape);
+      });
+      if (agentSchemas.length === 1) {
+        schema = agentSchemas[0];
+      } else {
+        schema = external_exports.discriminatedUnion("agent_name", agentSchemas);
+      }
+    }
     super(
-      definition.name,
-      definition.displayName ?? definition.name,
-      definition.description,
+      DELEGATE_TO_AGENT_TOOL_NAME,
+      "Delegate to Agent",
+      registry2.getToolDescription(),
       Kind.Think,
-      parameterSchema,
+      zodToJsonSchema(schema),
       /* isOutputMarkdown */
       true,
       /* canUpdateOutput */
       true,
       messageBus
     );
-    this.definition = definition;
+    this.registry = registry2;
     this.config = config3;
   }
-  /**
-   * Creates an invocation instance for executing the subagent.
-   *
-   * This method is called by the tool framework when the parent agent decides
-   * to use this tool.
-   *
-   * @param params The validated input parameters from the parent agent's call.
-   * @returns A `ToolInvocation` instance ready for execution.
-   */
   createInvocation(params) {
-    return new SubagentInvocation(params, this.definition, this.config, this.messageBus);
+    return new DelegateInvocation(params, this.registry, this.config, this.messageBus);
+  }
+};
+var DelegateInvocation = class extends BaseToolInvocation {
+  registry;
+  config;
+  constructor(params, registry2, config3, messageBus) {
+    super(params, messageBus, DELEGATE_TO_AGENT_TOOL_NAME);
+    this.registry = registry2;
+    this.config = config3;
+  }
+  getDescription() {
+    return `Delegating to agent '${this.params.agent_name}'`;
+  }
+  async execute(signal, updateOutput) {
+    const definition = this.registry.getDefinition(this.params.agent_name);
+    if (!definition) {
+      throw new Error(`Agent '${this.params.agent_name}' exists in the tool definition but could not be found in the registry.`);
+    }
+    const { agent_name, ...agentArgs } = this.params;
+    const subagentInvocation = new SubagentInvocation(agentArgs, definition, this.config, this.messageBus);
+    return subagentInvocation.execute(signal, updateOutput);
   }
 };
 
 // node_modules/read-package-up/index.js
-import path60 from "node:path";
+import path59 from "node:path";
 
 // node_modules/find-up-simple/index.js
 import process21 from "node:process";
 import fsPromises4 from "node:fs/promises";
 import { fileURLToPath as fileURLToPath8 } from "node:url";
-import path58 from "node:path";
+import path57 from "node:path";
 var toPath2 = (urlOrPath) => urlOrPath instanceof URL ? fileURLToPath8(urlOrPath) : urlOrPath;
 async function findUp(name4, {
   cwd = process21.cwd(),
   type = "file",
   stopAt
 } = {}) {
-  let directory = path58.resolve(toPath2(cwd) ?? "");
-  const { root } = path58.parse(directory);
-  stopAt = path58.resolve(directory, toPath2(stopAt ?? root));
-  const isAbsoluteName = path58.isAbsolute(name4);
+  let directory = path57.resolve(toPath2(cwd) ?? "");
+  const { root } = path57.parse(directory);
+  stopAt = path57.resolve(directory, toPath2(stopAt ?? root));
+  const isAbsoluteName = path57.isAbsolute(name4);
   while (directory) {
-    const filePath = isAbsoluteName ? name4 : path58.join(directory, name4);
+    const filePath = isAbsoluteName ? name4 : path57.join(directory, name4);
     try {
       const stats = await fsPromises4.stat(filePath);
       if (type === "file" && stats.isFile() || type === "directory" && stats.isDirectory()) {
@@ -381922,13 +382044,13 @@ async function findUp(name4, {
     if (directory === stopAt || directory === root) {
       break;
     }
-    directory = path58.dirname(directory);
+    directory = path57.dirname(directory);
   }
 }
 
 // node_modules/read-pkg/index.js
 import fsPromises5 from "node:fs/promises";
-import path59 from "node:path";
+import path58 from "node:path";
 
 // node_modules/parse-json/index.js
 var import_code_frame = __toESM(require_lib12(), 1);
@@ -382057,7 +382179,7 @@ function toPath3(urlOrPath) {
 }
 
 // node_modules/read-pkg/index.js
-var getPackagePath = (cwd) => path59.resolve(toPath3(cwd) ?? ".", "package.json");
+var getPackagePath = (cwd) => path58.resolve(toPath3(cwd) ?? ".", "package.json");
 var _readPackage = (file, normalize5) => {
   const json = typeof file === "string" ? parseJson(file) : file;
   if (normalize5) {
@@ -382077,7 +382199,7 @@ async function readPackageUp(options2) {
     return;
   }
   return {
-    packageJson: await readPackage({ ...options2, cwd: path60.dirname(filePath) }),
+    packageJson: await readPackage({ ...options2, cwd: path59.dirname(filePath) }),
     path: filePath
   };
 }
@@ -382118,10 +382240,22 @@ async function getReleaseChannel(cwd) {
 }
 
 // packages/core/dist/src/code_assist/experiments/client_metadata.js
-import { fileURLToPath as fileURLToPath10 } from "node:url";
+import { fileURLToPath as fileURLToPath11 } from "node:url";
 import path61 from "node:path";
+
+// packages/core/dist/src/utils/version.js
+import { fileURLToPath as fileURLToPath10 } from "node:url";
+import path60 from "node:path";
 var __filename = fileURLToPath10(import.meta.url);
-var __dirname5 = path61.dirname(__filename);
+var __dirname5 = path60.dirname(__filename);
+async function getVersion() {
+  const pkgJson = await getPackageJson(__dirname5);
+  return "0.21.0-nightly.20251212.54de67536";
+}
+
+// packages/core/dist/src/code_assist/experiments/client_metadata.js
+var __filename2 = fileURLToPath11(import.meta.url);
+var __dirname6 = path61.dirname(__filename2);
 var clientMetadataPromise;
 function getPlatform() {
   const platform11 = process.platform;
@@ -382148,9 +382282,9 @@ async function getClientMetadata() {
     clientMetadataPromise = (async () => ({
       ideName: "IDE_UNSPECIFIED",
       pluginType: "GEMINI",
-      ideVersion: "0.21.0-nightly.20251210.d90356e8a",
+      ideVersion: await getVersion(),
       platform: getPlatform(),
-      updateChannel: await getReleaseChannel(__dirname5)
+      updateChannel: await getReleaseChannel(__dirname6)
     }))();
   }
   return clientMetadataPromise;
@@ -383289,7 +383423,7 @@ var ServiceAccountImpersonationProvider = class {
 };
 
 // packages/core/dist/src/tools/mcp-client.js
-import { basename as basename11 } from "node:path";
+import { basename as basename12 } from "node:path";
 import { pathToFileURL } from "node:url";
 
 // packages/core/dist/src/mcp/oauth-provider.js
@@ -384676,7 +384810,7 @@ async function connectToMcpServer(mcpServerName, mcpServerConfig, debugMode, wor
     for (const dir of workspaceContext.getDirectories()) {
       roots.push({
         uri: pathToFileURL(dir).toString(),
-        name: basename11(dir)
+        name: basename12(dir)
       });
     }
     return {
@@ -385417,11 +385551,19 @@ var Config = class {
     this.geminiClient = new GeminiClient(this);
     this.modelRouterService = new ModelRouterService(this);
     let modelConfigServiceConfig = params.modelConfigServiceConfig;
-    if (modelConfigServiceConfig && !modelConfigServiceConfig.aliases) {
-      modelConfigServiceConfig = {
-        ...modelConfigServiceConfig,
-        aliases: DEFAULT_MODEL_CONFIGS.aliases
-      };
+    if (modelConfigServiceConfig) {
+      if (!modelConfigServiceConfig.aliases) {
+        modelConfigServiceConfig = {
+          ...modelConfigServiceConfig,
+          aliases: DEFAULT_MODEL_CONFIGS.aliases
+        };
+      }
+      if (!modelConfigServiceConfig.overrides) {
+        modelConfigServiceConfig = {
+          ...modelConfigServiceConfig,
+          overrides: DEFAULT_MODEL_CONFIGS.overrides
+        };
+      }
     }
     this.modelConfigService = new ModelConfigService(modelConfigServiceConfig ?? DEFAULT_MODEL_CONFIGS);
   }
@@ -385464,6 +385606,7 @@ var Config = class {
     return this.contentGenerator;
   }
   async refreshAuth(authMethod) {
+    this.modelAvailabilityService.reset();
     if (this.contentGeneratorConfig?.authType === AuthType2.USE_GEMINI && authMethod !== AuthType2.USE_GEMINI) {
       this.geminiClient.stripThoughtsFromHistory();
     }
@@ -385545,6 +385688,7 @@ var Config = class {
       coreEvents.emitModelChanged(newModel);
     }
     this.setFallbackMode(false);
+    this.modelAvailabilityService.reset();
   }
   getActiveModel() {
     return this._activeModel ?? this.model;
@@ -386088,16 +386232,13 @@ var Config = class {
     if (this.getUseWriteTodos()) {
       registerCoreTool(WriteTodosTool, this);
     }
-    if (this.getCodebaseInvestigatorSettings().enabled) {
-      const definition = this.agentRegistry.getDefinition("codebase_investigator");
-      if (definition) {
-        const allowedTools = this.getAllowedTools();
-        const isAllowed = !allowedTools || allowedTools.includes(definition.name);
-        if (isAllowed) {
-          const messageBusEnabled = this.getEnableMessageBusIntegration();
-          const wrapper = new SubagentToolWrapper(definition, this, messageBusEnabled ? this.getMessageBus() : void 0);
-          registry2.registerTool(wrapper);
-        }
+    if (this.isAgentsEnabled() || this.getCodebaseInvestigatorSettings().enabled) {
+      const allowedTools = this.getAllowedTools();
+      const isAllowed = !allowedTools || allowedTools.includes(DELEGATE_TO_AGENT_TOOL_NAME);
+      if (isAllowed) {
+        const messageBusEnabled = this.getEnableMessageBusIntegration();
+        const delegateTool = new DelegateToAgentTool(this.agentRegistry, this, messageBusEnabled ? this.getMessageBus() : void 0);
+        registry2.registerTool(delegateTool);
       }
     }
     await registry2.discoverAllTools();
@@ -386224,11 +386365,11 @@ var PolicyFileSchema = external_exports.object({
 
 // packages/core/dist/src/policy/config.js
 import * as path64 from "node:path";
-import { fileURLToPath as fileURLToPath11 } from "node:url";
+import { fileURLToPath as fileURLToPath12 } from "node:url";
 init_events();
-var __filename2 = fileURLToPath11(import.meta.url);
-var __dirname6 = path64.dirname(__filename2);
-var DEFAULT_CORE_POLICIES_DIR = path64.join(__dirname6, "policies");
+var __filename3 = fileURLToPath12(import.meta.url);
+var __dirname7 = path64.dirname(__filename3);
+var DEFAULT_CORE_POLICIES_DIR = path64.join(__dirname7, "policies");
 
 // packages/core/dist/src/commands/extensions.js
 function listExtensions(config3) {