@tearleads/client-sdk 0.0.0-stage → 0.1.13

package/data/persistence/container-contents/containerMetadataRows.js

@@ -0,0 +1,160 @@
+import { base64ToBytes } from "../../../internal/encoding/index.js";
+import { getImportBlobMetadata } from "../../../internal/loro/index.js";
+import { and, eq } from "drizzle-orm";
+import { serializeDocumentSyncPullContinuation } from "../../documents/shared/pullContinuation.js";
+import { documentRecordSelection, mapSelectedDocumentRecord, } from "../../sqlite/documentPersistence.js";
+import { documentHistoryCheckpoints, documents } from "../../sqlite/schema.js";
+import { getClientSQLitePersistenceRuntime, } from "../../sqlite/sqlitePersistenceRuntime.js";
+import { saveContainerRows, } from "../containers/containerPersistence.js";
+import { saveContainerCreateIntent } from "./containerIntentPersistence.js";
+import { saveContainerMoveIntent } from "./containerMoveIntentRows.js";
+import { CONTAINER_METADATA_APP_KIND, clearDormantContainerMetadataInTransaction, } from "./dormantContainerMetadata.js";
+export function getContainerMetadataScope(containerId) {
+    return {
+        appKind: CONTAINER_METADATA_APP_KIND,
+        localId: containerId,
+    };
+}
+// The metadata document's content frontier, derived from its full updates
+// export. Empty or undecodable blobs read as "never hydrated".
+function deriveMetadataEndVersion(metadataUpdates) {
+    if (metadataUpdates.length === 0) {
+        return "";
+    }
+    try {
+        return getImportBlobMetadata(base64ToBytes(metadataUpdates))
+            .partialEndVersionVector;
+    }
+    catch {
+        return "";
+    }
+}
+async function saveContainerMetadataRecord(input) {
+    const { containerId, record, tx, updatedAt } = input;
+    const snapshotEndVersion = deriveMetadataEndVersion(record.metadataUpdates);
+    const nextRow = {
+        appKind: CONTAINER_METADATA_APP_KIND,
+        localId: containerId,
+        documentId: record.documentId,
+        snapshotEndVersion,
+        accessEpoch: record.accessEpoch,
+        accessStateHash: record.accessStateHash ?? null,
+        lastCommitLsn: record.lastCommitLsn ?? null,
+        documentManifestBundle: record.documentManifestBundle ?? null,
+        contentKeyBundle: record.contentKeyBundle ?? null,
+        documentKekTargets: record.documentKekTargets ?? null,
+        ...(record.pullContinuationRecoveryRequired === true &&
+            record.pullContinuation === undefined
+            ? {}
+            : {
+                pullContinuation: serializeDocumentSyncPullContinuation(record.pullContinuation ?? null),
+            }),
+        updatedAt,
+    };
+    await tx
+        .insert(documents)
+        .values(nextRow)
+        .onConflictDoUpdate({
+        target: [documents.appKind, documents.localId],
+        set: nextRow,
+    })
+        .run();
+    // The metadata document's content lives in the shared history-checkpoint
+    // table, like every other document kind. The whole updates export IS the
+    // checkpoint: metadata documents are tiny registries, so no tail/compaction
+    // machinery is needed, and the row replaces atomically with the record.
+    const checkpointRow = {
+        appKind: CONTAINER_METADATA_APP_KIND,
+        localId: containerId,
+        snapshot: record.metadataUpdates,
+        endVersionVector: snapshotEndVersion,
+        revision: updatedAt,
+        updatedAt,
+    };
+    await tx
+        .insert(documentHistoryCheckpoints)
+        .values(checkpointRow)
+        .onConflictDoUpdate({
+        target: [
+            documentHistoryCheckpoints.appKind,
+            documentHistoryCheckpoints.localId,
+        ],
+        set: checkpointRow,
+    })
+        .run();
+}
+export async function saveContainerContentsContainerRows(input) {
+    const { container, createIntent, moveIntent, localUpdatedAt, record, serverTimestamps, tx, } = input;
+    const nextContainer = {
+        ...container,
+        ...(serverTimestamps
+            ? {
+                serverCreatedAt: serverTimestamps.createdAt ?? container.serverCreatedAt ?? null,
+                serverUpdatedAt: serverTimestamps.updatedAt ?? container.serverUpdatedAt ?? null,
+            }
+            : {}),
+    };
+    const savedContainer = await saveContainerRows({
+        record: nextContainer,
+        tx,
+        localUpdatedAt,
+    });
+    await clearDormantContainerMetadataInTransaction(tx, [container.id]);
+    if (record) {
+        await saveContainerMetadataRecord({
+            containerId: container.id,
+            record: {
+                ...record,
+                id: container.id,
+            },
+            tx,
+            updatedAt: localUpdatedAt,
+        });
+    }
+    if (createIntent) {
+        await saveContainerCreateIntent({
+            containerId: container.id,
+            createIntent,
+            tx,
+            updatedAt: localUpdatedAt,
+        });
+    }
+    if (moveIntent) {
+        await saveContainerMoveIntent({
+            containerId: container.id,
+            moveIntent,
+            tx,
+            updatedAt: localUpdatedAt,
+        });
+    }
+    return savedContainer;
+}
+/**
+ * ONE joined statement, so the record's key/access fields and the checkpoint
+ * content it pairs with come from a single consistent read — two separate
+ * queries could interleave with a concurrent metadata save (record +
+ * checkpoint written in one transaction) and pair stale keying state with
+ * newer content.
+ */
+export async function selectContainerMetadataRecord(execSql, containerId) {
+    const { db } = getClientSQLitePersistenceRuntime(execSql);
+    const rows = await db
+        .select({
+        ...documentRecordSelection,
+        metadataUpdates: documentHistoryCheckpoints.snapshot,
+    })
+        .from(documents)
+        .leftJoin(documentHistoryCheckpoints, and(eq(documentHistoryCheckpoints.appKind, CONTAINER_METADATA_APP_KIND), eq(documentHistoryCheckpoints.localId, documents.localId)))
+        .where(and(eq(documents.appKind, CONTAINER_METADATA_APP_KIND), eq(documents.localId, containerId)))
+        .limit(1);
+    const row = rows[0];
+    if (!row) {
+        return null;
+    }
+    const { metadataUpdates, ...recordRow } = row;
+    return {
+        ...mapSelectedDocumentRecord(recordRow),
+        metadataUpdates: metadataUpdates ?? "",
+    };
+}
+//# sourceMappingURL=containerMetadataRows.js.map

