@yourgpt/llm-sdk 2.6.0-beta.1 → 2.6.0-beta.3

package/dist/providers/anthropic/index.d.mts

@@ -1,7 +1,7 @@
-import { L as LanguageModel } from '../../types-BW3csYo5.mjs';
-import { a as AnthropicProviderConfig, A as AIProvider } from '../../types-NOswlhm9.mjs';
+import { L as LanguageModel } from '../../types-Dg1Bcg1k.mjs';
+import { a as AnthropicProviderConfig, A as AIProvider } from '../../types-DHQEMFHA.mjs';
 import 'zod';
-import '../../base-CkeT7u-O.mjs';
+import '../../base-BICaQaRS.mjs';
 
 /**
  * Anthropic Provider - Modern Pattern

package/dist/providers/anthropic/index.d.ts

@@ -1,7 +1,7 @@
-import { L as LanguageModel } from '../../types-BW3csYo5.js';
-import { a as AnthropicProviderConfig, A as AIProvider } from '../../types-DA54bSmX.js';
+import { L as LanguageModel } from '../../types-Dg1Bcg1k.js';
+import { a as AnthropicProviderConfig, A as AIProvider } from '../../types-Dikj3En4.js';
 import 'zod';
-import '../../base-BdTpUAWI.js';
+import '../../base-CpRPB8u8.js';
 
 /**
  * Anthropic Provider - Modern Pattern

package/dist/providers/anthropic/index.js

@@ -1,5 +1,92 @@
 'use strict';
 
+// src/core/tool-output.ts
+var imageTypes = /* @__PURE__ */ new Set([
+  "image/png",
+  "image/jpeg",
+  "image/webp",
+  "image/gif"
+]);
+function normalizeToolOutput(value) {
+  const output = value;
+  if (output?.type !== "content" || !Array.isArray(output.content) || !output.content.length) {
+    throw new Error("Tool model output must contain a nonempty content array");
+  }
+  return {
+    type: "content",
+    content: output.content.map((part) => {
+      if (part?.type === "text" && typeof part.text === "string")
+        return { type: "text", text: part.text };
+      if (part?.type !== "image")
+        throw new Error("Unsupported tool output content type");
+      const sources = ["data", "url", "fileId"].filter((key) => key in part);
+      if (sources.length !== 1)
+        throw new Error(
+          "Tool image requires exactly one of data, url, or fileId"
+        );
+      if ("fileId" in part) {
+        if (part.provider !== "openai" || typeof part.fileId !== "string" || !part.fileId.trim())
+          throw new Error(
+            "Tool image file references must name the openai provider and fileId"
+          );
+        return { type: "image", fileId: part.fileId, provider: "openai" };
+      }
+      if ("url" in part) {
+        let url;
+        try {
+          url = new URL(part.url);
+        } catch {
+          throw new Error("Invalid tool image URL");
+        }
+        if (!["https:", "http:"].includes(url.protocol) || url.username || url.password)
+          throw new Error(
+            "Tool image URL must use HTTP(S) without credentials"
+          );
+        return { type: "image", url: url.href };
+      }
+      if (!("data" in part) || !imageTypes.has(part.mediaType))
+        throw new Error("Unsupported tool image media type");
+      let data = part.data instanceof Uint8Array ? Buffer.from(part.data).toString("base64") : part.data;
+      if (typeof data !== "string")
+        throw new Error("Tool image data must be base64 or bytes");
+      if (data.startsWith("data:")) {
+        const match = /^data:([^;,]+);base64,(.+)$/.exec(data);
+        if (!match || match[1] !== part.mediaType)
+          throw new Error(
+            "Tool image data URL media type does not match mediaType"
+          );
+        data = match[2];
+      }
+      if (!data.length || data.length % 4 !== 0 || !/^[A-Za-z0-9+/]+={0,2}$/.test(data))
+        throw new Error("Invalid tool image base64 data");
+      if (Buffer.byteLength(data, "base64") > 20 * 1024 * 1024)
+        throw new Error("Tool image exceeds 20 MiB");
+      if (Buffer.from(data, "base64").toString("base64") !== data)
+        throw new Error("Invalid tool image base64 data");
+      return { type: "image", data, mediaType: part.mediaType };
+    })
+  };
+}
+function toolOutputForProvider(value, provider) {
+  const output = normalizeToolOutput(value);
+  return output.content.map((part) => {
+    if (part.type === "text")
+      return {
+        type: "text",
+        text: part.text
+      };
+    if ("fileId" in part) {
+      throw new Error(
+          "OpenAI image file references cannot be sent to another provider"
+        );
+    }
+    return {
+      type: "image",
+      source: "url" in part ? { type: "url", url: part.url } : { type: "base64", media_type: part.mediaType, data: part.data }
+    };
+  });
+}
+
 // src/adapters/base.ts
 function stringifyForDebug(value) {
   return JSON.stringify(
@@ -206,7 +293,20 @@ function messageToAnthropicContent(message) {
   }
   return blocks;
 }
+function extractAnthropicSystemPrompt(messages, systemPrompt) {
+  const explicit = typeof systemPrompt === "string" ? systemPrompt : "";
+  const parts = explicit ? [explicit] : [];
+  for (const message of messages) {
+    if (message.role !== "system") continue;
+    const text = typeof message.content === "string" ? message.content : Array.isArray(message.content) ? message.content.filter(
+      (block) => block?.type === "text" && typeof block.text === "string"
+    ).map((block) => block.text).filter(Boolean).join("\n") : "";
+    if (text && text !== explicit) parts.push(text);
+  }
+  return parts.join("\n");
+}
 function formatMessagesForAnthropic(messages, systemPrompt) {
+  const system = extractAnthropicSystemPrompt(messages, systemPrompt);
   const formatted = [];
   for (let i = 0; i < messages.length; i++) {
     const msg = messages[i];
@@ -235,7 +335,7 @@ function formatMessagesForAnthropic(messages, systemPrompt) {
         {
           type: "tool_result",
           tool_use_id: msg.tool_call_id,
-          content: msg.content ?? ""
+          content: msg.modelOutput ? toolOutputForProvider(msg.modelOutput) : msg.content ?? ""
         }
       ];
       while (i + 1 < messages.length && messages[i + 1].role === "tool") {
@@ -245,7 +345,7 @@ function formatMessagesForAnthropic(messages, systemPrompt) {
           toolResults.push({
             type: "tool_result",
             tool_use_id: nextTool.tool_call_id,
-            content: nextTool.content ?? ""
+            content: nextTool.modelOutput ? toolOutputForProvider(nextTool.modelOutput) : nextTool.content ?? ""
           });
         }
       }
@@ -261,7 +361,7 @@ function formatMessagesForAnthropic(messages, systemPrompt) {
     }
   }
   return {
-    system: "",
+    system,
     messages: formatted
   };
 }
@@ -631,7 +731,7 @@ function formatMessagesForAnthropic2(messages) {
       }
       pendingToolResults.push({
         toolCallId,
-        content: msg.content
+        content: msg.modelOutput ? toolOutputForProvider(msg.modelOutput) : msg.content
       });
     }
   }
