@indigoai-us/hq-cloud 6.16.27 → 6.16.29

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 (62) hide show
  1. package/dist/cli/conflict-winner.test.d.ts +7 -0
  2. package/dist/cli/conflict-winner.test.d.ts.map +1 -0
  3. package/dist/cli/conflict-winner.test.js +98 -0
  4. package/dist/cli/conflict-winner.test.js.map +1 -0
  5. package/dist/cli/conflict.d.ts +72 -0
  6. package/dist/cli/conflict.d.ts.map +1 -1
  7. package/dist/cli/conflict.js +107 -0
  8. package/dist/cli/conflict.js.map +1 -1
  9. package/dist/cli/doctor.d.ts +12 -0
  10. package/dist/cli/doctor.d.ts.map +1 -1
  11. package/dist/cli/doctor.js +29 -0
  12. package/dist/cli/doctor.js.map +1 -1
  13. package/dist/cli/doctor.test.js +55 -0
  14. package/dist/cli/doctor.test.js.map +1 -1
  15. package/dist/cli/index.d.ts +4 -2
  16. package/dist/cli/index.d.ts.map +1 -1
  17. package/dist/cli/index.js +4 -1
  18. package/dist/cli/index.js.map +1 -1
  19. package/dist/cli/share.d.ts.map +1 -1
  20. package/dist/cli/share.js +364 -101
  21. package/dist/cli/share.js.map +1 -1
  22. package/dist/cli/share.test.js +85 -15
  23. package/dist/cli/share.test.js.map +1 -1
  24. package/dist/cli/sync.d.ts +3 -1
  25. package/dist/cli/sync.d.ts.map +1 -1
  26. package/dist/cli/sync.js +315 -276
  27. package/dist/cli/sync.js.map +1 -1
  28. package/dist/cli/sync.test.js +109 -47
  29. package/dist/cli/sync.test.js.map +1 -1
  30. package/dist/journal-store.test.js +59 -0
  31. package/dist/journal-store.test.js.map +1 -1
  32. package/dist/journal.d.ts +8 -0
  33. package/dist/journal.d.ts.map +1 -1
  34. package/dist/journal.js +19 -5
  35. package/dist/journal.js.map +1 -1
  36. package/dist/lib/conflict-file.d.ts +50 -18
  37. package/dist/lib/conflict-file.d.ts.map +1 -1
  38. package/dist/lib/conflict-file.js +63 -34
  39. package/dist/lib/conflict-file.js.map +1 -1
  40. package/dist/lib/conflict-index.d.ts.map +1 -1
  41. package/dist/lib/conflict-index.js +6 -0
  42. package/dist/lib/conflict-index.js.map +1 -1
  43. package/dist/lib/conflict-reconcile.d.ts +106 -0
  44. package/dist/lib/conflict-reconcile.d.ts.map +1 -0
  45. package/dist/lib/conflict-reconcile.js +412 -0
  46. package/dist/lib/conflict-reconcile.js.map +1 -0
  47. package/dist/lib/conflict-reconcile.test.d.ts +7 -0
  48. package/dist/lib/conflict-reconcile.test.d.ts.map +1 -0
  49. package/dist/lib/conflict-reconcile.test.js +246 -0
  50. package/dist/lib/conflict-reconcile.test.js.map +1 -0
  51. package/dist/lib/conflict.test.d.ts +3 -2
  52. package/dist/lib/conflict.test.d.ts.map +1 -1
  53. package/dist/lib/conflict.test.js +60 -3
  54. package/dist/lib/conflict.test.js.map +1 -1
  55. package/dist/sync/area-ledger.d.ts.map +1 -1
  56. package/dist/sync/area-ledger.js +50 -7
  57. package/dist/sync/area-ledger.js.map +1 -1
  58. package/dist/sync/area-ledger.test.js +90 -0
  59. package/dist/sync/area-ledger.test.js.map +1 -1
  60. package/dist/types.d.ts +23 -5
  61. package/dist/types.d.ts.map +1 -1
  62. package/package.json +1 -1
