@jz92/ai-provider 0.2.1 → 0.3.1

package/dist/index.cjs

@@ -417,12 +417,17 @@ async function generateStructured(options) {
   const timeout = TIMEOUT_MS[config.provider];
   const result = await withRetry(
     () => withTimeout(
-      () => (0, import_ai.generateObject)({ model, messages, schema: options.schema, maxTokens: config.maxTokens }),
+      () => (0, import_ai.generateText)({
+        model,
+        messages,
+        output: import_ai.Output.object({ schema: options.schema }),
+        maxOutputTokens: config.maxTokens
+      }),
       timeout
     ),
     config.provider
   );
-  return buildResponse(result.object, result.usage, config, options.cacheKey);
+  return buildResponse(result.output, result.usage, config, options.cacheKey);
 }
 async function generatePlainText(options) {
   const config = resolveProvider();
@@ -436,7 +441,7 @@ async function generatePlainText(options) {
   const timeout = TIMEOUT_MS[config.provider];
   const result = await withRetry(
     () => withTimeout(
-      () => (0, import_ai.generateText)({ model, messages, maxTokens: config.maxTokens }),
+      () => (0, import_ai.generateText)({ model, messages, maxOutputTokens: config.maxTokens }),
       timeout
     ),
     config.provider
@@ -453,7 +458,7 @@ function buildMessages(config, systemPrompt, userPrompt) {
           {
             type: "text",
             text: userPrompt,
-            experimental_providerMetadata: {
+            providerOptions: {
               anthropic: { cacheControl: { type: "ephemeral" } }
             }
           }
@@ -468,17 +473,12 @@ function buildMessages(config, systemPrompt, userPrompt) {
 }
 function buildResponse(data, usage, config, cacheKey) {
   if (cacheKey) responseCache.set(cacheKey, data);
-  let cachedTokens = 0;
-  if (usage?.experimental_providerMetadata) {
-    const meta = usage.experimental_providerMetadata;
-    const anthropic = meta?.anthropic;
-    cachedTokens = (anthropic?.cacheReadInputTokens ?? 0) + (anthropic?.cacheCreationInputTokens ?? 0);
-  }
+  const cachedTokens = (usage?.inputTokenDetails?.cacheReadTokens ?? 0) + (usage?.inputTokenDetails?.cacheCreationTokens ?? 0);
   const response = {
     data,
     usage: usage ? {
-      inputTokens: usage.promptTokens,
-      outputTokens: usage.completionTokens,
+      inputTokens: usage.inputTokens ?? 0,
+      outputTokens: usage.outputTokens ?? 0,
       cachedTokens
     } : void 0,
     provider: config.provider,
@@ -506,8 +506,7 @@ function logUsage(config, response) {
   if (response.fromCache) {
     lines.push(line("tokens", "\x1B[2mskipped \u2014 response cache hit\x1B[0m"));
   } else if (u) {
-    const tokenStr = `in: \x1B[33m${u.inputTokens}\x1B[0m  out: \x1B[33m${u.outputTokens}\x1B[0m`;
-    lines.push(line("tokens", tokenStr));
+    lines.push(line("tokens", `in: \x1B[33m${u.inputTokens}\x1B[0m  out: \x1B[33m${u.outputTokens}\x1B[0m`));
     if (u.cachedTokens > 0) {
       const pct = Math.round(u.cachedTokens / u.inputTokens * 100);
       lines.push(line("cached", `\x1B[32m${u.cachedTokens} tokens (${pct}% of input)\x1B[0m`));

package/dist/index.d.cts

@@ -41,6 +41,9 @@ type AIResponse<T> = {
 /**
  * generateStructured — typed, validated JSON output.
  *
+ * Uses generateText + Output.object() (ai@6+ pattern).
+ * generateObject is deprecated in ai@6 and removed in ai@7.
+ *
  * @example
  * const result = await generateStructured({
  *   systemPrompt: MY_SYSTEM_PROMPT,

package/dist/index.d.ts

@@ -41,6 +41,9 @@ type AIResponse<T> = {
 /**
  * generateStructured — typed, validated JSON output.
  *
+ * Uses generateText + Output.object() (ai@6+ pattern).
+ * generateObject is deprecated in ai@6 and removed in ai@7.
+ *
  * @example
  * const result = await generateStructured({
  *   systemPrompt: MY_SYSTEM_PROMPT,

package/dist/index.js

@@ -1,5 +1,5 @@
 // src/gateway.ts
-import { generateObject, generateText } from "ai";
+import { generateText, Output } from "ai";
 
 // src/provider.ts
 function resolveProvider() {
@@ -377,12 +377,17 @@ async function generateStructured(options) {
   const timeout = TIMEOUT_MS[config.provider];
   const result = await withRetry(
     () => withTimeout(
-      () => generateObject({ model, messages, schema: options.schema, maxTokens: config.maxTokens }),
+      () => generateText({
+        model,
+        messages,
+        output: Output.object({ schema: options.schema }),
+        maxOutputTokens: config.maxTokens
+      }),
       timeout
     ),
     config.provider
   );
-  return buildResponse(result.object, result.usage, config, options.cacheKey);
+  return buildResponse(result.output, result.usage, config, options.cacheKey);
 }
 async function generatePlainText(options) {
   const config = resolveProvider();
@@ -396,7 +401,7 @@ async function generatePlainText(options) {
   const timeout = TIMEOUT_MS[config.provider];
   const result = await withRetry(
     () => withTimeout(
-      () => generateText({ model, messages, maxTokens: config.maxTokens }),
+      () => generateText({ model, messages, maxOutputTokens: config.maxTokens }),
       timeout
     ),
     config.provider
@@ -413,7 +418,7 @@ function buildMessages(config, systemPrompt, userPrompt) {
           {
             type: "text",
             text: userPrompt,
-            experimental_providerMetadata: {
+            providerOptions: {
               anthropic: { cacheControl: { type: "ephemeral" } }
             }
           }
@@ -428,17 +433,12 @@ function buildMessages(config, systemPrompt, userPrompt) {
 }
 function buildResponse(data, usage, config, cacheKey) {
   if (cacheKey) responseCache.set(cacheKey, data);
-  let cachedTokens = 0;
-  if (usage?.experimental_providerMetadata) {
-    const meta = usage.experimental_providerMetadata;
-    const anthropic = meta?.anthropic;
-    cachedTokens = (anthropic?.cacheReadInputTokens ?? 0) + (anthropic?.cacheCreationInputTokens ?? 0);
-  }
+  const cachedTokens = (usage?.inputTokenDetails?.cacheReadTokens ?? 0) + (usage?.inputTokenDetails?.cacheCreationTokens ?? 0);
   const response = {
     data,
     usage: usage ? {
-      inputTokens: usage.promptTokens,
-      outputTokens: usage.completionTokens,
+      inputTokens: usage.inputTokens ?? 0,
+      outputTokens: usage.outputTokens ?? 0,
       cachedTokens
     } : void 0,
     provider: config.provider,
@@ -466,8 +466,7 @@ function logUsage(config, response) {
   if (response.fromCache) {
     lines.push(line("tokens", "\x1B[2mskipped \u2014 response cache hit\x1B[0m"));
   } else if (u) {
-    const tokenStr = `in: \x1B[33m${u.inputTokens}\x1B[0m  out: \x1B[33m${u.outputTokens}\x1B[0m`;
-    lines.push(line("tokens", tokenStr));
+    lines.push(line("tokens", `in: \x1B[33m${u.inputTokens}\x1B[0m  out: \x1B[33m${u.outputTokens}\x1B[0m`));
     if (u.cachedTokens > 0) {
       const pct = Math.round(u.cachedTokens / u.inputTokens * 100);
       lines.push(line("cached", `\x1B[32m${u.cachedTokens} tokens (${pct}% of input)\x1B[0m`));

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@jz92/ai-provider",
-  "version": "0.2.1",
+  "version": "0.3.1",
   "description": "Environment-aware AI provider for portfolio projects. Local dev → Ollama, deployed → any cloud provider.",
   "author": "jz92",
   "license": "MIT",
   "private": false,
   "type": "module",
-  "main": "./dist/index.js",
-  "module": "./dist/index.mjs",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.js"
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
     }
   },
   "files": [
@@ -27,19 +27,18 @@
     "dev": "tsup src/index.ts --format esm,cjs --dts --watch",
     "type-check": "tsc --noEmit",
     "test": "NODE_ENV=development npx tsx --tsconfig tsconfig.test.json test/smoke.ts",
-    "postinstall": "node scripts/postinstall.js",
     "setup:local": "bash scripts/setup-local.sh",
     "prepublishOnly": "npm run build && npm run type-check"
   },
   "peerDependencies": {
-    "ai": ">=4.0.0",
+    "ai": ">=6.0.0",
     "zod": ">=3.0.0",
-    "@ai-sdk/anthropic": ">=1.0.0",
-    "@ai-sdk/openai": ">=1.0.0",
-    "@ai-sdk/google": ">=1.0.0",
-    "@ai-sdk/groq": ">=1.0.0",
-    "@ai-sdk/mistral": ">=1.0.0",
-    "ollama-ai-provider": ">=0.16.0"
+    "@ai-sdk/anthropic": ">=3.0.0",
+    "@ai-sdk/openai": ">=3.0.0",
+    "@ai-sdk/google": ">=3.0.0",
+    "@ai-sdk/groq": ">=3.0.0",
+    "@ai-sdk/mistral": ">=3.0.0",
+    "ollama-ai-provider": ">=1.0.0"
   },
   "peerDependenciesMeta": {
     "@ai-sdk/anthropic": {