@indigoai-us/hq-cloud 6.0.1 → 6.0.3

package/dist/cli/share.test.js

@@ -928,14 +928,12 @@ describe("share", () => {
                     },
                 },
             }));
-            // Currency-gated HEADs the candidate; return an etag matching the
-            // journal so the entry resolves as "remote still current → safe to
-            // tombstone."
-            vi.mocked(headRemoteFile).mockResolvedValueOnce({
-                lastModified: new Date(),
-                etag: '"personal-vault-drift-etag"',
-                size: 1054,
-            });
+            // (Pre-6.0.2: currency-gated would have HEADed the candidate; the
+            // mockResolvedValueOnce that lived here is now redundant because the
+            // vault-litter drain bypasses HEAD entirely for `.drift-` markers.
+            // Leaving the mock here would queue an unconsumed return value and
+            // poison the next test's HEAD call — removed so the assertion above
+            // verifies the litter path, not the etag path.)
             const personalCtx = makeEntityContext({
                 uid: "prs_01HASSAANTESTUSER",
                 slug: "__hq_personal_vault__",
@@ -1615,14 +1613,22 @@ describe("share", () => {
         // tooling that hands a conflict mirror to share() directly.
         expect(uploadFile).not.toHaveBeenCalled();
     });
-    it("conflict-mirror exclusion: journaled mirror with local-missing is NOT swept by delete plan", async () => {
+    it("vault-litter drain (6.0.2): journaled `.conflict-*` mirror with local-missing IS swept by the delete plan", async () => {
+        // Updated semantics (6.0.2): the existing-litter state — a conflict
+        // mirror that leaked into the journal from a prior buggy upload and was
+        // subsequently deleted locally — used to survive every sync because the
+        // `isEphemeralPath` skip in computeDeletePlan was wired to drop it
+        // before tombstoning. The deferred "dedicated reconcile command" the
+        // doc-comment promised never materialized, and the litter accumulated
+        // until users noticed it (e.g. the May-27 `personal/.obsidian/*.drift-*`
+        // pair on the EC2 outpost). The fix: drain unconditionally via the
+        // litter bucket — bypass shouldSync, ephemeral-skip, policy, and the
+        // bulk-asymmetry breaker. By construction litter is not user content
+        // (the EPHEMERAL_PATH_PATTERN / DRIFT_PATH_PATTERN regexes are precise
+        // enough that a false-positive on a real user filename is vanishingly
+        // unlikely), so the absence of those gates is the correct behavior.
         const companyRoot = path.join(tmpDir, "companies", "acme");
         fs.mkdirSync(companyRoot, { recursive: true });
-        // Simulate the existing-litter state: a conflict mirror that leaked
-        // into the journal in a prior buggy version. Locally missing (user
-        // already deleted it). The regular delete plan must NOT issue a
-        // DeleteObject — that's the dedicated reconcile command's job, and
-        // a sync should not accidentally race a user reviewing the mirror.
         const journalPath = path.join(stateDir, "sync-journal.acme.json");
         fs.writeFileSync(journalPath, JSON.stringify({
             version: "1",
@@ -1640,7 +1646,10 @@ describe("share", () => {
                 },
             },
         }));
-        // HEAD needed for the non-mirror entry under currency-gated.
+        // HEAD needed for the non-mirror entry under currency-gated. The litter
+        // drain bypasses HEAD by design — the etag check encodes a "remote
+        // hasn't drifted since I last synced" invariant that doesn't apply to
+        // never-should-have-been-there litter.
         vi.mocked(headRemoteFile).mockResolvedValue({
             lastModified: new Date(),
             etag: '"regular-etag"',
@@ -1654,14 +1663,60 @@ describe("share", () => {
             skipUnchanged: true,
             propagateDeletes: true,
         });
-        expect(result.filesDeleted).toBe(1);
-        expect(deleteRemoteFile).toHaveBeenCalledTimes(1);
+        // BOTH the regular file AND the conflict mirror tombstone in one pass.
+        expect(result.filesDeleted).toBe(2);
+        expect(deleteRemoteFile).toHaveBeenCalledTimes(2);
         expect(deleteRemoteFile).toHaveBeenCalledWith(expect.anything(), "regular.md");
-        expect(deleteRemoteFile).not.toHaveBeenCalledWith(expect.anything(), expect.stringContaining("conflict-"));
-        // Mirror's journal entry survives — reconcile command (separate skill)
-        // sweeps it once the user explicitly opts in.
+        expect(deleteRemoteFile).toHaveBeenCalledWith(expect.anything(), "CLAUDE.md.conflict-2026-05-13T19-40-40Z-e5797a.md");
+        // Both journal entries are removed by the delete loop's removeEntry call.
         const journal = JSON.parse(fs.readFileSync(journalPath, "utf-8"));
-        expect(journal.files["CLAUDE.md.conflict-2026-05-13T19-40-40Z-e5797a.md"]).toBeDefined();
+        expect(journal.files["CLAUDE.md.conflict-2026-05-13T19-40-40Z-e5797a.md"]).toBeUndefined();
+        expect(journal.files["regular.md"]).toBeUndefined();
+    });
+    it("vault-litter drain (6.0.2): `.drift-<unixts>-<pid>` rescue markers drain regardless of personal-vault exclusion path (the live obsidian case)", async () => {
+        // The exact failure mode that motivated the fix: a rescue-overlay
+        // `.drift-` marker sitting under a personal-vault default exclusion
+        // (`.obsidian/**`) survives every sync because `shouldSync` rejects
+        // the parent path before the delete plan ever considers the entry.
+        // The litter bypass routes such keys around shouldSync directly into
+        // `litterToDelete`.
+        const stateDirPersonal = fs.mkdtempSync(path.join(os.tmpdir(), "hq-state-prs-drift-"));
+        process.env.HQ_STATE_DIR = stateDirPersonal;
+        try {
+            const journalPath = path.join(stateDirPersonal, "sync-journal.__hq_personal_vault__.json");
+            fs.writeFileSync(journalPath, JSON.stringify({
+                version: "1",
+                lastSync: new Date().toISOString(),
+                files: {
+                    "personal/.obsidian/graph.json.drift-1779863862-42519": {
+                        hash: "h", size: 1054, syncedAt: new Date().toISOString(),
+                        direction: "down",
+                        remoteEtag: "obsidian-drift-etag",
+                    },
+                },
+            }));
+            const personalCtx = makeEntityContext({
+                uid: "prs_01HASSAANTESTUSER",
+                slug: "__hq_personal_vault__",
+                bucketName: "hq-vault-prs-01HASSAANTESTUSER",
+            });
+            const result = await share({
+                paths: [tmpDir],
+                entityContext: personalCtx,
+                hqRoot: tmpDir,
+                personalMode: true,
+                skipUnchanged: true,
+                propagateDeletes: true,
+            });
+            expect(result.filesDeleted).toBe(1);
+            expect(deleteRemoteFile).toHaveBeenCalledWith(expect.anything(), "personal/.obsidian/graph.json.drift-1779863862-42519");
+            const journal = JSON.parse(fs.readFileSync(journalPath, "utf-8"));
+            expect(journal.files["personal/.obsidian/graph.json.drift-1779863862-42519"]).toBeUndefined();
+        }
+        finally {
+            fs.rmSync(stateDirPersonal, { recursive: true, force: true });
+            delete process.env.HQ_STATE_DIR;
+        }
     });
     // ── personalMode ───────────────────────────────────────────────────────────
     //