@ai-sdk/moonshotai 0.0.1 → 0.0.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @ai-sdk/moonshotai
 
+## 0.0.3
+
+### Patch Changes
+
+- f46806c: fix (provider/moonshotai): report cached tokens when streaming correctly
+
+## 0.0.2
+
+### Patch Changes
+
+- 4e1117d: fix (provider/moonshotai): include usage when streaming
+
 ## 0.0.1
 
 ### Patch Changes

package/dist/index.js

@@ -68,10 +68,45 @@ var MoonshotAIChatLanguageModel = class extends import_openai_compatible.OpenAIC
       usage: convertMoonshotAIChatUsage(usage)
     };
   }
+  async doStream(options) {
+    const originalIncludeRawChunks = options.includeRawChunks;
+    const result = await super.doStream({
+      ...options,
+      includeRawChunks: true
+    });
+    let rawUsage = void 0;
+    return {
+      ...result,
+      stream: result.stream.pipeThrough(
+        new TransformStream({
+          transform(chunk, controller) {
+            if (chunk.type === "raw") {
+              const rawValue = chunk.rawValue;
+              if ((rawValue == null ? void 0 : rawValue.usage) != null) {
+                rawUsage = rawValue.usage;
+              }
+              if (originalIncludeRawChunks) {
+                controller.enqueue(chunk);
+              }
+              return;
+            }
+            if (chunk.type === "finish") {
+              controller.enqueue({
+                ...chunk,
+                usage: rawUsage ? convertMoonshotAIChatUsage(rawUsage) : chunk.usage
+              });
+              return;
+            }
+            controller.enqueue(chunk);
+          }
+        })
+      )
+    };
+  }
 };
 
 // src/version.ts
