@google/gemini-cli 0.33.0-preview.4 → 0.33.0-preview.6

package/bundle/gemini.js

@@ -43923,7 +43923,7 @@ var require_has_flag = __commonJS({
 var require_supports_color = __commonJS({
   "node_modules/supports-color/index.js"(exports2, module2) {
     "use strict";
-    var os40 = __require("os");
+    var os39 = __require("os");
     var hasFlag2 = require_has_flag();
     var env6 = process.env;
     var forceColor;
@@ -43961,7 +43961,7 @@ var require_supports_color = __commonJS({
       }
       const min = forceColor ? 1 : 0;
       if (process.platform === "win32") {
-        const osRelease = os40.release().split(".");
+        const osRelease = os39.release().split(".");
         if (Number(process.versions.node.split(".")[0]) >= 8 && Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
           return Number(osRelease[2]) >= 14931 ? 3 : 2;
         }
@@ -54665,7 +54665,7 @@ var require_util2 = __commonJS({
     exports2.isValidFile = isValidFile;
     exports2.getWellKnownCertificateConfigFileLocation = getWellKnownCertificateConfigFileLocation;
     var fs131 = __require("fs");
-    var os40 = __require("os");
+    var os39 = __require("os");
     var path152 = __require("path");
     var WELL_KNOWN_CERTIFICATE_CONFIG_FILE = "certificate_config.json";
     var CLOUDSDK_CONFIG_DIRECTORY = "gcloud";
@@ -54763,7 +54763,7 @@ var require_util2 = __commonJS({
       return path152.join(configDir, WELL_KNOWN_CERTIFICATE_CONFIG_FILE);
     }
     function _isWindows() {
-      return os40.platform().startsWith("win");
+      return os39.platform().startsWith("win");
     }
   }
 });
@@ -60078,7 +60078,7 @@ var require_googleauth = __commonJS({
     var fs131 = __require("fs");
     var gaxios_1 = require_src2();
     var gcpMetadata = require_src4();
-    var os40 = __require("os");
+    var os39 = __require("os");
     var path152 = __require("path");
     var crypto_1 = require_crypto3();
     var computeclient_1 = require_computeclient();
@@ -60581,7 +60581,7 @@ var require_googleauth = __commonJS({
        * @api private
        */
       _isWindows() {
-        const sys = os40.platform();
+        const sys = os39.platform();
         if (sys && sys.length >= 3) {
           if (sys.substring(0, 3).toLowerCase() === "win") {
             return true;
@@ -76458,24 +76458,24 @@ var init_node = __esm({
         return `other:${arch5}`;
       return "unknown";
     };
-    normalizePlatform = (platform22) => {
-      platform22 = platform22.toLowerCase();
-      if (platform22.includes("ios"))
+    normalizePlatform = (platform21) => {
+      platform21 = platform21.toLowerCase();
+      if (platform21.includes("ios"))
         return "iOS";
-      if (platform22 === "android")
+      if (platform21 === "android")
         return "Android";
-      if (platform22 === "darwin")
+      if (platform21 === "darwin")
         return "MacOS";
-      if (platform22 === "win32")
+      if (platform21 === "win32")
         return "Windows";
-      if (platform22 === "freebsd")
+      if (platform21 === "freebsd")
         return "FreeBSD";
-      if (platform22 === "openbsd")
+      if (platform21 === "openbsd")
         return "OpenBSD";
-      if (platform22 === "linux")
+      if (platform21 === "linux")
         return "Linux";
-      if (platform22)
-        return `Other:${platform22}`;
+      if (platform21)
+        return `Other:${platform21}`;
       return "Unknown";
     };
     getPlatformHeaders = () => {
@@ -81756,7 +81756,7 @@ var require_util4 = __commonJS({
     exports2.isValidFile = isValidFile;
     exports2.getWellKnownCertificateConfigFileLocation = getWellKnownCertificateConfigFileLocation;
     var fs131 = __require("fs");
-    var os40 = __require("os");
+    var os39 = __require("os");
     var path152 = __require("path");
     var WELL_KNOWN_CERTIFICATE_CONFIG_FILE = "certificate_config.json";
     var CLOUDSDK_CONFIG_DIRECTORY = "gcloud";
@@ -81854,7 +81854,7 @@ var require_util4 = __commonJS({
       return path152.join(configDir, WELL_KNOWN_CERTIFICATE_CONFIG_FILE);
     }
     function _isWindows() {
-      return os40.platform().startsWith("win");
+      return os39.platform().startsWith("win");
     }
   }
 });
@@ -86626,7 +86626,7 @@ var require_googleauth2 = __commonJS({
     var fs131 = __require("fs");
     var gaxios_1 = require_src7();
     var gcpMetadata = require_src9();
-    var os40 = __require("os");
+    var os39 = __require("os");
     var path152 = __require("path");
     var crypto_1 = require_crypto6();
     var computeclient_1 = require_computeclient2();
@@ -87129,7 +87129,7 @@ var require_googleauth2 = __commonJS({
        * @api private
        */
       _isWindows() {
-        const sys = os40.platform();
+        const sys = os39.platform();
         if (sys && sys.length >= 3) {
           if (sys.substring(0, 3).toLowerCase() === "win") {
             return true;
@@ -88841,8 +88841,8 @@ function isSubpath(parentPath, childPath) {
   const relative13 = pathModule2.relative(parentPath, childPath);
   return !relative13.startsWith(`..${pathModule2.sep}`) && relative13 !== ".." && !pathModule2.isAbsolute(relative13);
 }
-function resolveToRealPath(path152) {
-  let resolvedPath = path152;
+function resolveToRealPath(pathStr) {
+  let resolvedPath = pathStr;
   try {
     if (resolvedPath.startsWith("file://")) {
       resolvedPath = fileURLToPath2(resolvedPath);
@@ -88850,10 +88850,28 @@ function resolveToRealPath(path152) {
     resolvedPath = decodeURIComponent(resolvedPath);
   } catch (_e) {
   }
+  return robustRealpath(path3.resolve(resolvedPath));
+}
+function robustRealpath(p) {
   try {
-    return fs9.realpathSync(resolvedPath);
-  } catch (_e) {
-    return resolvedPath;
+    return fs9.realpathSync(p);
+  } catch (e3) {
+    if (e3 && typeof e3 === "object" && "code" in e3 && e3.code === "ENOENT") {
+      try {
+        const stat15 = fs9.lstatSync(p);
+        if (stat15.isSymbolicLink()) {
+          const target = fs9.readlinkSync(p);
+          const resolvedTarget = path3.resolve(path3.dirname(p), target);
+          return robustRealpath(resolvedTarget);
+        }
+      } catch {
+      }
+      const parent = path3.dirname(p);
+      if (parent === p)
+        return p;
+      return path3.join(robustRealpath(parent), path3.basename(p));
+    }
+    throw e3;
   }
 }
 var GEMINI_DIR, GOOGLE_ACCOUNTS_FILENAME;
@@ -88871,7 +88889,7 @@ var require_polyfills = __commonJS({
     var constants9 = __require("constants");
     var origCwd = process.cwd;
     var cwd7 = null;
-    var platform22 = process.env.GRACEFUL_FS_PLATFORM || process.platform;
+    var platform21 = process.env.GRACEFUL_FS_PLATFORM || process.platform;
     process.cwd = function() {
       if (!cwd7)
         cwd7 = origCwd.call(process);
@@ -88930,7 +88948,7 @@ var require_polyfills = __commonJS({
         fs131.lchownSync = function() {
         };
       }
-      if (platform22 === "win32") {
+      if (platform21 === "win32") {
         fs131.rename = typeof fs131.rename !== "function" ? fs131.rename : function(fs$rename) {
           function rename2(from, to, cb) {
             var start2 = Date.now();
@@ -105392,10 +105410,36 @@ var init_tools = __esm({
 
 // packages/core/dist/src/tools/mcp-tool.js
 function isMcpToolName(name4) {
-  if (!name4.includes(MCP_QUALIFIED_NAME_SEPARATOR))
-    return false;
-  const parts2 = name4.split(MCP_QUALIFIED_NAME_SEPARATOR);
-  return parts2.length === 2 && parts2[0].length > 0 && parts2[1].length > 0;
+  return name4.startsWith(MCP_TOOL_PREFIX);
+}
+function parseMcpToolName(name4) {
+  if (!isMcpToolName(name4)) {
+    return {};
+  }
+  const withoutPrefix = name4.slice(MCP_TOOL_PREFIX.length);
+  const match2 = withoutPrefix.match(/^([^_]+)_(.+)$/);
+  if (match2) {
+    return {
+      serverName: match2[1],
+      toolName: match2[2]
+    };
+  }
+  return {};
+}
+function formatMcpToolName(serverName, toolName) {
+  if (serverName === "*" && !toolName) {
+    return `${MCP_TOOL_PREFIX}*`;
+  } else if (serverName === "*") {
+    return `${MCP_TOOL_PREFIX}*_${toolName}`;
+  } else if (!toolName) {
+    return `${MCP_TOOL_PREFIX}${serverName}_*`;
+  } else {
+    return `${MCP_TOOL_PREFIX}${serverName}_${toolName}`;
+  }
+}
+function isMcpToolAnnotation(annotation) {
+  return typeof annotation === "object" && annotation !== null && // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+  typeof annotation["_serverName"] === "string";
 }
 function transformTextBlock(block) {
   return { text: block.text };
@@ -105490,24 +105534,28 @@ function getStringifiedResultForDisplay(rawResponse) {
   return displayParts.join("\n");
 }
 function generateValidName(name4) {
-  let validToolname = name4.replace(/[^a-zA-Z0-9_.:-]/g, "_");
+  let validToolname = name4.startsWith("mcp_") ? name4 : `mcp_${name4}`;
+  validToolname = validToolname.replace(/[^a-zA-Z0-9_\-.:]/g, "_");
   if (/^[^a-zA-Z_]/.test(validToolname)) {
     validToolname = `_${validToolname}`;
   }
   const safeLimit = MAX_FUNCTION_NAME_LENGTH - 1;
   if (validToolname.length > safeLimit) {
+    debugLogger.warn(`Truncating MCP tool name "${validToolname}" to fit within the 64 character limit. This tool may require user approval.`);
     validToolname = validToolname.slice(0, 30) + "..." + validToolname.slice(-30);
   }
   return validToolname;
 }
-var MCP_QUALIFIED_NAME_SEPARATOR, DiscoveredMCPToolInvocation, DiscoveredMCPTool, MAX_FUNCTION_NAME_LENGTH;
+var MCP_QUALIFIED_NAME_SEPARATOR, MCP_TOOL_PREFIX, DiscoveredMCPToolInvocation, DiscoveredMCPTool, MAX_FUNCTION_NAME_LENGTH;
 var init_mcp_tool = __esm({
   "packages/core/dist/src/tools/mcp-tool.js"() {
     "use strict";
     init_safeJsonStringify();
+    init_debugLogger();
     init_tools();
     init_tool_error();
-    MCP_QUALIFIED_NAME_SEPARATOR = "__";
+    MCP_QUALIFIED_NAME_SEPARATOR = "_";
+    MCP_TOOL_PREFIX = "mcp_";
     DiscoveredMCPToolInvocation = class _DiscoveredMCPToolInvocation extends BaseToolInvocation {
       mcpTool;
       serverName;
@@ -105649,7 +105697,7 @@ var init_mcp_tool = __esm({
       _toolAnnotations;
       constructor(mcpTool, serverName, serverToolName, description, parameterSchema, messageBus, trust, isReadOnly, nameOverride, cliConfig, extensionName, extensionId, _toolAnnotations) {
         super(
-          generateValidName(nameOverride ?? serverToolName),
+          nameOverride ?? generateValidName(`${serverName}${MCP_QUALIFIED_NAME_SEPARATOR}${serverToolName}`),
           `${serverToolName} (${serverName} MCP Server)`,
           description,
           Kind.Other,
@@ -105684,7 +105732,7 @@ var init_mcp_tool = __esm({
         return this._toolAnnotations;
       }
       getFullyQualifiedPrefix() {
-        return `${this.serverName}${MCP_QUALIFIED_NAME_SEPARATOR}`;
+        return generateValidName(`${this.serverName}${MCP_QUALIFIED_NAME_SEPARATOR}`);
       }
       getFullyQualifiedName() {
         return generateValidName(`${this.serverName}${MCP_QUALIFIED_NAME_SEPARATOR}${this.serverToolName}`);
@@ -121243,7 +121291,7 @@ var require_service_config = __commonJS({
     exports2.validateRetryThrottling = validateRetryThrottling;
     exports2.validateServiceConfig = validateServiceConfig;
     exports2.extractAndSelectServiceConfig = extractAndSelectServiceConfig;
-    var os40 = __require("os");
+    var os39 = __require("os");
     var constants_1 = require_constants4();
     var DURATION_REGEX = /^\d+(\.\d{1,9})?s$/;
     var CLIENT_LANGUAGE_STRING = "node";
@@ -121542,7 +121590,7 @@ var require_service_config = __commonJS({
         if (Array.isArray(validatedConfig.clientHostname)) {
           let hostnameMatched = false;
           for (const hostname3 of validatedConfig.clientHostname) {
-            if (hostname3 === os40.hostname()) {
+            if (hostname3 === os39.hostname()) {
               hostnameMatched = true;
             }
           }
@@ -135063,7 +135111,7 @@ var require_subchannel_call = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.Http2SubchannelCall = void 0;
     var http22 = __require("http2");
-    var os40 = __require("os");
+    var os39 = __require("os");
     var constants_1 = require_constants4();
     var metadata_1 = require_metadata3();
     var stream_decoder_1 = require_stream_decoder();
@@ -135071,7 +135119,7 @@ var require_subchannel_call = __commonJS({
     var constants_2 = require_constants4();
     var TRACER_NAME2 = "subchannel_call";
     function getSystemErrorName(errno) {
-      for (const [name4, num] of Object.entries(os40.constants.errno)) {
+      for (const [name4, num] of Object.entries(os39.constants.errno)) {
         if (num === errno) {
           return name4;
         }
@@ -155455,7 +155503,7 @@ var require_ProcessDetector = __commonJS({
     exports2.processDetector = void 0;
     var api_1 = (init_esm(), __toCommonJS(esm_exports));
     var semconv_1 = require_semconv2();
-    var os40 = __require("os");
+    var os39 = __require("os");
     var ProcessDetector = class {
       detect(_config) {
         const attributes = {
@@ -155475,7 +155523,7 @@ var require_ProcessDetector = __commonJS({
           attributes[semconv_1.ATTR_PROCESS_COMMAND] = process.argv[1];
         }
         try {
-          const userInfo2 = os40.userInfo();
+          const userInfo2 = os39.userInfo();
           attributes[semconv_1.ATTR_PROCESS_OWNER] = userInfo2.username;
         } catch (e3) {
           api_1.diag.debug(`error obtaining process owner: ${e3}`);
@@ -174985,7 +175033,7 @@ var require_package6 = __commonJS({
 var require_util11 = __commonJS({
   "node_modules/systeminformation/lib/util.js"(exports2) {
     "use strict";
-    var os40 = __require("os");
+    var os39 = __require("os");
     var fs131 = __require("fs");
     var path152 = __require("path");
     var spawn15 = __require("child_process").spawn;
@@ -175092,7 +175140,7 @@ var require_util11 = __commonJS({
     }
     function cores() {
       if (_cores === 0) {
-        _cores = os40.cpus().length;
+        _cores = os39.cpus().length;
       }
       return _cores;
     }
@@ -175353,7 +175401,7 @@ var require_util11 = __commonJS({
     function powerShellRelease() {
       try {
         if (_psChild) {
-          _psChild.stdin.write("exit" + os40.EOL);
+          _psChild.stdin.write("exit" + os39.EOL);
           _psChild.stdin.end();
         }
       } catch {
@@ -175380,7 +175428,7 @@ var require_util11 = __commonJS({
             });
             try {
               if (_psChild && _psChild.pid) {
-                _psChild.stdin.write(_psToUTF8 + "echo " + _psCmdStart + id + _psIdSeperator + "; " + os40.EOL + cmd + os40.EOL + "echo " + _psCmdSeperator + os40.EOL);
+                _psChild.stdin.write(_psToUTF8 + "echo " + _psCmdStart + id + _psIdSeperator + "; " + os39.EOL + cmd + os39.EOL + "echo " + _psCmdSeperator + os39.EOL);
               }
             } catch {
               resolve36("");
@@ -175392,7 +175440,7 @@ var require_util11 = __commonJS({
         return new Promise((resolve36) => {
           process.nextTick(() => {
             try {
-              const osVersion = os40.release().split(".").map(Number);
+              const osVersion = os39.release().split(".").map(Number);
               const spanOptions = osVersion[0] < 10 ? ["-NoProfile", "-NoLogo", "-InputFormat", "Text", "-NoExit", "-ExecutionPolicy", "Unrestricted", "-Command", "-"] : ["-NoProfile", "-NoLogo", "-InputFormat", "Text", "-ExecutionPolicy", "Unrestricted", "-Command", _psToUTF8 + cmd];
               const child = spawn15(_powerShell, spanOptions, {
                 stdio: "pipe",
@@ -175424,8 +175472,8 @@ var require_util11 = __commonJS({
                 });
                 if (osVersion[0] < 10) {
                   try {
-                    child.stdin.write(_psToUTF8 + cmd + os40.EOL);
-                    child.stdin.write("exit" + os40.EOL);
+                    child.stdin.write(_psToUTF8 + cmd + os39.EOL);
+                    child.stdin.write("exit" + os39.EOL);
                     child.stdin.end();
                   } catch {
                     child.kill();
@@ -175690,14 +175738,14 @@ var require_util11 = __commonJS({
       return ("00000000" + parseInt(hex, 16).toString(2)).substr(-8);
     }
     function getFilesInPath(source2) {
-      const lstatSync2 = fs131.lstatSync;
+      const lstatSync3 = fs131.lstatSync;
       const readdirSync4 = fs131.readdirSync;
       const join54 = path152.join;
       function isDirectory(source3) {
-        return lstatSync2(source3).isDirectory();
+        return lstatSync3(source3).isDirectory();
       }
       function isFile3(source3) {
-        return lstatSync2(source3).isFile();
+        return lstatSync3(source3).isFile();
       }
       function getDirectories(source3) {
         return readdirSync4(source3).map((name4) => {
@@ -177493,7 +177541,7 @@ var require_util11 = __commonJS({
 var require_osinfo = __commonJS({
   "node_modules/systeminformation/lib/osinfo.js"(exports2) {
     "use strict";
-    var os40 = __require("os");
+    var os39 = __require("os");
     var fs131 = __require("fs");
     var util5 = require_util11();
     var exec6 = __require("child_process").exec;
@@ -177516,14 +177564,14 @@ var require_osinfo = __commonJS({
       }
       const result2 = {
         current: Date.now(),
-        uptime: os40.uptime(),
+        uptime: os39.uptime(),
         timezone: t3.length >= 7 ? t3[5] : "",
         timezoneName
       };
       if (_darwin || _linux) {
         try {
           const stdout = execSync9("date +%Z && date +%z && ls -l /etc/localtime 2>/dev/null", util5.execOptsLinux);
-          const lines = stdout.toString().split(os40.EOL);
+          const lines = stdout.toString().split(os39.EOL);
           if (lines.length > 3 && !lines[0]) {
             lines.shift();
           }
@@ -177533,7 +177581,7 @@ var require_osinfo = __commonJS({
           }
           return {
             current: Date.now(),
-            uptime: os40.uptime(),
+            uptime: os39.uptime(),
             timezone: lines[1] ? timezone + lines[1] : timezone,
             timezoneName: lines[2] && lines[2].indexOf("/zoneinfo/") > 0 ? lines[2].split("/zoneinfo/")[1] || "" : ""
           };
@@ -177652,11 +177700,11 @@ var require_osinfo = __commonJS({
       return "";
     }
     function getFQDN() {
-      let fqdn = os40.hostname;
+      let fqdn = os39.hostname;
       if (_linux || _darwin) {
         try {
           const stdout = execSync9("hostname -f 2>/dev/null", util5.execOptsLinux);
-          fqdn = stdout.toString().split(os40.EOL)[0];
+          fqdn = stdout.toString().split(os39.EOL)[0];
         } catch {
           util5.noop();
         }
@@ -177664,7 +177712,7 @@ var require_osinfo = __commonJS({
       if (_freebsd || _openbsd || _netbsd) {
         try {
           const stdout = execSync9("hostname 2>/dev/null");
-          fqdn = stdout.toString().split(os40.EOL)[0];
+          fqdn = stdout.toString().split(os39.EOL)[0];
         } catch {
           util5.noop();
         }
@@ -177672,7 +177720,7 @@ var require_osinfo = __commonJS({
       if (_windows) {
         try {
           const stdout = execSync9("echo %COMPUTERNAME%.%USERDNSDOMAIN%", util5.execOptsWin);
-          fqdn = stdout.toString().replace(".%USERDNSDOMAIN%", "").split(os40.EOL)[0];
+          fqdn = stdout.toString().replace(".%USERDNSDOMAIN%", "").split(os39.EOL)[0];
         } catch {
           util5.noop();
         }
@@ -177687,9 +177735,9 @@ var require_osinfo = __commonJS({
             distro: "unknown",
             release: "unknown",
             codename: "",
-            kernel: os40.release(),
-            arch: os40.arch(),
-            hostname: os40.hostname(),
+            kernel: os39.release(),
+            arch: os39.arch(),
+            hostname: os39.hostname(),
             fqdn: getFQDN(),
             codepage: "",
             logofile: "",
@@ -177898,7 +177946,7 @@ var require_osinfo = __commonJS({
     }
     function versions(apps2, callback2) {
       let versionObject = {
-        kernel: os40.release(),
+        kernel: os39.release(),
         apache: "",
         bash: "",
         bun: "",
@@ -178608,7 +178656,7 @@ var require_osinfo = __commonJS({
     function getUniqueMacAdresses() {
       let macs = [];
       try {
-        const ifaces = os40.networkInterfaces();
+        const ifaces = os39.networkInterfaces();
         for (let dev in ifaces) {
           if ({}.hasOwnProperty.call(ifaces, dev)) {
             ifaces[dev].forEach((details) => {
@@ -178730,7 +178778,7 @@ var require_system = __commonJS({
   "node_modules/systeminformation/lib/system.js"(exports2) {
     "use strict";
     var fs131 = __require("fs");
-    var os40 = __require("os");
+    var os39 = __require("os");
     var util5 = require_util11();
     var { uuid: uuid3 } = require_osinfo();
     var exec6 = __require("child_process").exec;
@@ -178854,8 +178902,8 @@ var require_system = __commonJS({
                   util5.noop();
                 }
               }
-              if (!result2.virtual && (os40.release().toLowerCase().indexOf("microsoft") >= 0 || os40.release().toLowerCase().endsWith("wsl2"))) {
-                const kernelVersion = parseFloat(os40.release().toLowerCase());
+              if (!result2.virtual && (os39.release().toLowerCase().indexOf("microsoft") >= 0 || os39.release().toLowerCase().endsWith("wsl2"))) {
+                const kernelVersion = parseFloat(os39.release().toLowerCase());
                 result2.virtual = true;
                 result2.manufacturer = "Microsoft";
                 result2.model = "WSL";
@@ -179265,7 +179313,7 @@ var require_system = __commonJS({
                 result2.model = "Raspberry Pi";
                 result2.serial = rpi.serial;
                 result2.version = rpi.type + " - " + rpi.revision;
-                result2.memMax = os40.totalmem();
+                result2.memMax = os39.totalmem();
                 result2.memSlots = 0;
               }
               if (callback2) {
@@ -179291,9 +179339,9 @@ var require_system = __commonJS({
               }
               devices.shift();
               result2.memSlots = devices.length;
-              if (os40.arch() === "arm64") {
+              if (os39.arch() === "arm64") {
                 result2.memSlots = 0;
-                result2.memMax = os40.totalmem();
+                result2.memMax = os39.totalmem();
               }
               if (callback2) {
                 callback2(result2);
@@ -179310,7 +179358,7 @@ var require_system = __commonJS({
           if (_windows) {
             try {
               const workload = [];
-              const win10plus = parseInt(os40.release()) >= 10;
+              const win10plus = parseInt(os39.release()) >= 10;
               const maxCapacityAttribute = win10plus ? "MaxCapacityEx" : "MaxCapacity";
               workload.push(util5.powerShell("Get-CimInstance Win32_baseboard | select Model,Manufacturer,Product,Version,SerialNumber,PartNumber,SKU | fl"));
               workload.push(util5.powerShell(`Get-CimInstance Win32_physicalmemoryarray | select ${maxCapacityAttribute}, MemoryDevices | fl`));
@@ -179506,7 +179554,7 @@ var require_system = __commonJS({
 var require_cpu = __commonJS({
   "node_modules/systeminformation/lib/cpu.js"(exports2) {
     "use strict";
-    var os40 = __require("os");
+    var os39 = __require("os");
     var exec6 = __require("child_process").exec;
     var execSync9 = __require("child_process").execSync;
     var fs131 = __require("fs");
@@ -180369,7 +180417,7 @@ var require_cpu = __commonJS({
                 const countProcessors = util5.getValue(lines, "hw.packages");
                 const countCores = util5.getValue(lines, "hw.physicalcpu_max");
                 const countThreads = util5.getValue(lines, "hw.ncpu");
-                if (os40.arch() === "arm64") {
+                if (os39.arch() === "arm64") {
                   result2.socket = "SOC";
                   try {
                     const clusters = execSync9("ioreg -c IOPlatformDevice -d 3 -r | grep cluster-type").toString().split("\n");
@@ -180397,8 +180445,8 @@ var require_cpu = __commonJS({
             if (_linux) {
               let modelline = "";
               let lines = [];
-              if (os40.cpus()[0] && os40.cpus()[0].model) {
-                modelline = os40.cpus()[0].model;
+              if (os39.cpus()[0] && os39.cpus()[0].model) {
+                modelline = os39.cpus()[0].model;
               }
               exec6('export LC_ALL=C; lscpu; echo -n "Governor: "; cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor 2>/dev/null; echo; unset LC_ALL', (error40, stdout) => {
                 if (!error40) {
@@ -180487,8 +180535,8 @@ var require_cpu = __commonJS({
             if (_freebsd || _openbsd || _netbsd) {
               let modelline = "";
               let lines = [];
-              if (os40.cpus()[0] && os40.cpus()[0].model) {
-                modelline = os40.cpus()[0].model;
+              if (os39.cpus()[0] && os39.cpus()[0].model) {
+                modelline = os39.cpus()[0].model;
               }
               exec6("export LC_ALL=C; dmidecode -t 4; dmidecode -t 7 unset LC_ALL", (error40, stdout) => {
                 let cache4 = [];
@@ -180648,7 +180696,7 @@ var require_cpu = __commonJS({
     }
     exports2.cpu = cpu;
     function getCpuCurrentSpeedSync() {
-      const cpus2 = os40.cpus();
+      const cpus2 = os39.cpus();
       let minFreq = 999999999;
       let maxFreq = 0;
       let avgFreq = 0;
@@ -181343,7 +181391,7 @@ var require_cpu = __commonJS({
     function getLoad() {
       return new Promise((resolve36) => {
         process.nextTick(() => {
-          const loads = os40.loadavg().map((x3) => {
+          const loads = os39.loadavg().map((x3) => {
             return x3 / util5.cores();
           });
           const avgLoad = parseFloat(Math.max.apply(Math, loads).toFixed(2));
@@ -181351,7 +181399,7 @@ var require_cpu = __commonJS({
           const now = Date.now() - _current_cpu.ms;
           if (now >= 200) {
             _current_cpu.ms = Date.now();
-            const cpus2 = os40.cpus().map((cpu2) => {
+            const cpus2 = os39.cpus().map((cpu2) => {
               cpu2.times.steal = 0;
               cpu2.times.guest = 0;
               return cpu2;
@@ -181545,7 +181593,7 @@ var require_cpu = __commonJS({
     function getFullLoad() {
       return new Promise((resolve36) => {
         process.nextTick(() => {
-          const cpus2 = os40.cpus();
+          const cpus2 = os39.cpus();
           let totalUser = 0;
           let totalSystem = 0;
           let totalNice = 0;
@@ -181588,7 +181636,7 @@ var require_cpu = __commonJS({
 var require_memory = __commonJS({
   "node_modules/systeminformation/lib/memory.js"(exports2) {
     "use strict";
-    var os40 = __require("os");
+    var os39 = __require("os");
     var exec6 = __require("child_process").exec;
     var execSync9 = __require("child_process").execSync;
     var util5 = require_util11();
@@ -181634,12 +181682,12 @@ var require_memory = __commonJS({
       return new Promise((resolve36) => {
         process.nextTick(() => {
           let result2 = {
-            total: os40.totalmem(),
-            free: os40.freemem(),
-            used: os40.totalmem() - os40.freemem(),
-            active: os40.totalmem() - os40.freemem(),
+            total: os39.totalmem(),
+            free: os39.freemem(),
+            used: os39.totalmem() - os39.freemem(),
+            active: os39.totalmem() - os39.freemem(),
             // temporarily (fallback)
-            available: os40.freemem(),
+            available: os39.freemem(),
             // temporarily (fallback)
             buffers: 0,
             cached: 0,
@@ -181658,9 +181706,9 @@ var require_memory = __commonJS({
                 if (!error40) {
                   const lines = stdout.toString().split("\n");
                   result2.total = parseInt(util5.getValue(lines, "memtotal"), 10);
-                  result2.total = result2.total ? result2.total * 1024 : os40.totalmem();
+                  result2.total = result2.total ? result2.total * 1024 : os39.totalmem();
                   result2.free = parseInt(util5.getValue(lines, "memfree"), 10);
-                  result2.free = result2.free ? result2.free * 1024 : os40.freemem();
+                  result2.free = result2.free ? result2.free * 1024 : os39.freemem();
                   result2.used = result2.total - result2.free;
                   result2.buffers = parseInt(util5.getValue(lines, "buffers"), 10);
                   result2.buffers = result2.buffers ? result2.buffers * 1024 : 0;
@@ -181882,7 +181930,7 @@ var require_memory = __commonJS({
                 }
                 if (!result2.length) {
                   result2.push({
-                    size: os40.totalmem(),
+                    size: os39.totalmem(),
                     bank: "",
                     type: "",
                     ecc: null,
@@ -185030,7 +185078,7 @@ ${BSDName}|"; diskutil info /dev/${BSDName} | grep SMART;`;
 var require_network = __commonJS({
   "node_modules/systeminformation/lib/network.js"(exports2) {
     "use strict";
-    var os40 = __require("os");
+    var os39 = __require("os");
     var exec6 = __require("child_process").exec;
     var execSync9 = __require("child_process").execSync;
     var fs131 = __require("fs");
@@ -185054,7 +185102,7 @@ var require_network = __commonJS({
       let ifacename = "";
       let ifacenameFirst = "";
       try {
-        const ifaces = os40.networkInterfaces();
+        const ifaces = os39.networkInterfaces();
         let scopeid = 9999;
         for (let dev in ifaces) {
           if ({}.hasOwnProperty.call(ifaces, dev)) {
@@ -185074,7 +185122,7 @@ var require_network = __commonJS({
           let defaultIp = "";
           const cmd = "netstat -r";
           const result2 = execSync9(cmd, util5.execOptsWin);
-          const lines = result2.toString().split(os40.EOL);
+          const lines = result2.toString().split(os39.EOL);
           lines.forEach((line) => {
             line = line.replace(/\s+/g, " ").trim();
             if (line.indexOf("0.0.0.0 0.0.0.0") > -1 && !/[a-zA-Z]/.test(line)) {
@@ -185707,7 +185755,7 @@ var require_network = __commonJS({
       defaultString = "" + defaultString;
       return new Promise((resolve36) => {
         process.nextTick(() => {
-          const ifaces = os40.networkInterfaces();
+          const ifaces = os39.networkInterfaces();
           let result2 = [];
           let nics = [];
           let dnsSuffixes = [];
@@ -186777,7 +186825,7 @@ var require_network = __commonJS({
           if (_windows) {
             try {
               exec6("netstat -r", util5.execOptsWin, (error40, stdout) => {
-                const lines = stdout.toString().split(os40.EOL);
+                const lines = stdout.toString().split(os39.EOL);
                 lines.forEach((line) => {
                   line = line.replace(/\s+/g, " ").trim();
                   if (line.indexOf("0.0.0.0 0.0.0.0") > -1 && !/[a-zA-Z]/.test(line)) {
@@ -186823,7 +186871,7 @@ var require_network = __commonJS({
 var require_wifi = __commonJS({
   "node_modules/systeminformation/lib/wifi.js"(exports2) {
     "use strict";
-    var os40 = __require("os");
+    var os39 = __require("os");
     var exec6 = __require("child_process").exec;
     var execSync9 = __require("child_process").execSync;
     var util5 = require_util11();
@@ -187045,7 +187093,7 @@ var require_wifi = __commonJS({
         parts2.shift();
         parts2.forEach((part) => {
           part = "ACTIVE:" + part;
-          const lines = part.split(os40.EOL);
+          const lines = part.split(os39.EOL);
           const channel = util5.getValue(lines, "CHAN");
           const frequency = util5.getValue(lines, "FREQ").toLowerCase().replace("mhz", "").trim();
           const security = util5.getValue(lines, "SECURITY").replace("(", "").replace(")", "");
@@ -187269,15 +187317,15 @@ var require_wifi = __commonJS({
           } else if (_windows) {
             const cmd = "netsh wlan show networks mode=Bssid";
             util5.powerShell(cmd).then((stdout) => {
-              const ssidParts = stdout.toString("utf8").split(os40.EOL + os40.EOL + "SSID ");
+              const ssidParts = stdout.toString("utf8").split(os39.EOL + os39.EOL + "SSID ");
               ssidParts.shift();
               ssidParts.forEach((ssidPart) => {
-                const ssidLines = ssidPart.split(os40.EOL);
+                const ssidLines = ssidPart.split(os39.EOL);
                 if (ssidLines && ssidLines.length >= 8 && ssidLines[0].indexOf(":") >= 0) {
                   const bssidsParts = ssidPart.split(" BSSID");
                   bssidsParts.shift();
                   bssidsParts.forEach((bssidPart) => {
-                    const bssidLines = bssidPart.split(os40.EOL);
+                    const bssidLines = bssidPart.split(os39.EOL);
                     const bssidLine = bssidLines[0].split(":");
                     bssidLine.shift();
                     const bssid = bssidLine.join(":").trim().toLowerCase();
@@ -187601,7 +187649,7 @@ var require_wifi = __commonJS({
 var require_processes = __commonJS({
   "node_modules/systeminformation/lib/processes.js"(exports2) {
     "use strict";
-    var os40 = __require("os");
+    var os39 = __require("os");
     var fs131 = __require("fs");
     var path152 = __require("path");
     var exec6 = __require("child_process").exec;
@@ -188252,7 +188300,7 @@ var require_processes = __commonJS({
             line = line.trim().replace(/ +/g, " ").replace(/,+/g, ".");
             const parts2 = line.split(" ");
             const command2 = parts2.slice(9).join(" ");
-            const pmem = parseFloat((1 * parseInt(parts2[3]) * 1024 / os40.totalmem()).toFixed(1));
+            const pmem = parseFloat((1 * parseInt(parts2[3]) * 1024 / os39.totalmem()).toFixed(1));
             const started = parseElapsed(parts2[5]);
             result2.push({
               pid: parseInt(parts2[0]),
@@ -188455,7 +188503,7 @@ var require_processes = __commonJS({
                         cpu: 0,
                         cpuu: 0,
                         cpus: 0,
-                        mem: memw / os40.totalmem() * 100,
+                        mem: memw / os39.totalmem() * 100,
                         priority: element.Priority | null,
                         memVsz: element.PageFileUsage || null,
                         memRss: Math.floor((element.WorkingSetSize || 0) / 1024),
@@ -188609,7 +188657,7 @@ var require_processes = __commonJS({
                         result2.forEach((item) => {
                           if (item.proc.toLowerCase() === pname.toLowerCase()) {
                             item.pids.push(pid);
-                            item.mem += mem / os40.totalmem() * 100;
+                            item.mem += mem / os39.totalmem() * 100;
                             processFound = true;
                           }
                         });
@@ -188619,7 +188667,7 @@ var require_processes = __commonJS({
                             pid,
                             pids: [pid],
                             cpu: 0,
-                            mem: mem / os40.totalmem() * 100
+                            mem: mem / os39.totalmem() * 100
                           });
                         }
                       }
@@ -190360,7 +190408,7 @@ var require_docker = __commonJS({
 var require_virtualbox = __commonJS({
   "node_modules/systeminformation/lib/virtualbox.js"(exports2) {
     "use strict";
-    var os40 = __require("os");
+    var os39 = __require("os");
     var exec6 = __require("child_process").exec;
     var util5 = require_util11();
     function vboxInfo(callback2) {
@@ -190369,10 +190417,10 @@ var require_virtualbox = __commonJS({
         process.nextTick(() => {
           try {
             exec6(util5.getVboxmanage() + " list vms --long", (error40, stdout) => {
-              let parts2 = (os40.EOL + stdout.toString()).split(os40.EOL + "Name:");
+              let parts2 = (os39.EOL + stdout.toString()).split(os39.EOL + "Name:");
               parts2.shift();
               parts2.forEach((part) => {
-                const lines = ("Name:" + part).split(os40.EOL);
+                const lines = ("Name:" + part).split(os39.EOL);
                 const state = util5.getValue(lines, "State");
                 const running = state.startsWith("running");
                 const runningSinceString = running ? state.replace("running (since ", "").replace(")", "").trim() : "";
@@ -196293,8 +196341,8 @@ var GIT_COMMIT_INFO, CLI_VERSION;
 var init_git_commit = __esm({
   "packages/core/dist/src/generated/git-commit.js"() {
     "use strict";
-    GIT_COMMIT_INFO = "7e6e40c81";
-    CLI_VERSION = "0.33.0-preview.4";
+    GIT_COMMIT_INFO = "9912ea868";
+    CLI_VERSION = "0.33.0-preview.6";
   }
 });
 
@@ -207514,7 +207562,7 @@ var require_googleauth3 = __commonJS({
     var child_process_1 = __require("child_process");
     var fs131 = __require("fs");
     var gcpMetadata = require_src45();
-    var os40 = __require("os");
+    var os39 = __require("os");
     var path152 = __require("path");
     var crypto_1 = require_crypto9();
     var transporters_1 = require_transporters();
@@ -207955,7 +208003,7 @@ var require_googleauth3 = __commonJS({
        * @api private
        */
       _isWindows() {
-        const sys = os40.platform();
+        const sys = os39.platform();
         if (sys && sys.length >= 3) {
           if (sys.substring(0, 3).toLowerCase() === "win") {
             return true;
@@ -209147,13 +209195,13 @@ var require_src48 = __commonJS({
     };
     function mapOtelResourceToMonitoredResource(resource) {
       const attrs = resource.attributes;
-      const platform22 = attrs[semantic_conventions_1.SEMRESATTRS_CLOUD_PLATFORM];
+      const platform21 = attrs[semantic_conventions_1.SEMRESATTRS_CLOUD_PLATFORM];
       let mr;
-      if (platform22 === semantic_conventions_1.CLOUDPLATFORMVALUES_GCP_COMPUTE_ENGINE) {
+      if (platform21 === semantic_conventions_1.CLOUDPLATFORMVALUES_GCP_COMPUTE_ENGINE) {
         mr = createMonitoredResource(GCE_INSTANCE, attrs);
-      } else if (platform22 === semantic_conventions_1.CLOUDPLATFORMVALUES_GCP_APP_ENGINE) {
+      } else if (platform21 === semantic_conventions_1.CLOUDPLATFORMVALUES_GCP_APP_ENGINE) {
         mr = createMonitoredResource(GAE_INSTANCE, attrs);
-      } else if (platform22 === semantic_conventions_1.CLOUDPLATFORMVALUES_AWS_EC2) {
+      } else if (platform21 === semantic_conventions_1.CLOUDPLATFORMVALUES_AWS_EC2) {
         mr = createMonitoredResource(AWS_EC2_INSTANCE, attrs);
       } else if (semantic_conventions_1.SEMRESATTRS_K8S_CLUSTER_NAME in attrs) {
         if (semantic_conventions_1.SEMRESATTRS_K8S_CONTAINER_NAME in attrs) {
@@ -226245,7 +226293,7 @@ var require_grpc = __commonJS({
     var fs131 = __require("fs");
     var google_auth_library_1 = require_src47();
     var grpc = require_src16();
-    var os40 = __require("os");
+    var os39 = __require("os");
     var path_1 = __require("path");
     var path152 = __require("path");
     var protobuf = require_protobufjs();
@@ -226550,7 +226598,7 @@ var require_grpc = __commonJS({
           if ((opts === null || opts === void 0 ? void 0 : opts.cert) && (opts === null || opts === void 0 ? void 0 : opts.key)) {
             return [opts.cert, opts.key];
           }
-          const metadataPath = (0, path_1.join)(os40.homedir(), ".secureConnect", "context_aware_metadata.json");
+          const metadataPath = (0, path_1.join)(os39.homedir(), ".secureConnect", "context_aware_metadata.json");
           const metadata2 = JSON.parse(await readFileAsync(metadataPath));
           if (!metadata2.cert_provider_command) {
             throw Error("no cert_provider_command found");
@@ -292762,7 +292810,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname3);
-    return "0.33.0-preview.4";
+    return "0.33.0-preview.6";
   })();
   return versionPromise;
 }
@@ -292783,21 +292831,21 @@ var init_version5 = __esm({
 import { fileURLToPath as fileURLToPath6 } from "node:url";
 import path17 from "node:path";
 function getPlatform() {
-  const platform22 = process.platform;
+  const platform21 = process.platform;
   const arch5 = process.arch;
-  if (platform22 === "darwin" && arch5 === "x64") {
+  if (platform21 === "darwin" && arch5 === "x64") {
     return "DARWIN_AMD64";
   }
-  if (platform22 === "darwin" && arch5 === "arm64") {
+  if (platform21 === "darwin" && arch5 === "arm64") {
     return "DARWIN_ARM64";
   }
-  if (platform22 === "linux" && arch5 === "x64") {
+  if (platform21 === "linux" && arch5 === "x64") {
     return "LINUX_AMD64";
   }
-  if (platform22 === "linux" && arch5 === "arm64") {
+  if (platform21 === "linux" && arch5 === "arm64") {
     return "LINUX_ARM64";
   }
-  if (platform22 === "win32" && arch5 === "x64") {
+  if (platform21 === "win32" && arch5 === "x64") {
     return "WINDOWS_AMD64";
   }
   return "PLATFORM_UNSPECIFIED";
@@ -294985,11 +295033,11 @@ Signal: Signal number or \`(none)\` if no signal was received.
       buildToolMetadata() {
         const toolMetadata = /* @__PURE__ */ new Map();
         for (const [name4, tool] of this.allKnownTools) {
-          if (tool.toolAnnotations) {
-            const metadata2 = { ...tool.toolAnnotations };
-            if (tool instanceof DiscoveredMCPTool) {
-              metadata2["_serverName"] = tool.serverName;
-            }
+          const metadata2 = tool.toolAnnotations ? { ...tool.toolAnnotations } : {};
+          if (tool instanceof DiscoveredMCPTool) {
+            metadata2["_serverName"] = tool.serverName;
+          }
+          if (Object.keys(metadata2).length > 0) {
             toolMetadata.set(name4, metadata2);
           }
         }
@@ -301638,7 +301686,7 @@ var init_esm8 = __esm({
 // node_modules/path-scurry/dist/esm/index.js
 import { posix as posix2, win32 } from "node:path";
 import { fileURLToPath as fileURLToPath7 } from "node:url";
-import { lstatSync, readdir as readdirCB, readdirSync, readlinkSync, realpathSync as rps } from "fs";
+import { lstatSync as lstatSync2, readdir as readdirCB, readdirSync, readlinkSync as readlinkSync2, realpathSync as rps } from "fs";
 import * as actualFS from "node:fs";
 import { lstat, readdir, readlink, realpath } from "node:fs/promises";
 var realpathSync2, defaultFS, fsFromOption, uncDriveRegexp, uncToDrive, eitherSep, UNKNOWN, IFIFO, IFCHR, IFDIR, IFBLK, IFREG, IFLNK, IFSOCK, IFMT, IFMT_UNKNOWN, READDIR_CALLED, LSTAT_CALLED, ENOTDIR, ENOENT, ENOREADLINK, ENOREALPATH, ENOCHILD, TYPEMASK, entToType, normalizeCache, normalize, normalizeNocaseCache, normalizeNocase, ResolveCache, ChildrenCache, setAsCwd, PathBase, PathWin32, PathPosix, PathScurryBase, PathScurryWin32, PathScurryPosix, PathScurryDarwin, Path, PathScurry;
@@ -301648,10 +301696,10 @@ var init_esm9 = __esm({
     init_esm8();
     realpathSync2 = rps.native;
     defaultFS = {
-      lstatSync,
+      lstatSync: lstatSync2,
       readdir: readdirCB,
       readdirSync,
-      readlinkSync,
+      readlinkSync: readlinkSync2,
       realpathSync: realpathSync2,
       promises: {
         lstat,
@@ -303394,7 +303442,7 @@ var init_pattern = __esm({
       #isUNC;
       #isAbsolute;
       #followGlobstar = true;
-      constructor(patternList, globList, index, platform22) {
+      constructor(patternList, globList, index, platform21) {
         if (!isPatternList(patternList)) {
           throw new TypeError("empty pattern list");
         }
@@ -303411,7 +303459,7 @@ var init_pattern = __esm({
         this.#patternList = patternList;
         this.#globList = globList;
         this.#index = index;
-        this.#platform = platform22;
+        this.#platform = platform21;
         if (this.#index === 0) {
           if (this.isUNC()) {
             const [p0, p1, p2, p3, ...prest] = this.#patternList;
@@ -303560,12 +303608,12 @@ var init_ignore = __esm({
       absoluteChildren;
       platform;
       mmopts;
-      constructor(ignored, { nobrace, nocase, noext, noglobstar, platform: platform22 = defaultPlatform2 }) {
+      constructor(ignored, { nobrace, nocase, noext, noglobstar, platform: platform21 = defaultPlatform2 }) {
         this.relative = [];
         this.absolute = [];
         this.relativeChildren = [];
         this.absoluteChildren = [];
-        this.platform = platform22;
+        this.platform = platform21;
         this.mmopts = {
           dot: true,
           nobrace,
@@ -303573,7 +303621,7 @@ var init_ignore = __esm({
           noext,
           noglobstar,
           optimizationLevel: 2,
-          platform: platform22,
+          platform: platform21,
           nocomment: true,
           nonegate: true
         };
@@ -310870,8 +310918,8 @@ var require_path_key = __commonJS({
     "use strict";
     var pathKey2 = (options = {}) => {
       const environment = options.env || process.env;
-      const platform22 = options.platform || process.platform;
-      if (platform22 !== "win32") {
+      const platform21 = options.platform || process.platform;
+      if (platform21 !== "win32") {
         return "PATH";
       }
       return Object.keys(environment).reverse().find((key) => key.toUpperCase() === "PATH") || "Path";
@@ -311141,9 +311189,9 @@ var require_cross_spawn = __commonJS({
 function pathKey(options = {}) {
   const {
     env: env6 = process.env,
-    platform: platform22 = process.platform
+    platform: platform21 = process.platform
   } = options;
-  if (platform22 !== "win32") {
+  if (platform21 !== "win32") {
     return "PATH";
   }
   return Object.keys(env6).reverse().find((key) => key.toUpperCase() === "PATH") || "Path";
@@ -329988,8 +330036,8 @@ var init_downloadRipGrep = __esm({
     BIN_PATH = join10(__dirname5, "../bin");
     getTarget = () => {
       const arch5 = process.env.npm_config_arch || os14.arch();
-      const platform22 = process.env.platform || os14.platform();
-      switch (platform22) {
+      const platform21 = process.env.platform || os14.platform();
+      switch (platform21) {
         case "darwin":
           switch (arch5) {
             case "arm64":
@@ -330023,7 +330071,7 @@ var init_downloadRipGrep = __esm({
               return "i686-unknown-linux-musl.tar.gz";
           }
         default:
-          throw new VError("Unknown platform: " + platform22);
+          throw new VError("Unknown platform: " + platform21);
       }
     };
     downloadFile2 = async (url4, outFile) => {
@@ -331713,11 +331761,11 @@ async function getIdeProcessInfoForWindows() {
   return { pid: myPid, command: myProc.command };
 }
 async function getIdeProcessInfo() {
-  const platform22 = os16.platform();
+  const platform21 = os16.platform();
   if (process.env["GEMINI_CLI_IDE_PID"]) {
     const idePid = parseInt(process.env["GEMINI_CLI_IDE_PID"], 10);
     if (!isNaN(idePid) && idePid > 0) {
-      if (platform22 === "win32") {
+      if (platform21 === "win32") {
         const processMap = await getProcessTableWindows();
         const proc2 = processMap.get(idePid);
         return { pid: idePid, command: proc2?.command || "" };
@@ -331726,7 +331774,7 @@ async function getIdeProcessInfo() {
       return { pid: idePid, command: command2 };
     }
   }
-  if (platform22 === "win32") {
+  if (platform21 === "win32") {
     return getIdeProcessInfoForWindows();
   }
   return getIdeProcessInfoForUnix();
@@ -398321,7 +398369,7 @@ async function getEnvironmentContext(config2) {
     month: "long",
     day: "numeric"
   });
-  const platform22 = process.platform;
+  const platform21 = process.platform;
   const directoryContext = config2.getIncludeDirectoryTree() ? await getDirectoryContextString(config2) : "";
   const tempDir = config2.storage.getProjectTempDir();
   const environmentMemory = config2.getEnvironmentMemory();
@@ -398329,7 +398377,7 @@ async function getEnvironmentContext(config2) {
 <session_context>
 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: ${platform22}
+My operating system is: ${platform21}
 The project's temporary directory is: ${tempDir}
 ${directoryContext}
 
@@ -411545,8 +411593,8 @@ var WorkspaceContext;
 var init_workspaceContext = __esm({
   "packages/core/dist/src/utils/workspaceContext.js"() {
     "use strict";
-    init_errors();
     init_debugLogger();
+    init_paths();
     WorkspaceContext = class {
       targetDir;
       directories = /* @__PURE__ */ new Set();
@@ -411716,16 +411764,7 @@ var init_workspaceContext = __esm({
        * if it did exist.
        */
       fullyResolvedPath(pathToCheck) {
-        try {
-          return fs46.realpathSync(path60.resolve(this.targetDir, pathToCheck));
-        } catch (e3) {
-          if (isNodeError(e3) && e3.code === "ENOENT" && e3.path && // realpathSync does not set e.path correctly for symlinks to
-          // non-existent files.
-          !this.isFileSymlink(e3.path)) {
-            return e3.path;
-          }
-          throw e3;
-        }
+        return resolveToRealPath(path60.resolve(this.targetDir, pathToCheck));
       }
       /**
        * Checks if a path is within a given root directory.
@@ -411737,16 +411776,6 @@ var init_workspaceContext = __esm({
         const relative13 = path60.relative(rootDirectory, pathToCheck);
         return !relative13.startsWith(`..${path60.sep}`) && relative13 !== ".." && !path60.isAbsolute(relative13);
       }
-      /**
-       * Checks if a file path is a symbolic link that points to a file.
-       */
-      isFileSymlink(filePath) {
-        try {
-          return !fs46.readlinkSync(filePath).endsWith("/");
-        } catch (_error) {
-          return false;
-        }
-      }
     };
   }
 });
@@ -411952,34 +411981,17 @@ function matchesWildcard(pattern, toolName, serverName) {
   if (pattern === "*") {
     return true;
   }
-  if (pattern.includes("__")) {
-    return matchesCompositePattern(pattern, toolName, serverName);
+  if (pattern === `${MCP_TOOL_PREFIX}*`) {
+    return serverName !== void 0;
   }
-  return toolName === pattern;
-}
-function matchesCompositePattern(pattern, toolName, serverName) {
-  const parts2 = pattern.split("__");
-  if (parts2.length !== 2)
-    return false;
-  const [patternServer, patternTool] = parts2;
-  const { actualServer, actualTool } = getToolMetadata(toolName, serverName);
-  if (actualServer === void 0) {
-    return false;
-  }
-  if (serverName !== void 0 && !toolName.startsWith(serverName + "__")) {
-    return false;
+  if (pattern.startsWith(MCP_TOOL_PREFIX) && pattern.endsWith("_*")) {
+    const expectedServerName = pattern.slice(MCP_TOOL_PREFIX.length, -2);
+    if (serverName === void 0 || serverName !== expectedServerName) {
+      return false;
+    }
+    return toolName.startsWith(`${MCP_TOOL_PREFIX}${expectedServerName}_`);
   }
-  const serverMatch = patternServer === "*" || patternServer === actualServer;
-  const toolMatch = patternTool === "*" || patternTool === actualTool;
-  return serverMatch && toolMatch;
-}
-function getToolMetadata(toolName, serverName) {
-  const sepIndex = toolName.indexOf("__");
-  const isQualified = sepIndex !== -1;
-  return {
-    actualServer: serverName ?? (isQualified ? toolName.substring(0, sepIndex) : void 0),
-    actualTool: isQualified ? toolName.substring(sepIndex + 2) : toolName
-  };
+  return toolName === pattern;
 }
 function ruleMatches(rule, toolCall, stringifiedArgs, serverName, currentApprovalMode, toolAnnotations) {
   if (rule.modes && rule.modes.length > 0) {
@@ -411987,6 +411999,15 @@ function ruleMatches(rule, toolCall, stringifiedArgs, serverName, currentApprova
       return false;
     }
   }
+  if (rule.mcpName) {
+    if (rule.mcpName === "*") {
+      if (serverName === void 0)
+        return false;
+    } else {
+      if (serverName !== rule.mcpName)
+        return false;
+    }
+  }
   if (rule.toolName) {
     if (rule.toolName === "*") {
     } else if (isWildcardPattern(rule.toolName)) {
@@ -412028,6 +412049,7 @@ var init_policy_engine = __esm({
     init_protocol2();
     init_shell_utils();
     init_tool_names();
+    init_mcp_tool();
     PolicyEngine = class {
       rules;
       checkers;
@@ -412156,6 +412178,15 @@ var init_policy_engine = __esm({
        * Returns the decision and the matching rule (if any).
        */
       async check(toolCall, serverName, toolAnnotations) {
+        if (!serverName && isMcpToolAnnotation(toolAnnotations)) {
+          serverName = toolAnnotations._serverName;
+        }
+        if (!serverName && toolCall.name) {
+          const parsed = parseMcpToolName(toolCall.name);
+          if (parsed.serverName) {
+            serverName = parsed.serverName;
+          }
+        }
         let stringifiedArgs;
         if (toolCall.args && (this.rules.some((rule) => rule.argsPattern) || this.checkers.some((checker) => checker.argsPattern))) {
           stringifiedArgs = stableStringify(toolCall.args);
@@ -412177,12 +412208,6 @@ var init_policy_engine = __esm({
         const toolCallsToTry = [];
         for (const name4 of toolNamesToTry) {
           toolCallsToTry.push({ ...toolCall, name: name4 });
-          if (serverName && !name4.includes("__")) {
-            toolCallsToTry.push({
-              ...toolCall,
-              name: `${serverName}__${name4}`
-            });
-          }
         }
         for (const rule of this.rules) {
           const match2 = toolCallsToTry.some((tc) => ruleMatches(rule, tc, stringifiedArgs, serverName, this.approvalMode, toolAnnotations));
@@ -412328,107 +412353,52 @@ var init_policy_engine = __esm({
        */
       getExcludedTools(toolMetadata, allToolNames) {
         const excludedTools = /* @__PURE__ */ new Set();
-        const processedTools = /* @__PURE__ */ new Set();
-        let globalVerdict;
-        for (const rule of this.rules) {
-          if (rule.argsPattern) {
-            if (rule.toolName && rule.decision !== PolicyDecision.DENY) {
-              processedTools.add(rule.toolName);
-            }
-            continue;
-          }
-          if (rule.modes && rule.modes.length > 0) {
-            if (!rule.modes.includes(this.approvalMode)) {
-              continue;
-            }
-          }
-          if (rule.toolAnnotations) {
-            if (!toolMetadata) {
-              continue;
-            }
-            for (const [toolName2, annotations] of toolMetadata) {
-              if (processedTools.has(toolName2)) {
-                continue;
-              }
-              let annotationsMatch = true;
-              for (const [key, value] of Object.entries(rule.toolAnnotations)) {
-                if (annotations[key] !== value) {
-                  annotationsMatch = false;
+        if (!allToolNames) {
+          return excludedTools;
+        }
+        for (const toolName of allToolNames) {
+          const annotations = toolMetadata?.get(toolName);
+          const serverName = isMcpToolAnnotation(annotations) ? annotations._serverName : void 0;
+          let staticallyExcluded = false;
+          let matchFound = false;
+          for (const rule of this.rules) {
+            const ruleWithoutArgs = { ...rule, argsPattern: void 0 };
+            const toolCall = { name: toolName, args: {} };
+            const appliesToTool = ruleMatches(
+              ruleWithoutArgs,
+              toolCall,
+              void 0,
+              // stringifiedArgs
+              serverName,
+              this.approvalMode,
+              annotations
+            );
+            if (appliesToTool) {
+              if (rule.argsPattern) {
+                if (rule.decision !== PolicyDecision.DENY) {
+                  staticallyExcluded = false;
+                  matchFound = true;
                   break;
                 }
-              }
-              if (!annotationsMatch) {
                 continue;
-              }
-              if (rule.toolName) {
-                if (isWildcardPattern(rule.toolName)) {
-                  const rawServerName = annotations["_serverName"];
-                  const serverName = typeof rawServerName === "string" ? rawServerName : void 0;
-                  const qualifiedName = serverName && !toolName2.includes("__") ? `${serverName}__${toolName2}` : toolName2;
-                  if (!matchesWildcard(rule.toolName, qualifiedName, void 0)) {
-                    continue;
-                  }
-                } else if (toolName2 !== rule.toolName) {
-                  continue;
-                }
-              }
-              let decision2;
-              if (globalVerdict !== void 0) {
-                decision2 = globalVerdict;
               } else {
-                decision2 = rule.decision;
-              }
-              if (decision2 === PolicyDecision.DENY) {
-                excludedTools.add(toolName2);
-              }
-              processedTools.add(toolName2);
-            }
-            continue;
-          }
-          if (!rule.toolName) {
-            if (globalVerdict === void 0) {
-              globalVerdict = rule.decision;
-              if (globalVerdict !== PolicyDecision.DENY) {
+                const decision = this.applyNonInteractiveMode(rule.decision);
+                staticallyExcluded = decision === PolicyDecision.DENY;
+                matchFound = true;
                 break;
               }
             }
-            continue;
-          }
-          const toolName = rule.toolName;
-          if (processedTools.has(toolName)) {
-            continue;
           }
-          let coveredByWildcard = false;
-          for (const processed of processedTools) {
-            if (isWildcardPattern(processed) && matchesWildcard(processed, toolName, void 0)) {
-              if (excludedTools.has(processed)) {
-                excludedTools.add(toolName);
-              }
-              coveredByWildcard = true;
-              break;
+          if (!matchFound) {
+            const defaultDec = this.applyNonInteractiveMode(this.defaultDecision);
+            if (defaultDec === PolicyDecision.DENY) {
+              staticallyExcluded = true;
             }
           }
-          if (coveredByWildcard) {
-            continue;
-          }
-          processedTools.add(toolName);
-          let decision;
-          if (globalVerdict !== void 0) {
-            decision = globalVerdict;
-          } else {
-            decision = rule.decision;
-          }
-          if (decision === PolicyDecision.DENY) {
+          if (staticallyExcluded) {
             excludedTools.add(toolName);
           }
         }
-        if (globalVerdict === PolicyDecision.DENY && allToolNames) {
-          for (const name4 of allToolNames) {
-            if (!processedTools.has(name4)) {
-              excludedTools.add(name4);
-            }
-          }
-        }
         return excludedTools;
       }
       applyNonInteractiveMode(decision) {
@@ -427981,7 +427951,10 @@ function validateShellCommandSyntax(rule, ruleIndex) {
   return null;
 }
 function validateToolName(name4, ruleIndex) {
-  if (isValidToolName(name4, { allowWildcards: true }) && !name4.includes("__")) {
+  if (name4.includes("__")) {
+    return `Rule #${ruleIndex + 1}: The "__" syntax for MCP tools is strictly deprecated. Please use the 'mcpName = "..."' property or the 'mcp_server_tool' format instead.`;
+  }
+  if (isValidToolName(name4, { allowWildcards: true })) {
     return null;
   }
   const allNames = [...ALL_BUILTIN_TOOL_NAMES];
@@ -428066,8 +428039,6 @@ async function loadPoliciesFromToml(policyPaths, getPolicyTier2) {
         }
         for (let i4 = 0; i4 < tomlRules.length; i4++) {
           const rule = tomlRules[i4];
-          if (rule.mcpName)
-            continue;
           const toolNames = rule.toolName ? Array.isArray(rule.toolName) ? rule.toolName : [rule.toolName] : [];
           for (const name4 of toolNames) {
             const warning = validateToolName(name4, i4);
@@ -428090,16 +428061,14 @@ async function loadPoliciesFromToml(policyPaths, getPolicyTier2) {
           return argsPatterns.flatMap((argsPattern) => {
             const toolNames = rule.toolName ? Array.isArray(rule.toolName) ? rule.toolName : [rule.toolName] : [void 0];
             return toolNames.map((toolName) => {
-              let effectiveToolName;
-              if (rule.mcpName && toolName) {
-                effectiveToolName = `${rule.mcpName}__${toolName}`;
-              } else if (rule.mcpName) {
-                effectiveToolName = `${rule.mcpName}__*`;
-              } else {
-                effectiveToolName = toolName;
+              let effectiveToolName = toolName;
+              const mcpName = rule.mcpName;
+              if (mcpName) {
+                effectiveToolName = formatMcpToolName(mcpName, effectiveToolName);
               }
               const policyRule = {
                 toolName: effectiveToolName,
+                mcpName: rule.mcpName,
                 decision: rule.decision,
                 priority: transformPriority(rule.priority, tier),
                 modes: rule.modes,
@@ -428173,14 +428142,15 @@ Error: ${error40.message}`,
             return toolNames.map((toolName) => {
               let effectiveToolName;
               if (checker.mcpName && toolName) {
-                effectiveToolName = `${checker.mcpName}__${toolName}`;
+                effectiveToolName = `${MCP_TOOL_PREFIX}${checker.mcpName}_${toolName}`;
               } else if (checker.mcpName) {
-                effectiveToolName = `${checker.mcpName}__*`;
+                effectiveToolName = `${MCP_TOOL_PREFIX}${checker.mcpName}_*`;
               } else {
                 effectiveToolName = toolName;
               }
               const safetyCheckerRule = {
                 toolName: effectiveToolName,
+                mcpName: checker.mcpName,
                 priority: transformPriority(checker.priority, tier),
                 // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
                 checker: checker.checker,
@@ -428239,14 +428209,19 @@ Error: ${error40.message}`
   return { rules, checkers, errors };
 }
 function validateMcpPolicyToolNames(serverName, discoveredToolNames, policyRules) {
-  const prefix = `${serverName}__`;
+  const prefix = `${MCP_TOOL_PREFIX}${serverName}_`;
   const warnings = [];
   for (const rule of policyRules) {
     if (!rule.toolName)
       continue;
-    if (!rule.toolName.startsWith(prefix))
+    let toolPart;
+    if (rule.mcpName === serverName && rule.toolName.startsWith(prefix)) {
+      toolPart = rule.toolName.slice(prefix.length);
+    } else if (rule.toolName.startsWith(prefix)) {
+      toolPart = rule.toolName.slice(prefix.length);
+    } else {
       continue;
-    const toolPart = rule.toolName.slice(prefix.length);
+    }
     if (toolPart === "*")
       continue;
     if (discoveredToolNames.includes(toolPart))
@@ -428274,6 +428249,7 @@ var init_toml_loader = __esm({
     import_toml = __toESM(require_toml(), 1);
     init_zod();
     init_errors();
+    init_mcp_tool();
     MAX_TYPO_DISTANCE = 3;
     PolicyRuleSchema = external_exports.object({
       toolName: external_exports.union([external_exports.string(), external_exports.array(external_exports.string())]).optional(),
@@ -428529,7 +428505,8 @@ async function createPolicyEngineConfig(settings, approvalMode, defaultPoliciesD
   if (settings.mcp?.excluded) {
     for (const serverName of settings.mcp.excluded) {
       rules.push({
-        toolName: `${serverName}__*`,
+        toolName: serverName === "*" ? `${MCP_TOOL_PREFIX}*` : `${MCP_TOOL_PREFIX}${serverName}_*`,
+        mcpName: serverName,
         decision: PolicyDecision.DENY,
         priority: MCP_EXCLUDED_PRIORITY,
         source: "Settings (MCP Excluded)"
@@ -428588,7 +428565,8 @@ async function createPolicyEngineConfig(settings, approvalMode, defaultPoliciesD
     for (const [serverName, serverConfig] of Object.entries(settings.mcpServers)) {
       if (serverConfig.trust) {
         rules.push({
-          toolName: `${serverName}__*`,
+          toolName: `${MCP_TOOL_PREFIX}${serverName}_*`,
+          mcpName: serverName,
           decision: PolicyDecision.ALLOW,
           priority: TRUSTED_MCP_SERVER_PRIORITY,
           source: "Settings (MCP Trusted)"
@@ -428599,7 +428577,8 @@ async function createPolicyEngineConfig(settings, approvalMode, defaultPoliciesD
   if (settings.mcp?.allowed) {
     for (const serverName of settings.mcp.allowed) {
       rules.push({
-        toolName: `${serverName}__*`,
+        toolName: serverName === "*" ? `${MCP_TOOL_PREFIX}*` : `${MCP_TOOL_PREFIX}${serverName}_*`,
+        mcpName: serverName,
         decision: PolicyDecision.ALLOW,
         priority: ALLOWED_MCP_SERVER_PRIORITY,
         source: "Settings (MCP Allowed)"
@@ -428716,6 +428695,7 @@ var init_config3 = __esm({
     init_shell_utils();
     init_tool_names();
     init_errors();
+    init_mcp_tool();
     init_security();
     __filename3 = fileURLToPath15(import.meta.url);
     __dirname7 = path69.dirname(__filename3);
@@ -433196,7 +433176,6 @@ ${clientInstructions}
 // packages/core/dist/src/config/config.js
 import * as fs59 from "node:fs";
 import * as path73 from "node:path";
-import * as os26 from "node:os";
 import { inspect as inspect4 } from "node:util";
 import process36 from "node:process";
 var DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD, MCPServerConfig, AuthProviderType, Config;
@@ -434567,22 +434546,13 @@ var init_config4 = __esm({
        * @returns true if the path is allowed, false otherwise.
        */
       isPathAllowed(absolutePath) {
-        const realpath3 = (p) => {
-          let resolved;
-          try {
-            resolved = fs59.realpathSync(p);
-          } catch {
-            resolved = path73.resolve(p);
-          }
-          return os26.platform() === "win32" ? resolved.toLowerCase() : resolved;
-        };
-        const resolvedPath = realpath3(absolutePath);
+        const resolvedPath = resolveToRealPath(absolutePath);
         const workspaceContext = this.getWorkspaceContext();
         if (workspaceContext.isPathWithinWorkspace(resolvedPath)) {
           return true;
         }
         const projectTempDir = this.storage.getProjectTempDir();
-        const resolvedTempDir = realpath3(projectTempDir);
+        const resolvedTempDir = resolveToRealPath(projectTempDir);
         return isSubpath(resolvedTempDir, resolvedPath);
       }
       /**
@@ -436143,8 +436113,8 @@ var require_utils20 = __commonJS({
     exports2.toPosixSlashes = (str2) => str2.replace(REGEX_BACKSLASH, "/");
     exports2.isWindows = () => {
       if (typeof navigator !== "undefined" && navigator.platform) {
-        const platform22 = navigator.platform.toLowerCase();
-        return platform22 === "win32" || platform22 === "windows";
+        const platform21 = navigator.platform.toLowerCase();
+        return platform21 === "win32" || platform21 === "windows";
       }
       if (typeof process !== "undefined" && process.platform) {
         return process.platform === "win32";
@@ -439969,9 +439939,9 @@ import * as child_process from "node:child_process";
 import * as process37 from "node:process";
 import * as path81 from "node:path";
 import * as fs65 from "node:fs";
-async function findCommand(command2, platform22 = process37.platform) {
+async function findCommand(command2, platform21 = process37.platform) {
   try {
-    if (platform22 === "win32") {
+    if (platform21 === "win32") {
       const result2 = child_process.execSync(`where.exe ${command2}`).toString().trim();
       const firstPath = result2.split(/\r?\n/)[0];
       if (firstPath) {
@@ -440006,17 +439976,17 @@ async function findCommand(command2, platform22 = process37.platform) {
     appname = "positron";
   }
   if (appname) {
-    if (platform22 === "darwin") {
+    if (platform21 === "darwin") {
       const macConfig = appConfigs[appname].mac;
       if (macConfig) {
         locations.push(`/Applications/${macConfig.appName}.app/Contents/Resources/app/bin/${appname}`, path81.join(homeDir, `Library/Application Support/${macConfig.supportDirName}/bin/${appname}`));
       }
-    } else if (platform22 === "linux") {
+    } else if (platform21 === "linux") {
       const linuxConfig = appConfigs[appname]?.linux;
       if (linuxConfig) {
         locations.push(`/usr/share/${linuxConfig.appBinary}/bin/${linuxConfig.appBinary}`, `/snap/bin/${linuxConfig.appBinary}`, path81.join(homeDir, `.local/share/${linuxConfig.appBinary}/bin/${linuxConfig.appBinary}`));
       }
-    } else if (platform22 === "win32") {
+    } else if (platform21 === "win32") {
       const winConfig = appConfigs[appname].win;
       if (winConfig) {
         const winAppName = winConfig.appName;
@@ -440031,15 +440001,15 @@ async function findCommand(command2, platform22 = process37.platform) {
   }
   return null;
 }
-function getIdeInstaller(ide, platform22 = process37.platform) {
+function getIdeInstaller(ide, platform21 = process37.platform) {
   switch (ide.name) {
     case IDE_DEFINITIONS.vscode.name:
     case IDE_DEFINITIONS.firebasestudio.name:
-      return new VsCodeInstaller(ide, platform22);
+      return new VsCodeInstaller(ide, platform21);
     case IDE_DEFINITIONS.positron.name:
-      return new PositronInstaller(ide, platform22);
+      return new PositronInstaller(ide, platform21);
     case IDE_DEFINITIONS.antigravity.name:
-      return new AntigravityInstaller(ide, platform22);
+      return new AntigravityInstaller(ide, platform21);
     default:
       return null;
   }
@@ -440055,11 +440025,11 @@ var init_ide_installer = __esm({
       ideInfo;
       platform;
       vsCodeCommand;
-      constructor(ideInfo, platform22 = process37.platform) {
+      constructor(ideInfo, platform21 = process37.platform) {
         this.ideInfo = ideInfo;
-        this.platform = platform22;
-        const command2 = platform22 === "win32" ? "code.cmd" : "code";
-        this.vsCodeCommand = findCommand(command2, platform22);
+        this.platform = platform21;
+        const command2 = platform21 === "win32" ? "code.cmd" : "code";
+        this.vsCodeCommand = findCommand(command2, platform21);
       }
       async install() {
         const commandPath = await this.vsCodeCommand;
@@ -440094,11 +440064,11 @@ var init_ide_installer = __esm({
       ideInfo;
       platform;
       vsCodeCommand;
-      constructor(ideInfo, platform22 = process37.platform) {
+      constructor(ideInfo, platform21 = process37.platform) {
         this.ideInfo = ideInfo;
-        this.platform = platform22;
-        const command2 = platform22 === "win32" ? "positron.cmd" : "positron";
-        this.vsCodeCommand = findCommand(command2, platform22);
+        this.platform = platform21;
+        const command2 = platform21 === "win32" ? "positron.cmd" : "positron";
+        this.vsCodeCommand = findCommand(command2, platform21);
       }
       async install() {
         const commandPath = await this.vsCodeCommand;
@@ -440132,9 +440102,9 @@ var init_ide_installer = __esm({
     AntigravityInstaller = class {
       ideInfo;
       platform;
-      constructor(ideInfo, platform22 = process37.platform) {
+      constructor(ideInfo, platform21 = process37.platform) {
         this.ideInfo = ideInfo;
-        this.platform = platform22;
+        this.platform = platform21;
       }
       async install() {
         const command2 = process37.env["ANTIGRAVITY_CLI_ALIAS"];
@@ -440487,12 +440457,12 @@ ${fileContentForLlm}
 });
 
 // packages/core/dist/src/utils/compatibility.js
-import os27 from "node:os";
+import os26 from "node:os";
 function isWindows10() {
-  if (os27.platform() !== "win32") {
+  if (os26.platform() !== "win32") {
     return false;
   }
-  const release2 = os27.release();
+  const release2 = os26.release();
   const parts2 = release2.split(".");
   if (parts2.length >= 3 && parts2[0] === "10" && parts2[1] === "0") {
     const build2 = parseInt(parts2[2], 10);
@@ -440540,7 +440510,7 @@ function getCompatibilityWarnings(options) {
       darwin: "iTerm2 or Ghostty",
       linux: "Ghostty"
     };
-    const suggestion = platformTerminals[os27.platform()];
+    const suggestion = platformTerminals[os26.platform()];
     const suggestedTerminals = suggestion ? ` (e.g., ${suggestion})` : "";
     warnings.push({
       id: "jetbrains-terminal",
@@ -441114,6 +441084,7 @@ __export(dist_exports, {
   MCP_DEFAULT_TIMEOUT_MSEC: () => MCP_DEFAULT_TIMEOUT_MSEC,
   MCP_EXCLUDED_PRIORITY: () => MCP_EXCLUDED_PRIORITY,
   MCP_QUALIFIED_NAME_SEPARATOR: () => MCP_QUALIFIED_NAME_SEPARATOR,
+  MCP_TOOL_PREFIX: () => MCP_TOOL_PREFIX,
   MEDIA_FILE_PATTERNS: () => MEDIA_FILE_PATTERNS,
   MEMORY_PARAM_FACT: () => MEMORY_PARAM_FACT,
   MEMORY_SECTION_HEADER: () => MEMORY_SECTION_HEADER,
@@ -441343,6 +441314,7 @@ __export(dist_exports, {
   flushTelemetry: () => flushTelemetry,
   formatBytes: () => formatBytes,
   formatCheckpointDisplayList: () => formatCheckpointDisplayList,
+  formatMcpToolName: () => formatMcpToolName,
   formatPolicyError: () => formatPolicyError,
   formatProtoJsonDuration: () => formatProtoJsonDuration,
   formatTruncatedToolOutput: () => formatTruncatedToolOutput,
@@ -441462,6 +441434,7 @@ __export(dist_exports, {
   isHeadlessMode: () => isHeadlessMode,
   isInvalidArgumentError: () => isInvalidArgumentError,
   isJetBrainsTerminal: () => isJetBrainsTerminal,
+  isMcpToolAnnotation: () => isMcpToolAnnotation,
   isMcpToolName: () => isMcpToolName,
   isNightly: () => isNightly,
   isNodeError: () => isNodeError,
@@ -441536,6 +441509,7 @@ __export(dist_exports, {
   parseBooleanEnvFlag: () => parseBooleanEnvFlag,
   parseCommandDetails: () => parseCommandDetails,
   parseGoogleApiError: () => parseGoogleApiError,
+  parseMcpToolName: () => parseMcpToolName,
   parsePrompt: () => parsePrompt,
   parseTelemetryTargetValue: () => parseTelemetryTargetValue,
   parseThought: () => parseThought,
@@ -441750,7 +441724,7 @@ var require_main2 = __commonJS({
   "node_modules/dotenv/lib/main.js"(exports2, module2) {
     var fs131 = __require("fs");
     var path152 = __require("path");
-    var os40 = __require("os");
+    var os39 = __require("os");
     var crypto28 = __require("crypto");
     var packageJson2 = require_package13();
     var version5 = packageJson2.version;
@@ -441903,7 +441877,7 @@ var require_main2 = __commonJS({
       return null;
     }
     function _resolveHome(envPath) {
-      return envPath[0] === "~" ? path152.join(os40.homedir(), envPath.slice(1)) : envPath;
+      return envPath[0] === "~" ? path152.join(os39.homedir(), envPath.slice(1)) : envPath;
     }
     function _configVault(options) {
       const debug2 = parseBoolean(process.env.DOTENV_CONFIG_DEBUG || options && options.debug);
@@ -452018,7 +451992,7 @@ var require_signal_exit4 = __commonJS({
 var require_kill = __commonJS({
   "node_modules/run-jxa/node_modules/execa/lib/kill.js"(exports2, module2) {
     "use strict";
-    var os40 = __require("os");
+    var os39 = __require("os");
     var onExit2 = require_signal_exit4();
     var DEFAULT_FORCE_KILL_TIMEOUT2 = 1e3 * 5;
     var spawnedKill = (kill, signal = "SIGTERM", options = {}) => {
@@ -452042,7 +452016,7 @@ var require_kill = __commonJS({
       return isSigterm(signal) && forceKillAfterTimeout !== false && killResult;
     };
     var isSigterm = (signal) => {
-      return signal === os40.constants.signals.SIGTERM || typeof signal === "string" && signal.toUpperCase() === "SIGTERM";
+      return signal === os39.constants.signals.SIGTERM || typeof signal === "string" && signal.toUpperCase() === "SIGTERM";
     };
     var getForceKillAfterTimeout = ({ forceKillAfterTimeout = true }) => {
       if (forceKillAfterTimeout === true) {
@@ -457019,7 +456993,7 @@ var require_has_flag2 = __commonJS({
 var require_supports_color2 = __commonJS({
   "node_modules/chalk/node_modules/supports-color/index.js"(exports2, module2) {
     "use strict";
-    var os40 = __require("os");
+    var os39 = __require("os");
     var tty4 = __require("tty");
     var hasFlag2 = require_has_flag2();
     var { env: env6 } = process;
@@ -457067,7 +457041,7 @@ var require_supports_color2 = __commonJS({
         return min;
       }
       if (process.platform === "win32") {
-        const osRelease = os40.release().split(".");
+        const osRelease = os39.release().split(".");
         if (Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
           return Number(osRelease[2]) >= 14931 ? 3 : 2;
         }
@@ -466492,9 +466466,9 @@ var require_conf = __commonJS({
 var require_defaults4 = __commonJS({
   "node_modules/@pnpm/npm-conf/lib/defaults.js"(exports2) {
     "use strict";
-    var os40 = __require("os");
+    var os39 = __require("os");
     var path152 = __require("path");
-    var temp = os40.tmpdir();
+    var temp = os39.tmpdir();
     var uidOrPid = process.getuid ? process.getuid() : process.pid;
     var hasUnicode = () => true;
     var isWindows7 = process.platform === "win32";
@@ -466505,7 +466479,7 @@ var require_defaults4 = __commonJS({
     var umask2 = {
       fromString: () => process.umask()
     };
-    var home = os40.homedir();
+    var home = os39.homedir();
     if (home) {
       process.env.HOME = home;
     } else {
@@ -479442,7 +479416,7 @@ init_dist8();
 var import_strip_json_comments3 = __toESM(require_strip_json_comments(), 1);
 import * as fs71 from "node:fs";
 import * as path87 from "node:path";
-import { platform as platform14 } from "node:os";
+import { platform as platform13 } from "node:os";
 import process38 from "node:process";
 
 // packages/cli/src/ui/themes/color-utils.ts
@@ -485201,9 +485175,9 @@ function getSystemSettingsPath() {
   if (process38.env["GEMINI_CLI_SYSTEM_SETTINGS_PATH"]) {
     return process38.env["GEMINI_CLI_SYSTEM_SETTINGS_PATH"];
   }
-  if (platform14() === "darwin") {
+  if (platform13() === "darwin") {
     return "/Library/Application Support/GeminiCli/settings.json";
-  } else if (platform14() === "win32") {
+  } else if (platform13() === "win32") {
     return "C:\\ProgramData\\gemini-cli\\settings.json";
   } else {
     return "/etc/gemini-cli/settings.json";
@@ -489687,18 +489661,18 @@ import process43 from "node:process";
 import childProcess2 from "node:child_process";
 var execFilePromises = promisify16(childProcess2.execFile);
 function systemArchitectureSync() {
-  const { arch: arch5, platform: platform22, env: env6 } = process43;
-  if (platform22 === "darwin" && arch5 === "x64") {
+  const { arch: arch5, platform: platform21, env: env6 } = process43;
+  if (platform21 === "darwin" && arch5 === "x64") {
     const stdout = childProcess2.execFileSync("sysctl", ["-inq", "sysctl.proc_translated"], { encoding: "utf8" });
     return stdout.trim() === "1" ? "arm64" : "x64";
   }
   if (arch5 === "arm64" || arch5 === "x64") {
     return arch5;
   }
-  if (platform22 === "win32" && Object.hasOwn(env6, "PROCESSOR_ARCHITEW6432")) {
+  if (platform21 === "win32" && Object.hasOwn(env6, "PROCESSOR_ARCHITEW6432")) {
     return "x64";
   }
-  if (platform22 === "linux") {
+  if (platform21 === "linux") {
     const stdout = childProcess2.execFileSync("getconf", ["LONG_BIT"], { encoding: "utf8" });
     if (stdout.trim() === "64") {
       return "x64";
@@ -490625,7 +490599,7 @@ var import_react32 = __toESM(require_react(), 1);
 init_mnemonist();
 init_dist8();
 import fs79 from "node:fs";
-import os28 from "node:os";
+import os27 from "node:os";
 import pathMod from "node:path";
 import * as path93 from "node:path";
 
@@ -494230,7 +494204,7 @@ function useTextBuffer({
     dispatch({ type: "vim_escape_insert_mode" });
   }, []);
   const openInExternalEditor = (0, import_react32.useCallback)(async () => {
-    const tmpDir = fs79.mkdtempSync(pathMod.join(os28.tmpdir(), "gemini-edit-"));
+    const tmpDir = fs79.mkdtempSync(pathMod.join(os27.tmpdir(), "gemini-edit-"));
     const filePath = pathMod.join(tmpDir, "buffer.txt");
     const expandedText = text.replace(
       PASTED_TEXT_PLACEHOLDER_REGEX,
@@ -515092,7 +515066,7 @@ var WarningMessage = ({ text }) => {
 };
 
 // packages/cli/src/generated/git-commit.ts
-var GIT_COMMIT_INFO2 = "c316fc6c5";
+var GIT_COMMIT_INFO2 = "5d2983f12";
 
 // packages/cli/src/ui/components/AboutBox.tsx
 init_dist8();
@@ -516648,7 +516622,7 @@ import path100 from "node:path";
 // packages/cli/src/config/extensions/storage.ts
 import * as path99 from "node:path";
 import * as fs83 from "node:fs";
-import * as os29 from "node:os";
+import * as os28 from "node:os";
 
 // packages/cli/src/config/extensions/variables.ts
 import * as path98 from "node:path";
@@ -516744,7 +516718,7 @@ var ExtensionStorage = class _ExtensionStorage {
     return new Storage(homedir()).getExtensionsDir();
   }
   static async createTmpDir() {
-    return fs83.promises.mkdtemp(path99.join(os29.tmpdir(), "gemini-extension"));
+    return fs83.promises.mkdtemp(path99.join(os28.tmpdir(), "gemini-extension"));
   }
 };
 
@@ -517092,7 +517066,7 @@ function handleMaxTurnsExceededError(config2) {
 
 // packages/cli/src/config/extensions/github.ts
 init_dist8();
-import * as os30 from "node:os";
+import * as os29 from "node:os";
 import * as https5 from "node:https";
 import * as fs96 from "node:fs";
 import * as path109 from "node:path";
@@ -518428,8 +518402,8 @@ var parseKVLine = (set3, line) => {
 init_esm8();
 
 // node_modules/tar/dist/esm/normalize-windows-path.js
-var platform15 = process.env.TESTING_TAR_FAKE_PLATFORM || process.platform;
-var normalizeWindowsPath = platform15 !== "win32" ? (p) => p : (p) => p && p.replace(/\\/g, "/");
+var platform14 = process.env.TESTING_TAR_FAKE_PLATFORM || process.platform;
+var normalizeWindowsPath = platform14 !== "win32" ? (p) => p : (p) => p && p.replace(/\\/g, "/");
 
 // node_modules/tar/dist/esm/read-entry.js
 var ReadEntry = class extends Minipass {
@@ -520665,8 +520639,8 @@ import path107 from "node:path";
 
 // node_modules/tar/dist/esm/get-write-flag.js
 import fs90 from "fs";
-var platform16 = process.env.__FAKE_PLATFORM__ || process.platform;
-var isWindows4 = platform16 === "win32";
+var platform15 = process.env.__FAKE_PLATFORM__ || process.platform;
+var isWindows4 = platform15 === "win32";
 var { O_CREAT, O_TRUNC, O_WRONLY } = fs90.constants;
 var UV_FS_O_FILEMAP = Number(process.env.__FAKE_FS_O_FILENAME__) || fs90.constants.UV_FS_O_FILEMAP || 0;
 var fMapEnabled = isWindows4 && !!UV_FS_O_FILEMAP;
@@ -520961,8 +520935,8 @@ var normalizeUnicode = (s4) => {
 };
 
 // node_modules/tar/dist/esm/path-reservations.js
-var platform17 = process.env.TESTING_TAR_FAKE_PLATFORM || process.platform;
-var isWindows5 = platform17 === "win32";
+var platform16 = process.env.TESTING_TAR_FAKE_PLATFORM || process.platform;
+var isWindows5 = platform16 === "win32";
 var getDirs = (path152) => {
   const dirs = path152.split("/").slice(0, -1).reduce((set3, path153) => {
     const s4 = set3[set3.length - 1];
@@ -521122,8 +521096,8 @@ var DOCHOWN = Symbol("doChown");
 var UID = Symbol("uid");
 var GID = Symbol("gid");
 var CHECKED_CWD = Symbol("checkedCwd");
-var platform18 = process.env.TESTING_TAR_FAKE_PLATFORM || process.platform;
-var isWindows6 = platform18 === "win32";
+var platform17 = process.env.TESTING_TAR_FAKE_PLATFORM || process.platform;
+var isWindows6 = platform17 === "win32";
 var DEFAULT_MAX_DEPTH = 1024;
 var unlinkFile = (path152, cb) => {
   if (!isWindows6) {
@@ -522430,10 +522404,10 @@ async function downloadFromGitHubRelease(installMetadata, destination, githubRep
   }
 }
 function findReleaseAsset(assets) {
-  const platform22 = os30.platform();
-  const arch5 = os30.arch();
-  const platformArchPrefix = `${platform22}.${arch5}.`;
-  const platformPrefix = `${platform22}.`;
+  const platform21 = os29.platform();
+  const arch5 = os29.arch();
+  const platformArchPrefix = `${platform21}.${arch5}.`;
+  const platformPrefix = `${platform21}.`;
   const platformArchAsset = assets.find(
     (asset) => asset.name.toLowerCase().startsWith(platformArchPrefix)
   );
@@ -533778,7 +533752,7 @@ var import_react114 = __toESM(require_react(), 1);
 init_dist8();
 import * as fs104 from "node:fs/promises";
 import * as path119 from "node:path";
-import * as os31 from "node:os";
+import * as os30 from "node:os";
 
 // packages/cli/src/ui/hooks/shell-completions/gitProvider.ts
 import { execFile as execFile9 } from "node:child_process";
@@ -534114,7 +534088,7 @@ async function scanPathExecutables(signal) {
 }
 function expandTilde(inputPath) {
   if (inputPath === "~" || inputPath.startsWith("~/") || inputPath.startsWith("~" + path119.sep)) {
-    return [path119.join(os31.homedir(), inputPath.slice(1)), true];
+    return [path119.join(os30.homedir(), inputPath.slice(1)), true];
   }
   return [inputPath, false];
 }
@@ -534161,7 +534135,7 @@ async function resolvePathCompletions(partial2, cwd7, signal) {
       completionValue = parentPart + displayName;
     }
     if (didExpandTilde) {
-      const homeDir = os31.homedir().replace(/\\/g, "/");
+      const homeDir = os30.homedir().replace(/\\/g, "/");
       if (completionValue.startsWith(homeDir)) {
         completionValue = "~" + completionValue.slice(homeDir.length);
       }
@@ -537229,7 +537203,7 @@ init_dist8();
 init_node();
 import crypto27 from "node:crypto";
 import path121 from "node:path";
-import os32 from "node:os";
+import os31 from "node:os";
 import fs105 from "node:fs";
 
 // packages/cli/src/ui/hooks/shellReducer.ts
@@ -537493,14 +537467,14 @@ var useShellCommandProcessor = (addItemToHistory, setPendingHistoryItem, onExec,
         { type: "user_shell", text: rawQuery },
         userMessageTimestamp
       );
-      const isWindows7 = os32.platform() === "win32";
+      const isWindows7 = os31.platform() === "win32";
       const targetDir = config2.getTargetDir();
       let commandToExecute = rawQuery;
       let pwdFilePath;
       if (!isWindows7) {
         let command2 = rawQuery.trim();
         const pwdFileName = `shell_pwd_${crypto27.randomBytes(6).toString("hex")}.tmp`;
-        pwdFilePath = path121.join(os32.tmpdir(), pwdFileName);
+        pwdFilePath = path121.join(os31.tmpdir(), pwdFileName);
         if (!command2.endsWith(";") && !command2.endsWith("&")) {
           command2 += ";";
         }
@@ -546921,7 +546895,7 @@ init_dist8();
 var import_extract_zip3 = __toESM(require_extract_zip(), 1);
 import * as fs115 from "node:fs/promises";
 import * as path135 from "node:path";
-import * as os33 from "node:os";
+import * as os32 from "node:os";
 function renderSkillActionFeedback(result2, formatScope) {
   const { skillName, action, status, error: error40 } = result2;
   if (status === "error") {
@@ -546961,7 +546935,7 @@ async function installSkill(source2, scope, subpath, onLog, requestConsent = ()
   try {
     if (isGitUrl) {
       tempDirToClean = await fs115.mkdtemp(
-        path135.join(os33.tmpdir(), "gemini-skill-")
+        path135.join(os32.tmpdir(), "gemini-skill-")
       );
       sourcePath = tempDirToClean;
       onLog(`Cloning skill from ${source2}...`);
@@ -546974,7 +546948,7 @@ async function installSkill(source2, scope, subpath, onLog, requestConsent = ()
       );
     } else if (isSkillFile) {
       tempDirToClean = await fs115.mkdtemp(
-        path135.join(os33.tmpdir(), "gemini-skill-")
+        path135.join(os32.tmpdir(), "gemini-skill-")
       );
       sourcePath = tempDirToClean;
       onLog(`Extracting skill from ${source2}...`);
@@ -547716,7 +547690,7 @@ var setupGithubCommand = {
 
 // packages/cli/src/ui/utils/terminalSetup.ts
 import { promises as fs117 } from "node:fs";
-import * as os34 from "node:os";
+import * as os33 from "node:os";
 import * as path137 from "node:path";
 import { exec as exec4 } from "node:child_process";
 import { promisify as promisify19 } from "node:util";
@@ -547766,7 +547740,7 @@ async function detectTerminal() {
   if (envTerminal) {
     return envTerminal;
   }
-  if (os34.platform() !== "win32") {
+  if (os33.platform() !== "win32") {
     try {
       const { stdout } = await execAsync3("ps -o comm= -p $PPID");
       const parentName = stdout.trim();
@@ -547794,8 +547768,8 @@ async function backupFile(filePath) {
   }
 }
 function getVSCodeStyleConfigDir(appName) {
-  const platform22 = os34.platform();
-  if (platform22 === "darwin") {
+  const platform21 = os33.platform();
+  if (platform21 === "darwin") {
     return path137.join(
       homedir(),
       "Library",
@@ -547803,7 +547777,7 @@ function getVSCodeStyleConfigDir(appName) {
       appName,
       "User"
     );
-  } else if (platform22 === "win32") {
+  } else if (platform21 === "win32") {
     if (!process.env["APPDATA"]) {
       return null;
     }
@@ -563452,7 +563426,7 @@ init_dist8();
 // packages/cli/src/config/sandboxConfig.ts
 init_dist8();
 var import_command_exists = __toESM(require_command_exists2(), 1);
-import * as os35 from "node:os";
+import * as os34 from "node:os";
 import { fileURLToPath as fileURLToPath22 } from "node:url";
 import path145 from "node:path";
 var __filename6 = fileURLToPath22(import.meta.url);
@@ -563491,7 +563465,7 @@ function getSandboxCommand(sandbox) {
       `Missing sandbox command '${sandbox}' (from GEMINI_SANDBOX)`
     );
   }
-  if (os35.platform() === "darwin" && import_command_exists.default.sync("sandbox-exec")) {
+  if (os34.platform() === "darwin" && import_command_exists.default.sync("sandbox-exec")) {
     return "sandbox-exec";
   } else if (import_command_exists.default.sync("docker") && sandbox === true) {
     return "docker";
@@ -563509,7 +563483,7 @@ async function loadSandboxConfig(settings, argv) {
   const sandboxOption = argv.sandbox ?? settings.tools?.sandbox;
   const command2 = getSandboxCommand(sandboxOption);
   const packageJson2 = await getPackageJson(__dirname13);
-  const image2 = process.env["GEMINI_SANDBOX_IMAGE"] ?? "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.33.0-preview.4" ?? packageJson2?.config?.sandboxImageUri;
+  const image2 = process.env["GEMINI_SANDBOX_IMAGE"] ?? "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.33.0-preview.6" ?? packageJson2?.config?.sandboxImageUri;
   return command2 && image2 ? { command: command2, image: image2 } : void 0;
 }
 
@@ -564235,7 +564209,7 @@ function noopErrorHandler() {
 import { basename as basename26 } from "node:path";
 import { createHash as createHash11 } from "node:crypto";
 import v82 from "node:v8";
-import os39 from "node:os";
+import os38 from "node:os";
 import dns from "node:dns";
 
 // packages/cli/src/utils/sandbox.ts
@@ -564244,7 +564218,7 @@ init_dist8();
 import { exec as exec5, execSync as execSync8, spawn as spawn13 } from "node:child_process";
 import path147 from "node:path";
 import fs125 from "node:fs";
-import os37 from "node:os";
+import os36 from "node:os";
 import { fileURLToPath as fileURLToPath23 } from "node:url";
 import { promisify as promisify20 } from "node:util";
 
@@ -564298,7 +564272,7 @@ import { randomBytes as randomBytes6 } from "node:crypto";
 // packages/cli/src/utils/sandboxUtils.ts
 var import_shell_quote4 = __toESM(require_shell_quote(), 1);
 init_dist8();
-import os36 from "node:os";
+import os35 from "node:os";
 import fs124 from "node:fs";
 import { readFile as readFile17 } from "node:fs/promises";
 var LOCAL_DEV_SANDBOX_IMAGE_NAME = "gemini-cli-sandbox";
@@ -564313,7 +564287,7 @@ var BUILTIN_SEATBELT_PROFILES = [
   "strict-proxied"
 ];
 function getContainerPath(hostPath) {
-  if (os36.platform() !== "win32") {
+  if (os35.platform() !== "win32") {
     return hostPath;
   }
   const withForwardSlashes = hostPath.replace(/\\/g, "/");
@@ -564331,7 +564305,7 @@ async function shouldUseCurrentUserInSandbox() {
   if (envVar === "0" || envVar === "false") {
     return false;
   }
-  if (os36.platform() === "linux") {
+  if (os35.platform() === "linux") {
     try {
       const osReleaseContent = await readFile17("/etc/os-release", "utf8");
       if (osReleaseContent.includes("ID=debian") || osReleaseContent.includes("ID=ubuntu") || osReleaseContent.match(/^ID_LIKE=.*debian.*/m) || // Covers derivatives
@@ -564358,7 +564332,7 @@ function ports() {
   return (process.env["SANDBOX_PORTS"] ?? "").split(",").filter((p) => p.trim()).map((p) => p.trim());
 }
 function entrypoint(workdir, cliArgs) {
-  const isWindows7 = os36.platform() === "win32";
+  const isWindows7 = os35.platform() === "win32";
   const containerWorkdir = getContainerPath(workdir);
   const shellCmds = [];
   const pathSeparator = isWindows7 ? ";" : ":";
@@ -564440,7 +564414,7 @@ async function start_sandbox(config2, nodeArgs = [], cliConfig, cliArgs = []) {
         "-D",
         `TARGET_DIR=${fs125.realpathSync(process.cwd())}`,
         "-D",
-        `TMP_DIR=${fs125.realpathSync(os37.tmpdir())}`,
+        `TMP_DIR=${fs125.realpathSync(os36.tmpdir())}`,
         "-D",
         `HOME_DIR=${fs125.realpathSync(homedir())}`,
         "-D",
@@ -564617,8 +564591,8 @@ async function start_sandbox(config2, nodeArgs = [], cliConfig, cliArgs = []) {
         `${userSettingsDirOnHost}:${getContainerPath(userSettingsDirOnHost)}`
       );
     }
-    args2.push("--volume", `${os37.tmpdir()}:${getContainerPath(os37.tmpdir())}`);
-    if (userHomeDirOnHost !== os37.homedir()) {
+    args2.push("--volume", `${os36.tmpdir()}:${getContainerPath(os36.tmpdir())}`);
+    if (userHomeDirOnHost !== os36.homedir()) {
       args2.push(
         "--volume",
         `${userHomeDirOnHost}:${getContainerPath(userHomeDirOnHost)}`
@@ -564817,7 +564791,7 @@ async function start_sandbox(config2, nodeArgs = [], cliConfig, cliArgs = []) {
     }
     args2.push("--env", `SANDBOX=${containerName}`);
     if (config2.command === "podman") {
-      const emptyAuthFilePath = path147.join(os37.tmpdir(), "empty_auth.json");
+      const emptyAuthFilePath = path147.join(os36.tmpdir(), "empty_auth.json");
       fs125.writeFileSync(emptyAuthFilePath, "{}", "utf-8");
       args2.push("--authfile", emptyAuthFilePath);
     }
@@ -565022,9 +564996,9 @@ async function ensureSandboxImageIsPresent(sandbox, image2, cliConfig) {
 // packages/cli/src/utils/startupWarnings.ts
 init_dist8();
 import fs126 from "node:fs/promises";
-import os38 from "node:os";
+import os37 from "node:os";
 import { join as pathJoin } from "node:path";
-var warningsFilePath = pathJoin(os38.tmpdir(), "gemini-cli-warnings.txt");
+var warningsFilePath = pathJoin(os37.tmpdir(), "gemini-cli-warnings.txt");
 async function getStartupWarnings() {
   try {
     await fs126.access(warningsFilePath);
@@ -569333,7 +569307,7 @@ function validateDnsResolutionOrder(order) {
   return defaultValue;
 }
 function getNodeMemoryArgs(isDebugMode2) {
-  const totalMemoryMB = os39.totalmem() / (1024 * 1024);
+  const totalMemoryMB = os38.totalmem() / (1024 * 1024);
   const heapStats = v82.getHeapStatistics();
   const currentMaxOldSpaceSizeMb = Math.floor(
     heapStats.heap_size_limit / 1024 / 1024