@kernl-sdk/ai 0.3.5 → 0.4.1

package/dist/convert/stream.js

@@ -31,66 +31,66 @@ export const STREAM_PART = {
         switch (part.type) {
             case "text-start":
                 return {
-                    kind: "text-start",
+                    kind: "text.start",
                     id: part.id,
                     providerMetadata: part.providerMetadata,
                 };
             case "text-delta":
                 return {
-                    kind: "text-delta",
+                    kind: "text.delta",
                     id: part.id,
                     text: part.delta,
                     providerMetadata: part.providerMetadata,
                 };
             case "text-end":
                 return {
-                    kind: "text-end",
+                    kind: "text.end",
                     id: part.id,
                     providerMetadata: part.providerMetadata,
                 };
             case "reasoning-start":
                 return {
-                    kind: "reasoning-start",
+                    kind: "reasoning.start",
                     id: part.id,
                     providerMetadata: part.providerMetadata,
                 };
             case "reasoning-delta":
                 return {
-                    kind: "reasoning-delta",
+                    kind: "reasoning.delta",
                     id: part.id,
                     text: part.delta,
                     providerMetadata: part.providerMetadata,
                 };
             case "reasoning-end":
                 return {
-                    kind: "reasoning-end",
+                    kind: "reasoning.end",
                     id: part.id,
                     providerMetadata: part.providerMetadata,
                 };
             case "tool-input-start":
                 return {
-                    kind: "tool-input-start",
+                    kind: "tool.input.start",
                     id: part.id,
-                    toolName: part.toolName,
+                    toolId: part.toolName,
                     title: part.title,
                     providerMetadata: part.providerMetadata,
                 };
             case "tool-input-delta":
                 return {
-                    kind: "tool-input-delta",
+                    kind: "tool.input.delta",
                     id: part.id,
                     delta: part.delta,
                     providerMetadata: part.providerMetadata,
                 };
             case "tool-input-end":
                 return {
-                    kind: "tool-input-end",
+                    kind: "tool.input.end",
                     id: part.id,
                     providerMetadata: part.providerMetadata,
                 };
             case "tool-call":
                 return {
-                    kind: "tool-call",
+                    kind: "tool.call",
                     callId: part.toolCallId,
                     toolId: part.toolName,
                     state: IN_PROGRESS,
@@ -100,7 +100,7 @@ export const STREAM_PART = {
             case "tool-result":
                 // provider-defined tools can stream tool results
                 return {
-                    kind: "tool-result",
+                    kind: "tool.result",
                     callId: part.toolCallId,
                     toolId: part.toolName,
                     state: part.isError ? FAILED : COMPLETED,
@@ -110,7 +110,7 @@ export const STREAM_PART = {
                 };
             case "stream-start":
                 return {
-                    kind: "stream-start",
+                    kind: "stream.start",
                     warnings: part.warnings.map(WARNING.decode),
                 };
             case "finish":

package/dist/convert/ui-message.js

@@ -123,7 +123,7 @@ const TOOL_UI_PART = {
         switch (part.state) {
             case "input-available": {
                 const call = {
-                    kind: "tool-call",
+                    kind: "tool.call",
                     callId,
                     toolId,
                     state: IN_PROGRESS,
@@ -134,7 +134,7 @@ const TOOL_UI_PART = {
             }
             case "output-available": {
                 const result = {
-                    kind: "tool-result",
+                    kind: "tool.result",
                     callId,
                     toolId,
                     state: COMPLETED,
@@ -146,7 +146,7 @@ const TOOL_UI_PART = {
             }
             case "output-error": {
                 const result = {
-                    kind: "tool-result",
+                    kind: "tool.result",
                     callId,
                     toolId,
                     state: FAILED,
@@ -220,11 +220,11 @@ export function historyToUIMessages(items) {
                 const reasoningParts = [];
                 while (j < items.length && items[j].kind !== "message") {
                     const next = items[j];
-                    if (next.kind === "tool-call") {
+                    if (next.kind === "tool.call") {
                         const existing = toolMap.get(next.callId) || {};
                         toolMap.set(next.callId, { ...existing, call: next });
                     }
-                    else if (next.kind === "tool-result") {
+                    else if (next.kind === "tool.result") {
                         const existing = toolMap.get(next.callId) || {};
                         toolMap.set(next.callId, { ...existing, result: next });
                     }

package/dist/convert/ui-stream.d.ts

@@ -1,5 +1,6 @@
 import type { Codec } from "@kernl-sdk/shared/lib";
 import { type LanguageModelStreamEvent } from "@kernl-sdk/protocol";
+import { type ThreadStreamEvent } from "kernl";
 import { type UIMessageChunk } from "ai";
 /**
  * Convert kernl stream to AI SDK UIMessage stream.
@@ -14,7 +15,7 @@ import { type UIMessageChunk } from "ai";
  * return createUIMessageStreamResponse({ stream: ui });
  * ```
  */
-export declare function toUIMessageStream(stream: AsyncIterable<LanguageModelStreamEvent>): ReadableStream<UIMessageChunk>;
+export declare function toUIMessageStream(stream: AsyncIterable<ThreadStreamEvent | LanguageModelStreamEvent>): ReadableStream<UIMessageChunk>;
 /**
  * Convert kernl's LanguageModelStreamEvent to AI SDK's UIMessageChunk format.
  *

package/dist/convert/ui-stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-stream.d.ts","sourceRoot":"","sources":["../../src/convert/ui-stream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EACL,KAAK,wBAAwB,EAE9B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAyB,KAAK,cAAc,EAAE,MAAM,IAAI,CAAC;AAEhE;;;;;;;;;;;;GAYG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,aAAa,CAAC,wBAAwB,CAAC,GAC9C,cAAc,CAAC,cAAc,CAAC,CAWhC;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,cAAc,EAAE,KAAK,CAChC,wBAAwB,EACxB,cAAc,GAAG,IAAI,CAuHtB,CAAC"}
+{"version":3,"file":"ui-stream.d.ts","sourceRoot":"","sources":["../../src/convert/ui-stream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,KAAK,wBAAwB,EAAU,MAAM,qBAAqB,CAAC;AAC5E,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAC/C,OAAO,EAAyB,KAAK,cAAc,EAAE,MAAM,IAAI,CAAC;AAEhE;;;;;;;;;;;;GAYG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,aAAa,CAAC,iBAAiB,GAAG,wBAAwB,CAAC,GAClE,cAAc,CAAC,cAAc,CAAC,CAahC;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,cAAc,EAAE,KAAK,CAChC,wBAAwB,EACxB,cAAc,GAAG,IAAI,CAuHtB,CAAC"}

package/dist/convert/ui-stream.js

@@ -1,4 +1,4 @@
-import { FAILED, } from "@kernl-sdk/protocol";
+import { FAILED } from "@kernl-sdk/protocol";
 import { createUIMessageStream } from "ai";
 /**
  * Convert kernl stream to AI SDK UIMessage stream.
@@ -17,6 +17,8 @@ export function toUIMessageStream(stream) {
     return createUIMessageStream({
         async execute({ writer }) {
             for await (const event of stream) {
+                if (event.kind === "system")
+                    continue;
                 const chunk = STREAM_UI_PART.encode(event);
                 if (chunk) {
                     writer.write(chunk);
@@ -38,59 +40,59 @@ export function toUIMessageStream(stream) {
 export const STREAM_UI_PART = {
     encode: (event) => {
         switch (event.kind) {
-            case "text-start":
+            case "text.start":
                 return {
                     type: "text-start",
                     id: event.id,
                 };
-            case "text-delta":
+            case "text.delta":
                 return {
                     type: "text-delta",
                     id: event.id,
                     delta: event.text,
                 };
-            case "text-end":
+            case "text.end":
                 return {
                     type: "text-end",
                     id: event.id,
                 };
-            case "reasoning-start":
+            case "reasoning.start":
                 return {
                     type: "reasoning-start",
                     id: event.id,
                 };
-            case "reasoning-delta":
+            case "reasoning.delta":
                 return {
                     type: "reasoning-delta",
                     id: event.id,
                     delta: event.text,
                 };
-            case "reasoning-end":
+            case "reasoning.end":
                 return {
                     type: "reasoning-end",
                     id: event.id,
                 };
-            case "tool-input-start":
+            case "tool.input.start":
                 return {
                     type: "tool-input-start",
                     toolCallId: event.id,
-                    toolName: event.toolName,
+                    toolName: event.toolId,
                     ...(event.title != null ? { title: event.title } : {}),
                 };
-            case "tool-input-delta":
+            case "tool.input.delta":
                 return {
                     type: "tool-input-delta",
                     toolCallId: event.id,
                     inputTextDelta: event.delta,
                 };
-            case "tool-call":
+            case "tool.call":
                 return {
                     type: "tool-input-available",
                     toolCallId: event.callId,
                     toolName: event.toolId,
                     input: JSON.parse(event.arguments),
                 };
-            case "tool-result":
+            case "tool.result":
                 // Convert tool result to tool-output-available or tool-output-error
                 if (event.state === FAILED) {
                     return {
@@ -104,7 +106,7 @@ export const STREAM_UI_PART = {
                     toolCallId: event.callId,
                     output: event.result,
                 };
-            case "stream-start":
+            case "stream.start":
                 return {
                     type: "start",
                 };
@@ -125,7 +127,7 @@ export const STREAM_UI_PART = {
             case "message":
             case "reasoning":
             // - events without direct UI equivalents -
-            case "tool-input-end":
+            case "tool.input.end":
             case "raw":
                 return null;
             default:

package/dist/language-model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"language-model.d.ts","sourceRoot":"","sources":["../src/language-model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,KAAK,EACV,aAAa,EACb,oBAAoB,EACpB,qBAAqB,EACrB,wBAAwB,EACzB,MAAM,qBAAqB,CAAC;AAS7B;;GAEG;AACH,qBAAa,kBAAmB,YAAW,aAAa;IAK1C,OAAO,CAAC,KAAK;IAJzB,QAAQ,CAAC,IAAI,EAAG,KAAK,CAAU;IAC/B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;gBAEL,KAAK,EAAE,eAAe;IAK1C;;OAEG;IACG,QAAQ,CACZ,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,qBAAqB,CAAC;IAiBjC;;OAEG;IACI,MAAM,CACX,OAAO,EAAE,oBAAoB,GAC5B,aAAa,CAAC,wBAAwB,CAAC;CAkF3C"}
+{"version":3,"file":"language-model.d.ts","sourceRoot":"","sources":["../src/language-model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,KAAK,EACV,aAAa,EACb,oBAAoB,EACpB,qBAAqB,EACrB,wBAAwB,EACzB,MAAM,qBAAqB,CAAC;AAU7B;;GAEG;AACH,qBAAa,kBAAmB,YAAW,aAAa;IAK1C,OAAO,CAAC,KAAK;IAJzB,QAAQ,CAAC,IAAI,EAAG,KAAK,CAAU;IAC/B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;gBAEL,KAAK,EAAE,eAAe;IAK1C;;OAEG;IACG,QAAQ,CACZ,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,qBAAqB,CAAC;IAiBjC;;OAEG;IACI,MAAM,CACX,OAAO,EAAE,oBAAoB,GAC5B,aAAa,CAAC,wBAAwB,CAAC;CAkF3C"}

package/dist/language-model.js

@@ -4,6 +4,7 @@ import { TOOL } from "./convert/tools.js";
 import { MODEL_SETTINGS } from "./convert/settings.js";
 import { MODEL_RESPONSE, RESPONSE_FORMAT } from "./convert/response.js";
 import { convertStream } from "./convert/stream.js";
+import { normalizeProvider } from "./util.js";
 /**
  * LanguageModel adapter for the AI SDK LanguageModelV3.
  */
@@ -14,7 +15,7 @@ export class AISDKLanguageModel {
     modelId;
     constructor(model) {
         this.model = model;
-        this.provider = model.provider;
+        this.provider = normalizeProvider(model.provider);
         this.modelId = model.modelId;
     }
     /**
@@ -54,19 +55,19 @@ export class AISDKLanguageModel {
         const rbuf = {};
         for await (const event of convertStream(stream.stream)) {
             switch (event.kind) {
-                case "text-start": {
+                case "text.start": {
                     tbuf[event.id] = "";
                     yield event;
                     break;
                 }
-                case "text-delta": {
+                case "text.delta": {
                     if (tbuf[event.id] !== undefined) {
                         tbuf[event.id] += event.text;
                     }
                     yield event;
                     break;
                 }
-                case "text-end": {
+                case "text.end": {
                     const text = tbuf[event.id];
                     if (text !== undefined) {
                         yield message({
@@ -79,19 +80,19 @@ export class AISDKLanguageModel {
                     yield event;
                     break;
                 }
-                case "reasoning-start": {
+                case "reasoning.start": {
                     rbuf[event.id] = "";
                     yield event;
                     break;
                 }
-                case "reasoning-delta": {
+                case "reasoning.delta": {
                     if (rbuf[event.id] !== undefined) {
                         rbuf[event.id] += event.text;
                     }
                     yield event;
                     break;
                 }
-                case "reasoning-end": {
+                case "reasoning.end": {
                     const text = rbuf[event.id];
                     if (text !== undefined) {
                         yield reasoning({
@@ -104,7 +105,7 @@ export class AISDKLanguageModel {
                     break;
                 }
                 default:
-                    // all other events (tool-call, tool-result, finish, etc.) pass through
+                    // all other events (tool.call, tool.result, finish, etc.) pass through
                     yield event;
                     break;
             }

package/dist/util.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Normalize AI SDK provider strings to base provider ID.
+ *
+ * AI SDK returns provider strings like:
+ * - "anthropic.messages" -> "anthropic"
+ * - "openai.responses" -> "openai"
+ * - "google.generative-ai" -> "google"
+ */
+export declare function normalizeProvider(provider: string): string;
+//# sourceMappingURL=util.d.ts.map

package/dist/util.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAG1D"}

package/dist/util.js

@@ -0,0 +1,12 @@
+/**
+ * Normalize AI SDK provider strings to base provider ID.
+ *
+ * AI SDK returns provider strings like:
+ * - "anthropic.messages" -> "anthropic"
+ * - "openai.responses" -> "openai"
+ * - "google.generative-ai" -> "google"
+ */
+export function normalizeProvider(provider) {
+    const dot = provider.indexOf(".");
+    return dot !== -1 ? provider.slice(0, dot) : provider;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kernl-sdk/ai",
-  "version": "0.3.5",
+  "version": "0.4.1",
   "description": "Vercel AI SDK adapter for kernl",
   "keywords": [
     "kernl",
@@ -68,9 +68,10 @@
     "vitest": "^4.0.8"
   },
   "dependencies": {
-    "@kernl-sdk/protocol": "0.4.2",
-    "@kernl-sdk/retrieval": "0.1.8",
-    "@kernl-sdk/shared": "^0.4.0"
+    "@kernl-sdk/protocol": "0.5.0",
+    "@kernl-sdk/retrieval": "0.1.9",
+    "@kernl-sdk/shared": "^0.4.0",
+    "kernl": "0.12.1"
   },
   "scripts": {
     "build": "tsc && tsc-alias --resolve-full-paths",

package/src/__tests__/integration.test.ts

@@ -240,7 +240,7 @@ describe.skipIf(SKIP_OPENAI_TESTS)("AISDKLanguageModel - OpenAI", () => {
       }
 
       // Should have text-delta events
-      const textDeltas = events.filter((e) => e.kind === "text-delta");
+      const textDeltas = events.filter((e) => e.kind === "text.delta");
       expect(textDeltas.length).toBeGreaterThan(0);
 
       // Each text-delta should have text
@@ -302,15 +302,15 @@ describe.skipIf(SKIP_OPENAI_TESTS)("AISDKLanguageModel - OpenAI", () => {
       expect(events.length).toBeGreaterThan(0);
 
       // Should have text-delta events (for streaming UX)
-      const textDeltas = events.filter((e) => e.kind === "text-delta");
+      const textDeltas = events.filter((e) => e.kind === "text.delta");
       expect(textDeltas.length).toBeGreaterThan(0);
 
       // Should have text-start event
-      const textStarts = events.filter((e) => e.kind === "text-start");
+      const textStarts = events.filter((e) => e.kind === "text.start");
       expect(textStarts.length).toBeGreaterThan(0);
 
       // Should have text-end event
-      const textEnds = events.filter((e) => e.kind === "text-end");
+      const textEnds = events.filter((e) => e.kind === "text.end");
       expect(textEnds.length).toBeGreaterThan(0);
 
       // Should have complete Message item (for history)
@@ -386,7 +386,7 @@ describe.skipIf(SKIP_OPENAI_TESTS)("AISDKLanguageModel - OpenAI", () => {
       expect(events.length).toBeGreaterThan(0);
 
       // Should have a tool-call event
-      const toolCalls = events.filter((e) => e.kind === "tool-call");
+      const toolCalls = events.filter((e) => e.kind === "tool.call");
       expect(toolCalls.length).toBeGreaterThan(0);
 
       const toolCall = toolCalls[0] as any;
@@ -445,7 +445,7 @@ describe.skipIf(SKIP_OPENAI_TESTS)("AISDKLanguageModel - OpenAI", () => {
 
       // Should have a tool call
       const toolCalls = response.content.filter(
-        (item) => item.kind === "tool-call",
+        (item) => item.kind === "tool.call",
       );
       expect(toolCalls.length).toBeGreaterThan(0);
 
@@ -499,7 +499,7 @@ describe.skipIf(SKIP_OPENAI_TESTS)("AISDKLanguageModel - OpenAI", () => {
 
       // Should have a tool call since it's required
       const toolCalls = response.content.filter(
-        (item) => item.kind === "tool-call",
+        (item) => item.kind === "tool.call",
       );
       expect(toolCalls.length).toBeGreaterThan(0);
     });
@@ -546,7 +546,7 @@ describe.skipIf(SKIP_OPENAI_TESTS)("AISDKLanguageModel - OpenAI", () => {
 
       // Should potentially have multiple tool calls
       const toolCalls = response.content.filter(
-        (item) => item.kind === "tool-call",
+        (item) => item.kind === "tool.call",
       );
       expect(toolCalls.length).toBeGreaterThan(0);
     });
@@ -589,7 +589,7 @@ describe.skipIf(SKIP_OPENAI_TESTS)("AISDKLanguageModel - OpenAI", () => {
 
       // Extract tool calls
       const toolCalls = firstResponse.content.filter(
-        (item) => item.kind === "tool-call",
+        (item) => item.kind === "tool.call",
       );
       expect(toolCalls.length).toBeGreaterThan(0);
 
@@ -608,7 +608,7 @@ describe.skipIf(SKIP_OPENAI_TESTS)("AISDKLanguageModel - OpenAI", () => {
           },
           ...firstResponse.content,
           {
-            kind: "tool-result",
+            kind: "tool.result",
             callId: toolCall.callId,
             toolId: toolCall.toolId,
             state: "completed",
@@ -699,7 +699,7 @@ describe.skipIf(SKIP_OPENAI_TESTS)("AISDKLanguageModel - OpenAI", () => {
 
       // Should have a tool call
       const toolCalls = response.content.filter(
-        (item) => item.kind === "tool-call",
+        (item) => item.kind === "tool.call",
       );
       expect(toolCalls.length).toBeGreaterThan(0);
 
@@ -840,7 +840,7 @@ describe.skipIf(SKIP_OPENAI_TESTS)("AISDKLanguageModel - OpenAI", () => {
       expect(events.length).toBeGreaterThan(0);
 
       // Should have text-delta events for streaming JSON
-      const textDeltas = events.filter((e) => e.kind === "text-delta");
+      const textDeltas = events.filter((e) => e.kind === "text.delta");
       expect(textDeltas.length).toBeGreaterThan(0);
 
       // Should have a complete message with the JSON
@@ -921,7 +921,7 @@ describe.skipIf(SKIP_ANTHROPIC_TESTS)("AISDKLanguageModel - Anthropic", () => {
 
       // Should have a tool call
       const toolCalls = response.content.filter(
-        (item) => item.kind === "tool-call",
+        (item) => item.kind === "tool.call",
       );
       expect(toolCalls.length).toBeGreaterThan(0);
 
@@ -987,7 +987,7 @@ describe.skipIf(SKIP_ANTHROPIC_TESTS)("AISDKLanguageModel - Anthropic", () => {
       expect(events.length).toBeGreaterThan(0);
 
       // Should have a tool-call event
-      const toolCalls = events.filter((e) => e.kind === "tool-call");
+      const toolCalls = events.filter((e) => e.kind === "tool.call");
       expect(toolCalls.length).toBeGreaterThan(0);
 
       const toolCall = toolCalls[0] as any;
@@ -1089,7 +1089,7 @@ describe.skipIf(SKIP_ANTHROPIC_TESTS)("AISDKLanguageModel - Anthropic", () => {
       expect(events.length).toBeGreaterThan(0);
 
       // Should have text-delta events for streaming JSON
-      const textDeltas = events.filter((e) => e.kind === "text-delta");
+      const textDeltas = events.filter((e) => e.kind === "text.delta");
       expect(textDeltas.length).toBeGreaterThan(0);
 
       // Should have a complete message with the JSON
@@ -1265,7 +1265,7 @@ describe.skipIf(SKIP_GOOGLE_TESTS)("AISDKLanguageModel - Google", () => {
       expect(events.length).toBeGreaterThan(0);
 
       // Should have text-delta events for streaming JSON
-      const textDeltas = events.filter((e) => e.kind === "text-delta");
+      const textDeltas = events.filter((e) => e.kind === "text.delta");
       expect(textDeltas.length).toBeGreaterThan(0);
 
       // Should have a complete message with the JSON

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

@@ -91,19 +91,19 @@ describe("AISDKLanguageModel", () => {
       expect(events).toHaveLength(7);
 
       // Check delta events
-      expect(events[0]).toMatchObject({ kind: "text-start", id: "text-1" });
+      expect(events[0]).toMatchObject({ kind: "text.start", id: "text-1" });
       expect(events[1]).toMatchObject({
-        kind: "text-delta",
+        kind: "text.delta",
         id: "text-1",
         text: "Hello",
       });
       expect(events[2]).toMatchObject({
-        kind: "text-delta",
+        kind: "text.delta",
         id: "text-1",
         text: " ",
       });
       expect(events[3]).toMatchObject({
-        kind: "text-delta",
+        kind: "text.delta",
         id: "text-1",
         text: "World",
       });
@@ -125,7 +125,7 @@ describe("AISDKLanguageModel", () => {
       expect(messageEvent.id).toBeDefined();
 
       // Check end event (yielded after Message)
-      expect(events[5]).toMatchObject({ kind: "text-end", id: "text-1" });
+      expect(events[5]).toMatchObject({ kind: "text.end", id: "text-1" });
 
       // Check finish event
       expect(events[6]).toMatchObject({ kind: "finish" });
@@ -204,16 +204,16 @@ describe("AISDKLanguageModel", () => {
 
       // Check delta events
       expect(events[0]).toMatchObject({
-        kind: "reasoning-start",
+        kind: "reasoning.start",
         id: "reason-1",
       });
       expect(events[1]).toMatchObject({
-        kind: "reasoning-delta",
+        kind: "reasoning.delta",
         id: "reason-1",
         text: "Let me think",
       });
       expect(events[2]).toMatchObject({
-        kind: "reasoning-delta",
+        kind: "reasoning.delta",
         id: "reason-1",
         text: " about this",
       });
@@ -230,7 +230,7 @@ describe("AISDKLanguageModel", () => {
 
       // Check end event (yielded after Reasoning)
       expect(events[4]).toMatchObject({
-        kind: "reasoning-end",
+        kind: "reasoning.end",
         id: "reason-1",
       });
 
@@ -453,7 +453,7 @@ describe("AISDKLanguageModel", () => {
       expect(events).toHaveLength(2);
 
       expect(events[0]).toMatchObject({
-        kind: "tool-call",
+        kind: "tool.call",
         callId: "call-123",
         toolId: "calculator",
         state: IN_PROGRESS,

package/src/convert/__tests__/message.test.ts

@@ -212,7 +212,7 @@ describe("MESSAGE codec", () => {
   describe("encode - tool-call items", () => {
     it("should encode tool-call item", () => {
       const result = MESSAGE.encode({
-        kind: "tool-call",
+        kind: "tool.call",
         callId: "call-123",
         toolId: "get_weather",
         state: "completed",
@@ -225,7 +225,7 @@ describe("MESSAGE codec", () => {
           {
             type: "tool-call",
             toolCallId: "call-123",
-            toolName: "get_weather",
+            toolId: "get_weather",
             input: { city: "SF" },
             providerOptions: undefined,
           },
@@ -235,7 +235,7 @@ describe("MESSAGE codec", () => {
 
     it("should include providerMetadata for tool-call", () => {
       const result = MESSAGE.encode({
-        kind: "tool-call",
+        kind: "tool.call",
         callId: "call-123",
         toolId: "get_weather",
         state: "completed",
@@ -253,7 +253,7 @@ describe("MESSAGE codec", () => {
   describe("encode - tool-result items", () => {
     it("should encode tool-result item", () => {
       const result = MESSAGE.encode({
-        kind: "tool-result",
+        kind: "tool.result",
         callId: "call-123",
         toolId: "get_weather",
         state: "completed",
@@ -267,7 +267,7 @@ describe("MESSAGE codec", () => {
           {
             type: "tool-result",
             toolCallId: "call-123",
-            toolName: "get_weather",
+            toolId: "get_weather",
             output: {
               type: "json",
               value: { temp: 72, conditions: "sunny" },
@@ -280,7 +280,7 @@ describe("MESSAGE codec", () => {
 
     it("should encode tool-result item with error", () => {
       const result = MESSAGE.encode({
-        kind: "tool-result",
+        kind: "tool.result",
         callId: "call-123",
         toolId: "get_weather",
         state: "failed",
@@ -294,7 +294,7 @@ describe("MESSAGE codec", () => {
           {
             type: "tool-result",
             toolCallId: "call-123",
-            toolName: "get_weather",
+            toolId: "get_weather",
             output: {
               type: "error-text",
               value: "Network timeout",

package/src/convert/__tests__/settings.test.ts

@@ -109,7 +109,7 @@ describe("MODEL_SETTINGS codec", () => {
       const result = MODEL_SETTINGS.encode(settings);
 
       expect(result).toEqual({
-        toolChoice: { type: "tool", toolName: "get_weather" },
+        toolChoice: { type: "tool", toolId: "get_weather" },
       });
     });