effect-agent 0.1.0-beta.144 → 0.1.0-beta.149

package/dist/{AgentRuntime-B4kIzmSF.d.mts → AgentRuntime-sXpKcyxu.d.mts}

@@ -8,14 +8,14 @@ import { n as CurrentToolCatalog } from "./ToolExposure-UCN12eCd.mjs";
 import { s as ToolBroker } from "./ToolBroker-DWs4tZra.mjs";
 import { a as AgentInputError, c as AgentPolicyError, d as AgentToolAuthorizationDenied, f as ContextBudgetError, m as ModelProtocolError, n as AgentApprovalPending, p as ContextOverflowError, s as AgentOutputError, t as AgentApprovalDenied, u as AgentToolAuthorizationCheckError } from "./AgentError-Bn1ytXRD.mjs";
 import { t as AgentPolicy } from "./AgentPolicy-BqDoSXO6.mjs";
-import { A as ToolUnion, C as OutputSchema, D as RunDispositionFailure, E as RunDispositionDeclaration, N as UpdatesSchema, O as RunDispositionSchema, S as Output, _ as InstructionSource, a as CompletionFromToolDeclaration, c as Definition, d as EncodedInput, f as Failure, m as InputPromptSource, n as Any, r as AnyDefinition, s as CompletionToolDeclaration, t as Agent_d_exports, w as Requirements } from "./Agent-BWhD4Dvu.mjs";
+import { A as ToolUnion, C as OutputSchema, D as RunDispositionFailure, E as RunDispositionDeclaration, N as UpdatesSchema, O as RunDispositionSchema, S as Output, _ as InstructionSource, a as CompletionFromToolDeclaration, c as Definition, d as EncodedInput, f as Failure, m as InputPromptSource, n as Any, r as AnyDefinition, s as CompletionToolDeclaration, t as Agent_d_exports, w as Requirements } from "./Agent-Cjd_ZveM.mjs";
 import { a as WorkerBudgetScope } from "./Worker-fwWkBg12.mjs";
 import { a as ContextWindow } from "./ContextWindow-DRQ5Mbm2.mjs";
 import { n as CompactionError } from "./ContextCompactor-WwSIG_Z2.mjs";
 import { t as DurableStep } from "./DurableStep-Cry_iol4.mjs";
-import { B as RunSubagentChildIdentity, H as RunSubagentEstablishRequest, M as RunOptions, S as RunContextPreparationError, W as RunSubagentJoinRequest, i as ChildEstablishStatus, l as ModelUsageAccounting, t as AgentUpdateAcceptance, x as RunContextPreparation } from "./RunOptions-IlEXLG5F.mjs";
-import { t as MessagingHost } from "./MessagingHost-CajpPDPG.mjs";
-import { o as SubagentHost } from "./SubagentHost-B6f4PBC2.mjs";
+import { B as RunSubagentChildIdentity, H as RunSubagentEstablishRequest, M as RunOptions, S as RunContextPreparationError, W as RunSubagentJoinRequest, i as ChildEstablishStatus, l as ModelUsageAccounting, t as AgentUpdateAcceptance, x as RunContextPreparation } from "./RunOptions-Bv9NpkPZ.mjs";
+import { t as MessagingHost } from "./MessagingHost-D04wE-7W.mjs";
+import { o as SubagentHost } from "./SubagentHost-C-4A7tA2.mjs";
 import { t as RunEventSink } from "./RunEventSink-D5aVhISG.mjs";
 import { AiError, LanguageModel, Model, Prompt, Tool, Toolkit } from "effect/unstable/ai";
 import { Cause, Context, Effect, Layer, Option, Schema, Scope, Stream, Tracer } from "effect";
@@ -343,4 +343,4 @@ declare namespace AgentRuntime_d_exports {
 }
 //#endregion
 export { start as A, decodeFinalOutput as C, renderInputPrompt as D, projectCompletionOutput as E, withTerminalDefectEvent as F, stream as M, streamUnknown as N, run as O, streamWithUsageAccountingUnknown as P, ToolCallWaiting as S, projectCompletionFromToolOutput as T, SubagentDurability as _, AgentResultSchema as a, SubagentDurabilityError as b, AgentSpawner as c, DetachedRun as d, EngineProvidedToolServices as f, SpawnedChildRun as g, SpawnRunOptions as h, AgentResult as i, startUnknown as j, runUnknown as k, AgentSpawnerParent as l, SpawnDelegation as m, AgentChildPending as n, AgentRuntimeFailure as o, RuntimeBinding as p, AgentCompletionProjectionRequirements as r, AgentRuntimeRequirements as s, AgentRuntime_d_exports as t, AgentSpawnerService as u, SubagentDurabilityDurable as v, encodeRunDisposition as w, SubagentDurabilityService as x, SubagentDurabilityEphemeral as y };
