effect-agent 0.1.0-beta.159 → 0.1.0-beta.160

package/dist/{Admin-DWDYlvvZ.d.mts → Admin-Dirux8PR.d.mts}

@@ -182,6 +182,13 @@ declare const JournalCheckpointSeed_base: Schema.Class<JournalCheckpointSeed, Sc
 }>, {}>;
 /** Retired accounting is additive; the latest Tool batch always remains replayable verbatim. */
 declare class JournalCheckpointSeed extends JournalCheckpointSeed_base {}
+declare const ThreadContextCheckpoint_base: Schema.Class<ThreadContextCheckpoint, Schema.Struct<{
+  readonly throughSequence: Schema.brand<Schema.Natural, "@effect-agent/thread/CanonicalSequence">;
+  readonly prompt: Schema.declare<Schema.Json, Schema.Json>;
+  readonly contextWindowId: Schema.optionalKey<Schema.String>;
+}>, {}>;
+/** Canonical historical context for a later Run, without the previous Run's authority or usage. */
+declare class ThreadContextCheckpoint extends ThreadContextCheckpoint_base {}
 //#endregion
 //#region src/durable/internal/journal-metadata.d.ts
 /** Metadata for one exact canonical prefix, including the same optional checkpoint seed. */
@@ -444,7 +451,7 @@ interface JournalBoundary {
  * it skips only the metadata scan, never covered-Tool validation or the canonical fold.
  * @internal
  */
-declare const projectRunJournalStream: <E, R>(records: Stream.Stream<CanonicalRecordEnvelope, E, R>, ownerRunId: (string & import("effect/Brand").Brand<"@effect-agent/core/RunId">) | undefined, onBoundary?: ((boundary: JournalBoundary) => void) | undefined, seed?: JournalCheckpointSeed | undefined, preparedMetadata?: JournalMetadata | undefined) => Effect.Effect<RunJournalProjection, E | RunJournalError, R>;
+declare const projectRunJournalStream: <E, R>(records: Stream.Stream<CanonicalRecordEnvelope, E, R>, ownerRunId: (string & import("effect/Brand").Brand<"@effect-agent/core/RunId">) | undefined, onBoundary?: ((boundary: JournalBoundary) => void) | undefined, seed?: JournalCheckpointSeed | undefined, preparedMetadata?: JournalMetadata | undefined, priorContext?: ThreadContextCheckpoint | undefined) => Effect.Effect<RunJournalProjection, E | RunJournalError, R>;
 /** Pure projection of one Run's durable recovery state from canonical records. */
 declare const projectRunJournal: (records: readonly CanonicalRecordEnvelope[], runId: string & import("effect/Brand").Brand<"@effect-agent/core/RunId">) => Effect.Effect<RunJournalProjection, RunJournalError, never>;
 /**
@@ -4260,4 +4267,4 @@ declare const RetryRefused_base: Schema.Class<RetryRefused, Schema.TaggedStruct<
 declare class RetryRefused extends RetryRefused_base {}
 //#endregion
 export { RepairSubagentStartLink as $, runDurationBatchId as $i, DurableApprovalFailure as $n, ThreadRecoveryCheckpoints as $r, ParentLinkage as $t, AwaitChildSettlement as A, turnResultsBatchId as Aa, JournalBoundary as Ai, SuspensionReason as An, CheckpointRejected as Ar, ChildReservationConflict as At, MarkUnknown as B, DurableBindingFailure as Ba, compactionBatchId as Bi, settlementFailureFromRecord as Bn, ThreadExport as Br, InputAppliedMarker as Bt, renderRecoveryExplanation as C, turnBatchId as Ca, drainLifecyclePublications as Ci, SubmissionLookupByKey as Cn, isolateRecovery as Cr, ApprovalDecisionIntent as Ct, ApplyUnknownResolutions as D, turnResponseBatch as Da, SettledSubmission as Di, SubmissionWorkItem as Dn, threadCreatedRecordId as Dr, ChildAttachmentSnapshot as Dt, ApplyJoinAccounting as E, turnPreparedBatchId as Ea, PendingSubmission as Ei, SubmissionState as En, threadCreatedBatchId as Er, BeginChildBudgetReleaseRequest as Et, CompleteMaterialization as F, AgentAttemptContext as Fa, TurnCommitInput as Fi, UnknownResolutionIntent as Fn, SaveCheckpointRequest as Fr, Claim as Ft, PropagateChildAbort as G, compileBindingContracts as Ga, modelResponseInterruptedRecordId as Gi, submissionSettlementBatchId as Gn, ThreadNotMaterialized as Gr, MarkInputAppliedRequest as Gt, OpenDelegationCallEvidence as H, ExecutableAgentBinding as Ha, firstWorkerInputRecordId as Hi, submissionAbortRecordId as Hn, ThreadIdentity as Hr, JoiningClaim as Ht, DeclaredPendingBatchEvidence as I, AgentRegistration as Ia, agentUpdateRecordId as Ii, WaitingChild as In, SaveRecoveryCheckpointRequest as Ir, ClaimHandoff as It, Recovery_d_exports as J, projectRunJournal as Ji, workerTerminalFromRecord as Jn, ThreadOutstandingRequest as Jr, MarkUnknownRequest as Jt, RecoveryDecision as K, compileRegistrations as Ka, modelResponseRecordId as Ki, submissionSettlementId as Kn, ThreadObservation as Kr, MarkJoinedRequest as Kt, DelegationAdmissionEvidence as L, BindingSelection as La, approvalDecisionBatchId as Li, WaitingForChildSuspension as Ln, SelectedThreadRead as Lr, ClaimJoiningRequest as Lt, AwaitParentEstablishment as M, workerOriginRecordId as Ma, RunJournalProjection as Mi, UnknownResolution as Mn, FencedAppendRequest as Mr, ChildReservationStatus as Mt, AwaitUnknownResolution as N, workerReportRecordId as Na, RunJournalUsage as Ni, UnknownResolutionCommand as Nn, LoadCheckpointRequest as Nr, ChildSettledNotification as Nt, AwaitApprovalDecision as O, turnResponseBatchId as Oa, SubmissionStatus as Oi, SuspendRequest as On, AppendConflict as Or, ChildBudgetReservationRequest as Ot, CompleteChildAdmission as P, AgentRegistration_d_exports as Pa, RunJournal_d_exports as Pi, UnknownResolutionConflict as Pn, MAX_THREAD_EXPORT_RECORDS as Pr, ChildSettledOutcome as Pt, RepairReadiness as Q, runCompletionDigest as Qi, DurableAgentRuntime_d_exports as Qn, ThreadRecordRequest as Qr, OwnershipToken as Qt, EnsureWaitingForChild as R, BindingUnavailable as Ra, childIdempotencyKeyFor as Ri, WorkerLedgerState as Rn, ThreadCheckpoint as Rr, ClaimRequest as Rt, recoveryDecisionMeaning as S, turnApprovalsBatchId as Sa, LifecyclePublication_d_exports as Si, SubmissionLookupById as Sn, childReservationIdFor as Sr, ApprovalDecisionCommand as St, ApplyInput as T, turnIdForRun as Ta, lifecyclePublicationLayer as Ti, SubmissionSnapshot as Tn, recoveryRepairRecordId as Tr, AttachChildToReservationRequest as Tt, OpenToolCallEvidence as U, ReplayVersions as Ua, markUnknownBatchId as Ui, submissionInputBatchId as Un, ThreadIdentityRequest as Ur, LedgerCapabilities as Ut, NoAction as V, DurableWorkerBinding as Va, compactionRecordId as Vi, submissionAbortBatchId as Vn, ThreadExportRequest as Vr, JoinSnapshot as Vt, PendingApprovalEvidence as W, ResolvedBinding as Wa, modelResponseInterruptedBatchId as Wi, submissionInputRecordId as Wn, ThreadMaterialization as Wr, LedgerError as Wt, RepairInputMarker as X, promptFromCanonicalRecords as Xi, DurableAbortFailure as Xn, ThreadRead as Xr, OwnershipRenewal as Xt, ReleaseOrphanChildReservation as Y, projectRunJournalStream as Yi, ApprovalSuspensionError as Yn, ThreadPeerCountRequest as Yr, OwnershipLost as Yt, RepairJoinMarker as Z, runCompletedRecordId as Zi, DurableAgentRuntime as Zn, ThreadReadRequest as Zr, OwnershipSnapshot as Zt, RetryCommand as _, toolCallResultBatchId as _a, LifecyclePublicationError as _i, SubmissionAdmissionFence as _n, RecoveryBlocked as _r, AdmissionPolicyError as _t, IntegrityCheck as a, subagentJoinedRecordId as aa, ThreadStoreFailure as ai, ReservedChildBudget as an, DurableObserveOptions as ar, SettleAborted as at, obligationSeverityOf as b, toolStepSettledBatchId as ba, LifecyclePublicationSource as bi, SubmissionLedger_d_exports as bn, RecoverySweepOptions as br, AdmissionResult as bt, IntegrityReport as c, subagentRequestedBatchId as ca, ThreadTailRequest as ci, ResolutionCompletedWithResult as cn, DurableRetryFailure as cr, AbortCommand as ct, ObligationReport as d, subagentStartedRecordId as da, getRunInput as di, RevertJoiningRequest as dn, DurableSubmitAgent as dr, AdmissionAdmitted as dt, runDurationRecordId as ea, ThreadRunInputRequest as ei, RecoverySnapshot as en, DurableApprovalResolver as er, ResumeFromTurnBoundary as et, ObligationSeverity as f, toolApprovalDecisionRecordId as fa, readOutstanding as fi, Settlement as fn, DurableSubmitFailure as fr, AdmissionConflict as ft, RecoveryExplanation as g, toolCallResolvedRecordId as ga, LifecyclePublicationConfig as gi, SettlementReservationSnapshot as gn, DurableWorkerRequirements as gr, AdmissionNotAdmitted as gt, RecoveryDisposition as h, toolCallResolutionBatchId as ha, LifecyclePublicationBatch as hi, SettlementReservation as hn, DurableWorkerFailure as hr, AdmissionIndeterminate as ht, ExplainedUnknownCall as i, subagentJoinBatchId as ia, ThreadStoreError as ii, RenewOwnershipRequest as in, DurableObligationFailure as ir, RevertJoining as it, AwaitHostSettlement as j, workerInputRecordId as ja, RunJournalError as ji, SuspensionSnapshot as jn, FenceRejected as jr, ChildReservationId as jt, AwaitChildAdmissionResolution as k, turnResultsBatch as ka, SubmissionStatus_d_exports as ki, SuspensionOutcome as kn, AppendResult as kr, ChildBudgetReservationSnapshot as kt, ObligationBlockedOn as l, subagentRequestedRecordId as la, ThreadWorkerStateRequest as li, ResolutionNeverHappened as ln, DurableRuntimeConfig as lr, AbortIntent as lt, RECOVERY_DECISION_MEANINGS as m, toolCallPreparedRecordId as ma, LifecyclePublication as mi, SettlementFinalization as mn, DurableVerifyFailure as mr, AdmissionGroup as mt, ExplainedEvidence as n, runStartedBatchId as na, ThreadStore as ni, ReleaseChildBudgetRequest as nn, DurableAwaitFailure as nr, ResumeSuspended as nt, IntegrityCheckName as o, subagentLineageBatchId as oa, ThreadStore_d_exports as oi, ReservedSettlement as on, DurableProgressFailure as or, SettleJoinedWithHost as ot, ObligationThresholds as p, toolApprovalRequestRecordId as pa, readWorkerState as pi, SettlementConflict as pn, DurableSubmitOptions as pr, AdmissionFence as pt, RecoveryEvidence as q, definitionDigestsEqual as qa, peerMessageRecordId as qi, submissionSettlementRecordId as qn, ThreadOutstanding as qr, MarkReadyRequest as qt, ExplainedSubmission as r, runStartedRecordId as ra, ThreadStoreDiagnostic as ri, ReleaseOwnershipRequest as rn, DurableExplainFailure as rr, ResumeWaitingParent as rt, IntegrityCheckStatus as s, subagentLineageRecordId as sa, ThreadTail as si, ResolutionAbortSubmission as sn, DurableResolveFailure as sr, classifyRecovery as st, Admin_d_exports as t, runIdForSubmission as ta, ThreadSelection as ti, RecoverySnapshotRequest as tn, DurableApprovalSuspension as tr, ResumePendingToolBatch as tt, ObligationEntry as u, subagentStartedBatchId as ua, getRecord as ui, ResolutionSafeToRetry as un, DurableRuntimeConfigOptions as ur, AbortIntentRequest as ut, RetryRefusalReason as v, toolCallSettledRecordId as va, LifecyclePublicationFact as vi, SubmissionLedger as vn, RecoveryFailure as vr, AdmissionRequest as vt, AppendReservedSettlement as w, turnCanonicalBatch as wa, lifecyclePublicationBatchMaxFacts as wi, SubmissionScheduling as wn, recoveryRepairBatchId as wr, ApprovalPendingSuspension as wt, predictRecoveryDisposition as x, toolStepSettledRecordId as xa, LifecyclePublicationStorage as xi, SubmissionLookup as xn, RecoverySweepResult as xr, ApprovalConflict as xt, RetryRefused as y, toolCallUnknownRecordId as ya, LifecyclePublicationHandler as yi, SubmissionLedgerFailure as yn, RecoveryReport as yr, AdmissionResolution as yt, FinalizeLedgerFromHistory as z, CurrentBindingSelection as za, childThreadIdFor as zi, WorkerStopCommand as zn, ThreadCheckpoints as zr, DEFAULT_OWNERSHIP_LEASE_DURATION as zt };
-//# sourceMappingURL=Admin-DWDYlvvZ.d.mts.map
+//# sourceMappingURL=Admin-Dirux8PR.d.mts.map

package/dist/{DurableAgentRuntime-C7A5guvq.mjs → DurableAgentRuntime-pr7cCaZw.mjs}

@@ -27,7 +27,7 @@ import { DeclaredPendingBatchEvidence, OpenDelegationCallEvidence, OpenToolCallE
 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 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-BIOzAej4.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 { $ 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-CA2bsvHn.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-N9hZV85Q.mjs";
+import { c as threadCreatedBatchId, l as threadCreatedRecordId, n as WorkerAdmissionPort, o as ensureThreadCreated, r as WorkerAdmissionRequest, s as ensureWorkerOrigin } from "./WorkerAdmission-Cmcxd6nS.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";
@@ -70,20 +70,60 @@ var JournalCheckpointSeed = class extends Schema.Class("@effect-agent/thread/int
 	/** Canonical replacement whose covered batches were validated before retirement. */
 	compaction: CanonicalRecordEnvelope
 }) {};
