@yielded/agent-storage-cloudflare 0.1.0-beta.172 → 0.1.0-beta.174

package/src/internal/do-journal.ts

@@ -356,173 +356,172 @@ const ensureCurrentStorage = Effect.fnUntraced(function* (
   return journal;
 });
 
-const makeJournal = (
+const makeJournal = Effect.fnUntraced(function* (
   sql: SqlClient.SqlClient,
   failpoint: DoJournalFailpoint,
   maxStoredValueBytes: number,
   lifecycle: Effect.Success<ReturnType<typeof makeSqlLifecyclePublication>>,
   state: OwnedState,
-) =>
-  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,
-            }),
-          ),
+) {
+  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));
+      ),
+  }).pipe(Effect.provideService(SqlClient.SqlClient, sql));
 
-    yield* Effect.acquireRelease(
-      Effect.sync(() => state.invalidators.add(work.invalidate)),
-      () => Effect.sync(() => state.invalidators.delete(work.invalidate)),
-    );
+  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 workFailure = (cause: unknown) =>
+    DoStorageError.make({
+      operation: "publish Thread work",
+      message: "Canonical work metadata could not be published",
+      cause,
+    });
 
-    const executions = yield* makeSqlExecutions().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 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 cursors = lifecycleCursorRows(state, sql);
-    let records = recordCaches.get(state);
+  const threads = threadRows(state, sql);
+  const cursors = lifecycleCursorRows(state, sql);
+  let records = recordCaches.get(state);
 
-    if (records === undefined) {
-      records = makeRecordCache();
-      recordCaches.set(state, records);
-      state.invalidators.add(records.clear);
-    }
-    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,
-            }),
-          ),
+  if (records === undefined) {
+    records = makeRecordCache();
+    recordCaches.set(state, records);
+    state.invalidators.add(records.clear);
+  }
+  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));
+      ),
+  }).pipe(Effect.provideService(SqlClient.SqlClient, sql));
 
-    const recordJson = canonicalRecordJson(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> => {
-      return actualBytes > maxStoredValueBytes
-        ? Effect.fail(
-            DoValueBoundExceeded.make({
-              actualBytes,
-              maxBytes: maxStoredValueBytes,
-              operation,
-            }),
-          )
-        : Effect.void;
-    };
+  const physical = yield* makeCanonicalStorage().pipe(
+    Effect.provideService(SqlClient.SqlClient, sql),
+  );
 
-    /**
-     * Runs one journal write transaction on the Durable Object storage-backed
-     * `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.
-     * 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
-     * transaction. Expected outcomes may be captured only when every such refusal precedes
-     * mutation; real faults still roll back. Successful preflight reads never authorize a write.
-     */
-    const withWriteTransaction =
-      (operation: string, expected: (error: { readonly _tag: string }) => boolean = () => false) =>
-      <A, E extends { readonly _tag: string }>(
-        effect: Effect.Effect<A, E>,
-      ): Effect.Effect<A, E | DoStorageError> =>
-        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),
-          Effect.withSpan("DoJournal.withWriteTransaction", { attributes: { operation } }),
-          Effect.flatMap(Effect.fromResult),
-        );
+  /** 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> => {
+    return actualBytes > maxStoredValueBytes
+      ? Effect.fail(
+          DoValueBoundExceeded.make({
+            actualBytes,
+            maxBytes: maxStoredValueBytes,
+            operation,
+          }),
+        )
+      : Effect.void;
+  };
 
-    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);
+  /**
+   * Runs one journal write transaction on the Durable Object storage-backed
+   * `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.
+   * 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
+   * transaction. Expected outcomes may be captured only when every such refusal precedes
+   * mutation; real faults still roll back. Successful preflight reads never authorize a write.
+   */
+  const withWriteTransaction =
+    (operation: string, expected: (error: { readonly _tag: string }) => boolean = () => false) =>
+    <A, E extends { readonly _tag: string }>(
+      effect: Effect.Effect<A, E>,
+    ): Effect.Effect<A, E | DoStorageError> =>
+      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),
+        Effect.withSpan("DoJournal.withWriteTransaction", { attributes: { operation } }),
+        Effect.flatMap(Effect.fromResult),
+      );
 
-      if (current.length === 1) {
-        return;
-      }
-      yield* withWriteTransaction("materialize transaction")(
-        Effect.gen(function* () {
-          const existingRows = yield* getThread(threadId);
+  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);
 
-          const existing = yield* decodeRows(
-            Schema.Array(ThreadRow),
-            "effect_agent_threads",
-            threadId,
-            existingRows,
-          );
+    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,
+        );
 
-          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,
@@ -534,215 +533,178 @@ const makeJournal = (
             ) ON CONFLICT(thread_id) DO UPDATE SET created_at=excluded.created_at
               WHERE effect_agent_threads.created_at IS NULL
            RETURNING *`.pipe(
-              threads.write,
+            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)
+              VALUES (${threadId}, 0) RETURNING *`.pipe(
+              cursors.write,
               Effect.mapError((error) =>
-                error._tag === "SqlError" ? storageError("materialize thread")(error) : error,
+                error._tag === "SqlError"
+                  ? storageError("initialize lifecycle source")(error)
+                  : error,
               ),
             );
 
-            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;
-          }
-        }),
-      );
-    }, 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 && row.created_at !== null);
-    });
-
-    const hasRecord = Effect.fnUntraced(function* (threadId: string, recordId: string) {
-      const thread = (yield* getThread(threadId))[0];
-      const prefix = recordCache.prefix(threadId, thread?.tail_sequence ?? 0);
+          return;
+        }
+      }),
+    );
+  }, withStorageSpan("DoJournal.materialize"));
 
