effect-agent 0.1.0-beta.152 → 0.1.0-beta.154

package/dist/{ContextCompactor-WwSIG_Z2.d.mts → ContextCompactor-CPlStZRc.d.mts}

@@ -1,5 +1,5 @@
 import { s as RunId, u as ThreadId } from "./Identifiers-CN2s30fF.mjs";
-import { i as CompactionPolicy } from "./AgentPolicy-BqDoSXO6.mjs";
+import { i as CompactionPolicy } from "./AgentPolicy-CnXWWwdg.mjs";
 import { n as ContextRolloverRequest } from "./ContextWindow-DRQ5Mbm2.mjs";
 import { LanguageModel, Model, Prompt } from "effect/unstable/ai";
 import { Context, Effect, Layer, Option, Schema, Stream } from "effect";
@@ -158,4 +158,4 @@ declare class ContextCompactor extends ContextCompactor_base {
 }
 //#endregion
 export { ContextCompaction as a, ContextMessageTokenEstimator as c, CONTEXT_ROLLOVER_PREFIX as d, ContextCompactionState as f, estimatePromptTokens as g, estimateMessageTokens as h, CompactionRequest as i, CLEARED_TOOL_RESULT as l, contextWindowMessage as m, CompactionError as n, ContextCompactor as o, contextWindowId as p, CompactionModelLayer as r, ContextCompactor_d_exports as s, CompactionDecision as t, COMPACTION_SUMMARY_PREFIX as u };
-//# sourceMappingURL=ContextCompactor-WwSIG_Z2.d.mts.map
+//# sourceMappingURL=ContextCompactor-CPlStZRc.d.mts.map

package/dist/{Digest-U69rDHuO.d.mts → Digest-CaJ2RIsF.d.mts}

