npm - @tearleads/client-sdk - Versions diffs - 0.1.43 → 0.1.45 - Mend

@tearleads/client-sdk 0.1.43 → 0.1.45

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (189) hide show

package/data/persistence/container-contents/containerStructuralRepair.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { asc, eq, inArray } from "drizzle-orm";
-import { containerCreateIntents, containerMoveIntents, containerProjection, containers, documentContainerProjection, documentProjection, } from "../../sqlite/schema.js";
+import { and, asc, eq, inArray } from "drizzle-orm";
+import { containers, documentContainerProjection, documentProjection, inContainerIntentLanes, inLocalIntentLane, LOCAL_INTENT_LANES, localIntents, } from "../../sqlite/schema.js";
 import { deleteContainerWatermarksInTransaction } from "../containers/containerSyncWatermarkPersistence.js";
 import { deleteContainerDocumentTombstoneHoldsForContainers } from "../documents/containerDocumentTombstoneHoldsPersistence.js";
 import { getLatestTimestamp } from "../latestTimestamp.js";
@@ -113,11 +113,6 @@ export async function updateReparentedDescendantContainers(input) {
     })
         .where(inArray(containers.id, descendantIds))
         .run();
-    await tx
-        .update(containerProjection)
-        .set({ updatedAt })
-        .where(inArray(containerProjection.containerId, descendantIds))
-        .run();
     for (const reparent of descendantReparents) {
         await tx
             .update(containers)
@@ -134,25 +129,20 @@ export async function updateReparentedDescendantContainers(input) {
         }
         if (reparent.parentContainerId) {
             await tx
-                .update(containerMoveIntents)
+                .update(localIntents)
                 .set({
                 id: crypto.randomUUID(),
-                parentContainerId: reparent.parentContainerId,
+                targetContainerId: reparent.parentContainerId,
                 syncStatus: "pending",
                 updatedAt,
             })
-                .where(eq(containerMoveIntents.containerId, reparent.containerId))
+                .where(and(inLocalIntentLane(LOCAL_INTENT_LANES.containerMove), eq(localIntents.subjectId, reparent.containerId)))
                 .run();
         }
     }
 }
 export async function reparentLocalContainerChildren(input) {
     const { fromContainerId, remoteOrganizationId, toContainerId, tx, updatedAt, } = input;
-    const childRows = await tx
-        .select({ id: containers.id })
-        .from(containers)
-        .where(eq(containers.parentId, fromContainerId));
-    const childContainerIds = childRows.flatMap((row) => row.id ? [row.id] : []);
     await tx
         .update(containers)
         .set({
@@ -162,60 +152,47 @@ export async function reparentLocalContainerChildren(input) {
     })
         .where(eq(containers.parentId, fromContainerId))
         .run();
-    if (childContainerIds.length > 0) {
-        await tx
-            .update(containerProjection)
-            .set({ updatedAt })
-            .where(inArray(containerProjection.containerId, childContainerIds))
-            .run();
-    }
+    const createLane = inLocalIntentLane(LOCAL_INTENT_LANES.containerCreate);
     const createIntentRows = await tx
-        .select({ containerId: containerCreateIntents.containerId })
-        .from(containerCreateIntents)
-        .where(eq(containerCreateIntents.parentContainerId, fromContainerId))
+        .select({ containerId: localIntents.subjectId })
+        .from(localIntents)
+        .where(and(createLane, eq(localIntents.targetContainerId, fromContainerId)))
         .all();
     for (const intent of createIntentRows) {
         await tx
-            .update(containerCreateIntents)
+            .update(localIntents)
             .set({
             id: crypto.randomUUID(),
-            parentContainerId: toContainerId,
+            targetContainerId: toContainerId,
             updatedAt,
         })
-            .where(eq(containerCreateIntents.containerId, intent.containerId))
+            .where(and(createLane, eq(localIntents.subjectId, intent.containerId)))
             .run();
     }
+    const moveLane = inLocalIntentLane(LOCAL_INTENT_LANES.containerMove);
     const moveIntentRows = await tx
-        .select({ containerId: containerMoveIntents.containerId })
-        .from(containerMoveIntents)
-        .where(eq(containerMoveIntents.parentContainerId, fromContainerId))
+        .select({ containerId: localIntents.subjectId })
+        .from(localIntents)
+        .where(and(moveLane, eq(localIntents.targetContainerId, fromContainerId)))
         .all();
     for (const intent of moveIntentRows) {
         await tx
-            .update(containerMoveIntents)
+            .update(localIntents)
             .set({
             id: crypto.randomUUID(),
-            parentContainerId: toContainerId,
+            targetContainerId: toContainerId,
             syncStatus: "pending",
             updatedAt,
         })
-            .where(eq(containerMoveIntents.containerId, intent.containerId))
+            .where(and(moveLane, eq(localIntents.subjectId, intent.containerId)))
             .run();
     }
 }
 export async function deleteLocalContainerRows(input) {
     const { containerId, tx } = input;
     await tx
-        .delete(containerCreateIntents)
-        .where(eq(containerCreateIntents.containerId, containerId))
-        .run();
-    await tx
-        .delete(containerMoveIntents)
-        .where(eq(containerMoveIntents.containerId, containerId))
-        .run();
-    await tx
-        .delete(containerProjection)
-        .where(eq(containerProjection.containerId, containerId))
+        .delete(localIntents)
+        .where(and(inContainerIntentLanes(), eq(localIntents.subjectId, containerId)))
         .run();
     await tx.delete(containers).where(eq(containers.id, containerId)).run();
     await deleteContainerMetadataDocumentRowsInTransaction(tx, [containerId]);

package/data/persistence/container-contents/containerStructuralRepair.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"containerStructuralRepair.js","sourceRoot":"","sources":["containerStructuralRepair.ts"],"names":[],"mappings":"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","sourcesContent":["import { asc, eq, inArray } from \"drizzle-orm\";\nimport {\n containerCreateIntents,\n containerMoveIntents,\n containerProjection,\n containers,\n documentContainerProjection,\n documentProjection,\n} from \"../../sqlite/schema\";\nimport type { ClientSQLiteTransactionScope } from \"../../sqlite/sqlitePersistenceRuntime\";\nimport { deleteContainerWatermarksInTransaction } from \"../containers/containerSyncWatermarkPersistence\";\nimport { deleteContainerDocumentTombstoneHoldsForContainers } from \"../documents/containerDocumentTombstoneHoldsPersistence\";\nimport { getLatestTimestamp } from \"../latestTimestamp\";\nimport type {\n ContainerRemoval,\n LocalRootDescendantReparentInput,\n} from \"./containerContentsPersistenceTypes\";\nimport { saveContainerCreateIntent } from \"./containerIntentPersistence\";\nimport { deleteContainerMetadataDocumentRowsInTransaction } from \"./dormantContainerMetadata\";\n\n// The containers being removed still exist when repair runs (deletion follows\n// it). Capture their org attribution so a detached document's pending writes\n// keep a resolvable organization id after the join source is gone — e.g. when\n// access to a shared org is revoked mid-sync.\nasync function loadOrganizationIdsForContainers(\n tx: ClientSQLiteTransactionScope,\n containerIds: ReadonlyArray<string>,\n): Promise<Map<string, string>> {\n const rows = await tx\n .select({\n id: containers.id,\n organizationId: containers.organizationId,\n })\n .from(containers)\n .where(inArray(containers.id, containerIds));\n const organizationIdByContainerId = new Map<string, string>();\n for (const container of rows) {\n if (container.id && container.organizationId) {\n organizationIdByContainerId.set(container.id, container.organizationId);\n }\n }\n return organizationIdByContainerId;\n}\n\n// A document unlinked from a removed container may keep other live links; its\n// projection then re-homes to the first remaining link (deterministic order)\n// instead of dropping to null.\nasync function loadFirstRemainingContainerIdByDocumentId(\n tx: ClientSQLiteTransactionScope,\n documentIds: ReadonlyArray<string>,\n): Promise<Map<string, string>> {\n const firstRemainingContainerIdByDocumentId = new Map<string, string>();\n if (documentIds.length === 0) {\n return firstRemainingContainerIdByDocumentId;\n }\n const remainingLinks = await tx\n .select({\n containerId: documentContainerProjection.containerId,\n documentId: documentContainerProjection.documentId,\n })\n .from(documentContainerProjection)\n .where(inArray(documentContainerProjection.documentId, documentIds))\n .orderBy(\n asc(documentContainerProjection.documentId),\n asc(documentContainerProjection.containerId),\n );\n for (const link of remainingLinks) {\n if (!firstRemainingContainerIdByDocumentId.has(link.documentId)) {\n firstRemainingContainerIdByDocumentId.set(\n link.documentId,\n link.containerId,\n );\n }\n }\n return firstRemainingContainerIdByDocumentId;\n}\n\nexport async function repairDocumentsForRemovedContainersInTransaction(input: {\n removals: ReadonlyArray<ContainerRemoval>;\n tx: ClientSQLiteTransactionScope;\n}): Promise<void> {\n const { tx } = input;\n const updatedAtByContainerId = new Map(\n input.removals.map((removal) => [removal.containerId, removal.updatedAt]),\n );\n const containerIds = Array.from(updatedAtByContainerId.keys());\n if (containerIds.length === 0) {\n return;\n }\n\n {\n const selectedRows = await tx\n .select({\n containerId: documentProjection.containerId,\n documentId: documentProjection.documentId,\n localId: documentProjection.localId,\n updatedAt: documentProjection.updatedAt,\n })\n .from(documentProjection)\n .where(inArray(documentProjection.containerId, containerIds));\n\n const organizationIdByContainerId = await loadOrganizationIdsForContainers(\n tx,\n containerIds,\n );\n\n await tx\n .delete(documentContainerProjection)\n .where(inArray(documentContainerProjection.containerId, containerIds))\n .run();\n await deleteContainerDocumentTombstoneHoldsForContainers(tx, containerIds);\n\n const documentIds = Array.from(\n new Set(\n selectedRows.flatMap((row) => (row.documentId ? [row.documentId] : [])),\n ),\n );\n const firstRemainingContainerIdByDocumentId =\n await loadFirstRemainingContainerIdByDocumentId(tx, documentIds);\n\n for (const row of selectedRows) {\n if (!row.localId) {\n continue;\n }\n\n const removedOrganizationId = row.containerId\n ? organizationIdByContainerId.get(row.containerId)\n : undefined;\n await tx\n .update(documentProjection)\n .set({\n containerId: row.documentId\n ? (firstRemainingContainerIdByDocumentId.get(row.documentId) ??\n null)\n : null,\n ...(removedOrganizationId\n ? { organizationId: removedOrganizationId }\n : {}),\n updatedAt: getLatestTimestamp(\n row.updatedAt,\n row.containerId\n ? (updatedAtByContainerId.get(row.containerId) ?? row.updatedAt)\n : row.updatedAt,\n ),\n })\n .where(eq(documentProjection.localId, row.localId))\n .run();\n }\n }\n}\n\nexport async function updateReparentedDescendantContainers(input: {\n descendantReparents: ReadonlyArray<LocalRootDescendantReparentInput>;\n remoteOrganizationId: string;\n tx: ClientSQLiteTransactionScope;\n updatedAt: string;\n}): Promise<void> {\n const { descendantReparents, remoteOrganizationId, tx, updatedAt } = input;\n const descendantIds = Array.from(\n new Set(descendantReparents.map((reparent) => reparent.containerId)),\n );\n if (descendantIds.length === 0) {\n return;\n }\n\n await tx\n .update(containers)\n .set({\n organizationId: remoteOrganizationId,\n localUpdatedAt: updatedAt,\n })\n .where(inArray(containers.id, descendantIds))\n .run();\n await tx\n .update(containerProjection)\n .set({ updatedAt })\n .where(inArray(containerProjection.containerId, descendantIds))\n .run();\n\n for (const reparent of descendantReparents) {\n await tx\n .update(containers)\n .set({ parentId: reparent.parentContainerId })\n .where(eq(containers.id, reparent.containerId))\n .run();\n\n if (reparent.updateCreateIntent && reparent.parentContainerId) {\n await saveContainerCreateIntent({\n containerId: reparent.containerId,\n createIntent: { parentContainerId: reparent.parentContainerId },\n tx,\n updatedAt,\n });\n }\n\n if (reparent.parentContainerId) {\n await tx\n .update(containerMoveIntents)\n .set({\n id: crypto.randomUUID(),\n parentContainerId: reparent.parentContainerId,\n syncStatus: \"pending\",\n updatedAt,\n })\n .where(eq(containerMoveIntents.containerId, reparent.containerId))\n .run();\n }\n }\n}\n\nexport async function reparentLocalContainerChildren(input: {\n fromContainerId: string;\n remoteOrganizationId: string;\n toContainerId: string;\n tx: ClientSQLiteTransactionScope;\n updatedAt: string;\n}): Promise<void> {\n const {\n fromContainerId,\n remoteOrganizationId,\n toContainerId,\n tx,\n updatedAt,\n } = input;\n const childRows = await tx\n .select({ id: containers.id })\n .from(containers)\n .where(eq(containers.parentId, fromContainerId));\n const childContainerIds = childRows.flatMap((row) =>\n row.id ? [row.id] : [],\n );\n\n await tx\n .update(containers)\n .set({\n organizationId: remoteOrganizationId,\n parentId: toContainerId,\n localUpdatedAt: updatedAt,\n })\n .where(eq(containers.parentId, fromContainerId))\n .run();\n if (childContainerIds.length > 0) {\n await tx\n .update(containerProjection)\n .set({ updatedAt })\n .where(inArray(containerProjection.containerId, childContainerIds))\n .run();\n }\n const createIntentRows = await tx\n .select({ containerId: containerCreateIntents.containerId })\n .from(containerCreateIntents)\n .where(eq(containerCreateIntents.parentContainerId, fromContainerId))\n .all();\n for (const intent of createIntentRows) {\n await tx\n .update(containerCreateIntents)\n .set({\n id: crypto.randomUUID(),\n parentContainerId: toContainerId,\n updatedAt,\n })\n .where(eq(containerCreateIntents.containerId, intent.containerId))\n .run();\n }\n const moveIntentRows = await tx\n .select({ containerId: containerMoveIntents.containerId })\n .from(containerMoveIntents)\n .where(eq(containerMoveIntents.parentContainerId, fromContainerId))\n .all();\n for (const intent of moveIntentRows) {\n await tx\n .update(containerMoveIntents)\n .set({\n id: crypto.randomUUID(),\n parentContainerId: toContainerId,\n syncStatus: \"pending\",\n updatedAt,\n })\n .where(eq(containerMoveIntents.containerId, intent.containerId))\n .run();\n }\n}\n\nexport async function deleteLocalContainerRows(input: {\n containerId: string;\n tx: ClientSQLiteTransactionScope;\n}): Promise<void> {\n const { containerId, tx } = input;\n await tx\n .delete(containerCreateIntents)\n .where(eq(containerCreateIntents.containerId, containerId))\n .run();\n await tx\n .delete(containerMoveIntents)\n .where(eq(containerMoveIntents.containerId, containerId))\n .run();\n await tx\n .delete(containerProjection)\n .where(eq(containerProjection.containerId, containerId))\n .run();\n await tx.delete(containers).where(eq(containers.id, containerId)).run();\n await deleteContainerMetadataDocumentRowsInTransaction(tx, [containerId]);\n await deleteContainerWatermarksInTransaction(tx, [containerId]);\n}\n"]}
1	+ {"version":3,"file":"containerStructuralRepair.js","sourceRoot":"","sources":["containerStructuralRepair.ts"],"names":[],"mappings":"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","sourcesContent":["import { and, asc, eq, inArray } from \"drizzle-orm\";\nimport {\n containers,\n documentContainerProjection,\n documentProjection,\n inContainerIntentLanes,\n inLocalIntentLane,\n LOCAL_INTENT_LANES,\n localIntents,\n} from \"../../sqlite/schema\";\nimport type { ClientSQLiteTransactionScope } from \"../../sqlite/sqlitePersistenceRuntime\";\nimport { deleteContainerWatermarksInTransaction } from \"../containers/containerSyncWatermarkPersistence\";\nimport { deleteContainerDocumentTombstoneHoldsForContainers } from \"../documents/containerDocumentTombstoneHoldsPersistence\";\nimport { getLatestTimestamp } from \"../latestTimestamp\";\nimport type {\n ContainerRemoval,\n LocalRootDescendantReparentInput,\n} from \"./containerContentsPersistenceTypes\";\nimport { saveContainerCreateIntent } from \"./containerIntentPersistence\";\nimport { deleteContainerMetadataDocumentRowsInTransaction } from \"./dormantContainerMetadata\";\n\n// The containers being removed still exist when repair runs (deletion follows\n// it). Capture their org attribution so a detached document's pending writes\n// keep a resolvable organization id after the join source is gone — e.g. when\n// access to a shared org is revoked mid-sync.\nasync function loadOrganizationIdsForContainers(\n tx: ClientSQLiteTransactionScope,\n containerIds: ReadonlyArray<string>,\n): Promise<Map<string, string>> {\n const rows = await tx\n .select({\n id: containers.id,\n organizationId: containers.organizationId,\n })\n .from(containers)\n .where(inArray(containers.id, containerIds));\n const organizationIdByContainerId = new Map<string, string>();\n for (const container of rows) {\n if (container.id && container.organizationId) {\n organizationIdByContainerId.set(container.id, container.organizationId);\n }\n }\n return organizationIdByContainerId;\n}\n\n// A document unlinked from a removed container may keep other live links; its\n// projection then re-homes to the first remaining link (deterministic order)\n// instead of dropping to null.\nasync function loadFirstRemainingContainerIdByDocumentId(\n tx: ClientSQLiteTransactionScope,\n documentIds: ReadonlyArray<string>,\n): Promise<Map<string, string>> {\n const firstRemainingContainerIdByDocumentId = new Map<string, string>();\n if (documentIds.length === 0) {\n return firstRemainingContainerIdByDocumentId;\n }\n const remainingLinks = await tx\n .select({\n containerId: documentContainerProjection.containerId,\n documentId: documentContainerProjection.documentId,\n })\n .from(documentContainerProjection)\n .where(inArray(documentContainerProjection.documentId, documentIds))\n .orderBy(\n asc(documentContainerProjection.documentId),\n asc(documentContainerProjection.containerId),\n );\n for (const link of remainingLinks) {\n if (!firstRemainingContainerIdByDocumentId.has(link.documentId)) {\n firstRemainingContainerIdByDocumentId.set(\n link.documentId,\n link.containerId,\n );\n }\n }\n return firstRemainingContainerIdByDocumentId;\n}\n\nexport async function repairDocumentsForRemovedContainersInTransaction(input: {\n removals: ReadonlyArray<ContainerRemoval>;\n tx: ClientSQLiteTransactionScope;\n}): Promise<void> {\n const { tx } = input;\n const updatedAtByContainerId = new Map(\n input.removals.map((removal) => [removal.containerId, removal.updatedAt]),\n );\n const containerIds = Array.from(updatedAtByContainerId.keys());\n if (containerIds.length === 0) {\n return;\n }\n\n {\n const selectedRows = await tx\n .select({\n containerId: documentProjection.containerId,\n documentId: documentProjection.documentId,\n localId: documentProjection.localId,\n updatedAt: documentProjection.updatedAt,\n })\n .from(documentProjection)\n .where(inArray(documentProjection.containerId, containerIds));\n\n const organizationIdByContainerId = await loadOrganizationIdsForContainers(\n tx,\n containerIds,\n );\n\n await tx\n .delete(documentContainerProjection)\n .where(inArray(documentContainerProjection.containerId, containerIds))\n .run();\n await deleteContainerDocumentTombstoneHoldsForContainers(tx, containerIds);\n\n const documentIds = Array.from(\n new Set(\n selectedRows.flatMap((row) => (row.documentId ? [row.documentId] : [])),\n ),\n );\n const firstRemainingContainerIdByDocumentId =\n await loadFirstRemainingContainerIdByDocumentId(tx, documentIds);\n\n for (const row of selectedRows) {\n if (!row.localId) {\n continue;\n }\n\n const removedOrganizationId = row.containerId\n ? organizationIdByContainerId.get(row.containerId)\n : undefined;\n await tx\n .update(documentProjection)\n .set({\n containerId: row.documentId\n ? (firstRemainingContainerIdByDocumentId.get(row.documentId) ??\n null)\n : null,\n ...(removedOrganizationId\n ? { organizationId: removedOrganizationId }\n : {}),\n updatedAt: getLatestTimestamp(\n row.updatedAt,\n row.containerId\n ? (updatedAtByContainerId.get(row.containerId) ?? row.updatedAt)\n : row.updatedAt,\n ),\n })\n .where(eq(documentProjection.localId, row.localId))\n .run();\n }\n }\n}\n\nexport async function updateReparentedDescendantContainers(input: {\n descendantReparents: ReadonlyArray<LocalRootDescendantReparentInput>;\n remoteOrganizationId: string;\n tx: ClientSQLiteTransactionScope;\n updatedAt: string;\n}): Promise<void> {\n const { descendantReparents, remoteOrganizationId, tx, updatedAt } = input;\n const descendantIds = Array.from(\n new Set(descendantReparents.map((reparent) => reparent.containerId)),\n );\n if (descendantIds.length === 0) {\n return;\n }\n\n await tx\n .update(containers)\n .set({\n organizationId: remoteOrganizationId,\n localUpdatedAt: updatedAt,\n })\n .where(inArray(containers.id, descendantIds))\n .run();\n\n for (const reparent of descendantReparents) {\n await tx\n .update(containers)\n .set({ parentId: reparent.parentContainerId })\n .where(eq(containers.id, reparent.containerId))\n .run();\n\n if (reparent.updateCreateIntent && reparent.parentContainerId) {\n await saveContainerCreateIntent({\n containerId: reparent.containerId,\n createIntent: { parentContainerId: reparent.parentContainerId },\n tx,\n updatedAt,\n });\n }\n\n if (reparent.parentContainerId) {\n await tx\n .update(localIntents)\n .set({\n id: crypto.randomUUID(),\n targetContainerId: reparent.parentContainerId,\n syncStatus: \"pending\",\n updatedAt,\n })\n .where(\n and(\n inLocalIntentLane(LOCAL_INTENT_LANES.containerMove),\n eq(localIntents.subjectId, reparent.containerId),\n ),\n )\n .run();\n }\n }\n}\n\nexport async function reparentLocalContainerChildren(input: {\n fromContainerId: string;\n remoteOrganizationId: string;\n toContainerId: string;\n tx: ClientSQLiteTransactionScope;\n updatedAt: string;\n}): Promise<void> {\n const {\n fromContainerId,\n remoteOrganizationId,\n toContainerId,\n tx,\n updatedAt,\n } = input;\n await tx\n .update(containers)\n .set({\n organizationId: remoteOrganizationId,\n parentId: toContainerId,\n localUpdatedAt: updatedAt,\n })\n .where(eq(containers.parentId, fromContainerId))\n .run();\n const createLane = inLocalIntentLane(LOCAL_INTENT_LANES.containerCreate);\n const createIntentRows = await tx\n .select({ containerId: localIntents.subjectId })\n .from(localIntents)\n .where(and(createLane, eq(localIntents.targetContainerId, fromContainerId)))\n .all();\n for (const intent of createIntentRows) {\n await tx\n .update(localIntents)\n .set({\n id: crypto.randomUUID(),\n targetContainerId: toContainerId,\n updatedAt,\n })\n .where(and(createLane, eq(localIntents.subjectId, intent.containerId)))\n .run();\n }\n const moveLane = inLocalIntentLane(LOCAL_INTENT_LANES.containerMove);\n const moveIntentRows = await tx\n .select({ containerId: localIntents.subjectId })\n .from(localIntents)\n .where(and(moveLane, eq(localIntents.targetContainerId, fromContainerId)))\n .all();\n for (const intent of moveIntentRows) {\n await tx\n .update(localIntents)\n .set({\n id: crypto.randomUUID(),\n targetContainerId: toContainerId,\n syncStatus: \"pending\",\n updatedAt,\n })\n .where(and(moveLane, eq(localIntents.subjectId, intent.containerId)))\n .run();\n }\n}\n\nexport async function deleteLocalContainerRows(input: {\n containerId: string;\n tx: ClientSQLiteTransactionScope;\n}): Promise<void> {\n const { containerId, tx } = input;\n await tx\n .delete(localIntents)\n .where(\n and(inContainerIntentLanes(), eq(localIntents.subjectId, containerId)),\n )\n .run();\n await tx.delete(containers).where(eq(containers.id, containerId)).run();\n await deleteContainerMetadataDocumentRowsInTransaction(tx, [containerId]);\n await deleteContainerWatermarksInTransaction(tx, [containerId]);\n}\n"]}

package/data/persistence/container-contents/documentLinkRemovalRepair.js CHANGED Viewed

@@ -1,17 +1,18 @@
 import { and, asc, eq, inArray, or } from "drizzle-orm";
 import { documentIntentLinkTargets } from "../../sqlite/documentPlacementIntentSchema.js";
-import { documentContainerProjection, documentMoveIntents, } from "../../sqlite/schema.js";
+import { documentContainerProjection, inLocalIntentLane, LOCAL_INTENT_LANES, localIntents, } from "../../sqlite/schema.js";
 import { DOCUMENT_LINK_INTENT_TYPE, DOCUMENT_MOVE_INTENT_TYPE, } from "./documentMoveIntentPersistence.js";
+const placementLane = inLocalIntentLane(LOCAL_INTENT_LANES.documentPlacement);
 function loadAffectedIntents(tx, containerIds, includePrimaryMoves) {
     return tx
         .select()
-        .from(documentMoveIntents)
-        .where(and(inArray(documentMoveIntents.intentType, [
+        .from(localIntents)
+        .where(and(placementLane, inArray(localIntents.intentType, [
         DOCUMENT_LINK_INTENT_TYPE,
         DOCUMENT_MOVE_INTENT_TYPE,
     ]), or(and(includePrimaryMoves
         ? undefined
-        : eq(documentMoveIntents.intentType, DOCUMENT_LINK_INTENT_TYPE), inArray(documentMoveIntents.targetContainerId, containerIds)), inArray(documentMoveIntents.id, tx
+        : eq(localIntents.intentType, DOCUMENT_LINK_INTENT_TYPE), inArray(localIntents.targetContainerId, containerIds)), inArray(localIntents.id, tx
         .select({ id: documentIntentLinkTargets.intentId })
         .from(documentIntentLinkTargets)
         .where(inArray(documentIntentLinkTargets.containerId, containerIds))))));
@@ -24,7 +25,7 @@ async function survivingIntentTarget(input) {
     const [remaining] = await tx
         .select()
         .from(documentContainerProjection)
-        .where(eq(documentContainerProjection.documentId, intent.documentId))
+        .where(eq(documentContainerProjection.documentId, intent.subjectId))
         .orderBy(asc(documentContainerProjection.containerId))
         .limit(1);
     return (remaining?.containerId ??
@@ -56,8 +57,8 @@ async function repairRemovedLinks(input) {
             .run();
         if (intentType === DOCUMENT_LINK_INTENT_TYPE && targets.length === 0) {
             await tx
-                .delete(documentMoveIntents)
-                .where(eq(documentMoveIntents.documentId, intent.documentId))
+                .delete(localIntents)
+                .where(and(placementLane, eq(localIntents.subjectId, intent.subjectId)))
                 .run();
             continue;
         }
@@ -79,7 +80,7 @@ async function repairRemovedLinks(input) {
                 .run();
         const unavailable = removed.has(targetContainerId);
         await tx
-            .update(documentMoveIntents)
+            .update(localIntents)
             .set({
             id,
             intentType,
@@ -97,7 +98,7 @@ async function repairRemovedLinks(input) {
             syncStatus: unavailable ? "unavailable" : "pending",
             updatedAt: new Date().toISOString(),
         })
-            .where(eq(documentMoveIntents.documentId, intent.documentId))
+            .where(and(placementLane, eq(localIntents.subjectId, intent.subjectId)))
             .run();
     }
 }
@@ -120,7 +121,7 @@ export async function refreshPlacementIntentsAfterRemoval(input) {
             .where(eq(documentIntentLinkTargets.intentId, intent.id ?? ""))
             .run();
         await tx
-            .update(documentMoveIntents)
+            .update(localIntents)
             .set({
             id,
             syncStatus: intent.syncStatus === "unavailable" ? "pending" : intent.syncStatus,
@@ -128,7 +129,7 @@ export async function refreshPlacementIntentsAfterRemoval(input) {
             lastAttemptedAt: intent.syncStatus === "unavailable" ? null : intent.lastAttemptedAt,
             updatedAt: new Date().toISOString(),
         })
-            .where(eq(documentMoveIntents.id, intent.id ?? ""))
+            .where(eq(localIntents.id, intent.id ?? ""))
             .run();
     }
 }

package/data/persistence/container-contents/documentLinkRemovalRepair.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"documentLinkRemovalRepair.js","sourceRoot":"","sources":["documentLinkRemovalRepair.ts"],"names":[],"mappings":"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","sourcesContent":["import { and, asc, eq, inArray, or } from \"drizzle-orm\";\nimport { documentIntentLinkTargets } from \"../../sqlite/documentPlacementIntentSchema\";\nimport {\n documentContainerProjection,\n documentMoveIntents,\n} from \"../../sqlite/schema\";\nimport type { ClientSQLiteTransactionScope } from \"../../sqlite/sqlitePersistenceRuntime\";\nimport {\n DOCUMENT_LINK_INTENT_TYPE,\n DOCUMENT_MOVE_INTENT_TYPE,\n} from \"./documentMoveIntentPersistence\";\n\nfunction loadAffectedIntents(\n tx: ClientSQLiteTransactionScope,\n containerIds: ReadonlyArray<string>,\n includePrimaryMoves: boolean,\n) {\n return tx\n .select()\n .from(documentMoveIntents)\n .where(\n and(\n inArray(documentMoveIntents.intentType, [\n DOCUMENT_LINK_INTENT_TYPE,\n DOCUMENT_MOVE_INTENT_TYPE,\n ]),\n or(\n and(\n includePrimaryMoves\n ? undefined\n : eq(documentMoveIntents.intentType, DOCUMENT_LINK_INTENT_TYPE),\n inArray(documentMoveIntents.targetContainerId, containerIds),\n ),\n inArray(\n documentMoveIntents.id,\n tx\n .select({ id: documentIntentLinkTargets.intentId })\n .from(documentIntentLinkTargets)\n .where(\n inArray(documentIntentLinkTargets.containerId, containerIds),\n ),\n ),\n ),\n ),\n );\n}\n\nasync function survivingIntentTarget(input: {\n tx: ClientSQLiteTransactionScope;\n intent: typeof documentMoveIntents.$inferSelect;\n intentType: string;\n removed: ReadonlySet<string>;\n targets: ReadonlyArray<typeof documentIntentLinkTargets.$inferSelect>;\n}): Promise<string> {\n const { tx, intent, intentType, removed, targets } = input;\n if (\n intentType !== DOCUMENT_LINK_INTENT_TYPE \|\|\n !removed.has(intent.targetContainerId)\n )\n return intent.targetContainerId;\n const [remaining] = await tx\n .select()\n .from(documentContainerProjection)\n .where(eq(documentContainerProjection.documentId, intent.documentId))\n .orderBy(asc(documentContainerProjection.containerId))\n .limit(1);\n return (\n remaining?.containerId ??\n targets.find((target) => target.operation === \"link\")?.containerId ??\n intent.targetContainerId\n );\n}\n\n/** Runs after removed containers have been dropped from local link projections. /\nasync function repairRemovedLinks(input: {\n containerIds: ReadonlyArray<string>;\n discardPrimaryMoves: boolean;\n tx: ClientSQLiteTransactionScope;\n}): Promise<void> {\n const { containerIds, tx } = input;\n const removed = new Set(containerIds);\n const affected = await loadAffectedIntents(\n tx,\n containerIds,\n input.discardPrimaryMoves,\n );\n for (const intent of affected) {\n const discardedMove =\n input.discardPrimaryMoves &&\n intent.intentType === DOCUMENT_MOVE_INTENT_TYPE &&\n removed.has(intent.targetContainerId);\n const intentType = discardedMove\n ? DOCUMENT_LINK_INTENT_TYPE\n : intent.intentType;\n // Cancel both halves of a discarded move; unrelated link edits survive.\n const targets = (\n await tx\n .select()\n .from(documentIntentLinkTargets)\n .where(eq(documentIntentLinkTargets.intentId, intent.id ?? \"\"))\n ).filter((target) =>\n target.operation === \"unlink\"\n ? !(discardedMove && target.containerId === intent.sourceContainerId)\n : !removed.has(target.containerId),\n );\n await tx\n .delete(documentIntentLinkTargets)\n .where(eq(documentIntentLinkTargets.intentId, intent.id ?? \"\"))\n .run();\n if (intentType === DOCUMENT_LINK_INTENT_TYPE && targets.length === 0) {\n await tx\n .delete(documentMoveIntents)\n .where(eq(documentMoveIntents.documentId, intent.documentId))\n .run();\n continue;\n }\n const targetContainerId = await survivingIntentTarget({\n tx,\n intent,\n intentType,\n removed,\n targets,\n });\n // A removed preferred link is only a routing hint for an additive intent.\n // Keep explicit operations for surviving containers, and invalidate any\n // replay that captured the old target set before this transaction.\n const id = crypto.randomUUID();\n if (targets.length)\n await tx\n .insert(documentIntentLinkTargets)\n .values(targets.map((target) => ({ ...target, intentId: id })))\n .run();\n const unavailable = removed.has(targetContainerId);\n await tx\n .update(documentMoveIntents)\n .set({\n id,\n intentType,\n replaceLinkedContainers: discardedMove\n ? false\n : intent.replaceLinkedContainers,\n targetContainerId,\n // The source records what the user moved. Clearing it would make\n // replay fall back to the active link and remove that link instead.\n sourceContainerId: intent.sourceContainerId,\n lastAttemptedAt: null,\n lastError: unavailable\n ? \"Document placement has no surviving destination container\"\n : null,\n syncStatus: unavailable ? \"unavailable\" : \"pending\",\n updatedAt: new Date().toISOString(),\n })\n .where(eq(documentMoveIntents.documentId, intent.documentId))\n .run();\n }\n}\n\nexport function repairLinkIntentsForRemovedContainers(input: {\n containerIds: ReadonlyArray<string>;\n tx: ClientSQLiteTransactionScope;\n}): Promise<void> {\n return repairRemovedLinks({ ...input, discardPrimaryMoves: false });\n}\n\n/* Explicit discard cancels placement into these folders, retaining unrelated operations. /\nexport function discardLinkIntentsForRemovedContainers(input: {\n containerIds: ReadonlyArray<string>;\n tx: ClientSQLiteTransactionScope;\n}): Promise<void> {\n return repairRemovedLinks({ ...input, discardPrimaryMoves: true });\n}\n\n/* An unsigned absence hint must not let an old 404 strand queued placement. */\nexport async function refreshPlacementIntentsAfterRemoval(input: {\n containerIds: ReadonlyArray<string>;\n tx: ClientSQLiteTransactionScope;\n}): Promise<void> {\n const { tx } = input;\n for (const intent of await loadAffectedIntents(\n tx,\n input.containerIds,\n true,\n )) {\n // Rotate the revision to refuse completion from a pass that parked the old intent.\n const id = crypto.randomUUID();\n await tx\n .update(documentIntentLinkTargets)\n .set({ intentId: id })\n .where(eq(documentIntentLinkTargets.intentId, intent.id ?? \"\"))\n .run();\n await tx\n .update(documentMoveIntents)\n .set({\n id,\n syncStatus:\n intent.syncStatus === \"unavailable\" ? \"pending\" : intent.syncStatus,\n lastError:\n intent.syncStatus === \"unavailable\" ? null : intent.lastError,\n lastAttemptedAt:\n intent.syncStatus === \"unavailable\" ? null : intent.lastAttemptedAt,\n updatedAt: new Date().toISOString(),\n })\n .where(eq(documentMoveIntents.id, intent.id ?? \"\"))\n .run();\n }\n}\n"]}
1	+ {"version":3,"file":"documentLinkRemovalRepair.js","sourceRoot":"","sources":["documentLinkRemovalRepair.ts"],"names":[],"mappings":"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","sourcesContent":["import { and, asc, eq, inArray, or } from \"drizzle-orm\";\nimport { documentIntentLinkTargets } from \"../../sqlite/documentPlacementIntentSchema\";\nimport {\n documentContainerProjection,\n inLocalIntentLane,\n LOCAL_INTENT_LANES,\n localIntents,\n} from \"../../sqlite/schema\";\nimport type { ClientSQLiteTransactionScope } from \"../../sqlite/sqlitePersistenceRuntime\";\nimport {\n DOCUMENT_LINK_INTENT_TYPE,\n DOCUMENT_MOVE_INTENT_TYPE,\n} from \"./documentMoveIntentPersistence\";\n\nconst placementLane = inLocalIntentLane(LOCAL_INTENT_LANES.documentPlacement);\n\nfunction loadAffectedIntents(\n tx: ClientSQLiteTransactionScope,\n containerIds: ReadonlyArray<string>,\n includePrimaryMoves: boolean,\n) {\n return tx\n .select()\n .from(localIntents)\n .where(\n and(\n placementLane,\n inArray(localIntents.intentType, [\n DOCUMENT_LINK_INTENT_TYPE,\n DOCUMENT_MOVE_INTENT_TYPE,\n ]),\n or(\n and(\n includePrimaryMoves\n ? undefined\n : eq(localIntents.intentType, DOCUMENT_LINK_INTENT_TYPE),\n inArray(localIntents.targetContainerId, containerIds),\n ),\n inArray(\n localIntents.id,\n tx\n .select({ id: documentIntentLinkTargets.intentId })\n .from(documentIntentLinkTargets)\n .where(\n inArray(documentIntentLinkTargets.containerId, containerIds),\n ),\n ),\n ),\n ),\n );\n}\n\nasync function survivingIntentTarget(input: {\n tx: ClientSQLiteTransactionScope;\n intent: typeof localIntents.$inferSelect;\n intentType: string;\n removed: ReadonlySet<string>;\n targets: ReadonlyArray<typeof documentIntentLinkTargets.$inferSelect>;\n}): Promise<string> {\n const { tx, intent, intentType, removed, targets } = input;\n if (\n intentType !== DOCUMENT_LINK_INTENT_TYPE \|\|\n !removed.has(intent.targetContainerId)\n )\n return intent.targetContainerId;\n const [remaining] = await tx\n .select()\n .from(documentContainerProjection)\n .where(eq(documentContainerProjection.documentId, intent.subjectId))\n .orderBy(asc(documentContainerProjection.containerId))\n .limit(1);\n return (\n remaining?.containerId ??\n targets.find((target) => target.operation === \"link\")?.containerId ??\n intent.targetContainerId\n );\n}\n\n/** Runs after removed containers have been dropped from local link projections. /\nasync function repairRemovedLinks(input: {\n containerIds: ReadonlyArray<string>;\n discardPrimaryMoves: boolean;\n tx: ClientSQLiteTransactionScope;\n}): Promise<void> {\n const { containerIds, tx } = input;\n const removed = new Set(containerIds);\n const affected = await loadAffectedIntents(\n tx,\n containerIds,\n input.discardPrimaryMoves,\n );\n for (const intent of affected) {\n const discardedMove =\n input.discardPrimaryMoves &&\n intent.intentType === DOCUMENT_MOVE_INTENT_TYPE &&\n removed.has(intent.targetContainerId);\n const intentType = discardedMove\n ? DOCUMENT_LINK_INTENT_TYPE\n : intent.intentType;\n // Cancel both halves of a discarded move; unrelated link edits survive.\n const targets = (\n await tx\n .select()\n .from(documentIntentLinkTargets)\n .where(eq(documentIntentLinkTargets.intentId, intent.id ?? \"\"))\n ).filter((target) =>\n target.operation === \"unlink\"\n ? !(discardedMove && target.containerId === intent.sourceContainerId)\n : !removed.has(target.containerId),\n );\n await tx\n .delete(documentIntentLinkTargets)\n .where(eq(documentIntentLinkTargets.intentId, intent.id ?? \"\"))\n .run();\n if (intentType === DOCUMENT_LINK_INTENT_TYPE && targets.length === 0) {\n await tx\n .delete(localIntents)\n .where(and(placementLane, eq(localIntents.subjectId, intent.subjectId)))\n .run();\n continue;\n }\n const targetContainerId = await survivingIntentTarget({\n tx,\n intent,\n intentType,\n removed,\n targets,\n });\n // A removed preferred link is only a routing hint for an additive intent.\n // Keep explicit operations for surviving containers, and invalidate any\n // replay that captured the old target set before this transaction.\n const id = crypto.randomUUID();\n if (targets.length)\n await tx\n .insert(documentIntentLinkTargets)\n .values(targets.map((target) => ({ ...target, intentId: id })))\n .run();\n const unavailable = removed.has(targetContainerId);\n await tx\n .update(localIntents)\n .set({\n id,\n intentType,\n replaceLinkedContainers: discardedMove\n ? false\n : intent.replaceLinkedContainers,\n targetContainerId,\n // The source records what the user moved. Clearing it would make\n // replay fall back to the active link and remove that link instead.\n sourceContainerId: intent.sourceContainerId,\n lastAttemptedAt: null,\n lastError: unavailable\n ? \"Document placement has no surviving destination container\"\n : null,\n syncStatus: unavailable ? \"unavailable\" : \"pending\",\n updatedAt: new Date().toISOString(),\n })\n .where(and(placementLane, eq(localIntents.subjectId, intent.subjectId)))\n .run();\n }\n}\n\nexport function repairLinkIntentsForRemovedContainers(input: {\n containerIds: ReadonlyArray<string>;\n tx: ClientSQLiteTransactionScope;\n}): Promise<void> {\n return repairRemovedLinks({ ...input, discardPrimaryMoves: false });\n}\n\n/* Explicit discard cancels placement into these folders, retaining unrelated operations. /\nexport function discardLinkIntentsForRemovedContainers(input: {\n containerIds: ReadonlyArray<string>;\n tx: ClientSQLiteTransactionScope;\n}): Promise<void> {\n return repairRemovedLinks({ ...input, discardPrimaryMoves: true });\n}\n\n/* An unsigned absence hint must not let an old 404 strand queued placement. */\nexport async function refreshPlacementIntentsAfterRemoval(input: {\n containerIds: ReadonlyArray<string>;\n tx: ClientSQLiteTransactionScope;\n}): Promise<void> {\n const { tx } = input;\n for (const intent of await loadAffectedIntents(\n tx,\n input.containerIds,\n true,\n )) {\n // Rotate the revision to refuse completion from a pass that parked the old intent.\n const id = crypto.randomUUID();\n await tx\n .update(documentIntentLinkTargets)\n .set({ intentId: id })\n .where(eq(documentIntentLinkTargets.intentId, intent.id ?? \"\"))\n .run();\n await tx\n .update(localIntents)\n .set({\n id,\n syncStatus:\n intent.syncStatus === \"unavailable\" ? \"pending\" : intent.syncStatus,\n lastError:\n intent.syncStatus === \"unavailable\" ? null : intent.lastError,\n lastAttemptedAt:\n intent.syncStatus === \"unavailable\" ? null : intent.lastAttemptedAt,\n updatedAt: new Date().toISOString(),\n })\n .where(eq(localIntents.id, intent.id ?? \"\"))\n .run();\n }\n}\n"]}

package/data/persistence/container-contents/documentMoveIntentPersistence.js CHANGED Viewed

@@ -1,10 +1,11 @@
 import { and, asc, eq, inArray } from "drizzle-orm";
 import { documentIntentLinkTargets } from "../../sqlite/documentPlacementIntentSchema.js";
-import { containerTables, documentMoveIntents, documentMoveIntentTables, documentProjectionTables, } from "../../sqlite/schema.js";
+import { containerTables, documentPlacementIntentTables, documentProjectionTables, inLocalIntentLane, LOCAL_INTENT_LANES, localIntents, } from "../../sqlite/schema.js";
 import { getClientSQLitePersistenceRuntime } from "../../sqlite/sqlitePersistenceRuntime.js";
 import { ensureSqlTables, runSerializedSqlMutation, } from "../../sqlite/sqlSchema.js";
 import { enqueueDocumentLinkIntent, enqueueDocumentMoveIntent, enqueueDocumentUnlinkIntent, loadDocumentIntentLinkTargets, } from "./documentPlacementIntentEnqueue.js";
 export const DOCUMENT_MOVE_INTENT_TYPE = "document.move";
+const placementLane = inLocalIntentLane(LOCAL_INTENT_LANES.documentPlacement);
 export const DOCUMENT_LINK_INTENT_TYPE = "document.link";
 const DOCUMENT_PLACEMENT_INTENT_TYPES = [
     DOCUMENT_MOVE_INTENT_TYPE,
@@ -51,7 +52,8 @@ function mapDocumentMoveIntentRecord(row) {
             : DOCUMENT_MOVE_INTENT_TYPE,
         lastAttemptedAt: row.lastAttemptedAt,
         lastError: row.lastError,
-        localId: row.localId,
+        // Placement intents always carry their local document row.
+        localId: row.localId ?? "",
         replaceLinkedContainers: Boolean(row.replaceLinkedContainers),
         sourceContainerId: row.sourceContainerId,
         syncStatus: parseDocumentMoveIntentSyncStatus(row.syncStatus),
@@ -62,18 +64,31 @@ function mapDocumentMoveIntentRecord(row) {
 }
 export const sqlDocumentMoveIntentPersistence = {
     async ensureSchema(execSql) {
-        await ensureSqlTables(execSql, documentMoveIntentTables);
+        await ensureSqlTables(execSql, documentPlacementIntentTables);
     },
     enqueueMoveIntent: enqueueDocumentMoveIntent,
     enqueueLinkIntent: enqueueDocumentLinkIntent,
     enqueueUnlinkIntent: enqueueDocumentUnlinkIntent,
     async listPendingMoveIntents(execSql) {
         return runSerializedSqlMutation(execSql, async (lockedExecSql) => {
-            await ensureSqlTables(lockedExecSql, documentMoveIntentTables);
+            await ensureSqlTables(lockedExecSql, documentPlacementIntentTables);
             return getClientSQLitePersistenceRuntime(lockedExecSql).transaction(async (tx) => {
                 const rows = await tx
-                    .select()
-                    .from(documentMoveIntents)
+                    .select({
+                    id: localIntents.id,
+                    documentId: localIntents.subjectId,
+                    intentType: localIntents.intentType,
+                    lastAttemptedAt: localIntents.lastAttemptedAt,
+                    lastError: localIntents.lastError,
+                    localId: localIntents.localId,
+                    replaceLinkedContainers: localIntents.replaceLinkedContainers,
+                    sourceContainerId: localIntents.sourceContainerId,
+                    syncStatus: localIntents.syncStatus,
+                    targetContainerId: localIntents.targetContainerId,
+                    createdAt: localIntents.createdAt,
+                    updatedAt: localIntents.updatedAt,
+                })
+                    .from(localIntents)
                     // Blocked intents replay too: "blocked" names the reason the last
                     // attempt could not proceed (missing local doc / destination), not a
                     // terminal verdict. The blocking condition can heal after hydration or
@@ -82,8 +97,8 @@ export const sqlDocumentMoveIntentPersistence = {
                     // Unavailable intents never replay: the server proved a cited container
                     // is gone, so every replay would re-issue the same doomed requests
                     // (#2278 #4). Only the tombstone cascade or a re-enqueue revives them.
-                    .where(and(inArray(documentMoveIntents.syncStatus, ["pending", "blocked"]), inArray(documentMoveIntents.intentType, DOCUMENT_PLACEMENT_INTENT_TYPES)))
-                    .orderBy(asc(documentMoveIntents.createdAt));
+                    .where(and(placementLane, inArray(localIntents.syncStatus, ["pending", "blocked"]), inArray(localIntents.intentType, DOCUMENT_PLACEMENT_INTENT_TYPES)))
+                    .orderBy(asc(localIntents.createdAt));
                 return Promise.all(rows.map(async (row) => {
                     const targets = await loadDocumentIntentLinkTargets(lockedExecSql, row.id ?? "");
                     const added = targets
@@ -105,12 +120,14 @@ export const sqlDocumentMoveIntentPersistence = {
     },
     async markMoveIntentSynced(execSql, input) {
         return runSerializedSqlMutation(execSql, async (lockedExecSql) => {
-            const deleted = await lockedExecSql(`DELETE FROM document_move_intents
-         WHERE document_id = ?
+            const deleted = await lockedExecSql(`DELETE FROM local_intents
+         WHERE lane = ?
+           AND subject_id = ?
            AND intent_type IN (?, ?)
            AND updated_at = ?
            ${input.expectedIntentId ? "AND id = ?" : ""}
          RETURNING id`, [
+                LOCAL_INTENT_LANES.documentPlacement,
                 input.documentId,
                 ...DOCUMENT_PLACEMENT_INTENT_TYPES,
                 input.expectedUpdatedAt,
@@ -129,25 +146,25 @@ export const sqlDocumentMoveIntentPersistence = {
         await getClientSQLitePersistenceRuntime(execSql).guardedTransaction(async (db) => {
             const updatedAt = new Date().toISOString();
             await db
-                .update(documentMoveIntents)
+                .update(localIntents)
                 .set({
                 lastAttemptedAt: updatedAt,
                 lastError: input.message,
                 syncStatus: resolveRecordedSyncStatus(input),
                 updatedAt,
             })
-                .where(and(eq(documentMoveIntents.documentId, input.documentId),
+                .where(and(placementLane, eq(localIntents.subjectId, input.documentId),
             // Blocked/denied rows must stay updatable: a retried intent
             // records its fresh outcome, and a transient failure flips it
             // back to pending instead of freezing it forever.
-            inArray(documentMoveIntents.syncStatus, [
+            inArray(localIntents.syncStatus, [
                 "pending",
                 "blocked",
                 "denied",
-            ]), inArray(documentMoveIntents.intentType, DOCUMENT_PLACEMENT_INTENT_TYPES), ...(input.expectedIntentId
-                ? [eq(documentMoveIntents.id, input.expectedIntentId)]
+            ]), inArray(localIntents.intentType, DOCUMENT_PLACEMENT_INTENT_TYPES), ...(input.expectedIntentId
+                ? [eq(localIntents.id, input.expectedIntentId)]
                 : []), ...(input.expectedUpdatedAt
-                ? [eq(documentMoveIntents.updatedAt, input.expectedUpdatedAt)]
+                ? [eq(localIntents.updatedAt, input.expectedUpdatedAt)]
                 : [])))
                 .run();
         }, input.stillCurrent ?? (() => true), { behavior: "immediate" });
@@ -162,15 +179,18 @@ export const sqlDocumentMoveIntentPersistence = {
             ...documentProjectionTables,
             ...containerTables,
         ]);
-        const rows = await execSql(`SELECT intent.document_id AS document_id
-       FROM document_move_intents intent
+        const rows = await execSql(`SELECT intent.subject_id AS document_id
+       FROM local_intents intent
        ${input?.organizationId ? DENIED_INTENT_ORGANIZATION_JOINS_SQL : ""}
-       WHERE intent.sync_status = 'denied'
+       WHERE intent.lane = ?
+         AND intent.sync_status = 'denied'
          AND intent.intent_type IN (?, ?)
          ${input?.organizationId ? `AND (${DENIED_INTENT_ORGANIZATION_SQL} = ? OR ${DENIED_INTENT_ORGANIZATION_SQL} IS NULL)` : ""}
-       LIMIT 1`, input?.organizationId
-            ? [...DOCUMENT_PLACEMENT_INTENT_TYPES, input.organizationId]
-            : DOCUMENT_PLACEMENT_INTENT_TYPES);
+       LIMIT 1`, [
+            LOCAL_INTENT_LANES.documentPlacement,
+            ...DOCUMENT_PLACEMENT_INTENT_TYPES,
+            ...(input?.organizationId ? [input.organizationId] : []),
+        ]);
         return rows.length > 0;
     },
     /**
@@ -189,23 +209,28 @@ export const sqlDocumentMoveIntentPersistence = {
             // container joins above: restoring one organization's access must not
             // un-park moves that another organization still denies. Rows with no
             // resolvable organization are included (device-first shapes).
-            await lockedExecSql(`UPDATE document_move_intents
+            await lockedExecSql(`UPDATE local_intents
          SET sync_status = 'pending', updated_at = ?
-         WHERE sync_status = 'denied'
+         WHERE lane = ?
+           AND sync_status = 'denied'
            AND intent_type IN (?, ?)
            ${input?.localId ? "AND local_id = ?" : ""}
            ${input?.organizationId
                 ? `AND local_id IN (
-                    SELECT intent.local_id FROM document_move_intents intent
+                    SELECT intent.local_id FROM local_intents intent
                     ${DENIED_INTENT_ORGANIZATION_JOINS_SQL}
-                    WHERE ${DENIED_INTENT_ORGANIZATION_SQL} = ?
-                      OR ${DENIED_INTENT_ORGANIZATION_SQL} IS NULL
+                    WHERE intent.lane = ?
+                      AND (${DENIED_INTENT_ORGANIZATION_SQL} = ?
+                        OR ${DENIED_INTENT_ORGANIZATION_SQL} IS NULL)
                   )`
                 : ""}`, [
                 new Date().toISOString(),
+                LOCAL_INTENT_LANES.documentPlacement,
                 ...DOCUMENT_PLACEMENT_INTENT_TYPES,
                 ...(input?.localId ? [input.localId] : []),
-                ...(input?.organizationId ? [input.organizationId] : []),
+                ...(input?.organizationId
+                    ? [LOCAL_INTENT_LANES.documentPlacement, input.organizationId]
+                    : []),
             ]);
         });
     },