-      if (prefix !== undefined) return prefix.some((row) => row.record_id === recordId);
+  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 && row.created_at !== null);
+  });
 
-      const rows = yield* sql`SELECT record_id FROM effect_agent_canonical_records
-      WHERE thread_id = ${threadId} AND record_id = ${JSON.stringify(recordId)}`.pipe(
-        Effect.mapError(storageError("read canonical record identity")),
-      );
+  const hasRecord = Effect.fnUntraced(function* (threadId: string, recordId: string) {
+    const thread = (yield* getThread(threadId))[0];
+    const prefix = recordCache.prefix(threadId, thread?.tail_sequence ?? 0);
 
-      return rows.length > 0;
-    });
+    if (prefix !== undefined) return prefix.some((row) => row.record_id === recordId);
 
-    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",
-          });
-      }
-      for (const write of request.executionWrites)
-        yield* checkValueBound("commit active execution", write.json, write.bytes);
+    const rows = yield* sql`SELECT record_id FROM effect_agent_canonical_records
+      WHERE thread_id = ${threadId} AND record_id = ${JSON.stringify(recordId)}`.pipe(
+      Effect.mapError(storageError("read canonical record identity")),
+    );
 
-      const recordIds: Array<string> = request.records.map((record) => record.recordId);
+    return rows.length > 0;
+  });
 
-      if (new Set(recordIds).size !== recordIds.length) {
-        return yield* DoAppendConflict.make({
-          message: `Batch ${request.batchId} contains duplicate canonical record IDs.`,
-          reason: "record-identity",
+  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",
         });
-      }
-
-      return request;
-    });
+    }
+    for (const write of request.executionWrites)
+      yield* checkValueBound("commit active execution", write.json, write.bytes);
 
-    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 recordIds: Array<string> = request.records.map((record) => record.recordId);
 
-      const thread = threadRows.length === 1 ? threadRows[0] : undefined;
+    if (new Set(recordIds).size !== recordIds.length) {
+      return yield* DoAppendConflict.make({
+        message: `Batch ${request.batchId} contains duplicate canonical record IDs.`,
+        reason: "record-identity",
+      });
+    }
 
-      if (thread === undefined)
-        return yield* DoStorageCorruptionError.make({
-          table: "effect_agent_threads",
-          rowKey: request.threadId,
-          message: `Expected exactly one row but found ${threadRows.length}.`,
-        });
+    return request;
+  });
 
-      const prefix = recordCache.prefix(request.threadId, thread.tail_sequence);
+  const appendPrepared = Effect.fnUntraced(function* (
+    request: RawAppendRequest,
+  ): Effect.fn.Return<RawAppendResult, AppendError> {
+    const threadRows = yield* getThread(request.threadId);
 
-      const replay = yield* executionConflict(executions.replay(request));
+    const thread = threadRows.length === 1 ? threadRows[0] : undefined;
 
-      if (replay !== undefined) return RawAppendResult.make(replay);
+    if (thread === undefined)
+      return yield* DoStorageCorruptionError.make({
+        table: "effect_agent_threads",
+        rowKey: request.threadId,
+        message: `Expected exactly one row but found ${threadRows.length}.`,
+      });
 
-      const existing =
-        prefix !== undefined && !prefix.some((row) => row.batch_id === request.batchId)
-          ? undefined
-          : yield* archives.replay(request.threadId, request.batchId);
+    const prefix = recordCache.prefix(request.threadId, thread.tail_sequence);
 
-      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",
-          });
-        }
+    const replay = yield* executionConflict(executions.replay(request));
 
-        return RawAppendResult.make({
-          firstSequence: existing.first_sequence,
-          lastSequence: existing.last_sequence,
-          replayed: true,
-        });
-      }
+    if (replay !== undefined) return RawAppendResult.make(replay);
 