-//# sourceMappingURL=AgentRuntime-B4kIzmSF.d.mts.map
+//# sourceMappingURL=AgentRuntime-sXpKcyxu.d.mts.map

package/dist/{DurableAgentRuntime-D8GI66mP.mjs → DurableAgentRuntime-DLa4IwFi.mjs}

@@ -15,7 +15,7 @@ import { a as PeerMessageCapacity, d as MessageAdmission, f as MessagingError, i
 import { SubagentHost } from "./engine/SubagentHost.mjs";
 import { ThreadHistory } from "./engine/ThreadHistory.mjs";
 import { n as RunToolVisibility } from "./ToolExposure-9uF_Yo0T.mjs";
-import { f as renderInputPrompt, n as AgentChildPending, y as streamWithUsageAccountingUnknown } from "./AgentRuntime-xeCUXutN.mjs";
+import { f as renderInputPrompt, n as AgentChildPending, y as streamWithUsageAccountingUnknown } from "./AgentRuntime-D8U9gl9Q.mjs";
 import { ContextRolloverTool } from "./engine/ContextWindow.mjs";
 import { getToolExecutionClass } from "./engine/DurableStep.mjs";
 import { CompactionError, ContextCompactor } from "./engine/ContextCompactor.mjs";
@@ -634,6 +634,8 @@ const withinPolicy = (origin, source, target) => {
 };
 /** Admission and cancellation enter the owning runtime, never the raw ledger. */
 var WorkerInputControl = class extends Context.Service()("@effect-agent/thread/internal/WorkerInputControl") {};
+const CurrentStartPreparation = Context.Reference("@effect-agent/thread/internal/CurrentStartPreparation", { defaultValue: () => void 0 });
+const CurrentStartDelivery = Context.Reference("@effect-agent/thread/internal/CurrentStartDelivery", { defaultValue: () => void 0 });
 /** No in-memory ownership: every mutation is reserved in source canonical history with CAS. */
 const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (options) {
 	const control = yield* WorkerInputControl;
@@ -654,11 +656,17 @@ const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (options) {
 		status: Option.getOrUndefined(admission)?.submissionStatus ?? control.status
 	};
 	const withCrypto = (effect) => Effect.provideService(effect, Crypto.Crypto, deps.crypto);
-	const authorizeBudget = Effect.fn("WorkerHost.authorizeBudget")(function* (origin, principal) {
+	const currentStart = Effect.fnUntraced(function* (admission, sourceThreadId, sourceSubmissionId, principal, targetAgentId, continuationOf) {
+		if (admission === void 0 || admission.sourceThreadId !== sourceThreadId || admission.sourceSubmissionId !== sourceSubmissionId || admission.principal !== principal && admission.requestedPrincipal !== principal || admission.targetAgentId !== targetAgentId || !Schema.toEquivalence(Schema.UndefinedOr(WorkerContinuation))(admission.continuationOf, continuationOf)) return void 0;
+		const tail = yield* deps.store.inspectTail(ThreadTailRequest.make({ threadId: sourceThreadId })).pipe(Effect.mapError(storageFailure("start")));
+		return tail.tailSequence === admission.tailSequence && tail.tailDigest === admission.tailDigest ? admission : void 0;
+	});
+	const authorizeBudget = Effect.fn("WorkerHost.authorizeBudget")(function* (origin, principal, admission) {
 		yield* verifyContinuation(origin);
 		if (origin.budgetScope !== "worker-run") return;
 		if (origin.depth !== 1) return yield* failure("start", "denied");
 		yield* deps.budgetAuthorizer.authorize({
+			...admission === void 0 ? {} : { admission },
 			source: origin.source,
 			principal,
 			worker: origin.worker,
@@ -946,7 +954,7 @@ const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (options) {
 		}
 		return yield* failure("start", "storage");
 	});
-	const reservation = Effect.fn("WorkerHost.reserveInput")(function* (admission, inputDigest, input, principal, retainedFrameworkInput) {
+	const reservation = Effect.fn("WorkerHost.reserveInput")(function* (admission, inputDigest, input, principal, retainedFrameworkInput, authorization) {
 		const origin = admission.origin;
 		yield* verifyContinuation(origin);
 		const id = workerInputRecordId(admission.messageId);
@@ -980,6 +988,7 @@ const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (options) {
 			const selected = yield* resolveTargetPolicy(admission.messageId === origin.firstMessageId ? {
 				...targetRequest,
 				_tag: "InitialInput",
+				...authorization === void 0 || authorization.tailSequence !== current.tailSequence || authorization.tailDigest !== current.tailDigest ? {} : { admission: authorization },
 				...origin.continuationOf === void 0 ? {} : { continuationOf: origin.continuationOf },
 				input,
 				inputDigest,
@@ -1061,7 +1070,10 @@ const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (options) {
 			yield* validateCompletion(options.messageAdmission, options, agentId, inputDigest);
 		}
 		yield* verifyContinuation(admission.origin);
+		const delivery = yield* CurrentStartDelivery;
+		const authorization = delivery !== void 0 && sameAdmission(delivery.admission, admission) && delivery.inputDigest === inputDigest ? yield* currentStart(delivery.authorization, admission.origin.source.threadId, admission.sourceSubmissionId, options.principal, agentId, admission.origin.continuationOf) : void 0;
 		yield* deps.authorizer.authorize({
+			...authorization === void 0 ? {} : { admission: authorization },
 			sourceThreadId: admission.origin.source.threadId,
 			...admission.sourceSubmissionId === void 0 ? {} : { sourceSubmissionId: admission.sourceSubmissionId },
 			principal: options.principal,
@@ -1070,11 +1082,11 @@ const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (options) {
 			worker: admission.origin.worker,
 			...admission.origin.continuationOf === void 0 ? {} : { continuationOf: admission.origin.continuationOf }
 		});
-		yield* authorizeBudget(admission.origin, options.principal);
+		yield* authorizeBudget(admission.origin, options.principal, authorization);
 		if (admission.origin.worker.threadId !== options.threadId || admission.origin.worker.targetAgentId !== agentId || !definitionDigestsEqual(admission.origin.targetDigests, options.definitions) || options.idempotencyKey !== admission.messageId || admission.deliveryPrincipal !== void 0 && admission.deliveryPrincipal !== options.principal) return yield* failure("start", "worker-mismatch");
 		const retainedFrameworkInput = Schema.is(FrameworkMessage)(options.messageAdmission);
 		if (retainedFrameworkInput && admission.reportKind !== "update") yield* validateCompletion(options.messageAdmission, options, agentId, inputDigest);
-		yield* reservation(admission, inputDigest, input, options.principal, retainedFrameworkInput);
+		yield* reservation(admission, inputDigest, input, options.principal, retainedFrameworkInput, authorization);
 		return admission;
 	});
 	const prepareUpdate = Effect.fn("WorkerHost.prepareUpdate")(function* (update, submission, messageId) {
@@ -1338,7 +1350,9 @@ const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (options) {
 		return yield* failure("inspect", "storage");
 	});
 	const facet = (context, principal, sourceSubmissionId) => {
-		const authorize = (operation, access, worker, continuationOf) => deps.authorizer.authorize({
+		const requestedPrincipal = principal;
+		const authorize = (operation, access, worker, continuationOf, admission) => deps.authorizer.authorize({
+			...admission === void 0 ? {} : { admission },
 			sourceThreadId: context.source.threadId,
 			...sourceSubmissionId === void 0 ? {} : { sourceSubmissionId },
 			principal,
@@ -1349,17 +1363,19 @@ const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (options) {
 		});
 		const binding = (target, operation) => resolveDefinitionBinding(deps.bindings, target).pipe(Effect.mapError((cause) => failure(operation, "declaration-unavailable", cause)));
 		const deliveryStatus = (row, operation) => messageStatus(row).pipe(Effect.mapError((cause) => failure(operation, "corrupt", cause)));
-		const preparedTarget = Effect.fn("WorkerHost.preparedTarget")(function* (target, encodedInput, continuationOf) {
+		const preparedTarget = Effect.fn("WorkerHost.preparedTarget")(function* (target, encodedInput, continuationOf, authorization) {
 			const resolved = yield* binding(target, "start");
 			yield* Schema.decodeUnknownEffect(Schema.toEncoded(target.input))(encodedInput).pipe(Effect.mapError((cause) => failure("start", "corrupt", cause)));
 			const input = yield* decode(PersistedJson, encodedInput, "start");
 			const inputDigest = yield* withCrypto(digestJson(input)).pipe(Effect.mapError(storageFailure("start")));
 			const source = yield* sourceAuthority(context.source.threadId, sourceSubmissionId);
+			const admission = yield* currentStart(authorization, context.source.threadId, sourceSubmissionId, principal, target.id, continuationOf);
 			return {
 				resolved,
 				source,
 				policy: yield* resolveTargetPolicy({
 					_tag: "InitialInput",
+					...admission === void 0 ? {} : { admission },
 					...continuationOf === void 0 ? {} : { continuationOf },
 					definition: resolved.definition,
 					definitions: resolved.digests,
@@ -1420,7 +1436,7 @@ const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (options) {
 				budgetExhausted: result.finishReason === "budget-exhausted"
 			};
 		});
-		const send = Effect.fn("WorkerHost.send")(function* (origin, messageId, encodedInput, encodedParameters, principal, operation) {
+		const send = Effect.fn("WorkerHost.send")(function* (origin, messageId, encodedInput, encodedParameters, principal, operation, authorization) {
 			if (Option.isNone(deps.deliveries)) return yield* failure(operation, "unavailable");
 			const deliveries = deps.deliveries.value;
 			const input = yield* decode(PersistedJson, encodedInput, operation);
@@ -1472,7 +1488,11 @@ const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (options) {
 				batchSize: 1,
 				concurrency: 1
 			})), Effect.provideService(MessageDeliveryStore, deliveries), Effect.provideService(PreparedInputAdmission, {
-				submit: (prepared) => deps.submit(prepared).pipe(Effect.mapError((error) => error._tag === "AdmissionConflict" || error._tag === "AgentInputError" ? ScheduledInputRefused.make({
+				submit: (prepared) => deps.submit(prepared).pipe(Effect.provideService(CurrentStartDelivery, authorization !== void 0 && prepared.workerAdmission !== void 0 && prepared.admissionKey === messageId && prepared.inputDigest === inputDigest && sameOrigin(prepared.workerAdmission.origin, origin) ? {
+					authorization,
+					admission: prepared.workerAdmission,
+					inputDigest
+				} : void 0), Effect.mapError((error) => error._tag === "AdmissionConflict" || error._tag === "AgentInputError" ? ScheduledInputRefused.make({
 					code: error._tag,
 					cause: error
 				}) : error._tag === "AdmissionPolicyError" && error.reason === "refused" ? ScheduledInputRefused.make({
@@ -1596,12 +1616,25 @@ const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (options) {
 			}),
 			resolveTargetPolicy: Effect.fn("WorkerHost.resolvePreparedTargetPolicy")(function* (request) {
 				const previous = request.continuationOf === void 0 ? void 0 : yield* completedContinuation(context.source, request.continuationOf, request.target.id, request.continuationOf.delegationId);
-				yield* authorize("start", "send", void 0, previous?.evidence);
-				return (yield* preparedTarget(request.target, request.encodedInput, previous?.evidence)).policy;
+				const admission = yield* currentStart(yield* CurrentStartPreparation, context.source.threadId, sourceSubmissionId, principal, request.target.id, previous?.evidence);
+				yield* authorize("start", "send", void 0, previous?.evidence, admission);
+				return (yield* preparedTarget(request.target, request.encodedInput, previous?.evidence, admission)).policy;
 			}),
 			start: Effect.fn("WorkerHost.start")(function* (command) {
 				const previous = command.continuationOf === void 0 ? void 0 : yield* completedContinuation(context.source, command.continuationOf, command.target.id, command.delegationId);
+				const tail = yield* deps.store.inspectTail(ThreadTailRequest.make({ threadId: context.source.threadId })).pipe(Effect.mapError(storageFailure("start")));
 				const principal = yield* authorize("start", "send", void 0, previous?.evidence);
+				const startAdmission = {
+					sourceThreadId: context.source.threadId,
+					...sourceSubmissionId === void 0 ? {} : { sourceSubmissionId },
+					requestedPrincipal,
+					principal,
+					targetAgentId: command.target.id,
+					...previous === void 0 ? {} : { continuationOf: previous.evidence },
+					access: "send",
+					tailSequence: tail.tailSequence,
+					tailDigest: tail.tailDigest
+				};
 				if (context.depth !== 0 && sourceSubmissionId === void 0) return yield* failure("start", "denied");
 				const grant = yield* Schema.decodeUnknownEffect(SubagentGrant)(command.encodedGrant).pipe(Effect.mapError((cause) => failure("start", "corrupt", cause)));
 				const parameters = yield* decode(PersistedJson, command.encodedParameters, "start");
@@ -1634,14 +1667,14 @@ const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (options) {
 				if (existing !== null) return yield* replay(existing);
 				return yield* Effect.gen(function* () {
 					const request = "prepare" in command ? {
-						...yield* command.prepare,
+						...yield* command.prepare.pipe(Effect.provideService(CurrentStartPreparation, startAdmission)),
 						...command
 					} : command;
 					const currentPrevious = command.continuationOf === void 0 ? void 0 : yield* completedContinuation(context.source, command.continuationOf, command.target.id, command.delegationId, previous?.evidence);
 					if (currentPrevious !== void 0) {
 						if ((yield* authorize("start", "send", void 0, currentPrevious.evidence)) !== principal) return yield* failure("start", "denied");
 					}
-					const prepared = yield* preparedTarget(request.target, request.encodedInput, currentPrevious?.evidence);
+					const prepared = yield* preparedTarget(request.target, request.encodedInput, currentPrevious?.evidence, startAdmission);
 					const resolved = prepared.resolved;
 					const sourcePolicy = Option.getOrElse(prepared.source.policyOverride, () => context.policy);
 					const now = yield* Clock.currentTimeMillis;
@@ -1671,10 +1704,10 @@ const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (options) {
 						...reporting === void 0 ? {} : { reporting },
 						...request.toolCallAllowance === void 0 ? {} : { toolCallAllowance: request.toolCallAllowance }
 					}, "start");
-					yield* authorizeBudget(origin, principal);
+					yield* authorizeBudget(origin, principal, yield* currentStart(startAdmission, context.source.threadId, sourceSubmissionId, principal, request.target.id, currentPrevious?.evidence));
 					const targetPolicy = Option.isSome(prepared.policy) ? prepared.policy.value : origin.budgetScope === "worker-run" ? resolved.definition.policy : AgentPolicy.resolve(resolved.definition.policyOverrides ?? resolved.definition.policy, sourcePolicy);
 					if (!withinPolicy(origin, origin.budgetScope === "worker-run" ? targetPolicy : sourcePolicy, targetPolicy)) return yield* failure("start", "capacity");
-					const delivery = yield* send(origin, messageId, request.encodedInput, request.encodedParameters, principal, "start");
+					const delivery = yield* send(origin, messageId, request.encodedInput, request.encodedParameters, principal, "start", startAdmission);
 					return {
 						worker: origin.worker,
 						delivery
@@ -2338,11 +2371,6 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 	const ledger = yield* SubmissionLedger;
 	const submissionScheduling = yield* SubmissionScheduling;
 	const store = yield* ThreadStore;
-	const publicationPending = (threadId) => store.lifecyclePublications === void 0 ? Effect.succeed(false) : store.lifecyclePublications.pendingDeadlineFor(threadId).pipe(Effect.map(Option.isSome), Effect.mapError((cause) => ThreadStoreError.make({
-		operation: "read lifecycle publication gate",
-		message: "Native lifecycle publication state is unavailable",
-		cause
-	})));
 	const wake = yield* WakeScheduler;
 	const failpoint = yield* DurableRuntimeFailpoint;
 	const config = yield* DurableRuntimeConfig;
@@ -4103,7 +4131,6 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 	*/
 	const runModel = (agent, ctx, submission, tokenRef, records, canonical, canonicalThrough, journalSeed, journalMetadata, lineage, approvalDecisions, runTiming, yieldAfter) => Effect.gen(function* () {
 		const submissionId = submission.submissionId;
-		if (yield* publicationPending(submission.threadId)) return { _tag: "yielded" };
 		const runId = runIdForSubmission(submissionId);
 		const boundaries = [];
 		const journal = yield* projectRunJournalStream(canonical, runId, (boundary) => boundaries.push(boundary), journalSeed, journalMetadata);
@@ -4461,12 +4488,12 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 			...state,
 			history
 		});
-		const instructionView = (messages, instructions, insertWhenAbsent) => {
+		const instructionView = (messages, instructions, insertWhenAbsent, priorRunPrefixLength) => {
 			const projected = [];
 			const lengths = [0];
 			let inserted = false;
-			for (const message of messages) {
-				if (message.role === "system") {
+			for (const [index, message] of messages.entries()) {
+				if (index >= priorRunPrefixLength && message.role === "system") {
 					if (!inserted) projected.push(...instructions);
 					inserted = true;
 				} else projected.push(message);
@@ -4478,11 +4505,21 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 				prefixLength: (length) => lengths[length] ?? projected.length
 			};
 		};
-		const resumeContext = { prepare: ({ source }) => Ref.get(stateRef).pipe(Effect.map((state) => ({ prompt: Prompt.fromMessages([...instructionView(resumeProjection.prompt.content, source.content.slice(0, state.baseLen).filter((message) => message.role === "system"), true).messages, ...source.content.slice(state.baseLen ?? source.content.length)]) }))) };
+		const resumeContext = { prepare: ({ source }) => Ref.get(stateRef).pipe(Effect.map((state) => {
+			const view = instructionView(resumeProjection.prompt.content, source.content.slice(resumeProjection.historyBefore.content.length, state.baseLen).filter((message) => message.role === "system"), true, resumeProjection.historyBefore.content.length);
+			return {
+				prompt: Prompt.fromMessages([...view.messages, ...source.content.slice(state.baseLen ?? source.content.length)]),
+				priorRunPrefixLength: view.prefixLength(resumeProjection.historyBefore.content.length)
+			};
+		})) };
 		const externalContext = runContextPreparation.hook;
-		const preparedContext = externalContext === void 0 ? journal.committedTurns === 0 ? void 0 : resumeContext : { prepare: (request) => (journal.committedTurns === 0 ? Effect.succeed({ prompt: request.source }) : resumeContext.prepare(request)).pipe(Effect.flatMap(({ prompt }) => externalContext.prepare({
+		const preparedContext = externalContext === void 0 ? journal.committedTurns === 0 ? void 0 : resumeContext : { prepare: (request) => (journal.committedTurns === 0 ? Effect.succeed({
+			prompt: request.source,
+			priorRunPrefixLength: journal.historyBefore.content.length
+		}) : resumeContext.prepare(request)).pipe(Effect.flatMap(({ prompt, priorRunPrefixLength }) => externalContext.prepare({
 			...request,
-			source: prompt
+			source: prompt,
+			priorRunPrefixLength
 		}))) };
 		const durability = {
 			noteToolExposure: (turn, snapshot) => Effect.sync(() => {
@@ -4639,7 +4676,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 				const coverable = sourceBoundaries.filter((boundary) => commit.kind !== "summarize" || ownerFirstSequence === void 0 || boundary.sequence < ownerFirstSequence);
 				if (coverable.length === 0) return yield* CompactionError.make({ message: commit.kind === "rollover" ? "Durable rollover requires complete canonical records" : "Durable compaction requires eligible canonical records" });
 				const state = yield* Ref.get(stateRef);
-				const comparisonView = instructionView(sourceJournal.prompt.content, state.history?.content.slice(0, state.baseLen).filter((message) => message.role === "system") ?? [], false);
+				const comparisonView = instructionView(sourceJournal.prompt.content, state.history?.content.slice(resumeProjection.historyBefore.content.length, state.baseLen).filter((message) => message.role === "system") ?? [], false, sourceJournal.historyBefore.content.length);
 				let matchingPrefix = 0;
 				let requiredThrough = 0;
 				const comparisonLimit = Math.min(comparisonView.messages.length, commit.through);
@@ -4834,18 +4871,11 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 			const decodedInput = yield* Schema.decodeEffect(agent.definition.input)(encodedInput).pipe(Effect.mapError((cause) => AgentInputError.make({ message: cause.message })));
 			return yield* renderInputPrompt(inputPrompt, decodedInput, encodedInput);
 		});
-		const yieldForPublication = Effect.gen(function* () {
-			const pending = yield* Effect.exit(publicationPending(submission.threadId));
-			if (Exit.isSuccess(pending) && !pending.value) return;
-			yield* recordHalt(commitPendingTurn);
-			if (Exit.isFailure(pending)) return yield* recordHalt(Effect.failCause(pending.cause));
-			yield* Deferred.succeed(yieldSignal, void 0);
-			return yield* Effect.never;
+		const preserveToolResults = Effect.gen(function* () {
+			const state = yield* Ref.get(stateRef);
+			if (state.pendingTurn !== void 0 && knownIds.has(modelResponseRecordId(runId, state.pendingTurn.turn))) yield* commitPendingTurn;
 		});
 		const input = { drain: (policy) => Effect.gen(function* () {
-			const state = yield* Ref.get(stateRef);
-			if (state.pendingTurn !== void 0 && knownIds.has(modelResponseRecordId(runId, state.pendingTurn.turn))) yield* recordHalt(commitPendingTurn);
-			yield* yieldForPublication;
 			const joinedInputs = yield* recordHalt(Effect.gen(function* () {
 				const limit = policy === "one" ? 1 : MAX_JOIN_DRAIN;
 				const joinedInputs = [];
@@ -4870,6 +4900,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 					if (lastHostResponseSequence !== void 0 && lastHostResponseSequence > existing.sequence) continue;
 					const payload = existing.record.payload;
 					if (payload._tag !== "UserInputRecorded") continue;
+					yield* preserveToolResults;
 					joinedInputs.push(payload);
 				}
 				if (joinedInputs.length < limit) {
@@ -4887,6 +4918,16 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 							yield* ledger.revertJoining(RevertJoiningRequest.make({ submissionId: claim.submissionId }));
 							continue;
 						}
+						const payload = {
+							input: claim.inputPayload,
+							...claimSnapshot.submission.messageAdmission === void 0 ? {} : { messageAdmission: claimSnapshot.submission.messageAdmission }
+						};
+						const rendered = yield* Effect.result(renderJoinedInput(payload));
+						if (Result.isFailure(rendered)) {
+							for (const remaining of claims.slice(claims.indexOf(claim))) yield* ledger.revertJoining(RevertJoiningRequest.make({ submissionId: remaining.submissionId }));
+							break;
+						}
+						yield* preserveToolResults;
 						const recordId = submissionInputRecordId(claim.submissionId);
 						let sequence;
 						const existing = joinedInputEnvelopes.get(claim.submissionId);
@@ -4916,15 +4957,14 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 						}));
 						deliveredJoinInputs.add(claim.submissionId);
 						joinedInputs.push({
-							input: claim.inputPayload,
-							...claimSnapshot.submission.messageAdmission === void 0 ? {} : { messageAdmission: claimSnapshot.submission.messageAdmission }
+							...payload,
+							rendered: rendered.success
 						});
 					}
 				}
 				return joinedInputs;
-			}));
-			yield* yieldForPublication;
-			return yield* Effect.forEach(joinedInputs, (joinedInput) => renderJoinedInput(joinedInput).pipe(Effect.map((input) => ({
+			}).pipe(Effect.onExit((exit) => Exit.isFailure(exit) ? preserveToolResults : Effect.void)));
+			return yield* Effect.forEach(joinedInputs, (joinedInput) => (joinedInput.rendered === void 0 ? renderJoinedInput(joinedInput) : Effect.succeed(joinedInput.rendered)).pipe(Effect.map((input) => ({
 				kind: "steering",
 				input
 			}))));
@@ -5216,7 +5256,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 			history: pending === void 0 ? journal.historyBefore : resumeProjection.historyBefore,
 			onHistory,
 			input,
-			commandDrainPolicy: submission.workerAdmission === void 0 ? "one" : "all",
+			commandDrainPolicy: "all",
 			...journal.committedTurns > 0 || Schema.is(FrameworkMessage)(submission.messageAdmission) ? { retainedInput: submission.inputPayload } : {},
 			...Schema.is(FrameworkMessage)(submission.messageAdmission) ? { frameworkMessage: submission.messageAdmission } : {},
 			approval,
@@ -5246,7 +5286,6 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 			...preparedContext === void 0 ? {} : { context: preparedContext },
 			beforeTurn: () => Effect.gen(function* () {
 				yield* recordHalt(commitPendingTurn);
-				yield* yieldForPublication;
 				if (yieldAfter !== void 0 && (yield* Clock.currentTimeMillis) >= DateTime.toEpochMillis(yieldAfter)) {
 					yield* Deferred.succeed(yieldSignal, void 0);
 					return yield* Effect.never;
@@ -5503,7 +5542,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 			const failure = yield* Ref.get(haltRef);
 			if (failure !== void 0) return yield* Effect.fail(failure);
 			yield* handleEvent(event);
-		}))).pipe(Effect.tapCause((cause) => Option.isSome(agentApprovalPendingOption(cause)) && cause.reasons.every(Cause.isFailReason) ? Effect.flatMap(DurableApprovalSuspension, (retain) => retain === void 0 ? Effect.void : halt(retain)) : Effect.void), Effect.as({ _tag: "run" }));
+		}))).pipe(Effect.onExit((exit) => Exit.hasInterrupts(exit) ? preserveToolResults : Effect.void), Effect.tapCause((cause) => Option.isSome(agentApprovalPendingOption(cause)) && cause.reasons.every(Cause.isFailReason) ? Effect.flatMap(DurableApprovalSuspension, (retain) => retain === void 0 ? Effect.void : halt(retain)) : Effect.void), Effect.as({ _tag: "run" }));
 		const abortWatcher = halt(Effect.gen(function* () {
 			while (true) {
 				yield* Effect.sleep(config.abortPollInterval);
@@ -5522,7 +5561,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 			yield* Ref.set(tokenRef, renewal.ownershipToken);
 		}).pipe(Effect.uninterruptible), { schedule: Schedule.spaced(config.leaseRenewalInterval) }).pipe(Effect.andThen(Effect.never)));
 		const execution = Effect.raceFirst(consume, Effect.raceFirst(abortWatcher, renewal));
-		const result = yield* (yieldAfter === void 0 && submissionScheduling.yieldTo === void 0 && store.lifecyclePublications === void 0 ? execution : Effect.raceFirst(execution, Deferred.await(yieldSignal).pipe(Effect.map((nextSubmissionId) => ({
+		const result = yield* (yieldAfter === void 0 && submissionScheduling.yieldTo === void 0 ? execution : Effect.raceFirst(execution, Deferred.await(yieldSignal).pipe(Effect.map((nextSubmissionId) => ({
 			_tag: "yielded",
 			...nextSubmissionId === void 0 ? {} : { nextSubmissionId }
 		}))))).pipe(Effect.provideService(IdGenerator$1, idGenerator)).pipe(Effect.catchCauseFilter(Cause.findError, (error, cause) => {
@@ -5898,7 +5937,6 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 		let handoff;
 		let nextHandoff;
 		const attempt = Effect.scoped(Effect.gen(function* () {
-			if (yield* publicationPending(threadId)) return Option.none();
 			const claimed = yield* acquireClaim(threadId, handoff);
 			if (Option.isNone(claimed)) return Option.none();
 			const { claim, tokenRef } = claimed.value;
@@ -7180,4 +7218,4 @@ var DurableAgentRuntime = class DurableAgentRuntime extends Context.Service()("@
 //#endregion
 export { DurableApprovalSuspension as a, RecoveryFailure as c, childReservationIdFor as d, isolateRecovery as f, threadCreatedRecordId as g, threadCreatedBatchId as h, DurableApprovalResolver as i, RecoveryReport as l, recoveryRepairRecordId as m, DurableAgentRuntime as n, DurableRuntimeConfig as o, recoveryRepairBatchId as p, DurableAgentRuntime_exports as r, RecoveryBlocked as s, ApprovalSuspensionError as t, RecoverySweepResult as u };
 
-//# sourceMappingURL=DurableAgentRuntime-D8GI66mP.mjs.map
+//# sourceMappingURL=DurableAgentRuntime-DLa4IwFi.mjs.map