experimental-a2 0.0.0 → 0.2.0

package/dist/ai.js

@@ -1,5 +1,5 @@
 import { t as assertSyncSchema } from "./validate-XKT4FSNn.js";
-import { t as contract } from "./contract-B0kAXoaL.js";
+import { t as contract } from "./contract-CG_adnu_.js";
 //#region src/ai-projector.ts
 const isRecord$1 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 const cloneMessage = (messageId, base) => structuredClone(base ?? {
@@ -442,7 +442,7 @@ const completedPayloadSchema = schema("ai.generation.completed", (value) => {
 	return { value };
 });
 const compactionPayloadSchema = (messageSchema) => schema("ai.compaction.completed", (value) => {
-	if (!isRecord(value) || !isJSONCompatible(value) || !stringField(value, "generationId") || !stringField(value, "throughMessageId") || !Array.isArray(value["messages"])) return issue("invalid ai.compaction.completed payload");
+	if (!isRecord(value) || !isJSONCompatible(value) || !stringField(value, "generationId") || !stringField(value, "throughMessageId") || !Array.isArray(value["messages"]) || value["retainedMessageIds"] !== void 0 && (!Array.isArray(value["retainedMessageIds"]) || !value["retainedMessageIds"].every((candidate) => typeof candidate === "string"))) return issue("invalid ai.compaction.completed payload");
 	const messages = [];
 	for (const candidate of value["messages"]) {
 		const result = validateMessage(candidate, messageSchema);
@@ -452,7 +452,8 @@ const compactionPayloadSchema = (messageSchema) => schema("ai.compaction.complet
 	return { value: {
 		generationId: value["generationId"],
 		throughMessageId: value["throughMessageId"],
-		messages
+		messages,
+		...value["retainedMessageIds"] === void 0 ? {} : { retainedMessageIds: value["retainedMessageIds"] }
 	} };
 });
 function createEvents(options) {
@@ -464,17 +465,18 @@ function createEvents(options) {
 		"ai.message.created": messagePayloadSchema(messageSchema),
 		"ai.message.completed": jsonObject("ai.message.completed", (value) => stringField(value, "messageId")),
 		"ai.message.interrupted": jsonObject("ai.message.interrupted", (value) => stringField(value, "messageId") && optionalStringField(value, "generationId") && optionalStringField(value, "reason") && (value["lastSeenIndex"] === void 0 || typeof value["lastSeenIndex"] === "number" && Number.isInteger(value["lastSeenIndex"]) && value["lastSeenIndex"] >= 0)),
-		"ai.generation.requested": jsonObject("ai.generation.requested", (value) => stringField(value, "messageId") && optionalStringField(value, "responseMessageId") && (value["reason"] === "message" || value["reason"] === "approval" || value["reason"] === "input" || value["reason"] === "retry")),
+		"ai.generation.requested": jsonObject("ai.generation.requested", (value) => stringField(value, "messageId") && optionalStringField(value, "responseMessageId") && (value["reason"] === "message" || value["reason"] === "tool" || value["reason"] === "input" || value["reason"] === "retry")),
+		"ai.retry.requested": jsonObject("ai.retry.requested", (value) => stringField(value, "messageId") && stringField(value, "responseMessageId") && stringField(value, "retryId")),
 		"ai.generation.started": jsonObject("ai.generation.started", (value) => stringField(value, "requestId") && stringField(value, "messageId") && stringField(value, "generationId") && stringField(value, "responseMessageId") && typeof value["attempt"] === "number" && Number.isInteger(value["attempt"]) && value["attempt"] > 0 && stringField(value, "model")),
 		"ai.generation.progress": progressPayloadSchema,
 		"ai.generation.completed": completedPayloadSchema,
-		"ai.generation.failed": jsonObject("ai.generation.failed", (value) => stringField(value, "requestId") && stringField(value, "messageId") && stringField(value, "generationId") && stringField(value, "responseMessageId") && stringField(value, "error") && (value["superseded"] === void 0 || typeof value["superseded"] === "boolean")),
-		"ai.tool.called": jsonObject("ai.tool.called", (value) => stringField(value, "requestId") && stringField(value, "messageId") && stringField(value, "generationId") && stringField(value, "toolCallId") && stringField(value, "toolName") && (value["dynamic"] === void 0 || typeof value["dynamic"] === "boolean") && (value["providerExecuted"] === void 0 || typeof value["providerExecuted"] === "boolean") && optionalStringField(value, "title")),
+		"ai.generation.failed": jsonObject("ai.generation.failed", (value) => stringField(value, "requestId") && stringField(value, "messageId") && stringField(value, "generationId") && stringField(value, "responseMessageId") && stringField(value, "error") && (value["superseded"] === void 0 || typeof value["superseded"] === "boolean") && (value["stepLimit"] === void 0 || typeof value["stepLimit"] === "boolean")),
+		"ai.tool.called": jsonObject("ai.tool.called", (value) => stringField(value, "requestId") && stringField(value, "messageId") && stringField(value, "generationId") && stringField(value, "toolCallId") && stringField(value, "toolName") && (value["dynamic"] === void 0 || typeof value["dynamic"] === "boolean") && (value["providerExecuted"] === void 0 || typeof value["providerExecuted"] === "boolean") && (value["supportsDeferredResults"] === void 0 || typeof value["supportsDeferredResults"] === "boolean") && optionalStringField(value, "title")),
 		"ai.tool.result": jsonObject("ai.tool.result", (value) => stringField(value, "requestId") && stringField(value, "messageId") && stringField(value, "generationId") && stringField(value, "toolCallId") && optionalStringField(value, "toolName") && optionalStringField(value, "error") && (value["denied"] === void 0 || typeof value["denied"] === "boolean") && (value["preliminary"] === void 0 || typeof value["preliminary"] === "boolean") && (value["phase"] === void 0 || value["phase"] === "input" || value["phase"] === "execution") && (value["dynamic"] === void 0 || typeof value["dynamic"] === "boolean") && (value["providerExecuted"] === void 0 || typeof value["providerExecuted"] === "boolean")),
 		"ai.approval.requested": jsonObject("ai.approval.requested", (value) => stringField(value, "messageId") && stringField(value, "generationId") && stringField(value, "approvalId") && stringField(value, "toolCallId") && (value["isAutomatic"] === void 0 || typeof value["isAutomatic"] === "boolean") && optionalStringField(value, "signature")),
-		"ai.approval.responded": jsonObject("ai.approval.responded", (value) => stringField(value, "messageId") && stringField(value, "approvalId") && typeof value["approved"] === "boolean" && optionalStringField(value, "reason")),
-		"ai.input.requested": jsonObject("ai.input.requested", (value) => stringField(value, "messageId") && optionalStringField(value, "generationId") && stringField(value, "inputId") && stringField(value, "name")),
-		"ai.input.responded": jsonObject("ai.input.responded", (value) => stringField(value, "messageId") && stringField(value, "inputId") && stringField(value, "name")),
+		"ai.approval.responded": jsonObject("ai.approval.responded", (value) => stringField(value, "messageId") && stringField(value, "generationId") && stringField(value, "approvalId") && typeof value["approved"] === "boolean" && optionalStringField(value, "reason")),
+		"ai.input.requested": jsonObject("ai.input.requested", (value) => stringField(value, "messageId") && stringField(value, "generationId") && stringField(value, "inputId") && stringField(value, "name")),
+		"ai.input.responded": jsonObject("ai.input.responded", (value) => stringField(value, "messageId") && stringField(value, "generationId") && stringField(value, "inputId") && stringField(value, "name")),
 		"ai.compaction.requested": jsonObject("ai.compaction.requested", (value) => stringField(value, "generationId") && stringField(value, "throughMessageId")),
 		"ai.compaction.completed": compactionPayloadSchema(messageSchema)
 	};
@@ -485,7 +487,10 @@ const initialState = () => ({
 	messages: [],
 	status: "idle",
 	activeGeneration: null,
+	activeRequestId: null,
+	activeResponseMessageId: null,
 	activeProjection: null,
+	responseGenerationIds: {},
 	pendingApprovals: [],
 	pendingInputs: [],
 	tools: [],
@@ -522,12 +527,85 @@ const answerApproval = (messages, response) => messages.map((message) => {
 		parts
 	} : message;
 });
-const waitingStatus = (state) => state.pendingApprovals.length > 0 || state.pendingInputs.length > 0 ? "waiting" : "idle";
-const projectedMessage = (projection) => projectUIMessage({
-	messageId: projection.responseMessageId,
-	...projection.baseMessage === void 0 ? {} : { base: projection.baseMessage },
-	chunks: projection.batches.flatMap((batch) => batch.chunks)
+const projectMessageChunks = (messages, messageId, chunks) => messages.map((message) => message.id === messageId ? projectUIMessage({
+	messageId,
+	base: message,
+	chunks
+}) : message);
+const approvalRequestedChunk = (payload) => ({
+	type: "tool-approval-request",
+	approvalId: payload.approvalId,
+	toolCallId: payload.toolCallId,
+	...payload.isAutomatic === void 0 ? {} : { isAutomatic: payload.isAutomatic },
+	...payload.signature === void 0 ? {} : { signature: payload.signature }
 });
+const approvalRespondedChunk = (payload) => ({
+	type: "tool-approval-response",
+	approvalId: payload.approvalId,
+	approved: payload.approved,
+	...payload.reason === void 0 ? {} : { reason: payload.reason }
+});
+const toolResultChunk = (payload) => {
+	if (payload.phase === "input") return {
+		type: "tool-input-error",
+		toolCallId: payload.toolCallId,
+		toolName: payload.toolName ?? "unknown",
+		input: payload.rawInput ?? payload.input,
+		errorText: payload.error ?? "Invalid tool input",
+		...payload.dynamic === void 0 ? {} : { dynamic: payload.dynamic },
+		...payload.providerExecuted === void 0 ? {} : { providerExecuted: payload.providerExecuted },
+		...payload.providerMetadata === void 0 ? {} : { providerMetadata: payload.providerMetadata },
+		...payload.toolMetadata === void 0 ? {} : { toolMetadata: payload.toolMetadata }
+	};
+	if (payload.denied === true) return {
+		type: "tool-output-denied",
+		toolCallId: payload.toolCallId
+	};
+	if (payload.error !== void 0) return {
+		type: "tool-output-error",
+		toolCallId: payload.toolCallId,
+		errorText: payload.error,
+		...payload.dynamic === void 0 ? {} : { dynamic: payload.dynamic },
+		...payload.providerExecuted === void 0 ? {} : { providerExecuted: payload.providerExecuted },
+		...payload.providerMetadata === void 0 ? {} : { providerMetadata: payload.providerMetadata },
+		...payload.toolMetadata === void 0 ? {} : { toolMetadata: payload.toolMetadata }
+	};
+	return {
+		type: "tool-output-available",
+		toolCallId: payload.toolCallId,
+		output: payload.output,
+		...payload.preliminary === void 0 ? {} : { preliminary: payload.preliminary },
+		...payload.dynamic === void 0 ? {} : { dynamic: payload.dynamic },
+		...payload.providerExecuted === void 0 ? {} : { providerExecuted: payload.providerExecuted },
+		...payload.providerMetadata === void 0 ? {} : { providerMetadata: payload.providerMetadata },
+		...payload.toolMetadata === void 0 ? {} : { toolMetadata: payload.toolMetadata }
+	};
+};
+const waitingStatus = (state) => {
+	if (state.pendingApprovals.length > 0 || state.pendingInputs.length > 0) return "waiting";
+	return state.activeGeneration !== null || state.tools.some((tool) => tool.status === "running") ? "generating" : "idle";
+};
+const lifecycleStatus = (previous, next) => previous.status === "failed" ? "failed" : waitingStatus(next);
+const isStaleGeneration = (state, messageId, generationId) => {
+	const current = state.responseGenerationIds[messageId];
+	return current !== void 0 && current !== generationId;
+};
+const projectedMessage = (projection) => {
+	const projectionEvents = [...projection.batches];
+	for (const event of projection.toolEvents) if (event.type === "ai.tool.result") projectionEvents.push({
+		index: event.index,
+		chunks: [toolResultChunk(event.payload)]
+	});
+	for (const event of projection.approvalEvents) projectionEvents.push({
+		index: event.index,
+		chunks: [event.type === "ai.approval.requested" ? approvalRequestedChunk(event.payload) : approvalRespondedChunk(event.payload)]
+	});
+	return projectUIMessage({
+		messageId: projection.responseMessageId,
+		...projection.baseMessage === void 0 ? {} : { base: projection.baseMessage },
+		chunks: projectionEvents.toSorted((left, right) => left.index - right.index).flatMap((event) => event.chunks)
+	});
+};
 const reduceToolActivity = (tools, event) => {
 	if (event.type === "ai.tool.called") {
 		const payload = event.payload;
@@ -537,10 +615,10 @@ const reduceToolActivity = (tools, event) => {
 			...providerMetadata === void 0 ? {} : { callProviderMetadata: providerMetadata },
 			status: "running"
 		};
-		return [...tools.filter((candidate) => candidate.toolCallId !== payload.toolCallId), tool];
+		return [...tools.filter((candidate) => candidate.generationId !== payload.generationId || candidate.toolCallId !== payload.toolCallId), tool];
 	}
 	const payload = event.payload;
-	const existing = tools.find((candidate) => candidate.toolCallId === payload.toolCallId);
+	const existing = tools.find((candidate) => candidate.generationId === payload.generationId && candidate.toolCallId === payload.toolCallId);
 	const toolName = payload.toolName ?? existing?.toolName;
 	const input = payload.input === void 0 ? existing?.input : payload.input;
 	const dynamic = payload.dynamic ?? existing?.dynamic;
@@ -567,15 +645,19 @@ const reduceToolActivity = (tools, event) => {
 		...existing?.title === void 0 ? {} : { title: existing.title },
 		status: payload.denied ? "denied" : payload.error ? "failed" : payload.preliminary ? "running" : "completed"
 	};
-	return [...tools.filter((candidate) => candidate.toolCallId !== payload.toolCallId), tool];
+	return [...tools.filter((candidate) => candidate.generationId !== payload.generationId || candidate.toolCallId !== payload.toolCallId), tool];
 };
 const projectedTools = (projection) => projection.toolEvents.reduce((tools, event) => reduceToolActivity(tools, event), projection.baseTools);
-const stopGenerationTools = (tools, generationId, responseMessageId, error) => tools.map((tool) => (tool.generationId === generationId || tool.messageId === responseMessageId) && tool.status === "running" ? {
+const stopGenerationTools = (tools, generationId, responseMessageId, error) => tools.map((tool) => tool.generationId === generationId || tool.messageId === responseMessageId ? {
 	...tool,
 	status: "failed",
 	error,
 	preliminary: false
 } : tool);
+const generationRequestId = (generationId) => {
+	const markerIndex = generationId.lastIndexOf(":generation:");
+	return markerIndex === -1 ? void 0 : generationId.slice(0, markerIndex);
+};
 /** Pure projection of the built-in AI protocol. Unknown extension events are ignored. */
 function reduceAIState(state, event) {
 	if (state.status === "closed") return state;
@@ -594,6 +676,8 @@ function reduceAIState(state, event) {
 			...state,
 			status: "closed",
 			activeGeneration: null,
+			activeRequestId: null,
+			activeResponseMessageId: null,
 			activeProjection: null
 		};
 		case "ai.message.created": {
@@ -605,27 +689,46 @@ function reduceAIState(state, event) {
 		}
 		case "ai.generation.requested": {
 			const payload = event.payload;
+			const schedulesToolContinuation = payload.reason === "tool";
+			const responseMessageId = payload.responseMessageId ?? (payload.reason === "message" ? `${payload.messageId}:assistant` : payload.messageId);
+			const ownerGenerationId = state.responseGenerationIds[responseMessageId] ?? state.activeGeneration?.generationId;
+			const ownerRequestId = ownerGenerationId === void 0 ? void 0 : generationRequestId(ownerGenerationId);
+			const requestId = event.id;
+			if (!(payload.reason === "message" || (payload.reason === "tool" ? ownerGenerationId !== void 0 && requestId === `ai.generate:tools:${ownerGenerationId}` && state.activeRequestId === ownerRequestId && state.status !== "failed" : payload.reason === "retry" ? state.status === "failed" : ownerGenerationId !== void 0 && requestId?.startsWith(`ai.generate:input:${encodeURIComponent(responseMessageId)}:${encodeURIComponent(ownerGenerationId)}:`) === true && state.activeRequestId === ownerRequestId && state.status !== "failed"))) return state;
 			return {
 				...state,
 				messages: payload.reason === "retry" && payload.responseMessageId !== void 0 ? state.messages.filter((message) => message.id !== payload.responseMessageId) : state.messages,
-				status: "generating",
-				error: null
+				status: schedulesToolContinuation ? state.status : "generating",
+				activeRequestId: requestId ?? null,
+				activeResponseMessageId: responseMessageId,
+				error: schedulesToolContinuation ? state.error : null
 			};
 		}
 		case "ai.generation.started": {
 			const payload = event.payload;
+			if (state.activeRequestId !== null && state.activeRequestId !== payload.requestId) return state;
+			const currentOwner = state.responseGenerationIds[payload.responseMessageId];
+			const marker = ":generation:";
+			const currentAttempt = currentOwner?.startsWith(`${payload.requestId}${marker}`) ? Number(currentOwner.slice(`${payload.requestId}${marker}`.length)) : void 0;
+			if (currentAttempt !== void 0 && Number.isFinite(currentAttempt) && currentAttempt >= payload.attempt) return state;
 			const baseMessage = state.messages.find((message) => message.id === payload.responseMessageId);
 			return {
 				...state,
 				status: "generating",
 				activeGeneration: payload,
+				activeResponseMessageId: null,
+				responseGenerationIds: {
+					...state.responseGenerationIds,
+					[payload.responseMessageId]: payload.generationId
+				},
 				activeProjection: {
 					generationId: payload.generationId,
 					responseMessageId: payload.responseMessageId,
 					...baseMessage === void 0 ? {} : { baseMessage },
 					batches: [],
 					baseTools: state.tools,
-					toolEvents: []
+					toolEvents: [],
+					approvalEvents: []
 				},
 				error: null
 			};
@@ -668,13 +771,16 @@ function reduceAIState(state, event) {
 		}
 		case "ai.generation.failed": {
 			const payload = event.payload;
-			if (state.activeGeneration?.generationId !== payload.generationId) return state;
+			if (state.activeGeneration?.generationId !== payload.generationId && !(payload.stepLimit === true && state.responseGenerationIds[payload.responseMessageId] === payload.generationId)) return state;
 			if (payload.superseded === true) return {
 				...state,
 				messages: state.messages.filter((message) => message.id !== payload.responseMessageId),
 				tools: state.tools.filter((tool) => tool.generationId !== payload.generationId),
+				pendingApprovals: state.pendingApprovals.filter((approval) => approval.generationId !== payload.generationId),
+				pendingInputs: state.pendingInputs.filter((input) => input.generationId !== payload.generationId),
 				activeGeneration: null,
-				activeProjection: null
+				activeProjection: null,
+				compaction: state.compaction?.generationId === payload.generationId ? null : state.compaction
 			};
 			const projection = state.activeProjection;
 			const shouldProject = projection?.generationId === payload.generationId && (projection.baseMessage !== void 0 || projection.batches.length > 0);
@@ -683,7 +789,9 @@ function reduceAIState(state, event) {
 				messages: shouldProject ? upsertMessage(state.messages, interruptUIMessage(projectedMessage(projection), `Generation failed before tool completion: ${payload.error}`)) : state.messages,
 				status: "failed",
 				activeGeneration: null,
+				activeResponseMessageId: null,
 				activeProjection: null,
+				compaction: state.compaction?.generationId === payload.generationId ? null : state.compaction,
 				pendingApprovals: state.pendingApprovals.filter((approval) => approval.generationId !== payload.generationId),
 				tools: stopGenerationTools(state.tools, payload.generationId, payload.responseMessageId, payload.error),
 				error: payload.error
@@ -692,32 +800,72 @@ function reduceAIState(state, event) {
 		case "ai.message.interrupted": {
 			const payload = event.payload;
 			const active = state.activeGeneration;
-			if (active === null || (payload.generationId === void 0 ? payload.messageId !== active.responseMessageId : payload.generationId !== active.generationId)) return state;
+			if (active === null) {
+				if (payload.generationId === void 0 && state.activeRequestId !== null && state.activeResponseMessageId === payload.messageId) return {
+					...state,
+					status: "idle",
+					activeRequestId: null,
+					activeResponseMessageId: null,
+					error: null
+				};
+				if (!(state.pendingApprovals.some((approval) => approval.messageId === payload.messageId) || state.pendingInputs.some((input) => input.messageId === payload.messageId) || state.tools.some((tool) => tool.messageId === payload.messageId && tool.status === "running"))) return state;
+				const next = {
+					...state,
+					activeRequestId: null,
+					activeResponseMessageId: null,
+					messages: state.messages.map((message) => message.id === payload.messageId ? interruptUIMessage(message) : message),
+					pendingApprovals: state.pendingApprovals.filter((approval) => approval.messageId !== payload.messageId),
+					pendingInputs: state.pendingInputs.filter((input) => input.messageId !== payload.messageId),
+					tools: stopGenerationTools(state.tools, payload.generationId ?? "", payload.messageId, "Tool execution was interrupted.")
+				};
+				return {
+					...next,
+					status: lifecycleStatus(state, next)
+				};
+			}
+			if (payload.generationId === void 0 ? payload.messageId !== active.responseMessageId : payload.generationId !== active.generationId) return state;
 			const projection = state.activeProjection;
 			const cutoff = payload.lastSeenIndex ?? Number.POSITIVE_INFINITY;
 			const retained = projection?.generationId === active.generationId ? {
 				...projection,
 				batches: projection.batches.filter((batch) => batch.index <= cutoff),
-				toolEvents: projection.toolEvents.filter((toolEvent) => toolEvent.index <= cutoff)
+				toolEvents: projection.toolEvents.filter((toolEvent) => toolEvent.index <= cutoff),
+				approvalEvents: projection.approvalEvents.filter((approvalEvent) => approvalEvent.index <= cutoff)
 			} : null;
 			const shouldProject = retained !== null && (retained.baseMessage !== void 0 || retained.batches.length > 0);
 			const next = {
 				...state,
 				messages: shouldProject ? upsertMessage(state.messages, interruptUIMessage(projectedMessage(retained))) : state.messages,
 				activeGeneration: null,
+				activeRequestId: null,
+				activeResponseMessageId: null,
 				activeProjection: null,
 				pendingApprovals: state.pendingApprovals.filter((approval) => approval.generationId !== active.generationId),
 				tools: stopGenerationTools(retained === null ? state.tools : projectedTools(retained), active.generationId, active.responseMessageId, "Tool execution was interrupted.")
 			};
 			return {
 				...next,
-				status: waitingStatus(next)
+				status: lifecycleStatus(state, next)
 			};
 		}
 		case "ai.tool.called": {
 			const payload = event.payload;
 			const projection = state.activeProjection;
-			if (projection?.generationId !== payload.generationId) return state;
+			if (isStaleGeneration(state, payload.messageId, payload.generationId)) return state;
+			if (state.tools.some((tool) => tool.generationId === payload.generationId && tool.toolCallId === payload.toolCallId && tool.status === "failed" && state.activeProjection?.generationId !== payload.generationId)) return state;
+			if (projection?.generationId !== payload.generationId) {
+				const next = {
+					...state,
+					tools: reduceToolActivity(state.tools, {
+						type: "ai.tool.called",
+						payload
+					})
+				};
+				return {
+					...next,
+					status: lifecycleStatus(state, next)
+				};
+			}
 			const activeProjection = {
 				...projection,
 				toolEvents: [...projection.toolEvents, {
@@ -735,7 +883,22 @@ function reduceAIState(state, event) {
 		case "ai.tool.result": {
 			const payload = event.payload;
 			const projection = state.activeProjection;
-			if (projection?.generationId !== payload.generationId) return state;
+			if (isStaleGeneration(state, payload.messageId, payload.generationId)) return state;
+			if (state.tools.some((tool) => tool.generationId === payload.generationId && tool.toolCallId === payload.toolCallId && tool.status === "failed" && state.activeProjection?.generationId !== payload.generationId)) return state;
+			if (projection?.generationId !== payload.generationId) {
+				const next = {
+					...state,
+					messages: projectMessageChunks(state.messages, payload.messageId, [toolResultChunk(payload)]),
+					tools: reduceToolActivity(state.tools, {
+						type: "ai.tool.result",
+						payload
+					})
+				};
+				return {
+					...next,
+					status: lifecycleStatus(state, next)
+				};
+			}
 			const activeProjection = {
 				...projection,
 				toolEvents: [...projection.toolEvents, {
@@ -746,50 +909,88 @@ function reduceAIState(state, event) {
 			};
 			return {
 				...state,
+				messages: upsertMessage(state.messages, projectedMessage(activeProjection)),
 				activeProjection,
 				tools: projectedTools(activeProjection)
 			};
 		}
 		case "ai.approval.requested": {
 			const payload = event.payload;
-			return {
+			const projection = state.activeProjection;
+			if (isStaleGeneration(state, payload.messageId, payload.generationId)) return state;
+			if (state.tools.some((tool) => tool.generationId === payload.generationId && tool.toolCallId === payload.toolCallId && tool.status === "failed" && projection?.generationId !== payload.generationId)) return state;
+			const activeProjection = projection?.generationId === payload.generationId ? {
+				...projection,
+				approvalEvents: [...projection.approvalEvents, {
+					index: event.index,
+					type: "ai.approval.requested",
+					payload
+				}]
+			} : projection;
+			const next = {
 				...state,
-				pendingApprovals: [...state.pendingApprovals.filter((approval) => approval.approvalId !== payload.approvalId), payload]
+				messages: activeProjection === null || activeProjection === projection ? projectMessageChunks(state.messages, payload.messageId, [approvalRequestedChunk(payload)]) : upsertMessage(state.messages, projectedMessage(activeProjection)),
+				activeProjection,
+				pendingApprovals: payload.isAutomatic === true ? state.pendingApprovals : [...state.pendingApprovals.filter((approval) => approval.approvalId !== payload.approvalId || approval.messageId !== payload.messageId), payload]
+			};
+			return {
+				...next,
+				status: lifecycleStatus(state, next)
 			};
 		}
 		case "ai.approval.responded": {
 			const payload = event.payload;
+			if (isStaleGeneration(state, payload.messageId, payload.generationId)) return state;
+			const projection = state.activeProjection;
+			const pendingRequest = state.pendingApprovals.find((candidate) => candidate.approvalId === payload.approvalId && candidate.messageId === payload.messageId && candidate.generationId === payload.generationId);
+			const activeRequest = projection?.approvalEvents.findLast((candidate) => candidate.type === "ai.approval.requested" && candidate.payload.approvalId === payload.approvalId && candidate.payload.messageId === payload.messageId && candidate.payload.generationId === payload.generationId);
+			if (state.status === "failed" && pendingRequest === void 0 && activeRequest === void 0) return state;
+			const activeProjection = projection !== null && activeRequest !== void 0 ? {
+				...projection,
+				approvalEvents: [...projection.approvalEvents, {
+					index: event.index,
+					type: "ai.approval.responded",
+					payload
+				}]
+			} : projection;
 			const next = {
 				...state,
-				messages: answerApproval(state.messages, payload),
-				pendingApprovals: state.pendingApprovals.filter((approval) => approval.approvalId !== payload.approvalId)
+				messages: activeProjection === null || activeProjection === projection ? answerApproval(state.messages, payload) : upsertMessage(state.messages, projectedMessage(activeProjection)),
+				activeProjection,
+				pendingApprovals: state.pendingApprovals.filter((approval) => approval.approvalId !== payload.approvalId || approval.messageId !== payload.messageId || approval.generationId !== payload.generationId)
 			};
 			return {
 				...next,
-				status: waitingStatus(next)
+				status: lifecycleStatus(state, next)
 			};
 		}
 		case "ai.input.requested": {
 			const payload = event.payload;
-			return {
+			if (isStaleGeneration(state, payload.messageId, payload.generationId)) return state;
+			const next = {
 				...state,
-				pendingInputs: [...state.pendingInputs.filter((input) => input.inputId !== payload.inputId), payload],
-				status: "waiting"
+				pendingInputs: [...state.pendingInputs.filter((input) => input.messageId !== payload.messageId || input.generationId !== payload.generationId || input.inputId !== payload.inputId), payload]
+			};
+			return {
+				...next,
+				status: lifecycleStatus(state, next)
 			};
 		}
 		case "ai.input.responded": {
 			const payload = event.payload;
+			if (isStaleGeneration(state, payload.messageId, payload.generationId)) return state;
 			const next = {
 				...state,
-				pendingInputs: state.pendingInputs.filter((input) => input.inputId !== payload.inputId)
+				pendingInputs: state.pendingInputs.filter((input) => input.inputId !== payload.inputId || input.messageId !== payload.messageId || input.generationId !== payload.generationId)
 			};
 			return {
 				...next,
-				status: waitingStatus(next)
+				status: lifecycleStatus(state, next)
 			};
 		}
 		case "ai.compaction.requested": {
 			const payload = event.payload;
+			if (state.activeGeneration?.generationId !== payload.generationId) return state;
 			return {
 				...state,
 				compaction: {
@@ -800,6 +1001,7 @@ function reduceAIState(state, event) {
 		}
 		case "ai.compaction.completed": {
 			const payload = event.payload;
+			if (state.activeGeneration?.generationId !== payload.generationId || state.compaction?.status !== "running" || state.compaction.generationId !== payload.generationId) return state;
 			return {
 				...state,
 				compaction: {
@@ -820,19 +1022,10 @@ function deriveUIMessages(history) {
 /** Build the standard AI state projection for any contract containing the protocol. */
 function createReducer(options) {
 	return options.contract.reducer({
-		name: options.name ?? "a2.ai.state.v2",
+		name: options.name ?? "a2.ai.state.v6",
 		initialState: initialState()
 	}).fold((state, event) => reduceAIState(state, event));
 }
-const generationRequest = (options) => ({
-	type: "ai.generation.requested",
-	id: options.id,
-	payload: {
-		messageId: options.messageId,
-		reason: options.reason,
-		...options.responseMessageId === void 0 ? {} : { responseMessageId: options.responseMessageId }
-	}
-});
 const seedMessage = (message) => [{
 	type: "ai.message.created",
 	id: `ai.message:${message.id}`,
@@ -841,51 +1034,36 @@ const seedMessage = (message) => [{
 /** Pure append inputs for the built-in AI protocol. */
 const inputs = {
 	message(message) {
-		const messageInputs = seedMessage(message);
-		if (message.role !== "user") return messageInputs;
-		return [...messageInputs, generationRequest({
-			id: `ai.generate:message:${message.id}`,
-			messageId: message.id,
-			reason: "message"
-		})];
+		return seedMessage(message);
 	},
 	seed: seedMessage,
 	approval(response) {
 		return [{
 			type: "ai.approval.responded",
-			id: `ai.approval:${response.approvalId}:response`,
+			id: `ai.approval:${encodeURIComponent(response.messageId)}:${encodeURIComponent(response.generationId)}:${encodeURIComponent(response.approvalId)}:response`,
 			payload: response
-		}, generationRequest({
-			id: `ai.generate:approval:${response.approvalId}`,
-			messageId: response.messageId,
-			reason: "approval"
-		})];
+		}];
 	},
 	input(response) {
 		return [{
 			type: "ai.input.responded",
-			id: `ai.input:${response.inputId}:response`,
+			id: `ai.input:${encodeURIComponent(response.messageId)}:${encodeURIComponent(response.generationId)}:${encodeURIComponent(response.inputId)}:response`,
 			payload: response
-		}, generationRequest({
-			id: `ai.generate:input:${response.inputId}`,
-			messageId: response.messageId,
-			reason: "input"
-		})];
+		}];
 	},
 	requestInput(request) {
 		return [{
 			type: "ai.input.requested",
-			id: `ai.input:${request.inputId}:request`,
+			id: `ai.input:${encodeURIComponent(request.messageId)}:${encodeURIComponent(request.generationId)}:${encodeURIComponent(request.inputId)}:request`,
 			payload: request
 		}];
 	},
 	retry(retryOptions) {
-		return [generationRequest({
-			id: `ai.generate:retry:${retryOptions.retryId}`,
-			messageId: retryOptions.messageId,
-			responseMessageId: retryOptions.responseMessageId,
-			reason: "retry"
-		})];
+		return [{
+			type: "ai.retry.requested",
+			id: `ai.retry:${retryOptions.retryId}`,
+			payload: retryOptions
+		}];
 	},
 	interrupt(interruption) {
 		return [{
@@ -913,7 +1091,7 @@ function agent(options) {
 	return {
 		contract: agentContract,
 		reducer: agentContract.reducer({
-			name: options.reducerName ?? "a2.ai.state.v2",
+			name: options.reducerName ?? "a2.ai.state.v6",
 			initialState: initialState()
 		}).fold((state, event) => reduceAIState(state, event))
 	};

package/dist/client.d.ts

@@ -1,4 +1,4 @@
-import { i as EventDefs, r as ContractEvent, s as Reducer, t as AppendInput } from "./contract-DL8btVd9.js";
+import { a as EventDefs, c as Reducer, r as ContractEvent, t as AppendInput } from "./contract-C_3dIIEU.js";
 //#region src/client.d.ts
 type ConnectionStatus = "idle" | "connecting" | "live" | "closed";
 /**

package/dist/client.js

@@ -1,16 +1,16 @@
 import { n as validateSync } from "./validate-XKT4FSNn.js";
 import { t as A2Error } from "./errors-BJRMd-h6.js";
-import { r as STREAM_TIMINGS } from "./internal-Dm8Ejnud.js";
-import { i as eventFromWire, o as isWireEvent, t as errorFromWire } from "./wire-2QpU1EtJ.js";
+import { r as STREAM_TIMINGS } from "./internal-D6wNxTck.js";
+import { i as eventFromWire, o as isWireEvent, t as errorFromWire } from "./wire-BVsgR8o9.js";
 //#region src/client.ts
 /**
-* a2/client — the framework-agnostic session client.
+* experimental-a2/client — the framework-agnostic session client.
 *
 * Everything the browser needs to read a session live and push
 * optimistically, with no framework attached: the SSE subscription with
 * frontier resume and reconnection, the optimistic push queue with
 * ack/rollback, and the local fold through the same reducer the server
-* uses. `a2/react`'s `createReact` is a thin binding over it, and the
+* uses. `experimental-a2/react`'s `createReact` is a thin binding over it, and the
 * store contract (`subscribe`/`getSnapshot`) is exactly what
 * `useSyncExternalStore` wants.
 *

package/dist/{contract-B0kAXoaL.js → contract-CG_adnu_.js}

@@ -25,7 +25,7 @@ function makeReducerBuilder(events, options) {
 //#region src/contract.ts
 /**
 * The contract — a2's primary noun. A named event vocabulary, shared by
-* everything: the server implements it (a2/server's `createServer`),
+* everything: the server implements it (experimental-a2/server's `createServer`),
 * reducers derive from it (`contract.reducer`), the browser types its
 * pushes off it. Isomorphic by construction: this module imports
 * nothing but schema plumbing.
@@ -51,6 +51,7 @@ function contract(options) {
 	return {
 		name,
 		events,
+		batch: (...items) => items,
 		reducer(reducerOptions) {
 			return makeReducerBuilder(events, reducerOptions);
 		}

package/dist/{contract-DL8btVd9.d.ts → contract-C_3dIIEU.d.ts}

@@ -110,6 +110,7 @@ type AppendInput<D extends EventDefs> = { [T in keyof D & string]: {
   payload: StandardSchemaV1.InferInput<D[T]>;
   id?: string;
 }; }[keyof D & string];
+type EventBatchFactory<D extends EventDefs> = <const E extends readonly AppendInput<D>[]>(...events: E) => E;
 type ReducerOptions<Seed, S> = {
   /**
    * Identity and snapshot cache key. Rename it when the fold's logic
@@ -134,6 +135,8 @@ type Contract<D extends EventDefs = EventDefs> = {
   readonly name: string;
   /** The vocabulary. */
   readonly events: Readonly<D>;
+  /** Preserve literal types for a handler-returned event batch. */
+  readonly batch: EventBatchFactory<D>;
   /**
    * Derive a view from this contract. The reducer's `name` is its
    * identity and snapshot cache key: rename it when the fold's logic
@@ -158,4 +161,4 @@ declare function contract<D extends EventDefs>(options: {
   events: D;
 }): Contract<D>;
 //#endregion
-export { ReducerOptions as a, ReducerBuilder as c, EventDefs as i, StandardSchemaV1 as l, Contract as n, contract as o, ContractEvent as r, Reducer as s, AppendInput as t };
+export { EventDefs as a, Reducer as c, EventBatchFactory as i, ReducerBuilder as l, Contract as n, ReducerOptions as o, ContractEvent as r, contract as s, AppendInput as t, StandardSchemaV1 as u };