@google/gemini-cli-a2a-server 0.33.0 → 0.33.1

package/dist/a2a-server.mjs

@@ -108573,7 +108573,7 @@ var init_mcp_tool = __esm({
         return safeJsonStringify(this.params);
       }
     };
-    DiscoveredMCPTool = class _DiscoveredMCPTool extends BaseDeclarativeTool {
+    DiscoveredMCPTool = class extends BaseDeclarativeTool {
       mcpTool;
       serverName;
       serverToolName;
@@ -108625,9 +108625,6 @@ var init_mcp_tool = __esm({
       getFullyQualifiedName() {
         return generateValidName(`${this.serverName}${MCP_QUALIFIED_NAME_SEPARATOR}${this.serverToolName}`);
       }
-      asFullyQualifiedTool() {
-        return new _DiscoveredMCPTool(this.mcpTool, this.serverName, this.serverToolName, this.description, this.parameterSchema, this.messageBus, this.trust, this.isReadOnly, this.getFullyQualifiedName(), this.cliConfig, this.extensionName, this.extensionId, this._toolAnnotations);
-      }
       createInvocation(params, messageBus, _toolName, _displayName) {
         return new DiscoveredMCPToolInvocation(this.mcpTool, this.serverName, this.serverToolName, _displayName ?? this.displayName, messageBus, this.trust, params, this.cliConfig, this.description, this.parameterSchema, this._toolAnnotations);
       }
@@ -198422,18 +198419,28 @@ function isValidToolName(name3, options = {}) {
   if (options.allowWildcards && name3 === "*") {
     return true;
   }
-  if (name3.includes("__")) {
-    const parts2 = name3.split("__");
-    if (parts2.length !== 2 || parts2[0].length === 0 || parts2[1].length === 0) {
+  if (isMcpToolName(name3)) {
+    if (name3 === `${MCP_TOOL_PREFIX}*` && options.allowWildcards) {
+      return true;
+    }
+    if (name3.startsWith(`${MCP_TOOL_PREFIX}_`)) {
       return false;
     }
-    const server = parts2[0];
-    const tool = parts2[1];
-    if (tool === "*") {
-      return !!options.allowWildcards;
+    const parsed = parseMcpToolName(name3);
+    if (parsed.serverName && parsed.toolName) {
+      const slugRegex = /^[a-z0-9_.:-]+$/i;
+      if (!slugRegex.test(parsed.serverName)) {
+        return false;
+      }
+      if (parsed.toolName === "*") {
+        return options.allowWildcards === true;
+      }
+      if (/^_*$/.test(parsed.toolName)) {
+        return false;
+      }
+      return slugRegex.test(parsed.toolName);
     }
-    const slugRegex = /^[a-z0-9_.:-]+$/i;
-    return slugRegex.test(server) && slugRegex.test(tool);
+    return false;
   }
   return false;
 }
@@ -198442,6 +198449,7 @@ var init_tool_names = __esm({
   "packages/core/dist/src/tools/tool-names.js"() {
     "use strict";
     init_coreTools();
+    init_mcp_tool();
     EDIT_TOOL_NAMES = /* @__PURE__ */ new Set([EDIT_TOOL_NAME, WRITE_FILE_TOOL_NAME]);
     WRITE_FILE_DISPLAY_NAME = "WriteFile";
     EDIT_DISPLAY_NAME = "Edit";
@@ -199994,8 +200002,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 = "6ee19e1f6";
-    CLI_VERSION = "0.33.0";
+    GIT_COMMIT_INFO = "f59f9e931";
+    CLI_VERSION = "0.33.1";
   }
 });
 
@@ -277232,7 +277240,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname3);
-    return "0.33.0";
+    return "0.33.1";
   })();
   return versionPromise;
 }
@@ -279243,11 +279251,7 @@ Signal: Signal number or \`(none)\` if no signal was received.
        */
       registerTool(tool) {
         if (this.allKnownTools.has(tool.name)) {
-          if (tool instanceof DiscoveredMCPTool) {
-            tool = tool.asFullyQualifiedTool();
-          } else {
-            debugLogger.warn(`Tool with name "${tool.name}" is already registered. Overwriting.`);
-          }
+          debugLogger.warn(`Tool with name "${tool.name}" is already registered. Overwriting.`);
         }
         this.allKnownTools.set(tool.name, tool);
       }
@@ -279521,7 +279525,14 @@ Signal: Signal number or \`(none)\` if no signal was received.
         for (const name3 of toolNames) {
           const tool = this.getTool(name3);
           if (tool) {
-            declarations.push(tool.getSchema(modelId));
+            let schema2 = tool.getSchema(modelId);
+            if (tool instanceof DiscoveredMCPTool) {
+              schema2 = {
+                ...schema2,
+                name: tool.getFullyQualifiedName()
+              };
+            }
+            declarations.push(schema2);
           }
         }
         return declarations;
@@ -279581,16 +279592,6 @@ Signal: Signal number or \`(none)\` if no signal was received.
             debugLogger.debug(`Resolved legacy tool name "${name3}" to current name "${currentName}"`);
           }
         }
-        if (!tool && name3.includes("__")) {
-          for (const t3 of this.allKnownTools.values()) {
-            if (t3 instanceof DiscoveredMCPTool) {
-              if (t3.getFullyQualifiedName() === name3) {
-                tool = t3;
-                break;
-              }
-            }
-          }
-        }
         if (tool && this.isActiveTool(tool)) {
           return tool;
         }
@@ -393067,7 +393068,7 @@ var init_agentLoader = __esm({
       name: nameSchema,
       description: external_exports.string().min(1),
       display_name: external_exports.string().optional(),
-      tools: external_exports.array(external_exports.string().refine((val) => isValidToolName(val), {
+      tools: external_exports.array(external_exports.string().refine((val) => isValidToolName(val, { allowWildcards: true }), {
         message: "Invalid tool name"
       })).optional(),
       model: external_exports.string().optional(),
@@ -398961,6 +398962,7 @@ var init_local_executor = __esm({
     init_geminiChat();
     init_node();
     init_tool_registry();
+    init_tools();
     init_mcp_tool();
     init_turn();
     init_types3();
@@ -399008,18 +399010,40 @@ var init_local_executor = __esm({
         const agentToolRegistry = new ToolRegistry(runtimeContext, runtimeContext.getMessageBus());
         const parentToolRegistry = runtimeContext.getToolRegistry();
         const allAgentNames = new Set(runtimeContext.getAgentRegistry().getAllAgentNames());
+        const registerToolInstance = (tool) => {
+          if (allAgentNames.has(tool.name)) {
+            debugLogger.warn(`[LocalAgentExecutor] Skipping subagent tool '${tool.name}' for agent '${definition.name}' to prevent recursion.`);
+            return;
+          }
+          agentToolRegistry.registerTool(tool);
+        };
         const registerToolByName = (toolName) => {
-          if (allAgentNames.has(toolName)) {
-            debugLogger.warn(`[LocalAgentExecutor] Skipping subagent tool '${toolName}' for agent '${definition.name}' to prevent recursion.`);
+          if (toolName === "*") {
+            for (const tool2 of parentToolRegistry.getAllTools()) {
+              registerToolInstance(tool2);
+            }
             return;
           }
+          if (isMcpToolName(toolName)) {
+            if (toolName === `${MCP_TOOL_PREFIX}*`) {
+              for (const tool2 of parentToolRegistry.getAllTools()) {
+                if (tool2 instanceof DiscoveredMCPTool) {
+                  registerToolInstance(tool2);
+                }
+              }
+              return;
+            }
+            const parsed = parseMcpToolName(toolName);
+            if (parsed.serverName && parsed.toolName === "*") {
+              for (const tool2 of parentToolRegistry.getToolsByServer(parsed.serverName)) {
+                registerToolInstance(tool2);
+              }
+              return;
+            }
+          }
           const tool = parentToolRegistry.getTool(toolName);
           if (tool) {
-            if (tool instanceof DiscoveredMCPTool) {
-              agentToolRegistry.registerTool(tool.asFullyQualifiedTool());
-            } else {
-              agentToolRegistry.registerTool(tool);
-            }
+            registerToolInstance(tool);
           }
         };
         if (definition.toolConfig) {
@@ -399674,17 +399698,12 @@ var init_local_executor = __esm({
         const toolsList = [];
         const { toolConfig, outputConfig } = this.definition;
         if (toolConfig) {
-          const toolNamesToLoad = [];
           for (const toolRef of toolConfig.tools) {
-            if (typeof toolRef === "string") {
-              toolNamesToLoad.push(toolRef);
-            } else if (typeof toolRef === "object" && "schema" in toolRef) {
-              toolsList.push(toolRef.schema);
-            } else {
+            if (typeof toolRef === "object" && !("schema" in toolRef)) {
               toolsList.push(toolRef);
             }
           }
-          toolsList.push(...this.toolRegistry.getFunctionDeclarationsFiltered(toolNamesToLoad));
+          toolsList.push(...this.toolRegistry.getFunctionDeclarations());
         }
         const completeTool = {
           name: TASK_COMPLETE_TOOL_NAME,