@indigoai-us/hq-cloud 6.18.9 → 6.18.10
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/rescue-runner.js +20 -1
- package/dist/bin/rescue-runner.js.map +1 -1
- package/dist/cli/index.d.ts +2 -0
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +1 -0
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/rescue-core.d.ts +2 -0
- package/dist/cli/rescue-core.d.ts.map +1 -1
- package/dist/cli/rescue-core.js +87 -4
- package/dist/cli/rescue-core.js.map +1 -1
- package/dist/cli/rescue-restore-flag.d.ts +14 -0
- package/dist/cli/rescue-restore-flag.d.ts.map +1 -0
- package/dist/cli/rescue-restore-flag.js +62 -0
- package/dist/cli/rescue-restore-flag.js.map +1 -0
- package/dist/cli/rescue-restore-flag.test.d.ts +2 -0
- package/dist/cli/rescue-restore-flag.test.d.ts.map +1 -0
- package/dist/cli/rescue-restore-flag.test.js +82 -0
- package/dist/cli/rescue-restore-flag.test.js.map +1 -0
- package/dist/cli/rescue-rsync-status.test.js +121 -2
- package/dist/cli/rescue-rsync-status.test.js.map +1 -1
- package/dist/cli/rescue.d.ts +4 -2
- package/dist/cli/rescue.d.ts.map +1 -1
- package/dist/cli/rescue.js +7 -4
- package/dist/cli/rescue.js.map +1 -1
- package/dist/cli/rescue.reindex.test.js +18 -2
- package/dist/cli/rescue.reindex.test.js.map +1 -1
- package/dist/cognito-auth-lock-no-hard-links.test.d.ts +11 -0
- package/dist/cognito-auth-lock-no-hard-links.test.d.ts.map +1 -0
- package/dist/cognito-auth-lock-no-hard-links.test.js +76 -0
- package/dist/cognito-auth-lock-no-hard-links.test.js.map +1 -0
- package/dist/cognito-auth.d.ts +35 -0
- package/dist/cognito-auth.d.ts.map +1 -1
- package/dist/cognito-auth.js +66 -1
- package/dist/cognito-auth.js.map +1 -1
- package/package.json +1 -1
|
@@ -20,7 +20,26 @@
|
|
|
20
20
|
* stdout/stderr from the script are inherited so the caller (the menubar's
|
|
21
21
|
* RescueRunResult tail capture) sees the scan log + trailing summary.
|
|
22
22
|
*/
|
|
23
|
+
import { getValidAccessToken } from "../cognito-auth.js";
|
|
23
24
|
import { rescue } from "../cli/rescue.js";
|
|
24
|
-
|
|
25
|
+
import { resolveRescueRestoreOnRsyncFailure, shouldResolveRescueRestoreOnRsyncFailure, } from "../cli/rescue-restore-flag.js";
|
|
26
|
+
const args = process.argv.slice(2);
|
|
27
|
+
const DEFAULT_COGNITO = {
|
|
28
|
+
region: process.env.AWS_REGION ?? "us-east-1",
|
|
29
|
+
userPoolDomain: process.env.HQ_COGNITO_DOMAIN ?? "vault-indigo-hq-prod",
|
|
30
|
+
clientId: process.env.HQ_COGNITO_CLIENT_ID ?? "7acei2c8v870enheptb1j5foln",
|
|
31
|
+
port: process.env.HQ_COGNITO_CALLBACK_PORT
|
|
32
|
+
? Number(process.env.HQ_COGNITO_CALLBACK_PORT)
|
|
33
|
+
: 8765,
|
|
34
|
+
};
|
|
35
|
+
const restoreOnRsyncFailure = shouldResolveRescueRestoreOnRsyncFailure(args) &&
|
|
36
|
+
(await resolveRescueRestoreOnRsyncFailure({
|
|
37
|
+
env: process.env,
|
|
38
|
+
getToken: () => getValidAccessToken(DEFAULT_COGNITO, { interactive: false }),
|
|
39
|
+
}));
|
|
40
|
+
const { status } = rescue({
|
|
41
|
+
extraArgs: args,
|
|
42
|
+
restoreOnRsyncFailure,
|
|
43
|
+
});
|
|
25
44
|
process.exit(status);
|
|
26
45
|
//# sourceMappingURL=rescue-runner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rescue-runner.js","sourceRoot":"","sources":["../../src/bin/rescue-runner.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"rescue-runner.js","sourceRoot":"","sources":["../../src/bin/rescue-runner.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,OAAO,EAAE,mBAAmB,EAA0B,MAAM,oBAAoB,CAAC;AACjF,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EACL,kCAAkC,EAClC,wCAAwC,GACzC,MAAM,+BAA+B,CAAC;AAEvC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACnC,MAAM,eAAe,GAAsB;IACzC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,WAAW;IAC7C,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,sBAAsB;IACvE,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,4BAA4B;IAC1E,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB;QACxC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC;QAC9C,CAAC,CAAC,IAAI;CACT,CAAC;AACF,MAAM,qBAAqB,GACzB,wCAAwC,CAAC,IAAI,CAAC;IAC9C,CAAC,MAAM,kCAAkC,CAAC;QACxC,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,QAAQ,EAAE,GAAG,EAAE,CAAC,mBAAmB,CAAC,eAAe,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;KAC7E,CAAC,CAAC,CAAC;AAEN,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IACxB,SAAS,EAAE,IAAI;IACf,qBAAqB;CACtB,CAAC,CAAC;AACH,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC"}
|
package/dist/cli/index.d.ts
CHANGED
|
@@ -22,6 +22,8 @@ export { reindex } from "./reindex.js";
|
|
|
22
22
|
export type { ReindexOptions, ReindexResult } from "./reindex.js";
|
|
23
23
|
export { rescue, buildRescueArgs } from "./rescue.js";
|
|
24
24
|
export type { RescueOptions, RescueResult } from "./rescue.js";
|
|
25
|
+
export { resolveRescueRestoreOnRsyncFailure } from "./rescue-restore-flag.js";
|
|
26
|
+
export type { RescueRestoreFlagInput } from "./rescue-restore-flag.js";
|
|
25
27
|
export { syncDoctor, SKILLS_KEY_PREFIX } from "./doctor.js";
|
|
26
28
|
export type { SyncDoctorOptions, SyncDoctorResult, SyncDoctorPlan, SkillKeyRewrite, DoctorManualReviewItem, LocalGcManualReviewItem, DoctorStore, } from "./doctor.js";
|
|
27
29
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/cli/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,KAAK,EACL,6BAA6B,EAC7B,8BAA8B,GAC/B,MAAM,YAAY,CAAC;AACpB,YAAY,EACV,YAAY,EACZ,WAAW,EACX,qBAAqB,EACrB,+BAA+B,GAChC,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE5E,OAAO,EACL,eAAe,EACf,QAAQ,EACR,UAAU,EACV,uBAAuB,EACvB,sBAAsB,GACvB,MAAM,eAAe,CAAC;AACvB,YAAY,EACV,gBAAgB,EAChB,YAAY,EACZ,kBAAkB,EAClB,gBAAgB,EAChB,sBAAsB,EACtB,eAAe,GAChB,MAAM,eAAe,CAAC;AAIvB,OAAO,EACL,4BAA4B,EAC5B,uBAAuB,GACxB,MAAM,8BAA8B,CAAC;AACtC,YAAY,EACV,qBAAqB,EACrB,oBAAoB,EACpB,qBAAqB,EACrB,mBAAmB,EACnB,yBAAyB,GAC1B,MAAM,8BAA8B,CAAC;AAGtC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAChE,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAEvG,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACjD,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE/D,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,YAAY,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAIlE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,YAAY,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAIlE,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACtD,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,KAAK,EACL,6BAA6B,EAC7B,8BAA8B,GAC/B,MAAM,YAAY,CAAC;AACpB,YAAY,EACV,YAAY,EACZ,WAAW,EACX,qBAAqB,EACrB,+BAA+B,GAChC,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE5E,OAAO,EACL,eAAe,EACf,QAAQ,EACR,UAAU,EACV,uBAAuB,EACvB,sBAAsB,GACvB,MAAM,eAAe,CAAC;AACvB,YAAY,EACV,gBAAgB,EAChB,YAAY,EACZ,kBAAkB,EAClB,gBAAgB,EAChB,sBAAsB,EACtB,eAAe,GAChB,MAAM,eAAe,CAAC;AAIvB,OAAO,EACL,4BAA4B,EAC5B,uBAAuB,GACxB,MAAM,8BAA8B,CAAC;AACtC,YAAY,EACV,qBAAqB,EACrB,oBAAoB,EACpB,qBAAqB,EACrB,mBAAmB,EACnB,yBAAyB,GAC1B,MAAM,8BAA8B,CAAC;AAGtC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAChE,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAEvG,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACjD,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE/D,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,YAAY,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAIlE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,YAAY,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAIlE,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACtD,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAE,kCAAkC,EAAE,MAAM,0BAA0B,CAAC;AAC9E,YAAY,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAKvE,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAC5D,YAAY,EACV,iBAAiB,EACjB,gBAAgB,EAChB,cAAc,EACd,eAAe,EACf,sBAAsB,EACtB,uBAAuB,EACvB,WAAW,GACZ,MAAM,aAAa,CAAC"}
|
package/dist/cli/index.js
CHANGED
|
@@ -20,6 +20,7 @@ export { reindex } from "./reindex.js";
|
|
|
20
20
|
// Drift-preserving HQ-core re-sync (formerly bundled only inside the HQ Sync
|
|
21
21
|
// menubar app). Now shared between the app and `hq rescue`.
|
|
22
22
|
export { rescue, buildRescueArgs } from "./rescue.js";
|
|
23
|
+
export { resolveRescueRestoreOnRsyncFailure } from "./rescue-restore-flag.js";
|
|
23
24
|
// Bounded skill-key dedupe + local `.claude/skills/` farm GC for the
|
|
24
25
|
// mixed-version amplifier (`hq sync doctor`, US-003
|
|
25
26
|
// hq-sync-windows-skill-symlink-collision). Dry-run by default; --yes applies.
|
package/dist/cli/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,KAAK,EACL,6BAA6B,EAC7B,8BAA8B,GAC/B,MAAM,YAAY,CAAC;AAQpB,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,OAAO,EACL,eAAe,EACf,QAAQ,EACR,UAAU,EACV,uBAAuB,EACvB,sBAAsB,GACvB,MAAM,eAAe,CAAC;AAUvB,+DAA+D;AAC/D,8DAA8D;AAC9D,OAAO,EACL,4BAA4B,EAC5B,uBAAuB,GACxB,MAAM,8BAA8B,CAAC;AAStC,8BAA8B;AAC9B,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGjD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAGvC,0EAA0E;AAC1E,8CAA8C;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAGvC,6EAA6E;AAC7E,4DAA4D;AAC5D,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,KAAK,EACL,6BAA6B,EAC7B,8BAA8B,GAC/B,MAAM,YAAY,CAAC;AAQpB,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,OAAO,EACL,eAAe,EACf,QAAQ,EACR,UAAU,EACV,uBAAuB,EACvB,sBAAsB,GACvB,MAAM,eAAe,CAAC;AAUvB,+DAA+D;AAC/D,8DAA8D;AAC9D,OAAO,EACL,4BAA4B,EAC5B,uBAAuB,GACxB,MAAM,8BAA8B,CAAC;AAStC,8BAA8B;AAC9B,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGjD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAGvC,0EAA0E;AAC1E,8CAA8C;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAGvC,6EAA6E;AAC7E,4DAA4D;AAC5D,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEtD,OAAO,EAAE,kCAAkC,EAAE,MAAM,0BAA0B,CAAC;AAG9E,qEAAqE;AACrE,oDAAoD;AACpD,+EAA+E;AAC/E,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC"}
|
|
@@ -69,6 +69,8 @@ export declare function parseRescueArgs(argv: string[]): Config;
|
|
|
69
69
|
*/
|
|
70
70
|
export declare function runRescue(argv: string[], opts?: {
|
|
71
71
|
env?: NodeJS.ProcessEnv;
|
|
72
|
+
/** True only after the hq-flags resolver returned an explicit snapshot value. */
|
|
73
|
+
restoreOnRsyncFailure?: boolean;
|
|
72
74
|
/** Test-only override for the ls-remote probe. Not read from the environment. */
|
|
73
75
|
gitReachabilityProbeTimeoutMs?: number;
|
|
74
76
|
}): RunRescueResult;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rescue-core.d.ts","sourceRoot":"","sources":["../../src/cli/rescue-core.ts"],"names":[],"mappings":"AAgCA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAM7B,OAAO,EAOL,KAAK,gBAAgB,EAEtB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;CAChB;AA0CD,UAAU,MAAM;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,eAAe,EAAE,MAAM,CAAC;CACzB;AAkDD,oFAAoF;AACpF,wBAAgB,QAAQ,CACtB,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,IAAI,EAAE,MAAM,GACX,MAAM,GAAG,SAAS,CASpB;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAS3D;AAmND,UAAU,kBAAkB;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,UAAU,aAAa;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AA8BD;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,EAAE,EACjB,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB,kBAAkB,GAAG,SAAS,CAyChC;AAmCD,sFAAsF;AACtF,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,GACvB,aAAa,CA+Cf;AAmED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,CAwMtD;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CACvB,IAAI,EAAE,MAAM,EAAE,EACd,IAAI,GAAE;IACJ,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,iFAAiF;IACjF,6BAA6B,CAAC,EAAE,MAAM,CAAC;CACnC,GACL,eAAe,
|
|
1
|
+
{"version":3,"file":"rescue-core.d.ts","sourceRoot":"","sources":["../../src/cli/rescue-core.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/rescue-core.js
CHANGED
|
@@ -729,7 +729,7 @@ export function runRescue(argv, opts = {}) {
|
|
|
729
729
|
return recoverSnapshots(cfg, out, err);
|
|
730
730
|
return doRescue(cfg, env, out, err, (d) => {
|
|
731
731
|
tmpdir = d;
|
|
732
|
-
}, opts.gitReachabilityProbeTimeoutMs ?? GIT_REACHABILITY_PROBE_TIMEOUT_MS);
|
|
732
|
+
}, opts.gitReachabilityProbeTimeoutMs ?? GIT_REACHABILITY_PROBE_TIMEOUT_MS, opts.restoreOnRsyncFailure === true);
|
|
733
733
|
}
|
|
734
734
|
catch (e) {
|
|
735
735
|
if (e instanceof ExitError)
|
|
@@ -1516,7 +1516,7 @@ function recoveryProof(unresolved, cfg, hqRoot, srcDir, srcSha, rsyncLauncher, r
|
|
|
1516
1516
|
}
|
|
1517
1517
|
return { eligible: !hasSkippedSnapshotEntries(newest.entry.manifest), failures };
|
|
1518
1518
|
}
|
|
1519
|
-
function doRescue(cfg, env, out, err, setTmp, gitReachabilityProbeTimeoutMs = GIT_REACHABILITY_PROBE_TIMEOUT_MS) {
|
|
1519
|
+
function doRescue(cfg, env, out, err, setTmp, gitReachabilityProbeTimeoutMs = GIT_REACHABILITY_PROBE_TIMEOUT_MS, restoreOnRsyncFailure = false) {
|
|
1520
1520
|
const hqRoot = resolveHqRoot(cfg, err);
|
|
1521
1521
|
const RUN_TS = utcStamp(new Date(), "dash");
|
|
1522
1522
|
// Both the release overlay and a restorable snapshot require rsync. A shim
|
|
@@ -1976,6 +1976,7 @@ function doRescue(cfg, env, out, err, setTmp, gitReachabilityProbeTimeoutMs = GI
|
|
|
1976
1976
|
// backup space.
|
|
1977
1977
|
let backupDir = "";
|
|
1978
1978
|
let mutationStarted = false;
|
|
1979
|
+
let overlayRestored = false;
|
|
1979
1980
|
let snapshotSkippedEntries = [];
|
|
1980
1981
|
try {
|
|
1981
1982
|
const hasDestructivePaths = ctx.actions.some((action) => action.affectedRels.length > 0);
|
|
@@ -2153,6 +2154,37 @@ function doRescue(cfg, env, out, err, setTmp, gitReachabilityProbeTimeoutMs = GI
|
|
|
2153
2154
|
if (overlay.status !== 0) {
|
|
2154
2155
|
// bash runs under set -e: a failed rsync aborts with its status.
|
|
2155
2156
|
reportRsyncFailure(overlay.status, "overlay", overlay.stderr, err);
|
|
2157
|
+
if (restoreOnRsyncFailure) {
|
|
2158
|
+
const manifest = backupDir ? readSnapshotManifest(backupDir, hqRoot) : null;
|
|
2159
|
+
if (!manifest || hasSkippedSnapshotEntries(manifest)) {
|
|
2160
|
+
err("warning: automatic core restore was skipped because no complete safety snapshot is available.\n");
|
|
2161
|
+
if (backupDir) {
|
|
2162
|
+
err(` Safety snapshot: ${backupDir}\n`);
|
|
2163
|
+
err(` Inspect recovery: ${formatRecoveryCommand(hqRoot, cfg.backupRoot)}\n`);
|
|
2164
|
+
}
|
|
2165
|
+
}
|
|
2166
|
+
else {
|
|
2167
|
+
try {
|
|
2168
|
+
restoreSnapshotPaths(backupDir, hqRoot, manifest.includedRoots, manifest);
|
|
2169
|
+
const mismatch = snapshotTreeMismatch(backupDir, hqRoot, manifest.includedRoots, manifest.symlinks);
|
|
2170
|
+
if (mismatch)
|
|
2171
|
+
throw new Error(mismatch);
|
|
2172
|
+
if (overlayWritesCoveredBySnapshot(srcDir, cfg, rsyncExcludes, manifest.includedRoots)) {
|
|
2173
|
+
overlayRestored = true;
|
|
2174
|
+
out(`==> Restored captured paths from the safety snapshot after rsync failure: ${path.basename(backupDir)}\n`);
|
|
2175
|
+
}
|
|
2176
|
+
else {
|
|
2177
|
+
err("warning: captured paths were restored, but the source overlay can write outside the safety snapshot; recovery remains required.\n");
|
|
2178
|
+
}
|
|
2179
|
+
}
|
|
2180
|
+
catch (restoreError) {
|
|
2181
|
+
const detail = restoreError instanceof Error ? restoreError.message : String(restoreError);
|
|
2182
|
+
err(`warning: automatic core restore failed: ${detail}\n`);
|
|
2183
|
+
err(` Restore manually with: ${formatSnapshotRestoreCommand(hqRoot, cfg.backupRoot, path.basename(backupDir))}\n`);
|
|
2184
|
+
err(` Then verify with: ${formatRecoveryCommand(hqRoot, cfg.backupRoot, path.basename(backupDir))}\n`);
|
|
2185
|
+
}
|
|
2186
|
+
}
|
|
2187
|
+
}
|
|
2156
2188
|
throw new ExitError(overlay.status || 1);
|
|
2157
2189
|
}
|
|
2158
2190
|
// --- Restore preserved sub-paths ---
|
|
@@ -2417,12 +2449,63 @@ function doRescue(cfg, env, out, err, setTmp, gitReachabilityProbeTimeoutMs = GI
|
|
|
2417
2449
|
}
|
|
2418
2450
|
catch (error) {
|
|
2419
2451
|
if (backupDir && isDir(backupDir)) {
|
|
2420
|
-
|
|
2421
|
-
|
|
2452
|
+
try {
|
|
2453
|
+
updateSnapshotStatus(backupDir, mutationStarted && !overlayRestored
|
|
2454
|
+
? "recovery-required"
|
|
2455
|
+
: "failed-pre-mutation");
|
|
2456
|
+
pruneManagedBackups(cfg, hqRoot, out, true);
|
|
2457
|
+
}
|
|
2458
|
+
catch (snapshotError) {
|
|
2459
|
+
const errorName = snapshotError instanceof Error ? snapshotError.name : "UnknownError";
|
|
2460
|
+
err(`warning: could not finish safety snapshot bookkeeping after rescue failure (${errorName})\n`);
|
|
2461
|
+
}
|
|
2422
2462
|
}
|
|
2423
2463
|
throw error;
|
|
2424
2464
|
}
|
|
2425
2465
|
}
|
|
2466
|
+
/**
|
|
2467
|
+
* A successful restore only makes the failed overlay pre-mutation when its
|
|
2468
|
+
* entire possible write scope was captured. Full overlays can introduce new
|
|
2469
|
+
* source-only top-level roots; companies is narrower because rsync admits only
|
|
2470
|
+
* the release template subtree there. Fail closed when the scope is unclear.
|
|
2471
|
+
*/
|
|
2472
|
+
function overlayWritesCoveredBySnapshot(srcDir, cfg, rsyncExcludes, includedRoots) {
|
|
2473
|
+
const roots = includedRoots.filter((root) => root.length > 0 &&
|
|
2474
|
+
!root.startsWith("/") &&
|
|
2475
|
+
!root.split("/").some((segment) => segment === "" || segment === "." || segment === ".."));
|
|
2476
|
+
const covers = (target) => roots.some((root) => target === root || target.startsWith(`${root}/`));
|
|
2477
|
+
if (cfg.narrowPaths.length > 0) {
|
|
2478
|
+
return cfg.narrowPaths.every(covers);
|
|
2479
|
+
}
|
|
2480
|
+
let sourceEntries;
|
|
2481
|
+
try {
|
|
2482
|
+
sourceEntries = fs.readdirSync(srcDir);
|
|
2483
|
+
}
|
|
2484
|
+
catch {
|
|
2485
|
+
return false;
|
|
2486
|
+
}
|
|
2487
|
+
const exactExcludedNames = new Set(rsyncExcludes
|
|
2488
|
+
.filter((filter) => filter.startsWith("--exclude="))
|
|
2489
|
+
.map((filter) => filter.slice("--exclude=".length).replace(/^\//, ""))
|
|
2490
|
+
.filter((pattern) => pattern.length > 0 &&
|
|
2491
|
+
!pattern.includes("/") &&
|
|
2492
|
+
!["?", "*", "[", "]", "{", "}"].some((wildcard) => pattern.includes(wildcard))));
|
|
2493
|
+
for (const name of sourceEntries) {
|
|
2494
|
+
if (name === "companies") {
|
|
2495
|
+
// The full overlay admits only this one subtree below companies.
|
|
2496
|
+
if (lexists(path.join(srcDir, "companies", "_template")) &&
|
|
2497
|
+
!covers("companies/_template")) {
|
|
2498
|
+
return false;
|
|
2499
|
+
}
|
|
2500
|
+
continue;
|
|
2501
|
+
}
|
|
2502
|
+
if (exactExcludedNames.has(name))
|
|
2503
|
+
continue;
|
|
2504
|
+
if (!covers(name))
|
|
2505
|
+
return false;
|
|
2506
|
+
}
|
|
2507
|
+
return true;
|
|
2508
|
+
}
|
|
2426
2509
|
function recordDecision(ctx, decision) {
|
|
2427
2510
|
ctx.decisions.push(decision);
|
|
2428
2511
|
if (ctx.cfg.dryRun)
|