@ljoukov/llm 5.0.0 → 5.0.3

package/dist/index.js

@@ -5983,6 +5983,23 @@ function toOpenAiToolOutput(value) {
   }
   return mergeToolOutput(value);
 }
+function toChatGptToolOutput(value) {
+  const toolOutput = toOpenAiToolOutput(value);
+  if (typeof toolOutput === "string") {
+    return toolOutput;
+  }
+  return toolOutput.map((item) => {
+    if (item.type !== "input_image") {
+      return item;
+    }
+    return {
+      type: "input_image",
+      ...item.file_id ? { file_id: item.file_id } : {},
+      ...item.image_url ? { image_url: item.image_url } : {},
+      ...item.detail ? { detail: item.detail } : {}
+    };
+  });
+}
 function toGeminiToolOutputItems(value) {
   if (isLlmToolOutputContentItem(value)) {
     return [value];
@@ -6150,6 +6167,9 @@ async function maybeSpillToolOutputItem(item, toolName, options) {
   return item;
 }
 async function maybeSpillToolOutput(value, toolName, options) {
+  if (options?.provider === "chatgpt") {
+    return value;
+  }
   if (typeof value === "string") {
     if (options?.force !== true && Buffer5.byteLength(value, "utf8") <= TOOL_OUTPUT_SPILL_THRESHOLD_BYTES) {
       return value;
@@ -6203,7 +6223,7 @@ function estimateToolOutputPayloadBytes(value) {
   }
   return 0;
 }
-async function maybeSpillCombinedToolCallOutputs(callResults) {
+async function maybeSpillCombinedToolCallOutputs(callResults, options) {
   const totalBytes = callResults.reduce(
     (sum, callResult) => sum + estimateToolOutputPayloadBytes(callResult.outputPayload),
     0
@@ -6220,7 +6240,8 @@ async function maybeSpillCombinedToolCallOutputs(callResults) {
         callResult.outputPayload,
         callResult.entry.toolName,
         {
-          force: true
+          force: true,
+          provider: options?.provider
         }
       );
       return {
@@ -6450,7 +6471,7 @@ function extractSpawnStartupMetrics(outputPayload) {
   };
 }
 async function executeToolCall(params) {
-  const { callKind, toolName, tool: tool2, rawInput, parseError } = params;
+  const { callKind, toolName, tool: tool2, rawInput, parseError, provider } = params;
   const startedAtMs = Date.now();
   const finalize = (base, outputPayload, metrics) => {
     const completedAtMs = Date.now();
@@ -6485,7 +6506,7 @@ async function executeToolCall(params) {
     const input = typeof rawInput === "string" ? rawInput : String(rawInput ?? "");
     try {
       const output = await tool2.execute(input);
-      const outputPayload = await maybeSpillToolOutput(output, toolName);
+      const outputPayload = await maybeSpillToolOutput(output, toolName, { provider });
       const metrics = toolName === "spawn_agent" ? extractSpawnStartupMetrics(outputPayload) : void 0;
       return finalize({ toolName, input, output: outputPayload }, outputPayload, metrics);
     } catch (error) {
@@ -6521,7 +6542,7 @@ async function executeToolCall(params) {
   }
   try {
     const output = await tool2.execute(parsed.data);
-    const outputPayload = await maybeSpillToolOutput(output, toolName);
+    const outputPayload = await maybeSpillToolOutput(output, toolName, { provider });
     const metrics = toolName === "spawn_agent" ? extractSpawnStartupMetrics(outputPayload) : void 0;
     return finalize(
       { toolName, input: parsed.data, output: outputPayload },
@@ -8321,13 +8342,15 @@ async function runToolLoop(request) {
                       toolName: entry.toolName,
                       tool: request.tools[entry.toolName],
                       rawInput: entry.value,
-                      parseError: entry.parseError
+                      parseError: entry.parseError,
+                      provider: providerInfo.provider
                     });
                     return { entry, result, outputPayload };
                   }
                 );
               })
-            )
+            ),
+            { provider: providerInfo.provider }
           );
           const toolOutputs = [];
           let toolExecutionMs = 0;
@@ -8624,13 +8647,15 @@ async function runToolLoop(request) {
                       toolName: entry.toolName,
                       tool: request.tools[entry.toolName],
                       rawInput: entry.value,
-                      parseError: entry.parseError
+                      parseError: entry.parseError,
+                      provider: "chatgpt"
                     });
                     return { entry, result, outputPayload };
                   }
                 );
               })
-            )
+            ),
+            { provider: "chatgpt" }
           );
           let toolExecutionMs = 0;
           let waitToolMs = 0;
@@ -8667,7 +8692,7 @@ async function runToolLoop(request) {
               toolOutputs.push({
                 type: "custom_tool_call_output",
                 call_id: entry.ids.callId,
-                output: toOpenAiToolOutput(outputPayload)
+                output: toChatGptToolOutput(outputPayload)
               });
             } else {
               toolOutputs.push({
@@ -8681,7 +8706,7 @@ async function runToolLoop(request) {
               toolOutputs.push({
                 type: "function_call_output",
                 call_id: entry.ids.callId,
-                output: toOpenAiToolOutput(outputPayload)
+                output: toChatGptToolOutput(outputPayload)
               });
             }
           }
@@ -8918,13 +8943,15 @@ async function runToolLoop(request) {
                       toolName: entry.toolName,
                       tool: request.tools[entry.toolName],
                       rawInput: entry.value,
-                      parseError: entry.parseError
+                      parseError: entry.parseError,
+                      provider: providerInfo.provider
                     });
                     return { entry, result, outputPayload };
                   }
                 );
               })
-            )
+            ),
+            { provider: providerInfo.provider }
           );
           const assistantToolCalls = [];
           const toolMessages = [];
@@ -9271,13 +9298,15 @@ async function runToolLoop(request) {
                     callKind: "function",
                     toolName: entry.toolName,
                     tool: request.tools[entry.toolName],
-                    rawInput: entry.rawInput
+                    rawInput: entry.rawInput,
+                    provider: "gemini"
                   });
                   return { entry, result, outputPayload };
                 }
               );
             })
-          )
+          ),
+          { provider: "gemini" }
         );
         let toolExecutionMs = 0;
         let waitToolMs = 0;