veryfront 0.1.149 → 0.1.151

package/esm/src/agent/runtime/index.js

@@ -18,19 +18,20 @@ import { createMemory } from "../memory/index.js";
 import { serverLogger } from "../../utils/index.js";
 import { addSpanEvent, setSpanAttributes, withSpan, } from "../../observability/tracing/index.js";
 import { convertToModelMessages } from "./model-message-converter.js";
-import { convertToolsToAISDK } from "./model-tool-converter.js";
-import { createStreamState, processStream, } from "./ai-stream-handler.js";
+import { convertToolsToRuntimeTools } from "./model-tool-converter.js";
+import { createStreamState, processStream, } from "./chat-stream-handler.js";
 import { repairToolCall } from "./repair-tool-call.js";
 import { MiddlewareChain } from "../middleware/chain.js";
-import { generateText, streamText } from "ai";
-import { AGENT_DEFAULTS } from "../ai-defaults.js";
+import { AGENT_DEFAULTS } from "../defaults.js";
 import { tryGetCacheKeyContext } from "../../cache/cache-key-builder.js";
+import { isLocalModelRuntime } from "../../provider/runtime-inspection.js";
+import { generateText, streamText } from "../../runtime/runtime-bridge.js";
 // Re-export from submodules
 export { closeSSEStream, generateMessageId, sendSSE } from "./sse-utils.js";
 export { RunAlreadyExistsError, RunCancelledError, RunNotActiveError, RunResumeSessionManager, WaitConflictError, WaitNotPendingError, } from "./resume-session.js";
 export { executeConfiguredTool, getAvailableTools, isDynamicTool, parseToolArgs, } from "./tool-helpers.js";
 export { accumulateUsage, getMaxSteps, normalizeInput } from "./input-utils.js";
-export { createStreamState, processStream } from "./ai-stream-handler.js";
+export { createStreamState, processStream } from "./chat-stream-handler.js";
 export { DEFAULT_MAX_STEPS, DEFAULT_MAX_TOKENS, DEFAULT_TEMPERATURE, MAX_STREAM_BUFFER_SIZE, } from "./constants.js";
 import { DEFAULT_MAX_TOKENS, DEFAULT_TEMPERATURE } from "./constants.js";
 import { closeSSEStream, generateMessageId, sendSSE } from "./sse-utils.js";
@@ -97,12 +98,25 @@ export function collectPersistedToolResults(messages) {
         if (message.role !== "tool") {
             continue;
         }
-        for (const part of message.parts.filter((messagePart) => messagePart.type === "tool-result")) {
+        for (const part of message.parts) {
+            if (!isToolResultPart(part)) {
+                continue;
+            }
             persistedToolResults.set(part.toolCallId, part);
         }
     }
     return persistedToolResults;
 }
