Merge pull request #70 from ai-2070/support-ai-v6-and-v7

Support AI v6 and v7

Author: LZL0

.github/workflows/ci.yml

@@ -29,3 +29,30 @@ jobs:
 
       - name: Build
         run: npm run build
+
+  # Guard the lower bound of the `ai` peer range (^6.0.0 || ^7.0.0).
+  # The main job above exercises ai v7 (the saved devDependency); this job
+  # pins ai to v6 so the adapter's cross-version typing keeps compiling.
+  compat-ai-v6:
+    name: Build against ai v6
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v7
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version: 24
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Pin ai to v6
+        run: npm install ai@6 --no-save
+
+      - name: Run tests
+        run: npm test
+
+      - name: Build
+        run: npm run build

package.json

@@ -157,7 +157,7 @@
     "@mastra/core": "^1.0.0",
     "@opentelemetry/api": "^1.0.0",
     "@sentry/node": "^10.0.0",
-    "ai": "^6.0.0",
+    "ai": "^6.0.0 || ^7.0.0",
     "effect": "^3.0.0",
     "openai": "^4.0.0 || ^5.0.0 || ^6.0.0",
     "zod": "^3.0.0 || ^4.0.0"
@@ -199,7 +199,7 @@
     "@types/uuid": "^11.0.0",
     "@vitest/coverage-v8": "^4.0.0",
     "@vitest/ui": "^4.0.0",
-    "ai": "^6.0.0",
+    "ai": "^7.0.0",
     "effect": "^3.19.0",
     "esbuild": "0.28.1",
     "glob": "^13.0.0",

src/adapters/vercel-ai.ts

@@ -5,17 +5,41 @@
 // Install it with: npm install ai
 
 import type { L0Event, L0Adapter } from "../types/l0";
-import type { StreamTextResult, TextStreamPart, ToolSet } from "ai";
+import type { TextStreamPart, ToolSet } from "ai";
 
 /**
- * Vercel AI SDK StreamTextResult with any tool set
+ * Vercel AI SDK stream chunk type
+ *
+ * `TextStreamPart` is a single-argument generic in both AI SDK v6 and v7, so
+ * this reference is version-agnostic.
  */
-export type VercelStreamTextResult = StreamTextResult<ToolSet, never>;
+export type VercelStreamChunk = TextStreamPart<ToolSet>;
 
 /**
- * Vercel AI SDK stream chunk type
+ * Vercel AI SDK StreamTextResult, typed structurally for cross-version support.
+ *
+ * We deliberately avoid `import('ai').StreamTextResult` because its generic
+ * arity changed between major versions: v6 is `StreamTextResult<TOOLS, OUTPUT>`
+ * while v7 added a middle generic, `StreamTextResult<TOOLS, RUNTIME_CONTEXT,
+ * OUTPUT>`. No single explicit instantiation satisfies both. Instead we declare
+ * only the members this adapter actually reads — mirroring the minimal-interface
+ * approach already used in vercel-ai-object.ts — so the adapter compiles against
+ * `ai@^6 || ^7`. Detection stays runtime-based via `isVercelAIStream`.
  */
-export type VercelStreamChunk = TextStreamPart<ToolSet>;
+export interface VercelStreamTextResult {
+  /** Raw text token stream */
+  textStream: AsyncIterable<string>;
+  /** Full event stream including tool calls and results */
+  fullStream: ReadableStream<VercelStreamChunk>;
+  /** Promise resolving to the complete text */
+  text: Promise<string>;
+  /** Promise resolving to the tool calls made */
+  toolCalls: Promise<unknown>;
+  /** Promise resolving to usage information */
+  usage: Promise<unknown>;
+  /** Promise resolving to the finish reason */
+  finishReason: Promise<unknown>;
+}
 
 /**
  * Options for wrapping Vercel AI streams