@yourgpt/llm-sdk 2.1.5 → 2.1.6

package/dist/providers/google/index.js

@@ -335,329 +335,501 @@ ${stringifyForDebug(payload)}`
     );
   }
 }
-
-// src/adapters/google.ts
-function attachmentToGeminiPart(attachment) {
-  if (!attachment.data) {
-    console.warn(
-      "Gemini adapter: URL-based attachments not supported, skipping"
+function parameterToJsonSchema(param) {
+  const schema = {
+    type: param.type
+  };
+  if (param.description) {
+    schema.description = param.description;
+  }
+  if (param.enum) {
+    schema.enum = param.enum;
+  }
+  if (param.type === "array" && param.items) {
+    schema.items = parameterToJsonSchema(
+      param.items
     );
-    return null;
   }
-  if (attachment.type === "image") {
-    let base64Data = attachment.data;
-    if (base64Data.startsWith("data:")) {
-      const commaIndex = base64Data.indexOf(",");
-      if (commaIndex !== -1) {
-        base64Data = base64Data.slice(commaIndex + 1);
-      }
-    }
+  if (param.type === "object" && param.properties) {
+    schema.properties = Object.fromEntries(
+      Object.entries(param.properties).map(([key, prop]) => [
+        key,
+        parameterToJsonSchema(
+          prop
+        )
+      ])
+    );
+    schema.additionalProperties = false;
+  }
+  return schema;
+}
+function normalizeObjectJsonSchema(schema) {
+  if (!schema || typeof schema !== "object") {
     return {
-      inlineData: {
-        mimeType: attachment.mimeType || "image/png",
-        data: base64Data
-      }
+      type: "object",
+      properties: {},
+      required: [],
+      additionalProperties: false
     };
   }
-  if (attachment.type === "audio" || attachment.type === "video") {
-    let base64Data = attachment.data;
-    if (base64Data.startsWith("data:")) {
-      const commaIndex = base64Data.indexOf(",");
-      if (commaIndex !== -1) {
-        base64Data = base64Data.slice(commaIndex + 1);
-      }
+  const normalized = { ...schema };
+  const type = normalized.type;
+  if (type === "object") {
+    const properties = normalized.properties && typeof normalized.properties === "object" && !Array.isArray(normalized.properties) ? normalized.properties : {};
+    normalized.properties = Object.fromEntries(
+      Object.entries(properties).map(([key, value]) => [
+        key,
+        normalizeObjectJsonSchema(value)
+      ])
+    );
+    const propertyKeys = Object.keys(properties);
+    const required = Array.isArray(normalized.required) ? normalized.required.filter(
+      (value) => typeof value === "string"
+    ) : [];
+    normalized.required = Array.from(/* @__PURE__ */ new Set([...required, ...propertyKeys]));
+    if (normalized.additionalProperties === void 0) {
+      normalized.additionalProperties = false;
     }
-    return {
-      inlineData: {
-        mimeType: attachment.mimeType || (attachment.type === "audio" ? "audio/mp3" : "video/mp4"),
-        data: base64Data
-      }
-    };
+  } else if (type === "array" && normalized.items && typeof normalized.items === "object") {
+    normalized.items = normalizeObjectJsonSchema(
+      normalized.items
+    );
   }
-  return null;
+  return normalized;
 }
-function messageToGeminiContent(msg) {
-  if (msg.role === "system") return null;
-  const parts = [];
-  if (msg.role === "tool" && msg.tool_call_id) {
-    let responseData;
-    try {
-      responseData = JSON.parse(msg.content || "{}");
-    } catch {
-      responseData = { result: msg.content || "" };
-    }
-    const toolName = msg.metadata?.toolName || "tool";
-    parts.push({
-      functionResponse: {
-        name: toolName,
-        response: responseData
+function formatTools(actions) {
+  return actions.map((action) => ({
+    type: "function",
+    function: {
+      name: action.name,
+      description: action.description,
+      parameters: {
+        type: "object",
+        properties: action.parameters ? Object.fromEntries(
+          Object.entries(action.parameters).map(([key, param]) => [
+            key,
+            parameterToJsonSchema(param)
+          ])
+        ) : {},
+        required: action.parameters ? Object.entries(action.parameters).filter(([, param]) => param.required).map(([key]) => key) : [],
+        additionalProperties: false
       }
-    });
-    return { role: "user", parts };
+    }
+  }));
+}
+function hasImageAttachments(message) {
+  const attachments = message.metadata?.attachments;
+  return attachments?.some((a) => a.type === "image") ?? false;
+}
+function attachmentToOpenAIImage(attachment) {
+  if (attachment.type !== "image") return null;
+  let imageUrl;
+  if (attachment.url) {
+    imageUrl = attachment.url;
+  } else if (attachment.data) {
+    imageUrl = attachment.data.startsWith("data:") ? attachment.data : `data:${attachment.mimeType || "image/png"};base64,${attachment.data}`;
+  } else {
+    return null;
   }
-  if (msg.content) {
-    parts.push({ text: msg.content });
+  return {
+    type: "image_url",
+    image_url: {
+      url: imageUrl,
+      detail: "auto"
+    }
+  };
+}
+function messageToOpenAIContent(message) {
+  const attachments = message.metadata?.attachments;
+  const content = message.content ?? "";
+  if (!hasImageAttachments(message)) {
+    return content;
   }
-  const attachments = msg.metadata?.attachments;
-  if (attachments && Array.isArray(attachments)) {
+  const blocks = [];
+  if (content) {
+    blocks.push({ type: "text", text: content });
+  }
+  if (attachments) {
     for (const attachment of attachments) {
-      const part = attachmentToGeminiPart(attachment);
-      if (part) {
-        parts.push(part);
+      const imageBlock = attachmentToOpenAIImage(attachment);
+      if (imageBlock) {
+        blocks.push(imageBlock);
       }
     }
   }
-  if (msg.role === "assistant" && msg.tool_calls && msg.tool_calls.length > 0) {
-    for (const tc of msg.tool_calls) {
-      let args = {};
-      try {
-        args = JSON.parse(tc.function.arguments);
-      } catch {
+  return blocks;
+}
+function formatMessagesForOpenAI(messages, systemPrompt) {
+  const formatted = [];
+  if (systemPrompt) {
+    formatted.push({ role: "system", content: systemPrompt });
+  }
+  for (const msg of messages) {
+    if (msg.role === "system") {
+      formatted.push({ role: "system", content: msg.content ?? "" });
+    } else if (msg.role === "user") {
+      formatted.push({
+        role: "user",
+        content: messageToOpenAIContent(msg)
+      });
+    } else if (msg.role === "assistant") {
+      const hasToolCalls = msg.tool_calls && msg.tool_calls.length > 0;
+      const assistantMsg = {
+        role: "assistant",
+        // Gemini/xAI (OpenAI-compatible) reject content: "" on assistant messages with tool_calls
+        content: hasToolCalls ? msg.content || null : msg.content
+      };
+      if (hasToolCalls) {
+        assistantMsg.tool_calls = msg.tool_calls;
       }
-      parts.push({
-        functionCall: {
-          name: tc.function.name,
-          args
-        }
+      formatted.push(assistantMsg);
+    } else if (msg.role === "tool" && msg.tool_call_id) {
+      formatted.push({
+        role: "tool",
+        content: msg.content ?? "",
+        tool_call_id: msg.tool_call_id
       });
     }
   }
-  if (parts.length === 0) return null;
-  return {
-    role: msg.role === "assistant" ? "model" : "user",
-    parts
-  };
-}
-function formatToolsForGemini(actions) {
-  if (!actions || actions.length === 0) return void 0;
-  return {
-    functionDeclarations: actions.map((action) => ({
-      name: action.name,
-      description: action.description,
-      parameters: action.parameters ? {
-        type: "object",
-        properties: Object.fromEntries(
-          Object.entries(action.parameters).map(([key, param]) => [
-            key,
-            {
-              type: param.type,
-              description: param.description,
-              enum: param.enum
-            }
-          ])
-        ),
-        required: Object.entries(action.parameters).filter(([, param]) => param.required).map(([key]) => key)
-      } : void 0
-    }))
-  };
+  return formatted;
 }
-var GoogleAdapter = class {
+
+// src/adapters/openai.ts
+var OpenAIAdapter = class _OpenAIAdapter {
   constructor(config) {
-    this.provider = "google";
     this.config = config;
-    this.model = config.model || "gemini-2.0-flash";
+    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) {
-      const { GoogleGenerativeAI } = await import('@google/generative-ai');
-      this.client = new GoogleGenerativeAI(this.config.apiKey);
+      const { default: OpenAI } = await import('openai');
+      this.client = new OpenAI({
+        apiKey: this.config.apiKey,
+        baseURL: this.config.baseUrl
+      });
     }
     return this.client;
   }
-  async *stream(request) {
-    const client = await this.getClient();
-    const modelId = request.config?.model || this.model;
-    const webSearchConfig = request.webSearch ?? this.config.webSearch;
-    const model = client.getGenerativeModel({
-      model: modelId,
-      safetySettings: this.config.safetySettings
-    });
-    let contents = [];
-    let systemInstruction;
-    if (request.rawMessages && request.rawMessages.length > 0) {
-      for (const msg of request.rawMessages) {
-        if (msg.role === "system") {
-          systemInstruction = (systemInstruction || "") + (msg.content || "");
-          continue;
-        }
-        const content = messageToGeminiContent(msg);
+  shouldUseResponsesApi(request) {
+    return request.providerToolOptions?.openai?.nativeToolSearch?.enabled === true && request.providerToolOptions.openai.nativeToolSearch.useResponsesApi !== false && Array.isArray(request.toolDefinitions) && request.toolDefinitions.length > 0;
+  }
+  buildResponsesInput(request) {
+    const sourceMessages = request.rawMessages && request.rawMessages.length > 0 ? request.rawMessages : formatMessagesForOpenAI(request.messages, void 0);
+    const input = [];
+    for (const message of sourceMessages) {
+      if (message.role === "system") {
+        continue;
+      }
+      if (message.role === "assistant") {
+        const content = typeof message.content === "string" ? message.content : Array.isArray(message.content) ? message.content : message.content ? JSON.stringify(message.content) : "";
         if (content) {
-          contents.push(content);
+          input.push({
+            type: "message",
+            role: "assistant",
+            content
+          });
+        }
+        const toolCalls = Array.isArray(message.tool_calls) ? message.tool_calls : [];
+        for (const toolCall of toolCalls) {
+          input.push({
+            type: "function_call",
+            call_id: toolCall.id,
+            name: toolCall.function?.name,
+            arguments: toolCall.function?.arguments ?? "{}"
+          });
         }
+        continue;
       }
-      if (request.systemPrompt && !systemInstruction) {
-        systemInstruction = request.systemPrompt;
+      if (message.role === "tool") {
+        input.push({
+          type: "function_call_output",
+          call_id: message.tool_call_id,
+          output: typeof message.content === "string" ? message.content : JSON.stringify(message.content ?? null)
+        });
+        continue;
       }
-    } else {
-      for (const msg of request.messages) {
-        if (msg.role === "system") {
-          systemInstruction = (systemInstruction || "") + (msg.content || "");
-          continue;
+      input.push({
+        type: "message",
+        role: message.role === "developer" ? "developer" : "user",
+        content: typeof message.content === "string" ? message.content : Array.isArray(message.content) ? message.content : JSON.stringify(message.content ?? "")
+      });
+    }
+    return input;
+  }
+  buildResponsesTools(tools) {
+    const nativeTools = tools.filter((tool) => tool.available !== false).map((tool) => ({
+      type: "function",
+      name: tool.name,
+      description: tool.description,
+      parameters: normalizeObjectJsonSchema(
+        tool.inputSchema ?? {
+          type: "object",
+          properties: {},
+          required: []
         }
-        const content = messageToGeminiContent(msg);
-        if (content) {
-          contents.push(content);
+      ),
+      strict: true,
+      defer_loading: tool.deferLoading === true
+    }));
+    return [{ type: "tool_search" }, ...nativeTools];
+  }
+  parseResponsesResult(response) {
+    const content = typeof response?.output_text === "string" ? response.output_text : "";
+    const toolCalls = Array.isArray(response?.output) ? response.output.filter((item) => item?.type === "function_call").map((item) => ({
+      id: item.call_id ?? item.id ?? generateToolCallId(),
+      name: item.name,
+      args: (() => {
+        try {
+          return JSON.parse(item.arguments ?? "{}");
+        } catch {
+          return {};
         }
-      }
-      if (request.systemPrompt) {
-        systemInstruction = request.systemPrompt;
+      })()
+    })) : [];
+    return {
+      content,
+      toolCalls,
+      usage: response?.usage ? {
+        promptTokens: response.usage.input_tokens ?? 0,
+        completionTokens: response.usage.output_tokens ?? 0,
+        totalTokens: response.usage.total_tokens ?? (response.usage.input_tokens ?? 0) + (response.usage.output_tokens ?? 0)
+      } : void 0,
+      rawResponse: response
+    };
+  }
+  async completeWithResponses(request) {
+    const client = await this.getClient();
+    const openaiToolOptions = request.providerToolOptions?.openai;
+    const payload = {
+      model: request.config?.model || this.model,
+      instructions: request.systemPrompt,
+      input: this.buildResponsesInput(request),
+      tools: this.buildResponsesTools(request.toolDefinitions ?? []),
+      tool_choice: openaiToolOptions?.toolChoice === "required" ? "required" : openaiToolOptions?.toolChoice === "auto" ? "auto" : void 0,
+      parallel_tool_calls: openaiToolOptions?.parallelToolCalls,
+      temperature: request.config?.temperature ?? this.config.temperature,
+      max_output_tokens: request.config?.maxTokens ?? this.config.maxTokens,
+      stream: false
+    };
+    logProviderPayload("openai", "request payload", payload, request.debug);
+    const response = await client.responses.create(payload);
+    logProviderPayload("openai", "response payload", response, request.debug);
+    return this.parseResponsesResult(response);
+  }
+  async *stream(request) {
+    if (this.shouldUseResponsesApi(request)) {
+      const messageId2 = generateMessageId();
+      yield { type: "message:start", id: messageId2 };
+      try {
+        const result = await this.completeWithResponses(request);
+        if (result.content) {
+          yield { type: "message:delta", content: result.content };
+        }
+        for (const toolCall of result.toolCalls) {
+          yield {
+            type: "action:start",
+            id: toolCall.id,
+            name: toolCall.name
+          };
+          yield {
+            type: "action:args",
+            id: toolCall.id,
+            args: JSON.stringify(toolCall.args)
+          };
+        }
+        yield { type: "message:end" };
+        yield {
+          type: "done",
+          usage: result.usage ? {
+            prompt_tokens: result.usage.promptTokens,
+            completion_tokens: result.usage.completionTokens,
+            total_tokens: result.usage.totalTokens
+          } : void 0
+        };
+        return;
+      } catch (error) {
+        yield {
+          type: "error",
+          message: error instanceof Error ? error.message : "Unknown error",
+          code: "OPENAI_RESPONSES_ERROR"
+        };
+        return;
       }
     }
-    if (contents.length === 0 || contents[0].role !== "user") {
-      contents = [{ role: "user", parts: [{ text: "" }] }, ...contents];
-    }
-    const mergedContents = [];
-    for (const content of contents) {
-      const last = mergedContents[mergedContents.length - 1];
-      if (last && last.role === content.role) {
-        last.parts.push(...content.parts);
+    const client = await this.getClient();
+    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 = [];
+          if (msg.content) {
+            content.push({ type: "text", text: msg.content });
+          }
+          for (const attachment of msg.attachments) {
+            if (attachment.type === "image") {
+              let imageUrl;
+              if (attachment.url) {
+                imageUrl = attachment.url;
+              } else if (attachment.data) {
+                imageUrl = attachment.data.startsWith("data:") ? attachment.data : `data:${attachment.mimeType || "image/png"};base64,${attachment.data}`;
+              } else {
+                continue;
+              }
+              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 {
-        mergedContents.push({ ...content, parts: [...content.parts] });
+        messages = processedMessages;
       }
+    } else {
+      messages = formatMessagesForOpenAI(
+        request.messages,
+        request.systemPrompt
+      );
     }
-    const functionTools = formatToolsForGemini(request.actions);
-    const toolsArray = [];
-    if (functionTools) {
-      toolsArray.push(functionTools);
-    }
+    const tools = request.actions?.length ? formatTools(request.actions) : [];
+    const webSearchConfig = request.webSearch ?? this.config.webSearch;
     if (webSearchConfig) {
-      toolsArray.push({
-        google_search: {}
-      });
+      const webSearchTool = {
+        type: "web_search_preview"
+      };
+      const wsConfig = typeof webSearchConfig === "object" ? webSearchConfig : {};
+      if (wsConfig.userLocation) {
+        webSearchTool.search_context_size = "medium";
+      }
+      tools.push(webSearchTool);
     }
     const messageId = generateMessageId();
     yield { type: "message:start", id: messageId };
     try {
-      logProviderPayload(
-        "google",
-        "request payload",
-        {
-          model: modelId,
-          history: mergedContents.slice(0, -1),
-          systemInstruction: systemInstruction ? { parts: [{ text: systemInstruction }] } : void 0,
-          tools: toolsArray.length > 0 ? toolsArray : void 0,
-          generationConfig: {
-            temperature: request.config?.temperature ?? this.config.temperature,
-            maxOutputTokens: request.config?.maxTokens ?? this.config.maxTokens
-          },
-          messageParts: mergedContents[mergedContents.length - 1]?.parts
-        },
-        request.debug
-      );
-      const chat = model.startChat({
-        history: mergedContents.slice(0, -1),
-        // All but the last message
-        systemInstruction: systemInstruction ? { parts: [{ text: systemInstruction }] } : void 0,
-        tools: toolsArray.length > 0 ? toolsArray : void 0,
-        generationConfig: {
-          temperature: request.config?.temperature ?? this.config.temperature,
-          maxOutputTokens: request.config?.maxTokens ?? this.config.maxTokens
+      const openaiToolOptions = request.providerToolOptions?.openai;
+      const toolChoice = openaiToolOptions?.toolChoice && typeof openaiToolOptions.toolChoice === "object" ? {
+        type: "function",
+        function: {
+          name: openaiToolOptions.toolChoice.name
         }
-      });
-      const lastMessage = mergedContents[mergedContents.length - 1];
-      const result = await chat.sendMessageStream(lastMessage.parts);
+      } : openaiToolOptions?.toolChoice;
+      const payload = {
+        model: request.config?.model || this.model,
+        messages,
+        tools: tools.length > 0 ? tools : void 0,
+        tool_choice: tools.length > 0 ? toolChoice : void 0,
+        parallel_tool_calls: tools.length > 0 ? openaiToolOptions?.parallelToolCalls : void 0,
+        temperature: request.config?.temperature ?? this.config.temperature,
+        max_tokens: request.config?.maxTokens ?? this.config.maxTokens,
+        stream: true,
+        stream_options: { include_usage: true }
+      };
+      logProviderPayload("openai", "request payload", payload, request.debug);
+      const stream = await client.chat.completions.create(payload);
       let currentToolCall = null;
       const collectedCitations = [];
-      for await (const chunk of result.stream) {
-        logProviderPayload("google", "stream chunk", chunk, request.debug);
+      let citationIndex = 0;
+      let usage;
+      for await (const chunk of stream) {
+        logProviderPayload("openai", "stream chunk", chunk, request.debug);
         if (request.signal?.aborted) {
           break;
         }
-        const candidate = chunk.candidates?.[0];
-        if (!candidate?.content?.parts) continue;
-        for (const part of candidate.content.parts) {
-          if ("text" in part && part.text) {
-            yield { type: "message:delta", content: part.text };
+        const delta = chunk.choices[0]?.delta;
+        const choice = chunk.choices[0];
+        if (delta?.content) {
+          yield { type: "message:delta", content: delta.content };
+        }
+        const annotations = delta?.annotations;
+        if (annotations && annotations.length > 0) {
+          for (const annotation of annotations) {
+            if (annotation.type === "url_citation" && annotation.url_citation?.url) {
+              citationIndex++;
+              const url = annotation.url_citation.url;
+              const domain = extractDomain(url);
+              collectedCitations.push({
+                index: citationIndex,
+                url,
+                title: annotation.url_citation.title || domain,
+                domain,
+                favicon: domain ? `https://www.google.com/s2/favicons?domain=${domain}&sz=32` : void 0
+              });
+            }
           }
