@google/gemini-cli-a2a-server 0.15.0-nightly.20251110.c0b766ad → 0.15.0-preview.0

package/dist/a2a-server.mjs

@@ -1973,7 +1973,7 @@ var require_ms2 = __commonJS({
 var require_pretty_print = __commonJS({
   "node_modules/logform/pretty-print.js"(exports2, module2) {
     "use strict";
-    var inspect4 = __require("util").inspect;
+    var inspect5 = __require("util").inspect;
     var format2 = require_format();
     var { LEVEL, MESSAGE, SPLAT } = require_triple_beam();
     module2.exports = format2((info2, opts = {}) => {
@@ -1981,7 +1981,7 @@ var require_pretty_print = __commonJS({
       delete stripped[LEVEL];
       delete stripped[MESSAGE];
       delete stripped[SPLAT];
-      info2[MESSAGE] = inspect4(stripped, false, opts.depth || null, opts.colorize);
+      info2[MESSAGE] = inspect5(stripped, false, opts.depth || null, opts.colorize);
       return info2;
     });
   }
@@ -3091,8 +3091,8 @@ var require_buffer_list = __commonJS({
     var _require = __require("buffer");
     var Buffer9 = _require.Buffer;
     var _require2 = __require("util");
-    var inspect4 = _require2.inspect;
-    var custom2 = inspect4 && inspect4.custom || "inspect";
+    var inspect5 = _require2.inspect;
+    var custom2 = inspect5 && inspect5.custom || "inspect";
     function copyBuffer(src, target, offset) {
       Buffer9.prototype.copy.call(src, target, offset);
     }
@@ -3249,7 +3249,7 @@ var require_buffer_list = __commonJS({
       }, {
         key: custom2,
         value: function value(_, options2) {
-          return inspect4(this, _objectSpread(_objectSpread({}, options2), {}, {
+          return inspect5(this, _objectSpread(_objectSpread({}, options2), {}, {
             // Only inspect one level.
             depth: 0,
             // It should not recurse.
@@ -26452,7 +26452,7 @@ var require_object_inspect = __commonJS({
       } else if (indexOf(seen, obj) >= 0) {
         return "[Circular]";
       }
-      function inspect4(value, from, noIndent) {
+      function inspect5(value, from, noIndent) {
         if (from) {
           seen = $arrSlice.call(seen);
           seen.push(from);
@@ -26470,7 +26470,7 @@ var require_object_inspect = __commonJS({
       }
       if (typeof obj === "function" && !isRegExp2(obj)) {
         var name4 = nameOf(obj);
-        var keys = arrObjKeys(obj, inspect4);
+        var keys = arrObjKeys(obj, inspect5);
         return "[Function" + (name4 ? ": " + name4 : " (anonymous)") + "]" + (keys.length > 0 ? " { " + $join.call(keys, ", ") + " }" : "");
       }
       if (isSymbol2(obj)) {
@@ -26494,16 +26494,16 @@ var require_object_inspect = __commonJS({
         if (obj.length === 0) {
           return "[]";
         }
-        var xs = arrObjKeys(obj, inspect4);
+        var xs = arrObjKeys(obj, inspect5);
         if (indent && !singleLineValues(xs)) {
           return "[" + indentedJoin(xs, indent) + "]";
         }
         return "[ " + $join.call(xs, ", ") + " ]";
       }
       if (isError2(obj)) {
-        var parts2 = arrObjKeys(obj, inspect4);
+        var parts2 = arrObjKeys(obj, inspect5);
         if (!("cause" in Error.prototype) && "cause" in obj && !isEnumerable.call(obj, "cause")) {
-          return "{ [" + String(obj) + "] " + $join.call($concat.call("[cause]: " + inspect4(obj.cause), parts2), ", ") + " }";
+          return "{ [" + String(obj) + "] " + $join.call($concat.call("[cause]: " + inspect5(obj.cause), parts2), ", ") + " }";
         }
         if (parts2.length === 0) {
           return "[" + String(obj) + "]";
@@ -26521,7 +26521,7 @@ var require_object_inspect = __commonJS({
         var mapParts = [];
         if (mapForEach) {
           mapForEach.call(obj, function(value, key) {
-            mapParts.push(inspect4(key, obj, true) + " => " + inspect4(value, obj));
+            mapParts.push(inspect5(key, obj, true) + " => " + inspect5(value, obj));
           });
         }
         return collectionOf("Map", mapSize.call(obj), mapParts, indent);
@@ -26530,7 +26530,7 @@ var require_object_inspect = __commonJS({
         var setParts = [];
         if (setForEach) {
           setForEach.call(obj, function(value) {
-            setParts.push(inspect4(value, obj));
+            setParts.push(inspect5(value, obj));
           });
         }
         return collectionOf("Set", setSize.call(obj), setParts, indent);
@@ -26545,16 +26545,16 @@ var require_object_inspect = __commonJS({
         return weakCollectionOf("WeakRef");
       }
       if (isNumber4(obj)) {
-        return markBoxed(inspect4(Number(obj)));
+        return markBoxed(inspect5(Number(obj)));
       }
       if (isBigInt(obj)) {
-        return markBoxed(inspect4(bigIntValueOf.call(obj)));
+        return markBoxed(inspect5(bigIntValueOf.call(obj)));
       }
       if (isBoolean2(obj)) {
         return markBoxed(booleanValueOf.call(obj));
       }
       if (isString2(obj)) {
-        return markBoxed(inspect4(String(obj)));
+        return markBoxed(inspect5(String(obj)));
       }
       if (typeof window !== "undefined" && obj === window) {
         return "{ [object Window] }";
@@ -26563,7 +26563,7 @@ var require_object_inspect = __commonJS({
         return "{ [object globalThis] }";
       }
       if (!isDate2(obj) && !isRegExp2(obj)) {
-        var ys = arrObjKeys(obj, inspect4);
+        var ys = arrObjKeys(obj, inspect5);
         var isPlainObject4 = gPO ? gPO(obj) === Object.prototype : obj instanceof Object || obj.constructor === Object;
         var protoTag = obj instanceof Object ? "" : "null prototype";
         var stringTag = !isPlainObject4 && toStringTag && Object(obj) === obj && toStringTag in obj ? $slice.call(toStr(obj), 8, -1) : protoTag ? "Object" : "";
@@ -26817,13 +26817,13 @@ var require_object_inspect = __commonJS({
       var lineJoiner = "\n" + indent.prev + indent.base;
       return lineJoiner + $join.call(xs, "," + lineJoiner) + "\n" + indent.prev;
     }
-    function arrObjKeys(obj, inspect4) {
+    function arrObjKeys(obj, inspect5) {
       var isArr = isArray2(obj);
       var xs = [];
       if (isArr) {
         xs.length = obj.length;
         for (var i3 = 0; i3 < obj.length; i3++) {
-          xs[i3] = has(obj, i3) ? inspect4(obj[i3], obj) : "";
+          xs[i3] = has(obj, i3) ? inspect5(obj[i3], obj) : "";
         }
       }
       var syms = typeof gOPS === "function" ? gOPS(obj) : [];
@@ -26844,15 +26844,15 @@ var require_object_inspect = __commonJS({
         if (hasShammedSymbols && symMap["$" + key] instanceof Symbol) {
           continue;
         } else if ($test.call(/[^\w$]/, key)) {
-          xs.push(inspect4(key, obj) + ": " + inspect4(obj[key], obj));
+          xs.push(inspect5(key, obj) + ": " + inspect5(obj[key], obj));
         } else {
-          xs.push(key + ": " + inspect4(obj[key], obj));
+          xs.push(key + ": " + inspect5(obj[key], obj));
         }
       }
       if (typeof gOPS === "function") {
         for (var j = 0; j < syms.length; j++) {
           if (isEnumerable.call(obj, syms[j])) {
-            xs.push("[" + inspect4(syms[j]) + "]: " + inspect4(obj[syms[j]], obj));
+            xs.push("[" + inspect5(syms[j]) + "]: " + inspect5(obj[syms[j]], obj));
           }
         }
       }
@@ -26865,7 +26865,7 @@ var require_object_inspect = __commonJS({
 var require_side_channel_list = __commonJS({
   "node_modules/side-channel-list/index.js"(exports2, module2) {
     "use strict";
-    var inspect4 = require_object_inspect();
+    var inspect5 = require_object_inspect();
     var $TypeError = require_type();
     var listGetNode = function(list3, key, isDelete) {
       var prev = list3;
@@ -26919,7 +26919,7 @@ var require_side_channel_list = __commonJS({
       var channel = {
         assert: function(key) {
           if (!channel.has(key)) {
-            throw new $TypeError("Side channel does not contain " + inspect4(key));
+            throw new $TypeError("Side channel does not contain " + inspect5(key));
           }
         },
         "delete": function(key) {
@@ -27779,7 +27779,7 @@ var require_side_channel_map = __commonJS({
     "use strict";
     var GetIntrinsic = require_get_intrinsic();
     var callBound = require_call_bound();
-    var inspect4 = require_object_inspect();
+    var inspect5 = require_object_inspect();
     var $TypeError = require_type();
     var $Map = GetIntrinsic("%Map%", true);
     var $mapGet = callBound("Map.prototype.get", true);
@@ -27793,7 +27793,7 @@ var require_side_channel_map = __commonJS({
       var channel = {
         assert: function(key) {
           if (!channel.has(key)) {
-            throw new $TypeError("Side channel does not contain " + inspect4(key));
+            throw new $TypeError("Side channel does not contain " + inspect5(key));
           }
         },
         "delete": function(key) {
@@ -27835,7 +27835,7 @@ var require_side_channel_weakmap = __commonJS({
     "use strict";
     var GetIntrinsic = require_get_intrinsic();
     var callBound = require_call_bound();
-    var inspect4 = require_object_inspect();
+    var inspect5 = require_object_inspect();
     var getSideChannelMap = require_side_channel_map();
     var $TypeError = require_type();
     var $WeakMap = GetIntrinsic("%WeakMap%", true);
@@ -27851,7 +27851,7 @@ var require_side_channel_weakmap = __commonJS({
         var channel = {
           assert: function(key) {
             if (!channel.has(key)) {
-              throw new $TypeError("Side channel does not contain " + inspect4(key));
+              throw new $TypeError("Side channel does not contain " + inspect5(key));
             }
           },
           "delete": function(key) {
@@ -27907,7 +27907,7 @@ var require_side_channel = __commonJS({
   "node_modules/side-channel/index.js"(exports2, module2) {
     "use strict";
     var $TypeError = require_type();
-    var inspect4 = require_object_inspect();
+    var inspect5 = require_object_inspect();
     var getSideChannelList = require_side_channel_list();
     var getSideChannelMap = require_side_channel_map();
     var getSideChannelWeakMap = require_side_channel_weakmap();
@@ -27917,7 +27917,7 @@ var require_side_channel = __commonJS({
       var channel = {
         assert: function(key) {
           if (!channel.has(key)) {
-            throw new $TypeError("Side channel does not contain " + inspect4(key));
+            throw new $TypeError("Side channel does not contain " + inspect5(key));
           }
         },
         "delete": function(key) {
@@ -63543,11 +63543,11 @@ var require_XMLParser = __commonJS({
 // node_modules/fast-xml-parser/src/xmlbuilder/orderedJs2Xml.js
 var require_orderedJs2Xml = __commonJS({
   "node_modules/fast-xml-parser/src/xmlbuilder/orderedJs2Xml.js"(exports2, module2) {
-    var EOL4 = "\n";
+    var EOL3 = "\n";
     function toXml(jArray, options2) {
       let indentation = "";
       if (options2.format && options2.indentBy.length > 0) {
-        indentation = EOL4;
+        indentation = EOL3;
       }
       return arrToStr(jArray, options2, "", indentation);
     }
@@ -65770,10 +65770,10 @@ var require_universalify2 = __commonJS({
 // node_modules/jsonfile/utils.js
 var require_utils8 = __commonJS({
   "node_modules/jsonfile/utils.js"(exports2, module2) {
-    function stringify5(obj, { EOL: EOL4 = "\n", finalEOL = true, replacer = null, spaces } = {}) {
-      const EOF3 = finalEOL ? EOL4 : "";
+    function stringify5(obj, { EOL: EOL3 = "\n", finalEOL = true, replacer = null, spaces } = {}) {
+      const EOF3 = finalEOL ? EOL3 : "";
       const str = JSON.stringify(obj, replacer, spaces);
-      return str.replace(/\n/g, EOL4) + EOF3;
+      return str.replace(/\n/g, EOL3) + EOF3;
     }
     function stripBom(content) {
       if (Buffer.isBuffer(content)) content = content.toString("utf8");
@@ -218884,7 +218884,7 @@ var require_data_url = __commonJS({
 var require_webidl = __commonJS({
   "node_modules/undici/lib/web/webidl/index.js"(exports2, module2) {
     "use strict";
-    var { types: types4, inspect: inspect4 } = __require("node:util");
+    var { types: types4, inspect: inspect5 } = __require("node:util");
     var { markAsUncloneable } = __require("node:worker_threads");
     var UNDEFINED = 1;
     var BOOLEAN = 2;
@@ -219076,7 +219076,7 @@ var require_webidl = __commonJS({
         case SYMBOL:
           return `Symbol(${V2.description})`;
         case OBJECT:
-          return inspect4(V2);
+          return inspect5(V2);
         case STRING:
           return `"${V2}"`;
         case BIGINT:
@@ -274152,6 +274152,7 @@ import { homedir as homedir5 } from "node:os";
 
 // packages/core/dist/src/config/config.js
 import * as path63 from "node:path";
+import { inspect as inspect4 } from "node:util";
 import process22 from "node:process";
 
 // node_modules/@google/genai/dist/node/index.mjs
@@ -294032,6 +294033,7 @@ function getCommonAttributes(config2) {
   return {
     "session.id": config2.getSessionId(),
     "installation.id": installationManager.getInstallationId(),
+    interactive: config2.isInteractive(),
     ...email && { "user.email": email }
   };
 }
@@ -295871,6 +295873,7 @@ var EventMetadataKey;
   EventMetadataKey2[EventMetadataKey2["GEMINI_CLI_AGENT_RECOVERY_REASON"] = 122] = "GEMINI_CLI_AGENT_RECOVERY_REASON";
   EventMetadataKey2[EventMetadataKey2["GEMINI_CLI_AGENT_RECOVERY_DURATION_MS"] = 123] = "GEMINI_CLI_AGENT_RECOVERY_DURATION_MS";
   EventMetadataKey2[EventMetadataKey2["GEMINI_CLI_AGENT_RECOVERY_SUCCESS"] = 124] = "GEMINI_CLI_AGENT_RECOVERY_SUCCESS";
+  EventMetadataKey2[EventMetadataKey2["GEMINI_CLI_INTERACTIVE"] = 125] = "GEMINI_CLI_INTERACTIVE";
 })(EventMetadataKey || (EventMetadataKey = {}));
 
 // node_modules/mnemonist/index.mjs
@@ -295896,8 +295899,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 = "c0b766ad";
-var CLI_VERSION = "0.15.0-nightly.20251110.c0b766ad";
+var GIT_COMMIT_INFO = "2abc288c";
+var CLI_VERSION = "0.15.0-preview.0";
 
 // packages/core/dist/src/ide/detect-ide.js
 var IDE_DEFINITIONS = {
@@ -296071,7 +296074,8 @@ var ClearcutLogger = class _ClearcutLogger {
       this.events.push([
         {
           event_time_ms: Date.now(),
-          source_extension_json: safeJsonStringify(event)
+          source_extension_json: safeJsonStringify(event),
+          gws_experiment: this.config?.getExperiments()?.experimentIds ?? []
         }
       ]);
       if (wasAtCapacity && this.config?.getDebugMode()) {
@@ -296954,6 +296958,10 @@ var ClearcutLogger = class _ClearcutLogger {
       {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_USER_SETTINGS,
         value: this.getConfigJson()
+      },
+      {
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_INTERACTIVE,
+        value: this.config?.isInteractive().toString() ?? "false"
       }
     ];
     return [...data, ...defaultLogMetadata];
@@ -298697,7 +298705,7 @@ async function createContentGenerator(config2, gcConfig, sessionId2) {
     if (gcConfig.fakeResponses) {
       return FakeContentGenerator.fromFile(gcConfig.fakeResponses);
     }
-    const version3 = "0.15.0-nightly.20251110.c0b766ad";
+    const version3 = "0.15.0-preview.0";
     const userAgent = `GeminiCLI/${version3} (${process.platform}; ${process.arch})`;
     const baseHeaders = {
       "User-Agent": userAgent
@@ -307601,7 +307609,6 @@ var GrepTool = class _GrepTool extends BaseDeclarativeTool {
 // packages/core/dist/src/tools/ripGrep.js
 import fs31 from "node:fs";
 import path33 from "node:path";
-import { EOL as EOL2 } from "node:os";
 import { spawn as spawn4 } from "node:child_process";
 
 // node_modules/@joshua.litt/get-ripgrep/dist/index.js
@@ -320734,46 +320741,37 @@ var GrepToolInvocation2 = class extends BaseToolInvocation {
       };
     }
   }
-  parseRipgrepOutput(output, basePath) {
+  parseRipgrepJsonOutput(output, basePath) {
     const results = [];
     if (!output)
       return results;
-    const lines = output.split(EOL2);
+    const lines = output.trim().split("\n");
     for (const line of lines) {
       if (!line.trim())
         continue;
-      const firstColonIndex = line.indexOf(":");
-      if (firstColonIndex === -1)
-        continue;
-      const secondColonIndex = line.indexOf(":", firstColonIndex + 1);
-      if (secondColonIndex === -1)
-        continue;
-      const filePathRaw = line.substring(0, firstColonIndex);
-      const lineNumberStr = line.substring(firstColonIndex + 1, secondColonIndex);
-      const lineContent = line.substring(secondColonIndex + 1);
-      const lineNumber = parseInt(lineNumberStr, 10);
-      if (!isNaN(lineNumber)) {
-        const absoluteFilePath = path33.resolve(basePath, filePathRaw);
-        const relativeFilePath = path33.relative(basePath, absoluteFilePath);
-        results.push({
-          filePath: relativeFilePath || path33.basename(absoluteFilePath),
-          lineNumber,
-          line: lineContent
-        });
+      try {
+        const json = JSON.parse(line);
+        if (json.type === "match") {
+          const match2 = json.data;
+          if (match2.path?.text && match2.lines?.text) {
+            const absoluteFilePath = path33.resolve(basePath, match2.path.text);
+            const relativeFilePath = path33.relative(basePath, absoluteFilePath);
+            results.push({
+              filePath: relativeFilePath || path33.basename(absoluteFilePath),
+              lineNumber: match2.line_number,
+              line: match2.lines.text.trimEnd()
+            });
+          }
+        }
+      } catch (error) {
+        debugLogger.warn(`Failed to parse ripgrep JSON line: ${line}`, error);
       }
     }
     return results;
   }
   async performRipgrepSearch(options2) {
     const { pattern, path: absolutePath, include } = options2;
-    const rgArgs = [
-      "--line-number",
-      "--no-heading",
-      "--with-filename",
-      "--ignore-case",
-      "--regexp",
-      pattern
-    ];
+    const rgArgs = ["--json", "--ignore-case", "--regexp", pattern];
     if (include) {
       rgArgs.push("--glob", include);
     }
@@ -320825,7 +320823,7 @@ var GrepToolInvocation2 = class extends BaseToolInvocation {
           }
         });
       });
-      return this.parseRipgrepOutput(output, absolutePath);
+      return this.parseRipgrepJsonOutput(output, absolutePath);
     } catch (error) {
       console.error(`GrepLogic: ripgrep failed: ${getErrorMessage(error)}`);
       throw error;
@@ -329868,19 +329866,27 @@ function isModifiableDeclarativeTool(tool) {
   return "getModifyContext" in tool;
 }
 function createTempFilesForModify(currentContent, proposedContent, file_path) {
-  const tempDir = os11.tmpdir();
-  const diffDir = path38.join(tempDir, "gemini-cli-tool-modify-diffs");
-  if (!fs36.existsSync(diffDir)) {
-    fs36.mkdirSync(diffDir, { recursive: true });
+  const diffDir = fs36.mkdtempSync(path38.join(os11.tmpdir(), "gemini-cli-tool-modify-"));
+  try {
+    fs36.chmodSync(diffDir, 448);
+  } catch (e2) {
+    debugLogger.error(`Error setting permissions on temp diff directory: ${diffDir}`, e2);
+    throw e2;
   }
   const ext2 = path38.extname(file_path);
   const fileName = path38.basename(file_path, ext2);
   const timestamp = Date.now();
   const tempOldPath = path38.join(diffDir, `gemini-cli-modify-${fileName}-old-${timestamp}${ext2}`);
   const tempNewPath = path38.join(diffDir, `gemini-cli-modify-${fileName}-new-${timestamp}${ext2}`);
-  fs36.writeFileSync(tempOldPath, currentContent, "utf8");
-  fs36.writeFileSync(tempNewPath, proposedContent, "utf8");
-  return { oldPath: tempOldPath, newPath: tempNewPath };
+  fs36.writeFileSync(tempOldPath, currentContent, {
+    encoding: "utf8",
+    mode: 384
+  });
+  fs36.writeFileSync(tempNewPath, proposedContent, {
+    encoding: "utf8",
+    mode: 384
+  });
+  return { oldPath: tempOldPath, newPath: tempNewPath, dirPath: diffDir };
 }
 function getUpdatedParams(tmpOldPath, tempNewPath, originalParams, modifyContext) {
   let oldContent = "";
@@ -329903,7 +329909,7 @@ function getUpdatedParams(tmpOldPath, tempNewPath, originalParams, modifyContext
   const updatedDiff = createPatch(path38.basename(modifyContext.getFilePath(originalParams)), oldContent, newContent, "Current", "Proposed", DEFAULT_DIFF_OPTIONS);
   return { updatedParams, updatedDiff };
 }
-function deleteTempFiles(oldPath, newPath) {
+function deleteTempFiles(oldPath, newPath, dirPath) {
   try {
     fs36.unlinkSync(oldPath);
   } catch {
@@ -329914,17 +329920,24 @@ function deleteTempFiles(oldPath, newPath) {
   } catch {
     debugLogger.error(`Error deleting temp diff file: ${newPath}`);
   }
+  try {
+    fs36.rmdirSync(dirPath);
+  } catch {
+    debugLogger.error(`Error deleting temp diff directory: ${dirPath}`);
+  }
 }
-async function modifyWithEditor(originalParams, modifyContext, editorType, _abortSignal, onEditorClose) {
-  const currentContent = await modifyContext.getCurrentContent(originalParams);
-  const proposedContent = await modifyContext.getProposedContent(originalParams);
-  const { oldPath, newPath } = createTempFilesForModify(currentContent, proposedContent, modifyContext.getFilePath(originalParams));
+async function modifyWithEditor(originalParams, modifyContext, editorType, _abortSignal, onEditorClose, overrides) {
+  const hasCurrentOverride = overrides !== void 0 && "currentContent" in overrides;
+  const hasProposedOverride = overrides !== void 0 && "proposedContent" in overrides;
+  const currentContent = hasCurrentOverride ? overrides.currentContent ?? "" : await modifyContext.getCurrentContent(originalParams);
+  const proposedContent = hasProposedOverride ? overrides.proposedContent ?? "" : await modifyContext.getProposedContent(originalParams);
+  const { oldPath, newPath, dirPath } = createTempFilesForModify(currentContent ?? "", proposedContent ?? "", modifyContext.getFilePath(originalParams));
   try {
     await openDiff(oldPath, newPath, editorType, onEditorClose);
     const result = getUpdatedParams(oldPath, newPath, originalParams, modifyContext);
     return result;
   } finally {
-    deleteTempFiles(oldPath, newPath);
+    deleteTempFiles(oldPath, newPath, dirPath);
   }
 }
 
@@ -330906,14 +330919,7 @@ var EditToolInvocation2 = class extends BaseToolInvocation {
       currentContent: contentForLlmEditFixer,
       abortSignal
     });
-    const secondError = getErrorReplaceResult(
-      params,
-      secondAttemptResult.occurrences,
-      1,
-      // expectedReplacements is always 1 for smart_edit
-      secondAttemptResult.finalOldString,
-      secondAttemptResult.finalNewString
-    );
+    const secondError = getErrorReplaceResult(params, secondAttemptResult.occurrences, params.expected_replacements ?? 1, secondAttemptResult.finalOldString, secondAttemptResult.finalNewString);
     if (secondError) {
       const event2 = new SmartEditCorrectionEvent("failure");
       logSmartEditCorrectionEvent(this.config, event2);
@@ -330944,7 +330950,7 @@ var EditToolInvocation2 = class extends BaseToolInvocation {
    * @throws File system errors if reading the file fails unexpectedly (e.g., permissions)
    */
   async calculateEdit(params, abortSignal) {
-    const expectedReplacements = 1;
+    const expectedReplacements = params.expected_replacements ?? 1;
     let currentContent = null;
     let fileExists2 = false;
     let originalLineEnding = "\n";
@@ -331195,7 +331201,7 @@ var SmartEditTool = class _SmartEditTool extends BaseDeclarativeTool {
     super(
       _SmartEditTool.Name,
       "Edit",
-      `Replaces text within a file. Replaces a single occurrence. This tool requires providing significant context around the change to ensure precise targeting. Always use the ${READ_FILE_TOOL_NAME} tool to examine the file's current content before attempting a text replacement.
+      `Replaces text within a file. By default, replaces a single occurrence, but can replace multiple occurrences when \`expected_replacements\` is specified. This tool requires providing significant context around the change to ensure precise targeting. Always use the ${READ_FILE_TOOL_NAME} tool to examine the file's current content before attempting a text replacement.
       
       The user has the ability to modify the \`new_string\` content. If modified, this will be stated in the response.
       
@@ -331206,7 +331212,7 @@ var SmartEditTool = class _SmartEditTool extends BaseDeclarativeTool {
       4. NEVER escape \`old_string\` or \`new_string\`, that would break the exact literal text requirement.
       **Important:** If ANY of the above are not satisfied, the tool will fail. CRITICAL for \`old_string\`: Must uniquely identify the single instance to change. Include at least 3 lines of context BEFORE and AFTER the target text, matching whitespace and indentation precisely. If this string matches multiple locations, or does not match exactly, the tool will fail.
       5. Prefer to break down complex and long changes into multiple smaller atomic calls to this tool. Always check the content of the file after changes or not finding a string to match.
-      **Multiple replacements:** If there are multiple and ambiguous occurences of the \`old_string\` in the file, the tool will also fail.`,
+      **Multiple replacements:** Set \`expected_replacements\` to the number of occurrences you want to replace. The tool will replace ALL occurrences that match \`old_string\` exactly. Ensure the number of replacements matches your expectation.`,
       Kind.Edit,
       {
         properties: {
@@ -331233,12 +331239,17 @@ A good instruction should concisely answer:
             type: "string"
           },
           old_string: {
-            description: "The exact literal text to replace, preferably unescaped. Include at least 3 lines of context BEFORE and AFTER the target text, matching whitespace and indentation precisely. If this string is not the exact literal text (i.e. you escaped it) or does not match exactly, the tool will fail.",
+            description: "The exact literal text to replace, preferably unescaped. For single replacements (default), include at least 3 lines of context BEFORE and AFTER the target text, matching whitespace and indentation precisely. If this string is not the exact literal text (i.e. you escaped it) or does not match exactly, the tool will fail.",
             type: "string"
           },
           new_string: {
             description: "The exact literal text to replace `old_string` with, preferably unescaped. Provide the EXACT text. Ensure the resulting code is correct and idiomatic.",
             type: "string"
+          },
+          expected_replacements: {
+            type: "number",
+            description: "Number of replacements expected. Defaults to 1 if not specified. Use when you want to replace multiple occurrences.",
+            minimum: 1
           }
         },
         required: ["file_path", "instruction", "old_string", "new_string"],
@@ -331319,26 +331330,9 @@ A good instruction should concisely answer:
 // packages/core/dist/src/tools/shell.js
 import fs40 from "node:fs";
 import path42 from "node:path";
-import os16, { EOL as EOL3 } from "node:os";
+import os16, { EOL as EOL2 } from "node:os";
 import crypto20 from "node:crypto";
 
-// packages/core/dist/src/config/models.js
-var DEFAULT_GEMINI_MODEL = "gemini-2.5-pro";
-var DEFAULT_GEMINI_FLASH_MODEL = "gemini-2.5-flash";
-var DEFAULT_GEMINI_FLASH_LITE_MODEL = "gemini-2.5-flash-lite";
-var DEFAULT_GEMINI_MODEL_AUTO = "auto";
-var DEFAULT_GEMINI_EMBEDDING_MODEL = "gemini-embedding-001";
-var DEFAULT_THINKING_MODE = 8192;
-function getEffectiveModel(isInFallbackMode, requestedModel) {
-  if (!isInFallbackMode) {
-    return requestedModel;
-  }
-  if (requestedModel.includes("lite")) {
-    return requestedModel;
-  }
-  return DEFAULT_GEMINI_FLASH_MODEL;
-}
-
 // packages/core/dist/src/utils/summarizer.js
 var SUMMARIZE_TOOL_OUTPUT_PROMPT = `Summarize the following tool output to be a maximum of {maxOutputTokens} tokens. The summary should be concise and capture the main points of the tool output.
 
@@ -331353,17 +331347,15 @@ Text to summarize:
 
 Return the summary string which should first contain an overall summarization of text followed by the full stack trace of errors and warnings in the tool output.
 `;
-async function summarizeToolOutput(textToSummarize, geminiClient, abortSignal, maxOutputTokens = 2e3) {
+async function summarizeToolOutput(config2, modelConfigKey, textToSummarize, geminiClient, abortSignal) {
+  const maxOutputTokens = config2.modelConfigService.getResolvedConfig(modelConfigKey).generateContentConfig.maxOutputTokens ?? 2e3;
   if (!textToSummarize || textToSummarize.length < maxOutputTokens) {
     return textToSummarize;
   }
   const prompt = SUMMARIZE_TOOL_OUTPUT_PROMPT.replace("{maxOutputTokens}", String(maxOutputTokens)).replace("{textToSummarize}", textToSummarize);
   const contents = [{ role: "user", parts: [{ text: prompt }] }];
-  const toolOutputSummarizerConfig = {
-    maxOutputTokens
-  };
   try {
-    const parsedResponse = await geminiClient.generateContent(contents, toolOutputSummarizerConfig, abortSignal, DEFAULT_GEMINI_FLASH_LITE_MODEL);
+    const parsedResponse = await geminiClient.generateContent(modelConfigKey, contents, abortSignal);
     return getResponseText(parsedResponse) || textToSummarize;
   } catch (error) {
     debugLogger.warn("Failed to summarize tool output.", error);
@@ -337065,7 +337057,7 @@ var ShellToolInvocation = class extends BaseToolInvocation {
       const backgroundPIDs = [];
       if (os16.platform() !== "win32") {
         if (fs40.existsSync(tempFilePath)) {
-          const pgrepLines = fs40.readFileSync(tempFilePath, "utf8").split(EOL3).filter(Boolean);
+          const pgrepLines = fs40.readFileSync(tempFilePath, "utf8").split(EOL2).filter(Boolean);
           for (const line of pgrepLines) {
             if (!/^\d+$/.test(line)) {
               debugLogger.error(`pgrep: ${line}`);
@@ -337130,7 +337122,7 @@ ${result.output}`;
         }
       } : {};
       if (summarizeConfig && summarizeConfig[SHELL_TOOL_NAME]) {
-        const summary = await summarizeToolOutput(llmContent, this.config.getGeminiClient(), signal, summarizeConfig[SHELL_TOOL_NAME].tokenBudget);
+        const summary = await summarizeToolOutput(this.config, { model: "summarizer-shell" }, llmContent, this.config.getGeminiClient(), signal);
         return {
           llmContent: summary,
           returnDisplay: returnDisplayMessage,
@@ -342556,7 +342548,7 @@ I was unable to access the URL directly. Instead, I have fetched the raw content
 ${textContent2}
 ---
 `;
-      const result = await geminiClient.generateContent([{ role: "user", parts: [{ text: fallbackPrompt }] }], {}, signal, DEFAULT_GEMINI_FLASH_MODEL);
+      const result = await geminiClient.generateContent({ model: "web-fetch-fallback" }, [{ role: "user", parts: [{ text: fallbackPrompt }] }], signal);
       const resultText = getResponseText(result) || "";
       return {
         llmContent: resultText,
@@ -342614,13 +342606,7 @@ ${textContent2}
     }
     const geminiClient = this.config.getGeminiClient();
     try {
-      const response = await geminiClient.generateContent(
-        [{ role: "user", parts: [{ text: userPrompt }] }],
-        { tools: [{ urlContext: {} }] },
-        signal,
-        // Pass signal
-        DEFAULT_GEMINI_FLASH_MODEL
-      );
+      const response = await geminiClient.generateContent({ model: "web-fetch" }, [{ role: "user", parts: [{ text: userPrompt }] }], signal);
       debugLogger.debug(`[WebFetchTool] Full response for prompt "${userPrompt.substring(0, 50)}...":`, JSON.stringify(response, null, 2));
       let responseText = getResponseText(response) || "";
       const urlContextMeta = response.candidates?.[0]?.urlContextMetadata;
@@ -343078,7 +343064,7 @@ var WebSearchToolInvocation = class extends BaseToolInvocation {
   async execute(signal) {
     const geminiClient = this.config.getGeminiClient();
     try {
-      const response = await geminiClient.generateContent([{ role: "user", parts: [{ text: this.params.query }] }], { tools: [{ googleSearch: {} }] }, signal, DEFAULT_GEMINI_FLASH_MODEL);
+      const response = await geminiClient.generateContent({ model: "web-search" }, [{ role: "user", parts: [{ text: this.params.query }] }], signal);
       const responseText = getResponseText(response);
       const groundingMetadata = response.candidates?.[0]?.groundingMetadata;
       const sources = groundingMetadata?.groundingChunks;
@@ -343407,10 +343393,12 @@ async function getEnvironmentContext(config2) {
   });
   const platform10 = process.platform;
   const directoryContext = await getDirectoryContextString(config2);
+  const tempDir = config2.storage.getProjectTempDir();
   const context2 = `
 This is the Gemini CLI. We are setting up the context for our chat.
 Today's date is ${today} (formatted according to the user's locale).
 My operating system is: ${platform10}
+The project's temporary directory is: ${tempDir}
 ${directoryContext}
         `.trim();
   const initialParts = [{ text: context2 }];
@@ -343435,6 +343423,22 @@ My setup is complete. I will provide my first command in the next turn.
   ];
 }
 
+// packages/core/dist/src/config/models.js
+var DEFAULT_GEMINI_MODEL = "gemini-2.5-pro";
+var DEFAULT_GEMINI_FLASH_MODEL = "gemini-2.5-flash";
+var DEFAULT_GEMINI_MODEL_AUTO = "auto";
+var DEFAULT_GEMINI_EMBEDDING_MODEL = "gemini-embedding-001";
+var DEFAULT_THINKING_MODE = 8192;
+function getEffectiveModel(isInFallbackMode, requestedModel) {
+  if (!isInFallbackMode) {
+    return requestedModel;
+  }
+  if (requestedModel.includes("lite")) {
+    return requestedModel;
+  }
+  return DEFAULT_GEMINI_FLASH_MODEL;
+}
+
 // packages/core/dist/src/utils/generateContentResponseUtilities.js
 function getResponseTextFromParts(parts2) {
   if (!parts2) {
@@ -343958,7 +343962,11 @@ var CoreToolScheduler = class _CoreToolScheduler {
           ...waitingToolCall.confirmationDetails,
           isModifying: true
         });
-        const { updatedParams, updatedDiff } = await modifyWithEditor(waitingToolCall.request.args, modifyContext, editorType, signal, this.onEditorClose);
+        const contentOverrides = waitingToolCall.confirmationDetails.type === "edit" ? {
+          currentContent: waitingToolCall.confirmationDetails.originalContent,
+          proposedContent: waitingToolCall.confirmationDetails.newContent
+        } : void 0;
+        const { updatedParams, updatedDiff } = await modifyWithEditor(waitingToolCall.request.args, modifyContext, editorType, signal, this.onEditorClose, contentOverrides);
         this.setArgsInternal(callId, updatedParams);
         this.setStatusInternal(callId, "awaiting_approval", signal, {
           ...waitingToolCall.confirmationDetails,
@@ -344613,13 +344621,13 @@ var GeminiChat = class {
   sendPromise = Promise.resolve();
   chatRecordingService;
   lastPromptTokenCount;
-  constructor(config2, generationConfig = {}, history = []) {
+  constructor(config2, generationConfig = {}, history = [], resumedSessionData) {
     this.config = config2;
     this.generationConfig = generationConfig;
     this.history = history;
     validateHistory2(history);
     this.chatRecordingService = new ChatRecordingService(config2);
-    this.chatRecordingService.initialize();
+    this.chatRecordingService.initialize(resumedSessionData);
     this.lastPromptTokenCount = Math.ceil(JSON.stringify(this.history).length / 4);
   }
   setSystemInstruction(sysInstr) {
@@ -345425,7 +345433,7 @@ function getCoreSystemPrompt(config2, userMemory) {
 ## Software Engineering Tasks
 When requested to perform tasks like fixing bugs, adding features, refactoring, or explaining code, follow this sequence:
 1. **Understand:** Think about the user's request and the relevant codebase context. Use '${GREP_TOOL_NAME}' and '${GLOB_TOOL_NAME}' search tools extensively (in parallel if independent) to understand file structures, existing code patterns, and conventions. 
-Use '${READ_FILE_TOOL_NAME}' and '${READ_MANY_FILES_TOOL_NAME}' to understand context and validate any assumptions you may have.
+Use '${READ_FILE_TOOL_NAME}' to understand context and validate any assumptions you may have. If you need to read multiple files, you should make multiple parallel calls to '${READ_FILE_TOOL_NAME}'.
 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. 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: `
 # Primary Workflows
@@ -345446,7 +345454,7 @@ When requested to perform tasks like fixing bugs, adding features, refactoring,
 
 ## Software Engineering Tasks
 When requested to perform tasks like fixing bugs, adding features, refactoring, or explaining code, follow this sequence:
-1. **Understand:** Think about the user's request and the relevant codebase context. Use '${GREP_TOOL_NAME}' and '${GLOB_TOOL_NAME}' search tools extensively (in parallel if independent) to understand file structures, existing code patterns, and conventions. Use '${READ_FILE_TOOL_NAME}' and '${READ_MANY_FILES_TOOL_NAME}' to understand context and validate any assumptions you may have.
+1. **Understand:** Think about the user's request and the relevant codebase context. Use '${GREP_TOOL_NAME}' and '${GLOB_TOOL_NAME}' search tools extensively (in parallel if independent) to understand file structures, existing code patterns, and conventions. Use '${READ_FILE_TOOL_NAME}' to understand context and validate any assumptions you may have. If you need to read multiple files, you should make multiple parallel calls to '${READ_FILE_TOOL_NAME}'.
 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. 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_suffix: `3. **Implement:** Use the available tools (e.g., '${EDIT_TOOL_NAME}', '${WRITE_FILE_TOOL_NAME}' '${SHELL_TOOL_NAME}' ...) to act on the plan, strictly adhering to the project's established conventions (detailed under 'Core 
 Mandates').
@@ -345461,9 +345469,9 @@ Mandates').
 1. **Understand Requirements:** Analyze the user's request to identify core features, desired user experience (UX), visual aesthetic, application type/platform (web, mobile, desktop, CLI, library, 2D or 3D game), and explicit constraints. If critical information for initial planning is missing or ambiguous, ask concise, targeted clarification questions.
 2. **Propose Plan:** Formulate an internal development plan. Present a clear, concise, high-level summary to the user. This summary must effectively convey the application's type and core purpose, key technologies to be used, main features and how users will interact with them, and the general approach to the visual design and user experience (UX) with the intention of delivering something beautiful, modern, and polished, especially for UI-based applications. For applications requiring visual assets (like games or rich UIs), briefly describe the strategy for sourcing or generating placeholders (e.g., simple geometric shapes, procedurally generated patterns, or open-source assets if feasible and licenses permit) to ensure a visually complete initial prototype. Ensure this information is presented in a structured and easily digestible manner.
   - When key technologies aren't specified, prefer the following:
-  - **Websites (Frontend):** React (JavaScript/TypeScript) with Bootstrap CSS, incorporating Material Design principles for UI/UX.
+  - **Websites (Frontend):** React (JavaScript/TypeScript) or Angular with Bootstrap CSS, incorporating Material Design principles for UI/UX.
   - **Back-End APIs:** Node.js with Express.js (JavaScript/TypeScript) or Python with FastAPI.
-  - **Full-stack:** Next.js (React/Node.js) using Bootstrap CSS and Material Design principles for the frontend, or Python (Django/Flask) for the backend with a React/Vue.js frontend styled with Bootstrap CSS and Material Design principles.
+  - **Full-stack:** Next.js (React/Node.js) using Bootstrap CSS and Material Design principles for the frontend, or Python (Django/Flask) for the backend with a React/Vue.js/Angular frontend styled with Bootstrap CSS and Material Design principles.
   - **CLIs:** Python or Go.
   - **Mobile App:** Compose Multiplatform (Kotlin Multiplatform) or Flutter (Dart) using Material Design libraries and principles, when sharing code between Android and iOS. Jetpack Compose (Kotlin JVM) with Material Design principles or SwiftUI (Swift) for native apps targeted at either Android or iOS, respectively.
   - **3d Games:** HTML/CSS/JavaScript with Three.js.
@@ -345476,7 +345484,6 @@ Mandates').
 # Operational Guidelines
 ${function() {
         if (config2.getEnableShellOutputEfficiency()) {
-          const tempDir = config2.storage.getProjectTempDir();
           return `
 ## Shell tool output token efficiency:
 
@@ -345486,8 +345493,8 @@ IT IS CRITICAL TO FOLLOW THESE GUIDELINES TO AVOID EXCESSIVE TOKEN CONSUMPTION.
 - Aim to minimize tool output tokens while still capturing necessary information.
 - If a command is expected to produce a lot of output, use quiet or silent flags where available and appropriate.
 - Always consider the trade-off between output verbosity and the need for information. If a command's full output is essential for understanding the result, avoid overly aggressive quieting that might obscure important details.
-- If a command does not have quiet/silent flags or for commands with potentially long output that may not be useful, redirect stdout and stderr to temp files in the project's temporary directory: ${tempDir}. For example: 'command > ${path48.posix.join(tempDir, "out.log")} 2> ${path48.posix.join(tempDir, "err.log")}'.
-- After the command runs, inspect the temp files (e.g. '${path48.posix.join(tempDir, "out.log")}' and '${path48.posix.join(tempDir, "err.log")}') using commands like 'grep', 'tail', 'head', ... (or platform equivalents). Remove the temp files when done.
+- If a command does not have quiet/silent flags or for commands with potentially long output that may not be useful, redirect stdout and stderr to temp files in the project's temporary directory. For example: 'command > <temp_dir>/out.log 2> <temp_dir>/err.log'.
+- After the command runs, inspect the temp files (e.g. '<temp_dir>/out.log' and '<temp_dir>/err.log') using commands like 'grep', 'tail', 'head', ... (or platform equivalents). Remove the temp files when done.
 `;
         }
         return "";
@@ -345568,7 +345575,7 @@ ${function() {
       }()}`,
       finalReminder: `
 # Final Reminder
-Your core function is efficient and safe assistance. Balance extreme conciseness with the crucial need for clarity, especially regarding safety and potential system modifications. Always prioritize user control and project conventions. Never make assumptions about the contents of files; instead use '${READ_FILE_TOOL_NAME}' or '${READ_MANY_FILES_TOOL_NAME}' to ensure you aren't making broad assumptions. Finally, you are an agent - please keep going until the user's query is completely resolved.`
+Your core function is efficient and safe assistance. Balance extreme conciseness with the crucial need for clarity, especially regarding safety and potential system modifications. Always prioritize user control and project conventions. Never make assumptions about the contents of files; instead use '${READ_FILE_TOOL_NAME}' to ensure you aren't making broad assumptions. Finally, you are an agent - please keep going until the user's query is completely resolved.`
     };
     const orderedPrompts = [
       "preamble",
@@ -346281,6 +346288,9 @@ var GeminiClient = class {
     this.chat = await this.startChat();
     this.updateTelemetryTokenCount();
   }
+  async resumeChat(history, resumedSessionData) {
+    this.chat = await this.startChat(history, resumedSessionData);
+  }
   getChatRecordingService() {
     return this.chat?.getChatRecordingService();
   }
@@ -346299,7 +346309,7 @@ var GeminiClient = class {
       parts: [{ text: await getDirectoryContextString(this.config) }]
     });
   }
-  async startChat(extraHistory) {
+  async startChat(extraHistory, resumedSessionData) {
     this.forceFullIdeContext = true;
     this.hasFailedCompressionAttempt = false;
     const toolRegistry = this.config.getToolRegistry();
@@ -346321,7 +346331,7 @@ var GeminiClient = class {
         systemInstruction,
         ...config2,
         tools
-      }, history);
+      }, history, resumedSessionData);
     } catch (error) {
       await reportError(error, "Error initializing Gemini chat session.", history, "startChat");
       throw new Error(`Failed to initialize chat: ${getErrorMessage(error)}`);
@@ -346573,25 +346583,27 @@ var GeminiClient = class {
     }
     return turn;
   }
-  async generateContent(contents, generationConfig, abortSignal, model) {
-    let currentAttemptModel = model;
-    const configToUse = {
-      ...this.generateContentConfig,
-      ...generationConfig
-    };
+  async generateContent(modelConfigKey, contents, abortSignal) {
+    const desiredModelConfig = this.config.modelConfigService.getResolvedConfig(modelConfigKey);
+    let { model: currentAttemptModel, generateContentConfig: currentAttemptGenerateContentConfig } = desiredModelConfig;
+    const fallbackModelConfig = this.config.modelConfigService.getResolvedConfig({
+      ...modelConfigKey,
+      model: DEFAULT_GEMINI_FLASH_MODEL
+    });
     try {
       const userMemory = this.config.getUserMemory();
       const systemInstruction = getCoreSystemPrompt(this.config, userMemory);
-      const requestConfig = {
-        abortSignal,
-        ...configToUse,
-        systemInstruction
-      };
       const apiCall = () => {
-        const modelToUse = this.config.isInFallbackMode() ? DEFAULT_GEMINI_FLASH_MODEL : model;
-        currentAttemptModel = modelToUse;
+        const modelConfigToUse = this.config.isInFallbackMode() ? fallbackModelConfig : desiredModelConfig;
+        currentAttemptModel = modelConfigToUse.model;
+        currentAttemptGenerateContentConfig = modelConfigToUse.generateContentConfig;
+        const requestConfig = {
+          ...currentAttemptGenerateContentConfig,
+          abortSignal,
+          systemInstruction
+        };
         return this.getContentGeneratorOrFail().generateContent({
-          model: modelToUse,
+          model: currentAttemptModel,
           config: requestConfig,
           contents
         }, this.lastPromptId);
@@ -346611,7 +346623,7 @@ var GeminiClient = class {
       }
       await reportError(error, `Error generating content via API with model ${currentAttemptModel}.`, {
         requestContents: contents,
-        requestConfig: configToUse
+        requestConfig: currentAttemptGenerateContentConfig
       }, "generateContent-api");
       throw new Error(`Failed to generate content with model ${currentAttemptModel}: ${getErrorMessage(error)}`);
     }
@@ -352084,7 +352096,7 @@ var DEFAULT_MODEL_CONFIGS = {
         }
       }
     },
-    "web-search-tool": {
+    "web-search": {
       extends: "gemini-2.5-flash-base",
       modelConfig: {
         generateContentConfig: {
@@ -352092,7 +352104,7 @@ var DEFAULT_MODEL_CONFIGS = {
         }
       }
     },
-    "web-fetch-tool": {
+    "web-fetch": {
       extends: "gemini-2.5-flash-base",
       modelConfig: {
         generateContentConfig: {
@@ -352100,6 +352112,11 @@ var DEFAULT_MODEL_CONFIGS = {
         }
       }
     },
+    // TODO(joshualitt): During cleanup, make modelConfig optional.
+    "web-fetch-fallback": {
+      extends: "gemini-2.5-flash-base",
+      modelConfig: {}
+    },
     "loop-detection": {
       extends: "gemini-2.5-flash-base",
       modelConfig: {}
@@ -354956,7 +354973,7 @@ async function getClientMetadata() {
   if (!clientMetadataPromise) {
     clientMetadataPromise = (async () => ({
       ideName: "GEMINI_CLI",
-      ideVersion: "0.15.0-nightly.20251110.c0b766ad",
+      ideVersion: "0.15.0-preview.0",
       platform: getPlatform(),
       updateChannel: await getReleaseChannel(__dirname5)
     }))();
@@ -354990,6 +355007,12 @@ function parseExperiments(response) {
   };
 }
 
+// packages/core/dist/src/code_assist/experiments/flagNames.js
+var ExperimentFlags = {
+  CONTEXT_COMPRESSION_THRESHOLD: "GeminiCLIContextCompression__threshold_fraction",
+  USER_CACHING: "GcliUserCaching__user_caching"
+};
+
 // packages/core/dist/src/utils/memoryDiscovery.js
 import * as fs54 from "node:fs/promises";
 import * as fsSync from "node:fs";
@@ -357847,8 +357870,8 @@ var ErrorEvent = class extends Event {
    * @param inspect - The inspect function to use (prevents having to import it from `util`)
    * @returns A string representation of the error
    */
-  [Symbol.for("nodejs.util.inspect.custom")](_depth, options2, inspect4) {
-    return inspect4(inspectableError(this), options2);
+  [Symbol.for("nodejs.util.inspect.custom")](_depth, options2, inspect5) {
+    return inspect5(inspectableError(this), options2);
   }
   /**
    * Deno "hides" the `message` and `code` properties of the `ErrorEvent` instance,
@@ -357861,8 +357884,8 @@ var ErrorEvent = class extends Event {
    * @param options - The options passed to `Deno.inspect`
    * @returns A string representation of the error
    */
-  [Symbol.for("Deno.customInspect")](inspect4, options2) {
-    return inspect4(inspectableError(this), options2);
+  [Symbol.for("Deno.customInspect")](inspect5, options2) {
+    return inspect5(inspectableError(this), options2);
   }
 };
 function syntaxError(message) {
@@ -359725,26 +359748,28 @@ async function handleAutomaticOAuth(mcpServerName, mcpServerConfig, wwwAuthentic
     return false;
   }
 }
+function createTransportRequestInit(mcpServerConfig, headers) {
+  return {
+    headers: {
+      ...mcpServerConfig.headers,
+      ...headers
+    }
+  };
+}
 async function createTransportWithOAuth(mcpServerName, mcpServerConfig, accessToken) {
   try {
     if (mcpServerConfig.httpUrl) {
       const oauthTransportOptions = {
-        requestInit: {
-          headers: {
-            ...mcpServerConfig.headers,
-            Authorization: `Bearer ${accessToken}`
-          }
-        }
+        requestInit: createTransportRequestInit(mcpServerConfig, {
+          Authorization: `Bearer ${accessToken}`
+        })
       };
       return new StreamableHTTPClientTransport(new URL(mcpServerConfig.httpUrl), oauthTransportOptions);
     } else if (mcpServerConfig.url) {
       return new SSEClientTransport(new URL(mcpServerConfig.url), {
-        requestInit: {
-          headers: {
-            ...mcpServerConfig.headers,
-            Authorization: `Bearer ${accessToken}`
-          }
-        }
+        requestInit: createTransportRequestInit(mcpServerConfig, {
+          Authorization: `Bearer ${accessToken}`
+        })
       });
     }
     return null;
@@ -360050,6 +360075,7 @@ async function createTransport(mcpServerName, mcpServerConfig, debugMode) {
   if (mcpServerConfig.authProviderType === AuthProviderType.SERVICE_ACCOUNT_IMPERSONATION) {
     const provider = new ServiceAccountImpersonationProvider(mcpServerConfig);
     const transportOptions = {
+      requestInit: createTransportRequestInit(mcpServerConfig, {}),
       authProvider: provider
     };
     if (mcpServerConfig.httpUrl) {
@@ -360062,6 +360088,7 @@ async function createTransport(mcpServerName, mcpServerConfig, debugMode) {
   if (mcpServerConfig.authProviderType === AuthProviderType.GOOGLE_CREDENTIALS) {
     const provider = new GoogleCredentialProvider(mcpServerConfig);
     const transportOptions = {
+      requestInit: createTransportRequestInit(mcpServerConfig, {}),
       authProvider: provider
     };
     if (mcpServerConfig.httpUrl) {
@@ -360428,6 +360455,8 @@ var Config = class {
   ideMode;
   inFallbackMode = false;
   maxSessionTurns;
+  listSessions;
+  deleteSession;
   listExtensions;
   _extensionLoader;
   _enabledExtensions;
@@ -360524,6 +360553,8 @@ var Config = class {
     this.model = params.model;
     this.maxSessionTurns = params.maxSessionTurns ?? -1;
     this.experimentalZedIntegration = params.experimentalZedIntegration ?? false;
+    this.listSessions = params.listSessions ?? false;
+    this.deleteSession = params.deleteSession;
     this.listExtensions = params.listExtensions ?? false;
     this._extensionLoader = params.extensionLoader ?? new SimpleExtensionLoader([]);
     this._enabledExtensions = params.enabledExtensions ?? [];
@@ -360632,6 +360663,26 @@ var Config = class {
       await this.getExtensionLoader().start(this)
     ]);
     await this.geminiClient.initialize();
+    this.checkDeprecatedTools();
+  }
+  checkDeprecatedTools() {
+    const deprecatedTools = [
+      {
+        name: READ_MANY_FILES_TOOL_NAME,
+        alternateName: "ReadManyFilesTool"
+      }
+    ];
+    const checkList = (list3, listName) => {
+      if (!list3)
+        return;
+      for (const tool of deprecatedTools) {
+        if (list3.includes(tool.name) || list3.includes(tool.alternateName)) {
+          coreEvents.emitFeedback("warning", `The tool '${tool.name}' (or '${tool.alternateName}') specified in '${listName}' is deprecated and will be removed in v0.14.0.`);
+        }
+      }
+    };
+    checkList(this.coreTools, "tools.core");
+    checkList(this.allowedTools, "tools.allowed");
   }
   getContentGenerator() {
     return this.contentGenerator;
@@ -360683,6 +360734,9 @@ var Config = class {
   getSessionId() {
     return this.sessionId;
   }
+  setSessionId(sessionId2) {
+    this.sessionId = sessionId2;
+  }
   shouldLoadMemoryFromIncludeDirectories() {
     return this.loadMemoryFromIncludeDirectories;
   }
@@ -360927,6 +360981,12 @@ var Config = class {
   getListExtensions() {
     return this.listExtensions;
   }
+  getListSessions() {
+    return this.listSessions;
+  }
+  getDeleteSession() {
+    return this.deleteSession;
+  }
   getExtensionManagement() {
     return this.extensionManagement;
   }
@@ -360992,19 +361052,27 @@ var Config = class {
     if (this.compressionThreshold) {
       return this.compressionThreshold;
     }
-    if (this.experimentsPromise) {
-      try {
-        await this.experimentsPromise;
-      } catch (e2) {
-        debugLogger.debug("Failed to fetch experiments", e2);
-      }
-    }
-    const remoteThreshold = this.experiments?.flags["GeminiCLIContextCompression__threshold_fraction"]?.floatValue;
+    await this.ensureExperimentsLoaded();
+    const remoteThreshold = this.experiments?.flags[ExperimentFlags.CONTEXT_COMPRESSION_THRESHOLD]?.floatValue;
     if (remoteThreshold === 0) {
       return void 0;
     }
     return remoteThreshold;
   }
+  async getUserCaching() {
+    await this.ensureExperimentsLoaded();
+    return this.experiments?.flags[ExperimentFlags.USER_CACHING]?.boolValue;
+  }
+  async ensureExperimentsLoaded() {
+    if (!this.experimentsPromise) {
+      return;
+    }
+    try {
+      await this.experimentsPromise;
+    } catch (e2) {
+      debugLogger.debug("Failed to fetch experiments", e2);
+    }
+  }
   isInteractiveShellEnabled() {
     return this.interactive && this.ptyInfo !== "child_process" && this.enableInteractiveShell;
   }
@@ -361183,6 +361251,42 @@ var Config = class {
    */
   setExperiments(experiments) {
     this.experiments = experiments;
+    const flagSummaries = Object.entries(experiments.flags ?? {}).sort(([a2], [b]) => a2.localeCompare(b)).map(([name4, flag]) => {
+      const summary2 = { name: name4 };
+      if (flag.boolValue !== void 0) {
+        summary2["boolValue"] = flag.boolValue;
+      }
+      if (flag.floatValue !== void 0) {
+        summary2["floatValue"] = flag.floatValue;
+      }
+      if (flag.intValue !== void 0) {
+        summary2["intValue"] = flag.intValue;
+      }
+      if (flag.stringValue !== void 0) {
+        summary2["stringValue"] = flag.stringValue;
+      }
+      const int32Length = flag.int32ListValue?.values?.length ?? 0;
+      if (int32Length > 0) {
+        summary2["int32ListLength"] = int32Length;
+      }
+      const stringListLength = flag.stringListValue?.values?.length ?? 0;
+      if (stringListLength > 0) {
+        summary2["stringListLength"] = stringListLength;
+      }
+      return summary2;
+    });
+    const summary = {
+      experimentIds: experiments.experimentIds ?? [],
+      flags: flagSummaries
+    };
+    const summaryString = inspect4(summary, {
+      depth: null,
+      maxArrayLength: null,
+      maxStringLength: null,
+      breakLength: 80,
+      compact: false
+    });
+    debugLogger.debug("Experiments loaded", summaryString);
   }
 };