@@ -1,4 +1,4 @@
-import { _ as Digest, h as DefinitionDigests, m as DefinitionDigestInput, s as CanonicalBatch } from "./Records-B5GFWCpn.mjs";
+import { _ as Digest, h as DefinitionDigests, m as DefinitionDigestInput, s as CanonicalBatch } from "./Records-BrEpibum.mjs";
 import { Crypto, Effect, Schema } from "effect";
 declare namespace Digest_d_exports {
   export { DigestError, EMPTY_TAIL_DIGEST, digestCanonicalBatch, digestDefinition, digestDefinitions, digestJson };
@@ -19,4 +19,4 @@ declare const digestDefinitions: (definitions: DefinitionDigestInput) => Effect.
 declare const EMPTY_TAIL_DIGEST: string & import("effect/Brand").Brand<"@effect-agent/thread/Digest">;
 //#endregion
 export { digestDefinition as a, digestCanonicalBatch as i, Digest_d_exports as n, digestDefinitions as o, EMPTY_TAIL_DIGEST as r, digestJson as s, DigestError as t };
-//# sourceMappingURL=Digest-U69rDHuO.d.mts.map
+//# sourceMappingURL=Digest-CaJ2RIsF.d.mts.map

package/dist/{DurableAgentRuntime-DQFV26SB.mjs → DurableAgentRuntime-BQzYkFVy.mjs}

@@ -15,19 +15,19 @@ 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-D8U9gl9Q.mjs";
+import { f as renderInputPrompt, n as AgentChildPending, y as streamWithUsageAccountingUnknown } from "./AgentRuntime-IF_1GoUf.mjs";
 import { ContextRolloverTool } from "./engine/ContextWindow.mjs";
 import { getToolExecutionClass } from "./engine/DurableStep.mjs";
 import { CompactionError, ContextCompactor } from "./engine/ContextCompactor.mjs";
 import { RunPolicyUsage } from "./core/RunPolicyUsage.mjs";
 import { AgentUpdateAcceptance, CurrentToolFailureObserver, ModelUsageAccounting, RunContextPreparation, RunContextPreparationPassthrough, RunToolAuthorization, RunToolScheduling } from "./engine/RunOptions.mjs";
-import { AbortRequested, AgentUpdateEmitted, BatchId, CanonicalBatch, CanonicalRecordEnvelope, CanonicalSequence, CompactionCreated, DefinitionDigests, Digest, ModelResponseInterrupted, PeerMessagePrepared, PersistedJson, ProducerEpoch, RecordEnvelope, RecordId, RepairAnnotated, RunDurationExhausted, RunPolicyUsageReserved, RunStartedRecord, SettlementFailureDiagnostic, SubagentJoined, SubagentLineageRecorded, SubagentRequested, SubagentStarted, SubmissionSettled, SubmissionSettledRecord, SubtreeBudgetReserved, ToolApprovalDecided, ToolApprovalRequested, ToolCallPrepared, ToolCallResolved, ToolCallSettled, ToolCallUnknown, ToolOperation, ToolStepSettled, ToolUnavailable, UserInputRecorded, WorkerAdmission, WorkerContinuation, WorkerInputCompleted, WorkerInputRequested, WorkerOrigin, WorkerReportPrepared, WorkerReportRefused, WorkerReportingIntent, WorkerStopRequested } from "./durable/Records.mjs";
+import { AbortRequested, AgentUpdateEmitted, BatchId, CanonicalBatch, CanonicalRecordEnvelope, CanonicalSequence, CompactionCreated, DefinitionDigests, Digest, ModelCallAborted, ModelResponseInterrupted, PeerMessagePrepared, PersistedJson, ProducerEpoch, RecordEnvelope, RecordId, RepairAnnotated, RunDurationExhausted, RunPolicyUsageReserved, RunStartedRecord, SettlementFailureDiagnostic, SubagentJoined, SubagentLineageRecorded, SubagentRequested, SubagentStarted, SubmissionSettled, SubmissionSettledRecord, SubtreeBudgetReserved, ToolApprovalDecided, ToolApprovalRequested, ToolCallPrepared, ToolCallResolved, ToolCallSettled, ToolCallUnknown, ToolOperation, ToolStepSettled, ToolUnavailable, UserInputRecorded, WorkerAdmission, WorkerContinuation, WorkerInputCompleted, WorkerInputRequested, WorkerOrigin, WorkerReportPrepared, WorkerReportRefused, WorkerReportingIntent, WorkerStopRequested } from "./durable/Records.mjs";
 import { AbortCommand, AbortIntentRequest, AdmissionPolicyError, AdmissionRequest, ApprovalDecisionCommand, ApprovalPendingSuspension, AttachChildToReservationRequest, BeginChildBudgetReleaseRequest, ChildBudgetReservationRequest, ChildReservationId, ChildSettledNotification, ClaimHandoff, ClaimJoiningRequest, ClaimRequest, LedgerError, MarkInputAppliedRequest, MarkJoinedRequest, MarkReadyRequest, MarkUnknownRequest, OwnershipToken, ParentLinkage, RecoverySnapshotRequest, ReleaseChildBudgetRequest, ReleaseOwnershipRequest, RenewOwnershipRequest, RevertJoiningRequest, Settlement, SettlementFinalization, SettlementReservation, SubmissionLedger, SubmissionLookupById, SubmissionLookupByKey, SubmissionScheduling, SuspendRequest, UnknownResolutionCommand, WaitingChild, WaitingForChildSuspension, WorkerLedgerState, submissionAbortBatchId, submissionAbortRecordId, submissionInputBatchId, submissionInputRecordId, submissionSettlementBatchId, submissionSettlementId, submissionSettlementRecordId } from "./durable/SubmissionLedger.mjs";
 import { DeclaredPendingBatchEvidence, OpenDelegationCallEvidence, OpenToolCallEvidence, PendingApprovalEvidence, RecoveryDecision, RecoveryEvidence, classifyRecovery } from "./durable/Recovery.mjs";
 import { ExplainedEvidence, ExplainedSubmission, ExplainedUnknownCall, IntegrityCheck, IntegrityReport, ObligationEntry, ObligationReport, RecoveryExplanation, RetryRefused, obligationSeverityOf, predictRecoveryDisposition, recoveryDecisionMeaning } from "./durable/Admin.mjs";
 import { digestJson } from "./durable/Digest.mjs";
-import { a as definitionDigestsEqual, c as resolveWorkerBinding, i as compileRegistrations, l as toolReplayContracts, o as makeLegacyWorkerBinding, s as resolveDefinitionBinding, t as BindingUnavailable } from "./agent-registration-CKNsrpwo.mjs";
-import { $ as workerOriginRecordId, A as subagentRequestedRecordId, B as toolCallUnknownRecordId, C as runStartedBatchId, D as subagentLineageBatchId, E as subagentJoinedRecordId, F as toolCallPreparedRecordId, G as turnCanonicalBatch, H as toolStepSettledRecordId, I as toolCallResolutionBatchId, J as turnResponseBatch, K as turnIdForRun, L as toolCallResolvedRecordId, M as subagentStartedRecordId, N as toolApprovalDecisionRecordId, O as subagentLineageRecordId, P as toolApprovalRequestRecordId, Q as workerInputRecordId, R as toolCallResultBatchId, S as runIdForSubmission, T as subagentJoinBatchId, U as turnApprovalsBatchId, V as toolStepSettledBatchId, X as turnResultsBatch, a as childIdempotencyKeyFor, b as runDurationBatchId, c as compactionRecordId, d as modelResponseInterruptedBatchId, et as workerReportRecordId, f as modelResponseInterruptedRecordId, g as projectRunJournalStream, i as approvalDecisionBatchId, j as subagentStartedBatchId, k as subagentRequestedBatchId, l as firstWorkerInputRecordId, m as peerMessageRecordId, o as childThreadIdFor, p as modelResponseRecordId, q as turnPreparedBatchId, r as agentUpdateRecordId, s as compactionBatchId, t as RunJournalError, tt as makeJournalMetadata, u as markUnknownBatchId, v as runCompletedRecordId, w as runStartedRecordId, x as runDurationRecordId, y as runCompletionDigest, z as toolCallSettledRecordId } from "./RunJournal-Gd83HYqG.mjs";
+import { a as compileRegistrations, c as resolveDefinitionBinding, l as resolveWorkerBinding, n as CurrentBindingSelection, o as definitionDigestsEqual, s as makeLegacyWorkerBinding, t as BindingUnavailable, u as toolReplayContracts } from "./agent-registration-U3kmV7nW.mjs";
+import { $ as workerOriginRecordId, A as subagentRequestedRecordId, B as toolCallUnknownRecordId, C as runStartedBatchId, D as subagentLineageBatchId, E as subagentJoinedRecordId, F as toolCallPreparedRecordId, G as turnCanonicalBatch, H as toolStepSettledRecordId, I as toolCallResolutionBatchId, J as turnResponseBatch, K as turnIdForRun, L as toolCallResolvedRecordId, M as subagentStartedRecordId, N as toolApprovalDecisionRecordId, O as subagentLineageRecordId, P as toolApprovalRequestRecordId, Q as workerInputRecordId, R as toolCallResultBatchId, S as runIdForSubmission, T as subagentJoinBatchId, U as turnApprovalsBatchId, V as toolStepSettledBatchId, X as turnResultsBatch, a as childIdempotencyKeyFor, b as runDurationBatchId, c as compactionRecordId, d as modelResponseInterruptedBatchId, et as workerReportRecordId, f as modelResponseInterruptedRecordId, g as projectRunJournalStream, i as approvalDecisionBatchId, j as subagentStartedBatchId, k as subagentRequestedBatchId, l as firstWorkerInputRecordId, m as peerMessageRecordId, o as childThreadIdFor, p as modelResponseRecordId, q as turnPreparedBatchId, r as agentUpdateRecordId, s as compactionBatchId, t as RunJournalError, tt as makeJournalMetadata, u as markUnknownBatchId, v as runCompletedRecordId, w as runStartedRecordId, x as runDurationRecordId, y as runCompletionDigest, z as toolCallSettledRecordId } from "./RunJournal-ixFRCyW3.mjs";
 import { FencedAppendRequest, LoadCheckpointRequest, MAX_THREAD_EXPORT_RECORDS, SaveRecoveryCheckpointRequest, ThreadCheckpoint, ThreadExportRequest, ThreadIdentityRequest, ThreadMaterialization, ThreadObservation, ThreadRead, ThreadStore, ThreadStoreDiagnostic, ThreadStoreError, ThreadTailRequest, getRecord, getRunInput, readWorkerState } from "./durable/ThreadStore.mjs";
 import { DurableRuntimeFailpoint } from "./durable/DurableFailpoint.mjs";
 import { ScheduledInputRefused, ScheduledInputRetryable } from "./durable/Schedule.mjs";
@@ -36,7 +36,7 @@ import { PreparedInput } from "./durable/Subscription.mjs";
 import { MessageDeliveryDriver, MessageDeliveryFailpoint, MessageDeliveryRecord, MessageDeliveryStore, messageDeliveryCapacity, messageDeliveryUsesCapacity, prepareMessageDelivery } from "./durable/MessageDelivery.mjs";
 import { WakeScheduler } from "./durable/WakeScheduler.mjs";
 import { n as safeUnknownString, t as inspectForeignDiagnostic } from "./foreign-diagnostic-DBQ1XHKh.mjs";
-import { c as threadCreatedBatchId, l as threadCreatedRecordId, n as WorkerAdmissionPort, o as ensureThreadCreated, r as WorkerAdmissionRequest, s as ensureWorkerOrigin } from "./WorkerAdmission-CJ_oWRuS.mjs";
+import { c as threadCreatedBatchId, l as threadCreatedRecordId, n as WorkerAdmissionPort, o as ensureThreadCreated, r as WorkerAdmissionRequest, s as ensureWorkerOrigin } from "./WorkerAdmission-CNbm4o_x.mjs";
 import { WorkerBudgetAuthorizer, WorkerConcurrencyLimit, WorkerConcurrencyResolver, WorkerHostAuthorizer, WorkerHostConfig, WorkerPolicyResolver } from "./durable/WorkerHost.mjs";
 import { OperationAuthorizationRequest, OperationAuthorizer, OperationDenied } from "./durable/OperationAuthorizer.mjs";
 import { PendingSubmission, SettledSubmission } from "./durable/SubmissionStatus.mjs";
@@ -2369,10 +2369,12 @@ const declaredToolCalls = Effect.fn("DurableAgentRuntime.declaredToolCalls")((me
 const declaredApplicationCalls = Effect.fn("DurableAgentRuntime.declaredApplicationCalls")((messages) => declaredToolCalls(messages).pipe(Effect.map(({ application }) => application)));
 const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 	const registeredBindings = [...bindings];
+	const bindingSelection = yield* CurrentBindingSelection;
 	const workerAdmissionPort = yield* WorkerAdmissionPort;
 	const ledger = yield* SubmissionLedger;
 	const submissionScheduling = yield* SubmissionScheduling;
 	const store = yield* ThreadStore;
+	let projectedJournal;
 	const wake = yield* WakeScheduler;
 	const failpoint = yield* DurableRuntimeFailpoint;
 	const config = yield* DurableRuntimeConfig;
@@ -2391,15 +2393,14 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 	const toolFailureObserver = yield* CurrentToolFailureObserver;
 	const withCrypto = (effect) => Effect.provideService(effect, Crypto.Crypto, crypto);
 	const contractsFor = (definition) => {
-		const registered = registeredBindings.filter((binding) => binding.agentId === definition.id);
-		const binding = registered.length === 1 ? registered[0] : void 0;
-		const current = binding?.definition.toolkit === definition.toolkit && binding.definition.completion === definition.completion && binding.definition.completionFromTools === definition.completionFromTools ? binding : void 0;
+		const registered = registeredBindings.filter((binding) => binding.agentId === definition.id && Object.is(binding.definition, definition));
+		const current = registered.length === 1 ? registered[0] : void 0;
 		const contracts = current?.digests.replay?.tools;
 		return contracts === void 0 ? withCrypto(toolReplayContracts(definition, void 0, current?.digests.tools ?? config.deploymentId)) : Effect.succeed(contracts);
 	};
-	const currentOperationsFor = Effect.fnUntraced(function* (agentId) {
-		const registered = registeredBindings.filter((binding) => binding.agentId === agentId);
-		const binding = registered.length === 1 ? registered[0] : void 0;
+	const resolveCurrentBinding = (submission) => resolveWorkerBinding(registeredBindings, submission).pipe(Effect.provideService(CurrentBindingSelection, bindingSelection));
+	const currentOperationsFor = Effect.fnUntraced(function* (submission) {
+		const binding = yield* resolveCurrentBinding(submission).pipe(Effect.catchTag("BindingUnavailable", () => Effect.succeed(void 0)));
 		return binding === void 0 ? void 0 : {
 			definition: binding.definition,
 			contracts: yield* contractsFor(binding.definition)
@@ -4106,11 +4107,20 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 	* journal ends mid-batch,
 	* `RunOptions.resume` replays the declared batch without re-invoking the model (§2.4).
 	*/
-	const runModel = (agent, ctx, submission, tokenRef, records, canonical, canonicalThrough, journalSeed, journalMetadata, lineage, approvalDecisions, runTiming, yieldAfter) => Effect.gen(function* () {
+	const runModel = (agent, ctx, submission, tokenRef, records, canonical, canonicalThrough, journalSeed, journalMetadata, lineage, approvalDecisions, currentContracts, runTiming, yieldAfter) => Effect.gen(function* () {
 		const submissionId = submission.submissionId;
 		const runId = runIdForSubmission(submissionId);
 		const boundaries = [];
-		const journal = yield* projectRunJournalStream(canonical, runId, (boundary) => boundaries.push(boundary), journalSeed, journalMetadata);
+		const cached = projectedJournal;
+		const journal = cached !== void 0 && cached.threadId === ctx.threadId && cached.through === canonicalThrough && cached.runId === runId && cached.seedThrough === journalSeed?.throughSequence ? (boundaries.push(...cached.boundaries), cached.journal) : yield* projectRunJournalStream(canonical, runId, (boundary) => boundaries.push(boundary), journalSeed, journalMetadata);
+		projectedJournal = {
+			threadId: ctx.threadId,
+			through: canonicalThrough,
+			runId,
+			seedThrough: journalSeed?.throughSequence,
+			journal,
+			boundaries
+		};
 		const saveRecoveryCheckpoint = Effect.fn("DurableAgentRuntime.saveRecoveryCheckpoint")(function* (compactionId) {
 			if (store.recoveryCheckpoints === void 0) return;
 			const tail = yield* Ref.get(ctx.tailRef);
@@ -4252,7 +4262,6 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 		if (submission.parentLinkage !== void 0 && (childLineage?._tag !== "SubagentLineageRecorded" || childLineage.parentSubmissionId !== submission.parentLinkage.parentSubmissionId || childLineage.parentLink.parentToolCallId !== submission.parentLinkage.parentToolCallId || !definitionDigestsEqual(childLineage.childDefinitionDigests, submission.agentDigests) || childLineage.childInputDigest !== submission.inputDigest)) return yield* RunJournalError.make({ message: "The child Run has no matching canonical lineage and execution bounds" });
 		const pending = yield* pendingToolBatchFor(records, runId, agent.definition.completionFromTools?.map((declaration) => declaration.tool));
 		const resumeProjection = pending === void 0 ? journal : yield* projectRunJournalStream(withoutPendingBatch(canonical, pending, runId), runId, void 0, journalSeed);
-		const currentContracts = yield* contractsFor(agent.definition);
 		const rolloverOperation = journal.pendingContextToolCallId === void 0 ? void 0 : operationsFor(records, runId).get(journal.pendingContextToolCallId);
 		const rolloverTool = rolloverOperation === void 0 ? void 0 : agent.definition.toolkit.tools[rolloverOperation.toolName];
 		const pendingContextToolCallId = rolloverOperation !== void 0 && rolloverTool !== void 0 && Context.get(rolloverTool.annotations, ContextRolloverTool) && currentContracts[rolloverOperation.toolName] === rolloverOperation.replay ? journal.pendingContextToolCallId : void 0;
@@ -4294,11 +4303,26 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 		const stagedToolSelections = /* @__PURE__ */ new Map();
 		const stagedUsage = /* @__PURE__ */ new Map();
 		const committedUsageLengths = /* @__PURE__ */ new Map();
+		const committedUnobservedCalls = /* @__PURE__ */ new Map();
+		const usageForCommit = (turn) => {
+			const staged = stagedUsage.get(turn);
+			if (staged === void 0) return void 0;
+			const modelUsage = staged.modelUsage.slice(committedUsageLengths.get(turn) ?? 0);
+			if (modelUsage.length === 0) return void 0;
+			return {
+				modelUsage,
+				inputTokens: modelUsage.reduce((sum, call) => sum + call.inputTokens.total, 0),
+				outputTokens: modelUsage.reduce((sum, call) => sum + call.outputTokens.total, 0),
+				costMicrousd: modelUsage.reduce((sum, call) => sum + call.costMicrousd, 0)
+			};
+		};
+		const unobservedForCommit = (turn) => (stagedUnobservedCalls.get(turn) ?? 0) - (committedUnobservedCalls.get(turn) ?? 0);
 		const recordCommittedUsage = (batch) => {
 			for (const record of batch.records) {
-				if (record.payload._tag !== "ModelResponseRecorded") continue;
+				if (record.payload._tag !== "ModelResponseRecorded" && record.payload._tag !== "ModelCallAborted") continue;
 				const payload = record.payload;
-				committedUsageLengths.set(payload.turn, Math.max(committedUsageLengths.get(payload.turn) ?? 0, payload.modelUsage?.length ?? 0));
+				committedUsageLengths.set(payload.turn, (committedUsageLengths.get(payload.turn) ?? 0) + (payload.modelUsage?.length ?? 0));
+				committedUnobservedCalls.set(payload.turn, (committedUnobservedCalls.get(payload.turn) ?? 0) + (payload.unobservedModelCalls ?? 0));
 			}
 		};
 		const uncommittedModelUsage = () => [...stagedUsage.entries()].flatMap(([turn, usage]) => usage.modelUsage.slice(committedUsageLengths.get(turn) ?? 0));
@@ -4450,7 +4474,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 			completedFinishReason: void 0,
 			completedExhausted: void 0
 		});
-		const turnCounter = yield* Ref.make(journal.committedTurns);
+		const turnCounter = yield* Ref.make(journal.committedTurns + (journal.policyUsage.modelRestarts ?? 0));
 		const idGenerator = {
 			nextThreadId: Effect.succeed(submission.threadId),
 			nextRunId: Effect.succeed(runId),
@@ -4499,6 +4523,25 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 			priorRunPrefixLength
 		}))) };
 		const durability = {
+			commitModelRestart: (restart) => recordHalt(Effect.gen(function* () {
+				if (knownIds.has(modelResponseRecordId(runId, restart.turn))) return yield* RunJournalError.make({ message: "Cannot restart a canonical model response" });
+				const recordId = decodeRecordIdSync(`model-aborted:${runId}:${restart.restart}`);
+				const record = yield* makeEnvelope(recordId, ModelCallAborted.make({
+					runId,
+					...restart,
+					reason: "joined-input",
+					modelUsage: usageForCommit(restart.turn)?.modelUsage ?? [],
+					unobservedModelCalls: unobservedForCommit(restart.turn)
+				}));
+				const batch = CanonicalBatch.make({
+					batchId: decodeBatchIdSync(recordId),
+					producerId: config.producerId,
+					records: [record]
+				});
+				yield* appendBatch(ctx, batch);
+				recordCommittedUsage(batch);
+				knownIds.add(recordId);
+			})),
 			noteToolExposure: (turn, snapshot) => Effect.sync(() => {
 				stagedToolExposure.set(turn, snapshot);
 			}),
@@ -4553,8 +4596,8 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 					deploymentId: config.deploymentId,
 					createdAt,
 					...canonicalTurn === 1 && pendingSlice.length > 0 ? { runScopedPrefixLength: pendingSlice.length } : {},
-					usage: stagedUsage.get(canonicalTurn),
-					unobservedModelCalls: stagedUnobservedCalls.get(canonicalTurn)
+					usage: usageForCommit(canonicalTurn),
+					unobservedModelCalls: unobservedForCommit(canonicalTurn)
 				}));
 				yield* appendBatch(ctx, batch);
 				recordCommittedUsage(batch);
@@ -4852,58 +4895,94 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 			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 joinedInputs = yield* recordHalt(Effect.gen(function* () {
-				const limit = policy === "one" ? 1 : MAX_JOIN_DRAIN;
-				const joinedInputs = [];
-				if (joinBacklog === void 0) joinBacklog = (yield* ledger.loadRecoverySnapshot(RecoverySnapshotRequest.make({ submissionId }))).joins;
-				for (const join of joinBacklog) {
-					if (joinedInputs.length >= limit) break;
-					const joinId = join.submissionId;
-					if (deliveredJoinInputs.has(joinId)) continue;
-					if (join.state !== "joining" && join.state !== "joined") continue;
-					const existing = joinedInputEnvelopes.get(joinId);
-					if (existing === void 0) continue;
-					if (join.state === "joining") {
-						const ownershipToken = yield* Ref.get(tokenRef);
-						yield* ledger.markJoined(MarkJoinedRequest.make({
-							submissionId: joinId,
-							ownershipToken,
-							recordId: existing.record.recordId,
-							sequence: existing.sequence
-						}));
+		const pendingJoinClaims = [];
+		const claimInputs = Effect.fnUntraced(function* (maxCount) {
+			const ownershipToken = yield* Ref.get(tokenRef);
+			const claims = yield* ledger.claimJoining(ClaimJoiningRequest.make({
+				threadId: submission.threadId,
+				hostSubmissionId: submissionId,
+				ownershipToken,
+				maxCount
+			}));
+			pendingJoinClaims.push(...claims.map((claim) => ({ claim })));
+			return claims.length;
+		}, Effect.uninterruptible);
+		const revertClaims = Effect.fnUntraced(function* (claims) {
+			for (const pending of claims) {
+				yield* ledger.revertJoining(RevertJoiningRequest.make({ submissionId: pending.claim.submissionId }));
+				pendingJoinClaims.splice(pendingJoinClaims.indexOf(pending), 1);
+			}
+		}, Effect.uninterruptible);
+		const prepareInputs = Effect.fnUntraced(function* (limit, firstReady = false) {
+			if (pendingJoinClaims.length < limit && (yield* claimInputs(limit - pendingJoinClaims.length)) > 0) yield* hit("join:after-claim");
+			const prepared = [];
+			for (const pending of pendingJoinClaims.slice(0, limit)) {
+				const claim = pending.claim;
+				const snapshot = yield* ledger.loadRecoverySnapshot(RecoverySnapshotRequest.make({ submissionId: claim.submissionId }));
+				if (snapshot.abortIntent !== void 0) {
+					yield* revertClaims([pending]);
+					continue;
+				}
+				if (pending.prepared === void 0) {
+					const input = {
+						input: claim.inputPayload,
+						...snapshot.submission.messageAdmission === void 0 ? {} : { messageAdmission: snapshot.submission.messageAdmission }
+					};
+					const rendered = yield* Effect.result(renderJoinedInput(input));
+					if (Result.isFailure(rendered)) {
+						yield* revertClaims(pendingJoinClaims.slice(pendingJoinClaims.indexOf(pending)));
+						break;
 					}
-					deliveredJoinInputs.add(joinId);
-					if (lastHostResponseSequence !== void 0 && lastHostResponseSequence > existing.sequence) continue;
-					const payload = existing.record.payload;
-					if (payload._tag !== "UserInputRecorded") continue;
-					yield* preserveToolResults;
-					joinedInputs.push(payload);
+					pending.prepared = {
+						claim,
+						input,
+						rendered: rendered.success
+					};
 				}
-				if (joinedInputs.length < limit) {
-					const ownershipToken = yield* Ref.get(tokenRef);
-					const claims = yield* ledger.claimJoining(ClaimJoiningRequest.make({
-						threadId: submission.threadId,
-						hostSubmissionId: submissionId,
-						ownershipToken,
-						maxCount: limit - joinedInputs.length
-					}));
-					if (claims.length > 0) yield* hit("join:after-claim");
-					for (const claim of claims) {
-						const claimSnapshot = yield* ledger.loadRecoverySnapshot(RecoverySnapshotRequest.make({ submissionId: claim.submissionId }));
-						if (claimSnapshot.abortIntent !== void 0) {
-							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;
+				prepared.push(pending.prepared);
+				if (firstReady) break;
+			}
+			return prepared;
+		});
+		const input = {
+			awaitJoin: recordHalt(Effect.gen(function* () {
+				while (true) if (yield* Effect.scoped(Effect.gen(function* () {
+					const notified = yield* wake.subscribe(submission.threadId);
+					if ((yield* prepareInputs(MAX_JOIN_DRAIN, true)).length > 0) return true;
+					yield* notified;
+					return false;
+				}))) return;
+			})),
+			drain: (policy) => Effect.gen(function* () {
+				const joinedInputs = yield* recordHalt(Effect.gen(function* () {
+					const limit = policy === "one" ? 1 : MAX_JOIN_DRAIN;
+					const joinedInputs = [];
+					if (joinBacklog === void 0) joinBacklog = (yield* ledger.loadRecoverySnapshot(RecoverySnapshotRequest.make({ submissionId }))).joins;
+					for (const join of joinBacklog) {
+						const joinId = join.submissionId;
+						if (deliveredJoinInputs.has(joinId)) continue;
+						if (join.state !== "joining" && join.state !== "joined") continue;
+						const existing = joinedInputEnvelopes.get(joinId);
+						if (existing === void 0) continue;
+						if (join.state === "joining") {
+							const ownershipToken = yield* Ref.get(tokenRef);
+							yield* ledger.markJoined(MarkJoinedRequest.make({
+								submissionId: joinId,
+								ownershipToken,
+								recordId: existing.record.recordId,
+								sequence: existing.sequence
+							}));
 						}
+						deliveredJoinInputs.add(joinId);
+						if (lastHostResponseSequence !== void 0 && lastHostResponseSequence > existing.sequence) continue;
+						const payload = existing.record.payload;
+						if (payload._tag !== "UserInputRecorded") continue;
+						yield* preserveToolResults;
+						joinedInputs.push(payload);
+					}
+					const claims = yield* prepareInputs(limit);
+					pendingJoinClaims.splice(0, claims.length);
+					for (const { claim, input: payload, rendered } of claims) {
 						yield* preserveToolResults;
 						const recordId = submissionInputRecordId(claim.submissionId);
 						let sequence;
@@ -4915,7 +4994,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 								kind: "steering",
 								runId,
 								input: claim.inputPayload,
-								...claimSnapshot.submission.messageAdmission === void 0 ? {} : { messageAdmission: claimSnapshot.submission.messageAdmission }
+								...payload.messageAdmission === void 0 ? {} : { messageAdmission: payload.messageAdmission }
 							}));
 							sequence = (yield* appendBatch(ctx, CanonicalBatch.make({
 								batchId: submissionInputBatchId(claim.submissionId),
@@ -4935,17 +5014,17 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 						deliveredJoinInputs.add(claim.submissionId);
 						joinedInputs.push({
 							...payload,
-							rendered: rendered.success
+							rendered
 						});
 					}
-				}
-				return joinedInputs;
-			}).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
-			}))));
-		}) };
+					return joinedInputs;
+				}).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
+				}))));
+			})
+		};
 		/**
 		* Durable child establishment: `establish` performs or replays
 		* the idempotent get-or-create establishment protocol under the
@@ -5377,8 +5456,8 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 					createdAt,
 					...runScopedPrefixLength > 0 ? { runScopedPrefixLength } : {},
 					...completedRun === void 0 ? {} : { runCompletion: completedRun },
-					usage: stagedUsage.get(canonicalTurn),
-					unobservedModelCalls: stagedUnobservedCalls.get(canonicalTurn)
+					usage: usageForCommit(canonicalTurn),
+					unobservedModelCalls: unobservedForCommit(canonicalTurn)
 				}));
 				yield* appendBatch(ctx, batch);
 				recordCommittedUsage(batch);
@@ -5416,6 +5495,10 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 		});
 		const handleEvent = (event) => {
 			switch (event._tag) {
+				case "ModelRestarted": return Ref.update(stateRef, (state) => ({
+					...state,
+					pendingTurn: void 0
+				}));
 				case "TurnStarted": return commitPendingTurn.pipe(Effect.andThen(Effect.sync(() => {
 					siblingResults.clear();
 					stagedToolSelections.clear();
@@ -5668,6 +5751,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 				policy: childPolicy
 			}
 		};
+		const currentContracts = yield* contractsFor(registeredAgent.definition);
 		const evidence = yield* evidenceFor(records, submissionId, true, snapshot.hostSubmissionId);
 		const knownIds = knownRecordIdsOf(records);
 		if (evidence.recordedSettlementOutcome !== void 0) {
@@ -5710,7 +5794,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 			for (const envelope of reconciliationRecords) knownIds.add(envelope.record.recordId);
 			const review = yield* reconcileOpenCalls(ctx, submission, reconciliationSnapshot, reconciliationRecords, reconciliationEvidence.openToolCalls, knownIds, {
 				definition: agent.definition,
-				contracts: yield* contractsFor(agent.definition)
+				contracts: currentContracts
 			});
 			if (review.uncertain.length > 0 || review.unproven.length > 0) {
 				if (review.uncertain.length > 0) yield* markCallsUnknown(ctx, submissionId, knownIds, review.uncertain, "An ordinary Tool call may have executed without a canonical outcome");
@@ -5729,7 +5813,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 		if (continuation !== void 0) {
 			const current = {
 				definition: agent.definition,
-				contracts: yield* contractsFor(agent.definition)
+				contracts: currentContracts
 			};
 			const operations = operationsFor(continuationRecords, runIdForSubmission(submissionId));
 			const settled = new Set(continuation.settled.map((call) => call.id));
@@ -5802,7 +5886,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 			const tail = yield* store.inspectTail(ThreadTailRequest.make({ threadId }));
 			const canonical = Stream.concat(initialView.canonical, canonicalRange(threadId, tail.tailSequence, initialThrough));
 			const currentRecords = yield* refreshControl(tail.tailSequence);
-			const outcome = yield* runModel(agent, ctx, submission, tokenRef, currentRecords, canonical, tail.tailSequence, initialView.seed, journalMetadata?.snapshot(), lineage, approvalDecisionIntents, runTiming, yieldAfter);
+			const outcome = yield* runModel(agent, ctx, submission, tokenRef, currentRecords, canonical, tail.tailSequence, initialView.seed, journalMetadata?.snapshot(), lineage, approvalDecisionIntents, currentContracts, runTiming, yieldAfter);
 			if (outcome._tag === "yielded") {
 				if (outcome.nextSubmissionId !== void 0) onHandoff(outcome.nextSubmissionId);
 				return Option.none();
@@ -5992,7 +6076,6 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 			message: `This worker is bound to Agent ${binding.agentId}; the claimed head belongs to Agent ${submission.agentId} (SUB-023)`
 		})), threadId);
 	});
-	const resolveCurrentBinding = (submission) => resolveWorkerBinding(registeredBindings, submission.agentId);
 	const processThreadResolvedImpl = (threadId) => drainThread(resolveCurrentBinding, threadId);
 	const processThreadHeadImpl = (threadId, options) => processThreadHead(resolveCurrentBinding, threadId, options);
 	const claimFor = Effect.fn("DurableAgentRuntime.claimFor")(function* (submission, decision) {
@@ -6113,7 +6196,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 		const ctx = yield* attemptContextFor(submission.threadId, claim.producerEpoch);
 		const knownIds = knownRecordIdsOf(records);
 		const markableIds = new Set(decision.openToolCallIds);
-		const review = yield* reconcileOpenCalls(ctx, submission, snapshot, records, evidence.openToolCalls.filter((call) => markableIds.has(call.toolCallId)), knownIds, yield* currentOperationsFor(submission.agentId));
+		const review = yield* reconcileOpenCalls(ctx, submission, snapshot, records, evidence.openToolCalls.filter((call) => markableIds.has(call.toolCallId)), knownIds, yield* currentOperationsFor(submission));
 		let disposition;
 		if (review.uncertain.length > 0) {
 			yield* markCallsUnknown(ctx, submission.submissionId, knownIds, review.uncertain, decision.reason);
@@ -6130,7 +6213,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 	const hasUnsupportedRetry = Effect.fnUntraced(function* (snapshot, records) {
 		if (!snapshot.unknownResolutions.some((intent) => intent.resolution._tag === "SafeToRetry")) return false;
 		const submission = snapshot.submission;
-		const current = yield* currentOperationsFor(submission.agentId);
+		const current = yield* currentOperationsFor(submission);
 		const operations = operationsFor(records, runIdForSubmission(submission.submissionId));
 		for (const intent of snapshot.unknownResolutions) if (intent.resolution._tag === "SafeToRetry") {
 			const prepared = records.map(({ record }) => record.payload).find((payload) => payload._tag === "ToolCallPrepared" && payload.runId === runIdForSubmission(submission.submissionId) && payload.toolCallId === intent.toolCallId);
@@ -7096,6 +7179,20 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 		producerId: config.producerId
 	}).pipe(Effect.provideService(WorkerRuntime, workerRuntime));
 	return DurableAgentRuntime.of({
+		bindingRegistryKey: yield* withCrypto(digestJson({
+			selection: bindingSelection?.key ?? null,
+			bindings: (yield* Effect.forEach(registeredBindings, (binding) => withCrypto(digestJson({
+				agentId: binding.agentId,
+				agent: binding.digests.agent,
+				model: binding.digests.model,
+				tools: binding.digests.tools,
+				replay: binding.digests.replay === void 0 ? null : {
+					agent: binding.digests.replay.agent,
+					agentBehavior: binding.digests.replay.agentBehavior ?? null,
+					tools: binding.digests.replay.tools
+				}
+			}))).pipe(Effect.orDie)).sort()
+		})).pipe(Effect.orDie),
 		workerHost: workerRuntime.acquire,
 		messagingHost: messagingRuntime.acquire,
 		submitRegistered,
@@ -7186,7 +7283,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 var DurableAgentRuntime = class DurableAgentRuntime extends Context.Service()("@effect-agent/thread/DurableAgentRuntime") {
 	/**
 	* Resolve typed registrations and capture their services once in the runtime's Layer Scope.
-	* Every claimed head must match an exact registered identity and digest triple. Worker calls
+	* Every claimed head must select exactly one current registered Definition. Worker calls
 	* cannot replace these registrations or their captured services. Tool authorization is required.
 	*/
 	static layerRegistered(registrations) {
@@ -7204,4 +7301,4 @@ var DurableAgentRuntime = class DurableAgentRuntime extends Context.Service()("@
 //#endregion
 export { DurableApprovalSuspension as a, RecoveryFailure as c, childReservationIdFor as d, isolateRecovery as f, 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-DQFV26SB.mjs.map
+//# sourceMappingURL=DurableAgentRuntime-BQzYkFVy.mjs.map