@syncular/client 0.30.13 → 0.30.14

package/src/blob.ts

@@ -1,3 +1,4 @@
+export const BLOB_COMMIT_REFS = '_syncular_blob_commit_refs';
 /**
  * Client-side blob cache + transport (SPEC.md §5.9.7).
  *
@@ -187,7 +188,7 @@ export function enforceBlobCacheCap(
   if (total <= maxBytes) return [];
   // Oldest eligible body first, with blob ID as a stable tie.
   const candidates = db.query(
-    `SELECT blob_id,byte_length FROM _syncular_blobs WHERE blob_id NOT IN(SELECT blob_id FROM _syncular_blob_uploads)AND blob_id NOT IN(SELECT blob_id FROM _syncular_blob_commit_refs)AND blob_id NOT IN(${visibleBlobIdsSql(schema)})ORDER BY created_at_ms ASC,blob_id ASC`,
+    `SELECT blob_id,byte_length FROM _syncular_blobs WHERE blob_id NOT IN(SELECT blob_id FROM _syncular_blob_uploads)AND blob_id NOT IN(SELECT blob_id FROM ${BLOB_COMMIT_REFS})AND blob_id NOT IN(${visibleBlobIdsSql(schema)})ORDER BY created_at_ms ASC,blob_id ASC`,
   );
   const evicted: string[] = [];
   db.transaction(() => {
@@ -207,7 +208,7 @@ export function listPendingUploads(
 ): { blobId: string; mediaType?: string }[] {
   return db
     .query(
-      'SELECT blob_id,media_type FROM(SELECT blob_id,media_type,created_at_ms FROM _syncular_blob_uploads UNION ALL SELECT DISTINCT r.blob_id,b.media_type,9223372036854775807 AS created_at_ms FROM _syncular_blob_commit_refs r LEFT JOIN _syncular_blobs b ON b.blob_id=r.blob_id WHERE NOT EXISTS(SELECT 1 FROM _syncular_blob_uploads u WHERE u.blob_id=r.blob_id))ORDER BY created_at_ms,blob_id',
+      `SELECT blob_id,media_type FROM(SELECT blob_id,media_type,created_at_ms FROM _syncular_blob_uploads UNION ALL SELECT DISTINCT r.blob_id,b.media_type,9223372036854775807 AS created_at_ms FROM ${BLOB_COMMIT_REFS} r LEFT JOIN _syncular_blobs b ON b.blob_id=r.blob_id WHERE NOT EXISTS(SELECT 1 FROM _syncular_blob_uploads u WHERE u.blob_id=r.blob_id))ORDER BY created_at_ms,blob_id`,
     )
     .map((row) => {
       if (
@@ -285,7 +286,7 @@ export function deleteUnreferencedCachedBlobs(
   schema: CompiledClientSchema,
 ): void {
   db.exec(
-    `DELETE FROM _syncular_blobs WHERE blob_id NOT IN(SELECT blob_id FROM _syncular_blob_uploads)AND blob_id NOT IN(SELECT blob_id FROM _syncular_blob_commit_refs)AND blob_id NOT IN(${visibleBlobIdsSql(schema)})`,
+    `DELETE FROM _syncular_blobs WHERE blob_id NOT IN(SELECT blob_id FROM _syncular_blob_uploads)AND blob_id NOT IN(SELECT blob_id FROM ${BLOB_COMMIT_REFS})AND blob_id NOT IN(${visibleBlobIdsSql(schema)})`,
   );
 }
 

package/src/client.ts

@@ -1,9 +1,14 @@
+import { BLOB_COMMIT_REFS } from './blob';
+import { hasUniqueIndex } from './schema';
+import { OUTCOMES_TABLE } from './outcomes';
+import { OUTBOX_TABLE } from './outbox';
 import { RETAINED_ROWS } from './failed-overlay';
 import {
   dropFailedRows,
   failedOverlayCommits,
   retainFailedRows,
   restoreFailedBases,
+  type OverlayScope,
   uniqueConflicts,
 } from './failed-overlay';
 import {
@@ -1168,6 +1173,13 @@ export class SyncClient {
 
   /** §2.1 reset after the server reports a different log continuity. */
   #runLogEpochReset(logEpoch: string): string[] {
