@indigoai-us/hq-cloud 6.14.8 → 6.14.10

package/src/bin/sync-runner.test.ts

@@ -47,7 +47,7 @@ import type {
   PendingInviteByEmail,
   TelemetryEventsBatch,
 } from "../vault-client.js";
-import { VaultAuthError } from "../vault-client.js";
+import { VaultAuthError, VaultNotFoundError } from "../vault-client.js";
 import type { PushEvent } from "../sync/push-event.js";
 
 // ---------------------------------------------------------------------------
@@ -219,6 +219,7 @@ function makeDeps(overrides: Partial<RunnerDeps> = {}): TestDeps {
       embedded: false,
       pendingDirty: false,
     })),
+    reconcileManifest: vi.fn().mockResolvedValue(undefined),
     ...overrides,
     stdout,
     stderr,
@@ -926,6 +927,86 @@ describe("fanout-plan", () => {
     expect(plan.companies).toEqual([{ uid: "cmp_ghost", slug: "cmp_ghost" }]);
   });
 
+  it("skips a ghost membership whose entity is gone so it cannot force exit 2", async () => {
+    const sync = vi.fn().mockResolvedValue(defaultSyncResult());
+    const deps = makeDeps({
+      createVaultClient: () =>
+        makeVaultStub({
+          memberships: [
+            { companyUid: "cmp_live" },
+            { companyUid: "cmp_ghost" },
+          ],
+          entityGet: (uid: string) => {
+            if (uid === "cmp_ghost") {
+              return Promise.reject(new VaultNotFoundError("company deleted"));
+            }
+            return Promise.resolve({
+              uid,
+              slug: "live",
+              type: "company",
+              status: "active",
+              createdAt: "2026-01-01T00:00:00Z",
+            });
+          },
+        }),
+      sync,
+    });
+
+    const code = await runRunner(["--companies"], deps);
+
+    expect(code).toBe(0);
+    expect(sync).toHaveBeenCalledTimes(1);
+    expect(sync).toHaveBeenCalledWith(
+      expect.objectContaining({ company: "cmp_live" }),
+    );
+    const plan = deps.stdout
+      .events()
+      .find((e) => e.type === "fanout-plan") as Extract<
+      RunnerEvent,
+      { type: "fanout-plan" }
+    >;
+    expect(plan.companies).toEqual([{ uid: "cmp_live", slug: "live" }]);
+  });
+
+  it("reconciles after the personal leg completes", async () => {
+    const order: string[] = [];
+    const deps = makeDeps({
+      createVaultClient: () =>
+        makeVaultStub({
+          memberships: [{ companyUid: "cmp_acme" }],
+          entityGet: (uid: string) =>
+            Promise.resolve({
+              uid,
+              slug: "acme",
+              type: "company",
+              status: "active",
+              createdAt: "2026-01-01T00:00:00Z",
+            }),
+          listPersons: () =>
+            Promise.resolve([
+              {
+                uid: "prs_me",
+                slug: "me",
+                type: "person",
+                status: "active",
+                bucketName: "hq-vault-prs-me",
+                createdAt: "2026-01-01T00:00:00Z",
+              } as EntityInfo,
+            ]),
+        }),
+      sync: vi.fn().mockImplementation(async (options: SyncOptions) => {
+        order.push(options.personalMode === true ? "personal" : "company");
+        return defaultSyncResult();
+      }),
+      reconcileManifest: vi.fn().mockImplementation(async () => {
+        order.push("reconcile");
+      }),
+    });
+
+    expect(await runRunner(["--companies"], deps)).toBe(0);
+    expect(order).toEqual(["company", "personal", "reconcile"]);
+  });
+
   it("includes entity.name on plan entries when available", async () => {
     const deps = makeDeps({
       createVaultClient: () =>

package/src/bin/sync-runner.ts

@@ -139,6 +139,10 @@ import {
   emitFanoutPlan,
   resolveMembershipsForRun,
 } from "./sync-runner-planning.js";
+import {
+  reconcileCompanyManifest,
+  type ManifestReconcileOptions,
+} from "../manifest-reconcile.js";
 import { executeCompanyFanout } from "./sync-runner-company.js";
 import { rollupAllComplete } from "./sync-runner-rollup.js";
 import { emitTelemetry } from "./sync-runner-telemetry.js";
@@ -351,6 +355,10 @@ export type RunnerEvent =
   | { type: "new-files"; company: string; files: Array<{ path: string; bytes: number; addedBy: string | null }> }
   | { type: "scope-excluded"; company: string; count: number; samplePaths: string[] }
   | { type: "ignore-excluded"; company: string; count: number; totalExcluded: number; samplePaths: string[] }
+  | ({ type: "skip-invalid-scoped-key"; company: string } & Omit<
+      Extract<SyncProgressEvent, { type: "skip-invalid-scoped-key" }>,
+      "type"
+    >)
   | ({
       type: "complete";
       company: string;
@@ -603,6 +611,14 @@ export interface RunnerDeps {
     hqRoot: string,
     options: QmdReindexOptions,
   ) => ReturnType<typeof reindexAfterSync>;
+  /**
+   * Merge successfully pulled cloud companies into the local manifest after
+   * the complete fanout. Injectable so runner tests do not touch a developer's
+   * HQ root.
+   */
+  reconcileManifest?: (
+    options: ManifestReconcileOptions,
+  ) => Promise<void>;
   /** Internal: set when runRunner is invoked under the per-root operation lock. */
   operationLockAlreadyHeld?: boolean;
   /** Share function (push phase). Defaults to `cli/share.share`. */
@@ -1311,6 +1327,33 @@ export async function runRunner(
   const { errors, allConflicts, meaningfulOutcomeCount } = fanout;
   const rollup = rollupAllComplete(plan, fanout.stateByCompany);
 
+  // The personal-vault target runs last and can pull an older copy of the
+  // manifest. Reconcile only after the entire pull fanout has settled so the
+  // successfully materialized cloud directories restore their own entries.
+  if (parsed.direction !== "push") {
+    try {
+      const completedCompanySlugs = new Set(
+        Array.from(fanout.stateByCompany.entries())
+          .filter(([, state]) => state.status === "complete")
+          .map(([slug]) => slug),
+      );
+      await (deps.reconcileManifest ?? reconcileCompanyManifest)({
+        hqRoot: parsed.hqRoot,
+        targets: plan,
+        completedCompanySlugs,
+        getEntity: client.entity.get,
+      });
+    } catch (err) {
+      reportDiagnostic({
+        component: "manifest-reconcile",
+        event: "runner.manifest_reconcile.failed",
+        message: "post-fanout manifest reconciliation failed",
+        err,
+        context: { hqRoot: parsed.hqRoot },
+      });
+    }
+  }
+
   if (rollup.needsReindex) {
     try {
       const reindexOptions = {

package/src/cli/share.test.ts

@@ -71,6 +71,19 @@ function makeEntityContext(overrides: Partial<EntityContext> = {}): EntityContex
   };
 }
 
+function deleteIntent(
+  remoteEtag: string,
+  localHash: string,
+  localKind: "file" | "symlink" = "file",
+) {
+  return {
+    version: 1 as const,
+    remoteEtag,
+    localHash,
+    localKind,
+  };
+}
+
 describe("wrapFilterWithIgnoreVisibility", () => {
   it("records noteworthy base-ignore exclusions while counting all rejections", () => {
     const hqRoot = path.join("/tmp", "hqroot");
@@ -1950,6 +1963,12 @@ describe("share", () => {
             syncedAt: new Date().toISOString(),
             direction: "up",
             remoteEtag: "knowledge-etag",
+            kind: "symlink",
+            localDeleteIntent: deleteIntent(
+              "knowledge-etag",
+              "irrelevant-not-checked",
+              "symlink",
+            ),
           },
         },
       }),
@@ -2189,6 +2208,11 @@ describe("share", () => {
             syncedAt: new Date().toISOString(),
             direction: "up",
             remoteEtag: "gone-etag",
+            kind: "file",
+            localDeleteIntent: deleteIntent(
+              "gone-etag",
+              "irrelevant-not-checked-here",
+            ),
           },
         },
       }),
@@ -2231,6 +2255,9 @@ describe("share", () => {
             size: 42,
             syncedAt: new Date().toISOString(),
             direction: "up",
+            remoteEtag: "removed-etag",
+            kind: "file",
+            localDeleteIntent: deleteIntent("removed-etag", "h"),
           },
         },
       }),
@@ -2318,6 +2345,9 @@ describe("share", () => {
             size: 1,
             syncedAt: new Date().toISOString(),
             direction: "up",
+            remoteEtag: "in-scope-etag",
+            kind: "file",
+            localDeleteIntent: deleteIntent("in-scope-etag", "h"),
           },
           "other/also-gone.md": {
             hash: "h",
@@ -2371,6 +2401,9 @@ describe("share", () => {
             size: 5,
             syncedAt: new Date().toISOString(),
             direction: "up",
+            remoteEtag: "flaky-etag",
+            kind: "file",
+            localDeleteIntent: deleteIntent("flaky-etag", "h"),
           },
         },
       }),
@@ -2446,6 +2479,9 @@ describe("share", () => {
           "i-uploaded.md": {
             hash: "h", size: 1, syncedAt: new Date().toISOString(),
             direction: "up",
+            remoteEtag: "uploaded-etag",
+            kind: "file",
+            localDeleteIntent: deleteIntent("uploaded-etag", "h"),
           },
         },
       }),
@@ -2482,6 +2518,9 @@ describe("share", () => {
           "pulled.md": {
             hash: "h", size: 1, syncedAt: new Date().toISOString(),
             direction: "down",
+            remoteEtag: "pulled-etag",
+            kind: "file",
+            localDeleteIntent: deleteIntent("pulled-etag", "h"),
           },
         },
       }),
@@ -2526,6 +2565,9 @@ describe("share", () => {
           "active/current.md": {
             hash: "h", size: 1, syncedAt: new Date().toISOString(),
             direction: "up",
+            remoteEtag: "active-etag",
+            kind: "file",
+            localDeleteIntent: deleteIntent("active-etag", "h"),
           },
         },
       }),
@@ -2586,6 +2628,8 @@ describe("share", () => {
             hash: "h", size: 100, syncedAt: new Date().toISOString(),
             direction: "down",
             remoteEtag: "abc123",
+            kind: "file",
+            localDeleteIntent: deleteIntent("abc123", "h"),
           },
         },
       }),
@@ -2637,6 +2681,8 @@ describe("share", () => {
             syncedAt: new Date().toISOString(),
             direction: "down",
             remoteEtag: "abc123",
+            kind: "file",
+            localDeleteIntent: deleteIntent("abc123", "h"),
             removedAt: new Date().toISOString(),
             removedReason: "local-delete",
           },
@@ -2688,6 +2734,8 @@ describe("share", () => {
             hash: "h", size: 50, syncedAt: new Date().toISOString(),
             direction: "down",
             remoteEtag: "stale-etag",
+            kind: "file",
+            localDeleteIntent: deleteIntent("stale-etag", "h"),
           },
         },
       }),