package/data/persistence/container-contents/containerMetadataRows.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"containerMetadataRows.js","sourceRoot":"","sources":["containerMetadataRows.ts"],"names":[],"mappings":"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","sourcesContent":["import { base64ToBytes } from \"@tearleads/encoding\";\nimport { getImportBlobMetadata } from \"@tearleads/loro\";\nimport { and, eq } from \"drizzle-orm\";\nimport { serializeDocumentSyncPullContinuation } from \"../../documents/shared/pullContinuation\";\nimport {\n  documentRecordSelection,\n  mapSelectedDocumentRecord,\n} from \"../../sqlite/documentPersistence\";\nimport { documentHistoryCheckpoints, documents } from \"../../sqlite/schema\";\nimport {\n  type ClientSQLiteTransactionScope,\n  getClientSQLitePersistenceRuntime,\n} from \"../../sqlite/sqlitePersistenceRuntime\";\nimport type { ExecSql } from \"../../sqlite/sqlSchema\";\nimport {\n  type ContainerRecord,\n  saveContainerRows,\n} from \"../containers/containerPersistence\";\nimport type {\n  ContainerCreateIntentInput,\n  ContainerMetadataRecord,\n  ContainerMoveIntentInput,\n} from \"./containerContentsPersistenceTypes\";\nimport { saveContainerCreateIntent } from \"./containerIntentPersistence\";\nimport { saveContainerMoveIntent } from \"./containerMoveIntentRows\";\nimport {\n  CONTAINER_METADATA_APP_KIND,\n  clearDormantContainerMetadataInTransaction,\n} from \"./dormantContainerMetadata\";\n\nexport function getContainerMetadataScope(containerId: string) {\n  return {\n    appKind: CONTAINER_METADATA_APP_KIND,\n    localId: containerId,\n  };\n}\n\n// The metadata document's content frontier, derived from its full updates\n// export. Empty or undecodable blobs read as \"never hydrated\".\nfunction deriveMetadataEndVersion(metadataUpdates: string): string {\n  if (metadataUpdates.length === 0) {\n    return \"\";\n  }\n\n  try {\n    return getImportBlobMetadata(base64ToBytes(metadataUpdates))\n      .partialEndVersionVector;\n  } catch {\n    return \"\";\n  }\n}\n\nasync function saveContainerMetadataRecord(input: {\n  containerId: string;\n  record: ContainerMetadataRecord;\n  tx: ClientSQLiteTransactionScope;\n  updatedAt: string;\n}) {\n  const { containerId, record, tx, updatedAt } = input;\n  const snapshotEndVersion = deriveMetadataEndVersion(record.metadataUpdates);\n  const nextRow = {\n    appKind: CONTAINER_METADATA_APP_KIND,\n    localId: containerId,\n    documentId: record.documentId,\n    snapshotEndVersion,\n    accessEpoch: record.accessEpoch,\n    accessStateHash: record.accessStateHash ?? null,\n    lastCommitLsn: record.lastCommitLsn ?? null,\n    documentManifestBundle: record.documentManifestBundle ?? null,\n    contentKeyBundle: record.contentKeyBundle ?? null,\n    documentKekTargets: record.documentKekTargets ?? null,\n    ...(record.pullContinuationRecoveryRequired === true &&\n    record.pullContinuation === undefined\n      ? {}\n      : {\n          pullContinuation: serializeDocumentSyncPullContinuation(\n            record.pullContinuation ?? null,\n          ),\n        }),\n    updatedAt,\n  };\n\n  await tx\n    .insert(documents)\n    .values(nextRow)\n    .onConflictDoUpdate({\n      target: [documents.appKind, documents.localId],\n      set: nextRow,\n    })\n    .run();\n\n  // The metadata document's content lives in the shared history-checkpoint\n  // table, like every other document kind. The whole updates export IS the\n  // checkpoint: metadata documents are tiny registries, so no tail/compaction\n  // machinery is needed, and the row replaces atomically with the record.\n  const checkpointRow = {\n    appKind: CONTAINER_METADATA_APP_KIND,\n    localId: containerId,\n    snapshot: record.metadataUpdates,\n    endVersionVector: snapshotEndVersion,\n    revision: updatedAt,\n    updatedAt,\n  };\n  await tx\n    .insert(documentHistoryCheckpoints)\n    .values(checkpointRow)\n    .onConflictDoUpdate({\n      target: [\n        documentHistoryCheckpoints.appKind,\n        documentHistoryCheckpoints.localId,\n      ],\n      set: checkpointRow,\n    })\n    .run();\n}\n\nexport async function saveContainerContentsContainerRows(input: {\n  container: ContainerRecord;\n  createIntent?: ContainerCreateIntentInput | undefined;\n  moveIntent?: ContainerMoveIntentInput | undefined;\n  record: ContainerMetadataRecord | null;\n  tx: ClientSQLiteTransactionScope;\n  localUpdatedAt: string;\n  serverTimestamps?:\n    | {\n        createdAt?: string | null;\n        updatedAt?: string | null;\n      }\n    | undefined;\n}): Promise<ContainerRecord> {\n  const {\n    container,\n    createIntent,\n    moveIntent,\n    localUpdatedAt,\n    record,\n    serverTimestamps,\n    tx,\n  } = input;\n  const nextContainer = {\n    ...container,\n    ...(serverTimestamps\n      ? {\n          serverCreatedAt:\n            serverTimestamps.createdAt ?? container.serverCreatedAt ?? null,\n          serverUpdatedAt:\n            serverTimestamps.updatedAt ?? container.serverUpdatedAt ?? null,\n        }\n      : {}),\n  };\n\n  const savedContainer = await saveContainerRows({\n    record: nextContainer,\n    tx,\n    localUpdatedAt,\n  });\n  await clearDormantContainerMetadataInTransaction(tx, [container.id]);\n\n  if (record) {\n    await saveContainerMetadataRecord({\n      containerId: container.id,\n      record: {\n        ...record,\n        id: container.id,\n      },\n      tx,\n      updatedAt: localUpdatedAt,\n    });\n  }\n\n  if (createIntent) {\n    await saveContainerCreateIntent({\n      containerId: container.id,\n      createIntent,\n      tx,\n      updatedAt: localUpdatedAt,\n    });\n  }\n\n  if (moveIntent) {\n    await saveContainerMoveIntent({\n      containerId: container.id,\n      moveIntent,\n      tx,\n      updatedAt: localUpdatedAt,\n    });\n  }\n\n  return savedContainer;\n}\n\n/**\n * ONE joined statement, so the record's key/access fields and the checkpoint\n * content it pairs with come from a single consistent read — two separate\n * queries could interleave with a concurrent metadata save (record +\n * checkpoint written in one transaction) and pair stale keying state with\n * newer content.\n */\nexport async function selectContainerMetadataRecord(\n  execSql: ExecSql,\n  containerId: string,\n): Promise<ContainerMetadataRecord | null> {\n  const { db } = getClientSQLitePersistenceRuntime(execSql);\n  const rows = await db\n    .select({\n      ...documentRecordSelection,\n      metadataUpdates: documentHistoryCheckpoints.snapshot,\n    })\n    .from(documents)\n    .leftJoin(\n      documentHistoryCheckpoints,\n      and(\n        eq(documentHistoryCheckpoints.appKind, CONTAINER_METADATA_APP_KIND),\n        eq(documentHistoryCheckpoints.localId, documents.localId),\n      ),\n    )\n    .where(\n      and(\n        eq(documents.appKind, CONTAINER_METADATA_APP_KIND),\n        eq(documents.localId, containerId),\n      ),\n    )\n    .limit(1);\n  const row = rows[0];\n  if (!row) {\n    return null;\n  }\n  const { metadataUpdates, ...recordRow } = row;\n  return {\n    ...mapSelectedDocumentRecord(recordRow),\n    metadataUpdates: metadataUpdates ?? \"\",\n  };\n}\n"]}