-var VERSION = "0.0.1";
+var VERSION = "0.0.3";
 
 // src/moonshotai-provider.ts
 var moonshotaiErrorSchema = import_v4.z.object({
@@ -108,6 +143,7 @@ function createMoonshotAI(options = {}) {
   const createChatModel = (modelId) => {
     return new MoonshotAIChatLanguageModel(modelId, {
       ...getCommonModelConfig("chat"),
+      includeUsage: true,
       errorStructure: moonshotaiErrorStructure
     });
   };

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts","../src/moonshotai-provider.ts","../src/moonshotai-chat-language-model.ts","../src/convert-moonshotai-chat-usage.ts","../src/version.ts"],"sourcesContent":["export { createMoonshotAI, moonshotai } from './moonshotai-provider';\nexport type {\n  MoonshotAIProvider,\n  MoonshotAIProviderSettings,\n} from './moonshotai-provider';\nexport type {\n  MoonshotAIChatModelId,\n  MoonshotAIProviderOptions,\n} from './moonshotai-chat-options';\n","import { ProviderErrorStructure } from '@ai-sdk/openai-compatible';\nimport {\n  LanguageModelV2,\n  NoSuchModelError,\n  ProviderV2,\n} from '@ai-sdk/provider';\nimport {\n  FetchFunction,\n  loadApiKey,\n  withoutTrailingSlash,\n  withUserAgentSuffix,\n} from '@ai-sdk/provider-utils';\nimport { z } from 'zod/v4';\nimport { MoonshotAIChatLanguageModel } from './moonshotai-chat-language-model';\nimport { MoonshotAIChatModelId } from './moonshotai-chat-options';\nimport { VERSION } from './version';\n\nexport type MoonshotAIErrorData = z.infer<typeof moonshotaiErrorSchema>;\n\nconst moonshotaiErrorSchema = z.object({\n  error: z.object({\n    message: z.string(),\n    type: z.string().nullish(),\n  }),\n});\n\nconst moonshotaiErrorStructure: ProviderErrorStructure<MoonshotAIErrorData> = {\n  errorSchema: moonshotaiErrorSchema,\n  errorToMessage: data => data.error.message,\n};\n\nexport interface MoonshotAIProviderSettings {\n  /**\n   * Moonshot API key. Default value is taken from the `MOONSHOT_API_KEY`\n   * environment variable.\n   */\n  apiKey?: string;\n  /**\n   * Base URL for the API calls.\n   */\n  baseURL?: string;\n  /**\n   * Custom headers to include in the requests.\n   */\n  headers?: Record<string, string>;\n  /**\n   * Custom fetch implementation. You can use it as a middleware to intercept requests,\n   * or to provide a custom fetch implementation for e.g. testing.\n   */\n  fetch?: FetchFunction;\n}\n\nexport interface MoonshotAIProvider extends ProviderV2 {\n  /**\n   * Creates a model for text generation.\n   */\n  (modelId: MoonshotAIChatModelId): LanguageModelV2;\n\n  /**\n   * Creates a chat model for text generation.\n   */\n  chatModel(modelId: MoonshotAIChatModelId): LanguageModelV2;\n\n  /**\n   * Creates a language model for text generation.\n   */\n  languageModel(modelId: MoonshotAIChatModelId): LanguageModelV2;\n}\n\nconst defaultBaseURL = 'https://api.moonshot.ai/v1';\n\nexport function createMoonshotAI(\n  options: MoonshotAIProviderSettings = {},\n): MoonshotAIProvider {\n  const baseURL = withoutTrailingSlash(options.baseURL ?? defaultBaseURL);\n  const getHeaders = () =>\n    withUserAgentSuffix(\n      {\n        Authorization: `Bearer ${loadApiKey({\n          apiKey: options.apiKey,\n          environmentVariableName: 'MOONSHOT_API_KEY',\n          description: 'Moonshot API key',\n        })}`,\n        ...options.headers,\n      },\n      `ai-sdk/moonshotai/${VERSION}`,\n    );\n\n  interface CommonModelConfig {\n    provider: string;\n    url: ({ path }: { path: string }) => string;\n    headers: () => Record<string, string>;\n    fetch?: FetchFunction;\n  }\n\n  const getCommonModelConfig = (modelType: string): CommonModelConfig => ({\n    provider: `moonshotai.${modelType}`,\n    url: ({ path }) => `${baseURL}${path}`,\n    headers: getHeaders,\n    fetch: options.fetch,\n  });\n\n  const createChatModel = (modelId: MoonshotAIChatModelId) => {\n    return new MoonshotAIChatLanguageModel(modelId, {\n      ...getCommonModelConfig('chat'),\n      errorStructure: moonshotaiErrorStructure,\n    });\n  };\n\n  const provider = (modelId: MoonshotAIChatModelId) => createChatModel(modelId);\n\n  provider.specificationVersion = 'v2' as const;\n  provider.chatModel = createChatModel;\n  provider.languageModel = createChatModel;\n\n  provider.textEmbeddingModel = (modelId: string) => {\n    throw new NoSuchModelError({ modelId, modelType: 'textEmbeddingModel' });\n  };\n\n  provider.imageModel = (modelId: string) => {\n    throw new NoSuchModelError({ modelId, modelType: 'imageModel' });\n  };\n\n  return provider;\n}\n\nexport const moonshotai = createMoonshotAI();\n","import { OpenAICompatibleChatLanguageModel } from '@ai-sdk/openai-compatible';\nimport { OpenAICompatibleChatConfig } from '@ai-sdk/openai-compatible/internal';\nimport { LanguageModelV2 } from '@ai-sdk/provider';\nimport { convertMoonshotAIChatUsage } from './convert-moonshotai-chat-usage';\nimport { MoonshotAIChatModelId } from './moonshotai-chat-options';\n\nexport class MoonshotAIChatLanguageModel extends OpenAICompatibleChatLanguageModel {\n  constructor(\n    modelId: MoonshotAIChatModelId,\n    config: OpenAICompatibleChatConfig,\n  ) {\n    super(modelId, config);\n  }\n\n  async doGenerate(\n    options: Parameters<LanguageModelV2['doGenerate']>[0],\n  ): Promise<Awaited<ReturnType<LanguageModelV2['doGenerate']>>> {\n    const result = await super.doGenerate(options);\n\n    // @ts-expect-error accessing response body from parent result\n    const usage = result.response?.body?.usage;\n\n    return {\n      ...result,\n      usage: convertMoonshotAIChatUsage(usage),\n    };\n  }\n}\n","import { LanguageModelV2Usage } from '@ai-sdk/provider';\n\nexport function convertMoonshotAIChatUsage(\n  usage:\n    | {\n        prompt_tokens?: number | null;\n        completion_tokens?: number | null;\n        total_tokens?: number | null;\n        cached_tokens?: number | null;\n        prompt_tokens_details?: {\n          cached_tokens?: number | null;\n        } | null;\n        completion_tokens_details?: {\n          reasoning_tokens?: number | null;\n        } | null;\n      }\n    | undefined\n    | null,\n): LanguageModelV2Usage {\n  if (usage == null) {\n    return {\n      inputTokens: undefined,\n      outputTokens: undefined,\n      totalTokens: undefined,\n    };\n  }\n\n  const cachedInputTokens =\n    usage.cached_tokens ??\n    usage.prompt_tokens_details?.cached_tokens ??\n    undefined;\n\n  const reasoningTokens =\n    usage.completion_tokens_details?.reasoning_tokens ?? undefined;\n\n  return {\n    inputTokens: usage.prompt_tokens ?? undefined,\n    outputTokens: usage.completion_tokens ?? undefined,\n    totalTokens: usage.total_tokens ?? undefined,\n    reasoningTokens,\n    cachedInputTokens,\n  };\n}\n","declare const __PACKAGE_VERSION__: string;\n\nexport const VERSION = __PACKAGE_VERSION__;\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACCA,sBAIO;AACP,4BAKO;AACP,gBAAkB;;;ACZlB,+BAAkD;;;ACE3C,SAAS,2BACd,OAesB;AAlBxB;AAmBE,MAAI,SAAS,MAAM;AACjB,WAAO;AAAA,MACL,aAAa;AAAA,MACb,cAAc;AAAA,MACd,aAAa;AAAA,IACf;AAAA,EACF;AAEA,QAAM,qBACJ,iBAAM,kBAAN,aACA,WAAM,0BAAN,mBAA6B,kBAD7B,YAEA;AAEF,QAAM,mBACJ,iBAAM,8BAAN,mBAAiC,qBAAjC,YAAqD;AAEvD,SAAO;AAAA,IACL,cAAa,WAAM,kBAAN,YAAuB;AAAA,IACpC,eAAc,WAAM,sBAAN,YAA2B;AAAA,IACzC,cAAa,WAAM,iBAAN,YAAsB;AAAA,IACnC;AAAA,IACA;AAAA,EACF;AACF;;;ADpCO,IAAM,8BAAN,cAA0C,2DAAkC;AAAA,EACjF,YACE,SACA,QACA;AACA,UAAM,SAAS,MAAM;AAAA,EACvB;AAAA,EAEA,MAAM,WACJ,SAC6D;AAhBjE;AAiBI,UAAM,SAAS,MAAM,MAAM,WAAW,OAAO;AAG7C,UAAM,SAAQ,kBAAO,aAAP,mBAAiB,SAAjB,mBAAuB;AAErC,WAAO;AAAA,MACL,GAAG;AAAA,MACH,OAAO,2BAA2B,KAAK;AAAA,IACzC;AAAA,EACF;AACF;;;AEzBO,IAAM,UAAU;;;AHiBvB,IAAM,wBAAwB,YAAE,OAAO;AAAA,EACrC,OAAO,YAAE,OAAO;AAAA,IACd,SAAS,YAAE,OAAO;AAAA,IAClB,MAAM,YAAE,OAAO,EAAE,QAAQ;AAAA,EAC3B,CAAC;AACH,CAAC;AAED,IAAM,2BAAwE;AAAA,EAC5E,aAAa;AAAA,EACb,gBAAgB,UAAQ,KAAK,MAAM;AACrC;AAwCA,IAAM,iBAAiB;AAEhB,SAAS,iBACd,UAAsC,CAAC,GACnB;AAzEtB;AA0EE,QAAM,cAAU,6CAAqB,aAAQ,YAAR,YAAmB,cAAc;AACtE,QAAM,aAAa,UACjB;AAAA,IACE;AAAA,MACE,eAAe,cAAU,kCAAW;AAAA,QAClC,QAAQ,QAAQ;AAAA,QAChB,yBAAyB;AAAA,QACzB,aAAa;AAAA,MACf,CAAC,CAAC;AAAA,MACF,GAAG,QAAQ;AAAA,IACb;AAAA,IACA,qBAAqB,OAAO;AAAA,EAC9B;AASF,QAAM,uBAAuB,CAAC,eAA0C;AAAA,IACtE,UAAU,cAAc,SAAS;AAAA,IACjC,KAAK,CAAC,EAAE,KAAK,MAAM,GAAG,OAAO,GAAG,IAAI;AAAA,IACpC,SAAS;AAAA,IACT,OAAO,QAAQ;AAAA,EACjB;AAEA,QAAM,kBAAkB,CAAC,YAAmC;AAC1D,WAAO,IAAI,4BAA4B,SAAS;AAAA,MAC9C,GAAG,qBAAqB,MAAM;AAAA,MAC9B,gBAAgB;AAAA,IAClB,CAAC;AAAA,EACH;AAEA,QAAM,WAAW,CAAC,YAAmC,gBAAgB,OAAO;AAE5E,WAAS,uBAAuB;AAChC,WAAS,YAAY;AACrB,WAAS,gBAAgB;AAEzB,WAAS,qBAAqB,CAAC,YAAoB;AACjD,UAAM,IAAI,iCAAiB,EAAE,SAAS,WAAW,qBAAqB,CAAC;AAAA,EACzE;AAEA,WAAS,aAAa,CAAC,YAAoB;AACzC,UAAM,IAAI,iCAAiB,EAAE,SAAS,WAAW,aAAa,CAAC;AAAA,EACjE;AAEA,SAAO;AACT;AAEO,IAAM,aAAa,iBAAiB;","names":[]}
+{"version":3,"sources":["../src/index.ts","../src/moonshotai-provider.ts","../src/moonshotai-chat-language-model.ts","../src/convert-moonshotai-chat-usage.ts","../src/version.ts"],"sourcesContent":["export { createMoonshotAI, moonshotai } from './moonshotai-provider';\nexport type {\n  MoonshotAIProvider,\n  MoonshotAIProviderSettings,\n} from './moonshotai-provider';\nexport type {\n  MoonshotAIChatModelId,\n  MoonshotAIProviderOptions,\n} from './moonshotai-chat-options';\n","import { ProviderErrorStructure } from '@ai-sdk/openai-compatible';\nimport {\n  LanguageModelV2,\n  NoSuchModelError,\n  ProviderV2,\n} from '@ai-sdk/provider';\nimport {\n  FetchFunction,\n  loadApiKey,\n  withoutTrailingSlash,\n  withUserAgentSuffix,\n} from '@ai-sdk/provider-utils';\nimport { z } from 'zod/v4';\nimport { MoonshotAIChatLanguageModel } from './moonshotai-chat-language-model';\nimport { MoonshotAIChatModelId } from './moonshotai-chat-options';\nimport { VERSION } from './version';\n\nexport type MoonshotAIErrorData = z.infer<typeof moonshotaiErrorSchema>;\n\nconst moonshotaiErrorSchema = z.object({\n  error: z.object({\n    message: z.string(),\n    type: z.string().nullish(),\n  }),\n});\n\nconst moonshotaiErrorStructure: ProviderErrorStructure<MoonshotAIErrorData> = {\n  errorSchema: moonshotaiErrorSchema,\n  errorToMessage: data => data.error.message,\n};\n\nexport interface MoonshotAIProviderSettings {\n  /**\n   * Moonshot API key. Default value is taken from the `MOONSHOT_API_KEY`\n   * environment variable.\n   */\n  apiKey?: string;\n  /**\n   * Base URL for the API calls.\n   */\n  baseURL?: string;\n  /**\n   * Custom headers to include in the requests.\n   */\n  headers?: Record<string, string>;\n  /**\n   * Custom fetch implementation. You can use it as a middleware to intercept requests,\n   * or to provide a custom fetch implementation for e.g. testing.\n   */\n  fetch?: FetchFunction;\n}\n\nexport interface MoonshotAIProvider extends ProviderV2 {\n  /**\n   * Creates a model for text generation.\n   */\n  (modelId: MoonshotAIChatModelId): LanguageModelV2;\n\n  /**\n   * Creates a chat model for text generation.\n   */\n  chatModel(modelId: MoonshotAIChatModelId): LanguageModelV2;\n\n  /**\n   * Creates a language model for text generation.\n   */\n  languageModel(modelId: MoonshotAIChatModelId): LanguageModelV2;\n}\n\nconst defaultBaseURL = 'https://api.moonshot.ai/v1';\n\nexport function createMoonshotAI(\n  options: MoonshotAIProviderSettings = {},\n): MoonshotAIProvider {\n  const baseURL = withoutTrailingSlash(options.baseURL ?? defaultBaseURL);\n  const getHeaders = () =>\n    withUserAgentSuffix(\n      {\n        Authorization: `Bearer ${loadApiKey({\n          apiKey: options.apiKey,\n          environmentVariableName: 'MOONSHOT_API_KEY',\n          description: 'Moonshot API key',\n        })}`,\n        ...options.headers,\n      },\n      `ai-sdk/moonshotai/${VERSION}`,\n    );\n\n  interface CommonModelConfig {\n    provider: string;\n    url: ({ path }: { path: string }) => string;\n    headers: () => Record<string, string>;\n    fetch?: FetchFunction;\n  }\n\n  const getCommonModelConfig = (modelType: string): CommonModelConfig => ({\n    provider: `moonshotai.${modelType}`,\n    url: ({ path }) => `${baseURL}${path}`,\n    headers: getHeaders,\n    fetch: options.fetch,\n  });\n\n  const createChatModel = (modelId: MoonshotAIChatModelId) => {\n    return new MoonshotAIChatLanguageModel(modelId, {\n      ...getCommonModelConfig('chat'),\n      includeUsage: true,\n      errorStructure: moonshotaiErrorStructure,\n    });\n  };\n\n  const provider = (modelId: MoonshotAIChatModelId) => createChatModel(modelId);\n\n  provider.specificationVersion = 'v2' as const;\n  provider.chatModel = createChatModel;\n  provider.languageModel = createChatModel;\n\n  provider.textEmbeddingModel = (modelId: string) => {\n    throw new NoSuchModelError({ modelId, modelType: 'textEmbeddingModel' });\n  };\n\n  provider.imageModel = (modelId: string) => {\n    throw new NoSuchModelError({ modelId, modelType: 'imageModel' });\n  };\n\n  return provider;\n}\n\nexport const moonshotai = createMoonshotAI();\n","import { OpenAICompatibleChatLanguageModel } from '@ai-sdk/openai-compatible';\nimport { OpenAICompatibleChatConfig } from '@ai-sdk/openai-compatible/internal';\nimport { LanguageModelV2, LanguageModelV2StreamPart } from '@ai-sdk/provider';\nimport { convertMoonshotAIChatUsage } from './convert-moonshotai-chat-usage';\nimport { MoonshotAIChatModelId } from './moonshotai-chat-options';\n\nexport class MoonshotAIChatLanguageModel extends OpenAICompatibleChatLanguageModel {\n  constructor(\n    modelId: MoonshotAIChatModelId,\n    config: OpenAICompatibleChatConfig,\n  ) {\n    super(modelId, config);\n  }\n\n  async doGenerate(\n    options: Parameters<LanguageModelV2['doGenerate']>[0],\n  ): Promise<Awaited<ReturnType<LanguageModelV2['doGenerate']>>> {\n    const result = await super.doGenerate(options);\n\n    // @ts-expect-error accessing response body from parent result\n    const usage = result.response?.body?.usage;\n\n    return {\n      ...result,\n      usage: convertMoonshotAIChatUsage(usage),\n    };\n  }\n\n  async doStream(\n    options: Parameters<LanguageModelV2['doStream']>[0],\n  ): Promise<Awaited<ReturnType<LanguageModelV2['doStream']>>> {\n    const originalIncludeRawChunks = options.includeRawChunks;\n\n    // Enable raw chunks to capture pre-Zod usage data, since MoonshotAI\n    // returns cached_tokens at the top level of usage (not nested in\n    // prompt_tokens_details) and the parent's z.object() schema strips it.\n    const result = await super.doStream({\n      ...options,\n      includeRawChunks: true,\n    });\n\n    let rawUsage: unknown = undefined;\n\n    return {\n      ...result,\n      stream: result.stream.pipeThrough(\n        new TransformStream<\n          LanguageModelV2StreamPart,\n          LanguageModelV2StreamPart\n        >({\n          transform(chunk, controller) {\n            if (chunk.type === 'raw') {\n              // Capture raw usage data before Zod strips cached_tokens\n              const rawValue = chunk.rawValue as Record<string, unknown>;\n              if (rawValue?.usage != null) {\n                rawUsage = rawValue.usage;\n              }\n\n              // Only forward raw chunks if originally requested\n              if (originalIncludeRawChunks) {\n                controller.enqueue(chunk);\n              }\n              return;\n            }\n\n            if (chunk.type === 'finish') {\n              // Re-convert usage from raw data to capture cached_tokens\n              controller.enqueue({\n                ...chunk,\n                usage: rawUsage\n                  ? convertMoonshotAIChatUsage(rawUsage as any)\n                  : chunk.usage,\n              });\n              return;\n            }\n\n            controller.enqueue(chunk);\n          },\n        }),\n      ),\n    };\n  }\n}\n","import { LanguageModelV2Usage } from '@ai-sdk/provider';\n\nexport function convertMoonshotAIChatUsage(\n  usage:\n    | {\n        prompt_tokens?: number | null;\n        completion_tokens?: number | null;\n        total_tokens?: number | null;\n        cached_tokens?: number | null;\n        prompt_tokens_details?: {\n          cached_tokens?: number | null;\n        } | null;\n        completion_tokens_details?: {\n          reasoning_tokens?: number | null;\n        } | null;\n      }\n    | undefined\n    | null,\n): LanguageModelV2Usage {\n  if (usage == null) {\n    return {\n      inputTokens: undefined,\n      outputTokens: undefined,\n      totalTokens: undefined,\n    };\n  }\n\n  const cachedInputTokens =\n    usage.cached_tokens ??\n    usage.prompt_tokens_details?.cached_tokens ??\n    undefined;\n\n  const reasoningTokens =\n    usage.completion_tokens_details?.reasoning_tokens ?? undefined;\n\n  return {\n    inputTokens: usage.prompt_tokens ?? undefined,\n    outputTokens: usage.completion_tokens ?? undefined,\n    totalTokens: usage.total_tokens ?? undefined,\n    reasoningTokens,\n    cachedInputTokens,\n  };\n}\n","declare const __PACKAGE_VERSION__: string;\n\nexport const VERSION = __PACKAGE_VERSION__;\n"],"mappings":"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","names":[]}

package/dist/index.mjs

@@ -47,10 +47,45 @@ var MoonshotAIChatLanguageModel = class extends OpenAICompatibleChatLanguageMode
       usage: convertMoonshotAIChatUsage(usage)
     };
   }
+  async doStream(options) {
+    const originalIncludeRawChunks = options.includeRawChunks;
+    const result = await super.doStream({
+      ...options,
+      includeRawChunks: true
+    });
+    let rawUsage = void 0;
+    return {
+      ...result,
+      stream: result.stream.pipeThrough(
+        new TransformStream({
+          transform(chunk, controller) {
+            if (chunk.type === "raw") {
+              const rawValue = chunk.rawValue;
+              if ((rawValue == null ? void 0 : rawValue.usage) != null) {
+                rawUsage = rawValue.usage;
+              }
+              if (originalIncludeRawChunks) {
+                controller.enqueue(chunk);
+              }
+              return;
+            }
+            if (chunk.type === "finish") {
+              controller.enqueue({
+                ...chunk,
+                usage: rawUsage ? convertMoonshotAIChatUsage(rawUsage) : chunk.usage
+              });
+              return;
+            }
+            controller.enqueue(chunk);
+          }
+        })
+      )
+    };
+  }
 };
 
 // src/version.ts
-var VERSION = "0.0.1";
+var VERSION = "0.0.3";
 
 // src/moonshotai-provider.ts
 var moonshotaiErrorSchema = z.object({
@@ -87,6 +122,7 @@ function createMoonshotAI(options = {}) {
   const createChatModel = (modelId) => {
     return new MoonshotAIChatLanguageModel(modelId, {
       ...getCommonModelConfig("chat"),
+      includeUsage: true,
       errorStructure: moonshotaiErrorStructure
     });
   };

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/moonshotai-provider.ts","../src/moonshotai-chat-language-model.ts","../src/convert-moonshotai-chat-usage.ts","../src/version.ts"],"sourcesContent":["import { ProviderErrorStructure } from '@ai-sdk/openai-compatible';\nimport {\n  LanguageModelV2,\n  NoSuchModelError,\n  ProviderV2,\n} from '@ai-sdk/provider';\nimport {\n  FetchFunction,\n  loadApiKey,\n  withoutTrailingSlash,\n  withUserAgentSuffix,\n} from '@ai-sdk/provider-utils';\nimport { z } from 'zod/v4';\nimport { MoonshotAIChatLanguageModel } from './moonshotai-chat-language-model';\nimport { MoonshotAIChatModelId } from './moonshotai-chat-options';\nimport { VERSION } from './version';\n\nexport type MoonshotAIErrorData = z.infer<typeof moonshotaiErrorSchema>;\n\nconst moonshotaiErrorSchema = z.object({\n  error: z.object({\n    message: z.string(),\n    type: z.string().nullish(),\n  }),\n});\n\nconst moonshotaiErrorStructure: ProviderErrorStructure<MoonshotAIErrorData> = {\n  errorSchema: moonshotaiErrorSchema,\n  errorToMessage: data => data.error.message,\n};\n\nexport interface MoonshotAIProviderSettings {\n  /**\n   * Moonshot API key. Default value is taken from the `MOONSHOT_API_KEY`\n   * environment variable.\n   */\n  apiKey?: string;\n  /**\n   * Base URL for the API calls.\n   */\n  baseURL?: string;\n  /**\n   * Custom headers to include in the requests.\n   */\n  headers?: Record<string, string>;\n  /**\n   * Custom fetch implementation. You can use it as a middleware to intercept requests,\n   * or to provide a custom fetch implementation for e.g. testing.\n   */\n  fetch?: FetchFunction;\n}\n\nexport interface MoonshotAIProvider extends ProviderV2 {\n  /**\n   * Creates a model for text generation.\n   */\n  (modelId: MoonshotAIChatModelId): LanguageModelV2;\n\n  /**\n   * Creates a chat model for text generation.\n   */\n  chatModel(modelId: MoonshotAIChatModelId): LanguageModelV2;\n\n  /**\n   * Creates a language model for text generation.\n   */\n  languageModel(modelId: MoonshotAIChatModelId): LanguageModelV2;\n}\n\nconst defaultBaseURL = 'https://api.moonshot.ai/v1';\n\nexport function createMoonshotAI(\n  options: MoonshotAIProviderSettings = {},\n): MoonshotAIProvider {\n  const baseURL = withoutTrailingSlash(options.baseURL ?? defaultBaseURL);\n  const getHeaders = () =>\n    withUserAgentSuffix(\n      {\n        Authorization: `Bearer ${loadApiKey({\n          apiKey: options.apiKey,\n          environmentVariableName: 'MOONSHOT_API_KEY',\n          description: 'Moonshot API key',\n        })}`,\n        ...options.headers,\n      },\n      `ai-sdk/moonshotai/${VERSION}`,\n    );\n\n  interface CommonModelConfig {\n    provider: string;\n    url: ({ path }: { path: string }) => string;\n    headers: () => Record<string, string>;\n    fetch?: FetchFunction;\n  }\n\n  const getCommonModelConfig = (modelType: string): CommonModelConfig => ({\n    provider: `moonshotai.${modelType}`,\n    url: ({ path }) => `${baseURL}${path}`,\n    headers: getHeaders,\n    fetch: options.fetch,\n  });\n\n  const createChatModel = (modelId: MoonshotAIChatModelId) => {\n    return new MoonshotAIChatLanguageModel(modelId, {\n      ...getCommonModelConfig('chat'),\n      errorStructure: moonshotaiErrorStructure,\n    });\n  };\n\n  const provider = (modelId: MoonshotAIChatModelId) => createChatModel(modelId);\n\n  provider.specificationVersion = 'v2' as const;\n  provider.chatModel = createChatModel;\n  provider.languageModel = createChatModel;\n\n  provider.textEmbeddingModel = (modelId: string) => {\n    throw new NoSuchModelError({ modelId, modelType: 'textEmbeddingModel' });\n  };\n\n  provider.imageModel = (modelId: string) => {\n    throw new NoSuchModelError({ modelId, modelType: 'imageModel' });\n  };\n\n  return provider;\n}\n\nexport const moonshotai = createMoonshotAI();\n","import { OpenAICompatibleChatLanguageModel } from '@ai-sdk/openai-compatible';\nimport { OpenAICompatibleChatConfig } from '@ai-sdk/openai-compatible/internal';\nimport { LanguageModelV2 } from '@ai-sdk/provider';\nimport { convertMoonshotAIChatUsage } from './convert-moonshotai-chat-usage';\nimport { MoonshotAIChatModelId } from './moonshotai-chat-options';\n\nexport class MoonshotAIChatLanguageModel extends OpenAICompatibleChatLanguageModel {\n  constructor(\n    modelId: MoonshotAIChatModelId,\n    config: OpenAICompatibleChatConfig,\n  ) {\n    super(modelId, config);\n  }\n\n  async doGenerate(\n    options: Parameters<LanguageModelV2['doGenerate']>[0],\n  ): Promise<Awaited<ReturnType<LanguageModelV2['doGenerate']>>> {\n    const result = await super.doGenerate(options);\n\n    // @ts-expect-error accessing response body from parent result\n    const usage = result.response?.body?.usage;\n\n    return {\n      ...result,\n      usage: convertMoonshotAIChatUsage(usage),\n    };\n  }\n}\n","import { LanguageModelV2Usage } from '@ai-sdk/provider';\n\nexport function convertMoonshotAIChatUsage(\n  usage:\n    | {\n        prompt_tokens?: number | null;\n        completion_tokens?: number | null;\n        total_tokens?: number | null;\n        cached_tokens?: number | null;\n        prompt_tokens_details?: {\n          cached_tokens?: number | null;\n        } | null;\n        completion_tokens_details?: {\n          reasoning_tokens?: number | null;\n        } | null;\n      }\n    | undefined\n    | null,\n): LanguageModelV2Usage {\n  if (usage == null) {\n    return {\n      inputTokens: undefined,\n      outputTokens: undefined,\n      totalTokens: undefined,\n    };\n  }\n\n  const cachedInputTokens =\n    usage.cached_tokens ??\n    usage.prompt_tokens_details?.cached_tokens ??\n    undefined;\n\n  const reasoningTokens =\n    usage.completion_tokens_details?.reasoning_tokens ?? undefined;\n\n  return {\n    inputTokens: usage.prompt_tokens ?? undefined,\n    outputTokens: usage.completion_tokens ?? undefined,\n    totalTokens: usage.total_tokens ?? undefined,\n    reasoningTokens,\n    cachedInputTokens,\n  };\n}\n","declare const __PACKAGE_VERSION__: string;\n\nexport const VERSION = __PACKAGE_VERSION__;\n"],"mappings":";AACA;AAAA,EAEE;AAAA,OAEK;AACP;AAAA,EAEE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,SAAS;;;ACZlB,SAAS,yCAAyC;;;ACE3C,SAAS,2BACd,OAesB;AAlBxB;AAmBE,MAAI,SAAS,MAAM;AACjB,WAAO;AAAA,MACL,aAAa;AAAA,MACb,cAAc;AAAA,MACd,aAAa;AAAA,IACf;AAAA,EACF;AAEA,QAAM,qBACJ,iBAAM,kBAAN,aACA,WAAM,0BAAN,mBAA6B,kBAD7B,YAEA;AAEF,QAAM,mBACJ,iBAAM,8BAAN,mBAAiC,qBAAjC,YAAqD;AAEvD,SAAO;AAAA,IACL,cAAa,WAAM,kBAAN,YAAuB;AAAA,IACpC,eAAc,WAAM,sBAAN,YAA2B;AAAA,IACzC,cAAa,WAAM,iBAAN,YAAsB;AAAA,IACnC;AAAA,IACA;AAAA,EACF;AACF;;;ADpCO,IAAM,8BAAN,cAA0C,kCAAkC;AAAA,EACjF,YACE,SACA,QACA;AACA,UAAM,SAAS,MAAM;AAAA,EACvB;AAAA,EAEA,MAAM,WACJ,SAC6D;AAhBjE;AAiBI,UAAM,SAAS,MAAM,MAAM,WAAW,OAAO;AAG7C,UAAM,SAAQ,kBAAO,aAAP,mBAAiB,SAAjB,mBAAuB;AAErC,WAAO;AAAA,MACL,GAAG;AAAA,MACH,OAAO,2BAA2B,KAAK;AAAA,IACzC;AAAA,EACF;AACF;;;AEzBO,IAAM,UAAU;;;AHiBvB,IAAM,wBAAwB,EAAE,OAAO;AAAA,EACrC,OAAO,EAAE,OAAO;AAAA,IACd,SAAS,EAAE,OAAO;AAAA,IAClB,MAAM,EAAE,OAAO,EAAE,QAAQ;AAAA,EAC3B,CAAC;AACH,CAAC;AAED,IAAM,2BAAwE;AAAA,EAC5E,aAAa;AAAA,EACb,gBAAgB,UAAQ,KAAK,MAAM;AACrC;AAwCA,IAAM,iBAAiB;AAEhB,SAAS,iBACd,UAAsC,CAAC,GACnB;AAzEtB;AA0EE,QAAM,UAAU,sBAAqB,aAAQ,YAAR,YAAmB,cAAc;AACtE,QAAM,aAAa,MACjB;AAAA,IACE;AAAA,MACE,eAAe,UAAU,WAAW;AAAA,QAClC,QAAQ,QAAQ;AAAA,QAChB,yBAAyB;AAAA,QACzB,aAAa;AAAA,MACf,CAAC,CAAC;AAAA,MACF,GAAG,QAAQ;AAAA,IACb;AAAA,IACA,qBAAqB,OAAO;AAAA,EAC9B;AASF,QAAM,uBAAuB,CAAC,eAA0C;AAAA,IACtE,UAAU,cAAc,SAAS;AAAA,IACjC,KAAK,CAAC,EAAE,KAAK,MAAM,GAAG,OAAO,GAAG,IAAI;AAAA,IACpC,SAAS;AAAA,IACT,OAAO,QAAQ;AAAA,EACjB;AAEA,QAAM,kBAAkB,CAAC,YAAmC;AAC1D,WAAO,IAAI,4BAA4B,SAAS;AAAA,MAC9C,GAAG,qBAAqB,MAAM;AAAA,MAC9B,gBAAgB;AAAA,IAClB,CAAC;AAAA,EACH;AAEA,QAAM,WAAW,CAAC,YAAmC,gBAAgB,OAAO;AAE5E,WAAS,uBAAuB;AAChC,WAAS,YAAY;AACrB,WAAS,gBAAgB;AAEzB,WAAS,qBAAqB,CAAC,YAAoB;AACjD,UAAM,IAAI,iBAAiB,EAAE,SAAS,WAAW,qBAAqB,CAAC;AAAA,EACzE;AAEA,WAAS,aAAa,CAAC,YAAoB;AACzC,UAAM,IAAI,iBAAiB,EAAE,SAAS,WAAW,aAAa,CAAC;AAAA,EACjE;AAEA,SAAO;AACT;AAEO,IAAM,aAAa,iBAAiB;","names":[]}
+{"version":3,"sources":["../src/moonshotai-provider.ts","../src/moonshotai-chat-language-model.ts","../src/convert-moonshotai-chat-usage.ts","../src/version.ts"],"sourcesContent":["import { ProviderErrorStructure } from '@ai-sdk/openai-compatible';\nimport {\n  LanguageModelV2,\n  NoSuchModelError,\n  ProviderV2,\n} from '@ai-sdk/provider';\nimport {\n  FetchFunction,\n  loadApiKey,\n  withoutTrailingSlash,\n  withUserAgentSuffix,\n} from '@ai-sdk/provider-utils';\nimport { z } from 'zod/v4';\nimport { MoonshotAIChatLanguageModel } from './moonshotai-chat-language-model';\nimport { MoonshotAIChatModelId } from './moonshotai-chat-options';\nimport { VERSION } from './version';\n\nexport type MoonshotAIErrorData = z.infer<typeof moonshotaiErrorSchema>;\n\nconst moonshotaiErrorSchema = z.object({\n  error: z.object({\n    message: z.string(),\n    type: z.string().nullish(),\n  }),\n});\n\nconst moonshotaiErrorStructure: ProviderErrorStructure<MoonshotAIErrorData> = {\n  errorSchema: moonshotaiErrorSchema,\n  errorToMessage: data => data.error.message,\n};\n\nexport interface MoonshotAIProviderSettings {\n  /**\n   * Moonshot API key. Default value is taken from the `MOONSHOT_API_KEY`\n   * environment variable.\n   */\n  apiKey?: string;\n  /**\n   * Base URL for the API calls.\n   */\n  baseURL?: string;\n  /**\n   * Custom headers to include in the requests.\n   */\n  headers?: Record<string, string>;\n  /**\n   * Custom fetch implementation. You can use it as a middleware to intercept requests,\n   * or to provide a custom fetch implementation for e.g. testing.\n   */\n  fetch?: FetchFunction;\n}\n\nexport interface MoonshotAIProvider extends ProviderV2 {\n  /**\n   * Creates a model for text generation.\n   */\n  (modelId: MoonshotAIChatModelId): LanguageModelV2;\n\n  /**\n   * Creates a chat model for text generation.\n   */\n  chatModel(modelId: MoonshotAIChatModelId): LanguageModelV2;\n\n  /**\n   * Creates a language model for text generation.\n   */\n  languageModel(modelId: MoonshotAIChatModelId): LanguageModelV2;\n}\n\nconst defaultBaseURL = 'https://api.moonshot.ai/v1';\n\nexport function createMoonshotAI(\n  options: MoonshotAIProviderSettings = {},\n): MoonshotAIProvider {\n  const baseURL = withoutTrailingSlash(options.baseURL ?? defaultBaseURL);\n  const getHeaders = () =>\n    withUserAgentSuffix(\n      {\n        Authorization: `Bearer ${loadApiKey({\n          apiKey: options.apiKey,\n          environmentVariableName: 'MOONSHOT_API_KEY',\n          description: 'Moonshot API key',\n        })}`,\n        ...options.headers,\n      },\n      `ai-sdk/moonshotai/${VERSION}`,\n    );\n\n  interface CommonModelConfig {\n    provider: string;\n    url: ({ path }: { path: string }) => string;\n    headers: () => Record<string, string>;\n    fetch?: FetchFunction;\n  }\n\n  const getCommonModelConfig = (modelType: string): CommonModelConfig => ({\n    provider: `moonshotai.${modelType}`,\n    url: ({ path }) => `${baseURL}${path}`,\n    headers: getHeaders,\n    fetch: options.fetch,\n  });\n\n  const createChatModel = (modelId: MoonshotAIChatModelId) => {\n    return new MoonshotAIChatLanguageModel(modelId, {\n      ...getCommonModelConfig('chat'),\n      includeUsage: true,\n      errorStructure: moonshotaiErrorStructure,\n    });\n  };\n\n  const provider = (modelId: MoonshotAIChatModelId) => createChatModel(modelId);\n\n  provider.specificationVersion = 'v2' as const;\n  provider.chatModel = createChatModel;\n  provider.languageModel = createChatModel;\n\n  provider.textEmbeddingModel = (modelId: string) => {\n    throw new NoSuchModelError({ modelId, modelType: 'textEmbeddingModel' });\n  };\n\n  provider.imageModel = (modelId: string) => {\n    throw new NoSuchModelError({ modelId, modelType: 'imageModel' });\n  };\n\n  return provider;\n}\n\nexport const moonshotai = createMoonshotAI();\n","import { OpenAICompatibleChatLanguageModel } from '@ai-sdk/openai-compatible';\nimport { OpenAICompatibleChatConfig } from '@ai-sdk/openai-compatible/internal';\nimport { LanguageModelV2, LanguageModelV2StreamPart } from '@ai-sdk/provider';\nimport { convertMoonshotAIChatUsage } from './convert-moonshotai-chat-usage';\nimport { MoonshotAIChatModelId } from './moonshotai-chat-options';\n\nexport class MoonshotAIChatLanguageModel extends OpenAICompatibleChatLanguageModel {\n  constructor(\n    modelId: MoonshotAIChatModelId,\n    config: OpenAICompatibleChatConfig,\n  ) {\n    super(modelId, config);\n  }\n\n  async doGenerate(\n    options: Parameters<LanguageModelV2['doGenerate']>[0],\n  ): Promise<Awaited<ReturnType<LanguageModelV2['doGenerate']>>> {\n    const result = await super.doGenerate(options);\n\n    // @ts-expect-error accessing response body from parent result\n    const usage = result.response?.body?.usage;\n\n    return {\n      ...result,\n      usage: convertMoonshotAIChatUsage(usage),\n    };\n  }\n\n  async doStream(\n    options: Parameters<LanguageModelV2['doStream']>[0],\n  ): Promise<Awaited<ReturnType<LanguageModelV2['doStream']>>> {\n    const originalIncludeRawChunks = options.includeRawChunks;\n\n    // Enable raw chunks to capture pre-Zod usage data, since MoonshotAI\n    // returns cached_tokens at the top level of usage (not nested in\n    // prompt_tokens_details) and the parent's z.object() schema strips it.\n    const result = await super.doStream({\n      ...options,\n      includeRawChunks: true,\n    });\n\n    let rawUsage: unknown = undefined;\n\n    return {\n      ...result,\n      stream: result.stream.pipeThrough(\n        new TransformStream<\n          LanguageModelV2StreamPart,\n          LanguageModelV2StreamPart\n        >({\n          transform(chunk, controller) {\n            if (chunk.type === 'raw') {\n              // Capture raw usage data before Zod strips cached_tokens\n              const rawValue = chunk.rawValue as Record<string, unknown>;\n              if (rawValue?.usage != null) {\n                rawUsage = rawValue.usage;\n              }\n\n              // Only forward raw chunks if originally requested\n              if (originalIncludeRawChunks) {\n                controller.enqueue(chunk);\n              }\n              return;\n            }\n\n            if (chunk.type === 'finish') {\n              // Re-convert usage from raw data to capture cached_tokens\n              controller.enqueue({\n                ...chunk,\n                usage: rawUsage\n                  ? convertMoonshotAIChatUsage(rawUsage as any)\n                  : chunk.usage,\n              });\n              return;\n            }\n\n            controller.enqueue(chunk);\n          },\n        }),\n      ),\n    };\n  }\n}\n","import { LanguageModelV2Usage } from '@ai-sdk/provider';\n\nexport function convertMoonshotAIChatUsage(\n  usage:\n    | {\n        prompt_tokens?: number | null;\n        completion_tokens?: number | null;\n        total_tokens?: number | null;\n        cached_tokens?: number | null;\n        prompt_tokens_details?: {\n          cached_tokens?: number | null;\n        } | null;\n        completion_tokens_details?: {\n          reasoning_tokens?: number | null;\n        } | null;\n      }\n    | undefined\n    | null,\n): LanguageModelV2Usage {\n  if (usage == null) {\n    return {\n      inputTokens: undefined,\n      outputTokens: undefined,\n      totalTokens: undefined,\n    };\n  }\n\n  const cachedInputTokens =\n    usage.cached_tokens ??\n    usage.prompt_tokens_details?.cached_tokens ??\n    undefined;\n\n  const reasoningTokens =\n    usage.completion_tokens_details?.reasoning_tokens ?? undefined;\n\n  return {\n    inputTokens: usage.prompt_tokens ?? undefined,\n    outputTokens: usage.completion_tokens ?? undefined,\n    totalTokens: usage.total_tokens ?? undefined,\n    reasoningTokens,\n    cachedInputTokens,\n  };\n}\n","declare const __PACKAGE_VERSION__: string;\n\nexport const VERSION = __PACKAGE_VERSION__;\n"],"mappings":"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","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-sdk/moonshotai",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "license": "Apache-2.0",
   "sideEffects": false,
   "main": "./dist/index.js",
@@ -25,9 +25,9 @@
     }
   },
   "dependencies": {
-    "@ai-sdk/provider": "2.0.1",
+    "@ai-sdk/openai-compatible": "1.0.32",
     "@ai-sdk/provider-utils": "3.0.20",
-    "@ai-sdk/openai-compatible": "1.0.32"
+    "@ai-sdk/provider": "2.0.1"
   },
   "devDependencies": {
     "@types/node": "20.17.24",

package/src/moonshotai-chat-language-model.ts

@@ -1,6 +1,6 @@
 import { OpenAICompatibleChatLanguageModel } from '@ai-sdk/openai-compatible';
 import { OpenAICompatibleChatConfig } from '@ai-sdk/openai-compatible/internal';
-import { LanguageModelV2 } from '@ai-sdk/provider';
+import { LanguageModelV2, LanguageModelV2StreamPart } from '@ai-sdk/provider';
 import { convertMoonshotAIChatUsage } from './convert-moonshotai-chat-usage';
 import { MoonshotAIChatModelId } from './moonshotai-chat-options';
 
@@ -25,4 +25,59 @@ export class MoonshotAIChatLanguageModel extends OpenAICompatibleChatLanguageMod
       usage: convertMoonshotAIChatUsage(usage),
     };
   }
+
+  async doStream(
+    options: Parameters<LanguageModelV2['doStream']>[0],
+  ): Promise<Awaited<ReturnType<LanguageModelV2['doStream']>>> {
+    const originalIncludeRawChunks = options.includeRawChunks;
+
+    // Enable raw chunks to capture pre-Zod usage data, since MoonshotAI
+    // returns cached_tokens at the top level of usage (not nested in
+    // prompt_tokens_details) and the parent's z.object() schema strips it.
+    const result = await super.doStream({
+      ...options,
+      includeRawChunks: true,
+    });
+
+    let rawUsage: unknown = undefined;
+
+    return {
+      ...result,
+      stream: result.stream.pipeThrough(
+        new TransformStream<
+          LanguageModelV2StreamPart,
+          LanguageModelV2StreamPart
+        >({
+          transform(chunk, controller) {
+            if (chunk.type === 'raw') {
+              // Capture raw usage data before Zod strips cached_tokens
+              const rawValue = chunk.rawValue as Record<string, unknown>;
+              if (rawValue?.usage != null) {
+                rawUsage = rawValue.usage;
+              }
+
+              // Only forward raw chunks if originally requested
+              if (originalIncludeRawChunks) {
+                controller.enqueue(chunk);
+              }
+              return;
+            }
+
+            if (chunk.type === 'finish') {
+              // Re-convert usage from raw data to capture cached_tokens
+              controller.enqueue({
+                ...chunk,
+                usage: rawUsage
+                  ? convertMoonshotAIChatUsage(rawUsage as any)
+                  : chunk.usage,
+              });
+              return;
+            }
+
+            controller.enqueue(chunk);
+          },
+        }),
+      ),
+    };
+  }
 }

package/src/moonshotai-provider.ts

@@ -103,6 +103,7 @@ export function createMoonshotAI(
   const createChatModel = (modelId: MoonshotAIChatModelId) => {
     return new MoonshotAIChatLanguageModel(modelId, {
       ...getCommonModelConfig('chat'),
+      includeUsage: true,
       errorStructure: moonshotaiErrorStructure,
     });
   };