@indigoai-us/hq-cloud 6.15.0 → 6.15.2

package/src/lib/conflict.test.ts

@@ -1,348 +0,0 @@
-/**
- * Tests for the pure conflict primitives — path building, atomic index
- * writes, dedup. The machine-id resolver moved to `./machine-id.ts` (see
- * `./machine-id.test.ts`) when hq-cloud took ownership of the provisioning
- * step from the menubar app.
- */
-
-import { describe, it, expect, beforeEach, afterEach } from "vitest";
-import * as fs from "fs";
-import * as os from "os";
-import * as path from "path";
-import {
-  buildConflictPath,
-  buildConflictId,
-} from "./conflict-file.js";
-import {
-  appendConflictEntry,
-  getConflictIndexPath,
-  pruneConflictIndex,
-  readConflictIndex,
-  removeConflictEntry,
-  writeConflictIndex,
-} from "./conflict-index.js";
-import type { ConflictIndexEntry } from "../types.js";
-
-describe("buildConflictPath", () => {
-  it("inserts the conflict marker before the original extension", () => {
-    expect(
-      buildConflictPath("knowledge/notes.md", "2026-04-27T22:05:14Z", "abc123"),
-    ).toBe("knowledge/notes.md.conflict-2026-04-27T22-05-14Z-abc123.md");
-  });
-
-  it("preserves nested paths and json extensions", () => {
-    expect(
-      buildConflictPath("projects/foo/prd.json", "2026-04-27T22:05:14.123Z", "abc123"),
-    ).toBe("projects/foo/prd.json.conflict-2026-04-27T22-05-14Z-abc123.json");
-  });
-
-  it("appends the suffix verbatim for files without an extension", () => {
-    expect(
-      buildConflictPath("secrets", "2026-04-27T22:05:14Z", "abc123"),
-    ).toBe("secrets.conflict-2026-04-27T22-05-14Z-abc123");
-  });
-});
-
-describe("buildConflictId", () => {
-  it("escapes path separators and dots so the id is filesystem-safe", () => {
-    expect(
-      buildConflictId("knowledge/notes.md", "2026-04-27T22:05:14Z"),
-    ).toBe("knowledge-notes-md-2026-04-27T22-05-14Z");
-  });
-
-  it("yields the same id for the same (path, ts) pair — dedup primitive", () => {
-    const a = buildConflictId("foo/bar.md", "2026-04-27T22:05:14Z");
-    const b = buildConflictId("foo/bar.md", "2026-04-27T22:05:14Z");
-    expect(a).toBe(b);
-  });
-});
-
-describe("conflict index", () => {
-  let tmpHq: string;
-
-  beforeEach(() => {
-    tmpHq = fs.mkdtempSync(path.join(os.tmpdir(), "hq-cidx-"));
-  });
-
-  afterEach(() => {
-    fs.rmSync(tmpHq, { recursive: true, force: true });
-  });
-
-  function entry(overrides: Partial<ConflictIndexEntry> = {}): ConflictIndexEntry {
-    return {
-      id: "knowledge-notes-md-2026-04-27T22-05-14Z",
-      originalPath: "knowledge/notes.md",
-      conflictPath: "knowledge/notes.md.conflict-2026-04-27T22-05-14Z-abc123.md",
-      detectedAt: "2026-04-27T22:05:14Z",
-      side: "pull",
-      machineId: "abc123",
-      localHash: "local",
-      remoteHash: "remote",
-      remoteVersionId: "v2",
-      lastKnownVersionId: "v1",
-      ...overrides,
-    };
-  }
-
-  it("returns an empty index when the file does not exist", () => {
-    const idx = readConflictIndex(tmpHq);
-    expect(idx).toEqual({ version: 1, conflicts: [] });
-  });
-
-  it("creates the .hq-conflicts dir on first write", () => {
-    appendConflictEntry(tmpHq, entry());
-    expect(fs.existsSync(getConflictIndexPath(tmpHq))).toBe(true);
-    expect(fs.existsSync(path.join(tmpHq, ".hq-conflicts"))).toBe(true);
-  });
-
-  it("appends new entries and dedupes on id (idempotent re-detection)", () => {
-    appendConflictEntry(tmpHq, entry({ id: "a", remoteVersionId: "v1" }));
-    appendConflictEntry(tmpHq, entry({ id: "b", remoteVersionId: "v1" }));
-    // Re-detect "a" — the second push should update in place, not duplicate.
-    appendConflictEntry(tmpHq, entry({ id: "a", remoteVersionId: "v9" }));
-
-    const idx = readConflictIndex(tmpHq);
-    expect(idx.conflicts).toHaveLength(2);
-    const a = idx.conflicts.find((c) => c.id === "a");
-    expect(a?.remoteVersionId).toBe("v9"); // updated, not appended
-  });
-
-  it("sorts conflicts by detectedAt ascending on every write", () => {
-    appendConflictEntry(tmpHq, entry({ id: "newer", detectedAt: "2026-04-27T23:00:00Z" }));
-    appendConflictEntry(tmpHq, entry({ id: "older", detectedAt: "2026-04-27T22:00:00Z" }));
-    const idx = readConflictIndex(tmpHq);
-    expect(idx.conflicts.map((c) => c.id)).toEqual(["older", "newer"]);
-  });
-
-  it("removeConflictEntry removes a single entry by id", () => {
-    appendConflictEntry(tmpHq, entry({ id: "keep" }));
-    appendConflictEntry(tmpHq, entry({ id: "drop" }));
-    removeConflictEntry(tmpHq, "drop");
-    const idx = readConflictIndex(tmpHq);
-    expect(idx.conflicts.map((c) => c.id)).toEqual(["keep"]);
-  });
-
-  it("removeConflictEntry is a no-op when the id is not present", () => {
-    appendConflictEntry(tmpHq, entry({ id: "a" }));
-    expect(() => removeConflictEntry(tmpHq, "missing")).not.toThrow();
-    expect(readConflictIndex(tmpHq).conflicts).toHaveLength(1);
-  });
-
-  it("writeConflictIndex leaves no .tmp files on disk after success", () => {
-    writeConflictIndex(tmpHq, { version: 1, conflicts: [entry()] });
-    const files = fs.readdirSync(path.join(tmpHq, ".hq-conflicts"));
-    // Only index.json should remain; tmp files renamed atomically into place.
-    expect(files).toEqual(["index.json"]);
-  });
-
-  it("returns an empty index for malformed-but-parseable JSON", () => {
-    const indexPath = getConflictIndexPath(tmpHq);
-    fs.mkdirSync(path.dirname(indexPath), { recursive: true });
-    fs.writeFileSync(indexPath, JSON.stringify({ version: 1 })); // no `conflicts` array
-    const idx = readConflictIndex(tmpHq);
-    expect(idx.conflicts).toEqual([]);
-  });
-});
-
-describe("pruneConflictIndex", () => {
-  let tmpHq: string;
-
-  beforeEach(() => {
-    tmpHq = fs.mkdtempSync(path.join(os.tmpdir(), "hq-cprune-"));
-  });
-
-  afterEach(() => {
-    fs.rmSync(tmpHq, { recursive: true, force: true });
-  });
-
-  /** Write a file at a hq-relative path, creating parent dirs. */
-  function put(rel: string, content: string): void {
-    const abs = path.join(tmpHq, rel);
-    fs.mkdirSync(path.dirname(abs), { recursive: true });
-    fs.writeFileSync(abs, content);
-  }
-
-  /** Write a symlink at a hq-relative path pointing at `target` (verbatim). */
-  function putLink(rel: string, target: string): void {
-    const abs = path.join(tmpHq, rel);
-    fs.mkdirSync(path.dirname(abs), { recursive: true });
-    fs.symlinkSync(target, abs);
-  }
-
-  /**
-   * Build an entry whose original/conflict paths are derived from `id` so each
-   * row addresses distinct files on disk (the shared `entry()` helper above
-   * reuses one fixed path pair, which would collide across rows here).
-   */
-  function rowFor(id: string): ConflictIndexEntry {
-    return {
-      id,
-      originalPath: `dir/${id}.md`,
-      conflictPath: `dir/${id}.md.conflict-2026-04-27T22-05-14Z-abc123.md`,
-      detectedAt: "2026-04-27T22:05:14Z",
-      side: "pull",
-      machineId: "abc123",
-      localHash: "local",
-      remoteHash: "remote",
-    };
-  }
-
-  it("returns a zeroed result and writes nothing for an empty/absent index", () => {
-    const res = pruneConflictIndex(tmpHq);
-    expect(res).toEqual({
-      prunedOrphans: 0,
-      prunedIdentical: 0,
-      removedMirrors: 0,
-      kept: 0,
-      keptSamplePaths: [],
-    });
-    expect(fs.existsSync(getConflictIndexPath(tmpHq))).toBe(false);
-  });
-
-  it("drops a row whose .conflict-* mirror no longer exists (orphan)", () => {
-    const row = rowFor("orphan");
-    put(row.originalPath, "still here");
-    // No mirror file on disk.
-    writeConflictIndex(tmpHq, { version: 1, conflicts: [row] });
-
-    const res = pruneConflictIndex(tmpHq);
-    expect(res.prunedOrphans).toBe(1);
-    expect(res.kept).toBe(0);
-    expect(readConflictIndex(tmpHq).conflicts).toHaveLength(0);
-  });
-
-  it("drops a byte-identical row and deletes its mirror file", () => {
-    const row = rowFor("identical");
-    put(row.originalPath, "same bytes");
-    put(row.conflictPath, "same bytes");
-    writeConflictIndex(tmpHq, { version: 1, conflicts: [row] });
-
-    const res = pruneConflictIndex(tmpHq);
-    expect(res.prunedIdentical).toBe(1);
-    expect(res.removedMirrors).toBe(1);
-    expect(readConflictIndex(tmpHq).conflicts).toHaveLength(0);
-    expect(fs.existsSync(path.join(tmpHq, row.conflictPath))).toBe(false);
-    // The user's original is never touched.
-    expect(fs.existsSync(path.join(tmpHq, row.originalPath))).toBe(true);
-  });
-
-  it("keeps a genuinely divergent row and leaves both files in place", () => {
-    const row = rowFor("real");
-    put(row.originalPath, "local edit");
-    put(row.conflictPath, "remote edit");
-    writeConflictIndex(tmpHq, { version: 1, conflicts: [row] });
-
-    const res = pruneConflictIndex(tmpHq);
-    expect(res.kept).toBe(1);
-    expect(res.prunedIdentical).toBe(0);
-    expect(res.prunedOrphans).toBe(0);
-    expect(readConflictIndex(tmpHq).conflicts.map((c) => c.id)).toEqual(["real"]);
-    expect(fs.existsSync(path.join(tmpHq, row.conflictPath))).toBe(true);
-  });
-
-  it("keeps a row whose original is missing (local-delete divergence)", () => {
-    const row = rowFor("deleted-local");
-    // No original; mirror present.
-    put(row.conflictPath, "remote bytes");
-    writeConflictIndex(tmpHq, { version: 1, conflicts: [row] });
-
-    const res = pruneConflictIndex(tmpHq);
-    expect(res.kept).toBe(1);
-    expect(readConflictIndex(tmpHq).conflicts).toHaveLength(1);
-  });
-
-  it("treats two symlinks with the same target as identical, differing targets as a conflict", () => {
-    const same = rowFor("link-same");
-    putLink(same.originalPath, "../target/a");
-    putLink(same.conflictPath, "../target/a");
-
-    const diff = rowFor("link-diff");
-    putLink(diff.originalPath, "../target/a");
-    putLink(diff.conflictPath, "../target/b");
-
-    writeConflictIndex(tmpHq, { version: 1, conflicts: [same, diff] });
-
-    const res = pruneConflictIndex(tmpHq);
-    expect(res.prunedIdentical).toBe(1);
-    expect(res.kept).toBe(1);
-    expect(readConflictIndex(tmpHq).conflicts.map((c) => c.id)).toEqual([
-      "link-diff",
-    ]);
-  });
-
-  it("partitions a mixed batch and preserves only the real conflicts", () => {
-    const orphan = rowFor("orphan");
-    put(orphan.originalPath, "x"); // mirror missing
-
-    const identical = rowFor("identical");
-    put(identical.originalPath, "dup");
-    put(identical.conflictPath, "dup");
-
-    const real = rowFor("real");
-    put(real.originalPath, "L");
-    put(real.conflictPath, "R");
-
-    writeConflictIndex(tmpHq, {
-      version: 1,
-      conflicts: [orphan, identical, real],
-    });
-
-    const res = pruneConflictIndex(tmpHq);
-    expect(res).toEqual({
-      prunedOrphans: 1,
-      prunedIdentical: 1,
-      removedMirrors: 1,
-      kept: 1,
-      keptSamplePaths: ["dir/real.md"],
-    });
-    expect(readConflictIndex(tmpHq).conflicts.map((c) => c.id)).toEqual(["real"]);
-  });
-
-  it("does not rewrite the index file when nothing is pruned", () => {
-    const real = rowFor("real");
-    put(real.originalPath, "L");
-    put(real.conflictPath, "R");
-    writeConflictIndex(tmpHq, { version: 1, conflicts: [real] });
-
-    const indexPath = getConflictIndexPath(tmpHq);
-    const before = fs.statSync(indexPath).mtimeMs;
-    // Advance the clock past filesystem mtime granularity, then prune.
-    const spin = Date.now() + 20;
-    while (Date.now() < spin) {
-      /* busy-wait ~20ms so a rewrite would move mtime */
-    }
-    pruneConflictIndex(tmpHq);
-    expect(fs.statSync(indexPath).mtimeMs).toBe(before);
-  });
-
-  it("names the preserved conflict variants (keptSamplePaths, capped at 10) for the reconcile surface (feedback_d2082110)", () => {
-    // Reporter feedback_d2082110 finished a full sync with "20 older preserved
-    // conflict entries" still on disk and NO signal they were there. The prune
-    // self-heals the ledger but conservatively KEEPS genuine divergences; those
-    // were silent. keptSamplePaths surfaces the original (non-mirror) paths so
-    // the runner can emit a `conflicts-remaining` reconcile line pointing the
-    // operator at `/resolve-conflicts`.
-    const rows: ConflictIndexEntry[] = [];
-    for (let i = 0; i < 12; i++) {
-      const id = `real-${String(i).padStart(2, "0")}`;
-      const row = rowFor(id);
-      put(row.originalPath, `local-${i}`);
-      put(row.conflictPath, `remote-${i}`);
-      rows.push(row);
-    }
-    writeConflictIndex(tmpHq, { version: 1, conflicts: rows });
-
-    const res = pruneConflictIndex(tmpHq);
-    expect(res.kept).toBe(12);
-    // Capped at 10 samples, drawn from the kept (detectedAt-sorted) rows.
-    expect(res.keptSamplePaths).toHaveLength(10);
-    expect(res.keptSamplePaths.every((p) => p.startsWith("dir/real-"))).toBe(true);
-    // Orphaned/identical rows never contribute to the surfaced sample.
-    const orphan = rowFor("orphan");
-    put(orphan.originalPath, "x"); // mirror missing → dropped, not sampled
-    writeConflictIndex(tmpHq, { version: 1, conflicts: [orphan] });
-    const res2 = pruneConflictIndex(tmpHq);
-    expect(res2.kept).toBe(0);
-    expect(res2.keptSamplePaths).toEqual([]);
-  });
-});