+/** Canonical historical context for a later Run, without the previous Run's authority or usage. */
+var ThreadContextCheckpoint = class extends Schema.Class("@effect-agent/thread/internal/ThreadContextCheckpoint")({
+	throughSequence: CanonicalSequence,
+	prompt: PersistedJson,
+	contextWindowId: Schema.optionalKey(Schema.String)
+}) {};
 /** A bounded sparse projection, never a canonical log or a submission-ownership record. */
 var RecoveryCheckpointState = class extends Schema.Class("@effect-agent/thread/internal/RecoveryCheckpointState")({
-	schemaVersion: Schema.Literal(1),
+	schemaVersion: Schema.Literal(2),
 	policyAccountingVersion: Schema.Literal(1),
 	submissionId: SubmissionId,
 	submissionIds: Schema.Array(SubmissionId).check(Schema.isMaxLength(4096)),
-	seed: JournalCheckpointSeed,
+	seed: Schema.optionalKey(JournalCheckpointSeed),
+	context: Schema.optionalKey(ThreadContextCheckpoint),
 	records: Schema.Array(CanonicalRecordEnvelope).check(Schema.isMaxLength(4096))
 }) {};
 var RecoveryCheckpointContents = class extends Schema.Class("@effect-agent/thread/internal/RecoveryCheckpointContents")({
 	state: RecoveryCheckpointState,
 	digest: Digest
 }) {};
