@jaypie/llm 1.2.16 → 1.2.17

package/dist/cjs/types/LlmStreamChunk.interface.d.ts

@@ -16,6 +16,8 @@ export interface LlmStreamChunkToolCall {
         id: string;
         name: string;
         arguments: string;
+        /** Provider-specific metadata preserved through tool-call roundtrip */
+        metadata?: Record<string, unknown>;
     };
 }
 export interface LlmStreamChunkToolResult {

package/dist/esm/index.js

@@ -1679,6 +1679,11 @@ class GeminiAdapter extends BaseProviderAdapter {
                             name: functionCall.name || "",
                             arguments: functionCall.args || {},
                         };
+                        // Preserve thoughtSignature for Gemini 3 models
+                        // Required to maintain tool call context between turns
+                        const metadata = part.thoughtSignature
+                            ? { thoughtSignature: part.thoughtSignature }
+                            : undefined;
                         // Emit the function call immediately
                         yield {
                             type: LlmStreamChunkType.ToolCall,
@@ -1686,6 +1691,7 @@ class GeminiAdapter extends BaseProviderAdapter {
                                 id: currentFunctionCall.id,
                                 name: currentFunctionCall.name,
                                 arguments: JSON.stringify(currentFunctionCall.arguments),
+                                metadata,
                             },
                         };
                         currentFunctionCall = null;
@@ -2372,6 +2378,9 @@ class OpenAiAdapter extends BaseProviderAdapter {
                             id: currentFunctionCall.callId,
                             name: currentFunctionCall.name,
                             arguments: currentFunctionCall.arguments,
+                            // Preserve the item ID (fc_...) separately from call_id (call_...)
+                            // OpenAI Responses API requires both with correct prefixes
+                            metadata: { itemId: currentFunctionCall.id },
                         },
                     };
                     currentFunctionCall = null;
@@ -4791,13 +4800,22 @@ class StreamLoop {
         if (collectedToolCalls.length > 0 && state.toolkit && state.maxTurns > 1) {
             // Add tool calls to history
             for (const toolCall of collectedToolCalls) {
-                state.currentInput.push({
+                // Extract provider-specific metadata from the stream chunk
+                const metadata = toolCall.raw?.metadata;
+                const historyItem = {
                     type: LlmMessageType.FunctionCall,
                     name: toolCall.name,
                     arguments: toolCall.arguments,
                     call_id: toolCall.callId,
-                    id: toolCall.callId,
-                });
+                    // Use provider item ID if available (e.g., OpenAI fc_... prefix),
+                    // otherwise fall back to callId
+                    id: metadata?.itemId || toolCall.callId,
+                };
+                // Preserve provider-specific fields (e.g., Gemini thoughtSignature)
+                if (metadata?.thoughtSignature) {
+                    historyItem.thoughtSignature = metadata.thoughtSignature;
+                }
+                state.currentInput.push(historyItem);
             }
             return { shouldContinue: true, toolCalls: collectedToolCalls };
         }