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

package/dist/a2a-server.mjs

@@ -155,7 +155,7 @@ var require_has_flag = __commonJS({
 var require_supports_colors = __commonJS({
   "node_modules/@colors/colors/lib/system/supports-colors.js"(exports2, module2) {
     "use strict";
-    var os24 = __require("os");
+    var os23 = __require("os");
     var hasFlag = require_has_flag();
     var env2 = process.env;
     var forceColor = void 0;
@@ -193,7 +193,7 @@ var require_supports_colors = __commonJS({
       }
       var min = forceColor ? 1 : 0;
       if (process.platform === "win32") {
-        var osRelease = os24.release().split(".");
+        var osRelease = os23.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;
         }
@@ -5439,7 +5439,7 @@ var require_winston_transport = __commonJS({
 var require_console = __commonJS({
   "node_modules/winston/lib/winston/transports/console.js"(exports2, module2) {
     "use strict";
-    var os24 = __require("os");
+    var os23 = __require("os");
     var { LEVEL, MESSAGE } = require_triple_beam();
     var TransportStream = require_winston_transport();
     module2.exports = class Console extends TransportStream {
@@ -5453,7 +5453,7 @@ var require_console = __commonJS({
         this.name = options.name || "console";
         this.stderrLevels = this._stringArrayToSet(options.stderrLevels);
         this.consoleWarnLevels = this._stringArrayToSet(options.consoleWarnLevels);
-        this.eol = typeof options.eol === "string" ? options.eol : os24.EOL;
+        this.eol = typeof options.eol === "string" ? options.eol : os23.EOL;
         this.forceConsole = options.forceConsole || false;
         this._consoleLog = console.log.bind(console);
         this._consoleWarn = console.warn.bind(console);
@@ -8467,7 +8467,7 @@ var require_file = __commonJS({
     var { Stream: Stream7, PassThrough: PassThrough8 } = require_readable();
     var TransportStream = require_winston_transport();
     var debug2 = require_node2()("winston:file");
-    var os24 = __require("os");
+    var os23 = __require("os");
     var tailFile = require_tail_file();
     module2.exports = class File extends TransportStream {
       /**
@@ -8505,7 +8505,7 @@ var require_file = __commonJS({
         this.rotationFormat = options.rotationFormat || false;
         this.zippedArchive = options.zippedArchive || false;
         this.maxFiles = options.maxFiles || null;
-        this.eol = typeof options.eol === "string" ? options.eol : os24.EOL;
+        this.eol = typeof options.eol === "string" ? options.eol : os23.EOL;
         this.tailable = options.tailable || false;
         this.lazy = options.lazy || false;
         this._size = 0;
@@ -9286,7 +9286,7 @@ var require_stream2 = __commonJS({
     "use strict";
     var isStream4 = require_is_stream();
     var { MESSAGE } = require_triple_beam();
-    var os24 = __require("os");
+    var os23 = __require("os");
     var TransportStream = require_winston_transport();
     module2.exports = class Stream extends TransportStream {
       /**
@@ -9302,7 +9302,7 @@ var require_stream2 = __commonJS({
         this._stream = options.stream;
         this._stream.setMaxListeners(Infinity);
         this.isObjectMode = options.stream._writableState.objectMode;
-        this.eol = typeof options.eol === "string" ? options.eol : os24.EOL;
+        this.eol = typeof options.eol === "string" ? options.eol : os23.EOL;
       }
       /**
        * Core logging method exposed to Winston.
@@ -9685,7 +9685,7 @@ var require_exception_stream = __commonJS({
 var require_exception_handler = __commonJS({
   "node_modules/winston/lib/winston/exception-handler.js"(exports2, module2) {
     "use strict";
-    var os24 = __require("os");
+    var os23 = __require("os");
     var asyncForEach = require_forEach();
     var debug2 = require_node2()("winston:exception");
     var once10 = require_one_time();
@@ -9780,8 +9780,8 @@ var require_exception_handler = __commonJS({
        */
       getOsInfo() {
         return {
-          loadavg: os24.loadavg(),
-          uptime: os24.uptime()
+          loadavg: os23.loadavg(),
+          uptime: os23.uptime()
         };
       }
       /**
@@ -9923,7 +9923,7 @@ var require_rejection_stream = __commonJS({
 var require_rejection_handler = __commonJS({
   "node_modules/winston/lib/winston/rejection-handler.js"(exports2, module2) {
     "use strict";
-    var os24 = __require("os");
+    var os23 = __require("os");
     var asyncForEach = require_forEach();
     var debug2 = require_node2()("winston:rejection");
     var once10 = require_one_time();
@@ -10020,8 +10020,8 @@ var require_rejection_handler = __commonJS({
        */
       getOsInfo() {
         return {
-          loadavg: os24.loadavg(),
-          uptime: os24.uptime()
+          loadavg: os23.loadavg(),
+          uptime: os23.uptime()
         };
       }
       /**
@@ -11289,7 +11289,7 @@ var require_has_flag2 = __commonJS({
 var require_supports_color = __commonJS({
   "node_modules/supports-color/index.js"(exports2, module2) {
     "use strict";
-    var os24 = __require("os");
+    var os23 = __require("os");
     var hasFlag = require_has_flag2();
     var env2 = process.env;
     var forceColor;
@@ -11327,7 +11327,7 @@ var require_supports_color = __commonJS({
       }
       const min = forceColor ? 1 : 0;
       if (process.platform === "win32") {
-        const osRelease = os24.release().split(".");
+        const osRelease = os23.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;
         }
@@ -53565,7 +53565,7 @@ var require_googleauth = __commonJS({
     var child_process_1 = __require("child_process");
     var fs75 = __require("fs");
     var gcpMetadata = require_src6();
-    var os24 = __require("os");
+    var os23 = __require("os");
     var path90 = __require("path");
     var crypto_1 = require_crypto3();
     var transporters_1 = require_transporters();
@@ -54006,7 +54006,7 @@ var require_googleauth = __commonJS({
        * @api private
        */
       _isWindows() {
-        const sys = os24.platform();
+        const sys = os23.platform();
         if (sys && sys.length >= 3) {
           if (sys.substring(0, 3).toLowerCase() === "win") {
             return true;
@@ -58813,7 +58813,7 @@ var require_polyfills = __commonJS({
     var constants6 = __require("constants");
     var origCwd = process.cwd;
     var cwd = null;
-    var platform15 = process.env.GRACEFUL_FS_PLATFORM || process.platform;
+    var platform14 = process.env.GRACEFUL_FS_PLATFORM || process.platform;
     process.cwd = function() {
       if (!cwd)
         cwd = origCwd.call(process);
@@ -58872,7 +58872,7 @@ var require_polyfills = __commonJS({
         fs75.lchownSync = function() {
         };
       }
-      if (platform15 === "win32") {
+      if (platform14 === "win32") {
         fs75.rename = typeof fs75.rename !== "function" ? fs75.rename : function(fs$rename) {
           function rename(from, to, cb) {
             var start2 = Date.now();
@@ -69541,7 +69541,7 @@ var require_util4 = __commonJS({
     exports2.isValidFile = isValidFile;
     exports2.getWellKnownCertificateConfigFileLocation = getWellKnownCertificateConfigFileLocation;
     var fs75 = __require("fs");
-    var os24 = __require("os");
+    var os23 = __require("os");
     var path90 = __require("path");
     var WELL_KNOWN_CERTIFICATE_CONFIG_FILE = "certificate_config.json";
     var CLOUDSDK_CONFIG_DIRECTORY = "gcloud";
@@ -69639,7 +69639,7 @@ var require_util4 = __commonJS({
       return path90.join(configDir, WELL_KNOWN_CERTIFICATE_CONFIG_FILE);
     }
     function _isWindows() {
-      return os24.platform().startsWith("win");
+      return os23.platform().startsWith("win");
     }
   }
 });
@@ -74411,7 +74411,7 @@ var require_googleauth2 = __commonJS({
     var fs75 = __require("fs");
     var gaxios_1 = require_src14();
     var gcpMetadata = require_src16();
-    var os24 = __require("os");
+    var os23 = __require("os");
     var path90 = __require("path");
     var crypto_1 = require_crypto6();
     var computeclient_1 = require_computeclient2();
@@ -74914,7 +74914,7 @@ var require_googleauth2 = __commonJS({
        * @api private
        */
       _isWindows() {
-        const sys = os24.platform();
+        const sys = os23.platform();
         if (sys && sys.length >= 3) {
           if (sys.substring(0, 3).toLowerCase() === "win") {
             return true;
@@ -94419,24 +94419,24 @@ var init_node = __esm({
         return `other:${arch4}`;
       return "unknown";
     };
-    normalizePlatform = (platform15) => {
-      platform15 = platform15.toLowerCase();
-      if (platform15.includes("ios"))
+    normalizePlatform = (platform14) => {
+      platform14 = platform14.toLowerCase();
+      if (platform14.includes("ios"))
         return "iOS";
-      if (platform15 === "android")
+      if (platform14 === "android")
         return "Android";
-      if (platform15 === "darwin")
+      if (platform14 === "darwin")
         return "MacOS";
-      if (platform15 === "win32")
+      if (platform14 === "win32")
         return "Windows";
-      if (platform15 === "freebsd")
+      if (platform14 === "freebsd")
         return "FreeBSD";
-      if (platform15 === "openbsd")
+      if (platform14 === "openbsd")
         return "OpenBSD";
-      if (platform15 === "linux")
+      if (platform14 === "linux")
         return "Linux";
-      if (platform15)
-        return `Other:${platform15}`;
+      if (platform14)
+        return `Other:${platform14}`;
       return "Unknown";
     };
     getPlatformHeaders = () => {
@@ -99717,7 +99717,7 @@ var require_util6 = __commonJS({
     exports2.isValidFile = isValidFile;
     exports2.getWellKnownCertificateConfigFileLocation = getWellKnownCertificateConfigFileLocation;
     var fs75 = __require("fs");
-    var os24 = __require("os");
+    var os23 = __require("os");
     var path90 = __require("path");
     var WELL_KNOWN_CERTIFICATE_CONFIG_FILE = "certificate_config.json";
     var CLOUDSDK_CONFIG_DIRECTORY = "gcloud";
@@ -99815,7 +99815,7 @@ var require_util6 = __commonJS({
       return path90.join(configDir, WELL_KNOWN_CERTIFICATE_CONFIG_FILE);
     }
     function _isWindows() {
-      return os24.platform().startsWith("win");
+      return os23.platform().startsWith("win");
     }
   }
 });
@@ -104587,7 +104587,7 @@ var require_googleauth3 = __commonJS({
     var fs75 = __require("fs");
     var gaxios_1 = require_src19();
     var gcpMetadata = require_src21();
-    var os24 = __require("os");
+    var os23 = __require("os");
     var path90 = __require("path");
     var crypto_1 = require_crypto9();
     var computeclient_1 = require_computeclient3();
@@ -105090,7 +105090,7 @@ var require_googleauth3 = __commonJS({
        * @api private
        */
       _isWindows() {
-        const sys = os24.platform();
+        const sys = os23.platform();
         if (sys && sys.length >= 3) {
           if (sys.substring(0, 3).toLowerCase() === "win") {
             return true;
@@ -106747,8 +106747,8 @@ function isSubpath(parentPath, childPath) {
   const relative6 = pathModule2.relative(parentPath, childPath);
   return !relative6.startsWith(`..${pathModule2.sep}`) && relative6 !== ".." && !pathModule2.isAbsolute(relative6);
 }
-function resolveToRealPath(path90) {
-  let resolvedPath = path90;
+function resolveToRealPath(pathStr) {
+  let resolvedPath = pathStr;
   try {
     if (resolvedPath.startsWith("file://")) {
       resolvedPath = fileURLToPath2(resolvedPath);
@@ -106756,10 +106756,28 @@ function resolveToRealPath(path90) {
     resolvedPath = decodeURIComponent(resolvedPath);
   } catch (_e) {
   }
+  return robustRealpath(path11.resolve(resolvedPath));
+}
+function robustRealpath(p) {
   try {
-    return fs20.realpathSync(resolvedPath);
-  } catch (_e) {
-    return resolvedPath;
+    return fs20.realpathSync(p);
+  } catch (e3) {
+    if (e3 && typeof e3 === "object" && "code" in e3 && e3.code === "ENOENT") {
+      try {
+        const stat4 = fs20.lstatSync(p);
+        if (stat4.isSymbolicLink()) {
+          const target = fs20.readlinkSync(p);
+          const resolvedTarget = path11.resolve(path11.dirname(p), target);
+          return robustRealpath(resolvedTarget);
+        }
+      } catch {
+      }
+      const parent = path11.dirname(p);
+      if (parent === p)
+        return p;
+      return path11.join(robustRealpath(parent), path11.basename(p));
+    }
+    throw e3;
   }
 }
 var GEMINI_DIR, GOOGLE_ACCOUNTS_FILENAME;
@@ -122500,10 +122518,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 };
@@ -122598,24 +122642,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;
@@ -122757,7 +122805,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,
@@ -122792,7 +122840,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}`);
@@ -137624,7 +137672,7 @@ var require_service_config = __commonJS({
     exports2.validateRetryThrottling = validateRetryThrottling;
     exports2.validateServiceConfig = validateServiceConfig;
     exports2.extractAndSelectServiceConfig = extractAndSelectServiceConfig;
-    var os24 = __require("os");
+    var os23 = __require("os");
     var constants_1 = require_constants3();
     var DURATION_REGEX = /^\d+(\.\d{1,9})?s$/;
     var CLIENT_LANGUAGE_STRING = "node";
@@ -137923,7 +137971,7 @@ var require_service_config = __commonJS({
         if (Array.isArray(validatedConfig.clientHostname)) {
           let hostnameMatched = false;
           for (const hostname3 of validatedConfig.clientHostname) {
-            if (hostname3 === os24.hostname()) {
+            if (hostname3 === os23.hostname()) {
               hostnameMatched = true;
             }
           }
@@ -151444,7 +151492,7 @@ var require_subchannel_call = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.Http2SubchannelCall = void 0;
     var http22 = __require("http2");
-    var os24 = __require("os");
+    var os23 = __require("os");
     var constants_1 = require_constants3();
     var metadata_1 = require_metadata4();
     var stream_decoder_1 = require_stream_decoder();
@@ -151452,7 +151500,7 @@ var require_subchannel_call = __commonJS({
     var constants_2 = require_constants3();
     var TRACER_NAME2 = "subchannel_call";
     function getSystemErrorName(errno) {
-      for (const [name4, num] of Object.entries(os24.constants.errno)) {
+      for (const [name4, num] of Object.entries(os23.constants.errno)) {
         if (num === errno) {
           return name4;
         }
@@ -171836,7 +171884,7 @@ var require_ProcessDetector = __commonJS({
     exports2.processDetector = void 0;
     var api_1 = (init_esm2(), __toCommonJS(esm_exports4));
     var semconv_1 = require_semconv2();
-    var os24 = __require("os");
+    var os23 = __require("os");
     var ProcessDetector = class {
       detect(_config) {
         const attributes = {
@@ -171856,7 +171904,7 @@ var require_ProcessDetector = __commonJS({
           attributes[semconv_1.ATTR_PROCESS_COMMAND] = process.argv[1];
         }
         try {
-          const userInfo2 = os24.userInfo();
+          const userInfo2 = os23.userInfo();
           attributes[semconv_1.ATTR_PROCESS_OWNER] = userInfo2.username;
         } catch (e3) {
           api_1.diag.debug(`error obtaining process owner: ${e3}`);
@@ -191366,7 +191414,7 @@ var require_package10 = __commonJS({
 var require_util13 = __commonJS({
   "node_modules/systeminformation/lib/util.js"(exports2) {
     "use strict";
-    var os24 = __require("os");
+    var os23 = __require("os");
     var fs75 = __require("fs");
     var path90 = __require("path");
     var spawn10 = __require("child_process").spawn;
@@ -191473,7 +191521,7 @@ var require_util13 = __commonJS({
     }
     function cores() {
       if (_cores === 0) {
-        _cores = os24.cpus().length;
+        _cores = os23.cpus().length;
       }
       return _cores;
     }
@@ -191734,7 +191782,7 @@ var require_util13 = __commonJS({
     function powerShellRelease() {
       try {
         if (_psChild) {
-          _psChild.stdin.write("exit" + os24.EOL);
+          _psChild.stdin.write("exit" + os23.EOL);
           _psChild.stdin.end();
         }
       } catch {
@@ -191761,7 +191809,7 @@ var require_util13 = __commonJS({
             });
             try {
               if (_psChild && _psChild.pid) {
-                _psChild.stdin.write(_psToUTF8 + "echo " + _psCmdStart + id + _psIdSeperator + "; " + os24.EOL + cmd + os24.EOL + "echo " + _psCmdSeperator + os24.EOL);
+                _psChild.stdin.write(_psToUTF8 + "echo " + _psCmdStart + id + _psIdSeperator + "; " + os23.EOL + cmd + os23.EOL + "echo " + _psCmdSeperator + os23.EOL);
               }
             } catch {
               resolve20("");
@@ -191773,7 +191821,7 @@ var require_util13 = __commonJS({
         return new Promise((resolve20) => {
           process.nextTick(() => {
             try {
-              const osVersion = os24.release().split(".").map(Number);
+              const osVersion = os23.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 = spawn10(_powerShell, spanOptions, {
                 stdio: "pipe",
@@ -191805,8 +191853,8 @@ var require_util13 = __commonJS({
                 });
                 if (osVersion[0] < 10) {
                   try {
-                    child.stdin.write(_psToUTF8 + cmd + os24.EOL);
-                    child.stdin.write("exit" + os24.EOL);
+                    child.stdin.write(_psToUTF8 + cmd + os23.EOL);
+                    child.stdin.write("exit" + os23.EOL);
                     child.stdin.end();
                   } catch {
                     child.kill();
@@ -192071,14 +192119,14 @@ var require_util13 = __commonJS({
       return ("00000000" + parseInt(hex, 16).toString(2)).substr(-8);
     }
     function getFilesInPath(source) {
-      const lstatSync2 = fs75.lstatSync;
+      const lstatSync3 = fs75.lstatSync;
       const readdirSync4 = fs75.readdirSync;
       const join34 = path90.join;
       function isDirectory(source2) {
-        return lstatSync2(source2).isDirectory();
+        return lstatSync3(source2).isDirectory();
       }
       function isFile3(source2) {
-        return lstatSync2(source2).isFile();
+        return lstatSync3(source2).isFile();
       }
       function getDirectories(source2) {
         return readdirSync4(source2).map((name4) => {
@@ -193874,7 +193922,7 @@ var require_util13 = __commonJS({
 var require_osinfo = __commonJS({
   "node_modules/systeminformation/lib/osinfo.js"(exports2) {
     "use strict";
-    var os24 = __require("os");
+    var os23 = __require("os");
     var fs75 = __require("fs");
     var util5 = require_util13();
     var exec3 = __require("child_process").exec;
@@ -193897,14 +193945,14 @@ var require_osinfo = __commonJS({
       }
       const result2 = {
         current: Date.now(),
-        uptime: os24.uptime(),
+        uptime: os23.uptime(),
         timezone: t3.length >= 7 ? t3[5] : "",
         timezoneName
       };
       if (_darwin || _linux) {
         try {
           const stdout = execSync4("date +%Z && date +%z && ls -l /etc/localtime 2>/dev/null", util5.execOptsLinux);
-          const lines = stdout.toString().split(os24.EOL);
+          const lines = stdout.toString().split(os23.EOL);
           if (lines.length > 3 && !lines[0]) {
             lines.shift();
           }
@@ -193914,7 +193962,7 @@ var require_osinfo = __commonJS({
           }
           return {
             current: Date.now(),
-            uptime: os24.uptime(),
+            uptime: os23.uptime(),
             timezone: lines[1] ? timezone + lines[1] : timezone,
             timezoneName: lines[2] && lines[2].indexOf("/zoneinfo/") > 0 ? lines[2].split("/zoneinfo/")[1] || "" : ""
           };
@@ -194033,11 +194081,11 @@ var require_osinfo = __commonJS({
       return "";
     }
     function getFQDN() {
-      let fqdn = os24.hostname;
+      let fqdn = os23.hostname;
       if (_linux || _darwin) {
         try {
           const stdout = execSync4("hostname -f 2>/dev/null", util5.execOptsLinux);
-          fqdn = stdout.toString().split(os24.EOL)[0];
+          fqdn = stdout.toString().split(os23.EOL)[0];
         } catch {
           util5.noop();
         }
@@ -194045,7 +194093,7 @@ var require_osinfo = __commonJS({
       if (_freebsd || _openbsd || _netbsd) {
         try {
           const stdout = execSync4("hostname 2>/dev/null");
-          fqdn = stdout.toString().split(os24.EOL)[0];
+          fqdn = stdout.toString().split(os23.EOL)[0];
         } catch {
           util5.noop();
         }
@@ -194053,7 +194101,7 @@ var require_osinfo = __commonJS({
       if (_windows) {
         try {
           const stdout = execSync4("echo %COMPUTERNAME%.%USERDNSDOMAIN%", util5.execOptsWin);
-          fqdn = stdout.toString().replace(".%USERDNSDOMAIN%", "").split(os24.EOL)[0];
+          fqdn = stdout.toString().replace(".%USERDNSDOMAIN%", "").split(os23.EOL)[0];
         } catch {
           util5.noop();
         }
@@ -194068,9 +194116,9 @@ var require_osinfo = __commonJS({
             distro: "unknown",
             release: "unknown",
             codename: "",
-            kernel: os24.release(),
-            arch: os24.arch(),
-            hostname: os24.hostname(),
+            kernel: os23.release(),
+            arch: os23.arch(),
+            hostname: os23.hostname(),
             fqdn: getFQDN(),
             codepage: "",
             logofile: "",
@@ -194279,7 +194327,7 @@ var require_osinfo = __commonJS({
     }
     function versions(apps2, callback) {
       let versionObject = {
-        kernel: os24.release(),
+        kernel: os23.release(),
         apache: "",
         bash: "",
         bun: "",
@@ -194989,7 +195037,7 @@ var require_osinfo = __commonJS({
     function getUniqueMacAdresses() {
       let macs = [];
       try {
-        const ifaces = os24.networkInterfaces();
+        const ifaces = os23.networkInterfaces();
         for (let dev in ifaces) {
           if ({}.hasOwnProperty.call(ifaces, dev)) {
             ifaces[dev].forEach((details) => {
@@ -195111,7 +195159,7 @@ var require_system = __commonJS({
   "node_modules/systeminformation/lib/system.js"(exports2) {
     "use strict";
     var fs75 = __require("fs");
-    var os24 = __require("os");
+    var os23 = __require("os");
     var util5 = require_util13();
     var { uuid: uuid2 } = require_osinfo();
     var exec3 = __require("child_process").exec;
@@ -195235,8 +195283,8 @@ var require_system = __commonJS({
                   util5.noop();
                 }
               }
-              if (!result2.virtual && (os24.release().toLowerCase().indexOf("microsoft") >= 0 || os24.release().toLowerCase().endsWith("wsl2"))) {
-                const kernelVersion = parseFloat(os24.release().toLowerCase());
+              if (!result2.virtual && (os23.release().toLowerCase().indexOf("microsoft") >= 0 || os23.release().toLowerCase().endsWith("wsl2"))) {
+                const kernelVersion = parseFloat(os23.release().toLowerCase());
                 result2.virtual = true;
                 result2.manufacturer = "Microsoft";
                 result2.model = "WSL";
@@ -195646,7 +195694,7 @@ var require_system = __commonJS({
                 result2.model = "Raspberry Pi";
                 result2.serial = rpi.serial;
                 result2.version = rpi.type + " - " + rpi.revision;
-                result2.memMax = os24.totalmem();
+                result2.memMax = os23.totalmem();
                 result2.memSlots = 0;
               }
               if (callback) {
@@ -195672,9 +195720,9 @@ var require_system = __commonJS({
               }
               devices.shift();
               result2.memSlots = devices.length;
-              if (os24.arch() === "arm64") {
+              if (os23.arch() === "arm64") {
                 result2.memSlots = 0;
-                result2.memMax = os24.totalmem();
+                result2.memMax = os23.totalmem();
               }
               if (callback) {
                 callback(result2);
@@ -195691,7 +195739,7 @@ var require_system = __commonJS({
           if (_windows) {
             try {
               const workload = [];
-              const win10plus = parseInt(os24.release()) >= 10;
+              const win10plus = parseInt(os23.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`));
@@ -195887,7 +195935,7 @@ var require_system = __commonJS({
 var require_cpu = __commonJS({
   "node_modules/systeminformation/lib/cpu.js"(exports2) {
     "use strict";
-    var os24 = __require("os");
+    var os23 = __require("os");
     var exec3 = __require("child_process").exec;
     var execSync4 = __require("child_process").execSync;
     var fs75 = __require("fs");
@@ -196750,7 +196798,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 (os24.arch() === "arm64") {
+                if (os23.arch() === "arm64") {
                   result2.socket = "SOC";
                   try {
                     const clusters = execSync4("ioreg -c IOPlatformDevice -d 3 -r | grep cluster-type").toString().split("\n");
@@ -196778,8 +196826,8 @@ var require_cpu = __commonJS({
             if (_linux) {
               let modelline = "";
               let lines = [];
-              if (os24.cpus()[0] && os24.cpus()[0].model) {
-                modelline = os24.cpus()[0].model;
+              if (os23.cpus()[0] && os23.cpus()[0].model) {
+                modelline = os23.cpus()[0].model;
               }
               exec3('export LC_ALL=C; lscpu; echo -n "Governor: "; cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor 2>/dev/null; echo; unset LC_ALL', (error2, stdout) => {
                 if (!error2) {
@@ -196868,8 +196916,8 @@ var require_cpu = __commonJS({
             if (_freebsd || _openbsd || _netbsd) {
               let modelline = "";
               let lines = [];
-              if (os24.cpus()[0] && os24.cpus()[0].model) {
-                modelline = os24.cpus()[0].model;
+              if (os23.cpus()[0] && os23.cpus()[0].model) {
+                modelline = os23.cpus()[0].model;
               }
               exec3("export LC_ALL=C; dmidecode -t 4; dmidecode -t 7 unset LC_ALL", (error2, stdout) => {
                 let cache4 = [];
@@ -197029,7 +197077,7 @@ var require_cpu = __commonJS({
     }
     exports2.cpu = cpu;
     function getCpuCurrentSpeedSync() {
-      const cpus2 = os24.cpus();
+      const cpus2 = os23.cpus();
       let minFreq = 999999999;
       let maxFreq = 0;
       let avgFreq = 0;
@@ -197724,7 +197772,7 @@ var require_cpu = __commonJS({
     function getLoad() {
       return new Promise((resolve20) => {
         process.nextTick(() => {
-          const loads = os24.loadavg().map((x3) => {
+          const loads = os23.loadavg().map((x3) => {
             return x3 / util5.cores();
           });
           const avgLoad = parseFloat(Math.max.apply(Math, loads).toFixed(2));
@@ -197732,7 +197780,7 @@ var require_cpu = __commonJS({
           const now = Date.now() - _current_cpu.ms;
           if (now >= 200) {
             _current_cpu.ms = Date.now();
-            const cpus2 = os24.cpus().map((cpu2) => {
+            const cpus2 = os23.cpus().map((cpu2) => {
               cpu2.times.steal = 0;
               cpu2.times.guest = 0;
               return cpu2;
@@ -197926,7 +197974,7 @@ var require_cpu = __commonJS({
     function getFullLoad() {
       return new Promise((resolve20) => {
         process.nextTick(() => {
-          const cpus2 = os24.cpus();
+          const cpus2 = os23.cpus();
           let totalUser = 0;
           let totalSystem = 0;
           let totalNice = 0;
@@ -197969,7 +198017,7 @@ var require_cpu = __commonJS({
 var require_memory = __commonJS({
   "node_modules/systeminformation/lib/memory.js"(exports2) {
     "use strict";
-    var os24 = __require("os");
+    var os23 = __require("os");
     var exec3 = __require("child_process").exec;
     var execSync4 = __require("child_process").execSync;
     var util5 = require_util13();
@@ -198015,12 +198063,12 @@ var require_memory = __commonJS({
       return new Promise((resolve20) => {
         process.nextTick(() => {
           let result2 = {
-            total: os24.totalmem(),
-            free: os24.freemem(),
-            used: os24.totalmem() - os24.freemem(),
-            active: os24.totalmem() - os24.freemem(),
+            total: os23.totalmem(),
+            free: os23.freemem(),
+            used: os23.totalmem() - os23.freemem(),
+            active: os23.totalmem() - os23.freemem(),
             // temporarily (fallback)
-            available: os24.freemem(),
+            available: os23.freemem(),
             // temporarily (fallback)
             buffers: 0,
             cached: 0,
@@ -198039,9 +198087,9 @@ var require_memory = __commonJS({
                 if (!error2) {
                   const lines = stdout.toString().split("\n");
                   result2.total = parseInt(util5.getValue(lines, "memtotal"), 10);
-                  result2.total = result2.total ? result2.total * 1024 : os24.totalmem();
+                  result2.total = result2.total ? result2.total * 1024 : os23.totalmem();
                   result2.free = parseInt(util5.getValue(lines, "memfree"), 10);
-                  result2.free = result2.free ? result2.free * 1024 : os24.freemem();
+                  result2.free = result2.free ? result2.free * 1024 : os23.freemem();
                   result2.used = result2.total - result2.free;
                   result2.buffers = parseInt(util5.getValue(lines, "buffers"), 10);
                   result2.buffers = result2.buffers ? result2.buffers * 1024 : 0;
@@ -198263,7 +198311,7 @@ var require_memory = __commonJS({
                 }
                 if (!result2.length) {
                   result2.push({
-                    size: os24.totalmem(),
+                    size: os23.totalmem(),
                     bank: "",
                     type: "",
                     ecc: null,
@@ -201411,7 +201459,7 @@ ${BSDName}|"; diskutil info /dev/${BSDName} | grep SMART;`;
 var require_network = __commonJS({
   "node_modules/systeminformation/lib/network.js"(exports2) {
     "use strict";
-    var os24 = __require("os");
+    var os23 = __require("os");
     var exec3 = __require("child_process").exec;
     var execSync4 = __require("child_process").execSync;
     var fs75 = __require("fs");
@@ -201435,7 +201483,7 @@ var require_network = __commonJS({
       let ifacename = "";
       let ifacenameFirst = "";
       try {
-        const ifaces = os24.networkInterfaces();
+        const ifaces = os23.networkInterfaces();
         let scopeid = 9999;
         for (let dev in ifaces) {
           if ({}.hasOwnProperty.call(ifaces, dev)) {
@@ -201455,7 +201503,7 @@ var require_network = __commonJS({
           let defaultIp = "";
           const cmd = "netstat -r";
           const result2 = execSync4(cmd, util5.execOptsWin);
-          const lines = result2.toString().split(os24.EOL);
+          const lines = result2.toString().split(os23.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)) {
@@ -202088,7 +202136,7 @@ var require_network = __commonJS({
       defaultString = "" + defaultString;
       return new Promise((resolve20) => {
         process.nextTick(() => {
-          const ifaces = os24.networkInterfaces();
+          const ifaces = os23.networkInterfaces();
           let result2 = [];
           let nics = [];
           let dnsSuffixes = [];
@@ -203158,7 +203206,7 @@ var require_network = __commonJS({
           if (_windows) {
             try {
               exec3("netstat -r", util5.execOptsWin, (error2, stdout) => {
-                const lines = stdout.toString().split(os24.EOL);
+                const lines = stdout.toString().split(os23.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)) {
@@ -203204,7 +203252,7 @@ var require_network = __commonJS({
 var require_wifi = __commonJS({
   "node_modules/systeminformation/lib/wifi.js"(exports2) {
     "use strict";
-    var os24 = __require("os");
+    var os23 = __require("os");
     var exec3 = __require("child_process").exec;
     var execSync4 = __require("child_process").execSync;
     var util5 = require_util13();
@@ -203426,7 +203474,7 @@ var require_wifi = __commonJS({
         parts2.shift();
         parts2.forEach((part) => {
           part = "ACTIVE:" + part;
-          const lines = part.split(os24.EOL);
+          const lines = part.split(os23.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(")", "");
@@ -203650,15 +203698,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(os24.EOL + os24.EOL + "SSID ");
+              const ssidParts = stdout.toString("utf8").split(os23.EOL + os23.EOL + "SSID ");
               ssidParts.shift();
               ssidParts.forEach((ssidPart) => {
-                const ssidLines = ssidPart.split(os24.EOL);
+                const ssidLines = ssidPart.split(os23.EOL);
                 if (ssidLines && ssidLines.length >= 8 && ssidLines[0].indexOf(":") >= 0) {
                   const bssidsParts = ssidPart.split(" BSSID");
                   bssidsParts.shift();
                   bssidsParts.forEach((bssidPart) => {
-                    const bssidLines = bssidPart.split(os24.EOL);
+                    const bssidLines = bssidPart.split(os23.EOL);
                     const bssidLine = bssidLines[0].split(":");
                     bssidLine.shift();
                     const bssid = bssidLine.join(":").trim().toLowerCase();
@@ -203982,7 +204030,7 @@ var require_wifi = __commonJS({
 var require_processes = __commonJS({
   "node_modules/systeminformation/lib/processes.js"(exports2) {
     "use strict";
-    var os24 = __require("os");
+    var os23 = __require("os");
     var fs75 = __require("fs");
     var path90 = __require("path");
     var exec3 = __require("child_process").exec;
@@ -204633,7 +204681,7 @@ var require_processes = __commonJS({
             line = line.trim().replace(/ +/g, " ").replace(/,+/g, ".");
             const parts2 = line.split(" ");
             const command = parts2.slice(9).join(" ");
-            const pmem = parseFloat((1 * parseInt(parts2[3]) * 1024 / os24.totalmem()).toFixed(1));
+            const pmem = parseFloat((1 * parseInt(parts2[3]) * 1024 / os23.totalmem()).toFixed(1));
             const started = parseElapsed(parts2[5]);
             result2.push({
               pid: parseInt(parts2[0]),
@@ -204836,7 +204884,7 @@ var require_processes = __commonJS({
                         cpu: 0,
                         cpuu: 0,
                         cpus: 0,
-                        mem: memw / os24.totalmem() * 100,
+                        mem: memw / os23.totalmem() * 100,
                         priority: element.Priority | null,
                         memVsz: element.PageFileUsage || null,
                         memRss: Math.floor((element.WorkingSetSize || 0) / 1024),
@@ -204990,7 +205038,7 @@ var require_processes = __commonJS({
                         result2.forEach((item) => {
                           if (item.proc.toLowerCase() === pname.toLowerCase()) {
                             item.pids.push(pid);
-                            item.mem += mem / os24.totalmem() * 100;
+                            item.mem += mem / os23.totalmem() * 100;
                             processFound = true;
                           }
                         });
@@ -205000,7 +205048,7 @@ var require_processes = __commonJS({
                             pid,
                             pids: [pid],
                             cpu: 0,
-                            mem: mem / os24.totalmem() * 100
+                            mem: mem / os23.totalmem() * 100
                           });
                         }
                       }
@@ -206741,7 +206789,7 @@ var require_docker = __commonJS({
 var require_virtualbox = __commonJS({
   "node_modules/systeminformation/lib/virtualbox.js"(exports2) {
     "use strict";
-    var os24 = __require("os");
+    var os23 = __require("os");
     var exec3 = __require("child_process").exec;
     var util5 = require_util13();
     function vboxInfo(callback) {
@@ -206750,10 +206798,10 @@ var require_virtualbox = __commonJS({
         process.nextTick(() => {
           try {
             exec3(util5.getVboxmanage() + " list vms --long", (error2, stdout) => {
-              let parts2 = (os24.EOL + stdout.toString()).split(os24.EOL + "Name:");
+              let parts2 = (os23.EOL + stdout.toString()).split(os23.EOL + "Name:");
               parts2.shift();
               parts2.forEach((part) => {
-                const lines = ("Name:" + part).split(os24.EOL);
+                const lines = ("Name:" + part).split(os23.EOL);
                 const state = util5.getValue(lines, "State");
                 const running = state.startsWith("running");
                 const runningSinceString = running ? state.replace("running (since ", "").replace(")", "").trim() : "";
@@ -214180,8 +214228,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";
   }
 });
 
@@ -216572,13 +216620,13 @@ var require_src55 = __commonJS({
     };
     function mapOtelResourceToMonitoredResource(resource) {
       const attrs = resource.attributes;
-      const platform15 = attrs[semantic_conventions_1.SEMRESATTRS_CLOUD_PLATFORM];
+      const platform14 = attrs[semantic_conventions_1.SEMRESATTRS_CLOUD_PLATFORM];
       let mr;
-      if (platform15 === semantic_conventions_1.CLOUDPLATFORMVALUES_GCP_COMPUTE_ENGINE) {
+      if (platform14 === semantic_conventions_1.CLOUDPLATFORMVALUES_GCP_COMPUTE_ENGINE) {
         mr = createMonitoredResource(GCE_INSTANCE, attrs);
-      } else if (platform15 === semantic_conventions_1.CLOUDPLATFORMVALUES_GCP_APP_ENGINE) {
+      } else if (platform14 === semantic_conventions_1.CLOUDPLATFORMVALUES_GCP_APP_ENGINE) {
         mr = createMonitoredResource(GAE_INSTANCE, attrs);
-      } else if (platform15 === semantic_conventions_1.CLOUDPLATFORMVALUES_AWS_EC2) {
+      } else if (platform14 === 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) {
@@ -226449,7 +226497,7 @@ var require_grpc = __commonJS({
     var fs75 = __require("fs");
     var google_auth_library_1 = require_src8();
     var grpc = require_src28();
-    var os24 = __require("os");
+    var os23 = __require("os");
     var path_1 = __require("path");
     var path90 = __require("path");
     var protobuf = require_protobufjs();
@@ -226754,7 +226802,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)(os24.homedir(), ".secureConnect", "context_aware_metadata.json");
+          const metadataPath = (0, path_1.join)(os23.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");
@@ -291439,7 +291487,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname3);
-    return "0.33.0-preview.4";
+    return "0.33.0-preview.6";
   })();
   return versionPromise;
 }
@@ -291457,21 +291505,21 @@ var init_version5 = __esm({
 import { fileURLToPath as fileURLToPath6 } from "node:url";
 import path25 from "node:path";
 function getPlatform() {
-  const platform15 = process.platform;
+  const platform14 = process.platform;
   const arch4 = process.arch;
-  if (platform15 === "darwin" && arch4 === "x64") {
+  if (platform14 === "darwin" && arch4 === "x64") {
     return "DARWIN_AMD64";
   }
-  if (platform15 === "darwin" && arch4 === "arm64") {
+  if (platform14 === "darwin" && arch4 === "arm64") {
     return "DARWIN_ARM64";
   }
-  if (platform15 === "linux" && arch4 === "x64") {
+  if (platform14 === "linux" && arch4 === "x64") {
     return "LINUX_AMD64";
   }
-  if (platform15 === "linux" && arch4 === "arm64") {
+  if (platform14 === "linux" && arch4 === "arm64") {
     return "LINUX_ARM64";
   }
-  if (platform15 === "win32" && arch4 === "x64") {
+  if (platform14 === "win32" && arch4 === "x64") {
     return "WINDOWS_AMD64";
   }
   return "PLATFORM_UNSPECIFIED";
@@ -293618,11 +293666,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);
           }
         }
@@ -299003,7 +299051,7 @@ var init_index_min = __esm({
 // node_modules/path-scurry/dist/esm/index.js
 import { posix as posix2, win32 as win322 } 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, normalizeCache2, normalize2, normalizeNocaseCache, normalizeNocase, ResolveCache, ChildrenCache, setAsCwd, PathBase, PathWin32, PathPosix, PathScurryBase, PathScurryWin32, PathScurryPosix, PathScurryDarwin, Path, PathScurry;
@@ -299013,10 +299061,10 @@ var init_esm9 = __esm({
     init_esm();
     realpathSync2 = rps.native;
     defaultFS = {
-      lstatSync,
+      lstatSync: lstatSync2,
       readdir: readdirCB,
       readdirSync,
-      readlinkSync,
+      readlinkSync: readlinkSync2,
       realpathSync: realpathSync2,
       promises: {
         lstat,
@@ -300759,7 +300807,7 @@ var init_pattern = __esm({
       #isUNC;
       #isAbsolute;
       #followGlobstar = true;
-      constructor(patternList, globList, index, platform15) {
+      constructor(patternList, globList, index, platform14) {
         if (!isPatternList(patternList)) {
           throw new TypeError("empty pattern list");
         }
@@ -300776,7 +300824,7 @@ var init_pattern = __esm({
         this.#patternList = patternList;
         this.#globList = globList;
         this.#index = index;
-        this.#platform = platform15;
+        this.#platform = platform14;
         if (this.#index === 0) {
           if (this.isUNC()) {
             const [p0, p1, p2, p3, ...prest] = this.#patternList;
@@ -300925,12 +300973,12 @@ var init_ignore = __esm({
       absoluteChildren;
       platform;
       mmopts;
-      constructor(ignored, { nobrace, nocase, noext, noglobstar, platform: platform15 = defaultPlatform2 }) {
+      constructor(ignored, { nobrace, nocase, noext, noglobstar, platform: platform14 = defaultPlatform2 }) {
         this.relative = [];
         this.absolute = [];
         this.relativeChildren = [];
         this.absoluteChildren = [];
-        this.platform = platform15;
+        this.platform = platform14;
         this.mmopts = {
           dot: true,
           nobrace,
@@ -300938,7 +300986,7 @@ var init_ignore = __esm({
           noext,
           noglobstar,
           optimizationLevel: 2,
-          platform: platform15,
+          platform: platform14,
           nocomment: true,
           nonegate: true
         };
@@ -308228,8 +308276,8 @@ var require_path_key = __commonJS({
     "use strict";
     var pathKey2 = (options = {}) => {
       const environment = options.env || process.env;
-      const platform15 = options.platform || process.platform;
-      if (platform15 !== "win32") {
+      const platform14 = options.platform || process.platform;
+      if (platform14 !== "win32") {
         return "PATH";
       }
       return Object.keys(environment).reverse().find((key) => key.toUpperCase() === "PATH") || "Path";
@@ -308499,9 +308547,9 @@ var require_cross_spawn = __commonJS({
 function pathKey(options = {}) {
   const {
     env: env2 = process.env,
-    platform: platform15 = process.platform
+    platform: platform14 = process.platform
   } = options;
-  if (platform15 !== "win32") {
+  if (platform14 !== "win32") {
     return "PATH";
   }
   return Object.keys(env2).reverse().find((key) => key.toUpperCase() === "PATH") || "Path";
@@ -325965,8 +326013,8 @@ var init_downloadRipGrep = __esm({
     BIN_PATH = join11(__dirname5, "../bin");
     getTarget = () => {
       const arch4 = process.env.npm_config_arch || os12.arch();
-      const platform15 = process.env.platform || os12.platform();
-      switch (platform15) {
+      const platform14 = process.env.platform || os12.platform();
+      switch (platform14) {
         case "darwin":
           switch (arch4) {
             case "arm64":
@@ -326000,7 +326048,7 @@ var init_downloadRipGrep = __esm({
               return "i686-unknown-linux-musl.tar.gz";
           }
         default:
-          throw new VError("Unknown platform: " + platform15);
+          throw new VError("Unknown platform: " + platform14);
       }
     };
     downloadFile2 = async (url5, outFile) => {
@@ -327668,11 +327716,11 @@ async function getIdeProcessInfoForWindows() {
   return { pid: myPid, command: myProc.command };
 }
 async function getIdeProcessInfo() {
-  const platform15 = os14.platform();
+  const platform14 = os14.platform();
   if (process.env["GEMINI_CLI_IDE_PID"]) {
     const idePid = parseInt(process.env["GEMINI_CLI_IDE_PID"], 10);
     if (!isNaN(idePid) && idePid > 0) {
-      if (platform15 === "win32") {
+      if (platform14 === "win32") {
         const processMap = await getProcessTableWindows();
         const proc2 = processMap.get(idePid);
         return { pid: idePid, command: proc2?.command || "" };
@@ -327681,7 +327729,7 @@ async function getIdeProcessInfo() {
       return { pid: idePid, command };
     }
   }
-  if (platform15 === "win32") {
+  if (platform14 === "win32") {
     return getIdeProcessInfoForWindows();
   }
   return getIdeProcessInfoForUnix();
@@ -386771,7 +386819,7 @@ async function getEnvironmentContext(config3) {
     month: "long",
     day: "numeric"
   });
-  const platform15 = process.platform;
+  const platform14 = process.platform;
   const directoryContext = config3.getIncludeDirectoryTree() ? await getDirectoryContextString(config3) : "";
   const tempDir = config3.storage.getProjectTempDir();
   const environmentMemory = config3.getEnvironmentMemory();
@@ -386779,7 +386827,7 @@ async function getEnvironmentContext(config3) {
 <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: ${platform15}
+My operating system is: ${platform14}
 The project's temporary directory is: ${tempDir}
 ${directoryContext}
 
@@ -399906,8 +399954,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();
@@ -400077,16 +400125,7 @@ var init_workspaceContext = __esm({
        * if it did exist.
        */
       fullyResolvedPath(pathToCheck) {
-        try {
-          return fs57.realpathSync(path68.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(path68.resolve(this.targetDir, pathToCheck));
       }
       /**
        * Checks if a path is within a given root directory.
@@ -400098,16 +400137,6 @@ var init_workspaceContext = __esm({
         const relative6 = path68.relative(rootDirectory, pathToCheck);
         return !relative6.startsWith(`..${path68.sep}`) && relative6 !== ".." && !path68.isAbsolute(relative6);
       }
-      /**
-       * Checks if a file path is a symbolic link that points to a file.
-       */
-      isFileSymlink(filePath) {
-        try {
-          return !fs57.readlinkSync(filePath).endsWith("/");
-        } catch (_error) {
-          return false;
-        }
-      }
     };
   }
 });
@@ -400313,34 +400342,17 @@ function matchesWildcard(pattern, toolName, serverName) {
   if (pattern === "*") {
     return true;
   }
-  if (pattern.includes("__")) {
-    return matchesCompositePattern(pattern, toolName, serverName);
-  }
-  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 (pattern === `${MCP_TOOL_PREFIX}*`) {
+    return serverName !== void 0;
   }
-  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) {
@@ -400348,6 +400360,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)) {
@@ -400389,6 +400410,7 @@ var init_policy_engine = __esm({
     init_protocol2();
     init_shell_utils();
     init_tool_names();
+    init_mcp_tool();
     PolicyEngine = class {
       rules;
       checkers;
@@ -400517,6 +400539,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);
@@ -400538,12 +400569,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));
@@ -400689,107 +400714,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) {
@@ -414054,7 +414024,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];
@@ -414139,8 +414112,6 @@ async function loadPoliciesFromToml(policyPaths, getPolicyTier) {
         }
         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);
@@ -414163,16 +414134,14 @@ async function loadPoliciesFromToml(policyPaths, getPolicyTier) {
           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,
@@ -414246,14 +414215,15 @@ Error: ${error2.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,
@@ -414312,14 +414282,19 @@ Error: ${error2.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))
@@ -414347,6 +414322,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(),
@@ -414429,6 +414405,7 @@ var init_config3 = __esm({
     init_shell_utils();
     init_tool_names();
     init_errors();
+    init_mcp_tool();
     init_security();
     __filename3 = fileURLToPath15(import.meta.url);
     __dirname7 = path77.dirname(__filename3);
@@ -418851,7 +418828,6 @@ ${clientInstructions}
 // packages/core/dist/src/config/config.js
 import * as fs68 from "node:fs";
 import * as path81 from "node:path";
-import * as os23 from "node:os";
 import { inspect as inspect4 } from "node:util";
 import process24 from "node:process";
 var DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD, AuthProviderType, Config;
@@ -420180,22 +420156,13 @@ var init_config4 = __esm({
        * @returns true if the path is allowed, false otherwise.
        */
       isPathAllowed(absolutePath) {
-        const realpath3 = (p) => {
-          let resolved;
-          try {
-            resolved = fs68.realpathSync(p);
-          } catch {
-            resolved = path81.resolve(p);
-          }
-          return os23.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);
       }
       /**
@@ -421250,8 +421217,8 @@ var require_utils22 = __commonJS({
     exports2.toPosixSlashes = (str2) => str2.replace(REGEX_BACKSLASH, "/");
     exports2.isWindows = () => {
       if (typeof navigator !== "undefined" && navigator.platform) {
-        const platform15 = navigator.platform.toLowerCase();
-        return platform15 === "win32" || platform15 === "windows";
+        const platform14 = navigator.platform.toLowerCase();
+        return platform14 === "win32" || platform14 === "windows";
       }
       if (typeof process !== "undefined" && process.platform) {
         return process.platform === "win32";
@@ -423130,7 +423097,7 @@ var require_main2 = __commonJS({
   "packages/a2a-server/node_modules/dotenv/lib/main.js"(exports2, module2) {
     var fs75 = __require("fs");
     var path90 = __require("path");
-    var os24 = __require("os");
+    var os23 = __require("os");
     var crypto23 = __require("crypto");
     var packageJson4 = require_package15();
     var version4 = packageJson4.version;
@@ -423253,7 +423220,7 @@ var require_main2 = __commonJS({
       return null;
     }
     function _resolveHome(envPath) {
-      return envPath[0] === "~" ? path90.join(os24.homedir(), envPath.slice(1)) : envPath;
+      return envPath[0] === "~" ? path90.join(os23.homedir(), envPath.slice(1)) : envPath;
     }
     function _configVault(options) {
       const debug2 = Boolean(options && options.debug);