-      yield* executionConflict(executions.rejectSuperseded(request));
+    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) {
+    if (existing !== undefined) {
+      if (existing.batch_json !== request.batchJson) {
         return yield* DoAppendConflict.make({
-          message:
-            `Expected tail ${request.expectedTailSequence} ` + `but found ${thread.tail_sequence}.`,
-          reason: "tail",
-          actualTailSequence: thread.tail_sequence,
+          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>>`
-            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 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",
-        });
-      }
+    yield* executionConflict(executions.rejectSuperseded(request));
 
-      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,
-          }),
-        ),
-      );
+    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,
+      });
+    }
 
-      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,
-          }),
-        ),
-      );
+    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,
+        }),
+      ),
+    );
 
-      yield* executionConflict(executions.validate(request));
+    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,
+        }),
+      ),
+    );
 
-      const result = RawAppendResult.make({
-        firstSequence,
-        lastSequence,
-        replayed: false,
-      });
+    yield* executionConflict(executions.validate(request));
 
-      if (request.records.length > 0) {
-        yield* sql`
+    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,
@@ -757,162 +719,168 @@ const makeJournal = (
             ${request.producerIdJson}
           )
         `.pipe(Effect.mapError(storageError("insert canonical batch")));
-      }
-      yield* failpoint("append:after-batch-insert");
+    }
+    yield* failpoint("append:after-batch-insert");
 
-      const physicalRecords = yield* physical.records(
-        request.threadId,
-        firstSequence,
-        request.records,
-      );
+    const physicalRecords = yield* physical.records(
+      request.threadId,
+      firstSequence,
+      request.records,
+    );
 
-      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(
+    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))) {
+      const inserted =
+        yield* sql`INSERT INTO effect_agent_canonical_records ${sql.insert(group.map(({ row }) => row))}
+        ON CONFLICT(thread_id, record_id) DO NOTHING RETURNING 1`.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 (inserted.length !== group.length)
+        return yield* DoAppendConflict.make({
+          message: "A canonical record ID already exists.",
+          reason: "record-identity",
+        });
 
-      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));
+      const memberships = group.flatMap(({ memberships }) => memberships);
 
-        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,
-          ),
+      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")),
         );
-      }
-      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 { 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,
         );
-      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 operational lifecycle",
-                    message: cause.message,
-                    cause,
-                  }),
-                ),
-              );
-        }
+        yield* failpoint("append:after-record-insert");
       }
-      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",
+    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 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) =>
+    )
+      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: "retain lifecycle start prefix",
-              message: "Lifecycle start intent could not be retained",
-              cause,
+              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;
-    });
+    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`
+  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
@@ -920,47 +888,47 @@ const makeJournal = (
           LIMIT 1
         `.pipe(Effect.mapError(storageError("preflight append replay")));
 
-          // 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,
-            });
-          }
+        // 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),
-    );
+      return yield* withWriteTransaction(
+        "append transaction",
+        isAppendContention,
+      )(appendPrepared(request));
+    },
+    withStorageSpan("DoJournal.append", isAppendContention),
+  );
 
-    const read = Effect.fnUntraced(function* (request: RawReadRequest) {
-      const thread = (yield* getThread(request.threadId))[0];
+  const read = Effect.fnUntraced(function* (request: RawReadRequest) {
+    const thread = (yield* getThread(request.threadId))[0];
 
-      const through = Math.min(
-        thread?.tail_sequence ?? 0,
-        request.fromSequenceExclusive + request.limit,
-      );
+    const through = Math.min(
+      thread?.tail_sequence ?? 0,
+      request.fromSequenceExclusive + request.limit,
+    );
 
-      const cached: Array<RecordRow> = [];
+    const cached: Array<RecordRow> = [];
 
-      for (let sequence = request.fromSequenceExclusive + 1; sequence <= through; sequence++) {
-        const record = recordCache.get(request.threadId, sequence);
+    for (let sequence = request.fromSequenceExclusive + 1; sequence <= through; sequence++) {
+      const record = recordCache.get(request.threadId, sequence);
 
-        if (record === undefined) break;
-        cached.push(record);
-      }
-      if (cached.length === Math.max(0, through - request.fromSequenceExclusive)) {
-        return { count: cached.length, records: Stream.fromIterable(cached) };
-      }
+      if (record === undefined) break;
+      cached.push(record);
+    }
+    if (cached.length === Math.max(0, through - request.fromSequenceExclusive)) {
+      return { count: cached.length, records: Stream.fromIterable(cached) };
+    }
 
-      // Capture membership without retaining payloads. Append-only sequences keep each later
-      // payload query inside this snapshot, even when new records arrive during consumption.
-      const planRows = yield* sql<Record<string, unknown>>`
+    // Capture membership without retaining payloads. Append-only sequences keep each later
+    // payload query inside this snapshot, even when new records arrive during consumption.
+    const planRows = yield* sql<Record<string, unknown>>`
       SELECT
         sequence,
         length(CAST(${recordJson} AS BLOB)) AS record_json_bytes
@@ -971,44 +939,43 @@ const makeJournal = (
       LIMIT ${request.limit}
     `.pipe(Effect.mapError(storageError("read canonical records")));
 
-      const plan = yield* decodeRows(
-        Schema.Array(ReadPlanRow),
-        "effect_agent_canonical_records",
-        `${request.threadId}>${request.fromSequenceExclusive}`,
-        planRows,
-        "ReadPlanRow",
-      );
+    const plan = yield* decodeRows(
+      Schema.Array(ReadPlanRow),
+      "effect_agent_canonical_records",
+      `${request.threadId}>${request.fromSequenceExclusive}`,
+      planRows,
+      "ReadPlanRow",
+    );
 
-      const mismatch = () =>
-        DoStorageCorruptionError.make({
-          table: "effect_agent_canonical_records",
-          rowKey: `${request.threadId}>${request.fromSequenceExclusive}`,
-          message:
-            "Canonical read membership, sequence, or payload size changed from its read plan.",
-        });
+    const mismatch = () =>
+      DoStorageCorruptionError.make({
+        table: "effect_agent_canonical_records",
+        rowKey: `${request.threadId}>${request.fromSequenceExclusive}`,
+        message: "Canonical read membership, sequence, or payload size changed from its read plan.",
+      });
 
-      if (plan.length > request.limit) return yield* mismatch();
-
-      const pages: Array<ReadPage> = [];
-      let page: ReadPage | undefined;
-      let pageBytes = 0;
-      let previousSequence = request.fromSequenceExclusive;
-
-      for (const row of plan) {
-        if (row.sequence !== previousSequence + 1) return yield* mismatch();
-        previousSequence = row.sequence;
-        if (page === undefined || pageBytes + row.record_json_bytes > MAX_READ_PAGE_JSON_BYTES) {
-          page = [row];
-          pages.push(page);
-          pageBytes = row.record_json_bytes;
-        } else {
-          page.push(row);
-          pageBytes += row.record_json_bytes;
-        }
+    if (plan.length > request.limit) return yield* mismatch();
+
+    const pages: Array<ReadPage> = [];
+    let page: ReadPage | undefined;
+    let pageBytes = 0;
+    let previousSequence = request.fromSequenceExclusive;
+
+    for (const row of plan) {
+      if (row.sequence !== previousSequence + 1) return yield* mismatch();
+      previousSequence = row.sequence;
+      if (page === undefined || pageBytes + row.record_json_bytes > MAX_READ_PAGE_JSON_BYTES) {
+        page = [row];
+        pages.push(page);
+        pageBytes = row.record_json_bytes;
+      } else {
+        page.push(row);
+        pageBytes += row.record_json_bytes;
       }
+    }
 
-      const readPage = Effect.fnUntraced(function* (page: ReadPage) {
-        const rows = yield* sql<Record<string, unknown>>`
+    const readPage = Effect.fnUntraced(function* (page: ReadPage) {
+      const rows = yield* sql<Record<string, unknown>>`
         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}
@@ -1017,77 +984,77 @@ const makeJournal = (
         ORDER BY sequence
       `.pipe(Effect.mapError(storageError("read canonical records")));
 
-        const decoded = yield* decodeRows(
-          Schema.Array(RecordRow),
-          "effect_agent_canonical_records",
-          `${request.threadId}/${page[0].sequence}`,
-          rows,
-          "RecordRow",
-        );
-
-        if (
-          decoded.length !== page.length ||
-          decoded.some(
-            (row, index) =>
-              row.thread_id !== request.threadId ||
-              row.sequence !== page[index].sequence ||
-              storedTextBytes(row.record_json) !== page[index].record_json_bytes,
-          )
-        ) {
-          return yield* mismatch();
-        }
+      const decoded = yield* decodeRows(
+        Schema.Array(RecordRow),
+        "effect_agent_canonical_records",
+        `${request.threadId}/${page[0].sequence}`,
+        rows,
+        "RecordRow",
+      );
 
-        for (const row of decoded) recordCache.put(row);
+      if (
+        decoded.length !== page.length ||
+        decoded.some(
+          (row, index) =>
+            row.thread_id !== request.threadId ||
+            row.sequence !== page[index].sequence ||
+            storedTextBytes(row.record_json) !== page[index].record_json_bytes,
+        )
+      ) {
+        return yield* mismatch();
+      }
 
-        return decoded;
-      });
+      for (const row of decoded) recordCache.put(row);
 
-      return {
-        count: plan.length,
-        records: Stream.fromIterable(pages).pipe(
-          Stream.flatMap((page) => Stream.fromIterableEffect(state.read(readPage(page)))),
-        ),
-      };
+      return decoded;
     });
 
-    const saveCheckpoint = Effect.fnUntraced(function* (
-      checkpoint: RawCheckpoint,
-    ): Effect.fn.Return<void, CheckpointError> {
-      if (checkpoint.threadId.length > MAX_IDENTIFIER_LENGTH) {
-        return yield* DoStorageError.make({
-          operation: "save checkpoint",
-          message: "Checkpoint identity exceeds the Durable Object storage bounds.",
-        });
-      }
-      yield* checkValueBound("save checkpoint", checkpoint.checkpointJson);
-      yield* withWriteTransaction("checkpoint transaction")(
-        Effect.gen(function* () {
-          const threadRows = yield* getThread(checkpoint.threadId);
+    return {
+      count: plan.length,
+      records: Stream.fromIterable(pages).pipe(
+        Stream.flatMap((page) => Stream.fromIterableEffect(state.read(readPage(page)))),
+      ),
+    };
+  });
 
-          const thread = yield* decodeSingleRow(
-            Schema.Array(ThreadRow),
-            "effect_agent_threads",
-            checkpoint.threadId,
-            threadRows,
-          );
+  const saveCheckpoint = Effect.fnUntraced(function* (
+    checkpoint: RawCheckpoint,
+  ): Effect.fn.Return<void, CheckpointError> {
+    if (checkpoint.threadId.length > MAX_IDENTIFIER_LENGTH) {
+      return yield* DoStorageError.make({
+        operation: "save checkpoint",
+        message: "Checkpoint identity exceeds the Durable Object storage bounds.",
+      });
+    }
+    yield* checkValueBound("save checkpoint", checkpoint.checkpointJson);
+    yield* withWriteTransaction("checkpoint transaction")(
+      Effect.gen(function* () {
+        const threadRows = yield* getThread(checkpoint.threadId);
+
+        const thread = yield* decodeSingleRow(
+          Schema.Array(ThreadRow),
+          "effect_agent_threads",
+          checkpoint.threadId,
+          threadRows,
+        );
 
-          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 (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.",
-            });
-          }
+        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>>`
+        const checkpointRows = yield* sql<Record<string, unknown>>`
           SELECT
             thread_id,
             through_sequence,
@@ -1097,32 +1064,32 @@ const makeJournal = (
             AND through_sequence = ${checkpoint.throughSequence}
         `.pipe(Effect.mapError(storageError("read idempotent checkpoint")));
 
-          const existing = yield* decodeRows(
-            Schema.Array(CheckpointRow),
-            "effect_agent_checkpoints",
-            `${checkpoint.threadId}/${checkpoint.throughSequence}`,
-            checkpointRows,
-          );
+        const existing = yield* decodeRows(
+          Schema.Array(CheckpointRow),
+          "effect_agent_checkpoints",
+          `${checkpoint.threadId}/${checkpoint.throughSequence}`,
+          checkpointRows,
+        );
 
-          if (existing.length > 1) {
-            return yield* DoStorageCorruptionError.make({
-              table: "effect_agent_checkpoints",
-              rowKey: `${checkpoint.threadId}/${checkpoint.throughSequence}`,
-              message: "A checkpoint primary key returned more than one row.",
+        if (existing.length > 1) {
+          return yield* DoStorageCorruptionError.make({
+            table: "effect_agent_checkpoints",
+            rowKey: `${checkpoint.threadId}/${checkpoint.throughSequence}`,
+            message: "A checkpoint primary key returned more than one row.",
+          });
+        }
+        if (existing.length === 1) {
+          if (existing[0].checkpoint_json !== checkpoint.checkpointJson) {
+            return yield* DoCheckpointConflict.make({
+              reason: "corrupt",
+              message: "A different checkpoint already exists at this canonical sequence.",
             });
           }
-          if (existing.length === 1) {
-            if (existing[0].checkpoint_json !== checkpoint.checkpointJson) {
-              return yield* DoCheckpointConflict.make({
-                reason: "corrupt",
-                message: "A different checkpoint already exists at this canonical sequence.",
-              });
-            }
 
-            return;
-          }
+          return;
+        }
 
-          yield* sql`
+        yield* sql`
           INSERT INTO effect_agent_checkpoints (
             thread_id,
             through_sequence,
@@ -1133,15 +1100,15 @@ const makeJournal = (
             ${checkpoint.checkpointJson}
           )
         `.pipe(Effect.mapError(storageError("insert checkpoint")));
-        }),
-      );
-    });
+      }),
+    );
+  });
 
-    const loadCheckpoint = Effect.fnUntraced(function* (
-      threadId: string,
-      atOrBeforeSequence: CanonicalSequence,
-    ) {
-      const rows = yield* sql<Record<string, unknown>>`
+  const loadCheckpoint = Effect.fnUntraced(function* (
+    threadId: string,
+    atOrBeforeSequence: CanonicalSequence,
+  ) {
+    const rows = yield* sql<Record<string, unknown>>`
       SELECT
         thread_id,
         through_sequence,
@@ -1153,21 +1120,21 @@ const makeJournal = (
       LIMIT 1
     `.pipe(Effect.mapError(storageError("load checkpoint")));
 
-      return yield* decodeRows(
-        Schema.Array(CheckpointRow),
-        "effect_agent_checkpoints",
-        `${threadId}<=${atOrBeforeSequence}`,
-        rows,
-      );
-    });
+    return yield* decodeRows(
+      Schema.Array(CheckpointRow),
+      "effect_agent_checkpoints",
+      `${threadId}<=${atOrBeforeSequence}`,
+      rows,
+    );
+  });
 
-    const isBatchBoundary = Effect.fnUntraced(function* (
-      threadId: string,
-      sequence: CanonicalSequence,
-    ) {
-      if (sequence === 0) return true;
+  const isBatchBoundary = Effect.fnUntraced(function* (
+    threadId: string,
+    sequence: CanonicalSequence,
+  ) {
+    if (sequence === 0) return true;
 
-      const rows = yield* sql<Record<string, unknown>>`
+    const rows = yield* sql<Record<string, unknown>>`
         SELECT last_sequence FROM effect_agent_canonical_batches
         WHERE thread_id = ${threadId}
           AND batch_id = (
@@ -1177,207 +1144,207 @@ const makeJournal = (
           AND last_sequence = ${sequence}
       `.pipe(Effect.mapError(storageError("read canonical batch boundary")));
 
-      const batches = yield* decodeRows(
-        Schema.Array(Schema.Struct({ last_sequence: CanonicalSequence })),
-        "effect_agent_canonical_batches",
-        `${threadId}/${sequence}`,
-        rows,
-      );
+    const batches = yield* decodeRows(
+      Schema.Array(Schema.Struct({ last_sequence: CanonicalSequence })),
+      "effect_agent_canonical_batches",
+      `${threadId}/${sequence}`,
+      rows,
+    );
 
-      return batches.length === 1;
-    });
+    return batches.length === 1;
+  });
 
-    const sourceFailure = (cause: unknown) =>
-      LifecyclePublicationError.make({ reason: "unavailable", cause });
+  const sourceFailure = (cause: unknown) =>
+    LifecyclePublicationError.make({ reason: "unavailable", cause });
 
-    const sourceThreads = Effect.fnUntraced(function* () {
-      const all = yield* threads.matching(
-        "lifecycle-owners",
-        (row) => row.created_at !== null,
-        sql`SELECT * FROM effect_agent_threads WHERE created_at IS NOT NULL LIMIT 129`,
-        128,
-      );
+  const sourceThreads = Effect.fnUntraced(function* () {
+    const all = yield* threads.matching(
+      "lifecycle-owners",
+      (row) => row.created_at !== null,
+      sql`SELECT * FROM effect_agent_threads WHERE created_at IS NOT NULL LIMIT 129`,
+      128,
+    );
 
-      if (all.length <= 128) return all;
+    if (all.length <= 128) return all;
 
-      // 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
+    // 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 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`,
-      );
-    });
+    );
+  });
 
-    const initializeLifecycleSource = Effect.fnUntraced(function* () {
-      if (initializedLifecycleSources.has(state)) return;
-      yield* state
-        .transaction(
-          Effect.gen(function* () {
-            const existing =
-              yield* sql`SELECT name FROM sqlite_master WHERE name='effect_agent_lifecycle_cursors'`;
+  const initializeLifecycleSource = Effect.fnUntraced(function* () {
+    if (initializedLifecycleSources.has(state)) return;
+    yield* state
+      .transaction(
+        Effect.gen(function* () {
+          const existing =
+            yield* sql`SELECT name FROM sqlite_master WHERE name='effect_agent_lifecycle_cursors'`;
 
-            if (existing.length === 0) {
-              yield* sql`CREATE TABLE effect_agent_lifecycle_cursors (
+          if (existing.length === 0) {
+            yield* sql`CREATE TABLE effect_agent_lifecycle_cursors (
         thread_id TEXT PRIMARY KEY, through_sequence INTEGER NOT NULL
       )`;
-              // Existing inline writers already retained their facts. Enabling publication on an
-              // old store starts here too; it does not publish historical facts retroactively.
-            }
-            // 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)
+            // Existing inline writers already retained their facts. Enabling publication on an
+            // old store starts here too; it does not publish historical facts retroactively.
+          }
+          // 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 created_at IS NOT NULL
         ON CONFLICT(thread_id) DO NOTHING`;
-            yield* sourceThreads();
+          yield* sourceThreads();
+        }),
+      )
+      .pipe(
+        Effect.provideService(SqlClient.SqlClient, sql),
+        Effect.mapError((cause) =>
+          DoStorageError.make({
+            operation: "initialize lifecycle source",
+            message: "Lifecycle source cursor unavailable",
+            cause,
           }),
-        )
-        .pipe(
-          Effect.provideService(SqlClient.SqlClient, sql),
-          Effect.mapError((cause) =>
-            DoStorageError.make({
-              operation: "initialize lifecycle source",
-              message: "Lifecycle source cursor unavailable",
-              cause,
-            }),
-          ),
-        );
-      initializedLifecycleSources.add(state);
-    });
-
-    /** The journal is durable intent; only the bounded publication wave materializes a write set. */
-    const flushCanonical = Effect.fnUntraced(function* (threadId: string, maxRecords = Infinity) {
-      const { retainMany } = yield* SqlLifecycleRetainer;
-      const thread = (yield* getThread(threadId))[0];
-
-      if (thread === undefined) return;
-      const cursor = (yield* cursors.by("thread_id", threadId))[0];
+        ),
+      );
+    initializedLifecycleSources.add(state);
+  });
 
-      if (cursor === undefined || cursor.through_sequence > thread.tail_sequence)
-        return yield* LifecyclePublicationError.make({ reason: "corrupt" });
-      let through = cursor.through_sequence;
-      const bound = Math.min(thread.tail_sequence, through + maxRecords);
-
-      while (through < bound) {
-        const page = yield* read(
-          RawReadRequest.make({
-            threadId,
-            fromSequenceExclusive: through,
-            limit: Math.min(128, bound - through),
-          }),
-        );
+  /** The journal is durable intent; only the bounded publication wave materializes a write set. */
+  const flushCanonical = Effect.fnUntraced(function* (threadId: string, maxRecords = Infinity) {
+    const { retainMany } = yield* SqlLifecycleRetainer;
+    const thread = (yield* getThread(threadId))[0];
+
+    if (thread === undefined) return;
+    const cursor = (yield* cursors.by("thread_id", threadId))[0];
+
+    if (cursor === undefined || cursor.through_sequence > thread.tail_sequence)
+      return yield* LifecyclePublicationError.make({ reason: "corrupt" });
+    let through = cursor.through_sequence;
+    const bound = Math.min(thread.tail_sequence, through + maxRecords);
+
+    while (through < bound) {
+      const page = yield* read(
+        RawReadRequest.make({
+          threadId,
+          fromSequenceExclusive: through,
+          limit: Math.min(128, bound - through),
+        }),
+      );
 
-        const facts: Array<Parameters<SqlLifecycleRetainMany>[0][number]> = [];
-        let bytes = 0;
+      const facts: Array<Parameters<SqlLifecycleRetainMany>[0][number]> = [];
+      let bytes = 0;
 
-        yield* Stream.runForEach(page.records, (row) =>
-          Effect.gen(function* () {
-            const record = yield* Schema.decodeEffect(Schema.fromJsonString(CanonicalRecord))(
-              row.record_json,
-            );
+      yield* Stream.runForEach(page.records, (row) =>
+        Effect.gen(function* () {
+          const record = yield* Schema.decodeEffect(Schema.fromJsonString(CanonicalRecord))(
+            row.record_json,
+          );
 
-            if (record.recordId !== row.record_id || row.sequence !== through + 1)
-              return yield* LifecyclePublicationError.make({ reason: "corrupt" });
-            if (Schema.is(Schema.toType(LifecyclePublicationFact))(record.payload)) {
-              if (
-                bytes + storedTextBytes(row.record_json) > MAX_READ_PAGE_JSON_BYTES &&
-                facts.length > 0
-              ) {
-                yield* retainMany(facts);
-                facts.length = 0;
-                bytes = 0;
-              }
-              facts.push({
-                id: JSON.stringify([threadId, "record", record.recordId]),
-                ownerThreadId: yield* Schema.decodeEffect(ThreadId)(threadId),
-                canonicalSequence: row.sequence,
-                createdAt: record.createdAt,
-                fact: record.payload,
-              });
-              bytes += storedTextBytes(row.record_json);
+          if (record.recordId !== row.record_id || row.sequence !== through + 1)
+            return yield* LifecyclePublicationError.make({ reason: "corrupt" });
+          if (Schema.is(Schema.toType(LifecyclePublicationFact))(record.payload)) {
+            if (
+              bytes + storedTextBytes(row.record_json) > MAX_READ_PAGE_JSON_BYTES &&
+              facts.length > 0
+            ) {
+              yield* retainMany(facts);
+              facts.length = 0;
+              bytes = 0;
             }
-            through = row.sequence;
-          }),
-        );
-        if (page.count === 0) return yield* LifecyclePublicationError.make({ reason: "corrupt" });
-        yield* retainMany(facts);
-        yield* sql`UPDATE effect_agent_lifecycle_cursors SET through_sequence=${through} WHERE thread_id=${threadId} RETURNING *`.pipe(
-          cursors.write,
-        );
-      }
-    }, Effect.mapError(sourceFailure));
-
-    const flushPublications = Effect.fnUntraced(function* () {
-      let owners = 0;
+            facts.push({
+              id: JSON.stringify([threadId, "record", record.recordId]),
+              ownerThreadId: yield* Schema.decodeEffect(ThreadId)(threadId),
+              canonicalSequence: row.sequence,
+              createdAt: record.createdAt,
+              fact: record.payload,
+            });
+            bytes += storedTextBytes(row.record_json);
+          }
+          through = row.sequence;
+        }),
+      );
+      if (page.count === 0) return yield* LifecyclePublicationError.make({ reason: "corrupt" });
+      yield* retainMany(facts);
+      yield* sql`UPDATE effect_agent_lifecycle_cursors SET through_sequence=${through} WHERE thread_id=${threadId} RETURNING *`.pipe(
+        cursors.write,
+      );
+    }
+  }, Effect.mapError(sourceFailure));
 
-      for (const thread of yield* sourceThreads()) {
-        const cursor = (yield* cursors.by("thread_id", thread.thread_id))[0];
+  const flushPublications = Effect.fnUntraced(function* () {
+    let owners = 0;
 
-        if (cursor !== undefined && cursor.through_sequence === thread.tail_sequence) continue;
-        yield* flushCanonical(thread.thread_id, 1024);
-        if (++owners === 4) break;
-      }
-    }, Effect.mapError(sourceFailure));
+    for (const thread of yield* sourceThreads()) {
+      const cursor = (yield* cursors.by("thread_id", thread.thread_id))[0];
 
-    const sourcePending = Effect.gen(function* () {
-      for (const thread of yield* sourceThreads()) {
-        const cursor = (yield* cursors.by("thread_id", thread.thread_id))[0];
+      if (cursor !== undefined && cursor.through_sequence === thread.tail_sequence) continue;
+      yield* flushCanonical(thread.thread_id, 1024);
+      if (++owners === 4) break;
+    }
+  }, Effect.mapError(sourceFailure));
 
-        if (cursor === undefined || cursor.through_sequence > thread.tail_sequence)
-          return yield* LifecyclePublicationError.make({ reason: "corrupt" });
-        if (cursor.through_sequence < thread.tail_sequence) return true;
-      }
+  const sourcePending = Effect.gen(function* () {
+    for (const thread of yield* sourceThreads()) {
+      const cursor = (yield* cursors.by("thread_id", thread.thread_id))[0];
 
-      return false;
-    }).pipe(Effect.mapError(sourceFailure));
+      if (cursor === undefined || cursor.through_sequence > thread.tail_sequence)
+        return yield* LifecyclePublicationError.make({ reason: "corrupt" });
+      if (cursor.through_sequence < thread.tail_sequence) return true;
+    }
 
-    const ownedLifecycle =
-      lifecycle === undefined
-        ? undefined
-        : {
-            ...lifecycle,
-            storage: {
-              ...lifecycle.storage,
-              retainedPendingDeadline: lifecycle.storage.pendingDeadline,
-              pendingDeadline: state.read(
-                Effect.gen(function* () {
-                  const deadline = yield* lifecycle.storage.pendingDeadline;
-
-                  if (!(yield* sourcePending)) return deadline;
-                  const now = yield* Clock.currentTimeMillis;
-
-                  return Option.some(Option.isSome(deadline) ? Math.min(now, deadline.value) : now);
-                }),
-              ),
-            },
-          };
+    return false;
+  }).pipe(Effect.mapError(sourceFailure));
+
+  const ownedLifecycle =
+    lifecycle === undefined
+      ? undefined
+      : {
+          ...lifecycle,
+          storage: {
+            ...lifecycle.storage,
+            retainedPendingDeadline: lifecycle.storage.pendingDeadline,
+            pendingDeadline: state.read(
+              Effect.gen(function* () {
+                const deadline = yield* lifecycle.storage.pendingDeadline;
+
+                if (!(yield* sourcePending)) return deadline;
+                const now = yield* Clock.currentTimeMillis;
+
+                return Option.some(Option.isSome(deadline) ? Math.min(now, deadline.value) : now);
+              }),
+            ),
+          },
+        };
 
-    return {
-      archives: archives.storage,
-      archiveRanges: archives,
-      work,
-      state,
-      owner,
-      threads,
-      lifecycle: ownedLifecycle,
-      initializeLifecycleSource,
-      flushCanonical,
-      flushPublications,
-      append,
-      prepareAppend,
-      appendPrepared,
-      checkCommitIntent: (request: RawAppendRequest) =>
-        executionConflict(executions.checkCommitIntent(request)),
-      readExecution: executions.read,
-      checkValueBound,
-      getThread,
-      hasRecord,
-      isBatchBoundary,
-      loadCheckpoint,
-      materialize,
-      read: (request: RawReadRequest) => state.read(read(request)),
-      saveCheckpoint,
-      withWriteTransaction,
-    } as const;
-  });
+  return {
+    archives: archives.storage,
+    archiveRanges: archives,
+    work,
+    state,
+    owner,
+    threads,
+    lifecycle: ownedLifecycle,
+    initializeLifecycleSource,
+    flushCanonical,
+    flushPublications,
+    append,
+    prepareAppend,
+    appendPrepared,
+    checkCommitIntent: (request: RawAppendRequest) =>
+      executionConflict(executions.checkCommitIntent(request)),
+    readExecution: executions.read,
+    checkValueBound,
+    getThread,
+    hasRecord,
+    isBatchBoundary,
+    loadCheckpoint,
+    materialize,
+    read: (request: RawReadRequest) => state.read(read(request)),
+    saveCheckpoint,
+    withWriteTransaction,
+  } as const;
+});
 
 export type DoJournal = Effect.Success<ReturnType<typeof makeJournal>>;