extrait 0.7.4 → 0.7.5

package/dist/index.cjs

@@ -2227,7 +2227,8 @@ async function streamWithChatCompletionsWithMCP(options, fetcher, path, request,
         roundReasoning += reasoningDelta;
         reasoningFieldName ??= pickAssistantReasoningDeltaFieldName(json);
       }
-      const chunkToolCalls = nativeDelta.toolCalls.length > 0 ? mergeToolCalls(buildOpenAIStreamToolCalls(streamedToolCalls), nativeDelta.toolCalls) : undefined;
+      const streamedSnapshot = buildOpenAIStreamToolCalls(streamedToolCalls);
+      const chunkToolCalls = nativeDelta.toolCalls.length > 0 ? mergeToolCalls(streamedSnapshot, nativeDelta.toolCalls) : streamedSnapshot.length > 0 ? streamedSnapshot : undefined;
       emitOpenAIStreamChunk(callbacks, round, json, delta, reasoningDelta, chunkUsage, chunkFinishReason, chunkToolCalls);
     });
     const tail = nativeToolCalls.flush();
@@ -2421,7 +2422,8 @@ async function streamWithResponsesAPIWithMCP(options, fetcher, path, request, ca
       if (reasoningDelta) {
         roundReasoning += reasoningDelta;
       }
-      emitOpenAIStreamChunk(callbacks, round, json, delta, reasoningDelta, chunkUsage, chunkFinishReason);
+      const chunkToolCalls = buildResponsesStreamToolCalls(streamedToolCalls);
+      emitOpenAIStreamChunk(callbacks, round, json, delta, reasoningDelta, chunkUsage, chunkFinishReason, chunkToolCalls.length > 0 ? chunkToolCalls : undefined);
     });
     const resolvedRoundUsage = preferLatestUsage(roundUsage, roundPayload ? pickUsage(roundPayload) : undefined);
     state.aggregatedUsage = mergeUsage2(state.aggregatedUsage, resolvedRoundUsage);
