npm - @indigoai-us/hq-cloud - Versions diffs - 5.7.0 → 5.7.2 - Mend

@indigoai-us/hq-cloud 5.7.0 → 5.7.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (23) hide show

package/dist/cli/sync.d.ts.map +1 -1
package/dist/cli/sync.js +50 -0
package/dist/cli/sync.js.map +1 -1
package/dist/lib/conflict-file.d.ts +46 -0
package/dist/lib/conflict-file.d.ts.map +1 -0
package/dist/lib/conflict-file.js +86 -0
package/dist/lib/conflict-file.js.map +1 -0
package/dist/lib/conflict-index.d.ts +66 -0
package/dist/lib/conflict-index.d.ts.map +1 -0
package/dist/lib/conflict-index.js +112 -0
package/dist/lib/conflict-index.js.map +1 -0
package/dist/lib/conflict.test.d.ts +7 -0
package/dist/lib/conflict.test.d.ts.map +1 -0
package/dist/lib/conflict.test.js +136 -0
package/dist/lib/conflict.test.js.map +1 -0
package/dist/types.d.ts +18 -0
package/dist/types.d.ts.map +1 -1
package/package.json +1 -1
package/src/cli/sync.ts +66 -0
package/src/lib/conflict-file.ts +101 -0
package/src/lib/conflict-index.ts +127 -0
package/src/lib/conflict.test.ts +180 -0
package/src/types.ts +27 -0

package/dist/cli/sync.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/cli/sync.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,kBAAkB,EAAe,MAAM,aAAa,CAAC;AAOnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;~~AAE1E~~;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,MAAM,iBAAiB,GACzB;IACE,IAAI,EAAE,MAAM,CAAC;IACb,oEAAoE;IACpE,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,iEAAiE;IACjE,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,0EAA0E;IAC1E,WAAW,EAAE,MAAM,CAAC;IACpB;;;;OAIG;IACH,eAAe,EAAE,MAAM,CAAC;CACzB,GACD;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GACnE;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAChD;IACE,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,UAAU,EAAE,kBAAkB,CAAC;CAChC,CAAC;AAEN,MAAM,WAAW,WAAW;IAC1B,mEAAmE;IACnE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,wCAAwC;IACxC,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,2BAA2B;IAC3B,WAAW,EAAE,kBAAkB,CAAC;IAChC,wBAAwB;IACxB,MAAM,EAAE,MAAM,CAAC;IACf;;;;;OAKG;IACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC7C;;;;;OAKG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,UAAU;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED;;GAEG;AACH,wBAAsB,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,~~CA2KpE~~"}
1	+ {"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/cli/sync.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,kBAAkB,EAAe,MAAM,aAAa,CAAC;AAOnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAQ1E;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,MAAM,iBAAiB,GACzB;IACE,IAAI,EAAE,MAAM,CAAC;IACb,oEAAoE;IACpE,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,iEAAiE;IACjE,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,0EAA0E;IAC1E,WAAW,EAAE,MAAM,CAAC;IACpB;;;;OAIG;IACH,eAAe,EAAE,MAAM,CAAC;CACzB,GACD;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GACnE;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAChD;IACE,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,UAAU,EAAE,kBAAkB,CAAC;CAChC,CAAC;AAEN,MAAM,WAAW,WAAW;IAC1B,mEAAmE;IACnE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,wCAAwC;IACxC,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,2BAA2B;IAC3B,WAAW,EAAE,kBAAkB,CAAC;IAChC,wBAAwB;IACxB,MAAM,EAAE,MAAM,CAAC;IACf;;;;;OAKG;IACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC7C;;;;;OAKG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,UAAU;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED;;GAEG;AACH,wBAAsB,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,CAuOpE"}

package/dist/cli/sync.js CHANGED Viewed

@@ -11,6 +11,8 @@ import { downloadFile, listRemoteFiles } from "../s3.js";
 import { readJournal, writeJournal, hashFile, updateEntry, getEntry, normalizeEtag } from "../journal.js";
 import { createIgnoreFilter } from "../ignore.js";
 import { resolveConflict } from "./conflict.js";
+import { buildConflictId, buildConflictPath, readShortMachineId, } from "../lib/conflict-file.js";
+import { appendConflictEntry } from "../lib/conflict-index.js";
 /**
  * Sync (pull) all allowed files from the entity vault.
  */
@@ -93,6 +95,39 @@ export async function sync(options) {
                 direction: "pull",
                 resolution,
             });
