@fangyb/ahchat-bridge 0.1.38 → 0.1.39

package/dist/cli.cjs

@@ -117376,6 +117376,29 @@ function extractTodosFromInput(input) {
 function isObjectRecord(value) {
   return value != null && typeof value === "object" && !Array.isArray(value);
 }
+function readString(value) {
+  return typeof value === "string" && value.trim().length > 0 ? value.trim() : null;
+}
+function findToolNameByUseId(contentBlocks, toolUseId) {
+  if (!toolUseId) return null;
+  for (let i = contentBlocks.length - 1; i >= 0; i--) {
+    const block = contentBlocks[i];
+    if (block.type === "tool_use" && block.toolUseId === toolUseId) {
+      return block.toolName;
+    }
+  }
+  return null;
+}
+function findToolUseBlockById(contentBlocks, toolUseId) {
+  if (!toolUseId) return null;
+  for (let i = contentBlocks.length - 1; i >= 0; i--) {
+    const block = contentBlocks[i];
+    if (block.type === "tool_use" && block.toolUseId === toolUseId) {
+      return block;
+    }
+  }
+  return null;
+}
 function readTrimmedString(input, key) {
   const value = input[key];
   return typeof value === "string" && value.trim().length > 0 ? value.trim() : null;
@@ -117648,9 +117671,11 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
           } else if (block.type === "tool_use") {
             proc.currentBlockType = "tool_use";
             proc.currentToolName = block.name ?? "unknown";
+            proc.currentToolUseId = readString(block.id);
             proc.activeToolUseStartedAt = Date.now();
             proc.accumulatedToolInput = "";
             const toolName = block.name ?? "unknown";
+            const toolUseId = proc.currentToolUseId;
             proc.suppressCurrentToolUse = proc.officialMediaGenerationSatisfied === true && isOfficialMediaGenerationToolName(toolName);
             const isMcpTool = parseMcpRuntimeToolName(toolName) != null;
             proc.currentMcpInvocationId = isMcpTool ? createMcpToolInvocationId() : null;
@@ -117660,12 +117685,14 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
                 type: "agent:tool_use",
                 payload: {
                   ...wireBase(base),
+                  ...toolUseId ? { toolUseId } : {},
                   toolName,
                   input: {}
                 }
               });
               proc.contentBlocks.push({
                 type: "tool_use",
+                ...toolUseId ? { toolUseId } : {},
                 toolName,
                 input: {},
                 status: "running"
@@ -117696,6 +117723,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
                   type: "agent:tool_input_update",
                   payload: {
                     ...wireBase(base),
+                    ...proc.currentToolUseId ? { toolUseId: proc.currentToolUseId } : {},
                     toolName: proc.currentToolName,
                     input: liveInput
                   }
@@ -117755,7 +117783,9 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
               }
             }
             if (!proc.suppressCurrentToolUse) {
-              const lastToolUse = [...proc.contentBlocks].reverse().find((bl) => bl.type === "tool_use");
+              const lastToolUse = [...proc.contentBlocks].reverse().find(
+                (bl) => bl.type === "tool_use" && (proc.currentToolUseId ? bl.toolUseId === proc.currentToolUseId : true)
+              );
               if (lastToolUse && lastToolUse.type === "tool_use") {
                 lastToolUse.input = parsedInput;
               }
@@ -117764,6 +117794,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
                   type: "agent:tool_input_update",
                   payload: {
                     ...wireBase(base),
+                    ...proc.currentToolUseId ? { toolUseId: proc.currentToolUseId } : {},
                     toolName: proc.currentToolName,
                     input: parsedInput
                   }
@@ -117858,6 +117889,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
           }
           proc.suppressCurrentToolUse = false;
           proc.currentBlockType = null;
+          proc.currentToolUseId = null;
           break;
         }
         default:
