@indigoai-us/hq-cli 5.25.1 → 5.28.0

package/src/lib/local-tree-diff.test.ts

@@ -4,6 +4,13 @@
  * Uses a tmpdir fixture (same pattern as cloud-demote.test.ts) — vitest +
  * real fs — so the symmetric-diff + dirty-classification logic is exercised
  * end-to-end against an actual journal + filesystem.
+ *
+ * NAMESPACE CONTRACT (the bug these tests previously encoded): files are
+ * written on disk at their hq-root-relative path (`companies/<slug>/...`),
+ * but `buildNarrowPlan` emits — and the journal + grants endpoint use —
+ * COMPANY-RELATIVE keys (`meetings/a.md`). The `key()` helper derives the
+ * company-relative form from the on-disk path so journals, prefix sets, and
+ * expectations all speak the same namespace the real server does.
  */
 
 import { afterEach, beforeEach, describe, expect, it } from "vitest";
@@ -30,11 +37,23 @@ function writeFile(rel: string, contents: string): { abs: string; rel: string }
   return { abs, rel };
 }
 
+/**
+ * Strip the `companies/<slug>/` prefix from an on-disk hq-root-relative path
+ * to get the COMPANY-RELATIVE key — the namespace `buildNarrowPlan` emits and
+ * the journal + grants endpoint use.
+ */
+function key(rel: string): string {
+  return rel.replace(/^companies\/[^/]+\//, "");
+}
+
 function sha256(s: string): string {
   return crypto.createHash("sha256").update(s).digest("hex");
 }
 
-/** Build a journal that "knows about" the given files at their current hash + mtime. */
+/**
+ * Build a journal that "knows about" the given files at their current hash +
+ * mtime. Journal keys are COMPANY-RELATIVE (via `key()`), matching the engine.
+ */
 function journalFromFiles(
   files: Array<{ rel: string; contents: string; syncedAt?: string }>,
 ): SyncJournal {
@@ -45,7 +64,7 @@ function journalFromFiles(
     pulls: [],
   };
   for (const f of files) {
-    j.files[f.rel] = {
+    j.files[key(f.rel)] = {
       hash: sha256(f.contents),
       size: Buffer.byteLength(f.contents),
       // Stamp syncedAt slightly in the future so on-disk mtime <= syncedAt
@@ -97,13 +116,13 @@ describe("buildNarrowPlan — partition by prefix coverage", () => {
     const plan = buildNarrowPlan({
       hqRoot: tmpRoot,
       companySlug: "acme",
-      prospectivePrefixSet: ["companies/acme/meetings/"],
+      prospectivePrefixSet: ["meetings/"],
       journal,
     });
 
-    expect(plan.staying.map((f) => f.relPath)).toEqual([staying.rel]);
-    expect(plan.clean.map((f) => f.relPath)).toEqual([cleanOrphan.rel]);
-    expect(plan.dirty.map((f) => f.relPath)).toEqual([dirtyOrphan.rel]);
+    expect(plan.staying.map((f) => f.relPath)).toEqual([key(staying.rel)]);
+    expect(plan.clean.map((f) => f.relPath)).toEqual([key(cleanOrphan.rel)]);
+    expect(plan.dirty.map((f) => f.relPath)).toEqual([key(dirtyOrphan.rel)]);
     expect(plan.dirty[0].reason).toBe("hash-mismatch");
 
     expect(plan.totalStayingCount).toBe(1);
@@ -117,10 +136,10 @@ describe("buildNarrowPlan — partition by prefix coverage", () => {
     const plan = buildNarrowPlan({
       hqRoot: tmpRoot,
       companySlug: "acme",
-      prospectivePrefixSet: ["companies/acme/meetings/"],
+      prospectivePrefixSet: ["meetings/"],
       journal: journalFromFiles([]),
     });
-    expect(plan.dirty.map((f) => f.relPath)).toEqual([orphan.rel]);
+    expect(plan.dirty.map((f) => f.relPath)).toEqual([key(orphan.rel)]);
     expect(plan.dirty[0].reason).toBe("not-in-journal");
   });
 
@@ -130,16 +149,16 @@ describe("buildNarrowPlan — partition by prefix coverage", () => {
       { rel: orphan.rel, contents: "still here" },
     ]);
     // Mark the entry tombstoned post-hoc.
-    journal.files[orphan.rel]!.removedAt = new Date().toISOString();
-    journal.files[orphan.rel]!.removedReason = "scope_shrink";
+    journal.files[key(orphan.rel)]!.removedAt = new Date().toISOString();
+    journal.files[key(orphan.rel)]!.removedReason = "scope_shrink";
 
     const plan = buildNarrowPlan({
       hqRoot: tmpRoot,
       companySlug: "acme",
-      prospectivePrefixSet: ["companies/acme/meetings/"],
+      prospectivePrefixSet: ["meetings/"],
       journal,
     });
-    expect(plan.dirty.map((f) => f.relPath)).toEqual([orphan.rel]);
+    expect(plan.dirty.map((f) => f.relPath)).toEqual([key(orphan.rel)]);
     expect(plan.dirty[0].reason).toBe("not-in-journal");
   });
 
@@ -151,10 +170,10 @@ describe("buildNarrowPlan — partition by prefix coverage", () => {
     const plan = buildNarrowPlan({
       hqRoot: tmpRoot,
       companySlug: "acme",
-      prospectivePrefixSet: ["companies/acme/meetings/"],
+      prospectivePrefixSet: ["meetings/"],
       journal,
     });
-    expect(plan.dirty.map((f) => f.relPath)).toEqual([orphan.rel]);
+    expect(plan.dirty.map((f) => f.relPath)).toEqual([key(orphan.rel)]);
     expect(plan.dirty[0].reason).toBe("modified-after-sync");
   });
 
@@ -166,7 +185,7 @@ describe("buildNarrowPlan — partition by prefix coverage", () => {
     const plan = buildNarrowPlan({
       hqRoot: tmpRoot,
       companySlug: "acme",
-      prospectivePrefixSet: ["companies/acme/meetings/"],
+      prospectivePrefixSet: ["meetings/"],
       journal: journalFromFiles([
         { rel: a.rel, contents: "a" },
         { rel: b.rel, contents: "b" },
@@ -175,15 +194,15 @@ describe("buildNarrowPlan — partition by prefix coverage", () => {
     });
 
     const stayingPaths = plan.staying.map((f) => f.relPath).sort();
-    expect(stayingPaths).toEqual([a.rel, b.rel].sort());
-    expect(plan.clean.map((f) => f.relPath)).toEqual([c.rel]);
+    expect(stayingPaths).toEqual([key(a.rel), key(b.rel)].sort());
+    expect(plan.clean.map((f) => f.relPath)).toEqual([key(c.rel)]);
   });
 
   it("returns an empty plan when the company folder is missing", () => {
     const plan = buildNarrowPlan({
       hqRoot: tmpRoot,
       companySlug: "ghost",
-      prospectivePrefixSet: ["companies/ghost/"],
+      prospectivePrefixSet: [""],
       journal: journalFromFiles([]),
     });
     expect(plan.totalStayingCount).toBe(0);
@@ -214,7 +233,8 @@ describe("buildNarrowPlan — partition by prefix coverage", () => {
     const plan = buildNarrowPlan({
       hqRoot: tmpRoot,
       companySlug: "acme",
-      prospectivePrefixSet: ["companies/acme/"],
+      // Empty-string prefix = "covers everything" per isCoveredByAny.
+      prospectivePrefixSet: [""],
       journal: journalFromFiles([]),
     });
     expect(plan.totalStayingCount).toBe(2);
@@ -223,7 +243,7 @@ describe("buildNarrowPlan — partition by prefix coverage", () => {
     // both are staying, regardless of journal state
     expect(
       plan.staying.map((f) => f.relPath).sort(),
-    ).toEqual([a.rel, b.rel].sort());
+    ).toEqual([key(a.rel), key(b.rel)].sort());
   });
 });
 

package/src/lib/local-tree-diff.ts

@@ -43,7 +43,11 @@ export type DirtyReason =
   | "stat-error";
 
 export interface NarrowFile {
-  /** Path relative to `hqRoot` (matches journal key + S3 key naming). */
+  /**
+   * COMPANY-RELATIVE path (e.g. `meetings/a.md`) — the canonical namespace
+   * shared by the per-company journal keys, the vault S3 keys, and the
+   * server's explicit-grant paths. NOT hq-root-relative.
+   */
   relPath: string;
   /** Absolute path on disk (convenience for the CLI delete loop). */
   absPath: string;
@@ -79,7 +83,8 @@ export interface BuildNarrowPlanInput {
   /**
    * Coalesced prospective `shared`-mode prefix set (the result of running
    * the caller's explicit grants through `coalescePrefixes`). Prefixes are
-   * hq-root-relative (e.g. `companies/indigo/meetings/`).
+   * COMPANY-RELATIVE (e.g. `meetings/`) — the namespace the grants endpoint
+   * returns and the namespace `relPath` is now computed in.
    */
   prospectivePrefixSet: readonly string[];
   /**
@@ -120,7 +125,16 @@ export function buildNarrowPlan(input: BuildNarrowPlanInput): NarrowPlan {
     return emptyPlan();
   }
 
-  walkLocal(walkRoot, hqRoot, (file) => {
+  // Walk with `walkRoot` as the rel-root so each file's `relPath` is
+  // COMPANY-RELATIVE (e.g. `meetings/a.md`) — the same namespace as the
+  // server's explicit-grant paths, the per-company journal keys, and the
+  // hq-cloud sync engine's `RemoteFile.key`. Computing it relative to `hqRoot`
+  // (the old behavior) produced `companies/<slug>/meetings/a.md`, which
+  // matched neither the company-relative grants nor the journal keys — so
+  // every file fell out of `prospectivePrefixSet` AND missed its journal
+  // entry, making narrow flag the entire tree as dirty orphans. See the
+  // namespace contract in hq-cloud `scope-shrink.ts` / `prefix-coalesce.ts`.
+  walkLocal(walkRoot, walkRoot, (file) => {
     if (isCoveredByAny(file.relPath, prospectivePrefixSet)) {
       staying.push(file);
       return;
@@ -170,7 +184,9 @@ function emptyPlan(): NarrowPlan {
  */
 function walkLocal(
   dir: string,
-  hqRoot: string,
+  // Rel-root for `relPath` — the company walk root (`<hqRoot>/companies/<slug>`),
+  // so emitted `relPath`s are company-relative. Fixed across recursion.
+  relRoot: string,
   emit: (file: NarrowFile) => void,
 ): void {
   let entries: fs.Dirent[];
@@ -186,7 +202,7 @@ function walkLocal(
 
   for (const entry of entries) {
     const absPath = path.join(dir, entry.name);
-    const relPath = path.relative(hqRoot, absPath);
+    const relPath = path.relative(relRoot, absPath);
 
     if (entry.isSymbolicLink()) {
       // Record the link as a file-like entry. Don't descend — narrow is
@@ -204,7 +220,7 @@ function walkLocal(
     }
 
     if (entry.isDirectory()) {
-      walkLocal(absPath, hqRoot, emit);
+      walkLocal(absPath, relRoot, emit);
       continue;
     }