package/src/lib/describe-error.test.ts

@@ -1,100 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { describeError } from "./describe-error.js";
-
-describe("describeError", () => {
-  it("returns String(value) for non-Error throws", () => {
-    expect(describeError("plain string")).toBe("plain string");
-    expect(describeError(42)).toBe("42");
-    expect(describeError(null)).toBe("null");
-    expect(describeError(undefined)).toBe("undefined");
-  });
-
-  it("returns just the message for a plain Error (skips generic 'Error' name)", () => {
-    expect(describeError(new Error("acme blew up"))).toBe("acme blew up");
-  });
-
-  it("includes named subclasses (TypeError, RangeError, …)", () => {
-    expect(describeError(new TypeError("nope"))).toBe("TypeError nope");
-  });
-
-  it("surfaces AWS SDK v3 UnknownError with cause chain (the bug this fixes)", () => {
-    const sdkErr = new Error("UnknownError");
-    sdkErr.name = "UnknownError";
-    const dnsErr = new Error(
-      "getaddrinfo ENOTFOUND privy.s3.us-east-1.amazonaws.com",
-    );
-    (dnsErr as Error & { code?: string; syscall?: string; hostname?: string }).code =
-      "ENOTFOUND";
-    (dnsErr as Error & { code?: string; syscall?: string; hostname?: string }).syscall =
-      "getaddrinfo";
-    (dnsErr as Error & { code?: string; syscall?: string; hostname?: string }).hostname =
-      "privy.s3.us-east-1.amazonaws.com";
-    (sdkErr as Error & { cause?: unknown }).cause = dnsErr;
-
-    const msg = describeError(sdkErr);
-    expect(msg).toContain("UnknownError");
-    expect(msg).toContain("cause=ENOTFOUND");
-    expect(msg).toContain("syscall=getaddrinfo");
-    expect(msg).toContain("host=privy.s3.us-east-1.amazonaws.com");
-  });
-
-  it("surfaces $metadata.httpStatusCode when present (AccessDenied, etc.)", () => {
-    const err = new Error("The provided credentials were not authorized.");
-    err.name = "AccessDenied";
-    (err as Error & { $metadata?: { httpStatusCode?: number } }).$metadata = {
-      httpStatusCode: 403,
-    };
-    const msg = describeError(err);
-    expect(msg).toContain("AccessDenied");
-    expect(msg).toContain("http=403");
-    expect(msg).toContain("The provided credentials");
-  });
-
-  it("includes own .code attribute on the top-level error", () => {
-    const err = new Error("connect timeout") as Error & { code?: string };
-    err.code = "ETIMEDOUT";
-    expect(describeError(err)).toContain("code=ETIMEDOUT");
-  });
-
-  it("walks up to 3 cause levels, no further", () => {
-    // top → c1 → c2 → c3 → c4 (5 errors, 4 cause hops). The walk should
-    // surface c1/c2/c3 codes but stop before c4.
-    const c4 = new Error("c4");
-    (c4 as Error & { code?: string }).code = "C4_CODE";
-    const c3 = new Error("c3");
-    (c3 as Error & { code?: string; cause?: unknown }).code = "C3_CODE";
-    (c3 as Error & { cause?: unknown }).cause = c4;
-    const c2 = new Error("c2");
-    (c2 as Error & { code?: string; cause?: unknown }).code = "C2_CODE";
-    (c2 as Error & { cause?: unknown }).cause = c3;
-    const c1 = new Error("c1");
-    (c1 as Error & { code?: string; cause?: unknown }).code = "C1_CODE";
-    (c1 as Error & { cause?: unknown }).cause = c2;
-    const top = new Error("top");
-    (top as Error & { cause?: unknown }).cause = c1;
-    const msg = describeError(top);
-    expect(msg).toContain("cause=C1_CODE");
-    expect(msg).toContain("cause=C2_CODE");
-    expect(msg).toContain("cause=C3_CODE");
-    // c4 is the 4th cause level — outside the 3-level walk
-    expect(msg).not.toContain("C4_CODE");
-  });
-
-  it("breaks on a cycle in the cause chain", () => {
-    const a = new Error("a");
-    const b = new Error("b");
-    (a as Error & { cause?: unknown }).cause = b;
-    (b as Error & { cause?: unknown }).cause = a;
-    // Should not infinite-loop; should return something containing "a" and "b".
-    const msg = describeError(a);
-    expect(msg).toContain("a");
-    expect(msg).toContain("b");
-  });
-
-  it("de-dups consecutive identical fragments (the 'UnknownError UnknownError' case)", () => {
-    const err = new Error("UnknownError");
-    err.name = "UnknownError";
-    // Without de-dup the output would start "UnknownError UnknownError".
-    expect(describeError(err)).toBe("UnknownError");
-  });
-});

