@yielded/agent-storage-cloudflare 0.1.0-beta.166 → 0.1.0-beta.168

package/src/internal/do-journal.ts

@@ -1,34 +1,33 @@
-import { SqliteMigrator } from "@effect/sql-sqlite-do";
+import {
+  makeCanonicalStorage,
+  recordBatchId,
+} from "@yielded/agent-storage-sql/sql-canonical-storage";
+import type { RawAppendRequest } from "@yielded/agent-storage-sql/sql-journal";
+import { makeSqlExecutions } from "@yielded/agent-storage-sql/sql-journal";
 import {
   makeSqlLifecyclePublication,
   type SqlLifecycleRetainMany,
   SqlLifecycleSource,
   SqlLifecycleRetainer,
 } from "@yielded/agent-storage-sql/sql-lifecycle-publication";
-import { createMessageDeliveryPendingIndex } from "@yielded/agent-storage-sql/sql-message-delivery-store";
 import { SqlStorageProgress } from "@yielded/agent-storage-sql/sql-storage-progress";
-import { checkV2ThreadLayout } from "@yielded/agent-storage-sql/sql-storage-v2-upgrade";
 import {
-  createNativeReadIndexes,
-  seedNativeReadIndexes,
-  indexCanonicalRecord,
-  canonicalRecordOutstanding,
-} from "@yielded/agent-storage-sql/sql-thread-native-reads";
-import { EMPTY_TAIL_DIGEST } from "@yielded/agent/digest";
+  canonicalRecordJson,
+  makeSqlThreadArchiveRange,
+} from "@yielded/agent-storage-sql/sql-thread-archive-range";
+import { makeProgressAppendValidation } from "@yielded/agent-storage-sql/sql-thread-native-reads";
+import { makeSqlThreadWork } from "@yielded/agent-storage-sql/sql-thread-work";
 import { ThreadId } from "@yielded/agent/identifiers";
 import {
   LifecyclePublicationFact,
   LifecyclePublicationError,
 } from "@yielded/agent/lifecycle-publication";
-import { CanonicalRecord, CanonicalSequence, ProducerEpoch } from "@yielded/agent/records";
+import { CanonicalRecord, CanonicalSequence } from "@yielded/agent/records";
 import { SqlStorageOwner } from "@yielded/agent/sql-memory-store";
 import {
-  MAX_THREAD_EXPORT_RECORDS,
-  CheckpointRejected,
-  FenceRejected,
-  ThreadNotMaterialized,
+  type AppendConflict,
   ThreadStoreDiagnostic,
-  type SaveRecoveryCheckpointRequest,
+  ThreadStoreError,
 } from "@yielded/agent/thread-store";
 import { Cause, Clock, Effect, Option, Schema, Stream } from "effect";
 import * as SqlClient from "effect/sql/SqlClient";
@@ -38,22 +37,13 @@ import {
   type DoStorageFailpointError,
   DoAppendConflict,
   DoCheckpointConflict,
-  DoFenceRejected,
-  DoStorageCompatibilityError,
   DoStorageCorruptionError,
   DoStorageError,
   DoValueBoundExceeded,
   type DoStorageFailpointLocation,
 } from "../DoStorageError.ts";
-import { createMessageDeliveryTables } from "./message-delivery-schema.ts";
-import {
-  CurrentDoStorageVersion,
-  createNonterminalIndex,
-  createWorkerStops,
-  doMigrations,
-} from "./migrations.ts";
+import { ensureDoStorageLayout } from "./migrations.ts";
 import { ownedState, ownedRows, type OwnedState } from "./owned-state.ts";
