@indigoai-us/hq-cloud 6.15.80 → 6.15.82

package/dist/cli/share.test.js

@@ -17,30 +17,40 @@ vi.mock("fs", async (importOriginal) => {
 // response shape is `{ ETag: '"<hex>"' }`. uploadSymlink is the symlink-
 // preserving sibling that puts a zero-byte object with target metadata
 // instead of dereferencing the link.
-vi.mock("../s3.js", () => ({
-    toPosixKey: (key) => key.split("\\").join("/"),
-    uploadFile: vi.fn().mockResolvedValue({ etag: '"upload-etag"' }),
-    uploadSymlink: vi.fn().mockResolvedValue({ etag: '"upload-symlink-etag"' }),
-    downloadFile: vi.fn().mockResolvedValue(undefined),
-    listRemoteFiles: vi.fn().mockResolvedValue([]),
-    deleteRemoteFile: vi.fn().mockResolvedValue(undefined),
-    headRemoteFile: vi.fn().mockResolvedValue(null),
-    readVerifiedRemoteSymlinkTarget: vi.fn().mockResolvedValue(null),
-    primeObjectTransport: vi.fn().mockResolvedValue(undefined),
-    primeUploads: vi.fn().mockResolvedValue(undefined),
-    // Real exports share.ts now imports for the HQ-DESKTOP-54 privilege skip.
-    WINDOWS_SYMLINK_PRIVILEGE_REMEDY: "Enable Windows Developer Mode (Settings > Privacy & security > For developers) or run HQ sync once from an elevated terminal, then sync again.",
-    WindowsSymlinkPrivilegeError: class WindowsSymlinkPrivilegeError extends Error {
-        target;
-        code;
-        constructor(target, code) {
-            super(`symlink skipped: creating a file symlink to ${target} requires a Windows privilege`);
-            this.name = "WindowsSymlinkPrivilegeError";
-            this.target = target;
-            this.code = code;
-        }
-    },
-}));
+vi.mock("../s3.js", async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        toPosixKey: (key) => key.split("\\").join("/"),
+        uploadFile: vi.fn().mockResolvedValue({ etag: '"upload-etag"' }),
+        uploadSymlink: vi.fn().mockResolvedValue({ etag: '"upload-symlink-etag"' }),
+        downloadFile: vi.fn().mockResolvedValue(undefined),
+        listRemoteFiles: vi.fn().mockResolvedValue([]),
+        deleteRemoteFile: vi.fn().mockResolvedValue(undefined),
+        headRemoteFile: vi.fn().mockResolvedValue(null),
+        readVerifiedRemoteSymlinkTarget: vi.fn().mockResolvedValue(null),
+        primeObjectTransport: vi.fn().mockResolvedValue(undefined),
+        primeUploads: vi.fn().mockResolvedValue(undefined),
+        // Real exports share.ts now imports for the HQ-DESKTOP-54 privilege skip.
+        WINDOWS_SYMLINK_PRIVILEGE_REMEDY: "Enable Windows Developer Mode (Settings > Privacy & security > For developers) or run HQ sync once from an elevated terminal, then sync again.",
+        WindowsSymlinkPrivilegeError: class WindowsSymlinkPrivilegeError extends Error {
+            target;
+            code;
+            constructor(target, code) {
+                super(`symlink skipped: creating a file symlink to ${target} requires a Windows privilege`);
+                this.name = "WindowsSymlinkPrivilegeError";
+                this.target = target;
+                this.code = code;
+            }
+        },
+        // HQ-DESKTOP-54 (second path): the real win32 rename guard, typed error, and
+        // remedy that share.ts now imports. Real so `instanceof` matches the error the
+        // real helper throws, and the POSIX pass-through keeps existing push tests
+        // byte-identical.
+        renameOrRaiseWindowsBlocked: actual.renameOrRaiseWindowsBlocked,
+        WindowsRenameBlockedError: actual.WindowsRenameBlockedError,
+        WINDOWS_RENAME_BLOCKED_REMEDY: actual.WINDOWS_RENAME_BLOCKED_REMEDY,
+    };
+});
 // Mock readline so the interactive-conflict serialization test can observe
 // prompt lifecycle (createInterface + close) without ever touching stdin.
 // Default impl never resolves; conflict-prompt tests below override per-test
@@ -1986,6 +1996,103 @@ describe("share", () => {
         expect(result.conflictPaths).toEqual(["v7b-priv.txt"]);
         expect(fs.readFileSync(testFile, "utf-8")).toBe("local-collision-content");
     });