-const RECOVERY_ENGINE_VERSION = "effect-agent/recovery@2";
+const RECOVERY_ENGINE_VERSION = "effect-agent/recovery@3";
+/**
+* Prove that indexed original-input absence also means absent prefix Run/control evidence.
+* Only cache consumers with colon-free Submission IDs use this certificate. For those IDs,
+* every possible control marker is exactly :run:<submission-id>:. Parsing here can only decline
+* caching; it never supplies an execution identity. Separator-bearing identities use full replay.
+* The temporary anchor set is discarded after certification, not persisted with the context.
+*/
+const makeThreadContextCertificate = () => {
+	const anchored = /* @__PURE__ */ new Set();
+	let valid = true;
+	return {
+		add: ({ record }) => {
+			if (!valid) return;
+			const payload = record.payload;
+			if ("runId" in payload && payload.runId !== void 0) {
+				const originalInput = payload._tag === "UserInputRecorded" && payload.kind === "user";
+				if (originalInput ? anchored.has(payload.runId) : !anchored.has(payload.runId)) {
+					valid = false;
+					return;
+				}
+				if (originalInput) anchored.add(payload.runId);
+			}
+			for (let start = record.recordId.indexOf(":run:"); start !== -1; start = record.recordId.indexOf(":run:", start + 1)) {
+				const end = record.recordId.indexOf(":", start + 5);
+				if (end !== -1 && !anchored.has(record.recordId.slice(start + 1, end))) {
+					valid = false;
+					return;
+				}
+			}
+		},
+		isValid: () => valid
+	};
+};
 /**
 * Late evidence can invalidate an old compaction. Such histories use full canonical replay;
 * an omitted run/turn must never be treated as proven absent by a sparse projection.
@@ -2499,21 +2539,19 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 		const view = yield* recoveryView(threadId, tail.tailSequence, submissionIds);
 		return yield* Stream.runCollect(view.canonical.pipe(Stream.filter(controlRecords(submissionIds))));
 	});
-	/** A checkpoint is useful only for its explicitly retained submissions and exact definitions. */
-	const recoveryView = Effect.fn("DurableAgentRuntime.recoveryView")(function* (threadId, throughSequence, submissionIds, journalOwner) {
-		const full = { canonical: canonicalRange(threadId, throughSequence) };
-		if (store.recoveryCheckpoints === void 0) return full;
+	const loadRecoveryCheckpoint = Effect.fn("DurableAgentRuntime.loadRecoveryCheckpoint")(function* (threadId, throughSequence) {
+		if (store.recoveryCheckpoints === void 0) return Option.none();
 		const loaded = yield* store.recoveryCheckpoints.load(LoadCheckpointRequest.make({
 			threadId,
 			atOrBeforeSequence: throughSequence
 		})).pipe(Effect.catchTag("CheckpointRejected", () => Effect.succeed(Option.none())));
-		if (Option.isNone(loaded)) return full;
+		if (Option.isNone(loaded)) return Option.none();
 		const checkpoint = loaded.value;
-		if (checkpoint.engineVersion !== "effect-agent/recovery@2" || checkpoint.threadId !== threadId || checkpoint.throughSequence > throughSequence || throughSequence - checkpoint.throughSequence > 4096) return full;
+		if (checkpoint.engineVersion !== "effect-agent/recovery@3" || checkpoint.threadId !== threadId || checkpoint.throughSequence > throughSequence) return Option.none();
 		const decoded = yield* Schema.decodeUnknownEffect(RecoveryCheckpointContents)(checkpoint.state).pipe(Effect.option);
-		if (Option.isNone(decoded)) return full;
+		if (Option.isNone(decoded)) return Option.none();
 		const { state, digest } = decoded.value;
-		if (!submissionIds.every((id) => state.submissionIds.includes(id)) || state.seed.runId !== runIdForSubmission(state.submissionId) || journalOwner !== void 0 && state.seed.runId !== journalOwner) return full;
+		if (state.seed === void 0 && state.context === void 0 || state.records.some((record) => record.threadId !== threadId || record.sequence > checkpoint.throughSequence) || state.context !== void 0 && state.context.throughSequence !== checkpoint.throughSequence) return Option.none();
 		const encoded = yield* Schema.encodeEffect(RecoveryCheckpointState)(state).pipe(Effect.mapError((cause) => ThreadStoreError.make({
 			operation: "decode recovery checkpoint",
 			message: "Invalid recovery state",
@@ -2523,15 +2561,74 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 			operation: "decode recovery checkpoint",
 			message: cause.message,
 			cause
-		}))))) return full;
+		}))))) return Option.none();
+		if (state.context !== void 0) {
+			const prompt = yield* Schema.decodeUnknownEffect(Prompt.Prompt)(state.context.prompt).pipe(Effect.option);
+			if (Option.isNone(prompt)) return Option.none();
+		}
 		const owner = yield* ledger.lookup(SubmissionLookupById.make({ submissionId: state.submissionId })).pipe(Effect.mapError((cause) => ThreadStoreError.make({
 			operation: "recovery checkpoint compatibility",
 			message: cause.message,
 			cause
 		})));