-import { createRecoveryCheckpointTable } from "./recovery-checkpoint-schema.ts";
 import {
   isAppendContention,
   annotateStorageError,
@@ -69,8 +59,6 @@ import {
  */
 const BoundedStoredText = Schema.String.check(Schema.isMaxLength(2_000_000));
 const BoundedIdentifier = Schema.NonEmptyString.check(Schema.isMaxLength(1024));
-const MAX_RECORDS_PER_THREAD = MAX_THREAD_EXPORT_RECORDS;
-const ZERO_SEQUENCE = Schema.decodeSync(CanonicalSequence)(0);
 const MAX_IDENTIFIER_LENGTH = 1_024;
 const MAX_READ_PAGE_JSON_BYTES = 4 * 1024 * 1024;
 // A shared isolate budget permits multi-page hydration without multiplying its
@@ -93,19 +81,9 @@ const chunked = <A>(values: ReadonlyArray<A>, size: number): Array<ReadonlyArray
   return chunks;
 };
 
-class DoMetaRow extends Schema.Class<DoMetaRow>("DoMetaRow")({
-  value: Schema.NonEmptyString.check(Schema.isMaxLength(128)),
-}) {}
-
-class DoNameRow extends Schema.Class<DoNameRow>("DoNameRow")({
-  name: BoundedIdentifier,
-}) {}
-
 class ThreadRow extends Schema.Class<ThreadRow>("ThreadRow")({
   thread_id: BoundedIdentifier,
-  created_at: Schema.NonEmptyString.check(Schema.isMaxLength(128)),
-  producer_epoch: ProducerEpoch,
-  tail_digest: BoundedStoredText,
+  created_at: Schema.NullOr(Schema.NonEmptyString.check(Schema.isMaxLength(128))),
   tail_sequence: CanonicalSequence,
 }) {}
 
@@ -116,20 +94,10 @@ const threadRows = ownedRows(
   "thread_id",
 );
 
-class BatchRow extends Schema.Class<BatchRow>("BatchRow")({
-  batch_digest: BoundedStoredText,
-  batch_id: BoundedIdentifier,
-  batch_json: BoundedStoredText,
-  thread_id: BoundedIdentifier,
-  first_sequence: CanonicalSequence,
-  last_sequence: CanonicalSequence,
-  tail_digest: BoundedStoredText,
-}) {}
-
 class RecordRow extends Schema.Class<RecordRow>("RecordRow")({
-  batch_id: BoundedIdentifier,
+  batch_id: Schema.fromJsonString(BoundedIdentifier),
   thread_id: BoundedIdentifier,
-  record_id: BoundedIdentifier,
+  record_id: Schema.fromJsonString(BoundedIdentifier),
   record_json: BoundedStoredText,
   sequence: CanonicalSequence,
 }) {}
@@ -173,12 +141,12 @@ const makeRecordCache = () => {
 
       return prefix;
     },
-    put: (row: RecordRow) => {
+    put: (row: RecordRow, capturedBytes?: number) => {
       const id = key(row.thread_id, row.sequence);
       const prior = records.get(id);
 
       if (prior?.row === row) return;
-      const size = storedTextBytes(row.record_json);
+      const size = capturedBytes ?? storedTextBytes(row.record_json);
 
       if (prior !== undefined) releaseRecord(prior);
 
@@ -214,17 +182,9 @@ type ReadPage = [typeof ReadPlanRow.Type, ...Array<typeof ReadPlanRow.Type>];
 class CheckpointRow extends Schema.Class<CheckpointRow>("CheckpointRow")({
   checkpoint_json: BoundedStoredText,
   thread_id: BoundedIdentifier,
-  tail_digest: BoundedStoredText,
   through_sequence: CanonicalSequence,
 }) {}
 
-const recoveryRows = ownedRows(
-  CheckpointRow,
-  "effect_agent_recovery_checkpoints",
-  (row) => row.thread_id,
-  "thread_id",
-);
-
 const LifecycleCursorRow = Schema.Struct({
   thread_id: BoundedIdentifier,
   through_sequence: CanonicalSequence,
@@ -239,26 +199,7 @@ const lifecycleCursorRows = ownedRows(
 
 const initializedLifecycleSources = new WeakSet<OwnedState>();
 
-export class RawRecord extends Schema.Class<RawRecord>(
-  "@effect-agent/storage-cloudflare/RawRecord",
-)({
-  recordId: BoundedIdentifier,
-  recordJson: BoundedStoredText,
-}) {}
-
-export class RawAppendRequest extends Schema.Class<RawAppendRequest>(
-  "@effect-agent/storage-cloudflare/RawAppendRequest",
-)({
-  batchDigest: BoundedStoredText,
-  batchId: BoundedIdentifier,
-  batchJson: BoundedStoredText,
-  threadId: BoundedIdentifier,
-  expectedTailDigest: BoundedStoredText,
-  expectedTailSequence: CanonicalSequence,
-  producerEpoch: ProducerEpoch,
-  records: Schema.NonEmptyArray(RawRecord).check(Schema.isMaxLength(256)),
-  tailDigest: BoundedStoredText,
-}) {}
+export type { RawAppendRequest } from "@yielded/agent-storage-sql/sql-journal";
 
 export class RawAppendResult extends Schema.Class<RawAppendResult>(
   "@effect-agent/storage-cloudflare/RawAppendResult",
@@ -266,7 +207,6 @@ export class RawAppendResult extends Schema.Class<RawAppendResult>(
   firstSequence: CanonicalSequence,
   lastSequence: CanonicalSequence,
   replayed: Schema.Boolean,
-  tailDigest: BoundedStoredText,
 }) {}
 
 export class RawReadRequest extends Schema.Class<RawReadRequest>(
@@ -282,20 +222,12 @@ export class RawCheckpoint extends Schema.Class<RawCheckpoint>(
 )({
   checkpointJson: BoundedStoredText,
   threadId: BoundedIdentifier,
-  tailDigest: BoundedStoredText,
   throughSequence: CanonicalSequence,
 }) {}
 
-export class RawThreadExport extends Schema.Class<RawThreadExport>(
-  "@effect-agent/storage-cloudflare/RawThreadExport",
-)({
-  thread: ThreadRow,
-  records: Schema.Array(RecordRow),
-}) {}
-
 type AppendError =
+  | ThreadStoreError
   | DoAppendConflict
-  | DoFenceRejected
   | DoStorageCorruptionError
   | DoStorageError
   | DoStorageFailpointError
@@ -328,673 +260,65 @@ const storageError =
     });
 
 /** Decode raw Durable Object SQLite rows against a Schema, reporting failures as typed corruption. */
-export const decodeRows = Effect.fn(
-  <A, I>(
-    schema: Schema.Codec<ReadonlyArray<A>, ReadonlyArray<I>>,
-    table: string,
-    rowKey: string,
-    rows: unknown,
-    decoder: string = table,
-  ): Effect.Effect<ReadonlyArray<A>, DoStorageCorruptionError> =>
-    Schema.decodeUnknownEffect(schema)(rows).pipe(
-      Effect.mapError((error) =>
-        DoStorageCorruptionError.make({
-          table,
-          rowKey,
-          message: "Stored rows do not satisfy the storage schema",
-          diagnostic: ThreadStoreDiagnostic.make({
-            causeTag: error._tag,
-            operation: "decode storage rows",
-            decoder,
-            issueTag: error.issue._tag,
-          }),
+export const decodeRows = <A, I>(
+  schema: Schema.Codec<ReadonlyArray<A>, ReadonlyArray<I>>,
+  table: string,
+  rowKey: string,
+  rows: unknown,
+  decoder: string = table,
+): Effect.Effect<ReadonlyArray<A>, DoStorageCorruptionError> =>
+  Schema.decodeUnknownEffect(schema)(rows).pipe(
+    Effect.mapError((error) =>
+      DoStorageCorruptionError.make({
+        table,
+        rowKey,
+        message: "Stored rows do not satisfy the storage schema",
+        diagnostic: ThreadStoreDiagnostic.make({
+          causeTag: error._tag,
+          operation: "decode storage rows",
+          decoder,
+          issueTag: error.issue._tag,
         }),
-      ),
-      Effect.tapError((error) =>
-        Effect.annotateCurrentSpan({
-          "storage.failure.operation": error.diagnostic?.operation,
-          "storage.failure.cause": error.diagnostic?.causeTag,
-          "storage.failure.decoder": decoder,
-          "storage.failure.issue": error.diagnostic?.issueTag,
-        }),
-      ),
+      }),
     ),
-);
+    Effect.tapError((error) =>
+      Effect.annotateCurrentSpan({
+        "storage.failure.operation": error.diagnostic?.operation,
+        "storage.failure.cause": error.diagnostic?.causeTag,
+        "storage.failure.decoder": decoder,
+        "storage.failure.issue": error.diagnostic?.issueTag,
+      }),
+    ),
+  );
 
 /** Decode exactly one raw row against a Schema, reporting failures as typed corruption. */
-export const decodeSingleRow = Effect.fn(
-  <A, I>(
-    schema: Schema.Codec<ReadonlyArray<A>, ReadonlyArray<I>>,
-    table: string,
-    rowKey: string,
-    rows: unknown,
-  ): Effect.Effect<A, DoStorageCorruptionError> =>
-    decodeRows(schema, table, rowKey, rows).pipe(
-      Effect.flatMap((decoded) =>
-        decoded.length === 1
-          ? Effect.succeed(decoded[0])
-          : Effect.fail(
-              DoStorageCorruptionError.make({
-                table,
-                rowKey,
-                message: `Expected exactly one row but found ${decoded.length}.`,
-              }),
-            ),
-      ),
+export const decodeSingleRow = <A, I>(
+  schema: Schema.Codec<ReadonlyArray<A>, ReadonlyArray<I>>,
+  table: string,
+  rowKey: string,
+  rows: unknown,
+): Effect.Effect<A, DoStorageCorruptionError> =>
+  decodeRows(schema, table, rowKey, rows).pipe(
+    Effect.flatMap((decoded) =>
+      decoded.length === 1
+        ? Effect.succeed(decoded[0])
+        : Effect.fail(
+            DoStorageCorruptionError.make({
+              table,
+              rowKey,
+              message: `Expected exactly one row but found ${decoded.length}.`,
+            }),
+          ),
     ),
-);
-
-/** Column inventory of the supported v3 predecessor, independent of physical column order. */
-const predecessorColumns = {
-  effect_agent_threads: [
-    "thread_id",
-    "created_at",
-    "tail_sequence",
-    "tail_digest",
-    "producer_epoch",
-  ],
-  effect_agent_canonical_batches: [
-    "thread_id",
-    "batch_id",
-    "first_sequence",
-    "last_sequence",
-    "batch_digest",
-    "tail_digest",
-    "batch_json",
-  ],
-  effect_agent_canonical_records: ["thread_id", "sequence", "record_id", "batch_id", "record_json"],
-  effect_agent_checkpoints: ["thread_id", "through_sequence", "tail_digest", "checkpoint_json"],
-  effect_agent_submissions: [
-    "submission_id",
-    "thread_id",
-    "queue_sequence",
-    "principal",
-    "idempotency_key",
-    "agent_id",
-    "agent_digests_json",
-    "deployment_id",
-    "input_json",
-    "input_digest",
-    "receipt_id",
-    "state",
-    "settled_outcome",
-    "created_at",
-    "ready_at",
-    "input_applied_record_id",
-    "input_applied_sequence",
-    "joined_host_submission_id",
-    "suspended_reason_json",
-    "suspended_at",
-    "unknown_reason",
-    "unknown_tool_call_ids_json",
-    "parent_submission_id",
-    "parent_tool_call_id",
-    "admission_group",
-    "admission_fence_json",
-  ],
-  effect_agent_submission_ownership: [
-    "submission_id",
-    "attempt_id",
-    "ownership_token",
-    "producer_epoch",
-    "owner_producer_id",
-    "lease_expires_at",
-  ],
-  effect_agent_attempts: [
-    "attempt_id",
-    "submission_id",
-    "thread_id",
-    "owner_producer_id",
-    "producer_epoch",
-    "claimed_at",
-  ],
-  effect_agent_settlement_reservations: [
-    "submission_id",
-    "settlement_id",
-    "outcome",
-    "record_id",
-    "record_json",
-    "record_digest",
-    "reserved_at",
-    "finalized_at",
-  ],
-  effect_agent_abort_intents: [
-    "submission_id",
-    "author",
-    "reason",
-    "requested_at",
-    "canonical_record_id",
-  ],
-  effect_agent_approval_decisions: [
-    "submission_id",
-    "tool_call_id",
-    "decision",
-    "resolver",
-    "reason",
-    "decided_at",
-  ],
-  effect_agent_unknown_resolutions: [
-    "submission_id",
-    "tool_call_id",
-    "author",
-    "reason",
-    "resolution_json",
-    "resolved_at",
-  ],
-  effect_agent_child_reservations: [
-    "reservation_id",
-    "parent_submission_id",
-    "parent_tool_call_id",
-    "child_submission_id",
-    "status",
-    "allocation_json",
-    "allocation_digest",
-    "accounting_json",
-    "reserved_at",
-    "release_began_at",
-    "released_at",
-  ],
-  effect_agent_meta: ["key", "value"],
-  effect_agent_child_settlements: [
-    "parent_submission_id",
-    "child_submission_id",
-    "child_outcome",
-    "recorded_at",
-  ],
-} as const;
-
-const checkPredecessorLayout = Effect.fn("DoJournal.checkPredecessorLayout")(function* (
-  version: 3 | 4 | 5 | 7,
-) {
-  const sql = (yield* SqlClient.SqlClient).withoutTransforms();
-
-  const messageColumns =
-    version === 3
-      ? predecessorColumns
-      : {
-          ...predecessorColumns,
-          effect_agent_submissions: [
-            ...predecessorColumns.effect_agent_submissions,
-            "worker_admission_json",
-            "message_admission_json",
-          ],
-          effect_agent_message_deliveries: [
-            "owner_thread_id",
-            "message_id",
-            "version",
-            "state",
-            "deadline_at_millis",
-            "record_json",
-          ],
-        };
-
-  const expectedColumns = {
-    ...messageColumns,
-    ...(version === 7
-      ? {
-          effect_agent_canonical_records: [
-            ...predecessorColumns.effect_agent_canonical_records,
-            "outstanding",
-          ],
-        }
-      : {}),
-    ...(version >= 5
-      ? {
-          effect_agent_recovery_checkpoints: [
-            "thread_id",
-            "through_sequence",
-            "tail_digest",
-            "checkpoint_json",
-          ],
-        }
-      : {}),
-  };
-
-  for (const [table, expected] of Object.entries(expectedColumns)) {
-    const columns = yield* decodeRows(
-      Schema.Array(Schema.Struct({ name: BoundedIdentifier })),
-      table,
-      "schema",
-      yield* sql.unsafe(`PRAGMA table_info(${table})`),
-    );
-
-    const names = new Set<string>(expected);
-
-    if (columns.length !== names.size || columns.some((column) => !names.has(column.name)))
-      return yield* DoStorageCompatibilityError.make({
-        actualVersion: version,
-        supportedVersion: CurrentDoStorageVersion,
-        message: `The v${version} ${table} columns do not match the supported predecessor; no upgrade was committed.`,
-      });
-  }
-});
-
-const REQUIRED_TABLES = [
-  "effect_agent_abort_intents",
-  "effect_agent_approval_decisions",
-  "effect_agent_attempts",
-  "effect_agent_canonical_batches",
-  "effect_agent_canonical_records",
-  "effect_agent_checkpoints",
-  "effect_agent_child_reservations",
-  "effect_agent_child_settlements",
-  "effect_agent_threads",
-  "effect_agent_meta",
-  "effect_agent_settlement_reservations",
-  "effect_agent_submission_ownership",
-  "effect_agent_submissions",
-  "effect_agent_unknown_resolutions",
-] as const;
+  );
 
-/**
- * Supported-predecessor or fresh storage gate (DEPLOY-008) over `effect_agent_meta` instead of
- * `PRAGMA user_version` (unverified on Durable Object SQL storage; a meta table is portable
- * regardless). No WAL check (Durable Object storage owns durability and confirms writes
- * through output gates) and no busy timeout (a Durable Object has exactly one writer): the
- * Node machinery those served has no DC analogue and is deliberately absent.
- */
-const ensureCurrentStorage = Effect.fn("DoJournal.ensureCurrentStorage")(function* (
+/** Open a validated layout and bind this Object's storage owner. */
+const ensureCurrentStorage = Effect.fnUntraced(function* (
   sql: SqlClient.SqlClient,
   failpoint: DoJournalFailpoint = noFailpoint,
   maxStoredValueBytes: number,
 ) {
-  const verifyWorkerPredecessor = Effect.fnUntraced(function* (workerContract: boolean) {
-    const requiredRows = yield* sql<Record<string, unknown>>`
-    SELECT name
-    FROM sqlite_master
-    WHERE (type = 'table'
-      AND name IN ${sql.in([...REQUIRED_TABLES, "effect_agent_message_deliveries", "effect_agent_recovery_checkpoints"])}
-    ) OR (type = 'index' AND name IN ('effect_agent_submissions_nonterminal', 'effect_agent_records_subtree', 'effect_agent_message_deliveries_pending', 'effect_agent_records_outstanding', 'effect_agent_records_call', 'effect_agent_records_run_input', 'effect_agent_records_worker_input'))
-    OR (${workerContract ? 1 : 0} = 1 AND name IN ('effect_agent_worker_stops', 'effect_agent_worker_starts', 'effect_agent_worker_pending', 'effect_agent_worker_execution'))
-    ORDER BY name
-  `.pipe(Effect.mapError(storageError("verify storage tables")));
-
-    const required = yield* decodeRows(
-      Schema.Array(DoNameRow),
-      "sqlite_master",
-      "required_tables",
-      requiredRows,
-    );
-
-    if (required.length !== REQUIRED_TABLES.length + 9 + (workerContract ? 4 : 0)) {
-      return yield* DoStorageCompatibilityError.make({
-        actualVersion: CurrentDoStorageVersion,
-        supportedVersion: CurrentDoStorageVersion,
-        message:
-          "The Durable Object claims the current format but is missing required tables or its nonterminal index. Retain the original store for inspection.",
-      });
-    }
-  });
-
-  const metaTableRows = yield* sql<Record<string, unknown>>`
-    SELECT name
-    FROM sqlite_master
-    WHERE type = 'table'
-      AND name = 'effect_agent_meta'
-  `.pipe(Effect.mapError(storageError("read storage version table")));
-
-  const metaTables = yield* decodeRows(
-    Schema.Array(DoNameRow),
-    "sqlite_master",
-    "effect_agent_meta",
-    metaTableRows,
-  );
-
-  if (metaTables.length === 0) {
-    const existingRows = yield* sql<Record<string, unknown>>`
-      SELECT name
-      FROM sqlite_master
-      WHERE type = 'table'
-        AND name LIKE 'effect_agent_%'
-      ORDER BY name
-    `.pipe(Effect.mapError(storageError("inspect unversioned storage")));
-
-    const existing = yield* decodeRows(
-      Schema.Array(DoNameRow),
-      "sqlite_master",
-      "effect_agent_%",
-      existingRows,
-    );
-
-    if (existing.length > 0) {
-      return yield* DoStorageCompatibilityError.make({
-        actualVersion: 0,
-        supportedVersion: CurrentDoStorageVersion,
-        message:
-          "The Durable Object contains unversioned Effect Agent tables. Refusing to mutate ambiguous stored data; retain it for inspection with its original writer.",
-      });
-    }
-
-    yield* SqliteMigrator.run({
-      loader: doMigrations,
-      // An application can share this SQL client and own its own migration history.
-      // Keep bookkeeping outside effect_agent_% so interrupted unversioned schemas
-      // still fail the ambiguity check above.
-      table: "effect_sql_migrations_agent_threads",
-    }).pipe(
-      // SqliteMigrator depends on the generic client supplied by this adapter. The concrete
-      // Durable Object client is kept at the outer Layer boundary.
-      Effect.provideService(SqlClient.SqlClient, sql),
-      Effect.mapError((error) =>
-        DoStorageError.make({
-          cause: error,
-          operation: "initialize current storage",
-          message: error.message,
-        }),
-      ),
-    );
-  } else {
-    const versionRows = yield* sql<Record<string, unknown>>`
-      SELECT value
-      FROM effect_agent_meta
-      WHERE key = 'storage_version'
-    `.pipe(Effect.mapError(storageError("read storage version")));
-
-    const version = yield* decodeSingleRow(
-      Schema.Array(DoMetaRow),
-      "effect_agent_meta",
-      "storage_version",
-      versionRows,
-    );
-
-    if (
-      version.value === "2" ||
-      version.value === "3" ||
-      version.value === "4" ||
-      version.value === "5"
-    ) {
-      yield* sql
-        .withTransaction(
-          Effect.gen(function* () {
-            const current = yield* sql<{
-              value: string;
-            }>`SELECT value FROM effect_agent_meta WHERE key='storage_version'`;
-
-            if (current.length === 1 && current[0].value === String(CurrentDoStorageVersion))
-              return;
-            if (
-              current.length !== 1 ||
-              (current[0].value !== "2" &&
-                current[0].value !== "3" &&
-                current[0].value !== "4" &&
-                current[0].value !== "5")
-            )
-              return yield* DoStorageCompatibilityError.make({
-                actualVersion: -1,
-                supportedVersion: CurrentDoStorageVersion,
-                message: "Storage version changed while acquiring the upgrade transaction.",
-              });
-
-            const required = yield* decodeRows(
-              Schema.Array(DoNameRow),
-              "sqlite_master",
-              "required_tables",
-              yield* sql`SELECT name FROM sqlite_master WHERE type='table' AND name IN ${sql.in([...REQUIRED_TABLES])}`,
-            );
-
-            if (required.length !== REQUIRED_TABLES.length)
-              return yield* DoStorageCompatibilityError.make({
-                actualVersion: Number(current[0].value),
-                supportedVersion: CurrentDoStorageVersion,
-                message:
-                  "The predecessor store is missing required tables. Retain the original store for inspection; no upgrade was committed.",
-              });
-
-            const recoveryTables =
-              yield* sql`SELECT name FROM sqlite_master WHERE type='table' AND name='effect_agent_recovery_checkpoints'`;
-
-            if (recoveryTables.length !== (current[0].value === "5" ? 1 : 0))
-              return yield* DoStorageCompatibilityError.make({
-                actualVersion: Number(current[0].value),
-                supportedVersion: CurrentDoStorageVersion,
-                message:
-                  "The predecessor recovery checkpoint storage does not match its version; refusing ambiguous data without mutation.",
-              });
-
-            const indexes =
-              yield* sql`SELECT name FROM sqlite_master WHERE name='effect_agent_submissions_nonterminal'`;
-
-            if (indexes.length !== 0)
-              return yield* DoStorageCompatibilityError.make({
-                actualVersion: Number(current[0].value),
-                supportedVersion: CurrentDoStorageVersion,
-                message:
-                  "The predecessor already contains the nonterminal index; refusing ambiguous storage without mutation.",
-              });
-            if (current[0].value === "2") {
-              yield* checkV2ThreadLayout();
-              for (const statement of [
-                sql`ALTER TABLE effect_agent_submissions ADD COLUMN admission_group TEXT`,
-                sql`ALTER TABLE effect_agent_submissions ADD COLUMN admission_fence_json TEXT`,
-                sql`CREATE INDEX effect_agent_submissions_group ON effect_agent_submissions (thread_id, admission_group, state)`,
-              ]) {
-                yield* failpoint("upgrade:before-mutation");
-                yield* statement;
-                yield* failpoint("upgrade:after-mutation");
-              }
-            }
-            if (current[0].value === "3") yield* checkPredecessorLayout(3);
-            if (current[0].value === "4") yield* checkPredecessorLayout(4);
-            if (current[0].value === "5") yield* checkPredecessorLayout(5);
-            if (current[0].value === "2" || current[0].value === "3") {
-              yield* failpoint("upgrade:before-mutation");
-              yield* sql`ALTER TABLE effect_agent_submissions ADD COLUMN worker_admission_json TEXT`;
-              yield* failpoint("upgrade:after-mutation");
-              yield* failpoint("upgrade:before-mutation");
-              yield* sql`ALTER TABLE effect_agent_submissions ADD COLUMN message_admission_json TEXT`;
-              yield* failpoint("upgrade:after-mutation");
-              yield* failpoint("upgrade:before-mutation");
-              yield* createMessageDeliveryTables;
-              yield* failpoint("upgrade:after-mutation");
-            }
-            if (current[0].value !== "5") {
-              yield* failpoint("upgrade:before-mutation");
-              yield* createRecoveryCheckpointTable;
-              yield* failpoint("upgrade:after-mutation");
-            }
-            yield* failpoint("upgrade:before-mutation");
-            yield* createNonterminalIndex;
-            yield* failpoint("upgrade:after-mutation");
-            yield* failpoint("upgrade:before-version");
-            yield* createNativeReadIndexes();
-            yield* createMessageDeliveryPendingIndex();
-            yield* seedNativeReadIndexes.pipe(
-              Effect.catchTag("ThreadStoreError", (error) =>
-                DoStorageCorruptionError.make({
-                  table: "effect_agent_canonical_records",
-                  rowKey: "upgrade",
-                  message: error.message,
-                }),
-              ),
-            );
-            yield* createWorkerStops;
-            yield* sql`UPDATE effect_agent_meta SET value='9' WHERE key='storage_version'`;
-            yield* failpoint("upgrade:after-version");
-          }),
-        )
-        .pipe(
-          Effect.catchTag("DoStorageFailpointError", (error) =>
-            DoStorageError.make({
-              cause: error,
-              operation: "upgrade storage",
-              message: error.message,
-            }),
-          ),
-          Effect.catchTag("StorageUpgradeError", (error) =>
-            DoStorageCorruptionError.make({
-              table: error.table,
-              rowKey: error.rowKey,
-              message: error.message,
-            }),
-          ),
-          Effect.catchTag("SchemaError", (error) =>
-            DoStorageCorruptionError.make({
-              table: "effect_agent_canonical_records",
-              rowKey: "upgrade",
-              message: error.message,
-            }),
-          ),
-          Effect.catchTag("SqlError", storageError("upgrade supported thread storage")),
-        );
-    } else if (version.value === "6") {
-      yield* sql
-        .withTransaction(
-          Effect.gen(function* () {
-            const current = yield* sql<{
-              value: string;
-            }>`SELECT value FROM effect_agent_meta WHERE key = 'storage_version'`;
-
-            if (current[0]?.value === "9") return;
-            if (current[0]?.value !== "6")
-              return yield* DoStorageCompatibilityError.make({
-                actualVersion: -1,
-                supportedVersion: 9,
-                message: "Storage version changed during native index upgrade",
-              });
-            yield* checkPredecessorLayout(5);
-
-            const requiredIndex =
-              yield* sql`SELECT name FROM sqlite_master WHERE type = 'index' AND name = 'effect_agent_submissions_nonterminal'`;
-
-            if (requiredIndex.length !== 1)
-              return yield* DoStorageCompatibilityError.make({
-                actualVersion: 6,
-                supportedVersion: 9,
-                message: "Predecessor storage is missing its required nonterminal index",
-              });
-            yield* failpoint("upgrade:before-mutation");
-            yield* createNativeReadIndexes();
-            yield* createMessageDeliveryPendingIndex();
-            yield* seedNativeReadIndexes.pipe(
-              Effect.catchTag("ThreadStoreError", (error) =>
-                DoStorageCorruptionError.make({
-                  table: "effect_agent_canonical_records",
-                  rowKey: "upgrade",
-                  message: error.message,
-                }),
-              ),
-            );
-            yield* failpoint("upgrade:after-mutation");
-            yield* failpoint("upgrade:before-version");
-            yield* createWorkerStops;
-            yield* sql`UPDATE effect_agent_meta SET value='9' WHERE key='storage_version'`;
-            yield* failpoint("upgrade:after-version");
-          }),
-        )
-        .pipe(
-          Effect.mapError((error) =>
-            DoStorageError.make({
-              operation: "upgrade native indexes",
-              message: error.message,
-              cause: error,
-            }),
-          ),
-        );
-    } else if (version.value === "7") {
-      yield* sql
-        .withTransaction(
-          Effect.gen(function* () {
-            const current = yield* sql<{
-              value: string;
-            }>`SELECT value FROM effect_agent_meta WHERE key = 'storage_version'`;
-
-            if (current[0]?.value === "9") return;
-            if (current[0]?.value !== "7")
-              return yield* DoStorageCompatibilityError.make({
-                actualVersion: -1,
-                supportedVersion: 9,
-                message: "Storage version changed during worker stop upgrade",
-              });
-            yield* checkPredecessorLayout(7);
-            yield* verifyWorkerPredecessor(false);
-            yield* failpoint("upgrade:before-mutation");
-            yield* createWorkerStops;
-            yield* failpoint("upgrade:after-mutation");
-            yield* failpoint("upgrade:before-version");
-            yield* sql`UPDATE effect_agent_meta SET value='9' WHERE key='storage_version'`;
-            yield* failpoint("upgrade:after-version");
-          }),
-        )
-        .pipe(
-          Effect.mapError((cause) =>
-            DoStorageError.make({
-              operation: "upgrade worker stop",
-              message: "Worker stop upgrade failed",
-              cause,
-            }),
-          ),
-        );
-    } else if (version.value === "8") {
-      yield* sql
-        .withTransaction(
-          Effect.gen(function* () {
-            const current = yield* sql<{
-              value: string;
-            }>`SELECT value FROM effect_agent_meta WHERE key = 'storage_version'`;
-
-            if (current[0]?.value === "9") return;
-            if (current[0]?.value !== "8")
-              return yield* DoStorageCompatibilityError.make({
-                actualVersion: -1,
-                supportedVersion: 9,
-                message: "Storage version changed during assignment seal upgrade",
-              });
-            yield* checkPredecessorLayout(7);
-            yield* verifyWorkerPredecessor(true);
-            const columns = yield* sql`PRAGMA table_info(effect_agent_worker_stops)`;
-
-            yield* Schema.decodeUnknownEffect(
-              Schema.Tuple([
-                Schema.Struct({
-                  cid: Schema.Literal(0),
-                  name: Schema.Literal("thread_id"),
-                  type: Schema.Literal("TEXT"),
-                  notnull: Schema.Literal(1),
-                  dflt_value: Schema.Null,
-                  pk: Schema.Literal(1),
-                }),
-              ]),
-            )(columns).pipe(
-              Effect.mapError(() =>
-                DoStorageCompatibilityError.make({
-                  actualVersion: 8,
-                  supportedVersion: 9,
-                  message: "Unsupported worker seal layout; no upgrade was committed",
-                }),
-              ),
-            );
-            yield* failpoint("upgrade:before-mutation");
-            yield* sql`ALTER TABLE effect_agent_worker_stops ADD COLUMN terminal TEXT`;
-            yield* failpoint("upgrade:after-mutation");
-            yield* failpoint("upgrade:before-version");
-            yield* sql`UPDATE effect_agent_meta SET value='9' WHERE key='storage_version'`;
-            yield* failpoint("upgrade:after-version");
-          }),
-        )
-        .pipe(
-          Effect.mapError((cause) =>
-            DoStorageError.make({
-              operation: "upgrade assignment seals",
-              message: "Assignment seal upgrade failed",
-              cause,
-            }),
-          ),
-        );
-    } else if (version.value !== String(CurrentDoStorageVersion)) {
-      const actualVersion = Number.parseInt(version.value, 10);
-
-      return yield* DoStorageCompatibilityError.make({
-        actualVersion: Number.isSafeInteger(actualVersion) ? actualVersion : -1,
-        supportedVersion: CurrentDoStorageVersion,
-        message:
-          `The Durable Object uses unsupported storage version ${version.value}; ` +
-          `this build supports exactly version ${CurrentDoStorageVersion}. ` +
-          "Only supported v2, v3, v4, v5, v6, v7 and v8 can be upgraded automatically. Keep the original store and use a compatible library version.",
-      });
-    }
-  }
-
-  yield* verifyWorkerPredecessor(true);
+  yield* ensureDoStorageLayout().pipe(Effect.provideService(SqlClient.SqlClient, sql));
 
   const state = yield* ownedState(sql);
   const owner = (yield* SqlStorageOwner) ?? state;
@@ -1043,8 +367,58 @@ const makeJournal = (
   Effect.gen(function* () {
     const owner = (yield* SqlStorageOwner) ?? state;
     const progress = yield* SqlStorageProgress;
+
+    const work = yield* makeSqlThreadWork({
+      read: (body) => state.read(body),
+      write: (body) =>
+        owner.transaction(body.pipe(Effect.tap(() => state.invalidate))).pipe(
+          Effect.provideService(SqlClient.SqlClient, sql),
+          Effect.catchTag("SqlError", (cause) =>
+            ThreadStoreError.make({
+              operation: "rebuild Thread work",
+              message: "Thread work transaction failed",
+              cause,
+            }),
+          ),
+        ),
+    }).pipe(Effect.provideService(SqlClient.SqlClient, sql));
+
+    yield* Effect.acquireRelease(
+      Effect.sync(() => state.invalidators.add(work.invalidate)),
+      () => Effect.sync(() => state.invalidators.delete(work.invalidate)),
+    );
+
+    const workFailure = (cause: unknown) =>
+      DoStorageError.make({
+        operation: "publish Thread work",
+        message: "Canonical work metadata could not be published",
+        cause,
+      });
+
+    const validateProgress = yield* makeProgressAppendValidation().pipe(
+      Effect.provideService(SqlClient.SqlClient, sql),
+    );
+
+    const executions = yield* makeSqlExecutions().pipe(
+      Effect.provideService(SqlClient.SqlClient, sql),
+    );
+
+    const executionConflict = <A>(effect: Effect.Effect<A, AppendConflict | ThreadStoreError>) =>
+      effect.pipe(
+        Effect.catchTag("AppendConflict", (error) =>
+          Effect.fail(
+            DoAppendConflict.make({
+              reason: error.reason,
+              message: "Active execution conflicts with the captured commit",
+              ...(error.actualTailSequence === undefined
+                ? {}
+                : { actualTailSequence: error.actualTailSequence }),
+            }),
+          ),
+        ),
+      );
+
     const threads = threadRows(state, sql);
-    const recovery = recoveryRows(state, sql);
     const cursors = lifecycleCursorRows(state, sql);
     let records = recordCaches.get(state);
 
@@ -1055,13 +429,33 @@ const makeJournal = (
     }
     const recordCache = records;
 
+    const archives = yield* makeSqlThreadArchiveRange({
+      read: (body) => state.read(body),
+      write: (body) =>
+        owner.transaction(body.pipe(Effect.tap(() => state.invalidate))).pipe(
+          Effect.provideService(SqlClient.SqlClient, sql),
+          Effect.catchTag("SqlError", (cause) =>
+            ThreadStoreError.make({
+              operation: "archive write",
+              message: "Archive transaction failed.",
+              cause,
+            }),
+          ),
+        ),
+    }).pipe(Effect.provideService(SqlClient.SqlClient, sql));
+
+    const recordJson = canonicalRecordJson(sql);
+
+    const physical = yield* makeCanonicalStorage().pipe(
+      Effect.provideService(SqlClient.SqlClient, sql),
+    );
+
     /** Typed pre-write refusal for any single value over the configured byte bound. */
     const checkValueBound = (
       operation: string,
       value: string,
+      actualBytes = storedTextBytes(value),
     ): Effect.Effect<void, DoValueBoundExceeded> => {
-      const actualBytes = storedTextBytes(value);
-
       return actualBytes > maxStoredValueBytes
         ? Effect.fail(
             DoValueBoundExceeded.make({
@@ -1078,8 +472,7 @@ const makeJournal = (
      * `withTransaction` (`ctx.storage.transaction()` under the hood). Within one Durable
      * Object there is exactly ONE writer, so the Node `BEGIN IMMEDIATE` + busy-retry +
      * `SqliteWriteContention` machinery has no analogue here and is deliberately absent.
-     * Ownership-token and epoch checks still run INSIDE the transaction, so fencing atomicity
-     * (DUR-006) is preserved identically.
+     * The shared local owner gate covers the transaction and acknowledgement.
      *
      * Journal write transactions are always top level: the Durable Object client rejects
      * nested transactions, so new journal operations must not wrap this helper inside another
@@ -1091,7 +484,7 @@ const makeJournal = (
       <A, E extends { readonly _tag: string }>(
         effect: Effect.Effect<A, E>,
       ): Effect.Effect<A, E | DoStorageError> =>
-        owner.transaction(storageResult(effect, expected)).pipe(
+        state.owner.withMutation(owner.transaction(storageResult(effect, expected))).pipe(
           Effect.provideService(SqlClient.SqlClient, sql),
           Effect.mapError((error) => (isSqlError(error) ? storageError(operation)(error) : error)),
           Effect.tapError(annotateStorageError),
@@ -1099,126 +492,84 @@ const makeJournal = (
           Effect.flatMap(Effect.fromResult),
         );
 
-    const materialize = Effect.fnUntraced(
-      function* (
-        threadId: string,
-        createdAt: string,
-        emptyTailDigest: string,
-        producerEpoch: ProducerEpoch,
-      ): Effect.fn.Return<
-        void,
-        DoFenceRejected | DoStorageCorruptionError | DoStorageError | DoValueBoundExceeded
-      > {
-        if (threadId.length > MAX_IDENTIFIER_LENGTH) {
-          return yield* DoStorageError.make({
-            operation: "materialize thread",
-            message: "Thread identity exceeds the Durable Object storage bounds.",
-          });
-        }
-        yield* checkValueBound("materialize thread", emptyTailDigest);
-        // Refusals and idempotent materialization need no transaction. Recheck before writes.
-        const current = yield* getThread(threadId);
-
-        if (current.length === 1 && producerEpoch <= current[0].producer_epoch) {
-          if (producerEpoch === current[0].producer_epoch) return;
+    const materialize = Effect.fnUntraced(function* (
+      threadId: string,
+      createdAt: string,
+    ): Effect.fn.Return<void, DoStorageCorruptionError | DoStorageError | DoValueBoundExceeded> {
+      if (threadId.length > MAX_IDENTIFIER_LENGTH) {
+        return yield* DoStorageError.make({
+          operation: "materialize thread",
+          message: "Thread identity exceeds the Durable Object storage bounds.",
+        });
+      }
+      // Refusals and idempotent materialization need no transaction. Recheck before writes.
+      const current = yield* getThread(threadId);
 
-          return yield* DoFenceRejected.make({
-            producerEpoch,
-            actualEpoch: current[0].producer_epoch,
-            message: "The materialization producer epoch is stale.",
-          });
-        }
-        yield* withWriteTransaction(
-          "materialize transaction",
-          (error) => error._tag === "DoFenceRejected",
-        )(
-          Effect.gen(function* () {
-            const existingRows = yield* getThread(threadId);
+      if (current.length === 1) {
+        return;
+      }
+      yield* withWriteTransaction("materialize transaction")(
+        Effect.gen(function* () {
+          const existingRows = yield* getThread(threadId);
 
-            const existing = yield* decodeRows(
-              Schema.Array(ThreadRow),
-              "effect_agent_threads",
-              threadId,
-              existingRows,
-            );
+          const existing = yield* decodeRows(
+            Schema.Array(ThreadRow),
+            "effect_agent_threads",
+            threadId,
+            existingRows,
+          );
 
-            if (existing.length > 1) {
-              return yield* DoStorageCorruptionError.make({
-                table: "effect_agent_threads",
-                rowKey: threadId,
-                message: "A thread primary key returned more than one row.",
-              });
-            }
-            if (existing.length === 0) {
-              yield* sql`
+          if (existing.length > 1) {
+            return yield* DoStorageCorruptionError.make({
+              table: "effect_agent_threads",
+              rowKey: threadId,
+              message: "A thread primary key returned more than one row.",
+            });
+          }
+          if (existing.length === 0) {
+            yield* sql`
             INSERT INTO effect_agent_threads (
               thread_id,
               created_at,
-              tail_sequence,
-              tail_digest,
-              producer_epoch
+              tail_sequence
             ) VALUES (
               ${threadId},
               ${createdAt},
-              0,
-              ${emptyTailDigest},
-              ${producerEpoch}
-            )
+              0
+            ) ON CONFLICT(thread_id) DO UPDATE SET created_at=excluded.created_at
+              WHERE effect_agent_threads.created_at IS NULL
            RETURNING *`.pipe(
-                threads.write,
-                Effect.mapError((error) =>
-                  error._tag === "SqlError" ? storageError("materialize thread")(error) : error,
-                ),
-              );
+              threads.write,
+              Effect.mapError((error) =>
+                error._tag === "SqlError" ? storageError("materialize thread")(error) : error,
+              ),
+            );
 
-              if (lifecycle !== undefined)
-                yield* sql`INSERT INTO effect_agent_lifecycle_cursors (thread_id, through_sequence)
+            if (lifecycle !== undefined)
+              yield* sql`INSERT INTO effect_agent_lifecycle_cursors (thread_id, through_sequence)
               VALUES (${threadId}, 0) RETURNING *`.pipe(
-                  cursors.write,
-                  Effect.mapError((error) =>
-                    error._tag === "SqlError"
-                      ? storageError("initialize lifecycle source")(error)
-                      : error,
-                  ),
-                );
-
-              return;
-            }
-            if (producerEpoch < existing[0].producer_epoch) {
-              return yield* DoFenceRejected.make({
-                producerEpoch,
-                actualEpoch: existing[0].producer_epoch,
-                message: `Producer epoch ${producerEpoch} is stale; current epoch is ${existing[0].producer_epoch}.`,
-              });
-            }
-            if (producerEpoch > existing[0].producer_epoch) {
-              yield* sql`
-            UPDATE effect_agent_threads
-            SET producer_epoch = ${producerEpoch}
-            WHERE thread_id = ${threadId}
-           RETURNING *`.pipe(
-                threads.write,
+                cursors.write,
                 Effect.mapError((error) =>
                   error._tag === "SqlError"
-                    ? storageError("advance materialization epoch")(error)
+                    ? storageError("initialize lifecycle source")(error)
                     : error,
                 ),
               );
-            }
-          }),
-        );
-      },
-      withStorageSpan("DoJournal.materialize", (error) => error._tag === "DoFenceRejected"),
-    );
 
-    const getThread = Effect.fn("DoJournal.getThread")(function* (threadId: string) {
+            return;
+          }
+        }),
+      );
+    }, withStorageSpan("DoJournal.materialize"));
+
+    const getThread = Effect.fnUntraced(function* (threadId: string) {
       return (yield* threads
         .by("thread_id", threadId)
         .pipe(
           Effect.mapError((error) =>
             error._tag === "SqlError" ? storageError("read thread")(error) : error,
           ),
-        )).filter((row) => row.thread_id === threadId);
+        )).filter((row) => row.thread_id === threadId && row.created_at !== null);
     });
 
     const hasRecord = Effect.fnUntraced(function* (threadId: string, recordId: string) {
@@ -1228,360 +579,367 @@ const makeJournal = (
       if (prefix !== undefined) return prefix.some((row) => row.record_id === recordId);
 
       const rows = yield* sql`SELECT record_id FROM effect_agent_canonical_records
-      WHERE thread_id = ${threadId} AND record_id = ${recordId}`.pipe(
+      WHERE thread_id = ${threadId} AND record_id = ${JSON.stringify(recordId)}`.pipe(
         Effect.mapError(storageError("read canonical record identity")),
       );
 
       return rows.length > 0;
     });
 
-    const append = Effect.fnUntraced(
-      function* (
-        request: RawAppendRequest,
-        observed: ThreadRow,
-      ): Effect.fn.Return<RawAppendResult, AppendError> {
-        if (
-          request.threadId.length > MAX_IDENTIFIER_LENGTH ||
-          request.batchId.length > MAX_IDENTIFIER_LENGTH ||
-          request.records.some((record) => record.recordId.length > MAX_IDENTIFIER_LENGTH)
-        ) {
-          return yield* DoStorageError.make({
-            operation: "append canonical batch",
-            message: "Canonical identifiers exceed the Durable Object storage bounds.",
+    const prepareAppend = Effect.fnUntraced(function* (request: RawAppendRequest) {
+      if (
+        request.threadId.length > MAX_IDENTIFIER_LENGTH ||
+        request.batchId.length > MAX_IDENTIFIER_LENGTH ||
+        request.executionWrites.some(
+          ({ update }) => update.checkpoint.progress.runId.length > MAX_IDENTIFIER_LENGTH,
+        ) ||
+        request.records.some((record) => record.recordId.length > MAX_IDENTIFIER_LENGTH)
+      ) {
+        return yield* DoStorageError.make({
+          operation: "append canonical batch",
+          message: "Canonical identifiers exceed the Durable Object storage bounds.",
+        });
+      }
+      // Archives store the full batch as one value, so their ceiling also bounds hot appends.
+      // The trusted append SPI pairs captured JSON with its exact UTF-8 width.
+      yield* checkValueBound("append canonical batch", request.batchJson, request.batchBytes);
+      for (const record of request.records) {
+        if (record.recordBytes > maxStoredValueBytes)
+          return yield* DoValueBoundExceeded.make({
+            actualBytes: record.recordBytes,
+            maxBytes: maxStoredValueBytes,
+            operation: "append canonical record",
           });
-        }
-        // The platform's ~2 MB per-value limit, enforced typed BEFORE any write (plan §1.2).
-        yield* checkValueBound("append canonical batch", request.batchJson);
-        yield* checkValueBound("append canonical batch", request.batchDigest);
-        yield* checkValueBound("append canonical batch", request.tailDigest);
-        yield* Effect.forEach(
-          request.records,
-          (record) => checkValueBound("append canonical record", record.recordJson),
-          { discard: true },
-        );
-
-        const recordIds = request.records.map((record) => record.recordId);
+      }
+      for (const write of request.executionWrites)
+        yield* checkValueBound("commit active execution", write.json, write.bytes);
 
-        if (new Set(recordIds).size !== recordIds.length) {
-          return yield* DoAppendConflict.make({
-            message: `Batch ${request.batchId} contains duplicate canonical record IDs.`,
-            reason: "record-identity",
-          });
-        }
+      const recordIds: Array<string> = request.records.map((record) => record.recordId);
 
-        // The facade already read this tail. Reject a known stale writer without opening a
-        // transaction; a matching tail is still checked atomically below. Replays precede tail
-        // conflicts, preserving retry identity even after the log has advanced.
-        if (request.producerEpoch !== observed.producer_epoch) {
-          return yield* DoFenceRejected.make({
-            producerEpoch: request.producerEpoch,
-            actualEpoch: observed.producer_epoch,
-            message: "The append producer epoch is not current.",
-          });
-        }
-        if (
-          request.expectedTailSequence !== observed.tail_sequence ||
-          request.expectedTailDigest !== observed.tail_digest
-        ) {
-          const batches = yield* sql`
-          SELECT batch_id FROM effect_agent_canonical_batches
-          WHERE thread_id = ${request.threadId} AND batch_id = ${request.batchId}
-        `.pipe(Effect.mapError(storageError("preflight append replay")));
+      if (new Set(recordIds).size !== recordIds.length) {
+        return yield* DoAppendConflict.make({
+          message: `Batch ${request.batchId} contains duplicate canonical record IDs.`,
+          reason: "record-identity",
+        });
+      }
 
-          // A possible replay still checks the current epoch and digest in the transaction.
-          if (batches.length === 0) {
-            return yield* DoAppendConflict.make({
-              reason: "tail",
-              message: "The canonical tail has advanced.",
-              actualTailSequence: observed.tail_sequence,
-              actualTailDigest: observed.tail_digest,
-            });
-          }
-        }
+      return request;
+    });
 
-        return yield* withWriteTransaction(
-          "append transaction",
-          isAppendContention,
-        )(
-          Effect.gen(function* () {
-            const threadRows = yield* getThread(request.threadId);
+    const appendPrepared = Effect.fnUntraced(function* (
+      request: RawAppendRequest,
+    ): Effect.fn.Return<RawAppendResult, AppendError> {
+      const recordIds: Array<string> = request.records.map((record) => record.recordId);
+      const threadRows = yield* getThread(request.threadId);
 
-            const thread = yield* decodeSingleRow(
-              Schema.Array(ThreadRow),
-              "effect_agent_threads",
-              request.threadId,
-              threadRows,
-            );
+      const thread = threadRows.length === 1 ? threadRows[0] : undefined;
 
-            if (request.producerEpoch !== thread.producer_epoch) {
-              return yield* DoFenceRejected.make({
-                producerEpoch: request.producerEpoch,
-                actualEpoch: thread.producer_epoch,
-                message: `Producer epoch ${request.producerEpoch} is not the current epoch ${thread.producer_epoch}.`,
-              });
-            }
+      if (thread === undefined)
+        return yield* DoStorageCorruptionError.make({
+          table: "effect_agent_threads",
+          rowKey: request.threadId,
+          message: `Expected exactly one row but found ${threadRows.length}.`,
+        });
 
-            const prefix = recordCache.prefix(request.threadId, thread.tail_sequence);
+      const prefix = recordCache.prefix(request.threadId, thread.tail_sequence);
 
-            const batchRows =
-              prefix !== undefined && !prefix.some((row) => row.batch_id === request.batchId)
-                ? []
-                : yield* sql<Record<string, unknown>>`
-          SELECT
-            thread_id,
-            batch_id,
-            first_sequence,
-            last_sequence,
-            batch_digest,
-            tail_digest,
-            batch_json
-          FROM effect_agent_canonical_batches
-          WHERE thread_id = ${request.threadId}
-            AND batch_id = ${request.batchId}
-        `.pipe(Effect.mapError(storageError("read idempotent batch")));
-
-            const batches = yield* decodeRows(
-              Schema.Array(BatchRow),
-              "effect_agent_canonical_batches",
-              `${request.threadId}/${request.batchId}`,
-              batchRows,
-            );
+      const replay = yield* executionConflict(executions.replay(request));
 
-            if (batches.length > 1) {
-              return yield* DoStorageCorruptionError.make({
-                table: "effect_agent_canonical_batches",
-                rowKey: `${request.threadId}/${request.batchId}`,
-                message: "A canonical batch primary key returned more than one row.",
-              });
-            }
-            if (batches.length === 1) {
-              const existing = batches[0];
-
-              if (existing.batch_digest !== request.batchDigest) {
-                return yield* DoAppendConflict.make({
-                  message: `Batch ${request.batchId} already exists with different canonical content.`,
-                  reason: "batch-digest",
-                });
-              }
+      if (replay !== undefined) return RawAppendResult.make(replay);
 
-              return RawAppendResult.make({
-                firstSequence: existing.first_sequence,
-                lastSequence: existing.last_sequence,
-                replayed: true,
-                tailDigest: existing.tail_digest,
-              });
-            }
+      const existing =
+        prefix !== undefined && !prefix.some((row) => row.batch_id === request.batchId)
+          ? undefined
+          : yield* archives.replay(request.threadId, request.batchId);
 
-            if (
-              request.expectedTailSequence !== thread.tail_sequence ||
-              request.expectedTailDigest !== thread.tail_digest
-            ) {
-              return yield* DoAppendConflict.make({
-                message:
-                  `Expected tail ${request.expectedTailSequence}/${request.expectedTailDigest} ` +
-                  `but found ${thread.tail_sequence}/${thread.tail_digest}.`,
-                reason: "tail",
-                actualTailSequence: thread.tail_sequence,
-                actualTailDigest: thread.tail_digest,
-              });
-            }
-            if (thread.tail_sequence + request.records.length > MAX_RECORDS_PER_THREAD) {
-              return yield* DoStorageError.make({
-                operation: "append canonical batch",
-                message: `Thread record limit ${MAX_RECORDS_PER_THREAD} would be exceeded.`,
-              });
-            }
+      if (existing !== undefined) {
+        if (existing.batch_json !== request.batchJson) {
+          return yield* DoAppendConflict.make({
+            message: `Batch ${request.batchId} already exists with different canonical content.`,
+            reason: "batch-content",
+          });
+        }
 
-            // Chunked to respect the Durable Object platform's 100-bound-parameter statement
-            // limit: a batch may carry up to 256 records.
-            const existingRecords: Array<RecordRow> =
-              prefix === undefined ? [] : prefix.filter((row) => recordIds.includes(row.record_id));
+        return RawAppendResult.make({
+          firstSequence: existing.first_sequence,
+          lastSequence: existing.last_sequence,
+          replayed: true,
+        });
+      }
 
-            for (const chunk of prefix === undefined
-              ? chunked(recordIds, MAX_BOUND_PARAMETERS - 10)
-              : []) {
-              const existingRecordRows = yield* sql<Record<string, unknown>>`
+      yield* executionConflict(executions.rejectSuperseded(request));
+
+      if (request.expectedTailSequence !== thread.tail_sequence) {
+        return yield* DoAppendConflict.make({
+          message:
+            `Expected tail ${request.expectedTailSequence} ` + `but found ${thread.tail_sequence}.`,
+          reason: "tail",
+          actualTailSequence: thread.tail_sequence,
+        });
+      }
+
+      // Chunked to respect the Durable Object platform's 100-bound-parameter statement
+      // limit: a batch may carry up to 256 records.
+      const existingRecords: Array<RecordRow> =
+        prefix === undefined ? [] : prefix.filter((row) => recordIds.includes(row.record_id));
+
+      for (const chunk of prefix === undefined
+        ? chunked(recordIds, MAX_BOUND_PARAMETERS - 10)
+        : []) {
+        const existingRecordRows = yield* sql<Record<string, unknown>>`
             SELECT
               thread_id,
               sequence,
               record_id,
-              batch_id,
-              record_json
+              ${recordBatchId(sql)} AS batch_id,
+              ${recordJson} AS record_json
             FROM effect_agent_canonical_records
             WHERE thread_id = ${request.threadId}
-              AND record_id IN ${sql.in([...chunk])}
-            ORDER BY sequence
+              AND record_id IN ${sql.in(chunk.map((id) => JSON.stringify(id)))}
           `.pipe(Effect.mapError(storageError("check canonical record identities")));
 
-              existingRecords.push(
-                ...(yield* decodeRows(
-                  Schema.Array(RecordRow),
-                  "effect_agent_canonical_records",
-                  `${request.threadId}/record_ids`,
-                  existingRecordRows,
-                )),
-              );
-            }
-            if (existingRecords.length > 0) {
-              return yield* DoAppendConflict.make({
-                message: `Canonical record ID ${existingRecords[0].record_id} already exists.`,
-                reason: "record-identity",
-              });
-            }
+        existingRecords.push(
+          ...(yield* decodeRows(
+            Schema.Array(RecordRow),
+            "effect_agent_canonical_records",
+            `${request.threadId}/record_ids`,
+            existingRecordRows,
+          )),
+        );
+      }
+      if (existingRecords.length > 0) {
+        return yield* DoAppendConflict.make({
+          message: `Canonical record ID ${existingRecords[0].record_id} already exists.`,
+          reason: "record-identity",
+        });
+      }
 
-            const firstSequence = yield* Schema.decodeEffect(CanonicalSequence)(
-              thread.tail_sequence + 1,
-            ).pipe(
-              Effect.mapError((error) =>
-                DoStorageError.make({
-                  cause: error,
-                  operation: "append canonical batch",
-                  message: error.message,
-                }),
-              ),
-            );
+      const firstSequence = yield* Schema.decodeEffect(CanonicalSequence)(
+        thread.tail_sequence + (request.records.length === 0 ? 0 : 1),
+      ).pipe(
+        Effect.mapError((error) =>
+          DoStorageError.make({
+            cause: error,
+            operation: "append canonical batch",
+            message: error.message,
+          }),
+        ),
+      );
 
-            const lastSequence = yield* Schema.decodeEffect(CanonicalSequence)(
-              firstSequence + request.records.length - 1,
-            ).pipe(
-              Effect.mapError((error) =>
-                DoStorageError.make({
-                  cause: error,
-                  operation: "append canonical batch",
-                  message: error.message,
-                }),
-              ),
-            );
+      const lastSequence = yield* Schema.decodeEffect(CanonicalSequence)(
+        thread.tail_sequence + request.records.length,
+      ).pipe(
+        Effect.mapError((error) =>
+          DoStorageError.make({
+            cause: error,
+            operation: "append canonical batch",
+            message: error.message,
+          }),
+        ),
+      );
 
-            yield* sql`
+      yield* executionConflict(executions.validate(request));
+      yield* validateProgress(request);
+
+      const result = RawAppendResult.make({
+        firstSequence,
+        lastSequence,
+        replayed: false,
+      });
+
+      if (request.records.length > 0) {
+        yield* sql`
           INSERT INTO effect_agent_canonical_batches (
             thread_id,
             batch_id,
             first_sequence,
             last_sequence,
-            batch_digest,
-            tail_digest,
-            batch_json
+            producer_id_json
           ) VALUES (
             ${request.threadId},
-            ${request.batchId},
+            ${JSON.stringify(request.batchId)},
             ${firstSequence},
             ${lastSequence},
-            ${request.batchDigest},
-            ${request.tailDigest},
-            ${request.batchJson}
+            ${request.producerIdJson}
           )
         `.pipe(Effect.mapError(storageError("insert canonical batch")));
-            yield* failpoint("append:after-batch-insert");
-
-            const records = yield* Effect.forEach(request.records, (record, index) =>
-              Effect.gen(function* () {
-                const canonical = yield* Schema.decodeEffect(
-                  Schema.fromJsonString(CanonicalRecord),
-                )(record.recordJson).pipe(
-                  Effect.mapError((error) =>
-                    DoStorageCorruptionError.make({
-                      table: "effect_agent_canonical_records",
-                      rowKey: record.recordId,
-                      message: error.message,
-                    }),
-                  ),
-                );
-
-                return {
-                  record,
-                  canonical,
-                  row: {
-                    thread_id: request.threadId,
-                    sequence: firstSequence + index,
-                    record_id: record.recordId,
-                    batch_id: request.batchId,
-                    record_json: record.recordJson,
-                    outstanding: canonicalRecordOutstanding(canonical),
-                  },
-                };
-              }),
-            );
+      }
+      yield* failpoint("append:after-batch-insert");
 
-            // Six bound columns per row; preserve the logical batch and every append barrier.
-            for (const group of chunked(records, Math.floor(MAX_BOUND_PARAMETERS / 6))) {
-              yield* sql`INSERT INTO effect_agent_canonical_records ${sql.insert(group.map(({ row }) => row))}`.pipe(
-                Effect.mapError(storageError("insert canonical records")),
-              );
-              for (const { canonical, row } of group) {
-                yield* indexCanonicalRecord(request.threadId, canonical, undefined, {
-                  sequence: row.sequence,
-                }).pipe(
-                  Effect.provideService(SqlClient.SqlClient, sql),
-                  Effect.mapError(storageError("index canonical record")),
-                );
-                recordCache.put(
-                  RecordRow.make({
-                    ...row,
-                    sequence: Schema.decodeSync(CanonicalSequence)(row.sequence),
-                  }),
-                );
-                yield* failpoint("append:after-record-insert");
-              }
-            }
+      const physicalRecords = yield* physical.records(
+        request.threadId,
+        firstSequence,
+        request.records,
+      );
 
-            yield* sql`
-          UPDATE effect_agent_threads
-          SET
-            tail_sequence = ${lastSequence},
-            tail_digest = ${request.tailDigest},
-            producer_epoch = ${request.producerEpoch}
-          WHERE thread_id = ${request.threadId}
-         RETURNING *`.pipe(
-              threads.write,
-              Effect.mapError((error) =>
-                error._tag === "SqlError" ? storageError("advance thread tail")(error) : error,
-              ),
-            );
-            yield* failpoint("append:after-tail-update");
-
-            // Retain one start prefix atomically with its canonical proof, before model/tool
-            // execution. Later facts stay journal-backed until the settlement publication wave.
-            if (
-              lifecycle !== undefined &&
-              records.some(
-                ({ canonical: { payload } }) =>
-                  payload._tag === "RunStarted" || payload._tag === "SubagentStarted",
-              )
-            )
-              yield* flushCanonical(request.threadId).pipe(
-                Effect.provideService(SqlLifecycleRetainer, { retainMany: lifecycle.retainMany }),
+      const records = physicalRecords.map(({ columns, memberships }, index) => ({
+        record: request.records[index]!,
+        canonical: request.records[index]!.canonical,
+        row: columns,
+        memberships,
+      }));
+
+      // Captured scalar locators avoid parsing canonical JSON under the writer.
+      // Eighteen bound columns per row stay within workerd's statement limit.
+      for (const group of chunked(records, Math.floor(MAX_BOUND_PARAMETERS / 18))) {
+        yield* sql`INSERT INTO effect_agent_canonical_records ${sql.insert(group.map(({ row }) => row))}`.pipe(
+          Effect.mapError(storageError("insert canonical records")),
+        );
+
+        const memberships = group.flatMap(({ memberships }) => memberships);
+
+        for (const members of chunked(memberships, Math.floor(MAX_BOUND_PARAMETERS / 3)))
+          yield* sql`INSERT INTO effect_agent_record_runs ${sql.insert(members)}`.pipe(
+            Effect.mapError(storageError("index canonical Run membership")),
+          );
+        for (const { row, record } of group) {
+          recordCache.put(
+            RecordRow.make({
+              ...row,
+              record_id: record.recordId,
+              batch_id: request.batchId,
+              record_json: record.recordJson,
+              sequence: Schema.decodeSync(CanonicalSequence)(row.sequence),
+            }),
+            record.recordBytes,
+          );
+          yield* failpoint("append:after-record-insert");
+        }
+      }
+
+      if (request.records.length > 0) {
+        const workFields = yield* work
+          .apply(
+            yield* Schema.decodeEffect(ThreadId)(request.threadId).pipe(
+              Effect.mapError(workFailure),
+            ),
+            firstSequence,
+            request.records.map((record) => record.canonical),
+          )
+          .pipe(Effect.mapError(workFailure));
+
+        yield* sql`UPDATE effect_agent_threads SET ${sql.update({ tail_sequence: lastSequence, ...workFields })}
+          WHERE thread_id=${request.threadId} RETURNING *`.pipe(
+          threads.write,
+          Effect.mapError((error) =>
+            error._tag === "SqlError" ? storageError("advance thread tail")(error) : error,
+          ),
+        );
+      }
+      yield* executionConflict(executions.commit(request, result));
+      if (request.executionWrites.length > 0) yield* failpoint("append:after-record-insert");
+      if (
+        lifecycle !== undefined &&
+        request.executionWrites.some(({ update }) =>
+          update.facts.some(({ payload }) => payload._tag === "RunStarted"),
+        )
+      )
+        yield* flushCanonical(request.threadId).pipe(
+          Effect.provideService(SqlLifecycleRetainer, { retainMany: lifecycle.retainMany }),
+          Effect.mapError((cause) =>
+            DoStorageError.make({
+              operation: "retain lifecycle start prefix",
+              message: "Lifecycle start intent could not be retained",
+              cause,
+            }),
+          ),
+        );
+      for (const { update } of request.executionWrites) {
+        for (const fact of update.facts) {
+          if (
+            lifecycle !== undefined &&
+            Schema.is(Schema.toType(LifecyclePublicationFact))(fact.payload)
+          )
+            yield* lifecycle
+              .retain({
+                id: JSON.stringify([request.threadId, "record", fact.recordId]),
+                ownerThreadId: request.threadId,
+                canonicalSequence: lastSequence,
+                createdAt: fact.createdAt,
+                fact: fact.payload,
+              })
+              .pipe(
                 Effect.mapError((cause) =>
                   DoStorageError.make({
-                    operation: "retain lifecycle start prefix",
-                    message: "Lifecycle start intent could not be retained",
+                    operation: "retain operational lifecycle",
+                    message: cause.message,
                     cause,
                   }),
                 ),
               );
+        }
+      }
+      yield* failpoint("append:after-tail-update");
+
+      // Retain one start prefix atomically with its canonical proof, before model/tool
+      // execution. Later facts stay journal-backed until the settlement publication wave.
+      if (
+        lifecycle !== undefined &&
+        records.some(
+          ({ canonical: { payload } }) =>
+            payload._tag === "RunStarted" || payload._tag === "SubagentStarted",
+        )
+      )
+        yield* flushCanonical(request.threadId).pipe(
+          Effect.provideService(SqlLifecycleRetainer, { retainMany: lifecycle.retainMany }),
+          Effect.mapError((cause) =>
+            DoStorageError.make({
+              operation: "retain lifecycle start prefix",
+              message: "Lifecycle start intent could not be retained",
+              cause,
+            }),
+          ),
+        );
 
-            yield* progress.committed("canonical").pipe(
-              Effect.catchCause((cause) =>
-                Effect.failCause(
-                  Cause.map(cause, (error) =>
-                    DoStorageError.make({
-                      operation: "enroll canonical progress",
-                      message: error.message,
-                      cause: error,
-                    }),
-                  ),
-                ),
-              ),
-            );
+      yield* progress.committed("canonical").pipe(
+        Effect.catchCause((cause) =>
+          Effect.failCause(
+            Cause.map(cause, (error) =>
+              DoStorageError.make({
+                operation: "enroll canonical progress",
+                message: error.message,
+                cause: error,
+              }),
+            ),
+          ),
+        ),
+      );
+
+      return result;
+    });
+
+    const append = Effect.fnUntraced(
+      function* (
+        request: RawAppendRequest,
+        observed: ThreadRow,
+      ): Effect.fn.Return<RawAppendResult, AppendError> {
+        yield* prepareAppend(request);
+        // The facade already read this tail. Reject a known stale writer without opening a
+        // transaction; a matching tail is still checked atomically below. Replays precede tail
+        // conflicts, preserving retry identity even after the log has advanced.
+        if (request.records.length > 0 && request.expectedTailSequence !== observed.tail_sequence) {
+          const batches = yield* sql`
+          SELECT batch_id FROM effect_agent_canonical_batches
+          WHERE thread_id = ${request.threadId} AND batch_id = ${JSON.stringify(request.batchId)}
+          UNION ALL SELECT last_commit_id FROM effect_agent_executions
+          WHERE thread_id = ${request.threadId} AND last_commit_id = ${request.batchId}
+          LIMIT 1
+        `.pipe(Effect.mapError(storageError("preflight append replay")));
 
-            return RawAppendResult.make({
-              firstSequence,
-              lastSequence,
-              replayed: false,
-              tailDigest: request.tailDigest,
+          // A possible replay still checks exact content in the transaction.
+          if (batches.length === 0) {
+            return yield* DoAppendConflict.make({
+              reason: "tail",
+              message: "The canonical tail has advanced.",
+              actualTailSequence: observed.tail_sequence,
             });
-          }),
-        );
+          }
+        }
+
+        return yield* withWriteTransaction(
+          "append transaction",
+          isAppendContention,
+        )(appendPrepared(request));
       },
       withStorageSpan("DoJournal.append", isAppendContention),
     );
@@ -1611,7 +969,7 @@ const makeJournal = (
       const planRows = yield* sql<Record<string, unknown>>`
       SELECT
         sequence,
-        length(CAST(record_json AS BLOB)) AS record_json_bytes
+        length(CAST(${recordJson} AS BLOB)) AS record_json_bytes
       FROM effect_agent_canonical_records
       WHERE thread_id = ${request.threadId}
         AND sequence > ${request.fromSequenceExclusive}
@@ -1655,9 +1013,9 @@ const makeJournal = (
         }
       }
 
-      const readPage = Effect.fn("DoJournal.readPage")(function* (page: ReadPage) {
+      const readPage = Effect.fnUntraced(function* (page: ReadPage) {
         const rows = yield* sql<Record<string, unknown>>`
-        SELECT thread_id, sequence, record_id, batch_id, record_json
+        SELECT thread_id, sequence, record_id, ${recordBatchId(sql)} AS batch_id, ${recordJson} AS record_json
         FROM effect_agent_canonical_records
         WHERE thread_id = ${request.threadId}
           AND sequence >= ${page[0].sequence}
@@ -1698,80 +1056,7 @@ const makeJournal = (
       };
     });
 
-    const exportThread = Effect.fn("DoJournal.exportThread")(function* (threadId: string) {
-      return yield* state
-        .transaction(
-          Effect.gen(function* () {
-            const threadRows = yield* getThread(threadId);
-
-            const thread = yield* decodeSingleRow(
-              Schema.Array(ThreadRow),
-              "effect_agent_threads",
-              threadId,
-              threadRows,
-            );
-
-            yield* failpoint("export:after-thread-read");
-
-            if (thread.tail_sequence > MAX_RECORDS_PER_THREAD)
-              return yield* DoStorageError.make({
-                operation: "export thread",
-                message: "The thread exceeds the current export record limit.",
-              });
-            const records: Array<RecordRow> = [];
-            let afterSequence = ZERO_SEQUENCE;
-
-            while (afterSequence < thread.tail_sequence) {
-              const limit = Math.min(1_024, thread.tail_sequence - afterSequence);
-
-              const request = RawReadRequest.make({
-                threadId,
-                fromSequenceExclusive: afterSequence,
-                limit,
-              });
-
-              const plan = yield* read(request);
-              const page = yield* Stream.runCollect(plan.records);
-
-              if (
-                page.length !== limit ||
-                page.some((record, index) => record.sequence !== afterSequence + index + 1)
-              ) {
-                return yield* DoStorageCorruptionError.make({
-                  table: "effect_agent_canonical_records",
-                  rowKey: threadId,
-                  message:
-                    "The exported canonical prefix is not contiguous through its captured tail.",
-                });
-              }
-              records.push(...page);
-              afterSequence = page[page.length - 1].sequence;
-            }
-
-            const beyondTail =
-              yield* sql`SELECT sequence FROM effect_agent_canonical_records WHERE thread_id=${threadId} AND sequence > ${thread.tail_sequence} LIMIT 1`.pipe(
-                Effect.mapError(storageError("verify export tail")),
-              );
-
-            if (beyondTail.length !== 0)
-              return yield* DoStorageCorruptionError.make({
-                table: "effect_agent_canonical_records",
-                rowKey: threadId,
-                message: "Canonical records exist beyond the captured thread tail.",
-              });
-
-            return RawThreadExport.make({ thread, records });
-          }),
-        )
-        .pipe(
-          Effect.provideService(SqlClient.SqlClient, sql),
-          Effect.catchTag("SqlError", (error) =>
-            Effect.fail(storageError("export transaction")(error)),
-          ),
-        );
-    });
-
-    const saveCheckpoint = Effect.fn("DoJournal.saveCheckpoint")(function* (
+    const saveCheckpoint = Effect.fnUntraced(function* (
       checkpoint: RawCheckpoint,
     ): Effect.fn.Return<void, CheckpointError> {
       if (checkpoint.threadId.length > MAX_IDENTIFIER_LENGTH) {
@@ -1794,17 +1079,24 @@ const makeJournal = (
 
           if (checkpoint.throughSequence > thread.tail_sequence) {
             return yield* DoCheckpointConflict.make({
+              reason: "ahead-of-tail",
               message:
                 `Checkpoint sequence ${checkpoint.throughSequence} is after canonical tail ` +
                 `${thread.tail_sequence}.`,
             });
           }
 
+          if (!(yield* isBatchBoundary(checkpoint.threadId, checkpoint.throughSequence))) {
+            return yield* DoCheckpointConflict.make({
+              reason: "not-batch-boundary",
+              message: "Checkpoint sequence is not the end of a complete canonical batch.",
+            });
+          }
+
           const checkpointRows = yield* sql<Record<string, unknown>>`
           SELECT
             thread_id,
             through_sequence,
-            tail_digest,
             checkpoint_json
           FROM effect_agent_checkpoints
           WHERE thread_id = ${checkpoint.threadId}
@@ -1826,11 +1118,9 @@ const makeJournal = (
             });
           }
           if (existing.length === 1) {
-            if (
-              existing[0].tail_digest !== checkpoint.tailDigest ||
-              existing[0].checkpoint_json !== checkpoint.checkpointJson
-            ) {
+            if (existing[0].checkpoint_json !== checkpoint.checkpointJson) {
               return yield* DoCheckpointConflict.make({
+                reason: "corrupt",
                 message: "A different checkpoint already exists at this canonical sequence.",
               });
             }
@@ -1842,12 +1132,10 @@ const makeJournal = (
           INSERT INTO effect_agent_checkpoints (
             thread_id,
             through_sequence,
-            tail_digest,
             checkpoint_json
           ) VALUES (
             ${checkpoint.threadId},
             ${checkpoint.throughSequence},
-            ${checkpoint.tailDigest},
             ${checkpoint.checkpointJson}
           )
         `.pipe(Effect.mapError(storageError("insert checkpoint")));
@@ -1855,84 +1143,7 @@ const makeJournal = (
       );
     });
 
-    const saveRecoveryCheckpoint = Effect.fn("DoJournal.saveRecoveryCheckpoint")(function* (
-      request: SaveRecoveryCheckpointRequest,
-      checkpointJson: string,
-    ) {
-      const { checkpoint } = request;
-
-      if (checkpoint.threadId.length > MAX_IDENTIFIER_LENGTH) {
-        return yield* DoStorageError.make({
-          operation: "save recovery checkpoint",
-          message: "Checkpoint identity exceeds the Durable Object storage bounds.",
-        });
-      }
-      yield* checkValueBound("save recovery checkpoint", checkpointJson);
-      // Keep injected waits outside the storage-backed transaction callback.
-      yield* failpoint("save-recovery-checkpoint:before");
-      yield* withWriteTransaction("recovery checkpoint transaction")(
-        Effect.gen(function* () {
-          const threads = yield* getThread(checkpoint.threadId);
-          const thread = threads[0];
-
-          if (thread === undefined)
-            return yield* ThreadNotMaterialized.make({ threadId: checkpoint.threadId });
-          if (request.producerEpoch !== thread.producer_epoch)
-            return yield* FenceRejected.make({
-              threadId: checkpoint.threadId,
-              actualEpoch: thread.producer_epoch,
-              attemptedEpoch: request.producerEpoch,
-            });
-          if (checkpoint.throughSequence > thread.tail_sequence)
-            return yield* CheckpointRejected.make({
-              threadId: checkpoint.threadId,
-              reason: "ahead-of-tail",
-            });
-
-          const digests =
-            checkpoint.throughSequence === 0
-              ? [EMPTY_TAIL_DIGEST]
-              : yield* getTailDigestAt(checkpoint.threadId, checkpoint.throughSequence);
-
-          if (digests.length !== 1 || digests[0] !== checkpoint.tailDigest)
-            return yield* CheckpointRejected.make({
-              threadId: checkpoint.threadId,
-              reason: "digest-mismatch",
-            });
-
-          yield* sql`
-          INSERT INTO effect_agent_recovery_checkpoints (thread_id, through_sequence, tail_digest, checkpoint_json)
-          VALUES (${checkpoint.threadId}, ${checkpoint.throughSequence}, ${checkpoint.tailDigest}, ${checkpointJson})
-          ON CONFLICT (thread_id) DO UPDATE SET
-            through_sequence = excluded.through_sequence,
-            tail_digest = excluded.tail_digest,
-            checkpoint_json = excluded.checkpoint_json
-          WHERE excluded.through_sequence >= effect_agent_recovery_checkpoints.through_sequence
-          RETURNING *
-        `.pipe(
-            recovery.write,
-            Effect.mapError((error) =>
-              error._tag === "SqlError" ? storageError("save recovery checkpoint")(error) : error,
-            ),
-          );
-        }),
-      );
-      yield* failpoint("save-recovery-checkpoint:after");
-    });
-
-    const loadRecoveryCheckpoint = Effect.fn("DoJournal.loadRecoveryCheckpoint")(function* (
-      threadId: string,
-    ) {
-      return yield* recovery
-        .by("thread_id", threadId)
-        .pipe(
-          Effect.mapError((error) =>
-            error._tag === "SqlError" ? storageError("load recovery checkpoint")(error) : error,
-          ),
-        );
-    });
-
-    const loadCheckpoint = Effect.fn("DoJournal.loadCheckpoint")(function* (
+    const loadCheckpoint = Effect.fnUntraced(function* (
       threadId: string,
       atOrBeforeSequence: CanonicalSequence,
     ) {
@@ -1940,7 +1151,6 @@ const makeJournal = (
       SELECT
         thread_id,
         through_sequence,
-        tail_digest,
         checkpoint_json
       FROM effect_agent_checkpoints
       WHERE thread_id = ${threadId}
@@ -1957,136 +1167,30 @@ const makeJournal = (
       );
     });
 
-    const getTailDigestAt = Effect.fn("DoJournal.getTailDigestAt")(function* (
+    const isBatchBoundary = Effect.fnUntraced(function* (
       threadId: string,
       sequence: CanonicalSequence,
     ) {
-      const thread = (yield* getThread(threadId))[0];
-
-      if (thread !== undefined && sequence === thread.tail_sequence) return [thread.tail_digest];
-      if (sequence === 0) {
-        const threads = yield* getThread(threadId);
-
-        return threads.length === 0
-          ? []
-          : [threads[0].tail_sequence === 0 ? threads[0].tail_digest : undefined].filter(
-              (value): value is string => value !== undefined,
-            );
-      }
+      if (sequence === 0) return true;
 
-      // Resolve both primary keys; last_sequence alone scans the Thread's archived batches.
-      // Retain the batch-end predicate so an interior record cannot certify a checkpoint.
       const rows = yield* sql<Record<string, unknown>>`
-      SELECT
-        thread_id,
-        batch_id,
-        first_sequence,
-        last_sequence,
-        batch_digest,
-        tail_digest,
-        batch_json
-      FROM effect_agent_canonical_batches
-      WHERE thread_id = ${threadId}
-        AND batch_id = (
-          SELECT batch_id FROM effect_agent_canonical_records
-          WHERE thread_id = ${threadId} AND sequence = ${sequence}
-        )
-        AND last_sequence = ${sequence}
-    `.pipe(Effect.mapError(storageError("read canonical digest at sequence")));
+        SELECT last_sequence FROM effect_agent_canonical_batches
+        WHERE thread_id = ${threadId}
+          AND batch_id = (
+            SELECT ${recordBatchId(sql)} FROM effect_agent_canonical_records
+            WHERE thread_id = ${threadId} AND sequence = ${sequence}
+          )
+          AND last_sequence = ${sequence}
+      `.pipe(Effect.mapError(storageError("read canonical batch boundary")));
 
       const batches = yield* decodeRows(
-        Schema.Array(BatchRow),
+        Schema.Array(Schema.Struct({ last_sequence: CanonicalSequence })),
         "effect_agent_canonical_batches",
         `${threadId}/${sequence}`,
         rows,
       );
 
-      return batches.map((batch) => batch.tail_digest);
-    });
-
-    const scanStoredPayloads = Effect.fn("DoJournal.scanStoredPayloads")(function* () {
-      return yield* state
-        .transaction(
-          Effect.gen(function* () {
-            const threads = yield* sql<Record<string, unknown>>`
-            SELECT
-              thread_id,
-              created_at,
-              tail_sequence,
-              tail_digest,
-              producer_epoch
-            FROM effect_agent_threads
-            ORDER BY thread_id
-          `.pipe(Effect.mapError(storageError("scan threads")));
-
-            const batches = yield* sql<Record<string, unknown>>`
-            SELECT
-              thread_id,
-              batch_id,
-              first_sequence,
-              last_sequence,
-              batch_digest,
-              tail_digest,
-              batch_json
-            FROM effect_agent_canonical_batches
-            ORDER BY thread_id, first_sequence
-          `.pipe(Effect.mapError(storageError("scan canonical batches")));
-
-            const records = yield* sql<Record<string, unknown>>`
-            SELECT
-              thread_id,
-              sequence,
-              record_id,
-              batch_id,
-              record_json
-            FROM effect_agent_canonical_records
-            ORDER BY thread_id, sequence
-          `.pipe(Effect.mapError(storageError("scan canonical records")));
-
-            const checkpoints = yield* sql<Record<string, unknown>>`
-            SELECT
-              thread_id,
-              through_sequence,
-              tail_digest,
-              checkpoint_json
-            FROM effect_agent_checkpoints
-            ORDER BY thread_id, through_sequence
-          `.pipe(Effect.mapError(storageError("scan checkpoints")));
-
-            return {
-              threads: yield* decodeRows(
-                Schema.Array(ThreadRow),
-                "effect_agent_threads",
-                "startup_scan",
-                threads,
-              ),
-              batches: yield* decodeRows(
-                Schema.Array(BatchRow),
-                "effect_agent_canonical_batches",
-                "startup_scan",
-                batches,
-              ),
-              records: yield* decodeRows(
-                Schema.Array(RecordRow),
-                "effect_agent_canonical_records",
-                "startup_scan",
-                records,
-              ),
-              checkpoints: yield* decodeRows(
-                Schema.Array(CheckpointRow),
-                "effect_agent_checkpoints",
-                "startup_scan",
-                checkpoints,
-              ),
-            };
-          }),
-        )
-        .pipe(
-          Effect.provideService(SqlClient.SqlClient, sql),
-          Effect.catchTag("SqlError", (error) =>
-            Effect.fail(storageError("startup scan transaction")(error)),
-          ),
-        );
+      return batches.length === 1;
     });
 
     const sourceFailure = (cause: unknown) =>
@@ -2095,8 +1199,8 @@ const makeJournal = (
     const sourceThreads = Effect.fnUntraced(function* () {
       const all = yield* threads.matching(
         "lifecycle-owners",
-        () => true,
-        sql`SELECT * FROM effect_agent_threads LIMIT 129`,
+        (row) => row.created_at !== null,
+        sql`SELECT * FROM effect_agent_threads WHERE created_at IS NOT NULL LIMIT 129`,
         128,
       );
 
@@ -2105,7 +1209,7 @@ const makeJournal = (
       // Large custom hosts hydrate only owners whose journal has an unmaterialized suffix.
       return yield* Schema.decodeUnknownEffect(Schema.Array(ThreadRow))(
         yield* sql`SELECT t.* FROM effect_agent_threads t LEFT JOIN effect_agent_lifecycle_cursors c ON c.thread_id=t.thread_id
-        WHERE c.thread_id IS NULL OR t.tail_sequence > c.through_sequence ORDER BY t.thread_id LIMIT 128`,
+        WHERE t.created_at IS NOT NULL AND (c.thread_id IS NULL OR t.tail_sequence > c.through_sequence) ORDER BY t.thread_id LIMIT 128`,
       );
     });
 
@@ -2127,7 +1231,7 @@ const makeJournal = (
             // New Threads created with publication disabled have no cursor. Never advance
             // existing cursors: they can owe intent from an interrupted Attempt.
             yield* sql`INSERT INTO effect_agent_lifecycle_cursors(thread_id, through_sequence)
-        SELECT thread_id, tail_sequence FROM effect_agent_threads WHERE true
+        SELECT thread_id, tail_sequence FROM effect_agent_threads WHERE created_at IS NOT NULL
         ON CONFLICT(thread_id) DO NOTHING`;
             yield* sourceThreads();
           }),
@@ -2253,6 +1357,9 @@ const makeJournal = (
           };
 
     return {
+      archives: archives.storage,
+      archiveRanges: archives,
+      work,
       state,
       owner,
       threads,
@@ -2261,18 +1368,19 @@ const makeJournal = (
       flushCanonical,
       flushPublications,
       append,
+      prepareAppend,
+      appendPrepared,
+      checkCommitIntent: (request: RawAppendRequest) =>
+        executionConflict(executions.checkCommitIntent(request)),
+      readExecution: executions.read,
       checkValueBound,
-      exportThread,
       getThread,
       hasRecord,
-      getTailDigestAt,
+      isBatchBoundary,
       loadCheckpoint,
-      loadRecoveryCheckpoint,
-      saveRecoveryCheckpoint,
       materialize,
       read: (request: RawReadRequest) => state.read(read(request)),
       saveCheckpoint,
-      scanStoredPayloads,
       withWriteTransaction,
     } as const;
   });