@farmslot/recipe-runner 0.30.0 → 0.32.0
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/CHANGELOG.md +19 -0
- package/README.md +9 -0
- package/dist/adapters/core.d.ts.map +1 -1
- package/dist/adapters/core.js +60 -55
- package/dist/adapters/core.js.map +1 -1
- package/dist/cli/support.d.ts.map +1 -1
- package/dist/cli/support.js +8 -8
- package/dist/cli/support.js.map +1 -1
- package/dist/core/artifact-destination.d.ts +3 -0
- package/dist/core/artifact-destination.d.ts.map +1 -0
- package/dist/core/artifact-destination.js +32 -0
- package/dist/core/artifact-destination.js.map +1 -0
- package/dist/core/assertions.d.ts +16 -0
- package/dist/core/assertions.d.ts.map +1 -0
- package/dist/core/assertions.js +59 -0
- package/dist/core/assertions.js.map +1 -0
- package/dist/core/compose.d.ts +3 -2
- package/dist/core/compose.d.ts.map +1 -1
- package/dist/core/compose.js +23 -7
- package/dist/core/compose.js.map +1 -1
- package/dist/core/hud.d.ts +2 -1
- package/dist/core/hud.d.ts.map +1 -1
- package/dist/core/hud.js +6 -5
- package/dist/core/hud.js.map +1 -1
- package/dist/core/json.d.ts +1 -0
- package/dist/core/json.d.ts.map +1 -1
- package/dist/core/json.js +7 -9
- package/dist/core/json.js.map +1 -1
- package/dist/core/path.d.ts +1 -1
- package/dist/core/path.d.ts.map +1 -1
- package/dist/core/path.js +7 -4
- package/dist/core/path.js.map +1 -1
- package/dist/core/runner.d.ts.map +1 -1
- package/dist/core/runner.js +33 -45
- package/dist/core/runner.js.map +1 -1
- package/dist/core/trust.d.ts.map +1 -1
- package/dist/core/trust.js +7 -0
- package/dist/core/trust.js.map +1 -1
- package/dist/evidence/index.d.ts +4 -0
- package/dist/evidence/index.d.ts.map +1 -1
- package/dist/evidence/index.js +3 -0
- package/dist/evidence/index.js.map +1 -1
- package/dist/evidence/moments.d.ts +2 -0
- package/dist/evidence/moments.d.ts.map +1 -1
- package/dist/evidence/moments.js +6 -2
- package/dist/evidence/moments.js.map +1 -1
- package/dist/evidence/package.d.ts.map +1 -1
- package/dist/evidence/package.js +16 -8
- package/dist/evidence/package.js.map +1 -1
- package/dist/evidence/read-package.d.ts +7 -1
- package/dist/evidence/read-package.d.ts.map +1 -1
- package/dist/evidence/read-package.js +38 -26
- package/dist/evidence/read-package.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/node/writers.d.ts.map +1 -1
- package/dist/node/writers.js +15 -3
- package/dist/node/writers.js.map +1 -1
- package/dist/runtime/cdp.d.ts +2 -1
- package/dist/runtime/cdp.d.ts.map +1 -1
- package/dist/runtime/cdp.js +53 -17
- package/dist/runtime/cdp.js.map +1 -1
- package/package.json +2 -2
package/dist/core/compose.js
CHANGED
|
@@ -1,28 +1,44 @@
|
|
|
1
|
-
import
|
|
1
|
+
import path from 'node:path';
|
|
2
|
+
import { normalizeRecipeRef, resolvedRecipeArtifactPath, validateResolvedRecipeActionNode, } from '@farmslot/protocol';
|
|
2
3
|
import { DEFAULT_MAX_RECIPE_CALL_DEPTH } from './execution.js';
|
|
3
4
|
import { extractWorkflowGraph } from './graph.js';
|
|
4
|
-
import { isRecord } from './json.js';
|
|
5
|
+
import { isRecord, normalizeRelativePath } from './json.js';
|
|
5
6
|
import { resolveRecipeParams, resolveRecipeValue } from './parameters.js';
|
|
6
7
|
import { RecipeResolutionError } from './resolution-error.js';
|
|
7
8
|
export function rootResolutionRef(digest) {
|
|
8
9
|
return `$root:${digest}`;
|
|
9
10
|
}
|
|
10
|
-
/** Validate
|
|
11
|
+
/** Validate static invocations and return their run-scoped log paths before effects. */
|
|
11
12
|
export function validateRecipeDependencyParams(options) {
|
|
13
|
+
const runLogPaths = new Set();
|
|
12
14
|
const visit = (document, params) => {
|
|
13
15
|
for (const [nodeId, rawNode] of Object.entries(extractWorkflowGraph(document).nodes)) {
|
|
14
|
-
|
|
16
|
+
const node = resolveRecipeValue(rawNode, params, undefined, { nodeId });
|
|
17
|
+
if (!isRecord(node))
|
|
18
|
+
continue;
|
|
19
|
+
if (node.action === 'watch_logs' && options.actionManifest) {
|
|
20
|
+
const validation = validateResolvedRecipeActionNode(node, options.actionManifest, {
|
|
21
|
+
allowTemplates: true,
|
|
22
|
+
});
|
|
23
|
+
if (validation.status === 'invalid') {
|
|
24
|
+
throw new RecipeResolutionError('RECIPE_PARAMS_INVALID', `Recipe node ${nodeId}: ${validation.findings.map((finding) => finding.message).join('; ')}`, 'correct the log observation parameters before running the recipe');
|
|
25
|
+
}
|
|
26
|
+
if (node.scope !== 'file' && typeof node.path === 'string') {
|
|
27
|
+
runLogPaths.add(normalizeRelativePath(node.path).split(path.sep).join('/'));
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
if (node.action !== 'call' || typeof node.ref !== 'string')
|
|
15
31
|
continue;
|
|
16
|
-
const ref = normalizeRecipeRef(
|
|
32
|
+
const ref = normalizeRecipeRef(node.ref);
|
|
17
33
|
const dependency = options.recipes.get(ref);
|
|
18
34
|
if (!dependency)
|
|
19
35
|
continue;
|
|
20
|
-
const
|
|
21
|
-
const childParams = resolveRecipeParams(ref, dependency.document, isRecord(node) && isRecord(node.params) ? node.params : {}, { allowTemplates: true });
|
|
36
|
+
const childParams = resolveRecipeParams(ref, dependency.document, isRecord(node.params) ? node.params : {}, { allowTemplates: true });
|
|
22
37
|
visit(dependency.document, childParams);
|
|
23
38
|
}
|
|
24
39
|
};
|
|
25
40
|
visit(options.root, options.params);
|
|
41
|
+
return runLogPaths;
|
|
26
42
|
}
|
|
27
43
|
/** Resolve the exact static recipe call DAG before any side effect. */
|
|
28
44
|
export function resolveRecipeDependencies(options) {
|
package/dist/core/compose.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compose.js","sourceRoot":"","sources":["../../src/core/compose.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAIlB,0BAA0B,
|
|
1
|
+
{"version":3,"file":"compose.js","sourceRoot":"","sources":["../../src/core/compose.ts"],"names":[],"mappings":"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"}
|
package/dist/core/hud.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { RecipeHudOptions } from './types.js';
|
|
1
|
+
import type { RecipeHudDisplayOptions, RecipeHudOptions } from './types.js';
|
|
2
2
|
export declare function buildHudNode(status: 'running' | 'pass' | 'fail', event: {
|
|
3
3
|
nodeId: string;
|
|
4
4
|
action: string;
|
|
@@ -8,4 +8,5 @@ export declare function buildHudNode(status: 'running' | 'pass' | 'fail', event:
|
|
|
8
8
|
total: number;
|
|
9
9
|
error?: string;
|
|
10
10
|
}, options: RecipeHudOptions | false | undefined): Record<string, unknown>;
|
|
11
|
+
export declare function mergeHudDisplay(options: RecipeHudOptions | false | undefined, node: Record<string, unknown>): RecipeHudDisplayOptions;
|
|
11
12
|
//# sourceMappingURL=hud.d.ts.map
|
package/dist/core/hud.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hud.d.ts","sourceRoot":"","sources":["../../src/core/hud.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"hud.d.ts","sourceRoot":"","sources":["../../src/core/hud.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE5E,wBAAgB,YAAY,CAC1B,MAAM,EAAE,SAAS,GAAG,MAAM,GAAG,MAAM,EACnC,KAAK,EAAE;IACL,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EACD,OAAO,EAAE,gBAAgB,GAAG,KAAK,GAAG,SAAS,GAC5C,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA6BzB;AAED,wBAAgB,eAAe,CAC7B,OAAO,EAAE,gBAAgB,GAAG,KAAK,GAAG,SAAS,EAC7C,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,uBAAuB,CAKzB"}
|
package/dist/core/hud.js
CHANGED
|
@@ -22,17 +22,18 @@ export function buildHudNode(status, event, options) {
|
|
|
22
22
|
proves: event.node.proves,
|
|
23
23
|
intent: text,
|
|
24
24
|
error: event.error ? hudErrorSummary(event.error) : undefined,
|
|
25
|
-
display:
|
|
25
|
+
display: mergeHudDisplay(options, event.node),
|
|
26
26
|
progress: {
|
|
27
27
|
current: event.index,
|
|
28
28
|
total: event.total,
|
|
29
29
|
},
|
|
30
30
|
};
|
|
31
31
|
}
|
|
32
|
-
function
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
32
|
+
export function mergeHudDisplay(options, node) {
|
|
33
|
+
return {
|
|
34
|
+
...(options ? options.display : {}),
|
|
35
|
+
...(isRecord(node.display) ? node.display : {}),
|
|
36
|
+
};
|
|
36
37
|
}
|
|
37
38
|
function lifecyclePhase(status) {
|
|
38
39
|
if (status === 'running')
|
package/dist/core/hud.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hud.js","sourceRoot":"","sources":["../../src/core/hud.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE/E,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAGrC,MAAM,UAAU,YAAY,CAC1B,MAAmC,EACnC,KAQC,EACD,OAA6C;IAE7C,MAAM,KAAK,GACT,OAAO,IAAI,OAAO,CAAC,KAAK;QACtB,CAAC,CAAC,OAAO,CAAC,KAAK;QACf,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,OAAO,KAAK,CAAC,MAAM,CAAC,KAAK,KAAK,QAAQ;YAChE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK;YACpB,CAAC,CAAC,YAAY,CAAC;IACrB,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,IAAI,GAAG,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IAC9E,MAAM,MAAM,GAAG,qBAAqB,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACxE,OAAO;QACL,MAAM,EAAE,SAAS;QACjB,KAAK;QACL,MAAM;QACN,OAAO,EAAE,KAAK,CAAC,MAAM;QACrB,KAAK,EAAE,cAAc,CAAC,MAAM,CAAC;QAC7B,IAAI,EAAE,IAAI,IAAI,SAAS;QACvB,MAAM;QACN,IAAI;QACJ,WAAW,EAAE,KAAK,CAAC,MAAM;QACzB,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM;QACzB,MAAM,EAAE,IAAI;QACZ,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;QAC7D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"hud.js","sourceRoot":"","sources":["../../src/core/hud.ts"],"names":[],"mappings":"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"}
|
package/dist/core/json.d.ts
CHANGED
|
@@ -5,5 +5,6 @@ export declare function asString(value: unknown, label: string): string;
|
|
|
5
5
|
export declare function asOptionalString(value: unknown, label: string): string | undefined;
|
|
6
6
|
export declare function asNumber(value: unknown, label: string): number;
|
|
7
7
|
export declare function normalizeRelativePath(relativePath: string): string;
|
|
8
|
+
export declare function getJsonPathParts(jsonPath: string): string[];
|
|
8
9
|
export declare function getJsonPathValue(value: unknown, jsonPath: string): unknown;
|
|
9
10
|
//# sourceMappingURL=json.d.ts.map
|
package/dist/core/json.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json.d.ts","sourceRoot":"","sources":["../../src/core/json.ts"],"names":[],"mappings":"AAGA,wBAAsB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAQrE;AAED,wBAAsB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAGnF;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAEzE;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAK9D;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAGlF;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAK9D;AAED,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CASlE;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,
|
|
1
|
+
{"version":3,"file":"json.d.ts","sourceRoot":"","sources":["../../src/core/json.ts"],"names":[],"mappings":"AAGA,wBAAsB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAQrE;AAED,wBAAsB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAGnF;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAEzE;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAK9D;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAGlF;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAK9D;AAED,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CASlE;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAM3D;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAc1E"}
|
package/dist/core/json.js
CHANGED
|
@@ -44,18 +44,16 @@ export function normalizeRelativePath(relativePath) {
|
|
|
44
44
|
}
|
|
45
45
|
return normalized;
|
|
46
46
|
}
|
|
47
|
-
export function
|
|
47
|
+
export function getJsonPathParts(jsonPath) {
|
|
48
48
|
if (jsonPath === '$')
|
|
49
|
-
return
|
|
50
|
-
if (
|
|
49
|
+
return [];
|
|
50
|
+
if (!/^\$\.(?:[^.[\]]+|\[\d+\])(?:\.[^.[\]]+|\[\d+\])*$/u.test(jsonPath)) {
|
|
51
51
|
throw new Error(`Only simple $.path JSON paths are supported, received ${jsonPath}.`);
|
|
52
52
|
}
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
.split('.')
|
|
58
|
-
.filter(Boolean);
|
|
53
|
+
return jsonPath.slice(2).replaceAll('[', '.').replaceAll(']', '').split('.').filter(Boolean);
|
|
54
|
+
}
|
|
55
|
+
export function getJsonPathValue(value, jsonPath) {
|
|
56
|
+
const parts = getJsonPathParts(jsonPath);
|
|
59
57
|
let current = value;
|
|
60
58
|
for (const part of parts) {
|
|
61
59
|
if (Array.isArray(current)) {
|
package/dist/core/json.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/core/json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,QAAgB;IACjD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC/C,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,MAAM,IAAI,KAAK,CAAC,6BAA6B,QAAQ,KAAK,OAAO,EAAE,CAAC,CAAC;IACvE,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,QAAgB,EAAE,KAAc;IAClE,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACzD,MAAM,SAAS,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAC5E,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,KAAc;IACrC,OAAO,OAAO,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,KAAc,EAAE,KAAa;IACpD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3D,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,8BAA8B,CAAC,CAAC;IAC1D,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAAc,EAAE,KAAa;IAC5D,IAAI,KAAK,IAAI,IAAI;QAAE,OAAO,SAAS,CAAC;IACpC,OAAO,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,KAAc,EAAE,KAAa;IACpD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACzD,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,2BAA2B,CAAC,CAAC;IACvD,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,YAAoB;IACxD,IAAI,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;QACrE,MAAM,IAAI,KAAK,CAAC,QAAQ,YAAY,oBAAoB,CAAC,CAAC;IAC5D,CAAC;IACD,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IAChD,IAAI,UAAU,KAAK,IAAI,IAAI,UAAU,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;QAClE,MAAM,IAAI,KAAK,CAAC,QAAQ,YAAY,4BAA4B,CAAC,CAAC;IACpE,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/core/json.ts"],"names":[],"mappings":"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"}
|
package/dist/core/path.d.ts
CHANGED
|
@@ -2,6 +2,6 @@ export declare function isPathWithin(root: string, candidate: string): boolean;
|
|
|
2
2
|
export declare function readFileWithinRoot(root: string, relativePath: string): Promise<Buffer>;
|
|
3
3
|
export declare function digestFileWithinRoot(root: string, relativePath: string): Promise<string>;
|
|
4
4
|
export declare function statFileWithinRoot(root: string, relativePath: string): Promise<import("fs").Stats>;
|
|
5
|
-
export declare function writeFileWithinRoot(root: string, relativePath: string, data: string | Uint8Array): Promise<string>;
|
|
5
|
+
export declare function writeFileWithinRoot(root: string, relativePath: string, data: string | Uint8Array, exclusive?: boolean): Promise<string>;
|
|
6
6
|
export declare function copyFileWithinRoots(sourceRoot: string, sourceRelativePath: string, destinationRoot: string, destinationRelativePath: string): Promise<string>;
|
|
7
7
|
//# sourceMappingURL=path.d.ts.map
|
package/dist/core/path.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path.d.ts","sourceRoot":"","sources":["../../src/core/path.ts"],"names":[],"mappings":"AAQA,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAMrE;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAO5F;AAED,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAS9F;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,+BAO1E;AAED,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,MAAM,GAAG,UAAU,
|
|
1
|
+
{"version":3,"file":"path.d.ts","sourceRoot":"","sources":["../../src/core/path.ts"],"names":[],"mappings":"AAQA,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAMrE;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAO5F;AAED,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAS9F;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,+BAO1E;AAED,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,MAAM,GAAG,UAAU,EACzB,SAAS,UAAQ,GAChB,OAAO,CAAC,MAAM,CAAC,CAYjB;AAED,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,MAAM,EAClB,kBAAkB,EAAE,MAAM,EAC1B,eAAe,EAAE,MAAM,EACvB,uBAAuB,EAAE,MAAM,GAC9B,OAAO,CAAC,MAAM,CAAC,CAwBjB"}
|
package/dist/core/path.js
CHANGED
|
@@ -39,8 +39,8 @@ export async function statFileWithinRoot(root, relativePath) {
|
|
|
39
39
|
await handle.close();
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
|
-
export async function writeFileWithinRoot(root, relativePath, data) {
|
|
43
|
-
const { handle, path: outputPath } = await openOutputFileWithinRoot(root, relativePath);
|
|
42
|
+
export async function writeFileWithinRoot(root, relativePath, data, exclusive = false) {
|
|
43
|
+
const { handle, path: outputPath } = await openOutputFileWithinRoot(root, relativePath, exclusive);
|
|
44
44
|
try {
|
|
45
45
|
await handle.writeFile(data);
|
|
46
46
|
}
|
|
@@ -79,7 +79,7 @@ async function openExistingFileWithinRoot(root, relativePath) {
|
|
|
79
79
|
assertContained(rootReal, candidateReal, relativePath);
|
|
80
80
|
return open(candidateReal, constants.O_RDONLY | constants.O_NOFOLLOW);
|
|
81
81
|
}
|
|
82
|
-
async function openOutputFileWithinRoot(root, relativePath) {
|
|
82
|
+
async function openOutputFileWithinRoot(root, relativePath, exclusive = false) {
|
|
83
83
|
const normalized = normalizeRelativePath(relativePath);
|
|
84
84
|
const rootReal = await realpath(root);
|
|
85
85
|
const parentReal = await ensureContainedDirectory(rootReal, path.dirname(normalized), relativePath);
|
|
@@ -98,7 +98,10 @@ async function openOutputFileWithinRoot(root, relativePath) {
|
|
|
98
98
|
}
|
|
99
99
|
return {
|
|
100
100
|
path: outputPath,
|
|
101
|
-
handle: await open(outputPath, constants.O_WRONLY |
|
|
101
|
+
handle: await open(outputPath, constants.O_WRONLY |
|
|
102
|
+
constants.O_CREAT |
|
|
103
|
+
(exclusive ? constants.O_EXCL : constants.O_TRUNC) |
|
|
104
|
+
constants.O_NOFOLLOW, 0o600),
|
|
102
105
|
};
|
|
103
106
|
}
|
|
104
107
|
async function ensureContainedDirectory(rootReal, relativeDirectory, displayPath) {
|
package/dist/core/path.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../src/core/path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAmB,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACjF,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAElD,MAAM,UAAU,YAAY,CAAC,IAAY,EAAE,SAAiB;IAC1D,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAChD,OAAO,CACL,QAAQ,KAAK,EAAE;QACf,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,QAAQ,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAC3F,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,IAAY,EAAE,YAAoB;IACzE,MAAM,MAAM,GAAG,MAAM,0BAA0B,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IACpE,IAAI,CAAC;QACH,OAAO,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;IACjC,CAAC;YAAS,CAAC;QACT,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,IAAY,EAAE,YAAoB;IAC3E,MAAM,MAAM,GAAG,MAAM,0BAA0B,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IACpE,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;QAClC,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,CAAC,gBAAgB,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;YAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC5F,OAAO,UAAU,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;IACxC,CAAC;YAAS,CAAC;QACT,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,IAAY,EAAE,YAAoB;IACzE,MAAM,MAAM,GAAG,MAAM,0BAA0B,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IACpE,IAAI,CAAC;QACH,OAAO,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;IAC7B,CAAC;YAAS,CAAC;QACT,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,IAAY,EACZ,YAAoB,EACpB,IAAyB;
|
|
1
|
+
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../src/core/path.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/core/runner.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/core/runner.ts"],"names":[],"mappings":"AA4FA,OAAO,KAAK,EACV,aAAa,EAEb,yBAAyB,EAMzB,YAAY,EASb,MAAM,YAAY,CAAC;AA8BpB,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,aAAa,GAAG,aAAa,CAGzE;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG,YAAY,CAiCnF"}
|
package/dist/core/runner.js
CHANGED
|
@@ -5,6 +5,7 @@ import path from 'node:path';
|
|
|
5
5
|
import { DEFAULT_RECORDED_EVIDENCE_POLICY, digestRecipeDocument, getRecipeActionManifestActionNames, hasUnresolvedRecipeFailure, validateRecipeRecordingTarget, } from '@farmslot/protocol';
|
|
6
6
|
import { proofDocument } from '../evidence/assertions.js';
|
|
7
7
|
import { deriveRecipeClaims } from '../evidence/claims.js';
|
|
8
|
+
import { occurrenceRecordingCoverage } from '../evidence/moments.js';
|
|
8
9
|
import { validateRecordedEvidencePackage } from '../evidence/package.js';
|
|
9
10
|
import { planRecipeEvidence } from '../evidence/plan.js';
|
|
10
11
|
import { materializeEvidenceStill } from '../evidence/stills.js';
|
|
@@ -13,11 +14,12 @@ import { createCaptureHelperVideoRecorder, errorMessage, manifestTarget, } from
|
|
|
13
14
|
import { CAPTURE_INTERRUPTED, captureInterruptedTraceEntry, runCaptureInterruption, } from '../recording/capture-helper-interruption.js';
|
|
14
15
|
import { writeRecordingTimeline } from '../recording/timeline.js';
|
|
15
16
|
import { RECIPE_RUNNER_VERSION } from '../version.js';
|
|
17
|
+
import { assertRecipeArtifactDestinationAvailable } from './artifact-destination.js';
|
|
16
18
|
import { resolveRecipeDependencies, rootResolutionRef, validateRecipeDependencyParams, } from './compose.js';
|
|
17
19
|
import { executeRecipe } from './execution.js';
|
|
18
20
|
import { RecipeExecutionError, recipeFailureCause, recipeFailureTraceFields, RUNTIME_CONNECTION_CLOSED, } from './failure.js';
|
|
19
21
|
import { extractWorkflowGraph } from './graph.js';
|
|
20
|
-
import { buildHudNode } from './hud.js';
|
|
22
|
+
import { buildHudNode, mergeHudDisplay } from './hud.js';
|
|
21
23
|
import { createRecipeInvocation } from './invocation.js';
|
|
22
24
|
import { isRecord, normalizeRelativePath, readJsonFile } from './json.js';
|
|
23
25
|
import { loadRecipeLibraries, logRecipeLibraryShadows, logRecipeLibrarySources, } from './library.js';
|
|
@@ -64,22 +66,8 @@ export function createRecipeRunner(options) {
|
|
|
64
66
|
}
|
|
65
67
|
return new DefaultRecipeRunner(options.actionManifest, adapterMap, options.logger ?? noopLogger, options.hud, options.runner, options.recording, options.defaultSource, options.blockedCapabilities);
|
|
66
68
|
}
|
|
67
|
-
function
|
|
68
|
-
for (const node of Object.values(nodes)) {
|
|
69
|
-
if (!isRecord(node) || node.action !== 'watch_logs' || typeof node.path !== 'string')
|
|
70
|
-
continue;
|
|
71
|
-
paths.add(normalizeRelativePath(node.path).split(path.sep).join('/'));
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
async function collectRunFileOffsets({ graph, recipes, projectRoot, }) {
|
|
69
|
+
async function collectRunFileOffsets(paths, projectRoot) {
|
|
75
70
|
const offsets = new Map();
|
|
76
|
-
const paths = new Set();
|
|
77
|
-
collectWatchLogPaths(paths, graph.nodes);
|
|
78
|
-
for (const recipe of recipes.values()) {
|
|
79
|
-
if (recipe.aliasFor)
|
|
80
|
-
continue;
|
|
81
|
-
collectWatchLogPaths(paths, extractWorkflowGraph(recipe.document).nodes);
|
|
82
|
-
}
|
|
83
71
|
for (const relativePath of paths) {
|
|
84
72
|
try {
|
|
85
73
|
const info = await statFileWithinRoot(projectRoot, relativePath);
|
|
@@ -118,8 +106,9 @@ class DefaultRecipeRunner {
|
|
|
118
106
|
this.#blockedCapabilities = blockedCapabilities;
|
|
119
107
|
}
|
|
120
108
|
async preflight(request) {
|
|
121
|
-
const { executionPlan } = await this.#resolveRequest(request);
|
|
109
|
+
const { executionPlan, artifactsDir } = await this.#resolveRequest(request);
|
|
122
110
|
enforceRecipeExecutionPlan(executionPlan, request, this.#blockedCapabilities);
|
|
111
|
+
await assertRecipeArtifactDestinationAvailable(artifactsDir);
|
|
123
112
|
return executionPlan;
|
|
124
113
|
}
|
|
125
114
|
async #resolveRequest(request) {
|
|
@@ -185,10 +174,11 @@ class DefaultRecipeRunner {
|
|
|
185
174
|
});
|
|
186
175
|
}
|
|
187
176
|
const params = resolveRecipeParams(rootRef, recipe, request.params ?? {});
|
|
188
|
-
validateRecipeDependencyParams({
|
|
177
|
+
const runLogPaths = validateRecipeDependencyParams({
|
|
189
178
|
root: recipe,
|
|
190
179
|
params,
|
|
191
180
|
recipes: dependencyResolution.recipes,
|
|
181
|
+
actionManifest: this.#actionManifest,
|
|
192
182
|
});
|
|
193
183
|
const evidencePlan = planRecipeEvidence(proofDocument(recipe), new Map([...dependencyResolution.recipes].map(([ref, entry]) => [
|
|
194
184
|
ref,
|
|
@@ -224,22 +214,20 @@ class DefaultRecipeRunner {
|
|
|
224
214
|
recipes: dependencyResolution.recipes,
|
|
225
215
|
dependencyResolution,
|
|
226
216
|
executionPlan,
|
|
217
|
+
runLogPaths,
|
|
227
218
|
evidencePlan,
|
|
228
219
|
recordingRequired: needsUi,
|
|
229
220
|
videoOptions,
|
|
230
221
|
};
|
|
231
222
|
}
|
|
232
223
|
async run(request) {
|
|
233
|
-
const { projectRoot, artifactsDir, recipe, rootRef, params, env, libraryResolution,
|
|
224
|
+
const { projectRoot, artifactsDir, recipe, rootRef, params, env, libraryResolution, recipes, dependencyResolution, executionPlan, runLogPaths, evidencePlan, recordingRequired, videoOptions, } = await this.#resolveRequest(request);
|
|
234
225
|
enforceRecipeExecutionPlan(executionPlan, request, this.#blockedCapabilities);
|
|
235
226
|
const startedAt = new Date();
|
|
236
227
|
const recipeRunId = randomUUID();
|
|
228
|
+
const runHud = this.#hud === false ? false : { ...this.#hud, display: { ...this.#hud?.display } };
|
|
237
229
|
await mkdir(artifactsDir, { recursive: true });
|
|
238
|
-
const runFileOffsets = await collectRunFileOffsets(
|
|
239
|
-
graph,
|
|
240
|
-
recipes,
|
|
241
|
-
projectRoot,
|
|
242
|
-
});
|
|
230
|
+
const runFileOffsets = await collectRunFileOffsets(runLogPaths, projectRoot);
|
|
243
231
|
const artifactWriter = new JsonArtifactWriter(artifactsDir);
|
|
244
232
|
const traceWriter = new JsonTraceWriter(artifactsDir, this.#runnerProvenance);
|
|
245
233
|
const summaryWriter = new JsonSummaryWriter(artifactsDir);
|
|
@@ -320,7 +308,16 @@ class DefaultRecipeRunner {
|
|
|
320
308
|
for (const artifact of artifacts)
|
|
321
309
|
artifactWriter.register(artifact);
|
|
322
310
|
},
|
|
323
|
-
publishHudProgress: (hudStatus, event) =>
|
|
311
|
+
publishHudProgress: (hudStatus, event) => {
|
|
312
|
+
if (runHud &&
|
|
313
|
+
isRecord(event.node.display) &&
|
|
314
|
+
event.node.display.position !== undefined) {
|
|
315
|
+
runHud.display = mergeHudDisplay(runHud, {
|
|
316
|
+
display: { position: event.node.display.position },
|
|
317
|
+
});
|
|
318
|
+
}
|
|
319
|
+
return this.#publishHudProgressOrRecord(traceWriter, hudStatus, event, runHud);
|
|
320
|
+
},
|
|
324
321
|
...(request.stopAfterNode !== undefined ? { stopAfterNode: request.stopAfterNode } : {}),
|
|
325
322
|
});
|
|
326
323
|
status = hasUnresolvedRecipeFailure(traceWriter.list()) ? 'fail' : execution.status;
|
|
@@ -341,13 +338,7 @@ class DefaultRecipeRunner {
|
|
|
341
338
|
if (status === 'pass' || status === 'fail') {
|
|
342
339
|
const runHudStartedAt = new Date();
|
|
343
340
|
try {
|
|
344
|
-
await this.#publishRunHud(status, {
|
|
345
|
-
recipe,
|
|
346
|
-
projectRoot,
|
|
347
|
-
artifactsDir,
|
|
348
|
-
env,
|
|
349
|
-
outputs,
|
|
350
|
-
});
|
|
341
|
+
await this.#publishRunHud(status, { recipe, projectRoot, artifactsDir, env, outputs }, runHud);
|
|
351
342
|
}
|
|
352
343
|
catch (error) {
|
|
353
344
|
const message = error instanceof Error ? error.message : String(error);
|
|
@@ -469,7 +460,7 @@ class DefaultRecipeRunner {
|
|
|
469
460
|
...(artifact.metadata?.gapBefore === true ? { gapBefore: true } : {}),
|
|
470
461
|
});
|
|
471
462
|
if (artifact.timelinePath)
|
|
472
|
-
timelines.set(
|
|
463
|
+
timelines.set(artifact.path, (await readJsonFile(path.join(artifactsDir, artifact.timelinePath))));
|
|
473
464
|
}
|
|
474
465
|
const pendingClaims = deriveRecipeClaims({
|
|
475
466
|
recipeRunId,
|
|
@@ -491,12 +482,8 @@ class DefaultRecipeRunner {
|
|
|
491
482
|
artifact.nodeId === nodeId &&
|
|
492
483
|
isRecord(artifact.metadata?.recordedEvidence)))
|
|
493
484
|
continue;
|
|
494
|
-
const
|
|
495
|
-
const
|
|
496
|
-
const segment = moment
|
|
497
|
-
? segments.find((entry) => entry.videoDigest === moment.videoDigest)
|
|
498
|
-
: undefined;
|
|
499
|
-
const timeline = segment ? timelines.get(segment.videoDigest) : undefined;
|
|
485
|
+
const segment = occurrenceRecordingCoverage(traceIndex, segments, timelines).segments.at(-1);
|
|
486
|
+
const timeline = segment ? timelines.get(segment.videoPath) : undefined;
|
|
500
487
|
if (!segment || !timeline)
|
|
501
488
|
continue;
|
|
502
489
|
try {
|
|
@@ -578,7 +565,7 @@ class DefaultRecipeRunner {
|
|
|
578
565
|
artifactDigests: Object.fromEntries(segments.map((segment) => [segment.videoPath, segment.videoDigest])),
|
|
579
566
|
timelines: Object.fromEntries(segments
|
|
580
567
|
.filter((segment) => segment.timelinePath)
|
|
581
|
-
.map((segment) => [segment.timelinePath, timelines.get(segment.
|
|
568
|
+
.map((segment) => [segment.timelinePath, timelines.get(segment.videoPath)])),
|
|
582
569
|
recipe,
|
|
583
570
|
resolvedRecipes: Object.fromEntries([...dependencyResolution.recipes.values()].map((entry) => [
|
|
584
571
|
entry.provenance.digest,
|
|
@@ -850,10 +837,10 @@ class DefaultRecipeRunner {
|
|
|
850
837
|
return undefined;
|
|
851
838
|
return this.#adapters.has('app.hud') ? 'app.hud' : undefined;
|
|
852
839
|
}
|
|
853
|
-
async #publishHudProgressOrRecord(traceWriter, status, event) {
|
|
840
|
+
async #publishHudProgressOrRecord(traceWriter, status, event, hud) {
|
|
854
841
|
const startedAt = new Date();
|
|
855
842
|
try {
|
|
856
|
-
await this.#publishHudProgress(status, event);
|
|
843
|
+
await this.#publishHudProgress(status, event, hud);
|
|
857
844
|
return true;
|
|
858
845
|
}
|
|
859
846
|
catch (error) {
|
|
@@ -874,7 +861,7 @@ class DefaultRecipeRunner {
|
|
|
874
861
|
return false;
|
|
875
862
|
}
|
|
876
863
|
}
|
|
877
|
-
async #publishHudProgress(status, event) {
|
|
864
|
+
async #publishHudProgress(status, event, hud) {
|
|
878
865
|
const hudAction = this.#hudAction();
|
|
879
866
|
if (!hudAction || event.action === hudAction)
|
|
880
867
|
return;
|
|
@@ -882,9 +869,9 @@ class DefaultRecipeRunner {
|
|
|
882
869
|
if (!adapter)
|
|
883
870
|
return;
|
|
884
871
|
await verifyExecutableSource(adapter, `Action ${hudAction}`);
|
|
885
|
-
await adapter.execute(buildHudNode(status, event,
|
|
872
|
+
await adapter.execute(buildHudNode(status, event, hud), event.context);
|
|
886
873
|
}
|
|
887
|
-
async #publishRunHud(status, request) {
|
|
874
|
+
async #publishRunHud(status, request, hud) {
|
|
888
875
|
const hudAction = this.#hudAction();
|
|
889
876
|
if (!hudAction)
|
|
890
877
|
return;
|
|
@@ -925,6 +912,7 @@ class DefaultRecipeRunner {
|
|
|
925
912
|
flow: 'run',
|
|
926
913
|
detail: status === 'pass' ? 'Recipe completed' : 'Recipe failed',
|
|
927
914
|
text: status === 'pass' ? 'Recipe completed' : 'Recipe failed',
|
|
915
|
+
display: hud ? hud.display : undefined,
|
|
928
916
|
progress: { complete: true },
|
|
929
917
|
}, context);
|
|
930
918
|
}
|