@flutchai/flutch-sdk 0.7.13 → 0.7.15

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 = [];
@@ -5311,9 +5334,10 @@ exports.EventProcessor = class _EventProcessor {
     ].filter((b) => b.type === "tool_use");
     const block = (data.id ? blocks.find((b) => b.id === data.id) : void 0) ?? [
       ...blocks
-    ].reverse().find((b) => b.name === data.name && !b.label);
+    ].reverse().find((b) => b.name === data.name && !b.labelled);
     if (!block) return;
     block.label = String(data.label);
+    block.labelled = true;
     this.sendDelta(channel, {
       type: "tool_label",
       stepId: block.id,
@@ -5442,20 +5466,24 @@ exports.EventProcessor = class _EventProcessor {
   /**
   * Process content stream blocks (universal for all channels)
   */
-  processContentStream(acc, channel, blocks, onPartial) {
+  processContentStream(acc, channel, blocks, onPartial, titles) {
     const state = acc.channels.get(channel);
     for (const block of blocks) {
       if (block.type === "tool_use" || block.type === "tool_call") {
         if (state.currentBlock) {
           state.contentChain.push(state.currentBlock);
         }
+        const title = titles?.[String(block.name)];
         state.currentBlock = {
           index: state.contentChain.length,
           type: "tool_use",
           name: block.name,
           id: block.id,
           input: block.input || "",
-          output: ""
+          output: "",
+          ...typeof title === "string" && title ? {
+            label: title
+          } : {}
         };
         state.pendingToolBlocks.push(state.currentBlock);
         this.sendDelta(channel, {
@@ -5615,7 +5643,7 @@ exports.EventProcessor = class _EventProcessor {
         blocks.push(...this.toolCallChunksToBlocks(chunk.tool_call_chunks));
       }
       if (blocks.length > 0) {
-        this.processContentStream(acc, channel, blocks, onPartial);
+        this.processContentStream(acc, channel, blocks, onPartial, event.metadata?.tool_titles);
       }
       return;
     }
@@ -5683,7 +5711,7 @@ 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]";
         }
@@ -6952,6 +6980,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;
@@ -6980,7 +7011,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)) {
@@ -7300,12 +7337,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);
@@ -9486,8 +9528,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;