veryfront 0.1.261 → 0.1.263

package/esm/deno.js

@@ -1,6 +1,6 @@
 export default {
     "name": "veryfront",
-    "version": "0.1.261",
+    "version": "0.1.263",
     "license": "Apache-2.0",
     "nodeModulesDir": "auto",
     "workspace": [

package/esm/src/agent/ag-ui-detached-start.d.ts

@@ -1,10 +1,7 @@
 import { z } from "zod";
+import { type AgUiResumeValue } from "./ag-ui-tool-shared.js";
 import { type RunResumeSessionManager } from "./runtime/index.js";
 import type { Agent } from "./types.js";
-type AgUiResumeValue = {
-    result: unknown;
-    isError: boolean;
-};
 type AgUiContextValue = Record<string, unknown> | ((request: Request) => Record<string, unknown> | Promise<Record<string, unknown>>);
 export declare const AgUiDetachedStartRequestSchema: z.ZodObject<{
     messages: z.ZodArray<z.ZodObject<{

package/esm/src/agent/ag-ui-detached-start.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ag-ui-detached-start.d.ts","sourceRoot":"","sources":["../../../src/src/agent/ag-ui-detached-start.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ag-ui-detached-start.d.ts","sourceRoot":"","sources":["../../../src/src/agent/ag-ui-detached-start.ts"],"names":[],"mappings":"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"}

package/esm/src/agent/ag-ui-detached-start.js

@@ -1,34 +1,12 @@
 import { z } from "zod";
 import { INVALID_ARGUMENT } from "../errors/index.js";
-import { SKILL_TOOL_IDS } from "../skill/types.js";
-import { toolRegistry } from "../tool/index.js";
 import { streamDataStreamEvents } from "./data-stream.js";
-import { AgUiRequestSchema, normalizeAgUiMessages, } from "./ag-ui-host-support.js";
+import { AgUiRequestSchema, normalizeAgUiMessages } from "./ag-ui-host-support.js";
+import { extractRequest } from "./ag-ui-request-shared.js";
+import { buildMergedAgUiTools } from "./ag-ui-tool-shared.js";
 import { AgentRuntime, RunAlreadyExistsError, } from "./runtime/index.js";
 const AGENT_ID_PATTERN = /^[a-zA-Z0-9_-]+$/;
 const AG_UI_DETACHED_RUN_ID_SCHEMA = z.string().min(1).max(128).regex(AGENT_ID_PATTERN);
-function isRequest(obj) {
-    return (typeof obj === "object" &&
-        obj !== null &&
-        "json" in obj &&
-        typeof obj.json === "function" &&
-        "url" in obj &&
-        typeof obj.url === "string" &&
-        "method" in obj &&
-        typeof obj.method === "string");
-}
-function extractRequest(requestOrCtx) {
-    if (isRequest(requestOrCtx))
-        return requestOrCtx;
-    if (typeof requestOrCtx === "object" && requestOrCtx !== null && "request" in requestOrCtx) {
-        const candidate = requestOrCtx.request;
-        if (isRequest(candidate))
-            return candidate;
-    }
-    throw INVALID_ARGUMENT.create({
-        detail: "Invalid handler argument: expected Request or APIContext",
-    });
-}
 function buildStreamContext(request, baseContext, threadId, runId) {
     return {
         ...baseContext,
@@ -40,49 +18,8 @@ function buildStreamContext(request, baseContext, threadId, runId) {
         },
     };
 }
-function createInjectedAgUiTool(runId, tool, sessionManager) {
-    return {
-        id: tool.name,
-        type: "function",
-        description: tool.description ?? tool.name,
-        inputSchema: z.record(z.string(), z.unknown()),
-        inputSchemaJson: (tool.parameters ??
-            { type: "object", properties: {}, additionalProperties: true }),
-        execute: async (_input, context) => {
-            const toolCallId = typeof context?.toolCallId === "string" ? context.toolCallId : null;
-            if (!toolCallId) {
-                throw new Error(`Missing toolCallId for injected tool "${tool.name}"`);
-            }
-            sessionManager.prepareForSignal(runId, toolCallId);
-            const submitted = await sessionManager.waitForSignal(runId, toolCallId);
-            if (submitted.isError) {
-                throw new Error(typeof submitted.result === "string"
-                    ? submitted.result
-                    : JSON.stringify(submitted.result));
-            }
-            return submitted.result;
-        },
-    };
-}
 function buildMergedTools(agent, request, sessionManager) {
-    const injectedTools = Object.fromEntries(request.tools.map((tool) => [
-        tool.name,
-        createInjectedAgUiTool(request.runId, tool, sessionManager),
-    ]));
-    if (!agent.config.tools) {
-        return Object.keys(injectedTools).length > 0 ? injectedTools : undefined;
-    }
-    if (agent.config.tools === true) {
-        const merged = {};
-        for (const [toolId] of toolRegistry.getAll()) {
-            if (!agent.config.skills && SKILL_TOOL_IDS.has(toolId)) {
-                continue;
-            }
-            merged[toolId] = true;
-        }
-        return { ...merged, ...injectedTools };
-    }
-    return { ...agent.config.tools, ...injectedTools };
+    return buildMergedAgUiTools(agent, request.runId, request.tools, sessionManager);
 }
 function scheduleDetachedTask(requestOrCtx, task) {
     if (typeof requestOrCtx === "object" &&

package/esm/src/agent/ag-ui-handler.d.ts

@@ -1,10 +1,7 @@
 import type { Agent } from "./types.js";
 import { type RunResumeSessionManager } from "./runtime/index.js";
+import { type AgUiResumeValue } from "./ag-ui-tool-shared.js";
 export { type AgUiContextItem, AgUiContextItemSchema, type AgUiInjectedTool, AgUiInjectedToolSchema, type AgUiRequest, AgUiRequestSchema, } from "./ag-ui-host-support.js";
-type AgUiResumeValue = {
-    result: unknown;
-    isError: boolean;
-};
 export interface AgUiHandlerOptions {
     context?: Record<string, unknown> | ((request: Request) => Record<string, unknown> | Promise<Record<string, unknown>>);
     sessionManager?: RunResumeSessionManager<AgUiResumeValue>;

package/esm/src/agent/ag-ui-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ag-ui-handler.d.ts","sourceRoot":"","sources":["../../../src/src/agent/ag-ui-handler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAGL,KAAK,uBAAuB,EAC7B,MAAM,oBAAoB,CAAC;AAkB5B,OAAO,EACL,KAAK,eAAe,EACpB,qBAAqB,EACrB,KAAK,gBAAgB,EACrB,sBAAsB,EACtB,KAAK,WAAW,EAChB,iBAAiB,GAClB,MAAM,yBAAyB,CAAC;AAQjC,KAAK,eAAe,GAAG;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC;AAkT7D,MAAM,WAAW,kBAAkB;IACjC,OAAO,CAAC,EACJ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvB,CAAC,CAAC,OAAO,EAAE,OAAO,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACvF,cAAc,CAAC,EAAE,uBAAuB,CAAC,eAAe,CAAC,CAAC;CAC3D;AAED,MAAM,WAAW,0BAA2B,SAAQ,kBAAkB;IACpE,KAAK,EAAE,KAAK,CAAC;CACd;AAUD,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,kBAAkB,GAC3B,CAAC,YAAY,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;AAChD,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,0BAA0B,EAClC,OAAO,CAAC,EAAE,kBAAkB,GAC3B,CAAC,YAAY,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC"}
+{"version":3,"file":"ag-ui-handler.d.ts","sourceRoot":"","sources":["../../../src/src/agent/ag-ui-handler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAGL,KAAK,uBAAuB,EAC7B,MAAM,oBAAoB,CAAC;AAc5B,OAAO,EAAE,KAAK,eAAe,EAAwB,MAAM,wBAAwB,CAAC;AAEpF,OAAO,EACL,KAAK,eAAe,EACpB,qBAAqB,EACrB,KAAK,gBAAgB,EACrB,sBAAsB,EACtB,KAAK,WAAW,EAChB,iBAAiB,GAClB,MAAM,yBAAyB,CAAC;AA8OjC,MAAM,WAAW,kBAAkB;IACjC,OAAO,CAAC,EACJ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvB,CAAC,CAAC,OAAO,EAAE,OAAO,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACvF,cAAc,CAAC,EAAE,uBAAuB,CAAC,eAAe,CAAC,CAAC;CAC3D;AAED,MAAM,WAAW,0BAA2B,SAAQ,kBAAkB;IACpE,KAAK,EAAE,KAAK,CAAC;CACd;AAUD,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,kBAAkB,GAC3B,CAAC,YAAY,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;AAChD,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,0BAA0B,EAClC,OAAO,CAAC,EAAE,kBAAkB,GAC3B,CAAC,YAAY,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC"}

package/esm/src/agent/ag-ui-handler.js

@@ -2,40 +2,17 @@ import * as dntShim from "../../_dnt.shims.js";
 import { z } from "zod";
 import { getAgent } from "./composition/index.js";
 import { AgentRuntime, RunAlreadyExistsError, } from "./runtime/index.js";
-import { INVALID_ARGUMENT } from "../errors/index.js";
-import { SKILL_TOOL_IDS } from "../skill/types.js";
-import { toolRegistry } from "../tool/index.js";
 import { createStreamTransformState, finalizeRunEvents, formatAgUiEvent, mapRuntimeEventToAgUi, } from "../internal-agents/ag-ui-sse.js";
 import { streamDataStreamEvents } from "./data-stream.js";
 import { normalizeAgUiMessages, parseAgUiRequestOrError, } from "./ag-ui-host-support.js";
+import { extractRequest } from "./ag-ui-request-shared.js";
+import { buildMergedAgUiTools } from "./ag-ui-tool-shared.js";
 export { AgUiContextItemSchema, AgUiInjectedToolSchema, AgUiRequestSchema, } from "./ag-ui-host-support.js";
 const AG_UI_HEADERS = {
     "Content-Type": "text/event-stream",
     "Cache-Control": "no-cache",
     Connection: "keep-alive",
 };
-function isRequest(obj) {
-    return (typeof obj === "object" &&
-        obj !== null &&
-        "json" in obj &&
-        typeof obj.json === "function" &&
-        "url" in obj &&
-        typeof obj.url === "string" &&
-        "method" in obj &&
-        typeof obj.method === "string");
-}
-function extractRequest(requestOrCtx) {
-    if (isRequest(requestOrCtx))
-        return requestOrCtx;
-    if (typeof requestOrCtx === "object" && requestOrCtx !== null && "request" in requestOrCtx) {
-        const candidate = requestOrCtx.request;
-        if (isRequest(candidate))
-            return candidate;
-    }
-    throw INVALID_ARGUMENT.create({
-        detail: "Invalid handler argument: expected Request or APIContext",
-    });
-}
 function generateRunId() {
     return `run_${dntShim.crypto.randomUUID().replaceAll("-", "")}`;
 }
@@ -155,30 +132,6 @@ async function createAgUiDirectStreamResponse(agent, request, baseContext) {
         upstreamStatusText: upstream.statusText,
     });
 }
-function createInjectedAgUiTool(runId, tool, sessionManager) {
-    return {
-        id: tool.name,
-        type: "function",
-        description: tool.description ?? tool.name,
-        inputSchema: z.record(z.string(), z.unknown()),
-        inputSchemaJson: (tool.parameters ??
-            { type: "object", properties: {}, additionalProperties: true }),
-        execute: async (_input, context) => {
-            const toolCallId = typeof context?.toolCallId === "string" ? context.toolCallId : null;
-            if (!toolCallId) {
-                throw new Error(`Missing toolCallId for injected tool "${tool.name}"`);
-            }
-            sessionManager.prepareForSignal(runId, toolCallId);
-            const submitted = await sessionManager.waitForSignal(runId, toolCallId);
-            if (submitted.isError) {
-                throw new Error(typeof submitted.result === "string"
-                    ? submitted.result
-                    : JSON.stringify(submitted.result));
-            }
-            return submitted.result;
-        },
-    };
-}
 async function createAgUiInjectedToolsStreamResponse(agent, request, baseContext, sessionManager) {
     const threadId = request.threadId ?? dntShim.crypto.randomUUID();
     const runId = request.runId ?? generateRunId();
@@ -191,20 +144,9 @@ async function createAgUiInjectedToolsStreamResponse(agent, request, baseContext
         }
         throw error;
     }
-    const injectedTools = Object.fromEntries(request.tools.map((tool) => [tool.name, createInjectedAgUiTool(runId, tool, sessionManager)]));
-    const mergedTools = !agent.config.tools
-        ? injectedTools
-        : agent.config.tools === true
-            ? {
-                ...Object.fromEntries([...toolRegistry.getAll()]
-                    .filter(([toolId]) => agent.config.skills || !SKILL_TOOL_IDS.has(toolId))
-                    .map(([toolId]) => [toolId, true])),
-                ...injectedTools,
-            }
-            : { ...agent.config.tools, ...injectedTools };
     const runtime = new AgentRuntime(agent.id, {
         ...agent.config,
-        tools: mergedTools,
+        tools: buildMergedAgUiTools(agent, runId, request.tools, sessionManager),
     });
     let upstreamBody;
     try {

package/esm/src/agent/ag-ui-host-support.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ag-ui-host-support.d.ts","sourceRoot":"","sources":["../../../src/src/agent/ag-ui-host-support.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAY1C,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAgBD,eAAO,MAAM,sBAAsB;;;;iBAOjC,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;2BAqBhC,CAAC;AAYH,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAe5B,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AACtE,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AACpE,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AA0E5D,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,CAE7E;AAED,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,GAAG,QAAQ,CAAC,CA6BjC;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,WAAW,CAAC,UAAU,CAAC,GAAG,OAAO,EAAE,CAUlF;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,YAAY,CAQpF;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,GAAG,QAAQ,CAUxF;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,GAAG,QAAQ,CASlF"}
+{"version":3,"file":"ag-ui-host-support.d.ts","sourceRoot":"","sources":["../../../src/src/agent/ag-ui-host-support.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAa1C,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAgBD,eAAO,MAAM,sBAAsB;;;;iBAOjC,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;2BAqBhC,CAAC;AAYH,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAe5B,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AACtE,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AACpE,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AA0E5D,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,CAE7E;AAED,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,GAAG,QAAQ,CAAC,CAKjC;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,WAAW,CAAC,UAAU,CAAC,GAAG,OAAO,EAAE,CAUlF;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,YAAY,CAQpF;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,GAAG,QAAQ,CAUxF;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,GAAG,QAAQ,CASlF"}

package/esm/src/agent/ag-ui-host-support.js

@@ -1,5 +1,6 @@
 import { z } from "zod";
 import { formatAgUiEvent } from "../internal-agents/ag-ui-sse.js";
+import { parseAgUiJsonRequestOrError } from "./ag-ui-request-shared.js";
 const AGENT_ID_PATTERN = /^[a-zA-Z0-9_-]+$/;
 const MAX_TOOL_PARAMETERS_BYTES = 16_384;
 const MAX_CONTEXT_ITEM_BYTES = 16_384;
@@ -127,27 +128,7 @@ export async function parseAgUiRequest(request) {
     return AgUiRequestSchema.parse(await request.json());
 }
 export async function parseAgUiRequestOrError(request) {
-    try {
-        return await parseAgUiRequest(request);
-    }
-    catch (error) {
-        if (error instanceof z.ZodError) {
-            return Response.json({
-                error: "Invalid AG-UI request",
-                details: error.issues.map((issue) => ({
-                    path: issue.path,
-                    message: issue.message,
-                })),
-            }, { status: 400 });
-        }
-        if (error instanceof SyntaxError || error instanceof TypeError) {
-            return Response.json({
-                error: "Invalid AG-UI request",
-                details: [{ path: [], message: "Malformed JSON request body" }],
-            }, { status: 400 });
-        }
-        throw error;
-    }
+    return await parseAgUiJsonRequestOrError(() => parseAgUiRequest(request), "Invalid AG-UI request");
 }
 export function normalizeAgUiMessages(messages) {
     return messages.map((message) => ({

package/esm/src/agent/ag-ui-request-shared.d.ts

@@ -0,0 +1,4 @@
+export declare function isRequest(value: unknown): value is Request;
+export declare function extractRequest(requestOrCtx: unknown): Request;
+export declare function parseAgUiJsonRequestOrError<T>(parseRequest: () => Promise<T>, errorLabel: string): Promise<T | Response>;
+//# sourceMappingURL=ag-ui-request-shared.d.ts.map

package/esm/src/agent/ag-ui-request-shared.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ag-ui-request-shared.d.ts","sourceRoot":"","sources":["../../../src/src/agent/ag-ui-request-shared.ts"],"names":[],"mappings":"AAGA,wBAAgB,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,OAAO,CAW1D;AAED,wBAAgB,cAAc,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO,CAW7D;AAED,wBAAsB,2BAA2B,CAAC,CAAC,EACjD,YAAY,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAC9B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,CAAC,GAAG,QAAQ,CAAC,CA6BvB"}

package/esm/src/agent/ag-ui-request-shared.js

@@ -0,0 +1,47 @@
+import { z } from "zod";
+import { INVALID_ARGUMENT } from "../errors/index.js";
+export function isRequest(value) {
+    return (typeof value === "object" &&
+        value !== null &&
+        "json" in value &&
+        typeof value.json === "function" &&
+        "url" in value &&
+        typeof value.url === "string" &&
+        "method" in value &&
+        typeof value.method === "string");
+}
+export function extractRequest(requestOrCtx) {
+    if (isRequest(requestOrCtx))
+        return requestOrCtx;
+    if (typeof requestOrCtx === "object" && requestOrCtx !== null && "request" in requestOrCtx) {
+        const candidate = requestOrCtx.request;
+        if (isRequest(candidate))
+            return candidate;
+    }
+    throw INVALID_ARGUMENT.create({
+        detail: "Invalid handler argument: expected Request or APIContext",
+    });
+}
+export async function parseAgUiJsonRequestOrError(parseRequest, errorLabel) {
+    try {
+        return await parseRequest();
+    }
+    catch (error) {
+        if (error instanceof z.ZodError) {
+            return Response.json({
+                error: errorLabel,
+                details: error.issues.map((issue) => ({
+                    path: issue.path,
+                    message: issue.message,
+                })),
+            }, { status: 400 });
+        }
+        if (error instanceof SyntaxError || error instanceof TypeError) {
+            return Response.json({
+                error: errorLabel,
+                details: [{ path: [], message: "Malformed JSON request body" }],
+            }, { status: 400 });
+        }
+        throw error;
+    }
+}

package/esm/src/agent/ag-ui-run-control.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ag-ui-run-control.d.ts","sourceRoot":"","sources":["../../../src/src/agent/ag-ui-run-control.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAEL,uBAAuB,EAGxB,MAAM,6BAA6B,CAAC;AAKrC,eAAO,MAAM,sBAAsB;;;;;2BAOjC,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAEtE,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAgCF,MAAM,WAAW,4BAA4B;IAC3C,YAAY,CAAC,EACT,CAAC,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,YAAY,EAAE,OAAO,CAAA;KAAE,KAAK,MAAM,GAAG,IAAI,CAAC,GACvE,CAAC,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,YAAY,EAAE,OAAO,CAAA;KAAE,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC;CACtF;AAED,MAAM,WAAW,wBAAyB,SAAQ,4BAA4B;IAC5E,cAAc,EAAE,uBAAuB,CAAC,WAAW,CAAC,CAAC;CACtD;AAED,MAAM,WAAW,wBAAwB,CAAC,CAAC,GAAG,OAAO,CAAE,SAAQ,4BAA4B;IACzF,cAAc,EAAE,uBAAuB,CAAC,CAAC,CAAC,CAAC;CAC5C;AAaD,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,wBAAwB,GAChC,CAAC,YAAY,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAsD9C;AAED,wBAAgB,uBAAuB,CAAC,CAAC,GAAG,OAAO,EACjD,OAAO,EAAE,wBAAwB,CAAC,CAAC,CAAC,GACnC,CAAC,YAAY,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAgB9C"}
+{"version":3,"file":"ag-ui-run-control.d.ts","sourceRoot":"","sources":["../../../src/src/agent/ag-ui-run-control.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAEL,uBAAuB,EAGxB,MAAM,6BAA6B,CAAC;AAKrC,eAAO,MAAM,sBAAsB;;;;;2BAOjC,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAEtE,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAMF,MAAM,WAAW,4BAA4B;IAC3C,YAAY,CAAC,EACT,CAAC,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,YAAY,EAAE,OAAO,CAAA;KAAE,KAAK,MAAM,GAAG,IAAI,CAAC,GACvE,CAAC,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,YAAY,EAAE,OAAO,CAAA;KAAE,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC;CACtF;AAED,MAAM,WAAW,wBAAyB,SAAQ,4BAA4B;IAC5E,cAAc,EAAE,uBAAuB,CAAC,WAAW,CAAC,CAAC;CACtD;AAED,MAAM,WAAW,wBAAwB,CAAC,CAAC,GAAG,OAAO,CAAE,SAAQ,4BAA4B;IACzF,cAAc,EAAE,uBAAuB,CAAC,CAAC,CAAC,CAAC;CAC5C;AAaD,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,wBAAwB,GAChC,CAAC,YAAY,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAsD9C;AAED,wBAAgB,uBAAuB,CAAC,CAAC,GAAG,OAAO,EACjD,OAAO,EAAE,wBAAwB,CAAC,CAAC,CAAC,GACnC,CAAC,YAAY,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAgB9C"}

package/esm/src/agent/ag-ui-run-control.js

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { INVALID_ARGUMENT } from "../errors/index.js";
+import { extractRequest } from "./ag-ui-request-shared.js";
 import { RunNotActiveError, WaitConflictError, WaitNotPendingError, } from "./runtime/resume-session.js";
 const RESUME_PATH_REGEX = /^\/api\/ag-ui\/runs\/([^/]+)\/resume$/;
 const CANCEL_PATH_REGEX = /^\/api\/ag-ui\/runs\/([^/]+)$/;
@@ -11,28 +11,6 @@ export const AgUiResumeSignalSchema = z.discriminatedUnion("type", [
         isError: z.boolean().optional().default(false),
     }),
 ]);
-function isRequest(value) {
-    return (typeof value === "object" &&
-        value !== null &&
-        "json" in value &&
-        typeof value.json === "function" &&
-        "url" in value &&
-        typeof value.url === "string" &&
-        "method" in value &&
-        typeof value.method === "string");
-}
-function extractRequest(requestOrCtx) {
-    if (isRequest(requestOrCtx))
-        return requestOrCtx;
-    if (typeof requestOrCtx === "object" && requestOrCtx !== null && "request" in requestOrCtx) {
-        const candidate = requestOrCtx.request;
-        if (isRequest(candidate))
-            return candidate;
-    }
-    throw INVALID_ARGUMENT.create({
-        detail: "Invalid handler argument: expected Request or APIContext",
-    });
-}
 function getRunId(pathname, regex) {
     return regex.exec(pathname)?.[1] ?? null;
 }

package/esm/src/agent/ag-ui-runtime-handler.d.ts

@@ -1,10 +1,7 @@
 import { type RunResumeSessionManager } from "./runtime/index.js";
 import type { Agent } from "./types.js";
 import { type AgUiRuntimeRequest } from "./runtime-ag-ui-contract.js";
-type AgUiResumeValue = {
-    result: unknown;
-    isError: boolean;
-};
+import { type AgUiResumeValue } from "./ag-ui-tool-shared.js";
 export interface AgUiRuntimeLifecycleContext {
     request: AgUiRuntimeRequest;
     toolCallId?: string;
@@ -33,5 +30,4 @@ export type AgUiRuntimeHandlerConfig = AgUiRuntimeHandlerConfigWithAgent | (AgUi
     execute: AgUiRuntimeHandlerExecute;
 });
 export declare function createAgUiRuntimeHandler(config: AgUiRuntimeHandlerConfig): (requestOrCtx: unknown) => Promise<Response>;
-export {};
 //# sourceMappingURL=ag-ui-runtime-handler.d.ts.map

package/esm/src/agent/ag-ui-runtime-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ag-ui-runtime-handler.d.ts","sourceRoot":"","sources":["../../../src/src/agent/ag-ui-runtime-handler.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,KAAK,uBAAuB,EAC7B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAEL,KAAK,kBAAkB,EAExB,MAAM,6BAA6B,CAAC;AAgBrC,KAAK,eAAe,GAAG;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC;AAG7D,MAAM,WAAW,2BAA2B;IAC1C,OAAO,EAAE,kBAAkB,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAqWD,MAAM,WAAW,8BAA8B;IAC7C,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,kBAAkB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,qBAAqB,CAAC,EAAE,MAAM,OAAO,CAAC,QAAQ,CAAC,CAAC;CACjD;AAED,MAAM,MAAM,yBAAyB,GAAG,CACtC,KAAK,EAAE,8BAA8B,KAClC,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;AAElC,MAAM,WAAW,yBAAyB;IACxC,OAAO,CAAC,EACJ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvB,CAAC,CAAC,OAAO,EAAE,OAAO,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACvF,cAAc,CAAC,EAAE,uBAAuB,CAAC,eAAe,CAAC,CAAC;IAC1D,OAAO,CAAC,EAAE,yBAAyB,CAAC;IACpC,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,2BAA2B,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAChF,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,2BAA2B,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC1E,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,2BAA2B,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;CAC1E;AAED,MAAM,WAAW,iCAAkC,SAAQ,yBAAyB;IAClF,KAAK,EAAE,KAAK,CAAC;CACd;AAED,MAAM,MAAM,wBAAwB,GAChC,iCAAiC,GACjC,CAAC,yBAAyB,GAAG;IAAE,KAAK,CAAC,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,yBAAyB,CAAA;CAAE,CAAC,CAAC;AAE5F,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,wBAAwB,GAC/B,CAAC,YAAY,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAqI9C"}
+{"version":3,"file":"ag-ui-runtime-handler.d.ts","sourceRoot":"","sources":["../../../src/src/agent/ag-ui-runtime-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,uBAAuB,EAC7B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EACL,KAAK,kBAAkB,EAExB,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,KAAK,eAAe,EAAwB,MAAM,wBAAwB,CAAC;AAkBpF,MAAM,WAAW,2BAA2B;IAC1C,OAAO,EAAE,kBAAkB,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAqRD,MAAM,WAAW,8BAA8B;IAC7C,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,kBAAkB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,qBAAqB,CAAC,EAAE,MAAM,OAAO,CAAC,QAAQ,CAAC,CAAC;CACjD;AAED,MAAM,MAAM,yBAAyB,GAAG,CACtC,KAAK,EAAE,8BAA8B,KAClC,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;AAElC,MAAM,WAAW,yBAAyB;IACxC,OAAO,CAAC,EACJ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvB,CAAC,CAAC,OAAO,EAAE,OAAO,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACvF,cAAc,CAAC,EAAE,uBAAuB,CAAC,eAAe,CAAC,CAAC;IAC1D,OAAO,CAAC,EAAE,yBAAyB,CAAC;IACpC,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,2BAA2B,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAChF,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,2BAA2B,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC1E,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,2BAA2B,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;CAC1E;AAED,MAAM,WAAW,iCAAkC,SAAQ,yBAAyB;IAClF,KAAK,EAAE,KAAK,CAAC;CACd;AAED,MAAM,MAAM,wBAAwB,GAChC,iCAAiC,GACjC,CAAC,yBAAyB,GAAG;IAAE,KAAK,CAAC,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,yBAAyB,CAAA;CAAE,CAAC,CAAC;AAE5F,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,wBAAwB,GAC/B,CAAC,YAAY,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAqI9C"}

package/esm/src/agent/ag-ui-runtime-handler.js

@@ -1,9 +1,8 @@
 import { z } from "zod";
-import { INVALID_ARGUMENT } from "../errors/index.js";
-import { SKILL_TOOL_IDS } from "../skill/types.js";
-import { toolRegistry } from "../tool/index.js";
 import { AgentRuntime, RunAlreadyExistsError, } from "./runtime/index.js";
 import { parseAgUiRuntimeRequestOrError, } from "./runtime-ag-ui-contract.js";
+import { extractRequest } from "./ag-ui-request-shared.js";
+import { buildMergedAgUiTools } from "./ag-ui-tool-shared.js";
 import { normalizeAgUiRuntimeMessages } from "./ag-ui-runtime-support.js";
 import { createStreamTransformState, finalizeRunEvents, formatAgUiEvent, mapRuntimeEventToAgUi, } from "../internal-agents/ag-ui-sse.js";
 import { streamDataStreamEvents } from "./data-stream.js";
@@ -33,31 +32,9 @@ async function invokeLifecycleCallbackAndWait(callback, context) {
         return;
     }
 }
-function isRequest(obj) {
-    return (typeof obj === "object" &&
-        obj !== null &&
-        "json" in obj &&
-        typeof obj.json === "function" &&
-        "url" in obj &&
-        typeof obj.url === "string" &&
-        "method" in obj &&
-        typeof obj.method === "string");
-}
 function isRecord(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function extractRequest(requestOrCtx) {
-    if (isRequest(requestOrCtx))
-        return requestOrCtx;
-    if (typeof requestOrCtx === "object" && requestOrCtx !== null && "request" in requestOrCtx) {
-        const candidate = requestOrCtx.request;
-        if (isRequest(candidate))
-            return candidate;
-    }
-    throw INVALID_ARGUMENT.create({
-        detail: "Invalid handler argument: expected Request or APIContext",
-    });
-}
 function buildStreamContext(request, baseContext) {
     return {
         ...baseContext,
@@ -179,49 +156,8 @@ async function createAgUiRuntimeDirectStreamResponse(agent, request, baseContext
         onToolCallSeen: lifecycle?.onToolCallSeen,
     });
 }
-function createInjectedAgUiTool(runId, tool, sessionManager) {
-    return {
-        id: tool.name,
-        type: "function",
-        description: tool.description ?? tool.name,
-        inputSchema: z.record(z.string(), z.unknown()),
-        inputSchemaJson: (tool.parameters ??
-            { type: "object", properties: {}, additionalProperties: true }),
-        execute: async (_input, context) => {
-            const toolCallId = typeof context?.toolCallId === "string" ? context.toolCallId : null;
-            if (!toolCallId) {
-                throw new Error(`Missing toolCallId for injected tool "${tool.name}"`);
-            }
-            sessionManager.prepareForSignal(runId, toolCallId);
-            const submitted = await sessionManager.waitForSignal(runId, toolCallId);
-            if (submitted.isError) {
-                throw new Error(typeof submitted.result === "string"
-                    ? submitted.result
-                    : JSON.stringify(submitted.result));
-            }
-            return submitted.result;
-        },
-    };
-}
 function buildMergedTools(agent, request, sessionManager) {
-    const injectedTools = Object.fromEntries(request.tools.map((tool) => [
-        tool.name,
-        createInjectedAgUiTool(request.runId, tool, sessionManager),
-    ]));
-    if (!agent.config.tools) {
-        return Object.keys(injectedTools).length > 0 ? injectedTools : undefined;
-    }
-    if (agent.config.tools === true) {
-        const merged = {};
-        for (const [toolId] of toolRegistry.getAll()) {
-            if (!agent.config.skills && SKILL_TOOL_IDS.has(toolId)) {
-                continue;
-            }
-            merged[toolId] = true;
-        }
-        return { ...merged, ...injectedTools };
-    }
-    return { ...agent.config.tools, ...injectedTools };
+    return buildMergedAgUiTools(agent, request.runId, request.tools, sessionManager);
 }
 async function createAgUiRuntimeInjectedToolsStreamResponse(agent, request, baseContext, sessionManager, lifecycle) {
     try {

package/esm/src/agent/ag-ui-tool-shared.d.ts

@@ -0,0 +1,15 @@
+import type { Tool } from "../tool/types.js";
+import type { RunResumeSessionManager } from "./runtime/index.js";
+import type { Agent } from "./types.js";
+export type AgUiResumeValue = {
+    result: unknown;
+    isError: boolean;
+};
+export interface AgUiInjectedToolLike {
+    name: string;
+    description?: string;
+    parameters?: unknown;
+}
+export declare function createInjectedAgUiTool(runId: string, tool: AgUiInjectedToolLike, sessionManager: RunResumeSessionManager<AgUiResumeValue>): Tool;
+export declare function buildMergedAgUiTools(agent: Agent, runId: string, tools: AgUiInjectedToolLike[], sessionManager: RunResumeSessionManager<AgUiResumeValue>): Agent["config"]["tools"];
+//# sourceMappingURL=ag-ui-tool-shared.d.ts.map

package/esm/src/agent/ag-ui-tool-shared.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ag-ui-tool-shared.d.ts","sourceRoot":"","sources":["../../../src/src/agent/ag-ui-tool-shared.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAExC,MAAM,MAAM,eAAe,GAAG;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC;AAEpE,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,oBAAoB,EAC1B,cAAc,EAAE,uBAAuB,CAAC,eAAe,CAAC,GACvD,IAAI,CA0BN;AAED,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,oBAAoB,EAAE,EAC7B,cAAc,EAAE,uBAAuB,CAAC,eAAe,CAAC,GACvD,KAAK,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAwB1B"}

package/esm/src/agent/ag-ui-tool-shared.js

@@ -0,0 +1,47 @@
+import { z } from "zod";
+import { SKILL_TOOL_IDS } from "../skill/types.js";
+import { toolRegistry } from "../tool/registry.js";
+export function createInjectedAgUiTool(runId, tool, sessionManager) {
+    return {
+        id: tool.name,
+        type: "function",
+        description: tool.description ?? tool.name,
+        inputSchema: z.record(z.string(), z.unknown()),
+        inputSchemaJson: (tool.parameters ??
+            { type: "object", properties: {}, additionalProperties: true }),
+        execute: async (_input, context) => {
+            const toolCallId = typeof context?.toolCallId === "string" ? context.toolCallId : null;
+            if (!toolCallId) {
+                throw new Error(`Missing toolCallId for injected tool "${tool.name}"`);
+            }
+            sessionManager.prepareForSignal(runId, toolCallId);
+            const submitted = await sessionManager.waitForSignal(runId, toolCallId);
+            if (submitted.isError) {
+                throw new Error(typeof submitted.result === "string"
+                    ? submitted.result
+                    : JSON.stringify(submitted.result));
+            }
+            return submitted.result;
+        },
+    };
+}
+export function buildMergedAgUiTools(agent, runId, tools, sessionManager) {
+    const injectedTools = Object.fromEntries(tools.map((tool) => [
+        tool.name,
+        createInjectedAgUiTool(runId, tool, sessionManager),
+    ]));
+    if (!agent.config.tools) {
+        return Object.keys(injectedTools).length > 0 ? injectedTools : undefined;
+    }
+    if (agent.config.tools === true) {
+        const merged = {};
+        for (const [toolId] of toolRegistry.getAll()) {
+            if (!agent.config.skills && SKILL_TOOL_IDS.has(toolId)) {
+                continue;
+            }
+            merged[toolId] = true;
+        }
+        return { ...merged, ...injectedTools };
+    }
+    return { ...agent.config.tools, ...injectedTools };
+}

package/esm/src/agent/conversation-run-event-preparation.d.ts

@@ -1,5 +1,7 @@
-import { type ChatStreamEvent } from "../chat/protocol.js";
+import { type ChatMessageMetadata, type ChatStreamEvent, type ChatUiMessageChunk } from "../chat/protocol.js";
 import { type ConversationRunEvent, ConversationRunEventEncoder } from "./conversation-run-events.js";
+export declare function toConversationRunStreamEvent(chunk: ChatUiMessageChunk<ChatMessageMetadata>): ChatStreamEvent;
 export declare function prepareConversationRunStreamEvents(events: ChatStreamEvent[], encoder?: ConversationRunEventEncoder): ConversationRunEvent[];
+export declare function prepareConversationRunChunkEvents(chunks: ChatUiMessageChunk<ChatMessageMetadata>[], encoder?: ConversationRunEventEncoder): ConversationRunEvent[];
 export declare function prepareConversationRunExternalEvents(events: ConversationRunEvent[]): ConversationRunEvent[];
 //# sourceMappingURL=conversation-run-event-preparation.d.ts.map

package/esm/src/agent/conversation-run-event-preparation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-run-event-preparation.d.ts","sourceRoot":"","sources":["../../../src/src/agent/conversation-run-event-preparation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EACL,KAAK,oBAAoB,EACzB,2BAA2B,EAE5B,MAAM,8BAA8B,CAAC;AAGtC,wBAAgB,kCAAkC,CAChD,MAAM,EAAE,eAAe,EAAE,EACzB,OAAO,8BAAoC,GAC1C,oBAAoB,EAAE,CAExB;AAED,wBAAgB,oCAAoC,CAClD,MAAM,EAAE,oBAAoB,EAAE,GAC7B,oBAAoB,EAAE,CAExB"}
+{"version":3,"file":"conversation-run-event-preparation.d.ts","sourceRoot":"","sources":["../../../src/src/agent/conversation-run-event-preparation.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,mBAAmB,EACxB,KAAK,eAAe,EACpB,KAAK,kBAAkB,EACxB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,oBAAoB,EACzB,2BAA2B,EAE5B,MAAM,8BAA8B,CAAC;AAiBtC,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,kBAAkB,CAAC,mBAAmB,CAAC,GAC7C,eAAe,CAuBjB;AAED,wBAAgB,kCAAkC,CAChD,MAAM,EAAE,eAAe,EAAE,EACzB,OAAO,8BAAoC,GAC1C,oBAAoB,EAAE,CAExB;AAED,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,kBAAkB,CAAC,mBAAmB,CAAC,EAAE,EACjD,OAAO,8BAAoC,GAC1C,oBAAoB,EAAE,CAKxB;AAED,wBAAgB,oCAAoC,CAClD,MAAM,EAAE,oBAAoB,EAAE,GAC7B,oBAAoB,EAAE,CAExB"}

package/esm/src/agent/conversation-run-event-preparation.js

@@ -1,8 +1,48 @@
 import { ConversationRunEventEncoder, encodeConversationRunEvents, } from "./conversation-run-events.js";
 import { normalizeConversationRunEvents } from "./conversation-run-event-normalization.js";
+function normalizeFinishReason(reason) {
+    switch (reason) {
+        case "stop":
+        case "length":
+        case "tool-calls":
+        case "content-filter":
+        case "error":
+        case "other":
+            return reason;
+        default:
+            return undefined;
+    }
+}
+export function toConversationRunStreamEvent(chunk) {
+    switch (chunk.type) {
+        case "start":
+            return {
+                type: "start",
+                ...(chunk.messageId !== undefined ? { messageId: chunk.messageId } : {}),
+                ...(chunk.messageMetadata !== undefined ? { messageMetadata: chunk.messageMetadata } : {}),
+            };
+        case "finish": {
+            const finishReason = normalizeFinishReason(chunk.finishReason);
+            return {
+                type: "finish",
+                ...(finishReason !== undefined ? { finishReason } : {}),
+            };
+        }
+        case "message-metadata":
+            return {
+                type: "message-metadata",
+                messageMetadata: chunk.messageMetadata,
+            };
+        default:
+            return chunk;
+    }
+}
 export function prepareConversationRunStreamEvents(events, encoder = new ConversationRunEventEncoder()) {
     return normalizeConversationRunEvents(encodeConversationRunEvents(events, encoder));
 }
+export function prepareConversationRunChunkEvents(chunks, encoder = new ConversationRunEventEncoder()) {
+    return prepareConversationRunStreamEvents(chunks.map((chunk) => toConversationRunStreamEvent(chunk)), encoder);
+}
 export function prepareConversationRunExternalEvents(events) {
     return normalizeConversationRunEvents(events);
 }