+            // Write `<original>.conflict-<ts>-<machine>.<ext>` mirror + append to
+            // `<hqRoot>/.hq-conflicts/index.json` so the user can later run
+            // `/resolve-conflicts` to walk pending conflicts. Skipped for "abort"
+            // (user gave up) and "overwrite" (cloud bytes are about to replace
+            // local — mirror would be redundant). Best-effort: failure here only
+            // emits an error, doesn't break the sync.
+            if (resolution !== "abort" && resolution !== "overwrite") {
+                try {
+                    const detectedAt = new Date().toISOString();
+                    const machineId = readShortMachineId();
+                    const originalRelative = path.relative(hqRoot, localPath);
+                    const conflictRelative = buildConflictPath(originalRelative, detectedAt, machineId);
+                    const conflictAbs = path.join(hqRoot, conflictRelative);
+                    await downloadFile(ctx, remoteFile.key, conflictAbs);
+                    appendConflictEntry(hqRoot, {
+                        id: buildConflictId(originalRelative, detectedAt),
+                        originalPath: originalRelative,
+                        conflictPath: conflictRelative,
+                        detectedAt,
+                        side: "pull",
+                        machineId,
+                        localHash: item.localHash,
+                        remoteHash: remoteFile.etag ? normalizeEtag(remoteFile.etag) : "",
+                    });
+                }
+                catch (mirrorErr) {
+                    emit({
+                        type: "error",
+                        path: remoteFile.key,
+                        message: `conflict mirror write failed: ${mirrorErr instanceof Error ? mirrorErr.message : String(mirrorErr)}`,
+                    });
+                }
+            }
             if (resolution === "abort") {
                 writeJournal(journalSlug, journal);
                 return {
@@ -106,6 +141,21 @@ export async function sync(options) {
             }
             if (resolution === "keep" || resolution === "skip") {
                 filesSkipped++;
+                // Stamp the journal with the new baseline so the same conflict
+                // doesn't re-fire on every subsequent sync. After "keep", local
+                // wins — the user has accepted that the cloud version we just
+                // mirrored is what cloud is at this etag, and they don't want
+                // it. Recording (current localHash + current remoteEtag) tells
+                // the next sync "no change on either side" until something new
+                // diverges. Without this, both `localChanged` and `remoteChanged`
+                // stay true forever and the conflict is sticky.
+                try {
+                    const stat = fs.statSync(localPath);
+                    updateEntry(journal, remoteFile.key, item.localHash, stat.size, "down", remoteFile.etag);
+                }
+                catch {
+                    // best-effort — sync continues even if stat fails
+                }
                 continue;
             }
             // "overwrite" falls through to download

package/dist/cli/sync.js.map CHANGED Viewed

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

package/dist/lib/conflict-file.d.ts ADDED Viewed

@@ -0,0 +1,46 @@
+/**
+ * Conflict file naming + writing.
+ *
+ * When share/sync detects divergence, the cloud's version of the file is
+ * written next to the original with a name encoding the timestamp and the
+ * machine that detected the conflict. Lets multiple machines independently
+ * surface their own conflicts without name collisions, and lets the user
+ * (or the `/resolve-conflicts` HQ skill) see local + cloud side-by-side
+ * in their file browser.
+ */
+/**
+ * Read the short machine ID (first 6 chars) from `~/.hq/menubar.json`.
+ * Falls back to "unknown" if the file is missing/unreadable — conflict
+ * files should still be written even when machine identity is unclear.
+ */
+export declare function readShortMachineId(): string;
+/**
+ * Build the conflict file path for an original. ISO uses `-` instead of
+ * `:` so the result is filesystem-safe on every OS, and the original
+ * extension is preserved at the end so editors syntax-highlight correctly.
+ *
+ *   knowledge/notes.md, 2026-04-27T22:05:14Z, abc123
+ *     → knowledge/notes.md.conflict-2026-04-27T22-05-14Z-abc123.md
+ *
+ *   projects/foo/prd.json, ..., abc123
+ *     → projects/foo/prd.json.conflict-...-abc123.json
+ *
+ * Files without an extension get the `.conflict-...` suffix appended verbatim.
+ */
+export declare function buildConflictPath(originalRelative: string, detectedAt: string, shortMachineId: string): string;
+/**
+ * Write the cloud-side bytes to the conflict path. Creates parent dirs as
+ * needed (the conflict file always lives next to the original, so the
+ * parent already exists in the steady-state — but defense-in-depth).
+ */
+export declare function writeConflictFile(hqRoot: string, conflictRelative: string, contents: Buffer): void;
+/**
+ * Stable conflict ID — used to dedupe re-detections of the same conflict.
+ * Re-running sync after a conflict but before the user has resolved should
+ * NOT pile up duplicate entries. The id is derived from the original path
+ * and the detection timestamp; if the same original conflicts twice with
+ * the user resolving in between, that's a new id (different timestamp),
+ * which is correct.
+ */
+export declare function buildConflictId(originalRelative: string, detectedAt: string): string;
+//# sourceMappingURL=conflict-file.d.ts.map

package/dist/lib/conflict-file.d.ts.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"conflict-file.d.ts","sourceRoot":"","sources":["../../src/lib/conflict-file.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAiBH;;;;GAIG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAS3C;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,iBAAiB,CAC/B,gBAAgB,EAAE,MAAM,EACxB,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,GACrB,MAAM,CASR;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,MAAM,GACf,IAAI,CAIN;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,gBAAgB,EAAE,MAAM,EACxB,UAAU,EAAE,MAAM,GACjB,MAAM,CAIR"}

package/dist/lib/conflict-file.js ADDED Viewed

@@ -0,0 +1,86 @@
+/**
+ * Conflict file naming + writing.
+ *
+ * When share/sync detects divergence, the cloud's version of the file is
+ * written next to the original with a name encoding the timestamp and the
+ * machine that detected the conflict. Lets multiple machines independently
+ * surface their own conflicts without name collisions, and lets the user
+ * (or the `/resolve-conflicts` HQ skill) see local + cloud side-by-side
+ * in their file browser.
+ */
+import * as fs from "fs";
+import * as os from "os";
+import * as path from "path";
+/**
+ * Path to `~/.hq/menubar.json`. Evaluated lazily at call time (not module
+ * load) so that tests overriding `HOME` after import — and any future code
+ * that changes the user's effective home dir at runtime — see the right
+ * file. Going through `os.homedir()` rather than `process.env.HOME` keeps
+ * the Windows USERPROFILE fallback intact.
+ */
+function menubarJsonPath() {
+    return path.join(os.homedir(), ".hq", "menubar.json");
+}
+/**
+ * Read the short machine ID (first 6 chars) from `~/.hq/menubar.json`.
+ * Falls back to "unknown" if the file is missing/unreadable — conflict
+ * files should still be written even when machine identity is unclear.
+ */
+export function readShortMachineId() {
+    try {
+        const raw = fs.readFileSync(menubarJsonPath(), "utf-8");
+        const parsed = JSON.parse(raw);
+        const id = typeof parsed.machineId === "string" ? parsed.machineId : "";
+        return id.slice(0, 6) || "unknown";
+    }
+    catch {
+        return "unknown";
+    }
+}
+/**
+ * Build the conflict file path for an original. ISO uses `-` instead of
+ * `:` so the result is filesystem-safe on every OS, and the original
+ * extension is preserved at the end so editors syntax-highlight correctly.
+ *
+ *   knowledge/notes.md, 2026-04-27T22:05:14Z, abc123
+ *     → knowledge/notes.md.conflict-2026-04-27T22-05-14Z-abc123.md
+ *
+ *   projects/foo/prd.json, ..., abc123
+ *     → projects/foo/prd.json.conflict-...-abc123.json
+ *
+ * Files without an extension get the `.conflict-...` suffix appended verbatim.
+ */
+export function buildConflictPath(originalRelative, detectedAt, shortMachineId) {
+    const safeTs = detectedAt.replace(/:/g, "-").replace(/\.\d+/, "");
+    const ext = path.extname(originalRelative); // ".md" or "" if none
+    // The full original path is preserved (extension and all) so users can
+    // visually pair `notes.md` with `notes.md.conflict-…md` in their file
+    // browser. The trailing `<ext>` after the timestamp keeps the file
+    // syntax-highlighted in editors that key off the final extension.
+    const suffix = `.conflict-${safeTs}-${shortMachineId}${ext}`;
+    return `${originalRelative}${suffix}`;
+}
+/**
+ * Write the cloud-side bytes to the conflict path. Creates parent dirs as
+ * needed (the conflict file always lives next to the original, so the
+ * parent already exists in the steady-state — but defense-in-depth).
+ */
+export function writeConflictFile(hqRoot, conflictRelative, contents) {
+    const abs = path.join(hqRoot, conflictRelative);
+    fs.mkdirSync(path.dirname(abs), { recursive: true });
+    fs.writeFileSync(abs, contents);
+}
+/**
+ * Stable conflict ID — used to dedupe re-detections of the same conflict.
+ * Re-running sync after a conflict but before the user has resolved should
+ * NOT pile up duplicate entries. The id is derived from the original path
+ * and the detection timestamp; if the same original conflicts twice with
+ * the user resolving in between, that's a new id (different timestamp),
+ * which is correct.
+ */
+export function buildConflictId(originalRelative, detectedAt) {
+    const safeTs = detectedAt.replace(/:/g, "-").replace(/\.\d+/, "");
+    const safePath = originalRelative.replace(/[\/\\.]/g, "-");
+    return `${safePath}-${safeTs}`;
+}
+//# sourceMappingURL=conflict-file.js.map

package/dist/lib/conflict-file.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"conflict-file.js","sourceRoot":"","sources":["../../src/lib/conflict-file.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B;;;;;;GAMG;AACH,SAAS,eAAe;IACtB,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;AACxD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB;IAChC,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,EAAE,OAAO,CAAC,CAAC;QACxD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,EAAE,GAAG,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;QACxE,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,SAAS,CAAC;IACrC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,iBAAiB,CAC/B,gBAAwB,EACxB,UAAkB,EAClB,cAAsB;IAEtB,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAClE,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,sBAAsB;IAClE,uEAAuE;IACvE,sEAAsE;IACtE,mEAAmE;IACnE,kEAAkE;IAClE,MAAM,MAAM,GAAG,aAAa,MAAM,IAAI,cAAc,GAAG,GAAG,EAAE,CAAC;IAC7D,OAAO,GAAG,gBAAgB,GAAG,MAAM,EAAE,CAAC;AACxC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAC/B,MAAc,EACd,gBAAwB,EACxB,QAAgB;IAEhB,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAChD,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACrD,EAAE,CAAC,aAAa,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;AAClC,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,eAAe,CAC7B,gBAAwB,EACxB,UAAkB;IAElB,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAClE,MAAM,QAAQ,GAAG,gBAAgB,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;IAC3D,OAAO,GAAG,QAAQ,IAAI,MAAM,EAAE,CAAC;AACjC,CAAC"}

package/dist/lib/conflict-index.d.ts ADDED Viewed

@@ -0,0 +1,66 @@
+/**
+ * Conflict index — durable record of pending divergences awaiting resolution.
+ *
+ * Lives at `<hq_root>/.hq-conflicts/index.json` (inside HQ content, NOT in
+ * `~/.hq/`). Two reasons it sits in HQ content rather than in the state dir:
+ *   1. The `/resolve-conflicts` HQ skill discovers it relative to the user's
+ *      HQ folder — that's the user's mental anchor for "where my files are."
+ *   2. The conflict-side files themselves live in HQ content, so the index
+ *      and the files it references stay co-located. If the user moves HQ,
+ *      the index moves with it.
+ *
+ * Excluded from cross-machine sync via `.hqignore` — each machine resolves
+ * its own queue. We never propagate conflict files (they'd just create more
+ * conflicts on the other side).
+ *
+ * Writes are atomic (tmp + rename). The resolution skill mutates this file
+ * mid-walk; a torn write would corrupt the only record of pending conflicts
+ * and could lose track of files we'd written to disk. Higher stakes than the
+ * journal, which the next sync can rebuild.
+ */
+import type { ConflictIndex, ConflictIndexEntry } from "../types.js";
+/**
+ * Absolute path to the conflict index for a given HQ root.
+ */
+export declare function getConflictIndexPath(hqRoot: string): string;
+/**
+ * Read the conflict index. Returns an empty index if the file doesn't exist
+ * yet (first-conflict-ever case).
+ *
+ * Throws on corrupt JSON — we deliberately don't auto-repair, since the only
+ * record of pending conflicts is too important to silently overwrite. The
+ * `/resolve-conflicts` skill surfaces this case to the user with a manual
+ * inspection prompt.
+ */
+export declare function readConflictIndex(hqRoot: string): ConflictIndex;
+/**
+ * Atomically write the conflict index. Writes to `<index>.tmp.<random>` then
+ * renames into place — `rename(2)` is atomic on POSIX, so a crash mid-write
+ * leaves either the old file or the new one, never a half-written one.
+ *
+ * Always sorts conflicts by `detectedAt` ascending before writing — keeps
+ * the file diff-friendly across runs and makes "oldest-first walk" the
+ * natural read order in the resolution skill.
+ */
+export declare function writeConflictIndex(hqRoot: string, index: ConflictIndex): void;
+/**
+ * Idempotent append. If an entry with the same `id` already exists (same
+ * original path, same detection timestamp), update it in place rather than
+ * duplicating. This matters because re-running sync after a conflict but
+ * before resolution will re-detect the same divergence — without dedup the
+ * index would grow unboundedly.
+ *
+ * The "update in place" path also covers the case where the cloud advanced
+ * again between detections: we want the latest `remoteVersionId` and
+ * `remoteHash` so the resolution skill shows the user the *current* cloud
+ * state, not stale data from the first detection.
+ */
+export declare function appendConflictEntry(hqRoot: string, entry: ConflictIndexEntry): void;
+/**
+ * Remove an entry by id. Used by the `/resolve-conflicts` skill after the
+ * user picks a resolution and the conflict file is cleaned up. No-op if the
+ * id isn't present (e.g. user manually removed the file then re-ran the
+ * skill — we want that to be a clean exit, not an error).
+ */
+export declare function removeConflictEntry(hqRoot: string, id: string): void;
+//# sourceMappingURL=conflict-index.d.ts.map

package/dist/lib/conflict-index.d.ts.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"conflict-index.d.ts","sourceRoot":"","sources":["../../src/lib/conflict-index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAKH,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAKrE;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAE3D;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,CAY/D;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,aAAa,GACnB,IAAI,CAgBN;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,kBAAkB,GACxB,IAAI,CASN;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI,CAKpE"}

package/dist/lib/conflict-index.js ADDED Viewed

@@ -0,0 +1,112 @@
+/**
+ * Conflict index — durable record of pending divergences awaiting resolution.
+ *
+ * Lives at `<hq_root>/.hq-conflicts/index.json` (inside HQ content, NOT in
+ * `~/.hq/`). Two reasons it sits in HQ content rather than in the state dir:
+ *   1. The `/resolve-conflicts` HQ skill discovers it relative to the user's
+ *      HQ folder — that's the user's mental anchor for "where my files are."
+ *   2. The conflict-side files themselves live in HQ content, so the index
+ *      and the files it references stay co-located. If the user moves HQ,
+ *      the index moves with it.
+ *
+ * Excluded from cross-machine sync via `.hqignore` — each machine resolves
+ * its own queue. We never propagate conflict files (they'd just create more
+ * conflicts on the other side).
+ *
+ * Writes are atomic (tmp + rename). The resolution skill mutates this file
+ * mid-walk; a torn write would corrupt the only record of pending conflicts
+ * and could lose track of files we'd written to disk. Higher stakes than the
+ * journal, which the next sync can rebuild.
+ */
+import * as crypto from "crypto";
+import * as fs from "fs";
+import * as path from "path";
+const CONFLICTS_DIR = ".hq-conflicts";
+const INDEX_FILENAME = "index.json";
+/**
+ * Absolute path to the conflict index for a given HQ root.
+ */
+export function getConflictIndexPath(hqRoot) {
+    return path.join(hqRoot, CONFLICTS_DIR, INDEX_FILENAME);
+}
+/**
+ * Read the conflict index. Returns an empty index if the file doesn't exist
+ * yet (first-conflict-ever case).
+ *
+ * Throws on corrupt JSON — we deliberately don't auto-repair, since the only
+ * record of pending conflicts is too important to silently overwrite. The
+ * `/resolve-conflicts` skill surfaces this case to the user with a manual
+ * inspection prompt.
+ */
+export function readConflictIndex(hqRoot) {
+    const indexPath = getConflictIndexPath(hqRoot);
+    if (!fs.existsSync(indexPath)) {
+        return { version: 1, conflicts: [] };
+    }
+    const raw = fs.readFileSync(indexPath, "utf-8");
+    const parsed = JSON.parse(raw);
+    // Defensive: an empty file or wrong-shape JSON shouldn't crash callers.
+    if (!parsed || typeof parsed !== "object" || !Array.isArray(parsed.conflicts)) {
+        return { version: 1, conflicts: [] };
+    }
+    return parsed;
+}
+/**
+ * Atomically write the conflict index. Writes to `<index>.tmp.<random>` then
+ * renames into place — `rename(2)` is atomic on POSIX, so a crash mid-write
+ * leaves either the old file or the new one, never a half-written one.
+ *
+ * Always sorts conflicts by `detectedAt` ascending before writing — keeps
+ * the file diff-friendly across runs and makes "oldest-first walk" the
+ * natural read order in the resolution skill.
+ */
+export function writeConflictIndex(hqRoot, index) {
+    const indexPath = getConflictIndexPath(hqRoot);
+    fs.mkdirSync(path.dirname(indexPath), { recursive: true });
+    const sorted = {
+        version: index.version,
+        conflicts: [...index.conflicts].sort((a, b) => a.detectedAt.localeCompare(b.detectedAt)),
+    };
+    // Random suffix in tmp name avoids collision if two sync runs ever overlap
+    // (shouldn't happen — the runner serializes — but cheap insurance).
+    const tmpPath = `${indexPath}.tmp.${crypto.randomBytes(6).toString("hex")}`;
+    fs.writeFileSync(tmpPath, JSON.stringify(sorted, null, 2));
+    fs.renameSync(tmpPath, indexPath);
+}
+/**
+ * Idempotent append. If an entry with the same `id` already exists (same
+ * original path, same detection timestamp), update it in place rather than
+ * duplicating. This matters because re-running sync after a conflict but
+ * before resolution will re-detect the same divergence — without dedup the
+ * index would grow unboundedly.
+ *
+ * The "update in place" path also covers the case where the cloud advanced
+ * again between detections: we want the latest `remoteVersionId` and
+ * `remoteHash` so the resolution skill shows the user the *current* cloud
+ * state, not stale data from the first detection.
+ */
+export function appendConflictEntry(hqRoot, entry) {
+    const index = readConflictIndex(hqRoot);
+    const existingIdx = index.conflicts.findIndex((c) => c.id === entry.id);
+    if (existingIdx >= 0) {
+        index.conflicts[existingIdx] = entry;
+    }
+    else {
+        index.conflicts.push(entry);
+    }
+    writeConflictIndex(hqRoot, index);
+}
+/**
+ * Remove an entry by id. Used by the `/resolve-conflicts` skill after the
+ * user picks a resolution and the conflict file is cleaned up. No-op if the
+ * id isn't present (e.g. user manually removed the file then re-ran the
+ * skill — we want that to be a clean exit, not an error).
+ */
+export function removeConflictEntry(hqRoot, id) {
+    const index = readConflictIndex(hqRoot);
+    const filtered = index.conflicts.filter((c) => c.id !== id);
+    if (filtered.length === index.conflicts.length)
+        return;
+    writeConflictIndex(hqRoot, { version: index.version, conflicts: filtered });
+}
+//# sourceMappingURL=conflict-index.js.map

package/dist/lib/conflict-index.js.map ADDED Viewed

@@ -0,0 +1 @@

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

package/dist/lib/conflict.test.d.ts ADDED Viewed

@@ -0,0 +1,7 @@
+/**
+ * Tests for the pure conflict primitives — path building, machine-id
+ * fallback, atomic index writes, dedup. Kept in one file so the related
+ * helpers stay co-located.
+ */
+export {};
+//# sourceMappingURL=conflict.test.d.ts.map

package/dist/lib/conflict.test.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"conflict.test.d.ts","sourceRoot":"","sources":["../../src/lib/conflict.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG"}

package/dist/lib/conflict.test.js ADDED Viewed

@@ -0,0 +1,136 @@
+/**
+ * Tests for the pure conflict primitives — path building, machine-id
+ * fallback, atomic index writes, dedup. Kept in one file so the related
+ * helpers stay co-located.
+ */
+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, readShortMachineId, } from "./conflict-file.js";
+import { appendConflictEntry, getConflictIndexPath, readConflictIndex, removeConflictEntry, writeConflictIndex, } from "./conflict-index.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("readShortMachineId", () => {
+    let originalHome;
+    let tmpHome;
+    beforeEach(() => {
+        originalHome = process.env.HOME;
+        tmpHome = fs.mkdtempSync(path.join(os.tmpdir(), "hq-machineid-"));
+        process.env.HOME = tmpHome;
+    });
+    afterEach(() => {
+        if (originalHome)
+            process.env.HOME = originalHome;
+        else
+            delete process.env.HOME;
+        fs.rmSync(tmpHome, { recursive: true, force: true });
+    });
+    it("returns the first 6 chars when menubar.json has a machineId", () => {
+        fs.mkdirSync(path.join(tmpHome, ".hq"), { recursive: true });
+        fs.writeFileSync(path.join(tmpHome, ".hq", "menubar.json"), JSON.stringify({ machineId: "deadbeefcafe1234567890" }));
+        expect(readShortMachineId()).toBe("deadbe");
+    });
+    it("falls back to 'unknown' when menubar.json is missing", () => {
+        expect(readShortMachineId()).toBe("unknown");
+    });
+    it("falls back to 'unknown' when menubar.json is malformed", () => {
+        fs.mkdirSync(path.join(tmpHome, ".hq"), { recursive: true });
+        fs.writeFileSync(path.join(tmpHome, ".hq", "menubar.json"), "{not-json");
+        expect(readShortMachineId()).toBe("unknown");
+    });
+});
+describe("conflict index", () => {
+    let tmpHq;
+    beforeEach(() => {
+        tmpHq = fs.mkdtempSync(path.join(os.tmpdir(), "hq-cidx-"));
+    });
+    afterEach(() => {
+        fs.rmSync(tmpHq, { recursive: true, force: true });
+    });
+    function entry(overrides = {}) {
+        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([]);
+    });
+});
+//# sourceMappingURL=conflict.test.js.map

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

