npm - @fangyb/ahchat-bridge - Versions diffs - 0.1.38 → 0.1.40 - Mend

@fangyb/ahchat-bridge 0.1.38 → 0.1.40

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/dist/cli.cjs CHANGED Viewed

@@ -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,24 +117671,29 @@ 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;
             proc.currentMcpInvocationStartedAt = isMcpTool ? (/* @__PURE__ */ new Date()).toISOString() : null;
+            proc.currentMcpInvocationToolUseId = isMcpTool ? toolUseId ?? null : null;
             if (shouldStreamInternals(proc) && !proc.suppressCurrentToolUse && toolName !== "ExitPlanMode" && !isAskUserQuestionToolName(toolName)) {
               emit({
                 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 +117724,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 +117784,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 +117795,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
                   }
@@ -117835,6 +117867,14 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
             }
             if (proc.currentToolName && !proc.suppressCurrentToolUse && proc.currentMcpInvocationId && proc.currentMcpInvocationStartedAt && parseMcpRuntimeToolName(proc.currentToolName)) {
               try {
+                logger12.info("MCP audit start paired with tool_use", {
+                  agentId: proc.agentId,
+                  replyMessageId: base.replyMessageId,
+                  traceId: base.traceId,
+                  toolUseId: proc.currentMcpInvocationToolUseId ?? null,
+                  runtimeToolName: proc.currentToolName,
+                  mcpInvocationId: proc.currentMcpInvocationId
+                });
                 proc.mcpAuditRecorder?.recordStart({
                   id: proc.currentMcpInvocationId,
                   runtimeToolName: proc.currentToolName,
@@ -117858,6 +117898,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
           }
           proc.suppressCurrentToolUse = false;
           proc.currentBlockType = null;
+          proc.currentToolUseId = null;
           break;
         }
         default:
@@ -117900,7 +117941,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);
@@ -117913,8 +117955,10 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
               });
               proc.currentMcpInvocationId = null;
               proc.currentMcpInvocationStartedAt = null;
+              proc.currentMcpInvocationToolUseId = null;
               proc.activeToolUseStartedAt = void 0;
               proc.currentToolName = null;
