@indigoai-us/hq-cloud 6.15.44 → 6.15.46

package/dist/cli/sync.test.js

@@ -127,7 +127,7 @@ import * as conflictModule from "./conflict.js";
 import { reindex } from "./reindex.js";
 import { readSyncProgress } from "../sync-progress.js";
 import { VaultAuthError } from "../vault-client.js";
-import { readJournal, getEntry, listJournals } from "../journal.js";
+import { readJournal, writeJournal, getEntry, listJournals } from "../journal.js";
 /**
  * Read a journal the way production does.
  *
@@ -246,6 +246,53 @@ describe("sync", () => {
     it("keeps classifyVaultKey available from the partial S3 mock", () => {
         expect(s3Module.classifyVaultKey("docs/readme.md", "company")).toBeNull();
     });
+    it("uses a journal update committed during LIST to classify a local delete as intentional", async () => {
+        const companyRoot = path.join(tmpDir, "companies", "acme");
+        fs.mkdirSync(companyRoot, { recursive: true });
+        writeJournal("acme", {
+            version: "2",
+            lastSync: "",
+            pulls: [],
+            files: {
+                "deleted-during-list.md": {
+                    hash: "a".repeat(64),
+                    size: 1,
+                    syncedAt: "2026-08-24T21:48:05.000Z",
+                    direction: "up",
+                    remoteEtag: "current-etag",
+                    kind: "file",
+                },
+            },
+        });
+        // This is the production timing: sync has loaded its journal and is blocked
+        // in LIST when the watcher records the local deletion intent.
+        vi.mocked(s3Module.listRemoteFiles).mockImplementationOnce(async () => {
+            const watcherJournal = readJournal("acme");
+            watcherJournal.files["deleted-during-list.md"].localDeleteIntent = {
+                version: 1,
+                remoteEtag: "current-etag",
+                localHash: "a".repeat(64),
+                localKind: "file",
+            };
+            writeJournal("acme", watcherJournal);
+            return [{
+                    key: "deleted-during-list.md",
+                    size: 1,
+                    lastModified: new Date(),
+                    etag: '"current-etag"',
+                }];
+        });
+        await sync({
+            company: "acme",
+            vaultConfig: mockConfig,
+            hqRoot: tmpDir,
+            onConflict: "keep",
+            skipReindex: true,
+        });
+        expect(s3Module.downloadFile).not.toHaveBeenCalled();
+        expect(readJournal("acme").files["deleted-during-list.md"]?.removedReason)
+            .toBe("local-delete");
+    });
     it("pulses liveness from the synchronous pull planner", async () => {
         let heartbeatCalls = 0;
         await sync({
@@ -1734,7 +1781,7 @@ describe("sync", () => {
         expect(s3Module.downloadFile).toHaveBeenCalledWith(expect.anything(), key, expect.anything(), expect.anything());
         expect(fs.readFileSync(localPath, "utf-8")).toBe("mock file content");
     });
-    it("does not infer local-delete intent from a single missing file", async () => {
+    it("currency-gated pull treats a watcherless, ETag-current missing file as an intentional delete", async () => {
         const key = "docs/gone.md";
         const localPath = path.join(tmpDir, "companies", "acme", key);
         vi.mocked(s3Module.listRemoteFiles).mockResolvedValueOnce([
@@ -1755,11 +1802,88 @@ describe("sync", () => {
             },
             pulls: [],
         }));
-        await sync({ company: "acme", vaultConfig: mockConfig, hqRoot: tmpDir });
+        await sync({
+            company: "acme",
+            vaultConfig: mockConfig,
+            hqRoot: tmpDir,
+            propagateDeletePolicy: "currency-gated",
+        });
+        expect(s3Module.downloadFile).not.toHaveBeenCalled();
+        expect(fs.existsSync(localPath)).toBe(false);
+        const journal = journalAt(journalPath);
+        expect(journal.files[key]?.removedReason).toBe("local-delete");
+    });
+    it("owned-only pull refuses the same watcherless missing file for want of an intent", async () => {
+        const key = "docs/gone.md";
+        const localPath = path.join(tmpDir, "companies", "acme", key);
+        vi.mocked(s3Module.listRemoteFiles).mockResolvedValueOnce([
+            { key, size: 42, lastModified: new Date(), etag: '"cur123"' },
+        ]);
+        setupFetchMock({ tombstones: [] });
+        fs.writeFileSync(journalPath, JSON.stringify({
+            version: "2",
+            lastSync: new Date().toISOString(),
+            files: {
+                [key]: {
+                    hash: "h",
+                    size: 42,
+                    syncedAt: new Date().toISOString(),
+                    direction: "down",
+                    remoteEtag: "cur123",
+                },
+            },
+            pulls: [],
+        }));
+        await sync({
+            company: "acme",
+            vaultConfig: mockConfig,
+            hqRoot: tmpDir,
+            propagateDeletePolicy: "owned-only",
+        });
         expect(s3Module.downloadFile).toHaveBeenCalledWith(expect.anything(), key, expect.anything(), expect.anything());
         expect(fs.readFileSync(localPath, "utf-8")).toBe("mock file content");
+        expect(journalAt(journalPath).files[key]?.removedAt).toBeUndefined();
+    });
+    it("currency-gated pull still downloads stale-ETag and divergent watcherless absences", async () => {
+        const staleKey = "docs/stale.md";
+        const divergentKey = "docs/divergent.md";
+        vi.mocked(s3Module.listRemoteFiles).mockResolvedValueOnce([
+            { key: staleKey, size: 42, lastModified: new Date(), etag: '"remote-etag"' },
+            { key: divergentKey, size: 42, lastModified: new Date(), etag: '"cur123"' },
+        ]);
+        setupFetchMock({ tombstones: [] });
+        fs.writeFileSync(journalPath, JSON.stringify({
+            version: "2",
+            lastSync: new Date().toISOString(),
+            files: {
+                [staleKey]: {
+                    hash: "h",
+                    size: 42,
+                    syncedAt: new Date().toISOString(),
+                    direction: "down",
+                    remoteEtag: "old-etag",
+                },
+                [divergentKey]: {
+                    hash: "h",
+                    size: 42,
+                    syncedAt: new Date().toISOString(),
+                    direction: "down",
+                    remoteEtag: "cur123",
+                    localDiverges: true,
+                },
+            },
+            pulls: [],
+        }));
+        await sync({
+            company: "acme",
+            vaultConfig: mockConfig,
+            hqRoot: tmpDir,
+            propagateDeletePolicy: "currency-gated",
+        });
+        expect(s3Module.downloadFile).toHaveBeenCalledTimes(2);
         const journal = journalAt(journalPath);
-        expect(journal.files[key]?.removedAt).toBeUndefined();
+        expect(journal.files[staleKey]?.removedAt).toBeUndefined();
+        expect(journal.files[divergentKey]?.removedAt).toBeUndefined();
     });
     it("does not canonicalize ignored remote-missing journal keys in the tombstone sweep", async () => {
         // Regression (2026-08-19 sync-runner CPU storm): a stale journal carried
@@ -1850,7 +1974,7 @@ describe("sync", () => {
         expect(fs.existsSync(localPath)).toBe(false);
         expect(journalAt(journalPath).files[key]?.localDeleteIntent).toBeDefined();
     });
-    it("pull producer: a BULK disappearance is drift-restored, NOT tombstoned (ridge-incident guard in the pull leg)", async () => {
+    it("pull producer: a watcherless BULK disappearance is drift-restored, NOT tombstoned (ridge-incident guard in the pull leg)", async () => {
         // 12 clean files vanish at once (corrupt mirror / bulk rm / checkout). The
         // bulk-asymmetry guard refuses to treat this as intent — every file is
         // healed (re-downloaded), none tombstoned.
@@ -1866,12 +1990,6 @@ describe("sync", () => {
                 direction: "down",
                 kind: "file",
                 remoteEtag: `e-${k}`,
-                localDeleteIntent: {
-                    version: 1,
-                    remoteEtag: `e-${k}`,
-                    localHash: "h",
-                    localKind: "file",
-                },
             };
         }
         fs.writeFileSync(journalPath, JSON.stringify({
@@ -1880,7 +1998,12 @@ describe("sync", () => {
             files,
             pulls: [],
         }));
-        await sync({ company: "acme", vaultConfig: mockConfig, hqRoot: tmpDir });
+        await sync({
+            company: "acme",
+            vaultConfig: mockConfig,
+            hqRoot: tmpDir,
+            propagateDeletePolicy: "currency-gated",
+        });
         // All restored, none tombstoned.
         expect(s3Module.downloadFile).toHaveBeenCalledTimes(12);
         const journal = journalAt(journalPath);
@@ -1921,7 +2044,12 @@ describe("sync", () => {
             },
             pulls: [],
         }));
-        await sync({ company: "acme", vaultConfig: mockConfig, hqRoot: tmpDir });
+        await sync({
+            company: "acme",
+            vaultConfig: mockConfig,
+            hqRoot: tmpDir,
+            propagateDeletePolicy: "currency-gated",
+        });
         expect(s3Module.downloadFile).not.toHaveBeenCalledWith(expect.anything(), key, expect.anything());
         expect(fs.existsSync(localPath)).toBe(false);
         const journal = journalAt(journalPath);