@effect-agent/storage-sqlite 0.1.0-beta.38 → 0.1.0-beta.40

package/dist/index.mjs

@@ -1,8 +1,10 @@
-import { AbortCommand, AbortIntent, AdmissionAdmitted, AdmissionConflict, AdmissionNotAdmitted, AdmissionRequest, AdmissionResult, AppendConflict, AppendResult, ApprovalConflict, ApprovalDecision, ApprovalDecisionCommand, ApprovalDecisionIntent, AttachChildToReservationRequest, BeginChildBudgetReleaseRequest, CanonicalBatch, CanonicalRecord, CanonicalRecordEnvelope, CanonicalSequence, CheckpointRejected, ChildAttachmentSnapshot, ChildBudgetReservationRequest, ChildBudgetReservationSnapshot, ChildReservationConflict, ChildReservationStatus, ChildSettledNotification, Claim, ClaimJoiningRequest, ClaimRequest, ConversationCheckpoint, ConversationExport, ConversationExportRequest, ConversationMaterialization, ConversationNotMaterialized, ConversationObservation, ConversationRead, ConversationStore, ConversationStoreError, ConversationTail, ConversationTailRequest, DEFAULT_OWNERSHIP_LEASE_DURATION, DefinitionDigests, Digest, EMPTY_TAIL_DIGEST, FenceRejected, FencedAppendRequest, InputAppliedMarker, JoinSnapshot, JoinedToHost, JoiningClaim, LedgerCapabilities, LedgerError, LoadCheckpointRequest, MarkInputAppliedRequest, MarkJoinedRequest, MarkReadyRequest, MarkUnknownRequest, ObservationOffset, OwnershipLost, OwnershipRenewal, OwnershipSnapshot, ParentLinkage, PersistedJson, ProducerEpoch, QueueSequence, RecordEnvelope, RecoverySnapshot, RecoverySnapshotRequest, ReleaseChildBudgetRequest, ReleaseOwnershipRequest, RenewOwnershipRequest, ReservedChildBudget, ReservedSettlement, RevertJoiningRequest, SaveCheckpointRequest, ScheduleCapacityError, ScheduleChange, ScheduleConflict, ScheduleDueCursor, ScheduleFailpoint, ScheduleId, ScheduleInstant, ScheduleKey, ScheduleNotFound, ScheduleOwner, SchedulePageRequest, ScheduleRecord, ScheduleStorageError, ScheduleStore, Settlement, SettlementConflict, SettlementFinalization, SettlementOutcome, SettlementReservation, SettlementReservationSnapshot, SubmissionLedger, SubmissionLookup, SubmissionLookupByKey, SubmissionSnapshot, SubmissionState, SuspendRequest, SuspensionReason, SuspensionSnapshot, UnknownResolution, UnknownResolutionCommand, UnknownResolutionConflict, UnknownResolutionIntent, applyScheduleChange, defaultSchedulingLimits, digestCanonicalBatch, scheduleDeadline, scheduleUsesCapacity, settlementFailureFromRecord, submissionAbortRecordId } from "@effect-agent/session";
+import { t as SqliteStorageFailpoint } from "./sqlite-storage-failpoint-DIwWk5dw.mjs";
+import { AbortCommand, AbortIntent, AcceptedEvent, ActivityBusy, ActivityClaim, ActivityClaimRequest, ActivityMutationFailpoint, ActivityOwnershipLost, ActivityProcessorKey, ActivityProcessorStore, ActivityProgress, ActivityStoreError, ActivityWorkConflict, AdmissionAdmitted, AdmissionConflict, AdmissionNotAdmitted, AdmissionRequest, AdmissionResult, AppendConflict, AppendResult, ApprovalConflict, ApprovalDecision, ApprovalDecisionCommand, ApprovalDecisionIntent, AttachChildToReservationRequest, BeginChildBudgetReleaseRequest, CanonicalBatch, CanonicalRecord, CanonicalRecordEnvelope, CanonicalSequence, CheckpointRejected, ChildAttachmentSnapshot, ChildBudgetReservationRequest, ChildBudgetReservationSnapshot, ChildReservationConflict, ChildReservationStatus, ChildSettledNotification, Claim, ClaimJoiningRequest, ClaimRequest, DEFAULT_OWNERSHIP_LEASE_DURATION, DefinitionDigests, DeliveryChange, Digest, EMPTY_TAIL_DIGEST, FenceRejected, FencedAppendRequest, InputAppliedMarker, JoinSnapshot, JoinedToHost, JoiningClaim, LedgerCapabilities, LedgerError, LoadCheckpointRequest, MarkInputAppliedRequest, MarkJoinedRequest, MarkReadyRequest, MarkUnknownRequest, ObservationOffset, OwnershipLost, OwnershipRenewal, OwnershipSnapshot, ParentLinkage, PersistedJson, PreparedActivity, ProducerEpoch, QueueSequence, RecordEnvelope, RecoverySnapshot, RecoverySnapshotRequest, ReleaseChildBudgetRequest, ReleaseOwnershipRequest, RenewOwnershipRequest, ReservedChildBudget, ReservedSettlement, RevertJoiningRequest, SaveCheckpointRequest, ScheduleCapacityError, ScheduleChange, ScheduleConflict, ScheduleDueCursor, ScheduleFailpoint, ScheduleId, ScheduleInstant, ScheduleKey, ScheduleNotFound, ScheduleOwner, SchedulePageRequest, ScheduleRecord, ScheduleStorageError, ScheduleStore, Settlement, SettlementConflict, SettlementFinalization, SettlementOutcome, SettlementReservation, SettlementReservationSnapshot, SourcePartition, SubmissionLedger, SubmissionLookup, SubmissionLookupByKey, SubmissionSnapshot, SubmissionState, SubscriptionDelivery, SubscriptionDeliveryKey, SubscriptionError, SubscriptionFailpoint, SubscriptionKey, SubscriptionLimits, SubscriptionName, SubscriptionRecord, SubscriptionScanCursors, SubscriptionStore, SuspendRequest, SuspensionReason, SuspensionSnapshot, ThreadCheckpoint, ThreadExport, ThreadExportRequest, ThreadMaterialization, ThreadNotMaterialized, ThreadObservation, ThreadRead, ThreadStore, ThreadStoreError, ThreadTail, ThreadTailRequest, UnknownResolution, UnknownResolutionCommand, UnknownResolutionConflict, UnknownResolutionIntent, applyScheduleChange, applySubscriptionDeliveryChange, defaultSchedulingLimits, digestCanonicalBatch, sameAcceptedEventIdentity, sameSourcePartition, scheduleDeadline, scheduleUsesCapacity, settlementFailureFromRecord, submissionAbortRecordId, subscriptionCanSelect, subscriptionDeliveryCanSelect, subscriptionDeliveryKeyString } from "@effect-agent/thread";
 import { Clock, Context, Crypto, DateTime, Duration, Effect, Exit, Layer, Option, Ref, Result, Schema, Stream } from "effect";
 import { SqliteClient, SqliteMigrator } from "@effect/sql-sqlite-node";
 import * as SqlClient from "effect/unstable/sql/SqlClient";
 import { NodeCrypto } from "@effect/platform-node";
