@indigoai-us/hq-cloud 6.16.27 → 6.16.28
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.
- package/dist/cli/conflict-winner.test.d.ts +7 -0
- package/dist/cli/conflict-winner.test.d.ts.map +1 -0
- package/dist/cli/conflict-winner.test.js +98 -0
- package/dist/cli/conflict-winner.test.js.map +1 -0
- package/dist/cli/conflict.d.ts +72 -0
- package/dist/cli/conflict.d.ts.map +1 -1
- package/dist/cli/conflict.js +107 -0
- package/dist/cli/conflict.js.map +1 -1
- package/dist/cli/doctor.d.ts +12 -0
- package/dist/cli/doctor.d.ts.map +1 -1
- package/dist/cli/doctor.js +29 -0
- package/dist/cli/doctor.js.map +1 -1
- package/dist/cli/doctor.test.js +55 -0
- package/dist/cli/doctor.test.js.map +1 -1
- package/dist/cli/index.d.ts +4 -2
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +4 -1
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/share.d.ts.map +1 -1
- package/dist/cli/share.js +364 -101
- package/dist/cli/share.js.map +1 -1
- package/dist/cli/share.test.js +85 -15
- package/dist/cli/share.test.js.map +1 -1
- package/dist/cli/sync.d.ts +3 -1
- package/dist/cli/sync.d.ts.map +1 -1
- package/dist/cli/sync.js +315 -276
- package/dist/cli/sync.js.map +1 -1
- package/dist/cli/sync.test.js +94 -47
- package/dist/cli/sync.test.js.map +1 -1
- package/dist/lib/conflict-file.d.ts +50 -18
- package/dist/lib/conflict-file.d.ts.map +1 -1
- package/dist/lib/conflict-file.js +63 -34
- package/dist/lib/conflict-file.js.map +1 -1
- package/dist/lib/conflict-index.d.ts.map +1 -1
- package/dist/lib/conflict-index.js +6 -0
- package/dist/lib/conflict-index.js.map +1 -1
- package/dist/lib/conflict-reconcile.d.ts +106 -0
- package/dist/lib/conflict-reconcile.d.ts.map +1 -0
- package/dist/lib/conflict-reconcile.js +412 -0
- package/dist/lib/conflict-reconcile.js.map +1 -0
- package/dist/lib/conflict-reconcile.test.d.ts +7 -0
- package/dist/lib/conflict-reconcile.test.d.ts.map +1 -0
- package/dist/lib/conflict-reconcile.test.js +246 -0
- package/dist/lib/conflict-reconcile.test.js.map +1 -0
- package/dist/lib/conflict.test.d.ts +3 -2
- package/dist/lib/conflict.test.d.ts.map +1 -1
- package/dist/lib/conflict.test.js +60 -3
- package/dist/lib/conflict.test.js.map +1 -1
- package/dist/types.d.ts +23 -5
- package/dist/types.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -1,12 +1,18 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Conflict
|
|
2
|
+
* Conflict naming + id derivation.
|
|
3
3
|
*
|
|
4
|
-
* When share/sync detects divergence
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
4
|
+
* When share/sync detects divergence it records the conflict to
|
|
5
|
+
* `<hqRoot>/.hq-conflicts/index.json` (consumed by the `/resolve-conflicts`
|
|
6
|
+
* HQ skill) and decides a winner (`pickWinner` in `../cli/conflict.ts`). The
|
|
7
|
+
* engine no longer writes a sibling `<file>.conflict-…` twin beside the live
|
|
8
|
+
* file: the cloud side is covered by S3 versioning, and the LOSING local body
|
|
9
|
+
* (the only bytes S3 does not hold) is parked out of the tree under
|
|
10
|
+
* `.hq/conflict-backups/` — a sync-ignored directory — so nothing is destroyed
|
|
11
|
+
* and no twin ever pollutes the content tree again.
|
|
12
|
+
*
|
|
13
|
+
* `buildConflictPath` is kept ONLY so the legacy-twin reconciler
|
|
14
|
+
* (`./conflict-reconcile.ts`) and the ephemeral-path filters can recognise the
|
|
15
|
+
* twins older engines minted; no producer calls it any more.
|
|
10
16
|
*
|
|
11
17
|
* Machine-id provisioning lives in `./machine-id.ts` — hq-cloud owns the
|
|
12
18
|
* source-of-truth file `<hqRoot>/.hq/machine-id` so every sync host
|
|
@@ -15,26 +21,52 @@
|
|
|
15
21
|
* callers; new callers should import directly from `./machine-id.js`.
|
|
16
22
|
*/
|
|
17
23
|
export { readShortMachineId, getOrCreateMachineId } from "./machine-id.js";
|
|
24
|
+
/** hq-root-relative directory that holds losing bodies (sync-ignored via `.hq/`). */
|
|
25
|
+
export declare const CONFLICT_BACKUPS_DIR = ".hq/conflict-backups";
|
|
26
|
+
/** hq-root-relative scratch directory for convergence probes (always cleaned). */
|
|
27
|
+
export declare const CONFLICT_PROBE_DIR = ".hq/tmp";
|
|
18
28
|
/**
|
|
19
|
-
*
|
|
20
|
-
*
|
|
21
|
-
*
|
|
29
|
+
* LEGACY sibling-twin name for an original. ISO uses `-` instead of `:` so
|
|
30
|
+
* the result is filesystem-safe on every OS, and the original extension is
|
|
31
|
+
* preserved at the end so editors syntax-highlight correctly.
|
|
22
32
|
*
|
|
23
33
|
* knowledge/notes.md, 2026-04-27T22:05:14Z, abc123
|
|
24
34
|
* → knowledge/notes.md.conflict-2026-04-27T22-05-14Z-abc123.md
|
|
25
35
|
*
|
|
26
|
-
*
|
|
27
|
-
*
|
|
28
|
-
*
|
|
29
|
-
* Files without an extension get the `.conflict-...` suffix appended verbatim.
|
|
36
|
+
* No producer writes this path any more — see the module doc. It remains the
|
|
37
|
+
* grammar `parseLegacyConflictTwinName` recognises.
|
|
30
38
|
*/
|
|
31
39
|
export declare function buildConflictPath(originalRelative: string, detectedAt: string, shortMachineId: string): string;
|
|
40
|
+
export interface LegacyConflictTwinName {
|
|
41
|
+
/** Basename of the live file the twin shadows (`notes.md`). */
|
|
42
|
+
originalName: string;
|
|
43
|
+
/** Filesystem-safe detection timestamp as stamped in the name. */
|
|
44
|
+
detectedAt: string;
|
|
45
|
+
machineId: string;
|
|
46
|
+
}
|
|
47
|
+
/**
|
|
48
|
+
* Recognise a legacy `<name>.conflict-<ts>-<machine>[.<ext>]` basename and
|
|
49
|
+
* recover the live sibling's name. Returns null for anything else.
|
|
50
|
+
*/
|
|
51
|
+
export declare function parseLegacyConflictTwinName(basename: string): LegacyConflictTwinName | null;
|
|
52
|
+
/**
|
|
53
|
+
* Out-of-tree backup key for a LOSING body. Lives under `.hq/conflict-backups/`
|
|
54
|
+
* mirroring the original's relative path, so backups of one file sort
|
|
55
|
+
* together and the tree next to the live file stays clean:
|
|
56
|
+
*
|
|
57
|
+
* knowledge/notes.md, 2026-04-27T22:05:14Z, abc123
|
|
58
|
+
* → .hq/conflict-backups/knowledge/notes.md.2026-04-27T22-05-14Z-abc123.md
|
|
59
|
+
*
|
|
60
|
+
* Deliberately NOT the `.conflict-` grammar, so a backup can never be mistaken
|
|
61
|
+
* for a legacy twin by the reconciler or the ephemeral-path filters.
|
|
62
|
+
*/
|
|
63
|
+
export declare function buildConflictBackupPath(originalRelative: string, detectedAt: string, shortMachineId: string): string;
|
|
32
64
|
/**
|
|
33
|
-
*
|
|
34
|
-
*
|
|
35
|
-
*
|
|
65
|
+
* Absolute scratch path for one convergence probe download. Under
|
|
66
|
+
* `<hqRoot>/.hq/tmp/` (sync-ignored, never beside the live file); the caller
|
|
67
|
+
* MUST remove or move it before returning.
|
|
36
68
|
*/
|
|
37
|
-
export declare function
|
|
69
|
+
export declare function buildConflictProbePath(hqRoot: string): string;
|
|
38
70
|
/**
|
|
39
71
|
* Stable conflict ID — used to dedupe re-detections of the same conflict.
|
|
40
72
|
* Re-running sync after a conflict but before the user has resolved should
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conflict-file.d.ts","sourceRoot":"","sources":["../../src/lib/conflict-file.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"conflict-file.d.ts","sourceRoot":"","sources":["../../src/lib/conflict-file.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAKH,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAE3E,qFAAqF;AACrF,eAAO,MAAM,oBAAoB,yBAAyB,CAAC;AAE3D,kFAAkF;AAClF,eAAO,MAAM,kBAAkB,YAAY,CAAC;AAM5C;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAC/B,gBAAgB,EAAE,MAAM,EACxB,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,GACrB,MAAM,CAIR;AASD,MAAM,WAAW,sBAAsB;IACrC,+DAA+D;IAC/D,YAAY,EAAE,MAAM,CAAC;IACrB,kEAAkE;IAClE,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,MAAM,GACf,sBAAsB,GAAG,IAAI,CAI/B;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,uBAAuB,CACrC,gBAAgB,EAAE,MAAM,EACxB,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,GACrB,MAAM,CAGR;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAM7D;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,gBAAgB,EAAE,MAAM,EACxB,UAAU,EAAE,MAAM,GACjB,MAAM,CAGR"}
|
|
@@ -1,12 +1,18 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Conflict
|
|
2
|
+
* Conflict naming + id derivation.
|
|
3
3
|
*
|
|
4
|
-
* When share/sync detects divergence
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
4
|
+
* When share/sync detects divergence it records the conflict to
|
|
5
|
+
* `<hqRoot>/.hq-conflicts/index.json` (consumed by the `/resolve-conflicts`
|
|
6
|
+
* HQ skill) and decides a winner (`pickWinner` in `../cli/conflict.ts`). The
|
|
7
|
+
* engine no longer writes a sibling `<file>.conflict-…` twin beside the live
|
|
8
|
+
* file: the cloud side is covered by S3 versioning, and the LOSING local body
|
|
9
|
+
* (the only bytes S3 does not hold) is parked out of the tree under
|
|
10
|
+
* `.hq/conflict-backups/` — a sync-ignored directory — so nothing is destroyed
|
|
11
|
+
* and no twin ever pollutes the content tree again.
|
|
12
|
+
*
|
|
13
|
+
* `buildConflictPath` is kept ONLY so the legacy-twin reconciler
|
|
14
|
+
* (`./conflict-reconcile.ts`) and the ephemeral-path filters can recognise the
|
|
15
|
+
* twins older engines minted; no producer calls it any more.
|
|
10
16
|
*
|
|
11
17
|
* Machine-id provisioning lives in `./machine-id.ts` — hq-cloud owns the
|
|
12
18
|
* source-of-truth file `<hqRoot>/.hq/machine-id` so every sync host
|
|
@@ -14,45 +20,69 @@
|
|
|
14
20
|
* module re-exports `readShortMachineId` for back-compat with existing
|
|
15
21
|
* callers; new callers should import directly from `./machine-id.js`.
|
|
16
22
|
*/
|
|
17
|
-
import * as
|
|
23
|
+
import * as crypto from "crypto";
|
|
18
24
|
import * as path from "path";
|
|
19
|
-
import { localPathForVaultKey } from "../local-path-codec.js";
|
|
20
25
|
export { readShortMachineId, getOrCreateMachineId } from "./machine-id.js";
|
|
26
|
+
/** hq-root-relative directory that holds losing bodies (sync-ignored via `.hq/`). */
|
|
27
|
+
export const CONFLICT_BACKUPS_DIR = ".hq/conflict-backups";
|
|
28
|
+
/** hq-root-relative scratch directory for convergence probes (always cleaned). */
|
|
29
|
+
export const CONFLICT_PROBE_DIR = ".hq/tmp";
|
|
30
|
+
function safeTimestamp(detectedAt) {
|
|
31
|
+
return detectedAt.replace(/:/g, "-").replace(/\.\d+/, "");
|
|
32
|
+
}
|
|
21
33
|
/**
|
|
22
|
-
*
|
|
23
|
-
*
|
|
24
|
-
*
|
|
34
|
+
* LEGACY sibling-twin name for an original. ISO uses `-` instead of `:` so
|
|
35
|
+
* the result is filesystem-safe on every OS, and the original extension is
|
|
36
|
+
* preserved at the end so editors syntax-highlight correctly.
|
|
25
37
|
*
|
|
26
38
|
* knowledge/notes.md, 2026-04-27T22:05:14Z, abc123
|
|
27
39
|
* → knowledge/notes.md.conflict-2026-04-27T22-05-14Z-abc123.md
|
|
28
40
|
*
|
|
29
|
-
*
|
|
30
|
-
*
|
|
31
|
-
*
|
|
32
|
-
* Files without an extension get the `.conflict-...` suffix appended verbatim.
|
|
41
|
+
* No producer writes this path any more — see the module doc. It remains the
|
|
42
|
+
* grammar `parseLegacyConflictTwinName` recognises.
|
|
33
43
|
*/
|
|
34
44
|
export function buildConflictPath(originalRelative, detectedAt, shortMachineId) {
|
|
35
|
-
const safeTs = detectedAt.replace(/:/g, "-").replace(/\.\d+/, "");
|
|
36
45
|
const ext = path.extname(originalRelative); // ".md" or "" if none
|
|
37
|
-
|
|
38
|
-
// visually pair `notes.md` with `notes.md.conflict-…md` in their file
|
|
39
|
-
// browser. The trailing `<ext>` after the timestamp keeps the file
|
|
40
|
-
// syntax-highlighted in editors that key off the final extension.
|
|
41
|
-
const suffix = `.conflict-${safeTs}-${shortMachineId}${ext}`;
|
|
46
|
+
const suffix = `.conflict-${safeTimestamp(detectedAt)}-${shortMachineId}${ext}`;
|
|
42
47
|
return `${originalRelative}${suffix}`;
|
|
43
48
|
}
|
|
44
49
|
/**
|
|
45
|
-
*
|
|
46
|
-
*
|
|
47
|
-
|
|
50
|
+
* Grammar of a legacy twin basename. Mirrors `EPHEMERAL_PATH_PATTERN` in
|
|
51
|
+
* `../cli/share.ts` (hex or `unknown` machine token, optional trailing ext).
|
|
52
|
+
*/
|
|
53
|
+
const LEGACY_CONFLICT_TWIN_RE = /^(.+)\.conflict-(\d{4}-\d{2}-\d{2}T\d{2}-\d{2}-\d{2}Z)-([a-f0-9]+|unknown)(\.[^./]*)?$/;
|
|
54
|
+
/**
|
|
55
|
+
* Recognise a legacy `<name>.conflict-<ts>-<machine>[.<ext>]` basename and
|
|
56
|
+
* recover the live sibling's name. Returns null for anything else.
|
|
57
|
+
*/
|
|
58
|
+
export function parseLegacyConflictTwinName(basename) {
|
|
59
|
+
const m = LEGACY_CONFLICT_TWIN_RE.exec(basename);
|
|
60
|
+
if (!m)
|
|
61
|
+
return null;
|
|
62
|
+
return { originalName: m[1], detectedAt: m[2], machineId: m[3] };
|
|
63
|
+
}
|
|
64
|
+
/**
|
|
65
|
+
* Out-of-tree backup key for a LOSING body. Lives under `.hq/conflict-backups/`
|
|
66
|
+
* mirroring the original's relative path, so backups of one file sort
|
|
67
|
+
* together and the tree next to the live file stays clean:
|
|
68
|
+
*
|
|
69
|
+
* knowledge/notes.md, 2026-04-27T22:05:14Z, abc123
|
|
70
|
+
* → .hq/conflict-backups/knowledge/notes.md.2026-04-27T22-05-14Z-abc123.md
|
|
71
|
+
*
|
|
72
|
+
* Deliberately NOT the `.conflict-` grammar, so a backup can never be mistaken
|
|
73
|
+
* for a legacy twin by the reconciler or the ephemeral-path filters.
|
|
74
|
+
*/
|
|
75
|
+
export function buildConflictBackupPath(originalRelative, detectedAt, shortMachineId) {
|
|
76
|
+
const ext = path.extname(originalRelative);
|
|
77
|
+
return `${CONFLICT_BACKUPS_DIR}/${originalRelative}.${safeTimestamp(detectedAt)}-${shortMachineId}${ext}`;
|
|
78
|
+
}
|
|
79
|
+
/**
|
|
80
|
+
* Absolute scratch path for one convergence probe download. Under
|
|
81
|
+
* `<hqRoot>/.hq/tmp/` (sync-ignored, never beside the live file); the caller
|
|
82
|
+
* MUST remove or move it before returning.
|
|
48
83
|
*/
|
|
49
|
-
export function
|
|
50
|
-
|
|
51
|
-
// forward-slash) keys, so the mirror must land at the encoded local name
|
|
52
|
-
// on win32 — a raw join of a colon key can never be created there.
|
|
53
|
-
const abs = localPathForVaultKey(hqRoot, conflictRelative);
|
|
54
|
-
fs.mkdirSync(path.dirname(abs), { recursive: true });
|
|
55
|
-
fs.writeFileSync(abs, contents);
|
|
84
|
+
export function buildConflictProbePath(hqRoot) {
|
|
85
|
+
return path.join(hqRoot, ...CONFLICT_PROBE_DIR.split("/"), `conflict-probe-${crypto.randomBytes(8).toString("hex")}`);
|
|
56
86
|
}
|
|
57
87
|
/**
|
|
58
88
|
* Stable conflict ID — used to dedupe re-detections of the same conflict.
|
|
@@ -63,8 +93,7 @@ export function writeConflictFile(hqRoot, conflictRelative, contents) {
|
|
|
63
93
|
* which is correct.
|
|
64
94
|
*/
|
|
65
95
|
export function buildConflictId(originalRelative, detectedAt) {
|
|
66
|
-
const safeTs = detectedAt.replace(/:/g, "-").replace(/\.\d+/, "");
|
|
67
96
|
const safePath = originalRelative.replace(/[/\\.]/g, "-");
|
|
68
|
-
return `${safePath}-${
|
|
97
|
+
return `${safePath}-${safeTimestamp(detectedAt)}`;
|
|
69
98
|
}
|
|
70
99
|
//# sourceMappingURL=conflict-file.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conflict-file.js","sourceRoot":"","sources":["../../src/lib/conflict-file.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"conflict-file.js","sourceRoot":"","sources":["../../src/lib/conflict-file.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAE3E,qFAAqF;AACrF,MAAM,CAAC,MAAM,oBAAoB,GAAG,sBAAsB,CAAC;AAE3D,kFAAkF;AAClF,MAAM,CAAC,MAAM,kBAAkB,GAAG,SAAS,CAAC;AAE5C,SAAS,aAAa,CAAC,UAAkB;IACvC,OAAO,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;AAC5D,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,iBAAiB,CAC/B,gBAAwB,EACxB,UAAkB,EAClB,cAAsB;IAEtB,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,sBAAsB;IAClE,MAAM,MAAM,GAAG,aAAa,aAAa,CAAC,UAAU,CAAC,IAAI,cAAc,GAAG,GAAG,EAAE,CAAC;IAChF,OAAO,GAAG,gBAAgB,GAAG,MAAM,EAAE,CAAC;AACxC,CAAC;AAED;;;GAGG;AACH,MAAM,uBAAuB,GAC3B,wFAAwF,CAAC;AAU3F;;;GAGG;AACH,MAAM,UAAU,2BAA2B,CACzC,QAAgB;IAEhB,MAAM,CAAC,GAAG,uBAAuB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACjD,IAAI,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IACpB,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,CAAE,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,CAAE,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAE,EAAE,CAAC;AACtE,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,uBAAuB,CACrC,gBAAwB,EACxB,UAAkB,EAClB,cAAsB;IAEtB,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC3C,OAAO,GAAG,oBAAoB,IAAI,gBAAgB,IAAI,aAAa,CAAC,UAAU,CAAC,IAAI,cAAc,GAAG,GAAG,EAAE,CAAC;AAC5G,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,sBAAsB,CAAC,MAAc;IACnD,OAAO,IAAI,CAAC,IAAI,CACd,MAAM,EACN,GAAG,kBAAkB,CAAC,KAAK,CAAC,GAAG,CAAC,EAChC,kBAAkB,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAC1D,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,eAAe,CAC7B,gBAAwB,EACxB,UAAkB;IAElB,MAAM,QAAQ,GAAG,gBAAgB,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;IAC1D,OAAO,GAAG,QAAQ,IAAI,aAAa,CAAC,UAAU,CAAC,EAAE,CAAC;AACpD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conflict-index.d.ts","sourceRoot":"","sources":["../../src/lib/conflict-index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAMH,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;AAED,mEAAmE;AACnE,MAAM,WAAW,wBAAwB;IACvC,wEAAwE;IACxE,aAAa,EAAE,MAAM,CAAC;IACtB,gFAAgF;IAChF,eAAe,EAAE,MAAM,CAAC;IACxB,qEAAqE;IACrE,cAAc,EAAE,MAAM,CAAC;IACvB,0EAA0E;IAC1E,IAAI,EAAE,MAAM,CAAC;IACb;;;;;OAKG;IACH,eAAe,EAAE,MAAM,EAAE,CAAC;CAC3B;AA4BD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,wBAAwB,
|
|
1
|
+
{"version":3,"file":"conflict-index.d.ts","sourceRoot":"","sources":["../../src/lib/conflict-index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAMH,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;AAED,mEAAmE;AACnE,MAAM,WAAW,wBAAwB;IACvC,wEAAwE;IACxE,aAAa,EAAE,MAAM,CAAC;IACtB,gFAAgF;IAChF,eAAe,EAAE,MAAM,CAAC;IACxB,qEAAqE;IACrE,cAAc,EAAE,MAAM,CAAC;IACvB,0EAA0E;IAC1E,IAAI,EAAE,MAAM,CAAC;IACb;;;;;OAKG;IACH,eAAe,EAAE,MAAM,EAAE,CAAC;CAC3B;AA4BD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,wBAAwB,CA6F3E"}
|
|
@@ -174,6 +174,12 @@ export function pruneConflictIndex(hqRoot) {
|
|
|
174
174
|
const kept = [];
|
|
175
175
|
const mirrorsToRemove = [];
|
|
176
176
|
for (const entry of index.conflicts) {
|
|
177
|
+
// A row with no preserved body on disk (older engine, or a hold whose
|
|
178
|
+
// loser could not be parked) is unactionable — same class as an orphan.
|
|
179
|
+
if (!entry.conflictPath) {
|
|
180
|
+
result.prunedOrphans++;
|
|
181
|
+
continue;
|
|
182
|
+
}
|
|
177
183
|
// Codec boundary: index rows store canonical (hq-root-relative) keys, so
|
|
178
184
|
// both probes must resolve through the codec — a raw join of a win32
|
|
179
185
|
// colon key always lstat-fails, which would mis-classify a live encoded
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conflict-index.js","sourceRoot":"","sources":["../../src/lib/conflict-index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"conflict-index.js","sourceRoot":"","sources":["../../src/lib/conflict-index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,106 @@
|
|
|
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 { type ConflictDecision } from "../cli/conflict.js";
|
|
41
|
+
export type ReconcileTwinAction =
|
|
42
|
+
/** Twin body wins (strictly higher version): it replaces the live file; the old live body is backed up. */
|
|
43
|
+
"promote-twin"
|
|
44
|
+
/** Live body wins: the twin is moved out of the tree into the backup dir. */
|
|
45
|
+
| "keep-live"
|
|
46
|
+
/** No live sibling exists: the twin is parked in the backup dir and listed for manual review, never restored. */
|
|
47
|
+
| "park-orphan"
|
|
48
|
+
/** Left untouched (symlink, unreadable, …) — surfaced for a human. */
|
|
49
|
+
| "manual-review";
|
|
50
|
+
export interface ReconcileTwinPlanItem {
|
|
51
|
+
/** hq-root-relative canonical key of the twin file. */
|
|
52
|
+
twinPath: string;
|
|
53
|
+
/** hq-root-relative canonical key of the live file the twin shadows. */
|
|
54
|
+
livePath: string;
|
|
55
|
+
action: ReconcileTwinAction;
|
|
56
|
+
/** Winner decision for the two-sided cases (`local` = live, `remote` = twin). */
|
|
57
|
+
decision?: ConflictDecision;
|
|
58
|
+
reason: string;
|
|
59
|
+
}
|
|
60
|
+
export interface ReconcileManualReviewItem {
|
|
61
|
+
twinPath: string;
|
|
62
|
+
livePath: string;
|
|
63
|
+
action: ReconcileTwinAction;
|
|
64
|
+
reason: string;
|
|
65
|
+
/** Where the body now sits (set once a `park-orphan` has been applied). */
|
|
66
|
+
backupPath?: string;
|
|
67
|
+
}
|
|
68
|
+
export interface ReconcileTwinsResult {
|
|
69
|
+
plan: ReconcileTwinPlanItem[];
|
|
70
|
+
/** False on dry-run (the default). */
|
|
71
|
+
applied: boolean;
|
|
72
|
+
/** Twins whose body now sits at the live path (strictly higher version). */
|
|
73
|
+
promoted: number;
|
|
74
|
+
/** Twins moved out of the tree because the live body won. */
|
|
75
|
+
removed: number;
|
|
76
|
+
/** Orphan twins (no live sibling) parked under `.hq/conflict-backups/`. */
|
|
77
|
+
orphansParked: number;
|
|
78
|
+
/** Bodies parked under `.hq/conflict-backups/` (displaced live bodies, losing twins, orphans). */
|
|
79
|
+
backedUp: number;
|
|
80
|
+
/** `.hq-conflicts/index.json` rows dropped because their twin was reconciled. */
|
|
81
|
+
indexRowsDropped: number;
|
|
82
|
+
/** Non-fatal per-item warnings emitted during plan + apply. */
|
|
83
|
+
warnings: number;
|
|
84
|
+
/** Items an operator must look at: untouched twins and parked orphans. */
|
|
85
|
+
manualReview: ReconcileManualReviewItem[];
|
|
86
|
+
}
|
|
87
|
+
export interface ReconcileTwinsOptions {
|
|
88
|
+
hqRoot: string;
|
|
89
|
+
/** Apply the plan. Default false = dry-run. */
|
|
90
|
+
yes?: boolean;
|
|
91
|
+
/** Plan/progress sink; defaults to silent. */
|
|
92
|
+
log?: (line: string) => void;
|
|
93
|
+
/** Warning sink; defaults to `log`. */
|
|
94
|
+
warn?: (line: string) => void;
|
|
95
|
+
}
|
|
96
|
+
/**
|
|
97
|
+
* Build the reconcile plan. Pure planning — nothing on disk is touched.
|
|
98
|
+
* Twins are grouped per live path so at most ONE twin per live file is
|
|
99
|
+
* promoted (the highest strictly-greater frontmatter version).
|
|
100
|
+
*/
|
|
101
|
+
export declare function planLegacyConflictTwins(hqRoot: string, warn?: (message: string) => void): ReconcileTwinPlanItem[];
|
|
102
|
+
/**
|
|
103
|
+
* Plan and (with `yes`) apply legacy-twin reconciliation. See module doc.
|
|
104
|
+
*/
|
|
105
|
+
export declare function reconcileLegacyConflictTwins(options: ReconcileTwinsOptions): ReconcileTwinsResult;
|
|
106
|
+
//# sourceMappingURL=conflict-reconcile.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"conflict-reconcile.d.ts","sourceRoot":"","sources":["../../src/lib/conflict-reconcile.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AAKH,OAAO,EAAc,KAAK,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAkBvE,MAAM,MAAM,mBAAmB;AAC7B,2GAA2G;AACzG,cAAc;AAChB,6EAA6E;GAC3E,WAAW;AACb,iHAAiH;GAC/G,aAAa;AACf,sEAAsE;GACpE,eAAe,CAAC;AAEpB,MAAM,WAAW,qBAAqB;IACpC,uDAAuD;IACvD,QAAQ,EAAE,MAAM,CAAC;IACjB,wEAAwE;IACxE,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,iFAAiF;IACjF,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,yBAAyB;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,2EAA2E;IAC3E,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,qBAAqB,EAAE,CAAC;IAC9B,sCAAsC;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,4EAA4E;IAC5E,QAAQ,EAAE,MAAM,CAAC;IACjB,6DAA6D;IAC7D,OAAO,EAAE,MAAM,CAAC;IAChB,2EAA2E;IAC3E,aAAa,EAAE,MAAM,CAAC;IACtB,kGAAkG;IAClG,QAAQ,EAAE,MAAM,CAAC;IACjB,iFAAiF;IACjF,gBAAgB,EAAE,MAAM,CAAC;IACzB,+DAA+D;IAC/D,QAAQ,EAAE,MAAM,CAAC;IACjB,0EAA0E;IAC1E,YAAY,EAAE,yBAAyB,EAAE,CAAC;CAC3C;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,+CAA+C;IAC/C,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,8CAA8C;IAC9C,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7B,uCAAuC;IACvC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAC/B;AAsCD;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,EACd,IAAI,GAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAe,GACzC,qBAAqB,EAAE,CAiIzB;AAqED;;GAEG;AACH,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,qBAAqB,GAC7B,oBAAoB,CAoJtB"}
|