package/data/persistence/container-contents/containerMoveAbandonPersistence.js

@@ -0,0 +1,29 @@
+import { eq } from "drizzle-orm";
+import { containerProjection, containers } from "../../sqlite/schema.js";
+import { getClientSQLitePersistenceRuntime } from "../../sqlite/sqlitePersistenceRuntime.js";
+import { deleteContainerMoveIntentRevision } from "./containerIntentPersistence.js";
+/**
+ * Drop a queued move the server will never accept and put the folder back
+ * under the parent it left, atomically. The server row never changed, so no
+ * listing would ever restore the placement. Returns false, changing nothing,
+ * when a newer local move superseded the revision.
+ */
+export async function abandonStoredMoveIntentRevision(execSql, input) {
+    const outcome = await getClientSQLitePersistenceRuntime(execSql).guardedTransaction(async (tx) => {
+        if (!(await deleteContainerMoveIntentRevision({ ...input, tx })))
+            return false;
+        await tx
+            .update(containers)
+            .set({ parentId: input.previousParentContainerId })
+            .where(eq(containers.id, input.containerId))
+            .run();
+        await tx
+            .update(containerProjection)
+            .set({ updatedAt: new Date().toISOString() })
+            .where(eq(containerProjection.containerId, input.containerId))
+            .run();
+        return true;
+    }, input.stillCurrent, { behavior: "immediate" });
+    return outcome.committed && outcome.result === true;
+}
+//# sourceMappingURL=containerMoveAbandonPersistence.js.map

package/data/persistence/container-contents/containerMoveAbandonPersistence.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"containerMoveAbandonPersistence.js","sourceRoot":"","sources":["containerMoveAbandonPersistence.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,iCAAiC,EAAE,MAAM,uCAAuC,CAAC;AAG1F,OAAO,EAAE,iCAAiC,EAAE,MAAM,8BAA8B,CAAC;AAEjF;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,+BAA+B,CACnD,OAAgB,EAChB,KAEC;IAED,MAAM,OAAO,GAAG,MAAM,iCAAiC,CACrD,OAAO,CACR,CAAC,kBAAkB,CAClB,KAAK,EAAE,EAAE,EAAE,EAAE;QACX,IAAI,CAAC,CAAC,MAAM,iCAAiC,CAAC,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;YAC9D,OAAO,KAAK,CAAC;QACf,MAAM,EAAE;aACL,MAAM,CAAC,UAAU,CAAC;aAClB,GAAG,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,yBAAyB,EAAE,CAAC;aAClD,KAAK,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;aAC3C,GAAG,EAAE,CAAC;QACT,MAAM,EAAE;aACL,MAAM,CAAC,mBAAmB,CAAC;aAC3B,GAAG,CAAC,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC;aAC5C,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAAC,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;aAC7D,GAAG,EAAE,CAAC;QACT,OAAO,IAAI,CAAC;IACd,CAAC,EACD,KAAK,CAAC,YAAY,EAClB,EAAE,QAAQ,EAAE,WAAW,EAAE,CAC1B,CAAC;IACF,OAAO,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,MAAM,KAAK,IAAI,CAAC;AACtD,CAAC","sourcesContent":["import { eq } from \"drizzle-orm\";\nimport { containerProjection, containers } from \"../../sqlite/schema\";\nimport { getClientSQLitePersistenceRuntime } from \"../../sqlite/sqlitePersistenceRuntime\";\nimport type { ExecSql } from \"../../sqlite/sqlSchema\";\nimport type { ContainerMoveIntentRevisionInput } from \"./containerContentsPersistenceTypes\";\nimport { deleteContainerMoveIntentRevision } from \"./containerIntentPersistence\";\n\n/**\n * Drop a queued move the server will never accept and put the folder back\n * under the parent it left, atomically. The server row never changed, so no\n * listing would ever restore the placement. Returns false, changing nothing,\n * when a newer local move superseded the revision.\n */\nexport async function abandonStoredMoveIntentRevision(\n  execSql: ExecSql,\n  input: ContainerMoveIntentRevisionInput & {\n    previousParentContainerId: string;\n  },\n): Promise<boolean> {\n  const outcome = await getClientSQLitePersistenceRuntime(\n    execSql,\n  ).guardedTransaction(\n    async (tx) => {\n      if (!(await deleteContainerMoveIntentRevision({ ...input, tx })))\n        return false;\n      await tx\n        .update(containers)\n        .set({ parentId: input.previousParentContainerId })\n        .where(eq(containers.id, input.containerId))\n        .run();\n      await tx\n        .update(containerProjection)\n        .set({ updatedAt: new Date().toISOString() })\n        .where(eq(containerProjection.containerId, input.containerId))\n        .run();\n      return true;\n    },\n    input.stillCurrent,\n    { behavior: \"immediate\" },\n  );\n  return outcome.committed && outcome.result === true;\n}\n"]}

package/data/persistence/container-contents/containerMoveIntentRows.js