@@ -117900,7 +117932,8 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
         for (const block of content) {
           const b = block;
           if (b.type === "tool_result") {
-            const toolName = proc.currentToolName ?? "unknown";
+            const toolUseId = readString(b.tool_use_id);
+            const toolName = findToolNameByUseId(proc.contentBlocks, toolUseId) ?? proc.currentToolName ?? "unknown";
             const isError = toolName === "ExitPlanMode" ? false : !!b.is_error;
             const output = typeof b.content === "string" ? b.content : JSON.stringify(b.content);
             const duplicateOfficialMediaDeny = isError && isOfficialMediaGenerationToolName(toolName) && isOfficialMediaGenerationDuplicateDenyMessage(output);
@@ -117915,6 +117948,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
               proc.currentMcpInvocationStartedAt = null;
               proc.activeToolUseStartedAt = void 0;
               proc.currentToolName = null;
+              proc.currentToolUseId = null;
               continue;
             }
             if (isSuccessfulOfficialMediaOutput(toolName, output)) {
@@ -117923,6 +117957,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
             if (isAskUserQuestionToolName(toolName)) {
               proc.activeToolUseStartedAt = void 0;
               proc.currentToolName = null;
+              proc.currentToolUseId = null;
               continue;
             }
             if (proc.currentMcpInvocationId && parseMcpRuntimeToolName(toolName)) {
@@ -117954,6 +117989,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
                 type: "agent:tool_result",
                 payload: {
                   ...wireBase(base),
+                  ...toolUseId ? { toolUseId } : {},
                   toolName,
                   output,
                   isError
@@ -117961,11 +117997,12 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
               });
               proc.contentBlocks.push({
                 type: "tool_result",
+                ...toolUseId ? { toolUseId } : {},
                 toolName,
                 output,
                 isError
               });
-              const lastToolUse = [...proc.contentBlocks].reverse().find((bl) => bl.type === "tool_use");
+              const lastToolUse = findToolUseBlockById(proc.contentBlocks, toolUseId) ?? [...proc.contentBlocks].reverse().find((bl) => bl.type === "tool_use");
               if (lastToolUse && lastToolUse.type === "tool_use") {
                 lastToolUse.status = isError ? "error" : "done";
                 if (lastToolUse.toolName === "ExitPlanMode") {
@@ -117974,6 +118011,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
               }
             }
             proc.activeToolUseStartedAt = void 0;
+            proc.currentToolUseId = null;
           }
         }
       }
@@ -118355,6 +118393,7 @@ function resetAccumulators(proc) {
   proc.contentBlocks = [];
   proc.currentBlockType = null;
   proc.currentToolName = null;
+  proc.currentToolUseId = null;
   proc.currentMcpInvocationId = null;
   proc.currentMcpInvocationStartedAt = null;
   proc.activeToolUseStartedAt = void 0;

package/dist/index.js

@@ -28601,6 +28601,29 @@ function extractTodosFromInput(input) {
 function isObjectRecord(value) {
   return value != null && typeof value === "object" && !Array.isArray(value);
 }
+function readString(value) {
+  return typeof value === "string" && value.trim().length > 0 ? value.trim() : null;
+}
+function findToolNameByUseId(contentBlocks, toolUseId) {
+  if (!toolUseId) return null;
+  for (let i = contentBlocks.length - 1; i >= 0; i--) {
+    const block = contentBlocks[i];
+    if (block.type === "tool_use" && block.toolUseId === toolUseId) {
+      return block.toolName;
+    }
+  }
+  return null;
+}
+function findToolUseBlockById(contentBlocks, toolUseId) {
+  if (!toolUseId) return null;
+  for (let i = contentBlocks.length - 1; i >= 0; i--) {
+    const block = contentBlocks[i];
+    if (block.type === "tool_use" && block.toolUseId === toolUseId) {
+      return block;
+    }
+  }
+  return null;
+}
 function readTrimmedString(input, key) {
   const value = input[key];
   return typeof value === "string" && value.trim().length > 0 ? value.trim() : null;
@@ -28873,9 +28896,11 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
           } else if (block.type === "tool_use") {
             proc.currentBlockType = "tool_use";
             proc.currentToolName = block.name ?? "unknown";
+            proc.currentToolUseId = readString(block.id);
             proc.activeToolUseStartedAt = Date.now();
             proc.accumulatedToolInput = "";
             const toolName = block.name ?? "unknown";
+            const toolUseId = proc.currentToolUseId;
             proc.suppressCurrentToolUse = proc.officialMediaGenerationSatisfied === true && isOfficialMediaGenerationToolName(toolName);
             const isMcpTool = parseMcpRuntimeToolName(toolName) != null;
             proc.currentMcpInvocationId = isMcpTool ? createMcpToolInvocationId() : null;
@@ -28885,12 +28910,14 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
                 type: "agent:tool_use",
                 payload: {
                   ...wireBase(base),
+                  ...toolUseId ? { toolUseId } : {},
                   toolName,
                   input: {}
                 }
               });
               proc.contentBlocks.push({
                 type: "tool_use",
+                ...toolUseId ? { toolUseId } : {},
                 toolName,
                 input: {},
                 status: "running"
@@ -28921,6 +28948,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
                   type: "agent:tool_input_update",
                   payload: {
                     ...wireBase(base),
+                    ...proc.currentToolUseId ? { toolUseId: proc.currentToolUseId } : {},
                     toolName: proc.currentToolName,
                     input: liveInput
                   }
@@ -28980,7 +29008,9 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
               }
             }
             if (!proc.suppressCurrentToolUse) {
-              const lastToolUse = [...proc.contentBlocks].reverse().find((bl) => bl.type === "tool_use");
+              const lastToolUse = [...proc.contentBlocks].reverse().find(
+                (bl) => bl.type === "tool_use" && (proc.currentToolUseId ? bl.toolUseId === proc.currentToolUseId : true)
+              );
               if (lastToolUse && lastToolUse.type === "tool_use") {
                 lastToolUse.input = parsedInput;
               }
@@ -28989,6 +29019,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
                   type: "agent:tool_input_update",
                   payload: {
                     ...wireBase(base),
+                    ...proc.currentToolUseId ? { toolUseId: proc.currentToolUseId } : {},
                     toolName: proc.currentToolName,
                     input: parsedInput
                   }
@@ -29083,6 +29114,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
           }
           proc.suppressCurrentToolUse = false;
           proc.currentBlockType = null;
+          proc.currentToolUseId = null;
           break;
         }
         default:
@@ -29125,7 +29157,8 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
         for (const block of content) {
           const b = block;
           if (b.type === "tool_result") {
-            const toolName = proc.currentToolName ?? "unknown";
+            const toolUseId = readString(b.tool_use_id);
+            const toolName = findToolNameByUseId(proc.contentBlocks, toolUseId) ?? proc.currentToolName ?? "unknown";
             const isError = toolName === "ExitPlanMode" ? false : !!b.is_error;
             const output = typeof b.content === "string" ? b.content : JSON.stringify(b.content);
             const duplicateOfficialMediaDeny = isError && isOfficialMediaGenerationToolName(toolName) && isOfficialMediaGenerationDuplicateDenyMessage(output);
@@ -29140,6 +29173,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
               proc.currentMcpInvocationStartedAt = null;
               proc.activeToolUseStartedAt = void 0;
               proc.currentToolName = null;
+              proc.currentToolUseId = null;
               continue;
             }
             if (isSuccessfulOfficialMediaOutput(toolName, output)) {
@@ -29148,6 +29182,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
             if (isAskUserQuestionToolName(toolName)) {
               proc.activeToolUseStartedAt = void 0;
               proc.currentToolName = null;
+              proc.currentToolUseId = null;
               continue;
             }
             if (proc.currentMcpInvocationId && parseMcpRuntimeToolName(toolName)) {
@@ -29179,6 +29214,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
                 type: "agent:tool_result",
                 payload: {
                   ...wireBase(base),
+                  ...toolUseId ? { toolUseId } : {},
                   toolName,
                   output,
                   isError
@@ -29186,11 +29222,12 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
               });
               proc.contentBlocks.push({
                 type: "tool_result",
+                ...toolUseId ? { toolUseId } : {},
                 toolName,
                 output,
                 isError
               });
-              const lastToolUse = [...proc.contentBlocks].reverse().find((bl) => bl.type === "tool_use");
+              const lastToolUse = findToolUseBlockById(proc.contentBlocks, toolUseId) ?? [...proc.contentBlocks].reverse().find((bl) => bl.type === "tool_use");
               if (lastToolUse && lastToolUse.type === "tool_use") {
                 lastToolUse.status = isError ? "error" : "done";
                 if (lastToolUse.toolName === "ExitPlanMode") {
@@ -29199,6 +29236,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
               }
             }
             proc.activeToolUseStartedAt = void 0;
+            proc.currentToolUseId = null;
           }
         }
       }
@@ -29580,6 +29618,7 @@ function resetAccumulators(proc) {
   proc.contentBlocks = [];
   proc.currentBlockType = null;
   proc.currentToolName = null;
+  proc.currentToolUseId = null;
   proc.currentMcpInvocationId = null;
   proc.currentMcpInvocationStartedAt = null;
   proc.activeToolUseStartedAt = void 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fangyb/ahchat-bridge",
-  "version": "0.1.38",
+  "version": "0.1.39",
   "files": [
     "dist"
   ],