experimental-a2 0.18.0 → 0.19.0

package/dist/ai-server.js

@@ -1,10 +1,11 @@
 import { i as A2Error } from "./session-clear-DGI4jTQ5.js";
 import { a as reducer, s as validateSync } from "./reducer-BAXc8JyF.js";
-import { h as installAmbientToolScopeStorage, m as failedPreviousAttempt, p as consumeSchedulerSendFailure } from "./internal-B2T3U4Rq.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-Dw_k_7kO.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-BpOGm-zB.js";
-import { a as harnessDriver, o as harnessLog, s as harnessStates, u as registerHarnessStates } from "./ai-harness-BuLh_EYi.js";
+import { a as CONSOLE_TELEMETRY, o as setServerFetchHooks, t as createServer } from "./server-D-Y4pqwu.js";
+import { a as unexplainedAdmission, i as steersOn, n as initialControlState, r as steeringEnd, t as STEERED_REASON } from "./ai-control-CvLbW10B.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 isUIMessage, 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-mMiWul1T.js";
+import { a as harnessDriver, c as harnessStates, d as registerHarnessStates, s as harnessLog } from "./ai-harness-BuuC-gJ3.js";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { createHash } from "node:crypto";
 import { asSchema, convertToModelMessages, isToolUIPart, stepCountIs, streamText, toUIMessageStream } from "ai";