@@ -0,0 +1,37 @@
+import { sql } from "drizzle-orm";
+import { containerMoveIntents } from "../../sqlite/schema.js";
+import { CONTAINER_MOVE_INTENT_TYPE, } from "./containerContentsPersistenceTypes.js";
+export async function saveContainerMoveIntent(input) {
+    const { containerId, moveIntent, tx, updatedAt } = input;
+    const id = moveIntent.id ?? crypto.randomUUID();
+    await tx
+        .insert(containerMoveIntents)
+        .values({
+        id,
+        containerId,
+        parentContainerId: moveIntent.parentContainerId,
+        previousParentContainerId: moveIntent.previousParentContainerId ?? null,
+        intentType: CONTAINER_MOVE_INTENT_TYPE,
+        syncStatus: "pending",
+        lastError: null,
+        lastAttemptedAt: null,
+        createdAt: updatedAt,
+        updatedAt,
+    })
+        .onConflictDoUpdate({
+        target: containerMoveIntents.containerId,
+        set: {
+            // The timestamp can collide when two moves are queued in one clock
+            // tick, so every enqueue also owns a fresh revision token.
+            id,
+            parentContainerId: moveIntent.parentContainerId,
+            previousParentContainerId: sql `coalesce(${containerMoveIntents.previousParentContainerId}, ${moveIntent.previousParentContainerId ?? null})`,
+            intentType: CONTAINER_MOVE_INTENT_TYPE,
+            syncStatus: "pending",
+            lastError: null,
+            updatedAt,
+        },
+    })
+        .run();
+}
+//# sourceMappingURL=containerMoveIntentRows.js.map

package/data/persistence/container-contents/containerMoveIntentRows.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"containerMoveIntentRows.js","sourceRoot":"","sources":["containerMoveIntentRows.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAE3D,OAAO,EACL,0BAA0B,GAE3B,MAAM,qCAAqC,CAAC;AAE7C,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,KAK7C;IACC,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IACzD,MAAM,EAAE,GAAG,UAAU,CAAC,EAAE,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;IAChD,MAAM,EAAE;SACL,MAAM,CAAC,oBAAoB,CAAC;SAC5B,MAAM,CAAC;QACN,EAAE;QACF,WAAW;QACX,iBAAiB,EAAE,UAAU,CAAC,iBAAiB;QAC/C,yBAAyB,EAAE,UAAU,CAAC,yBAAyB,IAAI,IAAI;QACvE,UAAU,EAAE,0BAA0B;QACtC,UAAU,EAAE,SAAS;QACrB,SAAS,EAAE,IAAI;QACf,eAAe,EAAE,IAAI;QACrB,SAAS,EAAE,SAAS;QACpB,SAAS;KACV,CAAC;SACD,kBAAkB,CAAC;QAClB,MAAM,EAAE,oBAAoB,CAAC,WAAW;QACxC,GAAG,EAAE;YACH,mEAAmE;YACnE,2DAA2D;YAC3D,EAAE;YACF,iBAAiB,EAAE,UAAU,CAAC,iBAAiB;YAC/C,yBAAyB,EAAE,GAAG,CAAA,YAAY,oBAAoB,CAAC,yBAAyB,KAAK,UAAU,CAAC,yBAAyB,IAAI,IAAI,GAAG;YAC5I,UAAU,EAAE,0BAA0B;YACtC,UAAU,EAAE,SAAS;YACrB,SAAS,EAAE,IAAI;YACf,SAAS;SACV;KACF,CAAC;SACD,GAAG,EAAE,CAAC;AACX,CAAC","sourcesContent":["import { sql } from \"drizzle-orm\";\nimport { containerMoveIntents } from \"../../sqlite/schema\";\nimport type { ClientSQLiteTransactionScope } from \"../../sqlite/sqlitePersistenceRuntime\";\nimport {\n  CONTAINER_MOVE_INTENT_TYPE,\n  type ContainerMoveIntentInput,\n} from \"./containerContentsPersistenceTypes\";\n\nexport async function saveContainerMoveIntent(input: {\n  tx: ClientSQLiteTransactionScope;\n  containerId: string;\n  moveIntent: ContainerMoveIntentInput;\n  updatedAt: string;\n}) {\n  const { containerId, moveIntent, tx, updatedAt } = input;\n  const id = moveIntent.id ?? crypto.randomUUID();\n  await tx\n    .insert(containerMoveIntents)\n    .values({\n      id,\n      containerId,\n      parentContainerId: moveIntent.parentContainerId,\n      previousParentContainerId: moveIntent.previousParentContainerId ?? null,\n      intentType: CONTAINER_MOVE_INTENT_TYPE,\n      syncStatus: \"pending\",\n      lastError: null,\n      lastAttemptedAt: null,\n      createdAt: updatedAt,\n      updatedAt,\n    })\n    .onConflictDoUpdate({\n      target: containerMoveIntents.containerId,\n      set: {\n        // The timestamp can collide when two moves are queued in one clock\n        // tick, so every enqueue also owns a fresh revision token.\n        id,\n        parentContainerId: moveIntent.parentContainerId,\n        previousParentContainerId: sql`coalesce(${containerMoveIntents.previousParentContainerId}, ${moveIntent.previousParentContainerId ?? null})`,\n        intentType: CONTAINER_MOVE_INTENT_TYPE,\n        syncStatus: \"pending\",\n        lastError: null,\n        updatedAt,\n      },\n    })\n    .run();\n}\n"]}

package/data/persistence/container-contents/containerPendingUpdatePersistence.js

