experimental-a2 0.16.0 → 0.16.1

package/dist/ai-server.js

@@ -2,7 +2,7 @@ import { n as validateSync } from "./validate-XKT4FSNn.js";
 import { t as A2Error } from "./errors-DCk6ch5n.js";
 import { f as consumeSchedulerSendFailure, p as installAmbientToolScopeStorage } from "./internal-Dq2qYxou.js";
 import { i as setServerFetchHooks, t as createServer } from "./server-BD5ckxZb.js";
-import { C as applyControlChanges, S as initialControlState, _ as progressBatches, a as events, b as AI_EVENT_ID_PREFIX, d as advanceProjection, f as projectedMessage, g as flattenProgressBatches, h as upsertResponse, l as aiStateReducer, m as upsertMessage, p as reduceToolActivity, u as storedAIReducer, v as interruptUIMessage, w as controlCommit, x as aiEventId, y as pauseUIMessage } from "./ai-CrLYwNEx.js";
+import { C as interruptUIMessage, S as progressBatches, _ as projectedMessage, a as events, b as upsertResponse, d as AI_EVENT_ID_PREFIX, f as aiEventId, g as advanceProjection, h as controlCommit, l as aiStateReducer, m as applyControlChanges, p as initialControlState, u as storedAIReducer, v as reduceToolActivity, w as pauseUIMessage, x as flattenProgressBatches, y as upsertMessage } from "./ai-DgOBltJ_.js";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { createHash } from "node:crypto";
 import { asSchema, convertToModelMessages, isToolUIPart, stepCountIs, streamText, toUIMessageStream } from "ai";
@@ -239,12 +239,35 @@ const callReadyForModel = (call) => call.terminal || call.call.providerExecuted
 const approvalBlocksExecution = (call) => call.approval !== void 0 && call.response?.approved !== true;
 const createControlRuntime = (options) => {
 	const reducer = options.agent.contract.reducer({
-		name: "a2.ai.control.v4",
+		name: "a2.ai.control.v5",
 		initialState: initialControlState()
-	}).fold((state, event) => event.type === "ai.control.committed" ? applyControlChanges({
-		state,
-		changes: event.payload.changes
-	}) : state);
+	}).fold((state, event) => {
+		if (event.type === "ai.control.requested") {
+			const command = event.payload;
+			if (command.action === "stop") return {
+				...state,
+				pendingStops: {
+					...state.pendingStops,
+					[event.id]: command.turnId
+				}
+			};
+		}
+		if (event.type === "ai.control.decided") {
+			const receipt = event.payload;
+			if (Object.hasOwn(state.pendingStops, receipt.commandId)) {
+				const pendingStops = { ...state.pendingStops };
+				delete pendingStops[receipt.commandId];
+				return {
+					...state,
+					pendingStops
+				};
+			}
+		}
+		return event.type === "ai.control.committed" ? applyControlChanges({
+			state,
+			changes: event.payload.changes
+		}) : state;
+	});
 	const coordinator = aiCoordinatorReducer(options.agent.contract);
 	const handler = async (ctx) => {
 		const snapshot = await ctx.session.state(reducer, { through: "latest" });
@@ -2042,7 +2065,7 @@ function createHandlers(options) {
 			const state = (await ctx.session.state(control.reducer, { through: "latest" })).state;
 			const request = ctx.event.payload;
 			const call = state.coordinator.response?.calls.find((candidate) => candidate.work?.id === ctx.event.id);
-			if (state.active?.turnId !== request.turnId || state.active.suspended || state.active.version !== request.version || state.coordinator.response?.failure !== void 0 || !call || call.terminal || call.work?.settled) return control.settled({
+			if (state.active?.turnId !== request.turnId || Object.values(state.pendingStops).includes(request.turnId) || state.active.suspended || state.active.version !== request.version || state.coordinator.response?.failure !== void 0 || !call || call.terminal || call.work?.settled) return control.settled({
 				ctx,
 				events: void 0
 			});
@@ -2071,7 +2094,9 @@ function createHandlers(options) {
 		const request = ctx.event.payload;
 		const snapshot = await readContext(ctx.session, "latest");
 		if (snapshot.state.closed || snapshot.state.authority?.requestId !== requestId || snapshot.state.authority?.phase === "paused" || snapshot.state.authority?.phase === "pausing") return;
-		const coordinatorState = (await ctx.session.state(coordinator, { through: snapshot.index })).state;
+		const controlState = (await ctx.session.state(control.reducer, { through: snapshot.index })).state;
+		if (request.control !== void 0 && Object.values(controlState.pendingStops).includes(request.control.turnId)) return;
+		const coordinatorState = controlState.coordinator;
 		if (coordinatorState.closed || coordinatorState.response?.activeRequestId !== requestId) return;
 		const response = coordinatorState.response;
 		const current = response.generation?.requestId === requestId ? response.generation : void 0;
@@ -2475,6 +2500,7 @@ function createHandlers(options) {
 		"ai.generation.requested": {
 			lane: "a2.ai.model",
 			abortOn: {
+				"ai.control.requested": (event, trigger) => event.payload.action === "stop" && event.payload.turnId === trigger.payload.control?.turnId,
 				"ai.control.committed": (event, trigger) => {
 					const active = event.payload.view;
 					return active?.turnId !== trigger.payload.control?.turnId || active?.version !== trigger.payload.control?.version;
@@ -2501,6 +2527,7 @@ function createHandlers(options) {
 		},
 		"ai.tool.execution.requested": {
 			abortOn: {
+				"ai.control.requested": (event, trigger) => event.payload.action === "stop" && event.payload.turnId === trigger.payload.turnId,
 				"ai.generation.failed": (event, trigger) => event.payload.generationId === trigger.payload.call.generationId,
 				"ai.control.committed": (event, trigger) => {
 					const active = event.payload.view;