@kernl-sdk/ai 0.4.2 → 0.4.4

package/dist/oauth/openai.js

@@ -0,0 +1,97 @@
+import { appendFileSync } from "node:fs";
+const TOKEN_URL = "https://auth.openai.com/oauth/token";
+const CLIENT_ID = "app_EMoamEEZ73f0CkXaXp7hrann";
+const CODEX_ENDPOINT = "https://chatgpt.com/backend-api/codex/responses";
+function debug(msg) {
+    try {
+        appendFileSync("/tmp/popcorn-debug.log", `${new Date().toISOString()} [oauth/fetch] ${msg}\n`);
+    }
+    catch {
+        // ignore
+    }
+}
+/**
+ * Refresh OpenAI OAuth tokens.
+ */
+async function refresh(creds) {
+    const res = await fetch(TOKEN_URL, {
+        method: "POST",
+        headers: { "Content-Type": "application/x-www-form-urlencoded" },
+        body: new URLSearchParams({
+            grant_type: "refresh_token",
+            refresh_token: creds.refreshToken,
+            client_id: CLIENT_ID,
+        }),
+    });
+    if (!res.ok) {
+        throw new Error(`Token refresh failed: ${res.status}`);
+    }
+    const data = (await res.json());
+    creds.accessToken = data.access_token;
+    creds.refreshToken = data.refresh_token;
+    creds.expiresAt = Date.now() + data.expires_in * 1000;
+    creds.onRefresh?.({
+        accessToken: creds.accessToken,
+        refreshToken: creds.refreshToken,
+        expiresAt: creds.expiresAt,
+    });
+}
+/**
+ * Create a fetch wrapper for OpenAI Codex OAuth.
+ *
+ * Redirects all requests to the Codex endpoint and adds OAuth headers.
+ */
+export function createOAuthFetch(creds) {
+    return async (input, init) => {
+        // Refresh if expired (with 30s buffer)
+        if (Date.now() >= creds.expiresAt - 30_000) {
+            await refresh(creds);
+        }
+        const headers = new Headers(init?.headers);
+        headers.set("Authorization", `Bearer ${creds.accessToken}`);
+        if (creds.accountId) {
+            headers.set("ChatGPT-Account-Id", creds.accountId);
+        }
+        // Debug: log request
+        const url = typeof input === "string"
+            ? input
+            : input instanceof URL
+                ? input.toString()
+                : input.url;
+        debug(`Request to: ${url}`);
+        debug(`Redirecting to: ${CODEX_ENDPOINT}`);
+        // Transform request body for Codex API
+        // Codex requires "instructions" field instead of developer/system role in input
+        // Codex also requires "store: false"
+        let body = init?.body;
+        if (body && typeof body === "string") {
+            try {
+                const parsed = JSON.parse(body);
+                // Codex requires store: false
+                parsed.store = false;
+                // Extract developer/system message as instructions
+                if (parsed.input && Array.isArray(parsed.input)) {
+                    const devIdx = parsed.input.findIndex((m) => m.role === "developer" || m.role === "system");
+                    if (devIdx !== -1) {
+                        const devMsg = parsed.input[devIdx];
+                        parsed.instructions = devMsg.content;
+                        parsed.input.splice(devIdx, 1);
+                    }
+                }
+                body = JSON.stringify(parsed);
+                debug(`Transformed body: ${body.slice(0, 500)}`);
+            }
+            catch {
+                debug(`Failed to transform body`);
+            }
+        }
+        const response = await fetch(CODEX_ENDPOINT, { ...init, headers, body });
+        // Debug: log response
+        debug(`Response status: ${response.status}`);
+        if (!response.ok) {
+            const text = await response.clone().text();
+            debug(`Error response: ${text.slice(0, 1000)}`);
+        }
+        return response;
+    };
+}

package/dist/oauth/types.d.ts