+    if (getMeta(this.#db, LOG_EPOCH_META_KEY) === undefined) {
+      this.#applyBatch(() => setMeta(this.#db, LOG_EPOCH_META_KEY, logEpoch));
+      this.#setSyncNeeded(true);
+      this.#emitSyncNeeded('startup');
+      this.#emitSyncIntent({ kind: 'interactive' });
+      return [];
+    }
     const subscriptions = loadSubscriptions(this.#db);
     const pending = listOutbox(this.#db);
     this.#setUpgrading(true);
@@ -1917,11 +1929,11 @@ export class SyncClient {
       );
       const outboxBytes = Number(
         this.#db.query(
-          'SELECT COALESCE(SUM(LENGTH(operations)),0)AS bytes FROM _syncular_outbox',
+          `SELECT COALESCE(SUM(LENGTH(operations)),0)AS bytes FROM ${OUTBOX_TABLE}`,
         )[0]?.bytes ?? 0,
       );
       const outcome = this.#db.query(
-        'SELECT COUNT(*)AS entries,COALESCE(SUM(LENGTH(results)+ COALESCE(LENGTH(operations),0)),0)AS bytes FROM _syncular_commit_outcomes',
+        `SELECT COUNT(*)AS entries,COALESCE(SUM(LENGTH(results)+ COALESCE(LENGTH(operations),0)),0)AS bytes FROM ${OUTCOMES_TABLE}`,
       )[0];
       const blobBytes = this.#hasBlobs
         ? Number(
@@ -2894,7 +2906,7 @@ export class SyncClient {
               continue;
             }
             this.#db.exec(
-              'INSERT OR IGNORE INTO _syncular_blob_commit_refs(commit_id,blob_id)SELECT ?,? WHERE EXISTS(SELECT 1 FROM _syncular_blobs WHERE blob_id=?)',
+              `INSERT OR IGNORE INTO ${BLOB_COMMIT_REFS}(commit_id,blob_id)SELECT ?,? WHERE EXISTS(SELECT 1 FROM _syncular_blobs WHERE blob_id=?)`,
               [clientCommitId, blobId, blobId],
             );
           }
@@ -3295,7 +3307,7 @@ export class SyncClient {
     // Pin before the first encryption await: mutations can append while a
     // round is encoding, and belong to the next request.
     const bounds = this.#db.query(
-      'SELECT COUNT(*)AS count,MAX(seq)AS last_seq FROM _syncular_outbox',
+      `SELECT COUNT(*)AS count,MAX(seq)AS last_seq FROM ${OUTBOX_TABLE}`,
     )[0]!;
     const pendingCount = bounds.count as number;
     const throughSeq = (bounds.last_seq as number | null) ?? 0;
@@ -4398,13 +4410,7 @@ export class SyncClient {
         if (errorFrame !== undefined) break;
       }
     } finally {
-      try {
-        // §7.1: local reads see outbox state applied optimistically — replay
-        // the still-pending commits on top of the freshly applied server state.
-        this.#replayOutbox();
-      } finally {
-        this.#endDiagnosticsDeferral();
-      }
+      this.#endDiagnosticsDeferral();
     }
 
     if (errorFrame !== undefined) throw errorFrame;
@@ -4558,6 +4564,15 @@ export class SyncClient {
           listOutboxBeforeImages(this.#db, commit.clientCommitId),
         );
       this.#rollbackFailedCommit(commit, batch);
+      this.#replayOutbox(
+        commit.operations.map((operation) =>
+          JSON.stringify(
+            hasUniqueIndex(this.#table(operation.table))
+              ? [operation.table]
+              : [operation.table, operation.rowId],
+          ),
+        ),
+      );
     });
     batch.status();
     summary.rejected.push(frame.clientCommitId);
@@ -4567,7 +4582,7 @@ export class SyncClient {
   #outboxCommitExists(clientCommitId: string): boolean {
     return (
       this.#db.query(
-        'SELECT 1 FROM _syncular_outbox WHERE client_commit_id=? LIMIT 1',
+        `SELECT 1 FROM ${OUTBOX_TABLE} WHERE client_commit_id=? LIMIT 1`,
         [clientCommitId],
       ).length > 0
     );
