@indigoai-us/hq-cloud 6.18.109 → 6.18.111
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/bin/area-ledger-migration.d.ts.map +1 -1
- package/dist/bin/area-ledger-migration.js +5 -3
- package/dist/bin/area-ledger-migration.js.map +1 -1
- package/dist/bin/backup-prune-runner.js +2 -2
- package/dist/bin/backup-prune-runner.js.map +1 -1
- package/dist/bin/runner-output-guard.d.ts +39 -0
- package/dist/bin/runner-output-guard.d.ts.map +1 -0
- package/dist/bin/runner-output-guard.js +104 -0
- package/dist/bin/runner-output-guard.js.map +1 -0
- package/dist/bin/sync-runner-company.d.ts +20 -0
- package/dist/bin/sync-runner-company.d.ts.map +1 -1
- package/dist/bin/sync-runner-company.js +134 -6
- package/dist/bin/sync-runner-company.js.map +1 -1
- package/dist/bin/sync-runner.d.ts +42 -1
- package/dist/bin/sync-runner.d.ts.map +1 -1
- package/dist/bin/sync-runner.js +37 -3
- package/dist/bin/sync-runner.js.map +1 -1
- package/dist/cli/conflict.d.ts +30 -1
- package/dist/cli/conflict.d.ts.map +1 -1
- package/dist/cli/conflict.js +69 -3
- package/dist/cli/conflict.js.map +1 -1
- package/dist/cli/reconcile-skip-reason.d.ts +13 -3
- package/dist/cli/reconcile-skip-reason.d.ts.map +1 -1
- package/dist/cli/reconcile-skip-reason.js +18 -0
- package/dist/cli/reconcile-skip-reason.js.map +1 -1
- package/dist/cli/reindex.d.ts.map +1 -1
- package/dist/cli/reindex.js +231 -44
- package/dist/cli/reindex.js.map +1 -1
- package/dist/cli/rescue-core.d.ts +98 -2
- package/dist/cli/rescue-core.d.ts.map +1 -1
- package/dist/cli/rescue-core.js +501 -76
- package/dist/cli/rescue-core.js.map +1 -1
- package/dist/cli/rescue-hq-registrations.d.ts +45 -0
- package/dist/cli/rescue-hq-registrations.d.ts.map +1 -0
- package/dist/cli/rescue-hq-registrations.js +252 -0
- package/dist/cli/rescue-hq-registrations.js.map +1 -0
- package/dist/cli/rescue.d.ts +8 -0
- package/dist/cli/rescue.d.ts.map +1 -1
- package/dist/cli/rescue.js +64 -17
- package/dist/cli/rescue.js.map +1 -1
- package/dist/cli/share.d.ts +35 -8
- package/dist/cli/share.d.ts.map +1 -1
- package/dist/cli/share.js +491 -32
- package/dist/cli/share.js.map +1 -1
- package/dist/cli/sync.d.ts +70 -5
- package/dist/cli/sync.d.ts.map +1 -1
- package/dist/cli/sync.js +445 -79
- package/dist/cli/sync.js.map +1 -1
- package/dist/cognito-auth.d.ts +10 -0
- package/dist/cognito-auth.d.ts.map +1 -1
- package/dist/cognito-auth.js +162 -1
- package/dist/cognito-auth.js.map +1 -1
- package/dist/ignore.d.ts.map +1 -1
- package/dist/ignore.js +43 -21
- package/dist/ignore.js.map +1 -1
- package/dist/index.d.ts +3 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/journal-row-store.d.ts +3 -0
- package/dist/journal-row-store.d.ts.map +1 -1
- package/dist/journal-row-store.js +21 -0
- package/dist/journal-row-store.js.map +1 -1
- package/dist/journal-snapshot-decoder.js +2 -0
- package/dist/journal-snapshot-decoder.js.map +1 -1
- package/dist/journal-snapshot-v4.d.ts.map +1 -1
- package/dist/journal-snapshot-v4.js +6 -1
- package/dist/journal-snapshot-v4.js.map +1 -1
- package/dist/journal.d.ts +1 -1
- package/dist/journal.d.ts.map +1 -1
- package/dist/journal.js +20 -20
- package/dist/journal.js.map +1 -1
- package/dist/lib/append-log-merge.d.ts +43 -0
- package/dist/lib/append-log-merge.d.ts.map +1 -0
- package/dist/lib/append-log-merge.js +424 -0
- package/dist/lib/append-log-merge.js.map +1 -0
- package/dist/lib/same-path-upload-lock.d.ts +27 -1
- package/dist/lib/same-path-upload-lock.d.ts.map +1 -1
- package/dist/lib/same-path-upload-lock.js +32 -1
- package/dist/lib/same-path-upload-lock.js.map +1 -1
- package/dist/object-io.d.ts +36 -1
- package/dist/object-io.d.ts.map +1 -1
- package/dist/object-io.js +97 -13
- package/dist/object-io.js.map +1 -1
- package/dist/operation-lock.d.ts +27 -1
- package/dist/operation-lock.d.ts.map +1 -1
- package/dist/operation-lock.js +94 -8
- package/dist/operation-lock.js.map +1 -1
- package/dist/outposts/client.d.ts +19 -6
- package/dist/outposts/client.d.ts.map +1 -1
- package/dist/outposts/client.js +16 -5
- package/dist/outposts/client.js.map +1 -1
- package/dist/outposts/command.d.ts +2 -1
- package/dist/outposts/command.d.ts.map +1 -1
- package/dist/outposts/command.js +81 -13
- package/dist/outposts/command.js.map +1 -1
- package/dist/outposts/self-deploy.d.ts.map +1 -1
- package/dist/outposts/self-deploy.js +3 -0
- package/dist/outposts/self-deploy.js.map +1 -1
- package/dist/private-folder-transport.d.ts +0 -2
- package/dist/private-folder-transport.d.ts.map +1 -1
- package/dist/private-folder-transport.js +17 -16
- package/dist/private-folder-transport.js.map +1 -1
- package/dist/push-identity-fence.d.ts +116 -3
- package/dist/push-identity-fence.d.ts.map +1 -1
- package/dist/push-identity-fence.js +625 -62
- package/dist/push-identity-fence.js.map +1 -1
- package/dist/qmd-reindex.d.ts.map +1 -1
- package/dist/qmd-reindex.js +3 -2
- package/dist/qmd-reindex.js.map +1 -1
- package/dist/s3.d.ts +30 -9
- package/dist/s3.d.ts.map +1 -1
- package/dist/s3.js +110 -82
- package/dist/s3.js.map +1 -1
- package/dist/session-log-retention.d.ts +86 -0
- package/dist/session-log-retention.d.ts.map +1 -1
- package/dist/session-log-retention.js +127 -19
- package/dist/session-log-retention.js.map +1 -1
- package/dist/sync/area-ledger-migration.d.ts +17 -0
- package/dist/sync/area-ledger-migration.d.ts.map +1 -1
- package/dist/sync/area-ledger-migration.js +37 -3
- package/dist/sync/area-ledger-migration.js.map +1 -1
- package/dist/sync/scattered-delete-burst.d.ts +61 -0
- package/dist/sync/scattered-delete-burst.d.ts.map +1 -0
- package/dist/sync/scattered-delete-burst.js +111 -0
- package/dist/sync/scattered-delete-burst.js.map +1 -0
- package/dist/sync/unattended-delete-hold.d.ts +102 -0
- package/dist/sync/unattended-delete-hold.d.ts.map +1 -0
- package/dist/sync/unattended-delete-hold.js +164 -0
- package/dist/sync/unattended-delete-hold.js.map +1 -0
- package/dist/sync-core.d.ts +5 -6
- package/dist/sync-core.d.ts.map +1 -1
- package/dist/sync-core.js +5 -6
- package/dist/sync-core.js.map +1 -1
- package/dist/types.d.ts +13 -2
- package/dist/types.d.ts.map +1 -1
- package/dist/vault-client.d.ts +6 -0
- package/dist/vault-client.d.ts.map +1 -1
- package/dist/vault-client.js +53 -8
- package/dist/vault-client.js.map +1 -1
- package/dist/vault-key-grammar.d.ts +44 -0
- package/dist/vault-key-grammar.d.ts.map +1 -0
- package/dist/vault-key-grammar.js +158 -0
- package/dist/vault-key-grammar.js.map +1 -0
- package/dist/watcher.d.ts.map +1 -1
- package/dist/watcher.js +4 -1
- package/dist/watcher.js.map +1 -1
- package/dist/windows-extended-path.d.ts +22 -0
- package/dist/windows-extended-path.d.ts.map +1 -0
- package/dist/windows-extended-path.js +55 -0
- package/dist/windows-extended-path.js.map +1 -0
- package/package.json +1 -1
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
type JsonValue = string | number | boolean | null | JsonValue[] | {
|
|
2
|
+
[k: string]: JsonValue;
|
|
3
|
+
};
|
|
4
|
+
type JsonObject = {
|
|
5
|
+
[k: string]: JsonValue;
|
|
6
|
+
};
|
|
7
|
+
/** The project master-hook command HQ ships in `.claude/settings.json`. */
|
|
8
|
+
export declare function shippedMasterHookCommand(event: string): string;
|
|
9
|
+
/** True when `value` names the HQ root `root` (same spelling or same folder). */
|
|
10
|
+
export declare function sameHqRoot(value: string | undefined, root: string): boolean;
|
|
11
|
+
/**
|
|
12
|
+
* True for an entry HQ registers for this root: the pinned launcher
|
|
13
|
+
* (hq-cli `isNativeEntry`) or the new-core `hq-hook run --host` entry
|
|
14
|
+
* (hq-cli `isCoreNextEntry`).
|
|
15
|
+
*/
|
|
16
|
+
export declare function isHqRegistration(entry: unknown, root: string): entry is JsonObject;
|
|
17
|
+
/** First HQ registration per event, from each document in order. */
|
|
18
|
+
export declare function collectHqRegistrations(docs: Array<JsonValue | null | undefined>, root: string): Map<string, JsonObject>;
|
|
19
|
+
/**
|
|
20
|
+
* `ours` (the pre-rescue settings.json) as the user's edits on top of a
|
|
21
|
+
* release file `base`: every HQ registration stands for the shipped
|
|
22
|
+
* master-hook entry of its event, so it becomes `base`'s copy of that entry
|
|
23
|
+
* (or is dropped when `base` has none, or when the event's group already holds
|
|
24
|
+
* the shipped entry). An event whose HQ registration an HQ settings merge
|
|
25
|
+
* moved into settings.local.json (`localRegistrations`), and whose shipped
|
|
26
|
+
* entry is therefore missing from `ours`, gets `base`'s shipped groups back.
|
|
27
|
+
* The result is what to diff against `base`: neither the registrations nor
|
|
28
|
+
* the shipped entries they replaced count as user edits.
|
|
29
|
+
*/
|
|
30
|
+
export declare function withoutHqRegistrations(ours: JsonObject, base: JsonValue | null | undefined, root: string, localRegistrations?: ReadonlyMap<string, JsonObject>): JsonObject;
|
|
31
|
+
/**
|
|
32
|
+
* Put HQ's registrations back into the merged release settings `theirs`, in
|
|
33
|
+
* place: for each event, the first shipped master-hook entry becomes the
|
|
34
|
+
* registration, keeping the release entry's other fields (the same shape
|
|
35
|
+
* `hq reindex` writes). Returns the events placed. An event whose shipped
|
|
36
|
+
* entry the release no longer has is left as the release ships it.
|
|
37
|
+
*/
|
|
38
|
+
export declare function placeHqRegistrations(theirs: JsonObject, registrations: ReadonlyMap<string, JsonObject>): Set<string>;
|
|
39
|
+
/**
|
|
40
|
+
* Remove this root's HQ registrations for `events` from a settings.local.json
|
|
41
|
+
* document (hq-cli `withoutMovedEntries`). Returns true when it changed.
|
|
42
|
+
*/
|
|
43
|
+
export declare function removeHqRegistrations(local: JsonObject, events: ReadonlySet<string>, root: string): boolean;
|
|
44
|
+
export {};
|
|
45
|
+
//# sourceMappingURL=rescue-hq-registrations.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rescue-hq-registrations.d.ts","sourceRoot":"","sources":["../../src/cli/rescue-hq-registrations.ts"],"names":[],"mappings":"AAkBA,KAAK,SAAS,GACZ,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,EAAE,GAAG;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC;AAC9E,KAAK,UAAU,GAAG;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC;AAM7C,2EAA2E;AAC3E,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE9D;AAkCD,iFAAiF;AACjF,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAK3E;AAKD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,KAAK,IAAI,UAAU,CAQlF;AAmBD,oEAAoE;AACpE,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,KAAK,CAAC,SAAS,GAAG,IAAI,GAAG,SAAS,CAAC,EACzC,IAAI,EAAE,MAAM,GACX,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAgBzB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,GAAG,IAAI,GAAG,SAAS,EAClC,IAAI,EAAE,MAAM,EACZ,kBAAkB,GAAE,WAAW,CAAC,MAAM,EAAE,UAAU,CAAa,GAC9D,UAAU,CA8CZ;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,UAAU,EAClB,aAAa,EAAE,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,GAC7C,GAAG,CAAC,MAAM,CAAC,CAqBb;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,UAAU,EACjB,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,EAC3B,IAAI,EAAE,MAAM,GACX,OAAO,CA6BT"}
|
|
@@ -0,0 +1,252 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* HQ's own hook registrations in a project `.claude/settings.json`.
|
|
3
|
+
*
|
|
4
|
+
* `hq reindex` (hq-cli `lib/hook-engine/reconcile.ts`) replaces the shipped
|
|
5
|
+
* master-hook entry of an event the new hook core covers with an `hq-hook`
|
|
6
|
+
* entry, in place, and removes any copy of that entry from
|
|
7
|
+
* `.claude/settings.local.json`. Those entries are HQ's, not the user's. The
|
|
8
|
+
* rescue settings reconcile must not class them as user drift (it would move
|
|
9
|
+
* them into settings.local.json) and must not class the shipped entry they
|
|
10
|
+
* stand for as a user removal (it would delete the release's entry).
|
|
11
|
+
*
|
|
12
|
+
* Recognition mirrors hq-cli `lib/hook-engine/registration-identity.ts`
|
|
13
|
+
* (`isNativeEntry`, `isCoreNextEntry`, `sameHqRoot`), which reindex and doctor
|
|
14
|
+
* use: the pinned versioned launcher or the release-stable `hq-hook` link,
|
|
15
|
+
* with a `--hq-root` argument that names this HQ root.
|
|
16
|
+
*/
|
|
17
|
+
import * as fs from "fs";
|
|
18
|
+
function isPlainObject(v) {
|
|
19
|
+
return typeof v === "object" && v !== null && !Array.isArray(v);
|
|
20
|
+
}
|
|
21
|
+
/** The project master-hook command HQ ships in `.claude/settings.json`. */
|
|
22
|
+
export function shippedMasterHookCommand(event) {
|
|
23
|
+
return 'env BASH_ENV=/dev/null bash "$CLAUDE_PROJECT_DIR/.claude/hooks/master-hook.sh" ' + event;
|
|
24
|
+
}
|
|
25
|
+
function launcherRoot(root) {
|
|
26
|
+
const trimmed = root.replace(/[\\/]+$/, "");
|
|
27
|
+
return trimmed === "" || /^[A-Za-z]:$/.test(trimmed) ? root : trimmed;
|
|
28
|
+
}
|
|
29
|
+
function quotePosix(value) {
|
|
30
|
+
return "'" + value.replace(/'/g, "'\\''") + "'";
|
|
31
|
+
}
|
|
32
|
+
function hqRootArgument(entry) {
|
|
33
|
+
if (Array.isArray(entry.args)) {
|
|
34
|
+
const i = entry.args.indexOf("--hq-root");
|
|
35
|
+
const value = i >= 0 ? entry.args[i + 1] : undefined;
|
|
36
|
+
return typeof value === "string" ? value : undefined;
|
|
37
|
+
}
|
|
38
|
+
if (typeof entry.command !== "string")
|
|
39
|
+
return undefined;
|
|
40
|
+
if (entry.command.startsWith("& ")) {
|
|
41
|
+
const windows = entry.command.match(/'--hq-root' '((?:[^']|'')*)'/);
|
|
42
|
+
return windows ? windows[1].replace(/''/g, "'") : undefined;
|
|
43
|
+
}
|
|
44
|
+
const posix = entry.command.match(/'--hq-root' '((?:[^']|'\\'')*)'/);
|
|
45
|
+
return posix ? posix[1].replace(/'\\''/g, "'") : undefined;
|
|
46
|
+
}
|
|
47
|
+
function realpathOrNull(p) {
|
|
48
|
+
try {
|
|
49
|
+
return fs.realpathSync(p);
|
|
50
|
+
}
|
|
51
|
+
catch {
|
|
52
|
+
return null;
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
/** True when `value` names the HQ root `root` (same spelling or same folder). */
|
|
56
|
+
export function sameHqRoot(value, root) {
|
|
57
|
+
if (value === undefined)
|
|
58
|
+
return false;
|
|
59
|
+
if (value === launcherRoot(root) || launcherRoot(value) === launcherRoot(root))
|
|
60
|
+
return true;
|
|
61
|
+
const a = realpathOrNull(value);
|
|
62
|
+
return a !== null && a === realpathOrNull(root);
|
|
63
|
+
}
|
|
64
|
+
const PINNED_LAUNCHER = /[\\/]\.hq[\\/]bin[\\/]hq-hook[\\/]\d+\.\d+\.\d+[^\\/]*[\\/]/;
|
|
65
|
+
const CORE_NEXT_LINK = /[\\/]\.hq[\\/]bin[\\/]hq-hook[\\/]stable[\\/]/;
|
|
66
|
+
/**
|
|
67
|
+
* True for an entry HQ registers for this root: the pinned launcher
|
|
68
|
+
* (hq-cli `isNativeEntry`) or the new-core `hq-hook run --host` entry
|
|
69
|
+
* (hq-cli `isCoreNextEntry`).
|
|
70
|
+
*/
|
|
71
|
+
export function isHqRegistration(entry, root) {
|
|
72
|
+
if (!isPlainObject(entry) || typeof entry.command !== "string")
|
|
73
|
+
return false;
|
|
74
|
+
if (PINNED_LAUNCHER.test(entry.command))
|
|
75
|
+
return sameHqRoot(hqRootArgument(entry), root);
|
|
76
|
+
if (!CORE_NEXT_LINK.test(entry.command))
|
|
77
|
+
return false;
|
|
78
|
+
const runHost = Array.isArray(entry.args)
|
|
79
|
+
? entry.args[0] === "run" && entry.args[1] === "--host"
|
|
80
|
+
: entry.command.includes(`${quotePosix("run")} ${quotePosix("--host")}`);
|
|
81
|
+
return runHost && sameHqRoot(hqRootArgument(entry), root);
|
|
82
|
+
}
|
|
83
|
+
function groupEntries(group) {
|
|
84
|
+
return isPlainObject(group) && Array.isArray(group.hooks) ? group.hooks : null;
|
|
85
|
+
}
|
|
86
|
+
function eventGroups(doc, event) {
|
|
87
|
+
if (!isPlainObject(doc) || !isPlainObject(doc.hooks))
|
|
88
|
+
return [];
|
|
89
|
+
const groups = doc.hooks[event];
|
|
90
|
+
return Array.isArray(groups) ? groups : [];
|
|
91
|
+
}
|
|
92
|
+
function hasShippedEntry(groups, event) {
|
|
93
|
+
const shipped = shippedMasterHookCommand(event);
|
|
94
|
+
return groups.some((g) => groupEntries(g)?.some((e) => isPlainObject(e) && e.command === shipped));
|
|
95
|
+
}
|
|
96
|
+
/** First HQ registration per event, from each document in order. */
|
|
97
|
+
export function collectHqRegistrations(docs, root) {
|
|
98
|
+
const found = new Map();
|
|
99
|
+
for (const doc of docs) {
|
|
100
|
+
if (!isPlainObject(doc) || !isPlainObject(doc.hooks))
|
|
101
|
+
continue;
|
|
102
|
+
for (const [event, groups] of Object.entries(doc.hooks)) {
|
|
103
|
+
if (found.has(event) || !Array.isArray(groups))
|
|
104
|
+
continue;
|
|
105
|
+
for (const g of groups) {
|
|
106
|
+
const reg = groupEntries(g)?.find((e) => isHqRegistration(e, root));
|
|
107
|
+
if (reg) {
|
|
108
|
+
found.set(event, reg);
|
|
109
|
+
break;
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
return found;
|
|
115
|
+
}
|
|
116
|
+
/**
|
|
117
|
+
* `ours` (the pre-rescue settings.json) as the user's edits on top of a
|
|
118
|
+
* release file `base`: every HQ registration stands for the shipped
|
|
119
|
+
* master-hook entry of its event, so it becomes `base`'s copy of that entry
|
|
120
|
+
* (or is dropped when `base` has none, or when the event's group already holds
|
|
121
|
+
* the shipped entry). An event whose HQ registration an HQ settings merge
|
|
122
|
+
* moved into settings.local.json (`localRegistrations`), and whose shipped
|
|
123
|
+
* entry is therefore missing from `ours`, gets `base`'s shipped groups back.
|
|
124
|
+
* The result is what to diff against `base`: neither the registrations nor
|
|
125
|
+
* the shipped entries they replaced count as user edits.
|
|
126
|
+
*/
|
|
127
|
+
export function withoutHqRegistrations(ours, base, root, localRegistrations = new Map()) {
|
|
128
|
+
const out = structuredClone(ours);
|
|
129
|
+
const hooks = isPlainObject(out.hooks) ? out.hooks : undefined;
|
|
130
|
+
if (hooks) {
|
|
131
|
+
for (const [event, groups] of Object.entries(hooks)) {
|
|
132
|
+
if (!Array.isArray(groups))
|
|
133
|
+
continue;
|
|
134
|
+
const baseGroups = eventGroups(base, event);
|
|
135
|
+
const shipped = shippedMasterHookCommand(event);
|
|
136
|
+
const baseShipped = baseGroups
|
|
137
|
+
.flatMap((g) => groupEntries(g) ?? [])
|
|
138
|
+
.find((e) => isPlainObject(e) && e.command === shipped);
|
|
139
|
+
let shellPlaced = hasShippedEntry(groups, event);
|
|
140
|
+
const next = [];
|
|
141
|
+
for (const g of groups) {
|
|
142
|
+
const entries = groupEntries(g);
|
|
143
|
+
if (!entries) {
|
|
144
|
+
next.push(g);
|
|
145
|
+
continue;
|
|
146
|
+
}
|
|
147
|
+
let removed = false;
|
|
148
|
+
const kept = [];
|
|
149
|
+
for (const e of entries) {
|
|
150
|
+
if (!isHqRegistration(e, root)) {
|
|
151
|
+
kept.push(e);
|
|
152
|
+
continue;
|
|
153
|
+
}
|
|
154
|
+
removed = true;
|
|
155
|
+
if (!shellPlaced && baseShipped !== undefined) {
|
|
156
|
+
kept.push(structuredClone(baseShipped));
|
|
157
|
+
shellPlaced = true;
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
if (kept.length > 0 || !removed)
|
|
161
|
+
next.push({ ...g, hooks: kept });
|
|
162
|
+
}
|
|
163
|
+
hooks[event] = next;
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
for (const event of localRegistrations.keys()) {
|
|
167
|
+
const current = eventGroups(out, event);
|
|
168
|
+
if (hasShippedEntry(current, event))
|
|
169
|
+
continue;
|
|
170
|
+
const shippedGroups = eventGroups(base, event).filter((g) => hasShippedEntry([g], event));
|
|
171
|
+
if (shippedGroups.length === 0)
|
|
172
|
+
continue;
|
|
173
|
+
if (!isPlainObject(out.hooks))
|
|
174
|
+
out.hooks = {};
|
|
175
|
+
out.hooks[event] = [...current, ...structuredClone(shippedGroups)];
|
|
176
|
+
}
|
|
177
|
+
return out;
|
|
178
|
+
}
|
|
179
|
+
/**
|
|
180
|
+
* Put HQ's registrations back into the merged release settings `theirs`, in
|
|
181
|
+
* place: for each event, the first shipped master-hook entry becomes the
|
|
182
|
+
* registration, keeping the release entry's other fields (the same shape
|
|
183
|
+
* `hq reindex` writes). Returns the events placed. An event whose shipped
|
|
184
|
+
* entry the release no longer has is left as the release ships it.
|
|
185
|
+
*/
|
|
186
|
+
export function placeHqRegistrations(theirs, registrations) {
|
|
187
|
+
const placed = new Set();
|
|
188
|
+
for (const [event, reg] of registrations) {
|
|
189
|
+
const shipped = shippedMasterHookCommand(event);
|
|
190
|
+
for (const g of eventGroups(theirs, event)) {
|
|
191
|
+
const entries = groupEntries(g);
|
|
192
|
+
if (!entries)
|
|
193
|
+
continue;
|
|
194
|
+
const i = entries.findIndex((e) => isPlainObject(e) && e.command === shipped);
|
|
195
|
+
if (i < 0)
|
|
196
|
+
continue;
|
|
197
|
+
const { args: _args, commandWindows: _windows, ...rest } = entries[i];
|
|
198
|
+
entries[i] = {
|
|
199
|
+
...rest,
|
|
200
|
+
command: reg.command,
|
|
201
|
+
...(reg.args !== undefined ? { args: structuredClone(reg.args) } : {}),
|
|
202
|
+
...(reg.commandWindows !== undefined ? { commandWindows: reg.commandWindows } : {}),
|
|
203
|
+
};
|
|
204
|
+
placed.add(event);
|
|
205
|
+
break;
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
return placed;
|
|
209
|
+
}
|
|
210
|
+
/**
|
|
211
|
+
* Remove this root's HQ registrations for `events` from a settings.local.json
|
|
212
|
+
* document (hq-cli `withoutMovedEntries`). Returns true when it changed.
|
|
213
|
+
*/
|
|
214
|
+
export function removeHqRegistrations(local, events, root) {
|
|
215
|
+
if (!isPlainObject(local.hooks))
|
|
216
|
+
return false;
|
|
217
|
+
const hooks = local.hooks;
|
|
218
|
+
let changed = false;
|
|
219
|
+
for (const event of events) {
|
|
220
|
+
const groups = hooks[event];
|
|
221
|
+
if (!Array.isArray(groups))
|
|
222
|
+
continue;
|
|
223
|
+
let removed = false;
|
|
224
|
+
const kept = [];
|
|
225
|
+
for (const g of groups) {
|
|
226
|
+
const entries = groupEntries(g);
|
|
227
|
+
if (!entries) {
|
|
228
|
+
kept.push(g);
|
|
229
|
+
continue;
|
|
230
|
+
}
|
|
231
|
+
const left = entries.filter((e) => !isHqRegistration(e, root));
|
|
232
|
+
if (left.length === entries.length)
|
|
233
|
+
kept.push(g);
|
|
234
|
+
else {
|
|
235
|
+
removed = true;
|
|
236
|
+
if (left.length > 0)
|
|
237
|
+
kept.push({ ...g, hooks: left });
|
|
238
|
+
}
|
|
239
|
+
}
|
|
240
|
+
if (!removed)
|
|
241
|
+
continue;
|
|
242
|
+
changed = true;
|
|
243
|
+
if (kept.length > 0)
|
|
244
|
+
hooks[event] = kept;
|
|
245
|
+
else
|
|
246
|
+
delete hooks[event];
|
|
247
|
+
}
|
|
248
|
+
if (changed && Object.keys(hooks).length === 0)
|
|
249
|
+
delete local.hooks;
|
|
250
|
+
return changed;
|
|
251
|
+
}
|
|
252
|
+
//# sourceMappingURL=rescue-hq-registrations.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rescue-hq-registrations.js","sourceRoot":"","sources":["../../src/cli/rescue-hq-registrations.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/rescue.d.ts
CHANGED
|
@@ -103,6 +103,14 @@ export interface RescueResult {
|
|
|
103
103
|
* exported so callers and tests can assert the flag mapping without spawning.
|
|
104
104
|
*/
|
|
105
105
|
export declare function buildRescueArgs(opts?: RescueOptions): string[];
|
|
106
|
+
/**
|
|
107
|
+
* The HQ root a rescue with argv `args` (from [`buildRescueArgs`]) applies to:
|
|
108
|
+
* the last `--hq-root` value, as the rescue script's parser takes it, else the
|
|
109
|
+
* cwd (the script's own default). The machine entrypoint (`hq-rescue`, spawned
|
|
110
|
+
* by the HQ desktop app from an arbitrary cwd such as `/`) passes `--hq-root`
|
|
111
|
+
* only inside `extraArgs`, so `opts.hqRoot` alone is not the root.
|
|
112
|
+
*/
|
|
113
|
+
export declare function rescueHqRoot(args: readonly string[], cwd?: string): string;
|
|
106
114
|
/**
|
|
107
115
|
* Run the rescue against an HQ root. The long-running clone + scan + overlay
|
|
108
116
|
* writes progress directly. Keep this API synchronous for hq-cli callers.
|
package/dist/cli/rescue.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rescue.d.ts","sourceRoot":"","sources":["../../src/cli/rescue.ts"],"names":[],"mappings":"AA6BA,OAAO,EAEL,KAAK,QAAQ,
|
|
1
|
+
{"version":3,"file":"rescue.d.ts","sourceRoot":"","sources":["../../src/cli/rescue.ts"],"names":[],"mappings":"AA6BA,OAAO,EAEL,KAAK,QAAQ,EAMd,MAAM,sBAAsB,CAAC;AAE9B;;;;;;;GAOG;AACH,eAAO,MAAM,+BAA+B,MAAM,CAAC;AAEnD;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,MAAM,GAAG,SAAS,CAKpB;AA4CD,6EAA6E;AAC7E,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,QAAQ,EAChB,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,MAAM,CAoBR;AAED,gEAAgE;AAChE,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,QAAQ,EAChB,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,MAAM,CAqBR;AAYD;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,GAAG,SAAS,CAkBxF;AAED,6FAA6F;AAC7F,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,MAAM,EACd,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,OAAO,CAyBT;AAED,MAAM,WAAW,aAAa;IAC5B;mDAC+C;IAC/C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;yCACqC;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uDAAuD;IACvD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;+EAC2E;IAC3E,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;yBACqB;IACrB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,6EAA6E;IAC7E,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB;uBACmB;IACnB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,2EAA2E;IAC3E,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;kCAC8B;IAC9B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,2EAA2E;IAC3E,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,kFAAkF;IAClF,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,iDAAiD;IACjD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,uFAAuF;IACvF,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,iFAAiF;IACjF,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC;kCAC8B;IAC9B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,4CAA4C;IAC5C,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;qEACiE;IACjE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;;;OAOG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,4DAA4D;IAC5D,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,aAAa,GAAG;IACvD,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,gBAAgB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CACxC,CAqBA;AAED,MAAM,WAAW,YAAY;IAC3B,0DAA0D;IAC1D,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,GAAE,aAAkB,GAAG,MAAM,EAAE,CAuBlE;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,GAAG,GAAE,MAAsB,GAAG,MAAM,CASzF;AAED;;;;;GAKG;AACH,wBAAgB,MAAM,CAAC,IAAI,GAAE,aAAkB,GAAG,YAAY,CA4D7D"}
|
package/dist/cli/rescue.js
CHANGED
|
@@ -27,7 +27,7 @@ import * as fs from "node:fs";
|
|
|
27
27
|
import * as path from "node:path";
|
|
28
28
|
import { reindex } from "./reindex.js";
|
|
29
29
|
import { runRescue } from "./rescue-core.js";
|
|
30
|
-
import { acquireOperationLock, OperationLockedError, OPERATION_LOCKED_EXIT, } from "../operation-lock.js";
|
|
30
|
+
import { acquireOperationLock, formatLockHolder, liveHoldersOf, lockCommandLabel, OperationLockedError, OPERATION_LOCKED_EXIT, } from "../operation-lock.js";
|
|
31
31
|
/**
|
|
32
32
|
* How long rescue waits, by default, for a running sync/reindex to release the
|
|
33
33
|
* per-root operation lock. The HQ desktop app's watch-mode sync can keep
|
|
@@ -62,31 +62,59 @@ function describeWait(sec) {
|
|
|
62
62
|
}
|
|
63
63
|
return `${sec} second${sec === 1 ? "" : "s"}`;
|
|
64
64
|
}
|
|
65
|
+
/** A sync holder: `hq sync`, or hq-sync-core's daemon (joins as "hq-sync-canary"). */
|
|
66
|
+
function isSyncHolder(holder) {
|
|
67
|
+
return (holder.command === "sync" ||
|
|
68
|
+
holder.command === "hq-sync-canary" ||
|
|
69
|
+
holder.processName === "hq-syncd");
|
|
70
|
+
}
|
|
65
71
|
/** What to do about the holder, in plain words. */
|
|
66
|
-
function lockHolderAdvice(
|
|
67
|
-
if (
|
|
72
|
+
function lockHolderAdvice(holders) {
|
|
73
|
+
if (holders.some(isSyncHolder)) {
|
|
68
74
|
return ("To let the update start, pause sync in the HQ desktop app (or quit the app), " +
|
|
69
75
|
"or wait for this sync to finish.");
|
|
70
76
|
}
|
|
71
|
-
|
|
77
|
+
const first = holders[0];
|
|
78
|
+
return `Wait for "${first?.processName || first?.command || "the holder"}" to finish, or stop that process.`;
|
|
79
|
+
}
|
|
80
|
+
function isSharedLock(_holder, holders) {
|
|
81
|
+
return holders.length > 1;
|
|
72
82
|
}
|
|
73
83
|
/** First line rescue prints when it starts waiting on a live lock holder. */
|
|
74
84
|
export function rescueLockWaitMessage(holder, waitSec) {
|
|
85
|
+
const holders = liveHoldersOf(holder);
|
|
75
86
|
const bound = waitSec === null
|
|
76
87
|
? "Waiting with no time limit."
|
|
77
88
|
: `Waiting up to ${describeWait(waitSec)}.`;
|
|
78
|
-
|
|
79
|
-
` ${
|
|
89
|
+
if (isSharedLock(holder, holders)) {
|
|
90
|
+
const listed = holders.map((h) => ` ${formatLockHolder(h)}`).join("\n");
|
|
91
|
+
return (`Waiting for a shared lock to be released before updating HQ core. ${bound}\n` +
|
|
92
|
+
` Live holders:\n${listed}\n` +
|
|
93
|
+
` ${lockHolderAdvice(holders)}\n` +
|
|
94
|
+
" To change how long the update waits, set HQ_OP_LOCK_TIMEOUT=<seconds> (-1 waits with no limit).\n");
|
|
95
|
+
}
|
|
96
|
+
const first = holders[0];
|
|
97
|
+
return (`Waiting for "${lockCommandLabel(first.command)}" (pid ${first.pid}) to finish before updating HQ core. ${bound}\n` +
|
|
98
|
+
` ${lockHolderAdvice(holders)}\n` +
|
|
80
99
|
" To change how long the update waits, set HQ_OP_LOCK_TIMEOUT=<seconds> (-1 waits with no limit).\n");
|
|
81
100
|
}
|
|
82
101
|
/** What rescue prints when it gives up waiting for the lock. */
|
|
83
102
|
export function rescueLockTimeoutMessage(holder, waitSec) {
|
|
103
|
+
const holders = liveHoldersOf(holder);
|
|
84
104
|
const waited = waitSec === null || waitSec === 0
|
|
85
105
|
? "is still running"
|
|
86
106
|
: `was still running after ${describeWait(waitSec)}`;
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
`
|
|
107
|
+
if (isSharedLock(holder, holders)) {
|
|
108
|
+
const listed = holders.map((h) => ` ${formatLockHolder(h)}`).join("\n");
|
|
109
|
+
return (`error: HQ core update did not start: a shared lock ${waited}. Live holders:\n` +
|
|
110
|
+
`${listed}\n` +
|
|
111
|
+
` ${lockHolderAdvice(holders)} Then run the update again.\n` +
|
|
112
|
+
" To wait longer, set HQ_OP_LOCK_TIMEOUT=<seconds> (-1 waits with no limit).\n");
|
|
113
|
+
}
|
|
114
|
+
const first = holders[0];
|
|
115
|
+
return (`error: HQ core update did not start: "${lockCommandLabel(first.command)}" (pid ${first.pid}, ` +
|
|
116
|
+
`started ${first.startedAt}) ${waited}.\n` +
|
|
117
|
+
` ${lockHolderAdvice(holders)} Then run the update again.\n` +
|
|
90
118
|
" To wait longer, set HQ_OP_LOCK_TIMEOUT=<seconds> (-1 waits with no limit).\n");
|
|
91
119
|
}
|
|
92
120
|
const SETUP_PATH_SETTINGS_LOCAL_FLAG = "core.setup-path-settings-local";
|
|
@@ -227,6 +255,23 @@ export function buildRescueArgs(opts = {}) {
|
|
|
227
255
|
args.push(extra);
|
|
228
256
|
return args;
|
|
229
257
|
}
|
|
258
|
+
/**
|
|
259
|
+
* The HQ root a rescue with argv `args` (from [`buildRescueArgs`]) applies to:
|
|
260
|
+
* the last `--hq-root` value, as the rescue script's parser takes it, else the
|
|
261
|
+
* cwd (the script's own default). The machine entrypoint (`hq-rescue`, spawned
|
|
262
|
+
* by the HQ desktop app from an arbitrary cwd such as `/`) passes `--hq-root`
|
|
263
|
+
* only inside `extraArgs`, so `opts.hqRoot` alone is not the root.
|
|
264
|
+
*/
|
|
265
|
+
export function rescueHqRoot(args, cwd = process.cwd()) {
|
|
266
|
+
let root;
|
|
267
|
+
for (let i = 0; i < args.length; i++) {
|
|
268
|
+
if (args[i] === "--hq-root" && i + 1 < args.length) {
|
|
269
|
+
root = args[i + 1];
|
|
270
|
+
i++;
|
|
271
|
+
}
|
|
272
|
+
}
|
|
273
|
+
return root ?? cwd;
|
|
274
|
+
}
|
|
230
275
|
/**
|
|
231
276
|
* Run the rescue against an HQ root. The long-running clone + scan + overlay
|
|
232
277
|
* writes progress directly. Keep this API synchronous for hq-cli callers.
|
|
@@ -234,14 +279,17 @@ export function buildRescueArgs(opts = {}) {
|
|
|
234
279
|
* confirmation prompt (unless `assumeYes` is set).
|
|
235
280
|
*/
|
|
236
281
|
export function rescue(opts = {}) {
|
|
237
|
-
// Rescue is mutually exclusive with sync/reindex on this HQ root. Key the
|
|
238
|
-
// lock on the same root the rescue script resolves (cwd when --hq-root is
|
|
239
|
-
// omitted). Rescue is never the exempt push watcher, so it always locks.
|
|
240
|
-
const lockRoot = opts.hqRoot ?? process.cwd();
|
|
241
282
|
// Consume --lock-timeout from extraArgs (machine entrypoint) before it can
|
|
242
283
|
// reach the rescue script, which doesn't understand it.
|
|
243
284
|
const { lockTimeoutSec, cleanedExtraArgs } = extractLockTimeout(opts);
|
|
244
285
|
const rescueOpts = { ...opts, extraArgs: cleanedExtraArgs };
|
|
286
|
+
const args = buildRescueArgs(rescueOpts);
|
|
287
|
+
// Rescue is mutually exclusive with sync/reindex on this HQ root. Key the
|
|
288
|
+
// lock, and the post-apply reindex, on the same root the rescue script
|
|
289
|
+
// resolves: `--hq-root` from opts or extraArgs, else cwd. Rescue is never the
|
|
290
|
+
// exempt push watcher, so it always locks.
|
|
291
|
+
const hqRoot = rescueHqRoot(args);
|
|
292
|
+
const lockRoot = hqRoot;
|
|
245
293
|
const recoveryOnly = opts.recoverSnapshots ||
|
|
246
294
|
Boolean(opts.verifyRestoredSnapshot) ||
|
|
247
295
|
cleanedExtraArgs?.some((arg) => ["--recover-snapshots", "--restore-snapshot", "--verify-restored-snapshot"].includes(arg)) === true;
|
|
@@ -262,7 +310,6 @@ export function rescue(opts = {}) {
|
|
|
262
310
|
throw err;
|
|
263
311
|
}
|
|
264
312
|
try {
|
|
265
|
-
const args = buildRescueArgs(rescueOpts);
|
|
266
313
|
const env = { ...process.env };
|
|
267
314
|
if (opts.ghToken)
|
|
268
315
|
env.GH_TOKEN = opts.ghToken;
|
|
@@ -275,13 +322,13 @@ export function rescue(opts = {}) {
|
|
|
275
322
|
// A successful, non-dry-run rescue re-lays-down core/, so refresh the
|
|
276
323
|
// generated skill wrappers, personal-overlay mirrors, and workers registry.
|
|
277
324
|
// Best-effort + idempotent — never overrides the rescue's own exit status.
|
|
278
|
-
// repoRoot
|
|
279
|
-
//
|
|
325
|
+
// repoRoot is the root the rescue applied to (see rescueHqRoot), never the
|
|
326
|
+
// caller's cwd when `--hq-root` arrived in extraArgs. `skipLock`
|
|
280
327
|
// because we already hold the per-root lock — reindex's own acquire would
|
|
281
328
|
// otherwise see our live PID and refuse.
|
|
282
329
|
if (status === 0 && !opts.dryRun && !recoveryOnly) {
|
|
283
330
|
try {
|
|
284
|
-
reindex({ repoRoot:
|
|
331
|
+
reindex({ repoRoot: hqRoot, skipLock: true });
|
|
285
332
|
}
|
|
286
333
|
catch {
|
|
287
334
|
// best-effort
|
package/dist/cli/rescue.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rescue.js","sourceRoot":"","sources":["../../src/cli/rescue.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"rescue.js","sourceRoot":"","sources":["../../src/cli/rescue.ts"],"names":[],"mappings":"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"}
|