@@ -0,0 +1,57 @@
+import { and, asc, eq, inArray, isNotNull } from "drizzle-orm";
+import { deleteDocumentPendingUpdate, deleteDocumentPendingUpdates, enqueueDocumentPendingUpdate, listDocumentPendingUpdates, rekeyDocumentPendingUpdate, } from "../../sqlite/documentPersistence.js";
+import { documentPendingUpdates, documents } from "../../sqlite/schema.js";
+import { getClientSQLitePersistenceRuntime } from "../../sqlite/sqlitePersistenceRuntime.js";
+import { runSerializedSqlMutation } from "../../sqlite/sqlSchema.js";
+import { getContainerMetadataScope } from "./containerMetadataRows.js";
+import { CONTAINER_METADATA_APP_KIND } from "./dormantContainerMetadata.js";
+export const containerPendingUpdatePersistence = {
+    async deletePendingUpdate(execSql, id) {
+        await runSerializedSqlMutation(execSql, async (lockedExecSql) => {
+            await deleteDocumentPendingUpdate(lockedExecSql, id);
+        });
+    },
+    async deletePendingUpdates(execSql, containerId) {
+        await runSerializedSqlMutation(execSql, async (lockedExecSql) => {
+            await deleteDocumentPendingUpdates(lockedExecSql, getContainerMetadataScope(containerId));
+        });
+    },
+    async enqueuePendingUpdate(execSql, input) {
+        return runSerializedSqlMutation(execSql, async (lockedExecSql) => {
+            return enqueueDocumentPendingUpdate(lockedExecSql, getContainerMetadataScope(input.containerId), input);
+        });
+    },
+    async listPendingUpdates(execSql, containerId) {
+        return listDocumentPendingUpdates(execSql, getContainerMetadataScope(containerId));
+    },
+    async rekeyPendingUpdate(execSql, id) {
+        return rekeyDocumentPendingUpdate(execSql, id);
+    },
+    async listContainerIdsWithPendingUpdates(execSql, containerIds) {
+        const uniqueContainerIds = Array.from(new Set(containerIds));
+        if (uniqueContainerIds.length === 0) {
+            return [];
+        }
+        const { db } = getClientSQLitePersistenceRuntime(execSql);
+        const rows = await db
+            .selectDistinct({ containerId: documentPendingUpdates.localId })
+            .from(documentPendingUpdates)
+            .where(and(eq(documentPendingUpdates.appKind, CONTAINER_METADATA_APP_KIND), inArray(documentPendingUpdates.localId, uniqueContainerIds)))
+            .orderBy(asc(documentPendingUpdates.localId));
+        return rows.map((row) => row.containerId);
+    },
+    async listContainerIdsWithPullContinuations(execSql, containerIds) {
+        const uniqueContainerIds = Array.from(new Set(containerIds));
+        if (uniqueContainerIds.length === 0) {
+            return [];
+        }
+        const { db } = getClientSQLitePersistenceRuntime(execSql);
+        const rows = await db
+            .select({ containerId: documents.localId })
+            .from(documents)
+            .where(and(eq(documents.appKind, CONTAINER_METADATA_APP_KIND), inArray(documents.localId, uniqueContainerIds), isNotNull(documents.pullContinuation)))
+            .orderBy(asc(documents.localId));
+        return rows.map((row) => row.containerId);
+    },
+};
+//# sourceMappingURL=containerPendingUpdatePersistence.js.map

package/data/persistence/container-contents/containerPendingUpdatePersistence.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"containerPendingUpdatePersistence.js","sourceRoot":"","sources":["containerPendingUpdatePersistence.ts"],"names":[],"mappings":"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","sourcesContent":["import { and, asc, eq, inArray, isNotNull } from \"drizzle-orm\";\nimport {\n  deleteDocumentPendingUpdate,\n  deleteDocumentPendingUpdates,\n  enqueueDocumentPendingUpdate,\n  listDocumentPendingUpdates,\n  rekeyDocumentPendingUpdate,\n} from \"../../sqlite/documentPersistence\";\nimport { documentPendingUpdates, documents } from \"../../sqlite/schema\";\nimport { getClientSQLitePersistenceRuntime } from \"../../sqlite/sqlitePersistenceRuntime\";\nimport { runSerializedSqlMutation } from \"../../sqlite/sqlSchema\";\nimport type { ContainerContentsPersistence } from \"./containerContentsPersistenceTypes\";\nimport { getContainerMetadataScope } from \"./containerMetadataRows\";\nimport { CONTAINER_METADATA_APP_KIND } from \"./dormantContainerMetadata\";\n\ntype ContainerPendingUpdatePersistence = Pick<\n  ContainerContentsPersistence,\n  | \"deletePendingUpdate\"\n  | \"deletePendingUpdates\"\n  | \"enqueuePendingUpdate\"\n  | \"listPendingUpdates\"\n  | \"rekeyPendingUpdate\"\n  | \"listContainerIdsWithPendingUpdates\"\n  | \"listContainerIdsWithPullContinuations\"\n>;\n\nexport const containerPendingUpdatePersistence: ContainerPendingUpdatePersistence =\n  {\n    async deletePendingUpdate(execSql, id) {\n      await runSerializedSqlMutation(execSql, async (lockedExecSql) => {\n        await deleteDocumentPendingUpdate(lockedExecSql, id);\n      });\n    },\n    async deletePendingUpdates(execSql, containerId) {\n      await runSerializedSqlMutation(execSql, async (lockedExecSql) => {\n        await deleteDocumentPendingUpdates(\n          lockedExecSql,\n          getContainerMetadataScope(containerId),\n        );\n      });\n    },\n    async enqueuePendingUpdate(execSql, input) {\n      return runSerializedSqlMutation(execSql, async (lockedExecSql) => {\n        return enqueueDocumentPendingUpdate(\n          lockedExecSql,\n          getContainerMetadataScope(input.containerId),\n          input,\n        );\n      });\n    },\n    async listPendingUpdates(execSql, containerId) {\n      return listDocumentPendingUpdates(\n        execSql,\n        getContainerMetadataScope(containerId),\n      );\n    },\n    async rekeyPendingUpdate(execSql, id) {\n      return rekeyDocumentPendingUpdate(execSql, id);\n    },\n    async listContainerIdsWithPendingUpdates(execSql, containerIds) {\n      const uniqueContainerIds = Array.from(new Set(containerIds));\n      if (uniqueContainerIds.length === 0) {\n        return [];\n      }\n\n      const { db } = getClientSQLitePersistenceRuntime(execSql);\n      const rows = await db\n        .selectDistinct({ containerId: documentPendingUpdates.localId })\n        .from(documentPendingUpdates)\n        .where(\n          and(\n            eq(documentPendingUpdates.appKind, CONTAINER_METADATA_APP_KIND),\n            inArray(documentPendingUpdates.localId, uniqueContainerIds),\n          ),\n        )\n        .orderBy(asc(documentPendingUpdates.localId));\n\n      return rows.map((row) => row.containerId);\n    },\n    async listContainerIdsWithPullContinuations(execSql, containerIds) {\n      const uniqueContainerIds = Array.from(new Set(containerIds));\n      if (uniqueContainerIds.length === 0) {\n        return [];\n      }\n\n      const { db } = getClientSQLitePersistenceRuntime(execSql);\n      const rows = await db\n        .select({ containerId: documents.localId })\n        .from(documents)\n        .where(\n          and(\n            eq(documents.appKind, CONTAINER_METADATA_APP_KIND),\n            inArray(documents.localId, uniqueContainerIds),\n            isNotNull(documents.pullContinuation),\n          ),\n        )\n        .orderBy(asc(documents.localId));\n\n      return rows.map((row) => row.containerId);\n    },\n  };\n"]}

package/data/persistence/container-contents/containerRebindPersistence.js

