@witqq/agent-sdk 0.5.2 → 0.6.1

package/dist/backends/claude.js

@@ -325,6 +325,14 @@ function extractSchemaFromDef(schema) {
 }
 
 // src/backends/claude.ts
+var MCP_SERVER_NAME = "agent-sdk-tools";
+var MCP_TOOL_PREFIX = `mcp__${MCP_SERVER_NAME}__`;
+function mcpToolName(toolName) {
+  return `${MCP_TOOL_PREFIX}${toolName}`;
+}
+function stripMcpPrefix(name) {
+  return name.startsWith(MCP_TOOL_PREFIX) ? name.slice(MCP_TOOL_PREFIX.length) : name;
+}
 var sdkModule = null;
 async function loadSDK() {
   if (sdkModule) return sdkModule;
@@ -348,11 +356,13 @@ var ANTHROPIC_API_VERSION = "2023-06-01";
 var ANTHROPIC_OAUTH_BETA = "oauth-2025-04-20";
 function buildMcpServer(sdk, tools, toolResultCapture) {
   if (tools.length === 0) return void 0;
-  const mcpTools = tools.map(
-    (tool) => sdk.tool(
+  const mcpTools = tools.map((tool) => {
+    const zodSchema = tool.parameters;
+    const inputSchema = zodSchema.shape ?? zodToJsonSchema(tool.parameters);
+    return sdk.tool(
       tool.name,
       tool.description ?? "",
-      zodToJsonSchema(tool.parameters),
+      inputSchema,
       async (args) => {
         const result = await tool.execute(args);
         if (toolResultCapture) {
@@ -367,10 +377,10 @@ function buildMcpServer(sdk, tools, toolResultCapture) {
           ]
         };
       }
-    )
-  );
+    );
+  });
   return sdk.createSdkMcpServer({
-    name: "agent-sdk-tools",
+    name: MCP_SERVER_NAME,
     version: "1.0.0",
     tools: mcpTools
   });
@@ -407,7 +417,8 @@ function buildCanUseTool(config) {
   const onPermission = config.supervisor?.onPermission;
   if (!onPermission) return void 0;
   const permissionStore = config.permissionStore;
-  return async (toolName, input, options) => {
+  return async (rawToolName, input, options) => {
+    const toolName = stripMcpPrefix(rawToolName);
     if (permissionStore && await permissionStore.isApproved(toolName)) {
       return {
         behavior: "allow",
@@ -489,14 +500,10 @@ function mapSDKMessage(msg, thinkingBlockIndices, toolCallTracker) {
       const betaMessage = msg.message;
       if (!betaMessage?.content) return null;
       const events = [];
-      const textParts = betaMessage.content.filter((b) => b.type === "text" && b.text).map((b) => b.text).join("");
-      if (textParts) {
-        events.push({ type: "text_delta", text: textParts });
-      }
       for (const block of betaMessage.content) {
         if (block.type === "tool_use") {
           const toolCallId = String(block.id ?? "");
-          const toolName = block.name ?? "unknown";
+          const toolName = stripMcpPrefix(block.name ?? "unknown");
           if (toolCallTracker) {
             toolCallTracker.trackStart(toolCallId, toolName);
           }
@@ -519,7 +526,7 @@ function mapSDKMessage(msg, thinkingBlockIndices, toolCallTracker) {
     }
     case "tool_use_summary": {
       const summary = msg.summary;
-      const toolName = msg.tool_name ?? "unknown";
+      const toolName = stripMcpPrefix(msg.tool_name ?? "unknown");
       const precedingIds = msg.preceding_tool_use_ids;
       let toolCallId = "";
       if (precedingIds && precedingIds.length > 0) {
@@ -528,15 +535,12 @@ function mapSDKMessage(msg, thinkingBlockIndices, toolCallTracker) {
       } else if (toolCallTracker) {
         toolCallId = toolCallTracker.consumeToolCallId(toolName);
       }
-      if (summary) {
-        return {
-          type: "tool_call_end",
-          toolCallId,
-          toolName,
-          result: summary
-        };
-      }
-      return null;
+      return {
+        type: "tool_call_end",
+        toolCallId,
+        toolName,
+        result: summary ?? null
+      };
     }
     case "stream_event": {
       const event = msg.event;
@@ -564,10 +568,7 @@ function mapSDKMessage(msg, thinkingBlockIndices, toolCallTracker) {
       return null;
     }
     case "tool_progress": {
-      const toolName = msg.tool_name;
-      if (!toolName) return null;
-      const toolCallId = toolCallTracker?.peekToolCallId(toolName) ?? "";
-      return { type: "tool_call_start", toolCallId, toolName, args: {} };
+      return null;
     }
     case "result": {
       if (msg.subtype === "success") {
@@ -662,6 +663,9 @@ var ClaudeAgent = class extends BaseAgent {
     if (opts.canUseTool && !opts.permissionMode) {
       opts.permissionMode = "default";
     }
+    if (this.config.availableTools) {
+      opts.allowedTools = [...this.config.availableTools];
+    }
     return opts;
   }
   async buildMcpConfig(opts, toolResultCapture) {
@@ -670,8 +674,10 @@ var ClaudeAgent = class extends BaseAgent {
     const mcpServer = buildMcpServer(sdk, this.tools, toolResultCapture);
     if (mcpServer) {
       opts.mcpServers = {
-        "agent-sdk-tools": mcpServer
+        [MCP_SERVER_NAME]: mcpServer
       };
+      const mcpToolNames = this.tools.map((t) => mcpToolName(t.name));
+      opts.allowedTools = [...opts.allowedTools ?? [], ...mcpToolNames];
     }
     return opts;
   }
@@ -696,7 +702,7 @@ var ClaudeAgent = class extends BaseAgent {
           if (betaMessage?.content) {
             for (const block of betaMessage.content) {
               if (block.type === "tool_use") {
-                const toolName = block.name ?? "unknown";
+                const toolName = stripMcpPrefix(block.name ?? "unknown");
                 toolCalls.push({
                   toolName,
                   args: block.input ?? {},
@@ -756,7 +762,8 @@ var ClaudeAgent = class extends BaseAgent {
     const isResuming = this.isPersistent && this._sessionId !== void 0;
     const prompt = isResuming ? extractLastUserPrompt(messages) : buildContextualPrompt(messages);
     let opts = this.buildQueryOptions(signal);
-    opts = await this.buildMcpConfig(opts);
+    const toolResultCapture = /* @__PURE__ */ new Map();
+    opts = await this.buildMcpConfig(opts, toolResultCapture);
     const jsonSchema = zodToJsonSchema(schema.schema);
     opts.outputFormat = {
       type: "json_schema",
@@ -770,6 +777,30 @@ var ClaudeAgent = class extends BaseAgent {
     let usage;
     try {
       for await (const msg of q) {
+        if (msg.type === "assistant") {
+          const betaMessage = msg.message;
+          if (betaMessage?.content) {
+            for (const block of betaMessage.content) {
+              if (block.type === "tool_use") {
+                const toolName = stripMcpPrefix(block.name ?? "unknown");
+                toolCalls.push({
+                  toolName,
+                  args: block.input ?? {},
+                  result: toolResultCapture.get(toolName) ?? null,
+                  approved: true
+                });
+              }
+            }
+          }
+        }
+        if (msg.type === "tool_use_summary" || msg.type === "result") {
+          for (const tc of toolCalls) {
+            if (tc.result === null) {
+              const captured = toolResultCapture.get(tc.toolName);
+              if (captured !== void 0) tc.result = captured;
+            }
+          }
+        }
         if (msg.type === "result" && msg.subtype === "success") {
           const r = msg;
           output = r.result;
@@ -834,13 +865,10 @@ var ClaudeAgent = class extends BaseAgent {
     try {
       for await (const msg of q) {
         if (signal.aborted) throw new AbortError();
-        const event = mapSDKMessage(msg, thinkingBlockIndices, toolCallTracker);
-        if (event) {
-          if (Array.isArray(event)) {
-            for (const e of event) yield e;
-          } else {
-            yield event;
-          }
+        const events = mapSDKMessage(msg, thinkingBlockIndices, toolCallTracker);
+        if (events) {
+          const mapped = Array.isArray(events) ? events : [events];
+          for (const e of mapped) yield e;
         }
         if (msg.type === "result" && msg.subtype === "success") {
           const r = msg;