@@ -2733,6 +2781,64 @@ describe("share", () => {
     expect(result.filesTombstoned).toBe(0);
   });
 
+  it("currency-gated: preserves a file recreated after the delete plan", async () => {
+    const companyRoot = path.join(tmpDir, "companies", "acme");
+    fs.mkdirSync(companyRoot, { recursive: true });
+    const recreatedPath = path.join(companyRoot, "racy.md");
+    const journalPath = path.join(stateDir, "sync-journal.acme.json");
+    fs.writeFileSync(
+      journalPath,
+      JSON.stringify({
+        version: "2",
+        lastSync: new Date().toISOString(),
+        files: {
+          "racy.md": {
+            hash: "synced-hash",
+            size: 10,
+            syncedAt: new Date().toISOString(),
+            direction: "up",
+            remoteEtag: "racy-etag",
+            kind: "file",
+            localDeleteIntent: deleteIntent("racy-etag", "synced-hash"),
+          },
+        },
+        pulls: [],
+      }),
+    );
+
+    // The currency HEAD establishes the remote revision, then a local writer
+    // recreates the file before the planned DeleteObject can run.
+    vi.mocked(headRemoteFile).mockImplementationOnce(async () => {
+      fs.writeFileSync(recreatedPath, "recreated after planning");
+      return { lastModified: new Date(), etag: '"racy-etag"', size: 10 };
+    });
+
+    const events: Array<{ type: string; path?: string; reason?: string }> = [];
+    const result = await share({
+      paths: [companyRoot],
+      company: "acme",
+      vaultConfig: mockConfig,
+      hqRoot: tmpDir,
+      skipUnchanged: true,
+      propagateDeletes: true,
+      propagateDeletePolicy: "currency-gated",
+      onEvent: (e) => events.push(e as { type: string }),
+    });
+
+    expect(result.filesDeleted).toBe(0);
+    expect(deleteRemoteFile).not.toHaveBeenCalled();
+    expect(fs.readFileSync(recreatedPath, "utf-8")).toBe("recreated after planning");
+    const journal = JSON.parse(fs.readFileSync(journalPath, "utf-8"));
+    expect(journal.files["racy.md"]).toBeDefined();
+    expect(events).toContainEqual(
+      expect.objectContaining({
+        type: "delete-refused-stale-etag",
+        path: "racy.md",
+        reason: "intent-changed",
+      }),
+    );
+  });
+
   it("currency-gated: refuses delete for a divergent-local entry (journal-honesty — never delete a remote the local never genuinely matched)", async () => {
     const companyRoot = path.join(tmpDir, "companies", "acme");
     fs.mkdirSync(companyRoot, { recursive: true });
@@ -2814,6 +2920,8 @@ describe("share", () => {
             hash: "h", size: 25, syncedAt: new Date().toISOString(),
             direction: "down",
             remoteEtag: "doesnt-matter",
+            kind: "file",
+            localDeleteIntent: deleteIntent("doesnt-matter", "h"),
           },
         },
       }),