@@ -0,0 +1,75 @@
+import { and, eq } from "drizzle-orm";
+import { containers, documents, dormantContainerMetadata, } from "../../sqlite/schema.js";
+import { getClientSQLitePersistenceRuntime } from "../../sqlite/sqlitePersistenceRuntime.js";
+import { runSerializedSqlMutation } from "../../sqlite/sqlSchema.js";
+import { loadStoredHeldContainerBinding } from "./containerHydrationPersistence.js";
+import { CONTAINER_METADATA_APP_KIND } from "./dormantContainerMetadata.js";
+import { isSupersededContainerBinding, recordSupersededContainerBindingsInTransaction, } from "./supersededContainerBindings.js";
+function sameBinding(current, expected) {
+    return (current?.organizationId === expected.organizationId &&
+        current.metadataDocumentId === expected.metadataDocumentId);
+}
+/**
+ * Move a held folder to the binding its own user re-created it under: purged
+ * organization recovery re-homes folders under their existing ids. Local
+ * content and queued edits follow, as they do on the recovering device, and
+ * the metadata record's remote stream starts over at the new target. An
+ * already-applied re-home succeeds; any other change to the held binding since
+ * it was read returns false and changes nothing.
+ */
+export async function rebindStoredHeldContainer(execSql, input) {
+    return runSerializedSqlMutation(execSql, async (lockedExecSql) => {
+        const outcome = await getClientSQLitePersistenceRuntime(lockedExecSql).guardedTransaction(async (tx) => {
+            const current = await loadStoredHeldContainerBinding(lockedExecSql, input.containerId);
+            const { metadataDocumentId, organizationId } = input.next;
+            // Another store over this database may have applied the same re-home.
+            if (sameBinding(current, { metadataDocumentId, organizationId }))
+                return true;
+            if (!sameBinding(current, input.expected))
+                return false;
+            // A purged organization never returns; binding back is a replay.
+            if (await isSupersededContainerBinding(lockedExecSql, {
+                containerId: input.containerId,
+                organizationId,
+            }))
+                return false;
+            const supersededAt = new Date().toISOString();
+            if (input.expected.organizationId !== organizationId) {
+                await recordSupersededContainerBindingsInTransaction(tx, {
+                    containerIds: [input.containerId],
+                    organizationId: input.expected.organizationId,
+                    supersededAt,
+                });
+            }
+            // The old stream's clock cannot order listings of the new one.
+            await tx
+                .update(containers)
+                .set({ metadataDocumentId, organizationId, serverUpdatedAt: null })
+                .where(eq(containers.id, input.containerId))
+                .run();
+            await tx
+                .update(dormantContainerMetadata)
+                .set({ organizationId })
+                .where(eq(dormantContainerMetadata.containerId, input.containerId))
+                .run();
+            await tx
+                .update(documents)
+                .set({
+                accessEpoch: 1,
+                accessStateHash: null,
+                contentKeyBundle: null,
+                documentId: metadataDocumentId,
+                documentKekTargets: null,
+                documentManifestBundle: null,
+                lastCommitLsn: null,
+                pullContinuation: null,
+                updatedAt: supersededAt,
+            })
+                .where(and(eq(documents.appKind, CONTAINER_METADATA_APP_KIND), eq(documents.localId, input.containerId)))
+                .run();
+            return true;
+        }, () => !input.stillCurrent || input.stillCurrent(), { behavior: "immediate" });
+        return outcome.committed && outcome.result === true;
+    });
+}
+//# sourceMappingURL=containerRebindPersistence.js.map

package/data/persistence/container-contents/containerRebindPersistence.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"containerRebindPersistence.js","sourceRoot":"","sources":["containerRebindPersistence.ts"],"names":[],"mappings":"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","sourcesContent":["import { and, eq } from \"drizzle-orm\";\nimport type { HeldContainerBinding } from \"../../containers/containerBinding\";\nimport {\n  containers,\n  documents,\n  dormantContainerMetadata,\n} from \"../../sqlite/schema\";\nimport { getClientSQLitePersistenceRuntime } from \"../../sqlite/sqlitePersistenceRuntime\";\nimport { type ExecSql, runSerializedSqlMutation } from \"../../sqlite/sqlSchema\";\nimport { loadStoredHeldContainerBinding } from \"./containerHydrationPersistence\";\nimport { CONTAINER_METADATA_APP_KIND } from \"./dormantContainerMetadata\";\nimport {\n  isSupersededContainerBinding,\n  recordSupersededContainerBindingsInTransaction,\n} from \"./supersededContainerBindings\";\n\nfunction sameBinding(\n  current: HeldContainerBinding | null,\n  expected: HeldContainerBinding,\n): boolean {\n  return (\n    current?.organizationId === expected.organizationId &&\n    current.metadataDocumentId === expected.metadataDocumentId\n  );\n}\n\n/**\n * Move a held folder to the binding its own user re-created it under: purged\n * organization recovery re-homes folders under their existing ids. Local\n * content and queued edits follow, as they do on the recovering device, and\n * the metadata record's remote stream starts over at the new target. An\n * already-applied re-home succeeds; any other change to the held binding since\n * it was read returns false and changes nothing.\n */\nexport async function rebindStoredHeldContainer(\n  execSql: ExecSql,\n  input: {\n    containerId: string;\n    expected: HeldContainerBinding;\n    next: { metadataDocumentId: string; organizationId: string };\n    stillCurrent?: (() => boolean) | undefined;\n  },\n): Promise<boolean> {\n  return runSerializedSqlMutation(execSql, async (lockedExecSql) => {\n    const outcome = await getClientSQLitePersistenceRuntime(\n      lockedExecSql,\n    ).guardedTransaction(\n      async (tx) => {\n        const current = await loadStoredHeldContainerBinding(\n          lockedExecSql,\n          input.containerId,\n        );\n        const { metadataDocumentId, organizationId } = input.next;\n        // Another store over this database may have applied the same re-home.\n        if (sameBinding(current, { metadataDocumentId, organizationId }))\n          return true;\n        if (!sameBinding(current, input.expected)) return false;\n        // A purged organization never returns; binding back is a replay.\n        if (\n          await isSupersededContainerBinding(lockedExecSql, {\n            containerId: input.containerId,\n            organizationId,\n          })\n        )\n          return false;\n        const supersededAt = new Date().toISOString();\n        if (input.expected.organizationId !== organizationId) {\n          await recordSupersededContainerBindingsInTransaction(tx, {\n            containerIds: [input.containerId],\n            organizationId: input.expected.organizationId,\n            supersededAt,\n          });\n        }\n        // The old stream's clock cannot order listings of the new one.\n        await tx\n          .update(containers)\n          .set({ metadataDocumentId, organizationId, serverUpdatedAt: null })\n          .where(eq(containers.id, input.containerId))\n          .run();\n        await tx\n          .update(dormantContainerMetadata)\n          .set({ organizationId })\n          .where(eq(dormantContainerMetadata.containerId, input.containerId))\n          .run();\n        await tx\n          .update(documents)\n          .set({\n            accessEpoch: 1,\n            accessStateHash: null,\n            contentKeyBundle: null,\n            documentId: metadataDocumentId,\n            documentKekTargets: null,\n            documentManifestBundle: null,\n            lastCommitLsn: null,\n            pullContinuation: null,\n            updatedAt: supersededAt,\n          })\n          .where(\n            and(\n              eq(documents.appKind, CONTAINER_METADATA_APP_KIND),\n              eq(documents.localId, input.containerId),\n            ),\n          )\n          .run();\n        return true;\n      },\n      () => !input.stillCurrent || input.stillCurrent(),\n      { behavior: \"immediate\" },\n    );\n    return outcome.committed && outcome.result === true;\n  });\n}\n"]}

