veryfront 0.1.261 → 0.1.262

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

@@ -1,13 +1,9 @@
 import { z } from "zod";
 import { INVALID_ARGUMENT } from "../errors/index.js";
-import { SKILL_TOOL_IDS } from "../skill/types.js";
-import { type Tool, toolRegistry } from "../tool/index.js";
 import { streamDataStreamEvents } from "./data-stream.js";
-import {
-  type AgUiInjectedTool,
-  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 { type AgUiResumeValue, buildMergedAgUiTools } from "./ag-ui-tool-shared.js";
 import {
   AgentRuntime,
   RunAlreadyExistsError,
@@ -17,10 +13,6 @@ import type { Agent } from "./types.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);
-type AgUiResumeValue = {
-  result: unknown;
-  isError: boolean;
-};
 
 type AgUiContextValue =
   | Record<string, unknown>
@@ -28,32 +20,6 @@ type AgUiContextValue =
 
 type AgUiRuntimePart = Record<string, unknown> & { type: string };
 
-function isRequest(obj: unknown): obj is Request {
-  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: unknown): Request {
-  if (isRequest(requestOrCtx)) return requestOrCtx;
-
-  if (typeof requestOrCtx === "object" && requestOrCtx !== null && "request" in requestOrCtx) {
-    const candidate = (requestOrCtx as Record<string, unknown>).request;
-    if (isRequest(candidate)) return candidate;
-  }
-
-  throw INVALID_ARGUMENT.create({
-    detail: "Invalid handler argument: expected Request or APIContext",
-  });
-}
-
 function buildStreamContext(
   request: AgUiDetachedStartRequest,
   baseContext: Record<string, unknown>,
@@ -71,66 +37,12 @@ function buildStreamContext(
   };
 }
 
-function createInjectedAgUiTool(
-  runId: string,
-  tool: AgUiInjectedTool,
-  sessionManager: RunResumeSessionManager<AgUiResumeValue>,
-): Tool {
-  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 }) as Tool["inputSchemaJson"],
-    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: Agent,
   request: AgUiDetachedStartRequest,
   sessionManager: RunResumeSessionManager<AgUiResumeValue>,
 ): Agent["config"]["tools"] {
-  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: Record<string, Tool | boolean> = {};
-    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: unknown, task: Promise<void>): void {

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

@@ -7,9 +7,6 @@ import {
   RunAlreadyExistsError,
   type RunResumeSessionManager,
 } from "./runtime/index.js";
-import { INVALID_ARGUMENT } from "../errors/index.js";
-import { SKILL_TOOL_IDS } from "../skill/types.js";
-import { type Tool, toolRegistry } from "../tool/index.js";
 import {
   createStreamTransformState,
   finalizeRunEvents,
@@ -18,11 +15,12 @@ import {
 } from "../internal-agents/ag-ui-sse.js";
 import { streamDataStreamEvents } from "./data-stream.js";
 import {
-  type AgUiInjectedTool,
   type AgUiRequest,
   normalizeAgUiMessages,
   parseAgUiRequestOrError,
 } from "./ag-ui-host-support.js";
+import { extractRequest } from "./ag-ui-request-shared.js";
+import { type AgUiResumeValue, buildMergedAgUiTools } from "./ag-ui-tool-shared.js";
 
 export {
   type AgUiContextItem,
@@ -39,35 +37,8 @@ const AG_UI_HEADERS: Record<string, string> = {
   Connection: "keep-alive",
 };
 
-type AgUiResumeValue = { result: unknown; isError: boolean };
 type AgUiRuntimePart = Record<string, unknown> & { type: string };
 
-function isRequest(obj: unknown): obj is Request {
-  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: unknown): Request {
-  if (isRequest(requestOrCtx)) return requestOrCtx;
-
-  if (typeof requestOrCtx === "object" && requestOrCtx !== null && "request" in requestOrCtx) {
-    const candidate = (requestOrCtx as Record<string, unknown>).request;
-    if (isRequest(candidate)) return candidate;
-  }
-
-  throw INVALID_ARGUMENT.create({
-    detail: "Invalid handler argument: expected Request or APIContext",
-  });
-}
-
 function generateRunId(): string {
   return `run_${dntShim.crypto.randomUUID().replaceAll("-", "")}`;
 }
@@ -240,38 +211,6 @@ async function createAgUiDirectStreamResponse(
   });
 }
 
-function createInjectedAgUiTool(
-  runId: string,
-  tool: AgUiInjectedTool,
-  sessionManager: RunResumeSessionManager<AgUiResumeValue>,
-): Tool {
-  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 }) as Tool["inputSchemaJson"],
-    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: Agent,
   request: AgUiRequest,