-		if (Option.isNone(owner) || owner.value.threadId !== threadId || owner.value.agentDigests.agent !== checkpoint.agentDefinitionDigest || owner.value.agentDigests.model !== checkpoint.modelDigest || owner.value.agentDigests.tools !== checkpoint.toolDigest) return full;
+		if (Option.isNone(owner) || owner.value.threadId !== threadId || owner.value.agentDigests.agent !== checkpoint.agentDefinitionDigest || owner.value.agentDigests.model !== checkpoint.modelDigest || owner.value.agentDigests.tools !== checkpoint.toolDigest) return Option.none();
+		return Option.some({
+			checkpoint,
+			state
+		});
+	});
+	const retainThreadIdentity = ({ record }) => record.payload._tag === "ThreadCreated" || record.payload._tag === "SubagentLineageRecorded" || record.payload._tag === "WorkerOriginRecorded" || record.recordId.startsWith("subagent-lineage:");
+	/** Late/foreign evidence and new compactions require the original canonical proof. */
+	const contextSuffixCompatible = (records, submissionId) => {
+		const runId = runIdForSubmission(submissionId);
+		const certificate = makeThreadContextCertificate();
+		for (const entry of records) {
+			const { payload, recordId } = entry.record;
+			if (payload._tag === "CompactionCreated" || retainThreadIdentity(entry)) return false;
+			if ("runId" in payload && payload.runId !== void 0) {
+				if (payload.runId !== runId) return false;
+			} else if (payload._tag === "AbortRequested") {
+				if (payload.submissionId !== submissionId || recordId !== submissionAbortRecordId(submissionId)) return false;
+			} else if (payload._tag === "SubmissionSettled") {
+				if (payload.submissionId !== submissionId || recordId !== submissionSettlementRecordId(submissionId)) return false;
+			} else return false;
+			certificate.add(entry);
+		}
+		return certificate.isValid();
+	};
+	/** Run seeds retain their owner; certified Thread context serves only provably later Runs. */
+	const recoveryView = Effect.fn("DurableAgentRuntime.recoveryView")(function* (threadId, throughSequence, submissionIds, journalOwner) {
+		const full = { canonical: canonicalRange(threadId, throughSequence) };
+		const loaded = yield* loadRecoveryCheckpoint(threadId, throughSequence);
+		if (Option.isNone(loaded)) return full;
+		const { checkpoint, state } = loaded.value;
+		if (throughSequence - checkpoint.throughSequence > 4096) return full;
+		const submissionId = submissionIds.length === 1 ? submissionIds[0] : void 0;
+		if (state.context !== void 0 && submissionId !== void 0 && !submissionId.includes(":") && (journalOwner === void 0 || journalOwner === runIdForSubmission(submissionId))) {
+			const runId = runIdForSubmission(submissionId);
+			if ([yield* getRunInput({
+				threadId,
+				runId
+			}).pipe(Effect.provideService(ThreadStore, store)), ...yield* Effect.forEach([
+				submissionInputRecordId(submissionId),
+				submissionAbortRecordId(submissionId),
+				submissionSettlementRecordId(submissionId),
+				runStartedRecordId(runId),
+				runCompletedRecordId(runId)
+			], (recordId) => getRecord({
+				threadId,
+				recordId
+			}).pipe(Effect.provideService(ThreadStore, store)))].every((record) => Option.isNone(record) || record.value.sequence > checkpoint.throughSequence && record.value.sequence <= throughSequence)) {
+				const suffix = yield* Stream.runCollect(canonicalRange(threadId, throughSequence, checkpoint.throughSequence));
+				if (contextSuffixCompatible(suffix, submissionId)) return {
+					canonical: Stream.fromIterable([...state.records.filter(retainThreadIdentity), ...suffix]),
+					context: state.context
+				};
+			}
+		}
+		if (state.seed === void 0 || !submissionIds.every((id) => state.submissionIds.includes(id)) || state.seed.runId !== runIdForSubmission(state.submissionId) || journalOwner !== void 0 && state.seed.runId !== journalOwner) return full;
 		const replacement = state.seed.compaction;
-		if (replacement.threadId !== threadId || replacement.sequence > checkpoint.throughSequence || replacement.record.payload._tag !== "CompactionCreated" || replacement.record.payload.kind === "clear-tool-results" || replacement.record.payload.coversThrough < state.seed.throughSequence || replacement.record.payload.coversThrough >= replacement.sequence || state.records.some((record) => record.threadId !== threadId || record.sequence > checkpoint.throughSequence) || !state.records.some((record) => record.sequence === replacement.sequence && record.record.recordId === replacement.record.recordId)) return full;
+		if (replacement.threadId !== threadId || replacement.sequence > checkpoint.throughSequence || replacement.record.payload._tag !== "CompactionCreated" || replacement.record.payload.kind === "clear-tool-results" || replacement.record.payload.coversThrough < state.seed.throughSequence || replacement.record.payload.coversThrough >= replacement.sequence || !state.records.some((record) => record.sequence === replacement.sequence && record.record.recordId === replacement.record.recordId)) return full;
 		const suffix = yield* Stream.runCollect(canonicalRange(threadId, throughSequence, checkpoint.throughSequence));
 		if (!checkpointSuffixCompatible(state.seed, suffix, state.records)) return full;
 		return {
@@ -2539,6 +2636,90 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 			seed: state.seed
 		};
 	});