+import { MemoryDocument, MemoryKey, MemoryMutationFailpoint, MemoryNamespaceAddress, MemoryOperationConflict, MemoryReader, MemoryStorageError, MemoryWrite, MemoryWriter, applyMemoryWrite } from "@effect-agent/core";
 //#region src/errors.ts
 /** The SQLite file uses a private-development format this adapter cannot read. */
 var SqliteStorageCompatibilityError = class extends Schema.TaggedError()("SqliteStorageCompatibilityError", {
@@ -47,7 +49,7 @@ var SqliteAppendConflict = class extends Schema.TaggedError()("SqliteAppendConfl
 	actualTailDigest: Schema.optionalKey(Schema.String)
 }) {};
 /**
-* A producer epoch does not match the Conversation's current writer registration. Appends
+* A producer epoch does not match the Thread's current writer registration. Appends
 * require the exact registered epoch, so both older and newer unregistered epochs are fenced;
 * a newer epoch takes over by materializing first.
 */
@@ -76,7 +78,7 @@ const SqliteStorageFailpointLocation = Schema.Literals([
 	"append:after-record-insert",
 	"append:after-tail-update",
 	"append:after",
-	"export:after-conversation-read",
+	"export:after-thread-read",
 	"save-checkpoint:before",
 	"save-checkpoint:after",
 	"ledger:admit:before",
@@ -130,72 +132,68 @@ var SqliteStorageFailpointError = class extends Schema.TaggedError()("SqliteStor
 };
 //#endregion
 //#region src/migrations.ts
-const CurrentSqliteStorageVersion = 5;
-const sqliteMigrations = SqliteMigrator.fromRecord({
-	"1_current_persistent_conversation_foundation": Effect.gen(function* () {
-		const sql = yield* SqlClient.SqlClient;
-		yield* sql`
-      CREATE TABLE effect_agent_conversations (
-        conversation_id TEXT PRIMARY KEY NOT NULL,
+const CurrentSqliteStorageVersion = 7;
+/** Initialize empty storage with the complete current schema. */
+const sqliteMigrations = SqliteMigrator.fromRecord({ "1_current_thread_storage": Effect.gen(function* () {
+	const sql = yield* SqlClient.SqlClient;
+	yield* sql`
+      CREATE TABLE effect_agent_threads (
+        thread_id TEXT PRIMARY KEY NOT NULL,
         created_at TEXT NOT NULL,
         tail_sequence INTEGER NOT NULL,
         tail_digest TEXT NOT NULL,
         producer_epoch INTEGER NOT NULL
       )
     `.withoutTransform;
-		yield* sql`
+	yield* sql`
       CREATE TABLE effect_agent_canonical_batches (
-        conversation_id TEXT NOT NULL,
+        thread_id TEXT NOT NULL,
         batch_id TEXT NOT NULL,
         first_sequence INTEGER NOT NULL,
         last_sequence INTEGER NOT NULL,
         batch_digest TEXT NOT NULL,
         tail_digest TEXT NOT NULL,
         batch_json TEXT NOT NULL,
-        PRIMARY KEY (conversation_id, batch_id),
-        FOREIGN KEY (conversation_id)
-          REFERENCES effect_agent_conversations(conversation_id)
+        PRIMARY KEY (thread_id, batch_id),
+        FOREIGN KEY (thread_id)
+          REFERENCES effect_agent_threads(thread_id)
           ON DELETE RESTRICT
       )
     `.withoutTransform;
-		yield* sql`
+	yield* sql`
       CREATE TABLE effect_agent_canonical_records (
-        conversation_id TEXT NOT NULL,
+        thread_id TEXT NOT NULL,
         sequence INTEGER NOT NULL,
         record_id TEXT NOT NULL,
         batch_id TEXT NOT NULL,
         record_json TEXT NOT NULL,
-        PRIMARY KEY (conversation_id, sequence),
-        UNIQUE (conversation_id, record_id),
-        FOREIGN KEY (conversation_id, batch_id)
-          REFERENCES effect_agent_canonical_batches(conversation_id, batch_id)
+        PRIMARY KEY (thread_id, sequence),
+        UNIQUE (thread_id, record_id),
+        FOREIGN KEY (thread_id, batch_id)
+          REFERENCES effect_agent_canonical_batches(thread_id, batch_id)
           ON DELETE RESTRICT
       )
     `.withoutTransform;
-		yield* sql`
+	yield* sql`
       CREATE INDEX effect_agent_canonical_records_batch
-        ON effect_agent_canonical_records (conversation_id, batch_id, sequence)
+        ON effect_agent_canonical_records (thread_id, batch_id, sequence)
     `.withoutTransform;
-		yield* sql`
+	yield* sql`
       CREATE TABLE effect_agent_checkpoints (
-        conversation_id TEXT NOT NULL,
+        thread_id TEXT NOT NULL,
         through_sequence INTEGER NOT NULL,
         tail_digest TEXT NOT NULL,
         checkpoint_json TEXT NOT NULL,
-        PRIMARY KEY (conversation_id, through_sequence),
-        FOREIGN KEY (conversation_id)
-          REFERENCES effect_agent_conversations(conversation_id)
+        PRIMARY KEY (thread_id, through_sequence),
+        FOREIGN KEY (thread_id)
+          REFERENCES effect_agent_threads(thread_id)
           ON DELETE RESTRICT
       )
     `.withoutTransform;
-		yield* sql`PRAGMA user_version = 1`.withoutTransform;
-	}),
-	"2_durable_submission_ledger": Effect.gen(function* () {
-		const sql = yield* SqlClient.SqlClient;
-		yield* sql`
+	yield* sql`
       CREATE TABLE effect_agent_submissions (
         submission_id TEXT PRIMARY KEY NOT NULL,
-        conversation_id TEXT NOT NULL,
+        thread_id TEXT NOT NULL,
         queue_sequence INTEGER NOT NULL,
         principal TEXT NOT NULL,
         idempotency_key TEXT NOT NULL,
@@ -211,11 +209,18 @@ const sqliteMigrations = SqliteMigrator.fromRecord({
         ready_at TEXT,
         input_applied_record_id TEXT,
         input_applied_sequence INTEGER,
-        UNIQUE (conversation_id, principal, idempotency_key),
-        UNIQUE (conversation_id, queue_sequence)
+        joined_host_submission_id TEXT,
+        suspended_reason_json TEXT,
+        suspended_at TEXT,
+        unknown_reason TEXT,
+        unknown_tool_call_ids_json TEXT,
+        parent_submission_id TEXT,
+        parent_tool_call_id TEXT,
+        UNIQUE (thread_id, principal, idempotency_key),
+        UNIQUE (thread_id, queue_sequence)
       )
     `.withoutTransform;
-		yield* sql`
+	yield* sql`
       CREATE TABLE effect_agent_submission_ownership (
         submission_id TEXT PRIMARY KEY NOT NULL,
         attempt_id TEXT NOT NULL,
@@ -228,11 +233,11 @@ const sqliteMigrations = SqliteMigrator.fromRecord({
           ON DELETE RESTRICT
       )
     `.withoutTransform;
-		yield* sql`
+	yield* sql`
       CREATE TABLE effect_agent_attempts (
         attempt_id TEXT PRIMARY KEY NOT NULL,
         submission_id TEXT NOT NULL,
-        conversation_id TEXT NOT NULL,
+        thread_id TEXT NOT NULL,
         owner_producer_id TEXT NOT NULL,
         producer_epoch INTEGER NOT NULL,
         claimed_at TEXT NOT NULL,
@@ -241,7 +246,7 @@ const sqliteMigrations = SqliteMigrator.fromRecord({
           ON DELETE RESTRICT
       )
     `.withoutTransform;
-		yield* sql`
+	yield* sql`
       CREATE TABLE effect_agent_settlement_reservations (
         submission_id TEXT PRIMARY KEY NOT NULL,
         settlement_id TEXT NOT NULL,
@@ -256,7 +261,7 @@ const sqliteMigrations = SqliteMigrator.fromRecord({
           ON DELETE RESTRICT
       )
     `.withoutTransform;
-		yield* sql`
+	yield* sql`
       CREATE TABLE effect_agent_abort_intents (
         submission_id TEXT PRIMARY KEY NOT NULL,
         author TEXT NOT NULL,
@@ -268,35 +273,11 @@ const sqliteMigrations = SqliteMigrator.fromRecord({
           ON DELETE RESTRICT
       )
     `.withoutTransform;
-		yield* sql`PRAGMA user_version = 2`.withoutTransform;
-	}),
-	"3_durable_tools_and_joined_input": Effect.gen(function* () {
-		const sql = yield* SqlClient.SqlClient;
-		yield* sql`
-      ALTER TABLE effect_agent_submissions
-        ADD COLUMN joined_host_submission_id TEXT
-    `.withoutTransform;
-		yield* sql`
-      ALTER TABLE effect_agent_submissions
-        ADD COLUMN suspended_reason_json TEXT
-    `.withoutTransform;
-		yield* sql`
-      ALTER TABLE effect_agent_submissions
-        ADD COLUMN suspended_at TEXT
-    `.withoutTransform;
-		yield* sql`
-      ALTER TABLE effect_agent_submissions
-        ADD COLUMN unknown_reason TEXT
-    `.withoutTransform;
-		yield* sql`
-      ALTER TABLE effect_agent_submissions
-        ADD COLUMN unknown_tool_call_ids_json TEXT
-    `.withoutTransform;
-		yield* sql`
+	yield* sql`
       CREATE INDEX effect_agent_submissions_joined_host
         ON effect_agent_submissions (joined_host_submission_id)
     `.withoutTransform;
-		yield* sql`
+	yield* sql`
       CREATE TABLE effect_agent_approval_decisions (
         submission_id TEXT NOT NULL,
         tool_call_id TEXT NOT NULL,
@@ -310,7 +291,7 @@ const sqliteMigrations = SqliteMigrator.fromRecord({
           ON DELETE RESTRICT
       )
     `.withoutTransform;
-		yield* sql`
+	yield* sql`
       CREATE TABLE effect_agent_unknown_resolutions (
         submission_id TEXT NOT NULL,
         tool_call_id TEXT NOT NULL,
@@ -324,23 +305,11 @@ const sqliteMigrations = SqliteMigrator.fromRecord({
           ON DELETE RESTRICT
       )
     `.withoutTransform;
-		yield* sql`PRAGMA user_version = 3`.withoutTransform;
-	}),
-	"4_durable_subagents": Effect.gen(function* () {
-		const sql = yield* SqlClient.SqlClient;
-		yield* sql`
-      ALTER TABLE effect_agent_submissions
-        ADD COLUMN parent_submission_id TEXT
-    `.withoutTransform;
-		yield* sql`
-      ALTER TABLE effect_agent_submissions
-        ADD COLUMN parent_tool_call_id TEXT
-    `.withoutTransform;
-		yield* sql`
+	yield* sql`
       CREATE INDEX effect_agent_submissions_parent
         ON effect_agent_submissions (parent_submission_id)
     `.withoutTransform;
-		yield* sql`
+	yield* sql`
       CREATE TABLE effect_agent_child_reservations (
         reservation_id TEXT PRIMARY KEY NOT NULL,
         parent_submission_id TEXT NOT NULL,
@@ -359,11 +328,7 @@ const sqliteMigrations = SqliteMigrator.fromRecord({
           ON DELETE RESTRICT
       )
     `.withoutTransform;
-		yield* sql`PRAGMA user_version = 4`.withoutTransform;
-	}),
-	"5_durable_schedules": Effect.gen(function* () {
-		const sql = yield* SqlClient.SqlClient;
-		yield* sql`
+	yield* sql`
       CREATE TABLE effect_agent_schedules (
         tenant_id TEXT NOT NULL,
         owner_id TEXT NOT NULL,
@@ -373,19 +338,383 @@ const sqliteMigrations = SqliteMigrator.fromRecord({
         PRIMARY KEY (tenant_id, owner_id, schedule_id)
       )
     `.withoutTransform;
-		yield* sql`
+	yield* sql`
       CREATE INDEX effect_agent_schedules_deadline
         ON effect_agent_schedules (deadline_at_millis, tenant_id, owner_id, schedule_id)
         WHERE deadline_at_millis IS NOT NULL
     `.withoutTransform;
-		yield* sql`
+	yield* sql`
       CREATE INDEX effect_agent_schedules_owner_deadline
         ON effect_agent_schedules (tenant_id, owner_id, deadline_at_millis, schedule_id)
         WHERE deadline_at_millis IS NOT NULL
     `.withoutTransform;
-		yield* sql`PRAGMA user_version = 5`.withoutTransform;
-	})
+	yield* sql`
+      CREATE TABLE effect_agent_subscription_sequences (
+        tenant_id TEXT NOT NULL,
+        source_address TEXT NOT NULL,
+        sequence INTEGER NOT NULL,
+        event_scan_cursor TEXT NOT NULL,
+        delivery_scan_cursor TEXT NOT NULL,
+        recovery_scan_cursor INTEGER NOT NULL,
+        PRIMARY KEY (tenant_id, source_address)
+      )
+    `.withoutTransform;
+	yield* sql`
+      CREATE TABLE effect_agent_subscriptions (
+        tenant_id TEXT NOT NULL,
+        source_address TEXT NOT NULL,
+        owner_id TEXT NOT NULL,
+        subscription_id TEXT NOT NULL,
+        ordinal INTEGER NOT NULL,
+        source_name TEXT NOT NULL,
+        source_version TEXT NOT NULL,
+        matching_key TEXT NOT NULL,
+        state TEXT NOT NULL,
+        expires_at_millis INTEGER NOT NULL,
+        recovery_at_millis INTEGER,
+        record_json TEXT NOT NULL,
+        PRIMARY KEY (tenant_id, source_address, owner_id, subscription_id),
+        UNIQUE (tenant_id, source_address, ordinal)
+      )
+    `.withoutTransform;
+	yield* sql`CREATE INDEX effect_agent_subscriptions_owner ON effect_agent_subscriptions (tenant_id, source_address, owner_id, ordinal)`.withoutTransform;
+	yield* sql`CREATE INDEX effect_agent_subscriptions_candidates ON effect_agent_subscriptions (tenant_id, source_address, source_name, source_version, matching_key, ordinal)`.withoutTransform;
+	yield* sql`CREATE INDEX effect_agent_subscriptions_recovery ON effect_agent_subscriptions (tenant_id, source_address, recovery_at_millis, ordinal) WHERE recovery_at_millis IS NOT NULL`.withoutTransform;
+	yield* sql`
+      CREATE TABLE effect_agent_subscription_events (
+        tenant_id TEXT NOT NULL,
+        source_address TEXT NOT NULL,
+        event_id TEXT NOT NULL,
+        source_name TEXT NOT NULL,
+        source_version TEXT NOT NULL,
+        matching_key TEXT NOT NULL,
+        payload_digest TEXT NOT NULL,
+        cutoff INTEGER NOT NULL,
+        cursor INTEGER NOT NULL,
+        routing_complete INTEGER NOT NULL,
+        next_attempt_at_millis INTEGER NOT NULL,
+        record_json TEXT NOT NULL,
+        PRIMARY KEY (tenant_id, source_address, event_id)
+      )
+    `.withoutTransform;
+	yield* sql`CREATE INDEX effect_agent_subscription_events_pending ON effect_agent_subscription_events (tenant_id, source_address, routing_complete, next_attempt_at_millis, event_id)`.withoutTransform;
+	yield* sql`
+      CREATE TABLE effect_agent_subscription_deliveries (
+        tenant_id TEXT NOT NULL,
+        source_address TEXT NOT NULL,
+        owner_id TEXT NOT NULL,
+        subscription_id TEXT NOT NULL,
+        event_id TEXT NOT NULL,
+        delivery_key TEXT NOT NULL,
+        state TEXT NOT NULL,
+        next_attempt_at_millis INTEGER NOT NULL,
+        record_json TEXT NOT NULL,
+        PRIMARY KEY (tenant_id, source_address, owner_id, subscription_id, event_id),
+        UNIQUE (tenant_id, source_address, delivery_key)
+      )
+    `.withoutTransform;
+	yield* sql`CREATE INDEX effect_agent_subscription_deliveries_pending ON effect_agent_subscription_deliveries (tenant_id, source_address, state, next_attempt_at_millis, delivery_key)`.withoutTransform;
+	yield* sql`CREATE INDEX effect_agent_subscription_deliveries_registration ON effect_agent_subscription_deliveries (tenant_id, source_address, owner_id, subscription_id, delivery_key)`.withoutTransform;
+	yield* sql`PRAGMA user_version = 7`.withoutTransform;
+}) });
+//#endregion
+//#region src/sqlite-activity-store.ts
+const STORAGE_VERSION$1 = 1;
+const METADATA_COMPONENT$1 = "activity";
+const STATE_TABLE = "effect_agent_activity_processor_state_v1";
+const StoredJson$2 = Schema.String.check(Schema.isMaxLength(16777216));
+const sameKey = Schema.toEquivalence(ActivityProcessorKey);
+const sameWork = Schema.toEquivalence(PreparedActivity);
+var ActivityMetadataRow = class extends Schema.Class("@effect-agent/storage-sqlite/ActivityMetadataRow")({ version: Schema.Int }) {};
+var ActivityTableRow = class extends Schema.Class("@effect-agent/storage-sqlite/ActivityTableRow")({ name: Schema.NonEmptyString }) {};
+var ActivityStateRow = class extends Schema.Class("@effect-agent/storage-sqlite/ActivityStateRow")({
+	processor_id: ActivityProcessorKey.fields.processorId,
+	processor_version: ActivityProcessorKey.fields.processorVersion,
+	thread_id: ActivityProcessorKey.fields.threadId,
+	format_version: Schema.Int,
+	through_sequence: ActivityProgress.fields.throughSequence,
+	epoch: ActivityProgress.fields.epoch,
+	owner: ActivityProgress.fields.owner,
+	lease_expires_at: ActivityProgress.fields.leaseExpiresAt,
+	progress_json: StoredJson$2
+}) {};
+var ActivityChangeCountRow = class extends Schema.Class("@effect-agent/storage-sqlite/ActivityChangeCountRow")({ changed: Schema.Int }) {};
+const StoredVersionHeader$1 = Schema.Struct({ version: Schema.Int });
+const storeError$1 = (operation, reason = "unavailable") => ActivityStoreError.make({
+	operation,
+	reason
+});
+const query$1 = (effect, operation) => effect.pipe(Effect.mapError(() => storeError$1(operation)));
+const decodeRows$4 = Effect.fn("SqliteActivityStore.decodeRows")(function* (schema, rows, operation) {
+	return yield* Schema.decodeUnknownEffect(Schema.Array(schema))(rows).pipe(Effect.mapError(() => storeError$1(operation, "corrupt")));
+});
+const decodeInput$2 = Effect.fn("SqliteActivityStore.decodeInput")(function* (schema, value, operation) {
+	return yield* Schema.decodeUnknownEffect(schema)(value).pipe(Effect.mapError(() => storeError$1(operation, "invalid-input")));
 });
+const encodeProgress = Effect.fn("SqliteActivityStore.encodeProgress")(function* (progress, operation) {
+	return yield* Schema.encodeEffect(Schema.fromJsonString(ActivityProgress))(progress).pipe(Effect.mapError(() => storeError$1(operation, "corrupt")), Effect.flatMap((encoded) => Schema.decodeEffect(StoredJson$2)(encoded).pipe(Effect.mapError(() => storeError$1(operation, "invalid-input")))));
+});
+const decodeProgress = Effect.fn("SqliteActivityStore.decodeProgress")(function* (value, operation) {
+	if ((yield* Schema.decodeEffect(Schema.fromJsonString(StoredVersionHeader$1))(value).pipe(Effect.mapError(() => storeError$1(operation, "corrupt")))).version !== STORAGE_VERSION$1) return yield* storeError$1(operation, "incompatible");
+	const progress = yield* Schema.decodeEffect(Schema.fromJsonString(ActivityProgress))(value).pipe(Effect.mapError(() => storeError$1(operation, "corrupt")));
+	if ((yield* encodeProgress(progress, operation)) !== value) return yield* storeError$1(operation, "corrupt");
+	return progress;
+});
+const validateProgress = Effect.fn("SqliteActivityStore.validateProgress")(function* (progress, operation) {
+	if (progress.epoch < 1 || progress.owner === null && progress.leaseExpiresAt !== 0 || progress.pending !== null && (!sameKey(progress.pending.key, progress.key) || progress.pending.sequence !== progress.throughSequence + 1)) return yield* storeError$1(operation, "corrupt");
+	return progress;
+});
+const makeClaim = (progress) => progress.owner === null ? null : ActivityClaim.make({
+	key: progress.key,
+	owner: progress.owner,
+	epoch: progress.epoch,
+	throughSequence: progress.throughSequence,
+	leaseExpiresAt: progress.leaseExpiresAt,
+	pending: progress.pending
+});
+const ownershipLost = (claim) => ActivityOwnershipLost.make({
+	key: claim.key,
+	owner: claim.owner,
+	epoch: claim.epoch
+});
+const makeActivityStore = Effect.fn("SqliteActivityStore.make")(function* () {
+	const sql = yield* SqlClient.SqlClient;
+	const failpoint = yield* ActivityMutationFailpoint;
+	yield* failpoint.hit("activity:initialize:before");
+	yield* sql.withTransaction(Effect.gen(function* () {
+		yield* sql`
+          CREATE TABLE IF NOT EXISTS effect_agent_activity_metadata (
+            component TEXT PRIMARY KEY NOT NULL,
+            version INTEGER NOT NULL
+          )
+        `;
+		const metadataRows = yield* sql`
+          SELECT version FROM effect_agent_activity_metadata
+          WHERE component = ${METADATA_COMPONENT$1}
+        `;
+		const metadata = yield* decodeRows$4(ActivityMetadataRow, metadataRows, "decode activity schema version");
+		if (metadata.length > 1) return yield* storeError$1("decode activity schema version", "corrupt");
+		const currentVersion = metadata[0]?.version;
+		if (currentVersion !== void 0 && currentVersion !== STORAGE_VERSION$1) return yield* storeError$1("initialize activity schema", "incompatible");
+		if (currentVersion === void 0) {
+			const tableRows = yield* sql`
+            SELECT name FROM sqlite_master
+            WHERE type = 'table' AND name = ${STATE_TABLE}
+          `;
+			if ((yield* decodeRows$4(ActivityTableRow, tableRows, "inspect activity schema")).length > 0) return yield* storeError$1("initialize activity schema", "incompatible");
+			yield* sql`
+            CREATE TABLE effect_agent_activity_processor_state_v1 (
+              processor_id TEXT NOT NULL,
+              processor_version TEXT NOT NULL,
+              thread_id TEXT NOT NULL,
+              format_version INTEGER NOT NULL,
+              through_sequence INTEGER NOT NULL,
+              epoch INTEGER NOT NULL,
+              owner TEXT,
+              lease_expires_at REAL NOT NULL,
+              progress_json TEXT NOT NULL,
+              PRIMARY KEY (processor_id, processor_version, thread_id)
+            )
+          `;
+			yield* sql`
+            INSERT INTO effect_agent_activity_metadata (component, version)
+            VALUES (${METADATA_COMPONENT$1}, ${STORAGE_VERSION$1})
+          `;
+		}
+		yield* sql`
+          SELECT processor_id, processor_version, thread_id, format_version,
+            through_sequence, epoch, owner, lease_expires_at, progress_json
+          FROM effect_agent_activity_processor_state_v1
+          LIMIT 0
+        `;
+	})).pipe(Effect.catchTag("SqlError", () => Effect.fail(storeError$1("initialize activity schema"))));
+	yield* failpoint.hit("activity:initialize:after");
+	const readProgress = Effect.fn("SqliteActivityStore.readProgress")(function* (key, operation) {
+		const rawRows = yield* query$1(sql`
+        SELECT processor_id, processor_version, thread_id, format_version,
+          through_sequence, epoch, owner, lease_expires_at, progress_json
+        FROM effect_agent_activity_processor_state_v1
+        WHERE processor_id = ${key.processorId}
+          AND processor_version = ${key.processorVersion}
+          AND thread_id = ${key.threadId}
+      `, operation);
+		const rows = yield* decodeRows$4(ActivityStateRow, rawRows, operation);
+		if (rows.length === 0) return null;
+		if (rows.length !== 1) return yield* storeError$1(operation, "corrupt");
+		const row = rows[0];
+		if (row.format_version !== STORAGE_VERSION$1) return yield* storeError$1(operation, "incompatible");
+		const progress = yield* decodeProgress(row.progress_json, operation);
+		yield* validateProgress(progress, operation);
+		if (!sameKey(progress.key, key) || row.processor_id !== key.processorId || row.processor_version !== key.processorVersion || row.thread_id !== key.threadId || row.through_sequence !== progress.throughSequence || row.epoch !== progress.epoch || row.owner !== progress.owner || row.lease_expires_at !== progress.leaseExpiresAt) return yield* storeError$1(operation, "corrupt");
+		return progress;
+	});
+	const checkChanged = Effect.fn("SqliteActivityStore.checkChanged")(function* (operation) {
+		const rawRows = yield* query$1(sql`SELECT changes() AS changed`, operation);
+		const rows = yield* decodeRows$4(ActivityChangeCountRow, rawRows, operation);
+		if (rows.length !== 1 || rows[0].changed !== 1) return yield* storeError$1(operation, "corrupt");
+	});
+	const insertProgress = Effect.fn("SqliteActivityStore.insertProgress")(function* (progress, operation) {
+		const progressJson = yield* encodeProgress(progress, operation);
+		yield* sql`
+      INSERT INTO effect_agent_activity_processor_state_v1 (
+        processor_id, processor_version, thread_id, format_version, through_sequence,
+        epoch, owner, lease_expires_at, progress_json
+      ) VALUES (
+        ${progress.key.processorId}, ${progress.key.processorVersion}, ${progress.key.threadId},
+        ${STORAGE_VERSION$1}, ${progress.throughSequence}, ${progress.epoch}, ${progress.owner},
+        ${progress.leaseExpiresAt}, ${progressJson}
+      )
+    `;
+		yield* checkChanged(operation);
+	});
+	const updateProgress = Effect.fn("SqliteActivityStore.updateProgress")(function* (current, next, operation) {
+		const progressJson = yield* encodeProgress(next, operation);
+		yield* sql`
+      UPDATE effect_agent_activity_processor_state_v1
+      SET format_version = ${STORAGE_VERSION$1},
+          through_sequence = ${next.throughSequence},
+          epoch = ${next.epoch},
+          owner = ${next.owner},
+          lease_expires_at = ${next.leaseExpiresAt},
+          progress_json = ${progressJson}
+      WHERE processor_id = ${current.key.processorId}
+        AND processor_version = ${current.key.processorVersion}
+        AND thread_id = ${current.key.threadId}
+        AND through_sequence = ${current.throughSequence}
+        AND epoch = ${current.epoch}
+    `;
+		yield* checkChanged(operation);
+	});
+	const requireLive = Effect.fn("SqliteActivityStore.requireLive")(function* (progress, claim, requireSequence) {
+		const now = yield* Clock.currentTimeMillis;
+		if (progress === null || !sameKey(progress.key, claim.key) || progress.owner !== claim.owner || progress.epoch !== claim.epoch || progress.leaseExpiresAt <= now || requireSequence && progress.throughSequence !== claim.throughSequence) return yield* ownershipLost(claim);
+		return progress;
+	});
+	const inspect = Effect.fn("SqliteActivityStore.inspect")(function* (key) {
+		const decodedKey = yield* decodeInput$2(ActivityProcessorKey, key, "inspect activity progress");
+		return yield* readProgress(decodedKey, "inspect activity progress");
+	});
+	const claim = Effect.fn("SqliteActivityStore.claim")(function* (request) {
+		const operation = "claim activity progress";
+		const decoded = yield* decodeInput$2(ActivityClaimRequest, request, operation);
+		yield* failpoint.hit("activity:claim:before");
+		const claimed = yield* sql.withTransaction(Effect.gen(function* () {
+			const current = yield* readProgress(decoded.key, operation);
+			const now = yield* Clock.currentTimeMillis;
+			if (current !== null && current.owner !== null && current.leaseExpiresAt > now) return yield* ActivityBusy.make({
+				key: decoded.key,
+				leaseExpiresAt: current.leaseExpiresAt
+			});
+			const next = yield* Schema.decodeUnknownEffect(ActivityProgress)({
+				version: STORAGE_VERSION$1,
+				key: decoded.key,
+				throughSequence: current?.throughSequence ?? 0,
+				epoch: (current?.epoch ?? 0) + 1,
+				owner: decoded.owner,
+				leaseExpiresAt: now + decoded.leaseMillis,
+				pending: current?.pending ?? null,
+				advancedAt: current?.advancedAt ?? null
+			}).pipe(Effect.mapError(() => storeError$1(operation, "corrupt")));
+			if (current === null) yield* insertProgress(next, operation);
+			else yield* updateProgress(current, next, operation);
+			yield* failpoint.hit("activity:claim:after-state");
+			const result = makeClaim(next);
+			if (result === null) return yield* storeError$1(operation, "corrupt");
+			return result;
+		})).pipe(Effect.catchTag("SqlError", () => Effect.fail(storeError$1(operation))));
+		yield* failpoint.hit("activity:claim:after");
+		return claimed;
+	});
+	const prepare = Effect.fn("SqliteActivityStore.prepare")(function* (request) {
+		const operation = "prepare activity output";
+		const claim = yield* decodeInput$2(ActivityClaim, request.claim, operation);
+		const work = yield* decodeInput$2(PreparedActivity, request.work, operation);
+		yield* failpoint.hit("activity:prepare:before");
+		const result = yield* sql.withTransaction(Effect.gen(function* () {
+			const current = yield* requireLive(yield* readProgress(claim.key, operation), claim, true);
+			if (current.pending !== null) {
+				if (sameWork(current.pending, work)) return {
+					work: current.pending,
+					changed: false
+				};
+				return yield* ActivityWorkConflict.make({
+					key: claim.key,
+					workId: work.workId
+				});
+			}
+			if (!sameKey(work.key, claim.key) || work.sequence !== current.throughSequence + 1) return yield* ActivityWorkConflict.make({
+				key: claim.key,
+				workId: work.workId
+			});
+			const next = ActivityProgress.make({
+				...current,
+				pending: work
+			});
+			yield* updateProgress(current, next, operation);
+			yield* failpoint.hit("activity:prepare:after-state");
+			return {
+				work,
+				changed: true
+			};
+		})).pipe(Effect.catchTag("SqlError", () => Effect.fail(storeError$1(operation))));
+		if (result.changed) yield* failpoint.hit("activity:prepare:after");
+		return result.work;
+	});
+	const advance = Effect.fn("SqliteActivityStore.advance")(function* (request) {
+		const operation = "advance activity progress";
+		const claim = yield* decodeInput$2(ActivityClaim, request.claim, operation);
+		const workId = yield* decodeInput$2(Digest, request.workId, operation);
+		yield* failpoint.hit("activity:advance:before");
+		const nextClaim = yield* sql.withTransaction(Effect.gen(function* () {
+			const current = yield* requireLive(yield* readProgress(claim.key, operation), claim, true);
+			if (current.pending === null || current.pending.workId !== workId) return yield* ActivityWorkConflict.make({
+				key: claim.key,
+				workId
+			});
+			const next = ActivityProgress.make({
+				...current,
+				throughSequence: current.pending.sequence,
+				pending: null,
+				advancedAt: yield* Clock.currentTimeMillis
+			});
+			yield* updateProgress(current, next, operation);
+			yield* failpoint.hit("activity:advance:after-state");
+			const result = makeClaim(next);
+			if (result === null) return yield* storeError$1(operation, "corrupt");
+			return result;
+		})).pipe(Effect.catchTag("SqlError", () => Effect.fail(storeError$1(operation))));
+		yield* failpoint.hit("activity:advance:after");
+		return nextClaim;
+	});
+	const release = Effect.fn("SqliteActivityStore.release")(function* (claim) {
+		const operation = "release activity claim";
+		const decoded = yield* decodeInput$2(ActivityClaim, claim, operation);
+		yield* failpoint.hit("activity:release:before");
+		yield* sql.withTransaction(Effect.gen(function* () {
+			const current = yield* readProgress(decoded.key, operation);
+			if (current === null || current.owner !== decoded.owner || current.epoch !== decoded.epoch) return yield* ownershipLost(decoded);
+			const next = ActivityProgress.make({
+				...current,
+				owner: null,
+				leaseExpiresAt: 0
+			});
+			yield* updateProgress(current, next, operation);
+			yield* failpoint.hit("activity:release:after-state");
+		})).pipe(Effect.catchTag("SqlError", () => Effect.fail(storeError$1(operation))));
+		yield* failpoint.hit("activity:release:after");
+	});
+	return ActivityProcessorStore.of({
+		inspect,
+		claim,
+		prepare,
+		advance,
+		release
+	});
+});
+/** SQLite activity progress with mutation failpoints kept injectable for recovery tests. */
+const activityProcessorStoreLayerWithFailpoints = Layer.effect(ActivityProcessorStore, makeActivityStore());
+/** SQLite activity progress with the production no-op mutation failpoint. */
+const activityProcessorStoreLayer = activityProcessorStoreLayerWithFailpoints.pipe(Layer.provide(ActivityMutationFailpoint.layer));
 //#endregion
 //#region src/sqlite-storage-config.ts
 const ObservationPollInterval = Schema.Int.check(Schema.isGreaterThanOrEqualTo(0));
@@ -404,7 +733,7 @@ var SqliteStorageConfigValue = class extends Schema.Class("@effect-agent/storage
 	* Submission ownership lease duration in milliseconds (D5). The lease is a liveness hint
 	* that makes an abandoned claim reclaimable; correctness never depends on it because every
 	* canonical append is fenced by producer epoch. Convenience layers default this to
-	* `DEFAULT_OWNERSHIP_LEASE_DURATION` from `@effect-agent/session`.
+	* `DEFAULT_OWNERSHIP_LEASE_DURATION` from `@effect-agent/thread`.
 	*/
 	ownershipLeaseDuration: OwnershipLeaseMillis,
 	/**
@@ -417,37 +746,19 @@ var SqliteStorageConfigValue = class extends Schema.Class("@effect-agent/storage
 /** Explicit SQLite storage configuration authority. */
 var SqliteStorageConfig = class extends Context.Service()("@effect-agent/storage-sqlite/SqliteStorageConfig") {};
 //#endregion
-//#region src/sqlite-storage-failpoint.ts
-const noFailpoint = () => Effect.void;
-/** Test-only control for replacing the active SQLite failpoint handler. */
-var SqliteStorageFailpointTestControl = class extends Context.Service()("@effect-agent/storage-sqlite/SqliteStorageFailpointTestControl") {};
-/** Explicit fault-injection authority used at SQLite operation boundaries. */
-var SqliteStorageFailpoint = class SqliteStorageFailpoint extends Context.Service()("@effect-agent/storage-sqlite/SqliteStorageFailpoint") {
-	/** Production default: no fault injection. */
-	static layer = Layer.succeed(this)({ hit: noFailpoint });
-	/** Reusable test Layer with a control service backed by the same handler Ref. */
-	static layerTest = Layer.effectContext(Effect.gen(function* () {
-		const handler = yield* Ref.make(noFailpoint);
-		return Context.make(SqliteStorageFailpoint, SqliteStorageFailpoint.of({ hit: (location) => Ref.get(handler).pipe(Effect.flatMap((current) => current(location))) })).pipe(Context.add(SqliteStorageFailpointTestControl, SqliteStorageFailpointTestControl.of({
-			clear: Ref.set(handler, noFailpoint),
-			setHandler: (next) => Ref.set(handler, next)
-		})));
-	}));
-};
-//#endregion
 //#region src/sqlite-journal.ts
-const BoundedStoredText$1 = Schema.String.check(Schema.isMaxLength(16 * 1024 * 1024));
+const BoundedStoredText$1 = Schema.String.check(Schema.isMaxLength(16777216));
 const BoundedIdentifier$1 = Schema.NonEmptyString.check(Schema.isMaxLength(1024));
 const NonNegativeInt = Schema.Int.check(Schema.isGreaterThanOrEqualTo(0));
-const MAX_RECORDS_PER_CONVERSATION = 65536;
-const MAX_STORED_TEXT_BYTES = 16 * 1024 * 1024;
+const MAX_RECORDS_PER_THREAD = 65536;
+const MAX_STORED_TEXT_BYTES = 16777216;
 const MAX_IDENTIFIER_LENGTH = 1024;
 const storedTextBytes = (value) => new TextEncoder().encode(value).byteLength;
 var SqliteVersionRow = class extends Schema.Class("SqliteVersionRow")({ user_version: NonNegativeInt }) {};
 var SqliteJournalModeRow = class extends Schema.Class("SqliteJournalModeRow")({ journal_mode: Schema.NonEmptyString.check(Schema.isMaxLength(32)) }) {};
 var SqliteNameRow = class extends Schema.Class("SqliteNameRow")({ name: BoundedIdentifier$1 }) {};
-var ConversationRow = class extends Schema.Class("ConversationRow")({
-	conversation_id: BoundedIdentifier$1,
+var ThreadRow = class extends Schema.Class("ThreadRow")({
+	thread_id: BoundedIdentifier$1,
 	created_at: Schema.NonEmptyString.check(Schema.isMaxLength(128)),
 	producer_epoch: ProducerEpoch,
 	tail_digest: BoundedStoredText$1,
@@ -457,21 +768,21 @@ var BatchRow = class extends Schema.Class("BatchRow")({
 	batch_digest: BoundedStoredText$1,
 	batch_id: BoundedIdentifier$1,
 	batch_json: BoundedStoredText$1,
-	conversation_id: BoundedIdentifier$1,
+	thread_id: BoundedIdentifier$1,
 	first_sequence: CanonicalSequence,
 	last_sequence: CanonicalSequence,
 	tail_digest: BoundedStoredText$1
 }) {};
 var RecordRow = class extends Schema.Class("RecordRow")({
 	batch_id: BoundedIdentifier$1,
-	conversation_id: BoundedIdentifier$1,
+	thread_id: BoundedIdentifier$1,
 	record_id: BoundedIdentifier$1,
 	record_json: BoundedStoredText$1,
 	sequence: CanonicalSequence
 }) {};
 var CheckpointRow = class extends Schema.Class("CheckpointRow")({
 	checkpoint_json: BoundedStoredText$1,
-	conversation_id: BoundedIdentifier$1,
+	thread_id: BoundedIdentifier$1,
 	tail_digest: BoundedStoredText$1,
 	through_sequence: CanonicalSequence
 }) {};
@@ -483,7 +794,7 @@ var RawAppendRequest = class extends Schema.Class("@effect-agent/storage-sqlite/
 	batchDigest: BoundedStoredText$1,
 	batchId: BoundedIdentifier$1,
 	batchJson: BoundedStoredText$1,
-	conversationId: BoundedIdentifier$1,
+	threadId: BoundedIdentifier$1,
 	expectedTailDigest: BoundedStoredText$1,
 	expectedTailSequence: CanonicalSequence,
 	producerEpoch: ProducerEpoch,
@@ -497,35 +808,35 @@ var RawAppendResult = class extends Schema.Class("@effect-agent/storage-sqlite/R
 	tailDigest: BoundedStoredText$1
 }) {};
 var RawReadRequest = class extends Schema.Class("@effect-agent/storage-sqlite/RawReadRequest")({
-	conversationId: BoundedIdentifier$1,
+	threadId: BoundedIdentifier$1,
 	fromSequenceExclusive: CanonicalSequence,
 	limit: Schema.Int.check(Schema.isGreaterThan(0), Schema.isLessThanOrEqualTo(1024))
 }) {};
 var RawCheckpoint = class extends Schema.Class("@effect-agent/storage-sqlite/RawCheckpoint")({
 	checkpointJson: BoundedStoredText$1,
-	conversationId: BoundedIdentifier$1,
+	threadId: BoundedIdentifier$1,
 	tailDigest: BoundedStoredText$1,
 	throughSequence: CanonicalSequence
 }) {};
-var RawConversationExport = class extends Schema.Class("@effect-agent/storage-sqlite/RawConversationExport")({
+var RawThreadExport = class extends Schema.Class("@effect-agent/storage-sqlite/RawThreadExport")({
 	batches: Schema.Array(BatchRow),
 	checkpoints: Schema.Array(CheckpointRow),
-	conversation: ConversationRow,
+	thread: ThreadRow,
 	records: Schema.Array(RecordRow)
 }) {};
-const storageError = (operation) => (error) => SqliteStorageError.make({
+const storageError$1 = (operation) => (error) => SqliteStorageError.make({
 	cause: error,
 	operation,
 	message: error.message
 });
 /** Decode raw SQLite rows against a Schema, reporting failures as typed corruption. */
-const decodeRows$1 = Effect.fn("SqliteJournal.decodeRows")((schema, table, rowKey, rows) => Schema.decodeUnknownEffect(schema)(rows).pipe(Effect.mapError((error) => SqliteStorageCorruptionError.make({
+const decodeRows$3 = Effect.fn("SqliteJournal.decodeRows")((schema, table, rowKey, rows) => Schema.decodeUnknownEffect(schema)(rows).pipe(Effect.mapError((error) => SqliteStorageCorruptionError.make({
 	table,
 	rowKey,
 	message: String(error)
 }))));
 /** Decode exactly one raw SQLite row against a Schema, reporting failures as typed corruption. */
-const decodeSingleRow = Effect.fn("SqliteJournal.decodeSingleRow")((schema, table, rowKey, rows) => decodeRows$1(schema, table, rowKey, rows).pipe(Effect.flatMap((decoded) => decoded.length === 1 ? Effect.succeed(decoded[0]) : Effect.fail(SqliteStorageCorruptionError.make({
+const decodeSingleRow = Effect.fn("SqliteJournal.decodeSingleRow")((schema, table, rowKey, rows) => decodeRows$3(schema, table, rowKey, rows).pipe(Effect.flatMap((decoded) => decoded.length === 1 ? Effect.succeed(decoded[0]) : Effect.fail(SqliteStorageCorruptionError.make({
 	table,
 	rowKey,
 	message: `Expected exactly one row but found ${decoded.length}.`
@@ -534,21 +845,21 @@ const initializeSqliteJournal = Effect.fn("SqliteJournal.initialize")(function*
 	const sql = yield* SqlClient.SqlClient;
 	const { hit: failpoint } = yield* SqliteStorageFailpoint;
 	const { busyTimeout } = yield* SqliteStorageConfig;
-	yield* sql`PRAGMA foreign_keys = ON`.pipe(Effect.mapError(storageError("enable foreign keys")));
-	yield* sql.unsafe(`PRAGMA busy_timeout = ${busyTimeout}`).pipe(Effect.mapError(storageError("configure busy timeout")));
-	const journalModeRows = yield* sql`PRAGMA journal_mode`.pipe(Effect.mapError(storageError("read journal mode")));
+	yield* sql`PRAGMA foreign_keys = ON`.pipe(Effect.mapError(storageError$1("enable foreign keys")));
+	yield* sql.unsafe(`PRAGMA busy_timeout = ${busyTimeout}`).pipe(Effect.mapError(storageError$1("configure busy timeout")));
+	const journalModeRows = yield* sql`PRAGMA journal_mode`.pipe(Effect.mapError(storageError$1("read journal mode")));
 	const journalMode = yield* decodeSingleRow(Schema.Array(SqliteJournalModeRow), "pragma_journal_mode", "singleton", journalModeRows);
 	if (journalMode.journal_mode.toLowerCase() !== "wal") return yield* SqliteStorageCompatibilityError.make({
 		actualVersion: 0,
-		supportedVersion: 5,
+		supportedVersion: 7,
 		message: `SQLite WAL mode is required; the database reported ${journalMode.journal_mode}.`
 	});
-	const versionRows = yield* sql`PRAGMA user_version`.pipe(Effect.mapError(storageError("read storage version")));
+	const versionRows = yield* sql`PRAGMA user_version`.pipe(Effect.mapError(storageError$1("read storage version")));
 	const version = yield* decodeSingleRow(Schema.Array(SqliteVersionRow), "pragma_user_version", "singleton", versionRows);
-	if (version.user_version !== 0 && version.user_version !== 5) return yield* SqliteStorageCompatibilityError.make({
+	if (version.user_version !== 0 && version.user_version !== 7) return yield* SqliteStorageCompatibilityError.make({
 		actualVersion: version.user_version,
-		supportedVersion: 5,
-		message: `The SQLite file uses private-development storage version ${version.user_version}; this build supports exactly version 5. Reset the database file explicitly; automatic stored-data migrations are not provided during private development.`
+		supportedVersion: 7,
+		message: `The SQLite file uses private-development storage version ${version.user_version}; this build supports exactly version 7. Reset the database file explicitly; automatic stored-data migrations are not provided during private development.`
 	});
 	if (version.user_version === 0) {
 		const existingRows = yield* sql`
@@ -557,10 +868,10 @@ const initializeSqliteJournal = Effect.fn("SqliteJournal.initialize")(function*
       WHERE type = 'table'
         AND name LIKE 'effect_agent_%'
       ORDER BY name
-    `.pipe(Effect.mapError(storageError("inspect unversioned storage")));
-		if ((yield* decodeRows$1(Schema.Array(SqliteNameRow), "sqlite_master", "effect_agent_%", existingRows)).length > 0) return yield* SqliteStorageCompatibilityError.make({
+    `.pipe(Effect.mapError(storageError$1("inspect unversioned storage")));
+		if ((yield* decodeRows$3(Schema.Array(SqliteNameRow), "sqlite_master", "effect_agent_%", existingRows)).length > 0) return yield* SqliteStorageCompatibilityError.make({
 			actualVersion: 0,
-			supportedVersion: 5,
+			supportedVersion: 7,
 			message: "The SQLite file contains unversioned Effect Agent tables. Reset it explicitly; refusing to mutate ambiguous stored data."
 		});
 		yield* SqliteMigrator.run({ loader: sqliteMigrations }).pipe(Effect.mapError((error) => SqliteStorageError.make({
@@ -574,7 +885,7 @@ const initializeSqliteJournal = Effect.fn("SqliteJournal.initialize")(function*
     FROM sqlite_master
     WHERE type = 'table'
       AND name IN (
-        'effect_agent_conversations',
+        'effect_agent_threads',
         'effect_agent_canonical_batches',
         'effect_agent_canonical_records',
         'effect_agent_checkpoints',
@@ -588,17 +899,17 @@ const initializeSqliteJournal = Effect.fn("SqliteJournal.initialize")(function*
         'effect_agent_schedules'
       )
     ORDER BY name
-  `.pipe(Effect.mapError(storageError("verify storage tables")));
-	if ((yield* decodeRows$1(Schema.Array(SqliteNameRow), "sqlite_master", "required_tables", requiredRows)).length !== 12) return yield* SqliteStorageCompatibilityError.make({
-		actualVersion: 5,
-		supportedVersion: 5,
+  `.pipe(Effect.mapError(storageError$1("verify storage tables")));
+	if ((yield* decodeRows$3(Schema.Array(SqliteNameRow), "sqlite_master", "required_tables", requiredRows)).length !== 12) return yield* SqliteStorageCompatibilityError.make({
+		actualVersion: 7,
+		supportedVersion: 7,
 		message: "The SQLite file claims the current format but is missing required tables. Reset the corrupt private-development data."
 	});
 	const classifyWriteFailure = (operation) => (error) => error.reason._tag === "LockTimeoutError" ? SqliteWriteContention.make({
 		cause: error,
 		operation,
 		message: `Another producer holds the SQLite write lock; ${operation} is safe to retry.`
-	}) : storageError(operation)(error);
+	}) : storageError$1(operation)(error);
 	/**
 	* Runs one journal write transaction under `BEGIN IMMEDIATE`. SQLite's deferred `BEGIN`
 	* would let a read-then-write transaction start as a reader and fail with
@@ -631,54 +942,54 @@ const initializeSqliteJournal = Effect.fn("SqliteJournal.initialize")(function*
 	* `BEGIN` is reported directly because there is no transaction to roll back.
 	*/
 	const withReadTransaction = (operation) => (effect) => Effect.uninterruptibleMask((restore) => Effect.scoped(Effect.gen(function* () {
-		const connection = yield* sql.reserve.pipe(Effect.mapError(storageError(operation)));
-		yield* connection.executeUnprepared("BEGIN", [], void 0).pipe(Effect.mapError(storageError(operation)));
+		const connection = yield* sql.reserve.pipe(Effect.mapError(storageError$1(operation)));
+		yield* connection.executeUnprepared("BEGIN", [], void 0).pipe(Effect.mapError(storageError$1(operation)));
 		const exit = yield* restore(Effect.provideService(effect, sql.transactionService, [connection, 0])).pipe(Effect.exit);
 		if (Exit.isSuccess(exit)) {
-			yield* connection.executeUnprepared("COMMIT", [], void 0).pipe(Effect.mapError(storageError(operation)));
+			yield* connection.executeUnprepared("COMMIT", [], void 0).pipe(Effect.mapError(storageError$1(operation)));
 			return exit.value;
 		}
 		yield* Effect.orDie(connection.executeUnprepared("ROLLBACK", [], void 0));
 		return yield* exit;
 	})).pipe(Effect.withSpan("SqliteJournal.withReadTransaction", { attributes: { operation } })));
-	const materialize = Effect.fn("SqliteJournal.materialize")(function* (conversationId, createdAt, emptyTailDigest, producerEpoch) {
-		if (conversationId.length > MAX_IDENTIFIER_LENGTH || storedTextBytes(emptyTailDigest) > MAX_STORED_TEXT_BYTES) return yield* SqliteStorageError.make({
-			operation: "materialize conversation",
-			message: "Conversation identity or initial digest exceeds the SQLite storage bounds."
+	const materialize = Effect.fn("SqliteJournal.materialize")(function* (threadId, createdAt, emptyTailDigest, producerEpoch) {
+		if (threadId.length > MAX_IDENTIFIER_LENGTH || storedTextBytes(emptyTailDigest) > MAX_STORED_TEXT_BYTES) return yield* SqliteStorageError.make({
+			operation: "materialize thread",
+			message: "Thread identity or initial digest exceeds the SQLite storage bounds."
 		});
 		yield* withWriteTransaction("materialize transaction")(Effect.gen(function* () {
 			const existingRows = yield* sql`
           SELECT
-            conversation_id,
+            thread_id,
             created_at,
             tail_sequence,
             tail_digest,
             producer_epoch
-          FROM effect_agent_conversations
-          WHERE conversation_id = ${conversationId}
-        `.pipe(Effect.mapError(storageError("read materialized conversation")));
-			const existing = yield* decodeRows$1(Schema.Array(ConversationRow), "effect_agent_conversations", conversationId, existingRows);
+          FROM effect_agent_threads
+          WHERE thread_id = ${threadId}
+        `.pipe(Effect.mapError(storageError$1("read materialized thread")));
+			const existing = yield* decodeRows$3(Schema.Array(ThreadRow), "effect_agent_threads", threadId, existingRows);
 			if (existing.length > 1) return yield* SqliteStorageCorruptionError.make({
-				table: "effect_agent_conversations",
-				rowKey: conversationId,
-				message: "A conversation primary key returned more than one row."
+				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_conversations (
-              conversation_id,
+            INSERT INTO effect_agent_threads (
+              thread_id,
               created_at,
               tail_sequence,
               tail_digest,
               producer_epoch
             ) VALUES (
-              ${conversationId},
+              ${threadId},
               ${createdAt},
               0,
               ${emptyTailDigest},
               ${producerEpoch}
             )
-          `.pipe(Effect.mapError(storageError("materialize conversation")));
+          `.pipe(Effect.mapError(storageError$1("materialize thread")));
 				return;
 			}
 			if (producerEpoch < existing[0].producer_epoch) return yield* SqliteFenceRejected.make({
@@ -687,27 +998,27 @@ const initializeSqliteJournal = Effect.fn("SqliteJournal.initialize")(function*
 				message: `Producer epoch ${producerEpoch} is stale; current epoch is ${existing[0].producer_epoch}.`
 			});
 			if (producerEpoch > existing[0].producer_epoch) yield* sql`
-            UPDATE effect_agent_conversations
+            UPDATE effect_agent_threads
             SET producer_epoch = ${producerEpoch}
-            WHERE conversation_id = ${conversationId}
-          `.pipe(Effect.mapError(storageError("advance materialization epoch")));
+            WHERE thread_id = ${threadId}
+          `.pipe(Effect.mapError(storageError$1("advance materialization epoch")));
 		}));
 	});
-	const getConversation = Effect.fn("SqliteJournal.getConversation")(function* (conversationId) {
+	const getThread = Effect.fn("SqliteJournal.getThread")(function* (threadId) {
 		const rows = yield* sql`
       SELECT
-        conversation_id,
+        thread_id,
         created_at,
         tail_sequence,
         tail_digest,
         producer_epoch
-      FROM effect_agent_conversations
-      WHERE conversation_id = ${conversationId}
-    `.pipe(Effect.mapError(storageError("read conversation")));
-		return yield* decodeRows$1(Schema.Array(ConversationRow), "effect_agent_conversations", conversationId, rows);
+      FROM effect_agent_threads
+      WHERE thread_id = ${threadId}
+    `.pipe(Effect.mapError(storageError$1("read thread")));
+		return yield* decodeRows$3(Schema.Array(ThreadRow), "effect_agent_threads", threadId, rows);
 	});
 	const append = Effect.fn("SqliteJournal.append")(function* (request) {
-		if (request.conversationId.length > MAX_IDENTIFIER_LENGTH || request.batchId.length > MAX_IDENTIFIER_LENGTH || storedTextBytes(request.batchJson) > MAX_STORED_TEXT_BYTES || storedTextBytes(request.batchDigest) > MAX_STORED_TEXT_BYTES || storedTextBytes(request.tailDigest) > MAX_STORED_TEXT_BYTES || request.records.some((record) => record.recordId.length > MAX_IDENTIFIER_LENGTH || storedTextBytes(record.recordJson) > MAX_STORED_TEXT_BYTES)) return yield* SqliteStorageError.make({
+		if (request.threadId.length > MAX_IDENTIFIER_LENGTH || request.batchId.length > MAX_IDENTIFIER_LENGTH || storedTextBytes(request.batchJson) > MAX_STORED_TEXT_BYTES || storedTextBytes(request.batchDigest) > MAX_STORED_TEXT_BYTES || storedTextBytes(request.tailDigest) > MAX_STORED_TEXT_BYTES || request.records.some((record) => record.recordId.length > MAX_IDENTIFIER_LENGTH || storedTextBytes(record.recordJson) > MAX_STORED_TEXT_BYTES)) return yield* SqliteStorageError.make({
 			operation: "append canonical batch",
 			message: "Canonical identifiers or encoded JSON exceed the SQLite storage bounds."
 		});
@@ -717,25 +1028,25 @@ const initializeSqliteJournal = Effect.fn("SqliteJournal.initialize")(function*
 				message: `Batch ${request.batchId} contains duplicate canonical record IDs.`,
 				reason: "record-identity"
 			});
-			const conversationRows = yield* sql`
+			const threadRows = yield* sql`
           SELECT
-            conversation_id,
+            thread_id,
             created_at,
             tail_sequence,
             tail_digest,
             producer_epoch
-          FROM effect_agent_conversations
-          WHERE conversation_id = ${request.conversationId}
-        `.pipe(Effect.mapError(storageError("read append tail")));
-			const conversation = yield* decodeSingleRow(Schema.Array(ConversationRow), "effect_agent_conversations", request.conversationId, conversationRows);
-			if (request.producerEpoch !== conversation.producer_epoch) return yield* SqliteFenceRejected.make({
+          FROM effect_agent_threads
+          WHERE thread_id = ${request.threadId}
+        `.pipe(Effect.mapError(storageError$1("read append tail")));
+			const thread = yield* decodeSingleRow(Schema.Array(ThreadRow), "effect_agent_threads", request.threadId, threadRows);
+			if (request.producerEpoch !== thread.producer_epoch) return yield* SqliteFenceRejected.make({
 				producerEpoch: request.producerEpoch,
-				actualEpoch: conversation.producer_epoch,
-				message: `Producer epoch ${request.producerEpoch} is not the current epoch ${conversation.producer_epoch}.`
+				actualEpoch: thread.producer_epoch,
+				message: `Producer epoch ${request.producerEpoch} is not the current epoch ${thread.producer_epoch}.`
 			});
 			const batchRows = yield* sql`
           SELECT
-            conversation_id,
+            thread_id,
             batch_id,
             first_sequence,
             last_sequence,
@@ -743,13 +1054,13 @@ const initializeSqliteJournal = Effect.fn("SqliteJournal.initialize")(function*
             tail_digest,
             batch_json
           FROM effect_agent_canonical_batches
-          WHERE conversation_id = ${request.conversationId}
+          WHERE thread_id = ${request.threadId}
             AND batch_id = ${request.batchId}
-        `.pipe(Effect.mapError(storageError("read idempotent batch")));
-			const batches = yield* decodeRows$1(Schema.Array(BatchRow), "effect_agent_canonical_batches", `${request.conversationId}/${request.batchId}`, batchRows);
+        `.pipe(Effect.mapError(storageError$1("read idempotent batch")));
+			const batches = yield* decodeRows$3(Schema.Array(BatchRow), "effect_agent_canonical_batches", `${request.threadId}/${request.batchId}`, batchRows);
 			if (batches.length > 1) return yield* SqliteStorageCorruptionError.make({
 				table: "effect_agent_canonical_batches",
-				rowKey: `${request.conversationId}/${request.batchId}`,
+				rowKey: `${request.threadId}/${request.batchId}`,
 				message: "A canonical batch primary key returned more than one row."
 			});
 			if (batches.length === 1) {
@@ -765,34 +1076,34 @@ const initializeSqliteJournal = Effect.fn("SqliteJournal.initialize")(function*
 					tailDigest: existing.tail_digest
 				});
 			}
-			if (request.expectedTailSequence !== conversation.tail_sequence || request.expectedTailDigest !== conversation.tail_digest) return yield* SqliteAppendConflict.make({
-				message: `Expected tail ${request.expectedTailSequence}/${request.expectedTailDigest} but found ${conversation.tail_sequence}/${conversation.tail_digest}.`,
+			if (request.expectedTailSequence !== thread.tail_sequence || request.expectedTailDigest !== thread.tail_digest) return yield* SqliteAppendConflict.make({
+				message: `Expected tail ${request.expectedTailSequence}/${request.expectedTailDigest} but found ${thread.tail_sequence}/${thread.tail_digest}.`,
 				reason: "tail",
-				actualTailSequence: conversation.tail_sequence,
-				actualTailDigest: conversation.tail_digest
+				actualTailSequence: thread.tail_sequence,
+				actualTailDigest: thread.tail_digest
 			});
-			if (conversation.tail_sequence + request.records.length > MAX_RECORDS_PER_CONVERSATION) return yield* SqliteStorageError.make({
+			if (thread.tail_sequence + request.records.length > MAX_RECORDS_PER_THREAD) return yield* SqliteStorageError.make({
 				operation: "append canonical batch",
-				message: `Conversation record limit ${MAX_RECORDS_PER_CONVERSATION} would be exceeded.`
+				message: `Thread record limit ${MAX_RECORDS_PER_THREAD} would be exceeded.`
 			});
 			const existingRecordRows = yield* sql`
           SELECT
-            conversation_id,
+            thread_id,
             sequence,
             record_id,
             batch_id,
             record_json
           FROM effect_agent_canonical_records
-          WHERE conversation_id = ${request.conversationId}
+          WHERE thread_id = ${request.threadId}
             AND record_id IN ${sql.in(recordIds)}
           ORDER BY sequence
-        `.pipe(Effect.mapError(storageError("check canonical record identities")));
-			const existingRecords = yield* decodeRows$1(Schema.Array(RecordRow), "effect_agent_canonical_records", `${request.conversationId}/record_ids`, existingRecordRows);
+        `.pipe(Effect.mapError(storageError$1("check canonical record identities")));
+			const existingRecords = yield* decodeRows$3(Schema.Array(RecordRow), "effect_agent_canonical_records", `${request.threadId}/record_ids`, existingRecordRows);
 			if (existingRecords.length > 0) return yield* SqliteAppendConflict.make({
 				message: `Canonical record ID ${existingRecords[0].record_id} already exists.`,
 				reason: "record-identity"
 			});
-			const firstSequence = yield* Schema.decodeUnknownEffect(CanonicalSequence)(conversation.tail_sequence + 1).pipe(Effect.mapError((error) => SqliteStorageError.make({
+			const firstSequence = yield* Schema.decodeUnknownEffect(CanonicalSequence)(thread.tail_sequence + 1).pipe(Effect.mapError((error) => SqliteStorageError.make({
 				cause: error,
 				operation: "append canonical batch",
 				message: error.message
@@ -804,7 +1115,7 @@ const initializeSqliteJournal = Effect.fn("SqliteJournal.initialize")(function*
 			})));
 			yield* sql`
           INSERT INTO effect_agent_canonical_batches (
-            conversation_id,
+            thread_id,
             batch_id,
             first_sequence,
             last_sequence,
@@ -812,7 +1123,7 @@ const initializeSqliteJournal = Effect.fn("SqliteJournal.initialize")(function*
             tail_digest,
             batch_json
           ) VALUES (
-            ${request.conversationId},
+            ${request.threadId},
             ${request.batchId},
             ${firstSequence},
             ${lastSequence},
@@ -820,34 +1131,34 @@ const initializeSqliteJournal = Effect.fn("SqliteJournal.initialize")(function*
             ${request.tailDigest},
             ${request.batchJson}
           )
-        `.pipe(Effect.mapError(storageError("insert canonical batch")));
+        `.pipe(Effect.mapError(storageError$1("insert canonical batch")));
 			yield* failpoint("append:after-batch-insert");
 			yield* Effect.forEach(request.records, (record, index) => Effect.gen(function* () {
 				yield* sql`
                   INSERT INTO effect_agent_canonical_records (
-                    conversation_id,
+                    thread_id,
                     sequence,
                     record_id,
                     batch_id,
                     record_json
                   ) VALUES (
-                    ${request.conversationId},
+                    ${request.threadId},
                     ${firstSequence + index},
                     ${record.recordId},
                     ${request.batchId},
                     ${record.recordJson}
                   )
-                `.pipe(Effect.mapError(storageError("insert canonical record")));
+                `.pipe(Effect.mapError(storageError$1("insert canonical record")));
 				yield* failpoint("append:after-record-insert");
 			}), { discard: true });
 			yield* sql`
-          UPDATE effect_agent_conversations
+          UPDATE effect_agent_threads
           SET
             tail_sequence = ${lastSequence},
             tail_digest = ${request.tailDigest},
             producer_epoch = ${request.producerEpoch}
-          WHERE conversation_id = ${request.conversationId}
-        `.pipe(Effect.mapError(storageError("advance conversation tail")));
+          WHERE thread_id = ${request.threadId}
+        `.pipe(Effect.mapError(storageError$1("advance thread tail")));
 			yield* failpoint("append:after-tail-update");
 			return RawAppendResult.make({
 				firstSequence,
@@ -860,36 +1171,36 @@ const initializeSqliteJournal = Effect.fn("SqliteJournal.initialize")(function*
 	const read = Effect.fn("SqliteJournal.read")(function* (request) {
 		const rows = yield* sql`
       SELECT
-        conversation_id,
+        thread_id,
         sequence,
         record_id,
         batch_id,
         record_json
       FROM effect_agent_canonical_records
-      WHERE conversation_id = ${request.conversationId}
+      WHERE thread_id = ${request.threadId}
         AND sequence > ${request.fromSequenceExclusive}
       ORDER BY sequence
       LIMIT ${request.limit}
-    `.pipe(Effect.mapError(storageError("read canonical records")));
-		return yield* decodeRows$1(Schema.Array(RecordRow), "effect_agent_canonical_records", `${request.conversationId}>${request.fromSequenceExclusive}`, rows);
+    `.pipe(Effect.mapError(storageError$1("read canonical records")));
+		return yield* decodeRows$3(Schema.Array(RecordRow), "effect_agent_canonical_records", `${request.threadId}>${request.fromSequenceExclusive}`, rows);
 	});
-	const exportConversation = Effect.fn("SqliteJournal.exportConversation")(function* (conversationId) {
+	const exportThread = Effect.fn("SqliteJournal.exportThread")(function* (threadId) {
 		return yield* withReadTransaction("export transaction")(Effect.gen(function* () {
-			const conversationRows = yield* sql`
+			const threadRows = yield* sql`
             SELECT
-              conversation_id,
+              thread_id,
               created_at,
               tail_sequence,
               tail_digest,
               producer_epoch
-            FROM effect_agent_conversations
-            WHERE conversation_id = ${conversationId}
-          `.pipe(Effect.mapError(storageError("export conversation")));
-			const conversation = yield* decodeSingleRow(Schema.Array(ConversationRow), "effect_agent_conversations", conversationId, conversationRows);
-			yield* failpoint("export:after-conversation-read");
+            FROM effect_agent_threads
+            WHERE thread_id = ${threadId}
+          `.pipe(Effect.mapError(storageError$1("export thread")));
+			const thread = yield* decodeSingleRow(Schema.Array(ThreadRow), "effect_agent_threads", threadId, threadRows);
+			yield* failpoint("export:after-thread-read");
 			const batchRows = yield* sql`
             SELECT
-              conversation_id,
+              thread_id,
               batch_id,
               first_sequence,
               last_sequence,
@@ -897,70 +1208,70 @@ const initializeSqliteJournal = Effect.fn("SqliteJournal.initialize")(function*
               tail_digest,
               batch_json
             FROM effect_agent_canonical_batches
-            WHERE conversation_id = ${conversationId}
+            WHERE thread_id = ${threadId}
             ORDER BY first_sequence
-          `.pipe(Effect.mapError(storageError("export canonical batches")));
+          `.pipe(Effect.mapError(storageError$1("export canonical batches")));
 			const recordRows = yield* sql`
             SELECT
-              conversation_id,
+              thread_id,
               sequence,
               record_id,
               batch_id,
               record_json
             FROM effect_agent_canonical_records
-            WHERE conversation_id = ${conversationId}
+            WHERE thread_id = ${threadId}
             ORDER BY sequence
-          `.pipe(Effect.mapError(storageError("export canonical records")));
+          `.pipe(Effect.mapError(storageError$1("export canonical records")));
 			const checkpointRows = yield* sql`
             SELECT
-              conversation_id,
+              thread_id,
               through_sequence,
               tail_digest,
               checkpoint_json
             FROM effect_agent_checkpoints
-            WHERE conversation_id = ${conversationId}
+            WHERE thread_id = ${threadId}
             ORDER BY through_sequence
-          `.pipe(Effect.mapError(storageError("export checkpoints")));
-			return RawConversationExport.make({
-				conversation,
-				batches: yield* decodeRows$1(Schema.Array(BatchRow), "effect_agent_canonical_batches", conversationId, batchRows),
-				records: yield* decodeRows$1(Schema.Array(RecordRow), "effect_agent_canonical_records", conversationId, recordRows),
-				checkpoints: yield* decodeRows$1(Schema.Array(CheckpointRow), "effect_agent_checkpoints", conversationId, checkpointRows)
+          `.pipe(Effect.mapError(storageError$1("export checkpoints")));
+			return RawThreadExport.make({
+				thread,
+				batches: yield* decodeRows$3(Schema.Array(BatchRow), "effect_agent_canonical_batches", threadId, batchRows),
+				records: yield* decodeRows$3(Schema.Array(RecordRow), "effect_agent_canonical_records", threadId, recordRows),
+				checkpoints: yield* decodeRows$3(Schema.Array(CheckpointRow), "effect_agent_checkpoints", threadId, checkpointRows)
 			});
 		}));
 	});
 	const saveCheckpoint = Effect.fn("SqliteJournal.saveCheckpoint")(function* (checkpoint) {
-		if (checkpoint.conversationId.length > MAX_IDENTIFIER_LENGTH || storedTextBytes(checkpoint.checkpointJson) > MAX_STORED_TEXT_BYTES) return yield* SqliteStorageError.make({
+		if (checkpoint.threadId.length > MAX_IDENTIFIER_LENGTH || storedTextBytes(checkpoint.checkpointJson) > MAX_STORED_TEXT_BYTES) return yield* SqliteStorageError.make({
 			operation: "save checkpoint",
 			message: "Checkpoint identity or encoded JSON exceeds the SQLite storage bounds."
 		});
 		yield* withWriteTransaction("checkpoint transaction")(Effect.gen(function* () {
-			const conversationRows = yield* sql`
+			const threadRows = yield* sql`
           SELECT
-            conversation_id,
+            thread_id,
             created_at,
             tail_sequence,
             tail_digest,
             producer_epoch
-          FROM effect_agent_conversations
-          WHERE conversation_id = ${checkpoint.conversationId}
-        `.pipe(Effect.mapError(storageError("read checkpoint tail")));
-			const conversation = yield* decodeSingleRow(Schema.Array(ConversationRow), "effect_agent_conversations", checkpoint.conversationId, conversationRows);
-			if (checkpoint.throughSequence > conversation.tail_sequence) return yield* SqliteCheckpointConflict.make({ message: `Checkpoint sequence ${checkpoint.throughSequence} is after canonical tail ${conversation.tail_sequence}.` });
+          FROM effect_agent_threads
+          WHERE thread_id = ${checkpoint.threadId}
+        `.pipe(Effect.mapError(storageError$1("read checkpoint tail")));
+			const thread = yield* decodeSingleRow(Schema.Array(ThreadRow), "effect_agent_threads", checkpoint.threadId, threadRows);
+			if (checkpoint.throughSequence > thread.tail_sequence) return yield* SqliteCheckpointConflict.make({ message: `Checkpoint sequence ${checkpoint.throughSequence} is after canonical tail ${thread.tail_sequence}.` });
 			const checkpointRows = yield* sql`
           SELECT
-            conversation_id,
+            thread_id,
             through_sequence,
             tail_digest,
             checkpoint_json
           FROM effect_agent_checkpoints
-          WHERE conversation_id = ${checkpoint.conversationId}
+          WHERE thread_id = ${checkpoint.threadId}
             AND through_sequence = ${checkpoint.throughSequence}
-        `.pipe(Effect.mapError(storageError("read idempotent checkpoint")));
-			const existing = yield* decodeRows$1(Schema.Array(CheckpointRow), "effect_agent_checkpoints", `${checkpoint.conversationId}/${checkpoint.throughSequence}`, checkpointRows);
+        `.pipe(Effect.mapError(storageError$1("read idempotent checkpoint")));
+			const existing = yield* decodeRows$3(Schema.Array(CheckpointRow), "effect_agent_checkpoints", `${checkpoint.threadId}/${checkpoint.throughSequence}`, checkpointRows);
 			if (existing.length > 1) return yield* SqliteStorageCorruptionError.make({
 				table: "effect_agent_checkpoints",
-				rowKey: `${checkpoint.conversationId}/${checkpoint.throughSequence}`,
+				rowKey: `${checkpoint.threadId}/${checkpoint.throughSequence}`,
 				message: "A checkpoint primary key returned more than one row."
 			});
 			if (existing.length === 1) {
@@ -969,46 +1280,46 @@ const initializeSqliteJournal = Effect.fn("SqliteJournal.initialize")(function*
 			}
 			yield* sql`
           INSERT INTO effect_agent_checkpoints (
-            conversation_id,
+            thread_id,
             through_sequence,
             tail_digest,
             checkpoint_json
           ) VALUES (
-            ${checkpoint.conversationId},
+            ${checkpoint.threadId},
             ${checkpoint.throughSequence},
             ${checkpoint.tailDigest},
             ${checkpoint.checkpointJson}
           )
-        `.pipe(Effect.mapError(storageError("insert checkpoint")));
+        `.pipe(Effect.mapError(storageError$1("insert checkpoint")));
 		}));
 	});
-	const loadCheckpoint = Effect.fn("SqliteJournal.loadCheckpoint")(function* (conversationId, atOrBeforeSequence) {
+	const loadCheckpoint = Effect.fn("SqliteJournal.loadCheckpoint")(function* (threadId, atOrBeforeSequence) {
 		const rows = yield* sql`
       SELECT
-        conversation_id,
+        thread_id,
         through_sequence,
         tail_digest,
         checkpoint_json
       FROM effect_agent_checkpoints
-      WHERE conversation_id = ${conversationId}
+      WHERE thread_id = ${threadId}
         AND through_sequence <= ${atOrBeforeSequence}
       ORDER BY through_sequence DESC
       LIMIT 1
-    `.pipe(Effect.mapError(storageError("load checkpoint")));
-		return yield* decodeRows$1(Schema.Array(CheckpointRow), "effect_agent_checkpoints", `${conversationId}<=${atOrBeforeSequence}`, rows);
+    `.pipe(Effect.mapError(storageError$1("load checkpoint")));
+		return yield* decodeRows$3(Schema.Array(CheckpointRow), "effect_agent_checkpoints", `${threadId}<=${atOrBeforeSequence}`, rows);
 	});
 	return {
 		append,
-		exportConversation,
-		getConversation,
-		getTailDigestAt: Effect.fn("SqliteJournal.getTailDigestAt")(function* (conversationId, sequence) {
+		exportThread,
+		getThread,
+		getTailDigestAt: Effect.fn("SqliteJournal.getTailDigestAt")(function* (threadId, sequence) {
 			if (sequence === 0) {
-				const conversations = yield* getConversation(conversationId);
-				return conversations.length === 0 ? [] : [conversations[0].tail_sequence === 0 ? conversations[0].tail_digest : void 0].filter((value) => value !== void 0);
+				const threads = yield* getThread(threadId);
+				return threads.length === 0 ? [] : [threads[0].tail_sequence === 0 ? threads[0].tail_digest : void 0].filter((value) => value !== void 0);
 			}
 			const rows = yield* sql`
       SELECT
-        conversation_id,
+        thread_id,
         batch_id,
         first_sequence,
         last_sequence,
@@ -1016,10 +1327,10 @@ const initializeSqliteJournal = Effect.fn("SqliteJournal.initialize")(function*
         tail_digest,
         batch_json
       FROM effect_agent_canonical_batches
-      WHERE conversation_id = ${conversationId}
+      WHERE thread_id = ${threadId}
         AND last_sequence = ${sequence}
-    `.pipe(Effect.mapError(storageError("read canonical digest at sequence")));
-			return (yield* decodeRows$1(Schema.Array(BatchRow), "effect_agent_canonical_batches", `${conversationId}/${sequence}`, rows)).map((batch) => batch.tail_digest);
+    `.pipe(Effect.mapError(storageError$1("read canonical digest at sequence")));
+			return (yield* decodeRows$3(Schema.Array(BatchRow), "effect_agent_canonical_batches", `${threadId}/${sequence}`, rows)).map((batch) => batch.tail_digest);
 		}),
 		loadCheckpoint,
 		materialize,
@@ -1027,19 +1338,19 @@ const initializeSqliteJournal = Effect.fn("SqliteJournal.initialize")(function*
 		saveCheckpoint,
 		scanStoredPayloads: Effect.fn("SqliteJournal.scanStoredPayloads")(function* () {
 			return yield* withReadTransaction("startup scan transaction")(Effect.gen(function* () {
-				const conversations = yield* sql`
+				const threads = yield* sql`
             SELECT
-              conversation_id,
+              thread_id,
               created_at,
               tail_sequence,
               tail_digest,
               producer_epoch
-            FROM effect_agent_conversations
-            ORDER BY conversation_id
-          `.pipe(Effect.mapError(storageError("scan conversations")));
+            FROM effect_agent_threads
+            ORDER BY thread_id
+          `.pipe(Effect.mapError(storageError$1("scan threads")));
 				const batches = yield* sql`
             SELECT
-              conversation_id,
+              thread_id,
               batch_id,
               first_sequence,
               last_sequence,
@@ -1047,32 +1358,32 @@ const initializeSqliteJournal = Effect.fn("SqliteJournal.initialize")(function*
               tail_digest,
               batch_json
             FROM effect_agent_canonical_batches
-            ORDER BY conversation_id, first_sequence
-          `.pipe(Effect.mapError(storageError("scan canonical batches")));
+            ORDER BY thread_id, first_sequence
+          `.pipe(Effect.mapError(storageError$1("scan canonical batches")));
 				const records = yield* sql`
             SELECT
-              conversation_id,
+              thread_id,
               sequence,
               record_id,
               batch_id,
               record_json
             FROM effect_agent_canonical_records
-            ORDER BY conversation_id, sequence
-          `.pipe(Effect.mapError(storageError("scan canonical records")));
+            ORDER BY thread_id, sequence
+          `.pipe(Effect.mapError(storageError$1("scan canonical records")));
 				const checkpoints = yield* sql`
             SELECT
-              conversation_id,
+              thread_id,
               through_sequence,
               tail_digest,
               checkpoint_json
             FROM effect_agent_checkpoints
-            ORDER BY conversation_id, through_sequence
-          `.pipe(Effect.mapError(storageError("scan checkpoints")));
+            ORDER BY thread_id, through_sequence
+          `.pipe(Effect.mapError(storageError$1("scan checkpoints")));
 				return {
-					conversations: yield* decodeRows$1(Schema.Array(ConversationRow), "effect_agent_conversations", "startup_scan", conversations),
-					batches: yield* decodeRows$1(Schema.Array(BatchRow), "effect_agent_canonical_batches", "startup_scan", batches),
-					records: yield* decodeRows$1(Schema.Array(RecordRow), "effect_agent_canonical_records", "startup_scan", records),
-					checkpoints: yield* decodeRows$1(Schema.Array(CheckpointRow), "effect_agent_checkpoints", "startup_scan", checkpoints)
+					threads: yield* decodeRows$3(Schema.Array(ThreadRow), "effect_agent_threads", "startup_scan", threads),
+					batches: yield* decodeRows$3(Schema.Array(BatchRow), "effect_agent_canonical_batches", "startup_scan", batches),
+					records: yield* decodeRows$3(Schema.Array(RecordRow), "effect_agent_canonical_records", "startup_scan", records),
+					checkpoints: yield* decodeRows$3(Schema.Array(CheckpointRow), "effect_agent_checkpoints", "startup_scan", checkpoints)
 				};
 			}));
 		}),
@@ -1080,85 +1391,85 @@ const initializeSqliteJournal = Effect.fn("SqliteJournal.initialize")(function*
 	};
 });
 //#endregion
-//#region src/sqlite-conversation-store.ts
-const OffsetText = Schema.String.check(Schema.isMaxLength(4 * 1024));
+//#region src/sqlite-thread-store.ts
+const OffsetText = Schema.String.check(Schema.isMaxLength(4096));
 const SQLITE_OFFSET_PREFIX = "effect-agent-sqlite@1:";
 const ZERO_CANONICAL_SEQUENCE = Schema.decodeSync(CanonicalSequence)(0);
 const isDigest = Schema.is(Digest);
 const isSqliteFenceRejected = Schema.is(SqliteFenceRejected);
 const isSqliteAppendConflict = Schema.is(SqliteAppendConflict);
 const isSqliteCheckpointConflict = Schema.is(SqliteCheckpointConflict);
-const storeError = (operation, error) => ConversationStoreError.make({
+const storeError = (operation, error) => ThreadStoreError.make({
 	cause: error,
 	operation,
 	message: error.message
 });
-const schemaStoreError = (operation, error) => ConversationStoreError.make({
+const schemaStoreError = (operation, error) => ThreadStoreError.make({
 	cause: error,
 	operation,
 	message: error.message
 });
-const makeOffset = Effect.fn("SqliteConversationStore.makeOffset")(function* (conversationId, sequence) {
-	return yield* Schema.decodeUnknownEffect(CanonicalSequence)(sequence).pipe(Effect.flatMap((validatedSequence) => Schema.decodeUnknownEffect(ObservationOffset)(`${SQLITE_OFFSET_PREFIX}${encodeURIComponent(conversationId)}:${validatedSequence}`)), Effect.mapError((error) => schemaStoreError("encode observation offset", error)));
+const makeOffset = Effect.fn("SqliteThreadStore.makeOffset")(function* (threadId, sequence) {
+	return yield* Schema.decodeUnknownEffect(CanonicalSequence)(sequence).pipe(Effect.flatMap((validatedSequence) => Schema.decodeUnknownEffect(ObservationOffset)(`${SQLITE_OFFSET_PREFIX}${encodeURIComponent(threadId)}:${validatedSequence}`)), Effect.mapError((error) => schemaStoreError("encode observation offset", error)));
 });
-const parseOffset = Effect.fn("SqliteConversationStore.parseOffset")(function* (conversationId, offset) {
+const parseOffset = Effect.fn("SqliteThreadStore.parseOffset")(function* (threadId, offset) {
 	if (offset === void 0) return ZERO_CANONICAL_SEQUENCE;
 	const text = yield* Schema.decodeUnknownEffect(OffsetText)(offset).pipe(Effect.mapError((error) => schemaStoreError("decode observation offset", error)));
-	const conversationPrefix = `${SQLITE_OFFSET_PREFIX}${encodeURIComponent(conversationId)}:`;
-	if (!text.startsWith(conversationPrefix)) return yield* ConversationStoreError.make({
+	const threadPrefix = `${SQLITE_OFFSET_PREFIX}${encodeURIComponent(threadId)}:`;
+	if (!text.startsWith(threadPrefix)) return yield* ThreadStoreError.make({
 		operation: "decode observation offset",
-		message: "The observation offset belongs to a different adapter, storage version, or Conversation."
+		message: "The observation offset belongs to a different adapter, storage version, or Thread."
 	});
-	const sequenceText = text.slice(conversationPrefix.length);
-	if (!/^(0|[1-9][0-9]*)$/.test(sequenceText)) return yield* ConversationStoreError.make({
+	const sequenceText = text.slice(threadPrefix.length);
+	if (!/^(0|[1-9][0-9]*)$/.test(sequenceText)) return yield* ThreadStoreError.make({
 		operation: "decode observation offset",
 		message: "The observation offset is malformed."
 	});
 	return yield* Schema.decodeUnknownEffect(CanonicalSequence)(Number(sequenceText)).pipe(Effect.mapError((error) => schemaStoreError("decode observation offset", error)));
 });
-const mapFence = (conversationId, error) => FenceRejected.make({
-	conversationId,
+const mapFence = (threadId, error) => FenceRejected.make({
+	threadId,
 	actualEpoch: error.actualEpoch,
 	attemptedEpoch: error.producerEpoch
 });
-const encodeCanonicalRecord = Effect.fn("SqliteConversationStore.encodeCanonicalRecord")(function* (record) {
+const encodeCanonicalRecord = Effect.fn("SqliteThreadStore.encodeCanonicalRecord")(function* (record) {
 	return yield* Schema.encodeEffect(Schema.fromJsonString(CanonicalRecord))(record).pipe(Effect.mapError((error) => schemaStoreError("encode canonical record", error)));
 });
-const encodeCanonicalBatch = Effect.fn("SqliteConversationStore.encodeCanonicalBatch")(function* (batch) {
+const encodeCanonicalBatch = Effect.fn("SqliteThreadStore.encodeCanonicalBatch")(function* (batch) {
 	return yield* Schema.encodeEffect(Schema.fromJsonString(CanonicalBatch))(batch).pipe(Effect.mapError((error) => schemaStoreError("encode canonical batch", error)));
 });
-const encodeCheckpoint = Effect.fn("SqliteConversationStore.encodeCheckpoint")(function* (checkpoint) {
-	return yield* Schema.encodeEffect(Schema.fromJsonString(ConversationCheckpoint))(checkpoint).pipe(Effect.mapError((error) => schemaStoreError("encode checkpoint", error)));
+const encodeCheckpoint = Effect.fn("SqliteThreadStore.encodeCheckpoint")(function* (checkpoint) {
+	return yield* Schema.encodeEffect(Schema.fromJsonString(ThreadCheckpoint))(checkpoint).pipe(Effect.mapError((error) => schemaStoreError("encode checkpoint", error)));
 });
-const decodeEnvelope = Effect.fn("SqliteConversationStore.decodeEnvelope")(function* (row) {
-	const record = yield* Schema.decodeEffect(Schema.fromJsonString(CanonicalRecord))(row.record_json).pipe(Effect.mapError((error) => ConversationStoreError.make({
+const decodeEnvelope = Effect.fn("SqliteThreadStore.decodeEnvelope")(function* (row) {
+	const record = yield* Schema.decodeEffect(Schema.fromJsonString(CanonicalRecord))(row.record_json).pipe(Effect.mapError((error) => ThreadStoreError.make({
 		operation: "decode canonical record",
 		message: error.message
 	})));
-	const conversationId = yield* Schema.decodeUnknownEffect(CanonicalRecordEnvelope.fields.conversationId)(row.conversation_id).pipe(Effect.mapError((error) => schemaStoreError("decode conversation identity", error)));
-	const offset = yield* makeOffset(conversationId, row.sequence);
+	const threadId = yield* Schema.decodeUnknownEffect(CanonicalRecordEnvelope.fields.threadId)(row.thread_id).pipe(Effect.mapError((error) => schemaStoreError("decode thread identity", error)));
+	const offset = yield* makeOffset(threadId, row.sequence);
 	const batchId = yield* Schema.decodeUnknownEffect(CanonicalRecordEnvelope.fields.batchId)(row.batch_id).pipe(Effect.mapError((error) => schemaStoreError("decode batch identity", error)));
 	return CanonicalRecordEnvelope.make({
-		conversationId,
+		threadId,
 		batchId,
 		sequence: row.sequence,
 		offset,
 		record
 	});
 });
-const decodeCheckpoint = Effect.fn("SqliteConversationStore.decodeCheckpoint")(function* (checkpointJson) {
-	return yield* Schema.decodeEffect(Schema.fromJsonString(ConversationCheckpoint))(checkpointJson).pipe(Effect.mapError((error) => schemaStoreError("decode checkpoint", error)));
+const decodeCheckpoint = Effect.fn("SqliteThreadStore.decodeCheckpoint")(function* (checkpointJson) {
+	return yield* Schema.decodeEffect(Schema.fromJsonString(ThreadCheckpoint))(checkpointJson).pipe(Effect.mapError((error) => schemaStoreError("decode checkpoint", error)));
 });
-const requireConversation = Effect.fn("SqliteConversationStore.requireConversation")(function* (journal, conversationId) {
-	const rows = yield* journal.getConversation(conversationId).pipe(Effect.mapError((error) => storeError("read conversation", error)));
-	if (rows.length === 0) return yield* ConversationNotMaterialized.make({ conversationId });
+const requireThread = Effect.fn("SqliteThreadStore.requireThread")(function* (journal, threadId) {
+	const rows = yield* journal.getThread(threadId).pipe(Effect.mapError((error) => storeError("read thread", error)));
+	if (rows.length === 0) return yield* ThreadNotMaterialized.make({ threadId });
 	return rows[0];
 });
-const tailDigestAt = Effect.fn("SqliteConversationStore.tailDigestAt")(function* (journal, conversationId, sequence) {
+const tailDigestAt = Effect.fn("SqliteThreadStore.tailDigestAt")(function* (journal, threadId, sequence) {
 	if (sequence === 0) return EMPTY_TAIL_DIGEST;
-	const digests = yield* journal.getTailDigestAt(conversationId, sequence).pipe(Effect.mapError((error) => storeError("read checkpoint digest", error)));
+	const digests = yield* journal.getTailDigestAt(threadId, sequence).pipe(Effect.mapError((error) => storeError("read checkpoint digest", error)));
 	if (digests.length !== 1) return yield* CheckpointRejected.make({
-		conversationId,
+		threadId,
 		reason: "digest-mismatch"
 	});
 	return yield* Schema.decodeUnknownEffect(Digest)(digests[0]).pipe(Effect.mapError((error) => schemaStoreError("decode checkpoint digest", error)));
@@ -1177,14 +1488,14 @@ const groupByKey = (rows, key) => {
 * and re-digested against the canonical chain. Routine opens skip this scan: per-operation
 * Schema decoding plus the digest chain already fail clearly on corrupt rows.
 */
-const decodeStartupPayloads = Effect.fn("SqliteConversationStore.decodeStartupPayloads")(function* (journal, crypto) {
+const decodeStartupPayloads = Effect.fn("SqliteThreadStore.decodeStartupPayloads")(function* (journal, crypto) {
 	const stored = yield* journal.scanStoredPayloads();
 	const batches = yield* Effect.forEach(stored.batches, (batch) => Schema.decodeEffect(Schema.fromJsonString(CanonicalBatch))(batch.batch_json).pipe(Effect.map((decoded) => ({
 		decoded,
 		row: batch
 	})), Effect.mapError((error) => SqliteStorageCorruptionError.make({
 		table: "effect_agent_canonical_batches",
-		rowKey: `${batch.conversation_id}/${batch.batch_id}`,
+		rowKey: `${batch.thread_id}/${batch.batch_id}`,
 		message: error.message
 	}))));
 	const records = yield* Effect.forEach(stored.records, (record) => Schema.decodeEffect(Schema.fromJsonString(CanonicalRecord))(record.record_json).pipe(Effect.map((decoded) => ({
@@ -1192,31 +1503,31 @@ const decodeStartupPayloads = Effect.fn("SqliteConversationStore.decodeStartupPa
 		row: record
 	})), Effect.mapError((error) => SqliteStorageCorruptionError.make({
 		table: "effect_agent_canonical_records",
-		rowKey: `${record.conversation_id}/${record.sequence}`,
+		rowKey: `${record.thread_id}/${record.sequence}`,
 		message: error.message
 	}))));
-	const checkpoints = yield* Effect.forEach(stored.checkpoints, (checkpoint) => Schema.decodeEffect(Schema.fromJsonString(ConversationCheckpoint))(checkpoint.checkpoint_json).pipe(Effect.map((decoded) => ({
+	const checkpoints = yield* Effect.forEach(stored.checkpoints, (checkpoint) => Schema.decodeEffect(Schema.fromJsonString(ThreadCheckpoint))(checkpoint.checkpoint_json).pipe(Effect.map((decoded) => ({
 		decoded,
 		row: checkpoint
 	})), Effect.mapError((error) => SqliteStorageCorruptionError.make({
 		table: "effect_agent_checkpoints",
-		rowKey: `${checkpoint.conversation_id}/${checkpoint.through_sequence}`,
+		rowKey: `${checkpoint.thread_id}/${checkpoint.through_sequence}`,
 		message: error.message
 	}))));
-	const batchesByConversation = groupByKey(batches, ({ row }) => row.conversation_id);
-	const recordsByConversation = groupByKey(records, ({ row }) => row.conversation_id);
-	const checkpointsByConversation = groupByKey(checkpoints, ({ row }) => row.conversation_id);
-	const materializedIds = new Set(stored.conversations.map((conversation) => conversation.conversation_id));
-	for (const conversation of stored.conversations) {
-		const conversationBatches = batchesByConversation.get(conversation.conversation_id) ?? [];
-		const conversationRecords = recordsByConversation.get(conversation.conversation_id) ?? [];
-		const conversationCheckpoints = checkpointsByConversation.get(conversation.conversation_id) ?? [];
-		const recordsByBatch = groupByKey(conversationRecords, ({ row }) => row.batch_id);
+	const batchesByThread = groupByKey(batches, ({ row }) => row.thread_id);
+	const recordsByThread = groupByKey(records, ({ row }) => row.thread_id);
+	const checkpointsByThread = groupByKey(checkpoints, ({ row }) => row.thread_id);
+	const materializedIds = new Set(stored.threads.map((thread) => thread.thread_id));
+	for (const thread of stored.threads) {
+		const threadBatches = batchesByThread.get(thread.thread_id) ?? [];
+		const threadRecords = recordsByThread.get(thread.thread_id) ?? [];
+		const threadCheckpoints = checkpointsByThread.get(thread.thread_id) ?? [];
+		const recordsByBatch = groupByKey(threadRecords, ({ row }) => row.batch_id);
 		let previousDigest = EMPTY_TAIL_DIGEST;
 		let expectedSequence = 1;
 		const tailDigests = /* @__PURE__ */ new Map([[0, EMPTY_TAIL_DIGEST]]);
-		for (const { decoded: canonicalBatch, row: batchRow } of conversationBatches) {
-			const key = `${batchRow.conversation_id}/${batchRow.batch_id}`;
+		for (const { decoded: canonicalBatch, row: batchRow } of threadBatches) {
+			const key = `${batchRow.thread_id}/${batchRow.batch_id}`;
 			if (canonicalBatch.batchId !== batchRow.batch_id || batchRow.first_sequence !== expectedSequence || batchRow.last_sequence !== batchRow.first_sequence + canonicalBatch.records.length - 1) return yield* SqliteStorageCorruptionError.make({
 				table: "effect_agent_canonical_batches",
 				rowKey: key,
@@ -1261,41 +1572,41 @@ const decodeStartupPayloads = Effect.fn("SqliteConversationStore.decodeStartupPa
 			expectedSequence = batchRow.last_sequence + 1;
 			tailDigests.set(batchRow.last_sequence, digest);
 		}
-		if (conversationRecords.length !== conversation.tail_sequence || conversation.tail_sequence !== expectedSequence - 1 || conversation.tail_digest !== previousDigest) return yield* SqliteStorageCorruptionError.make({
-			table: "effect_agent_conversations",
-			rowKey: conversation.conversation_id,
-			message: "Conversation tail does not match its canonical batch chain."
+		if (threadRecords.length !== thread.tail_sequence || thread.tail_sequence !== expectedSequence - 1 || thread.tail_digest !== previousDigest) return yield* SqliteStorageCorruptionError.make({
+			table: "effect_agent_threads",
+			rowKey: thread.thread_id,
+			message: "Thread tail does not match its canonical batch chain."
 		});
-		for (const checkpoint of conversationCheckpoints) if (checkpoint.decoded.conversationId !== conversation.conversation_id || checkpoint.decoded.throughSequence !== checkpoint.row.through_sequence || checkpoint.decoded.tailDigest !== checkpoint.row.tail_digest || tailDigests.get(checkpoint.row.through_sequence) !== checkpoint.row.tail_digest) return yield* SqliteStorageCorruptionError.make({
+		for (const checkpoint of threadCheckpoints) if (checkpoint.decoded.threadId !== thread.thread_id || checkpoint.decoded.throughSequence !== checkpoint.row.through_sequence || checkpoint.decoded.tailDigest !== checkpoint.row.tail_digest || tailDigests.get(checkpoint.row.through_sequence) !== checkpoint.row.tail_digest) return yield* SqliteStorageCorruptionError.make({
 			table: "effect_agent_checkpoints",
-			rowKey: `${conversation.conversation_id}/${checkpoint.row.through_sequence}`,
+			rowKey: `${thread.thread_id}/${checkpoint.row.through_sequence}`,
 			message: "Checkpoint identity or digest is not bound to a canonical batch tail."
 		});
 	}
-	if (batches.some(({ row }) => !materializedIds.has(row.conversation_id)) || records.some(({ row }) => !materializedIds.has(row.conversation_id)) || checkpoints.some(({ row }) => !materializedIds.has(row.conversation_id))) return yield* SqliteStorageCorruptionError.make({
-		table: "effect_agent_conversations",
+	if (batches.some(({ row }) => !materializedIds.has(row.thread_id)) || records.some(({ row }) => !materializedIds.has(row.thread_id)) || checkpoints.some(({ row }) => !materializedIds.has(row.thread_id))) return yield* SqliteStorageCorruptionError.make({
+		table: "effect_agent_threads",
 		rowKey: "startup_scan",
-		message: "Canonical rows exist without a materialized Conversation."
+		message: "Canonical rows exist without a materialized Thread."
 	});
 });
-const makeServices$1 = Effect.fn("SqliteConversationStore.makeServices")(function* () {
+const makeServices$1 = Effect.fn("SqliteThreadStore.makeServices")(function* () {
 	const config = yield* SqliteStorageConfig;
 	const failpoint = yield* SqliteStorageFailpoint;
 	const crypto = yield* Crypto.Crypto;
 	const journal = yield* initializeSqliteJournal();
 	if (config.verifyOnOpen) yield* decodeStartupPayloads(journal, crypto);
 	const provideCrypto = (effect) => Effect.provideService(effect, Crypto.Crypto, crypto);
-	const hitFailpoint = Effect.fn("SqliteConversationStore.hitFailpoint")((location) => failpoint.hit(location).pipe(Effect.mapError((error) => storeError(`storage failpoint ${location}`, error))));
-	const materialize = Effect.fn("SqliteConversationStore.materialize")(function* (request) {
-		const validated = yield* Schema.decodeUnknownEffect(Schema.toType(ConversationMaterialization))(request).pipe(Effect.mapError((error) => schemaStoreError("validate materialization", error)));
+	const hitFailpoint = Effect.fn("SqliteThreadStore.hitFailpoint")((location) => failpoint.hit(location).pipe(Effect.mapError((error) => storeError(`storage failpoint ${location}`, error))));
+	const materialize = Effect.fn("SqliteThreadStore.materialize")(function* (request) {
+		const validated = yield* Schema.decodeUnknownEffect(Schema.toType(ThreadMaterialization))(request).pipe(Effect.mapError((error) => schemaStoreError("validate materialization", error)));
 		const now = yield* Clock.currentTimeMillis;
 		yield* hitFailpoint("materialize:before");
-		yield* journal.materialize(validated.conversationId, new Date(now).toISOString(), EMPTY_TAIL_DIGEST, validated.producerEpoch).pipe(Effect.mapError((error) => error._tag === "SqliteFenceRejected" ? mapFence(validated.conversationId, error) : storeError("materialize conversation", error)));
+		yield* journal.materialize(validated.threadId, new Date(now).toISOString(), EMPTY_TAIL_DIGEST, validated.producerEpoch).pipe(Effect.mapError((error) => error._tag === "SqliteFenceRejected" ? mapFence(validated.threadId, error) : storeError("materialize thread", error)));
 		yield* hitFailpoint("materialize:after");
 	});
-	const append = Effect.fn("SqliteConversationStore.append")(function* (request) {
+	const append = Effect.fn("SqliteThreadStore.append")(function* (request) {
 		const validated = yield* Schema.decodeUnknownEffect(Schema.toType(FencedAppendRequest))(request).pipe(Effect.mapError((error) => schemaStoreError("validate canonical append", error)));
-		yield* requireConversation(journal, validated.conversationId);
+		yield* requireThread(journal, validated.threadId);
 		const tailDigest = yield* provideCrypto(digestCanonicalBatch(validated.expectedTailDigest, validated.batch)).pipe(Effect.mapError((error) => storeError("digest canonical append", error)));
 		const batchJson = yield* encodeCanonicalBatch(validated.batch);
 		const rawRecords = yield* Effect.forEach(validated.batch.records, (record) => encodeCanonicalRecord(record).pipe(Effect.map((recordJson) => ({
@@ -1303,7 +1614,7 @@ const makeServices$1 = Effect.fn("SqliteConversationStore.makeServices")(functio
 			recordJson
 		}))));
 		const rawRequest = yield* Schema.decodeUnknownEffect(RawAppendRequest)({
-			conversationId: validated.conversationId,
+			threadId: validated.threadId,
 			batchId: validated.batch.batchId,
 			batchDigest: tailDigest,
 			batchJson,
@@ -1315,15 +1626,15 @@ const makeServices$1 = Effect.fn("SqliteConversationStore.makeServices")(functio
 		}).pipe(Effect.mapError((error) => schemaStoreError("encode canonical append", error)));
 		yield* hitFailpoint("append:before");
 		const result = yield* journal.append(rawRequest).pipe(Effect.mapError((error) => {
-			if (isSqliteFenceRejected(error)) return mapFence(validated.conversationId, error);
+			if (isSqliteFenceRejected(error)) return mapFence(validated.threadId, error);
 			if (isSqliteAppendConflict(error)) return error.actualTailSequence !== void 0 && isDigest(error.actualTailDigest) ? AppendConflict.make({
-				conversationId: validated.conversationId,
+				threadId: validated.threadId,
 				batchId: validated.batch.batchId,
 				reason: error.reason,
 				actualTailSequence: error.actualTailSequence,
 				actualTailDigest: error.actualTailDigest
 			}) : AppendConflict.make({
-				conversationId: validated.conversationId,
+				threadId: validated.threadId,
 				batchId: validated.batch.batchId,
 				reason: error.reason
 			});
@@ -1332,30 +1643,30 @@ const makeServices$1 = Effect.fn("SqliteConversationStore.makeServices")(functio
 		yield* hitFailpoint("append:after");
 		return result;
 	});
-	const loadRecords = Effect.fn("SqliteConversationStore.loadRecords")(function* (request) {
+	const loadRecords = Effect.fn("SqliteThreadStore.loadRecords")(function* (request) {
 		const rows = yield* journal.read(request).pipe(Effect.mapError((error) => storeError("read canonical records", error)));
 		return yield* Effect.forEach(rows, decodeEnvelope);
 	});
-	const readEffect = Effect.fn("SqliteConversationStore.read")(function* (request) {
-		const validated = yield* Schema.decodeUnknownEffect(Schema.toType(ConversationRead))(request).pipe(Effect.mapError((error) => schemaStoreError("validate conversation read", error)));
-		yield* requireConversation(journal, validated.conversationId);
+	const readEffect = Effect.fn("SqliteThreadStore.read")(function* (request) {
+		const validated = yield* Schema.decodeUnknownEffect(Schema.toType(ThreadRead))(request).pipe(Effect.mapError((error) => schemaStoreError("validate thread read", error)));
+		yield* requireThread(journal, validated.threadId);
 		const records = yield* loadRecords(RawReadRequest.make({
-			conversationId: validated.conversationId,
+			threadId: validated.threadId,
 			fromSequenceExclusive: validated.afterSequence ?? ZERO_CANONICAL_SEQUENCE,
 			limit: validated.limit
 		}));
 		return Stream.fromIterable(records);
 	});
 	const read = (request) => Stream.unwrap(readEffect(request));
-	const observeEffect = Effect.fn("SqliteConversationStore.observe")(function* (request) {
-		const validated = yield* Schema.decodeUnknownEffect(Schema.toType(ConversationObservation))(request).pipe(Effect.mapError((error) => schemaStoreError("validate conversation observation", error)));
-		yield* requireConversation(journal, validated.conversationId);
-		const initialSequence = yield* parseOffset(validated.conversationId, validated.afterOffset);
+	const observeEffect = Effect.fn("SqliteThreadStore.observe")(function* (request) {
+		const validated = yield* Schema.decodeUnknownEffect(Schema.toType(ThreadObservation))(request).pipe(Effect.mapError((error) => schemaStoreError("validate thread observation", error)));
+		yield* requireThread(journal, validated.threadId);
+		const initialSequence = yield* parseOffset(validated.threadId, validated.afterOffset);
 		const cursor = yield* Ref.make(initialSequence);
-		const poll = Effect.fn("SqliteConversationStore.observePoll")(function* () {
+		const poll = Effect.fn("SqliteThreadStore.observePoll")(function* () {
 			const fromSequenceExclusive = yield* Ref.get(cursor);
 			const records = yield* loadRecords(RawReadRequest.make({
-				conversationId: validated.conversationId,
+				threadId: validated.threadId,
 				fromSequenceExclusive,
 				limit: 1024
 			}));
@@ -1369,96 +1680,98 @@ const makeServices$1 = Effect.fn("SqliteConversationStore.makeServices")(functio
 		return Stream.fromIterableEffectRepeat(poll());
 	});
 	const observe = (request) => Stream.unwrap(observeEffect(request));
-	const exportConversation = Effect.fn("SqliteConversationStore.export")(function* (request) {
-		const validated = yield* Schema.decodeUnknownEffect(Schema.toType(ConversationExportRequest))(request).pipe(Effect.mapError((error) => schemaStoreError("validate conversation export", error)));
-		yield* requireConversation(journal, validated.conversationId);
-		const exported = yield* journal.exportConversation(validated.conversationId).pipe(Effect.mapError((error) => storeError("export conversation", error)));
+	const exportThread = Effect.fn("SqliteThreadStore.export")(function* (request) {
+		const validated = yield* Schema.decodeUnknownEffect(Schema.toType(ThreadExportRequest))(request).pipe(Effect.mapError((error) => schemaStoreError("validate thread export", error)));
+		yield* requireThread(journal, validated.threadId);
+		const exported = yield* journal.exportThread(validated.threadId).pipe(Effect.mapError((error) => storeError("export thread", error)));
 		const records = yield* Effect.forEach(exported.records, decodeEnvelope);
-		if (records.length > 65536) return yield* ConversationStoreError.make({
-			operation: "decode conversation export",
-			message: "The conversation exceeds the current export record limit."
+		if (records.length > 65536) return yield* ThreadStoreError.make({
+			operation: "decode thread export",
+			message: "The thread exceeds the current export record limit."
 		});
-		const tailDigest = yield* Schema.decodeUnknownEffect(Digest)(exported.conversation.tail_digest).pipe(Effect.mapError((error) => schemaStoreError("decode export tail digest", error)));
-		return ConversationExport.make({
-			format: "effect-agent/conversation@1",
-			conversationId: validated.conversationId,
-			tailSequence: exported.conversation.tail_sequence,
+		const tailDigest = yield* Schema.decodeUnknownEffect(Digest)(exported.thread.tail_digest).pipe(Effect.mapError((error) => schemaStoreError("decode export tail digest", error)));
+		return ThreadExport.make({
+			format: "effect-agent/thread@1",
+			threadId: validated.threadId,
+			tailSequence: exported.thread.tail_sequence,
 			tailDigest,
 			records
 		});
 	});
-	const inspectTail = Effect.fn("SqliteConversationStore.inspectTail")(function* (request) {
-		const validated = yield* Schema.decodeUnknownEffect(Schema.toType(ConversationTailRequest))(request).pipe(Effect.mapError((error) => schemaStoreError("validate tail inspection", error)));
-		const conversation = yield* requireConversation(journal, validated.conversationId);
-		const tailDigest = yield* Schema.decodeUnknownEffect(Digest)(conversation.tail_digest).pipe(Effect.mapError((error) => schemaStoreError("decode tail digest", error)));
-		return ConversationTail.make({
-			conversationId: validated.conversationId,
-			tailSequence: conversation.tail_sequence,
+	const inspectTail = Effect.fn("SqliteThreadStore.inspectTail")(function* (request) {
+		const validated = yield* Schema.decodeUnknownEffect(Schema.toType(ThreadTailRequest))(request).pipe(Effect.mapError((error) => schemaStoreError("validate tail inspection", error)));
+		const thread = yield* requireThread(journal, validated.threadId);
+		const tailDigest = yield* Schema.decodeUnknownEffect(Digest)(thread.tail_digest).pipe(Effect.mapError((error) => schemaStoreError("decode tail digest", error)));
+		return ThreadTail.make({
+			threadId: validated.threadId,
+			tailSequence: thread.tail_sequence,
 			tailDigest,
-			producerEpoch: conversation.producer_epoch
+			producerEpoch: thread.producer_epoch
 		});
 	});
-	const saveCheckpoint = Effect.fn("SqliteConversationStore.saveCheckpoint")(function* (request) {
+	const saveCheckpoint = Effect.fn("SqliteThreadStore.saveCheckpoint")(function* (request) {
 		const validated = yield* Schema.decodeUnknownEffect(Schema.toType(SaveCheckpointRequest))(request).pipe(Effect.mapError((error) => schemaStoreError("validate checkpoint", error)));
-		const conversation = yield* requireConversation(journal, validated.checkpoint.conversationId);
-		if (validated.checkpoint.throughSequence > conversation.tail_sequence) return yield* CheckpointRejected.make({
-			conversationId: validated.checkpoint.conversationId,
+		const thread = yield* requireThread(journal, validated.checkpoint.threadId);
+		if (validated.checkpoint.throughSequence > thread.tail_sequence) return yield* CheckpointRejected.make({
+			threadId: validated.checkpoint.threadId,
 			reason: "ahead-of-tail"
 		});
-		if ((yield* tailDigestAt(journal, validated.checkpoint.conversationId, validated.checkpoint.throughSequence)) !== validated.checkpoint.tailDigest) return yield* CheckpointRejected.make({
-			conversationId: validated.checkpoint.conversationId,
+		if ((yield* tailDigestAt(journal, validated.checkpoint.threadId, validated.checkpoint.throughSequence)) !== validated.checkpoint.tailDigest) return yield* CheckpointRejected.make({
+			threadId: validated.checkpoint.threadId,
 			reason: "digest-mismatch"
 		});
 		const checkpointJson = yield* encodeCheckpoint(validated.checkpoint);
 		const raw = RawCheckpoint.make({
-			conversationId: validated.checkpoint.conversationId,
+			threadId: validated.checkpoint.threadId,
 			throughSequence: validated.checkpoint.throughSequence,
 			tailDigest: validated.checkpoint.tailDigest,
 			checkpointJson
 		});
 		yield* hitFailpoint("save-checkpoint:before");
 		yield* journal.saveCheckpoint(raw).pipe(Effect.mapError((error) => isSqliteCheckpointConflict(error) ? CheckpointRejected.make({
-			conversationId: validated.checkpoint.conversationId,
+			threadId: validated.checkpoint.threadId,
 			reason: "digest-mismatch"
 		}) : storeError("save checkpoint", error)));
 		yield* hitFailpoint("save-checkpoint:after");
 	});
-	const loadCheckpoint = Effect.fn("SqliteConversationStore.loadCheckpoint")(function* (request) {
+	const loadCheckpoint = Effect.fn("SqliteThreadStore.loadCheckpoint")(function* (request) {
 		const validated = yield* Schema.decodeUnknownEffect(Schema.toType(LoadCheckpointRequest))(request).pipe(Effect.mapError((error) => schemaStoreError("validate checkpoint lookup", error)));
-		const conversation = yield* requireConversation(journal, validated.conversationId);
-		const rows = yield* journal.loadCheckpoint(validated.conversationId, validated.atOrBeforeSequence ?? conversation.tail_sequence).pipe(Effect.mapError((error) => storeError("load checkpoint", error)));
+		const thread = yield* requireThread(journal, validated.threadId);
+		const rows = yield* journal.loadCheckpoint(validated.threadId, validated.atOrBeforeSequence ?? thread.tail_sequence).pipe(Effect.mapError((error) => storeError("load checkpoint", error)));
 		if (rows.length === 0) return Option.none();
-		if (rows.length !== 1) return yield* ConversationStoreError.make({
+		if (rows.length !== 1) return yield* ThreadStoreError.make({
 			operation: "load checkpoint",
 			message: `Expected at most one checkpoint row but found ${rows.length}.`
 		});
 		const checkpoint = yield* decodeCheckpoint(rows[0].checkpoint_json);
-		if ((yield* tailDigestAt(journal, checkpoint.conversationId, checkpoint.throughSequence)) !== checkpoint.tailDigest) return yield* CheckpointRejected.make({
-			conversationId: checkpoint.conversationId,
+		if ((yield* tailDigestAt(journal, checkpoint.threadId, checkpoint.throughSequence)) !== checkpoint.tailDigest) return yield* CheckpointRejected.make({
+			threadId: checkpoint.threadId,
 			reason: "digest-mismatch"
 		});
 		return Option.some(checkpoint);
 	});
-	const conversationStore = ConversationStore.of({
+	const threadStore = ThreadStore.of({
 		append,
-		export: exportConversation,
+		export: exportThread,
 		inspectTail,
-		loadCheckpoint,
 		materialize,
 		observe,
 		read,
-		saveCheckpoint
+		checkpoints: {
+			save: saveCheckpoint,
+			load: loadCheckpoint
+		}
 	});
-	return Context.make(ConversationStore, conversationStore);
+	return Context.make(ThreadStore, threadStore);
 });
 /**
-* SQLite Conversation Store implementation with configuration, failpoint, SQL, and Crypto
+* SQLite Thread Store implementation with configuration, failpoint, SQL, and Crypto
 * authority kept visible in its input channel.
 */
-const conversationStoreLayer = Layer.effectContext(makeServices$1());
+const threadStoreLayer = Layer.effectContext(makeServices$1());
 /**
 * Validated SQLite storage configuration Layer with the documented defaults applied. Shared
-* by the ConversationStore and SubmissionLedger convenience layers so their defaults cannot
+* by the ThreadStore and SubmissionLedger convenience layers so their defaults cannot
 * drift.
 */
 const storageConfigLayer = (options) => Layer.effect(SqliteStorageConfig)(Schema.decodeUnknownEffect(SqliteStorageConfigValue)({
@@ -1474,15 +1787,15 @@ const storageConfigLayer = (options) => Layer.effect(SqliteStorageConfig)(Schema
 /** The failpoint Layer selected by convenience options: explicit handler or the no-op default. */
 const storageFailpointLayer = (options) => options.failpoint === void 0 ? SqliteStorageFailpoint.layer : Layer.succeed(SqliteStorageFailpoint)({ hit: options.failpoint });
 /**
-* A composition-root convenience Layer for canonical Conversations. Durable accepted work is
+* A composition-root convenience Layer for canonical Threads. Durable accepted work is
 * served by the separate SubmissionLedger port.
 */
-const layer = (options) => Layer.unwrap(Effect.map(SqliteStorageConfig, (config) => conversationStoreLayer.pipe(Layer.provide(Layer.mergeAll(Layer.succeed(SqliteStorageConfig)(config), storageFailpointLayer(options), SqliteClient.layer({ filename: options.filename }), NodeCrypto.layer))))).pipe(Layer.provide(storageConfigLayer(options)));
+const layer = (options) => Layer.unwrap(Effect.map(SqliteStorageConfig, (config) => threadStoreLayer.pipe(Layer.provide(Layer.mergeAll(Layer.succeed(SqliteStorageConfig)(config), storageFailpointLayer(options), SqliteClient.layer({ filename: options.filename }), NodeCrypto.layer))))).pipe(Layer.provide(storageConfigLayer(options)));
 /** Create an adapter-owned resumable observation offset for a known canonical sequence. */
 const observationOffsetAt = makeOffset;
 //#endregion
 //#region src/sqlite-ledger.ts
-const BoundedStoredText = Schema.String.check(Schema.isMaxLength(16 * 1024 * 1024));
+const BoundedStoredText = Schema.String.check(Schema.isMaxLength(16777216));
 const BoundedIdentifier = Schema.NonEmptyString.check(Schema.isMaxLength(1024));
 const BoundedTimestamp = Schema.NonEmptyString.check(Schema.isMaxLength(128));
 const SCAN_PAGE_SIZE = 256;
@@ -1494,7 +1807,7 @@ const STILL_WAITING = "still-waiting";
 const WOKEN = "woken";
 var SubmissionRow = class extends Schema.Class("SubmissionRow")({
 	submission_id: BoundedIdentifier,
-	conversation_id: BoundedIdentifier,
+	thread_id: BoundedIdentifier,
 	queue_sequence: QueueSequence,
 	principal: BoundedIdentifier,
 	idempotency_key: BoundedIdentifier,
@@ -1576,7 +1889,7 @@ var MaxQueueSequenceRow = class extends Schema.Class("MaxQueueSequenceRow")({ ma
 var CanonicalRecordIdRow = class extends Schema.Class("CanonicalRecordIdRow")({ record_id: BoundedIdentifier }) {};
 const SUBMISSION_COLUMNS = `
   submission_id,
-  conversation_id,
+  thread_id,
   queue_sequence,
   principal,
   idempotency_key,
@@ -1613,7 +1926,7 @@ const CHILD_RESERVATION_COLUMNS = `
   release_began_at,
   released_at
 `;
-/** The branded ToolCallId schema, reached through the session port so no core import is needed. */
+/** The branded ToolCallId schema, reached through the thread port so no core import is needed. */
 const ToolCallIdSchema = ApprovalDecisionCommand.fields.toolCallId;
 const ToolCallIdList = Schema.Array(ToolCallIdSchema);
 const encodePersistedJsonText = Schema.encodeEffect(Schema.fromJsonString(PersistedJson));
@@ -1691,7 +2004,7 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
 		iso: new Date(millis).toISOString()
 	}));
 	const timestampMillis = (operation, rowKey) => (timestamp) => decodeUtcInstant(timestamp).pipe(Effect.map(DateTime.toEpochMillis), Effect.mapError((error) => corruptionFailure(operation, "effect_agent_submission_ownership", rowKey, error.message)));
-	const decodeSubmissionRows = (operation, rowKey, rows) => decodeRows$1(Schema.Array(SubmissionRow), "effect_agent_submissions", rowKey, rows).pipe(Effect.mapError(internalFailure(operation)));
+	const decodeSubmissionRows = (operation, rowKey, rows) => decodeRows$3(Schema.Array(SubmissionRow), "effect_agent_submissions", rowKey, rows).pipe(Effect.mapError(internalFailure(operation)));
 	const readSubmission = Effect.fn("SqliteSubmissionLedger.readSubmission")(function* (operation, submissionId) {
 		const rows = yield* sql`
       SELECT ${sql.literal(SUBMISSION_COLUMNS)}
@@ -1722,23 +2035,23 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
       FROM effect_agent_submission_ownership
       WHERE submission_id = ${submissionId}
     `.pipe(Effect.mapError(sqlFailure(operation)));
-		const decoded = yield* decodeRows$1(Schema.Array(OwnershipRow), "effect_agent_submission_ownership", submissionId, rows).pipe(Effect.mapError(internalFailure(operation)));
+		const decoded = yield* decodeRows$3(Schema.Array(OwnershipRow), "effect_agent_submission_ownership", submissionId, rows).pipe(Effect.mapError(internalFailure(operation)));
 		if (decoded.length > 1) return yield* corruptionFailure(operation, "effect_agent_submission_ownership", submissionId, "An ownership primary key returned more than one row.");
 		return decoded.length === 0 ? Option.none() : Option.some(decoded[0]);
 	});
-	const conversationEpoch = Effect.fn("SqliteSubmissionLedger.conversationEpoch")(function* (operation, conversationId) {
-		const conversations = yield* journal.getConversation(conversationId).pipe(Effect.mapError(internalFailure(operation)));
-		return conversations.length === 0 ? EPOCH_ZERO : conversations[0].producer_epoch;
+	const threadEpoch = Effect.fn("SqliteSubmissionLedger.threadEpoch")(function* (operation, threadId) {
+		const threads = yield* journal.getThread(threadId).pipe(Effect.mapError(internalFailure(operation)));
+		return threads.length === 0 ? EPOCH_ZERO : threads[0].producer_epoch;
 	});
 	/**
 	* Verify inside the surrounding write transaction that the presented token still owns the
 	* Submission's lane; a superseded or missing token fails with OwnershipLost carrying the
-	* Conversation's current producer epoch (DUR-006).
+	* Thread's current producer epoch (DUR-006).
 	*/
 	const requireOwnership = Effect.fn("SqliteSubmissionLedger.requireOwnership")(function* (operation, submission, ownershipToken) {
 		const ownership = yield* readOwnership(operation, submission.submission_id);
 		if (Option.isNone(ownership) || ownership.value.ownership_token !== ownershipToken) {
-			const actualEpoch = yield* conversationEpoch(operation, submission.conversation_id);
+			const actualEpoch = yield* threadEpoch(operation, submission.thread_id);
 			const submissionId = yield* Schema.decodeUnknownEffect(SubmissionSnapshot.fields.submissionId)(submission.submission_id).pipe(Effect.mapError(internalFailure(operation)));
 			return yield* OwnershipLost.make({
 				submissionId,
@@ -1753,7 +2066,7 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
 		if (row.parent_submission_id === null !== (row.parent_tool_call_id === null)) return yield* corruptionFailure(operation, "effect_agent_submissions", row.submission_id, "A parent linkage must record both the parent Submission and the parent Tool Call.");
 		return yield* decodeSubmissionSnapshotUnknown({
 			submissionId: row.submission_id,
-			conversationId: row.conversation_id,
+			threadId: row.thread_id,
 			queueSequence: row.queue_sequence,
 			principal: row.principal,
 			idempotencyKey: row.idempotency_key,
@@ -1787,7 +2100,7 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
       FROM effect_agent_settlement_reservations
       WHERE submission_id = ${submissionId}
     `.pipe(Effect.mapError(sqlFailure(operation)));
-		const decoded = yield* decodeRows$1(Schema.Array(ReservationRow), "effect_agent_settlement_reservations", submissionId, rows).pipe(Effect.mapError(internalFailure(operation)));
+		const decoded = yield* decodeRows$3(Schema.Array(ReservationRow), "effect_agent_settlement_reservations", submissionId, rows).pipe(Effect.mapError(internalFailure(operation)));
 		if (decoded.length > 1) return yield* corruptionFailure(operation, "effect_agent_settlement_reservations", submissionId, "A settlement reservation primary key returned more than one row.");
 		return decoded.length === 0 ? Option.none() : Option.some(decoded[0]);
 	});
@@ -1802,11 +2115,11 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
       FROM effect_agent_abort_intents
       WHERE submission_id = ${submissionId}
     `.pipe(Effect.mapError(sqlFailure(operation)));
-		const decoded = yield* decodeRows$1(Schema.Array(AbortIntentRow), "effect_agent_abort_intents", submissionId, rows).pipe(Effect.mapError(internalFailure(operation)));
+		const decoded = yield* decodeRows$3(Schema.Array(AbortIntentRow), "effect_agent_abort_intents", submissionId, rows).pipe(Effect.mapError(internalFailure(operation)));
 		if (decoded.length > 1) return yield* corruptionFailure(operation, "effect_agent_abort_intents", submissionId, "An abort intent primary key returned more than one row.");
 		return decoded.length === 0 ? Option.none() : Option.some(decoded[0]);
 	});
-	const decodeChildReservationRows = (operation, rowKey, rows) => decodeRows$1(Schema.Array(ChildReservationRow), "effect_agent_child_reservations", rowKey, rows).pipe(Effect.mapError(internalFailure(operation)));
+	const decodeChildReservationRows = (operation, rowKey, rows) => decodeRows$3(Schema.Array(ChildReservationRow), "effect_agent_child_reservations", rowKey, rows).pipe(Effect.mapError(internalFailure(operation)));
 	const readChildReservation = Effect.fn("SqliteSubmissionLedger.readChildReservation")(function* (operation, reservationId) {
 		const rows = yield* sql`
       SELECT ${sql.literal(CHILD_RESERVATION_COLUMNS)}
@@ -1859,7 +2172,7 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
         WHERE submission_id = ${submissionId}
         ORDER BY tool_call_id ASC
       `.pipe(Effect.mapError(sqlFailure(operation)));
-		return yield* decodeRows$1(Schema.Array(ApprovalDecisionRow), "effect_agent_approval_decisions", submissionId, rows).pipe(Effect.mapError(internalFailure(operation)));
+		return yield* decodeRows$3(Schema.Array(ApprovalDecisionRow), "effect_agent_approval_decisions", submissionId, rows).pipe(Effect.mapError(internalFailure(operation)));
 	});
 	const approvalIntentFromRow = Effect.fn("SqliteSubmissionLedger.approvalIntentFromRow")(function* (operation, row) {
 		return yield* decodeApprovalDecisionIntent({
@@ -1884,7 +2197,7 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
         WHERE submission_id = ${submissionId}
         ORDER BY tool_call_id ASC
       `.pipe(Effect.mapError(sqlFailure(operation)));
-		return yield* decodeRows$1(Schema.Array(UnknownResolutionRow), "effect_agent_unknown_resolutions", submissionId, rows).pipe(Effect.mapError(internalFailure(operation)));
+		return yield* decodeRows$3(Schema.Array(UnknownResolutionRow), "effect_agent_unknown_resolutions", submissionId, rows).pipe(Effect.mapError(internalFailure(operation)));
 	});
 	const unknownResolutionIntentFromRow = Effect.fn("SqliteSubmissionLedger.unknownResolutionIntentFromRow")(function* (operation, row) {
 		const resolution = yield* parseStoredJsonText(row.resolution_json).pipe(Effect.mapError((error) => corruptionFailure(operation, "effect_agent_unknown_resolutions", `${row.submission_id}/${row.tool_call_id}`, error.message)));
@@ -1907,18 +2220,18 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
 	* derived from the shared canonical-records table using the deterministic abort record
 	* identity, never from a cached ledger marker.
 	*/
-	const canonicalAbortRecordId = Effect.fn("SqliteSubmissionLedger.canonicalAbortRecordId")(function* (operation, conversationId, submissionId) {
+	const canonicalAbortRecordId = Effect.fn("SqliteSubmissionLedger.canonicalAbortRecordId")(function* (operation, threadId, submissionId) {
 		const recordId = submissionAbortRecordId(submissionId);
 		const rows = yield* sql`
         SELECT record_id
         FROM effect_agent_canonical_records
-        WHERE conversation_id = ${conversationId}
+        WHERE thread_id = ${threadId}
           AND record_id = ${recordId}
       `.pipe(Effect.mapError(sqlFailure(operation)));
-		return (yield* decodeRows$1(Schema.Array(CanonicalRecordIdRow), "effect_agent_canonical_records", `${conversationId}/${recordId}`, rows).pipe(Effect.mapError(internalFailure(operation)))).length === 0 ? void 0 : recordId;
+		return (yield* decodeRows$3(Schema.Array(CanonicalRecordIdRow), "effect_agent_canonical_records", `${threadId}/${recordId}`, rows).pipe(Effect.mapError(internalFailure(operation)))).length === 0 ? void 0 : recordId;
 	});
 	const abortIntentFromRow = Effect.fn("SqliteSubmissionLedger.abortIntentFromRow")(function* (operation, submission, submissionId, row) {
-		const canonicalRecordId = yield* canonicalAbortRecordId(operation, submission.conversation_id, submissionId);
+		const canonicalRecordId = yield* canonicalAbortRecordId(operation, submission.thread_id, submissionId);
 		return yield* decodeAbortIntent({
 			submissionId: row.submission_id,
 			author: row.author,
@@ -1937,11 +2250,11 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
 		const mintedReceiptId = yield* mintIdentifier("receipt", operation);
 		yield* hitFailpoint("ledger:admit:before", operation);
 		const result = yield* inWriteTransaction(operation, Effect.gen(function* () {
-			const keyRowKey = `${validated.conversationId}/${validated.principal}/${validated.idempotencyKey}`;
+			const keyRowKey = `${validated.threadId}/${validated.principal}/${validated.idempotencyKey}`;
 			const existingRows = yield* sql`
             SELECT ${sql.literal(SUBMISSION_COLUMNS)}
             FROM effect_agent_submissions
-            WHERE conversation_id = ${validated.conversationId}
+            WHERE thread_id = ${validated.threadId}
               AND principal = ${validated.principal}
               AND idempotency_key = ${validated.idempotencyKey}
           `.pipe(Effect.mapError(sqlFailure(operation)));
@@ -1950,7 +2263,7 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
 			if (existing.length === 1) {
 				const sameLinkage = validated.parentLinkage === void 0 ? existing[0].parent_submission_id === null && existing[0].parent_tool_call_id === null : existing[0].parent_submission_id === validated.parentLinkage.parentSubmissionId && existing[0].parent_tool_call_id === validated.parentLinkage.parentToolCallId;
 				if (existing[0].input_digest !== validated.inputDigest || !sameLinkage) return yield* AdmissionConflict.make({
-					conversationId: validated.conversationId,
+					threadId: validated.threadId,
 					principal: validated.principal,
 					idempotencyKey: validated.idempotencyKey,
 					existingInputDigest: existing[0].input_digest,
@@ -1967,15 +2280,15 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
 			const maxRows = yield* sql`
             SELECT COALESCE(MAX(queue_sequence), 0) AS max_queue_sequence
             FROM effect_agent_submissions
-            WHERE conversation_id = ${validated.conversationId}
+            WHERE thread_id = ${validated.threadId}
           `.pipe(Effect.mapError(sqlFailure(operation)));
-			const decodedMax = yield* decodeRows$1(Schema.Array(MaxQueueSequenceRow), "effect_agent_submissions", validated.conversationId, maxRows).pipe(Effect.mapError(internalFailure(operation)));
+			const decodedMax = yield* decodeRows$3(Schema.Array(MaxQueueSequenceRow), "effect_agent_submissions", validated.threadId, maxRows).pipe(Effect.mapError(internalFailure(operation)));
 			const queueSequence = yield* decodeQueueSequence((decodedMax[0]?.max_queue_sequence ?? 0) + 1).pipe(Effect.mapError(internalFailure(operation)));
 			const now = yield* currentInstant;
 			yield* sql`
             INSERT INTO effect_agent_submissions (
               submission_id,
-              conversation_id,
+              thread_id,
               queue_sequence,
               principal,
               idempotency_key,
@@ -1991,7 +2304,7 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
               parent_tool_call_id
             ) VALUES (
               ${mintedSubmissionId},
-              ${validated.conversationId},
+              ${validated.threadId},
               ${queueSequence},
               ${validated.principal},
               ${validated.idempotencyKey},
@@ -2044,12 +2357,12 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
 		const rows = yield* sql`
       SELECT ${sql.literal(SUBMISSION_COLUMNS)}
       FROM effect_agent_submissions
-      WHERE conversation_id = ${validated.conversationId}
+      WHERE thread_id = ${validated.threadId}
         AND principal = ${validated.principal}
         AND idempotency_key = ${validated.idempotencyKey}
     `.pipe(Effect.mapError(sqlFailure(operation)));
-		const decoded = yield* decodeSubmissionRows(operation, `${validated.conversationId}/${validated.principal}/${validated.idempotencyKey}`, rows);
-		if (decoded.length > 1) return yield* corruptionFailure(operation, "effect_agent_submissions", `${validated.conversationId}/${validated.principal}/${validated.idempotencyKey}`, "An admission idempotency key returned more than one row.");
+		const decoded = yield* decodeSubmissionRows(operation, `${validated.threadId}/${validated.principal}/${validated.idempotencyKey}`, rows);
+		if (decoded.length > 1) return yield* corruptionFailure(operation, "effect_agent_submissions", `${validated.threadId}/${validated.principal}/${validated.idempotencyKey}`, "An admission idempotency key returned more than one row.");
 		if (decoded.length === 0) return Option.none();
 		return Option.some(yield* decodeSubmissionSnapshot(operation, decoded[0]));
 	});
@@ -2059,12 +2372,12 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
 		const rows = yield* sql`
       SELECT ${sql.literal(SUBMISSION_COLUMNS)}
       FROM effect_agent_submissions
-      WHERE conversation_id = ${validated.conversationId}
+      WHERE thread_id = ${validated.threadId}
         AND principal = ${validated.principal}
         AND idempotency_key = ${validated.idempotencyKey}
     `.pipe(Effect.mapError(sqlFailure(operation)));
-		const decoded = yield* decodeSubmissionRows(operation, `${validated.conversationId}/${validated.principal}/${validated.idempotencyKey}`, rows);
-		if (decoded.length > 1) return yield* corruptionFailure(operation, "effect_agent_submissions", `${validated.conversationId}/${validated.principal}/${validated.idempotencyKey}`, "An admission idempotency key returned more than one row.");
+		const decoded = yield* decodeSubmissionRows(operation, `${validated.threadId}/${validated.principal}/${validated.idempotencyKey}`, rows);
+		if (decoded.length > 1) return yield* corruptionFailure(operation, "effect_agent_submissions", `${validated.threadId}/${validated.principal}/${validated.idempotencyKey}`, "An admission idempotency key returned more than one row.");
 		if (decoded.length === 0) return AdmissionNotAdmitted.make();
 		return AdmissionAdmitted.make({ submission: yield* decodeSubmissionSnapshot(operation, decoded[0]) });
 	});
@@ -2078,12 +2391,12 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
 			const headRows = yield* sql`
             SELECT ${sql.literal(SUBMISSION_COLUMNS)}
             FROM effect_agent_submissions
-            WHERE conversation_id = ${validated.conversationId}
+            WHERE thread_id = ${validated.threadId}
               AND state <> 'settled'
             ORDER BY queue_sequence ASC
             LIMIT 1
           `.pipe(Effect.mapError(sqlFailure(operation)));
-			const heads = yield* decodeSubmissionRows(operation, validated.conversationId, headRows);
+			const heads = yield* decodeSubmissionRows(operation, validated.threadId, headRows);
 			if (heads.length === 0) return Option.none();
 			const head = heads[0];
 			if (head.state === "joining" || head.state === "joined" || head.state === "suspended" || head.state === "unknown" && Option.isNone(yield* readAbortIntent(operation, head.submission_id))) return Option.none();
@@ -2092,19 +2405,19 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
 			if (Option.isSome(ownership)) {
 				if ((yield* timestampMillis(operation, head.submission_id)(ownership.value.lease_expires_at)) > now.millis) return Option.none();
 			}
-			const conversations = yield* journal.getConversation(head.conversation_id).pipe(Effect.mapError(internalFailure(operation)));
+			const threads = yield* journal.getThread(head.thread_id).pipe(Effect.mapError(internalFailure(operation)));
 			let producerEpoch;
-			if (conversations.length === 0) {
+			if (threads.length === 0) {
 				producerEpoch = 1;
 				yield* sql`
-              INSERT INTO effect_agent_conversations (
-                conversation_id,
+              INSERT INTO effect_agent_threads (
+                thread_id,
                 created_at,
                 tail_sequence,
                 tail_digest,
                 producer_epoch
               ) VALUES (
-                ${head.conversation_id},
+                ${head.thread_id},
                 ${now.iso},
                 0,
                 ${EMPTY_TAIL_DIGEST},
@@ -2112,11 +2425,11 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
               )
             `.pipe(Effect.mapError(sqlFailure(operation)));
 			} else {
-				producerEpoch = conversations[0].producer_epoch + 1;
+				producerEpoch = threads[0].producer_epoch + 1;
 				yield* sql`
-              UPDATE effect_agent_conversations
+              UPDATE effect_agent_threads
               SET producer_epoch = ${producerEpoch}
-              WHERE conversation_id = ${head.conversation_id}
+              WHERE thread_id = ${head.thread_id}
             `.pipe(Effect.mapError(sqlFailure(operation)));
 			}
 			const leaseExpiresAt = new Date(now.millis + config.ownershipLeaseDuration).toISOString();
@@ -2147,14 +2460,14 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
             INSERT INTO effect_agent_attempts (
               attempt_id,
               submission_id,
-              conversation_id,
+              thread_id,
               owner_producer_id,
               producer_epoch,
               claimed_at
             ) VALUES (
               ${attemptId},
               ${head.submission_id},
-              ${head.conversation_id},
+              ${head.thread_id},
               ${validated.producerId},
               ${producerEpoch},
               ${now.iso}
@@ -2336,7 +2649,8 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
 				submissionId: validated.submissionId,
 				existingOutcome: reservation.value.outcome
 			});
-			const settlementFailure = settlementFailureFromRecord(yield* decodeRecordEnvelopeText(reservation.value.record_json).pipe(Effect.mapError((error) => corruptionFailure(operation, "effect_agent_settlement_reservations", validated.submissionId, error.message))));
+			const reservationRecord = yield* decodeRecordEnvelopeText(reservation.value.record_json).pipe(Effect.mapError((error) => corruptionFailure(operation, "effect_agent_settlement_reservations", validated.submissionId, error.message)));
+			const settlementFailure = settlementFailureFromRecord(reservationRecord);
 			if (reservation.value.outcome === "failed" !== (settlementFailure !== void 0)) return yield* corruptionFailure(operation, "effect_agent_settlement_reservations", validated.submissionId, "The reserved outcome and canonical failure diagnostic disagree.");
 			const submission = yield* requireSubmission(operation, validated.submissionId);
 			if (submission.state === "settled") {
@@ -2414,7 +2728,7 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
             ${now.iso}
           )
         `.pipe(Effect.mapError(sqlFailure(operation)));
-			const canonicalRecordId = yield* canonicalAbortRecordId(operation, submission.conversation_id, validated.submissionId);
+			const canonicalRecordId = yield* canonicalAbortRecordId(operation, submission.thread_id, validated.submissionId);
 			return yield* decodeAbortIntent({
 				submissionId: validated.submissionId,
 				author: validated.author,
@@ -2432,19 +2746,19 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
 		yield* hitFailpoint("ledger:claim-joining:before", operation);
 		const claims = yield* inWriteTransaction(operation, Effect.gen(function* () {
 			const host = yield* requireSubmission(operation, validated.hostSubmissionId);
-			if (host.conversation_id !== validated.conversationId) return yield* LedgerError.make({
+			if (host.thread_id !== validated.threadId) return yield* LedgerError.make({
 				operation,
-				message: `Host submission ${validated.hostSubmissionId} does not belong to conversation ${validated.conversationId}.`
+				message: `Host submission ${validated.hostSubmissionId} does not belong to thread ${validated.threadId}.`
 			});
 			yield* requireOwnership(operation, host, validated.ownershipToken);
 			const laterRows = yield* sql`
           SELECT ${sql.literal(SUBMISSION_COLUMNS)}
           FROM effect_agent_submissions
-          WHERE conversation_id = ${validated.conversationId}
+          WHERE thread_id = ${validated.threadId}
             AND queue_sequence > ${host.queue_sequence}
           ORDER BY queue_sequence ASC
         `.pipe(Effect.mapError(sqlFailure(operation)));
-			const later = yield* decodeSubmissionRows(operation, validated.conversationId, laterRows);
+			const later = yield* decodeSubmissionRows(operation, validated.threadId, laterRows);
 			const claimed = [];
 			for (const row of later) {
 				if (claimed.length >= validated.maxCount) break;
@@ -2947,27 +3261,27 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
           SELECT ${sql.literal(SUBMISSION_COLUMNS)}
           FROM effect_agent_submissions
           WHERE state <> 'settled'
-          ORDER BY conversation_id ASC, queue_sequence ASC
+          ORDER BY thread_id ASC, queue_sequence ASC
           LIMIT ${SCAN_PAGE_SIZE}
         ` : sql`
           SELECT ${sql.literal(SUBMISSION_COLUMNS)}
           FROM effect_agent_submissions
           WHERE state <> 'settled'
             AND (
-              conversation_id > ${cursor.conversationId}
+              thread_id > ${cursor.threadId}
               OR (
-                conversation_id = ${cursor.conversationId}
+                thread_id = ${cursor.threadId}
                 AND queue_sequence > ${cursor.queueSequence}
               )
             )
-          ORDER BY conversation_id ASC, queue_sequence ASC
+          ORDER BY thread_id ASC, queue_sequence ASC
           LIMIT ${SCAN_PAGE_SIZE}
         `).pipe(Effect.mapError(sqlFailure(operation)));
 		const decoded = yield* decodeSubmissionRows(operation, "nonterminal_scan", rows);
 		const snapshots = yield* Effect.forEach(decoded, (row) => decodeSubmissionSnapshot(operation, row));
 		const last = decoded[decoded.length - 1];
 		return [snapshots, last === void 0 || decoded.length < SCAN_PAGE_SIZE ? Option.none() : Option.some({
-			conversationId: last.conversation_id,
+			threadId: last.thread_id,
 			queueSequence: last.queue_sequence
 		})];
 	});
@@ -3112,12 +3426,312 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
 const submissionLedgerLayer = Layer.effectContext(makeServices());
 /**
 * A composition-root convenience Layer for the durable Submission Ledger. Point it at the
-* same database file as the ConversationStore so claims fence the same producer epochs.
+* same database file as the ThreadStore so claims fence the same producer epochs.
 */
 const ledgerLayer = (options) => Layer.unwrap(Effect.map(SqliteStorageConfig, (config) => submissionLedgerLayer.pipe(Layer.provide(Layer.mergeAll(Layer.succeed(SqliteStorageConfig)(config), storageFailpointLayer(options), SqliteClient.layer({ filename: options.filename }), NodeCrypto.layer))))).pipe(Layer.provide(storageConfigLayer(options)));
 //#endregion
+//#region src/sqlite-memory-store.ts
+const STORAGE_VERSION = 2;
+const METADATA_COMPONENT = "memory";
+const DOCUMENT_TABLE = "effect_agent_memory_documents_v1";
+const RECEIPT_TABLE = "effect_agent_memory_receipts_v1";
+const StoredJson$1 = Schema.String.check(Schema.isMaxLength(16777216));
+const EncodedMemoryChange = Schema.Struct({
+	commandJson: StoredJson$1,
+	documentJson: StoredJson$1,
+	resultJson: StoredJson$1
+});
+const equivalentContent = Schema.toEquivalence(MemoryWrite.Wire.members[0].fields.content);
+const equivalentScopes = Schema.toEquivalence(MemoryWrite.Wire.members[0].fields.scopes);
+var MemoryMetadataRow = class extends Schema.Class("@effect-agent/storage-sqlite/MemoryMetadataRow")({ version: Schema.Int }) {};
+var MemoryTableRow = class extends Schema.Class("@effect-agent/storage-sqlite/MemoryTableRow")({ name: Schema.NonEmptyString }) {};
+var MemoryDocumentRow = class extends Schema.Class("@effect-agent/storage-sqlite/MemoryDocumentRow")({
+	namespace: MemoryNamespaceAddress,
+	source_id: MemoryKey.Wire.fields.id,
+	format_version: Schema.Int,
+	generation: Schema.Int,
+	revision: Schema.NonEmptyString,
+	document_json: StoredJson$1
+}) {};
+var MemoryReceiptRow = class extends Schema.Class("@effect-agent/storage-sqlite/MemoryReceiptRow")({
+	namespace: MemoryNamespaceAddress,
+	operation_id: MemoryWrite.Wire.members[0].fields.operationId,
+	source_id: MemoryKey.Wire.fields.id,
+	format_version: Schema.Int,
+	command_json: StoredJson$1,
+	result_json: StoredJson$1
+}) {};
+var MemoryChangeCountRow = class extends Schema.Class("@effect-agent/storage-sqlite/MemoryChangeCountRow")({ changed: Schema.Int }) {};
+var StoredMemoryCommand = class extends Schema.Class("@effect-agent/storage-sqlite/StoredMemoryCommand")({
+	version: Schema.Literal(STORAGE_VERSION),
+	value: MemoryWrite.Wire
+}) {};
+var StoredMemoryResult = class extends Schema.Class("@effect-agent/storage-sqlite/StoredMemoryResult")({
+	version: Schema.Literal(STORAGE_VERSION),
+	value: MemoryDocument.Wire
+}) {};
+const StoredVersionHeader = Schema.Struct({ version: Schema.Int });
+const storageError = (operation, reason = "unavailable") => MemoryStorageError.make({
+	operation,
+	reason
+});
+const query = (effect, operation) => effect.pipe(Effect.mapError(() => storageError(operation)));
+const decodeRows$2 = Effect.fn("SqliteMemoryStore.decodeRows")(function* (schema, rows, operation) {
+	return yield* Schema.decodeUnknownEffect(Schema.Array(schema))(rows).pipe(Effect.mapError(() => storageError(operation, "corrupt")));
+});
+const decodeInput$1 = Effect.fn("SqliteMemoryStore.decodeInput")(function* (schema, value, operation) {
+	return yield* Schema.decodeUnknownEffect(schema)(value).pipe(Effect.mapError(() => storageError(operation, "invalid-input")));
+});
+const encodeJson = Effect.fn("SqliteMemoryStore.encodeJson")(function* (schema, value, operation) {
+	return yield* Schema.encodeEffect(Schema.fromJsonString(schema))(value).pipe(Effect.mapError(() => storageError(operation, "corrupt")));
+});
+const validateEncodedChange = Effect.fn("SqliteMemoryStore.validateEncodedChange")(function* (encoded, operation) {
+	yield* Schema.decodeEffect(EncodedMemoryChange)(encoded).pipe(Effect.mapError(() => storageError(operation, "invalid-input")));
+});
+const decodeVersionedJson = Effect.fn("SqliteMemoryStore.decodeVersionedJson")(function* (schema, value, operation) {
+	if ((yield* Schema.decodeEffect(Schema.fromJsonString(StoredVersionHeader))(value).pipe(Effect.mapError(() => storageError(operation, "corrupt")))).version !== STORAGE_VERSION) return yield* storageError(operation, "incompatible");
+	const decoded = yield* Schema.decodeEffect(Schema.fromJsonString(schema))(value).pipe(Effect.mapError(() => storageError(operation, "corrupt")));
+	if ((yield* encodeJson(schema, decoded, operation)) !== value) return yield* storageError(operation, "corrupt");
+	return decoded;
+});
+const validateDocument = Effect.fn("SqliteMemoryStore.validateDocument")(function* (document, key, operation) {
+	if (document.key.namespace.address !== key.namespace.address || document.key.id !== key.id || document.source.id !== key.id || document.source.revision !== String(document.generation) || document.generation === 1 !== (document.predecessor === null) || document.predecessor !== null && (document.predecessor.id !== key.id || document.predecessor.revision !== String(document.generation - 1))) return yield* storageError(operation, "corrupt");
+	return document;
+});
+const validateReceiptResult = Effect.fn("SqliteMemoryStore.validateReceiptResult")(function* (command, result, operation) {
+	if ((result.predecessor?.revision ?? null) !== command.expectedRevision) return yield* storageError(operation, "corrupt");
+	if (command._tag === "Put") {
+		if (result._tag !== "ActiveMemoryDocument" || result.source.locator !== command.locator) return yield* storageError(operation, "corrupt");
+		if (!equivalentContent(command.content, result.content) || !equivalentScopes(command.scopes, result.scopes)) return yield* storageError(operation, "corrupt");
+		return;
+	}
+	if (result._tag !== "WithdrawnMemoryDocument" || result.reason !== command.reason || result.predecessor === null || result.source.locator !== result.predecessor.locator) return yield* storageError(operation, "corrupt");
+});
+const initializeMemorySchema = Effect.fn("SqliteMemoryStore.initialize")(function* () {
+	const sql = yield* SqlClient.SqlClient;
+	const failpoint = yield* MemoryMutationFailpoint;
+	yield* failpoint.hit("memory:initialize:before");
+	yield* sql.withTransaction(Effect.gen(function* () {
+		yield* sql`
+          CREATE TABLE IF NOT EXISTS effect_agent_memory_metadata (
+            component TEXT PRIMARY KEY NOT NULL,
+            version INTEGER NOT NULL
+          )
+        `;
+		const metadataRows = yield* sql`
+          SELECT version
+          FROM effect_agent_memory_metadata
+          WHERE component = ${METADATA_COMPONENT}
+        `;
+		const metadata = yield* decodeRows$2(MemoryMetadataRow, metadataRows, "decode memory schema version");
+		if (metadata.length > 1) return yield* storageError("decode memory schema version", "corrupt");
+		const currentVersion = metadata[0]?.version;
+		if (currentVersion !== void 0 && currentVersion !== STORAGE_VERSION) return yield* storageError("initialize memory schema", "incompatible");
+		if (currentVersion === void 0) {
+			const tableRows = yield* sql`
+            SELECT name
+            FROM sqlite_master
+            WHERE type = 'table' AND name IN (${DOCUMENT_TABLE}, ${RECEIPT_TABLE})
+          `;
+			if ((yield* decodeRows$2(MemoryTableRow, tableRows, "inspect memory schema")).length > 0) return yield* storageError("initialize memory schema", "incompatible");
+			yield* sql`
+            CREATE TABLE effect_agent_memory_documents_v1 (
+              namespace TEXT NOT NULL,
+              source_id TEXT NOT NULL,
+              format_version INTEGER NOT NULL,
+              generation INTEGER NOT NULL,
+              revision TEXT NOT NULL,
+              document_json TEXT NOT NULL,
+              PRIMARY KEY (namespace, source_id)
+            )
+          `;
+			yield* sql`
+            CREATE TABLE effect_agent_memory_receipts_v1 (
+              namespace TEXT NOT NULL,
+              operation_id TEXT NOT NULL,
+              source_id TEXT NOT NULL,
+              format_version INTEGER NOT NULL,
+              command_json TEXT NOT NULL,
+              result_json TEXT NOT NULL,
+              PRIMARY KEY (namespace, operation_id)
+            )
+          `;
+			yield* sql`
+            INSERT INTO effect_agent_memory_metadata (component, version)
+            VALUES (${METADATA_COMPONENT}, ${STORAGE_VERSION})
+          `;
+		}
+		yield* sql`
+          SELECT namespace, source_id, format_version, generation, revision, document_json
+          FROM effect_agent_memory_documents_v1
+          LIMIT 0
+        `;
+		yield* sql`
+          SELECT namespace, operation_id, source_id, format_version, command_json, result_json
+          FROM effect_agent_memory_receipts_v1
+          LIMIT 0
+        `;
+	})).pipe(Effect.catchTag("SqlError", () => Effect.fail(storageError("initialize memory schema"))));
+	yield* failpoint.hit("memory:initialize:after");
+});
+const makeMemoryReader = Effect.fn("SqliteMemoryStore.makeReader")(function* () {
+	const sql = yield* SqlClient.SqlClient;
+	const readDocument = Effect.fn("SqliteMemoryStore.readDocument")(function* (key, operation) {
+		const rawRows = yield* query(sql`
+        SELECT namespace, source_id, format_version, generation, revision, document_json
+        FROM effect_agent_memory_documents_v1
+        WHERE namespace = ${key.namespace.address} AND source_id = ${key.id}
+      `, operation);
+		const rows = yield* decodeRows$2(MemoryDocumentRow, rawRows, operation);
+		if (rows.length === 0) return null;
+		if (rows.length !== 1) return yield* storageError(operation, "corrupt");
+		const row = rows[0];
+		if (row.format_version !== STORAGE_VERSION) return yield* storageError(operation, "incompatible");
+		const document = (yield* decodeVersionedJson(StoredMemoryResult, row.document_json, operation)).value;
+		yield* validateDocument(document, key, operation);
+		if (row.namespace !== key.namespace.address || row.source_id !== key.id || row.generation !== document.generation || row.revision !== document.source.revision) return yield* storageError(operation, "corrupt");
+		return document;
+	});
+	return {
+		get: Effect.fn("SqliteMemoryStore.get")(function* (key) {
+			const decodedKey = yield* decodeInput$1(MemoryKey.Wire, key, "get memory document");
+			return yield* readDocument(decodedKey, "get memory document");
+		}),
+		readDocument
+	};
+});
+const makeMemoryServices = Effect.fn("SqliteMemoryStore.make")(function* () {
+	const sql = yield* SqlClient.SqlClient;
+	const failpoint = yield* MemoryMutationFailpoint;
+	yield* initializeMemorySchema();
+	const { get, readDocument } = yield* makeMemoryReader();
+	const readReceipt = Effect.fn("SqliteMemoryStore.readReceipt")(function* (write, operation) {
+		const rawRows = yield* query(sql`
+        SELECT namespace, operation_id, source_id, format_version, command_json, result_json
+        FROM effect_agent_memory_receipts_v1
+        WHERE namespace = ${write.key.namespace.address} AND operation_id = ${write.operationId}
+      `, operation);
+		const rows = yield* decodeRows$2(MemoryReceiptRow, rawRows, operation);
+		if (rows.length === 0) return null;
+		if (rows.length !== 1) return yield* storageError(operation, "corrupt");
+		const row = rows[0];
+		if (row.format_version !== STORAGE_VERSION) return yield* storageError(operation, "incompatible");
+		const command = yield* decodeVersionedJson(StoredMemoryCommand, row.command_json, `${operation} command`);
+		const result = yield* decodeVersionedJson(StoredMemoryResult, row.result_json, `${operation} result`);
+		if (row.namespace !== command.value.key.namespace.address || row.operation_id !== command.value.operationId || row.source_id !== command.value.key.id || result.value.key.namespace.address !== command.value.key.namespace.address || result.value.key.id !== command.value.key.id) return yield* storageError(operation, "corrupt");
+		yield* validateDocument(result.value, command.value.key, operation);
+		yield* validateReceiptResult(command.value, result.value, operation);
+		return {
+			commandJson: row.command_json,
+			result: result.value
+		};
+	});
+	const change = Effect.fn("SqliteMemoryStore.change")(function* (write) {
+		const operation = "change memory document";
+		const decodedWrite = yield* decodeInput$1(MemoryWrite.Wire, write, operation);
+		const commandJson = yield* encodeJson(StoredMemoryCommand, StoredMemoryCommand.make({
+			version: STORAGE_VERSION,
+			value: decodedWrite
+		}), "encode memory command");
+		yield* failpoint.hit("memory:change:before");
+		const transactionResult = yield* sql.withTransaction(Effect.gen(function* () {
+			const receipt = yield* readReceipt(decodedWrite, operation);
+			if (receipt !== null) {
+				if (receipt.commandJson !== commandJson) return yield* MemoryOperationConflict.make({
+					key: decodedWrite.key,
+					operationId: decodedWrite.operationId
+				});
+				return {
+					document: receipt.result,
+					changed: false
+				};
+			}
+			const current = yield* readDocument(decodedWrite.key, operation);
+			const modifiedAt = yield* Clock.currentTimeMillis;
+			const next = yield* applyMemoryWrite(current, decodedWrite, modifiedAt);
+			const resultJson = yield* encodeJson(StoredMemoryResult, StoredMemoryResult.make({
+				version: STORAGE_VERSION,
+				value: next
+			}), "encode memory result");
+			const documentJson = resultJson;
+			yield* validateEncodedChange({
+				commandJson,
+				documentJson,
+				resultJson
+			}, operation);
+			if (current === null) yield* sql`
+                INSERT INTO effect_agent_memory_documents_v1 (
+                  namespace, source_id, format_version, generation, revision, document_json
+                ) VALUES (
+                  ${next.key.namespace.address}, ${next.key.id}, ${STORAGE_VERSION},
+                  ${next.generation}, ${next.source.revision}, ${documentJson}
+                )
+              `;
+			else yield* sql`
+                UPDATE effect_agent_memory_documents_v1
+                SET format_version = ${STORAGE_VERSION},
+                    generation = ${next.generation},
+                    revision = ${next.source.revision},
+                    document_json = ${documentJson}
+                WHERE namespace = ${next.key.namespace.address}
+                  AND source_id = ${next.key.id}
+                  AND generation = ${current.generation}
+                  AND revision = ${current.source.revision}
+              `;
+			const changedRows = yield* sql`
+              SELECT changes() AS changed
+            `;
+			const changed = yield* decodeRows$2(MemoryChangeCountRow, changedRows, operation);
+			if (changed.length !== 1 || changed[0].changed !== 1) return yield* storageError(operation, "corrupt");
+			yield* failpoint.hit("memory:change:after-state");
+			yield* sql`
+              INSERT INTO effect_agent_memory_receipts_v1 (
+                namespace, operation_id, source_id, format_version, command_json, result_json
+              ) VALUES (
+                ${decodedWrite.key.namespace.address}, ${decodedWrite.operationId}, ${decodedWrite.key.id},
+                ${STORAGE_VERSION}, ${commandJson}, ${resultJson}
+              )
+            `;
+			yield* failpoint.hit("memory:change:after-receipt");
+			return {
+				document: next,
+				changed: true
+			};
+		})).pipe(Effect.catchTag("SqlError", () => Effect.fail(storageError(operation))));
+		if (transactionResult.changed) yield* failpoint.hit("memory:change:after");
+		return transactionResult.document;
+	});
+	return Context.make(MemoryReader, MemoryReader.fromAdapter({ get })).pipe(Context.add(MemoryWriter, MemoryWriter.fromAdapter({ change })));
+});
+/** SQLite memory ports with the mutation failpoint kept injectable for recovery tests. */
+const memoryStoreLayerWithFailpoints = Layer.effectContext(makeMemoryServices());
+/** SQLite memory reader and writer with the production no-op mutation failpoint. */
+const memoryStoreLayer = memoryStoreLayerWithFailpoints.pipe(Layer.provide(MemoryMutationFailpoint.layer));
+/** Reads an existing memory schema without writes, transactions, or mutation failpoints. */
+const memoryReaderLayer = Layer.effect(MemoryReader, Effect.gen(function* () {
+	const sql = yield* SqlClient.SqlClient;
+	const operation = "open memory reader";
+	const tables = yield* query(sql`
+        SELECT name FROM sqlite_master
+        WHERE type = 'table' AND name IN (
+          'effect_agent_memory_metadata', ${DOCUMENT_TABLE}, ${RECEIPT_TABLE}
+        )
+      `, operation).pipe(Effect.flatMap((rows) => decodeRows$2(MemoryTableRow, rows, operation)));
+	if (tables.length !== 3) return yield* storageError(operation, tables.length === 0 ? "unavailable" : "incompatible");
+	const metadata = yield* query(sql`
+        SELECT version FROM effect_agent_memory_metadata WHERE component = ${METADATA_COMPONENT}
+      `, operation).pipe(Effect.flatMap((rows) => decodeRows$2(MemoryMetadataRow, rows, operation)));
+	if (metadata.length !== 1 || metadata[0].version !== STORAGE_VERSION) return yield* storageError(operation, "incompatible");
+	yield* query(sql`
+        SELECT namespace, source_id, format_version, generation, revision, document_json
+        FROM effect_agent_memory_documents_v1 LIMIT 0
+      `, operation);
+	const { get } = yield* makeMemoryReader();
+	return MemoryReader.fromAdapter({ get });
+}));
+//#endregion
 //#region src/sqlite-schedule-store.ts
-const StoredScheduleJson = Schema.String.check(Schema.isMaxLength(16 * 1024 * 1024));
+const StoredScheduleJson = Schema.String.check(Schema.isMaxLength(16777216));
 const StoredDeadline = Schema.NullOr(ScheduleInstant);
 var ScheduleRow = class extends Schema.Class("@effect-agent/storage-sqlite/ScheduleRow")({
 	tenant_id: ScheduleOwner.fields.tenantId,
@@ -3134,27 +3748,27 @@ const ScheduleDueRow = Schema.Struct({
 });
 var ScheduleCountRow = class extends Schema.Class("@effect-agent/storage-sqlite/ScheduleCountRow")({ schedule_count: Schema.Int.check(Schema.isGreaterThanOrEqualTo(0)) }) {};
 var ScheduleDeadlineRow = class extends Schema.Class("@effect-agent/storage-sqlite/ScheduleDeadlineRow")({ deadline_at_millis: StoredDeadline }) {};
-const unavailable = (operation) => ScheduleStorageError.make({
+const unavailable$1 = (operation) => ScheduleStorageError.make({
 	operation,
 	reason: "unavailable"
 });
-const corrupt = (operation) => ScheduleStorageError.make({
+const corrupt$1 = (operation) => ScheduleStorageError.make({
 	operation,
 	reason: "corrupt"
 });
-const decodeRows = Effect.fn("SqliteScheduleStore.decodeRows")(function* (schema, rows, operation) {
-	return yield* Schema.decodeUnknownEffect(schema)(rows).pipe(Effect.mapError(() => corrupt(operation)));
+const decodeRows$1 = Effect.fn("SqliteScheduleStore.decodeRows")(function* (schema, rows, operation) {
+	return yield* Schema.decodeUnknownEffect(schema)(rows).pipe(Effect.mapError(() => corrupt$1(operation)));
 });
 const decodeRecord = Effect.fn("SqliteScheduleStore.decodeRecord")(function* (row) {
-	const record = yield* Schema.decodeEffect(Schema.fromJsonString(ScheduleRecord))(row.record_json).pipe(Effect.mapError(() => corrupt("decode schedule")));
-	if (record.owner.tenantId !== row.tenant_id || record.owner.ownerId !== row.owner_id || record.scheduleId !== row.schedule_id || scheduleDeadline(record) !== row.deadline_at_millis) return yield* corrupt("decode schedule identity");
+	const record = yield* Schema.decodeEffect(Schema.fromJsonString(ScheduleRecord))(row.record_json).pipe(Effect.mapError(() => corrupt$1("decode schedule")));
+	if (record.owner.tenantId !== row.tenant_id || record.owner.ownerId !== row.owner_id || record.scheduleId !== row.schedule_id || scheduleDeadline(record) !== row.deadline_at_millis) return yield* corrupt$1("decode schedule identity");
 	return record;
 });
 const encodeRecord = Effect.fn("SqliteScheduleStore.encodeRecord")(function* (record) {
-	return yield* Schema.encodeEffect(Schema.fromJsonString(ScheduleRecord))(record).pipe(Effect.mapError(() => corrupt("encode schedule")));
+	return yield* Schema.encodeEffect(Schema.fromJsonString(ScheduleRecord))(record).pipe(Effect.mapError(() => corrupt$1("encode schedule")));
 });
 const decodeInput = Effect.fn("SqliteScheduleStore.decodeInput")(function* (operation, schema, value) {
-	return yield* Schema.decodeUnknownEffect(schema)(value).pipe(Effect.mapError(() => corrupt(operation)));
+	return yield* Schema.decodeUnknownEffect(schema)(value).pipe(Effect.mapError(() => corrupt$1(operation)));
 });
 const makeScheduleStore = Effect.gen(function* () {
 	const sql = yield* SqlClient.SqlClient;
@@ -3167,13 +3781,13 @@ const makeScheduleStore = Effect.gen(function* () {
       WHERE tenant_id = ${key.owner.tenantId}
         AND owner_id = ${key.owner.ownerId}
         AND schedule_id = ${key.scheduleId}
-    `.pipe(Effect.mapError(() => unavailable(operation)));
-		return yield* decodeRows(Schema.Array(ScheduleRow), rows, operation);
+    `.pipe(Effect.mapError(() => unavailable$1(operation)));
+		return yield* decodeRows$1(Schema.Array(ScheduleRow), rows, operation);
 	});
 	const readOne = Effect.fn("SqliteScheduleStore.readOne")(function* (key, operation) {
 		const rows = yield* readRows(key, operation);
 		if (rows.length === 0) return null;
-		if (rows.length !== 1) return yield* corrupt(operation);
+		if (rows.length !== 1) return yield* corrupt$1(operation);
 		return yield* decodeRecord(rows[0]);
 	});
 	const insert = Effect.fn("SqliteScheduleStore.insert")(function* (record, ownerLimit) {
@@ -3202,9 +3816,9 @@ const makeScheduleStore = Effect.gen(function* () {
               AND owner_id = ${canonical.owner.ownerId}
               AND (json_extract(record_json, '$.pending') IS NOT NULL OR
                 (json_extract(record_json, '$.state') != 'cancelled' AND json_extract(record_json, '$.nextAtMillis') IS NOT NULL))
-          `.pipe(Effect.mapError(() => unavailable(operation)));
-			const counts = yield* decodeRows(Schema.Array(ScheduleCountRow), rawCounts, operation);
-			if (counts.length !== 1) return yield* corrupt(operation);
+          `.pipe(Effect.mapError(() => unavailable$1(operation)));
+			const counts = yield* decodeRows$1(Schema.Array(ScheduleCountRow), rawCounts, operation);
+			if (counts.length !== 1) return yield* corrupt$1(operation);
 			if (counts[0].schedule_count >= ownerLimit) return yield* ScheduleCapacityError.make({ limit: ownerLimit });
 			yield* scheduleFailpoint.hit("schedule:insert:before");
 			yield* sql`
@@ -3217,12 +3831,12 @@ const makeScheduleStore = Effect.gen(function* () {
               ${scheduleDeadline(canonical)},
               ${recordJson}
             )
-          `.pipe(Effect.mapError(() => unavailable(operation)));
+          `.pipe(Effect.mapError(() => unavailable$1(operation)));
 			return {
 				record: canonical,
 				inserted: true
 			};
-		})).pipe(Effect.catchTag("SqlError", () => Effect.fail(unavailable(operation))));
+		})).pipe(Effect.catchTag("SqlError", () => Effect.fail(unavailable$1(operation))));
 		if (result.inserted) yield* scheduleFailpoint.hit("schedule:insert:after");
 		return result.record;
 	});
@@ -3240,7 +3854,7 @@ const makeScheduleStore = Effect.gen(function* () {
               AND owner_id = ${decodedRequest.owner.ownerId}
             ORDER BY schedule_id
             LIMIT ${decodedRequest.limit + 1}
-          `.pipe(Effect.mapError(() => unavailable(operation))) : yield* sql`
+          `.pipe(Effect.mapError(() => unavailable$1(operation))) : yield* sql`
             SELECT tenant_id, owner_id, schedule_id, deadline_at_millis, record_json
             FROM effect_agent_schedules
             WHERE tenant_id = ${decodedRequest.owner.tenantId}
@@ -3248,8 +3862,8 @@ const makeScheduleStore = Effect.gen(function* () {
               AND schedule_id > ${decodedRequest.after}
             ORDER BY schedule_id
             LIMIT ${decodedRequest.limit + 1}
-          `.pipe(Effect.mapError(() => unavailable(operation)));
-		const decoded = yield* decodeRows(Schema.Array(ScheduleRow), rows, operation);
+          `.pipe(Effect.mapError(() => unavailable$1(operation)));
+		const decoded = yield* decodeRows$1(Schema.Array(ScheduleRow), rows, operation);
 		const records = yield* Effect.forEach(decoded, decodeRecord);
 		const hasNext = records.length > decodedRequest.limit;
 		const items = hasNext ? records.slice(0, decodedRequest.limit) : records;
@@ -3274,9 +3888,9 @@ const makeScheduleStore = Effect.gen(function* () {
               WHERE tenant_id = ${key.owner.tenantId} AND owner_id = ${key.owner.ownerId}
                 AND (json_extract(record_json, '$.pending') IS NOT NULL OR
                   (json_extract(record_json, '$.state') != 'cancelled' AND json_extract(record_json, '$.nextAtMillis') IS NOT NULL))
-            `.pipe(Effect.mapError(() => unavailable(operation)));
-				const counts = yield* decodeRows(Schema.Array(ScheduleCountRow), rawCounts, operation);
-				if (counts.length !== 1) return yield* corrupt(operation);
+            `.pipe(Effect.mapError(() => unavailable$1(operation)));
+				const counts = yield* decodeRows$1(Schema.Array(ScheduleCountRow), rawCounts, operation);
+				if (counts.length !== 1) return yield* corrupt$1(operation);
 				if (counts[0].schedule_count >= ownerLimit) return yield* ScheduleCapacityError.make({ limit: ownerLimit });
 			}
 			if (next === current) return {
@@ -3291,19 +3905,19 @@ const makeScheduleStore = Effect.gen(function* () {
             WHERE tenant_id = ${decodedKey.owner.tenantId}
               AND owner_id = ${decodedKey.owner.ownerId}
               AND schedule_id = ${decodedKey.scheduleId}
-          `.pipe(Effect.mapError(() => unavailable(operation)));
+          `.pipe(Effect.mapError(() => unavailable$1(operation)));
 			return {
 				record: next,
 				changed: true
 			};
-		})).pipe(Effect.catchTag("SqlError", () => Effect.fail(unavailable(operation))));
+		})).pipe(Effect.catchTag("SqlError", () => Effect.fail(unavailable$1(operation))));
 		if (result.changed) yield* scheduleFailpoint.hit(`schedule:${decodedChange._tag.toLowerCase()}:after`);
 		return result.record;
 	});
 	const due = Effect.fn("SqliteScheduleStore.due")(function* (nowMillis, limit, owner, after) {
 		const operation = "query due schedules";
 		const decodedOwner = owner === void 0 ? void 0 : yield* decodeInput(operation, ScheduleOwner, owner);
-		const cursor = after === void 0 ? void 0 : yield* Schema.decodeUnknownEffect(ScheduleDueCursor)(after).pipe(Effect.mapError(() => corrupt(operation)));
+		const cursor = after === void 0 ? void 0 : yield* Schema.decodeUnknownEffect(ScheduleDueCursor)(after).pipe(Effect.mapError(() => corrupt$1(operation)));
 		const continuation = cursor === void 0 ? sql`1 = 1` : sql`
       (deadline_at_millis, tenant_id, owner_id, schedule_id) >
       (${cursor.deadlineAtMillis}, ${cursor.owner.tenantId}, ${cursor.owner.ownerId}, ${cursor.scheduleId})`;
@@ -3313,7 +3927,7 @@ const makeScheduleStore = Effect.gen(function* () {
             WHERE deadline_at_millis <= ${nowMillis} AND ${continuation}
             ORDER BY deadline_at_millis, tenant_id, owner_id, schedule_id
             LIMIT ${limit}
-          `.pipe(Effect.mapError(() => unavailable(operation))) : yield* sql`
+          `.pipe(Effect.mapError(() => unavailable$1(operation))) : yield* sql`
             SELECT tenant_id, owner_id, schedule_id, deadline_at_millis
             FROM effect_agent_schedules
             WHERE tenant_id = ${decodedOwner.tenantId}
@@ -3321,8 +3935,8 @@ const makeScheduleStore = Effect.gen(function* () {
               AND deadline_at_millis <= ${nowMillis} AND ${continuation}
             ORDER BY deadline_at_millis, schedule_id
             LIMIT ${limit}
-          `.pipe(Effect.mapError(() => unavailable(operation)));
-		return (yield* decodeRows(Schema.Array(ScheduleDueRow), rows, operation)).map((row) => ({
+          `.pipe(Effect.mapError(() => unavailable$1(operation)));
+		return (yield* decodeRows$1(Schema.Array(ScheduleDueRow), rows, operation)).map((row) => ({
 			owner: {
 				tenantId: row.tenant_id,
 				ownerId: row.owner_id
@@ -3338,15 +3952,15 @@ const makeScheduleStore = Effect.gen(function* () {
           SELECT MIN(deadline_at_millis) AS deadline_at_millis
           FROM effect_agent_schedules
           WHERE deadline_at_millis IS NOT NULL
-        `.pipe(Effect.mapError(() => unavailable(operation))) : yield* sql`
+        `.pipe(Effect.mapError(() => unavailable$1(operation))) : yield* sql`
           SELECT MIN(deadline_at_millis) AS deadline_at_millis
           FROM effect_agent_schedules
           WHERE tenant_id = ${decodedOwner.tenantId}
             AND owner_id = ${decodedOwner.ownerId}
             AND deadline_at_millis IS NOT NULL
-        `.pipe(Effect.mapError(() => unavailable(operation)));
-		const decoded = yield* decodeRows(Schema.Array(ScheduleDeadlineRow), rows, operation);
-		if (decoded.length !== 1) return yield* corrupt(operation);
+        `.pipe(Effect.mapError(() => unavailable$1(operation)));
+		const decoded = yield* decodeRows$1(Schema.Array(ScheduleDeadlineRow), rows, operation);
+		if (decoded.length !== 1) return yield* corrupt$1(operation);
 		return decoded[0].deadline_at_millis;
 	});
 	return ScheduleStore.of({
@@ -3361,6 +3975,591 @@ const makeScheduleStore = Effect.gen(function* () {
 /** SQLite implementation of the atomic ScheduleStore port. */
 const scheduleStoreLayer = Layer.effect(ScheduleStore)(makeScheduleStore);
 //#endregion
-export { CurrentSqliteStorageVersion, SqliteAppendConflict, SqliteCheckpointConflict, SqliteFenceRejected, SqliteLedgerError, SqliteStorageCompatibilityError, SqliteStorageConfig, SqliteStorageConfigValue, SqliteStorageCorruptionError, SqliteStorageError, SqliteStorageFailpoint, SqliteStorageFailpointError, SqliteStorageFailpointLocation, SqliteStorageFailpointTestControl, SqliteWriteContention, conversationStoreLayer, layer, ledgerLayer, observationOffsetAt, scheduleStoreLayer, sqliteMigrations, storageConfigLayer, storageFailpointLayer, submissionLedgerLayer };
+//#region src/sqlite-subscription-store.ts
+const StoredJson = Schema.String.check(Schema.isMaxLength(16777216));
+const CountRow = Schema.Struct({ count: Schema.Int.check(Schema.isGreaterThanOrEqualTo(0)) });
+const SequenceRow = Schema.Struct({ sequence: Schema.Natural });
+const ScanRow = Schema.Struct({
+	event_scan_cursor: Schema.String,
+	delivery_scan_cursor: Schema.String,
+	recovery_scan_cursor: Schema.Natural
+});
+const JsonRow = Schema.Struct({ record_json: StoredJson });
+const RegistrationRow = Schema.Struct({
+	owner_id: Schema.String,
+	subscription_id: Schema.String,
+	ordinal: Schema.Natural,
+	source_name: Schema.String,
+	source_version: Schema.String,
+	matching_key: Schema.String,
+	state: SubscriptionRecord.fields.state,
+	expires_at_millis: Schema.Number,
+	recovery_at_millis: Schema.NullOr(Schema.Number),
+	record_json: StoredJson
+});
+const EventRow = Schema.Struct({
+	event_id: Schema.String,
+	source_name: Schema.String,
+	source_version: Schema.String,
+	matching_key: Schema.String,
+	payload_digest: Digest,
+	cutoff: Schema.Natural,
+	cursor: Schema.Natural,
+	routing_complete: Schema.Number,
+	next_attempt_at_millis: Schema.Number,
+	record_json: StoredJson
+});
+const DeliveryRow = Schema.Struct({
+	owner_id: Schema.String,
+	subscription_id: Schema.String,
+	event_id: Schema.String,
+	delivery_key: Schema.String,
+	state: SubscriptionDelivery.fields.state,
+	next_attempt_at_millis: Schema.Number,
+	record_json: StoredJson
+});
+const error = (reason, code) => SubscriptionError.make({
+	reason,
+	code
+});
+const unavailable = (operation) => error("storage", operation);
+const corrupt = (operation) => error("corrupt", operation);
+const bytes = (value) => new TextEncoder().encode(JSON.stringify(value)).byteLength;
+const validate = (schema, value, code) => Schema.decodeUnknownEffect(schema)(value).pipe(Effect.mapError(() => error("validation", code)));
+const encode = (schema, value, code) => Schema.encodeEffect(Schema.fromJsonString(schema))(value).pipe(Effect.mapError(() => corrupt(code)));
+const decode = (schema, value, code) => Schema.decodeEffect(Schema.fromJsonString(schema))(value).pipe(Effect.mapError(() => corrupt(code)));
+const decodeRows = (schema, rows, code) => Schema.decodeUnknownEffect(Schema.Array(schema))(rows).pipe(Effect.mapError(() => corrupt(code)));
+const sameDeliveryIdentity = (left, right) => subscriptionDeliveryKeyString(left.key) === subscriptionDeliveryKeyString(right.key) && left.deliveryId === right.deliveryId && left.source.name === right.source.name && left.source.version === right.source.version && left.threadId === right.threadId && left.admissionKey === right.admissionKey && left.subscriptionFingerprint === right.subscriptionFingerprint && left.eventDigest === right.eventDigest;
+const makeSubscriptionStore = Effect.fn("SqliteSubscriptionStore.make")(function* (owned) {
+	const partition = yield* validate(SourcePartition, owned, "partition");
+	const sql = yield* SqlClient.SqlClient;
+	const failpoint = yield* SubscriptionFailpoint;
+	yield* initializeSqliteJournal();
+	yield* sql`
+    INSERT INTO effect_agent_subscription_sequences (
+      tenant_id, source_address, sequence, event_scan_cursor, delivery_scan_cursor, recovery_scan_cursor
+    ) VALUES (${partition.tenantId}, ${partition.address}, 0, '', '', 0) ON CONFLICT DO NOTHING
+  `.pipe(Effect.mapError(() => unavailable("initialize subscription partition")));
+	const transact = (effect) => sql.withTransaction(effect).pipe(Effect.catchTag("SqlError", () => Effect.fail(unavailable("transaction"))));
+	const query = (effect, code) => effect.pipe(Effect.mapError(() => unavailable(code)));
+	const requirePartition = (candidate, code) => sameSourcePartition(candidate, partition) ? Effect.void : Effect.fail(error("validation", code));
+	const requireKey = Effect.fn("SqliteSubscriptionStore.requireKey")(function* (input, code) {
+		const key = yield* validate(SubscriptionKey, input, code);
+		yield* requirePartition(key.partition, code);
+		return key;
+	});
+	const readRegistration = Effect.fn("SqliteSubscriptionStore.readRegistration")(function* (key, code) {
+		const rows = yield* query(sql`
+      SELECT owner_id, subscription_id, ordinal, source_name, source_version, matching_key, state,
+        expires_at_millis, recovery_at_millis, record_json FROM effect_agent_subscriptions
+      WHERE tenant_id=${partition.tenantId} AND source_address=${partition.address}
+        AND owner_id=${key.ownerId} AND subscription_id=${key.subscriptionId}
+    `, code);
+		const decodedRows = yield* decodeRows(RegistrationRow, rows, code);
+		if (decodedRows.length > 1) return yield* corrupt(code);
+		const row = decodedRows[0];
+		if (row === void 0) return null;
+		const record = yield* decode(SubscriptionRecord, row.record_json, code);
+		if (!sameSourcePartition(record.key.partition, partition) || record.key.ownerId !== row.owner_id || record.key.subscriptionId !== row.subscription_id || record.ordinal !== row.ordinal || record.configuration.source.name !== row.source_name || record.configuration.source.version !== row.source_version || record.configuration.matchingKey !== row.matching_key || record.state !== row.state || record.configuration.expiresAtMillis !== row.expires_at_millis || (record.recovery?.nextAttemptAtMillis ?? null) !== row.recovery_at_millis) return yield* corrupt(`${code}-projection`);
+		return record;
+	});
+	const readEvent = Effect.fn("SqliteSubscriptionStore.readEvent")(function* (eventId, code) {
+		const rows = yield* query(sql`
+      SELECT event_id, source_name, source_version, matching_key, payload_digest, cutoff, cursor,
+        routing_complete, next_attempt_at_millis, record_json FROM effect_agent_subscription_events
+      WHERE tenant_id=${partition.tenantId} AND source_address=${partition.address} AND event_id=${eventId}
+    `, code);
+		const decodedRows = yield* decodeRows(EventRow, rows, code);
+		if (decodedRows.length > 1) return yield* corrupt(code);
+		const row = decodedRows[0];
+		if (row === void 0) return null;
+		const event = yield* decode(AcceptedEvent, row.record_json, code);
+		if (!sameSourcePartition(event.partition, partition) || event.eventId !== row.event_id || event.source.name !== row.source_name || event.source.version !== row.source_version || event.matchingKey !== row.matching_key || event.payloadDigest !== row.payload_digest || event.cutoff !== row.cutoff || event.cursor !== row.cursor || (event.routingComplete ? 1 : 0) !== row.routing_complete || event.nextAttemptAtMillis !== row.next_attempt_at_millis) return yield* corrupt(`${code}-projection`);
+		return event;
+	});
+	const readDelivery = Effect.fn("SqliteSubscriptionStore.readDelivery")(function* (key, code) {
+		const rows = yield* query(sql`
+      SELECT owner_id, subscription_id, event_id, delivery_key, state, next_attempt_at_millis, record_json
+      FROM effect_agent_subscription_deliveries
+      WHERE tenant_id=${partition.tenantId} AND source_address=${partition.address}
+        AND owner_id=${key.subscription.ownerId} AND subscription_id=${key.subscription.subscriptionId}
+        AND event_id=${key.eventId}
+    `, code);
+		const decodedRows = yield* decodeRows(DeliveryRow, rows, code);
+		if (decodedRows.length > 1) return yield* corrupt(code);
+		const row = decodedRows[0];
+		if (row === void 0) return null;
+		const delivery = yield* decode(SubscriptionDelivery, row.record_json, code);
+		if (!sameSourcePartition(delivery.key.subscription.partition, partition) || delivery.key.subscription.ownerId !== row.owner_id || delivery.key.subscription.subscriptionId !== row.subscription_id || delivery.key.eventId !== row.event_id || subscriptionDeliveryKeyString(delivery.key) !== row.delivery_key || delivery.state !== row.state || delivery.retry.nextAttemptAtMillis !== row.next_attempt_at_millis) return yield* corrupt(`${code}-projection`);
+		return delivery;
+	});
+	const count = Effect.fn("SqliteSubscriptionStore.count")(function* (statement, code) {
+		const rows = yield* query(statement, code);
+		const decoded = yield* decodeRows(CountRow, rows, code);
+		if (decoded.length !== 1) return yield* corrupt(code);
+		return decoded[0].count;
+	});
+	const nextSequence = Effect.fn("SqliteSubscriptionStore.nextSequence")(function* () {
+		const rows = yield* query(sql`
+      UPDATE effect_agent_subscription_sequences SET sequence=sequence+1
+      WHERE tenant_id=${partition.tenantId} AND source_address=${partition.address}
+      RETURNING sequence
+    `, "advance subscription sequence");
+		const decoded = yield* decodeRows(SequenceRow, rows, "advance subscription sequence");
+		if (decoded.length !== 1) return yield* corrupt("subscription sequence");
+		return decoded[0].sequence;
+	});
+	const writeRegistration = Effect.fn("SqliteSubscriptionStore.writeRegistration")(function* (record) {
+		const json = yield* encode(SubscriptionRecord, record, "encode subscription");
+		yield* query(sql`
+      UPDATE effect_agent_subscriptions SET state=${record.state}, expires_at_millis=${record.configuration.expiresAtMillis},
+        recovery_at_millis=${record.recovery?.nextAttemptAtMillis ?? null}, record_json=${json}
+      WHERE tenant_id=${partition.tenantId} AND source_address=${partition.address}
+        AND owner_id=${record.key.ownerId} AND subscription_id=${record.key.subscriptionId}
+    `, "write subscription");
+	});
+	const writeEvent = Effect.fn("SqliteSubscriptionStore.writeEvent")(function* (event) {
+		const json = yield* encode(AcceptedEvent, event, "encode event");
+		yield* query(sql`
+      UPDATE effect_agent_subscription_events SET cursor=${event.cursor}, routing_complete=${event.routingComplete ? 1 : 0},
+        next_attempt_at_millis=${event.nextAttemptAtMillis}, record_json=${json}
+      WHERE tenant_id=${partition.tenantId} AND source_address=${partition.address} AND event_id=${event.eventId}
+    `, "write event");
+	});
+	const writeDelivery = Effect.fn("SqliteSubscriptionStore.writeDelivery")(function* (delivery) {
+		const json = yield* encode(SubscriptionDelivery, delivery, "encode delivery");
+		yield* query(sql`
+      UPDATE effect_agent_subscription_deliveries SET state=${delivery.state},
+        next_attempt_at_millis=${delivery.retry.nextAttemptAtMillis}, record_json=${json}
+      WHERE tenant_id=${partition.tenantId} AND source_address=${partition.address}
+        AND owner_id=${delivery.key.subscription.ownerId} AND subscription_id=${delivery.key.subscription.subscriptionId}
+        AND event_id=${delivery.key.eventId}
+    `, "write delivery");
+	});
+	const register = Effect.fn("SqliteSubscriptionStore.register")(function* (input, inputLimits) {
+		const record = yield* validate(SubscriptionRecord, input, "register-record");
+		const limits = yield* validate(SubscriptionLimits, inputLimits, "register-limits");
+		yield* requirePartition(record.key.partition, "register-partition");
+		const result = yield* transact(Effect.gen(function* () {
+			const existing = yield* readRegistration(record.key, "register-existing");
+			if (existing !== null) {
+				if (existing.creationFingerprint !== record.creationFingerprint) return yield* error("conflict", "registration-identity");
+				return {
+					value: existing,
+					changed: false
+				};
+			}
+			if (bytes(record.configuration.context) > limits.maxContextBytes) return yield* error("capacity", "context-bytes");
+			if (bytes(record.configuration.parameters) > limits.maxPayloadBytes) return yield* error("capacity", "parameters-bytes");
+			if (record.configuration.expiresAtMillis - record.createdAtMillis > limits.maxLifetimeMillis) return yield* error("capacity", "lifetime");
+			if ((yield* count(sql`SELECT COUNT(*) AS count FROM effect_agent_subscriptions WHERE tenant_id=${partition.tenantId} AND source_address=${partition.address}`, "count registrations")) >= limits.maxRegistrations) return yield* error("capacity", "registrations");
+			if ((yield* count(sql`SELECT COUNT(*) AS count FROM effect_agent_subscriptions WHERE tenant_id=${partition.tenantId} AND source_address=${partition.address} AND owner_id=${record.key.ownerId}`, "count owner registrations")) >= limits.maxRegistrationsPerOwner) return yield* error("capacity", "owner-registrations");
+			const assigned = {
+				...record,
+				ordinal: yield* nextSequence()
+			};
+			const json = yield* encode(SubscriptionRecord, assigned, "encode registration");
+			yield* failpoint.hit("subscription:register:before");
+			yield* query(sql`
+        INSERT INTO effect_agent_subscriptions (tenant_id, source_address, owner_id, subscription_id, ordinal,
+          source_name, source_version, matching_key, state, expires_at_millis, recovery_at_millis, record_json)
+        VALUES (${partition.tenantId}, ${partition.address}, ${assigned.key.ownerId}, ${assigned.key.subscriptionId}, ${assigned.ordinal},
+          ${assigned.configuration.source.name}, ${assigned.configuration.source.version}, ${assigned.configuration.matchingKey}, ${assigned.state},
+          ${assigned.configuration.expiresAtMillis}, ${assigned.recovery?.nextAttemptAtMillis ?? null}, ${json})
+      `, "insert registration");
+			return {
+				value: assigned,
+				changed: true
+			};
+		}));
+		if (result.changed) yield* failpoint.hit("subscription:register:after");
+		return result.value;
+	});
+	const get = Effect.fn("SqliteSubscriptionStore.get")(function* (input) {
+		return yield* readRegistration(yield* requireKey(input, "get-key"), "get subscription");
+	});
+	const list = Effect.fn("SqliteSubscriptionStore.list")(function* (ownerId, after, limit) {
+		const rows = yield* query(sql`
+      SELECT owner_id, subscription_id, ordinal FROM effect_agent_subscriptions WHERE tenant_id=${partition.tenantId} AND source_address=${partition.address}
+        AND owner_id=${ownerId} AND ordinal>${after} ORDER BY ordinal LIMIT ${limit}
+    `, "list subscriptions");
+		const decoded = yield* decodeRows(Schema.Struct({
+			owner_id: Schema.String,
+			subscription_id: Schema.String,
+			ordinal: Schema.Natural
+		}), rows, "list subscriptions");
+		return yield* Effect.forEach(decoded, Effect.fn("SqliteSubscriptionStore.listRecord")(function* (row) {
+			const record = yield* readRegistration({
+				partition,
+				ownerId: row.owner_id,
+				subscriptionId: row.subscription_id
+			}, "list subscription");
+			if (record === null || record.ordinal !== row.ordinal) return yield* corrupt("list subscription projection");
+			return record;
+		}));
+	});
+	const cancel = Effect.fn("SqliteSubscriptionStore.cancel")(function* (input) {
+		const key = yield* requireKey(input, "cancel-key");
+		const result = yield* transact(Effect.gen(function* () {
+			const current = yield* readRegistration(key, "cancel subscription");
+			if (current === null) return yield* error("not-found", "subscription");
+			if (current.state === "cancelled") return {
+				value: current,
+				changed: false
+			};
+			const updated = {
+				...current,
+				state: "cancelled",
+				recovery: null
+			};
+			yield* failpoint.hit("subscription:cancel:before");
+			yield* writeRegistration(updated);
+			return {
+				value: updated,
+				changed: true
+			};
+		}));
+		if (result.changed) yield* failpoint.hit("subscription:cancel:after");
+		return result.value;
+	});
+	const accept = Effect.fn("SqliteSubscriptionStore.accept")(function* (input, inputLimits) {
+		const event = yield* validate(AcceptedEvent, input, "accept-event");
+		const limits = yield* validate(SubscriptionLimits, inputLimits, "accept-limits");
+		yield* requirePartition(event.partition, "accept-partition");
+		const result = yield* transact(Effect.gen(function* () {
+			const existing = yield* readEvent(event.eventId, "accept event");
+			if (existing !== null) {
+				if (!sameAcceptedEventIdentity(existing, event)) return yield* error("conflict", "event-identity");
+				return {
+					value: existing,
+					changed: false
+				};
+			}
+			if (bytes(event.payload) > limits.maxPayloadBytes) return yield* error("capacity", "payload-bytes");
+			if ((yield* count(sql`SELECT COUNT(*) AS count FROM effect_agent_subscription_events WHERE tenant_id=${partition.tenantId} AND source_address=${partition.address}`, "count events")) >= limits.maxEvents) return yield* error("capacity", "events");
+			const accepted = {
+				...event,
+				cutoff: yield* nextSequence(),
+				cursor: 0,
+				routingComplete: false,
+				routingFailure: null
+			};
+			const json = yield* encode(AcceptedEvent, accepted, "encode accepted event");
+			yield* failpoint.hit("subscription:accept:before");
+			yield* query(sql`
+        INSERT INTO effect_agent_subscription_events (tenant_id, source_address, event_id, source_name, source_version,
+          matching_key, payload_digest, cutoff, cursor, routing_complete, next_attempt_at_millis, record_json)
+        VALUES (${partition.tenantId}, ${partition.address}, ${accepted.eventId}, ${accepted.source.name}, ${accepted.source.version},
+          ${accepted.matchingKey}, ${accepted.payloadDigest}, ${accepted.cutoff}, ${accepted.cursor}, 0, ${accepted.nextAttemptAtMillis}, ${json})
+      `, "insert event");
+			return {
+				value: accepted,
+				changed: true
+			};
+		}));
+		if (result.changed) yield* failpoint.hit("subscription:accept:after");
+		return result.value;
+	});
+	const event = Effect.fn("SqliteSubscriptionStore.event")((eventId) => readEvent(eventId, "get event"));
+	const pendingEvents = Effect.fn("SqliteSubscriptionStore.pendingEvents")(function* (nowMillis, after, limit) {
+		const rows = yield* query(sql`
+      SELECT event_id FROM effect_agent_subscription_events WHERE tenant_id=${partition.tenantId} AND source_address=${partition.address}
+        AND routing_complete=0 AND next_attempt_at_millis<=${nowMillis} AND event_id>${after} ORDER BY event_id LIMIT ${limit}
+    `, "pending events");
+		return yield* decodeRows(Schema.Struct({ event_id: Schema.String }), rows, "pending event keys").pipe(Effect.map((items) => items.map((item) => item.event_id)));
+	});
+	const candidates = Effect.fn("SqliteSubscriptionStore.candidates")(function* (input, limit) {
+		const supplied = yield* validate(AcceptedEvent, input, "candidates-event");
+		yield* requirePartition(supplied.partition, "candidates-partition");
+		const stored = yield* readEvent(supplied.eventId, "candidates event");
+		if (stored === null) return yield* error("not-found", "event");
+		if (!sameAcceptedEventIdentity(stored, supplied)) return yield* error("conflict", "event");
+		const rows = yield* query(sql`
+      SELECT owner_id, subscription_id, ordinal FROM effect_agent_subscriptions WHERE tenant_id=${partition.tenantId} AND source_address=${partition.address}
+        AND source_name=${stored.source.name} AND source_version=${stored.source.version} AND matching_key=${stored.matchingKey}
+        AND ordinal>${stored.cursor} AND ordinal<=${stored.cutoff} ORDER BY ordinal LIMIT ${limit}
+    `, "subscription candidates");
+		const decoded = yield* decodeRows(Schema.Struct({
+			owner_id: Schema.String,
+			subscription_id: Schema.String,
+			ordinal: Schema.Natural
+		}), rows, "subscription candidates");
+		return yield* Effect.forEach(decoded, Effect.fn("SqliteSubscriptionStore.candidateRecord")(function* (row) {
+			const record = yield* readRegistration({
+				partition,
+				ownerId: row.owner_id,
+				subscriptionId: row.subscription_id
+			}, "subscription candidate");
+			if (record === null || record.ordinal !== row.ordinal) return yield* corrupt("subscription candidate projection");
+			return record;
+		}));
+	});
+	const insertDelivery = Effect.fn("SqliteSubscriptionStore.insertDelivery")(function* (delivery) {
+		const json = yield* encode(SubscriptionDelivery, delivery, "encode selected delivery");
+		yield* query(sql`
+      INSERT INTO effect_agent_subscription_deliveries (tenant_id, source_address, owner_id, subscription_id, event_id,
+        delivery_key, state, next_attempt_at_millis, record_json)
+      VALUES (${partition.tenantId}, ${partition.address}, ${delivery.key.subscription.ownerId}, ${delivery.key.subscription.subscriptionId},
+        ${delivery.key.eventId}, ${subscriptionDeliveryKeyString(delivery.key)}, ${delivery.state}, ${delivery.retry.nextAttemptAtMillis}, ${json})
+    `, "insert delivery");
+	});
+	const select = Effect.fn("SqliteSubscriptionStore.select")(function* (inputEvent, inputDeliveries, cursor, complete, nowMillis, inputLimits) {
+		const supplied = yield* validate(AcceptedEvent, inputEvent, "select-event");
+		const deliveries = yield* validate(Schema.Array(SubscriptionDelivery), inputDeliveries, "select-deliveries");
+		const limits = yield* validate(SubscriptionLimits, inputLimits, "select-limits");
+		yield* requirePartition(supplied.partition, "select-partition");
+		for (const candidate of deliveries) yield* requirePartition(candidate.key.subscription.partition, "select-delivery-partition");
+		if (yield* transact(Effect.gen(function* () {
+			const accepted = yield* readEvent(supplied.eventId, "select event");
+			if (accepted === null) return yield* error("not-found", "event");
+			if (!sameAcceptedEventIdentity(accepted, supplied) || accepted.cursor !== supplied.cursor) return yield* error("conflict", "event-cursor");
+			if (accepted.routingComplete) return false;
+			if (!Number.isSafeInteger(cursor) || cursor < accepted.cursor || cursor > accepted.cutoff) return yield* error("validation", "cursor");
+			yield* failpoint.hit("subscription:select:before");
+			const effectiveNowMillis = Math.max(nowMillis, yield* Clock.currentTimeMillis);
+			const additions = [];
+			for (const delivery of deliveries) {
+				const record = yield* readRegistration(delivery.key.subscription, "select registration");
+				if (record === null) return yield* error("not-found", "subscription");
+				if (!subscriptionDeliveryCanSelect(delivery, record, accepted) || delivery.key.eventId !== accepted.eventId || delivery.source.name !== accepted.source.name || delivery.source.version !== accepted.source.version || record.ordinal <= accepted.cursor || record.ordinal > cursor) return yield* error("conflict", "selection");
+				const existing = yield* readDelivery(delivery.key, "select existing delivery");
+				if (existing !== null) {
+					if (!sameDeliveryIdentity(existing, delivery)) return yield* error("conflict", "delivery-identity");
+					continue;
+				}
+				if (!subscriptionCanSelect(record, accepted, effectiveNowMillis, false)) continue;
+				additions.push({
+					delivery,
+					record
+				});
+			}
+			if ((yield* count(sql`SELECT COUNT(*) AS count FROM effect_agent_subscription_deliveries WHERE tenant_id=${partition.tenantId} AND source_address=${partition.address}`, "count deliveries")) + additions.length > limits.maxDeliveries) return yield* error("capacity", "deliveries");
+			for (const ownerId of new Set(additions.map(({ record }) => record.key.ownerId))) if ((yield* count(sql`SELECT COUNT(*) AS count FROM effect_agent_subscription_deliveries WHERE tenant_id=${partition.tenantId} AND source_address=${partition.address} AND owner_id=${ownerId}`, "count owner deliveries")) + additions.filter(({ record }) => record.key.ownerId === ownerId).length > limits.maxDeliveriesPerOwner) return yield* error("capacity", "owner-deliveries");
+			for (const addition of additions) {
+				yield* insertDelivery(addition.delivery);
+				if (addition.record.configuration.mode === "once") yield* writeRegistration({
+					...addition.record,
+					state: "consumed",
+					recovery: null
+				});
+			}
+			yield* writeEvent({
+				...accepted,
+				cursor,
+				routingComplete: complete,
+				routingFailure: null
+			});
+			return true;
+		}))) yield* failpoint.hit("subscription:select:after");
+	});
+	const catchUp = Effect.fn("SqliteSubscriptionStore.catchUp")(function* (inputEvent, inputDelivery, nowMillis, inputLimits) {
+		const supplied = yield* validate(AcceptedEvent, inputEvent, "catch-up-event");
+		const delivery = yield* validate(SubscriptionDelivery, inputDelivery, "catch-up-delivery");
+		const limits = yield* validate(SubscriptionLimits, inputLimits, "catch-up-limits");
+		yield* requirePartition(supplied.partition, "catch-up-partition");
+		yield* requirePartition(delivery.key.subscription.partition, "catch-up-delivery-partition");
+		if (yield* transact(Effect.gen(function* () {
+			const accepted = yield* readEvent(supplied.eventId, "catch-up event");
+			const record = yield* readRegistration(delivery.key.subscription, "catch-up subscription");
+			if (accepted === null || record === null) return yield* error("not-found", accepted === null ? "event" : "subscription");
+			if (!sameAcceptedEventIdentity(accepted, supplied) || !subscriptionDeliveryCanSelect(delivery, record, accepted) || delivery.key.eventId !== accepted.eventId || delivery.source.name !== accepted.source.name || delivery.source.version !== accepted.source.version || record.configuration.mode !== "once") return yield* error("conflict", "catch-up-identity");
+			const existing = yield* readDelivery(delivery.key, "catch-up existing delivery");
+			if (existing !== null) {
+				if (!sameDeliveryIdentity(existing, delivery)) return yield* error("conflict", "delivery-identity");
+				return false;
+			}
+			yield* failpoint.hit("subscription:catch-up:before");
+			const effectiveNowMillis = Math.max(nowMillis, yield* Clock.currentTimeMillis);
+			if (!subscriptionCanSelect(record, accepted, effectiveNowMillis, true)) return yield* error("conflict", "catch-up-eligibility");
+			if ((yield* count(sql`SELECT COUNT(*) AS count FROM effect_agent_subscription_deliveries WHERE tenant_id=${partition.tenantId} AND source_address=${partition.address}`, "count deliveries")) >= limits.maxDeliveries) return yield* error("capacity", "deliveries");
+			if ((yield* count(sql`SELECT COUNT(*) AS count FROM effect_agent_subscription_deliveries WHERE tenant_id=${partition.tenantId} AND source_address=${partition.address} AND owner_id=${record.key.ownerId}`, "count owner deliveries")) >= limits.maxDeliveriesPerOwner) return yield* error("capacity", "owner-deliveries");
+			yield* insertDelivery(delivery);
+			yield* writeRegistration({
+				...record,
+				state: "consumed",
+				recovery: null
+			});
+			return true;
+		}))) yield* failpoint.hit("subscription:catch-up:after");
+	});
+	const deferEvent = Effect.fn("SqliteSubscriptionStore.deferEvent")(function* (eventId, nextAttemptAtMillis, code) {
+		const routingFailure = code === void 0 ? "routing-failed" : yield* validate(SubscriptionName, code, "routing-failure");
+		yield* transact(Effect.gen(function* () {
+			const accepted = yield* readEvent(eventId, "defer event");
+			if (accepted === null) return yield* error("not-found", "event");
+			yield* failpoint.hit("subscription:defer-event:before");
+			yield* writeEvent({
+				...accepted,
+				nextAttemptAtMillis,
+				routingFailure
+			});
+		}));
+		yield* failpoint.hit("subscription:defer-event:after");
+	});
+	const delivery = Effect.fn("SqliteSubscriptionStore.delivery")(function* (input) {
+		const key = yield* validate(SubscriptionDeliveryKey, input, "delivery-key");
+		yield* requirePartition(key.subscription.partition, "delivery-partition");
+		return yield* readDelivery(key, "get delivery");
+	});
+	const pendingDeliveries = Effect.fn("SqliteSubscriptionStore.pendingDeliveries")(function* (nowMillis, after, limit) {
+		const rows = yield* query(sql`
+      SELECT owner_id, subscription_id, event_id FROM effect_agent_subscription_deliveries
+      WHERE tenant_id=${partition.tenantId} AND source_address=${partition.address} AND state NOT IN ('delivered','refused')
+        AND next_attempt_at_millis<=${nowMillis} AND delivery_key>${after} ORDER BY delivery_key LIMIT ${limit}
+    `, "pending deliveries");
+		const rowSchema = Schema.Struct({
+			owner_id: Schema.String,
+			subscription_id: Schema.String,
+			event_id: Schema.String
+		});
+		return yield* decodeRows(rowSchema, rows, "pending delivery keys").pipe(Effect.map((items) => items.map((item) => ({
+			subscription: {
+				partition,
+				ownerId: item.owner_id,
+				subscriptionId: item.subscription_id
+			},
+			eventId: item.event_id
+		}))));
+	});
+	const listDeliveries = Effect.fn("SqliteSubscriptionStore.listDeliveries")(function* (input, after, limit) {
+		const key = yield* requireKey(input, "list-deliveries-key");
+		const rows = yield* query(sql`
+      SELECT record_json FROM effect_agent_subscription_deliveries WHERE tenant_id=${partition.tenantId} AND source_address=${partition.address}
+        AND owner_id=${key.ownerId} AND subscription_id=${key.subscriptionId} AND delivery_key>${after} ORDER BY delivery_key LIMIT ${limit}
+    `, "list deliveries");
+		const decoded = yield* decodeRows(JsonRow, rows, "list deliveries");
+		return yield* Effect.forEach(decoded, (row) => decode(SubscriptionDelivery, row.record_json, "list delivery"));
+	});
+	const changeDelivery = Effect.fn("SqliteSubscriptionStore.changeDelivery")(function* (inputKey, inputDeliveryId, inputChange) {
+		const key = yield* validate(SubscriptionDeliveryKey, inputKey, "change-delivery-key");
+		const deliveryId = yield* validate(Digest, inputDeliveryId, "change-delivery-id");
+		const change = yield* validate(DeliveryChange, inputChange, "change-delivery-change");
+		yield* requirePartition(key.subscription.partition, "change-delivery-partition");
+		const result = yield* transact(Effect.gen(function* () {
+			const existing = yield* readDelivery(key, "change delivery");
+			const record = yield* readRegistration(key.subscription, "change delivery subscription");
+			if (existing === null || record === null) return yield* error("not-found", existing === null ? "delivery" : "subscription");
+			yield* failpoint.hit(`subscription:delivery-${change._tag.toLowerCase()}:before`);
+			const effectiveChange = change._tag === "Prepare" ? {
+				...change,
+				nowMillis: Math.max(change.nowMillis, yield* Clock.currentTimeMillis)
+			} : change;
+			const transition = applySubscriptionDeliveryChange(existing, record, deliveryId, effectiveChange);
+			if (Result.isFailure(transition)) return yield* transition.failure;
+			if (transition.success === existing) return {
+				value: existing,
+				changed: false
+			};
+			yield* writeDelivery(transition.success);
+			return {
+				value: transition.success,
+				changed: true
+			};
+		}));
+		if (result.changed) yield* failpoint.hit(`subscription:delivery-${change._tag.toLowerCase()}:after`);
+		return result.value;
+	});
+	const recovering = Effect.fn("SqliteSubscriptionStore.recovering")(function* (nowMillis, after, limit) {
+		const rows = yield* query(sql`
+      SELECT owner_id, subscription_id, ordinal FROM effect_agent_subscriptions
+      WHERE tenant_id=${partition.tenantId} AND source_address=${partition.address} AND state='active'
+        AND recovery_at_millis IS NOT NULL AND recovery_at_millis<=${nowMillis} AND ordinal>${after}
+      ORDER BY ordinal LIMIT ${limit}
+    `, "recovering subscriptions");
+		const rowSchema = Schema.Struct({
+			owner_id: Schema.String,
+			subscription_id: Schema.String,
+			ordinal: Schema.Natural
+		});
+		return yield* decodeRows(rowSchema, rows, "recovering subscription keys").pipe(Effect.map((items) => items.map((item) => ({
+			key: {
+				partition,
+				ownerId: item.owner_id,
+				subscriptionId: item.subscription_id
+			},
+			ordinal: item.ordinal
+		}))));
+	});
+	const deferRecovery = Effect.fn("SqliteSubscriptionStore.deferRecovery")(function* (input, recovery) {
+		const key = yield* requireKey(input, "defer-recovery-key");
+		yield* transact(Effect.gen(function* () {
+			const record = yield* readRegistration(key, "defer recovery");
+			if (record === null) return yield* error("not-found", "subscription");
+			yield* failpoint.hit("subscription:defer-recovery:before");
+			yield* writeRegistration({
+				...record,
+				recovery: record.state === "active" ? recovery : null
+			});
+		}));
+		yield* failpoint.hit("subscription:defer-recovery:after");
+	});
+	const readScanCursors = Effect.gen(function* () {
+		const rows = yield* query(sql`
+      SELECT event_scan_cursor, delivery_scan_cursor, recovery_scan_cursor
+      FROM effect_agent_subscription_sequences
+      WHERE tenant_id=${partition.tenantId} AND source_address=${partition.address}
+    `, "read subscription scan cursors");
+		const decoded = yield* decodeRows(ScanRow, rows, "read subscription scan cursors");
+		if (decoded.length !== 1) return yield* corrupt("subscription scan cursors");
+		return {
+			events: decoded[0].event_scan_cursor,
+			deliveries: decoded[0].delivery_scan_cursor,
+			recovery: decoded[0].recovery_scan_cursor
+		};
+	});
+	const advanceScanCursors = Effect.fn("SqliteSubscriptionStore.advanceScanCursors")(function* (input) {
+		const cursors = yield* validate(SubscriptionScanCursors, input, "scan-cursors");
+		yield* transact(Effect.gen(function* () {
+			yield* failpoint.hit("subscription:advance-scan-cursors:before");
+			yield* query(sql`
+        UPDATE effect_agent_subscription_sequences
+        SET event_scan_cursor=${cursors.events}, delivery_scan_cursor=${cursors.deliveries}, recovery_scan_cursor=${cursors.recovery}
+        WHERE tenant_id=${partition.tenantId} AND source_address=${partition.address}
+      `, "advance subscription scan cursors");
+		}));
+		yield* failpoint.hit("subscription:advance-scan-cursors:after");
+	});
+	const indexedDeadline = query(sql`
+    SELECT MIN(deadline) AS deadline FROM (
+      SELECT next_attempt_at_millis AS deadline FROM effect_agent_subscription_events
+        WHERE tenant_id=${partition.tenantId} AND source_address=${partition.address} AND routing_complete=0
+      UNION ALL SELECT next_attempt_at_millis FROM effect_agent_subscription_deliveries
+        WHERE tenant_id=${partition.tenantId} AND source_address=${partition.address} AND state NOT IN ('delivered','refused')
+      UNION ALL SELECT recovery_at_millis FROM effect_agent_subscriptions
+        WHERE tenant_id=${partition.tenantId} AND source_address=${partition.address} AND state='active' AND recovery_at_millis IS NOT NULL
+    )
+  `, "next subscription deadline").pipe(Effect.flatMap((rows) => decodeRows(Schema.Struct({ deadline: Schema.NullOr(Schema.Number) }), rows, "next subscription deadline")), Effect.flatMap((rows) => rows.length === 1 ? Effect.succeed(rows[0].deadline) : Effect.fail(corrupt("next subscription deadline"))));
+	const nextDeadline = Effect.gen(function* () {
+		const cursors = yield* readScanCursors;
+		if (cursors.events !== "" || cursors.deliveries !== "" || cursors.recovery !== 0) return 0;
+		return yield* indexedDeadline;
+	});
+	return SubscriptionStore.of({
+		partition,
+		register,
+		get,
+		list,
+		cancel,
+		accept,
+		event,
+		pendingEvents,
+		candidates,
+		select,
+		catchUp,
+		deferEvent,
+		delivery,
+		pendingDeliveries,
+		listDeliveries,
+		changeDelivery,
+		recovering,
+		deferRecovery,
+		readScanCursors,
+		advanceScanCursors,
+		nextDeadline
+	});
+});
+const subscriptionStoreLayer = (partition) => Layer.effect(SubscriptionStore, makeSubscriptionStore(partition));
+//#endregion
+export { CurrentSqliteStorageVersion, SqliteAppendConflict, SqliteCheckpointConflict, SqliteFenceRejected, SqliteLedgerError, SqliteStorageCompatibilityError, SqliteStorageConfig, SqliteStorageConfigValue, SqliteStorageCorruptionError, SqliteStorageError, SqliteStorageFailpoint, SqliteStorageFailpointError, SqliteStorageFailpointLocation, SqliteWriteContention, activityProcessorStoreLayer, activityProcessorStoreLayerWithFailpoints, layer, ledgerLayer, memoryReaderLayer, memoryStoreLayer, memoryStoreLayerWithFailpoints, observationOffsetAt, scheduleStoreLayer, storageConfigLayer, storageFailpointLayer, submissionLedgerLayer, subscriptionStoreLayer, threadStoreLayer };
 
 //# sourceMappingURL=index.mjs.map