@mcpc-tech/core 0.3.28 → 0.3.29

package/index.cjs

@@ -18374,15 +18374,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);
@@ -18405,84 +18419,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 (error2) {
       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 (error2) {
-        if (executeSpan) {
-          endSpan(executeSpan, error2);
-        }
-        this.logger.error({
-          message: "Error executing internal tool",
-          tool: tool2,
-          error: String(error2)
-        });
-        return {
-          content: [
-            {
-              type: "text",
-              text: `Error executing tool "${tool2}": ${error2 instanceof Error ? error2.message : String(error2)}`
-            }
-          ],
-          isError: true
-        };
+        endSpan(executeSpan, error2);
       }
-    }
-    if (executeSpan) {
-      executeSpan.setAttributes({
-        toolType: "not_found",
-        tool: tool2
+      this.logger.error({
+        message: `Error executing ${toolType} tool`,
+        tool: tool2,
+        error: String(error2)
       });
-      endSpan(executeSpan);
+      return {
+        content: [
+          {
+            type: "text",
+            text: `Error executing tool "${tool2}": ${error2 instanceof Error ? error2.message : String(error2)}`
+          }
+        ],
+        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/index.mjs

@@ -18360,15 +18360,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);
@@ -18391,84 +18405,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 (error2) {
       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 (error2) {
-        if (executeSpan) {
-          endSpan(executeSpan, error2);
-        }
-        this.logger.error({
-          message: "Error executing internal tool",
-          tool: tool2,
-          error: String(error2)
-        });
-        return {
-          content: [
-            {
-              type: "text",
-              text: `Error executing tool "${tool2}": ${error2 instanceof Error ? error2.message : String(error2)}`
-            }
-          ],
-          isError: true
-        };
+        endSpan(executeSpan, error2);
       }
-    }
-    if (executeSpan) {
-      executeSpan.setAttributes({
-        toolType: "not_found",
-        tool: tool2
+      this.logger.error({
+        message: `Error executing ${toolType} tool`,
+        tool: tool2,
+        error: String(error2)
       });
-      endSpan(executeSpan);
+      return {
+        content: [
+          {
+            type: "text",
+            text: `Error executing tool "${tool2}": ${error2 instanceof Error ? error2.message : String(error2)}`
+          }
+        ],
+        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

@@ -1,6 +1,6 @@
 {
   "name": "@mcpc-tech/core",
-  "version": "0.3.28",
+  "version": "0.3.29",
   "homepage": "https://jsr.io/@mcpc/core",
   "dependencies": {
     "@ai-sdk/provider": "^2.0.0",