@indigoai-us/hq-cloud 6.13.2 → 6.13.3

package/dist/cli/sync.test.js

@@ -2645,6 +2645,94 @@ describe("sync", () => {
         // Local directory still intact.
         expect(fs.existsSync(path.join(localDir, "inside.md"))).toBe(true);
     });
+    it("stale personal-overlay marker vs release-shipped core dir: skips cleanly, no 'rm -rf' advice (feedback_ce9aeede)", async () => {
+        // Reporter feedback_ce9aeede: a stale personal-overlay symlink marker in
+        // the vault at core/knowledge/public/agent-browser collided with the REAL,
+        // release-shipped core directory of the same name (the overlay mirror once
+        // symlinked it into core/, pushed the marker, then a release shipped a real
+        // dir there). Pre-fix, the pull planner hit the generic dir-vs-object
+        // collision branch and emitted, on EVERY sync, a "manual reconciliation
+        // required (rm -rf the local directory to pull)" warning — advice that here
+        // would DESTROY release-shipped core content to pull an inert marker. The
+        // reporter had to hand-delete the vault object. Fix: recognize the
+        // overlay-mirror core key, keep the local directory, and skip quietly.
+        const markerKey = "core/knowledge/public/agent-browser";
+        const localDir = path.join(tmpDir, "core", "knowledge", "public", "agent-browser");
+        fs.mkdirSync(localDir, { recursive: true });
+        fs.writeFileSync(path.join(localDir, "INDEX.md"), "release-shipped core content");
+        vi.mocked(s3Module.listRemoteFiles).mockResolvedValueOnce([
+            { key: markerKey, size: 40, lastModified: new Date(), etag: '"stale-marker"' },
+        ]);
+        const errSpy = vi.spyOn(console, "error").mockImplementation(() => { });
+        let crashed = false;
+        let result;
+        try {
+            result = await sync({
+                company: "acme",
+                vaultConfig: mockConfig,
+                hqRoot: tmpDir,
+                // personalMode → companyRoot === hqRoot, so a `core/...` key resolves
+                // under the HQ root exactly as the reporter's personal-vault pull did.
+                personalMode: true,
+            });
+        }
+        catch {
+            crashed = true;
+        }
+        const errOutput = errSpy.mock.calls.map((c) => c.join(" ")).join("\n");
+        errSpy.mockRestore();
+        expect(crashed).toBe(false);
+        expect(result).toBeDefined();
+        // Marker ignored, nothing downloaded, release-shipped dir intact.
+        expect(result.filesDownloaded).toBe(0);
+        expect(result.filesSkipped).toBe(1);
+        expect(fs.readFileSync(path.join(localDir, "INDEX.md"), "utf-8")).toBe("release-shipped core content");
+        // The dangerous, recurring reconciliation advice is GONE...
+        expect(errOutput).not.toContain("rm -rf");
+        expect(errOutput).not.toContain("manual");
+        // ...replaced by a calm, no-action-needed note naming the stale marker.
+        expect(errOutput).toContain("stale personal-overlay marker");
+        expect(errOutput).toContain(markerKey);
+    });
+    it("dir-vs-object collision OUTSIDE the overlay-mirror core namespace still warns to reconcile (no over-broadening)", async () => {
+        // Boundary guard for the feedback_ce9aeede fix: the quiet skip is scoped to
+        // core/{knowledge,policies,workers,settings}/ overlay-mirror keys ONLY. A
+        // dir-vs-object collision at any OTHER key (here `core/docs/...`, a core
+        // subtree that is NOT an overlay-mirror type) is a genuine structural
+        // collision the operator must resolve, so the original warning path — and
+        // its skip-local-only classification — must remain intact.
+        const key = "core/docs/agent-browser";
+        const localDir = path.join(tmpDir, "core", "docs", "agent-browser");
+        fs.mkdirSync(localDir, { recursive: true });
+        fs.writeFileSync(path.join(localDir, "inside.md"), "local content");
+        vi.mocked(s3Module.listRemoteFiles).mockResolvedValueOnce([
+            { key, size: 40, lastModified: new Date(), etag: '"obj"' },
+        ]);
+        const errSpy = vi.spyOn(console, "error").mockImplementation(() => { });
+        let crashed = false;
+        let result;
+        try {
+            result = await sync({
+                company: "acme",
+                vaultConfig: mockConfig,
+                hqRoot: tmpDir,
+                personalMode: true,
+            });
+        }
+        catch {
+            crashed = true;
+        }
+        const errOutput = errSpy.mock.calls.map((c) => c.join(" ")).join("\n");
+        errSpy.mockRestore();
+        expect(crashed).toBe(false);
+        expect(result.filesDownloaded).toBe(0);
+        expect(result.filesSkipped).toBe(1);
+        expect(fs.existsSync(path.join(localDir, "inside.md"))).toBe(true);
+        // Generic collision path preserved: reconciliation warning still emitted,
+        // NOT the overlay-marker note.
+        expect(errOutput).toContain("manual");
+        expect(errOutput).not.toContain("stale personal-overlay marker");
+    });
     it("pulls a remote symlink record under an .hqinclude dir-only allowlist pattern", async () => {
         // Codex round-7 P1 follow-up: pre-fix, computePullPlan called
         // shouldSync(localPath) with the default isDir=false. LIST gives