@yourgpt/llm-sdk 2.1.4-alpha.3 → 2.1.6

package/dist/adapters/index.d.mts

@@ -1,6 +1,6 @@
-import { L as LLMAdapter, W as WebSearchConfig, C as ChatCompletionRequest, S as StreamEvent, o as CompletionResult } from '../base-5n-UuPfS.mjs';
-export { e as AdapterFactory, B as AnthropicContentBlock, E as OpenAIContentBlock, y as attachmentToAnthropicDocument, x as attachmentToAnthropicImage, z as attachmentToOpenAIImage, p as formatMessages, r as formatMessagesForAnthropic, s as formatMessagesForOpenAI, q as formatTools, v as hasImageAttachments, w as hasMediaAttachments, t as messageToAnthropicContent, u as messageToOpenAIContent } from '../base-5n-UuPfS.mjs';
-import { d as OllamaModelOptions } from '../types-VDgiUvH2.mjs';
+import { L as LLMAdapter, W as WebSearchConfig, C as ChatCompletionRequest, S as StreamEvent, o as CompletionResult } from '../base-D-U61JaB.mjs';
+export { e as AdapterFactory, B as AnthropicContentBlock, E as OpenAIContentBlock, y as attachmentToAnthropicDocument, x as attachmentToAnthropicImage, z as attachmentToOpenAIImage, p as formatMessages, r as formatMessagesForAnthropic, s as formatMessagesForOpenAI, q as formatTools, v as hasImageAttachments, w as hasMediaAttachments, t as messageToAnthropicContent, u as messageToOpenAIContent } from '../base-D-U61JaB.mjs';
+import { d as OllamaModelOptions } from '../types-DRqxMIjF.mjs';
 import '../types-CR8mi9I0.mjs';
 import 'zod';
 
