@indigoai-us/hq-cloud 6.15.55 → 6.15.57

package/dist/cli/sync.test.js

@@ -120,13 +120,20 @@ vi.mock("../s3.js", async (importOriginal) => {
 vi.mock("./reindex.js", () => ({
     reindex: vi.fn(() => ({ status: 0 })),
 }));
+vi.mock("../remote-pull.js", async (importOriginal) => {
+    const actual = await importOriginal();
+    const { vi: innerVi } = await import("vitest");
+    return { ...actual, listRemoteForScope: innerVi.fn(actual.listRemoteForScope) };
+});
 import { sync, reportNewFilesToNotify, applyRealtimeDeltaPage, isSyncMutationStdinCommand, runSyncMutationStdinJson, SYNC_MUTATION_STDIN_COMMAND, win32SymlinkFlavorBroken, } from "./sync.js";
 import { share } from "./share.js";
 import * as s3Module from "../s3.js";
 import * as conflictModule from "./conflict.js";
+import * as remotePullModule from "../remote-pull.js";
 import { reindex } from "./reindex.js";
 import { readSyncProgress } from "../sync-progress.js";
 import { VaultAuthError } from "../vault-client.js";
+import * as journalModule from "../journal.js";
 import { readJournal, writeJournal, getEntry, listJournals } from "../journal.js";
 /**
  * Read a journal the way production does.
@@ -238,6 +245,7 @@ describe("sync", () => {
     });
     afterEach(() => {
         vi.unstubAllGlobals();
+        vi.mocked(remotePullModule.listRemoteForScope).mockRestore();
         vi.clearAllMocks();
         fs.rmSync(tmpDir, { recursive: true, force: true });
         fs.rmSync(stateDir, { recursive: true, force: true });
@@ -293,6 +301,83 @@ describe("sync", () => {
         expect(readJournal("acme").files["deleted-during-list.md"]?.removedReason)
             .toBe("local-delete");
     });
+    it("targeted pulls do not rematerialize the v3 journal after their cold keyed-session open", async () => {
+        writeJournal("acme", {
+            version: "2",
+            lastSync: "",
+            pulls: [],
+            files: {
+                "docs/known.md": {
+                    hash: "a".repeat(64), size: 1, syncedAt: "2026-08-25T00:00:00.000Z", direction: "down",
+                },
+            },
+        });
+        const materialisations = vi.spyOn(journalModule, "readJournal");
+        materialisations.mockClear();
+        vi.mocked(remotePullModule.listRemoteForScope).mockResolvedValue([
+            { key: "docs/known.md", size: 1, lastModified: new Date(), etag: '"known"' },
+        ]);
+        await sync({ company: "acme", vaultConfig: mockConfig, hqRoot: tmpDir, pullPrefixes: ["docs"], skipReindex: true });
+        await sync({ company: "acme", vaultConfig: mockConfig, hqRoot: tmpDir, pullPrefixes: ["docs"], skipReindex: true });
+        // Unfixed origin/main fails here with:
+        //   expected "readJournal" to be called +0 times, but got 2 times
+        expect(materialisations).not.toHaveBeenCalled();
+    });
+    it("keeps warm targeted journal work in milliseconds with a 100k-row journal", async () => {
+        const files = {
+            "docs/known.md": { hash: "a".repeat(64), size: 1, syncedAt: "2026-08-25T00:00:00.000Z", direction: "down" },
+        };
+        for (let index = 0; index < 100_000; index++) {
+            files[`unrelated/${index}.md`] = {
+                hash: "b".repeat(64), size: index, syncedAt: "2026-08-25T00:00:00.000Z", direction: "down",
+            };
+        }
+        writeJournal("acme", { version: "2", lastSync: "", pulls: [], files });
+        vi.mocked(remotePullModule.listRemoteForScope).mockResolvedValue([
+            { key: "docs/known.md", size: 1, lastModified: new Date(), etag: '"known"' },
+        ]);
+        const options = { company: "acme", vaultConfig: mockConfig, hqRoot: tmpDir, pullPrefixes: ["docs"], skipReindex: true };
+        // Cold open is intentionally excluded: the contract is no *per-pass*
+        // materialisation after the long-lived keyed session has opened.
+        await sync(options);
+        const started = performance.now();
+        await sync(options);
+        expect(performance.now() - started).toBeLessThan(500);
+    });
+    it("only tombstones remote deletions inside the targeted prefix", async () => {
+        writeJournal("acme", {
+            version: "2", lastSync: "", pulls: [], files: {
+                "docs/deleted.md": { hash: crypto.createHash("sha256").update("gone").digest("hex"), size: 4, syncedAt: "2026-08-25T00:00:00.000Z", direction: "down" },
+                "outside/kept.md": { hash: "b".repeat(64), size: 1, syncedAt: "2026-08-25T00:00:00.000Z", direction: "down" },
+            },
+        });
+        const companyRoot = path.join(tmpDir, "companies", "acme");
+        fs.mkdirSync(path.join(companyRoot, "docs"), { recursive: true });
+        fs.mkdirSync(path.join(companyRoot, "outside"), { recursive: true });
+        fs.writeFileSync(path.join(companyRoot, "docs", "deleted.md"), "gone");
+        fs.writeFileSync(path.join(companyRoot, "outside", "kept.md"), "keep");
+        vi.mocked(remotePullModule.listRemoteForScope).mockResolvedValue([]);
+        vi.mocked(s3Module.headRemoteFile).mockResolvedValue(null);
+        await sync({ company: "acme", vaultConfig: mockConfig, hqRoot: tmpDir, pullPrefixes: ["docs"], skipReindex: true });
+        expect(readJournal("acme").files["docs/deleted.md"]).toBeUndefined();
+        expect(readJournal("acme").files["outside/kept.md"]).toBeDefined();
+        expect(fs.readFileSync(path.join(companyRoot, "outside", "kept.md"), "utf8")).toBe("keep");
+    });
+    it("refreshes a concurrent writer after LIST and explicit keyed delta leaves it intact", async () => {
+        writeJournal("acme", { version: "2", lastSync: "", pulls: [], files: {} });
+        vi.mocked(remotePullModule.listRemoteForScope).mockImplementationOnce(async () => {
+            const concurrent = readJournal("acme");
+            concurrent.files["outside/push.md"] = {
+                hash: "c".repeat(64), size: 7, syncedAt: "2026-08-25T00:00:00.000Z", direction: "up",
+            };
+            writeJournal("acme", concurrent);
+            return [{ key: "docs/pull.md", size: 4, lastModified: new Date(), etag: '"pull"' }];
+        });
+        await sync({ company: "acme", vaultConfig: mockConfig, hqRoot: tmpDir, pullPrefixes: ["docs"], skipReindex: true });
+        const finalJournal = readJournal("acme");
+        expect(finalJournal.files["outside/push.md"]?.direction).toBe("up");
+        expect(finalJournal.files["docs/pull.md"]).toBeDefined();
+    });
     it("pulses liveness from the synchronous pull planner", async () => {
         let heartbeatCalls = 0;
         await sync({