@yourgpt/llm-sdk 2.1.5 → 2.1.6

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

@@ -1,6 +1,6 @@
-import { c as OllamaProviderConfig, A as AIProvider } from '../../types-VDgiUvH2.mjs';
-export { d as OllamaModelOptions } from '../../types-VDgiUvH2.mjs';
-import '../../base-5n-UuPfS.mjs';
+import { c as OllamaProviderConfig, A as AIProvider } from '../../types-DRqxMIjF.mjs';
+export { d as OllamaModelOptions } from '../../types-DRqxMIjF.mjs';
+import '../../base-D-U61JaB.mjs';
 import '../../types-CR8mi9I0.mjs';
 import 'zod';
 

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

@@ -1,6 +1,6 @@
-import { c as OllamaProviderConfig, A as AIProvider } from '../../types-C0vLXzuw.js';
-export { d as OllamaModelOptions } from '../../types-C0vLXzuw.js';
-import '../../base-Di31iy_8.js';
+import { c as OllamaProviderConfig, A as AIProvider } from '../../types-BctsnC3g.js';
+export { d as OllamaModelOptions } from '../../types-BctsnC3g.js';
+import '../../base-iGi9Va6Z.js';
 import '../../types-CR8mi9I0.js';
 import 'zod';
 

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

@@ -1,7 +1,7 @@
 import { L as LanguageModel } from '../../types-CR8mi9I0.mjs';
-import { O as OpenAIProviderConfig, A as AIProvider } from '../../types-VDgiUvH2.mjs';
+import { O as OpenAIProviderConfig, A as AIProvider } from '../../types-DRqxMIjF.mjs';
 import 'zod';
