@flutchai/flutch-sdk 0.7.14 → 0.7.16

package/dist/index.cjs

@@ -5203,6 +5203,29 @@ function sanitizeTraceError(error, options) {
 }
 __name(sanitizeTraceError, "sanitizeTraceError");
 
+// src/tools/tool-usage.ts
+function toolUsageOf(value) {
+  const cost = value?.total_cost;
+  return typeof cost === "number" && Number.isFinite(cost) && cost >= 0 ? {
+    total_cost: cost
+  } : void 0;
+}
+__name(toolUsageOf, "toolUsageOf");
+function toolEndOutput(content, usage) {
+  return usage ? {
+    content,
+    usage_metadata: usage
+  } : content;
+}
+__name(toolEndOutput, "toolEndOutput");
+function toolEndContent(output) {
+  if (!output || typeof output !== "object") return void 0;
+  const o = output;
+  if (typeof o.content !== "string") return void 0;
+  return toolUsageOf(o.usage_metadata) || toolUsageOf(o.artifact?.usage_metadata) ? o.content : void 0;
+}
+__name(toolEndContent, "toolEndContent");
+
 // src/engines/langgraph/stream-thinking.ts
 function splitThinking(blocks) {
   const thoughts = [];
@@ -5268,6 +5291,7 @@ function joinTextSteps(parts) {
 __name(joinTextSteps, "joinTextSteps");
 var MIN_DUPLICATE_WORDS = 8;
 var DUPLICATE_SIMILARITY = 0.75;
+var NO_TOOL_END = "No result: the call's end was not received.";
 function paragraphsOf(text) {
   return text.split(/\n\s*\n/).map((p) => p.trim()).filter(Boolean);
 }
@@ -5688,25 +5712,11 @@ exports.EventProcessor = class _EventProcessor {
         const output = event.data?.output;
         let outputString;
         try {
-          outputString = typeof output === "string" ? output : JSON.stringify(output, null, 2);
+          outputString = typeof output === "string" ? output : toolEndContent(output) ?? JSON.stringify(output, null, 2);
         } catch {
           outputString = typeof output?.content === "string" ? output.content : "[Output too large to display]";
         }
-        const MAX_TOOL_OUTPUT_LENGTH = 5e4;
-        if (outputString.length > MAX_TOOL_OUTPUT_LENGTH) {
-          let cutAt = outputString.lastIndexOf("\n", MAX_TOOL_OUTPUT_LENGTH);
-          if (cutAt < MAX_TOOL_OUTPUT_LENGTH * 0.8) {
-            cutAt = MAX_TOOL_OUTPUT_LENGTH;
-          }
-          outputString = outputString.slice(0, cutAt) + `
-... [truncated: ${outputString.length - cutAt} chars]`;
-        }
-        toolBlock.output = outputString;
-        this.sendDelta(channel, {
-          type: "tool_output_chunk",
-          stepId: toolBlock.id,
-          chunk: outputString
-        }, onPartial);
+        this.closeToolBlock(channel, toolBlock, outputString, onPartial);
         this.logger.log("\u2705 Tool completed", {
           toolName: event.name,
           toolBlockId: toolBlock.id,
@@ -5723,8 +5733,18 @@ exports.EventProcessor = class _EventProcessor {
     if (event.event === "on_tool_error") {
       const channel = event.metadata?.stream_channel ?? StreamChannel.TEXT;
       const state = acc.channels.get(channel);
-      if (state && event.run_id) {
+      let toolBlock;
+      if (state && event.run_id && state.toolBlocksByRunId.has(event.run_id)) {
+        toolBlock = state.toolBlocksByRunId.get(event.run_id);
         state.toolBlocksByRunId.delete(event.run_id);
+      } else if (state) {
+        const idx = state.pendingToolBlocks.findIndex((b) => b.name === event.name);
+        if (idx !== -1) toolBlock = state.pendingToolBlocks.splice(idx, 1)[0];
+      }
+      if (toolBlock && toolBlock.type === "tool_use") {
+        const error = event.data?.error;
+        const message = error instanceof Error ? error.message : String(error ?? "failed");
+        this.closeToolBlock(channel, toolBlock, `Error: ${message}`, onPartial);
       }
       this.logger.error("\u274C Tool failed", {
         toolName: event.name,
@@ -5765,6 +5785,28 @@ exports.EventProcessor = class _EventProcessor {
     }
   }
   /**
+  * A call's result on its block and to the client: the client closes the
+  * step on it. Cut to keep the message document under MongoDB's 16MB.
+  */
+  closeToolBlock(channel, toolBlock, output, onPartial) {
+    const MAX_TOOL_OUTPUT_LENGTH = 5e4;
+    let outputString = output;
+    if (outputString.length > MAX_TOOL_OUTPUT_LENGTH) {
+      let cutAt = outputString.lastIndexOf("\n", MAX_TOOL_OUTPUT_LENGTH);
+      if (cutAt < MAX_TOOL_OUTPUT_LENGTH * 0.8) {
+        cutAt = MAX_TOOL_OUTPUT_LENGTH;
+      }
+      outputString = outputString.slice(0, cutAt) + `
+... [truncated: ${outputString.length - cutAt} chars]`;
+    }
+    toolBlock.output = outputString;
+    this.sendDelta(channel, {
+      type: "tool_output_chunk",
+      stepId: toolBlock.id,
+      chunk: outputString
+    }, onPartial);
+  }
+  /**
   * Build final result from accumulator
   * Returns unified content chains from all channels
   */
@@ -5777,6 +5819,12 @@ exports.EventProcessor = class _EventProcessor {
           pendingCount: state.pendingToolBlocks.length,
           mappedCount: state.toolBlocksByRunId.size
         });
+        for (const block of [
+          ...state.pendingToolBlocks,
+          ...state.toolBlocksByRunId.values()
+        ]) if (block.type === "tool_use" && !block.output) block.output = NO_TOOL_END;
+        state.pendingToolBlocks = [];
+        state.toolBlocksByRunId.clear();
       }
       if (state.currentBlock) {
         state.contentChain.push(state.currentBlock);
@@ -6957,6 +7005,9 @@ ${paramDescriptions.join("\n")}`;
       name: mcpTool.name,
       description: enhancedDescription,
       schema,
+      // The call's cost rides on the ToolMessage's artifact, which the model
+      // never sees and the trace keeps (see tool-usage.ts).
+      responseFormat: "content_and_artifact",
       func: /* @__PURE__ */ __name(async (input, _runManager, config) => {
         logger3.log(`\u{1F527} [${mcpTool.name}] LLM INPUT: ${JSON.stringify(input)}`);
         const configurable = config?.configurable;
@@ -6985,7 +7036,13 @@ ${paramDescriptions.join("\n")}`;
           }
           const output = typeof result.result === "string" ? result.result : JSON.stringify(result.result, null, 2);
           logger3.log(`\u{1F527} [${mcpTool.name}] TOOL OUTPUT: ${output.length > 200 ? output.substring(0, 200) + "..." : output}`);
-          return output;
+          const usage = toolUsageOf(result.usage_metadata);
+          return [
+            output,
+            usage ? {
+              usage_metadata: usage
+            } : void 0
+          ];
         } catch (error) {
           logger3.error(`\u{1F527} [${mcpTool.name}] Exception during execution`, error);
           if (axios2__default.default.isAxiosError(error)) {
@@ -7305,12 +7362,17 @@ exports.McpRuntimeHttpClient = class _McpRuntimeHttpClient {
         ]
       }, JSON.stringify(enrichedArgs), parsedConfig.runId, void 0, parsedConfig.tags, parsedConfig.metadata, toolName);
       const result = await this.executeTool(toolName, enrichedArgs, executionContext, mcpServers, config?.signal);
-      const content = result.success ? JSON.stringify(result) : result.error || JSON.stringify(result);
-      await runManager?.handleToolEnd(content);
+      const { usage_metadata: rawUsage, ...shown } = result;
+      const usageMetadata = toolUsageOf(rawUsage);
+      const content = shown.success ? JSON.stringify(shown) : shown.error || JSON.stringify(shown);
+      await runManager?.handleToolEnd(toolEndOutput(content, usageMetadata));
       return {
         content,
         success: result.success,
-        rawResult: result.success ? result.result : void 0
+        rawResult: result.success ? result.result : void 0,
+        ...usageMetadata && {
+          usageMetadata
+        }
       };
     } catch (error) {
       this.logger.error(`Error executing tool ${toolName}:`, error);
@@ -9491,8 +9553,11 @@ exports.splitTools = splitTools;
 exports.storeAttachmentData = storeAttachmentData;
 exports.toOpenAIEffort = toOpenAIEffort;
 exports.toOptionalNumber = toOptionalNumber;
+exports.toolEndContent = toolEndContent;
+exports.toolEndOutput = toolEndOutput;
 exports.toolSearchApplies = toolSearchApplies;
 exports.toolSearchTerms = toolSearchTerms;
+exports.toolUsageOf = toolUsageOf;
 exports.traceApiCall = traceApiCall;
 exports.withFlutchContext = withFlutchContext;
 exports.withToolReferences = withToolReferences;