@@ -0,0 +1,412 @@
1
+ /**
2
+ * Legacy conflict-twin reconciliation (`hq sync doctor --reconcile-conflicts`).
3
+ *
4
+ * Until the version-aware conflict engine landed, every unresolved sync
5
+ * conflict parked one side of the file as a sibling "twin" —
6
+ * `<file>.conflict-<ts>-<machine>.<ext>` — next to the live path, and the
7
+ * winner was whichever side the caller's `--on-conflict` flag named, never
8
+ * the newer body. Vaults therefore hold twins whose bytes are strictly newer
9
+ * than the live file (a policy at frontmatter `version: 10` parked beside a
10
+ * live `version: 8`).
11
+ *
12
+ * This pass walks the HQ root for those legacy twins, groups them per live
13
+ * path, and decides ONCE per live file:
14
+ *
15
+ * - a twin is promoted to the live path ONLY when its frontmatter
16
+ * `version:` is strictly higher than the live file's — and only the
17
+ * highest-versioned such twin. Every other twin (lower/equal version, no
18
+ * version at all, byte-identical) is moved OUT of the tree into
19
+ * `.hq/conflict-backups/` (sync-ignored) so nothing is destroyed, and no
20
+ * twin ever remains beside the live file. A twin's disk mtime is its
21
+ * DETECTION time, not its content's age, so mtime is never evidence for
22
+ * promotion: a no-`version:` twin (prd.json, board.json, .jsonl, …) can
23
+ * never overwrite the live body;
24
+ * - with no live sibling, the twin is NOT restored: the usual cause is a
25
+ * live file that was deliberately deleted (locally or via a synced
26
+ * tombstone) while the sync-ignored twin was left behind, and restoring
27
+ * it would resurrect the deletion fleet-wide on the next push. The twin
28
+ * is parked under `.hq/conflict-backups/` and listed for manual review;
29
+ * - drops every `.hq-conflicts/index.json` row that referenced the twin.
30
+ *
31
+ * Backups never overwrite each other: each is named from the twin's own
32
+ * detection timestamp + machine token and suffixed `-1`, `-2`, … when that
33
+ * name is already taken.
34
+ *
35
+ * Dry-run is the DEFAULT: the plan is returned (and optionally logged) and
36
+ * nothing is written until `yes: true`. Symlink twins and unreadable files are
37
+ * surfaced for manual review, never touched. Per-item failures are warnings,
38
+ * never fatal.
39
+ */
40
+ import * as fs from "fs";
41
+ import * as path from "path";
42
+ import { pickWinner } from "../cli/conflict.js";
43
+ import { localPathForVaultKey, vaultKeyForLocalPath } from "../local-path-codec.js";
44
+ import { buildConflictBackupPath, parseLegacyConflictTwinName, readShortMachineId, } from "./conflict-file.js";
45
+ import { readConflictIndex, writeConflictIndex } from "./conflict-index.js";
46
+ /** Directories the twin walker never descends into. */
47
+ const SKIPPED_DIR_NAMES = new Set([
48
+ ".git",
49
+ "node_modules",
50
+ ".hq",
51
+ ".hq-conflicts",
52
+ "repos",
53
+ ]);
54
+ function walkTwins(root, out, warn) {
55
+ let entries;
56
+ try {
57
+ entries = fs.readdirSync(root, { withFileTypes: true });
58
+ }
59
+ catch (err) {
60
+ warn(`cannot read ${root}: ${String(err)}`);
61
+ return;
62
+ }
63
+ for (const entry of entries) {
64
+ const full = path.join(root, entry.name);
65
+ if (entry.isDirectory()) {
66
+ if (SKIPPED_DIR_NAMES.has(entry.name))
67
+ continue;
68
+ walkTwins(full, out, warn);
69
+ continue;
70
+ }
71
+ // Symlinks (file or dir) are never followed: a link twin is manual-review
72
+ // material and a link dir could walk outside the HQ root.
73
+ if (parseLegacyConflictTwinName(entry.name) !== null)
74
+ out.push(full);
75
+ }
76
+ }
77
+ function safeLstat(p) {
78
+ try {
79
+ return fs.lstatSync(p);
80
+ }
81
+ catch {
82
+ return null;
83
+ }
84
+ }
85
+ /**
86
+ * Build the reconcile plan. Pure planning — nothing on disk is touched.
87
+ * Twins are grouped per live path so at most ONE twin per live file is
88
+ * promoted (the highest strictly-greater frontmatter version).
89
+ */
90
+ export function planLegacyConflictTwins(hqRoot, warn = () => { }) {
91
+ const twinsAbs = [];
92
+ walkTwins(hqRoot, twinsAbs, warn);
93
+ twinsAbs.sort();
94
+ // Group by live path, preserving the sorted first-seen order of groups.
95
+ const groups = new Map();
96
+ for (const twinAbs of twinsAbs) {
97
+ const parsed = parseLegacyConflictTwinName(path.basename(twinAbs));
98
+ if (!parsed)
99
+ continue;
100
+ const liveAbs = path.join(path.dirname(twinAbs), parsed.originalName);
101
+ const list = groups.get(liveAbs);
102
+ if (list)
103
+ list.push(twinAbs);
104
+ else
105
+ groups.set(liveAbs, [twinAbs]);
106
+ }
107
+ const plan = [];
108
+ for (const [liveAbs, groupTwins] of groups) {
109
+ const liveKey = vaultKeyForLocalPath(hqRoot, liveAbs);
110
+ const liveStat = safeLstat(liveAbs);
111
+ // Pass 1: structural refusals and the orphan case need no body reads.
112
+ const regular = [];
113
+ for (const twinAbs of groupTwins) {
114
+ const twinKey = vaultKeyForLocalPath(hqRoot, twinAbs);
115
+ const twinStat = safeLstat(twinAbs);
116
+ if (!twinStat || !twinStat.isFile()) {
117
+ plan.push({
118
+ twinPath: twinKey,
119
+ livePath: liveKey,
120
+ action: "manual-review",
121
+ reason: "twin is not a regular file (symlink or special) — never auto-reconciled",
122
+ });
123
+ continue;
124
+ }
125
+ if (liveStat === null) {
126
+ plan.push({
127
+ twinPath: twinKey,
128
+ livePath: liveKey,
129
+ action: "park-orphan",
130
+ reason: "no live sibling — the live file was probably deleted on purpose; twin parked under .hq/conflict-backups/ for manual restore, never resurrected",
131
+ });
132
+ continue;
133
+ }
134
+ if (!liveStat.isFile()) {
135
+ plan.push({
136
+ twinPath: twinKey,
137
+ livePath: liveKey,
138
+ action: "manual-review",
139
+ reason: "live sibling is not a regular file — never auto-reconciled",
140
+ });
141
+ continue;
142
+ }
143
+ regular.push({ twinAbs, twinKey, twinStat });
144
+ }
145
+ if (regular.length === 0 || liveStat === null)
146
+ continue;
147
+ let liveBytes = null;
148
+ try {
149
+ liveBytes = fs.readFileSync(liveAbs);
150
+ }
151
+ catch (err) {
152
+ warn(`cannot read live file ${liveKey}: ${String(err)}`);
153
+ }
154
+ // Pass 2: decide each twin against the live body as of planning.
155
+ const candidates = [];
156
+ for (const { twinAbs, twinKey, twinStat } of regular) {
157
+ let twinBytes;
158
+ try {
159
+ if (liveBytes === null)
160
+ throw new Error("live sibling unreadable");
161
+ twinBytes = fs.readFileSync(twinAbs);
162
+ }
163
+ catch (err) {
164
+ warn(`cannot read ${twinKey} or its live sibling: ${String(err)}`);
165
+ plan.push({
166
+ twinPath: twinKey,
167
+ livePath: liveKey,
168
+ action: "manual-review",
169
+ reason: "unreadable — not inspected",
170
+ });
171
+ continue;
172
+ }
173
+ const decision = pickWinner({
174
+ localBytes: liveBytes,
175
+ remoteBytes: twinBytes,
176
+ localMtime: liveStat.mtime,
177
+ remoteMtime: twinStat.mtime,
178
+ });
179
+ candidates.push({ twinAbs, twinKey, twinStat, decision });
180
+ }
181
+ // Pass 3: ONE decision per live path. Only a strictly higher frontmatter
182
+ // version is positive evidence; among several such twins the highest
183
+ // version wins and the rest are parked.
184
+ let best = null;
185
+ for (const c of candidates) {
186
+ if (!twinWinsByVersion(c.decision))
187
+ continue;
188
+ if (best === null ||
189
+ (c.decision.remoteVersion ?? -Infinity) > (best.decision.remoteVersion ?? -Infinity)) {
190
+ best = c;
191
+ }
192
+ }
193
+ for (const c of candidates) {
194
+ if (c === best) {
195
+ plan.push({
196
+ twinPath: c.twinKey,
197
+ livePath: liveKey,
198
+ action: "promote-twin",
199
+ decision: c.decision,
200
+ reason: describeDecision(c.decision),
201
+ });
202
+ continue;
203
+ }
204
+ const superseded = best !== null && twinWinsByVersion(c.decision)
205
+ ? ` — superseded by ${path.basename(best.twinKey)} (version ${best.decision.remoteVersion ?? "?"})`
206
+ : "";
207
+ plan.push({
208
+ twinPath: c.twinKey,
209
+ livePath: liveKey,
210
+ action: "keep-live",
211
+ decision: c.decision,
212
+ reason: describeDecision(c.decision) + superseded,
213
+ });
214
+ }
215
+ }
216
+ return plan;
217
+ }
218
+ function twinWinsByVersion(decision) {
219
+ return decision.winner === "remote" && decision.reason === "version";
220
+ }
221
+ function describeDecision(decision) {
222
+ switch (decision.reason) {
223
+ case "version":
224
+ return decision.winner === "remote"
225
+ ? `twin wins: frontmatter version ${decision.remoteVersion ?? "?"} (twin) vs ${decision.localVersion ?? "?"} (live)`
226
+ : `live kept: frontmatter version ${decision.localVersion ?? "?"} (live) vs ${decision.remoteVersion ?? "?"} (twin)`;
227
+ case "mtime":
228
+ return decision.winner === "remote"
229
+ ? "live kept: twin has a newer mtime but no higher frontmatter version (mtime is detection time, never promotion evidence)"
230
+ : "live kept: newer mtime and no higher twin version";
231
+ case "identical":
232
+ return "twin is byte-identical to the live file";
233
+ default:
234
+ return "live kept: no frontmatter version to prefer the twin (tie)";
235
+ }
236
+ }
237
+ /**
238
+ * Backup key for a body displaced from `liveKey`, named from the given
239
+ * detection timestamp + machine token and guaranteed NOT to exist on disk
240
+ * (a `-1`, `-2`, … suffix is appended before the extension when taken).
241
+ */
242
+ function uniqueBackupKey(hqRoot, liveKey, detectedAt, machineId) {
243
+ const base = buildConflictBackupPath(liveKey, detectedAt, machineId);
244
+ const ext = path.extname(liveKey);
245
+ const stem = base.slice(0, base.length - ext.length);
246
+ let candidate = base;
247
+ for (let n = 1; fs.existsSync(localPathForVaultKey(hqRoot, candidate)); n++) {
248
+ candidate = `${stem}-${n}${ext}`;
249
+ }
250
+ return candidate;
251
+ }
252
+ /**
253
+ * Move `fromAbs` into the backup dir under a name derived from the LIVE key
254
+ * (so backups of the same file sort together) and the given detection
255
+ * tokens. Never overwrites an existing backup. Returns the backup key.
256
+ */
257
+ function parkInBackups(hqRoot, liveKey, fromAbs, detectedAt, machineId) {
258
+ const backupKey = uniqueBackupKey(hqRoot, liveKey, detectedAt, machineId);
259
+ const backupAbs = localPathForVaultKey(hqRoot, backupKey);
260
+ fs.mkdirSync(path.dirname(backupAbs), { recursive: true });
261
+ try {
262
+ fs.renameSync(fromAbs, backupAbs);
263
+ }
264
+ catch {
265
+ // Cross-device or rename-refused: fall back to copy + unlink.
266
+ fs.copyFileSync(fromAbs, backupAbs, fs.constants.COPYFILE_EXCL);
267
+ fs.rmSync(fromAbs, { force: true });
268
+ }
269
+ return backupKey;
270
+ }
271
+ /**
272
+ * Plan and (with `yes`) apply legacy-twin reconciliation. See module doc.
273
+ */
274
+ export function reconcileLegacyConflictTwins(options) {
275
+ const log = options.log ?? (() => { });
276
+ let warnings = 0;
277
+ const warn = (message) => {
278
+ warnings++;
279
+ (options.warn ?? log)(` ! ${message}`);
280
+ };
281
+ const plan = planLegacyConflictTwins(options.hqRoot, warn);
282
+ const result = {
283
+ plan,
284
+ applied: false,
285
+ promoted: 0,
286
+ removed: 0,
287
+ orphansParked: 0,
288
+ backedUp: 0,
289
+ indexRowsDropped: 0,
290
+ warnings,
291
+ manualReview: plan
292
+ .filter((item) => item.action === "manual-review" || item.action === "park-orphan")
293
+ .map((item) => ({
294
+ twinPath: item.twinPath,
295
+ livePath: item.livePath,
296
+ action: item.action,
297
+ reason: item.reason,
298
+ })),
299
+ };
300
+ log(`hq sync doctor — legacy conflict-twin reconcile plan (${options.hqRoot})`);
301
+ log(` twins found: ${plan.length}`);
302
+ for (const item of plan) {
303
+ const marker = item.action === "promote-twin" ? "^"
304
+ : item.action === "park-orphan" ? "~"
305
+ : item.action === "keep-live" ? "-"
306
+ : "?";
307
+ log(` ${marker} ${item.twinPath} → ${item.livePath} [${item.action}] ${item.reason}`);
308
+ }
309
+ if (!options.yes) {
310
+ log("\nDry run — nothing changed. Re-run with --yes to apply.");
311
+ logManualReview(log, result.manualReview);
312
+ result.warnings = warnings;
313
+ return result;
314
+ }
315
+ const machineId = readShortMachineId(options.hqRoot);
316
+ const reconciledTwinKeys = new Set();
317
+ for (const item of plan) {
318
+ if (item.action === "manual-review")
319
+ continue;
320
+ const twinAbs = localPathForVaultKey(options.hqRoot, item.twinPath);
321
+ const liveAbs = localPathForVaultKey(options.hqRoot, item.livePath);
322
+ const parsed = parseLegacyConflictTwinName(path.basename(twinAbs));
323
+ const twinDetectedAt = parsed?.detectedAt ?? new Date().toISOString();
324
+ const twinMachineId = parsed?.machineId ?? machineId;
325
+ try {
326
+ // Re-verify at apply time: the twin must still be a regular file.
327
+ const twinNow = safeLstat(twinAbs);
328
+ if (!twinNow || !twinNow.isFile()) {
329
+ warn(`skipped ${item.twinPath} — changed since planning`);
330
+ continue;
331
+ }
332
+ switch (item.action) {
333
+ case "park-orphan": {
334
+ if (safeLstat(liveAbs) !== null) {
335
+ warn(`skipped ${item.twinPath} — live sibling appeared since planning`);
336
+ continue;
337
+ }
338
+ const backupKey = parkInBackups(options.hqRoot, item.livePath, twinAbs, twinDetectedAt, twinMachineId);
339
+ result.backedUp++;
340
+ result.orphansParked++;
341
+ const review = result.manualReview.find((r) => r.twinPath === item.twinPath);
342
+ if (review)
343
+ review.backupPath = backupKey;
344
+ break;
345
+ }
346
+ case "promote-twin": {
347
+ // The displaced live body is parked under the twin's detection
348
+ // stamp with THIS machine's token (it is this machine's body).
349
+ const parkedLiveKey = parkInBackups(options.hqRoot, item.livePath, liveAbs, twinDetectedAt, machineId);
350
+ result.backedUp++;
351
+ try {
352
+ fs.renameSync(twinAbs, liveAbs);
353
+ }
354
+ catch (promoteErr) {
355
+ // Roll back: the live path must never be left empty.
356
+ const parkedLiveAbs = localPathForVaultKey(options.hqRoot, parkedLiveKey);
357
+ try {
358
+ fs.renameSync(parkedLiveAbs, liveAbs);
359
+ result.backedUp--;
360
+ }
361
+ catch (rollbackErr) {
362
+ warn(`rollback failed for ${item.livePath}: live body remains at ${parkedLiveKey} (${String(rollbackErr)})`);
363
+ }
364
+ throw promoteErr;
365
+ }
366
+ result.promoted++;
367
+ break;
368
+ }
369
+ case "keep-live": {
370
+ parkInBackups(options.hqRoot, item.livePath, twinAbs, twinDetectedAt, twinMachineId);
371
+ result.backedUp++;
372
+ result.removed++;
373
+ break;
374
+ }
375
+ }
376
+ reconciledTwinKeys.add(item.twinPath);
377
+ }
378
+ catch (err) {
379
+ warn(`reconcile failed for ${item.twinPath}: ${String(err)}`);
380
+ }
381
+ }
382
+ // Drop index rows that pointed at a twin we just reconciled. Rows whose
383
+ // sidecar is elsewhere (or absent) are left for the ordinary prune pass.
384
+ if (reconciledTwinKeys.size > 0) {
385
+ try {
386
+ const index = readConflictIndex(options.hqRoot);
387
+ const kept = index.conflicts.filter((row) => !(row.conflictPath && reconciledTwinKeys.has(row.conflictPath)));
388
+ if (kept.length !== index.conflicts.length) {
389
+ result.indexRowsDropped = index.conflicts.length - kept.length;
390
+ writeConflictIndex(options.hqRoot, { version: index.version, conflicts: kept });
391
+ }
392
+ }
393
+ catch (err) {
394
+ warn(`conflict index update failed: ${String(err)}`);
395
+ }
396
+ }
397
+ result.applied = true;
398
+ result.warnings = warnings;
399
+ log(`\nApplied: ${result.promoted} twin(s) promoted to the live path, ${result.removed} twin(s) removed, ${result.orphansParked} orphan twin(s) parked, ${result.backedUp} bod(ies) parked under .hq/conflict-backups/, ${result.indexRowsDropped} index row(s) dropped.`);
400
+ logManualReview(log, result.manualReview);
401
+ return result;
402
+ }
403
+ function logManualReview(log, items) {
404
+ if (items.length === 0)
405
+ return;
406
+ log(`\nManual review (${items.length}):`);
407
+ for (const item of items) {
408
+ const where = item.backupPath ? ` (parked at ${item.backupPath})` : "";
409
+ log(` ? ${item.twinPath} → ${item.livePath} [${item.action}] ${item.reason}${where}`);
410
+ }
411
+ }
412
+ //# sourceMappingURL=conflict-reconcile.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"conflict-reconcile.js","sourceRoot":"","sources":["../../src/lib/conflict-reconcile.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,7 @@
1
+ /**
2
+ * Tests for the legacy conflict-twin reconciler (`hq sync doctor
3
+ * --reconcile-conflicts`): dry-run by default, version-aware promotion, loser
4
+ * parking under `.hq/conflict-backups/`, index cleanup, and refusals.
5
+ */
6
+ export {};
7
+ //# sourceMappingURL=conflict-reconcile.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"conflict-reconcile.test.d.ts","sourceRoot":"","sources":["../../src/lib/conflict-reconcile.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG"}