-import '../../base-5n-UuPfS.mjs';
+import '../../base-D-U61JaB.mjs';
 
 /**
  * OpenAI Provider - Modern Pattern

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

@@ -1,7 +1,7 @@
 import { L as LanguageModel } from '../../types-CR8mi9I0.js';
-import { O as OpenAIProviderConfig, A as AIProvider } from '../../types-C0vLXzuw.js';
+import { O as OpenAIProviderConfig, A as AIProvider } from '../../types-BctsnC3g.js';
 import 'zod';
-import '../../base-Di31iy_8.js';
+import '../../base-iGi9Va6Z.js';
 
 /**
  * OpenAI Provider - Modern Pattern

package/dist/providers/openai/index.js

@@ -454,11 +454,13 @@ function formatMessagesForOpenAI2(messages, systemPrompt) {
         content: messageToOpenAIContent(msg)
       });
     } else if (msg.role === "assistant") {
+      const hasToolCalls = msg.tool_calls && msg.tool_calls.length > 0;
       const assistantMsg = {
         role: "assistant",
-        content: msg.content
+        // Gemini/xAI (OpenAI-compatible) reject content: "" on assistant messages with tool_calls
+        content: hasToolCalls ? msg.content || null : msg.content
       };
-      if (msg.tool_calls && msg.tool_calls.length > 0) {
+      if (hasToolCalls) {
         assistantMsg.tool_calls = msg.tool_calls;
       }
       formatted.push(assistantMsg);
@@ -474,11 +476,18 @@ function formatMessagesForOpenAI2(messages, systemPrompt) {
 }
 
 // src/adapters/openai.ts
-var OpenAIAdapter = class {
+var OpenAIAdapter = class _OpenAIAdapter {
   constructor(config) {
-    this.provider = "openai";
     this.config = config;
     this.model = config.model || "gpt-4o";
+    this.provider = _OpenAIAdapter.resolveProviderName(config.baseUrl);
+  }
+  static resolveProviderName(baseUrl) {
+    if (!baseUrl) return "openai";
+    if (baseUrl.includes("generativelanguage.googleapis.com")) return "google";
+    if (baseUrl.includes("x.ai")) return "xai";
+    if (baseUrl.includes("azure")) return "azure";
+    return "openai";
   }
   async getClient() {
     if (!this.client) {
@@ -640,6 +649,9 @@ var OpenAIAdapter = class {
     let messages;
     if (request.rawMessages && request.rawMessages.length > 0) {
       const processedMessages = request.rawMessages.map((msg) => {
+        if (msg.role === "assistant" && Array.isArray(msg.tool_calls) && msg.tool_calls.length > 0 && msg.content === "") {
+          return { ...msg, content: null };
+        }
         const hasAttachments = msg.attachments && Array.isArray(msg.attachments) && msg.attachments.length > 0;
         if (hasAttachments) {
           const content = [];
@@ -761,15 +773,18 @@ var OpenAIAdapter = class {
                   args: currentToolCall.arguments
                 };
               }
+              const tcExtraContent = toolCall.extra_content;
               currentToolCall = {
                 id: toolCall.id,
                 name: toolCall.function?.name || "",
-                arguments: toolCall.function?.arguments || ""
+                arguments: toolCall.function?.arguments || "",
+                ...tcExtraContent ? { extra_content: tcExtraContent } : {}
               };
               yield {
                 type: "action:start",
                 id: currentToolCall.id,
-                name: currentToolCall.name
+                name: currentToolCall.name,
+                ...currentToolCall.extra_content ? { extra_content: currentToolCall.extra_content } : {}
               };
             } else if (currentToolCall && toolCall.function?.arguments) {
               currentToolCall.arguments += toolCall.function.arguments;
@@ -803,7 +818,7 @@ var OpenAIAdapter = class {
       yield {
         type: "error",
         message: error instanceof Error ? error.message : "Unknown error",
-        code: "OPENAI_ERROR"
+        code: `${this.provider.toUpperCase()}_ERROR`
       };
     }
   }
@@ -814,12 +829,19 @@ var OpenAIAdapter = class {
     const client = await this.getClient();
     let messages;
     if (request.rawMessages && request.rawMessages.length > 0) {
-      messages = request.rawMessages;
-      if (request.systemPrompt && !messages.some((message2) => message2.role === "system")) {
+      const sanitized = request.rawMessages.map((msg) => {
+        if (msg.role === "assistant" && Array.isArray(msg.tool_calls) && msg.tool_calls.length > 0 && msg.content === "") {
+          return { ...msg, content: null };
+        }
+        return msg;
+      });
+      if (request.systemPrompt && !sanitized.some((message2) => message2.role === "system")) {
         messages = [
           { role: "system", content: request.systemPrompt },
-          ...messages
+          ...sanitized
         ];
+      } else {
+        messages = sanitized;
       }
     } else {
       messages = formatMessagesForOpenAI2(
@@ -861,7 +883,8 @@ var OpenAIAdapter = class {
           } catch {
             return {};
           }
-        })()
+        })(),
+        ...toolCall.extra_content ? { extra_content: toolCall.extra_content } : {}
       })) ?? [],
       usage: response.usage ? {
         promptTokens: response.usage.prompt_tokens,

package/dist/providers/openai/index.mjs

@@ -452,11 +452,13 @@ function formatMessagesForOpenAI2(messages, systemPrompt) {
         content: messageToOpenAIContent(msg)
       });
     } else if (msg.role === "assistant") {
+      const hasToolCalls = msg.tool_calls && msg.tool_calls.length > 0;
       const assistantMsg = {
         role: "assistant",
-        content: msg.content
+        // Gemini/xAI (OpenAI-compatible) reject content: "" on assistant messages with tool_calls
+        content: hasToolCalls ? msg.content || null : msg.content
       };
-      if (msg.tool_calls && msg.tool_calls.length > 0) {
+      if (hasToolCalls) {
         assistantMsg.tool_calls = msg.tool_calls;
       }
       formatted.push(assistantMsg);
@@ -472,11 +474,18 @@ function formatMessagesForOpenAI2(messages, systemPrompt) {
 }
 
 // src/adapters/openai.ts
-var OpenAIAdapter = class {
+var OpenAIAdapter = class _OpenAIAdapter {
   constructor(config) {
-    this.provider = "openai";
     this.config = config;
     this.model = config.model || "gpt-4o";
+    this.provider = _OpenAIAdapter.resolveProviderName(config.baseUrl);
+  }
+  static resolveProviderName(baseUrl) {
+    if (!baseUrl) return "openai";
+    if (baseUrl.includes("generativelanguage.googleapis.com")) return "google";
+    if (baseUrl.includes("x.ai")) return "xai";
+    if (baseUrl.includes("azure")) return "azure";
+    return "openai";
   }
   async getClient() {
     if (!this.client) {
@@ -638,6 +647,9 @@ var OpenAIAdapter = class {
     let messages;
     if (request.rawMessages && request.rawMessages.length > 0) {
       const processedMessages = request.rawMessages.map((msg) => {
+        if (msg.role === "assistant" && Array.isArray(msg.tool_calls) && msg.tool_calls.length > 0 && msg.content === "") {
+          return { ...msg, content: null };
+        }
         const hasAttachments = msg.attachments && Array.isArray(msg.attachments) && msg.attachments.length > 0;
         if (hasAttachments) {
           const content = [];
@@ -759,15 +771,18 @@ var OpenAIAdapter = class {
                   args: currentToolCall.arguments
                 };
               }
+              const tcExtraContent = toolCall.extra_content;
               currentToolCall = {
                 id: toolCall.id,
                 name: toolCall.function?.name || "",
-                arguments: toolCall.function?.arguments || ""
+                arguments: toolCall.function?.arguments || "",
+                ...tcExtraContent ? { extra_content: tcExtraContent } : {}
               };
               yield {
                 type: "action:start",
                 id: currentToolCall.id,
-                name: currentToolCall.name
+                name: currentToolCall.name,
+                ...currentToolCall.extra_content ? { extra_content: currentToolCall.extra_content } : {}
               };
             } else if (currentToolCall && toolCall.function?.arguments) {
               currentToolCall.arguments += toolCall.function.arguments;
@@ -801,7 +816,7 @@ var OpenAIAdapter = class {
       yield {
         type: "error",
         message: error instanceof Error ? error.message : "Unknown error",
-        code: "OPENAI_ERROR"
+        code: `${this.provider.toUpperCase()}_ERROR`
       };
     }
   }
@@ -812,12 +827,19 @@ var OpenAIAdapter = class {
     const client = await this.getClient();
     let messages;
     if (request.rawMessages && request.rawMessages.length > 0) {
-      messages = request.rawMessages;
-      if (request.systemPrompt && !messages.some((message2) => message2.role === "system")) {
+      const sanitized = request.rawMessages.map((msg) => {
+        if (msg.role === "assistant" && Array.isArray(msg.tool_calls) && msg.tool_calls.length > 0 && msg.content === "") {
+          return { ...msg, content: null };
+        }
+        return msg;
+      });
+      if (request.systemPrompt && !sanitized.some((message2) => message2.role === "system")) {
         messages = [
           { role: "system", content: request.systemPrompt },
-          ...messages
+          ...sanitized
         ];
+      } else {
+        messages = sanitized;
       }
     } else {
       messages = formatMessagesForOpenAI2(
@@ -859,7 +881,8 @@ var OpenAIAdapter = class {
           } catch {
             return {};
           }
-        })()
+        })(),
+        ...toolCall.extra_content ? { extra_content: toolCall.extra_content } : {}
       })) ?? [],
       usage: response.usage ? {
         promptTokens: response.usage.prompt_tokens,

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

@@ -1,7 +1,7 @@
 import { L as LanguageModel } from '../../types-CR8mi9I0.mjs';
-import { A as AIProvider } from '../../types-VDgiUvH2.mjs';
+import { A as AIProvider } from '../../types-DRqxMIjF.mjs';
 import 'zod';
-import '../../base-5n-UuPfS.mjs';
+import '../../base-D-U61JaB.mjs';
 
 /**
  * OpenRouter Provider - Modern Pattern

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

@@ -1,7 +1,7 @@
 import { L as LanguageModel } from '../../types-CR8mi9I0.js';
-import { A as AIProvider } from '../../types-C0vLXzuw.js';
+import { A as AIProvider } from '../../types-BctsnC3g.js';
 import 'zod';
-import '../../base-Di31iy_8.js';
+import '../../base-iGi9Va6Z.js';
 
 /**
  * OpenRouter Provider - Modern Pattern

package/dist/providers/openrouter/index.js

@@ -440,11 +440,13 @@ function formatMessagesForOpenAI(messages, systemPrompt) {
         content: messageToOpenAIContent(msg)
       });
     } else if (msg.role === "assistant") {
+      const hasToolCalls = msg.tool_calls && msg.tool_calls.length > 0;
       const assistantMsg = {
         role: "assistant",
-        content: msg.content
+        // Gemini/xAI (OpenAI-compatible) reject content: "" on assistant messages with tool_calls
+        content: hasToolCalls ? msg.content || null : msg.content
       };
-      if (msg.tool_calls && msg.tool_calls.length > 0) {
+      if (hasToolCalls) {
         assistantMsg.tool_calls = msg.tool_calls;
       }
       formatted.push(assistantMsg);
@@ -460,11 +462,18 @@ function formatMessagesForOpenAI(messages, systemPrompt) {
 }
 
 // src/adapters/openai.ts
-var OpenAIAdapter = class {
+var OpenAIAdapter = class _OpenAIAdapter {
   constructor(config) {
-    this.provider = "openai";
     this.config = config;
     this.model = config.model || "gpt-4o";
+    this.provider = _OpenAIAdapter.resolveProviderName(config.baseUrl);
+  }
+  static resolveProviderName(baseUrl) {
+    if (!baseUrl) return "openai";
+    if (baseUrl.includes("generativelanguage.googleapis.com")) return "google";
+    if (baseUrl.includes("x.ai")) return "xai";
+    if (baseUrl.includes("azure")) return "azure";
+    return "openai";
   }
   async getClient() {
     if (!this.client) {
@@ -626,6 +635,9 @@ var OpenAIAdapter = class {
     let messages;
     if (request.rawMessages && request.rawMessages.length > 0) {
       const processedMessages = request.rawMessages.map((msg) => {
+        if (msg.role === "assistant" && Array.isArray(msg.tool_calls) && msg.tool_calls.length > 0 && msg.content === "") {
+          return { ...msg, content: null };
+        }
         const hasAttachments = msg.attachments && Array.isArray(msg.attachments) && msg.attachments.length > 0;
         if (hasAttachments) {
           const content = [];
@@ -747,15 +759,18 @@ var OpenAIAdapter = class {
                   args: currentToolCall.arguments
                 };
               }
+              const tcExtraContent = toolCall.extra_content;
               currentToolCall = {
                 id: toolCall.id,
                 name: toolCall.function?.name || "",
-                arguments: toolCall.function?.arguments || ""
+                arguments: toolCall.function?.arguments || "",
+                ...tcExtraContent ? { extra_content: tcExtraContent } : {}
               };
               yield {
                 type: "action:start",
                 id: currentToolCall.id,
-                name: currentToolCall.name
+                name: currentToolCall.name,
+                ...currentToolCall.extra_content ? { extra_content: currentToolCall.extra_content } : {}
               };
             } else if (currentToolCall && toolCall.function?.arguments) {
               currentToolCall.arguments += toolCall.function.arguments;
@@ -789,7 +804,7 @@ var OpenAIAdapter = class {
       yield {
         type: "error",
         message: error instanceof Error ? error.message : "Unknown error",
-        code: "OPENAI_ERROR"
+        code: `${this.provider.toUpperCase()}_ERROR`
       };
     }
   }
@@ -800,12 +815,19 @@ var OpenAIAdapter = class {
     const client = await this.getClient();
     let messages;
     if (request.rawMessages && request.rawMessages.length > 0) {
-      messages = request.rawMessages;
-      if (request.systemPrompt && !messages.some((message2) => message2.role === "system")) {
+      const sanitized = request.rawMessages.map((msg) => {
+        if (msg.role === "assistant" && Array.isArray(msg.tool_calls) && msg.tool_calls.length > 0 && msg.content === "") {
+          return { ...msg, content: null };
+        }
+        return msg;
+      });
+      if (request.systemPrompt && !sanitized.some((message2) => message2.role === "system")) {
         messages = [
           { role: "system", content: request.systemPrompt },
-          ...messages
+          ...sanitized
         ];
+      } else {
+        messages = sanitized;
       }
     } else {
       messages = formatMessagesForOpenAI(
@@ -847,7 +869,8 @@ var OpenAIAdapter = class {
           } catch {
             return {};
           }
-        })()
+        })(),
+        ...toolCall.extra_content ? { extra_content: toolCall.extra_content } : {}
       })) ?? [],
       usage: response.usage ? {
         promptTokens: response.usage.prompt_tokens,

package/dist/providers/openrouter/index.mjs

@@ -438,11 +438,13 @@ function formatMessagesForOpenAI(messages, systemPrompt) {
         content: messageToOpenAIContent(msg)
       });
     } else if (msg.role === "assistant") {
+      const hasToolCalls = msg.tool_calls && msg.tool_calls.length > 0;
       const assistantMsg = {
         role: "assistant",
-        content: msg.content
+        // Gemini/xAI (OpenAI-compatible) reject content: "" on assistant messages with tool_calls
+        content: hasToolCalls ? msg.content || null : msg.content
       };
-      if (msg.tool_calls && msg.tool_calls.length > 0) {
+      if (hasToolCalls) {
         assistantMsg.tool_calls = msg.tool_calls;
       }
       formatted.push(assistantMsg);
@@ -458,11 +460,18 @@ function formatMessagesForOpenAI(messages, systemPrompt) {
 }
 
 // src/adapters/openai.ts
-var OpenAIAdapter = class {
+var OpenAIAdapter = class _OpenAIAdapter {
   constructor(config) {
-    this.provider = "openai";
     this.config = config;
     this.model = config.model || "gpt-4o";
+    this.provider = _OpenAIAdapter.resolveProviderName(config.baseUrl);
+  }
+  static resolveProviderName(baseUrl) {
+    if (!baseUrl) return "openai";
+    if (baseUrl.includes("generativelanguage.googleapis.com")) return "google";
+    if (baseUrl.includes("x.ai")) return "xai";
+    if (baseUrl.includes("azure")) return "azure";
+    return "openai";
   }
   async getClient() {
     if (!this.client) {
@@ -624,6 +633,9 @@ var OpenAIAdapter = class {
     let messages;
     if (request.rawMessages && request.rawMessages.length > 0) {
       const processedMessages = request.rawMessages.map((msg) => {
+        if (msg.role === "assistant" && Array.isArray(msg.tool_calls) && msg.tool_calls.length > 0 && msg.content === "") {
+          return { ...msg, content: null };
+        }
         const hasAttachments = msg.attachments && Array.isArray(msg.attachments) && msg.attachments.length > 0;
         if (hasAttachments) {
           const content = [];
@@ -745,15 +757,18 @@ var OpenAIAdapter = class {
                   args: currentToolCall.arguments
                 };
               }
+              const tcExtraContent = toolCall.extra_content;
               currentToolCall = {
                 id: toolCall.id,
                 name: toolCall.function?.name || "",
-                arguments: toolCall.function?.arguments || ""
+                arguments: toolCall.function?.arguments || "",
+                ...tcExtraContent ? { extra_content: tcExtraContent } : {}
               };
               yield {
                 type: "action:start",
                 id: currentToolCall.id,
-                name: currentToolCall.name
+                name: currentToolCall.name,
+                ...currentToolCall.extra_content ? { extra_content: currentToolCall.extra_content } : {}
               };
             } else if (currentToolCall && toolCall.function?.arguments) {
               currentToolCall.arguments += toolCall.function.arguments;
@@ -787,7 +802,7 @@ var OpenAIAdapter = class {
       yield {
         type: "error",
         message: error instanceof Error ? error.message : "Unknown error",
-        code: "OPENAI_ERROR"
+        code: `${this.provider.toUpperCase()}_ERROR`
       };
     }
   }
@@ -798,12 +813,19 @@ var OpenAIAdapter = class {
     const client = await this.getClient();
     let messages;
     if (request.rawMessages && request.rawMessages.length > 0) {
-      messages = request.rawMessages;
-      if (request.systemPrompt && !messages.some((message2) => message2.role === "system")) {
+      const sanitized = request.rawMessages.map((msg) => {
+        if (msg.role === "assistant" && Array.isArray(msg.tool_calls) && msg.tool_calls.length > 0 && msg.content === "") {
+          return { ...msg, content: null };
+        }
+        return msg;
+      });
+      if (request.systemPrompt && !sanitized.some((message2) => message2.role === "system")) {
         messages = [
           { role: "system", content: request.systemPrompt },
-          ...messages
+          ...sanitized
         ];
+      } else {
+        messages = sanitized;
       }
     } else {
       messages = formatMessagesForOpenAI(
@@ -845,7 +867,8 @@ var OpenAIAdapter = class {
           } catch {
             return {};
           }
-        })()
+        })(),
+        ...toolCall.extra_content ? { extra_content: toolCall.extra_content } : {}
       })) ?? [],
       usage: response.usage ? {
         promptTokens: response.usage.prompt_tokens,

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

@@ -1,7 +1,7 @@
 import { L as LanguageModel } from '../../types-CR8mi9I0.mjs';
-import { X as XAIProviderConfig, A as AIProvider } from '../../types-VDgiUvH2.mjs';
+import { X as XAIProviderConfig, A as AIProvider } from '../../types-DRqxMIjF.mjs';
 import 'zod';
-import '../../base-5n-UuPfS.mjs';
+import '../../base-D-U61JaB.mjs';
 
 /**
  * xAI Provider - Modern Pattern

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

@@ -1,7 +1,7 @@
 import { L as LanguageModel } from '../../types-CR8mi9I0.js';
-import { X as XAIProviderConfig, A as AIProvider } from '../../types-C0vLXzuw.js';
+import { X as XAIProviderConfig, A as AIProvider } from '../../types-BctsnC3g.js';
 import 'zod';
-import '../../base-Di31iy_8.js';
+import '../../base-iGi9Va6Z.js';
 
 /**
  * xAI Provider - Modern Pattern