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

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

@@ -90,15 +90,16 @@ var RecoveryCheckpointContents = class extends Schema.Class("@effect-agent/threa
 	state: RecoveryCheckpointState,
 	digest: Digest
 }) {};
-const RECOVERY_ENGINE_VERSION = "effect-agent/recovery@3";
+const RECOVERY_ENGINE_VERSION = "effect-agent/recovery@4";
 /**
 * 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.
+* A certificate covers only Run IDs with the given length. Every possible control marker for
+* those IDs is exactly :<run-id>:, including markers nested inside opaque IDs. Cache consumers
+* must have the checkpoint owner's ID length; shorter/longer aliases require full replay.
+* Parsing here can only decline caching; it never supplies an execution identity.
 * The temporary anchor set is discarded after certification, not persisted with the context.
 */
-const makeThreadContextCertificate = () => {
+const makeThreadContextCertificate = (runIdLength) => {
 	const anchored = /* @__PURE__ */ new Set();
 	let valid = true;
 	return {
@@ -114,8 +115,8 @@ const makeThreadContextCertificate = () => {
 				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))) {
+				const end = start + 1 + runIdLength;
+				if (record.recordId[end] === ":" && !anchored.has(record.recordId.slice(start + 1, end))) {
 					valid = false;
 					return;
 				}
@@ -2547,7 +2548,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 		})).pipe(Effect.catchTag("CheckpointRejected", () => Effect.succeed(Option.none())));
 		if (Option.isNone(loaded)) return Option.none();
 		const checkpoint = loaded.value;
-		if (checkpoint.engineVersion !== "effect-agent/recovery@3" || checkpoint.threadId !== threadId || checkpoint.throughSequence > throughSequence) return Option.none();
+		if (checkpoint.engineVersion !== "effect-agent/recovery@4" || 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 Option.none();
 		const { state, digest } = decoded.value;
@@ -2581,7 +2582,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 	/** Late/foreign evidence and new compactions require the original canonical proof. */
 	const contextSuffixCompatible = (records, submissionId) => {
 		const runId = runIdForSubmission(submissionId);
-		const certificate = makeThreadContextCertificate();
+		const certificate = makeThreadContextCertificate(runId.length);
 		for (const entry of records) {
 			const { payload, recordId } = entry.record;
 			if (payload._tag === "CompactionCreated" || retainThreadIdentity(entry)) return false;
@@ -2604,7 +2605,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 		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))) {
+		if (state.context !== void 0 && submissionId !== void 0 && submissionId.length === state.submissionId.length && (journalOwner === void 0 || journalOwner === runIdForSubmission(submissionId))) {
 			const runId = runIdForSubmission(submissionId);
 			if ([yield* getRunInput({
 				threadId,
@@ -2636,16 +2637,17 @@ 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 encodeRecoveryCheckpoint = Effect.fnUntraced(function* (state) {
 		const encoded = yield* Schema.encodeEffect(RecoveryCheckpointState)(state).pipe(Effect.option);
-		if (Option.isNone(encoded)) return;
+		if (Option.isNone(encoded)) return Option.none();
 		const digest = yield* withCrypto(digestJson(encoded.value));
-		const contents = yield* Schema.encodeEffect(Schema.fromJsonString(RecoveryCheckpointContents))(RecoveryCheckpointContents.make({
+		return 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 persistRecoveryCheckpoint = Effect.fn("DurableAgentRuntime.persistRecoveryCheckpoint")(function* (ctx, submission, contents, tail, createdAt) {
+		if (store.recoveryCheckpoints === void 0) return;
 		const checkpoint = ThreadCheckpoint.make({
 			schemaVersion: 1,
 			threadId: ctx.threadId,
@@ -2655,7 +2657,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 			agentDefinitionDigest: submission.agentDigests.agent,
 			modelDigest: submission.agentDigests.model,
 			toolDigest: submission.agentDigests.tools,
-			state: contents.value,
+			state: contents,
 			createdAt
 		});
 		yield* hit("checkpoint:before-save");
@@ -2680,7 +2682,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 		}
 		if (projection === void 0) {
 			const source = canonicalRange(ctx.threadId, tail.sequence);
-			const certificate = makeThreadContextCertificate();
+			const certificate = makeThreadContextCertificate(runIdForSubmission(submission.submissionId).length);
 			const metadata = makeJournalMetadata(void 0);
 			const retained = [];
 			yield* Stream.runForEach(source, (entry) => Effect.sync(() => {
@@ -2695,30 +2697,32 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 		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({
+		const contextState = RecoveryCheckpointState.make({
 			schemaVersion: 2,
 			policyAccountingVersion: 1,
 			submissionId: submission.submissionId,
-			submissionIds,
-			...seed === void 0 ? {} : { seed },
+			submissionIds: [submission.submissionId],
 			context: ThreadContextCheckpoint.make({
 				throughSequence: tail.sequence,
 				prompt: prompt.value,
 				...projection.contextWindowId === void 0 ? {} : { contextWindowId: projection.contextWindowId }
 			}),
-			records
-		}), tail, yield* DateTime.now);
+			records: identities
+		});
+		let state = contextState;
+		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)) state = RecoveryCheckpointState.make({
+				...contextState,
+				seed: previous.state.seed,
+				records: [...previous.state.records, ...suffix],
+				submissionIds: previous.state.submissionIds
+			});
+		}
+		let contents = yield* encodeRecoveryCheckpoint(state);
+		if (Option.isNone(contents) && state.seed !== void 0) contents = yield* encodeRecoveryCheckpoint(contextState);
+		if (Option.isNone(contents)) return;
+		yield* persistRecoveryCheckpoint(ctx, submission, contents.value, tail, yield* DateTime.now);
 	});
 	const readAllTolerant = Effect.fn("DurableAgentRuntime.readAllTolerant")((threadId, submissionIds) => readControl(threadId, submissionIds).pipe(Effect.map((records) => ({
 		records,
@@ -4451,7 +4455,9 @@ 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;
-			yield* persistRecoveryCheckpoint(ctx, submission, validated.value, tail, replacement.record.createdAt);
+			const contents = yield* encodeRecoveryCheckpoint(validated.value);
+			if (Option.isNone(contents)) return;
+			yield* persistRecoveryCheckpoint(ctx, submission, contents.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);
@@ -7504,4 +7510,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-pr7cCaZw.mjs.map
+//# sourceMappingURL=DurableAgentRuntime-BpB5rBcu.mjs.map