@@ -25,11 +25,12 @@ interface OpenAIAdapterConfig {
  * Supports: GPT-4, GPT-4o, GPT-3.5-turbo, etc.
  */
 declare class OpenAIAdapter implements LLMAdapter {
-    readonly provider = "openai";
+    readonly provider: string;
     readonly model: string;
     private client;
     private config;
     constructor(config: OpenAIAdapterConfig);
+    private static resolveProviderName;
     private getClient;
     private shouldUseResponsesApi;
     private buildResponsesInput;
@@ -194,17 +195,11 @@ declare class GoogleAdapter implements LLMAdapter {
 declare function createGoogleAdapter(config: GoogleAdapterConfig): GoogleAdapter;
 
 /**
- * xAI Grok LLM Adapter
+ * xAI Grok Adapter
  *
- * xAI uses an OpenAI-compatible API, so this adapter extends OpenAIAdapter
- * with a different base URL.
- *
- * Supports: Grok-2, Grok-2-mini, Grok-beta
- * Features: Vision, Tools/Function Calling
- */
-
-/**
- * xAI adapter configuration
+ * xAI uses an OpenAI-compatible API — this is a thin factory
+ * that creates an OpenAIAdapter with the xAI endpoint baked in.
+ * No separate class needed.
  */
 interface XAIAdapterConfig {
     apiKey: string;
@@ -213,28 +208,7 @@ interface XAIAdapterConfig {
     temperature?: number;
     maxTokens?: number;
 }
-/**
- * xAI Grok LLM Adapter
- *
- * Uses OpenAI-compatible API with xAI's endpoint
- */
-declare class XAIAdapter implements LLMAdapter {
-    readonly provider = "xai";
-    readonly model: string;
-    private client;
-    private config;
-    constructor(config: XAIAdapterConfig);
-    private getClient;
-    stream(request: ChatCompletionRequest): AsyncGenerator<StreamEvent>;
-    /**
-     * Non-streaming completion (optional, for debugging)
-     */
-    complete(request: ChatCompletionRequest): Promise<CompletionResult>;
-}
-/**
- * Create xAI Grok adapter
- */
-declare function createXAIAdapter(config: XAIAdapterConfig): XAIAdapter;
+declare function createXAIAdapter(config: XAIAdapterConfig): OpenAIAdapter;
 
 /**
  * Azure OpenAI LLM Adapter
@@ -286,4 +260,4 @@ declare class AzureAdapter implements LLMAdapter {
  */
 declare function createAzureAdapter(config: AzureAdapterConfig): AzureAdapter;
 
-export { AnthropicAdapter, type AnthropicAdapterConfig, AzureAdapter, type AzureAdapterConfig, ChatCompletionRequest, CompletionResult, GoogleAdapter, type GoogleAdapterConfig, LLMAdapter, OllamaAdapter, type OllamaAdapterConfig, OpenAIAdapter, type OpenAIAdapterConfig, XAIAdapter, type XAIAdapterConfig, createAnthropicAdapter, createAzureAdapter, createGoogleAdapter, createOllamaAdapter, createOpenAIAdapter, createXAIAdapter };
+export { AnthropicAdapter, type AnthropicAdapterConfig, AzureAdapter, type AzureAdapterConfig, ChatCompletionRequest, CompletionResult, GoogleAdapter, type GoogleAdapterConfig, LLMAdapter, OllamaAdapter, type OllamaAdapterConfig, OpenAIAdapter, type OpenAIAdapterConfig, type XAIAdapterConfig, createAnthropicAdapter, createAzureAdapter, createGoogleAdapter, createOllamaAdapter, createOpenAIAdapter, createXAIAdapter };

package/dist/adapters/index.d.ts

@@ -1,6 +1,6 @@
-import { L as LLMAdapter, W as WebSearchConfig, C as ChatCompletionRequest, S as StreamEvent, o as CompletionResult } from '../base-Di31iy_8.js';
-export { e as AdapterFactory, B as AnthropicContentBlock, E as OpenAIContentBlock, y as attachmentToAnthropicDocument, x as attachmentToAnthropicImage, z as attachmentToOpenAIImage, p as formatMessages, r as formatMessagesForAnthropic, s as formatMessagesForOpenAI, q as formatTools, v as hasImageAttachments, w as hasMediaAttachments, t as messageToAnthropicContent, u as messageToOpenAIContent } from '../base-Di31iy_8.js';
-import { d as OllamaModelOptions } from '../types-C0vLXzuw.js';
+import { L as LLMAdapter, W as WebSearchConfig, C as ChatCompletionRequest, S as StreamEvent, o as CompletionResult } from '../base-iGi9Va6Z.js';
+export { e as AdapterFactory, B as AnthropicContentBlock, E as OpenAIContentBlock, y as attachmentToAnthropicDocument, x as attachmentToAnthropicImage, z as attachmentToOpenAIImage, p as formatMessages, r as formatMessagesForAnthropic, s as formatMessagesForOpenAI, q as formatTools, v as hasImageAttachments, w as hasMediaAttachments, t as messageToAnthropicContent, u as messageToOpenAIContent } from '../base-iGi9Va6Z.js';
+import { d as OllamaModelOptions } from '../types-BctsnC3g.js';
 import '../types-CR8mi9I0.js';
 import 'zod';
 
@@ -25,11 +25,12 @@ interface OpenAIAdapterConfig {
  * Supports: GPT-4, GPT-4o, GPT-3.5-turbo, etc.
  */
 declare class OpenAIAdapter implements LLMAdapter {
-    readonly provider = "openai";
+    readonly provider: string;
     readonly model: string;
     private client;
     private config;
     constructor(config: OpenAIAdapterConfig);
+    private static resolveProviderName;
     private getClient;
     private shouldUseResponsesApi;
     private buildResponsesInput;
@@ -194,17 +195,11 @@ declare class GoogleAdapter implements LLMAdapter {
 declare function createGoogleAdapter(config: GoogleAdapterConfig): GoogleAdapter;
 
 /**
- * xAI Grok LLM Adapter
+ * xAI Grok Adapter
  *
- * xAI uses an OpenAI-compatible API, so this adapter extends OpenAIAdapter
- * with a different base URL.
- *
- * Supports: Grok-2, Grok-2-mini, Grok-beta
- * Features: Vision, Tools/Function Calling
- */
-
-/**
- * xAI adapter configuration
+ * xAI uses an OpenAI-compatible API — this is a thin factory
+ * that creates an OpenAIAdapter with the xAI endpoint baked in.
+ * No separate class needed.
  */
 interface XAIAdapterConfig {
     apiKey: string;
@@ -213,28 +208,7 @@ interface XAIAdapterConfig {
     temperature?: number;
     maxTokens?: number;
 }
-/**
- * xAI Grok LLM Adapter
- *
- * Uses OpenAI-compatible API with xAI's endpoint
- */
-declare class XAIAdapter implements LLMAdapter {
-    readonly provider = "xai";
-    readonly model: string;
-    private client;
-    private config;
-    constructor(config: XAIAdapterConfig);
-    private getClient;
-    stream(request: ChatCompletionRequest): AsyncGenerator<StreamEvent>;
-    /**
-     * Non-streaming completion (optional, for debugging)
-     */
-    complete(request: ChatCompletionRequest): Promise<CompletionResult>;
-}
-/**
- * Create xAI Grok adapter
- */
-declare function createXAIAdapter(config: XAIAdapterConfig): XAIAdapter;
+declare function createXAIAdapter(config: XAIAdapterConfig): OpenAIAdapter;
 
 /**
  * Azure OpenAI LLM Adapter
@@ -286,4 +260,4 @@ declare class AzureAdapter implements LLMAdapter {
  */
 declare function createAzureAdapter(config: AzureAdapterConfig): AzureAdapter;
 
-export { AnthropicAdapter, type AnthropicAdapterConfig, AzureAdapter, type AzureAdapterConfig, ChatCompletionRequest, CompletionResult, GoogleAdapter, type GoogleAdapterConfig, LLMAdapter, OllamaAdapter, type OllamaAdapterConfig, OpenAIAdapter, type OpenAIAdapterConfig, XAIAdapter, type XAIAdapterConfig, createAnthropicAdapter, createAzureAdapter, createGoogleAdapter, createOllamaAdapter, createOpenAIAdapter, createXAIAdapter };
+export { AnthropicAdapter, type AnthropicAdapterConfig, AzureAdapter, type AzureAdapterConfig, ChatCompletionRequest, CompletionResult, GoogleAdapter, type GoogleAdapterConfig, LLMAdapter, OllamaAdapter, type OllamaAdapterConfig, OpenAIAdapter, type OpenAIAdapterConfig, type XAIAdapterConfig, createAnthropicAdapter, createAzureAdapter, createGoogleAdapter, createOllamaAdapter, createOpenAIAdapter, createXAIAdapter };

package/dist/adapters/index.js

@@ -338,11 +338,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);
@@ -369,11 +371,18 @@ function generateToolCallId() {
 }
 
 // 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) {
@@ -535,6 +544,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 = [];
@@ -656,15 +668,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;
@@ -698,7 +713,7 @@ var OpenAIAdapter = class {
       yield {
         type: "error",
         message: error instanceof Error ? error.message : "Unknown error",
-        code: "OPENAI_ERROR"
+        code: `${this.provider.toUpperCase()}_ERROR`
       };
     }
   }
@@ -709,12 +724,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(
@@ -756,7 +778,8 @@ var OpenAIAdapter = class {
           } catch {
             return {};
           }
-        })()
+        })(),
+        ...toolCall.extra_content ? { extra_content: toolCall.extra_content } : {}
       })) ?? [],
       usage: response.usage ? {
         promptTokens: response.usage.prompt_tokens,
@@ -1987,187 +2010,14 @@ function extractDomain3(url) {
 
 // src/adapters/xai.ts
 var XAI_BASE_URL = "https://api.x.ai/v1";
-var XAIAdapter = class {
-  constructor(config) {
-    this.provider = "xai";
-    this.config = config;
-    this.model = config.model || "grok-2";
-  }
-  async getClient() {
-    if (!this.client) {
-      const { default: OpenAI } = await import('openai');
-      this.client = new OpenAI({
-        apiKey: this.config.apiKey,
-        baseURL: this.config.baseUrl || XAI_BASE_URL
-      });
-    }
-    return this.client;
-  }
-  async *stream(request) {
-    const client = await this.getClient();
-    let messages;
-    if (request.rawMessages && request.rawMessages.length > 0) {
-      const processedMessages = request.rawMessages.map((msg) => {
-        const hasAttachments = msg.attachments && Array.isArray(msg.attachments) && msg.attachments.length > 0;
-        if (hasAttachments) {
-          const content = [];
-          if (msg.content) {
-            content.push({ type: "text", text: msg.content });
-          }
-          for (const attachment of msg.attachments) {
-            if (attachment.type === "image") {
-              let imageUrl = attachment.data;
-              if (!imageUrl.startsWith("data:")) {
-                imageUrl = `data:${attachment.mimeType || "image/png"};base64,${attachment.data}`;
-              }
-              content.push({
-                type: "image_url",
-                image_url: { url: imageUrl, detail: "auto" }
-              });
-            }
-          }
-          return { ...msg, content, attachments: void 0 };
-        }
-        return msg;
-      });
-      if (request.systemPrompt) {
-        const hasSystem = processedMessages.some((m) => m.role === "system");
-        if (!hasSystem) {
-          messages = [
-            { role: "system", content: request.systemPrompt },
-            ...processedMessages
-          ];
-        } else {
-          messages = processedMessages;
-        }
-      } else {
-        messages = processedMessages;
-      }
-    } else {
-      messages = formatMessagesForOpenAI(
-        request.messages,
-        request.systemPrompt
-      );
-    }
-    const tools = request.actions?.length ? formatTools(request.actions) : void 0;
-    const messageId = generateMessageId();
-    yield { type: "message:start", id: messageId };
-    try {
-      const payload = {
-        model: request.config?.model || this.model,
-        messages,
-        tools,
-        temperature: request.config?.temperature ?? this.config.temperature,
-        max_tokens: request.config?.maxTokens ?? this.config.maxTokens,
-        stream: true
-      };
-      logProviderPayload("xai", "request payload", payload, request.debug);
-      const stream = await client.chat.completions.create(payload);
-      let currentToolCall = null;
-      for await (const chunk of stream) {
-        logProviderPayload("xai", "stream chunk", chunk, request.debug);
-        if (request.signal?.aborted) {
-          break;
-        }
-        const delta = chunk.choices[0]?.delta;
-        if (delta?.content) {
-          yield { type: "message:delta", content: delta.content };
-        }
-        if (delta?.tool_calls) {
-          for (const toolCall of delta.tool_calls) {
-            if (toolCall.id) {
-              if (currentToolCall) {
-                yield {
-                  type: "action:args",
-                  id: currentToolCall.id,
-                  args: currentToolCall.arguments
-                };
-              }
-              currentToolCall = {
-                id: toolCall.id,
-                name: toolCall.function?.name || "",
-                arguments: toolCall.function?.arguments || ""
-              };
-              yield {
-                type: "action:start",
-                id: currentToolCall.id,
-                name: currentToolCall.name
-              };
-            } else if (currentToolCall && toolCall.function?.arguments) {
-              currentToolCall.arguments += toolCall.function.arguments;
-            }
-          }
-        }
-        if (chunk.choices[0]?.finish_reason) {
-          if (currentToolCall) {
-            yield {
-              type: "action:args",
-              id: currentToolCall.id,
-              args: currentToolCall.arguments
-            };
-          }
-        }
-      }
-      yield { type: "message:end" };
-      yield { type: "done" };
-    } catch (error) {
-      yield {
-        type: "error",
-        message: error instanceof Error ? error.message : "Unknown error",
-        code: "XAI_ERROR"
-      };
-    }
-  }
-  /**
-   * Non-streaming completion (optional, for debugging)
-   */
-  async complete(request) {
-    const client = await this.getClient();
-    let messages;
-    if (request.rawMessages && request.rawMessages.length > 0) {
-      messages = request.rawMessages;
-      if (request.systemPrompt) {
-        const hasSystem = messages.some((m) => m.role === "system");
-        if (!hasSystem) {
-          messages = [
-            { role: "system", content: request.systemPrompt },
-            ...messages
-          ];
-        }
-      }
-    } else {
-      messages = formatMessagesForOpenAI(
-        request.messages,
-        request.systemPrompt
-      );
-    }
-    const tools = request.actions?.length ? formatTools(request.actions) : void 0;
-    const payload = {
-      model: request.config?.model || this.model,
-      messages,
-      tools,
-      temperature: request.config?.temperature ?? this.config.temperature,
-      max_tokens: request.config?.maxTokens ?? this.config.maxTokens
-    };
-    logProviderPayload("xai", "request payload", payload, request.debug);
-    const response = await client.chat.completions.create(payload);
-    logProviderPayload("xai", "response payload", response, request.debug);
-    const choice = response.choices[0];
-    const message = choice?.message;
-    const toolCalls = (message?.tool_calls || []).map((tc) => ({
-      id: tc.id,
-      name: tc.function.name,
-      args: JSON.parse(tc.function.arguments || "{}")
-    }));
-    return {
-      content: message?.content || "",
-      toolCalls,
-      rawResponse: response
-    };
-  }
-};
 function createXAIAdapter(config) {
-  return new XAIAdapter(config);
+  return createOpenAIAdapter({
+    apiKey: config.apiKey,
+    model: config.model || "grok-3",
+    baseUrl: config.baseUrl || XAI_BASE_URL,
+    temperature: config.temperature,
+    maxTokens: config.maxTokens
+  });
 }
 
 // src/adapters/azure.ts
@@ -2370,7 +2220,6 @@ exports.AzureAdapter = AzureAdapter;
 exports.GoogleAdapter = GoogleAdapter;
 exports.OllamaAdapter = OllamaAdapter;
 exports.OpenAIAdapter = OpenAIAdapter;
-exports.XAIAdapter = XAIAdapter;
 exports.attachmentToAnthropicDocument = attachmentToAnthropicDocument;
 exports.attachmentToAnthropicImage = attachmentToAnthropicImage;
 exports.attachmentToOpenAIImage = attachmentToOpenAIImage;