package/data/persistence/container-contents/containerReconcilePersistence.js

@@ -0,0 +1,144 @@
+import { ensureDocumentTables } from "../../sqlite/documentPersistence.js";
+import { containerCreateIntentTables, containerMoveIntentTables, documentContainerProjectionTables, documentMoveIntentTables, documentProjectionTables, } from "../../sqlite/schema.js";
+import { getClientSQLitePersistenceRuntime } from "../../sqlite/sqlitePersistenceRuntime.js";
+import { ensureSqlTables, runSerializedSqlMutation, } from "../../sqlite/sqlSchema.js";
+import { ensureContainerTables } from "../containers/containerPersistence.js";
+import { sqlContainerSyncWatermarkPersistence } from "../containers/containerSyncWatermarkPersistence.js";
+import { reassignContainerDocumentsInTransaction } from "./containerDocumentReassignment.js";
+import { deleteLocalContainerRows, reparentLocalContainerChildren, updateReparentedDescendantContainers, } from "./containerStructuralRepair.js";
+export const containerReconcilePersistence = {
+    async reassignContainerDocuments(execSql, input) {
+        if (input.fromContainerId === input.toContainerId) {
+            return;
+        }
+        if (input.stillCurrent?.() === false) {
+            return;
+        }
+        await runSerializedSqlMutation(execSql, async (lockedExecSql) => {
+            const updatedAt = input.updatedAt ?? new Date().toISOString();
+            await ensureSqlTables(lockedExecSql, [
+                ...documentContainerProjectionTables,
+                ...documentMoveIntentTables,
+                ...documentProjectionTables,
+            ]);
+            if (input.stillCurrent?.() === false) {
+                return;
+            }
+            const runtime = getClientSQLitePersistenceRuntime(lockedExecSql);
+            const reassign = async (tx) => {
+                await reassignContainerDocumentsInTransaction({
+                    fromContainerId: input.fromContainerId,
+                    toContainerId: input.toContainerId,
+                    tx,
+                    updatedAt,
+                });
+            };
+            if (input.stillCurrent) {
+                await runtime.guardedTransaction(reassign, input.stillCurrent);
+            }
+            else {
+                await runtime.transaction(reassign);
+            }
+        });
+    },
+    async reconcileLocalRootContainer(execSql, input) {
+        if (input.localRootContainerId === input.remoteRootContainerId) {
+            return;
+        }
+        if (input.stillCurrent?.() === false) {
+            return;
+        }
+        await runSerializedSqlMutation(execSql, async (lockedExecSql) => {
+            const updatedAt = input.updatedAt ?? new Date().toISOString();
+            await ensureSqlTables(lockedExecSql, [
+                ...containerCreateIntentTables,
+                ...containerMoveIntentTables,
+                ...documentContainerProjectionTables,
+                ...documentMoveIntentTables,
+                ...documentProjectionTables,
+            ]);
+            await ensureContainerTables(lockedExecSql);
+            await ensureDocumentTables(lockedExecSql);
+            await sqlContainerSyncWatermarkPersistence.ensureSchema(lockedExecSql);
+            if (input.stillCurrent?.() === false) {
+                return;
+            }
+            const runtime = getClientSQLitePersistenceRuntime(lockedExecSql);
+            const reconcile = async (tx) => {
+                await updateReparentedDescendantContainers({
+                    descendantReparents: input.descendantReparents,
+                    remoteOrganizationId: input.remoteOrganizationId,
+                    tx,
+                    updatedAt,
+                });
+                await reassignContainerDocumentsInTransaction({
+                    fromContainerId: input.localRootContainerId,
+                    toContainerId: input.remoteRootContainerId,
+                    tx,
+                    updatedAt,
+                });
+                await deleteLocalContainerRows({
+                    containerId: input.localRootContainerId,
+                    tx,
+                });
+            };
+            if (input.stillCurrent) {
+                await runtime.guardedTransaction(reconcile, input.stillCurrent);
+            }
+            else {
+                await runtime.transaction(reconcile);
+            }
+        });
+    },
+    async reconcileLocalSystemContainer(execSql, input) {
+        if (input.localContainerId === input.remoteContainerId) {
+            return;
+        }
+        if (input.stillCurrent?.() === false) {
+            return;
+        }
+        await runSerializedSqlMutation(execSql, async (lockedExecSql) => {
+            const updatedAt = input.updatedAt ?? new Date().toISOString();
+            await ensureSqlTables(lockedExecSql, [
+                ...containerCreateIntentTables,
+                ...containerMoveIntentTables,
+                ...documentContainerProjectionTables,
+                ...documentMoveIntentTables,
+                ...documentProjectionTables,
+            ]);
+            await ensureContainerTables(lockedExecSql);
+            await ensureDocumentTables(lockedExecSql);
+            await sqlContainerSyncWatermarkPersistence.ensureSchema(lockedExecSql);
+            if (input.stillCurrent?.() === false) {
+                return;
+            }
+            const runtime = getClientSQLitePersistenceRuntime(lockedExecSql);
+            const reconcile = async (tx) => {
+                await reparentLocalContainerChildren({
+                    fromContainerId: input.localContainerId,
+                    remoteOrganizationId: input.remoteOrganizationId,
+                    toContainerId: input.remoteContainerId,
+                    tx,
+                    updatedAt,
+                });
+                await reassignContainerDocumentsInTransaction({
+                    fromContainerId: input.localContainerId,
+                    toContainerId: input.remoteContainerId,
+                    tx,
+                    updatedAt,
+                });
+                await deleteLocalContainerRows({
+                    containerId: input.localContainerId,
+                    tx,
+                });
+            };
+            if (input.stillCurrent) {
+                await runtime.guardedTransaction(reconcile, input.stillCurrent);
+            }
+            else {
+                await runtime.transaction(reconcile);
+            }
+        });
+    },
+};
+//# sourceMappingURL=containerReconcilePersistence.js.map