@@ -4621,7 +4636,7 @@ export class SyncClient {
         this.#applyBatch((batch) => {
           this.#recordCommitChanges(batch, frame);
           const result = fn();
-          this.#replayOutbox(result);
+          this.#replayOutbox(result, false);
           return result;
         }),
     );
@@ -4704,7 +4719,7 @@ export class SyncClient {
           )
             batch.table(table.name);
           const result = fn();
-          this.#replayOutbox();
+          this.#replayOutbox(result, false);
           return result;
         }),
     };
@@ -4888,14 +4903,17 @@ export class SyncClient {
               }),
             );
           if (covered.length) {
-            restoreFailedBases(this.#db, this.#schema);
+            const scope = covered.map((row) =>
+              JSON.stringify([sub.table, String(row.id)]),
+            );
+            restoreFailedBases(this.#db, this.#schema, scope);
             for (const row of covered)
               this.#db.exec(
                 `DELETE FROM ${RETAINED_ROWS} WHERE tbl=? AND id=? AND commit_seq<=?`,
                 [sub.table, String(row.id), nextCursor],
               );
             batch.table(sub.table);
-            this.#replayOutbox();
+            this.#replayOutbox(scope, false);
           }
         }
         if (completed && registered !== undefined) {
@@ -4945,13 +4963,15 @@ export class SyncClient {
         Object.keys(lastEffective).length > 0
       ) {
         try {
-          restoreFailedBases(this.#db, this.#schema);
-          this.#dropRetainedRows(
-            batch,
-            (name, values) =>
-              name === table.name &&
-              matchesLocalScopes(table, lastEffective, values),
-          );
+          const scope = [
+            JSON.stringify([table.name]),
+            ...this.#dropRetainedRows(
+              batch,
+              (name, values) =>
+                name === table.name &&
+                matchesLocalScopes(table, lastEffective, values),
+            ),
+          ];
           deleteScopedRows(this.#db, table, lastEffective);
           batch.scopeMap(table, lastEffective);
           const pendingById = new Map(
@@ -4997,6 +5017,7 @@ export class SyncClient {
             batch.rejections();
             batch.outcomes();
           }
+          this.#replayOutbox(scope);
           this.#deleteUnreferencedBlobs();
         } catch (error) {
           if (
@@ -5217,7 +5238,7 @@ export class SyncClient {
           : (local[SYNC_VERSION_COLUMN] as number);
       if (
         replay &&
-        table.indexes.some((index) => index.unique) &&
+        hasUniqueIndex(table) &&
         uniqueConflicts(
           this.#db,
           table,
@@ -5245,8 +5266,9 @@ export class SyncClient {
       table: string,
       values: Readonly<Record<string, JsonRowValue>>,
     ) => boolean,
-  ): void {
-    for (const commit of dropFailedRows(this.#db, matches)) {
+  ): string[] {
+    const scope: string[] = [];
+    for (const commit of dropFailedRows(this.#db, this.#schema, matches)) {
       batch.conflicts();
       batch.rejections();
       batch.outcomes();
@@ -5256,32 +5278,39 @@ export class SyncClient {
       this.#rejections = this.#rejections.filter(
         (record) => record.clientCommitId !== commit.clientCommitId,
       );
-      for (const op of commit.operations) batch.table(op.table);
+      for (const op of commit.operations) {
+        batch.table(op.table);
+        scope.push(JSON.stringify([op.table, op.rowId]));
+      }
     }
+    return scope;
   }
 
-  #replayOutbox(rowKeys?: readonly string[]): void {
-    const acknowledged = failedOverlayCommits(this.#db, true, rowKeys);
-    const pending = [
-      ...failedOverlayCommits(this.#db, false, rowKeys),
-      ...listOutbox(this.#db, rowKeys),
-    ].sort((a, b) => a.createdAtMs - b.createdAtMs || a.seq - b.seq);
-    if (pending.length === 0 && acknowledged.length === 0) return;
+  #replayOutbox(scope?: OverlayScope, restoreBases = true): void {
+    if (scope?.length === 0) return;
     this.#applyBatch((batch) => {
-      this.#db.transaction(() => {
-        restoreFailedBases(this.#db, this.#schema, false, rowKeys);
-        restoreFailedBases(this.#db, this.#schema, true, rowKeys);
-        for (const commit of [...acknowledged, ...pending])
-          this.#applyOperationsLocally(
-            rowKeys === undefined
-              ? commit.operations
-              : commit.operations.filter((op) =>
-                  rowKeys.includes(JSON.stringify([op.table, op.rowId])),
-                ),
-            batch,
-            true,
-          );
-      });
+      if (restoreBases) restoreFailedBases(this.#db, this.#schema, scope);
+      const acknowledged = failedOverlayCommits(
+        this.#db,
+        true,
+        scope,
+        this.#schema,
+      );
+      const pending = [
+        ...failedOverlayCommits(this.#db, false, scope, this.#schema),
+        ...listOutbox(this.#db, scope),
+      ].sort((a, b) => a.createdAtMs - b.createdAtMs || a.seq - b.seq);
+      for (const commit of [...acknowledged, ...pending])
+        this.#applyOperationsLocally(
+          commit.operations.filter(
+            (op) =>
+              scope === undefined ||
+              scope.includes(JSON.stringify([op.table, op.rowId])) ||
+              scope.includes(JSON.stringify([op.table])),
+          ),
+          batch,
+          true,
+        );
     });
   }
 

package/src/failed-overlay.ts

@@ -1,3 +1,6 @@
+import { hasUniqueIndex } from './schema';
+import { OUTCOMES_TABLE } from './outcomes';
+import { OUTBOX_TABLE } from './outbox';
 export const RETAINED_ROWS = '_syncular_failed_rows';
 import { ClientSyncError } from './errors';
 import type { ClientDatabase } from './database';
@@ -48,7 +51,7 @@ export function retainedBaseWrite(
     table.name,
     rowId,
   ]);
-  if (!table.indexes.some((index) => index.unique)) return;
+  if (!hasUniqueIndex(table)) return;
   for (const retained of db.query(
     `SELECT commit_id,idx,intent,unique_conflicts FROM ${RETAINED_ROWS} WHERE tbl=? AND commit_seq IS NULL`,
     [table.name],
@@ -164,90 +167,51 @@ export function uniqueConflicts(
     );
 }
 
-function retainedRows(db: ClientDatabase, rowKeys?: readonly string[]) {
+/** Exact row keys are JSON [table,id]; table scopes include unique-key peers. */
+export type OverlayScope = readonly string[];
+
+export function overlayScopePredicate(table: string, id: string): string {
+  return `?1 IS NULL OR json_array(${table},${id}) IN(SELECT value FROM json_each(?1)) OR json_array(${table}) IN(SELECT value FROM json_each(?1))`;
+}
+
+function retainedRows(
+  db: ClientDatabase,
+  scope?: OverlayScope,
+  acknowledged?: boolean,
+) {
   return db.query(
-    `SELECT * FROM ${RETAINED_ROWS} WHERE ?1 IS NULL OR json_array(tbl,id) IN(SELECT value FROM json_each(?1)) ORDER BY commit_seq,at,commit_id,idx`,
-    [rowKeys ? JSON.stringify(rowKeys) : null],
+    `SELECT * FROM ${RETAINED_ROWS} WHERE (${overlayScopePredicate('tbl', 'id')})${acknowledged === undefined ? '' : ` AND commit_seq IS${acknowledged ? ' NOT' : ''} NULL`} ORDER BY commit_seq,at,commit_id,idx`,
+    [scope ? JSON.stringify(scope) : null],
   );
 }
 
+function retainedTable(
+  schema: CompiledClientSchema,
+  name: string,
+): CompiledClientTable {
+  const table = schema.tables.get(name);
+  if (!table)
+    throw new ClientSyncError(
+      'sync.unknown_table',
+      'retained table is unknown',
+    );
+  return table;
+}
+
 export function restoreFailedBases(
   db: ClientDatabase,
   schema: CompiledClientSchema,
-  absentIntent = false,
-  rowKeys?: readonly string[],
+  scope?: OverlayScope,
 ): boolean {
   const seen = new Set<string>();
-  for (const row of retainedRows(db, rowKeys)) {
+  for (const row of retainedRows(db, scope)) {
     const key = JSON.stringify([row.tbl, row.id]);
-    if (!absentIntent && seen.has(key)) continue;
+    if (seen.has(key)) continue;
     seen.add(key);
-    const table = schema.tables.get(row.tbl as string);
-    if (!table)
-      throw new ClientSyncError(
-        'sync.unknown_table',
-        'retained table is unknown',
-      );
-    const json = absentIntent ? row.intent : row.base;
-    if (absentIntent && row.intent !== null) {
-      const values: Record<string, JsonRowValue> = JSON.parse(
-        row.intent as string,
-      );
-      const conflicts = uniqueConflicts(
-        db,
-        table,
-        mapRowValues(values, jsonToRowValue),
-      );
-      // Hydrate a pre-0.30.11 failure after its winner was already imported.
-      // Pending and retained overlays cannot supply authoritative row evidence.
-      if (row.commit_seq === null && row.unique_conflicts === null) {
-        const authorized = conflicts.filter(
-          (conflict) =>
-            conflict.serverVersion >= 0 &&
-            !db.query(
-              `SELECT 1 FROM ${RETAINED_ROWS} WHERE tbl=? AND id=? UNION ALL SELECT 1 FROM _syncular_outbox,json_each(operations)WHERE json_extract(json_each.value,'$.table')=? AND json_extract(json_each.value,'$.rowId')=? LIMIT 1`,
-              [table.name, conflict.rowId, table.name, conflict.rowId],
-            ).length,
-        );
-        if (authorized.length)
-          db.exec(
-            `UPDATE ${RETAINED_ROWS} SET unique_conflicts=? WHERE commit_id=? AND idx=?`,
-            [
-              JSON.stringify(
-                authorized.map((conflict) => ({
-                  ...conflict,
-                  serverRow: mapRowValues(conflict.serverRow, rowValueToJson),
-                })),
-              ),
-              row.commit_id as string,
-              row.idx as number,
-            ],
-          );
-      }
-      if (conflicts.length) continue;
-    }
-    if (
-      absentIntent &&
-      (json === null ||
-        db.query(
-          `SELECT 1 FROM ${quoteIdent(table.name)} WHERE ${quoteIdent(table.primaryKey)}=?`,
-          [row.id as string],
-        ).length)
-    )
-      continue;
-    if (json === null) deleteLocalRow(db, table, row.id as string, false);
+    const table = retainedTable(schema, row.tbl as string);
+    if (row.base === null) deleteLocalRow(db, table, row.id as string, false);
     else {
-      const values: Record<string, JsonRowValue> = JSON.parse(String(json));
-      if (absentIntent) {
-        const operation: OutboxOperation = JSON.parse(row.op as string);
-        if (
-          row.commit_seq === null &&
-          !table.columns.every((column) =>
-            Object.hasOwn(operation.values ?? {}, column.name),
-          )
-        )
-          continue;
-      }
+      const values: Record<string, JsonRowValue> = JSON.parse(String(row.base));
       upsertLocalRow(
         db,
         table,
@@ -265,7 +229,8 @@ export function restoreFailedBases(
 export function failedOverlayCommits(
   db: ClientDatabase,
   acknowledged = false,
-  rowKeys?: readonly string[],
+  scope?: OverlayScope,
+  schema?: CompiledClientSchema,
 ): OutboxCommit[] {
   const commits = new Map<
     string,
@@ -276,10 +241,55 @@ export function failedOverlayCommits(
       operations: OutboxOperation[];
     }
   >();
-  for (const row of retainedRows(db, rowKeys)) {
-    if ((row.commit_seq !== null) !== acknowledged) continue;
+  for (const row of retainedRows(db, scope, acknowledged)) {
     const id = row.commit_id as string;
-    const operation: OutboxOperation = JSON.parse(row.op as string);
+    let operation: OutboxOperation = JSON.parse(row.op as string);
+    if (schema && operation.op === 'upsert') {
+      const table = retainedTable(schema, operation.table);
+      if (acknowledged) {
+        if (
+          !db.query(
+            `SELECT 1 FROM ${quoteIdent(table.name)} WHERE ${quoteIdent(table.primaryKey)}=?`,
+            [operation.rowId],
+          ).length
+        )
+          operation = {
+            ...operation,
+            values: JSON.parse(row.intent as string),
+          };
+      } else if (row.unique_conflicts === null && row.intent !== null) {
+        // Hydrate legacy failure evidence from authoritative unique-key peers.
+        const values: Record<string, JsonRowValue> = JSON.parse(
+          row.intent as string,
+        );
+        const authorized = uniqueConflicts(
+          db,
+          table,
+          mapRowValues(values, jsonToRowValue),
+        ).filter(
+          (conflict) =>
+            conflict.serverVersion >= 0 &&
+            !db.query(
+              `SELECT 1 FROM ${RETAINED_ROWS} WHERE tbl=? AND id=? UNION ALL SELECT 1 FROM ${OUTBOX_TABLE},json_each(operations)WHERE json_extract(json_each.value,'$.table')=? AND json_extract(json_each.value,'$.rowId')=? LIMIT 1`,
+              [table.name, conflict.rowId, table.name, conflict.rowId],
+            ).length,
+        );
+        if (authorized.length)
+          db.exec(
+            `UPDATE ${RETAINED_ROWS} SET unique_conflicts=? WHERE commit_id=? AND idx=?`,
+            [
+              JSON.stringify(
+                authorized.map((conflict) => ({
+                  ...conflict,
+                  serverRow: mapRowValues(conflict.serverRow, rowValueToJson),
+                })),
+              ),
+              row.commit_id as string,
+              row.idx as number,
+            ],
+          );
+      }
+    }
     const prior = commits.get(id);
     if (prior) prior.operations.push(operation);
     else
@@ -295,6 +305,7 @@ export function failedOverlayCommits(
 
 export function dropFailedRows(
   db: ClientDatabase,
+  schema: CompiledClientSchema,
   matches: (
     table: string,
     values: Readonly<Record<string, JsonRowValue>>,
@@ -312,10 +323,17 @@ export function dropFailedRows(
     ...failedOverlayCommits(db),
     ...failedOverlayCommits(db, true),
   ].filter((commit) => ids.has(commit.clientCommitId));
+  restoreFailedBases(
+    db,
+    schema,
+    dropped.flatMap((commit) =>
+      commit.operations.map((op) => JSON.stringify([op.table, op.rowId])),
+    ),
+  );
   for (const id of ids) {
     db.exec(`DELETE FROM ${RETAINED_ROWS} WHERE commit_id=?`, [id]);
     db.exec(
-      "UPDATE _syncular_commit_outcomes SET operations=NULL,results='[]' WHERE client_commit_id=?",
+      `UPDATE ${OUTCOMES_TABLE} SET operations=NULL,results='[]' WHERE client_commit_id=?`,
       [id],
     );
   }

package/src/outbox.ts

@@ -1,3 +1,7 @@
+import { BLOB_COMMIT_REFS } from './blob';
+export const OUTBOX_TABLE = '_syncular_outbox';
+export const OUTBOX_IMAGES = '_syncular_outbox_before_images';
+import { overlayScopePredicate, type OverlayScope } from './failed-overlay';
 /**
  * The durable outbox (SPEC.md §7.1) with encode-at-send (the §0 binary-push
  * outbox rule): local mutations are persisted in a schema-agnostic JSON
@@ -68,7 +72,7 @@ export function appendOutboxCommit(
     );
   }
   db.exec(
-    'INSERT INTO _syncular_outbox(client_commit_id,created_at_ms,operations)VALUES(?,?,?)',
+    `INSERT INTO ${OUTBOX_TABLE}(client_commit_id,created_at_ms,operations)VALUES(?,?,?)`,
     [clientCommitId, nowMs, JSON.stringify(operations)],
   );
   replaceOutboxBeforeImages(db, clientCommitId, beforeImages);
@@ -77,14 +81,14 @@ export function appendOutboxCommit(
 /** Pending commits in FIFO creation order (§7.1). Full reads serve replay and the public listing. */
 export function listOutbox(
   db: ClientDatabase,
-  rowKeys?: readonly string[],
+  scope?: OverlayScope,
 ): OutboxCommit[] {
   return db
     .query(
-      rowKeys === undefined
-        ? 'SELECT seq, client_commit_id, created_at_ms, operations FROM _syncular_outbox ORDER BY seq ASC'
-        : "SELECT * FROM _syncular_outbox WHERE EXISTS(SELECT 1 FROM json_each(operations) WHERE json_array(json_extract(value,'$.table'),json_extract(value,'$.rowId')) IN(SELECT value FROM json_each(?))) ORDER BY seq",
-      rowKeys && [JSON.stringify(rowKeys)],
+      scope === undefined
+        ? `SELECT * FROM ${OUTBOX_TABLE} ORDER BY seq ASC`
+        : `SELECT * FROM ${OUTBOX_TABLE} WHERE EXISTS(SELECT 1 FROM json_each(operations) WHERE ${overlayScopePredicate("json_extract(value,'$.table')", "json_extract(value,'$.rowId')")}) ORDER BY seq`,
+      scope && [JSON.stringify(scope)],
     )
     .map(decodeOutboxRow);
 }
@@ -106,7 +110,7 @@ export function* iterateOutbox(
   let afterSeq = 0;
   while (afterSeq < throughSeq) {
     const rows = db.query(
-      'SELECT seq, client_commit_id, created_at_ms, operations FROM _syncular_outbox WHERE seq > ? AND seq <= ? ORDER BY seq ASC LIMIT 32',
+      `SELECT * FROM ${OUTBOX_TABLE} WHERE seq > ? AND seq <= ? ORDER BY seq ASC LIMIT 32`,
       [afterSeq, throughSeq],
     );
     if (rows.length === 0) return;
@@ -120,7 +124,7 @@ export function* iterateOutbox(
 
 /** Routine status reads never load operation bodies. */
 export function countOutbox(db: ClientDatabase): number {
-  return db.query('SELECT COUNT(*)AS count FROM _syncular_outbox')[0]!
+  return db.query(`SELECT COUNT(*)AS count FROM ${OUTBOX_TABLE}`)[0]!
     .count as number;
 }
 
@@ -128,14 +132,13 @@ export function deleteOutboxCommit(
   db: ClientDatabase,
   clientCommitId: string,
 ): void {
-  db.exec('DELETE FROM _syncular_blob_commit_refs WHERE commit_id=?', [
+  db.exec(`DELETE FROM ${BLOB_COMMIT_REFS} WHERE commit_id=?`, [
     clientCommitId,
   ]);
-  db.exec(
-    'DELETE FROM _syncular_outbox_before_images WHERE client_commit_id=?',
-    [clientCommitId],
-  );
-  db.exec('DELETE FROM _syncular_outbox WHERE client_commit_id=?', [
+  db.exec(`DELETE FROM ${OUTBOX_IMAGES} WHERE client_commit_id=?`, [
+    clientCommitId,
+  ]);
+  db.exec(`DELETE FROM ${OUTBOX_TABLE} WHERE client_commit_id=?`, [
     clientCommitId,
   ]);
 }
@@ -146,7 +149,7 @@ export function listOutboxBeforeImages(
 ): OutboxBeforeImage[] {
   return db
     .query(
-      'SELECT op_index,existed,sync_version,values_json,delivery_seq FROM _syncular_outbox_before_images WHERE client_commit_id=? ORDER BY op_index',
+      `SELECT op_index,existed,sync_version,values_json,delivery_seq FROM ${OUTBOX_IMAGES} WHERE client_commit_id=? ORDER BY op_index`,
       [clientCommitId],
     )
     .map((row) => ({
@@ -175,7 +178,7 @@ export function replaceOutboxBeforeImages(
 ): void {
   for (const image of replacements) {
     db.exec(
-      'INSERT INTO _syncular_outbox_before_images(client_commit_id,op_index,existed,sync_version,values_json)VALUES(?,?,?,?,?) ON CONFLICT(client_commit_id,op_index)DO UPDATE SET existed=excluded.existed,sync_version=excluded.sync_version,values_json=excluded.values_json',
+      `INSERT INTO ${OUTBOX_IMAGES}(client_commit_id,op_index,existed,sync_version,values_json)VALUES(?,?,?,?,?) ON CONFLICT(client_commit_id,op_index)DO UPDATE SET existed=excluded.existed,sync_version=excluded.sync_version,values_json=excluded.values_json`,
       [
         clientCommitId,
         image.opIndex,

package/src/outcomes.ts

@@ -1,3 +1,5 @@
+export const OUTCOMES_TABLE = '_syncular_commit_outcomes';
+const SELECT_OUTCOME = `SELECT * FROM ${OUTCOMES_TABLE}`;
 import { RETAINED_ROWS } from './failed-overlay';
 /**
  * Durable per-client commit outcomes.
@@ -233,7 +235,7 @@ export function recordCommitOutcome(
   outcome: Omit<CommitOutcome, 'sequence' | 'resolution'>,
 ): CommitOutcome {
   db.exec(
-    "INSERT INTO _syncular_commit_outcomes(client_commit_id,status,recorded_at_ms,results,operations,resolution)VALUES(?,?,?,?,?,'active')",
+    `INSERT INTO ${OUTCOMES_TABLE}(client_commit_id,status,recorded_at_ms,results,operations,resolution)VALUES(?,?,?,?,?,'active')`,
     [
       outcome.clientCommitId,
       outcome.status,
@@ -251,10 +253,9 @@ export function commitOutcome(
   db: ClientDatabase,
   clientCommitId: string,
 ): CommitOutcome | undefined {
-  const row = db.query(
-    'SELECT seq,client_commit_id,status,recorded_at_ms,results,operations,resolution,resolved_at_ms,replacement_client_commit_id FROM _syncular_commit_outcomes WHERE client_commit_id=?',
-    [clientCommitId],
-  )[0];
+  const row = db.query(`${SELECT_OUTCOME} WHERE client_commit_id=?`, [
+    clientCommitId,
+  ])[0];
   return row === undefined ? undefined : parseOutcome(db, row);
 }
 
@@ -273,7 +274,7 @@ export function listCommitOutcomes(
     ? "WHERE resolution = 'active' AND status IN ('conflict', 'rejected')"
     : '';
   const rows = db.query(
-    `SELECT seq,client_commit_id,status,recorded_at_ms,results,operations,resolution,resolved_at_ms,replacement_client_commit_id FROM _syncular_commit_outcomes ${where} ORDER BY seq DESC${limit === undefined ? '' : ' LIMIT ?'}`,
+    `${SELECT_OUTCOME} ${where} ORDER BY seq DESC${limit === undefined ? '' : ' LIMIT ?'}`,
     limit === undefined ? [] : [limit],
   );
   return rows.map((row) => parseOutcome(db, row));
@@ -285,7 +286,7 @@ export function persistCommitOutcomeResolution(
   nowMs: number,
 ): CommitOutcome | undefined {
   db.exec(
-    "UPDATE _syncular_commit_outcomes SET resolution=?,resolved_at_ms=?,replacement_client_commit_id=? WHERE client_commit_id=? AND resolution='active'",
+    `UPDATE ${OUTCOMES_TABLE} SET resolution=?,resolved_at_ms=?,replacement_client_commit_id=? WHERE client_commit_id=? AND resolution='active'`,
     [
       input.resolution,
       nowMs,
@@ -310,17 +311,16 @@ export function pruneCommitOutcomes(
       'outcome retention maxEntries must be a positive safe integer',
     );
   }
-  const count = db.query(
-    'SELECT COUNT(*) AS count FROM _syncular_commit_outcomes',
-  )[0]?.count as number | undefined;
+  const count = db.query(`SELECT COUNT(*) AS count FROM ${OUTCOMES_TABLE}`)[0]
+    ?.count as number | undefined;
   const excess = Math.max(0, (count ?? 0) - maxEntries);
   if (excess === 0) return 0;
   const candidates = db.query(
-    "SELECT seq FROM _syncular_commit_outcomes WHERE status IN('applied','cached')OR resolution !='active' ORDER BY seq ASC LIMIT ?",
+    `SELECT seq FROM ${OUTCOMES_TABLE} WHERE status IN('applied','cached')OR resolution !='active' ORDER BY seq ASC LIMIT ?`,
     [excess],
   );
   for (const candidate of candidates) {
-    db.exec('DELETE FROM _syncular_commit_outcomes WHERE seq=?', [
+    db.exec(`DELETE FROM ${OUTCOMES_TABLE} WHERE seq=?`, [
       candidate.seq as number,
     ]);
   }