@@ -43,12 +44,11 @@ const foldCoordinator = (state, event) => {
 		}
 		case "ai.message.created": {
 			const payload = event.payload;
-			const message = payload.message;
-			if (message.role !== "user") return state;
+			if (payload.role !== "user") return state;
 			return {
 				...state,
-				queued: [...state.queued.filter((item) => item.messageId !== message.id), {
-					messageId: message.id,
+				queued: [...state.queued.filter((item) => item.messageId !== payload.messageId), {
+					messageId: payload.messageId,
 					generate: payload.generate !== false
 				}]
 			};
@@ -244,7 +244,7 @@ const createControlRuntime = (options) => {
 	const telemetry = options.telemetry ?? CONSOLE_TELEMETRY;
 	const reducer$2 = reducer({
 		contract: options.contract,
-		name: "a2.ai.control.v5",
+		name: "a2.ai.control.v6",
 		initialState: initialControlState()
 	}).fold((state, event) => {
 		if (event.type === "ai.control.requested") {
@@ -309,15 +309,41 @@ const createControlRuntime = (options) => {
 			});
 			state.active = null;
 		};
-		const insert = ({ message, generate = true, first = false, afterStepOf }) => {
+		const decide = async () => {
+			const receipt = {
+				commandId: ctx.event.id,
+				...ctx.event.type === "ai.work.reported" ? { work: true } : {},
+				outcome: reason === void 0 ? "applied" : "rejected",
+				...reason === void 0 ? {} : { reason }
+			};
+			return [
+				...facts,
+				{
+					type: "ai.control.committed",
+					id: await aiEventId("a2.ai.control.committed", ctx.event.id),
+					payload: controlCommit({
+						before,
+						after: state,
+						moves
+					})
+				},
+				...jobs,
+				{
+					type: "ai.control.decided",
+					id: await aiEventId("a2.ai.control.decided", ctx.event.id),
+					payload: receipt
+				}
+			];
+		};
+		const insert = ({ message, generate = true, afterStepOf }) => {
 			const candidate = {
 				id: message.id,
-				message,
+				role: message.role,
 				generate: generate && message.role === "user",
 				...afterStepOf === void 0 ? {} : { afterStepOf }
 			};
-			if (first) state.inbox.items.unshift(candidate);
-			else state.inbox.items.push(candidate);
+			if (afterStepOf === void 0) state.inbox.items.push(candidate);
+			else state.inbox.items.splice(steeringEnd(state.inbox.items, afterStepOf), 0, candidate);
 		};
 		const moveInput = ({ from, to }) => {
 			if (from === to) return;
@@ -380,9 +406,8 @@ const createControlRuntime = (options) => {
 				case "edit": {
 					const item = state.inbox.items.find((candidate) => candidate.id === command.message.id);
 					if (item === void 0) reason = "not-pending";
-					else if (item.message.role !== command.message.role) reason = "role-mismatch";
-					else item.message = command.message;
-					break;
+					else if (item.role !== command.message.role) reason = "role-mismatch";
+					return decide();
 				}
 				case "remove": {
 					const position = state.inbox.items.findIndex((item) => item.id === command.inputId);
@@ -408,14 +433,15 @@ const createControlRuntime = (options) => {
 					const selected = state.inbox.items[position];
 					if (!selected) reason = "not-pending";
 					else if ((state.active?.turnId ?? null) !== command.turnId) reason = "stale-turn";
-					else if (selected.message.role !== "user") reason = "not-user-input";
+					else if (selected.role !== "user") reason = "not-user-input";
 					else {
 						selected.generate = true;
 						if (state.active) selected.afterStepOf = state.active.turnId;
 						else delete selected.afterStepOf;
+						const others = state.inbox.items.filter((item) => item !== selected);
 						moveInput({
 							from: position,
-							to: 0
+							to: state.active ? steeringEnd(others, state.active.turnId) : 0
 						});
 					}
 					break;
@@ -431,7 +457,6 @@ const createControlRuntime = (options) => {
 					insert({
 						message: command.message,
 						generate: true,
-						first: true,
 						afterStepOf: command.turnId
 					});
 					break;
@@ -597,12 +622,12 @@ const createControlRuntime = (options) => {
 			const modelDone = active.model === null || active.model.settled;
 			const workSettled = modelDone && response.calls.every((call) => call.work === void 0 || call.work.settled);
 			const externalPending = response.calls.some((call) => call.call.providerExecuted && call.call.supportsDeferredResults && !call.terminal && !approvalBlocksExecution(call));
-			const handoffReady = handoff && workSettled && !externalPending && (active.suspended || response.failure !== void 0 || response.calls.every((call) => callReadyForModel(call) || approvalBlocksExecution(call)));
+			const handoffReady = handoff && workSettled && !externalPending && (active.suspended ? !state.inbox.paused : response.failure !== void 0 || response.calls.every((call) => callReadyForModel(call) || approvalBlocksExecution(call)));
 			const readyForModel = !active.suspended && response.failure === void 0 && modelDone && callsDone && response.inputs.length === 0;
 			const naturalCompletion = readyForModel && response.completion !== void 0 && response.completion.finishReason !== "tool-calls";
 			if (handoffReady && !naturalCompletion) await end({
 				lastSeenIndex: void 0,
-				reason: "steered after step"
+				reason: STEERED_REASON
 			});
 			else if (readyForModel && (!handoff || handoffReady)) {
 				const resume = active.model !== null && active.model.version !== active.version;
@@ -632,12 +657,14 @@ const createControlRuntime = (options) => {
 		}
 		if (state.active === null && !state.inbox.paused && !state.coordinator.closed) while (state.inbox.items.length > 0) {
 			const item = state.inbox.items.shift();
+			if (steersOn(item, state.inbox.items)) item.generate = false;
 			delete item.afterStepOf;
 			await emit({
 				type: "ai.message.created",
 				payload: {
-					message: item.message,
-					generate: item.generate
+					messageId: item.id,
+					role: item.role,
+					...item.generate ? {} : { generate: false }
 				},
 				id: await aiEventId("a2.ai.admitted", options.contract.name, ctx.event.sessionId, item.id)
 			});
@@ -661,30 +688,7 @@ const createControlRuntime = (options) => {
 			});
 			break;
 		}
-		const receipt = {
-			commandId: ctx.event.id,
-			...ctx.event.type === "ai.work.reported" ? { work: true } : {},
-			outcome: reason === void 0 ? "applied" : "rejected",
-			...reason === void 0 ? {} : { reason }
-		};
-		return [
-			...facts,
-			{
-				type: "ai.control.committed",
-				id: await aiEventId("a2.ai.control.committed", ctx.event.id),
-				payload: controlCommit({
-					before,
-					after: state,
-					moves
-				})
-			},
-			...jobs,
-			{
-				type: "ai.control.decided",
-				id: await aiEventId("a2.ai.control.decided", ctx.event.id),
-				payload: receipt
-			}
-		];
+		return decide();
 	};
 	const report = async ({ ctx, events, settled, name }) => {
 		const payload = ctx.event.payload;
@@ -784,8 +788,12 @@ const index = (value) => typeof value === "number" && Number.isSafeInteger(value
 const id = (value) => typeof value === "string" && value.length > 0;
 const nullableId = (value) => value === null || id(value);
 const matches = (schema, value) => validateSync(schema, value, "AI context checkpoint").issues === void 0;
-const isMessage = (value) => matches(events["ai.message.created"], { message: value });
 const indexes = (value, messages) => record(value) && Object.values(value).every(index) && messages.every((message) => Object.hasOwn(value, message.id));
+const inputs = (value) => record(value) && Object.keys(value).length === 2 && Array.isArray(value["commands"]) && value["commands"].every((held) => record(held) && Object.keys(held).every((key) => [
+	"commandId",
+	"inputId",
+	"message"
+].includes(key)) && id(held["commandId"]) && id(held["inputId"]) && (held["message"] === void 0 || isUIMessage(held["message"]))) && Array.isArray(value["waiting"]) && value["waiting"].every((input) => record(input) && Object.keys(input).length === 2 && id(input["inputId"]) && isUIMessage(input["message"]));
 const compaction = (value) => value === null || record(value) && Object.keys(value).every((key) => [
 	"status",
 	"generationId",
@@ -816,7 +824,7 @@ const progress = (value) => {
 const indexedEvents = (value, types) => Array.isArray(value) && value.every((event) => record(event) && index(event["index"]) && types.includes(event["type"]) && matches(events[event["type"]], event["payload"]));
 const restorableBase = (options) => {
 	assertMessageBase(options.base);
-	return isMessage(restoreMessageBase({
+	return isUIMessage(restoreMessageBase({
 		current: options.current,
 		base: options.base
 	}));
@@ -880,6 +888,7 @@ const contextSchema = (app) => ({ "~standard": {
 			"compaction",
 			"modelMetadata",
 			"closed",
+			"inputs",
 			"authority",
 			"generation",
 			"activeProjection",
@@ -892,7 +901,7 @@ const contextSchema = (app) => ({ "~standard": {
 			const metadata = value["modelMetadata"];
 			const generation = value["generation"];
 			const current = value["activeProjection"];
-			if (!Array.isArray(messages) || !messages.every(isMessage) || !compaction(value["compaction"]) || typeof value["closed"] !== "boolean" || !authority(value["authority"]) || !record(metadata) || !Object.entries(metadata).every(([modelId, entry]) => record(entry) && (entry["status"] === "pending" || entry["status"] === "unavailable" || entry["status"] === "resolved" && matches(events["ai.model.metadata.resolved"], {
+			if (!Array.isArray(messages) || !messages.every(isUIMessage) || !compaction(value["compaction"]) || typeof value["closed"] !== "boolean" || !inputs(value["inputs"]) || !authority(value["authority"]) || !record(metadata) || !Object.entries(metadata).every(([modelId, entry]) => record(entry) && (entry["status"] === "pending" || entry["status"] === "unavailable" || entry["status"] === "resolved" && matches(events["ai.model.metadata.resolved"], {
 				modelId,
 				limits: entry["limits"]
 			}))) || !indexes(value["messageIndexes"], messages)) return invalid;
@@ -1002,6 +1011,10 @@ const createContextReducer = ({ contract }) => {
 		compaction: null,
 		modelMetadata: {},
 		closed: false,
+		inputs: {
+			commands: [],
+			waiting: []
+		},
 		authority: null,
 		generation: null,
 		activeProjection: null,
@@ -1010,7 +1023,7 @@ const createContextReducer = ({ contract }) => {
 	};
 	const reducer$1 = reducer({
 		contract,
-		name: app === void 0 ? "a2.ai.context.v6" : `${app.name}+a2.ai.context.v6`,
+		name: app === void 0 ? "a2.ai.context.v7" : `${app.name}+a2.ai.context.v7`,
 		initialState,
 		stateSchema: contextSchema(app)
 	}).fold((state, event) => {
@@ -1046,15 +1059,69 @@ const reduceContext = (state, event) => {
 			};
 			return view.closed ? endGeneration(next) : next;
 		}
+		case "ai.control.requested": {
+			const command = event.payload;
+			const held = command.action === "send" || command.action === "steer" || command.action === "edit" ? {
+				commandId: event.id,
+				inputId: command.message.id,
+				message: command.message
+			} : command.action === "remove" ? {
+				commandId: event.id,
+				inputId: command.inputId
+			} : void 0;
+			if (held === void 0) return state;
+			return {
+				...state,
+				inputs: {
+					...state.inputs,
+					commands: [...state.inputs.commands, held]
+				}
+			};
+		}
+		case "ai.control.decided": {
+			const receipt = event.payload;
+			const held = receipt.work ? void 0 : state.inputs.commands.find((command) => command.commandId === receipt.commandId);
+			if (held === void 0) return state;
+			const commands = state.inputs.commands.filter((command) => command !== held);
+			if (receipt.outcome !== "applied") return {
+				...state,
+				inputs: {
+					...state.inputs,
+					commands
+				}
+			};
+			const waiting = state.inputs.waiting.filter((input) => input.inputId !== held.inputId);
+			if (held.message !== void 0) waiting.push({
+				inputId: held.inputId,
+				message: held.message
+			});
+			return {
+				...state,
+				inputs: {
+					commands,
+					waiting
+				}
+			};
+		}
 		case "ai.session.closed": return endGeneration({
 			...state,
 			closed: true,
+			inputs: {
+				commands: [],
+				waiting: []
+			},
 			compaction: state.compaction?.status === "running" ? state.activeProjection?.baseCompaction ?? null : state.compaction
 		});
 		case "ai.message.created": {
-			const { message } = event.payload;
+			const { messageId } = event.payload;
+			const message = state.inputs.waiting.find((input) => input.inputId === messageId)?.message ?? state.inputs.commands.find((command) => command.commandId === messageId)?.message;
+			if (message === void 0) throw unexplainedAdmission(messageId);
 			return {
 				...state,
+				inputs: {
+					commands: state.inputs.commands.filter((command) => command.commandId !== messageId),
+					waiting: state.inputs.waiting.filter((input) => input.inputId !== messageId)
+				},
 				messages: upsertMessage(state.messages, message),
 				activeProjection: state.activeProjection?.responseMessageId === message.id ? {
 					...state.activeProjection,
@@ -1711,7 +1778,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;
@@ -1730,7 +1802,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();
@@ -1740,7 +1812,6 @@ async function* consumeGeneration(options) {
 		if (pending.length > 0) yield batch();
 		throw error;
 	} finally {
-		pendingChunk.catch(() => {});
 		try {
 			await reader.cancel();
 		} catch {} finally {
@@ -2058,6 +2129,7 @@ function createHandlers(options) {
 	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`);
+		if (tool.type === "provider") throw new TypeError(`a harness runs only tools A2 executes; '${name}' is provider-defined`);
 	}
 	const configuredCompaction = loop.compaction ?? (loop.generate === void 0 && harness === void 0 ? {} : false);
 	const staticCompaction = typeof configuredCompaction === "function" ? void 0 : validateCompaction({