experimental-a2 0.17.0 → 0.18.1

package/dist/ai-server.js

@@ -1,8 +1,10 @@
 import { i as A2Error } from "./session-clear-DGI4jTQ5.js";
 import { a as reducer, s as validateSync } from "./reducer-BAXc8JyF.js";
-import { m as installAmbientToolScopeStorage, p as consumeSchedulerSendFailure } from "./internal-CbVvEwad.js";
-import { a as CONSOLE_TELEMETRY, l as boundedCache, o as setServerFetchHooks, t as createServer } from "./server-Rj64fNvX.js";
-import { A as interruptUIMessage, C as reduceToolActivity, D as flattenProgressBatches, E as upsertResponse, M as assertMessageBase, N as restoreMessageBase, O as progressBatches, S as projectedMessage, T as upsertMessage, _ as applyControlChanges, a as events, b as findMessage, d as appSlice, f as isAgentContract, g as initialControlState, h as aiEventId, j as pauseUIMessage, k as progressOwnedBy, m as AI_EVENT_ID_PREFIX, n as agentContract, p as withAIStorage, u as appReducerOf, v as controlCommit, w as retainMessageBase, y as advanceProjection } from "./ai-UrWfKeuv.js";
+import { h as installAmbientToolScopeStorage, m as failedPreviousAttempt, p as consumeSchedulerSendFailure } from "./internal-CscSY7K_.js";
+import { t as boundedCache } from "./bounded-cache-CPHWF-8h.js";
+import { a as CONSOLE_TELEMETRY, o as setServerFetchHooks, t as createServer } from "./server-D-Y4pqwu.js";
+import { A as interruptUIMessage, C as reduceToolActivity, D as flattenProgressBatches, E as upsertResponse, M as assertMessageBase, N as restoreMessageBase, O as progressBatches, S as projectedMessage, T as upsertMessage, _ as applyControlChanges, a as events, b as findMessage, d as appSlice, f as isAgentContract, g as initialControlState, h as aiEventId, j as pauseUIMessage, k as progressOwnedBy, m as AI_EVENT_ID_PREFIX, n as agentContract, p as withAIStorage, u as appReducerOf, v as controlCommit, w as retainMessageBase, y as advanceProjection } from "./ai-D6mGlO8j.js";
+import { a as harnessDriver, o as harnessLog, s as harnessStates, u as registerHarnessStates } from "./ai-harness-BuLh_EYi.js";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { createHash } from "node:crypto";
 import { asSchema, convertToModelMessages, isToolUIPart, stepCountIs, streamText, toUIMessageStream } from "ai";
@@ -1441,9 +1443,15 @@ const catalogUrl = "https://ai-gateway.vercel.sh/v1/models";
 const catalogLifetimeMs = 36e5;
 const catalogTimeoutMs = 5e3;
 let catalog;
+/**
+* The model's AI Gateway ID: the model string, unless an AI SDK global
+* provider resolves it to a model that is not Gateway's.
+*/
 const gatewayModelId = (model) => {
-	if (typeof model === "string") return globalThis.AI_SDK_DEFAULT_PROVIDER === void 0 ? model : void 0;
-	return model.provider === "gateway" ? model.modelId : void 0;
+	const provider = globalThis.AI_SDK_DEFAULT_PROVIDER;
+	if (provider === void 0) return model;
+	if (typeof provider.languageModel !== "function") return void 0;
+	return provider.languageModel(model).provider === "gateway" ? model : void 0;
 };
 const readCatalog = () => {
 	if (catalog && catalog.expiresAt > Date.now()) return catalog.promise;
@@ -1581,11 +1589,7 @@ const withModelSettings = (options) => {
 		} }
 	};
 };