+    it("HQ-DESKTOP-54 (second path): a blocked push conflict-keep move-aside rename is a skip, not an error, and does not touch the local body", async () => {
+        // Push keep moves the local body aside before adopting the remote. On a
+        // Windows host where a program is holding that file open, the move-aside
+        // rename EPERMs; s3 raises the typed WindowsRenameBlockedError
+        // immediately (no retry). The push leg must downgrade it to the
+        // deliberate skip (never type:"error") so the company stays complete and the
+        // runner exits 0 — mirroring the symlink-privilege skip above.
+        const companyRoot = path.join(tmpDir, "companies", "acme");
+        fs.mkdirSync(companyRoot, { recursive: true });
+        const testFile = path.join(companyRoot, "v7b-rename.txt");
+        fs.writeFileSync(testFile, "local-collision-content");
+        vi.mocked(headRemoteFile).mockResolvedValueOnce({
+            lastModified: new Date(),
+            etag: '"remote-version-etag"',
+            size: 40,
+        });
+        // The reconciled probe fetches the (divergent) remote so a conflict is
+        // detected; the move-aside rename below is what fails.
+        vi.mocked(downloadFile).mockImplementation(async (_ctx, _key, dest) => {
+            fs.writeFileSync(dest, "peer remote content");
+            return undefined;
+        });
+        const realRenameSync = fs.renameSync;
+        const renameSpy = vi.spyOn(fs, "renameSync").mockImplementation((from, to) => {
+            if (String(from) === testFile && String(to).includes(".conflict-")) {
+                const err = new Error("EPERM: operation not permitted, rename");
+                err.code = "EPERM";
+                throw err;
+            }
+            return realRenameSync(from, to);
+        });
+        const realPlatform = process.platform;
+        Object.defineProperty(process, "platform", { value: "win32", configurable: true });
+        const events = [];
+        let result;
+        try {
+            result = await share({
+                paths: [testFile],
+                company: "acme",
+                vaultConfig: mockConfig,
+                hqRoot: tmpDir,
+                onConflict: "keep",
+                onEvent: (e) => events.push(e),
+            });
+        }
+        finally {
+            Object.defineProperty(process, "platform", { value: realPlatform, configurable: true });
+            renameSpy.mockRestore();
+        }
+        expect(events).toContainEqual(expect.objectContaining({ type: "skip-rename-blocked", path: "v7b-rename.txt" }));
+        expect(events.some((e) => e.type === "error")).toBe(false);
+        // Nothing was moved or overwritten: the local body is intact and no upload
+        // happened, so the conflict simply re-fires next pass.
+        expect(fs.readFileSync(testFile, "utf-8")).toBe("local-collision-content");
+        expect(result.filesUploaded).toBe(0);
+    });
+    it("HQ-DESKTOP-54 (second path): the push default console logger renders the rename-blocked skip and its remedy (a plain `hq sync` is not silent)", async () => {
+        const companyRoot = path.join(tmpDir, "companies", "acme");
+        fs.mkdirSync(companyRoot, { recursive: true });
+        const testFile = path.join(companyRoot, "v7b-render.txt");
+        fs.writeFileSync(testFile, "local-collision-content");
+        vi.mocked(headRemoteFile).mockResolvedValueOnce({
+            lastModified: new Date(),
+            etag: '"remote-version-etag"',
+            size: 40,
+        });
+        vi.mocked(downloadFile).mockImplementation(async (_ctx, _key, dest) => {
+            fs.writeFileSync(dest, "peer remote content");
+            return undefined;
+        });
+        const realRenameSync = fs.renameSync;
+        const renameSpy = vi.spyOn(fs, "renameSync").mockImplementation((from, to) => {
+            if (String(from) === testFile && String(to).includes(".conflict-")) {
+                const err = new Error("EPERM: operation not permitted, rename");
+                err.code = "EPERM";
+                throw err;
+            }
+            return realRenameSync(from, to);
+        });
+        const realPlatform = process.platform;
+        Object.defineProperty(process, "platform", { value: "win32", configurable: true });
+        const warn = vi.spyOn(console, "warn").mockImplementation(() => { });
+        const log = vi.spyOn(console, "log").mockImplementation(() => { });
+        let rendered = [];
+        try {
+            // No onEvent → the push defaultConsoleLogger renders the skip.
+            await share({ paths: [testFile], company: "acme", vaultConfig: mockConfig, hqRoot: tmpDir, onConflict: "keep" });
+            rendered = warn.mock.calls.map((c) => String(c[0]));
+        }
+        finally {
+            Object.defineProperty(process, "platform", { value: realPlatform, configurable: true });
+            warn.mockRestore();
+            log.mockRestore();
+            renameSpy.mockRestore();
+        }
+        expect(rendered.some((line) => /v7b-render\.txt skipped/.test(line) && /holding the file open/i.test(line))).toBe(true);
+    });
     it("fresh-install SSE-KMS etag: byte-identical remote is reconciled without a conflict", async () => {
         const companyRoot = path.join(tmpDir, "companies", "acme");
         fs.mkdirSync(companyRoot, { recursive: true });