@indigoai-us/hq-cloud 6.15.34 → 6.15.35

package/dist/cli/share.test.js

@@ -52,7 +52,7 @@ vi.mock("readline", () => ({
     })),
 }));
 import * as readline from "readline";
-import { share, isForbiddenCompanyVaultKey, UnreachablePushPathsError, currentUploadBytes, _testing as shareTesting } from "./share.js";
+import { share, isForbiddenCompanyVaultKey, ServerOwnedPushPathsError, UnreachablePushPathsError, currentUploadBytes, _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";
@@ -1222,6 +1222,110 @@ describe("share", () => {
         expect(fs.readFileSync(path.join(tmpDir, index.conflicts[0].conflictPath), "utf-8"))
             .toBe("local edit");
     });
+    it.each([
+        ["local-only", false],
+        ["divergent-remote", true],
+    ])("direct source push (%s): emits a machine-readable refusal and fails when it is the only requested path", async (_state, divergentRemote) => {
+        const companyRoot = path.join(tmpDir, "companies", "acme");
+        const testFile = path.join(companyRoot, "sources", "meetings", "m-1.md");
+        fs.mkdirSync(path.dirname(testFile), { recursive: true });
+        fs.writeFileSync(testFile, "local meeting source");
+        if (divergentRemote) {
+            seedJournalAt(path.join(stateDir, "sync-journal.acme.json"), {
+                version: "1",
+                lastSync: new Date().toISOString(),
+                files: {
+                    "sources/meetings/m-1.md": {
+                        hash: "remote-body-hash",
+                        size: 21,
+                        syncedAt: new Date().toISOString(),
+                        direction: "down",
+                        remoteEtag: "remote-etag",
+                        localDiverges: true,
+                    },
+                },
+            });
+        }
+        const events = [];
+        await expect(share({
+            paths: [testFile],
+            company: "acme",
+            vaultConfig: mockConfig,
+            hqRoot: tmpDir,
+            skipUnchanged: divergentRemote,
+            onEvent: (event) => events.push(event),
+        })).rejects.toMatchObject({
+            name: "ServerOwnedPushPathsError",
+            paths: ["sources/meetings/m-1.md"],
+        });
+        expect(events).toContainEqual({
+            type: "push-refused-server-owned",
+            path: "sources/meetings/m-1.md",
+            nextStep: "use-source-ingestion",
+        });
+        expect(events.some((event) => event.type === "reconciled")).toBe(false);
+        expect(uploadFile).not.toHaveBeenCalled();
+        expect(headRemoteFile).not.toHaveBeenCalled();
+    });
+    it.each([
+        ["local-only", false],
+        ["divergent-remote", true],
+    ])("watch-driven source push (%s): explicit skip mode refuses without failing the pass", async (_state, divergentRemote) => {
+        const companyRoot = path.join(tmpDir, "companies", "acme");
+        const testFile = path.join(companyRoot, "sources", "meetings", "m-2.md");
+        fs.mkdirSync(path.dirname(testFile), { recursive: true });
+        fs.writeFileSync(testFile, "local meeting source");
+        if (divergentRemote) {
+            seedJournalAt(path.join(stateDir, "sync-journal.acme.json"), {
+                version: "1",
+                lastSync: new Date().toISOString(),
+                files: {
+                    "sources/meetings/m-2.md": {
+                        hash: "remote-body-hash",
+                        size: 21,
+                        syncedAt: new Date().toISOString(),
+                        direction: "down",
+                        remoteEtag: "remote-etag",
+                        localDiverges: true,
+                    },
+                },
+            });
+        }
+        const events = [];
+        const result = await share({
+            paths: [testFile],
+            company: "acme",
+            vaultConfig: mockConfig,
+            hqRoot: tmpDir,
+            skipUnchanged: true,
+            serverOwnedPathPolicy: "skip",
+            onEvent: (event) => events.push(event),
+        });
+        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",
+        });
+        expect(events.some((event) => event.type === "reconciled")).toBe(false);
+        expect(uploadFile).not.toHaveBeenCalled();
+        expect(headRemoteFile).not.toHaveBeenCalled();
+    });
+    it("direct source push explains the server-owned refusal and supported next step", async () => {
+        const companyRoot = path.join(tmpDir, "companies", "acme");
+        const testFile = path.join(companyRoot, "sources", "meetings", "m-3.md");
+        fs.mkdirSync(path.dirname(testFile), { recursive: true });
+        fs.writeFileSync(testFile, "local meeting source");
+        const warn = vi.spyOn(console, "warn").mockImplementation(() => undefined);
+        await expect(share({
+            paths: [testFile],
+            company: "acme",
+            vaultConfig: mockConfig,
+            hqRoot: tmpDir,
+        })).rejects.toThrow(ServerOwnedPushPathsError);
+        expect(warn).toHaveBeenCalledWith(expect.stringContaining("is server-owned and was not uploaded"));
+        expect(warn).toHaveBeenCalledWith(expect.stringContaining("supported integration or ingestion flow"));
+    });
     it("cloud-authoritative: never pushes a stale local ontology/.last-run over the server value (one-sided-change clobber guard)", async () => {
         // Regression for the gardener watermark clobber. A second HQ root sharing this
         // machine's sync journal can leave the local mirror holding a STALE value A while
@@ -1255,11 +1359,14 @@ describe("share", () => {
                 },
             },
         }));
+        const events = [];
         const result = await share({
             paths: [testFile],
             company: "acme",
             vaultConfig: mockConfig,
             hqRoot: tmpDir,
+            serverOwnedPathPolicy: "skip",
+            onEvent: (event) => events.push(event),
         });
         // Server-owned file: push is skipped BEFORE HEAD, the stale local value is NEVER
         // uploaded (the pull leg refreshes local from cloud instead), and it is not a conflict.
@@ -1268,6 +1375,12 @@ describe("share", () => {
         expect(result.filesUploaded).toBe(0);
         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",
+        });
+        expect(events.some((event) => event.type === "reconciled")).toBe(false);
     });
     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