+	const persistRecoveryCheckpoint = Effect.fn("DurableAgentRuntime.persistRecoveryCheckpoint")(function* (ctx, submission, state, tail, createdAt) {
+		if (store.recoveryCheckpoints === void 0) return;
+		const encoded = yield* Schema.encodeEffect(RecoveryCheckpointState)(state).pipe(Effect.option);
+		if (Option.isNone(encoded)) return;
+		const digest = yield* withCrypto(digestJson(encoded.value));
+		const contents = yield* Schema.encodeEffect(Schema.fromJsonString(RecoveryCheckpointContents))(RecoveryCheckpointContents.make({
+			state,
+			digest
+		})).pipe(Effect.flatMap(Schema.decodeUnknownEffect(Schema.fromJsonString(PersistedJson))), Effect.option);
+		if (Option.isNone(contents)) return;
+		const checkpoint = ThreadCheckpoint.make({
+			schemaVersion: 1,
+			threadId: ctx.threadId,
+			throughSequence: tail.sequence,
+			tailDigest: tail.digest,
+			engineVersion: RECOVERY_ENGINE_VERSION,
+			agentDefinitionDigest: submission.agentDigests.agent,
+			modelDigest: submission.agentDigests.model,
+			toolDigest: submission.agentDigests.tools,
+			state: contents.value,
+			createdAt
+		});
+		yield* hit("checkpoint:before-save");
+		yield* store.recoveryCheckpoints.save(SaveRecoveryCheckpointRequest.make({
+			checkpoint,
+			producerEpoch: ctx.producerEpoch
+		})).pipe(Effect.catchTag("CheckpointRejected", () => Effect.void));
+		yield* hit("checkpoint:after-save");
+	});
+	/** Refresh before settlement finalization, so completed processing includes the cache's cost. */
+	const saveThreadContext = Effect.fn("DurableAgentRuntime.saveThreadContext")(function* (ctx, submission, priorContext) {
+		if (store.recoveryCheckpoints === void 0) return;
+		const tail = yield* Ref.get(ctx.tailRef);
+		const loaded = yield* loadRecoveryCheckpoint(ctx.threadId, tail.sequence);
+		if (Option.isNone(loaded)) return;
+		const previous = loaded.value;
+		let identities = previous.state.records.filter(retainThreadIdentity);
+		let projection;
+		if (priorContext !== void 0 && tail.sequence - priorContext.throughSequence <= 4096) {
+			const suffix = yield* Stream.runCollect(canonicalRange(ctx.threadId, tail.sequence, priorContext.throughSequence));
+			if (contextSuffixCompatible(suffix, submission.submissionId)) projection = yield* projectRunJournalStream(Stream.fromIterable(suffix), void 0, void 0, void 0, void 0, priorContext).pipe(Effect.catchTag("RunJournalError", () => Effect.succeed(void 0)));
+		}
+		if (projection === void 0) {
+			const source = canonicalRange(ctx.threadId, tail.sequence);
+			const certificate = makeThreadContextCertificate();
+			const metadata = makeJournalMetadata(void 0);
+			const retained = [];
+			yield* Stream.runForEach(source, (entry) => Effect.sync(() => {
+				certificate.add(entry);
+				metadata.add(entry);
+				if (retainThreadIdentity(entry) && retained.length <= 4096) retained.push(entry);
+			}));
+			if (!certificate.isValid() || retained.length > 4096) return;
+			identities = retained;
+			projection = yield* projectRunJournalStream(source, void 0, void 0, void 0, metadata.snapshot()).pipe(Effect.catchTag("RunJournalError", () => Effect.succeed(void 0)));
+		}
+		if (projection === void 0) return;
+		const prompt = yield* Schema.encodeEffect(Prompt.Prompt)(projection.prompt).pipe(Effect.flatMap(decodePersisted), Effect.option);
+		if (Option.isNone(prompt)) return;
+		let seed;
+		let records = identities;
+		let submissionIds = [submission.submissionId];
+		if (previous.state.submissionId === submission.submissionId && previous.state.seed !== void 0 && tail.sequence - previous.checkpoint.throughSequence + previous.state.records.length <= 4096) {
+			const suffix = yield* Stream.runCollect(canonicalRange(ctx.threadId, tail.sequence, previous.checkpoint.throughSequence));
+			if (checkpointSuffixCompatible(previous.state.seed, suffix, previous.state.records)) {
+				seed = previous.state.seed;
+				records = [...previous.state.records, ...suffix];
+				submissionIds = previous.state.submissionIds;
+			}
+		}
+		yield* persistRecoveryCheckpoint(ctx, submission, RecoveryCheckpointState.make({
+			schemaVersion: 2,
+			policyAccountingVersion: 1,
+			submissionId: submission.submissionId,
+			submissionIds,
+			...seed === void 0 ? {} : { seed },
+			context: ThreadContextCheckpoint.make({
+				throughSequence: tail.sequence,
+				prompt: prompt.value,
+				...projection.contextWindowId === void 0 ? {} : { contextWindowId: projection.contextWindowId }
+			}),
+			records
+		}), tail, yield* DateTime.now);
+	});
 	const readAllTolerant = Effect.fn("DurableAgentRuntime.readAllTolerant")((threadId, submissionIds) => readControl(threadId, submissionIds).pipe(Effect.map((records) => ({
 		records,
 		materialized: true
@@ -3468,7 +3649,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 	* Submissions joined to this host Run settle with the host outcome immediately after
 	* (plan §2.5); recovery completes any prefix of that loop.
 	*/
-	const terminalize = Effect.fn("DurableAgentRuntime.terminalize")(function* (ctx, submission, tokenRef, outcome, includeRunId) {
+	const terminalize = Effect.fn("DurableAgentRuntime.terminalize")(function* (ctx, submission, tokenRef, outcome, includeRunId, afterCanonical) {
 		const submissionId = submission.submissionId;
 		const settlementId = submissionSettlementId(submissionId);
 		const payload = yield* Schema.decodeEffect(SubmissionSettledRecord)(SubmissionSettled.make({
@@ -3505,6 +3686,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 		})).pipe(Effect.catchTag("AppendConflict", () => Effect.void), Effect.asVoid);
 		yield* hit("terminalize:after-canonical-append");
 		yield* notifyParentOfChildSettlement(submission, reserved.record);
+		if (afterCanonical !== void 0) yield* afterCanonical;
 		const settlement = yield* ledger.finalizeSettlement(SettlementFinalization.make({
 			submissionId,
 			settlementId
@@ -4146,25 +4328,26 @@ 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, renewAtRef, records, canonical, canonicalThrough, journalSeed, journalMetadata, lineage, approvalDecisions, currentContracts, runTiming, yieldAfter) => Effect.gen(function* () {
+	const runModel = (agent, ctx, submission, tokenRef, renewAtRef, records, canonical, canonicalThrough, journalSeed, priorContext, journalMetadata, lineage, approvalDecisions, currentContracts, runTiming, yieldAfter) => Effect.gen(function* () {
 		const submissionId = submission.submissionId;
 		const runId = runIdForSubmission(submissionId);
 		const boundaries = [];
 		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);
+		const journal = cached !== void 0 && cached.threadId === ctx.threadId && cached.through === canonicalThrough && cached.runId === runId && cached.seedThrough === journalSeed?.throughSequence && cached.contextThrough === priorContext?.throughSequence ? (boundaries.push(...cached.boundaries), cached.journal) : yield* projectRunJournalStream(canonical, runId, (boundary) => boundaries.push(boundary), journalSeed, journalMetadata, priorContext);
 		journalMetadata = void 0;
 		projectedJournal = {
 			threadId: ctx.threadId,
 			through: canonicalThrough,
 			runId,
 			seedThrough: journalSeed?.throughSequence,
+			contextThrough: priorContext?.throughSequence,
 			journal,
 			boundaries
 		};
 		const saveRecoveryCheckpoint = Effect.fn("DurableAgentRuntime.saveRecoveryCheckpoint")(function* (compactionId) {
 			if (store.recoveryCheckpoints === void 0) return;
 			const tail = yield* Ref.get(ctx.tailRef);
-			const source = Stream.concat(canonical, canonicalRange(ctx.threadId, tail.sequence, canonicalThrough));
+			const source = priorContext === void 0 ? Stream.concat(canonical, canonicalRange(ctx.threadId, tail.sequence, canonicalThrough)) : canonicalRange(ctx.threadId, tail.sequence);
 			let compaction;
 			let latestResponse;
 			let firstSequence = journalSeed?.firstSequence;
@@ -4222,7 +4405,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 			for (const { record: { payload } } of retained) if (payload._tag === "UserInputRecorded" && payload.submissionId !== void 0) ids.add(payload.submissionId);
 			const validated = yield* Effect.try({
 				try: () => RecoveryCheckpointState.make({
-					schemaVersion: 1,
+					schemaVersion: 2,
 					policyAccountingVersion: 1,
 					submissionId,
 					submissionIds: [...ids],
@@ -4268,32 +4451,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 			].some((field) => current.usage[field] !== candidate.usage[field]) || (current.usage.unobservedModelCalls ?? 0) !== (candidate.usage.unobservedModelCalls ?? 0)) return;
 			const summaries = yield* Effect.forEach([current, candidate], (projection) => summarizeModelUsage(projection.usage.modelUsage, projection.usage.summarizedModelUsage)).pipe(Effect.option);
 			if (Option.isNone(summaries) || summaries.value[0] === void 0 || summaries.value[1] === void 0 || !Schema.toEquivalence(RunUsageSummary)(summaries.value[0], summaries.value[1])) return;
-			const encoded = yield* Schema.encodeEffect(RecoveryCheckpointState)(validated.value).pipe(Effect.option);
-			if (Option.isNone(encoded)) return;
-			const digest = yield* withCrypto(digestJson(encoded.value));
-			const contents = yield* Schema.encodeEffect(Schema.fromJsonString(RecoveryCheckpointContents))(RecoveryCheckpointContents.make({
-				state: validated.value,
-				digest
-			})).pipe(Effect.flatMap(Schema.decodeUnknownEffect(Schema.fromJsonString(PersistedJson))), Effect.option);
-			if (Option.isNone(contents)) return;
-			const checkpoint = ThreadCheckpoint.make({
-				schemaVersion: 1,
-				threadId: ctx.threadId,
-				throughSequence: tail.sequence,
-				tailDigest: tail.digest,
-				engineVersion: RECOVERY_ENGINE_VERSION,
-				agentDefinitionDigest: submission.agentDigests.agent,
-				modelDigest: submission.agentDigests.model,
-				toolDigest: submission.agentDigests.tools,
-				state: contents.value,
-				createdAt: replacement.record.createdAt
-			});
-			yield* hit("checkpoint:before-save");
-			yield* store.recoveryCheckpoints.save(SaveRecoveryCheckpointRequest.make({
-				checkpoint,
-				producerEpoch: ctx.producerEpoch
-			})).pipe(Effect.catchTag("CheckpointRejected", () => Effect.void));
-			yield* hit("checkpoint:after-save");
+			yield* persistRecoveryCheckpoint(ctx, submission, validated.value, tail, replacement.record.createdAt);
 		});
 		const childLineage = records.find(({ record }) => record.recordId === subagentLineageRecordId(submission.threadId))?.record.payload;
 		const inheritedGrant = submission.workerAdmission?.origin.grant ?? (childLineage?._tag === "SubagentLineageRecorded" ? childLineage.grant : void 0);
@@ -4301,7 +4459,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 		const inheritedBudget = submission.workerAdmission?.origin.budget ?? (childLineage?._tag === "SubagentLineageRecorded" ? childLineage.budget : void 0);
 		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 resumeProjection = pending === void 0 ? journal : yield* projectRunJournalStream(withoutPendingBatch(canonical, pending, runId), runId, void 0, journalSeed, void 0, priorContext);
 		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;
@@ -4728,11 +4886,11 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 				if (knownIds.has(recordId)) return yield* CompactionError.make({ message: "Compaction is already committed for this Turn and kind" });
 				let sourceJournal = journal;
 				let sourceBoundaries = boundaries;
-				if (commit.kind !== "summarize") {
-					yield* recordHalt(commitPendingTurn);
+				if (commit.kind !== "summarize" || priorContext !== void 0) {
+					if (commit.kind !== "summarize") yield* recordHalt(commitPendingTurn);
 					const tail = yield* Ref.get(ctx.tailRef);
 					sourceBoundaries = [];
-					sourceJournal = yield* recordHalt(projectRunJournalStream(Stream.concat(canonical, canonicalRange(ctx.threadId, tail.sequence, canonicalThrough)).pipe(Stream.filter((envelope) => envelope.record.payload._tag !== "CompactionCreated" || envelope.sequence <= canonicalThrough)), runId, (boundary) => sourceBoundaries.push(boundary), journalSeed));
+					sourceJournal = yield* recordHalt(projectRunJournalStream((priorContext === void 0 ? Stream.concat(canonical, canonicalRange(ctx.threadId, tail.sequence, canonicalThrough)) : canonicalRange(ctx.threadId, commit.kind === "summarize" ? canonicalThrough : tail.sequence)).pipe(Stream.filter((envelope) => envelope.record.payload._tag !== "CompactionCreated" || envelope.sequence <= canonicalThrough)), runId, (boundary) => sourceBoundaries.push(boundary), journalSeed));
 				}
 				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" });
@@ -5935,11 +6093,14 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 			inputWasRecorded: evidence.inputRecorded
 		};
 		let approvalDecisionIntents = snapshot.approvalDecisions;
+		let priorContext = initialView.context;
 		while (true) {
 			const tail = yield* store.inspectTail(ThreadTailRequest.make({ threadId }));
-			const canonical = Stream.concat(initialView.canonical, canonicalRange(threadId, tail.tailSequence, initialThrough));
+			const fullContextReplay = initialView.context !== void 0 && priorContext === void 0;
+			const canonical = fullContextReplay ? canonicalRange(threadId, tail.tailSequence) : Stream.concat(initialView.canonical, canonicalRange(threadId, tail.tailSequence, initialThrough));
 			const currentRecords = yield* refreshControl(tail.tailSequence);
-			const outcome = yield* runModel(agent, ctx, submission, tokenRef, renewAtRef, currentRecords, canonical, tail.tailSequence, initialView.seed, takeJournalMetadata(), lineage, approvalDecisionIntents, currentContracts, runTiming, yieldAfter);
+			const outcome = yield* runModel(agent, ctx, submission, tokenRef, renewAtRef, currentRecords, canonical, tail.tailSequence, initialView.seed, priorContext, fullContextReplay ? void 0 : takeJournalMetadata(), lineage, approvalDecisionIntents, currentContracts, runTiming, yieldAfter);
+			priorContext = void 0;
 			if (outcome._tag === "yielded") {
 				if (outcome.nextSubmissionId !== void 0) onHandoff(outcome.nextSubmissionId);
 				return Option.none();
@@ -6021,7 +6182,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 				});
 			}
 			if (outcome._tag === "failed" && outcome.policyLimit === "duration" && !(yield* ordinaryCallsResolved)) return Option.none();
-			return Option.some(yield* terminalize(ctx, submission, tokenRef, outcome, true));
+			return Option.some(yield* terminalize(ctx, submission, tokenRef, outcome, true, outcome._tag === "completed" ? saveThreadContext(ctx, submission, initialView.context) : void 0));
 		}
 	}).pipe(Effect.scoped);
 	const acquireClaim = Effect.fn("DurableAgentRuntime.acquireClaim")(function* (threadId, handoff) {
@@ -7343,4 +7504,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-C7A5guvq.mjs.map
+//# sourceMappingURL=DurableAgentRuntime-pr7cCaZw.mjs.map