@providerprotocol/ai 0.0.12 → 0.0.14

package/dist/openai/index.js

@@ -3,17 +3,17 @@ import {
   isAssistantMessage,
   isToolResultMessage,
   isUserMessage
-} from "../chunk-W4BB4BG2.js";
+} from "../chunk-SVYROCLD.js";
 import {
   parseSSEStream
-} from "../chunk-X5G4EHL7.js";
+} from "../chunk-Z7RBRCRN.js";
 import {
   UPPError,
   doFetch,
   doStreamFetch,
   normalizeHttpError,
   resolveApiKey
-} from "../chunk-SUNYWHTH.js";
+} from "../chunk-MOU4U3PO.js";
 
 // src/providers/openai/transform.completions.ts
 function transformRequest(request, modelId) {
@@ -48,12 +48,18 @@ function transformRequest(request, modelId) {
   }
   return openaiRequest;
 }
+function normalizeSystem(system) {
+  if (!system) return void 0;
+  if (typeof system === "string") return system;
+  return system.map((block) => block.text ?? "").filter((text) => text.length > 0).join("\n\n");
+}
 function transformMessages(messages, system) {
   const result = [];
-  if (system) {
+  const normalizedSystem = normalizeSystem(system);
+  if (normalizedSystem) {
     result.push({
       role: "system",
-      content: system
+      content: normalizedSystem
     });
   }
   for (const message of messages) {
@@ -154,7 +160,12 @@ function transformContentBlock(block) {
       throw new Error(`Unsupported content type: ${block.type}`);
   }
 }
+function extractToolOptions(tool) {
+  const openaiMeta = tool.metadata?.openai;
+  return { strict: openaiMeta?.strict };
+}
 function transformTool(tool) {
+  const { strict } = extractToolOptions(tool);
   return {
     type: "function",
     function: {
@@ -165,7 +176,8 @@ function transformTool(tool) {
         properties: tool.parameters.properties,
         required: tool.parameters.required,
         ...tool.parameters.additionalProperties !== void 0 ? { additionalProperties: tool.parameters.additionalProperties } : {}
-      }
+      },
+      ...strict !== void 0 ? { strict } : {}
     }
   };
 }
@@ -221,7 +233,9 @@ function transformResponse(data) {
   const usage = {
     inputTokens: data.usage.prompt_tokens,
     outputTokens: data.usage.completion_tokens,
-    totalTokens: data.usage.total_tokens
+    totalTokens: data.usage.total_tokens,
+    cacheReadTokens: data.usage.prompt_tokens_details?.cached_tokens ?? 0,
+    cacheWriteTokens: 0
   };
   let stopReason = "end_turn";
   switch (choice.finish_reason) {
@@ -257,6 +271,7 @@ function createStreamState() {
     finishReason: null,
     inputTokens: 0,
     outputTokens: 0,
+    cacheReadTokens: 0,
     hadRefusal: false
   };
 }
@@ -324,6 +339,7 @@ function transformStreamEvent(chunk, state) {
   if (chunk.usage) {
     state.inputTokens = chunk.usage.prompt_tokens;
     state.outputTokens = chunk.usage.completion_tokens;
+    state.cacheReadTokens = chunk.usage.prompt_tokens_details?.cached_tokens ?? 0;
   }
   return events;
 }
@@ -368,7 +384,9 @@ function buildResponseFromState(state) {
   const usage = {
     inputTokens: state.inputTokens,
     outputTokens: state.outputTokens,
-    totalTokens: state.inputTokens + state.outputTokens
+    totalTokens: state.inputTokens + state.outputTokens,
+    cacheReadTokens: state.cacheReadTokens,
+    cacheWriteTokens: 0
   };
   let stopReason = "end_turn";
   switch (state.finishReason) {
@@ -436,14 +454,22 @@ function createCompletionsLLMHandler() {
           );
           const baseUrl = request.config.baseUrl ?? OPENAI_API_URL;
           const body = transformRequest(request, modelId);
+          const headers = {
+            "Content-Type": "application/json",
+            Authorization: `Bearer ${apiKey}`
+          };
+          if (request.config.headers) {
+            for (const [key, value] of Object.entries(request.config.headers)) {
+              if (value !== void 0) {
+                headers[key] = value;
+              }
+            }
+          }
           const response = await doFetch(
             baseUrl,
             {
               method: "POST",
-              headers: {
-                "Content-Type": "application/json",
-                Authorization: `Bearer ${apiKey}`
-              },
+              headers,
               body: JSON.stringify(body),
               signal: request.signal
             },
@@ -474,14 +500,22 @@ function createCompletionsLLMHandler() {
               const body = transformRequest(request, modelId);
               body.stream = true;
               body.stream_options = { include_usage: true };
+              const headers = {
+                "Content-Type": "application/json",
+                Authorization: `Bearer ${apiKey}`
+              };
+              if (request.config.headers) {
+                for (const [key, value] of Object.entries(request.config.headers)) {
+                  if (value !== void 0) {
+                    headers[key] = value;
+                  }
+                }
+              }
               const response = await doStreamFetch(
                 baseUrl,
                 {
                   method: "POST",
-                  headers: {
-                    "Content-Type": "application/json",
-                    Authorization: `Bearer ${apiKey}`
-                  },
+                  headers,
                   body: JSON.stringify(body),
                   signal: request.signal
                 },
@@ -583,13 +617,19 @@ function transformRequest2(request, modelId) {
   }
   return openaiRequest;
 }
+function normalizeSystem2(system) {
+  if (!system) return void 0;
+  if (typeof system === "string") return system;
+  return system.map((block) => block.text ?? "").filter((text) => text.length > 0).join("\n\n");
+}
 function transformInputItems(messages, system) {
   const result = [];
-  if (system) {
+  const normalizedSystem = normalizeSystem2(system);
+  if (normalizedSystem) {
     result.push({
       type: "message",
       role: "system",
-      content: system
+      content: normalizedSystem
     });
   }
   for (const message of messages) {
@@ -708,7 +748,12 @@ function transformContentPart(block) {
       throw new Error(`Unsupported content type: ${block.type}`);
   }
 }
+function extractToolOptions2(tool) {
+  const openaiMeta = tool.metadata?.openai;
+  return { strict: openaiMeta?.strict };
+}
 function transformTool2(tool) {
+  const { strict } = extractToolOptions2(tool);
   return {
     type: "function",
     name: tool.name,
@@ -718,7 +763,8 @@ function transformTool2(tool) {
       properties: tool.parameters.properties,
       required: tool.parameters.required,
       ...tool.parameters.additionalProperties !== void 0 ? { additionalProperties: tool.parameters.additionalProperties } : {}
-    }
+    },
+    ...strict !== void 0 ? { strict } : {}
   };
 }
 function transformResponse2(data) {
@@ -791,7 +837,9 @@ function transformResponse2(data) {
   const usage = {
     inputTokens: data.usage.input_tokens,
     outputTokens: data.usage.output_tokens,
-    totalTokens: data.usage.total_tokens
+    totalTokens: data.usage.total_tokens,
+    cacheReadTokens: data.usage.input_tokens_details?.cached_tokens ?? 0,
+    cacheWriteTokens: 0
   };
   let stopReason = "end_turn";
   if (data.status === "completed") {
@@ -821,6 +869,7 @@ function createStreamState2() {
     status: "in_progress",
     inputTokens: 0,
     outputTokens: 0,
+    cacheReadTokens: 0,
     hadRefusal: false
   };
 }
@@ -840,6 +889,7 @@ function transformStreamEvent2(event, state) {
       if (event.response.usage) {
         state.inputTokens = event.response.usage.input_tokens;
         state.outputTokens = event.response.usage.output_tokens;
+        state.cacheReadTokens = event.response.usage.input_tokens_details?.cached_tokens ?? 0;
       }
       events.push({ type: "message_stop", index: 0, delta: {} });
       break;
@@ -892,7 +942,7 @@ function transformStreamEvent2(event, state) {
         delta: {}
       });
       break;
-    case "response.output_text.delta":
+    case "response.output_text.delta": {
       const currentText = state.textByIndex.get(event.output_index) ?? "";
       state.textByIndex.set(event.output_index, currentText + event.delta);
       events.push({
@@ -901,6 +951,7 @@ function transformStreamEvent2(event, state) {
         delta: { text: event.delta }
       });
       break;
+    }
     case "response.output_text.done":
       state.textByIndex.set(event.output_index, event.text);
       break;
@@ -1023,7 +1074,6 @@ function buildResponseFromState2(state) {
         openai: {
           model: state.model,
           status: state.status,
-          // Store response_id for multi-turn tool calling
           response_id: state.id,
           functionCallItems: functionCallItems.length > 0 ? functionCallItems : void 0
         }
@@ -1033,7 +1083,9 @@ function buildResponseFromState2(state) {
   const usage = {
     inputTokens: state.inputTokens,
     outputTokens: state.outputTokens,
-    totalTokens: state.inputTokens + state.outputTokens
+    totalTokens: state.inputTokens + state.outputTokens,
+    cacheReadTokens: state.cacheReadTokens,
+    cacheWriteTokens: 0
   };
   let stopReason = "end_turn";
   if (state.status === "completed") {
@@ -1092,14 +1144,22 @@ function createResponsesLLMHandler() {
           );
           const baseUrl = request.config.baseUrl ?? OPENAI_RESPONSES_API_URL;
           const body = transformRequest2(request, modelId);
+          const headers = {
+            "Content-Type": "application/json",
+            Authorization: `Bearer ${apiKey}`
+          };
+          if (request.config.headers) {
+            for (const [key, value] of Object.entries(request.config.headers)) {
+              if (value !== void 0) {
+                headers[key] = value;
+              }
+            }
+          }
           const response = await doFetch(
             baseUrl,
             {
               method: "POST",
-              headers: {
-                "Content-Type": "application/json",
-                Authorization: `Bearer ${apiKey}`
-              },
+              headers,
               body: JSON.stringify(body),
               signal: request.signal
             },
@@ -1137,14 +1197,22 @@ function createResponsesLLMHandler() {
               const baseUrl = request.config.baseUrl ?? OPENAI_RESPONSES_API_URL;
               const body = transformRequest2(request, modelId);
               body.stream = true;
+              const headers = {
+                "Content-Type": "application/json",
+                Authorization: `Bearer ${apiKey}`
+              };
+              if (request.config.headers) {
+                for (const [key, value] of Object.entries(request.config.headers)) {
+                  if (value !== void 0) {
+                    headers[key] = value;
+                  }
+                }
+              }
               const response = await doStreamFetch(
                 baseUrl,
                 {
                   method: "POST",
-                  headers: {
-                    "Content-Type": "application/json",
-                    Authorization: `Bearer ${apiKey}`
-                  },
+                  headers,
                   body: JSON.stringify(body),
                   signal: request.signal
                 },
@@ -1262,11 +1330,17 @@ function mcpTool(options) {
   };
 }
 var tools = {
+  /** Creates a web search tool configuration */
   webSearch: webSearchTool,
+  /** Creates a file search tool configuration */
   fileSearch: fileSearchTool,
+  /** Creates a code interpreter tool configuration */
   codeInterpreter: codeInterpreterTool,
+  /** Creates a computer tool configuration */
   computer: computerTool,
+  /** Creates an image generation tool configuration */
   imageGeneration: imageGenerationTool,
+  /** Creates an MCP tool configuration */
   mcp: mcpTool
 };