@effect-agent/storage-cloudflare 0.1.0-beta.23 → 0.1.0-beta.25

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { AbortCommand, AbortIntent, AdmissionAdmitted, AdmissionConflict, AdmissionIndeterminate, AdmissionNotAdmitted, AdmissionRequest, AdmissionResolution, AdmissionResult, AppendConflict, AppendResult, ApprovalConflict, ApprovalDecision, ApprovalDecisionCommand, ApprovalDecisionIntent, AttachChildToReservationRequest, BeginChildBudgetReleaseRequest, CanonicalBatch, CanonicalRecord, CanonicalRecordEnvelope, CanonicalSequence, CheckpointRejected, ChildAttachmentSnapshot, ChildBudgetReservationRequest, ChildBudgetReservationSnapshot, ChildReservationConflict, ChildReservationStatus, ChildSettledNotification, ChildSettledOutcome, Claim, ClaimJoiningRequest, ClaimRequest, ConversationCheckpoint, ConversationExport, ConversationExportRequest, ConversationMaterialization, ConversationNotMaterialized, ConversationObservation, ConversationRead, ConversationStore, ConversationStoreError, ConversationTail, ConversationTailRequest, DEFAULT_OWNERSHIP_LEASE_DURATION, DefinitionDigests, Digest, EMPTY_TAIL_DIGEST, FenceRejected, FencedAppendRequest, InputAppliedMarker, JoinSnapshot, JoinedToHost, JoiningClaim, LedgerCapabilities, LedgerError, LoadCheckpointRequest, MarkInputAppliedRequest, MarkJoinedRequest, MarkReadyRequest, MarkUnknownRequest, ObservationOffset, OwnershipLost, OwnershipRenewal, OwnershipSnapshot, ParentLinkage, PersistedJson, ProducerEpoch, QueueSequence, RecordEnvelope, RecoverySnapshot, RecoverySnapshotRequest, ReleaseChildBudgetRequest, ReleaseOwnershipRequest, RenewOwnershipRequest, ReservedChildBudget, ReservedSettlement, RevertJoiningRequest, SaveCheckpointRequest, Settlement, SettlementConflict, SettlementFinalization, SettlementOutcome, SettlementReservation, SettlementReservationSnapshot, SubmissionLedger, SubmissionLookup, SubmissionLookupById, SubmissionLookupByKey, SubmissionSnapshot, SubmissionState, SuspendRequest, SuspensionReason, SuspensionSnapshot, UnknownResolution, UnknownResolutionCommand, UnknownResolutionConflict, UnknownResolutionIntent, digestCanonicalBatch, settlementFailureFromRecord, submissionAbortRecordId } from "@effect-agent/session";
-import { Clock, Context, Crypto, DateTime, Duration, Effect, Layer, Option, Ref, Schema, Stream } from "effect";
+import { Clock, Context, Crypto, DateTime, Duration, Effect, Layer, Option, Predicate, Ref, Schema, Stream } from "effect";
 import { SqliteClient, SqliteMigrator } from "@effect/sql-sqlite-do";
 import * as SqlClient from "effect/unstable/sql/SqlClient";
 import { BrowserCrypto } from "@effect/platform-browser";
@@ -394,6 +394,7 @@ const MAX_RECORDS_PER_CONVERSATION = 65536;
 const MAX_IDENTIFIER_LENGTH$1 = 1024;
 /** Durable Object SQL storage allows at most 100 bound parameters per statement. */
 const MAX_BOUND_PARAMETERS = 100;