@@ -0,0 +1 @@

+ {"version":3,"file":"conflict.test.js","sourceRoot":"","sources":["../../src/lib/conflict.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACrE,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,kBAAkB,GACnB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,mBAAmB,EACnB,oBAAoB,EACpB,iBAAiB,EACjB,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;AAG7B,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACnE,MAAM,CACJ,iBAAiB,CAAC,oBAAoB,EAAE,sBAAsB,EAAE,QAAQ,CAAC,CAC1E,CAAC,IAAI,CAAC,4DAA4D,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,CACJ,iBAAiB,CAAC,uBAAuB,EAAE,0BAA0B,EAAE,QAAQ,CAAC,CACjF,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;QACpE,MAAM,CACJ,iBAAiB,CAAC,SAAS,EAAE,sBAAsB,EAAE,QAAQ,CAAC,CAC/D,CAAC,IAAI,CAAC,8CAA8C,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACvE,MAAM,CACJ,eAAe,CAAC,oBAAoB,EAAE,sBAAsB,CAAC,CAC9D,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;QAC3E,MAAM,CAAC,GAAG,eAAe,CAAC,YAAY,EAAE,sBAAsB,CAAC,CAAC;QAChE,MAAM,CAAC,GAAG,eAAe,CAAC,YAAY,EAAE,sBAAsB,CAAC,CAAC;QAChE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,IAAI,YAAgC,CAAC;IACrC,IAAI,OAAe,CAAC;IAEpB,UAAU,CAAC,GAAG,EAAE;QACd,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;QAChC,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,eAAe,CAAC,CAAC,CAAC;QAClE,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,OAAO,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,YAAY;YAAE,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,YAAY,CAAC;;YAC7C,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;QAC7B,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;QACrE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7D,EAAE,CAAC,aAAa,CACd,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,cAAc,CAAC,EACzC,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,wBAAwB,EAAE,CAAC,CACxD,CAAC;QACF,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;QAC9D,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;QAChE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7D,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,cAAc,CAAC,EAAE,WAAW,CAAC,CAAC;QACzE,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,IAAI,KAAa,CAAC;IAElB,UAAU,CAAC,GAAG,EAAE;QACd,KAAK,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,UAAU,CAAC,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;IAEH,SAAS,KAAK,CAAC,YAAyC,EAAE;QACxD,OAAO;YACL,EAAE,EAAE,yCAAyC;YAC7C,YAAY,EAAE,oBAAoB;YAClC,YAAY,EAAE,4DAA4D;YAC1E,UAAU,EAAE,sBAAsB;YAClC,IAAI,EAAE,MAAM;YACZ,SAAS,EAAE,QAAQ;YACnB,SAAS,EAAE,OAAO;YAClB,UAAU,EAAE,QAAQ;YACpB,eAAe,EAAE,IAAI;YACrB,kBAAkB,EAAE,IAAI;YACxB,GAAG,SAAS;SACb,CAAC;IACJ,CAAC;IAED,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;QAC7D,MAAM,GAAG,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;QACrC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,mBAAmB,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QACpC,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9D,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iEAAiE,EAAE,GAAG,EAAE;QACzE,mBAAmB,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QACtE,mBAAmB,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QACtE,yEAAyE;QACzE,mBAAmB,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAEtE,MAAM,GAAG,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;QACrC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACtC,MAAM,CAAC,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC;QAClD,MAAM,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,wBAAwB;IACjE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;QAChE,mBAAmB,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,CAAC,CAAC,CAAC;QACvF,mBAAmB,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,CAAC,CAAC,CAAC;QACvF,MAAM,GAAG,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;QACrC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QAC1D,mBAAmB,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QAClD,mBAAmB,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QAClD,mBAAmB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACnC,MAAM,GAAG,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;QACrC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACnE,mBAAmB,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;QAC/C,MAAM,CAAC,GAAG,EAAE,CAAC,mBAAmB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;QAClE,MAAM,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACvE,kBAAkB,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QAChE,MAAM,KAAK,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC,CAAC;QAChE,0EAA0E;QAC1E,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;QACjE,MAAM,SAAS,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;QAC9C,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3D,EAAE,CAAC,aAAa,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,uBAAuB;QACpF,MAAM,GAAG,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;QACrC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/types.d.ts CHANGED Viewed

@@ -91,4 +91,22 @@ export interface VaultServiceConfig {
     /** AWS region for S3 client (defaults to entity region or us-east-1) */
     region?: string;
 }
+export interface ConflictIndexEntry {
+    id: string;
+    originalPath: string;
+    conflictPath: string;
+    detectedAt: string;
+    side: "push" | "pull";
+    machineId: string;
+    localHash: string;
+    remoteHash: string;
+    /** S3 VersionId when known (present for VersionId-aware buckets). */
+    remoteVersionId?: string;
+    /** Last-known parent VersionId from journal, when known. */
+    lastKnownVersionId?: string | null;
+}
+export interface ConflictIndex {
+    version: 1;
+    conflicts: ConflictIndexEntry[];
+}
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,WAAW;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,IAAI,GAAG,MAAM,CAAC;IACzB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,GAAG,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;CACrC;AAED,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,MAAM,WAAW,UAAU;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,UAAU;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B,yBAAyB;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,4EAA4E;IAC5E,IAAI,EAAE,MAAM,CAAC;IACb,qCAAqC;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,6BAA6B;IAC7B,WAAW,EAAE,gBAAgB,CAAC;IAC9B,6CAA6C;IAC7C,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,8DAA8D;IAC9D,MAAM,EAAE,MAAM,CAAC;IACf,2CAA2C;IAC3C,SAAS,EAAE,MAAM,CAAC;IAClB,wEAAwE;IACxE,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB"}
1	+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

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

package/src/cli/sync.ts CHANGED Viewed

@@ -15,6 +15,12 @@ import { readJournal, writeJournal, hashFile, updateEntry, getEntry, normalizeEt
 import { createIgnoreFilter } from "../ignore.js";
 import { resolveConflict } from "./conflict.js";
 import type { ConflictStrategy, ConflictResolution } from "./conflict.js";
+import {
+  buildConflictId,
+  buildConflictPath,
+  readShortMachineId,
+} from "../lib/conflict-file.js";
+import { appendConflictEntry } from "../lib/conflict-index.js";
 /**
  * Per-file events emitted by `sync()` as it progresses.
@@ -213,6 +219,45 @@ export async function sync(options: SyncOptions): Promise<SyncResult> {
         resolution,
       });
+      // Write `<original>.conflict-<ts>-<machine>.<ext>` mirror + append to
+      // `<hqRoot>/.hq-conflicts/index.json` so the user can later run
+      // `/resolve-conflicts` to walk pending conflicts. Skipped for "abort"
+      // (user gave up) and "overwrite" (cloud bytes are about to replace
+      // local — mirror would be redundant). Best-effort: failure here only
+      // emits an error, doesn't break the sync.
+      if (resolution !== "abort" && resolution !== "overwrite") {
+        try {
+          const detectedAt = new Date().toISOString();
+          const machineId = readShortMachineId();
+          const originalRelative = path.relative(hqRoot, localPath);
+          const conflictRelative = buildConflictPath(
+            originalRelative,
+            detectedAt,
+            machineId,
+          );
+          const conflictAbs = path.join(hqRoot, conflictRelative);
+          await downloadFile(ctx, remoteFile.key, conflictAbs);
+          appendConflictEntry(hqRoot, {
+            id: buildConflictId(originalRelative, detectedAt),
+            originalPath: originalRelative,
+            conflictPath: conflictRelative,
+            detectedAt,
+            side: "pull",
+            machineId,
+            localHash: item.localHash,
+            remoteHash: remoteFile.etag ? normalizeEtag(remoteFile.etag) : "",
+          });
+        } catch (mirrorErr) {
+          emit({
+            type: "error",
+            path: remoteFile.key,
+            message: `conflict mirror write failed: ${
+              mirrorErr instanceof Error ? mirrorErr.message : String(mirrorErr)
+            }`,
+          });
+        }
+      }
       if (resolution === "abort") {
         writeJournal(journalSlug, journal);
         return {
@@ -226,6 +271,27 @@ export async function sync(options: SyncOptions): Promise<SyncResult> {
       }
       if (resolution === "keep" || resolution === "skip") {
         filesSkipped++;
+        // Stamp the journal with the new baseline so the same conflict
+        // doesn't re-fire on every subsequent sync. After "keep", local
+        // wins — the user has accepted that the cloud version we just
+        // mirrored is what cloud is at this etag, and they don't want
+        // it. Recording (current localHash + current remoteEtag) tells
+        // the next sync "no change on either side" until something new
+        // diverges. Without this, both `localChanged` and `remoteChanged`
+        // stay true forever and the conflict is sticky.
+        try {
+          const stat = fs.statSync(localPath);
+          updateEntry(
+            journal,
+            remoteFile.key,
+            item.localHash,
+            stat.size,
+            "down",
+            remoteFile.etag,
+          );
+        } catch {
+          // best-effort — sync continues even if stat fails
+        }
         continue;
       }
       // "overwrite" falls through to download

package/src/lib/conflict-file.ts ADDED Viewed

@@ -0,0 +1,101 @@
+/**
+ * Conflict file naming + writing.
+ *
+ * When share/sync detects divergence, the cloud's version of the file is
+ * written next to the original with a name encoding the timestamp and the
+ * machine that detected the conflict. Lets multiple machines independently
+ * surface their own conflicts without name collisions, and lets the user
+ * (or the `/resolve-conflicts` HQ skill) see local + cloud side-by-side
+ * in their file browser.
+ */
+import * as fs from "fs";
+import * as os from "os";
+import * as path from "path";
+/**
+ * Path to `~/.hq/menubar.json`. Evaluated lazily at call time (not module
+ * load) so that tests overriding `HOME` after import — and any future code
+ * that changes the user's effective home dir at runtime — see the right
+ * file. Going through `os.homedir()` rather than `process.env.HOME` keeps
+ * the Windows USERPROFILE fallback intact.
+ */
+function menubarJsonPath(): string {
+  return path.join(os.homedir(), ".hq", "menubar.json");
+}
+/**
+ * Read the short machine ID (first 6 chars) from `~/.hq/menubar.json`.
+ * Falls back to "unknown" if the file is missing/unreadable — conflict
+ * files should still be written even when machine identity is unclear.
+ */
+export function readShortMachineId(): string {
+  try {
+    const raw = fs.readFileSync(menubarJsonPath(), "utf-8");
+    const parsed = JSON.parse(raw);
+    const id = typeof parsed.machineId === "string" ? parsed.machineId : "";
+    return id.slice(0, 6) || "unknown";
+  } catch {
+    return "unknown";
+  }
+}
+/**
+ * Build the conflict file path for an original. ISO uses `-` instead of
+ * `:` so the result is filesystem-safe on every OS, and the original
+ * extension is preserved at the end so editors syntax-highlight correctly.
+ *
+ *   knowledge/notes.md, 2026-04-27T22:05:14Z, abc123
+ *     → knowledge/notes.md.conflict-2026-04-27T22-05-14Z-abc123.md
+ *
+ *   projects/foo/prd.json, ..., abc123
+ *     → projects/foo/prd.json.conflict-...-abc123.json
+ *
+ * Files without an extension get the `.conflict-...` suffix appended verbatim.
+ */
+export function buildConflictPath(
+  originalRelative: string,
+  detectedAt: string,
+  shortMachineId: string,
+): string {
+  const safeTs = detectedAt.replace(/:/g, "-").replace(/\.\d+/, "");
+  const ext = path.extname(originalRelative); // ".md" or "" if none
+  // The full original path is preserved (extension and all) so users can
+  // visually pair `notes.md` with `notes.md.conflict-…md` in their file
+  // browser. The trailing `<ext>` after the timestamp keeps the file
+  // syntax-highlighted in editors that key off the final extension.
+  const suffix = `.conflict-${safeTs}-${shortMachineId}${ext}`;
+  return `${originalRelative}${suffix}`;
+}
+/**
+ * Write the cloud-side bytes to the conflict path. Creates parent dirs as
+ * needed (the conflict file always lives next to the original, so the
+ * parent already exists in the steady-state — but defense-in-depth).
+ */
+export function writeConflictFile(
+  hqRoot: string,
+  conflictRelative: string,
+  contents: Buffer,
+): void {
+  const abs = path.join(hqRoot, conflictRelative);
+  fs.mkdirSync(path.dirname(abs), { recursive: true });
+  fs.writeFileSync(abs, contents);
+}
+/**
+ * Stable conflict ID — used to dedupe re-detections of the same conflict.
+ * Re-running sync after a conflict but before the user has resolved should
+ * NOT pile up duplicate entries. The id is derived from the original path
+ * and the detection timestamp; if the same original conflicts twice with
+ * the user resolving in between, that's a new id (different timestamp),
+ * which is correct.
+ */
+export function buildConflictId(
+  originalRelative: string,
+  detectedAt: string,
+): string {
+  const safeTs = detectedAt.replace(/:/g, "-").replace(/\.\d+/, "");
+  const safePath = originalRelative.replace(/[\/\\.]/g, "-");
+  return `${safePath}-${safeTs}`;
+}

package/src/lib/conflict-index.ts ADDED Viewed

@@ -0,0 +1,127 @@
+/**
+ * Conflict index — durable record of pending divergences awaiting resolution.
+ *
+ * Lives at `<hq_root>/.hq-conflicts/index.json` (inside HQ content, NOT in
+ * `~/.hq/`). Two reasons it sits in HQ content rather than in the state dir:
+ *   1. The `/resolve-conflicts` HQ skill discovers it relative to the user's
+ *      HQ folder — that's the user's mental anchor for "where my files are."
+ *   2. The conflict-side files themselves live in HQ content, so the index
+ *      and the files it references stay co-located. If the user moves HQ,
+ *      the index moves with it.
+ *
+ * Excluded from cross-machine sync via `.hqignore` — each machine resolves
+ * its own queue. We never propagate conflict files (they'd just create more
+ * conflicts on the other side).
+ *
+ * Writes are atomic (tmp + rename). The resolution skill mutates this file
+ * mid-walk; a torn write would corrupt the only record of pending conflicts
+ * and could lose track of files we'd written to disk. Higher stakes than the
+ * journal, which the next sync can rebuild.
+ */
+import * as crypto from "crypto";
+import * as fs from "fs";
+import * as path from "path";
+import type { ConflictIndex, ConflictIndexEntry } from "../types.js";
+const CONFLICTS_DIR = ".hq-conflicts";
+const INDEX_FILENAME = "index.json";
+/**
+ * Absolute path to the conflict index for a given HQ root.
+ */
+export function getConflictIndexPath(hqRoot: string): string {
+  return path.join(hqRoot, CONFLICTS_DIR, INDEX_FILENAME);
+}
+/**
+ * Read the conflict index. Returns an empty index if the file doesn't exist
+ * yet (first-conflict-ever case).
+ *
+ * Throws on corrupt JSON — we deliberately don't auto-repair, since the only
+ * record of pending conflicts is too important to silently overwrite. The
+ * `/resolve-conflicts` skill surfaces this case to the user with a manual
+ * inspection prompt.
+ */
+export function readConflictIndex(hqRoot: string): ConflictIndex {
+  const indexPath = getConflictIndexPath(hqRoot);
+  if (!fs.existsSync(indexPath)) {
+    return { version: 1, conflicts: [] };
+  }
+  const raw = fs.readFileSync(indexPath, "utf-8");
+  const parsed = JSON.parse(raw) as ConflictIndex;
+  // Defensive: an empty file or wrong-shape JSON shouldn't crash callers.
+  if (!parsed || typeof parsed !== "object" || !Array.isArray(parsed.conflicts)) {
+    return { version: 1, conflicts: [] };
+  }
+  return parsed;
+}
+/**
+ * Atomically write the conflict index. Writes to `<index>.tmp.<random>` then
+ * renames into place — `rename(2)` is atomic on POSIX, so a crash mid-write
+ * leaves either the old file or the new one, never a half-written one.
+ *
+ * Always sorts conflicts by `detectedAt` ascending before writing — keeps
+ * the file diff-friendly across runs and makes "oldest-first walk" the
+ * natural read order in the resolution skill.
+ */
+export function writeConflictIndex(
+  hqRoot: string,
+  index: ConflictIndex,
+): void {
+  const indexPath = getConflictIndexPath(hqRoot);
+  fs.mkdirSync(path.dirname(indexPath), { recursive: true });
+  const sorted: ConflictIndex = {
+    version: index.version,
+    conflicts: [...index.conflicts].sort((a, b) =>
+      a.detectedAt.localeCompare(b.detectedAt),
+    ),
+  };
+  // Random suffix in tmp name avoids collision if two sync runs ever overlap
+  // (shouldn't happen — the runner serializes — but cheap insurance).
+  const tmpPath = `${indexPath}.tmp.${crypto.randomBytes(6).toString("hex")}`;
+  fs.writeFileSync(tmpPath, JSON.stringify(sorted, null, 2));
+  fs.renameSync(tmpPath, indexPath);
+}
+/**
+ * Idempotent append. If an entry with the same `id` already exists (same
+ * original path, same detection timestamp), update it in place rather than
+ * duplicating. This matters because re-running sync after a conflict but
+ * before resolution will re-detect the same divergence — without dedup the
+ * index would grow unboundedly.
+ *
+ * The "update in place" path also covers the case where the cloud advanced
+ * again between detections: we want the latest `remoteVersionId` and
+ * `remoteHash` so the resolution skill shows the user the *current* cloud
+ * state, not stale data from the first detection.
+ */
+export function appendConflictEntry(
+  hqRoot: string,
+  entry: ConflictIndexEntry,
+): void {
+  const index = readConflictIndex(hqRoot);
+  const existingIdx = index.conflicts.findIndex((c) => c.id === entry.id);
+  if (existingIdx >= 0) {
+    index.conflicts[existingIdx] = entry;
+  } else {
+    index.conflicts.push(entry);
+  }
+  writeConflictIndex(hqRoot, index);
+}
+/**
+ * Remove an entry by id. Used by the `/resolve-conflicts` skill after the
+ * user picks a resolution and the conflict file is cleaned up. No-op if the
+ * id isn't present (e.g. user manually removed the file then re-ran the
+ * skill — we want that to be a clean exit, not an error).
+ */
+export function removeConflictEntry(hqRoot: string, id: string): void {
+  const index = readConflictIndex(hqRoot);
+  const filtered = index.conflicts.filter((c) => c.id !== id);
+  if (filtered.length === index.conflicts.length) return;
+  writeConflictIndex(hqRoot, { version: index.version, conflicts: filtered });
+}

package/src/lib/conflict.test.ts ADDED Viewed

@@ -0,0 +1,180 @@
+/**
+ * Tests for the pure conflict primitives — path building, machine-id
+ * fallback, atomic index writes, dedup. Kept in one file so the related
+ * helpers stay co-located.
+ */
+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,
+  readShortMachineId,
+} from "./conflict-file.js";
+import {
+  appendConflictEntry,
+  getConflictIndexPath,
+  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("readShortMachineId", () => {
+  let originalHome: string | undefined;
+  let tmpHome: string;
+  beforeEach(() => {
+    originalHome = process.env.HOME;
+    tmpHome = fs.mkdtempSync(path.join(os.tmpdir(), "hq-machineid-"));
+    process.env.HOME = tmpHome;
+  });
+  afterEach(() => {
+    if (originalHome) process.env.HOME = originalHome;
+    else delete process.env.HOME;
+    fs.rmSync(tmpHome, { recursive: true, force: true });
+  });
+  it("returns the first 6 chars when menubar.json has a machineId", () => {
+    fs.mkdirSync(path.join(tmpHome, ".hq"), { recursive: true });
+    fs.writeFileSync(
+      path.join(tmpHome, ".hq", "menubar.json"),
+      JSON.stringify({ machineId: "deadbeefcafe1234567890" }),
+    );
+    expect(readShortMachineId()).toBe("deadbe");
+  });
+  it("falls back to 'unknown' when menubar.json is missing", () => {
+    expect(readShortMachineId()).toBe("unknown");
+  });
+  it("falls back to 'unknown' when menubar.json is malformed", () => {
+    fs.mkdirSync(path.join(tmpHome, ".hq"), { recursive: true });
+    fs.writeFileSync(path.join(tmpHome, ".hq", "menubar.json"), "{not-json");
+    expect(readShortMachineId()).toBe("unknown");
+  });
+});
+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([]);
+  });
+});

package/src/types.ts CHANGED Viewed

@@ -102,3 +102,30 @@ export interface VaultServiceConfig {
   /** AWS region for S3 client (defaults to entity region or us-east-1) */
   region?: string;
 }
+// ── Conflict index (consumed by /resolve-conflicts) ─────────────────────────
+//
+// Restored from feat/lineage-conflict-tracking (83bf5fa1) so the producer
+// can write `.conflict-<ts>-<machine>.<ext>` mirror files + append to
+// `<hqRoot>/.hq-conflicts/index.json` whenever the hash-comparison detector
+// flags a conflict that doesn't get overwritten or aborted.
+export interface ConflictIndexEntry {
+  id: string;
+  originalPath: string;
+  conflictPath: string;
+  detectedAt: string;
+  side: "push" | "pull";
+  machineId: string;
+  localHash: string;
+  remoteHash: string;
+  /** S3 VersionId when known (present for VersionId-aware buckets). */
+  remoteVersionId?: string;
+  /** Last-known parent VersionId from journal, when known. */
+  lastKnownVersionId?: string | null;
+}
+export interface ConflictIndex {
+  version: 1;
+  conflicts: ConflictIndexEntry[];
+}