@senpi-ai/runtime 3.0.201 → 3.0.212
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/actions/open-position/open-position.action.d.ts.map +1 -1
- package/dist/actions/open-position/open-position.action.js +2 -1
- package/dist/actions/open-position/open-position.action.js.map +1 -1
- package/dist/cli/guide-commands.d.ts.map +1 -1
- package/dist/cli/guide-commands.js +8 -3
- package/dist/cli/guide-commands.js.map +1 -1
- package/dist/cli/senpi-commands.d.ts.map +1 -1
- package/dist/cli/senpi-commands.js +59 -14
- package/dist/cli/senpi-commands.js.map +1 -1
- package/dist/cli/update-command.d.ts +13 -0
- package/dist/cli/update-command.d.ts.map +1 -1
- package/dist/cli/update-command.js +44 -3
- package/dist/cli/update-command.js.map +1 -1
- package/dist/deploy/deadlines.d.ts +11 -3
- package/dist/deploy/deadlines.d.ts.map +1 -1
- package/dist/deploy/deadlines.js +18 -4
- package/dist/deploy/deadlines.js.map +1 -1
- package/dist/deploy/messages.d.ts +45 -1
- package/dist/deploy/messages.d.ts.map +1 -1
- package/dist/deploy/messages.js +86 -13
- package/dist/deploy/messages.js.map +1 -1
- package/dist/deploy/orchestrator.d.ts +7 -4
- package/dist/deploy/orchestrator.d.ts.map +1 -1
- package/dist/deploy/orchestrator.js +121 -54
- package/dist/deploy/orchestrator.js.map +1 -1
- package/dist/deploy/package.d.ts +18 -5
- package/dist/deploy/package.d.ts.map +1 -1
- package/dist/deploy/package.js +36 -22
- package/dist/deploy/package.js.map +1 -1
- package/dist/deploy/proof-gate.d.ts.map +1 -1
- package/dist/deploy/proof-gate.js +12 -3
- package/dist/deploy/proof-gate.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +14 -3
- package/dist/index.js.map +1 -1
- package/dist/runtime/effective-config.d.ts.map +1 -1
- package/dist/runtime/effective-config.js +12 -2
- package/dist/runtime/effective-config.js.map +1 -1
- package/dist/runtime/load-runtime-config.d.ts +20 -0
- package/dist/runtime/load-runtime-config.d.ts.map +1 -1
- package/dist/runtime/load-runtime-config.js +36 -8
- package/dist/runtime/load-runtime-config.js.map +1 -1
- package/dist/runtime/map-strategies.d.ts.map +1 -1
- package/dist/runtime/map-strategies.js +7 -4
- package/dist/runtime/map-strategies.js.map +1 -1
- package/dist/runtime/recipe-file.d.ts.map +1 -1
- package/dist/runtime/recipe-file.js +2 -1
- package/dist/runtime/recipe-file.js.map +1 -1
- package/dist/runtime/update-apply-deps.d.ts +24 -6
- package/dist/runtime/update-apply-deps.d.ts.map +1 -1
- package/dist/runtime/update-apply-deps.js +88 -21
- package/dist/runtime/update-apply-deps.js.map +1 -1
- package/dist/runtime/update-handler.d.ts +9 -6
- package/dist/runtime/update-handler.d.ts.map +1 -1
- package/dist/runtime/update-handler.js +38 -8
- package/dist/runtime/update-handler.js.map +1 -1
- package/dist/runtime/update-register.d.ts +99 -0
- package/dist/runtime/update-register.d.ts.map +1 -1
- package/dist/runtime/update-register.js +240 -51
- package/dist/runtime/update-register.js.map +1 -1
- package/dist/senpi/client.d.ts +8 -4
- package/dist/senpi/client.d.ts.map +1 -1
- package/dist/senpi/client.js +36 -15
- package/dist/senpi/client.js.map +1 -1
- package/dist/senpi/index.d.ts +1 -1
- package/dist/senpi/index.d.ts.map +1 -1
- package/dist/senpi/strategy-status.d.ts +8 -0
- package/dist/senpi/strategy-status.d.ts.map +1 -1
- package/dist/senpi/strategy-status.js +12 -0
- package/dist/senpi/strategy-status.js.map +1 -1
- package/dist/senpi/types.d.ts +10 -0
- package/dist/senpi/types.d.ts.map +1 -1
- package/dist/validate/proof.d.ts.map +1 -1
- package/dist/validate/proof.js +20 -5
- package/dist/validate/proof.js.map +1 -1
- package/dist/validate/wallet-binding-stage.js +17 -0
- package/dist/validate/wallet-binding-stage.js.map +1 -1
- package/openclaw.plugin.json +1 -1
- package/package.json +1 -1
|
@@ -8,6 +8,26 @@ import { type RuntimeConfig } from "./runtime-schema.js";
|
|
|
8
8
|
export interface LoadRuntimeConfigOptions {
|
|
9
9
|
fromPath?: boolean;
|
|
10
10
|
}
|
|
11
|
+
/**
|
|
12
|
+
* The recipe file could not be read (missing, a directory, no permission). Kept apart from a YAML
|
|
13
|
+
* error so a caller is not sent to edit a recipe that is fine.
|
|
14
|
+
*/
|
|
15
|
+
export declare class RecipeReadError extends Error {
|
|
16
|
+
readonly path: string;
|
|
17
|
+
/** The underlying read error's message, e.g. "EACCES: permission denied, open '<path>'". */
|
|
18
|
+
readonly detail: string;
|
|
19
|
+
constructor(path: string, cause: unknown);
|
|
20
|
+
}
|
|
21
|
+
/**
|
|
22
|
+
* The fix for a RecipeReadError on a recipe the caller is handing over, whichever read error it
|
|
23
|
+
* was: `senpi.installRuntime`'s `runtimeYamlPath` (src/index.ts) and `senpi.update`'s incoming
|
|
24
|
+
* `runtimeYamlPath` (update-handler.ts). Both callers can fix or retry the path they sent.
|
|
25
|
+
*
|
|
26
|
+
* Not for the recipe a runtime was installed FROM: `senpi.update`'s stored-recipe branch has its own
|
|
27
|
+
* text, because there "check the file exists" invites writing the edited recipe in its place, which
|
|
28
|
+
* makes the plan diff the edit against itself.
|
|
29
|
+
*/
|
|
30
|
+
export declare const RECIPE_READ_FIX = "Check that the file exists at that path and the gateway can read it, then retry.";
|
|
11
31
|
/**
|
|
12
32
|
* Minimal valid YAML structure shown in validation errors so users can fix their file.
|
|
13
33
|
* Keep this in sync with runtimeConfigSchema (name + strategy with wallet).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-runtime-config.d.ts","sourceRoot":"","sources":["../../src/runtime/load-runtime-config.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAgB,KAAK,QAAQ,EAAE,MAAM,KAAK,CAAC;AAElD,OAAO,EAAuB,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAK9E,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;;GAGG;AACH,eAAO,MAAM,0BAA0B,sVAQtC,CAAC;AAgDF;;;;;;GAMG;AACH,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAC1B,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,GACjD,cAAc,CAoBhB;AA0BD;;;;;;;;GAQG;AACH;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,SAAS;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAgB5F;AAsCD;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,aAAa,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE,wBAAwB,GACjC,OAAO,CAAC,aAAa,CAAC,CAExB;AAED;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC5C,aAAa,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE,wBAAwB,GACjC,OAAO,CAAC;IAAE,MAAM,EAAE,aAAa,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"load-runtime-config.d.ts","sourceRoot":"","sources":["../../src/runtime/load-runtime-config.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAgB,KAAK,QAAQ,EAAE,MAAM,KAAK,CAAC;AAElD,OAAO,EAAuB,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAK9E,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;;GAGG;AACH,qBAAa,eAAgB,SAAQ,KAAK;IACxC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,4FAA4F;IAC5F,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;gBAEZ,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;CAOzC;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,eAAe,qFAAqF,CAAC;AAElH;;;GAGG;AACH,eAAO,MAAM,0BAA0B,sVAQtC,CAAC;AAgDF;;;;;;GAMG;AACH,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAC1B,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,GACjD,cAAc,CAoBhB;AA0BD;;;;;;;;GAQG;AACH;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,SAAS;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAgB5F;AAsCD;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,aAAa,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE,wBAAwB,GACjC,OAAO,CAAC,aAAa,CAAC,CAExB;AAED;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC5C,aAAa,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE,wBAAwB,GACjC,OAAO,CAAC;IAAE,MAAM,EAAE,aAAa,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAAC,CA0EzE"}
|
|
@@ -11,6 +11,32 @@ import { runtimeConfigSchema } from "./runtime-schema.js";
|
|
|
11
11
|
import { resolveEnvInObject } from "./env-resolve.js";
|
|
12
12
|
import { mapRuntimeExitToDslConfig } from "./map-exit-config.js";
|
|
13
13
|
import { assertActionPromptPlaceholdersResolvable } from "./validate-action-prompts.js";
|
|
14
|
+
/**
|
|
15
|
+
* The recipe file could not be read (missing, a directory, no permission). Kept apart from a YAML
|
|
16
|
+
* error so a caller is not sent to edit a recipe that is fine.
|
|
17
|
+
*/
|
|
18
|
+
export class RecipeReadError extends Error {
|
|
19
|
+
path;
|
|
20
|
+
/** The underlying read error's message, e.g. "EACCES: permission denied, open '<path>'". */
|
|
21
|
+
detail;
|
|
22
|
+
constructor(path, cause) {
|
|
23
|
+
const detail = cause instanceof Error ? cause.message : String(cause);
|
|
24
|
+
super(`could not read ${path}: ${detail}`, { cause });
|
|
25
|
+
this.name = "RecipeReadError";
|
|
26
|
+
this.path = path;
|
|
27
|
+
this.detail = detail;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
* The fix for a RecipeReadError on a recipe the caller is handing over, whichever read error it
|
|
32
|
+
* was: `senpi.installRuntime`'s `runtimeYamlPath` (src/index.ts) and `senpi.update`'s incoming
|
|
33
|
+
* `runtimeYamlPath` (update-handler.ts). Both callers can fix or retry the path they sent.
|
|
34
|
+
*
|
|
35
|
+
* Not for the recipe a runtime was installed FROM: `senpi.update`'s stored-recipe branch has its own
|
|
36
|
+
* text, because there "check the file exists" invites writing the edited recipe in its place, which
|
|
37
|
+
* makes the plan diff the edit against itself.
|
|
38
|
+
*/
|
|
39
|
+
export const RECIPE_READ_FIX = "Check that the file exists at that path and the gateway can read it, then retry.";
|
|
14
40
|
/**
|
|
15
41
|
* Minimal valid YAML structure shown in validation errors so users can fix their file.
|
|
16
42
|
* Keep this in sync with runtimeConfigSchema (name + strategy with wallet).
|
|
@@ -189,17 +215,19 @@ export async function loadRuntimeConfig(pathOrContent, options) {
|
|
|
189
215
|
* form — never the resolved one, which would inline secrets — so the boot path needs both.
|
|
190
216
|
*/
|
|
191
217
|
export async function loadRuntimeConfigWithRaw(pathOrContent, options) {
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
const content = await readFile(pathOrContent, "utf-8");
|
|
197
|
-
raw = parse(content);
|
|
218
|
+
let text = pathOrContent;
|
|
219
|
+
if (options?.fromPath === true) {
|
|
220
|
+
try {
|
|
221
|
+
text = await readFile(pathOrContent, "utf-8");
|
|
198
222
|
}
|
|
199
|
-
|
|
200
|
-
|
|
223
|
+
catch (readErr) {
|
|
224
|
+
throw new RecipeReadError(pathOrContent, readErr);
|
|
201
225
|
}
|
|
202
226
|
}
|
|
227
|
+
let raw;
|
|
228
|
+
try {
|
|
229
|
+
raw = parse(text);
|
|
230
|
+
}
|
|
203
231
|
catch (parseErr) {
|
|
204
232
|
const detail = parseErr instanceof Error ? parseErr.message : String(parseErr);
|
|
205
233
|
throw new Error(`Invalid YAML syntax. Please check indentation, colons, and quotes.\nDetails: ${detail}\n\nExample of valid structure:\n${MINIMAL_RECIPE_YAML_SAMPLE}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-runtime-config.js","sourceRoot":"","sources":["../../src/runtime/load-runtime-config.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"load-runtime-config.js","sourceRoot":"","sources":["../../src/runtime/load-runtime-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"map-strategies.d.ts","sourceRoot":"","sources":["../../src/runtime/map-strategies.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAe,MAAM,sBAAsB,CAAC;AACxE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAgBzD;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,aAAa,GAAG,cAAc,
|
|
1
|
+
{"version":3,"file":"map-strategies.d.ts","sourceRoot":"","sources":["../../src/runtime/map-strategies.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAe,MAAM,sBAAsB,CAAC;AACxE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAgBzD;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,aAAa,GAAG,cAAc,CA8FjF;AAED,qDAAqD;AACrD,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,aAAa,GAAG,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAG9F"}
|
|
@@ -45,10 +45,13 @@ export function resolveStrategyConfig(recipeConfig) {
|
|
|
45
45
|
logger.warn("Both margin_pct and margin_per_slot are set. margin_pct will take priority; margin_per_slot will be ignored.");
|
|
46
46
|
}
|
|
47
47
|
if (strategyConfig.marginPct != null && strategyConfig.slots > 1) {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
48
|
+
// Not a reservation: each open takes margin_pct of what is left, so sizes shrink rather than
|
|
49
|
+
// run out. Only signals sized in one batch share a balance snapshot (see effective-config).
|
|
50
|
+
if (strategyConfig.marginPct * strategyConfig.slots > 100) {
|
|
51
|
+
logger.warn(`margin_pct (${strategyConfig.marginPct}%) × slots (${strategyConfig.slots}) exceeds 100% only within ` +
|
|
52
|
+
`one batch: each open takes ${strategyConfig.marginPct}% of the withdrawable left at that moment, so ` +
|
|
53
|
+
`later positions are smaller, and more than ${Math.floor(100 / strategyConfig.marginPct)} signals in ` +
|
|
54
|
+
`one batch skip the rest as insufficient_margin.`);
|
|
52
55
|
}
|
|
53
56
|
}
|
|
54
57
|
if (typeof entry.default_leverage === "number") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"map-strategies.js","sourceRoot":"","sources":["../../src/runtime/map-strategies.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,MAAM,MAAM,GAAG,YAAY,CAAC,+BAA+B,CAAC,CAAC;AAE7D,MAAM,mBAAmB,GAAkB,CAAC,cAAc,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;AAEtF,SAAS,YAAY,CAAC,CAAU;IAC9B,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QAAE,OAAO,CAAC,CAAC;IAC1D,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;QAC1B,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACpB,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;YAAE,OAAO,CAAC,CAAC;IACnC,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CAAC,YAA2B;IAC/D,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,CAAC;IACpC,MAAM,OAAO,GAAG,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC5E,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IACD,MAAM,OAAO,GAAG,OAAO,KAAK,CAAC,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;IACjF,MAAM,WAAW,GAAgB,mBAAmB,CAAC,QAAQ,CAAC,OAAsB,CAAC;QACnF,CAAC,CAAE,OAAuB;QAC1B,CAAC,CAAC,UAAU,CAAC;IACf,MAAM,cAAc,GAAmB;QACrC,OAAO;QACP,MAAM,EAAE,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC;QAClC,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC;QACrC,WAAW;KACZ,CAAC;IACF,IAAI,OAAO,KAAK,CAAC,eAAe,KAAK,QAAQ,IAAI,CAAC,OAAO,KAAK,CAAC,eAAe,KAAK,QAAQ,IAAI,KAAK,CAAC,eAAe,KAAK,EAAE,CAAC,EAAE,CAAC;QAC7H,cAAc,CAAC,aAAa,GAAG,YAAY,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IACrE,CAAC;IACD,IAAI,OAAO,KAAK,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;QACzC,cAAc,CAAC,SAAS,GAAG,KAAK,CAAC,UAAU,CAAC;IAC9C,CAAC;IACD,IAAI,cAAc,CAAC,SAAS,IAAI,IAAI,IAAI,cAAc,CAAC,aAAa,IAAI,IAAI,EAAE,CAAC;QAC7E,MAAM,CAAC,IAAI,CACT,8GAA8G,CAC/G,CAAC;IACJ,CAAC;IACD,IAAI,cAAc,CAAC,SAAS,IAAI,IAAI,IAAI,cAAc,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC;QACjE,
|
|
1
|
+
{"version":3,"file":"map-strategies.js","sourceRoot":"","sources":["../../src/runtime/map-strategies.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recipe-file.d.ts","sourceRoot":"","sources":["../../src/runtime/recipe-file.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAKH,OAAO,EAKL,KAAK,iBAAiB,EACvB,MAAM,uBAAuB,CAAC;AAE/B;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,0CAA2C,CAAC;AAEzE,yGAAyG;AACzG,MAAM,WAAW,YAAY;IAC3B,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/B,OAAO,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,QAAQ,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,yCAAyC;IACzC,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAChC,oDAAoD;IACpD,UAAU,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAC/B,+EAA+E;IAC/E,cAAc,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACpC;;;;OAIG;IACH,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,CAAC;CACnD;AAED,eAAO,MAAM,mBAAmB,EAAE,YA4BjC,CAAC;AAOF,MAAM,MAAM,cAAc,GAAG;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAgEzG;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,GAAG,cAAc,
|
|
1
|
+
{"version":3,"file":"recipe-file.d.ts","sourceRoot":"","sources":["../../src/runtime/recipe-file.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAKH,OAAO,EAKL,KAAK,iBAAiB,EACvB,MAAM,uBAAuB,CAAC;AAE/B;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,0CAA2C,CAAC;AAEzE,yGAAyG;AACzG,MAAM,WAAW,YAAY;IAC3B,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/B,OAAO,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,QAAQ,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,yCAAyC;IACzC,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAChC,oDAAoD;IACpD,UAAU,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAC/B,+EAA+E;IAC/E,cAAc,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACpC;;;;OAIG;IACH,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,CAAC;CACnD;AAED,eAAO,MAAM,mBAAmB,EAAE,YA4BjC,CAAC;AAOF,MAAM,MAAM,cAAc,GAAG;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAgEzG;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,GAAG,cAAc,CA0DlF"}
|
|
@@ -169,7 +169,8 @@ export function readRecipeAtPath(io, pathArg) {
|
|
|
169
169
|
ok: false,
|
|
170
170
|
message: `"${pathArg}" is a directory with no recipe in it, and none of its subdirectories holds one. ` +
|
|
171
171
|
`Expected one of: ${RECIPE_FILENAMES.join(", ")}.\n` +
|
|
172
|
-
"Point at the directory that holds the
|
|
172
|
+
"Point at the directory that holds runtime.yaml (the package root when runtime.yaml is there; " +
|
|
173
|
+
"otherwise the instance subdirectory that holds it), or at the recipe file itself.",
|
|
173
174
|
};
|
|
174
175
|
}
|
|
175
176
|
resolved = candidate;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recipe-file.js","sourceRoot":"","sources":["../../src/runtime/recipe-file.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC9D,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EACL,cAAc,EACd,iBAAiB,EACjB,aAAa,EACb,SAAS,GAEV,MAAM,uBAAuB,CAAC;AAE/B;;;;;GAKG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,cAAc,EAAE,aAAa,CAAU,CAAC;AAqBzE,MAAM,CAAC,MAAM,mBAAmB,GAAiB;IAC/C,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAClD,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IAC/B,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC;IACxC,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE;QACjB,IAAI,CAAC;YACH,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACnC,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IACD,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE;QAChB,IAAI,CAAC;YACH,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;QAC9B,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IACD,cAAc,EAAE,CAAC,CAAC,EAAE,EAAE;QACpB,IAAI,CAAC;YACH,OAAO,WAAW,CAAC,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;iBAC3C,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;iBAC9B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC;IACD,iBAAiB;CAClB,CAAC;AAEF,qFAAqF;AACrF,SAAS,QAAQ,CAAC,EAAgB,EAAE,GAAW;IAC7C,OAAO,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AAClF,CAAC;AAID,6FAA6F;AAC7F,SAAS,QAAQ,CAAC,OAAe,EAAE,QAAgB,EAAE,MAAc;IACjE,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC5C,OAAO,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC;AACxE,CAAC;AAED;;;GAGG;AACH,SAAS,mBAAmB,CAC1B,EAAgB,EAChB,OAAe,EACf,QAAgB;IAEhB,MAAM,QAAQ,GAAG,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAChD,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;QACtB,KAAK,UAAU,CAAC,CAAC,CAAC;YAChB,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC;YACnC,4FAA4F;YAC5F,+EAA+E;YAC/E,IAAI,SAAS,CAAC,GAAG,EAAE,QAAQ,CAAC;gBAAE,OAAO,EAAE,OAAO,EAAE,aAAa,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC;YAC/E,uFAAuF;YACvF,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,eAAe,EAAE,CAAC;QAC9C,CAAC;QACD,KAAK,cAAc,CAAC,CAAC,CAAC;YACpB,MAAM,EAAE,GAAG,EAAE,GAAG,QAAQ,CAAC;YACzB,MAAM,QAAQ,GAAG,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;YACxC,MAAM,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;YAClE,OAAO;gBACL,OAAO,EACL,IAAI,OAAO,0DAA0D,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG;oBAC5F,WAAW,GAAG,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,mDAAmD;oBACnG,CAAC,QAAQ,KAAK,SAAS;wBACrB,CAAC,CAAC,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,gEAAgE;wBAChG,CAAC,CAAC,EAAE,CAAC;oBACP,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC;wBACb,CAAC,CAAC,8FAA8F;4BAC9F,2EAA2E;4BAC3E,GAAG;iCACA,GAAG,CACF,CAAC,IAAI,EAAE,EAAE,CACP,2BAA2B,QAAQ,CAAC,OAAO,EAAE,QAAQ,EAAE,cAAc,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,SAAS,iBAAiB,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAC5I;iCACA,IAAI,CAAC,IAAI,CAAC;4BACb,6DAA6D;wBAC/D,CAAC,CAAC,EAAE,CAAC;oBACP,CAAC,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACvE,CAAC;QACJ,CAAC;QACD,KAAK,iBAAiB;YACpB,OAAO;gBACL,OAAO,EACL,IAAI,OAAO,6CAA6C,QAAQ,CAAC,KAAK,IAAI;oBAC1E,6FAA6F;oBAC7F,8GAA8G;aACjH,CAAC;QACJ,KAAK,YAAY;YACf,OAAO,SAAS,CAAC;IACrB,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,UAAU,gBAAgB,CAAC,EAAgB,EAAE,OAAe;IAChE,IAAI,QAAQ,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACvC,kGAAkG;IAClG,iGAAiG;IACjG,gBAAgB;IAChB,IAAI,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC7B,8FAA8F;QAC9F,oEAAoE;QACpE,MAAM,WAAW,GAAG,mBAAmB,CAAC,EAAE,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC/D,IAAI,WAAW,KAAK,SAAS,IAAI,SAAS,IAAI,WAAW,EAAE,CAAC;YAC1D,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC;QACrD,CAAC;QACD,MAAM,SAAS,GAAG,WAAW,EAAE,MAAM,IAAI,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QAChE,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B,gFAAgF;YAChF,2FAA2F;YAC3F,oCAAoC;YACpC,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACzC,MAAM,SAAS,GAAG,EAAE;iBACjB,cAAc,CAAC,QAAQ,CAAC;iBACxB,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,EAAE,EAAE,GAAG,QAAQ,IAAI,IAAI,EAAE,CAAC,KAAK,SAAS,CAAC;iBAC5F,IAAI,EAAE,CAAC;YACV,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACzB,OAAO;oBACL,EAAE,EAAE,KAAK;oBACT,OAAO,EACL,IAAI,OAAO,wCAAwC,SAAS,CAAC,MAAM,YAAY;wBAC/E,WAAW,SAAS,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,mDAAmD;wBAClG,uFAAuF;wBACvF,+DAA+D;wBAC/D,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;iBAC1D,CAAC;YACJ,CAAC;YACD,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,OAAO,EACL,IAAI,OAAO,mFAAmF;oBAC9F,oBAAoB,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK;oBACpD,
|
|
1
|
+
{"version":3,"file":"recipe-file.js","sourceRoot":"","sources":["../../src/runtime/recipe-file.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,24 +46,42 @@ export interface ProofOutcome {
|
|
|
46
46
|
};
|
|
47
47
|
finding?: Finding;
|
|
48
48
|
}
|
|
49
|
+
/**
|
|
50
|
+
* The recipe an update is about to apply, as the caller named it: its text (`runtimeYamlContent`,
|
|
51
|
+
* before the wallet placeholder is bound), or the file it named (`runtimeYamlPath`).
|
|
52
|
+
*/
|
|
53
|
+
export interface AppliedRecipe {
|
|
54
|
+
content?: string;
|
|
55
|
+
path?: string;
|
|
56
|
+
}
|
|
49
57
|
/**
|
|
50
58
|
* Decide whether a proof covers the recipe actually being applied.
|
|
51
59
|
*
|
|
52
60
|
* `verifyProof` answers a question about a directory: do these files still hash to what passed?
|
|
53
61
|
* An update asks a narrower one, because the recipe it applies does not have to be the file in that
|
|
54
|
-
* directory
|
|
55
|
-
*
|
|
56
|
-
*
|
|
57
|
-
*
|
|
62
|
+
* directory. `runtimeYamlContent` supplies bytes directly, and `runtimeYamlDir` only says where the
|
|
63
|
+
* proof is read and relative scanner paths resolve. A `runtimeYamlPath` names a file, but not
|
|
64
|
+
* necessarily the one the proof was taken over: a second recipe beside the proven one, outside every
|
|
65
|
+
* scanner root, leaves the package fingerprint matching. So the gate passes only when the applied
|
|
66
|
+
* file IS the proven recipe and the applied bytes are its bytes. Nothing to compare is a refusal.
|
|
58
67
|
*
|
|
59
|
-
* `
|
|
68
|
+
* `applied.content` is the caller's text BEFORE the wallet placeholder is bound. The proof describes
|
|
60
69
|
* bytes on disk and binding happens afterwards, so comparing the bound form would reject every
|
|
61
70
|
* package that legitimately writes `${WALLET}`.
|
|
62
71
|
*/
|
|
63
|
-
export declare function checkProofCoversRecipe(packageDir: string, result: ProofOutcome,
|
|
72
|
+
export declare function checkProofCoversRecipe(packageDir: string, result: ProofOutcome, applied: AppliedRecipe, readFile: (path: string) => string): {
|
|
64
73
|
ok: boolean;
|
|
65
74
|
finding?: Finding;
|
|
66
75
|
};
|
|
76
|
+
/**
|
|
77
|
+
* The `verifyProof` dependency `senpi.update` runs on: the package's proof, then whether it covers
|
|
78
|
+
* the recipe being applied. `index.ts` and the end-to-end test both build it here, so the test
|
|
79
|
+
* exercises the gate the gateway ships rather than a copy of it.
|
|
80
|
+
*/
|
|
81
|
+
export declare function makeUpdateProofCheck(verify: (packageDir: string) => ProofOutcome, readFile: (path: string) => string): (packageDir: string, applied: AppliedRecipe) => Promise<{
|
|
82
|
+
ok: boolean;
|
|
83
|
+
finding?: Finding;
|
|
84
|
+
}>;
|
|
67
85
|
/** The slice of a `run()` handle an apply needs. */
|
|
68
86
|
export interface ApplicableRuntime {
|
|
69
87
|
applyUpdatedConfig(next: RuntimeConfig): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-apply-deps.d.ts","sourceRoot":"","sources":["../../src/runtime/update-apply-deps.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;
|
|
1
|
+
{"version":3,"file":"update-apply-deps.d.ts","sourceRoot":"","sources":["../../src/runtime/update-apply-deps.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAIH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEtE,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAGrD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,iBAAiB,EAAE,IAAI,CAAC,UAAU,EAAE,aAAa,GAAG,QAAQ,CAGxE,CAAC;AASF,4FAA4F;AAC5F,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,OAAO,CAAC;IACZ,MAAM,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,aAAa,EACtB,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GACjC;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,CAyDpC;AAmDD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,YAAY,EAC5C,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GACjC,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,CAE7F;AAED,oDAAoD;AACpD,MAAM,WAAW,iBAAiB;IAChC,kBAAkB,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACxD;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS,CAAA;CAAE;AAC3D;;;;;;;;;;;;;;;;;;;GAmBG;AACH,gBAAgB,CAAC,EAAE,CACjB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,aAAa,EACnB,MAAM,EAAE,YAAY,KACjB,OAAO,CAAC,IAAI,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,GACxC,CACD,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,aAAa,EACnB,MAAM,EAAE,YAAY,KACjB,OAAO,CAAC;IAAE,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAoBzC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,MAAM,GACnB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAe5D"}
|
|
@@ -12,7 +12,8 @@
|
|
|
12
12
|
* Extracted rather than copied into a test: a test over a duplicate of this logic proves only that
|
|
13
13
|
* the duplicate works.
|
|
14
14
|
*/
|
|
15
|
-
import {
|
|
15
|
+
import { realpathSync } from "node:fs";
|
|
16
|
+
import { dirname, join, resolve } from "node:path";
|
|
16
17
|
import { readRegistry, writeRegistry, withRegistryLock } from "./strategy-registry.js";
|
|
17
18
|
import { KeyedMutex } from "../utils/keyed-mutex.js";
|
|
18
19
|
import { runtimeProcessState } from "./process-state.js";
|
|
@@ -52,31 +53,90 @@ function heldRuntimeChangeLock() {
|
|
|
52
53
|
*
|
|
53
54
|
* `verifyProof` answers a question about a directory: do these files still hash to what passed?
|
|
54
55
|
* An update asks a narrower one, because the recipe it applies does not have to be the file in that
|
|
55
|
-
* directory
|
|
56
|
-
*
|
|
57
|
-
*
|
|
58
|
-
*
|
|
56
|
+
* directory. `runtimeYamlContent` supplies bytes directly, and `runtimeYamlDir` only says where the
|
|
57
|
+
* proof is read and relative scanner paths resolve. A `runtimeYamlPath` names a file, but not
|
|
58
|
+
* necessarily the one the proof was taken over: a second recipe beside the proven one, outside every
|
|
59
|
+
* scanner root, leaves the package fingerprint matching. So the gate passes only when the applied
|
|
60
|
+
* file IS the proven recipe and the applied bytes are its bytes. Nothing to compare is a refusal.
|
|
59
61
|
*
|
|
60
|
-
* `
|
|
62
|
+
* `applied.content` is the caller's text BEFORE the wallet placeholder is bound. The proof describes
|
|
61
63
|
* bytes on disk and binding happens afterwards, so comparing the bound form would reject every
|
|
62
64
|
* package that legitimately writes `${WALLET}`.
|
|
63
65
|
*/
|
|
64
|
-
export function checkProofCoversRecipe(packageDir, result,
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
//
|
|
68
|
-
|
|
66
|
+
export function checkProofCoversRecipe(packageDir, result, applied, readFile) {
|
|
67
|
+
// Validating a file writes its proof to the file's own directory. When the caller sent a
|
|
68
|
+
// `runtimeYamlDir` elsewhere, the gate keeps reading that one, so any fix that says only
|
|
69
|
+
// "validate" refuses again forever: every refusal here must also say to move or drop it.
|
|
70
|
+
const fileDir = applied.path !== undefined ? dirname(resolve(applied.path)) : undefined;
|
|
71
|
+
const dirElsewhere = fileDir !== undefined && canonicalPath(fileDir) !== canonicalPath(packageDir);
|
|
72
|
+
const moveDirFix = `Validate this recipe (openclaw senpi validate ${applied.path}), then send \`runtimeYamlDir\` as ${fileDir} or leave it out, so the proof is read where validate writes it`;
|
|
73
|
+
if (!result.ok) {
|
|
74
|
+
if (!result.finding)
|
|
75
|
+
return { ok: false };
|
|
76
|
+
return { ok: false, finding: dirElsewhere ? { ...result.finding, fix: moveDirFix } : result.finding };
|
|
77
|
+
}
|
|
78
|
+
if (!result.record) {
|
|
79
|
+
return proofMismatch(`The proof for ${packageDir} names no recipe, so it cannot cover the one being applied`, dirElsewhere ? moveDirFix : `Run: openclaw senpi validate ${packageDir}`);
|
|
80
|
+
}
|
|
81
|
+
const proven = resolve(join(packageDir, result.record.recipe));
|
|
82
|
+
if (applied.path !== undefined && canonicalPath(applied.path) !== canonicalPath(proven)) {
|
|
83
|
+
return proofMismatch(`The proof for ${packageDir} covers ${result.record.recipe}, not ${applied.path}, the recipe being applied`, dirElsewhere
|
|
84
|
+
? `Apply the validated recipe (${proven}), or validate this one (openclaw senpi validate ${applied.path}), ` +
|
|
85
|
+
`then send \`runtimeYamlDir\` as ${fileDir} or leave it out, so the proof is read where validate writes it`
|
|
86
|
+
: `Apply the validated recipe (${proven}), or validate this one first: openclaw senpi validate ${applied.path}`);
|
|
87
|
+
}
|
|
88
|
+
// Unreadable is not the same as matching, and treating it as a pass would make an apply against
|
|
89
|
+
// a deleted recipe the easiest way through the gate. Both fall through to the refusal below.
|
|
90
|
+
const read = (path) => {
|
|
91
|
+
try {
|
|
92
|
+
return readFile(path);
|
|
93
|
+
}
|
|
94
|
+
catch {
|
|
95
|
+
return undefined;
|
|
96
|
+
}
|
|
97
|
+
};
|
|
98
|
+
// A path that reaches here already names the proven file (realpath compare above), so reading it
|
|
99
|
+
// again would only compare the file with itself.
|
|
100
|
+
const onDisk = read(proven);
|
|
101
|
+
if (onDisk === undefined) {
|
|
102
|
+
return proofMismatch(`The proven recipe file ${proven} could not be read`, dirElsewhere ? moveDirFix : `Re-run: openclaw senpi validate ${packageDir}`, "A proof is a claim about exact content. The proven file could not be read back, so nothing " +
|
|
103
|
+
"shows the recipe being applied is the one that passed.");
|
|
104
|
+
}
|
|
105
|
+
const covered = applied.content !== undefined ? onDisk === applied.content : applied.path !== undefined;
|
|
106
|
+
if (covered)
|
|
69
107
|
return { ok: true };
|
|
70
|
-
|
|
108
|
+
return proofMismatch(`The proof for ${packageDir} covers ${result.record.recipe}, which is not the recipe being applied`, dirElsewhere ? moveDirFix : `Apply the package as validated, or re-run: openclaw senpi validate ${packageDir}`);
|
|
109
|
+
}
|
|
110
|
+
/**
|
|
111
|
+
* A path as the filesystem resolves it, so two names for one file compare equal: `/tmp/pkg` and
|
|
112
|
+
* `/private/tmp/pkg` on macOS, or a symlinked package or home directory. A path that does not
|
|
113
|
+
* exist falls back to its lexical form; the gate then refuses it as unreadable anyway.
|
|
114
|
+
*/
|
|
115
|
+
function canonicalPath(p) {
|
|
71
116
|
try {
|
|
72
|
-
|
|
117
|
+
return realpathSync(p);
|
|
73
118
|
}
|
|
74
119
|
catch {
|
|
75
|
-
|
|
76
|
-
// a deleted recipe the easiest way through the gate. Falls through to the refusal below.
|
|
120
|
+
return resolve(p);
|
|
77
121
|
}
|
|
78
|
-
|
|
79
|
-
|
|
122
|
+
}
|
|
123
|
+
/**
|
|
124
|
+
* Build the `E_UPDATE_PROOF_MISMATCH` refusal: the package's proof exists but does not show that
|
|
125
|
+
* the recipe being applied is the one that passed validation.
|
|
126
|
+
*
|
|
127
|
+
* @param what - The headline: which proof, which recipe, and what is wrong between them.
|
|
128
|
+
* @param fix - The command or change that clears it, computed by the caller against the request
|
|
129
|
+
* (for example the move-or-drop fix when `runtimeYamlDir` is not the recipe file's directory).
|
|
130
|
+
* @param why - Why the pass does not count. The default asserts that the recipe being applied is
|
|
131
|
+
* NOT the file that passed validation, so it is true only when the caller has established that:
|
|
132
|
+
* another recipe file, other content, or a proof that names no recipe at all. A caller that
|
|
133
|
+
* could not make that comparison must pass its own reason: the unreadable-proven-file case does,
|
|
134
|
+
* since nothing there shows the recipes differ, and the default would send the caller after a
|
|
135
|
+
* mismatch that may not exist.
|
|
136
|
+
* @returns A failed outcome carrying the finding; no side effects.
|
|
137
|
+
*/
|
|
138
|
+
function proofMismatch(what, fix, why = "A proof is a claim about exact content. The recipe being applied is not the file that " +
|
|
139
|
+
"passed validation, so the pass says nothing about what would actually run.") {
|
|
80
140
|
return {
|
|
81
141
|
ok: false,
|
|
82
142
|
finding: {
|
|
@@ -85,13 +145,20 @@ export function checkProofCoversRecipe(packageDir, result, appliedRecipe, readFi
|
|
|
85
145
|
stage: "invocation",
|
|
86
146
|
actor: "agent",
|
|
87
147
|
fix_kind: "command",
|
|
88
|
-
what
|
|
89
|
-
why
|
|
90
|
-
|
|
91
|
-
fix: `Apply the package as validated, or re-run: openclaw senpi validate ${packageDir}`,
|
|
148
|
+
what,
|
|
149
|
+
why,
|
|
150
|
+
fix,
|
|
92
151
|
},
|
|
93
152
|
};
|
|
94
153
|
}
|
|
154
|
+
/**
|
|
155
|
+
* The `verifyProof` dependency `senpi.update` runs on: the package's proof, then whether it covers
|
|
156
|
+
* the recipe being applied. `index.ts` and the end-to-end test both build it here, so the test
|
|
157
|
+
* exercises the gate the gateway ships rather than a copy of it.
|
|
158
|
+
*/
|
|
159
|
+
export function makeUpdateProofCheck(verify, readFile) {
|
|
160
|
+
return async (packageDir, applied) => checkProofCoversRecipe(packageDir, verify(packageDir), applied, readFile);
|
|
161
|
+
}
|
|
95
162
|
/**
|
|
96
163
|
* Swap the live runtime onto the new recipe.
|
|
97
164
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-apply-deps.js","sourceRoot":"","sources":["../../src/runtime/update-apply-deps.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"update-apply-deps.js","sourceRoot":"","sources":["../../src/runtime/update-apply-deps.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAInD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AACvF,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEzD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAA+C;IAC3E,WAAW,EAAE,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,qBAAqB,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,EAAE,CAAC;IACtE,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,qBAAqB,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC;CACrD,CAAC;AAEF,2EAA2E;AAC3E,SAAS,qBAAqB;IAC5B,MAAM,KAAK,GAAG,mBAAmB,EAAE,CAAC;IACpC,KAAK,CAAC,iBAAiB,KAAK,IAAI,UAAU,EAAE,CAAC;IAC7C,OAAO,KAAK,CAAC,iBAAiB,CAAC;AACjC,CAAC;AAkBD;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,sBAAsB,CACpC,UAAkB,EAClB,MAAoB,EACpB,OAAsB,EACtB,QAAkC;IAElC,yFAAyF;IACzF,yFAAyF;IACzF,yFAAyF;IACzF,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACxF,MAAM,YAAY,GAAG,OAAO,KAAK,SAAS,IAAI,aAAa,CAAC,OAAO,CAAC,KAAK,aAAa,CAAC,UAAU,CAAC,CAAC;IACnG,MAAM,UAAU,GAAG,iDAAiD,OAAO,CAAC,IAAI,sCAAsC,OAAO,iEAAiE,CAAC;IAE/L,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;QACf,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC;QAC1C,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;IACxG,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACnB,OAAO,aAAa,CAClB,iBAAiB,UAAU,4DAA4D,EACvF,YAAY,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,gCAAgC,UAAU,EAAE,CACzE,CAAC;IACJ,CAAC;IACD,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IAE/D,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,IAAI,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;QACxF,OAAO,aAAa,CAClB,iBAAiB,UAAU,WAAW,MAAM,CAAC,MAAM,CAAC,MAAM,SAAS,OAAO,CAAC,IAAI,4BAA4B,EAC3G,YAAY;YACV,CAAC,CAAC,+BAA+B,MAAM,oDAAoD,OAAO,CAAC,IAAI,KAAK;gBACxG,mCAAmC,OAAO,iEAAiE;YAC/G,CAAC,CAAC,+BAA+B,MAAM,0DAA0D,OAAO,CAAC,IAAI,EAAE,CAClH,CAAC;IACJ,CAAC;IAED,gGAAgG;IAChG,6FAA6F;IAC7F,MAAM,IAAI,GAAG,CAAC,IAAY,EAAsB,EAAE;QAChD,IAAI,CAAC;YACH,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC,CAAC;IACF,iGAAiG;IACjG,iDAAiD;IACjD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5B,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,aAAa,CAClB,0BAA0B,MAAM,oBAAoB,EACpD,YAAY,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,mCAAmC,UAAU,EAAE,EAC3E,6FAA6F;YAC3F,wDAAwD,CAC3D,CAAC;IACJ,CAAC;IACD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC;IACxG,IAAI,OAAO;QAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;IAEjC,OAAO,aAAa,CAClB,iBAAiB,UAAU,WAAW,MAAM,CAAC,MAAM,CAAC,MAAM,yCAAyC,EACnG,YAAY,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,sEAAsE,UAAU,EAAE,CAC/G,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAS,aAAa,CAAC,CAAS;IAC9B,IAAI,CAAC;QACH,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,SAAS,aAAa,CACpB,IAAY,EACZ,GAAW,EACX,GAAG,GAAG,wFAAwF;IAC5F,4EAA4E;IAE9E,OAAO;QACL,EAAE,EAAE,KAAK;QACT,OAAO,EAAE;YACP,IAAI,EAAE,yBAAyB;YAC/B,QAAQ,EAAE,OAAO;YACjB,KAAK,EAAE,YAAY;YACnB,KAAK,EAAE,OAAO;YACd,QAAQ,EAAE,SAAS;YACnB,IAAI;YACJ,GAAG;YACH,GAAG;SACJ;KACF,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,oBAAoB,CAClC,MAA4C,EAC5C,QAAkC;IAElC,OAAO,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,CAAC,sBAAsB,CAAC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AAClH,CAAC;AAOD;;;;;;GAMG;AACH,MAAM,UAAU,kBAAkB,CAChC,OAA2D;AAC3D;;;;;;;;;;;;;;;;;;;GAmBG;AACH,gBAIyC;IAMzC,OAAO,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CACvC,iBAAiB,CAAC,WAAW,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE;QACpD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACtC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CACb,YAAY,SAAS,+DAA+D;gBAClF,4EAA4E,CAC/E,CAAC;QACJ,CAAC;QACD,MAAM,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACtC,gGAAgG;QAChG,0FAA0F;QAC1F,qDAAqD;QACrD,IAAI,CAAC,gBAAgB;YAAE,OAAO,EAAE,CAAC;QACjC,0FAA0F;QAC1F,+FAA+F;QAC/F,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QACnE,OAAO,UAAU,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACvF,CAAC,CAAC,CAAC;AACP,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,iBAAiB,CAC/B,YAAoB;IAEpB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,CACjC,gBAAgB,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;QACxC,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,YAAY,CAAC,CAAC;QAClD,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YAC/C,IAAI,KAAK,CAAC,EAAE,KAAK,SAAS;gBAAE,OAAO,KAAK,CAAC;YACzC,MAAM,EAAE,eAAe,EAAE,EAAE,EAAE,kBAAkB,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC;YAC3F,OAAO;gBACL,GAAG,IAAI;gBACP,kBAAkB,EAAE,MAAM,CAAC,OAAO;gBAClC,GAAG,CAAC,MAAM,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACpE,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,MAAM,aAAa,CAAC,YAAY,EAAE,EAAE,GAAG,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -70,13 +70,16 @@ export interface UpdateHandlerDeps {
|
|
|
70
70
|
/**
|
|
71
71
|
* Pure observation; never enforced here.
|
|
72
72
|
*
|
|
73
|
-
* `
|
|
74
|
-
*
|
|
75
|
-
*
|
|
76
|
-
* matters: does the proof cover the recipe about to be applied, or merely some
|
|
77
|
-
* in the same directory?
|
|
73
|
+
* `applied` is the recipe as the CALLER named it: its text before the wallet placeholder is bound
|
|
74
|
+
* (the proof describes bytes on disk, and binding happens after, so the bound form would never
|
|
75
|
+
* match a package that uses `${WALLET}`), or the file it named. Passing it lets the check answer
|
|
76
|
+
* the question that matters: does the proof cover the recipe about to be applied, or merely some
|
|
77
|
+
* recipe that lives in the same directory?
|
|
78
78
|
*/
|
|
79
|
-
verifyProof(packageDir: string,
|
|
79
|
+
verifyProof(packageDir: string, applied: {
|
|
80
|
+
content?: string;
|
|
81
|
+
path?: string;
|
|
82
|
+
}): Promise<{
|
|
80
83
|
ok: boolean;
|
|
81
84
|
finding?: Finding;
|
|
82
85
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-handler.d.ts","sourceRoot":"","sources":["../../src/runtime/update-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;
|
|
1
|
+
{"version":3,"file":"update-handler.d.ts","sourceRoot":"","sources":["../../src/runtime/update-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,11 +23,12 @@
|
|
|
23
23
|
* turns a plan into a network round trip per gate. The report says so rather than staying silent,
|
|
24
24
|
* because silence there reads as "all clear".
|
|
25
25
|
*/
|
|
26
|
+
import { dirname } from "node:path";
|
|
26
27
|
import { isScalar, parseDocument } from "yaml";
|
|
28
|
+
import { RecipeReadError, RECIPE_READ_FIX } from "./load-runtime-config.js";
|
|
27
29
|
import { planUpdate } from "./update-plan.js";
|
|
28
30
|
import { isRollbackFailure } from "./rebuild-errors.js";
|
|
29
31
|
import { recipeHash } from "./runtime-descriptor.js";
|
|
30
|
-
import { dirname } from "node:path";
|
|
31
32
|
import { instanceRuntimeId } from "../deploy/package.js";
|
|
32
33
|
import { deployPyUpdateCommand } from "../deploy/recheck-commands.js";
|
|
33
34
|
import { manifestDirectory, sharedDirNote, sharesDir } from "../validate/target.js";
|
|
@@ -206,7 +207,7 @@ function resolveTarget(runtimes, req) {
|
|
|
206
207
|
if (runtimes.length > 1) {
|
|
207
208
|
return {
|
|
208
209
|
ok: false,
|
|
209
|
-
refusal: refusal(UPDATE_HANDLER_CODE.ambiguousTarget, `This box runs ${runtimes.length} runtimes and none was named`, "An update rebuilds a live strategy's components. Choosing one by guessing is choosing someone's open position book by guessing.", `Name one with --id: ${runtimes.map((r) => r.id).join(", ")}`),
|
|
210
|
+
refusal: refusal(UPDATE_HANDLER_CODE.ambiguousTarget, `This box runs ${runtimes.length} runtimes and none was named`, "An update rebuilds a live strategy's components. Choosing one by guessing is choosing someone's open position book by guessing.", `Name one with \`id\` (CLI: --id): ${runtimes.map((r) => r.id).join(", ")}`),
|
|
210
211
|
};
|
|
211
212
|
}
|
|
212
213
|
return { ok: true, runtime: runtimes[0] };
|
|
@@ -253,6 +254,20 @@ async function prepare(deps, req, applied) {
|
|
|
253
254
|
catch (err) {
|
|
254
255
|
// The recipe the runtime is RUNNING failed to parse. That is not the user's edit being wrong —
|
|
255
256
|
// it is the stored copy being unreadable, which they cannot fix by editing their package.
|
|
257
|
+
// A path-installed runtime whose file is gone may have fine YAML, so a read error names the
|
|
258
|
+
// path and the error instead of "could not be parsed". It states only that: not "running"
|
|
259
|
+
// (after a restart the boot cannot read the path either), and no reinstall or recovery steps.
|
|
260
|
+
// Writing an edited recipe to that path would not fix it: `current` is re-read from that path,
|
|
261
|
+
// so the edit would diff against itself, as an in-place edit of a path-installed recipe
|
|
262
|
+
// already does (out of scope here).
|
|
263
|
+
if (err instanceof RecipeReadError) {
|
|
264
|
+
return {
|
|
265
|
+
ok: false,
|
|
266
|
+
refusals: [
|
|
267
|
+
refusal(UPDATE_HANDLER_CODE.unreadableRecipe, `The recipe file this runtime was installed from, ${err.path}, could not be read: ${err.detail}`, "Without it there is nothing to compare the change against, so the update cannot say what it would alter.", "Nothing was changed. Tell the user this path and error; don't write your edited recipe to that path."),
|
|
268
|
+
],
|
|
269
|
+
};
|
|
270
|
+
}
|
|
256
271
|
return {
|
|
257
272
|
ok: false,
|
|
258
273
|
refusals: [
|
|
@@ -292,6 +307,16 @@ async function prepare(deps, req, applied) {
|
|
|
292
307
|
next = await deps.parseConfig(recipeSource);
|
|
293
308
|
}
|
|
294
309
|
catch (err) {
|
|
310
|
+
// A path that cannot be read is not bad YAML; "Fix the YAML" would send the caller to edit a
|
|
311
|
+
// recipe that is fine. The read error says which; the fix is the same for all of them.
|
|
312
|
+
if (err instanceof RecipeReadError) {
|
|
313
|
+
return {
|
|
314
|
+
ok: false,
|
|
315
|
+
refusals: [
|
|
316
|
+
refusal(UPDATE_HANDLER_CODE.unreadableRecipe, `The recipe at ${err.path} could not be read: ${err.detail}`, "Nothing is changed; the runtime keeps running its current recipe.", RECIPE_READ_FIX),
|
|
317
|
+
],
|
|
318
|
+
};
|
|
319
|
+
}
|
|
295
320
|
return {
|
|
296
321
|
ok: false,
|
|
297
322
|
refusals: [
|
|
@@ -339,8 +364,8 @@ async function prepare(deps, req, applied) {
|
|
|
339
364
|
ok: false,
|
|
340
365
|
refusals: [
|
|
341
366
|
refusal(UPDATE_HANDLER_CODE.recipeChangedUnderCodeOnly, "--code-only was passed, but the recipe changed as well", "The flag asserts that only scanner code differs. Applying anyway would ship a recipe " +
|
|
342
|
-
"change the caller did not mean to make, alongside the code they did.", "Re-run without --code-only to see what the recipe change would do, or
|
|
343
|
-
"and re-run with it."),
|
|
367
|
+
"change the caller did not mean to make, alongside the code they did.", "Re-run without `codeOnly` (CLI: --code-only) to see what the recipe change would do, or " +
|
|
368
|
+
"revert the recipe and re-run with it."),
|
|
344
369
|
],
|
|
345
370
|
};
|
|
346
371
|
}
|
|
@@ -358,9 +383,11 @@ async function prepare(deps, req, applied) {
|
|
|
358
383
|
const packageDir = recipeSource.dir;
|
|
359
384
|
const applyBlockers = [];
|
|
360
385
|
if (packageDir !== undefined) {
|
|
361
|
-
// `req.recipe
|
|
362
|
-
//
|
|
363
|
-
|
|
386
|
+
// `req.recipe`, not `recipeSource`: the latter has had the wallet placeholder bound into its
|
|
387
|
+
// content and would not match the file the proof was taken over. A request is content-only (the
|
|
388
|
+
// gateway reads a `runtimeYamlPath` into content), so the gate compares these bytes with the
|
|
389
|
+
// proven recipe file.
|
|
390
|
+
const proof = await deps.verifyProof(packageDir, { content: req.recipe.content });
|
|
364
391
|
if (!proof.ok && proof.finding)
|
|
365
392
|
applyBlockers.push(proof.finding);
|
|
366
393
|
}
|
|
@@ -374,7 +401,10 @@ async function prepare(deps, req, applied) {
|
|
|
374
401
|
// plan still renders, with the gate named as the thing standing between it and an apply.
|
|
375
402
|
applyBlockers.push(refusal(UPDATE_HANDLER_CODE.proofRequired, "This update cannot be checked against a validation proof", "A proof is a claim about the exact contents of a package on disk. This recipe arrived as " +
|
|
376
403
|
"content with no directory, so there is nothing to verify it against and nothing is " +
|
|
377
|
-
"known about how it behaves.", proofRequiredFix(runtime)
|
|
404
|
+
"known about how it behaves.", proofRequiredFix(runtime) +
|
|
405
|
+
"\nA raw senpi.update call: send the recipe content with `runtimeYamlDir`, the directory that " +
|
|
406
|
+
"holds runtime.yaml (the package root when runtime.yaml is there; otherwise the instance " +
|
|
407
|
+
"subdirectory that holds it)."));
|
|
378
408
|
}
|
|
379
409
|
return {
|
|
380
410
|
ok: true,
|