@@ -3226,6 +3228,7 @@ async function streamPassThrough(options, fetcher, path, request, callbacks) {
   let text = "";
   let usage;
   let finishReason;
+  const streamedToolCalls = new Map;
   await consumeSSE(response, (data) => {
     if (data === "[DONE]") {
       return;
@@ -3237,6 +3240,7 @@ async function streamPassThrough(options, fetcher, path, request, callbacks) {
     const delta = pickAnthropicDelta(json);
     const chunkUsage = pickUsage2(json);
     const chunkFinishReason = pickFinishReason2(json);
+    collectAnthropicStreamToolCalls(json, streamedToolCalls);
     usage = preferLatestUsage(usage, chunkUsage);
     if (chunkFinishReason) {
       finishReason = chunkFinishReason;
@@ -3245,16 +3249,25 @@ async function streamPassThrough(options, fetcher, path, request, callbacks) {
       text += delta;
       callbacks.onToken?.(delta);
     }
-    if (delta || chunkUsage || chunkFinishReason) {
+    const streamedSnapshot = buildAnthropicStreamToolCalls(streamedToolCalls);
+    const chunkToolCalls = streamedSnapshot.length > 0 ? streamedSnapshot : undefined;
+    if (delta || chunkUsage || chunkFinishReason || chunkToolCalls) {
       callbacks.onChunk?.({
         textDelta: delta,
         raw: json,
         usage: chunkUsage,
-        finishReason: chunkFinishReason
+        finishReason: chunkFinishReason,
+        toolCalls: chunkToolCalls
       });
     }
   });
-  const out = { text, usage, finishReason };
+  const toolCalls = buildAnthropicStreamToolCalls(streamedToolCalls);
+  const out = {
+    text,
+    usage,
+    finishReason: finishReason ?? (toolCalls.length > 0 ? "tool_use" : undefined),
+    toolCalls: toolCalls.length > 0 ? toolCalls : undefined
+  };
   callbacks.onComplete?.(out);
   return out;
 }
@@ -3432,14 +3445,17 @@ async function streamWithMCPToolLoop(options, fetcher, path, request, callbacks)
       if (reasoningDelta) {
         roundReasoning += reasoningDelta;
       }
-      if (delta || reasoningDelta || chunkUsage || chunkFinishReason) {
+      const streamedSnapshot = buildAnthropicStreamToolCalls(streamedToolCalls);
+      const chunkToolCalls = streamedSnapshot.length > 0 ? streamedSnapshot : undefined;
+      if (delta || reasoningDelta || chunkUsage || chunkFinishReason || chunkToolCalls) {
         const chunk = {
           textDelta: delta,
           reasoningDelta: reasoningDelta || undefined,
           turnIndex: round,
           raw: json,
           usage: chunkUsage,
-          finishReason: chunkFinishReason
+          finishReason: chunkFinishReason,
+          toolCalls: chunkToolCalls
         };
         callbacks.onChunk?.(chunk);
       }

package/dist/index.js

@@ -2134,7 +2134,8 @@ async function streamWithChatCompletionsWithMCP(options, fetcher, path, request,
         roundReasoning += reasoningDelta;
         reasoningFieldName ??= pickAssistantReasoningDeltaFieldName(json);
       }
-      const chunkToolCalls = nativeDelta.toolCalls.length > 0 ? mergeToolCalls(buildOpenAIStreamToolCalls(streamedToolCalls), nativeDelta.toolCalls) : undefined;
+      const streamedSnapshot = buildOpenAIStreamToolCalls(streamedToolCalls);
+      const chunkToolCalls = nativeDelta.toolCalls.length > 0 ? mergeToolCalls(streamedSnapshot, nativeDelta.toolCalls) : streamedSnapshot.length > 0 ? streamedSnapshot : undefined;
       emitOpenAIStreamChunk(callbacks, round, json, delta, reasoningDelta, chunkUsage, chunkFinishReason, chunkToolCalls);
     });
     const tail = nativeToolCalls.flush();
@@ -2328,7 +2329,8 @@ async function streamWithResponsesAPIWithMCP(options, fetcher, path, request, ca
       if (reasoningDelta) {
         roundReasoning += reasoningDelta;
       }
-      emitOpenAIStreamChunk(callbacks, round, json, delta, reasoningDelta, chunkUsage, chunkFinishReason);
+      const chunkToolCalls = buildResponsesStreamToolCalls(streamedToolCalls);
+      emitOpenAIStreamChunk(callbacks, round, json, delta, reasoningDelta, chunkUsage, chunkFinishReason, chunkToolCalls.length > 0 ? chunkToolCalls : undefined);
     });
     const resolvedRoundUsage = preferLatestUsage(roundUsage, roundPayload ? pickUsage(roundPayload) : undefined);
     state.aggregatedUsage = mergeUsage2(state.aggregatedUsage, resolvedRoundUsage);
@@ -3133,6 +3135,7 @@ async function streamPassThrough(options, fetcher, path, request, callbacks) {
   let text = "";
   let usage;
   let finishReason;
+  const streamedToolCalls = new Map;
   await consumeSSE(response, (data) => {
     if (data === "[DONE]") {
       return;
@@ -3144,6 +3147,7 @@ async function streamPassThrough(options, fetcher, path, request, callbacks) {
     const delta = pickAnthropicDelta(json);
     const chunkUsage = pickUsage2(json);
     const chunkFinishReason = pickFinishReason2(json);
+    collectAnthropicStreamToolCalls(json, streamedToolCalls);
     usage = preferLatestUsage(usage, chunkUsage);
     if (chunkFinishReason) {
       finishReason = chunkFinishReason;
@@ -3152,16 +3156,25 @@ async function streamPassThrough(options, fetcher, path, request, callbacks) {
       text += delta;
       callbacks.onToken?.(delta);
     }
-    if (delta || chunkUsage || chunkFinishReason) {
+    const streamedSnapshot = buildAnthropicStreamToolCalls(streamedToolCalls);
+    const chunkToolCalls = streamedSnapshot.length > 0 ? streamedSnapshot : undefined;
+    if (delta || chunkUsage || chunkFinishReason || chunkToolCalls) {
       callbacks.onChunk?.({
         textDelta: delta,
         raw: json,
         usage: chunkUsage,
-        finishReason: chunkFinishReason
+        finishReason: chunkFinishReason,
+        toolCalls: chunkToolCalls
       });
     }
   });
-  const out = { text, usage, finishReason };
+  const toolCalls = buildAnthropicStreamToolCalls(streamedToolCalls);
+  const out = {
+    text,
+    usage,
+    finishReason: finishReason ?? (toolCalls.length > 0 ? "tool_use" : undefined),
+    toolCalls: toolCalls.length > 0 ? toolCalls : undefined
+  };
   callbacks.onComplete?.(out);
   return out;
 }
@@ -3339,14 +3352,17 @@ async function streamWithMCPToolLoop(options, fetcher, path, request, callbacks)
       if (reasoningDelta) {
         roundReasoning += reasoningDelta;
       }
-      if (delta || reasoningDelta || chunkUsage || chunkFinishReason) {
+      const streamedSnapshot = buildAnthropicStreamToolCalls(streamedToolCalls);
+      const chunkToolCalls = streamedSnapshot.length > 0 ? streamedSnapshot : undefined;
+      if (delta || reasoningDelta || chunkUsage || chunkFinishReason || chunkToolCalls) {
         const chunk = {
           textDelta: delta,
           reasoningDelta: reasoningDelta || undefined,
           turnIndex: round,
           raw: json,
           usage: chunkUsage,
-          finishReason: chunkFinishReason
+          finishReason: chunkFinishReason,
+          toolCalls: chunkToolCalls
         };
         callbacks.onChunk?.(chunk);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "extrait",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/tterrasson/extrait.git"