package/data/persistence/container-contents/containerReconcilePersistence.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"containerReconcilePersistence.js","sourceRoot":"","sources":["containerReconcilePersistence.ts"],"names":[],"mappings":"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","sourcesContent":["import { ensureDocumentTables } from \"../../sqlite/documentPersistence\";\nimport {\n  containerCreateIntentTables,\n  containerMoveIntentTables,\n  documentContainerProjectionTables,\n  documentMoveIntentTables,\n  documentProjectionTables,\n} from \"../../sqlite/schema\";\nimport { getClientSQLitePersistenceRuntime } from \"../../sqlite/sqlitePersistenceRuntime\";\nimport {\n  ensureSqlTables,\n  runSerializedSqlMutation,\n} from \"../../sqlite/sqlSchema\";\nimport { ensureContainerTables } from \"../containers/containerPersistence\";\nimport { sqlContainerSyncWatermarkPersistence } from \"../containers/containerSyncWatermarkPersistence\";\nimport type { ContainerContentsPersistence } from \"./containerContentsPersistenceTypes\";\nimport { reassignContainerDocumentsInTransaction } from \"./containerDocumentReassignment\";\nimport {\n  deleteLocalContainerRows,\n  reparentLocalContainerChildren,\n  updateReparentedDescendantContainers,\n} from \"./containerStructuralRepair\";\n\ntype ContainerReconcilePersistence = Pick<\n  ContainerContentsPersistence,\n  | \"reassignContainerDocuments\"\n  | \"reconcileLocalRootContainer\"\n  | \"reconcileLocalSystemContainer\"\n>;\n\nexport const containerReconcilePersistence: ContainerReconcilePersistence = {\n  async reassignContainerDocuments(execSql, input) {\n    if (input.fromContainerId === input.toContainerId) {\n      return;\n    }\n    if (input.stillCurrent?.() === false) {\n      return;\n    }\n\n    await runSerializedSqlMutation(execSql, async (lockedExecSql) => {\n      const updatedAt = input.updatedAt ?? new Date().toISOString();\n      await ensureSqlTables(lockedExecSql, [\n        ...documentContainerProjectionTables,\n        ...documentMoveIntentTables,\n        ...documentProjectionTables,\n      ]);\n      if (input.stillCurrent?.() === false) {\n        return;\n      }\n      const runtime = getClientSQLitePersistenceRuntime(lockedExecSql);\n      const reassign = async (\n        tx: Parameters<typeof reassignContainerDocumentsInTransaction>[0][\"tx\"],\n      ) => {\n        await reassignContainerDocumentsInTransaction({\n          fromContainerId: input.fromContainerId,\n          toContainerId: input.toContainerId,\n          tx,\n          updatedAt,\n        });\n      };\n      if (input.stillCurrent) {\n        await runtime.guardedTransaction(reassign, input.stillCurrent);\n      } else {\n        await runtime.transaction(reassign);\n      }\n    });\n  },\n  async reconcileLocalRootContainer(execSql, input) {\n    if (input.localRootContainerId === input.remoteRootContainerId) {\n      return;\n    }\n    if (input.stillCurrent?.() === false) {\n      return;\n    }\n\n    await runSerializedSqlMutation(execSql, async (lockedExecSql) => {\n      const updatedAt = input.updatedAt ?? new Date().toISOString();\n      await ensureSqlTables(lockedExecSql, [\n        ...containerCreateIntentTables,\n        ...containerMoveIntentTables,\n        ...documentContainerProjectionTables,\n        ...documentMoveIntentTables,\n        ...documentProjectionTables,\n      ]);\n      await ensureContainerTables(lockedExecSql);\n      await ensureDocumentTables(lockedExecSql);\n      await sqlContainerSyncWatermarkPersistence.ensureSchema(lockedExecSql);\n      if (input.stillCurrent?.() === false) {\n        return;\n      }\n      const runtime = getClientSQLitePersistenceRuntime(lockedExecSql);\n      const reconcile = async (\n        tx: Parameters<typeof updateReparentedDescendantContainers>[0][\"tx\"],\n      ) => {\n        await updateReparentedDescendantContainers({\n          descendantReparents: input.descendantReparents,\n          remoteOrganizationId: input.remoteOrganizationId,\n          tx,\n          updatedAt,\n        });\n        await reassignContainerDocumentsInTransaction({\n          fromContainerId: input.localRootContainerId,\n          toContainerId: input.remoteRootContainerId,\n          tx,\n          updatedAt,\n        });\n        await deleteLocalContainerRows({\n          containerId: input.localRootContainerId,\n          tx,\n        });\n      };\n      if (input.stillCurrent) {\n        await runtime.guardedTransaction(reconcile, input.stillCurrent);\n      } else {\n        await runtime.transaction(reconcile);\n      }\n    });\n  },\n  async reconcileLocalSystemContainer(execSql, input) {\n    if (input.localContainerId === input.remoteContainerId) {\n      return;\n    }\n    if (input.stillCurrent?.() === false) {\n      return;\n    }\n\n    await runSerializedSqlMutation(execSql, async (lockedExecSql) => {\n      const updatedAt = input.updatedAt ?? new Date().toISOString();\n      await ensureSqlTables(lockedExecSql, [\n        ...containerCreateIntentTables,\n        ...containerMoveIntentTables,\n        ...documentContainerProjectionTables,\n        ...documentMoveIntentTables,\n        ...documentProjectionTables,\n      ]);\n      await ensureContainerTables(lockedExecSql);\n      await ensureDocumentTables(lockedExecSql);\n      await sqlContainerSyncWatermarkPersistence.ensureSchema(lockedExecSql);\n      if (input.stillCurrent?.() === false) {\n        return;\n      }\n      const runtime = getClientSQLitePersistenceRuntime(lockedExecSql);\n      const reconcile = async (\n        tx: Parameters<typeof reparentLocalContainerChildren>[0][\"tx\"],\n      ) => {\n        await reparentLocalContainerChildren({\n          fromContainerId: input.localContainerId,\n          remoteOrganizationId: input.remoteOrganizationId,\n          toContainerId: input.remoteContainerId,\n          tx,\n          updatedAt,\n        });\n        await reassignContainerDocumentsInTransaction({\n          fromContainerId: input.localContainerId,\n          toContainerId: input.remoteContainerId,\n          tx,\n          updatedAt,\n        });\n        await deleteLocalContainerRows({\n          containerId: input.localContainerId,\n          tx,\n        });\n      };\n      if (input.stillCurrent) {\n        await runtime.guardedTransaction(reconcile, input.stillCurrent);\n      } else {\n        await runtime.transaction(reconcile);\n      }\n    });\n  },\n};\n"]}