-          if ("functionCall" in part && part.functionCall) {
-            const fc = part.functionCall;
-            const toolId = generateToolCallId();
-            if (currentToolCall) {
+        }
+        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
+                };
+              }
+              const tcExtraContent = toolCall.extra_content;
+              currentToolCall = {
+                id: toolCall.id,
+                name: toolCall.function?.name || "",
+                arguments: toolCall.function?.arguments || "",
+                ...tcExtraContent ? { extra_content: tcExtraContent } : {}
+              };
               yield {
-                type: "action:args",
+                type: "action:start",
                 id: currentToolCall.id,
-                args: JSON.stringify(currentToolCall.args)
+                name: currentToolCall.name,
+                ...currentToolCall.extra_content ? { extra_content: currentToolCall.extra_content } : {}
               };
+            } else if (currentToolCall && toolCall.function?.arguments) {
+              currentToolCall.arguments += toolCall.function.arguments;
             }
-            currentToolCall = {
-              id: toolId,
-              name: fc.name,
-              args: fc.args || {}
-            };
-            yield {
-              type: "action:start",
-              id: toolId,
-              name: fc.name
-            };
           }
         }
-        if (candidate.finishReason) {
+        if (chunk.usage) {
+          usage = {
+            prompt_tokens: chunk.usage.prompt_tokens,
+            completion_tokens: chunk.usage.completion_tokens,
+            total_tokens: chunk.usage.total_tokens
+          };
+        }
+        if (choice?.finish_reason) {
           if (currentToolCall) {
             yield {
               type: "action:args",
               id: currentToolCall.id,
-              args: JSON.stringify(currentToolCall.args)
+              args: currentToolCall.arguments
             };
           }
         }
-        const groundingMetadata = candidate?.groundingMetadata;
-        if (groundingMetadata?.groundingChunks) {
-          for (const chunk2 of groundingMetadata.groundingChunks) {
-            if (chunk2.web?.uri) {
-              const url = chunk2.web.uri;
-              const domain = extractDomain(url);
-              if (!collectedCitations.some((c) => c.url === url)) {
-                collectedCitations.push({
-                  index: collectedCitations.length + 1,
-                  url,
-                  title: chunk2.web.title || domain,
-                  domain,
-                  favicon: domain ? `https://www.google.com/s2/favicons?domain=${domain}&sz=32` : void 0
-                });
-              }
-            }
-          }
-        }
-      }
-      let usage;
-      try {
-        const response = await result.response;
-        logProviderPayload(
-          "google",
-          "response payload",
-          response,
-          request.debug
-        );
-        if (response.usageMetadata) {
-          usage = {
-            prompt_tokens: response.usageMetadata.promptTokenCount || 0,
-            completion_tokens: response.usageMetadata.candidatesTokenCount || 0,
-            total_tokens: response.usageMetadata.totalTokenCount || 0
-          };
-        }
-        const finalCandidate = response.candidates?.[0];
-        const finalGrounding = finalCandidate?.groundingMetadata;
-        if (finalGrounding?.groundingChunks) {
-          for (const chunk of finalGrounding.groundingChunks) {
-            if (chunk.web?.uri) {
-              const url = chunk.web.uri;
-              const domain = extractDomain(url);
-              if (!collectedCitations.some((c) => c.url === url)) {
-                collectedCitations.push({
-                  index: collectedCitations.length + 1,
-                  url,
-                  title: chunk.web.title || domain,
-                  domain,
-                  favicon: domain ? `https://www.google.com/s2/favicons?domain=${domain}&sz=32` : void 0
-                });
-              }
-            }
-          }
-        }
-      } catch {
       }
       if (collectedCitations.length > 0) {
-        yield { type: "citation", citations: collectedCitations };
+        const uniqueCitations = deduplicateCitations(collectedCitations);
+        yield { type: "citation", citations: uniqueCitations };
       }
       yield { type: "message:end" };
       yield { type: "done", usage };
