@mcpc-tech/cli 0.1.34 → 0.1.36

package/bin/mcpc.cjs

@@ -8884,15 +8884,29 @@ ${JSON.stringify(cleanedSchema, null, 2)}
    * Execute a tool with runtime validation
    */
   async executeTool(tool2, toolArgs, executeSpan) {
-    const externalTool = this.toolNameToDetailList.find(([name]) => name === tool2);
-    if (externalTool) {
-      const [, toolDetail] = externalTool;
+    const isExternalTool = this.toolNameToDetailList.some(([name]) => name === tool2);
+    const isInternalTool = this.allToolNames.includes(tool2);
+    if (!isExternalTool && !isInternalTool) {
       if (executeSpan) {
         executeSpan.setAttributes({
-          toolType: "external",
-          selectedTool: tool2
+          toolType: "not_found",
+          tool: tool2
         });
+        endSpan(executeSpan);
       }
+      return {
+        content: [
+          {
+            type: "text",
+            text: `Tool "${tool2}" not found. Available tools: ${this.allToolNames.join(", ")}`
+          }
+        ],
+        isError: true
+      };
+    }
+    if (isExternalTool) {
+      const externalTool = this.toolNameToDetailList.find(([name]) => name === tool2);
+      const [, toolDetail] = externalTool;
       if (toolDetail.inputSchema) {
         const rawSchema = extractJsonSchema(toolDetail.inputSchema);
         const validation = validateSchema(toolArgs, rawSchema);
@@ -8915,84 +8929,53 @@ ${JSON.stringify(cleanedSchema, null, 2)}
           };
         }
       }
-      this.logger.debug({
-        message: "Executing external tool",
-        tool: tool2
+    }
+    const toolType = isExternalTool ? "external" : "internal";
+    if (executeSpan) {
+      executeSpan.setAttributes({
+        toolType,
+        selectedTool: tool2
       });
-      const result = await toolDetail.execute(toolArgs);
+    }
+    this.logger.debug({
+      message: `Executing ${toolType} tool`,
+      tool: tool2
+    });
+    try {
+      const result = await this.server.callTool(tool2, toolArgs, {
+        agentName: this.name
+      });
+      const callToolResult = result ?? {
+        content: []
+      };
       if (executeSpan) {
         executeSpan.setAttributes({
           success: true,
-          isError: !!result.isError,
-          resultContentLength: result.content?.length || 0
+          isError: !!callToolResult.isError,
+          resultContentLength: callToolResult.content?.length || 0
         });
         endSpan(executeSpan);
       }
-      return result;
-    }
-    if (this.allToolNames.includes(tool2)) {
+      return callToolResult;
+    } catch (error) {
       if (executeSpan) {
-        executeSpan.setAttributes({
-          toolType: "internal",
-          selectedTool: tool2
-        });
-      }
-      this.logger.debug({
-        message: "Executing internal tool",
-        tool: tool2
-      });
-      try {
-        const result = await this.server.callTool(tool2, toolArgs, {
-          agentName: this.name
-        });
-        const callToolResult = result ?? {
-          content: []
-        };
-        if (executeSpan) {
-          executeSpan.setAttributes({
-            success: true,
-            isError: !!callToolResult.isError,
-            resultContentLength: callToolResult.content?.length || 0
-          });
-          endSpan(executeSpan);
-        }
-        return callToolResult;
-      } catch (error) {
-        if (executeSpan) {
-          endSpan(executeSpan, error);
-        }
-        this.logger.error({
-          message: "Error executing internal tool",
-          tool: tool2,
-          error: String(error)
-        });
-        return {
-          content: [
-            {
-              type: "text",
-              text: `Error executing tool "${tool2}": ${error instanceof Error ? error.message : String(error)}`
-            }
-          ],
-          isError: true
-        };
+        endSpan(executeSpan, error);
       }
-    }
-    if (executeSpan) {
-      executeSpan.setAttributes({
-        toolType: "not_found",
-        tool: tool2
+      this.logger.error({
+        message: `Error executing ${toolType} tool`,
+        tool: tool2,
+        error: String(error)
       });
-      endSpan(executeSpan);
+      return {
+        content: [
+          {
+            type: "text",
+            text: `Error executing tool "${tool2}": ${error instanceof Error ? error.message : String(error)}`
+          }
+        ],
+        isError: true
+      };
     }
-    return {
-      content: [
-        {
-          type: "text",
-          text: `Tool "${tool2}" not found. Available tools: ${this.allToolNames.join(", ")}`
-        }
-      ],
-      isError: true
-    };
   }
   validate(args, schema) {
     return validateSchema(args, schema);
@@ -9433,7 +9416,7 @@ IMPORTANT: You MUST respond with valid JSON only. Do not include any text before
     let enhanced = systemPrompt || "";
     const toolsPrompt = `
 
-AVAILABLE TOOLS:
+<available_tools>
 You have access to the following tools. To use a tool, respond with this XML format:
 <use_tool tool="tool_name">
 {"param1": "value1", "param2": "value2"}
@@ -9442,23 +9425,34 @@ You have access to the following tools. To use a tool, respond with this XML for
 Follow the JSON schema definition for each tool's parameters.
 You can use multiple tools in one response. DO NOT include text before or after tool calls - wait for the tool results first.
 
-Tools:`;
+<tools>`;
     const toolDescriptions = tools.map((tool2) => {
       if (tool2.type === "function") {
         const toolAny = tool2;
         const description = toolAny.description || "No description provided";
         const schema = toolAny.inputSchema || toolAny.parameters;
-        const params = schema ? `
-  JSON Schema: ${JSON.stringify(schema, null, 2)}` : "";
+        const schemaStr = schema ? `
+<schema>
+${JSON.stringify(schema, null, 2)}
+</schema>` : "";
         return `
-- ${tool2.name}: ${description}${params}`;
+<tool name="${tool2.name}">
+<description>
+${description}
+</description>${schemaStr}
+</tool>`;
       } else if (tool2.type === "provider-defined") {
         return `
-- ${tool2.name}: ${tool2.id || "No description provided"}`;
+<tool name="${tool2.name}">
+<description>${tool2.id || "No description provided"}</description>
+</tool>`;
       }
       return "";
     }).filter(Boolean).join("");
-    enhanced = enhanced ? `${enhanced}${toolsPrompt}${toolDescriptions}` : `${toolsPrompt}${toolDescriptions}`.trim();
+    const toolsEnd = `
+</tools>
+</available_tools>`;
+    enhanced = enhanced ? `${enhanced}${toolsPrompt}${toolDescriptions}${toolsEnd}` : `${toolsPrompt}${toolDescriptions}${toolsEnd}`.trim();
     return enhanced || void 0;
   }
   /**

package/bin/mcpc.mjs

@@ -8892,15 +8892,29 @@ ${JSON.stringify(cleanedSchema, null, 2)}
    * Execute a tool with runtime validation
    */
   async executeTool(tool2, toolArgs, executeSpan) {
-    const externalTool = this.toolNameToDetailList.find(([name]) => name === tool2);
-    if (externalTool) {
-      const [, toolDetail] = externalTool;
+    const isExternalTool = this.toolNameToDetailList.some(([name]) => name === tool2);
+    const isInternalTool = this.allToolNames.includes(tool2);
+    if (!isExternalTool && !isInternalTool) {
       if (executeSpan) {
         executeSpan.setAttributes({
-          toolType: "external",
-          selectedTool: tool2
+          toolType: "not_found",
+          tool: tool2
         });
+        endSpan(executeSpan);
       }
+      return {
+        content: [
+          {
+            type: "text",
+            text: `Tool "${tool2}" not found. Available tools: ${this.allToolNames.join(", ")}`
+          }
+        ],
+        isError: true
+      };
+    }
+    if (isExternalTool) {
+      const externalTool = this.toolNameToDetailList.find(([name]) => name === tool2);
+      const [, toolDetail] = externalTool;
       if (toolDetail.inputSchema) {
         const rawSchema = extractJsonSchema(toolDetail.inputSchema);
         const validation = validateSchema(toolArgs, rawSchema);
@@ -8923,84 +8937,53 @@ ${JSON.stringify(cleanedSchema, null, 2)}
           };
         }
       }
-      this.logger.debug({
-        message: "Executing external tool",
-        tool: tool2
+    }
+    const toolType = isExternalTool ? "external" : "internal";
+    if (executeSpan) {
+      executeSpan.setAttributes({
+        toolType,
+        selectedTool: tool2
       });
-      const result = await toolDetail.execute(toolArgs);
+    }
+    this.logger.debug({
+      message: `Executing ${toolType} tool`,
+      tool: tool2
+    });
+    try {
+      const result = await this.server.callTool(tool2, toolArgs, {
+        agentName: this.name
+      });
+      const callToolResult = result ?? {
+        content: []
+      };
       if (executeSpan) {
         executeSpan.setAttributes({
           success: true,
-          isError: !!result.isError,
-          resultContentLength: result.content?.length || 0
+          isError: !!callToolResult.isError,
+          resultContentLength: callToolResult.content?.length || 0
         });
         endSpan(executeSpan);
       }
-      return result;
-    }
-    if (this.allToolNames.includes(tool2)) {
+      return callToolResult;
+    } catch (error) {
       if (executeSpan) {
-        executeSpan.setAttributes({
-          toolType: "internal",
-          selectedTool: tool2
-        });
-      }
-      this.logger.debug({
-        message: "Executing internal tool",
-        tool: tool2
-      });
-      try {
-        const result = await this.server.callTool(tool2, toolArgs, {
-          agentName: this.name
-        });
-        const callToolResult = result ?? {
-          content: []
-        };
-        if (executeSpan) {
-          executeSpan.setAttributes({
-            success: true,
-            isError: !!callToolResult.isError,
-            resultContentLength: callToolResult.content?.length || 0
-          });
-          endSpan(executeSpan);
-        }
-        return callToolResult;
-      } catch (error) {
-        if (executeSpan) {
-          endSpan(executeSpan, error);
-        }
-        this.logger.error({
-          message: "Error executing internal tool",
-          tool: tool2,
-          error: String(error)
-        });
-        return {
-          content: [
-            {
-              type: "text",
-              text: `Error executing tool "${tool2}": ${error instanceof Error ? error.message : String(error)}`
-            }
-          ],
-          isError: true
-        };
+        endSpan(executeSpan, error);
       }
-    }
-    if (executeSpan) {
-      executeSpan.setAttributes({
-        toolType: "not_found",
-        tool: tool2
+      this.logger.error({
+        message: `Error executing ${toolType} tool`,
+        tool: tool2,
+        error: String(error)
       });
-      endSpan(executeSpan);
+      return {
+        content: [
+          {
+            type: "text",
+            text: `Error executing tool "${tool2}": ${error instanceof Error ? error.message : String(error)}`
+          }
+        ],
+        isError: true
+      };
     }
-    return {
-      content: [
-        {
-          type: "text",
-          text: `Tool "${tool2}" not found. Available tools: ${this.allToolNames.join(", ")}`
-        }
-      ],
-      isError: true
-    };
   }
   validate(args, schema) {
     return validateSchema(args, schema);
@@ -9441,7 +9424,7 @@ IMPORTANT: You MUST respond with valid JSON only. Do not include any text before
     let enhanced = systemPrompt || "";
     const toolsPrompt = `
 
-AVAILABLE TOOLS:
+<available_tools>
 You have access to the following tools. To use a tool, respond with this XML format:
 <use_tool tool="tool_name">
 {"param1": "value1", "param2": "value2"}
@@ -9450,23 +9433,34 @@ You have access to the following tools. To use a tool, respond with this XML for
 Follow the JSON schema definition for each tool's parameters.
 You can use multiple tools in one response. DO NOT include text before or after tool calls - wait for the tool results first.
 
-Tools:`;
+<tools>`;
     const toolDescriptions = tools.map((tool2) => {
       if (tool2.type === "function") {
         const toolAny = tool2;
         const description = toolAny.description || "No description provided";
         const schema = toolAny.inputSchema || toolAny.parameters;
-        const params = schema ? `
-  JSON Schema: ${JSON.stringify(schema, null, 2)}` : "";
+        const schemaStr = schema ? `
+<schema>
+${JSON.stringify(schema, null, 2)}
+</schema>` : "";
         return `
-- ${tool2.name}: ${description}${params}`;
+<tool name="${tool2.name}">
+<description>
+${description}
+</description>${schemaStr}
+</tool>`;
       } else if (tool2.type === "provider-defined") {
         return `
-- ${tool2.name}: ${tool2.id || "No description provided"}`;
+<tool name="${tool2.name}">
+<description>${tool2.id || "No description provided"}</description>
+</tool>`;
       }
       return "";
     }).filter(Boolean).join("");
-    enhanced = enhanced ? `${enhanced}${toolsPrompt}${toolDescriptions}` : `${toolsPrompt}${toolDescriptions}`.trim();
+    const toolsEnd = `
+</tools>
+</available_tools>`;
+    enhanced = enhanced ? `${enhanced}${toolsPrompt}${toolDescriptions}${toolsEnd}` : `${toolsPrompt}${toolDescriptions}${toolsEnd}`.trim();
     return enhanced || void 0;
   }
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcpc-tech/cli",
-  "version": "0.1.34",
+  "version": "0.1.36",
   "homepage": "https://jsr.io/@mcpc/cli",
   "dependencies": {
     "@hono/zod-openapi": "^0.19.2",