package/src/lib/describe-error.ts

@@ -1,58 +0,0 @@
-/**
- * Surface AWS SDK v3's opaque `UnknownError` wrapper.
- *
- * When the SDK can't match a response to a modeled exception (which includes
- * every Node-side networking failure — `getaddrinfo ENOTFOUND`, `ECONNRESET`,
- * `EHOSTUNREACH`, expired-DNS-cache hits, etc.) it raises an error whose
- * `name` and `message` are both literally "UnknownError" and stashes the
- * underlying Node error on `.cause`. Plain `err.message` extraction at the
- * catch site loses the cause chain entirely, leaving operators with an
- * unactionable "UnknownError" in the event stream.
- *
- * This walks the cause chain (capped at 3 levels) and stitches together a
- * single diagnostic line that preserves the original failure mode.
- *
- * Example outputs:
- *   "UnknownError cause=ENOTFOUND syscall=getaddrinfo host=hq-vault-cmp-…s3.us-east-1.amazonaws.com"
- *   "AccessDenied http=403 The provided credentials …"
- *   "Error code=ETIMEDOUT cause=ETIMEDOUT host=api.example.com"
- */
-export function describeError(err: unknown): string {
-  if (!(err instanceof Error)) return String(err);
-
-  const parts: string[] = [];
-  const e = err as Error & {
-    code?: string;
-    $metadata?: { httpStatusCode?: number; requestId?: string };
-    cause?: unknown;
-  };
-
-  if (e.name && e.name !== "Error") parts.push(e.name);
-  if (e.code) parts.push(`code=${e.code}`);
-  if (e.$metadata?.httpStatusCode) parts.push(`http=${e.$metadata.httpStatusCode}`);
-
-  // Walk cause chain to capture the underlying syscall / hostname / code
-  // that the SDK swallowed. Cap depth at 3 and de-cycle with a Set.
-  const seen = new Set<unknown>([err]);
-  let cur: unknown = e.cause;
-  for (let i = 0; i < 3 && cur && !seen.has(cur); i++) {
-    seen.add(cur);
-    const c = cur as {
-      code?: string;
-      syscall?: string;
-      hostname?: string;
-      message?: string;
-      cause?: unknown;
-    };
-    if (c.code) parts.push(`cause=${c.code}`);
-    if (c.syscall) parts.push(`syscall=${c.syscall}`);
-    if (c.hostname) parts.push(`host=${c.hostname}`);
-    if (c.message && c.message !== e.message) parts.push(c.message);
-    cur = c.cause;
-  }
-
-  if (e.message) parts.push(e.message);
-
-  // De-dup consecutive repeats (SDK's "UnknownError UnknownError" case)
-  return parts.filter((p, i) => i === 0 || p !== parts[i - 1]).join(" ");
-}