@@ -2894,12 +3002,13 @@ describe("share", () => {
 
     expect(result.filesDeleted).toBe(0);
     expect(deleteRemoteFile).not.toHaveBeenCalled();
-    // HEAD must NOT be called — we short-circuit on the missing journal etag.
+    // HEAD must NOT be called — the explicit-intent gate rejects legacy
+    // entries before any remote operation.
     expect(headRemoteFile).not.toHaveBeenCalled();
     const refused = events.find((e) => e.type === "delete-refused-stale-etag");
     expect(refused).toMatchObject({
-      journalEtag: "<legacy-no-etag>",
-      reason: "legacy-no-etag",
+      journalEtag: "<missing-delete-intent>",
+      reason: "missing-delete-intent",
     });
     expect(result.filesRefusedStale).toBe(1);
   });
@@ -2925,6 +3034,8 @@ describe("share", () => {
             hash: "h", size: 200, syncedAt: new Date().toISOString(),
             direction: "down",
             remoteEtag: "upstream-etag",
+            kind: "file",
+            localDeleteIntent: deleteIntent("upstream-etag", "h"),
           },
         },
       }),
@@ -3059,6 +3170,8 @@ describe("share", () => {
             hash: "h", size: 5, syncedAt: new Date().toISOString(),
             direction: "up",
             remoteEtag: "regular-etag",
+            kind: "file",
+            localDeleteIntent: deleteIntent("regular-etag", "h"),
           },
         },
       }),
