@indigoai-us/hq-cloud 6.15.91 → 6.15.92

package/dist/cli/share.test.js

@@ -65,8 +65,9 @@ import * as readline from "readline";
 import { share, ServerOwnedPushPathsError, UnreachablePushPathsError, UnregisteredCompanySkillError, currentUploadBytes, parseRegisteredCompanySkillUid, _testing as shareTesting, } from "./share.js";
 import { deleteRemoteFile, downloadFile, headRemoteFile, primeObjectTransport, primeUploads, uploadFile, uploadSymlink, WindowsSymlinkPrivilegeError, } from "../s3.js";
 import { VaultAuthError, } from "../vault-client.js";
-import { hashFile, readJournal, writeJournal } from "../journal.js";
+import { AreaLedgerMigration, closeCachedAreaJournalMigration, hashFile, openJournalStateStoreForMigration, readJournal, readJournalScoped, setAreaLedgerMigrationTestHooksForTest, writeJournal, } from "../journal.js";
 import { ReconcileCursorStore } from "../sync/reconcile-cursor.js";
+import { AreaResolver } from "../sync/area-resolver.js";
 /**
  * Read a journal the way production does.
  *
@@ -3799,6 +3800,78 @@ describe("share", () => {
         expect(result.filesDeleted).toBe(1);
         expect(deleteRemoteFile).toHaveBeenCalledWith(expect.anything(), "vanished.md");
     });
+    it("defers unscoped delete and exclusion maintenance until the next full personal pass", async () => {
+        const current = path.join(tmpDir, "personal", "current.md");
+        fs.mkdirSync(path.dirname(current), { recursive: true });
+        fs.writeFileSync(current, "current");
+        const journalPath = path.join(stateDir, "sync-journal.personal.json");
+        seedJournalAt(journalPath, {
+            version: "2",
+            lastSync: "",
+            pulls: [],
+            files: {
+                "personal/current.md": {
+                    hash: hashFile(current),
+                    size: fs.statSync(current).size,
+                    syncedAt: new Date().toISOString(),
+                    direction: "up",
+                    remoteEtag: "current-etag",
+                    kind: "file",
+                },
+                ".claude/worktrees/stale.md": {
+                    hash: "stale",
+                    size: 1,
+                    syncedAt: new Date().toISOString(),
+                    direction: "up",
+                    remoteEtag: "stale-etag",
+                    kind: "file",
+                },
+                "personal/vanished.md": {
+                    hash: "vanished",
+                    size: 1,
+                    syncedAt: new Date().toISOString(),
+                    direction: "up",
+                    remoteEtag: "vanished-etag",
+                    kind: "file",
+                    localDeleteIntent: deleteIntent("vanished-etag", "vanished"),
+                },
+            },
+        });
+        const context = makeEntityContext({ uid: "prs_personal", slug: "personal" });
+        const scopedEvents = [];
+        await share({
+            paths: [current],
+            hqRoot: tmpDir,
+            entityContext: context,
+            personalMode: true,
+            scopedJournal: true,
+            deleteScopeRoots: ["personal/current.md"],
+            propagateDeletes: true,
+            propagateDeletePolicy: "owned-only",
+            skipUnchanged: true,
+            onEvent: (event) => scopedEvents.push(event),
+        });
+        expect(deleteRemoteFile).not.toHaveBeenCalledWith(expect.anything(), "personal/vanished.md");
+        expect(scopedEvents.some((event) => event.type === "personal-vault-journal-pruned"))
+            .toBe(false);
+        expect(readJournal("personal").files[".claude/worktrees/stale.md"]).toBeDefined();
+        const fullEvents = [];
+        await share({
+            paths: [tmpDir],
+            hqRoot: tmpDir,
+            entityContext: context,
+            personalMode: true,
+            propagateDeletes: true,
+            propagateDeletePolicy: "owned-only",
+            skipUnchanged: true,
+            onEvent: (event) => fullEvents.push(event),
+        });
+        expect(deleteRemoteFile).toHaveBeenCalledWith(expect.anything(), "personal/vanished.md");
+        expect(fullEvents.some((event) => event.type === "personal-vault-journal-pruned"))
+            .toBe(true);
+        expect(readJournal("personal").files[".claude/worktrees/stale.md"]).toBeUndefined();
+        expect(readJournal("personal").files["personal/vanished.md"]).toBeUndefined();
+    });
     // ── Delete propagation (propagateDeletes) ──────────────────────────────────
     //
     // The bug: when a user deletes a local file, the next pull re-downloads it
@@ -5697,6 +5770,7 @@ describe("share", () => {
             hqRoot: tmpDir,
             personalMode: true,
             journalSlug,
+            scopedJournal: true,
             skipUnchanged: true,
             propagateDeletes: true,
             propagateDeletePolicy: "owned-only",
@@ -5705,6 +5779,72 @@ describe("share", () => {
         expect(deleteRemoteFile).toHaveBeenCalledWith(expect.anything(), key);
         expect(journalAt(journalPath).files[key]).toBeUndefined();
     });
+    it("propagates every area-journal descendant of a scoped deleted directory", async () => {
+        const journalSlug = "personal-area-scoped-directory-delete";
+        const deleteRoot = "personal/deleted-directory";
+        const descendants = [
+            `${deleteRoot}/first.md`,
+            `${deleteRoot}/nested/second.md`,
+        ];
+        const deletedEntry = (hash) => ({
+            hash,
+            size: 1,
+            syncedAt: new Date().toISOString(),
+            direction: "up",
+            remoteEtag: `${hash}-etag`,
+            kind: "file",
+            localDeleteIntent: deleteIntent(`${hash}-etag`, hash),
+        });
+        writeJournal(journalSlug, {
+            version: "2",
+            lastSync: "",
+            pulls: [],
+            files: {
+                [descendants[0]]: deletedEntry("first"),
+                [descendants[1]]: deletedEntry("second"),
+                "other/untouched.md": deletedEntry("other"),
+            },
+        });
+        const migration = new AreaLedgerMigration({
+            rootDir: stateDir,
+            journalSlug,
+            resolver: new AreaResolver({
+                format: 1,
+                routerVersion: 1,
+                areas: [
+                    { id: "root:personal", prefixes: ["personal"], paths: [] },
+                    { id: "root:other", prefixes: ["other"], paths: [] },
+                ],
+            }),
+            legacyStore: openJournalStateStoreForMigration(journalSlug),
+        });
+        expect(migration.cutOver().phase).toBe("area-authoritative");
+        const opened = [];
+        setAreaLedgerMigrationTestHooksForTest({ afterOpen: (bridge) => opened.push(bridge) });
+        expect(Object.keys(readJournalScoped(journalSlug, [], [deleteRoot]).files).sort())
+            .toEqual(descendants.slice().sort());
+        expect(opened).toHaveLength(1);
+        expect(opened[0].openedAreaStoresForTest()).toEqual(["@meta", "root:personal"]);
+        closeCachedAreaJournalMigration(journalSlug);
+        setAreaLedgerMigrationTestHooksForTest(undefined);
+        const result = await share({
+            paths: [],
+            deleteScopeRoots: [deleteRoot],
+            entityContext: makeEntityContext({ uid: "prs_personal", slug: "personal" }),
+            hqRoot: tmpDir,
+            personalMode: true,
+            journalSlug,
+            scopedJournal: true,
+            skipUnchanged: true,
+            propagateDeletes: true,
+            propagateDeletePolicy: "owned-only",
+        });
+        expect(result.filesDeleted).toBe(descendants.length);
+        expect(deleteRemoteFile).toHaveBeenCalledWith(expect.anything(), descendants[0]);
+        expect(deleteRemoteFile).toHaveBeenCalledWith(expect.anything(), descendants[1]);
+        expect(deleteRemoteFile).not.toHaveBeenCalledWith(expect.anything(), "other/untouched.md");
+        closeCachedAreaJournalMigration(journalSlug);
+    });
     // ── Decommission prefixes ──────────────────────────────────────────────────
     //
     // `decommissionPrefixes` is the "company was promoted to its own team