package/src/lib/exit-codes.ts

@@ -1,24 +0,0 @@
-/**
- * Runner exit code for a partial sync pass: the pass ran to completion but one
- * or more per-file transfers threw (`errors.length > 0` in the all-complete
- * aggregate). Deterministic per-file failures — an oversized object on a
- * pre-skip runner, a presign denial, an expired token late in a long pass, a
- * corrupt doubly-scoped vault key — all land here.
- *
- * A one-shot `hq sync` exits with this code so humans and scripts see the
- * failure. The watch loop must NOT exit on it: auto-sync runs unattended, and
- * a watcher that dies on every partial pass gets hot-respawned by the menubar
- * supervisor, which Sentry-captures each death as "auto-sync watcher exited
- * unexpectedly (code=Some(2))". Because the watcher typically runs healthily
- * for minutes before the failing pass, the supervisor's fast-crash-loop
- * dampening never engages and EVERY death ships an event — the July 2026
- * #hq-sentry-alerts flood (~1,700 events across 60+ machines in 5 days).
- * Instead the loop logs, stays alive, and re-attempts on the next tick; the
- * per-file errors still surface through the ndjson `error` events and the
- * `partial: true` all-complete aggregate.
- *
- * Kept off the other codes in use by the runner: 0 ok, 1 hard error, 17
- * op-locked (`OPERATION_LOCKED_EXIT`), 75 transient network
- * (`TRANSIENT_NETWORK_EXIT`).
- */
-export const PARTIAL_SYNC_EXIT = 2;