@@ -665,100 +837,83 @@ var GoogleAdapter = class {
       yield {
         type: "error",
         message: error instanceof Error ? error.message : "Unknown error",
-        code: "GOOGLE_ERROR"
+        code: `${this.provider.toUpperCase()}_ERROR`
       };
     }
   }
-  /**
-   * Non-streaming completion (optional, for debugging)
-   */
   async complete(request) {
-    const client = await this.getClient();
-    const modelId = request.config?.model || this.model;
-    const model = client.getGenerativeModel({
-      model: modelId,
-      safetySettings: this.config.safetySettings
-    });
-    let contents = [];
-    let systemInstruction;
-    for (const msg of request.messages) {
-      if (msg.role === "system") {
-        systemInstruction = (systemInstruction || "") + (msg.content || "");
-        continue;
-      }
-      const content = messageToGeminiContent(msg);
-      if (content) {
-        contents.push(content);
-      }
-    }
-    if (request.systemPrompt) {
-      systemInstruction = request.systemPrompt;
-    }
-    if (contents.length === 0 || contents[0].role !== "user") {
-      contents = [{ role: "user", parts: [{ text: "" }] }, ...contents];
+    if (this.shouldUseResponsesApi(request)) {
+      return this.completeWithResponses(request);
     }
-    const mergedContents = [];
-    for (const content of contents) {
-      const last = mergedContents[mergedContents.length - 1];
-      if (last && last.role === content.role) {
-        last.parts.push(...content.parts);
+    const client = await this.getClient();
+    let messages;
+    if (request.rawMessages && request.rawMessages.length > 0) {
+      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 },
+          ...sanitized
+        ];
       } else {
-        mergedContents.push({ ...content, parts: [...content.parts] });
+        messages = sanitized;
       }
+    } else {
+      messages = formatMessagesForOpenAI(
+        request.messages,
+        request.systemPrompt
+      );
     }
-    const tools = formatToolsForGemini(request.actions);
+    const tools = request.actions?.length ? formatTools(request.actions) : [];
+    const openaiToolOptions = request.providerToolOptions?.openai;
+    const toolChoice = openaiToolOptions?.toolChoice && typeof openaiToolOptions.toolChoice === "object" ? {
+      type: "function",
+      function: {
+        name: openaiToolOptions.toolChoice.name
+      }
+    } : openaiToolOptions?.toolChoice;
     const payload = {
-      model: modelId,
-      history: mergedContents.slice(0, -1),
-      systemInstruction: systemInstruction ? { parts: [{ text: systemInstruction }] } : void 0,
-      tools: tools ? [tools] : void 0,
-      generationConfig: {
-        temperature: request.config?.temperature ?? this.config.temperature,
-        maxOutputTokens: request.config?.maxTokens ?? this.config.maxTokens
-      },
-      messageParts: mergedContents[mergedContents.length - 1]?.parts
+      model: request.config?.model || this.model,
+      messages,
+      tools: tools.length > 0 ? tools : void 0,
+      tool_choice: tools.length > 0 ? toolChoice : void 0,
+      parallel_tool_calls: tools.length > 0 ? openaiToolOptions?.parallelToolCalls : void 0,
+      temperature: request.config?.temperature ?? this.config.temperature,
+      max_tokens: request.config?.maxTokens ?? this.config.maxTokens,
+      stream: false
     };
-    logProviderPayload("google", "request payload", payload, request.debug);
-    const chat = model.startChat({
-      history: mergedContents.slice(0, -1),
-      systemInstruction: systemInstruction ? { parts: [{ text: systemInstruction }] } : void 0,
-      tools: tools ? [tools] : void 0,
-      generationConfig: {
-        temperature: request.config?.temperature ?? this.config.temperature,
-        maxOutputTokens: request.config?.maxTokens ?? this.config.maxTokens
-      }
-    });
-    const lastMessage = mergedContents[mergedContents.length - 1];
-    const result = await chat.sendMessage(lastMessage.parts);
-    const response = result.response;
-    logProviderPayload("google", "response payload", response, request.debug);
-    let textContent = "";
-    const toolCalls = [];
-    const candidate = response.candidates?.[0];
-    if (candidate?.content?.parts) {
-      for (const part of candidate.content.parts) {
-        if ("text" in part && part.text) {
-          textContent += part.text;
-        }
-        if ("functionCall" in part && part.functionCall) {
-          toolCalls.push({
-            id: generateToolCallId(),
-            name: part.functionCall.name,
-            args: part.functionCall.args || {}
-          });
-        }
-      }
-    }
+    logProviderPayload("openai", "request payload", payload, request.debug);
+    const response = await client.chat.completions.create(payload);
+    logProviderPayload("openai", "response payload", response, request.debug);
+    const choice = response.choices?.[0];
+    const message = choice?.message;
     return {
-      content: textContent,
-      toolCalls,
+      content: message?.content ?? "",
+      toolCalls: message?.tool_calls?.map((toolCall) => ({
+        id: toolCall.id ?? generateToolCallId(),
+        name: toolCall.function?.name ?? "",
+        args: (() => {
+          try {
+            return JSON.parse(toolCall.function?.arguments ?? "{}");
+          } catch {
+            return {};
+          }
+        })(),
+        ...toolCall.extra_content ? { extra_content: toolCall.extra_content } : {}
+      })) ?? [],
+      usage: response.usage ? {
+        promptTokens: response.usage.prompt_tokens,
+        completionTokens: response.usage.completion_tokens,
+        totalTokens: response.usage.total_tokens
+      } : void 0,
       rawResponse: response
     };
   }
 };