@@ -0,0 +1,25 @@
+/**
+ * Base OAuth credentials.
+ */
+export interface OAuthCredentials {
+    /** Current access token */
+    accessToken: string;
+    /** Refresh token for obtaining new access tokens */
+    refreshToken: string;
+    /** Expiration timestamp in milliseconds */
+    expiresAt: number;
+    /** Called when tokens are refreshed - use to persist new tokens */
+    onRefresh?: (tokens: {
+        accessToken: string;
+        refreshToken: string;
+        expiresAt: number;
+    }) => void;
+}
+/**
+ * OpenAI OAuth credentials (ChatGPT Plus/Pro via Codex).
+ */
+export interface OpenAIOAuthCredentials extends OAuthCredentials {
+    /** Account ID for org/team subscriptions */
+    accountId?: string;
+}
+//# sourceMappingURL=types.d.ts.map

package/dist/oauth/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/oauth/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,2BAA2B;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,oDAAoD;IACpD,YAAY,EAAE,MAAM,CAAC;IACrB,2CAA2C;IAC3C,SAAS,EAAE,MAAM,CAAC;IAClB,mEAAmE;IACnE,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE;QACnB,WAAW,EAAE,MAAM,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;QACrB,SAAS,EAAE,MAAM,CAAC;KACnB,KAAK,IAAI,CAAC;CACZ;AAED;;GAEG;AACH,MAAM,WAAW,sBAAuB,SAAQ,gBAAgB;IAC9D,4CAA4C;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB"}

package/dist/oauth/types.js

@@ -0,0 +1 @@
+export {};

package/dist/providers/anthropic.d.ts

@@ -1,14 +1,58 @@
+import { anthropic as _anthropic } from "@ai-sdk/anthropic";
 import { AISDKLanguageModel } from "../language-model.js";
+import type { OAuthCredentials } from "../oauth/types.js";
+/**
+ * Anthropic model IDs (derived from @ai-sdk/anthropic).
+ */
+export type AnthropicModelId = Parameters<typeof _anthropic>[0];
+/**
+ * Options for creating a custom Anthropic provider.
+ */
+export interface AnthropicProviderOptions {
+    /** API key for standard authentication */
+    apiKey?: string;
+    /** OAuth credentials for Claude Pro/Max authentication */
+    oauth?: OAuthCredentials;
+    /** Custom base URL */
+    baseURL?: string;
+    /** Custom headers */
+    headers?: Record<string, string>;
+}
+/**
+ * Create a custom Anthropic provider with explicit credentials.
+ *
+ * @example API key auth
+ * ```ts
+ * const anthropic = createAnthropic({ apiKey: "sk-..." });
+ * const model = anthropic("claude-sonnet-4-5");
+ * ```
+ *
+ * @example OAuth auth (Claude Pro/Max)
+ * ```ts
+ * const anthropic = createAnthropic({
+ *   oauth: {
+ *     accessToken: "...",
+ *     refreshToken: "...",
+ *     expiresAt: Date.now() + 3600000,
+ *     onRefresh: (tokens) => saveTokens(tokens),
+ *   }
+ * });
+ * const model = anthropic("claude-sonnet-4-5");
+ * ```
+ */
+export declare function createAnthropic(options?: AnthropicProviderOptions): (modelId: AnthropicModelId) => AISDKLanguageModel;
 /**
  * Create a kernl-compatible Anthropic language model.
+ * Uses ANTHROPIC_API_KEY environment variable.
  *
  * @example
  * ```ts
  * import { anthropic } from '@kernl-sdk/ai/anthropic';
  *
- * const claude = anthropic('claude-3-5-sonnet-20241022');
+ * const claude = anthropic('claude-sonnet-4-5');
  * const response = await claude.generate([...], {});
  * ```
  */
-export declare function anthropic(modelId: string): AISDKLanguageModel;
+export declare function anthropic(modelId: AnthropicModelId): AISDKLanguageModel;
+export type { OAuthCredentials } from "../oauth/types.js";
 //# sourceMappingURL=anthropic.d.ts.map