@@ -3385,6 +3498,8 @@ describe("share", () => {
             hash: "h", size: 1, syncedAt: new Date().toISOString(),
             direction: "up",
             remoteEtag: "abc",
+            kind: "file",
+            localDeleteIntent: deleteIntent("abc", "h"),
           },
         },
       }),
@@ -3892,6 +4007,8 @@ describe("share", () => {
           syncedAt: string;
           direction: "up" | "down";
           remoteEtag: string;
+          kind: "file";
+          localDeleteIntent: ReturnType<typeof deleteIntent>;
         }
       > = {};
       for (let i = 0; i < total; i++) {
@@ -3902,6 +4019,8 @@ describe("share", () => {
           syncedAt: new Date().toISOString(),
           direction,
           remoteEtag: `etag-${i}`,
+          kind: "file",
+          localDeleteIntent: deleteIntent(`etag-${i}`, "h"),
         };
         if (i >= missing) {
           fs.writeFileSync(path.join(companyRoot, key), "hi");
@@ -4135,17 +4254,22 @@ describe("share", () => {
       const files: Record<string, {
         hash: string; size: number; syncedAt: string;
         direction: "up" | "down"; remoteEtag: string;
+        kind: "file"; localDeleteIntent: ReturnType<typeof deleteIntent>;
       }> = {};
       const now = new Date().toISOString();
       for (let i = 0; i < 50; i++) {
         files[`d-${i.toString().padStart(4, "0")}.md`] = {
           hash: "h", size: 5, syncedAt: now,
           direction: "down", remoteEtag: `down-etag-${i}`,
+          kind: "file",
+          localDeleteIntent: deleteIntent(`down-etag-${i}`, "h"),
         };
       }
       files["only-up.md"] = {
         hash: "h", size: 5, syncedAt: now,
         direction: "up", remoteEtag: "up-etag",
+        kind: "file",
+        localDeleteIntent: deleteIntent("up-etag", "h"),
       };
       const journalPath = path.join(stateDir, "sync-journal.acme.json");
       fs.writeFileSync(journalPath, JSON.stringify({ version: "1", lastSync: now, files }));
@@ -4293,6 +4417,8 @@ describe("currency-gated: journal version 2 fixtures", () => {
             syncedAt: new Date().toISOString(),
             direction: "down",
             remoteEtag: "v2-etag",
+            kind: "file",
+            localDeleteIntent: deleteIntent("v2-etag", "h"),
           },
         },
         pulls: [],