@indigoai-us/hq-cloud 6.15.38 → 6.15.40

package/dist/cli/share.test.js

@@ -1303,9 +1303,9 @@ describe("share", () => {
         });
         expect(result).toMatchObject({ filesUploaded: 0, filesSkipped: 1 });
         expect(events).toContainEqual({
-            type: "push-refused-server-owned",
-            path: "sources/meetings/m-2.md",
-            nextStep: "use-source-ingestion",
+            type: "push-refused-server-owned-summary",
+            count: 1,
+            samplePaths: ["sources/meetings/m-2.md"],
         });
         expect(events.some((event) => event.type === "reconciled")).toBe(false);
         expect(uploadFile).not.toHaveBeenCalled();
@@ -1376,12 +1376,42 @@ describe("share", () => {
         expect(result.filesSkipped).toBeGreaterThanOrEqual(1);
         expect(result.conflictPaths).toEqual([]);
         expect(events).toContainEqual({
-            type: "push-refused-server-owned",
-            path: "ontology/.last-run",
-            nextStep: "change-upstream-and-pull",
+            type: "push-refused-server-owned-summary",
+            count: 1,
+            samplePaths: ["ontology/.last-run"],
         });
         expect(events.some((event) => event.type === "reconciled")).toBe(false);
     });
+    it("watch push collapses 32k server-owned refusals to one exact-count event while board.json still uploads", async () => {
+        const companyRoot = path.join(tmpDir, "companies", "acme");
+        const sourceRoot = path.join(companyRoot, "sources", "meetings");
+        const serverOwnedPathCount = 32_540;
+        fs.mkdirSync(sourceRoot, { recursive: true });
+        for (let index = 0; index < serverOwnedPathCount; index++) {
+            fs.writeFileSync(path.join(sourceRoot, `meeting-${index}.md`), "source");
+        }
+        fs.writeFileSync(path.join(companyRoot, "board.json"), "{\"cards\":[]}");
+        const events = [];
+        const result = await share({
+            paths: [companyRoot],
+            company: "acme",
+            vaultConfig: mockConfig,
+            hqRoot: tmpDir,
+            serverOwnedPathPolicy: "skip",
+            onEvent: (event) => events.push(event),
+        });
+        const summaries = events.filter((event) => event.type === "push-refused-server-owned-summary");
+        expect(summaries).toHaveLength(1);
+        expect(summaries[0]).toMatchObject({ count: serverOwnedPathCount });
+        expect(summaries[0].samplePaths).toHaveLength(10);
+        expect(summaries[0].samplePaths.every((sample) => sample.startsWith("sources/meetings/"))).toBe(true);
+        expect(events.filter((event) => event.type === "push-refused-server-owned")).toHaveLength(0);
+        expect(result).toMatchObject({
+            filesUploaded: 1,
+            filesSkipped: serverOwnedPathCount,
+        });
+        expect(vi.mocked(uploadFile).mock.calls.map((call) => call[2])).toEqual(["board.json"]);
+    });
     it("first-time-upload-with-cloud-collision: emits conflict + writes mirror under --on-conflict keep (Bug #7)", async () => {
         // Bug #7 (data-loss class) from the 5.33.0 deep test: when a file has
         // NO prior journal entry (fresh upload from this machine) but the
@@ -2950,6 +2980,7 @@ describe("share", () => {
                     e.type === "scope-materialization-gap" ||
                     e.type === "ignore-excluded" ||
                     e.type === "not-shipped" ||
+                    e.type === "push-refused-server-owned-summary" ||
                     e.type === "delete-refused-bulk-asymmetry")
                     return;
                 events.push({
@@ -4930,6 +4961,94 @@ describe("share", () => {
             delete process.env.HQ_STATE_DIR;
         }
     });
+    it("journal prune is local-only while an in-scope missing entry stays on the normal delete path", async () => {
+        const journalSlug = "personal-prune-safety";
+        const journalPath = path.join(stateDir, `sync-journal.${journalSlug}.json`);
+        seedJournalAt(journalPath, {
+            version: "2",
+            lastSync: new Date().toISOString(),
+            pulls: [],
+            files: {
+                // Absent and currently ignored: this is positively out of scope and
+                // may be forgotten without expressing a remote deletion intent.
+                ".claude/worktrees/gone/stranded.ts": {
+                    hash: "stranded", size: 1, syncedAt: new Date().toISOString(), direction: "up",
+                },
+                // Absent but still in scope: this remains a genuine local-delete
+                // candidate and must be handled by the ordinary delete planner.
+                "personal/pending-delete.md": {
+                    hash: "pending",
+                    size: 1,
+                    syncedAt: new Date().toISOString(),
+                    direction: "up",
+                    remoteEtag: "pending-etag",
+                    kind: "file",
+                    localDeleteIntent: deleteIntent("pending-etag", "pending"),
+                },
+            },
+        });
+        const personalCtx = makeEntityContext({
+            uid: "prs_01HASSAANTESTUSER",
+            slug: journalSlug,
+            bucketName: "hq-vault-prs-01HASSAANTESTUSER",
+        });
+        const result = await share({
+            paths: [],
+            deleteScopeRoots: ["personal/pending-delete.md"],
+            entityContext: personalCtx,
+            hqRoot: tmpDir,
+            personalMode: true,
+            journalSlug,
+            skipUnchanged: true,
+            propagateDeletes: true,
+            propagateDeletePolicy: "owned-only",
+        });
+        // The in-scope deletion remains eligible and produces the existing normal
+        // remote delete behavior; the prune itself never contributes a mutation.
+        expect(result.filesDeleted).toBe(1);
+        expect(deleteRemoteFile).toHaveBeenCalledTimes(1);
+        expect(deleteRemoteFile).toHaveBeenCalledWith(expect.anything(), "personal/pending-delete.md");
+        expect(uploadFile).not.toHaveBeenCalled();
+        expect(uploadSymlink).not.toHaveBeenCalled();
+        expect(journalAt(journalPath).files[".claude/worktrees/gone/stranded.ts"]).toBeUndefined();
+        expect(journalAt(journalPath).files["personal/pending-delete.md"]).toBeUndefined();
+    });
+    it("journal prune of an ignored missing row issues zero push-side mutations", async () => {
+        const journalSlug = "personal-prune-local-only";
+        const journalPath = path.join(stateDir, `sync-journal.${journalSlug}.json`);
+        seedJournalAt(journalPath, {
+            version: "2",
+            lastSync: new Date().toISOString(),
+            pulls: [],
+            files: {
+                ".claude/worktrees/gone/stranded.ts": {
+                    hash: "stranded", size: 1, syncedAt: new Date().toISOString(), direction: "up",
+                },
+            },
+        });
+        const personalCtx = makeEntityContext({
+            uid: "prs_01HASSAANTESTUSER",
+            slug: journalSlug,
+            bucketName: "hq-vault-prs-01HASSAANTESTUSER",
+        });
+        const result = await share({
+            paths: [],
+            entityContext: personalCtx,
+            hqRoot: tmpDir,
+            personalMode: true,
+            journalSlug,
+            skipUnchanged: true,
+            propagateDeletes: true,
+            propagateDeletePolicy: "owned-only",
+        });
+        expect(result.filesUploaded).toBe(0);
+        expect(result.filesDeleted).toBe(0);
+        expect(result.filesTombstoned).toBe(0);
+        expect(uploadFile).not.toHaveBeenCalled();
+        expect(uploadSymlink).not.toHaveBeenCalled();
+        expect(deleteRemoteFile).not.toHaveBeenCalled();
+        expect(journalAt(journalPath).files[".claude/worktrees/gone/stranded.ts"]).toBeUndefined();
+    });
     // ── personalMode ───────────────────────────────────────────────────────────
     //
     // The personal vault (slug "personal" in the runner's fanout plan) shares
@@ -7657,5 +7776,23 @@ describe("defaultConsoleLogger — delete refusal wording per reason", () => {
         expect(out).toContain("aaa111");
         expect(out).toContain("bbb222");
     });
+    it("logs personal journal prune reason classes", () => {
+        const lines = [];
+        const spy = vi.spyOn(console, "log").mockImplementation((msg) => {
+            lines.push(String(msg));
+        });
+        try {
+            shareTesting.defaultConsoleLogger({
+                type: "personal-vault-journal-pruned",
+                count: 3,
+                samplePaths: ["workspace/scratch/a.md"],
+                byReason: { "ignore-filtered": 2, "excluded-top-level": 1 },
+            });
+        }
+        finally {
+            spy.mockRestore();
+        }
+        expect(lines.join("\n")).toContain("ignore-filtered=2, excluded-top-level=1");
+    });
 });
 //# sourceMappingURL=share.test.js.map