package/dist/providers/anthropic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"anthropic.d.ts","sourceRoot":"","sources":["../../src/providers/anthropic.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD;;;;;;;;;;GAUG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,sBAGxC"}
+{"version":3,"file":"anthropic.d.ts","sourceRoot":"","sources":["../../src/providers/anthropic.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,IAAI,UAAU,EAExB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAEvD;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AAEhE;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,0CAA0C;IAC1C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,0DAA0D;IAC1D,KAAK,CAAC,EAAE,gBAAgB,CAAC;IACzB,sBAAsB;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,qBAAqB;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,eAAe,CAAC,OAAO,GAAE,wBAA6B,IAQ5D,SAAS,gBAAgB,wBAElC;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,gBAAgB,sBAGlD;AAGD,YAAY,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC"}

package/dist/providers/anthropic.js

@@ -1,13 +1,46 @@
-import { anthropic as _anthropic } from "@ai-sdk/anthropic";
+import { anthropic as _anthropic, createAnthropic as _createAnthropic, } from "@ai-sdk/anthropic";
 import { AISDKLanguageModel } from "../language-model.js";
+import { createOAuthFetch } from "../oauth/anthropic.js";
+/**
+ * Create a custom Anthropic provider with explicit credentials.
+ *
+ * @example API key auth
+ * ```ts
+ * const anthropic = createAnthropic({ apiKey: "sk-..." });
+ * const model = anthropic("claude-sonnet-4-5");
+ * ```
+ *
+ * @example OAuth auth (Claude Pro/Max)
+ * ```ts
+ * const anthropic = createAnthropic({
+ *   oauth: {
+ *     accessToken: "...",
+ *     refreshToken: "...",
+ *     expiresAt: Date.now() + 3600000,
+ *     onRefresh: (tokens) => saveTokens(tokens),
+ *   }
+ * });
+ * const model = anthropic("claude-sonnet-4-5");
+ * ```
+ */
+export function createAnthropic(options = {}) {
+    const provider = _createAnthropic({
+        apiKey: options.oauth ? undefined : options.apiKey,
+        baseURL: options.baseURL,
+        headers: options.headers,
+        fetch: options.oauth ? createOAuthFetch(options.oauth) : undefined,
+    });
+    return (modelId) => new AISDKLanguageModel(provider(modelId));
+}
 /**
  * Create a kernl-compatible Anthropic language model.
+ * Uses ANTHROPIC_API_KEY environment variable.
  *
  * @example
  * ```ts
  * import { anthropic } from '@kernl-sdk/ai/anthropic';
  *
- * const claude = anthropic('claude-3-5-sonnet-20241022');
+ * const claude = anthropic('claude-sonnet-4-5');
  * const response = await claude.generate([...], {});
  * ```
  */

package/dist/providers/google.d.ts

@@ -1,4 +1,9 @@
+import { google as _google } from "@ai-sdk/google";
 import { AISDKLanguageModel } from "../language-model.js";
+/**
+ * Google model IDs (derived from @ai-sdk/google).
+ */
+export type GoogleModelId = Parameters<typeof _google>[0];
 /**
  * Create a kernl-compatible Google Generative AI language model.
  *
@@ -6,9 +11,9 @@ import { AISDKLanguageModel } from "../language-model.js";
  * ```ts
  * import { google } from '@kernl-sdk/ai/google';
  *
- * const gemini = google('gemini-2.0-flash-exp');
+ * const gemini = google('gemini-2.5-pro');
  * const response = await gemini.generate([...], {});
  * ```
  */
-export declare function google(modelId: string): AISDKLanguageModel;
+export declare function google(modelId: GoogleModelId): AISDKLanguageModel;
 //# sourceMappingURL=google.d.ts.map

package/dist/providers/google.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"google.d.ts","sourceRoot":"","sources":["../../src/providers/google.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAIvD;;;;;;;;;;GAUG;AACH,wBAAgB,MAAM,CAAC,OAAO,EAAE,MAAM,sBAGrC"}
+{"version":3,"file":"google.d.ts","sourceRoot":"","sources":["../../src/providers/google.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAGvD;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AAE1D;;;;;;;;;;GAUG;AACH,wBAAgB,MAAM,CAAC,OAAO,EAAE,aAAa,sBAG5C"}

package/dist/providers/google.js

@@ -1,7 +1,7 @@
 import { google as _google } from "@ai-sdk/google";
+import { registerEmbeddingProvider } from "@kernl-sdk/retrieval";
 import { AISDKLanguageModel } from "../language-model.js";
 import { AISDKEmbeddingModel } from "../embedding-model.js";
-import { registerEmbeddingProvider } from "@kernl-sdk/retrieval";
 /**
  * Create a kernl-compatible Google Generative AI language model.
  *
@@ -9,7 +9,7 @@ import { registerEmbeddingProvider } from "@kernl-sdk/retrieval";
  * ```ts
  * import { google } from '@kernl-sdk/ai/google';
  *
- * const gemini = google('gemini-2.0-flash-exp');
+ * const gemini = google('gemini-2.5-pro');
  * const response = await gemini.generate([...], {});
  * ```
  */

package/dist/providers/openai.d.ts

@@ -1,14 +1,59 @@
+import { openai as _openai } from "@ai-sdk/openai";
 import { AISDKLanguageModel } from "../language-model.js";
+import type { OpenAIOAuthCredentials } from "../oauth/types.js";
+/**
+ * OpenAI model IDs (derived from @ai-sdk/openai).
+ */
+export type OpenAIModelId = Parameters<typeof _openai>[0];
+/**
+ * Options for creating a custom OpenAI provider.
+ */
+export interface OpenAIProviderOptions {
+    /** API key for standard authentication */
+    apiKey?: string;
+    /** OAuth credentials for ChatGPT Plus/Pro (Codex) authentication */
+    oauth?: OpenAIOAuthCredentials;
+    /** Custom base URL (ignored for OAuth - uses Codex endpoint) */
+    baseURL?: string;
+    /** Custom headers */
+    headers?: Record<string, string>;
+}
+/**
+ * Create a custom OpenAI provider with explicit credentials.
+ *
+ * @example API key auth
+ * ```ts
+ * const openai = createOpenAI({ apiKey: "sk-..." });
+ * const model = openai("gpt-4o");
+ * ```
+ *
+ * @example OAuth auth (ChatGPT Plus/Pro via Codex)
+ * ```ts
+ * const openai = createOpenAI({
+ *   oauth: {
+ *     accessToken: "...",
+ *     refreshToken: "...",
+ *     expiresAt: Date.now() + 3600000,
+ *     accountId: "...", // for org subscriptions
+ *     onRefresh: (tokens) => saveTokens(tokens),
+ *   }
+ * });
+ * const model = openai("gpt-4o");
+ * ```
+ */
+export declare function createOpenAI(options?: OpenAIProviderOptions): (modelId: OpenAIModelId) => AISDKLanguageModel;
 /**
  * Create a kernl-compatible OpenAI language model.
+ * Uses OPENAI_API_KEY environment variable.
  *
  * @example
  * ```ts
  * import { openai } from '@kernl-sdk/ai/openai';
  *
- * const gpt4 = openai('gpt-4-turbo');
+ * const gpt4 = openai('gpt-4o');
  * const response = await gpt4.generate([...], {});
  * ```
  */
-export declare function openai(modelId: string): AISDKLanguageModel;
+export declare function openai(modelId: OpenAIModelId): AISDKLanguageModel;
+export type { OpenAIOAuthCredentials } from "../oauth/types.js";
 //# sourceMappingURL=openai.d.ts.map

package/dist/providers/openai.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../src/providers/openai.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAIvD;;;;;;;;;;GAUG;AACH,wBAAgB,MAAM,CAAC,OAAO,EAAE,MAAM,sBAGrC"}
+{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../src/providers/openai.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,IAAI,OAAO,EAElB,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAGvD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAE7D;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AAE1D;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,0CAA0C;IAC1C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oEAAoE;IACpE,KAAK,CAAC,EAAE,sBAAsB,CAAC;IAC/B,gEAAgE;IAChE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,qBAAqB;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,YAAY,CAAC,OAAO,GAAE,qBAA0B,IAQtD,SAAS,aAAa,wBAC/B;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,MAAM,CAAC,OAAO,EAAE,aAAa,sBAG5C;AAGD,YAAY,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC"}

package/dist/providers/openai.js

@@ -1,15 +1,49 @@
-import { openai as _openai } from "@ai-sdk/openai";
+import { openai as _openai, createOpenAI as _createOpenAI, } from "@ai-sdk/openai";
+import { registerEmbeddingProvider } from "@kernl-sdk/retrieval";
 import { AISDKLanguageModel } from "../language-model.js";
 import { AISDKEmbeddingModel } from "../embedding-model.js";
-import { registerEmbeddingProvider } from "@kernl-sdk/retrieval";
+import { createOAuthFetch } from "../oauth/openai.js";
+/**
+ * Create a custom OpenAI provider with explicit credentials.
+ *
+ * @example API key auth
+ * ```ts
+ * const openai = createOpenAI({ apiKey: "sk-..." });
+ * const model = openai("gpt-4o");
+ * ```
+ *
+ * @example OAuth auth (ChatGPT Plus/Pro via Codex)
+ * ```ts
+ * const openai = createOpenAI({
+ *   oauth: {
+ *     accessToken: "...",
+ *     refreshToken: "...",
+ *     expiresAt: Date.now() + 3600000,
+ *     accountId: "...", // for org subscriptions
+ *     onRefresh: (tokens) => saveTokens(tokens),
+ *   }
+ * });
+ * const model = openai("gpt-4o");
+ * ```
+ */
+export function createOpenAI(options = {}) {
+    const provider = _createOpenAI({
+        apiKey: options.oauth ? undefined : options.apiKey,
+        baseURL: options.oauth ? undefined : options.baseURL,
+        headers: options.headers,
+        fetch: options.oauth ? createOAuthFetch(options.oauth) : undefined,
+    });
+    return (modelId) => new AISDKLanguageModel(provider(modelId));
+}
 /**
  * Create a kernl-compatible OpenAI language model.
+ * Uses OPENAI_API_KEY environment variable.
  *
  * @example
  * ```ts
  * import { openai } from '@kernl-sdk/ai/openai';
  *
- * const gpt4 = openai('gpt-4-turbo');
+ * const gpt4 = openai('gpt-4o');
  * const response = await gpt4.generate([...], {});
  * ```
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kernl-sdk/ai",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "Vercel AI SDK adapter for kernl",
   "keywords": [
     "kernl",
@@ -43,7 +43,7 @@
     }
   },
   "peerDependencies": {
-    "@ai-sdk/provider": "^3.0.0-beta.15"
+    "@ai-sdk/provider": "^3.0.3"
   },
   "peerDependenciesMeta": {
     "@ai-sdk/anthropic": {
@@ -57,10 +57,10 @@
     }
   },
   "devDependencies": {
-    "@ai-sdk/anthropic": "3.0.0-beta.53",
-    "@ai-sdk/google": "3.0.0-beta.43",
-    "@ai-sdk/openai": "3.0.0-beta.57",
-    "@ai-sdk/provider": "3.0.0-beta.15",
+    "@ai-sdk/anthropic": "^3.0.14",
+    "@ai-sdk/google": "^3.0.9",
+    "@ai-sdk/openai": "^3.0.11",
+    "@ai-sdk/provider": "^3.0.3",
     "@types/node": "^24.10.0",
     "ai": "^5.0.93",
     "tsc-alias": "^1.8.10",
@@ -68,10 +68,10 @@
     "vitest": "^4.0.8"
   },
   "dependencies": {
-    "@kernl-sdk/protocol": "0.5.0",
-    "@kernl-sdk/retrieval": "0.1.9",
+    "@kernl-sdk/protocol": "0.5.1",
+    "@kernl-sdk/retrieval": "0.1.10",
     "@kernl-sdk/shared": "^0.4.0",
-    "kernl": "0.12.2"
+    "kernl": "0.12.3"
   },
   "scripts": {
     "build": "tsc && tsc-alias --resolve-full-paths",

package/src/__tests__/integration.test.ts

@@ -64,9 +64,8 @@ describe.skipIf(SKIP_OPENAI_TESTS)("AISDKLanguageModel - OpenAI", () => {
       expect(response.content).toBeDefined();
       expect(response.content.length).toBeGreaterThan(0);
       expect(response.usage).toBeDefined();
-      expect(response.usage.totalTokens).toBeGreaterThan(0);
-      expect(response.usage.inputTokens).toBeGreaterThan(0);
-      expect(response.usage.outputTokens).toBeGreaterThan(0);
+      expect(response.usage.inputTokens.total).toBeGreaterThan(0);
+      expect(response.usage.outputTokens.total).toBeGreaterThan(0);
 
       // Should have at least one message
       const messages = response.content.filter(
@@ -103,7 +102,7 @@ describe.skipIf(SKIP_OPENAI_TESTS)("AISDKLanguageModel - OpenAI", () => {
       });
 
       expect(response.content).toBeDefined();
-      expect(response.usage.totalTokens).toBeGreaterThan(0);
+      expect(response.usage.inputTokens.total).toBeGreaterThan(0);
     });
 
     it("should handle multi-turn conversations", async () => {
@@ -135,7 +134,7 @@ describe.skipIf(SKIP_OPENAI_TESTS)("AISDKLanguageModel - OpenAI", () => {
       });
 
       expect(response.content).toBeDefined();
-      expect(response.usage.totalTokens).toBeGreaterThan(0);
+      expect(response.usage.inputTokens.total).toBeGreaterThan(0);
 
       // Check that it remembers the name (should mention Alice)
       const assistantMessages = response.content.filter(
@@ -161,7 +160,7 @@ describe.skipIf(SKIP_OPENAI_TESTS)("AISDKLanguageModel - OpenAI", () => {
       });
 
       expect(response.content).toBeDefined();
-      expect(response.usage.totalTokens).toBeGreaterThan(0);
+      expect(response.usage.inputTokens.total).toBeGreaterThan(0);
     });
 
     it("should respect maxTokens setting", async () => {
@@ -181,8 +180,8 @@ describe.skipIf(SKIP_OPENAI_TESTS)("AISDKLanguageModel - OpenAI", () => {
       });
 
       expect(response.content).toBeDefined();
-      expect(response.usage.outputTokens).toBeDefined();
-      expect(response.usage.outputTokens).toBeLessThanOrEqual(20);
+      expect(response.usage.outputTokens.total).toBeDefined();
+      expect(response.usage.outputTokens.total).toBeLessThanOrEqual(20);
     });
   });
 
@@ -216,7 +215,7 @@ describe.skipIf(SKIP_OPENAI_TESTS)("AISDKLanguageModel - OpenAI", () => {
       // Should have usage information
       const finishEvent = finishEvents[0] as any;
       expect(finishEvent.usage).toBeDefined();
-      expect(finishEvent.usage.totalTokens).toBeGreaterThan(0);
+      expect(finishEvent.usage.inputTokens.total).toBeGreaterThan(0);
     });
 
     it("should stream text deltas", async () => {
@@ -1141,7 +1140,7 @@ describe.skipIf(SKIP_GOOGLE_TESTS)("AISDKLanguageModel - Google", () => {
       expect(response.content).toBeDefined();
       expect(response.content.length).toBeGreaterThan(0);
       expect(response.usage).toBeDefined();
-      expect(response.usage.totalTokens).toBeGreaterThan(0);
+      expect(response.usage.inputTokens.total).toBeGreaterThan(0);
 
       const messages = response.content.filter(
         (item) => item.kind === "message",
@@ -1180,7 +1179,7 @@ describe.skipIf(SKIP_GOOGLE_TESTS)("AISDKLanguageModel - Google", () => {
       // Should have usage information
       const finishEvent = finishEvents[0] as any;
       expect(finishEvent.usage).toBeDefined();
-      expect(finishEvent.usage.totalTokens).toBeGreaterThan(0);
+      expect(finishEvent.usage.inputTokens.total).toBeGreaterThan(0);
     });
   });
 

package/src/__tests__/language-model.test.ts

@@ -51,11 +51,10 @@ describe("AISDKLanguageModel", () => {
                 },
                 {
                   type: "finish",
-                  finishReason: "stop",
+                  finishReason: { unified: "stop", raw: "stop" },
                   usage: {
-                    inputTokens: 5,
-                    outputTokens: 10,
-                    totalTokens: 15,
+                    inputTokens: { total: 5, noCache: 5, cacheRead: undefined, cacheWrite: undefined },
+                    outputTokens: { total: 10, text: 10, reasoning: undefined },
                   },
                   providerMetadata: undefined,
                 },
@@ -163,11 +162,10 @@ describe("AISDKLanguageModel", () => {
                 },
                 {
                   type: "finish",
-                  finishReason: "stop",
+                  finishReason: { unified: "stop", raw: "stop" },
                   usage: {
-                    inputTokens: 5,
-                    outputTokens: 20,
-                    totalTokens: 25,
+                    inputTokens: { total: 5, noCache: 5, cacheRead: undefined, cacheWrite: undefined },
+                    outputTokens: { total: 20, text: 20, reasoning: undefined },
                   },
                   providerMetadata: undefined,
                 },
@@ -272,11 +270,10 @@ describe("AISDKLanguageModel", () => {
                 },
                 {
                   type: "finish",
-                  finishReason: "stop",
+                  finishReason: { unified: "stop", raw: "stop" },
                   usage: {
-                    inputTokens: 5,
-                    outputTokens: 10,
-                    totalTokens: 15,
+                    inputTokens: { total: 5, noCache: 5, cacheRead: undefined, cacheWrite: undefined },
+                    outputTokens: { total: 10, text: 10, reasoning: undefined },
                   },
                   providerMetadata: undefined,
                 },
@@ -353,11 +350,10 @@ describe("AISDKLanguageModel", () => {
                 },
                 {
                   type: "finish",
-                  finishReason: "stop",
+                  finishReason: { unified: "stop", raw: "stop" },
                   usage: {
-                    inputTokens: 5,
-                    outputTokens: 10,
-                    totalTokens: 15,
+                    inputTokens: { total: 5, noCache: 5, cacheRead: undefined, cacheWrite: undefined },
+                    outputTokens: { total: 10, text: 10, reasoning: undefined },
                   },
                   providerMetadata: undefined,
                 },
@@ -413,11 +409,10 @@ describe("AISDKLanguageModel", () => {
                 },
                 {
                   type: "finish",
-                  finishReason: "tool-calls",
+                  finishReason: { unified: "tool-calls", raw: "tool_calls" },
                   usage: {
-                    inputTokens: 5,
-                    outputTokens: 10,
-                    totalTokens: 15,
+                    inputTokens: { total: 5, noCache: 5, cacheRead: undefined, cacheWrite: undefined },
+                    outputTokens: { total: 10, text: 10, reasoning: undefined },
                   },
                   providerMetadata: undefined,
                 },