+export function collectGeneratedToolResults(toolResults) {
+    const generatedToolResults = new Map();
+    for (const toolResult of toolResults ?? []) {
+        generatedToolResults.set(toolResult.toolCallId, toolResult);
+    }
+    return generatedToolResults;
+}
+function isToolResultPart(part) {
+    return part.type === "tool-result" && "result" in part;
+}
 /**
  * Extract and validate the skill policy from a load-skill tool result.
  * Returns `[]` (no tools allowed) for invalid/missing policies instead of
@@ -150,17 +164,6 @@ export function enforceSkillPolicy(toolName, activeSkillPolicy, mustLoadSkillFir
     }
     return { allowed: true };
 }
-/**
- * Check whether a resolved LanguageModel is a local inference model.
- * Checks the model object properties rather than the requested string,
- * because resolveModel may internally fall back from cloud to local.
- */
-function isLocalModel(model) {
-    const m = model;
-    return !!m._isVfLocalModel ||
-        m.provider === "local" ||
-        (typeof m.modelId === "string" && m.modelId.startsWith("local/"));
-}
 function getRuntimeAllowedRemoteTools(config) {
     const configWithRuntimeFilters = config;
     if (!Object.hasOwn(configWithRuntimeFilters, "__vfAllowedRemoteTools")) {
@@ -260,7 +263,7 @@ export class AgentRuntime {
         const languageModel = resolveModel(resolvedModelString);
         // Determine inference mode from the resolved model object (not the string),
         // because resolveModel may internally fall back from cloud to local.
-        const isLocal = isLocalModel(languageModel);
+        const isLocal = isLocalModelRuntime(languageModel);
         // Eagerly verify the model runtime is available. For local models this
         // checks that @huggingface/transformers can be imported. Must happen
         // BEFORE creating the ReadableStream so no_ai_available errors propagate
@@ -331,7 +334,7 @@ export class AgentRuntime {
             const currentMessages = [...messages];
             const totalUsage = { promptTokens: 0, completionTokens: 0, totalTokens: 0 };
             // Local models can't reliably do function calling — skip tools gracefully.
-            const isLocal = isLocalModel(languageModel);
+            const isLocal = isLocalModelRuntime(languageModel);
             if (isLocal && this.config.tools) {
                 logger.warn(`Agent "${this.id}" has tools configured but is using local model "${effectiveModel}". ` +
                     "Local models don't support tool calling — tools will be skipped. " +
@@ -363,7 +366,7 @@ export class AgentRuntime {
                         model: languageModel,
                         system: systemPrompt,
                         messages: convertToModelMessages(currentMessages),
-                        tools: convertToolsToAISDK(tools, {
+                        tools: convertToolsToRuntimeTools(tools, {
                             model: effectiveModel,
                             allowedToolNames: allowedRemoteToolNames,
                         }),
@@ -401,7 +404,30 @@ export class AgentRuntime {
                 };
                 currentMessages.push(assistantMessage);
                 await this.memory.add(assistantMessage);
+                const generatedToolResults = collectGeneratedToolResults(response.toolResults);
+                const persistGeneratedToolResult = async (generatedToolResult) => {
+                    const toolResultMessage = {
+                        id: `tool_${generatedToolResult.toolCallId}`,
+                        role: "tool",
+                        parts: [
+                            {
+                                type: "tool-result",
+                                toolCallId: generatedToolResult.toolCallId,
+                                toolName: generatedToolResult.toolName,
+                                result: generatedToolResult.isError === true
+                                    ? { error: stringifyToolError(generatedToolResult.result) }
+                                    : generatedToolResult.result,
+                            },
+                        ],
+                        timestamp: Date.now(),
+                    };
+                    currentMessages.push(toolResultMessage);
+                    await this.memory.add(toolResultMessage);
+                };
                 if (!response.toolCalls?.length) {
+                    for (const generatedToolResult of generatedToolResults.values()) {
+                        await persistGeneratedToolResult(generatedToolResult);
+                    }
                     this.status = "completed";
                     addSpanEvent(loopSpan, "loop_complete");
                     return {
@@ -424,8 +450,19 @@ export class AgentRuntime {
                         args: tc.input,
                         status: "pending",
                     };
+                    const generatedToolResult = generatedToolResults.get(tc.toolCallId);
                     await withSpan("agent.tool_execute", async (toolSpan) => {
                         setSpanAttributes(toolSpan, { "tool.name": tc.toolName, "tool.id": tc.toolCallId });
+                        if (generatedToolResult) {
+                            await persistGeneratedToolResult(generatedToolResult);
+                            toolCall.status = generatedToolResult.isError === true ? "error" : "completed";
+                            toolCall.result = generatedToolResult.result;
+                            toolCall.error = generatedToolResult.isError === true
+                                ? stringifyToolError(generatedToolResult.result)
+                                : undefined;
+                            toolCalls.push(toolCall);
+                            return;
+                        }
                         const policyCheck = enforceSkillPolicy(tc.toolName, activeSkillPolicy, mustLoadSkillFirst);
                         if (!policyCheck.allowed) {
                             toolCall.status = "error";
@@ -519,7 +556,7 @@ export class AgentRuntime {
     /**
      * Execute agent loop with streaming
      * Emits veryfront stream events (message-start/message-finish + step-start/step-end)
-     * while consuming AI SDK `streamText()` parts internally.
+     * while consuming model-runtime `streamText()` parts internally.
      */
     async executeAgentLoopStreaming(systemPrompt, messages, controller, encoder, callbacks, textPartId, toolContext, modelString, resolvedModel, maxOutputTokensOverride, abortSignal) {
         const { maxAgentSteps } = getPlatformCapabilities();
@@ -530,7 +567,7 @@ export class AgentRuntime {
         const currentMessages = [...messages];
         const totalUsage = { promptTokens: 0, completionTokens: 0, totalTokens: 0 };
         // Local models can't reliably do function calling — skip tools gracefully.
-        const isLocalStreaming = isLocalModel(languageModel);
+        const isLocalStreaming = isLocalModelRuntime(languageModel);
         if (isLocalStreaming && this.config.tools) {
             logger.warn(`Agent "${this.id}" has tools configured but is using local model "${effectiveModel}". ` +
                 "Local models don't support tool calling — tools will be skipped. " +
@@ -545,7 +582,7 @@ export class AgentRuntime {
         for (let step = 0; step < maxSteps; step++) {
             throwIfAborted(abortSignal);
             sendSSE(controller, encoder, { type: "step-start" });
-            const persistedToolResults = collectPersistedToolResults(currentMessages);
+            const currentStepToolResults = new Map();
             let tools = isLocalStreaming ? [] : await getAvailableTools(this.config.tools, {
                 includeSkillTools: Boolean(this.config.skills),
                 allowedRemoteToolNames,
@@ -560,7 +597,7 @@ export class AgentRuntime {
                 model: languageModel,
                 system: systemPrompt,
                 messages: convertToModelMessages(currentMessages),
-                tools: convertToolsToAISDK(tools, {
+                tools: convertToolsToRuntimeTools(tools, {
                     model: effectiveModel,
                     allowedToolNames: allowedRemoteToolNames,
                 }),
@@ -605,7 +642,7 @@ export class AgentRuntime {
             await this.memory.add(assistantMessage);
             const finalToolResults = collectFinalStreamToolResults(state);
             const persistToolResult = async (toolResult) => {
-                if (persistedToolResults.has(toolResult.toolCallId)) {
+                if (currentStepToolResults.has(toolResult.toolCallId)) {
                     return;
                 }
                 const toolResultMessage = {
@@ -625,7 +662,7 @@ export class AgentRuntime {
                 };
                 currentMessages.push(toolResultMessage);
                 await this.memory.add(toolResultMessage);
-                persistedToolResults.set(toolResult.toolCallId, toolResultMessage.parts[0]);
+                currentStepToolResults.set(toolResult.toolCallId, toolResultMessage.parts[0]);
             };
             if (state.finishReason !== "tool-calls" || !state.toolCalls.size) {
                 for (const toolResult of finalToolResults.values()) {
@@ -644,7 +681,7 @@ export class AgentRuntime {
                 const { args, error: argError } = parseToolArgs(tc.arguments);
                 const toolCall = { id: tc.id, name: tc.name, args, status: "pending" };
                 const matchingResult = finalToolResults.get(tc.id);
-                const persistedResult = persistedToolResults.get(tc.id);
+                const persistedResult = currentStepToolResults.get(tc.id);
                 if (matchingResult) {
                     await persistToolResult(matchingResult);
                     toolCall.status = matchingResult.error === undefined ? "completed" : "error";
@@ -721,10 +758,10 @@ export class AgentRuntime {
                         ],
                         timestamp: Date.now(),
                     };
-                    if (!persistedToolResults.has(tc.id)) {
+                    if (!currentStepToolResults.has(tc.id)) {
                         currentMessages.push(toolResultMessage);
                         await this.memory.add(toolResultMessage);
-                        persistedToolResults.set(tc.id, toolResultMessage.parts[0]);
+                        currentStepToolResults.set(tc.id, toolResultMessage.parts[0]);
                     }
                 }
                 catch (error) {
@@ -787,7 +824,7 @@ export class AgentRuntime {
             return system;
         if (typeof system === "function")
             return system();
-        return "You are a helpful AI assistant.";
+        return "You are a helpful assistant.";
     }
     /**
      * Compute max steps considering edge config and platform limits.

package/esm/src/agent/runtime/model-message-converter.d.ts

@@ -1,19 +1,19 @@
 /**
  * Model Message Converter
  *
- * Converts between veryfront's internal Message format and AI SDK ModelMessage format.
- * Used when calling streamText() / generateText() from the AI SDK.
+ * Converts between veryfront's internal Message format and the current
+ * model-runtime message format.
  *
  * @module ai/agent/runtime/model-message-converter
  */
-import type { ModelMessage } from "ai";
+import type { ModelRuntimeMessage } from "./model-runtime-types.js";
 import { type Message } from "../types.js";
 /**
- * Convert a veryfront Message to AI SDK ModelMessage format.
+ * Convert a veryfront Message to the current model-runtime message format.
  */
-export declare function convertToModelMessage(msg: Message): ModelMessage;
+export declare function convertToModelMessage(msg: Message): ModelRuntimeMessage;
 /**
- * Convert an array of veryfront Messages to AI SDK ModelMessage format.
+ * Convert an array of veryfront Messages to the current model-runtime message format.
  */
-export declare function convertToModelMessages(messages: Message[]): ModelMessage[];
+export declare function convertToModelMessages(messages: Message[]): ModelRuntimeMessage[];
 //# sourceMappingURL=model-message-converter.d.ts.map

package/esm/src/agent/runtime/model-message-converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-message-converter.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/runtime/model-message-converter.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AACvC,OAAO,EAGL,KAAK,OAAO,EAGb,MAAM,aAAa,CAAC;AAgBrB;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,OAAO,GAAG,YAAY,CAyEhE;AAgBD;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,YAAY,EAAE,CAkC1E"}
+{"version":3,"file":"model-message-converter.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/runtime/model-message-converter.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAEV,mBAAmB,EAIpB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAGL,KAAK,OAAO,EAGb,MAAM,aAAa,CAAC;AAErB;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,OAAO,GAAG,mBAAmB,CAsEvE;AAgBD;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,mBAAmB,EAAE,CAkCjF"}

package/esm/src/agent/runtime/model-message-converter.js

@@ -1,14 +1,14 @@
 /**
  * Model Message Converter
  *
- * Converts between veryfront's internal Message format and AI SDK ModelMessage format.
- * Used when calling streamText() / generateText() from the AI SDK.
+ * Converts between veryfront's internal Message format and the current
+ * model-runtime message format.
  *
  * @module ai/agent/runtime/model-message-converter
  */
 import { getTextFromParts, getToolArguments, } from "../types.js";
 /**
- * Convert a veryfront Message to AI SDK ModelMessage format.
+ * Convert a veryfront Message to the current model-runtime message format.
  */
 export function convertToModelMessage(msg) {
     switch (msg.role) {
@@ -43,7 +43,8 @@ export function convertToModelMessage(msg) {
             if (content.length === 0) {
                 content.push({ type: "text", text: "" });
             }
-            return { role: "assistant", content };
+            const assistantMessage = { role: "assistant", content };
+            return assistantMessage;
         }
         case "tool": {
             const content = [];
@@ -58,7 +59,8 @@ export function convertToModelMessage(msg) {
                     output: { type: "json", value: resultPart.result },
                 });
             }
-            return { role: "tool", content };
+            const toolMessage = { role: "tool", content };
+            return toolMessage;
         }
         default: {
             // Fallback: treat as user message
@@ -79,7 +81,7 @@ function convertToolResultPart(part) {
     };
 }
 /**
- * Convert an array of veryfront Messages to AI SDK ModelMessage format.
+ * Convert an array of veryfront Messages to the current model-runtime message format.
  */
 export function convertToModelMessages(messages) {
     const modelMessages = [];

package/esm/src/agent/runtime/model-runtime-types.d.ts

@@ -0,0 +1,44 @@
+/**
+ * Model Runtime Types
+ *
+ * Framework-owned message types for the current text-generation runtime
+ * boundary. These describe the subset of message shapes the runtime uses
+ * today without exposing SDK-owned message contracts upward.
+ */
+export interface ModelRuntimeTextPart {
+    type: "text";
+    text: string;
+}
+export interface ModelRuntimeToolCallPart {
+    type: "tool-call";
+    toolCallId: string;
+    toolName: string;
+    input: Record<string, unknown>;
+}
+export interface ModelRuntimeToolResultPart {
+    type: "tool-result";
+    toolCallId: string;
+    toolName: string;
+    output: {
+        type: "json";
+        value: unknown;
+    };
+}
+export interface ModelRuntimeSystemMessage {
+    role: "system";
+    content: string;
+}
+export interface ModelRuntimeUserMessage {
+    role: "user";
+    content: string;
+}
+export interface ModelRuntimeAssistantMessage {
+    role: "assistant";
+    content: Array<ModelRuntimeTextPart | ModelRuntimeToolCallPart>;
+}
+export interface ModelRuntimeToolMessage {
+    role: "tool";
+    content: ModelRuntimeToolResultPart[];
+}
+export type ModelRuntimeMessage = ModelRuntimeSystemMessage | ModelRuntimeUserMessage | ModelRuntimeAssistantMessage | ModelRuntimeToolMessage;
+//# sourceMappingURL=model-runtime-types.d.ts.map

package/esm/src/agent/runtime/model-runtime-types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"model-runtime-types.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/runtime/model-runtime-types.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,WAAW,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChC;AAED,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,aAAa,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE;QACN,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,OAAO,CAAC;KAChB,CAAC;CACH;AAED,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,4BAA4B;IAC3C,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,KAAK,CAAC,oBAAoB,GAAG,wBAAwB,CAAC,CAAC;CACjE;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,0BAA0B,EAAE,CAAC;CACvC;AAED,MAAM,MAAM,mBAAmB,GAC3B,yBAAyB,GACzB,uBAAuB,GACvB,4BAA4B,GAC5B,uBAAuB,CAAC"}

package/esm/src/agent/runtime/model-runtime-types.js

@@ -0,0 +1,8 @@
+/**
+ * Model Runtime Types
+ *
+ * Framework-owned message types for the current text-generation runtime
+ * boundary. These describe the subset of message shapes the runtime uses
+ * today without exposing SDK-owned message contracts upward.
+ */
+export {};

package/esm/src/agent/runtime/model-tool-converter.d.ts

@@ -1,22 +1,22 @@
 /**
  * Model Tool Converter
  *
- * Converts veryfront ToolDefinition[] to AI SDK ToolSet format.
- * Uses jsonSchema() to pass JSON Schema parameters directly to the AI SDK.
+ * Converts veryfront ToolDefinition[] to the current model-runtime ToolSet
+ * format using framework-owned plain tool/schema objects.
  *
- * @module ai/agent/runtime/model-tool-converter
+ * @module agent/runtime/model-tool-converter
  */
-import type { ToolSet } from "ai";
 import type { ToolDefinition } from "../../tool/index.js";
-export interface ConvertToolsToAISDKOptions {
+import type { RuntimeToolSet } from "./runtime-tool-types.js";
+export interface ConvertToolsToRuntimeToolsOptions {
     model?: string;
     allowedToolNames?: string[];
 }
 /**
- * Convert veryfront tool definitions to AI SDK ToolSet.
+ * Convert veryfront tool definitions to the current model-runtime ToolSet.
  *
- * The AI SDK tool() function wraps each tool with its schema.
- * We don't provide `execute` — the agent runtime handles execution.
+ * We only provide the schema/metadata the runtime substrate needs here.
+ * Tool execution remains owned by the agent runtime.
  */
-export declare function convertToolsToAISDK(tools: ToolDefinition[], options?: ConvertToolsToAISDKOptions): ToolSet | undefined;
+export declare function convertToolsToRuntimeTools(tools: ToolDefinition[], options?: ConvertToolsToRuntimeToolsOptions): RuntimeToolSet | undefined;
 //# sourceMappingURL=model-tool-converter.d.ts.map

package/esm/src/agent/runtime/model-tool-converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-tool-converter.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/runtime/model-tool-converter.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAClC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAG1D,MAAM,WAAW,0BAA0B;IACzC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B;AAgCD;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,cAAc,EAAE,EACvB,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,GAAG,SAAS,CAoBrB"}
+{"version":3,"file":"model-tool-converter.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/runtime/model-tool-converter.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAQ9D,MAAM,WAAW,iCAAiC;IAChD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B;AA4BD;;;;;GAKG;AACH,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,cAAc,EAAE,EACvB,OAAO,CAAC,EAAE,iCAAiC,GAC1C,cAAc,GAAG,SAAS,CAwB5B"}

package/esm/src/agent/runtime/model-tool-converter.js

@@ -1,13 +1,5 @@
-/**
- * Model Tool Converter
- *
- * Converts veryfront ToolDefinition[] to AI SDK ToolSet format.
- * Uses jsonSchema() to pass JSON Schema parameters directly to the AI SDK.
- *
- * @module ai/agent/runtime/model-tool-converter
- */
-import { jsonSchema, tool } from "ai";
-import { anthropic } from "@ai-sdk/anthropic";
+import { addRuntimeTool, createRuntimeJsonSchema, createRuntimeTool, } from "./runtime-tool-builder.js";
+import { createAnthropicWebSearchToolSet } from "./provider-native-tools.js";
 function resolveHostedProvider(model) {
     if (!model)
         return undefined;
@@ -26,25 +18,21 @@ function resolveProviderNativeTools(options) {
     if (resolveHostedProvider(options.model) !== "anthropic") {
         return undefined;
     }
-    return {
-        web_search: anthropic.tools.webSearch_20250305({
-            maxUses: 5,
-        }),
-    };
+    return createAnthropicWebSearchToolSet();
 }
 /**
- * Convert veryfront tool definitions to AI SDK ToolSet.
+ * Convert veryfront tool definitions to the current model-runtime ToolSet.
  *
- * The AI SDK tool() function wraps each tool with its schema.
- * We don't provide `execute` — the agent runtime handles execution.
+ * We only provide the schema/metadata the runtime substrate needs here.
+ * Tool execution remains owned by the agent runtime.
  */
-export function convertToolsToAISDK(tools, options) {
+export function convertToolsToRuntimeTools(tools, options) {
     const toolSet = {};
     for (const def of tools) {
-        toolSet[def.name] = tool({
+        addRuntimeTool(toolSet, def.name, createRuntimeTool({
             description: def.description,
-            inputSchema: jsonSchema(def.parameters),
-        });
+            inputSchema: createRuntimeJsonSchema(def.parameters),
+        }));
     }
     const providerNativeTools = resolveProviderNativeTools(options);
     if (providerNativeTools) {

package/esm/src/agent/runtime/provider-native-tools.d.ts

@@ -0,0 +1,3 @@
+import type { RuntimeToolSet } from "./runtime-tool-types.js";
+export declare function createAnthropicWebSearchToolSet(): RuntimeToolSet;
+//# sourceMappingURL=provider-native-tools.d.ts.map

package/esm/src/agent/runtime/provider-native-tools.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider-native-tools.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/runtime/provider-native-tools.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AA8C9D,wBAAgB,+BAA+B,IAAI,cAAc,CAYhE"}

package/esm/src/agent/runtime/provider-native-tools.js

@@ -0,0 +1,56 @@
+import { createLazyRuntimeJsonSchema, createRuntimeProviderTool } from "./runtime-tool-builder.js";
+const WEB_SEARCH_INPUT_SCHEMA = {
+    type: "object",
+    properties: {
+        query: {
+            type: "string",
+        },
+    },
+    required: ["query"],
+    additionalProperties: false,
+};
+const WEB_SEARCH_OUTPUT_SCHEMA = {
+    type: "array",
+    items: {
+        type: "object",
+        properties: {
+            url: {
+                type: "string",
+            },
+            title: {
+                anyOf: [
+                    { type: "string" },
+                    { type: "null" },
+                ],
+            },
+            pageAge: {
+                anyOf: [
+                    { type: "string" },
+                    { type: "null" },
+                ],
+            },
+            encryptedContent: {
+                type: "string",
+            },
+            type: {
+                type: "string",
+                const: "web_search_result",
+            },
+        },
+        required: ["url", "title", "pageAge", "encryptedContent", "type"],
+        additionalProperties: false,
+    },
+};
+export function createAnthropicWebSearchToolSet() {
+    return {
+        web_search: createRuntimeProviderTool({
+            id: "anthropic.web_search_20250305",
+            args: {
+                maxUses: 5,
+            },
+            inputSchema: createLazyRuntimeJsonSchema(WEB_SEARCH_INPUT_SCHEMA),
+            outputSchema: createLazyRuntimeJsonSchema(WEB_SEARCH_OUTPUT_SCHEMA),
+            supportsDeferredResults: true,
+        }),
+    };
+}

package/esm/src/agent/runtime/repair-tool-call.d.ts

@@ -1,3 +1,3 @@
-import { type ToolCallRepairFunction, type ToolSet } from "ai";
-export declare const repairToolCall: ToolCallRepairFunction<ToolSet>;
+import type { RuntimeToolCallRepairFunction } from "./runtime-tool-types.js";
+export declare const repairToolCall: RuntimeToolCallRepairFunction;
 //# sourceMappingURL=repair-tool-call.d.ts.map

package/esm/src/agent/runtime/repair-tool-call.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"repair-tool-call.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/runtime/repair-tool-call.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,sBAAsB,EAC3B,KAAK,OAAO,EACb,MAAM,IAAI,CAAC;AAIZ,eAAO,MAAM,cAAc,EAAE,sBAAsB,CAAC,OAAO,CA2C1D,CAAC"}
+{"version":3,"file":"repair-tool-call.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/runtime/repair-tool-call.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,yBAAyB,CAAC;AAI7E,eAAO,MAAM,cAAc,EAAE,6BA4C5B,CAAC"}

package/esm/src/agent/runtime/repair-tool-call.js

@@ -1,7 +1,7 @@
-import { InvalidToolInputError, NoSuchToolError, } from "ai";
+import { isInvalidToolInputError, isNoSuchToolError } from "./runtime-tool-errors.js";
 const REPAIRABLE_PROVIDER_TOOL_NAMES = new Set(["web_search"]);
 export const repairToolCall = async ({ toolCall, error, }) => {
-    if (NoSuchToolError.isInstance(error)) {
+    if (isNoSuchToolError(error)) {
         return null;
     }
     if (!REPAIRABLE_PROVIDER_TOOL_NAMES.has(toolCall.toolName)) {
@@ -10,7 +10,7 @@ export const repairToolCall = async ({ toolCall, error, }) => {
     if (toolCall.providerExecuted !== true) {
         return null;
     }
-    if (!InvalidToolInputError.isInstance(error) || typeof toolCall.input !== "string") {
+    if (!isInvalidToolInputError(error) || typeof toolCall.input !== "string") {
         return null;
     }
     const trimmedInput = toolCall.input.trim();

package/esm/src/agent/runtime/runtime-tool-builder.d.ts

@@ -0,0 +1,48 @@
+import type { JsonSchema } from "../../tool/schema/index.js";
+import type { RuntimeToolSet } from "./runtime-tool-types.js";
+interface RuntimeJsonSchema<T = unknown> {
+    readonly jsonSchema: JsonSchema | PromiseLike<JsonSchema>;
+    validate?: (value: unknown) => T | PromiseLike<T>;
+}
+type RuntimeLazySchema<T = unknown> = () => RuntimeJsonSchema<T>;
+interface RuntimeToolDefinition {
+    description: string;
+    inputSchema: RuntimeJsonSchema;
+    type?: "function" | "dynamic";
+    execute?: (...args: unknown[]) => unknown;
+    onInputAvailable?: (...args: unknown[]) => unknown;
+    onInputStart?: (...args: unknown[]) => unknown;
+    onInputDelta?: (...args: unknown[]) => unknown;
+    needsApproval?: (...args: unknown[]) => unknown;
+}
+interface RuntimeProviderToolDefinition {
+    type: "provider";
+    id: string;
+    args: Record<string, unknown>;
+    inputSchema: RuntimeLazySchema;
+    outputSchema?: RuntimeLazySchema;
+    execute?: undefined;
+    needsApproval?: undefined;
+    toModelOutput?: undefined;
+    onInputStart?: undefined;
+    onInputDelta?: undefined;
+    onInputAvailable?: undefined;
+    supportsDeferredResults?: boolean;
+}
+export declare function createRuntimeJsonSchema(json: JsonSchema): RuntimeJsonSchema;
+export declare function createLazyRuntimeJsonSchema(json: JsonSchema): RuntimeLazySchema;
+export declare function createRuntimeTool(definition: {
+    description: string;
+    inputSchema: RuntimeJsonSchema;
+    type?: "function" | "dynamic";
+}): RuntimeToolDefinition;
+export declare function addRuntimeTool(toolSet: RuntimeToolSet, name: string, definition: RuntimeToolDefinition): void;
+export declare function createRuntimeProviderTool(definition: {
+    id: string;
+    args: Record<string, unknown>;
+    inputSchema: RuntimeLazySchema;
+    outputSchema?: RuntimeLazySchema;
+    supportsDeferredResults?: boolean;
+}): RuntimeProviderToolDefinition;
+export {};
+//# sourceMappingURL=runtime-tool-builder.d.ts.map

package/esm/src/agent/runtime/runtime-tool-builder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"runtime-tool-builder.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/runtime/runtime-tool-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE9D,UAAU,iBAAiB,CAAC,CAAC,GAAG,OAAO;IACrC,QAAQ,CAAC,UAAU,EAAE,UAAU,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;IAC1D,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;CACnD;AAED,KAAK,iBAAiB,CAAC,CAAC,GAAG,OAAO,IAAI,MAAM,iBAAiB,CAAC,CAAC,CAAC,CAAC;AAEjE,UAAU,qBAAqB;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,iBAAiB,CAAC;IAC/B,IAAI,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IAC9B,OAAO,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC;IAC1C,gBAAgB,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC;IACnD,YAAY,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC;IAC/C,YAAY,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC;IAC/C,aAAa,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC;CACjD;AAED,UAAU,6BAA6B;IACrC,IAAI,EAAE,UAAU,CAAC;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,WAAW,EAAE,iBAAiB,CAAC;IAC/B,YAAY,CAAC,EAAE,iBAAiB,CAAC;IACjC,OAAO,CAAC,EAAE,SAAS,CAAC;IACpB,aAAa,CAAC,EAAE,SAAS,CAAC;IAC1B,aAAa,CAAC,EAAE,SAAS,CAAC;IAC1B,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,gBAAgB,CAAC,EAAE,SAAS,CAAC;IAC7B,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,UAAU,GAAG,iBAAiB,CAI3E;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,UAAU,GAAG,iBAAiB,CAE/E;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE;IAC5C,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,iBAAiB,CAAC;IAC/B,IAAI,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;CAC/B,GAAG,qBAAqB,CAMxB;AAED,wBAAgB,cAAc,CAC5B,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,qBAAqB,GAChC,IAAI,CAEN;AAED,wBAAgB,yBAAyB,CAAC,UAAU,EAAE;IACpD,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,WAAW,EAAE,iBAAiB,CAAC;IAC/B,YAAY,CAAC,EAAE,iBAAiB,CAAC;IACjC,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC,GAAG,6BAA6B,CAShC"}

package/esm/src/agent/runtime/runtime-tool-builder.js

@@ -0,0 +1,28 @@
+export function createRuntimeJsonSchema(json) {
+    return {
+        jsonSchema: json,
+    };
+}
+export function createLazyRuntimeJsonSchema(json) {
+    return () => createRuntimeJsonSchema(json);
+}
+export function createRuntimeTool(definition) {
+    return {
+        type: definition.type ?? "function",
+        description: definition.description,
+        inputSchema: definition.inputSchema,
+    };
+}
+export function addRuntimeTool(toolSet, name, definition) {
+    toolSet[name] = definition;
+}
+export function createRuntimeProviderTool(definition) {
+    return {
+        type: "provider",
+        id: definition.id,
+        args: definition.args,
+        inputSchema: definition.inputSchema,
+        outputSchema: definition.outputSchema,
+        supportsDeferredResults: definition.supportsDeferredResults,
+    };
+}