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

package/dist/providers/openai/index.mjs

@@ -1,3 +1,96 @@
+// src/core/openai-parameters.ts
+function capabilities(model) {
+  const gpt = /^gpt-(\d+)(?:\.(\d+))?(?:-(.+))?$/i.exec(model);
+  const major = Number(gpt?.[1] ?? 0);
+  const minor = Number(gpt?.[2] ?? 0);
+  const chat = gpt?.[3]?.startsWith("chat") ?? false;
+  const reasoning = /^o\d+(?:-|$)/i.test(model) || major >= 5 && !chat;
+  const supportsNone = major === 5 && minor >= 1 && !chat || /^gpt-6-(?:sol|luna)(?:-\d{4}-\d{2}-\d{2})?$/i.test(model);
+  return { major, minor, reasoning, supportsNone };
+}
+function requiresOpenAIResponses(model, baseUrl, options = {}) {
+  if (options.parameterPolicy === "passthrough") return false;
+  const c = capabilities(model);
+  if (!c.reasoning || options.reasoningEffort === "none") return false;
+  if (!(c.major >= 6 || c.major === 5 && c.minor >= 4)) return false;
+  if (!baseUrl) return true;
+  try {
+    return new URL(baseUrl).hostname === "api.openai.com";
+  } catch {
+    return false;
+  }
+}
+function buildOpenAIParameters(model, maxTokens, temperature, options = {}, api = "chat") {
+  const c = capabilities(model ?? "");
+  const normalize = options.parameterPolicy !== "passthrough";
+  const effort = options.reasoningEffort;
+  if (normalize && c.reasoning && effort === "none" && !c.supportsNone) {
+    throw new Error(`${model} does not support reasoningEffort: none`);
+  }
+  if (normalize && c.major >= 6 && effort === "minimal") {
+    throw new Error(`${model} does not support reasoningEffort: minimal`);
+  }
+  const result = {
+    [api === "responses" ? "max_output_tokens" : normalize && c.reasoning ? "max_completion_tokens" : "max_tokens"]: maxTokens
+  };
+  if (effort !== void 0) {
+    if (api === "responses") result.reasoning = { effort };
+    else result.reasoning_effort = effort;
+  }
+  if (temperature !== void 0) {
+    if (!normalize || !c.reasoning || effort === "none" && c.supportsNone) {
+      result.temperature = temperature;
+    } else {
+      (options.onWarning ?? console.warn)(
+        `[llm-sdk] ${model}: omitted temperature because reasoning is enabled.`
+      );
+    }
+  }
+  return result;
+}
+
+// src/core/provider-error.ts
+function providerErrorEvent(error, code) {
+  const details = error ?? {};
+  const event = {
+    type: "error",
+    message: error instanceof Error ? error.message : String(error),
+    code,
+    ...typeof details.status === "number" ? { status: details.status } : {},
+    ...typeof details.code === "string" ? { providerCode: details.code } : {},
+    ...typeof details.param === "string" ? { param: details.param } : {},
+    ...typeof details.request_id === "string" ? { requestId: details.request_id } : {}
+  };
+  Object.defineProperty(event, "cause", { value: error, enumerable: false });
+  return event;
+}
+function errorFromEvent(event) {
+  if (event.cause instanceof Error) return event.cause;
+  return Object.assign(new Error(event.message), {
+    status: event.status,
+    code: event.providerCode ?? event.code,
+    param: event.param,
+    request_id: event.requestId
+  });
+}
+function throwIfAborted(signal) {
+  if (!signal?.aborted) return;
+  const error = new Error("The operation was aborted");
+  error.name = "AbortError";
+  throw error;
+}
+
+// src/core/utils.ts
+function generateId(prefix = "id") {
+  return `${prefix}_${Date.now()}_${Math.random().toString(36).substring(2, 9)}`;
+}
+function generateMessageId() {
+  return generateId("msg");
+}
+function generateToolCallId() {
+  return generateId("call");
+}
+
 // src/adapters/base.ts
 function stringifyForDebug(value) {
   return JSON.stringify(
@@ -104,16 +197,6 @@ function normalizeObjectJsonSchema(schema) {
   }
   return normalized;
 }
-function isOpenAIReasoningModel(modelId) {
-  if (!modelId) return false;
-  return /^(o1|o3|o4|gpt-5)/i.test(modelId);
-}
-function buildOpenAITokenParams(modelId, maxTokens, temperature) {
-  if (isOpenAIReasoningModel(modelId)) {
-    return { max_completion_tokens: maxTokens };
-  }
-  return { max_tokens: maxTokens, temperature };
-}
 function toOpenAIResponseFormat(rf) {
   if (!rf) return void 0;
   if (rf.type === "json_object") return { type: "json_object" };
@@ -233,291 +316,6 @@ function formatMessagesForOpenAI(messages, systemPrompt) {
   return formatted;
 }
 
-// src/providers/openai/provider.ts
-var OPENAI_MODELS = {
-  // GPT-4o series
-  "gpt-4o": { vision: true, tools: true, jsonMode: true, maxTokens: 128e3 },
-  "gpt-5.2": {
-    vision: true,
-    tools: true,
-    jsonMode: true,
-    maxTokens: 128e3
-  },
-  "gpt-4o-2024-11-20": {
-    vision: true,
-    tools: true,
-    jsonMode: true,
-    maxTokens: 128e3
-  },
-  "gpt-4o-2024-08-06": {
-    vision: true,
-    tools: true,
-    jsonMode: true,
-    maxTokens: 128e3
-  },
-  // GPT-4 Turbo
-  "gpt-4-turbo": {
-    vision: true,
-    tools: true,
-    jsonMode: true,
-    maxTokens: 128e3
-  },
-  "gpt-4-turbo-preview": {
-    vision: false,
-    tools: true,
-    jsonMode: true,
-    maxTokens: 128e3
-  },
-  // GPT-4
-  "gpt-4": { vision: false, tools: true, jsonMode: false, maxTokens: 8192 },
-  "gpt-4-32k": {
-    vision: false,
-    tools: true,
-    jsonMode: false,
-    maxTokens: 32768
-  },
-  // GPT-3.5
-  "gpt-3.5-turbo": {
-    vision: false,
-    tools: true,
-    jsonMode: true,
-    maxTokens: 16385
-  },
-  // O1 series (reasoning)
-  o1: { vision: true, tools: false, jsonMode: false, maxTokens: 128e3 },
-  "o1-mini": { vision: true, tools: false, jsonMode: false, maxTokens: 128e3 },
-  "o1-preview": {
-    vision: true,
-    tools: false,
-    jsonMode: false,
-    maxTokens: 128e3
-  },
-  // O3 series
-  "o3-mini": { vision: true, tools: false, jsonMode: false, maxTokens: 128e3 }
-};
-function openai(modelId, options = {}) {
-  const apiKey = options.apiKey ?? process.env.OPENAI_API_KEY;
-  const baseURL = options.baseURL ?? "https://api.openai.com/v1";
-  let client = null;
-  async function getClient() {
-    if (!client) {
-      const { default: OpenAI } = await import('openai');
-      client = new OpenAI({
-        apiKey,
-        baseURL,
-        organization: options.organization,
-        defaultHeaders: options.headers
-      });
-    }
-    return client;
-  }
-  const modelConfig = OPENAI_MODELS[modelId] ?? OPENAI_MODELS["gpt-4o"];
-  return {
-    provider: "openai",
-    modelId,
-    capabilities: {
-      supportsVision: modelConfig.vision,
-      supportsTools: modelConfig.tools,
-      supportsStreaming: true,
-      supportsJsonMode: modelConfig.jsonMode,
-      supportsThinking: false,
-      supportsPDF: false,
-      maxTokens: modelConfig.maxTokens,
-      supportedImageTypes: modelConfig.vision ? ["image/png", "image/jpeg", "image/gif", "image/webp"] : []
-    },
-    async doGenerate(params) {
-      const client2 = await getClient();
-      const messages = formatMessagesForOpenAI2(params.messages);
-      const response = await client2.chat.completions.create({
-        model: modelId,
-        messages,
-        tools: params.tools,
-        ...buildOpenAITokenParams(
-          modelId,
-          params.maxTokens,
-          params.temperature
-        ),
-        response_format: toOpenAIResponseFormat(params.responseFormat)
-      });
-      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 {
-        text: message.content ?? "",
-        toolCalls,
-        finishReason: mapFinishReason(choice.finish_reason),
-        usage: {
-          promptTokens: response.usage?.prompt_tokens ?? 0,
-          completionTokens: response.usage?.completion_tokens ?? 0,
-          totalTokens: response.usage?.total_tokens ?? 0
-        },
-        rawResponse: response
-      };
-    },
-    async *doStream(params) {
-      const client2 = await getClient();
-      const messages = formatMessagesForOpenAI2(params.messages);
-      const stream = await client2.chat.completions.create({
-        model: modelId,
-        messages,
-        tools: params.tools,
-        ...buildOpenAITokenParams(
-          modelId,
-          params.maxTokens,
-          params.temperature
-        ),
-        response_format: toOpenAIResponseFormat(params.responseFormat),
-        stream: true
-      });
-      let currentToolCall = null;
-      let totalPromptTokens = 0;
-      let totalCompletionTokens = 0;
-      for await (const chunk of stream) {
-        if (params.signal?.aborted) {
-          yield { type: "error", error: new Error("Aborted") };
-          return;
-        }
-        const choice = chunk.choices[0];
-        const delta = choice?.delta;
-        if (delta?.content) {
-          yield { type: "text-delta", text: delta.content };
-        }
-        if (delta?.tool_calls) {
-          for (const tc of delta.tool_calls) {
-            if (tc.id) {
-              if (currentToolCall) {
-                yield {
-                  type: "tool-call",
-                  toolCall: {
-                    id: currentToolCall.id,
-                    name: currentToolCall.name,
-                    args: JSON.parse(currentToolCall.arguments || "{}")
-                  }
-                };
-              }
-              currentToolCall = {
-                id: tc.id,
-                name: tc.function?.name ?? "",
-                arguments: tc.function?.arguments ?? ""
-              };
-            } else if (currentToolCall && tc.function?.arguments) {
-              currentToolCall.arguments += tc.function.arguments;
-            }
-          }
-        }
-        if (choice?.finish_reason) {
-          if (currentToolCall) {
-            yield {
-              type: "tool-call",
-              toolCall: {
-                id: currentToolCall.id,
-                name: currentToolCall.name,
-                args: JSON.parse(currentToolCall.arguments || "{}")
-              }
-            };
-            currentToolCall = null;
-          }
-          if (chunk.usage) {
-            totalPromptTokens = chunk.usage.prompt_tokens;
-            totalCompletionTokens = chunk.usage.completion_tokens;
-          }
-          yield {
-            type: "finish",
-            finishReason: mapFinishReason(choice.finish_reason),
-            usage: {
-              promptTokens: totalPromptTokens,
-              completionTokens: totalCompletionTokens,
-              totalTokens: totalPromptTokens + totalCompletionTokens
-            }
-          };
-        }
-      }
-    }
-  };
-}
-function mapFinishReason(reason) {
-  switch (reason) {
-    case "stop":
-      return "stop";
-    case "length":
-      return "length";
-    case "tool_calls":
-    case "function_call":
-      return "tool-calls";
-    case "content_filter":
-      return "content-filter";
-    default:
-      return "unknown";
-  }
-}
-function formatMessagesForOpenAI2(messages) {
-  return messages.map((msg) => {
-    switch (msg.role) {
-      case "system":
-        return { role: "system", content: msg.content };
-      case "user":
-        if (typeof msg.content === "string") {
-          return { role: "user", content: msg.content };
-        }
-        return {
-          role: "user",
-          content: msg.content.map((part) => {
-            if (part.type === "text") {
-              return { type: "text", text: part.text };
-            }
-            if (part.type === "image") {
-              const imageData = typeof part.image === "string" ? part.image : Buffer.from(part.image).toString("base64");
-              const url = imageData.startsWith("data:") ? imageData : `data:${part.mimeType ?? "image/png"};base64,${imageData}`;
-              return { type: "image_url", image_url: { url, detail: "auto" } };
-            }
-            return { type: "text", text: "" };
-          })
-        };
-      case "assistant":
-        const assistantMsg = {
-          role: "assistant",
-          content: msg.content
-        };
-        if (msg.toolCalls && msg.toolCalls.length > 0) {
-          assistantMsg.tool_calls = msg.toolCalls.map((tc) => ({
-            id: tc.id,
-            type: "function",
-            function: {
-              name: tc.name,
-              arguments: JSON.stringify(tc.args)
-            }
-          }));
-        }
-        return assistantMsg;
-      case "tool":
-        return {
-          role: "tool",
-          tool_call_id: msg.toolCallId,
-          content: msg.content
-        };
-      default:
-        return msg;
-    }
-  });
-}
-
-// src/core/utils.ts
-function generateId(prefix = "id") {
-  return `${prefix}_${Date.now()}_${Math.random().toString(36).substring(2, 9)}`;
-}
-function generateMessageId() {
-  return generateId("msg");
-}
-function generateToolCallId() {
-  return generateId("call");
-}
-
 // src/adapters/openai.ts
 var OpenAIAdapter = class _OpenAIAdapter {
   constructor(config) {
@@ -538,39 +336,38 @@ var OpenAIAdapter = class _OpenAIAdapter {
       const { default: OpenAI } = await import('openai');
       this.client = new OpenAI({
         apiKey: this.config.apiKey,
-        baseURL: this.config.baseUrl
+        baseURL: this.config.baseUrl,
+        organization: this.config.organization,
+        defaultHeaders: this.config.headers
       });
     }
     return this.client;
   }
+  parameterOptions(request) {
+    return {
+      ...this.config,
+      reasoningEffort: request.config?.reasoningEffort ?? this.config.reasoningEffort
+    };
+  }
+  toolDefinitions(request) {
+    if (request.toolDefinitions?.length) return request.toolDefinitions;
+    return formatTools(request.actions ?? []).map((tool) => ({
+      name: tool.function.name,
+      description: tool.function.description ?? "",
+      location: "server",
+      inputSchema: tool.function.parameters
+    }));
+  }
   shouldUseResponsesApi(request) {
-    const hasTools = Array.isArray(request.toolDefinitions) && request.toolDefinitions.length > 0;
-    if (!hasTools) return false;
-    if (request.providerToolOptions?.openai?.nativeToolSearch?.enabled === true && request.providerToolOptions.openai.nativeToolSearch.useResponsesApi !== false) {
+    if (this.toolDefinitions(request).length === 0) return false;
+    if (request.providerToolOptions?.openai?.nativeToolSearch?.enabled === true && request.providerToolOptions.openai.nativeToolSearch.useResponsesApi !== false)
       return true;
-    }
-    return this.requiresResponsesApiForTools(
-      request.config?.model || this.model
+    return requiresOpenAIResponses(
+      request.config?.model || this.model,
+      this.config.baseUrl,
+      this.parameterOptions(request)
     );
   }
-  /**
-   * Whether this model rejects function tools on /v1/chat/completions.
-   *
-   * Applies to OpenAI proper only — the adapter is reused for OpenAI-compatible
-   * providers (Azure, xAI, Google, Fireworks) whose endpoints have no such
-   * restriction and may not implement /v1/responses at all.
-   */
-  requiresResponsesApiForTools(modelId) {
-    if (!modelId) return false;
-    if (!/^gpt-5\.(?:[4-9]|\d{2,})/i.test(modelId)) return false;
-    const baseUrl = this.config.baseUrl;
-    if (!baseUrl) return true;
-    try {
-      return new URL(baseUrl).hostname === "api.openai.com";
-    } catch {
-      return false;
-    }
-  }
   /**
    * Convert one message's content to Responses content parts.
    *
@@ -601,7 +398,7 @@ var OpenAIAdapter = class _OpenAIAdapter {
     });
   }
   buildResponsesInput(request) {
-    const sourceMessages = request.rawMessages && request.rawMessages.length > 0 ? request.rawMessages : formatMessagesForOpenAI(request.messages, void 0);
+    const sourceMessages = request.rawMessages && request.rawMessages.length > 0 ? this.formatRawMessages(request.rawMessages) : formatMessagesForOpenAI(request.messages, void 0);
     const input = [];
     for (const message of sourceMessages) {
       if (message.role === "system") {
@@ -651,6 +448,26 @@ var OpenAIAdapter = class _OpenAIAdapter {
     }
     return input;
   }
+  /** Preserve Copilot screenshot attachments on every OpenAI transport. */
+  formatRawMessages(messages) {
+    return messages.map((message) => {
+      const { attachments, ...rest } = message;
+      let content = message.content;
+      if (message.role === "assistant" && Array.isArray(message.tool_calls) && message.tool_calls.length > 0 && content === "") {
+        content = null;
+      }
+      if (Array.isArray(attachments) && attachments.length > 0) {
+        const images = attachments.filter((attachment) => attachment && typeof attachment === "object").map(
+          (attachment) => attachmentToOpenAIImage(attachment)
+        ).filter((image) => image !== null);
+        if (images.length > 0) {
+          const parts = Array.isArray(content) ? content : content ? [{ type: "text", text: content }] : [];
+          content = [...parts, ...images];
+        }
+      }
+      return { ...rest, content };
+    });
+  }
   /**
    * Build the web_search tool for the Responses API, or undefined when web
    * search is off.
@@ -732,13 +549,7 @@ var OpenAIAdapter = class _OpenAIAdapter {
     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 {};
-        }
-      })()
+      args: JSON.parse(item.arguments ?? "{}")
     })) : [];
     return {
       content,
@@ -762,18 +573,19 @@ var OpenAIAdapter = class _OpenAIAdapter {
       instructions: request.systemPrompt,
       input: this.buildResponsesInput(request),
       tools: this.buildResponsesTools(
-        request.toolDefinitions ?? [],
+        this.toolDefinitions(request),
         request.providerToolOptions?.openai?.nativeToolSearch?.enabled === true,
         this.buildResponsesWebSearchTool(request)
       ),
-      tool_choice: openaiToolOptions?.toolChoice === "required" ? "required" : openaiToolOptions?.toolChoice === "auto" ? "auto" : void 0,
+      tool_choice: openaiToolOptions?.toolChoice,
       parallel_tool_calls: openaiToolOptions?.parallelToolCalls,
-      // Reasoning models reject `temperature` outright — sending it would swap one
-      // 400 for another. isOpenAIReasoningModel already encodes that family test.
-      ...isOpenAIReasoningModel(modelIdForPayload) ? {} : {
-        temperature: request.config?.temperature ?? this.config.temperature
-      },
-      max_output_tokens: request.config?.maxTokens ?? this.config.maxTokens,
+      ...buildOpenAIParameters(
+        modelIdForPayload,
+        request.config?.maxTokens ?? this.config.maxTokens,
+        request.config?.temperature ?? this.config.temperature,
+        this.parameterOptions(request),
+        "responses"
+      ),
       ...responsesTextFormat ? { text: { format: responsesTextFormat } } : {},
       stream
     };
@@ -781,10 +593,26 @@ var OpenAIAdapter = class _OpenAIAdapter {
   }
   async completeWithResponses(request) {
     const client = await this.getClient();
+    throwIfAborted(request.signal);
     const payload = this.buildResponsesPayload(request, false);
     logProviderPayload("openai", "request payload", payload, request.debug);
-    const response = await client.responses.create(payload);
+    if (!client.responses?.create)
+      throw new Error(
+        "This OpenAI client does not support Responses; install an openai version with Responses support."
+      );
+    const response = await client.responses.create(payload, {
+      signal: request.signal
+    });
+    throwIfAborted(request.signal);
     logProviderPayload("openai", "response payload", response, request.debug);
+    if (response.status && response.status !== "completed") {
+      throw Object.assign(
+        new Error(
+          response.error?.message ?? `Responses request ${response.status}`
+        ),
+        response.error
+      );
+    }
     return this.parseResponsesResult(response);
   }
   /**
@@ -802,13 +630,26 @@ var OpenAIAdapter = class _OpenAIAdapter {
    */
   async *streamWithResponses(request) {
     const client = await this.getClient();
+    throwIfAborted(request.signal);
     const payload = this.buildResponsesPayload(request, true);
     logProviderPayload("openai", "request payload", payload, request.debug);
-    const stream = await client.responses.create(payload);
+    if (!client.responses?.create)
+      throw new Error(
+        "This OpenAI client does not support Responses; install an openai version with Responses support."
+      );
+    const stream = await client.responses.create(payload, {
+      signal: request.signal
+    });
     const toolCalls = /* @__PURE__ */ new Map();
     let usage;
     const citations = [];
+    let completed = false;
     function* flushToolCalls() {
+      for (const call of toolCalls.values()) {
+        if (!call.name)
+          throw new Error("Responses tool call is missing its name");
+        JSON.parse(call.arguments || "{}");
+      }
       for (const call of toolCalls.values()) {
         yield { type: "action:start", id: call.id, name: call.name };
         yield { type: "action:args", id: call.id, args: call.arguments };
@@ -817,7 +658,7 @@ var OpenAIAdapter = class _OpenAIAdapter {
       toolCalls.clear();
     }
     for await (const event of stream) {
-      if (request.signal?.aborted) break;
+      throwIfAborted(request.signal);
       logProviderPayload("openai", "stream chunk", event, request.debug);
       const index = event?.output_index ?? 0;
       switch (event?.type) {
@@ -847,8 +688,8 @@ var OpenAIAdapter = class _OpenAIAdapter {
           }
           break;
         }
-        case "response.completed":
-        case "response.incomplete": {
+        case "response.completed": {
+          completed = true;
           const found = this.collectResponsesCitations(
             event.response?.output,
             citations.length
@@ -864,13 +705,27 @@ var OpenAIAdapter = class _OpenAIAdapter {
           }
           break;
         }
-        case "error":
-        case "response.failed":
+        case "response.incomplete":
           throw new Error(
-            event.message ?? event.response?.error?.message ?? "Responses stream failed"
+            `Responses stream incomplete: ${event.response?.incomplete_details?.reason ?? "unknown reason"}`
           );
+        case "error":
+        case "response.failed": {
+          const details = event.response?.error ?? event;
+          throw Object.assign(
+            new Error(details.message ?? "Responses stream failed"),
+            {
+              code: details.code,
+              param: details.param,
+              status: details.status
+            }
+          );
+        }
       }
     }
+    throwIfAborted(request.signal);
+    if (!completed)
+      throw new Error("Responses stream ended without a completed response");
     yield* flushToolCalls();
     if (citations.length > 0) {
       yield { type: "citation", citations: deduplicateCitations(citations) };
@@ -879,6 +734,7 @@ var OpenAIAdapter = class _OpenAIAdapter {
     yield { type: "done", usage };
   }
   async *stream(request) {
+    throwIfAborted(request.signal);
     if (this.shouldUseResponsesApi(request)) {
       const messageId2 = generateMessageId();
       yield { type: "message:start", id: messageId2 };
@@ -886,47 +742,14 @@ var OpenAIAdapter = class _OpenAIAdapter {
         yield* this.streamWithResponses(request);
         return;
       } catch (error) {
-        yield {
-          type: "error",
-          message: error instanceof Error ? error.message : "Unknown error",
-          code: "OPENAI_RESPONSES_ERROR"
-        };
+        yield providerErrorEvent(error, "OPENAI_RESPONSES_ERROR");
         return;
       }
     }
     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;
-      });
+      const processedMessages = this.formatRawMessages(request.rawMessages);
       if (request.systemPrompt) {
         const hasSystem = processedMessages.some((m) => m.role === "system");
         if (!hasSystem) {
@@ -946,7 +769,16 @@ var OpenAIAdapter = class _OpenAIAdapter {
         request.systemPrompt
       );
     }
-    const tools = request.actions?.length ? formatTools(request.actions) : [];
+    const tools = request.toolDefinitions?.length ? request.toolDefinitions.filter((tool) => tool.available !== false).map((tool) => ({
+      type: "function",
+      function: {
+        name: tool.name,
+        description: tool.description,
+        parameters: normalizeObjectJsonSchema(
+          tool.inputSchema
+        )
+      }
+    })) : formatTools(request.actions ?? []);
     const webSearchConfig = request.webSearch ?? this.config.webSearch;
     if (webSearchConfig) {
       const webSearchTool = {
@@ -975,26 +807,28 @@ var OpenAIAdapter = class _OpenAIAdapter {
         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,
-        ...buildOpenAITokenParams(
+        ...buildOpenAIParameters(
           modelIdForPayload,
           request.config?.maxTokens ?? this.config.maxTokens,
-          request.config?.temperature ?? this.config.temperature
+          request.config?.temperature ?? this.config.temperature,
+          this.parameterOptions(request)
         ),
         response_format: toOpenAIResponseFormat(request.config?.responseFormat),
         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 stream = await client.chat.completions.create(payload, {
+        signal: request.signal
+      });
+      const toolCalls = /* @__PURE__ */ new Map();
+      let finishReason;
       const collectedCitations = [];
       let citationIndex = 0;
       let usage;
       for await (const chunk of stream) {
         logProviderPayload("openai", "stream chunk", chunk, request.debug);
-        if (request.signal?.aborted) {
-          break;
-        }
+        throwIfAborted(request.signal);
         const delta = chunk.choices[0]?.delta;
         const choice = chunk.choices[0];
         if (delta?.content) {
@@ -1017,38 +851,19 @@ var OpenAIAdapter = class _OpenAIAdapter {
             }
           }
         }
-        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
-                };
-                yield {
-                  type: "action:end",
-                  id: currentToolCall.id,
-                  name: currentToolCall.name
-                };
-              }
-              const tcExtraContent = toolCall.extra_content;
-              currentToolCall = {
-                id: toolCall.id,
-                name: toolCall.function?.name || "",
-                arguments: toolCall.function?.arguments || "",
-                ...tcExtraContent ? { extra_content: tcExtraContent } : {}
-              };
-              yield {
-                type: "action:start",
-                id: currentToolCall.id,
-                name: currentToolCall.name,
-                ...currentToolCall.extra_content ? { extra_content: currentToolCall.extra_content } : {}
-              };
-            } else if (currentToolCall && toolCall.function?.arguments) {
-              currentToolCall.arguments += toolCall.function.arguments;
-            }
-          }
+        for (const part of delta?.tool_calls ?? []) {
+          const index = part.index ?? 0;
+          const call = toolCalls.get(index) ?? {
+            id: "",
+            name: "",
+            arguments: ""
+          };
+          if (part.id) call.id = part.id;
+          if (part.function?.name) call.name += part.function.name;
+          if (part.function?.arguments)
+            call.arguments += part.function.arguments;
+          if (part.extra_content) call.extra_content = part.extra_content;
+          toolCalls.set(index, call);
         }
         if (chunk.usage) {
           usage = {
@@ -1057,21 +872,28 @@ var OpenAIAdapter = class _OpenAIAdapter {
             total_tokens: chunk.usage.total_tokens
           };
         }
-        if (choice?.finish_reason) {
-          if (currentToolCall) {
-            yield {
-              type: "action:args",
-              id: currentToolCall.id,
-              args: currentToolCall.arguments
-            };
-            yield {
-              type: "action:end",
-              id: currentToolCall.id,
-              name: currentToolCall.name
-            };
-            currentToolCall = null;
-          }
-        }
+        if (choice?.finish_reason) finishReason = choice.finish_reason;
+      }
+      throwIfAborted(request.signal);
+      if (!finishReason)
+        throw new Error("OpenAI stream ended without a finish reason");
+      if (toolCalls.size && !["tool_calls", "function_call"].includes(finishReason)) {
+        throw new Error("OpenAI stream ended with incomplete tool calls");
+      }
+      for (const call of toolCalls.values()) {
+        if (!call.id || !call.name)
+          throw new Error("OpenAI stream contains an incomplete tool call");
+        JSON.parse(call.arguments || "{}");
+      }
+      for (const call of toolCalls.values()) {
+        yield {
+          type: "action:start",
+          id: call.id,
+          name: call.name,
+          ...call.extra_content ? { extra_content: call.extra_content } : {}
+        };
+        yield { type: "action:args", id: call.id, args: call.arguments };
+        yield { type: "action:end", id: call.id, name: call.name };
       }
       if (collectedCitations.length > 0) {
         const uniqueCitations = deduplicateCitations(collectedCitations);
@@ -1080,26 +902,18 @@ var OpenAIAdapter = class _OpenAIAdapter {
       yield { type: "message:end" };
       yield { type: "done", usage };
     } catch (error) {
-      yield {
-        type: "error",
-        message: error instanceof Error ? error.message : "Unknown error",
-        code: `${this.provider.toUpperCase()}_ERROR`
-      };
+      yield providerErrorEvent(error, `${this.provider.toUpperCase()}_ERROR`);
     }
   }
   async complete(request) {
+    throwIfAborted(request.signal);
     if (this.shouldUseResponsesApi(request)) {
       return this.completeWithResponses(request);
     }
     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;
-      });
+      const sanitized = this.formatRawMessages(request.rawMessages);
       if (request.systemPrompt && !sanitized.some((message2) => message2.role === "system")) {
         messages = [
           { role: "system", content: request.systemPrompt },
@@ -1114,7 +928,16 @@ var OpenAIAdapter = class _OpenAIAdapter {
         request.systemPrompt
       );
     }
-    const tools = request.actions?.length ? formatTools(request.actions) : [];
+    const tools = request.toolDefinitions?.length ? request.toolDefinitions.filter((tool) => tool.available !== false).map((tool) => ({
+      type: "function",
+      function: {
+        name: tool.name,
+        description: tool.description,
+        parameters: normalizeObjectJsonSchema(
+          tool.inputSchema
+        )
+      }
+    })) : formatTools(request.actions ?? []);
     const openaiToolOptions = request.providerToolOptions?.openai;
     const toolChoice = openaiToolOptions?.toolChoice && typeof openaiToolOptions.toolChoice === "object" ? {
       type: "function",
@@ -1129,16 +952,19 @@ var OpenAIAdapter = class _OpenAIAdapter {
       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,
-      ...buildOpenAITokenParams(
+      ...buildOpenAIParameters(
         modelIdForCompletePayload,
         request.config?.maxTokens ?? this.config.maxTokens,
-        request.config?.temperature ?? this.config.temperature
+        request.config?.temperature ?? this.config.temperature,
+        this.parameterOptions(request)
       ),
       response_format: toOpenAIResponseFormat(request.config?.responseFormat),
       stream: false
     };
     logProviderPayload("openai", "request payload", payload, request.debug);
-    const response = await client.chat.completions.create(payload);
+    const response = await client.chat.completions.create(payload, {
+      signal: request.signal
+    });
     logProviderPayload("openai", "response payload", response, request.debug);
     const choice = response.choices?.[0];
     const message = choice?.message;
@@ -1188,6 +1014,383 @@ function createOpenAIAdapter(config) {
   return new OpenAIAdapter(config);
 }
 
+// src/providers/openai/provider.ts
+var OPENAI_MODELS = {
+  // GPT-4o series
+  "gpt-4o": { vision: true, tools: true, jsonMode: true, maxTokens: 128e3 },
+  "gpt-5.2": {
+    vision: true,
+    tools: true,
+    jsonMode: true,
+    maxTokens: 128e3
+  },
+  "gpt-4o-2024-11-20": {
+    vision: true,
+    tools: true,
+    jsonMode: true,
+    maxTokens: 128e3
+  },
+  "gpt-4o-2024-08-06": {
+    vision: true,
+    tools: true,
+    jsonMode: true,
+    maxTokens: 128e3
+  },
+  // GPT-4 Turbo
+  "gpt-4-turbo": {
+    vision: true,
+    tools: true,
+    jsonMode: true,
+    maxTokens: 128e3
+  },
+  "gpt-4-turbo-preview": {
+    vision: false,
+    tools: true,
+    jsonMode: true,
+    maxTokens: 128e3
+  },
+  // GPT-4
+  "gpt-4": { vision: false, tools: true, jsonMode: false, maxTokens: 8192 },
+  "gpt-4-32k": {
+    vision: false,
+    tools: true,
+    jsonMode: false,
+    maxTokens: 32768
+  },
+  // GPT-3.5
+  "gpt-3.5-turbo": {
+    vision: false,
+    tools: true,
+    jsonMode: true,
+    maxTokens: 16385
+  },
+  // O1 series (reasoning)
+  o1: { vision: true, tools: false, jsonMode: false, maxTokens: 128e3 },
+  "o1-mini": { vision: true, tools: false, jsonMode: false, maxTokens: 128e3 },
+  "o1-preview": {
+    vision: true,
+    tools: false,
+    jsonMode: false,
+    maxTokens: 128e3
+  },
+  // O3 series
+  "o3-mini": { vision: true, tools: false, jsonMode: false, maxTokens: 128e3 }
+};
+function openai(modelId, options = {}) {
+  const apiKey = options.apiKey ?? process.env.OPENAI_API_KEY;
+  const baseURL = options.baseURL ?? "https://api.openai.com/v1";
+  let client = null;
+  async function getClient() {
+    if (!client) {
+      const { default: OpenAI } = await import('openai');
+      client = new OpenAI({
+        apiKey,
+        baseURL,
+        organization: options.organization,
+        defaultHeaders: options.headers
+      });
+    }
+    return client;
+  }
+  function parameterOptions(params) {
+    return {
+      ...options,
+      reasoningEffort: params.reasoningEffort ?? options.reasoningEffort
+    };
+  }
+  function useResponses(params) {
+    return !!params.tools?.length && requiresOpenAIResponses(modelId, baseURL, parameterOptions(params));
+  }
+  const responsesAdapter = new OpenAIAdapter({
+    ...options,
+    apiKey: apiKey ?? "",
+    model: modelId,
+    baseUrl: baseURL
+  });
+  function responsesRequest(params) {
+    return {
+      messages: [],
+      rawMessages: formatMessagesForOpenAI2(params.messages),
+      toolDefinitions: params.tools?.map((raw) => {
+        const tool = raw;
+        if (tool.type !== "function")
+          throw new Error(
+            "Only function tools are supported by this OpenAI generation path"
+          );
+        return {
+          name: tool.function.name,
+          description: tool.function.description ?? "",
+          location: "server",
+          inputSchema: tool.function.parameters
+        };
+      }),
+      config: {
+        temperature: params.temperature,
+        maxTokens: params.maxTokens,
+        responseFormat: params.responseFormat,
+        reasoningEffort: parameterOptions(params).reasoningEffort
+      },
+      signal: params.signal
+    };
+  }
+  const modelConfig = OPENAI_MODELS[modelId] ?? OPENAI_MODELS["gpt-4o"];
+  return {
+    provider: "openai",
+    modelId,
+    capabilities: {
+      supportsVision: modelConfig.vision,
+      supportsTools: modelConfig.tools,
+      supportsStreaming: true,
+      supportsJsonMode: modelConfig.jsonMode,
+      supportsThinking: false,
+      supportsPDF: false,
+      maxTokens: modelConfig.maxTokens,
+      supportedImageTypes: modelConfig.vision ? ["image/png", "image/jpeg", "image/gif", "image/webp"] : []
+    },
+    async doGenerate(params) {
+      throwIfAborted(params.signal);
+      if (useResponses(params)) {
+        const result = await responsesAdapter.complete(
+          responsesRequest(params)
+        );
+        return {
+          text: result.content,
+          toolCalls: result.toolCalls,
+          finishReason: result.toolCalls.length ? "tool-calls" : "stop",
+          usage: result.usage ?? {
+            promptTokens: 0,
+            completionTokens: 0,
+            totalTokens: 0
+          },
+          rawResponse: result.rawResponse
+        };
+      }
+      const client2 = await getClient();
+      const messages = formatMessagesForOpenAI2(params.messages);
+      const response = await client2.chat.completions.create(
+        {
+          model: modelId,
+          messages,
+          tools: params.tools,
+          ...buildOpenAIParameters(
+            modelId,
+            params.maxTokens,
+            params.temperature,
+            parameterOptions(params)
+          ),
+          response_format: toOpenAIResponseFormat(params.responseFormat)
+        },
+        { signal: params.signal }
+      );
+      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 {
+        text: message.content ?? "",
+        toolCalls,
+        finishReason: mapFinishReason(choice.finish_reason),
+        usage: {
+          promptTokens: response.usage?.prompt_tokens ?? 0,
+          completionTokens: response.usage?.completion_tokens ?? 0,
+          totalTokens: response.usage?.total_tokens ?? 0
+        },
+        rawResponse: response
+      };
+    },
+    async *doStream(params) {
+      throwIfAborted(params.signal);
+      if (useResponses(params)) {
+        const calls2 = /* @__PURE__ */ new Map();
+        let hasTools = false;
+        for await (const event of responsesAdapter.stream(
+          responsesRequest(params)
+        )) {
+          switch (event.type) {
+            case "message:delta":
+              yield { type: "text-delta", text: event.content };
+              break;
+            case "action:start":
+              calls2.set(event.id, { name: event.name, args: "" });
+              break;
+            case "action:args": {
+              const call = calls2.get(event.id);
+              if (call) call.args += event.args;
+              break;
+            }
+            case "action:end": {
+              const call = calls2.get(event.id);
+              if (!call)
+                throw new Error("Responses tool call has no matching start");
+              hasTools = true;
+              yield {
+                type: "tool-call",
+                toolCall: {
+                  id: event.id,
+                  name: call.name,
+                  args: JSON.parse(call.args || "{}")
+                }
+              };
+              calls2.delete(event.id);
+              break;
+            }
+            case "error":
+              throw errorFromEvent(event);
+            case "done":
+              yield {
+                type: "finish",
+                finishReason: hasTools ? "tool-calls" : "stop",
+                usage: {
+                  promptTokens: event.usage?.prompt_tokens ?? 0,
+                  completionTokens: event.usage?.completion_tokens ?? 0,
+                  totalTokens: event.usage?.total_tokens ?? 0
+                }
+              };
+              break;
+          }
+        }
+        return;
+      }
+      const client2 = await getClient();
+      const messages = formatMessagesForOpenAI2(params.messages);
+      const stream = await client2.chat.completions.create(
+        {
+          model: modelId,
+          messages,
+          tools: params.tools,
+          ...buildOpenAIParameters(
+            modelId,
+            params.maxTokens,
+            params.temperature,
+            parameterOptions(params)
+          ),
+          response_format: toOpenAIResponseFormat(params.responseFormat),
+          stream: true,
+          stream_options: { include_usage: true }
+        },
+        { signal: params.signal }
+      );
+      const toolCalls = /* @__PURE__ */ new Map();
+      let usage = { promptTokens: 0, completionTokens: 0, totalTokens: 0 };
+      let finishReason;
+      for await (const chunk of stream) {
+        throwIfAborted(params.signal);
+        if (chunk.usage) {
+          usage = {
+            promptTokens: chunk.usage.prompt_tokens ?? 0,
+            completionTokens: chunk.usage.completion_tokens ?? 0,
+            totalTokens: chunk.usage.total_tokens ?? (chunk.usage.prompt_tokens ?? 0) + (chunk.usage.completion_tokens ?? 0)
+          };
+        }
+        const choice = chunk.choices?.[0];
+        if (choice?.delta?.content)
+          yield { type: "text-delta", text: choice.delta.content };
+        for (const part of choice?.delta?.tool_calls ?? []) {
+          const index = part.index ?? 0;
+          const call = toolCalls.get(index) ?? {
+            id: "",
+            name: "",
+            arguments: ""
+          };
+          if (part.id) call.id = part.id;
+          if (part.function?.name) call.name += part.function.name;
+          if (part.function?.arguments)
+            call.arguments += part.function.arguments;
+          toolCalls.set(index, call);
+        }
+        if (choice?.finish_reason)
+          finishReason = mapFinishReason(choice.finish_reason);
+      }
+      throwIfAborted(params.signal);
+      if (!finishReason)
+        throw new Error("OpenAI stream ended without a finish reason");
+      const calls = [...toolCalls.values()].map((call) => {
+        if (!call.id || !call.name)
+          throw new Error("OpenAI stream contains an incomplete tool call");
+        return {
+          id: call.id,
+          name: call.name,
+          args: JSON.parse(call.arguments || "{}")
+        };
+      });
+      if (calls.length && finishReason !== "tool-calls")
+        throw new Error("OpenAI stream ended with incomplete tool calls");
+      for (const toolCall of calls) yield { type: "tool-call", toolCall };
+      yield { type: "finish", finishReason, usage };
+    }
+  };
+}
+function mapFinishReason(reason) {
+  switch (reason) {
+    case "stop":
+      return "stop";
+    case "length":
+      return "length";
+    case "tool_calls":
+    case "function_call":
+      return "tool-calls";
+    case "content_filter":
+      return "content-filter";
+    default:
+      return "unknown";
+  }
+}
+function formatMessagesForOpenAI2(messages) {
+  return messages.map((msg) => {
+    switch (msg.role) {
+      case "system":
+        return { role: "system", content: msg.content };
+      case "user":
+        if (typeof msg.content === "string") {
+          return { role: "user", content: msg.content };
+        }
+        return {
+          role: "user",
+          content: msg.content.map((part) => {
+            if (part.type === "text") {
+              return { type: "text", text: part.text };
+            }
+            if (part.type === "image") {
+              const imageData = typeof part.image === "string" ? part.image : Buffer.from(part.image).toString("base64");
+              const url = imageData.startsWith("data:") ? imageData : `data:${part.mimeType ?? "image/png"};base64,${imageData}`;
+              return { type: "image_url", image_url: { url, detail: "auto" } };
+            }
+            return { type: "text", text: "" };
+          })
+        };
+      case "assistant":
+        const assistantMsg = {
+          role: "assistant",
+          content: msg.content
+        };
+        if (msg.toolCalls && msg.toolCalls.length > 0) {
+          assistantMsg.tool_calls = msg.toolCalls.map((tc) => ({
+            id: tc.id,
+            type: "function",
+            function: {
+              name: tc.name,
+              arguments: JSON.stringify(tc.args)
+            }
+          }));
+        }
+        return assistantMsg;
+      case "tool":
+        return {
+          role: "tool",
+          tool_call_id: msg.toolCallId,
+          content: msg.content
+        };
+      default:
+        return msg;
+    }
+  });
+}
+
 // src/providers/types.ts
 function createCallableProvider(providerFn, properties) {
   Object.defineProperty(providerFn, "name", {
@@ -1318,7 +1521,10 @@ function createOpenAI(config = {}) {
     return createOpenAIAdapter({
       apiKey,
       model: modelId,
-      baseUrl: config.baseUrl
+      baseUrl: config.baseUrl,
+      reasoningEffort: config.reasoningEffort,
+      parameterPolicy: config.parameterPolicy,
+      onWarning: config.onWarning
     });
   };
   const getCapabilities = (modelId) => {