@flutchai/flutch-sdk 0.1.23 → 0.1.24

package/dist/index.d.cts

@@ -1125,6 +1125,7 @@ interface ChannelState {
     contentChain: IContentBlock[];
     currentBlock: IContentBlock | null;
     pendingToolBlocks: IContentBlock[];
+    toolBlocksByRunId: Map<string, IContentBlock>;
 }
 interface StreamAccumulator {
     channels: Map<StreamChannel, ChannelState>;

package/dist/index.d.ts

@@ -1125,6 +1125,7 @@ interface ChannelState {
     contentChain: IContentBlock[];
     currentBlock: IContentBlock | null;
     pendingToolBlocks: IContentBlock[];
+    toolBlocksByRunId: Map<string, IContentBlock>;
 }
 interface StreamAccumulator {
     channels: Map<StreamChannel, ChannelState>;

package/dist/index.js

@@ -4421,11 +4421,21 @@ var EventProcessor = class {
       channels: /* @__PURE__ */ new Map([
         [
           "text" /* TEXT */,
-          { contentChain: [], currentBlock: null, pendingToolBlocks: [] }
+          {
+            contentChain: [],
+            currentBlock: null,
+            pendingToolBlocks: [],
+            toolBlocksByRunId: /* @__PURE__ */ new Map()
+          }
         ],
         [
           "processing" /* PROCESSING */,
-          { contentChain: [], currentBlock: null, pendingToolBlocks: [] }
+          {
+            contentChain: [],
+            currentBlock: null,
+            pendingToolBlocks: [],
+            toolBlocksByRunId: /* @__PURE__ */ new Map()
+          }
         ]
       ]),
       attachments: [],
@@ -4598,11 +4608,20 @@ var EventProcessor = class {
       return;
     }
     if (event.event === "on_tool_start") {
+      const channel = event.metadata?.stream_channel ?? "text" /* TEXT */;
+      const state = acc.channels.get(channel);
+      if (state && event.run_id) {
+        const idx = state.pendingToolBlocks.findIndex(
+          (b) => b.name === event.name
+        );
+        if (idx !== -1) {
+          const block = state.pendingToolBlocks.splice(idx, 1)[0];
+          state.toolBlocksByRunId.set(event.run_id, block);
+        }
+      }
       this.logger.log("\u{1F527} Tool execution started", {
         toolName: event.name,
-        input: event.data?.input,
-        runId: event.run_id,
-        metadata: event.metadata
+        runId: event.run_id
       });
       return;
     }
@@ -4610,7 +4629,13 @@ var EventProcessor = class {
       const channel = event.metadata?.stream_channel ?? "text" /* TEXT */;
       const state = acc.channels.get(channel);
       if (!state) return;
-      const toolBlock = state.pendingToolBlocks.shift();
+      let toolBlock;
+      if (event.run_id && state.toolBlocksByRunId.has(event.run_id)) {
+        toolBlock = state.toolBlocksByRunId.get(event.run_id);
+        state.toolBlocksByRunId.delete(event.run_id);
+      } else {
+        toolBlock = state.pendingToolBlocks.shift();
+      }
       if (toolBlock && toolBlock.type === "tool_use") {
         const output = event.data?.output;
         const outputString = typeof output === "string" ? output : JSON.stringify(output, null, 2);
@@ -4624,26 +4649,26 @@ var EventProcessor = class {
           },
           onPartial
         );
-        this.logger.log("\u2705 Tool execution completed", {
+        this.logger.log("\u2705 Tool completed", {
           toolName: event.name,
           toolBlockId: toolBlock.id,
-          outputPreview: outputString.substring(0, 200) + (outputString.length > 200 ? "..." : ""),
           runId: event.run_id
         });
       } else {
-        this.logger.warn(
-          "\u26A0\uFE0F on_tool_end received but no pending tool block found",
-          {
-            toolName: event.name,
-            runId: event.run_id,
-            pendingCount: state.pendingToolBlocks.length
-          }
-        );
+        this.logger.warn("\u26A0\uFE0F on_tool_end: no matching tool block", {
+          toolName: event.name,
+          runId: event.run_id
+        });
       }
       return;
     }
     if (event.event === "on_tool_error") {
-      this.logger.error("\u274C Tool execution failed", {
+      const channel = event.metadata?.stream_channel ?? "text" /* TEXT */;
+      const state = acc.channels.get(channel);
+      if (state && event.run_id) {
+        state.toolBlocksByRunId.delete(event.run_id);
+      }
+      this.logger.error("\u274C Tool failed", {
         toolName: event.name,
         error: event.data?.error,
         runId: event.run_id
@@ -4691,6 +4716,13 @@ var EventProcessor = class {
   getResult(acc) {
     const allChains = [];
     for (const [channel, state] of acc.channels.entries()) {
+      if (state.pendingToolBlocks.length > 0 || state.toolBlocksByRunId.size > 0) {
+        this.logger.warn("\u26A0\uFE0F Orphaned tool blocks detected at finalization", {
+          channel,
+          pendingCount: state.pendingToolBlocks.length,
+          mappedCount: state.toolBlocksByRunId.size
+        });
+      }
       if (state.currentBlock) {
         state.contentChain.push(state.currentBlock);
       }