@@ -750,7 +850,7 @@ var AnthropicAdapter = class {
         }
         pendingToolResults.push({
           tool_use_id: toolCallId,
-          content: typeof msg.content === "string" ? msg.content : JSON.stringify(msg.content)
+          content: msg.modelOutput ? toolOutputForProvider(msg.modelOutput) : typeof msg.content === "string" ? msg.content : JSON.stringify(msg.content)
         });
       } else if (msg.role === "user") {
         if (pendingToolResults.length > 0) {
@@ -871,14 +971,23 @@ var AnthropicAdapter = class {
   buildRequestOptions(request) {
     const responseFormat = request.config?.responseFormat;
     const jsonObjectSuffix = responseFormat?.type === "json_object" ? "\n\nRespond with a single JSON object and no other text." : "";
-    const systemMessage = (request.systemPrompt || "") + jsonObjectSuffix;
+    let systemMessage;
     let messages;
     if (request.rawMessages && request.rawMessages.length > 0) {
+      systemMessage = extractAnthropicSystemPrompt(
+        request.rawMessages,
+        request.systemPrompt
+      );
       messages = this.convertToAnthropicMessages(request.rawMessages);
     } else {
-      const formatted = formatMessagesForAnthropic(request.messages);
+      const formatted = formatMessagesForAnthropic(
+        request.messages,
+        request.systemPrompt
+      );
+      systemMessage = formatted.system;
       messages = formatted.messages;
     }
+    systemMessage += jsonObjectSuffix;
     const anthropicNativeSearch = request.providerToolOptions?.anthropic?.nativeToolSearch;
     const tools = anthropicNativeSearch?.enabled ? this.buildNativeSearchTools(
       request.toolDefinitions ?? [],

package/dist/providers/anthropic/index.mjs

@@ -1,3 +1,90 @@
+// src/core/tool-output.ts
+var imageTypes = /* @__PURE__ */ new Set([
+  "image/png",
+  "image/jpeg",
+  "image/webp",
+  "image/gif"
+]);
+function normalizeToolOutput(value) {
+  const output = value;
+  if (output?.type !== "content" || !Array.isArray(output.content) || !output.content.length) {
+    throw new Error("Tool model output must contain a nonempty content array");
+  }
+  return {
+    type: "content",
+    content: output.content.map((part) => {
+      if (part?.type === "text" && typeof part.text === "string")
+        return { type: "text", text: part.text };
+      if (part?.type !== "image")
+        throw new Error("Unsupported tool output content type");
+      const sources = ["data", "url", "fileId"].filter((key) => key in part);
+      if (sources.length !== 1)
+        throw new Error(
+          "Tool image requires exactly one of data, url, or fileId"
+        );
+      if ("fileId" in part) {
+        if (part.provider !== "openai" || typeof part.fileId !== "string" || !part.fileId.trim())
+          throw new Error(
+            "Tool image file references must name the openai provider and fileId"
+          );
+        return { type: "image", fileId: part.fileId, provider: "openai" };
+      }
+      if ("url" in part) {
+        let url;
+        try {
+          url = new URL(part.url);
+        } catch {
+          throw new Error("Invalid tool image URL");
+        }
+        if (!["https:", "http:"].includes(url.protocol) || url.username || url.password)
+          throw new Error(
+            "Tool image URL must use HTTP(S) without credentials"
+          );
+        return { type: "image", url: url.href };
+      }
+      if (!("data" in part) || !imageTypes.has(part.mediaType))
+        throw new Error("Unsupported tool image media type");
+      let data = part.data instanceof Uint8Array ? Buffer.from(part.data).toString("base64") : part.data;
+      if (typeof data !== "string")
+        throw new Error("Tool image data must be base64 or bytes");
+      if (data.startsWith("data:")) {
+        const match = /^data:([^;,]+);base64,(.+)$/.exec(data);
+        if (!match || match[1] !== part.mediaType)
+          throw new Error(
+            "Tool image data URL media type does not match mediaType"
+          );
+        data = match[2];
+      }
+      if (!data.length || data.length % 4 !== 0 || !/^[A-Za-z0-9+/]+={0,2}$/.test(data))
+        throw new Error("Invalid tool image base64 data");
+      if (Buffer.byteLength(data, "base64") > 20 * 1024 * 1024)
+        throw new Error("Tool image exceeds 20 MiB");
+      if (Buffer.from(data, "base64").toString("base64") !== data)
+        throw new Error("Invalid tool image base64 data");
+      return { type: "image", data, mediaType: part.mediaType };
+    })
+  };
+}
+function toolOutputForProvider(value, provider) {
+  const output = normalizeToolOutput(value);
+  return output.content.map((part) => {
+    if (part.type === "text")
+      return {
+        type: "text",
+        text: part.text
+      };
+    if ("fileId" in part) {
+      throw new Error(
+          "OpenAI image file references cannot be sent to another provider"
+        );
+    }
+    return {
+      type: "image",
+      source: "url" in part ? { type: "url", url: part.url } : { type: "base64", media_type: part.mediaType, data: part.data }
+    };
+  });
+}
+
 // src/adapters/base.ts
 function stringifyForDebug(value) {
   return JSON.stringify(
@@ -204,7 +291,20 @@ function messageToAnthropicContent(message) {
   }
   return blocks;
 }
+function extractAnthropicSystemPrompt(messages, systemPrompt) {
+  const explicit = typeof systemPrompt === "string" ? systemPrompt : "";
+  const parts = explicit ? [explicit] : [];
+  for (const message of messages) {
+    if (message.role !== "system") continue;
+    const text = typeof message.content === "string" ? message.content : Array.isArray(message.content) ? message.content.filter(
+      (block) => block?.type === "text" && typeof block.text === "string"
+    ).map((block) => block.text).filter(Boolean).join("\n") : "";
+    if (text && text !== explicit) parts.push(text);
+  }
+  return parts.join("\n");
+}
 function formatMessagesForAnthropic(messages, systemPrompt) {
+  const system = extractAnthropicSystemPrompt(messages, systemPrompt);
   const formatted = [];
   for (let i = 0; i < messages.length; i++) {
     const msg = messages[i];
@@ -233,7 +333,7 @@ function formatMessagesForAnthropic(messages, systemPrompt) {
         {
           type: "tool_result",
           tool_use_id: msg.tool_call_id,
-          content: msg.content ?? ""
+          content: msg.modelOutput ? toolOutputForProvider(msg.modelOutput) : msg.content ?? ""
         }
       ];
       while (i + 1 < messages.length && messages[i + 1].role === "tool") {
@@ -243,7 +343,7 @@ function formatMessagesForAnthropic(messages, systemPrompt) {
           toolResults.push({
             type: "tool_result",
             tool_use_id: nextTool.tool_call_id,
-            content: nextTool.content ?? ""
+            content: nextTool.modelOutput ? toolOutputForProvider(nextTool.modelOutput) : nextTool.content ?? ""
           });
         }
       }
@@ -259,7 +359,7 @@ function formatMessagesForAnthropic(messages, systemPrompt) {
     }
   }
   return {
-    system: "",
+    system,
     messages: formatted
   };
 }
@@ -629,7 +729,7 @@ function formatMessagesForAnthropic2(messages) {
       }
       pendingToolResults.push({
         toolCallId,
-        content: msg.content
+        content: msg.modelOutput ? toolOutputForProvider(msg.modelOutput) : msg.content
       });
     }
   }
@@ -748,7 +848,7 @@ var AnthropicAdapter = class {
         }
         pendingToolResults.push({
           tool_use_id: toolCallId,
-          content: typeof msg.content === "string" ? msg.content : JSON.stringify(msg.content)
+          content: msg.modelOutput ? toolOutputForProvider(msg.modelOutput) : typeof msg.content === "string" ? msg.content : JSON.stringify(msg.content)
         });
       } else if (msg.role === "user") {
         if (pendingToolResults.length > 0) {
@@ -869,14 +969,23 @@ var AnthropicAdapter = class {
   buildRequestOptions(request) {
     const responseFormat = request.config?.responseFormat;
     const jsonObjectSuffix = responseFormat?.type === "json_object" ? "\n\nRespond with a single JSON object and no other text." : "";
-    const systemMessage = (request.systemPrompt || "") + jsonObjectSuffix;
+    let systemMessage;
     let messages;
     if (request.rawMessages && request.rawMessages.length > 0) {
+      systemMessage = extractAnthropicSystemPrompt(
+        request.rawMessages,
+        request.systemPrompt
+      );
       messages = this.convertToAnthropicMessages(request.rawMessages);
     } else {
-      const formatted = formatMessagesForAnthropic(request.messages);
+      const formatted = formatMessagesForAnthropic(
+        request.messages,
+        request.systemPrompt
+      );
+      systemMessage = formatted.system;
       messages = formatted.messages;
     }
+    systemMessage += jsonObjectSuffix;
     const anthropicNativeSearch = request.providerToolOptions?.anthropic?.nativeToolSearch;
     const tools = anthropicNativeSearch?.enabled ? this.buildNativeSearchTools(
       request.toolDefinitions ?? [],

package/dist/providers/azure/index.d.mts

@@ -1,7 +1,7 @@
-import { b as AzureProviderConfig, A as AIProvider } from '../../types-NOswlhm9.mjs';
-import '../../types-BW3csYo5.mjs';
+import { b as AzureProviderConfig, A as AIProvider } from '../../types-DHQEMFHA.mjs';
+import '../../types-Dg1Bcg1k.mjs';
 import 'zod';
-import '../../base-CkeT7u-O.mjs';
+import '../../base-BICaQaRS.mjs';
 
 /**
  * Azure OpenAI Provider

package/dist/providers/azure/index.d.ts

@@ -1,7 +1,7 @@
-import { b as AzureProviderConfig, A as AIProvider } from '../../types-DA54bSmX.js';
-import '../../types-BW3csYo5.js';
+import { b as AzureProviderConfig, A as AIProvider } from '../../types-Dikj3En4.js';
+import '../../types-Dg1Bcg1k.js';
 import 'zod';
-import '../../base-BdTpUAWI.js';
+import '../../base-CpRPB8u8.js';
 
 /**
  * Azure OpenAI Provider

package/dist/providers/azure/index.js

@@ -1,5 +1,90 @@
 'use strict';
 
+// src/core/tool-output.ts
+var imageTypes = /* @__PURE__ */ new Set([
+  "image/png",
+  "image/jpeg",
+  "image/webp",
+  "image/gif"
+]);
+function normalizeToolOutput(value) {
+  const output = value;
+  if (output?.type !== "content" || !Array.isArray(output.content) || !output.content.length) {
+    throw new Error("Tool model output must contain a nonempty content array");
+  }
+  return {
+    type: "content",
+    content: output.content.map((part) => {
+      if (part?.type === "text" && typeof part.text === "string")
+        return { type: "text", text: part.text };
+      if (part?.type !== "image")
+        throw new Error("Unsupported tool output content type");
+      const sources = ["data", "url", "fileId"].filter((key) => key in part);
+      if (sources.length !== 1)
+        throw new Error(
+          "Tool image requires exactly one of data, url, or fileId"
+        );
+      if ("fileId" in part) {
+        if (part.provider !== "openai" || typeof part.fileId !== "string" || !part.fileId.trim())
+          throw new Error(
+            "Tool image file references must name the openai provider and fileId"
+          );
+        return { type: "image", fileId: part.fileId, provider: "openai" };
+      }
+      if ("url" in part) {
+        let url;
+        try {
+          url = new URL(part.url);
+        } catch {
+          throw new Error("Invalid tool image URL");
+        }
+        if (!["https:", "http:"].includes(url.protocol) || url.username || url.password)
+          throw new Error(
+            "Tool image URL must use HTTP(S) without credentials"
+          );
+        return { type: "image", url: url.href };
+      }
+      if (!("data" in part) || !imageTypes.has(part.mediaType))
+        throw new Error("Unsupported tool image media type");
+      let data = part.data instanceof Uint8Array ? Buffer.from(part.data).toString("base64") : part.data;
+      if (typeof data !== "string")
+        throw new Error("Tool image data must be base64 or bytes");
+      if (data.startsWith("data:")) {
+        const match = /^data:([^;,]+);base64,(.+)$/.exec(data);
+        if (!match || match[1] !== part.mediaType)
+          throw new Error(
+            "Tool image data URL media type does not match mediaType"
+          );
+        data = match[2];
+      }
+      if (!data.length || data.length % 4 !== 0 || !/^[A-Za-z0-9+/]+={0,2}$/.test(data))
+        throw new Error("Invalid tool image base64 data");
+      if (Buffer.byteLength(data, "base64") > 20 * 1024 * 1024)
+        throw new Error("Tool image exceeds 20 MiB");
+      if (Buffer.from(data, "base64").toString("base64") !== data)
+        throw new Error("Invalid tool image base64 data");
+      return { type: "image", data, mediaType: part.mediaType };
+    })
+  };
+}
+function toolOutputForProvider(value, provider) {
+  const output = normalizeToolOutput(value);
+  return output.content.map((part) => {
+    if (part.type === "text")
+      return {
+        type: "text",
+        text: part.text
+      };
+    throw new Error(
+        "Image tool results require OpenAI Responses or Anthropic; this endpoint is not supported"
+      );
+  });
+}
+function textToolOutput(value, fallback) {
+  if (value === void 0) return fallback;
+  return toolOutputForProvider(value).map((part) => part.text).join("\n");
+}
+
 // src/core/utils.ts
 function generateId(prefix = "id") {
   return `${prefix}_${Date.now()}_${Math.random().toString(36).substring(2, 9)}`;
@@ -189,7 +274,7 @@ function messageToOpenAIContent(message) {
   }
   return blocks;
 }
-function formatMessagesForOpenAI(messages, systemPrompt) {
+function formatMessagesForOpenAI(messages, systemPrompt, preserveProviderMetadata = false) {
   const formatted = [];
   if (systemPrompt) {
     formatted.push({ role: "system", content: systemPrompt });
@@ -207,7 +292,8 @@ function formatMessagesForOpenAI(messages, systemPrompt) {
       const assistantMsg = {
         role: "assistant",
         // Gemini/xAI (OpenAI-compatible) reject content: "" on assistant messages with tool_calls
-        content: hasToolCalls ? msg.content || null : msg.content
+        content: hasToolCalls ? msg.content || null : msg.content,
+        ...preserveProviderMetadata && msg.providerMetadata ? { providerMetadata: msg.providerMetadata } : {}
       };
       if (hasToolCalls) {
         assistantMsg.tool_calls = msg.tool_calls;
@@ -216,7 +302,8 @@ function formatMessagesForOpenAI(messages, systemPrompt) {
     } else if (msg.role === "tool" && msg.tool_call_id) {
       formatted.push({
         role: "tool",
-        content: msg.content ?? "",
+        content: preserveProviderMetadata ? msg.content ?? "" : textToolOutput(msg.modelOutput, msg.content ?? ""),
+        ...preserveProviderMetadata && msg.modelOutput ? { modelOutput: msg.modelOutput } : {},
         tool_call_id: msg.tool_call_id
       });
     }
@@ -256,6 +343,13 @@ var AzureAdapter = class {
     let messages;
     if (request.rawMessages && request.rawMessages.length > 0) {
       const processedMessages = request.rawMessages.map((msg) => {
+        const { modelOutput, ...rest } = msg;
+        msg = {
+          ...rest,
+          ...msg.role === "tool" ? {
+            content: textToolOutput(modelOutput, String(msg.content ?? ""))
+          } : {}
+        };
         const hasAttachments = msg.attachments && Array.isArray(msg.attachments) && msg.attachments.length > 0;
         if (hasAttachments) {
           const content = [];
@@ -386,7 +480,10 @@ var AzureAdapter = class {
     const client = await this.getClient();
     let messages;
     if (request.rawMessages && request.rawMessages.length > 0) {
-      messages = request.rawMessages;
+      messages = request.rawMessages.map(({ modelOutput, ...msg }) => ({
+        ...msg,
+        ...msg.role === "tool" ? { content: textToolOutput(modelOutput, String(msg.content ?? "")) } : {}
+      }));
       if (request.systemPrompt) {
         const hasSystem = messages.some((m) => m.role === "system");
         if (!hasSystem) {