@ai-sdk/xai 3.0.0-beta.51 → 3.0.0-beta.53

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @ai-sdk/xai
 
+## 3.0.0-beta.53
+
+### Patch Changes
+
+- 3bd2689: feat: extended token usage
+- Updated dependencies [3bd2689]
+  - @ai-sdk/openai-compatible@2.0.0-beta.46
+  - @ai-sdk/provider@3.0.0-beta.26
+  - @ai-sdk/provider-utils@4.0.0-beta.45
+
+## 3.0.0-beta.52
+
+### Patch Changes
+
+- Updated dependencies [53f3368]
+  - @ai-sdk/provider@3.0.0-beta.25
+  - @ai-sdk/openai-compatible@2.0.0-beta.45
+  - @ai-sdk/provider-utils@4.0.0-beta.44
+
 ## 3.0.0-beta.51
 
 ### Patch Changes

package/dist/index.js

@@ -335,6 +335,27 @@ function prepareTools({
   }
 }
 
+// src/convert-xai-chat-usage.ts
+function convertXaiChatUsage(usage) {
+  var _a, _b, _c, _d;
+  const cacheReadTokens = (_b = (_a = usage.prompt_tokens_details) == null ? void 0 : _a.cached_tokens) != null ? _b : 0;
+  const reasoningTokens = (_d = (_c = usage.completion_tokens_details) == null ? void 0 : _c.reasoning_tokens) != null ? _d : 0;
+  return {
+    inputTokens: {
+      total: usage.prompt_tokens,
+      noCache: usage.prompt_tokens - cacheReadTokens,
+      cacheRead: cacheReadTokens,
+      cacheWrite: void 0
+    },
+    outputTokens: {
+      total: usage.completion_tokens,
+      text: usage.completion_tokens - reasoningTokens,
+      reasoning: reasoningTokens
+    },
+    raw: usage
+  };
+}
+
 // src/xai-chat-language-model.ts
 var XaiChatLanguageModel = class {
   constructor(modelId, config) {
@@ -459,7 +480,7 @@ var XaiChatLanguageModel = class {
     };
   }
   async doGenerate(options) {
-    var _a, _b, _c, _d, _e;
+    var _a;
     const { args: body, warnings } = await this.getArgs(options);
     const {
       responseHeaders,
@@ -517,13 +538,7 @@ var XaiChatLanguageModel = class {
     return {
       content,
       finishReason: mapXaiFinishReason(choice.finish_reason),
-      usage: {
-        inputTokens: response.usage.prompt_tokens,
-        outputTokens: response.usage.completion_tokens,
-        totalTokens: response.usage.total_tokens,
-        reasoningTokens: (_c = (_b = response.usage.completion_tokens_details) == null ? void 0 : _b.reasoning_tokens) != null ? _c : void 0,
-        cachedInputTokens: (_e = (_d = response.usage.prompt_tokens_details) == null ? void 0 : _d.cached_tokens) != null ? _e : void 0
-      },
+      usage: convertXaiChatUsage(response.usage),
       request: { body },
       response: {
         ...getResponseMetadata(response),
@@ -553,13 +568,7 @@ var XaiChatLanguageModel = class {
       fetch: this.config.fetch
     });
     let finishReason = "unknown";
-    const usage = {
-      inputTokens: void 0,
-      outputTokens: void 0,
-      totalTokens: void 0,
-      reasoningTokens: void 0,
-      cachedInputTokens: void 0
-    };
+    let usage = void 0;
     let isFirstChunk = true;
     const contentBlocks = {};
     const lastReasoningDeltas = {};
@@ -571,7 +580,6 @@ var XaiChatLanguageModel = class {
             controller.enqueue({ type: "stream-start", warnings });
           },
           transform(chunk, controller) {
-            var _a2, _b, _c, _d;
             if (options.includeRawChunks) {
               controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
             }
@@ -598,11 +606,7 @@ var XaiChatLanguageModel = class {
               }
             }
             if (value.usage != null) {
-              usage.inputTokens = value.usage.prompt_tokens;
-              usage.outputTokens = value.usage.completion_tokens;
-              usage.totalTokens = value.usage.total_tokens;
-              usage.reasoningTokens = (_b = (_a2 = value.usage.completion_tokens_details) == null ? void 0 : _a2.reasoning_tokens) != null ? _b : void 0;
-              usage.cachedInputTokens = (_d = (_c = value.usage.prompt_tokens_details) == null ? void 0 : _c.cached_tokens) != null ? _d : void 0;
+              usage = convertXaiChatUsage(value.usage);
             }
             const choice = value.choices[0];
             if ((choice == null ? void 0 : choice.finish_reason) != null) {
@@ -772,6 +776,189 @@ var xaiChatChunkSchema = import_v43.z.object({
 // src/responses/xai-responses-language-model.ts
 var import_provider_utils7 = require("@ai-sdk/provider-utils");
 
+// src/responses/convert-to-xai-responses-input.ts
+async function convertToXaiResponsesInput({
+  prompt
+}) {
+  var _a, _b, _c, _d, _e;
+  const input = [];
+  const inputWarnings = [];
+  for (const message of prompt) {
+    switch (message.role) {
+      case "system": {
+        input.push({
+          role: "system",
+          content: message.content
+        });
+        break;
+      }
+      case "user": {
+        let userContent = "";
+        for (const block of message.content) {
+          switch (block.type) {
+            case "text": {
+              userContent += block.text;
+              break;
+            }
+            case "file": {
+              inputWarnings.push({
+                type: "other",
+                message: `xAI Responses API does not support ${block.type} in user messages`
+              });
+              break;
+            }
+            default: {
+              const _exhaustiveCheck = block;
+              inputWarnings.push({
+                type: "other",
+                message: "xAI Responses API does not support this content type in user messages"
+              });
+            }
+          }
+        }
+        input.push({
+          role: "user",
+          content: userContent
+        });
+        break;
+      }
+      case "assistant": {
+        for (const part of message.content) {
+          switch (part.type) {
+            case "text": {
+              const id = typeof ((_b = (_a = part.providerOptions) == null ? void 0 : _a.xai) == null ? void 0 : _b.itemId) === "string" ? part.providerOptions.xai.itemId : void 0;
+              input.push({
+                role: "assistant",
+                content: part.text,
+                id
+              });
+              break;
+            }
+            case "tool-call": {
+              if (part.providerExecuted) {
+                break;
+              }
+              const id = typeof ((_d = (_c = part.providerOptions) == null ? void 0 : _c.xai) == null ? void 0 : _d.itemId) === "string" ? part.providerOptions.xai.itemId : void 0;
+              input.push({
+                type: "function_call",
+                id: id != null ? id : part.toolCallId,
+                call_id: part.toolCallId,
+                name: part.toolName,
+                arguments: JSON.stringify(part.input),
+                status: "completed"
+              });
+              break;
+            }
+            case "tool-result": {
+              break;
+            }
+            case "reasoning":
+            case "file": {
+              inputWarnings.push({
+                type: "other",
+                message: `xAI Responses API does not support ${part.type} in assistant messages`
+              });
+              break;
+            }
+            default: {
+              const _exhaustiveCheck = part;
+              inputWarnings.push({
+                type: "other",
+                message: "xAI Responses API does not support this content type in assistant messages"
+              });
+            }
+          }
+        }
+        break;
+      }
+      case "tool": {
+        for (const part of message.content) {
+          const output = part.output;
+          let outputValue;
+          switch (output.type) {
+            case "text":
+            case "error-text":
+              outputValue = output.value;
+              break;
+            case "execution-denied":
+              outputValue = (_e = output.reason) != null ? _e : "tool execution denied";
+              break;
+            case "json":
+            case "error-json":
+              outputValue = JSON.stringify(output.value);
+              break;
+            case "content":
+              outputValue = output.value.map((item) => {
+                if (item.type === "text") {
+                  return item.text;
+                }
+                return "";
+              }).join("");
+              break;
+            default: {
+              const _exhaustiveCheck = output;
+              outputValue = "";
+            }
+          }
+          input.push({
+            type: "function_call_output",
+            call_id: part.toolCallId,
+            output: outputValue
+          });
+        }
+        break;
+      }
+      default: {
+        const _exhaustiveCheck = message;
+        inputWarnings.push({
+          type: "other",
+          message: "unsupported message role"
+        });
+      }
+    }
+  }
+  return { input, inputWarnings };
+}
+
+// src/responses/convert-xai-responses-usage.ts
+function convertXaiResponsesUsage(usage) {
+  var _a, _b, _c, _d;
+  const cacheReadTokens = (_b = (_a = usage.input_tokens_details) == null ? void 0 : _a.cached_tokens) != null ? _b : 0;
+  const reasoningTokens = (_d = (_c = usage.output_tokens_details) == null ? void 0 : _c.reasoning_tokens) != null ? _d : 0;
+  return {
+    inputTokens: {
+      total: usage.input_tokens,
+      noCache: usage.input_tokens - cacheReadTokens,
+      cacheRead: cacheReadTokens,
+      cacheWrite: void 0
+    },
+    outputTokens: {
+      total: usage.output_tokens,
+      text: usage.output_tokens - reasoningTokens,
+      reasoning: reasoningTokens
+    },
+    raw: usage
+  };
+}
+
+// src/responses/map-xai-responses-finish-reason.ts
+function mapXaiResponsesFinishReason(finishReason) {
+  switch (finishReason) {
+    case "stop":
+    case "completed":
+      return "stop";
+    case "length":
+      return "length";
+    case "tool_calls":
+    case "function_call":
+      return "tool-calls";
+    case "content_filter":
+      return "content-filter";
+    default:
+      return "unknown";
+  }
+}
+
 // src/responses/xai-responses-api.ts
 var import_v44 = require("zod/v4");
 var annotationSchema = import_v44.z.union([
@@ -1031,24 +1218,6 @@ var xaiResponsesChunkSchema = import_v44.z.union([
   })
 ]);
 
-// src/responses/map-xai-responses-finish-reason.ts
-function mapXaiResponsesFinishReason(finishReason) {
-  switch (finishReason) {
-    case "stop":
-    case "completed":
-      return "stop";
-    case "length":
-      return "length";
-    case "tool_calls":
-    case "function_call":
-      return "tool-calls";
-    case "content_filter":
-      return "content-filter";
-    default:
-      return "unknown";
-  }
-}
-
 // src/responses/xai-responses-options.ts
 var import_v45 = require("zod/v4");
 var xaiResponsesProviderOptions = import_v45.z.object({
@@ -1068,150 +1237,6 @@ var xaiResponsesProviderOptions = import_v45.z.object({
   previousResponseId: import_v45.z.string().optional()
 });
 
-// src/responses/convert-to-xai-responses-input.ts
-async function convertToXaiResponsesInput({
-  prompt
-}) {
-  var _a, _b, _c, _d, _e;
-  const input = [];
-  const inputWarnings = [];
-  for (const message of prompt) {
-    switch (message.role) {
-      case "system": {
-        input.push({
-          role: "system",
-          content: message.content
-        });
-        break;
-      }
-      case "user": {
-        let userContent = "";
-        for (const block of message.content) {
-          switch (block.type) {
-            case "text": {
-              userContent += block.text;
-              break;
-            }
-            case "file": {
-              inputWarnings.push({
-                type: "other",
-                message: `xAI Responses API does not support ${block.type} in user messages`
-              });
-              break;
-            }
-            default: {
-              const _exhaustiveCheck = block;
-              inputWarnings.push({
-                type: "other",
-                message: "xAI Responses API does not support this content type in user messages"
-              });
-            }
-          }
-        }
-        input.push({
-          role: "user",
-          content: userContent
-        });
-        break;
-      }
-      case "assistant": {
-        for (const part of message.content) {
-          switch (part.type) {
-            case "text": {
-              const id = typeof ((_b = (_a = part.providerOptions) == null ? void 0 : _a.xai) == null ? void 0 : _b.itemId) === "string" ? part.providerOptions.xai.itemId : void 0;
-              input.push({
-                role: "assistant",
-                content: part.text,
-                id
-              });
-              break;
-            }
-            case "tool-call": {
-              if (part.providerExecuted) {
-                break;
-              }
-              const id = typeof ((_d = (_c = part.providerOptions) == null ? void 0 : _c.xai) == null ? void 0 : _d.itemId) === "string" ? part.providerOptions.xai.itemId : void 0;
-              input.push({
-                type: "function_call",
-                id: id != null ? id : part.toolCallId,
-                call_id: part.toolCallId,
-                name: part.toolName,
-                arguments: JSON.stringify(part.input),
-                status: "completed"
-              });
-              break;
-            }
-            case "tool-result": {
-              break;
-            }
-            case "reasoning":
-            case "file": {
-              inputWarnings.push({
-                type: "other",
-                message: `xAI Responses API does not support ${part.type} in assistant messages`
-              });
-              break;
-            }
-            default: {
-              const _exhaustiveCheck = part;
-              inputWarnings.push({
-                type: "other",
-                message: "xAI Responses API does not support this content type in assistant messages"
-              });
-            }
-          }
-        }
-        break;
-      }
-      case "tool": {
-        for (const part of message.content) {
-          const output = part.output;
-          let outputValue;
-          switch (output.type) {
-            case "text":
-            case "error-text":
-              outputValue = output.value;
-              break;
-            case "execution-denied":
-              outputValue = (_e = output.reason) != null ? _e : "tool execution denied";
-              break;
-            case "json":
-            case "error-json":
-              outputValue = JSON.stringify(output.value);
-              break;
-            case "content":
-              outputValue = output.value.map((item) => {
-                if (item.type === "text") {
-                  return item.text;
-                }
-                return "";
-              }).join("");
-              break;
-            default: {
-              const _exhaustiveCheck = output;
-              outputValue = "";
-            }
-          }
-          input.push({
-            type: "function_call_output",
-            call_id: part.toolCallId,
-            output: outputValue
-          });
-        }
-        break;
-      }
-      default: {
-        const _exhaustiveCheck = message;
-        inputWarnings.push({
-          type: "other",
-          message: "unsupported message role"
-        });
-      }
-    }
-  }
-  return { input, inputWarnings };
-}
-
 // src/responses/xai-responses-prepare-tools.ts
 var import_provider3 = require("@ai-sdk/provider");
 var import_provider_utils6 = require("@ai-sdk/provider-utils");
@@ -1556,7 +1581,7 @@ var XaiResponsesLanguageModel = class {
     };
   }
   async doGenerate(options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g;
     const {
       args: body,
       warnings,
@@ -1653,12 +1678,7 @@ var XaiResponsesLanguageModel = class {
     return {
       content,
       finishReason: mapXaiResponsesFinishReason(response.status),
-      usage: {
-        inputTokens: response.usage.input_tokens,
-        outputTokens: response.usage.output_tokens,
-        totalTokens: response.usage.total_tokens,
-        reasoningTokens: (_h = response.usage.output_tokens_details) == null ? void 0 : _h.reasoning_tokens
-      },
+      usage: convertXaiResponsesUsage(response.usage),
       request: { body },
       response: {
         ...getResponseMetadata(response),
@@ -1693,11 +1713,7 @@ var XaiResponsesLanguageModel = class {
       fetch: this.config.fetch
     });
     let finishReason = "unknown";
-    const usage = {
-      inputTokens: void 0,
-      outputTokens: void 0,
-      totalTokens: void 0
-    };
+    let usage = void 0;
     let isFirstChunk = true;
     const contentBlocks = {};
     const seenToolCalls = /* @__PURE__ */ new Set();
@@ -1709,7 +1725,7 @@ var XaiResponsesLanguageModel = class {
             controller.enqueue({ type: "stream-start", warnings });
           },
           transform(chunk, controller) {
-            var _a2, _b, _c, _d, _e, _f, _g, _h, _i;
+            var _a2, _b, _c, _d, _e, _f, _g, _h;
             if (options.includeRawChunks) {
               controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
             }
@@ -1799,10 +1815,7 @@ var XaiResponsesLanguageModel = class {
             if (event.type === "response.done" || event.type === "response.completed") {
               const response2 = event.response;
               if (response2.usage) {
-                usage.inputTokens = response2.usage.input_tokens;
-                usage.outputTokens = response2.usage.output_tokens;
-                usage.totalTokens = response2.usage.total_tokens;
-                usage.reasoningTokens = (_c = response2.usage.output_tokens_details) == null ? void 0 : _c.reasoning_tokens;
+                usage = convertXaiResponsesUsage(response2.usage);
               }
               if (response2.status) {
                 finishReason = mapXaiResponsesFinishReason(response2.status);
@@ -1825,15 +1838,15 @@ var XaiResponsesLanguageModel = class {
                     "x_semantic_search",
                     "x_thread_fetch"
                   ];
-                  let toolName = (_d = part.name) != null ? _d : "";
-                  if (webSearchSubTools.includes((_e = part.name) != null ? _e : "")) {
+                  let toolName = (_c = part.name) != null ? _c : "";
+                  if (webSearchSubTools.includes((_d = part.name) != null ? _d : "")) {
                     toolName = webSearchToolName != null ? webSearchToolName : "web_search";
-                  } else if (xSearchSubTools.includes((_f = part.name) != null ? _f : "")) {
+                  } else if (xSearchSubTools.includes((_e = part.name) != null ? _e : "")) {
                     toolName = xSearchToolName != null ? xSearchToolName : "x_search";
                   } else if (part.name === "code_execution") {
                     toolName = codeExecutionToolName != null ? codeExecutionToolName : "code_execution";
                   }
-                  const toolInput = part.type === "custom_tool_call" ? (_g = part.input) != null ? _g : "" : (_h = part.arguments) != null ? _h : "";
+                  const toolInput = part.type === "custom_tool_call" ? (_f = part.input) != null ? _f : "" : (_g = part.arguments) != null ? _g : "";
                   controller.enqueue({
                     type: "tool-input-start",
                     id: part.id,
@@ -1883,7 +1896,7 @@ var XaiResponsesLanguageModel = class {
                           sourceType: "url",
                           id: self.config.generateId(),
                           url: annotation.url,
-                          title: (_i = annotation.title) != null ? _i : annotation.url
+                          title: (_h = annotation.title) != null ? _h : annotation.url
                         });
                       }
                     }
@@ -1988,7 +2001,7 @@ var xaiTools = {
 };
 
 // src/version.ts
-var VERSION = true ? "3.0.0-beta.51" : "0.0.0-test";
+var VERSION = true ? "3.0.0-beta.53" : "0.0.0-test";
 
 // src/xai-provider.ts
 var xaiErrorStructure = {