+              proc.currentToolUseId = null;
               continue;
             }
             if (isSuccessfulOfficialMediaOutput(toolName, output)) {
@@ -117923,10 +117967,21 @@ 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)) {
               try {
+                logger12.info("MCP audit result paired with tool_result", {
+                  agentId: proc.agentId,
+                  replyMessageId: base.replyMessageId,
+                  traceId: base.traceId,
+                  toolUseId,
+                  startedToolUseId: proc.currentMcpInvocationToolUseId ?? null,
+                  runtimeToolName: toolName,
+                  mcpInvocationId: proc.currentMcpInvocationId,
+                  isError
+                });
                 proc.mcpAuditRecorder?.recordResult({
                   id: proc.currentMcpInvocationId,
                   runtimeToolName: toolName,
@@ -117948,12 +118003,14 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
               }
               proc.currentMcpInvocationId = null;
               proc.currentMcpInvocationStartedAt = null;
+              proc.currentMcpInvocationToolUseId = null;
             }
             if (shouldStreamInternals(proc)) {
               emit({
                 type: "agent:tool_result",
                 payload: {
                   ...wireBase(base),
+                  ...toolUseId ? { toolUseId } : {},
                   toolName,
                   output,
                   isError
@@ -117961,11 +118018,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 +118032,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
               }
             }
             proc.activeToolUseStartedAt = void 0;
+            proc.currentToolUseId = null;
           }
         }
       }
@@ -118355,8 +118414,10 @@ function resetAccumulators(proc) {
   proc.contentBlocks = [];
   proc.currentBlockType = null;
   proc.currentToolName = null;
+  proc.currentToolUseId = null;
   proc.currentMcpInvocationId = null;
   proc.currentMcpInvocationStartedAt = null;
+  proc.currentMcpInvocationToolUseId = null;
   proc.activeToolUseStartedAt = void 0;
   proc.segmentBuffer = "";
   proc.segmentCount = 0;

package/dist/index.js CHANGED Viewed

@@ -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,24 +28896,29 @@ 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;
             proc.currentMcpInvocationStartedAt = isMcpTool ? (/* @__PURE__ */ new Date()).toISOString() : null;
+            proc.currentMcpInvocationToolUseId = isMcpTool ? toolUseId ?? null : null;
             if (shouldStreamInternals(proc) && !proc.suppressCurrentToolUse && toolName !== "ExitPlanMode" && !isAskUserQuestionToolName(toolName)) {
               emit({
                 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 +28949,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 +29009,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 +29020,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
                   }
@@ -29060,6 +29092,14 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
             }
             if (proc.currentToolName && !proc.suppressCurrentToolUse && proc.currentMcpInvocationId && proc.currentMcpInvocationStartedAt && parseMcpRuntimeToolName(proc.currentToolName)) {
               try {
+                logger11.info("MCP audit start paired with tool_use", {
+                  agentId: proc.agentId,
+                  replyMessageId: base.replyMessageId,
+                  traceId: base.traceId,
+                  toolUseId: proc.currentMcpInvocationToolUseId ?? null,
+                  runtimeToolName: proc.currentToolName,
+                  mcpInvocationId: proc.currentMcpInvocationId
+                });
                 proc.mcpAuditRecorder?.recordStart({
                   id: proc.currentMcpInvocationId,
                   runtimeToolName: proc.currentToolName,
@@ -29083,6 +29123,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
           }
           proc.suppressCurrentToolUse = false;
           proc.currentBlockType = null;
+          proc.currentToolUseId = null;
           break;
         }
         default:
@@ -29125,7 +29166,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);
@@ -29138,8 +29180,10 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
               });
               proc.currentMcpInvocationId = null;
               proc.currentMcpInvocationStartedAt = null;
+              proc.currentMcpInvocationToolUseId = null;
               proc.activeToolUseStartedAt = void 0;
               proc.currentToolName = null;
+              proc.currentToolUseId = null;
               continue;
             }
             if (isSuccessfulOfficialMediaOutput(toolName, output)) {
@@ -29148,10 +29192,21 @@ 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)) {
               try {
+                logger11.info("MCP audit result paired with tool_result", {
+                  agentId: proc.agentId,
+                  replyMessageId: base.replyMessageId,
+                  traceId: base.traceId,
+                  toolUseId,
+                  startedToolUseId: proc.currentMcpInvocationToolUseId ?? null,
+                  runtimeToolName: toolName,
+                  mcpInvocationId: proc.currentMcpInvocationId,
+                  isError
+                });
                 proc.mcpAuditRecorder?.recordResult({
                   id: proc.currentMcpInvocationId,
                   runtimeToolName: toolName,
@@ -29173,12 +29228,14 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
               }
               proc.currentMcpInvocationId = null;
               proc.currentMcpInvocationStartedAt = null;
+              proc.currentMcpInvocationToolUseId = null;
             }
             if (shouldStreamInternals(proc)) {
               emit({
                 type: "agent:tool_result",
                 payload: {
                   ...wireBase(base),
+                  ...toolUseId ? { toolUseId } : {},
                   toolName,
                   output,
                   isError
@@ -29186,11 +29243,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 +29257,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
               }
             }
             proc.activeToolUseStartedAt = void 0;
+            proc.currentToolUseId = null;
           }
         }
       }
@@ -29580,8 +29639,10 @@ function resetAccumulators(proc) {
   proc.contentBlocks = [];
   proc.currentBlockType = null;
   proc.currentToolName = null;
+  proc.currentToolUseId = null;
   proc.currentMcpInvocationId = null;
   proc.currentMcpInvocationStartedAt = null;
+  proc.currentMcpInvocationToolUseId = null;
   proc.activeToolUseStartedAt = void 0;
   proc.segmentBuffer = "";
   proc.segmentCount = 0;

package/package.json CHANGED Viewed

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