@providerprotocol/ai 0.0.12 → 0.0.14

package/dist/xai/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/xai/transform.completions.ts
 function transformRequest(request, modelId) {
@@ -48,12 +48,18 @@ function transformRequest(request, modelId) {
   }
   return xaiRequest;
 }
+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) {
@@ -92,7 +98,6 @@ function transformMessage(message) {
     const hasToolCalls = message.toolCalls && message.toolCalls.length > 0;
     const assistantMessage = {
       role: "assistant",
-      // xAI/OpenAI: content should be null when tool_calls are present and there's no text
       content: hasToolCalls && !textContent ? null : textContent
     };
     if (hasToolCalls) {
@@ -224,7 +229,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) {
@@ -260,6 +267,7 @@ function createStreamState() {
     finishReason: null,
     inputTokens: 0,
     outputTokens: 0,
+    cacheReadTokens: 0,
     hadRefusal: false
   };
 }
@@ -327,6 +335,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;
 }
@@ -371,7 +380,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) {
@@ -439,14 +450,22 @@ function createCompletionsLLMHandler() {
           );
           const baseUrl = request.config.baseUrl ?? XAI_COMPLETIONS_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
             },
@@ -477,14 +496,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
                 },
@@ -582,13 +609,19 @@ function transformRequest2(request, modelId) {
   }
   return xaiRequest;
 }
+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) {
@@ -769,7 +802,6 @@ function transformResponse2(data) {
         xai: {
           model: data.model,
           status: data.status,
-          // Store response_id for multi-turn tool calling
           response_id: data.id,
           functionCallItems: functionCallItems.length > 0 ? functionCallItems : void 0,
           citations: data.citations,
@@ -781,7 +813,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") {
@@ -810,6 +844,7 @@ function createStreamState2() {
     status: "in_progress",
     inputTokens: 0,
     outputTokens: 0,
+    cacheReadTokens: 0,
     hadRefusal: false
   };
 }
@@ -829,6 +864,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;
@@ -876,7 +912,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({
@@ -885,6 +921,7 @@ function transformStreamEvent2(event, state) {
         delta: { text: event.delta }
       });
       break;
+    }
     case "response.output_text.done":
       state.textByIndex.set(event.output_index, event.text);
       break;
@@ -1000,7 +1037,6 @@ function buildResponseFromState2(state) {
         xai: {
           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
         }
@@ -1010,7 +1046,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") {
@@ -1069,14 +1107,22 @@ function createResponsesLLMHandler() {
           );
           const baseUrl = request.config.baseUrl ?? XAI_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
             },
@@ -1114,14 +1160,22 @@ function createResponsesLLMHandler() {
               const baseUrl = request.config.baseUrl ?? XAI_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
                 },
@@ -1187,15 +1241,21 @@ function createResponsesLLMHandler() {
 }
 
 // src/providers/xai/transform.messages.ts
+function normalizeSystem3(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 transformRequest3(request, modelId) {
   const params = request.params ?? {};
+  const normalizedSystem = normalizeSystem3(request.system);
   const xaiRequest = {
     ...params,
     model: modelId,
     messages: request.messages.map(transformMessage3)
   };
-  if (request.system) {
-    xaiRequest.system = request.system;
+  if (normalizedSystem) {
+    xaiRequest.system = normalizedSystem;
   }
   if (request.tools && request.tools.length > 0) {
     xaiRequest.tools = request.tools.map(transformTool3);
@@ -1351,7 +1411,9 @@ function transformResponse3(data) {
   const usage = {
     inputTokens: data.usage.input_tokens,
     outputTokens: data.usage.output_tokens,
-    totalTokens: data.usage.input_tokens + data.usage.output_tokens
+    totalTokens: data.usage.input_tokens + data.usage.output_tokens,
+    cacheReadTokens: data.usage.cache_read_input_tokens ?? 0,
+    cacheWriteTokens: data.usage.cache_creation_input_tokens ?? 0
   };
   return {
     message,
@@ -1368,6 +1430,8 @@ function createStreamState3() {
     stopReason: null,
     inputTokens: 0,
     outputTokens: 0,
+    cacheReadTokens: 0,
+    cacheWriteTokens: 0,
     currentIndex: 0
   };
 }
@@ -1377,6 +1441,8 @@ function transformStreamEvent3(event, state) {
       state.messageId = event.message.id;
       state.model = event.message.model;
       state.inputTokens = event.message.usage.input_tokens;
+      state.cacheReadTokens = event.message.usage.cache_read_input_tokens ?? 0;
+      state.cacheWriteTokens = event.message.usage.cache_creation_input_tokens ?? 0;
       return { type: "message_start", index: 0, delta: {} };
     case "content_block_start":
       state.currentIndex = event.index;
@@ -1485,7 +1551,9 @@ function buildResponseFromState3(state) {
   const usage = {
     inputTokens: state.inputTokens,
     outputTokens: state.outputTokens,
-    totalTokens: state.inputTokens + state.outputTokens
+    totalTokens: state.inputTokens + state.outputTokens,
+    cacheReadTokens: state.cacheReadTokens,
+    cacheWriteTokens: state.cacheWriteTokens
   };
   return {
     message,
@@ -1535,15 +1603,23 @@ function createMessagesLLMHandler() {
           );
           const baseUrl = request.config.baseUrl ?? XAI_MESSAGES_API_URL;
           const body = transformRequest3(request, modelId);
+          const headers = {
+            "Content-Type": "application/json",
+            "x-api-key": apiKey,
+            "anthropic-version": "2023-06-01"
+          };
+          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",
-                "x-api-key": apiKey,
-                "anthropic-version": "2023-06-01"
-              },
+              headers,
               body: JSON.stringify(body),
               signal: request.signal
             },
@@ -1573,15 +1649,23 @@ function createMessagesLLMHandler() {
               const baseUrl = request.config.baseUrl ?? XAI_MESSAGES_API_URL;
               const body = transformRequest3(request, modelId);
               body.stream = true;
+              const headers = {
+                "Content-Type": "application/json",
+                "x-api-key": apiKey,
+                "anthropic-version": "2023-06-01"
+              };
+              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",
-                    "x-api-key": apiKey,
-                    "anthropic-version": "2023-06-01"
-                  },
+                  headers,
                   body: JSON.stringify(body),
                   signal: request.signal
                 },