npm - @mcpc-tech/cli - Versions diffs - 0.1.34 → 0.1.35 - Mend

@mcpc-tech/cli 0.1.34 → 0.1.35

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/bin/mcpc.cjs CHANGED Viewed

@@ -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);

package/bin/mcpc.mjs CHANGED Viewed

@@ -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);

package/package.json CHANGED Viewed

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