@@ -290,26 +229,9 @@ async function createAgUiInjectedToolsStreamResponse(
     throw error;
   }
 
-  const injectedTools = Object.fromEntries(
-    request.tools.map((tool) => [tool.name, createInjectedAgUiTool(runId, tool, sessionManager)]),
-  );
-
-  const mergedTools: Agent["config"]["tools"] = !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: ReadableStream<Uint8Array>;

package/src/src/agent/ag-ui-host-support.ts

@@ -1,6 +1,7 @@
 import { z } from "zod";
 import { formatAgUiEvent } from "../internal-agents/ag-ui-sse.js";
 import type { Message } from "./types.js";
+import { parseAgUiJsonRequestOrError } from "./ag-ui-request-shared.js";
 
 const AGENT_ID_PATTERN = /^[a-zA-Z0-9_-]+$/;
 const MAX_TOOL_PARAMETERS_BYTES = 16_384;
@@ -173,34 +174,10 @@ export async function parseAgUiRequest(request: Request): Promise<AgUiRequest> {
 export async function parseAgUiRequestOrError(
   request: Request,
 ): Promise<AgUiRequest | Response> {
-  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: AgUiRequest["messages"]): Message[] {

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

@@ -0,0 +1,62 @@
+import { z } from "zod";
+import { INVALID_ARGUMENT } from "../errors/index.js";
+
+export function isRequest(value: unknown): value is Request {
+  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: unknown): Request {
+  if (isRequest(requestOrCtx)) return requestOrCtx;
+
+  if (typeof requestOrCtx === "object" && requestOrCtx !== null && "request" in requestOrCtx) {
+    const candidate = (requestOrCtx as Record<string, unknown>).request;
+    if (isRequest(candidate)) return candidate;
+  }
+
+  throw INVALID_ARGUMENT.create({
+    detail: "Invalid handler argument: expected Request or APIContext",
+  });
+}
+
+export async function parseAgUiJsonRequestOrError<T>(
+  parseRequest: () => Promise<T>,
+  errorLabel: string,
+): Promise<T | Response> {
+  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/src/src/agent/ag-ui-run-control.ts

@@ -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,
   RunResumeSessionManager,
@@ -26,32 +26,6 @@ type ResumeValue = {
   isError: boolean;
 };
 
-function isRequest(value: unknown): value is Request {
-  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: unknown): Request {
-  if (isRequest(requestOrCtx)) return requestOrCtx;
-
-  if (typeof requestOrCtx === "object" && requestOrCtx !== null && "request" in requestOrCtx) {
-    const candidate = (requestOrCtx as Record<string, unknown>).request;
-    if (isRequest(candidate)) return candidate;
-  }
-
-  throw INVALID_ARGUMENT.create({
-    detail: "Invalid handler argument: expected Request or APIContext",
-  });
-}
-
 function getRunId(pathname: string, regex: RegExp): string | null {
   return regex.exec(pathname)?.[1] ?? null;
 }

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

@@ -1,7 +1,4 @@
 import { z } from "zod";
-import { INVALID_ARGUMENT } from "../errors/index.js";
-import { SKILL_TOOL_IDS } from "../skill/types.js";
-import { type Tool, toolRegistry } from "../tool/index.js";
 import {
   AgentRuntime,
   RunAlreadyExistsError,
@@ -9,10 +6,11 @@ import {
 } from "./runtime/index.js";
 import type { Agent } from "./types.js";
 import {
-  type AgUiRuntimeInjectedTool,
   type AgUiRuntimeRequest,
   parseAgUiRuntimeRequestOrError,
 } from "./runtime-ag-ui-contract.js";
+import { extractRequest } from "./ag-ui-request-shared.js";
+import { type AgUiResumeValue, buildMergedAgUiTools } from "./ag-ui-tool-shared.js";
 import { normalizeAgUiRuntimeMessages } from "./ag-ui-runtime-support.js";
 import {
   createStreamTransformState,
@@ -28,7 +26,6 @@ const AG_UI_HEADERS: Record<string, string> = {
   Connection: "keep-alive",
 };
 
-type AgUiResumeValue = { result: unknown; isError: boolean };
 type AgUiRuntimePart = Record<string, unknown> & { type: string };
 
 export interface AgUiRuntimeLifecycleContext {
@@ -64,36 +61,10 @@ async function invokeLifecycleCallbackAndWait(
   }
 }
 
-function isRequest(obj: unknown): obj is Request {
-  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: unknown): value is Record<string, unknown> {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
-function extractRequest(requestOrCtx: unknown): Request {
-  if (isRequest(requestOrCtx)) return requestOrCtx;
-
-  if (typeof requestOrCtx === "object" && requestOrCtx !== null && "request" in requestOrCtx) {
-    const candidate = (requestOrCtx as Record<string, unknown>).request;
-    if (isRequest(candidate)) return candidate;
-  }
-
-  throw INVALID_ARGUMENT.create({
-    detail: "Invalid handler argument: expected Request or APIContext",
-  });
-}
-
 function buildStreamContext(
   request: AgUiRuntimeRequest,
   baseContext: Record<string, unknown>,
@@ -271,66 +242,12 @@ async function createAgUiRuntimeDirectStreamResponse(
   });
 }
 
-function createInjectedAgUiTool(
-  runId: string,
-  tool: AgUiRuntimeInjectedTool,
-  sessionManager: RunResumeSessionManager<AgUiResumeValue>,
-): Tool {
-  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 }) as Tool["inputSchemaJson"],
-    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: Agent,
   request: AgUiRuntimeRequest,
   sessionManager: RunResumeSessionManager<AgUiResumeValue>,
 ): Agent["config"]["tools"] {
-  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: Record<string, Tool | boolean> = {};
-    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(

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

@@ -0,0 +1,77 @@
+import { z } from "zod";
+import { SKILL_TOOL_IDS } from "../skill/types.js";
+import { toolRegistry } from "../tool/registry.js";
+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 function createInjectedAgUiTool(
+  runId: string,
+  tool: AgUiInjectedToolLike,
+  sessionManager: RunResumeSessionManager<AgUiResumeValue>,
+): Tool {
+  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 }) as Tool["inputSchemaJson"],
+    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: Agent,
+  runId: string,
+  tools: AgUiInjectedToolLike[],
+  sessionManager: RunResumeSessionManager<AgUiResumeValue>,
+): Agent["config"]["tools"] {
+  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: Record<string, Tool | boolean> = {};
+    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/src/src/agent/index.ts

@@ -379,6 +379,21 @@ export {
   streamDataStreamEvents,
   stripLeadingEmptyObjectPlaceholder,
 } from "./data-stream.js";
+export type {
+  ChatMessageMetadata,
+  ChatMessageMetadataUsage,
+  ChatUiMessageChunk,
+  ChildRunAudit,
+  ChildRunAuditToolCall,
+  ChildRunAuditToolResult,
+} from "../chat/protocol.js";
+export {
+  buildChatStreamChunkMessageMetadata,
+  type BuildChatStreamChunkMessageMetadataInput,
+  extractChatMessageMetadata,
+  normalizeChatMessageMetadata,
+  normalizeChatUiMessageChunk,
+} from "../chat/chat-ui-message-helpers.js";
 export {
   expandAllowedRemoteToolNames,
   getProviderNativeToolNames,

package/src/src/agent/runtime-ag-ui-contract.ts

@@ -1,4 +1,5 @@
 import { z } from "zod";
+import { parseAgUiJsonRequestOrError } from "./ag-ui-request-shared.js";
 
 const AGENT_ID_PATTERN = /^[a-zA-Z0-9_-]+$/;
 const MAX_TOOL_PARAMETERS_BYTES = 16_384;
@@ -172,32 +173,8 @@ export async function parseAgUiRuntimeRequest(request: Request): Promise<AgUiRun
 export async function parseAgUiRuntimeRequestOrError(
   request: Request,
 ): Promise<AgUiRuntimeRequest | Response> {
-  try {
-    return await parseAgUiRuntimeRequest(request);
-  } catch (error) {
-    if (error instanceof z.ZodError) {
-      return Response.json(
-        {
-          error: "Invalid AG-UI runtime 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 runtime request",
-          details: [{ path: [], message: "Malformed JSON request body" }],
-        },
-        { status: 400 },
-      );
-    }
-
-    throw error;
-  }
+  return await parseAgUiJsonRequestOrError(
+    () => parseAgUiRuntimeRequest(request),
+    "Invalid AG-UI runtime request",
+  );
 }