-const modelName = (model) => {
-	if (typeof model === "string") return model;
-	if ("modelId" in model && typeof model.modelId === "string") return model.modelId;
-	return "custom";
-};
+const instructionTexts = (instructions) => instructions === void 0 ? [] : typeof instructions === "string" ? [instructions] : (Array.isArray(instructions) ? instructions : [instructions]).map((message) => message.content);
 const errorMessage = (error) => error instanceof Error ? error.message : String(error);
 const toolScopeStorage = installAmbientToolScopeStorage(() => new AsyncLocalStorage());
 /** Run `fn` with `ctx` as the ambient tool handler context, for direct tool tests. */
@@ -1707,7 +1711,12 @@ async function* consumeGeneration(options) {
 		chunks: mergeDeltas(pending.splice(0))
 	});
 	const reader = options.source.stream.getReader();
-	let pendingChunk = reader.read();
+	const readAhead = () => {
+		const read = reader.read();
+		read.catch(() => {});
+		return read;
+	};
+	let pendingChunk = readAhead();
 	try {
 		for (;;) {
 			let result;
@@ -1726,7 +1735,7 @@ async function* consumeGeneration(options) {
 			pending.push(chunk);
 			if (chunk.type === "finish") streamedFinishReason = chunk.finishReason;
 			if (chunk.type === "error") streamedError = chunk.errorText;
-			pendingChunk = reader.read();
+			pendingChunk = readAhead();
 			if (pending.length >= maxChunks || isBoundaryChunk(pending.at(-1))) {
 				yield batch();
 				lastFlush = Date.now();
@@ -1736,7 +1745,6 @@ async function* consumeGeneration(options) {
 		if (pending.length > 0) yield batch();
 		throw error;
 	} finally {
-		pendingChunk.catch(() => {});
 		try {
 			await reader.cancel();
 		} catch {} finally {
@@ -1887,7 +1895,7 @@ const lifecycleEvents = async (options) => {
 				...chunk.title === void 0 ? {} : { title: chunk.title }
 			};
 			take(payload.toolCallId);
-			const classification = approvalClassification(options.tools, options.generation, chunk.toolName);
+			const classification = options.approvals === false ? "automatic" : approvalClassification(options.tools, options.generation, chunk.toolName);
 			if (classification === "automatic") result.push(await toolCalledEvent(payload));
 			else pending.push({
 				call: payload,
@@ -2028,19 +2036,50 @@ const validateCompaction = (options) => {
 	}
 	return compaction;
 };
+const AI_SDK_HARNESS_OPTIONS = [
+	"generation",
+	"generate",
+	"compaction",
+	"messageMetadata"
+];
+const assertNoLoopOptions = (options) => {
+	const harness = options.harness?.type ?? "ai-sdk";
+	for (const key of AI_SDK_HARNESS_OPTIONS) {
+		if (!Object.hasOwn(options, key)) continue;
+		throw new TypeError(harness === "ai-sdk" ? `${key} belongs to the harness: agent({ harness: { type: 'ai-sdk', ${key} } })` : `${key} is an option of the AI SDK harness; ${harness}() runs its own loop`);
+	}
+};
 function createHandlers(options) {
 	if (options.model === void 0) throw new TypeError("agent requires model");
 	if (options.progress?.maxChunks !== void 0 && (!Number.isInteger(options.progress.maxChunks) || options.progress.maxChunks < 1)) throw new TypeError("progress.maxChunks must be a positive integer");
 	if (options.progress?.maxDelayMs !== void 0 && (!Number.isFinite(options.progress.maxDelayMs) || options.progress.maxDelayMs < 0)) throw new TypeError("progress.maxDelayMs must be a non-negative number");
 	if (options.maxSteps !== void 0 && options.maxSteps !== Number.POSITIVE_INFINITY && (!Number.isInteger(options.maxSteps) || options.maxSteps < 1)) throw new TypeError("maxSteps must be a positive integer or Infinity");
-	const configuredCompaction = options.compaction ?? (options.generate === void 0 ? {} : false);
+	assertNoLoopOptions(options);
+	const configured = options.harness;
+	const loop = configured?.type === "ai-sdk" ? configured : {};
+	const harness = configured === void 0 || configured.type === "ai-sdk" ? void 0 : harnessDriver(configured);
+	const states = options.harnessStates ?? harnessStates();
+	if (harness !== void 0) for (const [name, tool] of Object.entries(options.tools ?? {})) {
+		const needsApproval = tool.needsApproval;
+		if (needsApproval !== void 0 && needsApproval !== false) throw new TypeError(`a harness runs tools without approval; '${name}' sets needsApproval`);
+	}
+	const configuredCompaction = loop.compaction ?? (loop.generate === void 0 && harness === void 0 ? {} : false);
 	const staticCompaction = typeof configuredCompaction === "function" ? void 0 : validateCompaction({
 		compaction: configuredCompaction,
-		explicit: options.compaction !== void 0,
-		generation: typeof options.generation === "function" ? void 0 : options.generation,
+		explicit: loop.compaction !== void 0,
+		generation: typeof loop.generation === "function" ? void 0 : loop.generation,
 		tools: options.tools
 	});
-	const tools = options.tools ?? {};
+	const tools = harness === void 0 ? options.tools ?? {} : {
+		...harness.tools,
+		...options.tools
+	};
+	const toolRecovery = options.toolRecovery ?? {};
+	for (const [name, recovery] of Object.entries(toolRecovery)) {
+		if (!Object.hasOwn(tools, name)) throw new TypeError(`toolRecovery names '${name}', which is not one of the agent's tools`);
+		if (typeof tools[name].execute !== "function") throw new TypeError(`toolRecovery names '${name}', which has no execute function`);
+		if (recovery !== "rerun" && recovery !== "report") throw new TypeError(`toolRecovery for '${name}' must be 'rerun' or 'report'`);
+	}
 	const telemetry = options.telemetry ?? CONSOLE_TELEMETRY;
 	const maxSteps = options.maxSteps ?? Number.POSITIVE_INFINITY;
 	const control = createControlRuntime({
@@ -2126,13 +2165,14 @@ function createHandlers(options) {
 		if (schedulerFailure === "retryable") throw error;
 		return resultEvent(call, `${ctx.event.id}:execution:error`, { error: errorMessage(error) });
 	};
-	const runToolExecution = async (ctx, call, execute, messages) => {
+	const runToolExecution = async (ctx, call, execute, messages, sandbox) => {
 		let output;
 		try {
 			output = await execute(call.input, {
 				toolCallId: call.toolCallId,
 				messages,
-				abortSignal: ctx.signal
+				abortSignal: ctx.signal,
+				...sandbox === void 0 ? {} : { experimental_sandbox: sandbox }
 			});
 		} catch (error) {
 			return toolExecutionFailure(ctx, call, error);
@@ -2183,13 +2223,27 @@ function createHandlers(options) {
 		const { ctx, call } = input;
 		const execute = tools[call.toolName]?.execute;
 		if (execute === void 0) return resultEvent(call, `${ctx.event.id}:execution:error`, { error: `Tool '${call.toolName}' has no server executor` });
+		const report = toolRecovery[call.toolName] === "report";
+		const interrupted = () => resultEvent(call, `${ctx.event.id}:execution:error`, { error: `Tool '${call.toolName}' was interrupted and may have partly run.` });
+		if (report && ctx.attempt > 1 && !failedPreviousAttempt.has(ctx)) return interrupted();
 		const messages = await promptMessages(input);
+		const sandbox = harness?.sandbox === void 0 ? void 0 : await resolve(harness.sandbox, {
+			session: { id: ctx.session.id },
+			signal: ctx.signal
+		});
 		if (checkAbort(ctx.signal)) return;
 		const scope = {
 			contract: options.contract,
 			context: ctx
 		};
-		return toolScopeStorage.run(scope, () => runToolExecution(ctx, call, execute, messages));
+		const run = () => toolScopeStorage.run(scope, () => runToolExecution(ctx, call, execute, messages, sandbox));
+		if (!report) return run();
+		try {
+			return await run() ?? await interrupted();
+		} catch {
+			checkAbort(ctx.signal);
+			return interrupted();
+		}
 	};
 	const handleToolExecution = async (ctx) => {
 		try {
@@ -2304,7 +2358,7 @@ function createHandlers(options) {
 			generationId,
 			responseMessageId,
 			attempt,
-			...model === void 0 ? {} : { model: modelName(model) },
+			...model === void 0 ? {} : { model },
 			promptThroughIndex: snapshot.index
 		});
 		let resolvedModel;
@@ -2313,23 +2367,23 @@ function createHandlers(options) {
 		try {
 			const choice = await resolve(options.model, resolverContext);
 			if (choice === void 0) throw new TypeError("the model resolver returned undefined");
-			const settings = typeof choice === "string" || "specificationVersion" in choice ? { model: choice } : choice;
+			const settings = typeof choice === "string" ? { model: choice } : choice;
 			const model = settings.model;
-			if (typeof model !== "string" && (typeof model !== "object" || model === null)) throw new TypeError("the model resolver must return a model");
+			if (typeof model !== "string" || model === "") throw new TypeError("the model must be an AI Gateway model ID");
 			resolvedModel = model;
 			if (checkAbort(ctx.signal)) return;
 			const resolvedInstructions = options.instructions === void 0 ? void 0 : await resolve(options.instructions, resolverContext);
 			if (checkAbort(ctx.signal)) return;
-			const resolvedGeneration = await resolve(options.generation ?? {}, resolverContext);
+			const resolvedGeneration = await resolve(loop.generation ?? {}, resolverContext);
 			if (checkAbort(ctx.signal)) return;
 			if (resolvedGeneration === null || typeof resolvedGeneration !== "object" || Array.isArray(resolvedGeneration)) throw new TypeError("the generation resolver must return settings");
 			const generation = withModelSettings({
 				generation: resolvedGeneration,
 				settings
 			});
-			const compaction = typeof configuredCompaction === "function" || typeof options.generation === "function" ? validateCompaction({
+			const compaction = typeof configuredCompaction === "function" || typeof loop.generation === "function" ? validateCompaction({
 				compaction: typeof configuredCompaction === "function" ? await resolve(configuredCompaction, resolverContext) : staticCompaction,
-				explicit: options.compaction !== void 0,
+				explicit: loop.compaction !== void 0,
 				generation,
 				tools: options.tools
 			}) : staticCompaction;
@@ -2393,7 +2447,7 @@ function createHandlers(options) {
 					});
 					const inputTokens = measuredInputTokens({
 						estimate: inputTokenEstimate,
-						model: modelName(resolvedModel),
+						model: resolvedModel,
 						calibration: coordinatorState.calibration
 					});
 					const threshold = policy.thresholdTokens ?? (limits === void 0 ? void 0 : Math.floor(Math.min(limits.contextWindow * .75, limits.contextWindow - (generation.maxOutputTokens ?? 0))));
@@ -2500,13 +2554,30 @@ function createHandlers(options) {
 				messages: generationMessages,
 				modelMessages
 			};
-			const custom = options.generate !== void 0;
 			const updates = consumeGeneration({
-				source: options.generate === void 0 ? await generateWithAISDK({
+				source: harness !== void 0 ? await harness.step({
+					agentName: options.contract.name,
+					sessionId: ctx.event.sessionId,
+					requestIndex: ctx.event.index,
+					generationId,
+					responseMessageId,
+					throughIndex: snapshot.index,
+					messages: generationMessages,
+					model,
+					...settings.reasoning === void 0 ? {} : { reasoning: settings.reasoning },
+					...settings.speed === void 0 ? {} : { speed: settings.speed },
+					instructions: instructionTexts(resolvedInstructions),
+					tools,
+					log: harnessLog({
+						states,
+						session: ctx.session
+					}),
+					signal: ctx.signal
+				}) : loop.generate === void 0 ? await generateWithAISDK({
 					agentName: options.contract.name,
 					context: generateContext,
-					messageMetadata: options.messageMetadata
-				}) : { stream: await options.generate(generateContext) },
+					messageMetadata: loop.messageMetadata
+				}) : { stream: await loop.generate(generateContext) },
 				...options.progress === void 0 ? {} : { progress: options.progress }
 			});
 			let sequence = 0;
@@ -2530,7 +2601,7 @@ function createHandlers(options) {
 					pending: pendingToolCalls,
 					tools,
 					generation,
-					custom
+					approvals: harness === void 0
 				});
 				pendingToolCalls = lifecycle.pending;
 				await control.append({
@@ -2559,9 +2630,9 @@ function createHandlers(options) {
 				id: await aiEventId("a2.ai.completed", generationId),
 				payload: completed
 			};
-			const unresolved = options.generate ? pendingToolCalls.filter((pending) => pending.classification !== "automatic") : [];
+			const unresolved = loop.generate ? pendingToolCalls.filter((pending) => pending.classification !== "automatic") : [];
 			if (unresolved.length > 0) throw new Error(`generation ended with unresolved tool authorization for '${unresolved[0].call.toolName}'`);
-			const pendingEvents = await Promise.all(pendingToolCalls.filter((pending) => pending.classification === "automatic" || options.generate === void 0 && pending.classification === "unknown").map((pending) => toolCalledEvent(pending.call)));
+			const pendingEvents = await Promise.all(pendingToolCalls.filter((pending) => pending.classification === "automatic" || loop.generate === void 0 && pending.classification === "unknown").map((pending) => toolCalledEvent(pending.call)));
 			if (finish.finishReason === "tool-calls") return [...pendingEvents, completionEvent];
 			forgetPrompt(ctx.event.sessionId, generationId);
 			return [
@@ -2691,7 +2762,8 @@ function createHandlers(options) {
 	};
 }
 function agent(options) {
-	const { model, tools, instructions, generation, maxSteps, messageMetadata, generate, compaction, progress, toolLane, handlers, ...rest } = options;
+	assertNoLoopOptions(options);
+	const { model, tools, instructions, maxSteps, harness, toolRecovery, progress, toolLane, handlers, ...rest } = options;
 	let contract;
 	let serverOptions;
 	if ("contract" in rest) {
@@ -2709,17 +2781,17 @@ function agent(options) {
 		});
 		serverOptions = remaining;
 	}
+	const states = harnessStates();
 	const builtIns = createHandlers({
 		contract,
 		model,
+		harnessStates: states,
 		...serverOptions.telemetry === void 0 ? {} : { telemetry: serverOptions.telemetry },
 		...tools === void 0 ? {} : { tools },
 		...instructions === void 0 ? {} : { instructions },
-		...generation === void 0 ? {} : { generation },
 		...maxSteps === void 0 ? {} : { maxSteps },
-		...messageMetadata === void 0 ? {} : { messageMetadata },
-		...generate === void 0 ? {} : { generate },
-		...compaction === void 0 ? {} : { compaction },
+		...harness === void 0 ? {} : { harness },
+		...toolRecovery === void 0 ? {} : { toolRecovery },
 		...progress === void 0 ? {} : { progress },
 		...toolLane === void 0 ? {} : { toolLane }
 	});
@@ -2732,6 +2804,7 @@ function agent(options) {
 			...handlers
 		}
 	});
+	registerHarnessStates(server, states);
 	const applicationEvents = "contract" in rest;
 	setServerFetchHooks(server, { validateIngress: (context) => validateAgentIngress({
 		context,