@indigoai-us/hq-cloud 6.15.26 → 6.15.28

package/dist/cli/sync.test.js

@@ -530,6 +530,60 @@ describe("sync", () => {
         // …and the local one survives beside it.
         expect(fs.readFileSync(sidecarIn(companyDocs), "utf-8")).toBe("local version");
     });
+    it("rechecks the current local body when executing a planned conflict", async () => {
+        const companyDocs = path.join(tmpDir, "companies", "acme", "docs");
+        fs.mkdirSync(companyDocs, { recursive: true });
+        const localPath = path.join(companyDocs, "handoff.md");
+        fs.writeFileSync(localPath, "local body seen by the planner");
+        fs.writeFileSync(journalPath, JSON.stringify({
+            version: "1",
+            lastSync: new Date().toISOString(),
+            files: {
+                "docs/handoff.md": {
+                    hash: "common-base-hash",
+                    size: 16,
+                    syncedAt: new Date(Date.now() - 3600000).toISOString(),
+                    direction: "down",
+                    remoteEtag: "common-base-etag",
+                },
+            },
+        }));
+        vi.mocked(s3Module.listRemoteFiles).mockResolvedValueOnce([
+            {
+                key: "docs/handoff.md",
+                size: "mock file content".length,
+                lastModified: new Date(),
+                etag: '"new-remote-etag"',
+            },
+        ]);
+        let changedAfterPlan = false;
+        const result = await sync({
+            company: "acme",
+            onConflict: "keep",
+            vaultConfig: mockConfig,
+            hqRoot: tmpDir,
+            onEvent: (event) => {
+                if (event.type === "plan" && !changedAfterPlan) {
+                    changedAfterPlan = true;
+                    // The local writer converged this path with the cloud after the
+                    // whole-run preview classified it, but before its action executes.
+                    fs.writeFileSync(localPath, "mock file content");
+                }
+            },
+        });
+        expect(changedAfterPlan).toBe(true);
+        expect(result.conflicts).toBe(0);
+        expect(result.conflictPaths).toEqual([]);
+        expect(fs.readdirSync(companyDocs).filter((name) => name.includes(".conflict-")))
+            .toEqual([]);
+        const entry = journalAt(journalPath).files["docs/handoff.md"];
+        expect(entry).toMatchObject({
+            hash: crypto.createHash("sha256").update("mock file content").digest("hex"),
+            remoteEtag: "new-remote-etag",
+            direction: "down",
+        });
+        expect(entry.localDiverges).toBeFalsy();
+    });
     it("conflict skip marks the entry localDiverges (journal-honesty: the held copy never matched the recorded remote etag)", async () => {
         const companyDocs = path.join(tmpDir, "companies", "acme", "docs");
         fs.mkdirSync(companyDocs, { recursive: true });
@@ -3351,6 +3405,42 @@ describe("sync", () => {
         expect(journal.files["docs/handoff.md"].remoteEtag).toBe("abc123");
         expect(journal.files["knowledge/readme.md"].remoteEtag).toBe("def456");
     });
+    it("persists each downloaded hash before starting the next file", async () => {
+        process.env.HQ_SYNC_TRANSFER_CONCURRENCY = "1";
+        const remoteFiles = [
+            { key: "ordered/first.md", size: 18, lastModified: new Date(), etag: '"first-etag"' },
+            { key: "ordered/second.md", size: 18, lastModified: new Date(), etag: '"second-etag"' },
+        ];
+        const defaultDownload = vi.mocked(s3Module.downloadFile).getMockImplementation();
+        if (!defaultDownload)
+            throw new Error("missing default download mock");
+        try {
+            vi.mocked(s3Module.listRemoteFiles).mockResolvedValueOnce(remoteFiles);
+            vi.mocked(s3Module.downloadFile).mockImplementation(async (ctx, key, localPath, options) => {
+                if (key === "ordered/second.md") {
+                    const first = journalAt(journalPath).files["ordered/first.md"];
+                    expect(first).toMatchObject({
+                        hash: crypto.createHash("sha256").update("mock file content").digest("hex"),
+                        remoteEtag: "first-etag",
+                        direction: "down",
+                    });
+                    expect(first.localDiverges).toBeFalsy();
+                }
+                return defaultDownload(ctx, key, localPath, options);
+            });
+            await sync({
+                company: "acme",
+                vaultConfig: mockConfig,
+                hqRoot: tmpDir,
+                skipReindex: true,
+                onEvent: () => undefined,
+            });
+        }
+        finally {
+            vi.mocked(s3Module.downloadFile).mockImplementation(defaultDownload);
+            delete process.env.HQ_SYNC_TRANSFER_CONCURRENCY;
+        }
+    });
     it("checkpoints completed downloads so a failed bulk pass resumes only its tail", async () => {
         process.env.HQ_SYNC_TRANSFER_CONCURRENCY = "1";
         const remoteFiles = Array.from({ length: 9 }, (_, index) => ({