@indigoai-us/hq-cloud 6.1.0 → 6.2.1

package/dist/lib/conflict.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"conflict.test.js","sourceRoot":"","sources":["../../src/lib/conflict.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"conflict.test.js","sourceRoot":"","sources":["../../src/lib/conflict.test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indigoai-us/hq-cloud",
-  "version": "6.1.0",
+  "version": "6.2.1",
   "description": "HQ by Indigo cloud sync engine — bidirectional S3 sync for mobile access",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/bin/sync-runner.ts

@@ -99,6 +99,7 @@ import {
 import { collectAndSendTelemetry } from "../telemetry.js";
 import { collectAndSendSkillTelemetry } from "../skill-telemetry.js";
 import { reindexAfterSync } from "../qmd-reindex.js";
+import { pruneConflictIndex } from "../lib/conflict-index.js";
 import { describeError } from "../lib/describe-error.js";
 import { getOrCreateMachineId } from "../lib/machine-id.js";
 import {
@@ -1639,6 +1640,23 @@ export async function runRunner(
     }
   }
 
+  // Post-sync conflict-ledger prune — also a best-effort tail step (runs AFTER
+  // `all-complete`, never touches the exit code). The producers only append a
+  // conflict row after proving real divergence, but the ledger has no other
+  // self-healing path: rows for byte-identical false positives (legacy or
+  // since-reverted) and orphaned `.conflict-*` mirrors otherwise linger
+  // forever and make `.hq-conflicts/index.json` over-report. One GC pass per
+  // run keeps it converged. Idempotent and cheap on a clean ledger (a no-row
+  // index returns immediately and never rewrites the file). Opt-out via
+  // HQ_CONFLICT_PRUNE_ON_SYNC=0.
+  if (process.env.HQ_CONFLICT_PRUNE_ON_SYNC !== "0") {
+    try {
+      pruneConflictIndex(parsed.hqRoot);
+    } catch {
+      // Defensive: a prune failure must never affect the sync outcome.
+    }
+  }
+
   // Exit 2 only when something actually threw (`errors.length > 0`). A clean
   // conflict-abort sets `partial: true` in the JSON but exits 0 — the Tauri
   // menubar's non-zero-exit Sentry capture would otherwise fire for normal

package/src/cli/index.ts

@@ -26,10 +26,10 @@ export type { PromoteOptions, PromoteResult } from "./promote.js";
 
 // Skill/personal-overlay mirroring + workers-registry regen (formerly the
 // hq-core master-sync.sh hook; `hq reindex`).
-export { reindex, reindexScriptPath } from "./reindex.js";
+export { reindex } from "./reindex.js";
 export type { ReindexOptions, ReindexResult } from "./reindex.js";
 
 // Drift-preserving HQ-core re-sync (formerly bundled only inside the HQ Sync
 // menubar app). Now shared between the app and `hq rescue`.
-export { rescue, rescueScriptPath, buildRescueArgs } from "./rescue.js";
+export { rescue, buildRescueArgs } from "./rescue.js";
 export type { RescueOptions, RescueResult } from "./rescue.js";

package/src/cli/reindex.test.ts

@@ -2,25 +2,17 @@
  * Unit tests for `hq reindex` (the formerly-bash hq-core hook, now shipped
  * in this package and invoked via the CLI).
  *
- * The logic itself lives in scripts/reindex.sh; these tests exercise it via
- * the reindex() wrapper against a temp HQ tree, asserting the observable
+ * The logic is implemented natively in TypeScript in ./reindex.ts; these tests
+ * exercise reindex() directly against a temp HQ tree, asserting the observable
  * filesystem outcomes (skill wrappers, personal-overlay mirroring) rather than
- * re-deriving the bash internals.
+ * re-deriving the implementation internals.
  */
 
 import { describe, it, expect, beforeEach, afterEach } from "vitest";
 import * as fs from "fs";
 import * as path from "path";
 import * as os from "os";
-import { reindex, reindexScriptPath } from "./reindex.js";
-
-describe("reindexScriptPath", () => {
-  it("resolves to the bundled script and the file exists", () => {
-    const p = reindexScriptPath();
-    expect(p.endsWith(path.join("scripts", "reindex.sh"))).toBe(true);
-    expect(fs.existsSync(p)).toBe(true);
-  });
-});
+import { reindex } from "./reindex.js";
 
 describe("reindex", () => {
   let root: string;
@@ -91,4 +83,45 @@ describe("reindex", () => {
       fs.readlinkSync(path.join(root, ".claude/skills/core:demo/SKILL.md")),
     ).toBe("../../../core/skills/demo/SKILL.md");
   });
+
+  it("skips `_`-prefixed and dotfile skill folders", () => {
+    writeSkill("core/skills/_template");
+    fs.mkdirSync(path.join(root, "core/skills/.hidden"), { recursive: true });
+    fs.writeFileSync(path.join(root, "core/skills/.hidden/SKILL.md"), "x\n");
+    writeSkill("core/skills/real");
+
+    reindex({ repoRoot: root });
+
+    expect(fs.existsSync(path.join(root, ".claude/skills/core:real"))).toBe(true);
+    expect(fs.existsSync(path.join(root, ".claude/skills/core:_template"))).toBe(false);
+    expect(fs.existsSync(path.join(root, ".claude/skills/core:.hidden"))).toBe(false);
+  });
+
+  it("removes legacy .claude/commands/<ns>/<skill>.md bridge symlinks", () => {
+    const cmdDir = path.join(root, ".claude/commands/core");
+    fs.mkdirSync(cmdDir, { recursive: true });
+    // Legacy bridge symlink (matches the cleanup pattern) → removed.
+    fs.symlinkSync("../../../core/skills/demo/SKILL.md", path.join(cmdDir, "demo.md"));
+    // A real file (non-symlink) → preserved.
+    fs.writeFileSync(path.join(cmdDir, "keep.md"), "manual\n");
+
+    reindex({ repoRoot: root });
+
+    expect(fs.existsSync(path.join(cmdDir, "demo.md"))).toBe(false);
+    expect(fs.existsSync(path.join(cmdDir, "keep.md"))).toBe(true);
+  });
+
+  it("leaves hand-authored composite wrappers (unmanaged namespace) alone", () => {
+    // A wrapper whose namespace ('vendor') is not a managed namespace and
+    // whose target points into core/skills/<other> — must not be pruned.
+    const wrapper = path.join(root, ".claude/skills/vendor:tool");
+    fs.mkdirSync(wrapper, { recursive: true });
+    writeSkill("core/skills/helper");
+    fs.symlinkSync("../../../core/skills/helper/SKILL.md", path.join(wrapper, "SKILL.md"));
+
+    reindex({ repoRoot: root });
+
+    expect(fs.existsSync(wrapper)).toBe(true);
+    expect(fs.lstatSync(path.join(wrapper, "SKILL.md")).isSymbolicLink()).toBe(true);
+  });
 });

package/src/cli/reindex.ts

@@ -1,30 +1,22 @@
 /**
- * hq reindex — surfaces namespaced skills as Claude Code skill wrappers,
- * mirrors personal/{knowledge,policies,workers,settings} into core/, prunes
- * orphan wrappers, and regenerates the workers registry.
+ * hq reindex — surfaces namespaced skills as Claude Code skill wrappers under
+ * .claude/skills/<ns>:<skill>/ (one symlink per source file), mirrors
+ * personal/{knowledge,policies,workers,settings}/<entry> into core/<type>/,
+ * prunes orphan wrappers + legacy command symlinks, and regenerates the
+ * workers registry.
  *
- * The implementation lives in scripts/reindex.sh, shipped with this package.
- * This module resolves that script relative to the package (dist/cli → package
- * root) and execs it against the caller's HQ root. Historically the script ran
- * directly as a Claude Code hook inside hq-core (named "master-sync"); it now
- * lives here so a single copy is maintained, and the hq-core hook is a thin
- * shim over `hq reindex`.
+ * The logic historically lived in a bundled bash script (scripts/reindex.sh)
+ * that this module exec'd via `bash`. It is now implemented natively in
+ * TypeScript so the package ships a single, testable code path with no runtime
+ * dependency on a shipped shell script. Behaviour is preserved exactly: the
+ * same skill wrappers, personal-overlay mirrors, legacy-symlink cleanup, and
+ * idempotent re-runs as before. Historically the script ran directly as a
+ * Claude Code hook inside hq-core (named "master-sync"); the hq-core hook
+ * remains a thin shim over `hq reindex`.
  */
 import { spawnSync } from "child_process";
-import { fileURLToPath } from "url";
-import path from "path";
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-/**
- * Absolute path to the bundled reindex.sh. From the compiled module at
- * dist/cli/reindex.js, the package root is two levels up; the script lives
- * at <package-root>/scripts/reindex.sh.
- */
-export function reindexScriptPath(): string {
-  return path.resolve(__dirname, "..", "..", "scripts", "reindex.sh");
-}
+import * as fs from "fs";
+import * as path from "path";
 
 export interface ReindexOptions {
   /** HQ root to operate on. Defaults to process.cwd(). */
@@ -32,26 +24,343 @@ export interface ReindexOptions {
 }
 
 export interface ReindexResult {
-  /** Exit status of the underlying script (0 = success). */
+  /** 0 = success; 1 = invalid repo root (mirrors the old script's exit codes). */
   status: number;
 }
 
+// --- small fs helpers (each mirrors a bash test operator) -------------------
+
+/** `[ -d "$p" ]` — exists and is a directory (follows symlinks). */
+function isDir(p: string): boolean {
+  try {
+    return fs.statSync(p).isDirectory();
+  } catch {
+    return false;
+  }
+}
+
+/** `[ -f "$p" ]` — exists and is a regular file (follows symlinks). */
+function isFile(p: string): boolean {
+  try {
+    return fs.statSync(p).isFile();
+  } catch {
+    return false;
+  }
+}
+
+/** `[ -e "$p" ]` — exists, dereferencing symlinks (a broken symlink is false). */
+function existsFollow(p: string): boolean {
+  try {
+    fs.statSync(p);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+/** `[ -x "$p" ]` — exists and is executable. */
+function isExecutable(p: string): boolean {
+  try {
+    fs.accessSync(p, fs.constants.X_OK);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+/** lstat without throwing (null when the path doesn't exist). */
+function lstatOrNull(p: string): fs.Stats | null {
+  try {
+    return fs.lstatSync(p);
+  } catch {
+    return null;
+  }
+}
+
+/** readlink without throwing (null when not a symlink / missing). */
+function readlinkOrNull(p: string): string | null {
+  try {
+    return fs.readlinkSync(p);
+  } catch {
+    return null;
+  }
+}
+
 /**
- * Run reindex against an HQ root. Synchronous — the script is cheap and
+ * Entries of `dir` matching a bash `dir/*` glob: dotfiles excluded (no
+ * dotglob), sorted lexicographically (bash glob order). Missing dir → [].
+ */
+function globEntries(dir: string): string[] {
+  let names: string[];
+  try {
+    names = fs.readdirSync(dir);
+  } catch {
+    return [];
+  }
+  return names.filter((n) => !n.startsWith(".")).sort();
+}
+
+function warn(msg: string): void {
+  process.stderr.write(`${msg}\n`);
+}
+
+// --- legacy `.claude/commands/<ns>/<skill>.md` symlink matcher --------------
+// Mirrors the bash `case` patterns; `*` matches any chars (including `/`).
+function isLegacyCommandTarget(t: string): boolean {
+  return (
+    /^\.\.\/\.\.\/\.\.\/companies\/.*\/skills\/.*\/SKILL\.md$/.test(t) ||
+    /^\.\.\/\.\.\/\.\.\/core\/skills\/.*\/SKILL\.md$/.test(t) ||
+    /^\.\.\/\.\.\/\.\.\/personal\/skills\/.*\/SKILL\.md$/.test(t) ||
+    /^\.\.\/\.\.\/\.\.\/core\/packages\/.*\/skills\/.*\/SKILL\.md$/.test(t)
+  );
+}
+
+/**
+ * Run reindex against an HQ root. Synchronous — the work is cheap and
  * idempotent, and callers (the hook shim, sync/rescue, tests) want the exit
- * status. stdout/stderr from the script are forwarded to stderr so the
- * caller's stdout stays clean (hooks must not emit stdout that the agent
- * interprets).
+ * status. Diagnostics are written to stderr so the caller's stdout stays clean
+ * (hooks must not emit stdout that the agent interprets).
  */
 export function reindex(opts: ReindexOptions = {}): ReindexResult {
-  const repoRoot = opts.repoRoot ?? process.cwd();
-  const script = reindexScriptPath();
-  const res = spawnSync("bash", [script, repoRoot], {
-    stdio: ["ignore", "inherit", "inherit"],
-  });
-  if (res.error) {
-    process.stderr.write(`reindex: failed to run ${script}: ${res.error.message}\n`);
+  const rawRoot = opts.repoRoot ?? process.cwd();
+  if (!isDir(rawRoot)) {
+    warn(`reindex: REPO_ROOT '${rawRoot}' is not a directory`);
     return { status: 1 };
   }
-  return { status: res.status ?? 1 };
+  const root = path.resolve(rawRoot);
+
+  fs.mkdirSync(path.join(root, ".claude", "skills"), { recursive: true });
+
+  // --- Build (namespace, src_rel) pairs -------------------------------------
+  const pairs: { ns: string; srcRel: string }[] = [];
+  const addNs = (ns: string, srcRel: string): void => {
+    if (isDir(path.join(root, srcRel))) pairs.push({ ns, srcRel });
+  };
+
+  for (const slug of globEntries(path.join(root, "companies"))) {
+    if (isDir(path.join(root, "companies", slug))) {
+      addNs(slug, `companies/${slug}/skills`);
+    }
+  }
+  addNs("core", "core/skills");
+  addNs("personal", "personal/skills");
+  for (const pack of globEntries(path.join(root, "core", "packages"))) {
+    if (isDir(path.join(root, "core", "packages", pack))) {
+      addNs(pack, `core/packages/${pack}/skills`);
+    }
+  }
+
+  // --- Cleanup pass A: drop legacy .claude/commands/<ns>/<skill>.md links ----
+  const commandsDir = path.join(root, ".claude", "commands");
+  if (isDir(commandsDir)) {
+    for (const nsName of globEntries(commandsDir)) {
+      const cmdNsDir = path.join(commandsDir, nsName);
+      // Only real directories (bash `*/`); folder-level symlinks are left for
+      // a human to resolve. lstat().isDirectory() is false for a symlink, so
+      // this single check covers both bash guards.
+      const st = lstatOrNull(cmdNsDir);
+      if (!st || !st.isDirectory()) continue;
+
+      for (const f of globEntries(cmdNsDir)) {
+        if (!f.endsWith(".md")) continue;
+        const fp = path.join(cmdNsDir, f);
+        const fst = lstatOrNull(fp);
+        if (!fst || !fst.isSymbolicLink()) continue;
+        const target = readlinkOrNull(fp);
+        if (target && isLegacyCommandTarget(target)) {
+          try {
+            fs.rmSync(fp);
+          } catch {
+            /* best-effort */
+          }
+        }
+      }
+
+      // rmdir if empty; ignore "directory not empty".
+      try {
+        fs.rmdirSync(cmdNsDir);
+      } catch {
+        /* not empty / gone — fine */
+      }
+    }
+  }
+
+  // --- Skill wrapper creation -----------------------------------------------
+  const expectedWrappers = new Set<string>();
+  const seen = new Set<string>();
+
+  for (const { ns, srcRel } of pairs) {
+    // First writer for a namespace wins.
+    if (seen.has(ns)) {
+      warn(
+        `reindex: namespace '${ns}' already claimed by an earlier source; skipping ${srcRel}`,
+      );
+      continue;
+    }
+    seen.add(ns);
+
+    const srcAbs = path.join(root, srcRel);
+    for (const skillName of globEntries(srcAbs)) {
+      const skillPath = path.join(srcAbs, skillName);
+      if (!isDir(skillPath)) continue;
+      // Skip `_shared`, `_template`, etc. (dotfiles already excluded by glob).
+      if (skillName.startsWith("_")) continue;
+      if (!isFile(path.join(skillPath, "SKILL.md"))) continue;
+
+      const wrapperName = `${ns}:${skillName}`;
+      const wrapper = path.join(root, ".claude", "skills", wrapperName);
+      expectedWrappers.add(wrapperName);
+
+      const wst = lstatOrNull(wrapper);
+      // If something non-directory, non-symlink occupies the slot, bail.
+      if (wst && !wst.isSymbolicLink() && !wst.isDirectory()) {
+        warn(`reindex: ${wrapper} exists and is not a directory; skipping`);
+        continue;
+      }
+      // If it's a symlink (legacy directory-symlink form), replace it with a
+      // real directory of per-file symlinks.
+      if (wst && wst.isSymbolicLink()) {
+        try {
+          fs.rmSync(wrapper);
+        } catch {
+          /* best-effort */
+        }
+      }
+      fs.mkdirSync(wrapper, { recursive: true });
+
+      // Symlink every (non-hidden) entry in the source skill folder. The
+      // wrapper lives three levels below REPO_ROOT.
+      for (const entry of globEntries(skillPath)) {
+        const entryPath = path.join(skillPath, entry);
+        if (!existsFollow(entryPath)) continue;
+        const linkPath = path.join(wrapper, entry);
+        const relativeTarget = `../../../${srcRel}/${skillName}/${entry}`;
+
+        const lst = lstatOrNull(linkPath);
+        if (lst && lst.isSymbolicLink()) {
+          const current = readlinkOrNull(linkPath);
+          if (current === relativeTarget) continue;
+          warn(
+            `reindex: .claude/skills/${wrapperName}/${entry} already points to '${current}' (expected '${relativeTarget}'); leaving alone`,
+          );
+          continue;
+        } else if (lst) {
+          warn(`reindex: ${linkPath} already exists and is not a symlink; skipping`);
+          continue;
+        }
+
+        fs.symlinkSync(relativeTarget, linkPath);
+      }
+
+      // Prune symlinks in the wrapper whose source entry no longer exists.
+      for (const entry of globEntries(wrapper)) {
+        const linkPath = path.join(wrapper, entry);
+        const lst = lstatOrNull(linkPath);
+        if (!lst || !lst.isSymbolicLink()) continue;
+        if (existsFollow(linkPath)) continue;
+        try {
+          fs.rmSync(linkPath);
+        } catch {
+          /* best-effort */
+        }
+      }
+    }
+  }
+
+  // --- Cleanup pass B: drop orphan <ns>:<skill> wrappers --------------------
+  const skillsDir = path.join(root, ".claude", "skills");
+  for (const entry of globEntries(skillsDir)) {
+    const entryPath = path.join(skillsDir, entry);
+    const lst = lstatOrNull(entryPath);
+    if (!lst) continue; // accept broken symlinks (lstat still succeeds)
+    if (!entry.includes(":")) continue; // not a namespaced wrapper
+    if (expectedWrappers.has(entry)) continue; // maintained this run
+
+    // A wrapper is "managed" only when its namespace prefix matches the
+    // namespace encoded in its symlink target — this distinguishes
+    // script-produced wrappers from hand-authored composite wrappers.
+    const ns = entry.slice(0, entry.indexOf(":"));
+    const matchTarget = (t: string | null, p: string): boolean => {
+      if (!t) return false;
+      if (t.startsWith(`${p}/personal/skills/`)) return ns === "personal";
+      if (t.startsWith(`${p}/core/skills/`)) return ns === "core";
+      if (t.startsWith(`${p}/companies/${ns}/skills/`)) return true;
+      if (t.startsWith(`${p}/core/packages/${ns}/skills/`)) return true;
+      return false;
+    };
+
+    let isManaged = false;
+    if (lst.isSymbolicLink()) {
+      // (a) directory-style symlink wrapper (older shape): 2-level target.
+      isManaged = matchTarget(readlinkOrNull(entryPath), "../..");
+    } else if (lst.isDirectory()) {
+      // (b) real directory of per-file symlinks (current shape): 3-level.
+      for (const f of globEntries(entryPath)) {
+        const fp = path.join(entryPath, f);
+        const fst = lstatOrNull(fp);
+        if (!fst || !fst.isSymbolicLink()) continue;
+        if (matchTarget(readlinkOrNull(fp), "../../..")) {
+          isManaged = true;
+          break;
+        }
+      }
+    }
+    if (!isManaged) continue;
+
+    // Managed-namespace wrapper with no corresponding live source → drop.
+    try {
+      if (lst.isSymbolicLink()) {
+        fs.rmSync(entryPath);
+      } else if (lst.isDirectory()) {
+        fs.rmSync(entryPath, { recursive: true, force: true });
+      }
+    } catch {
+      /* best-effort */
+    }
+  }
+
+  // --- Personal type mirroring ----------------------------------------------
+  // Mirror personal/<type>/<entry> into core/<type>/<entry> as symlinks.
+  for (const type of ["knowledge", "policies", "workers", "settings"]) {
+    const personalDir = path.join(root, "personal", type);
+    const coreDir = path.join(root, "core", type);
+
+    if (!isDir(personalDir)) continue;
+    fs.mkdirSync(coreDir, { recursive: true });
+
+    for (const entry of globEntries(personalDir)) {
+      const entryPath = path.join(personalDir, entry);
+      if (!existsFollow(entryPath)) continue;
+
+      const linkPath = path.join(coreDir, entry);
+      const relativeTarget = `../../personal/${type}/${entry}`;
+
+      const lst = lstatOrNull(linkPath);
+      if (lst && lst.isSymbolicLink()) {
+        const current = readlinkOrNull(linkPath);
+        if (current === relativeTarget) continue;
+        warn(
+          `reindex: core/${type}/${entry} already points to '${current}' (expected '${relativeTarget}'); leaving alone`,
+        );
+        continue;
+      } else if (lst) {
+        warn(`reindex: core/${type}/${entry} already exists and is not a symlink; skipping`);
+        continue;
+      }
+
+      fs.symlinkSync(relativeTarget, linkPath);
+    }
+  }
+
+  // --- Workers registry regeneration ----------------------------------------
+  // Source of truth: each worker.yaml. The registry is a derived index — the
+  // generator (when present in the operated-on tree) keeps it in sync.
+  // Best-effort and idempotent; never fails the reindex.
+  const genScript = path.join(root, "core", "scripts", "generate-workers-registry.sh");
+  if (isExecutable(genScript)) {
+    // Route the generator's stdout+stderr to our stderr (`>&2 2>&1`).
+    spawnSync("bash", [genScript], { stdio: ["ignore", 2, 2] });
+  }
+
+  return { status: 0 };
 }