+const isSqlError = Schema.is(SqlError);
 const storedTextBytes = (value) => new TextEncoder().encode(value).byteLength;
 const chunked = (values, size) => {
 	const chunks = [];
@@ -587,7 +588,7 @@ const makeJournal = (sql, failpoint, maxStoredValueBytes) => {
 	* nested transactions, so new journal operations must not wrap this helper inside another
 	* transaction.
 	*/
-	const withWriteTransaction = (operation) => (effect) => sql.withTransaction(effect).pipe(Effect.mapError((error) => error instanceof SqlError ? storageError(operation)(error) : error), Effect.withSpan("DoJournal.withWriteTransaction", { attributes: { operation } }));
+	const withWriteTransaction = (operation) => (effect) => sql.withTransaction(effect).pipe(Effect.mapError((error) => isSqlError(error) ? storageError(operation)(error) : error), Effect.withSpan("DoJournal.withWriteTransaction", { attributes: { operation } }));
 	const materialize = Effect.fn("DoJournal.materialize")(function* (conversationId, createdAt, emptyTailDigest, producerEpoch) {
 		if (conversationId.length > MAX_IDENTIFIER_LENGTH$1) return yield* DoStorageError.make({
 			operation: "materialize conversation",
@@ -1119,6 +1120,9 @@ const OffsetText = Schema.String.check(Schema.isMaxLength(4 * 1024));
 const DO_OFFSET_PREFIX = "effect-agent-do@1:";
 const ZERO_CANONICAL_SEQUENCE = Schema.decodeSync(CanonicalSequence)(0);
 const isDigest = Schema.is(Digest);
+const isDoFenceRejected = Schema.is(DoFenceRejected);
+const isDoAppendConflict = Schema.is(DoAppendConflict);
+const isDoCheckpointConflict = Schema.is(DoCheckpointConflict);
 const storeError = (operation, error) => ConversationStoreError.make({
 	cause: error,
 	operation,
@@ -1347,8 +1351,8 @@ const makeServices$1 = Effect.fn("DoConversationStore.makeServices")(function* (
 		}).pipe(Effect.mapError((error) => schemaStoreError("encode canonical append", error)));
 		yield* hitFailpoint("append:before");
 		const result = yield* journal.append(rawRequest).pipe(Effect.mapError((error) => {
-			if (error instanceof DoFenceRejected) return mapFence(validated.conversationId, error);
-			if (error instanceof DoAppendConflict) return error.actualTailSequence !== void 0 && isDigest(error.actualTailDigest) ? AppendConflict.make({
+			if (isDoFenceRejected(error)) return mapFence(validated.conversationId, error);
+			if (isDoAppendConflict(error)) return error.actualTailSequence !== void 0 && isDigest(error.actualTailDigest) ? AppendConflict.make({
 				conversationId: validated.conversationId,
 				batchId: validated.batch.batchId,
 				reason: error.reason,
@@ -1449,7 +1453,7 @@ const makeServices$1 = Effect.fn("DoConversationStore.makeServices")(function* (
 			checkpointJson
 		});
 		yield* hitFailpoint("save-checkpoint:before");
-		yield* journal.saveCheckpoint(raw).pipe(Effect.mapError((error) => error instanceof DoCheckpointConflict ? CheckpointRejected.make({
+		yield* journal.saveCheckpoint(raw).pipe(Effect.mapError((error) => isDoCheckpointConflict(error) ? CheckpointRejected.make({
 			conversationId: validated.checkpoint.conversationId,
 			reason: "digest-mismatch"
 		}) : storeError("save checkpoint", error)));
@@ -1511,10 +1515,7 @@ const storageFailpointLayer = (options) => options.failpoint === void 0 ? DoStor
 * port; point both at the SAME `ctx.storage` so claims fence the same producer epochs
 * (ADR-0011 D7's "same file" rule, transposed to one object's private database).
 */
-const layer = (options) => {
-	const sqlLayer = SqliteClient.layer({ storage: options.storage });
-	return conversationStoreLayer.pipe(Layer.provide(Layer.mergeAll(storageConfigLayer(options), storageFailpointLayer(options), sqlLayer, BrowserCrypto.layer)));
-};
+const layer = (options) => Layer.unwrap(Effect.map(DoStorageConfig, (config) => conversationStoreLayer.pipe(Layer.provide(Layer.mergeAll(Layer.succeed(DoStorageConfig)(config), storageFailpointLayer(options), SqliteClient.layer({ storage: options.storage }), BrowserCrypto.layer))))).pipe(Layer.provide(storageConfigLayer(options)));
 /** Create an adapter-owned resumable observation offset for a known canonical sequence. */
 const observationOffsetAt = makeOffset;
 //#endregion
@@ -1528,6 +1529,11 @@ const BoundedIdentifier = Schema.NonEmptyString.check(Schema.isMaxLength(1024));
 const BoundedTimestamp = Schema.NonEmptyString.check(Schema.isMaxLength(128));
 const SCAN_PAGE_SIZE = 256;
 const EPOCH_ZERO = Schema.decodeSync(ProducerEpoch)(0);
+const RESUME_IMMEDIATELY = "resume-immediately";
+const SUSPENDED = "suspended";
+const NOT_WAITING = "not-waiting";
+const STILL_WAITING = "still-waiting";
+const WOKEN = "woken";
 const MAX_IDENTIFIER_LENGTH = 1024;
 var SubmissionRow = class extends Schema.Class("SubmissionRow")({
 	submission_id: BoundedIdentifier,
@@ -1687,6 +1693,9 @@ const decodeUnknownResolutionIntent = Schema.decodeUnknownEffect(UnknownResoluti
 const decodeParentLinkage = Schema.decodeUnknownEffect(ParentLinkage);
 const decodeChildReservationSnapshotUnknown = Schema.decodeUnknownEffect(ChildBudgetReservationSnapshot);
 const decodeChildAttachmentSnapshot = Schema.decodeUnknownEffect(ChildAttachmentSnapshot);
+const equivalentPersistedJson = Schema.toEquivalence(PersistedJson);
+const equivalentUnknownResolution = Schema.toEquivalence(UnknownResolution);
+const isDoStorageError = Schema.is(DoStorageError);
 /** Wrap an adapter-internal failure into the port's LedgerError without erasing its tag. */
 const internalFailure = (operation) => (error) => LedgerError.make({
 	operation,
@@ -1720,7 +1729,7 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
 	* ownership-token and epoch checks are atomic with their writes (DUR-006). Transaction
 	* failures surface as LedgerError carrying the typed `DoStorageError` as cause.
 	*/
-	const inWriteTransaction = (operation, effect) => journal.withWriteTransaction(operation)(effect).pipe(Effect.mapError((error) => error instanceof DoStorageError ? internalFailure(operation)(error) : error));
+	const inWriteTransaction = (operation, effect) => journal.withWriteTransaction(operation)(effect).pipe(Effect.mapError((error) => isDoStorageError(error) ? internalFailure(operation)(error) : error));
 	const mintUuid = (operation) => crypto.randomUUIDv7.pipe(Effect.mapError((error) => internalFailure(operation)(error)));
 	const currentInstant = Effect.map(Clock.currentTimeMillis, (millis) => ({
 		millis,
@@ -2607,7 +2616,7 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
 			if (validated.reason._tag === "ApprovalPending") {
 				const decisions = yield* readApprovalDecisions(operation, validated.submissionId);
 				const decided = new Set(decisions.map((row) => row.tool_call_id));
-				if (validated.reason.toolCallIds.every((toolCallId) => decided.has(toolCallId))) return "resume-immediately";
+				if (validated.reason.toolCallIds.every((toolCallId) => decided.has(toolCallId))) return RESUME_IMMEDIATELY;
 			} else {
 				const markers = yield* readChildSettlementMarkers(operation, validated.submissionId);
 				const markerChildren = new Set(markers.map((row) => row.child_submission_id));
@@ -2616,7 +2625,7 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
 					allSettled = false;
 					break;
 				}
-				if (allSettled) return "resume-immediately";
+				if (allSettled) return RESUME_IMMEDIATELY;
 			}
 			const now = yield* currentInstant;
 			yield* sql`
@@ -2631,7 +2640,7 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
             DELETE FROM effect_agent_submission_ownership
             WHERE submission_id = ${validated.submissionId}
           `.pipe(Effect.mapError(sqlFailure(operation)));
-			return "suspended";
+			return SUSPENDED;
 		}));
 		yield* hitFailpoint("ledger:suspend:after", operation);
 		return outcome;
@@ -2759,12 +2768,13 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
 				});
 			}
 			const existing = (yield* readUnknownResolutions(operation, validated.submissionId)).find((row) => row.tool_call_id === validated.toolCallId);
-			if (existing !== void 0 && existing.resolution_json !== resolutionJson) return yield* UnknownResolutionConflict.make({
+			const existingIntent = existing === void 0 ? void 0 : yield* unknownResolutionIntentFromRow(operation, existing);
+			if (existingIntent !== void 0 && !equivalentUnknownResolution(existingIntent.resolution, validated.resolution)) return yield* UnknownResolutionConflict.make({
 				submissionId: validated.submissionId,
 				toolCallId: validated.toolCallId
 			});
 			let resolved;
-			if (existing !== void 0) resolved = yield* unknownResolutionIntentFromRow(operation, existing);
+			if (existingIntent !== void 0) resolved = existingIntent;
 			else {
 				const now = yield* currentInstant;
 				yield* sql`
@@ -2839,13 +2849,13 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
           )
           ON CONFLICT (parent_submission_id, child_submission_id) DO NOTHING
         `.pipe(Effect.mapError(sqlFailure(operation)));
-			if (parent.state !== "suspended" || parent.suspended_reason_json === null) return "not-waiting";
+			if (parent.state !== "suspended" || parent.suspended_reason_json === null) return NOT_WAITING;
 			const reason = yield* Schema.decodeEffect(Schema.fromJsonString(SuspensionReason))(parent.suspended_reason_json).pipe(Effect.mapError((error) => corruptionFailure(operation, "effect_agent_submissions", parent.submission_id, error.message)));
-			if (reason._tag !== "WaitingForChild") return "not-waiting";
-			if (!reason.children.some((entry) => entry.childSubmissionId === validated.childSubmissionId)) return "not-waiting";
+			if (reason._tag !== "WaitingForChild") return NOT_WAITING;
+			if (!reason.children.some((entry) => entry.childSubmissionId === validated.childSubmissionId)) return NOT_WAITING;
 			const markers = yield* readChildSettlementMarkers(operation, validated.parentSubmissionId);
 			const markerChildren = new Set(markers.map((row) => row.child_submission_id));
-			for (const entry of reason.children) if (!(yield* childProvablySettled(operation, markerChildren, entry.childSubmissionId))) return "still-waiting";
+			for (const entry of reason.children) if (!(yield* childProvablySettled(operation, markerChildren, entry.childSubmissionId))) return STILL_WAITING;
 			yield* sql`
           UPDATE effect_agent_submissions
           SET
@@ -2854,7 +2864,7 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
             suspended_at = NULL
           WHERE submission_id = ${validated.parentSubmissionId}
         `.pipe(Effect.mapError(sqlFailure(operation)));
-			return "woken";
+			return WOKEN;
 		}));
 		yield* hitFailpoint("ledger:child-settled:after", operation);
 		return outcome;
@@ -2867,13 +2877,14 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
 		const reserved = yield* inWriteTransaction(operation, Effect.gen(function* () {
 			const existing = yield* readChildReservation(operation, validated.reservationId);
 			if (Option.isSome(existing)) {
-				if (!(existing.value.parent_submission_id === validated.parentSubmissionId && existing.value.parent_tool_call_id === validated.parentToolCallId && existing.value.allocation_digest === validated.allocationDigest && existing.value.allocation_json === allocationJson)) return yield* ChildReservationConflict.make({
+				const existingSnapshot = yield* childReservationSnapshotFromRow(operation, existing.value);
+				if (!(existing.value.parent_submission_id === validated.parentSubmissionId && existing.value.parent_tool_call_id === validated.parentToolCallId && existing.value.allocation_digest === validated.allocationDigest && equivalentPersistedJson(existingSnapshot.allocation, validated.allocation))) return yield* ChildReservationConflict.make({
 					reservationId: validated.reservationId,
 					status: existing.value.status,
 					message: "A reservation with this identity exists with a different parent Tool Call or allocation."
 				});
 				return ReservedChildBudget.make({
-					reservation: yield* childReservationSnapshotFromRow(operation, existing.value),
+					reservation: existingSnapshot,
 					replayed: true
 				});
 			}
@@ -2964,7 +2975,8 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
 				message: `Unknown child reservation ${validated.reservationId}.`
 			});
 			if (existing.value.status !== "reserved") {
-				if (existing.value.accounting_json === accountingJson) return yield* childReservationSnapshotFromRow(operation, existing.value);
+				const existingSnapshot = yield* childReservationSnapshotFromRow(operation, existing.value);
+				if (existingSnapshot.accounting !== void 0 && equivalentPersistedJson(existingSnapshot.accounting, validated.accounting)) return existingSnapshot;
 				return yield* ChildReservationConflict.make({
 					reservationId: validated.reservationId,
 					status: existing.value.status,
@@ -3201,7 +3213,7 @@ const submissionLedgerLayer = Layer.effectContext(makeServices());
 * A composition-root convenience Layer for the durable Submission Ledger. Point it at the
 * same `ctx.storage` as the ConversationStore so claims fence the same producer epochs.
 */
-const ledgerLayer = (options) => submissionLedgerLayer.pipe(Layer.provide(Layer.mergeAll(storageConfigLayer(options), storageFailpointLayer(options), SqliteClient.layer({ storage: options.storage }), BrowserCrypto.layer)));
+const ledgerLayer = (options) => Layer.unwrap(Effect.map(DoStorageConfig, (config) => submissionLedgerLayer.pipe(Layer.provide(Layer.mergeAll(Layer.succeed(DoStorageConfig)(config), storageFailpointLayer(options), SqliteClient.layer({ storage: options.storage }), BrowserCrypto.layer))))).pipe(Layer.provide(storageConfigLayer(options)));
 //#endregion
 //#region src/port-protocol.ts
 /**
@@ -3357,20 +3369,32 @@ var PortTransportError = class extends Schema.TaggedError()("PortTransportError"
 	retryable: Schema.optionalKey(Schema.Boolean),
 	cause: Schema.optionalKey(Schema.Defect())
 }) {};
+const safeTransportDiagnostic = (cause) => {
+	try {
+		const message = cause instanceof Error ? cause.message : cause;
+		return boundPortDiagnostic(typeof message === "string" ? message : String(message));
+	} catch {
+		return "[unavailable transport diagnostic]";
+	}
+};
+const transportRetryableSignal = (cause) => {
+	if (!Predicate.isObjectKeyword(cause)) return void 0;
+	try {
+		const signal = Reflect.get(cause, "retryable");
+		return typeof signal === "boolean" ? signal : void 0;
+	} catch {
+		return;
+	}
+};
 /**
 * Build a `PortTransportError` from an arbitrary thrown transport cause, preserving the
 * platform stub's own `retryable` signal when present.
 */
 const portTransportFailure = (target, cause) => {
-	const message = cause instanceof Error ? cause.message : String(cause);
-	let retryable;
-	if (typeof cause === "object" && cause !== null && "retryable" in cause) {
-		const signal = cause.retryable;
-		if (typeof signal === "boolean") retryable = signal;
-	}
+	const retryable = transportRetryableSignal(cause);
 	return PortTransportError.make({
 		target,
-		message: boundPortDiagnostic(message),
+		message: safeTransportDiagnostic(cause),
 		...retryable === void 0 ? {} : { retryable },
 		cause
 	});
@@ -3409,13 +3433,13 @@ const routableSubmissionTarget = (localConversationId) => Effect.fn("DoPortRouti
 		conversationId
 	})), Effect.orElseSucceed(() => LOCAL));
 });
-const isResultTag = (tag) => (result) => result._tag === tag;
-const isAdmitConflict = (failure) => failure._tag === "AdmissionConflict";
-const isAbortConflict = (failure) => failure._tag === "SettlementConflict" || failure._tag === "JoinedToHost";
-const noExtraFailure = (_failure) => false;
-const isFenceRejected = (failure) => failure._tag === "FenceRejected";
-const isAppendFailure = (failure) => failure._tag === "ConversationNotMaterialized" || failure._tag === "AppendConflict" || failure._tag === "FenceRejected";
-const isNotMaterialized = (failure) => failure._tag === "ConversationNotMaterialized";
+const NoAdditionalPortFailure = Schema.Never;
+const AbortPortFailure = Schema.Union([SettlementConflict, JoinedToHost]);
+const AppendPortFailure = Schema.Union([
+	ConversationNotMaterialized,
+	AppendConflict,
+	FenceRejected
+]);
 /**
 * The fail-fast refusal for any foreign operation OUTSIDE the closed route-capable subset
 * (plan §1.3): honesty over accidental distribution.
@@ -3448,27 +3472,31 @@ const makeRoutedLedgerServices = Effect.fn("DoPortRouting.makeRoutedLedgerServic
 	* any failure outside the operation's declared surface — including protocol anomalies — is
 	* folded into a `LedgerError` naming the anomaly instead of being erased or re-thrown raw.
 	*/
-	const foreignLedgerCall = (operation, target, call, resultTag, isExpectedFailure) => transportCall(target, call).pipe(Effect.mapError(routeFailure(operation, target)), Effect.flatMap((response) => {
-		if (response._tag === "PortFailed") {
-			const failure = response.failure;
-			if (isExpectedFailure(failure)) return Effect.fail(failure);
-			if (failure._tag === "LedgerError") return Effect.fail(failure);
-			return Effect.fail(LedgerError.make({
+	const foreignLedgerCall = (operation, target, call, resultSchema, failureSchema) => {
+		const isExpectedResult = Schema.is(resultSchema);
+		const isExpectedFailure = Schema.is(failureSchema);
+		return transportCall(target, call).pipe(Effect.mapError(routeFailure(operation, target)), Effect.flatMap((response) => {
+			if (response._tag === "PortFailed") {
+				const failure = response.failure;
+				if (isExpectedFailure(failure)) return Effect.fail(failure);
+				if (failure._tag === "LedgerError") return Effect.fail(failure);
+				return Effect.fail(LedgerError.make({
+					operation,
+					message: boundPortDiagnostic(`The Conversation Object owning ${target} answered ${operation} with the out-of-contract failure ${failure._tag}: ${failure.message}`),
+					cause: failure
+				}));
+			}
+			const result = response.result;
+			if (!isExpectedResult(result)) return Effect.fail(LedgerError.make({
 				operation,
-				message: boundPortDiagnostic(`The Conversation Object owning ${target} answered ${operation} with the out-of-contract failure ${failure._tag}: ${failure.message}`),
-				cause: failure
+				message: `The Conversation Object owning ${target} answered ${operation} with the mismatched result ${result._tag}.`
 			}));
-		}
-		const result = response.result;
-		if (!isResultTag(resultTag)(result)) return Effect.fail(LedgerError.make({
+			return Effect.succeed(result);
+		}), Effect.withSpan("DoPortRouting.foreignLedgerCall", { attributes: {
 			operation,
-			message: `The Conversation Object owning ${target} answered ${operation} with the mismatched result ${result._tag}; expected ${resultTag}.`
-		}));
-		return Effect.succeed(result);
-	}), Effect.withSpan("DoPortRouting.foreignLedgerCall", { attributes: {
-		operation,
-		target
-	} }));
+			target
+		} }));
+	};
 	/**
 	* Routed `resolveAdmission` — where the S2 tri-state becomes real (plan §1.3): when the
 	* owning Object cannot be reached, or its answer cannot be understood, the routed adapter
@@ -3488,7 +3516,7 @@ const makeRoutedLedgerServices = Effect.fn("DoPortRouting.makeRoutedLedgerServic
 		PortTransportError: (error) => Effect.succeed(AdmissionIndeterminate.make({ reason: boundPortDiagnostic(`The Conversation Object owning ${target} is unreachable: ${error.message}`) })),
 		PortProtocolError: (error) => Effect.succeed(AdmissionIndeterminate.make({ reason: boundPortDiagnostic(`The answer of the Conversation Object owning ${target} could not be understood: ${error.message}`) }))
 	}), Effect.withSpan("DoPortRouting.resolveForeignAdmission", { attributes: { target } }));
-	const foreignLookupById = (operation, target, submissionId) => foreignLedgerCall(operation, target, LedgerLookupCall.make({ request: SubmissionLookupById.make({ submissionId }) }), "LedgerLookupResult", noExtraFailure).pipe(Effect.map((result) => result.submission === void 0 ? Option.none() : Option.some(result.submission)));
+	const foreignLookupById = (operation, target, submissionId) => foreignLedgerCall(operation, target, LedgerLookupCall.make({ request: SubmissionLookupById.make({ submissionId }) }), LedgerLookupResult, NoAdditionalPortFailure).pipe(Effect.map((result) => result.submission === void 0 ? Option.none() : Option.some(result.submission)));
 	/**
 	* Enrich a LOCAL parent's recovery snapshot with the lane state of attached children whose
 	* rows live in other Durable Objects (plan §1.3): markers first (the local facet already
@@ -3529,12 +3557,12 @@ const makeRoutedLedgerServices = Effect.fn("DoPortRouting.makeRoutedLedgerServic
 	});
 	const routed = SubmissionLedger.of({
 		capabilities: local.capabilities,
-		admit: (request) => request.conversationId === options.localConversationId ? local.admit(request) : foreignLedgerCall("ledger admit", request.conversationId, LedgerAdmitCall.make({ request }), "LedgerAdmitResult", isAdmitConflict).pipe(Effect.map((reply) => reply.result)),
-		markReady: (request) => submissionTarget("ledger mark ready", request.submissionId).pipe(Effect.flatMap((target) => target._tag === "local" ? local.markReady(request) : foreignLedgerCall("ledger mark ready", target.conversationId, LedgerMarkReadyCall.make({ request }), "LedgerMarkReadyResult", noExtraFailure).pipe(Effect.asVoid))),
-		lookup: (request) => request._tag === "SubmissionLookupById" ? submissionTarget("ledger lookup", request.submissionId).pipe(Effect.flatMap((target) => target._tag === "local" ? local.lookup(request) : foreignLookupById("ledger lookup", target.conversationId, request.submissionId))) : request.conversationId === options.localConversationId ? local.lookup(request) : foreignLedgerCall("ledger lookup", request.conversationId, LedgerLookupCall.make({ request }), "LedgerLookupResult", noExtraFailure).pipe(Effect.map((result) => result.submission === void 0 ? Option.none() : Option.some(result.submission))),
+		admit: (request) => request.conversationId === options.localConversationId ? local.admit(request) : foreignLedgerCall("ledger admit", request.conversationId, LedgerAdmitCall.make({ request }), LedgerAdmitResult, AdmissionConflict).pipe(Effect.map((reply) => reply.result)),
+		markReady: (request) => submissionTarget("ledger mark ready", request.submissionId).pipe(Effect.flatMap((target) => target._tag === "local" ? local.markReady(request) : foreignLedgerCall("ledger mark ready", target.conversationId, LedgerMarkReadyCall.make({ request }), LedgerMarkReadyResult, NoAdditionalPortFailure).pipe(Effect.asVoid))),
+		lookup: (request) => request._tag === "SubmissionLookupById" ? submissionTarget("ledger lookup", request.submissionId).pipe(Effect.flatMap((target) => target._tag === "local" ? local.lookup(request) : foreignLookupById("ledger lookup", target.conversationId, request.submissionId))) : request.conversationId === options.localConversationId ? local.lookup(request) : foreignLedgerCall("ledger lookup", request.conversationId, LedgerLookupCall.make({ request }), LedgerLookupResult, NoAdditionalPortFailure).pipe(Effect.map((result) => result.submission === void 0 ? Option.none() : Option.some(result.submission))),
 		resolveAdmission: (request) => request.conversationId === options.localConversationId ? local.resolveAdmission(request) : resolveForeignAdmission(request.conversationId, request),
-		requestAbort: (request) => submissionTarget("ledger request abort", request.submissionId).pipe(Effect.flatMap((target) => target._tag === "local" ? local.requestAbort(request) : foreignLedgerCall("ledger request abort", target.conversationId, LedgerRequestAbortCall.make({ request }), "LedgerRequestAbortResult", isAbortConflict).pipe(Effect.map((reply) => reply.intent)))),
-		recordChildSettled: (request) => submissionTarget("ledger record child settled", request.parentSubmissionId).pipe(Effect.flatMap((target) => target._tag === "local" ? local.recordChildSettled(request) : foreignLedgerCall("ledger record child settled", target.conversationId, LedgerRecordChildSettledCall.make({ request }), "LedgerRecordChildSettledResult", noExtraFailure).pipe(Effect.map((reply) => reply.outcome)))),
+		requestAbort: (request) => submissionTarget("ledger request abort", request.submissionId).pipe(Effect.flatMap((target) => target._tag === "local" ? local.requestAbort(request) : foreignLedgerCall("ledger request abort", target.conversationId, LedgerRequestAbortCall.make({ request }), LedgerRequestAbortResult, AbortPortFailure).pipe(Effect.map((reply) => reply.intent)))),
+		recordChildSettled: (request) => submissionTarget("ledger record child settled", request.parentSubmissionId).pipe(Effect.flatMap((target) => target._tag === "local" ? local.recordChildSettled(request) : foreignLedgerCall("ledger record child settled", target.conversationId, LedgerRecordChildSettledCall.make({ request }), LedgerRecordChildSettledResult, NoAdditionalPortFailure).pipe(Effect.map((reply) => reply.outcome)))),
 		claim: (request) => request.conversationId === options.localConversationId ? local.claim(request) : Effect.fail(crossConversationLedgerError("ledger claim", request.conversationId)),
 		claimJoining: (request) => request.conversationId === options.localConversationId ? local.claimJoining(request) : Effect.fail(crossConversationLedgerError("ledger claim joining", request.conversationId)),
 		renewOwnership: (request) => submissionTarget("ledger renew ownership", request.submissionId).pipe(Effect.flatMap((target) => target._tag === "local" ? local.renewOwnership(request) : Effect.fail(crossConversationLedgerError("ledger renew ownership", target.conversationId)))),
@@ -3567,33 +3595,37 @@ const makeRoutedStoreServices = Effect.fn("DoPortRouting.makeRoutedStoreServices
 		cause: error
 	});
 	/** The store twin of `foreignLedgerCall` with `ConversationStoreError` as the base error. */
-	const foreignStoreCall = (operation, target, call, resultTag, isExpectedFailure) => transportCall(target, call).pipe(Effect.mapError(routeFailure(operation, target)), Effect.flatMap((response) => {
-		if (response._tag === "PortFailed") {
-			const failure = response.failure;
-			if (isExpectedFailure(failure)) return Effect.fail(failure);
-			if (failure._tag === "ConversationStoreError") return Effect.fail(failure);
-			return Effect.fail(ConversationStoreError.make({
+	const foreignStoreCall = (operation, target, call, resultSchema, failureSchema) => {
+		const isExpectedResult = Schema.is(resultSchema);
+		const isExpectedFailure = Schema.is(failureSchema);
+		return transportCall(target, call).pipe(Effect.mapError(routeFailure(operation, target)), Effect.flatMap((response) => {
+			if (response._tag === "PortFailed") {
+				const failure = response.failure;
+				if (isExpectedFailure(failure)) return Effect.fail(failure);
+				if (failure._tag === "ConversationStoreError") return Effect.fail(failure);
+				return Effect.fail(ConversationStoreError.make({
+					operation,
+					message: boundPortDiagnostic(`The Conversation Object owning ${target} answered ${operation} with the out-of-contract failure ${failure._tag}: ${failure.message}`),
+					cause: failure
+				}));
+			}
+			const result = response.result;
+			if (!isExpectedResult(result)) return Effect.fail(ConversationStoreError.make({
 				operation,
-				message: boundPortDiagnostic(`The Conversation Object owning ${target} answered ${operation} with the out-of-contract failure ${failure._tag}: ${failure.message}`),
-				cause: failure
+				message: `The Conversation Object owning ${target} answered ${operation} with the mismatched result ${result._tag}.`
 			}));
-		}
-		const result = response.result;
-		if (!isResultTag(resultTag)(result)) return Effect.fail(ConversationStoreError.make({
+			return Effect.succeed(result);
+		}), Effect.withSpan("DoPortRouting.foreignStoreCall", { attributes: {
 			operation,
-			message: `The Conversation Object owning ${target} answered ${operation} with the mismatched result ${result._tag}; expected ${resultTag}.`
-		}));
-		return Effect.succeed(result);
-	}), Effect.withSpan("DoPortRouting.foreignStoreCall", { attributes: {
-		operation,
-		target
-	} }));
+			target
+		} }));
+	};
 	const routed = ConversationStore.of({
-		materialize: (request) => request.conversationId === options.localConversationId ? local.materialize(request) : foreignStoreCall("conversation materialize", request.conversationId, StoreMaterializeCall.make({ request }), "StoreMaterializeResult", isFenceRejected).pipe(Effect.asVoid),
-		append: (request) => request.conversationId === options.localConversationId ? local.append(request) : foreignStoreCall("conversation append", request.conversationId, StoreAppendCall.make({ request }), "StoreAppendResult", isAppendFailure).pipe(Effect.map((reply) => reply.result)),
-		read: (request) => request.conversationId === options.localConversationId ? local.read(request) : Stream.unwrap(foreignStoreCall("conversation read", request.conversationId, StoreReadPageCall.make({ request }), "StoreReadPageResult", isNotMaterialized).pipe(Effect.map((reply) => Stream.fromIterable(reply.records)))),
-		inspectTail: (request) => request.conversationId === options.localConversationId ? local.inspectTail(request) : foreignStoreCall("conversation inspect tail", request.conversationId, StoreInspectTailCall.make({ request }), "StoreInspectTailResult", isNotMaterialized).pipe(Effect.map((reply) => reply.tail)),
-		export: (request) => request.conversationId === options.localConversationId ? local.export(request) : foreignStoreCall("conversation export", request.conversationId, StoreExportCall.make({ request }), "StoreExportResult", isNotMaterialized).pipe(Effect.map((reply) => reply.export)),
+		materialize: (request) => request.conversationId === options.localConversationId ? local.materialize(request) : foreignStoreCall("conversation materialize", request.conversationId, StoreMaterializeCall.make({ request }), StoreMaterializeResult, FenceRejected).pipe(Effect.asVoid),
+		append: (request) => request.conversationId === options.localConversationId ? local.append(request) : foreignStoreCall("conversation append", request.conversationId, StoreAppendCall.make({ request }), StoreAppendResult, AppendPortFailure).pipe(Effect.map((reply) => reply.result)),
+		read: (request) => request.conversationId === options.localConversationId ? local.read(request) : Stream.unwrap(foreignStoreCall("conversation read", request.conversationId, StoreReadPageCall.make({ request }), StoreReadPageResult, ConversationNotMaterialized).pipe(Effect.map((reply) => Stream.fromIterable(reply.records)))),
+		inspectTail: (request) => request.conversationId === options.localConversationId ? local.inspectTail(request) : foreignStoreCall("conversation inspect tail", request.conversationId, StoreInspectTailCall.make({ request }), StoreInspectTailResult, ConversationNotMaterialized).pipe(Effect.map((reply) => reply.tail)),
+		export: (request) => request.conversationId === options.localConversationId ? local.export(request) : foreignStoreCall("conversation export", request.conversationId, StoreExportCall.make({ request }), StoreExportResult, ConversationNotMaterialized).pipe(Effect.map((reply) => reply.export)),
 		observe: (request) => request.conversationId === options.localConversationId ? local.observe(request) : Stream.unwrap(Effect.fail(crossConversationStoreError("conversation observe", request.conversationId))),
 		saveCheckpoint: (request) => request.checkpoint.conversationId === options.localConversationId ? local.saveCheckpoint(request) : Effect.fail(crossConversationStoreError("conversation save checkpoint", request.checkpoint.conversationId)),
 		loadCheckpoint: (request) => request.conversationId === options.localConversationId ? local.loadCheckpoint(request) : Effect.fail(crossConversationStoreError("conversation load checkpoint", request.conversationId))