-function createGoogleAdapter(config) {
-  return new GoogleAdapter(config);
-}
 function extractDomain(url) {
   try {
     const parsed = new URL(url);
@@ -767,6 +922,20 @@ function extractDomain(url) {
     return "";
   }
 }
+function deduplicateCitations(citations) {
+  const seen = /* @__PURE__ */ new Map();
+  let index = 0;
+  for (const citation of citations) {
+    if (!seen.has(citation.url)) {
+      index++;
+      seen.set(citation.url, { ...citation, index });
+    }
+  }
+  return Array.from(seen.values());
+}
+function createOpenAIAdapter(config) {
+  return new OpenAIAdapter(config);
+}
 
 // src/providers/types.ts
 function createCallableProvider(providerFn, properties) {
@@ -785,6 +954,7 @@ function createCallableProvider(providerFn, properties) {
 }
 
 // src/providers/google/index.ts
+var GEMINI_BASE_URL = "https://generativelanguage.googleapis.com/v1beta/openai/";
 var GOOGLE_MODELS2 = {
   // Gemini 2.0 series (latest)
   "gemini-2.0-flash": {
@@ -870,6 +1040,25 @@ var GOOGLE_MODELS2 = {
     maxTokens: 1e6,
     outputTokens: 8192
   },
+  // Gemini 3 series (thinking models)
+  "gemini-3.1-flash-lite-preview": {
+    vision: true,
+    tools: true,
+    audio: false,
+    video: false,
+    pdf: true,
+    maxTokens: 1e6,
+    outputTokens: 32768
+  },
+  "gemini-3.1-flash-preview": {
+    vision: true,
+    tools: true,
+    audio: false,
+    video: false,
+    pdf: true,
+    maxTokens: 1e6,
+    outputTokens: 32768
+  },
   // Gemini 1.0 series (legacy)
   "gemini-1.0-pro": {
     vision: false,
@@ -884,11 +1073,10 @@ var GOOGLE_MODELS2 = {
 function createGoogle(config = {}) {
   const apiKey = config.apiKey ?? process.env.GOOGLE_API_KEY ?? "";
   const providerFn = (modelId) => {
-    return createGoogleAdapter({
+    return createOpenAIAdapter({
       apiKey,
       model: modelId,
-      baseUrl: config.baseUrl,
-      safetySettings: config.safetySettings
+      baseUrl: config.baseUrl || GEMINI_BASE_URL
     });
   };
   const getCapabilities = (modelId) => {