@relayflows/sdk 2.0.30 → 2.0.31
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/agent-artifacts.d.ts.map +1 -1
- package/dist/agent-artifacts.js +2 -9
- package/dist/agent-artifacts.js.map +1 -1
- package/dist/agent-cwd.d.ts +69 -0
- package/dist/agent-cwd.d.ts.map +1 -0
- package/dist/agent-cwd.js +140 -0
- package/dist/agent-cwd.js.map +1 -0
- package/dist/artifact-scan-policy.d.ts +35 -0
- package/dist/artifact-scan-policy.d.ts.map +1 -0
- package/dist/artifact-scan-policy.js +49 -0
- package/dist/artifact-scan-policy.js.map +1 -0
- package/dist/authored-completion-record.d.ts +35 -0
- package/dist/authored-completion-record.d.ts.map +1 -0
- package/dist/authored-completion-record.js +92 -0
- package/dist/authored-completion-record.js.map +1 -0
- package/dist/authored-completion.d.ts +99 -0
- package/dist/authored-completion.d.ts.map +1 -0
- package/dist/authored-completion.js +184 -0
- package/dist/authored-completion.js.map +1 -0
- package/dist/authored-flow-error.d.ts +13 -1
- package/dist/authored-flow-error.d.ts.map +1 -1
- package/dist/authored-flow-error.js +12 -0
- package/dist/authored-flow-error.js.map +1 -1
- package/dist/authored-flow-executor.d.ts +7 -30
- package/dist/authored-flow-executor.d.ts.map +1 -1
- package/dist/authored-flow-executor.js +54 -47
- package/dist/authored-flow-executor.js.map +1 -1
- package/dist/authored-human.d.ts.map +1 -1
- package/dist/authored-human.js +1 -3
- package/dist/authored-human.js.map +1 -1
- package/dist/authored-node-entry.js +4 -1
- package/dist/authored-node-entry.js.map +1 -1
- package/dist/authored-node-runner.d.ts +9 -1
- package/dist/authored-node-runner.d.ts.map +1 -1
- package/dist/authored-node-runner.js +92 -17
- package/dist/authored-node-runner.js.map +1 -1
- package/dist/authored-root.d.ts +5 -0
- package/dist/authored-root.d.ts.map +1 -1
- package/dist/authored-root.js +20 -2
- package/dist/authored-root.js.map +1 -1
- package/dist/authored-step-output.d.ts +35 -10
- package/dist/authored-step-output.d.ts.map +1 -1
- package/dist/authored-step-output.js +108 -40
- package/dist/authored-step-output.js.map +1 -1
- package/dist/authored-verdict.d.ts +28 -0
- package/dist/authored-verdict.d.ts.map +1 -0
- package/dist/authored-verdict.js +79 -0
- package/dist/authored-verdict.js.map +1 -0
- package/dist/authored-worker-step.d.ts +5 -2
- package/dist/authored-worker-step.d.ts.map +1 -1
- package/dist/authored-worker-step.js +48 -11
- package/dist/authored-worker-step.js.map +1 -1
- package/dist/cli/check-worker-surface.d.ts +27 -0
- package/dist/cli/check-worker-surface.d.ts.map +1 -0
- package/dist/cli/check-worker-surface.js +63 -0
- package/dist/cli/check-worker-surface.js.map +1 -0
- package/dist/cli/check.d.ts +19 -2
- package/dist/cli/check.d.ts.map +1 -1
- package/dist/cli/check.js +12 -4
- package/dist/cli/check.js.map +1 -1
- package/dist/cli/cloud-format.d.ts +9 -0
- package/dist/cli/cloud-format.d.ts.map +1 -0
- package/dist/cli/cloud-format.js +77 -0
- package/dist/cli/cloud-format.js.map +1 -0
- package/dist/cli/cloud-live.d.ts +39 -0
- package/dist/cli/cloud-live.d.ts.map +1 -0
- package/dist/cli/cloud-live.js +325 -0
- package/dist/cli/cloud-live.js.map +1 -0
- package/dist/cli/cloud-read.d.ts +3 -7
- package/dist/cli/cloud-read.d.ts.map +1 -1
- package/dist/cli/cloud-read.js +14 -266
- package/dist/cli/cloud-read.js.map +1 -1
- package/dist/cli/cloud-refusal.d.ts +39 -0
- package/dist/cli/cloud-refusal.d.ts.map +1 -0
- package/dist/cli/cloud-refusal.js +95 -0
- package/dist/cli/cloud-refusal.js.map +1 -0
- package/dist/cli/cloud-status-view.d.ts +7 -0
- package/dist/cli/cloud-status-view.d.ts.map +1 -0
- package/dist/cli/cloud-status-view.js +214 -0
- package/dist/cli/cloud-status-view.js.map +1 -0
- package/dist/cli/direct-run.d.ts.map +1 -1
- package/dist/cli/direct-run.js +16 -2
- package/dist/cli/direct-run.js.map +1 -1
- package/dist/cli/hn-monitor.d.ts +0 -13
- package/dist/cli/hn-monitor.d.ts.map +1 -1
- package/dist/cli/hn-monitor.js +2 -1
- package/dist/cli/hn-monitor.js.map +1 -1
- package/dist/cli/local-agent-remedy.d.ts +80 -0
- package/dist/cli/local-agent-remedy.d.ts.map +1 -0
- package/dist/cli/local-agent-remedy.js +116 -0
- package/dist/cli/local-agent-remedy.js.map +1 -0
- package/dist/cli/observer-session.d.ts +41 -0
- package/dist/cli/observer-session.d.ts.map +1 -0
- package/dist/cli/observer-session.js +78 -0
- package/dist/cli/observer-session.js.map +1 -0
- package/dist/cli/run.d.ts +30 -2
- package/dist/cli/run.d.ts.map +1 -1
- package/dist/cli/run.js +186 -24
- package/dist/cli/run.js.map +1 -1
- package/dist/cli/status.d.ts +9 -0
- package/dist/cli/status.d.ts.map +1 -1
- package/dist/cli/status.js +31 -2
- package/dist/cli/status.js.map +1 -1
- package/dist/cli/step-evidence.d.ts +90 -0
- package/dist/cli/step-evidence.d.ts.map +1 -0
- package/dist/cli/step-evidence.js +259 -0
- package/dist/cli/step-evidence.js.map +1 -0
- package/dist/cli/step-failure.d.ts +14 -4
- package/dist/cli/step-failure.d.ts.map +1 -1
- package/dist/cli/step-failure.js +41 -76
- package/dist/cli/step-failure.js.map +1 -1
- package/dist/cli-commands.d.ts +6 -0
- package/dist/cli-commands.d.ts.map +1 -1
- package/dist/cli-commands.js +2 -0
- package/dist/cli-commands.js.map +1 -1
- package/dist/cli.d.ts +10 -0
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +53 -42
- package/dist/cli.js.map +1 -1
- package/dist/cloud-read.d.ts +15 -0
- package/dist/cloud-read.d.ts.map +1 -1
- package/dist/cloud-read.js +20 -1
- package/dist/cloud-read.js.map +1 -1
- package/dist/cloud-run-record.d.ts +27 -0
- package/dist/cloud-run-record.d.ts.map +1 -0
- package/dist/cloud-run-record.js +56 -0
- package/dist/cloud-run-record.js.map +1 -0
- package/dist/cloud-run.d.ts +2 -9
- package/dist/cloud-run.d.ts.map +1 -1
- package/dist/cloud-run.js +3 -20
- package/dist/cloud-run.js.map +1 -1
- package/dist/communication/local.d.ts.map +1 -1
- package/dist/communication/local.js +2 -1
- package/dist/communication/local.js.map +1 -1
- package/dist/communication/worker.d.ts +1 -1
- package/dist/communication/worker.d.ts.map +1 -1
- package/dist/communication/worker.js +13 -5
- package/dist/communication/worker.js.map +1 -1
- package/dist/compile.d.ts.map +1 -1
- package/dist/compile.js +28 -6
- package/dist/compile.js.map +1 -1
- package/dist/direct-input.d.ts.map +1 -1
- package/dist/direct-input.js +21 -1
- package/dist/direct-input.js.map +1 -1
- package/dist/failure-kinds.d.ts +96 -6
- package/dist/failure-kinds.d.ts.map +1 -1
- package/dist/failure-kinds.js +29 -2
- package/dist/failure-kinds.js.map +1 -1
- package/dist/flow-requirements.d.ts.map +1 -1
- package/dist/flow-requirements.js +24 -9
- package/dist/flow-requirements.js.map +1 -1
- package/dist/gate-contract.d.ts +7 -0
- package/dist/gate-contract.d.ts.map +1 -1
- package/dist/gate-contract.js +6 -1
- package/dist/gate-contract.js.map +1 -1
- package/dist/helper-preflight.d.ts.map +1 -1
- package/dist/helper-preflight.js +10 -3
- package/dist/helper-preflight.js.map +1 -1
- package/dist/helper-reference.d.ts +25 -0
- package/dist/helper-reference.d.ts.map +1 -0
- package/dist/helper-reference.js +129 -0
- package/dist/helper-reference.js.map +1 -0
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/journal-client.d.ts +3 -1
- package/dist/journal-client.d.ts.map +1 -1
- package/dist/journal-client.js +17 -2
- package/dist/journal-client.js.map +1 -1
- package/dist/journal-projection.d.ts +16 -0
- package/dist/journal-projection.d.ts.map +1 -0
- package/dist/journal-projection.js +108 -0
- package/dist/journal-projection.js.map +1 -0
- package/dist/llm-worker.js +1 -1
- package/dist/llm-worker.js.map +1 -1
- package/dist/local-agent.d.ts +1 -1
- package/dist/local-agent.d.ts.map +1 -1
- package/dist/local-agent.js +4 -3
- package/dist/local-agent.js.map +1 -1
- package/dist/named-gate-lowering.js +35 -5
- package/dist/named-gate-lowering.js.map +1 -1
- package/dist/named-gate-preflight.d.ts +27 -0
- package/dist/named-gate-preflight.d.ts.map +1 -0
- package/dist/named-gate-preflight.js +47 -0
- package/dist/named-gate-preflight.js.map +1 -0
- package/dist/named-gates.d.ts +1 -1
- package/dist/named-gates.d.ts.map +1 -1
- package/dist/named-gates.js +3 -0
- package/dist/named-gates.js.map +1 -1
- package/dist/observer-link.d.ts +7 -0
- package/dist/observer-link.d.ts.map +1 -1
- package/dist/observer-link.js +3 -1
- package/dist/observer-link.js.map +1 -1
- package/dist/preflight.d.ts.map +1 -1
- package/dist/preflight.js +7 -0
- package/dist/preflight.js.map +1 -1
- package/dist/protocol.d.ts +2 -0
- package/dist/protocol.d.ts.map +1 -1
- package/dist/redact.d.ts +42 -0
- package/dist/redact.d.ts.map +1 -1
- package/dist/redact.js +128 -0
- package/dist/redact.js.map +1 -1
- package/dist/run-projection.d.ts +83 -0
- package/dist/run-projection.d.ts.map +1 -0
- package/dist/run-projection.js +199 -0
- package/dist/run-projection.js.map +1 -0
- package/dist/shell-word.d.ts +19 -0
- package/dist/shell-word.d.ts.map +1 -0
- package/dist/shell-word.js +23 -0
- package/dist/shell-word.js.map +1 -0
- package/dist/spec.d.ts +52 -3
- package/dist/spec.d.ts.map +1 -1
- package/dist/spec.js.map +1 -1
- package/dist/step-fields.d.ts +1 -1
- package/dist/step-fields.js +1 -1
- package/dist/step-fields.js.map +1 -1
- package/dist/steps-green.d.ts +27 -0
- package/dist/steps-green.d.ts.map +1 -0
- package/dist/steps-green.js +164 -0
- package/dist/steps-green.js.map +1 -0
- package/dist/validate.d.ts.map +1 -1
- package/dist/validate.js +39 -8
- package/dist/validate.js.map +1 -1
- package/dist/worker-lease.d.ts +8 -1
- package/dist/worker-lease.d.ts.map +1 -1
- package/dist/worker-lease.js +34 -4
- package/dist/worker-lease.js.map +1 -1
- package/dist/worker.d.ts +8 -0
- package/dist/worker.d.ts.map +1 -1
- package/dist/worker.js +17 -9
- package/dist/worker.js.map +1 -1
- package/package.json +3 -7
- package/src/agent-artifacts.ts +2 -10
- package/src/agent-cwd.ts +139 -0
- package/src/artifact-scan-policy.ts +51 -0
- package/src/authored-completion-record.ts +119 -0
- package/src/authored-completion.ts +203 -0
- package/src/authored-flow-error.ts +13 -1
- package/src/authored-flow-executor.ts +91 -58
- package/src/authored-human.ts +1 -4
- package/src/authored-node-entry.ts +4 -1
- package/src/authored-node-runner.ts +96 -22
- package/src/authored-root.ts +20 -2
- package/src/authored-step-output.ts +139 -42
- package/src/authored-verdict.ts +87 -0
- package/src/authored-worker-step.ts +60 -12
- package/src/cli/check-worker-surface.ts +66 -0
- package/src/cli/check.ts +35 -4
- package/src/cli/cloud-format.ts +82 -0
- package/src/cli/cloud-live.ts +366 -0
- package/src/cli/cloud-read.ts +13 -282
- package/src/cli/cloud-refusal.ts +113 -0
- package/src/cli/cloud-status-view.ts +213 -0
- package/src/cli/direct-run.ts +19 -2
- package/src/cli/hn-monitor.ts +2 -1
- package/src/cli/local-agent-remedy.ts +160 -0
- package/src/cli/observer-session.ts +107 -0
- package/src/cli/run.ts +233 -28
- package/src/cli/status.ts +59 -3
- package/src/cli/step-evidence.ts +310 -0
- package/src/cli/step-failure.ts +57 -81
- package/src/cli-commands.ts +2 -0
- package/src/cli.ts +64 -44
- package/src/cloud-read.ts +25 -1
- package/src/cloud-run-record.ts +64 -0
- package/src/cloud-run.ts +5 -24
- package/src/communication/local.ts +2 -1
- package/src/communication/worker.ts +13 -5
- package/src/compile.ts +28 -6
- package/src/direct-input.ts +22 -1
- package/src/failure-kinds.ts +104 -2
- package/src/flow-requirements.ts +24 -9
- package/src/gate-contract.ts +13 -1
- package/src/helper-preflight.ts +10 -3
- package/src/helper-reference.ts +130 -0
- package/src/index.ts +2 -0
- package/src/journal-client.ts +19 -2
- package/src/journal-projection.ts +106 -0
- package/src/llm-worker.ts +1 -1
- package/src/local-agent.ts +4 -2
- package/src/named-gate-lowering.ts +35 -5
- package/src/named-gate-preflight.ts +47 -0
- package/src/named-gates.ts +3 -0
- package/src/observer-link.ts +10 -1
- package/src/preflight.ts +7 -0
- package/src/protocol.ts +2 -0
- package/src/redact.ts +111 -0
- package/src/run-projection.ts +247 -0
- package/src/shell-word.ts +24 -0
- package/src/spec.ts +54 -3
- package/src/step-fields.ts +1 -1
- package/src/steps-green.ts +168 -0
- package/src/validate.ts +35 -8
- package/src/worker-lease.ts +35 -5
- package/src/worker.ts +27 -11
package/src/spec.ts
CHANGED
|
@@ -15,6 +15,13 @@ export type { JsonOutputSchema } from './output-schema.js';
|
|
|
15
15
|
/** The three rungs of the ladder (RFC §1; AGENTS.md rule 7). */
|
|
16
16
|
export type StepType = 'deterministic' | 'llm' | 'agent';
|
|
17
17
|
|
|
18
|
+
/**
|
|
19
|
+
* A deterministic step's exit-code policy. `'fail'` is the kernel's implicit
|
|
20
|
+
* gate; `'record'` completes the step with its exit code journaled so a later
|
|
21
|
+
* step can read the outcome instead of re-running the command.
|
|
22
|
+
*/
|
|
23
|
+
export type OnNonZero = 'fail' | 'record';
|
|
24
|
+
|
|
18
25
|
/** Project-owned MCP connections. env contains names, never secret values. */
|
|
19
26
|
export type McpServerConfig =
|
|
20
27
|
| { command: string; args?: string[]; env?: string[] }
|
|
@@ -93,9 +100,24 @@ export interface ArtifactExistsGate {
|
|
|
93
100
|
path: string;
|
|
94
101
|
}
|
|
95
102
|
|
|
103
|
+
/**
|
|
104
|
+
* Asserts that every named step recorded a zero exit code, reading the
|
|
105
|
+
* journaled outcome instead of re-running the command. This is the read side
|
|
106
|
+
* of `onNonZero: 'record'`: red work is allowed to exist, and this gate is
|
|
107
|
+
* where a flow declares that it stops being allowed.
|
|
108
|
+
*
|
|
109
|
+
* Deterministic hosts only — a worker step has no recorded exit code to read —
|
|
110
|
+
* and the ids it names must be deterministic steps that precede it.
|
|
111
|
+
*/
|
|
112
|
+
export interface StepsGreenGate {
|
|
113
|
+
type: 'steps_green';
|
|
114
|
+
/** Earlier deterministic step ids whose recorded exit codes must all be zero. */
|
|
115
|
+
ids: string[];
|
|
116
|
+
}
|
|
117
|
+
|
|
96
118
|
export type NamedDataGate = ReferencesInputGate | SubprocessGate | WordCountBoundsGate | RegexMatchGate | ArtifactExistsGate;
|
|
97
119
|
export type OutputVerificationSpec = OutputContainsGate | JsonSchemaGate | NamedDataGate;
|
|
98
|
-
export type VerificationSpec = ExitCodeGate | OutputVerificationSpec;
|
|
120
|
+
export type VerificationSpec = ExitCodeGate | StepsGreenGate | OutputVerificationSpec;
|
|
99
121
|
|
|
100
122
|
/**
|
|
101
123
|
* Agent-step recovery modes (RFC Appendix A rule 4). Default is `reset`.
|
|
@@ -226,6 +248,15 @@ export interface DeterministicStepSpec extends BaseStepSpec {
|
|
|
226
248
|
timeoutMs?: number;
|
|
227
249
|
/** Per-invocation deterministic lease in milliseconds (maximum 15 minutes). */
|
|
228
250
|
lease_ms?: number;
|
|
251
|
+
/**
|
|
252
|
+
* What a nonzero exit means. `'fail'` (the default) is the implicit
|
|
253
|
+
* `exit_code == 0` gate. `'record'` journals the exit code and output tails
|
|
254
|
+
* as the step's outcome, completes the step red, and lets dependents run —
|
|
255
|
+
* the repair-before-failure shape, without discarding the exit code the way
|
|
256
|
+
* `<command> || true` does. Declared content and schema gates, timeouts and
|
|
257
|
+
* worker errors keep their existing fatal semantics.
|
|
258
|
+
*/
|
|
259
|
+
onNonZero?: OnNonZero;
|
|
229
260
|
/** Omit to get the implicit `exit_code` gate. */
|
|
230
261
|
verification?: VerificationSpec;
|
|
231
262
|
}
|
|
@@ -274,7 +305,17 @@ export interface AgentStepSpec extends BaseStepSpec {
|
|
|
274
305
|
surfaces?: AgentSurfaces;
|
|
275
306
|
recoveryMode?: RecoveryMode;
|
|
276
307
|
permissions?: PermissionsSpec;
|
|
277
|
-
/**
|
|
308
|
+
/**
|
|
309
|
+
* Directory the declared CLI is spawned in, as a path relative to the run
|
|
310
|
+
* root — the flow-runner's working directory, which is also where the CLI
|
|
311
|
+
* runs when this is absent. Absolute paths, `.`, `..` and empty components
|
|
312
|
+
* are refused lexically by `flows check` and by the kernel; the worker that
|
|
313
|
+
* spawns the CLI additionally requires the symlink-free directory to exist
|
|
314
|
+
* inside the symlink-free run root. A declaration, not a sandbox: nothing
|
|
315
|
+
* stops a CLI from writing outside it. Not supported with
|
|
316
|
+
* `transport: 'relay'`, where the agent runs on a host this process cannot
|
|
317
|
+
* resolve. See docs/SURFACE.md.
|
|
318
|
+
*/
|
|
278
319
|
cwd?: string;
|
|
279
320
|
/**
|
|
280
321
|
* Dispatch transport (flows#385). `'direct'` (default) spawns the CLI as
|
|
@@ -440,6 +481,12 @@ export interface KernelDeterministicStep extends KernelStepCommon {
|
|
|
440
481
|
command: string;
|
|
441
482
|
timeout_ms?: number;
|
|
442
483
|
lease_ms?: number;
|
|
484
|
+
/**
|
|
485
|
+
* Omitted for the default `'fail'`, exactly as the kernel skips serializing
|
|
486
|
+
* it: a step that does not declare the policy keeps the canonical bytes —
|
|
487
|
+
* and therefore the step hash — it had before this field existed.
|
|
488
|
+
*/
|
|
489
|
+
on_non_zero?: OnNonZero;
|
|
443
490
|
}
|
|
444
491
|
|
|
445
492
|
export interface KernelLlmStep extends KernelStepCommon {
|
|
@@ -469,7 +516,11 @@ export interface KernelAgentStep extends KernelStepCommon {
|
|
|
469
516
|
recovery_mode: RecoveryMode;
|
|
470
517
|
surfaces?: KernelAgentSurfaces;
|
|
471
518
|
permissions?: KernelPermissionsSpec;
|
|
472
|
-
/**
|
|
519
|
+
/**
|
|
520
|
+
* Run-root-relative directory the attached worker spawns the CLI in. The
|
|
521
|
+
* kernel checks the shape and does no I/O: existence and containment are
|
|
522
|
+
* decided by the worker, on the host that shares the agent's filesystem.
|
|
523
|
+
*/
|
|
473
524
|
cwd?: string;
|
|
474
525
|
/**
|
|
475
526
|
* Dispatch transport (flows#385). Kernel passes through untouched;
|
package/src/step-fields.ts
CHANGED
|
@@ -35,7 +35,7 @@ export const STEP_COMMON_FIELDS = [
|
|
|
35
35
|
* per-verb boundary through a second, drifting allowlist.
|
|
36
36
|
*/
|
|
37
37
|
export const STEP_FIELDS_BY_TYPE = {
|
|
38
|
-
deterministic: ['command', 'timeoutMs', 'lease_ms'],
|
|
38
|
+
deterministic: ['command', 'timeoutMs', 'lease_ms', 'onNonZero'],
|
|
39
39
|
llm: ['prompt', 'model', 'cli', 'output'],
|
|
40
40
|
agent: ['instruction', 'agent', 'cli', 'model', 'cwd', 'transport', 'surfaces', 'recoveryMode', 'permissions', 'output'],
|
|
41
41
|
} as const satisfies Record<StepType, readonly string[]>;
|
|
@@ -0,0 +1,168 @@
|
|
|
1
|
+
// The read side of `onNonZero: 'record'`. A `steps_green` gate names earlier
|
|
2
|
+
// deterministic steps and asserts every one of them recorded exit code zero.
|
|
3
|
+
// The verdict comes from the journal — the recorded outcome each step already
|
|
4
|
+
// produced — so asserting it costs nothing and cannot disagree with what ran.
|
|
5
|
+
|
|
6
|
+
import { bindingDependencies } from './input-binding.js';
|
|
7
|
+
import type { StepSpec, StepsGreenGate, VerificationSpec } from './spec.js';
|
|
8
|
+
|
|
9
|
+
export const STEPS_GREEN_KEYS = ['type', 'ids'] as const;
|
|
10
|
+
|
|
11
|
+
export function isStepsGreenGate(gate: VerificationSpec | undefined): gate is StepsGreenGate {
|
|
12
|
+
return gate?.type === 'steps_green';
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
/** Shape errors for one gate, without reference to the rest of the flow. */
|
|
16
|
+
export function stepsGreenErrors(gate: Record<string, unknown>, at: string, stepType: string): string[] {
|
|
17
|
+
const errors: string[] = [];
|
|
18
|
+
if (stepType !== 'deterministic') {
|
|
19
|
+
errors.push(`${at}: gate_host_unsupported: steps_green is supported only on deterministic steps`);
|
|
20
|
+
}
|
|
21
|
+
const ids = gate['ids'];
|
|
22
|
+
if (!Array.isArray(ids) || ids.length === 0
|
|
23
|
+
|| !ids.every(id => typeof id === 'string' && id.trim().length > 0)) {
|
|
24
|
+
errors.push(`${at}.ids: gate_ids_invalid: expected a non-empty array of step ids`);
|
|
25
|
+
return errors;
|
|
26
|
+
}
|
|
27
|
+
if (new Set(ids).size !== ids.length) {
|
|
28
|
+
errors.push(`${at}.ids: gate_ids_invalid: step ids must be unique`);
|
|
29
|
+
}
|
|
30
|
+
return errors;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
/**
|
|
34
|
+
* Flow-level errors: the ids must resolve to earlier deterministic steps whose
|
|
35
|
+
* recorded outcome this gate can actually read. Refusing here is the whole
|
|
36
|
+
* point — a gate that silently reads nothing is the `|| true` failure mode
|
|
37
|
+
* this feature replaces.
|
|
38
|
+
*/
|
|
39
|
+
export function stepsGreenReferenceErrors(steps: readonly unknown[]): string[] {
|
|
40
|
+
const errors: string[] = [];
|
|
41
|
+
const sources = new Map(steps.flatMap((step, index) =>
|
|
42
|
+
isObject(step) && typeof step['id'] === 'string' ? [[step['id'], { step, index }] as const] : []));
|
|
43
|
+
for (const [index, step] of steps.entries()) {
|
|
44
|
+
if (!isObject(step)) continue;
|
|
45
|
+
const gate = step['verification'];
|
|
46
|
+
if (!isObject(gate) || gate['type'] !== 'steps_green') continue;
|
|
47
|
+
const ids = gate['ids'];
|
|
48
|
+
if (!Array.isArray(ids)) continue;
|
|
49
|
+
const at = `spec.steps[${index}].verification.ids`;
|
|
50
|
+
for (const id of ids) {
|
|
51
|
+
if (typeof id !== 'string') continue;
|
|
52
|
+
const source = sources.get(id);
|
|
53
|
+
if (source === undefined) {
|
|
54
|
+
errors.push(`${at}: gate_source_unsupported: unknown step "${id}"`);
|
|
55
|
+
continue;
|
|
56
|
+
}
|
|
57
|
+
if (source.index >= index) {
|
|
58
|
+
errors.push(`${at}: gate_source_unsupported: source "${id}" must precede this step; forward and self references are not supported`);
|
|
59
|
+
continue;
|
|
60
|
+
}
|
|
61
|
+
if (source.step['type'] !== 'deterministic') {
|
|
62
|
+
errors.push(`${at}: gate_source_unsupported: source "${id}" is a ${String(source.step['type'])} step and records no exit code`);
|
|
63
|
+
continue;
|
|
64
|
+
}
|
|
65
|
+
// The gate binds the source's whole output envelope, which requires a
|
|
66
|
+
// declared output schema. Every source shape is reachable except this
|
|
67
|
+
// one: `output_contains` is the single gate the compiler cannot widen
|
|
68
|
+
// without dropping the author's own check.
|
|
69
|
+
const sourceGate = source.step['verification'];
|
|
70
|
+
if (isObject(sourceGate) && sourceGate['type'] === 'output_contains') {
|
|
71
|
+
errors.push(`${at}: gate_source_unsupported: source "${id}" declares an output_contains gate, which cannot also carry the output schema this gate reads`);
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
return errors;
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
/**
|
|
79
|
+
* Lower every `steps_green` gate into a generated deterministic gate step.
|
|
80
|
+
*
|
|
81
|
+
* The host keeps its own command and its own exit policy; the gate is a
|
|
82
|
+
* separate step, always fatal, that binds each named source's journaled output
|
|
83
|
+
* envelope and refuses any nonzero or malformed exit code. Dependents of the
|
|
84
|
+
* host gain a barrier on the gate, so "these steps were green" is established
|
|
85
|
+
* before anything downstream of the assertion runs.
|
|
86
|
+
*
|
|
87
|
+
* Runs BEFORE `lowerNamedGates`, which then adds each source's own named-gate
|
|
88
|
+
* barrier to the generated step and rewrites named-gate hosts to the permissive
|
|
89
|
+
* envelope schema this gate's bindings need.
|
|
90
|
+
*/
|
|
91
|
+
export function lowerStepsGreenGates(steps: readonly StepSpec[]): StepSpec[] {
|
|
92
|
+
const used = new Set(steps.map(step => step.id));
|
|
93
|
+
const barriers = new Map<string, string>();
|
|
94
|
+
for (const step of steps) {
|
|
95
|
+
// Deterministic hosts only, which `validateSpec` already enforces; the
|
|
96
|
+
// narrowing here is what lets the rewrite below stay type-exact.
|
|
97
|
+
if (step.type !== 'deterministic' || !isStepsGreenGate(step.verification)) continue;
|
|
98
|
+
let id = `${step.id}.green`;
|
|
99
|
+
while (used.has(id)) id += '.green';
|
|
100
|
+
used.add(id);
|
|
101
|
+
barriers.set(step.id, id);
|
|
102
|
+
}
|
|
103
|
+
if (barriers.size === 0) return [...steps];
|
|
104
|
+
|
|
105
|
+
// Every source's envelope has to be bindable. A source that declares no
|
|
106
|
+
// gate, or the implicit exit_code gate, gets the permissive whole-output
|
|
107
|
+
// schema; its exit policy is untouched, so a recording source stays red.
|
|
108
|
+
const bound = new Set(steps.flatMap(step =>
|
|
109
|
+
isStepsGreenGate(step.verification) ? step.verification.ids : []));
|
|
110
|
+
const output: StepSpec[] = [];
|
|
111
|
+
for (const step of steps) {
|
|
112
|
+
const dependencies = [...new Set([...(step.dependsOn ?? []), ...bindingDependencies(step.input)])];
|
|
113
|
+
const dependsOn = [...new Set([...dependencies, ...dependencies.flatMap(id => barriers.get(id) ?? [])])];
|
|
114
|
+
let producer: StepSpec = dependsOn.length ? { ...step, dependsOn } : step;
|
|
115
|
+
if (bound.has(step.id) && producer.type === 'deterministic'
|
|
116
|
+
&& (producer.verification === undefined || producer.verification.type === 'exit_code')) {
|
|
117
|
+
producer = { ...producer, verification: { type: 'json_schema', schema: true } };
|
|
118
|
+
}
|
|
119
|
+
const gate = step.verification;
|
|
120
|
+
if (producer.type !== 'deterministic' || !isStepsGreenGate(gate)) {
|
|
121
|
+
output.push(producer);
|
|
122
|
+
continue;
|
|
123
|
+
}
|
|
124
|
+
// The host's own gate becomes the implicit exit_code check. Its command
|
|
125
|
+
// still runs, and its own `onNonZero` still applies to its own exit. A
|
|
126
|
+
// host that is itself read by a later gate keeps the bindable envelope.
|
|
127
|
+
output.push({
|
|
128
|
+
...producer,
|
|
129
|
+
verification: bound.has(step.id) ? { type: 'json_schema', schema: true } : { type: 'exit_code' },
|
|
130
|
+
});
|
|
131
|
+
const input = Object.fromEntries(gate.ids.map((id, index) => [String(index), { step: id }]));
|
|
132
|
+
output.push({
|
|
133
|
+
id: barriers.get(step.id)!, type: 'deterministic',
|
|
134
|
+
// A named source that is itself a gate host must have passed its own
|
|
135
|
+
// assertion too — depending on the source alone would read its command
|
|
136
|
+
// exit and let this barrier pass while the inner gate is still red.
|
|
137
|
+
dependsOn: [...new Set([step.id, ...gate.ids, ...gate.ids.flatMap(id => barriers.get(id) ?? [])])], input,
|
|
138
|
+
command: greenCommand(gate.ids),
|
|
139
|
+
verification: { type: 'exit_code' }, maxIterations: step.maxIterations ?? 1,
|
|
140
|
+
...(step.requirements === undefined ? {} : { requirements: step.requirements }),
|
|
141
|
+
});
|
|
142
|
+
}
|
|
143
|
+
return output;
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
/**
|
|
147
|
+
* Compiler-owned Node command. Author-supplied ids are JSON literals and the
|
|
148
|
+
* recorded envelopes travel only through FLOWS_INPUT, never through shell text.
|
|
149
|
+
*/
|
|
150
|
+
function greenCommand(ids: readonly string[]): string {
|
|
151
|
+
const script = `const input=JSON.parse(process.env.FLOWS_INPUT);
|
|
152
|
+
const ids=${JSON.stringify(ids)};
|
|
153
|
+
const red=[];
|
|
154
|
+
for(let i=0;i<ids.length;i++){
|
|
155
|
+
const envelope=input[String(i)];
|
|
156
|
+
if(envelope===null||typeof envelope!=='object'||Array.isArray(envelope)){red.push(ids[i]+': no recorded outcome');continue;}
|
|
157
|
+
const code=envelope.exit_code;
|
|
158
|
+
if(typeof code!=='number'||!Number.isInteger(code)){red.push(ids[i]+': recorded no integer exit_code');continue;}
|
|
159
|
+
if(code!==0)red.push(ids[i]+': exit code '+code);
|
|
160
|
+
}
|
|
161
|
+
if(red.length>0){process.stderr.write('steps_green: '+red.join('; ')+'\\n');process.exit(1);}
|
|
162
|
+
process.stdout.write('steps_green:pass');`;
|
|
163
|
+
return `node -e '${script.replaceAll("'", "'\\''")}'`;
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
function isObject(value: unknown): value is Record<string, unknown> {
|
|
167
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
168
|
+
}
|
package/src/validate.ts
CHANGED
|
@@ -19,10 +19,12 @@ import type {
|
|
|
19
19
|
import { SPEC_SCHEMA_VERSION } from './spec.js';
|
|
20
20
|
import { validateOutputDeclaration } from './output-schema.js';
|
|
21
21
|
import { modelNameError } from './model-name.js';
|
|
22
|
+
import { agentCwdDeclarationError, agentCwdTransportError } from './agent-cwd.js';
|
|
22
23
|
import { unknownKeyErrors } from './unknown-keys.js';
|
|
23
24
|
import { stepDependencyErrors } from './step-dependencies.js';
|
|
24
25
|
import { inputBindingErrors } from './input-binding.js';
|
|
25
26
|
import { NAMED_GATE_KEYS, namedGateErrors } from './named-gates.js';
|
|
27
|
+
import { STEPS_GREEN_KEYS, stepsGreenErrors, stepsGreenReferenceErrors } from './steps-green.js';
|
|
26
28
|
import {
|
|
27
29
|
AGENT_DECLARATION_FIELDS,
|
|
28
30
|
FLOW_FIELDS,
|
|
@@ -74,6 +76,7 @@ const BUDGET_KEYS = ['maxTokensIn', 'maxTokensOut', 'maxDollars', 'maxTokens', '
|
|
|
74
76
|
const VERIFICATION_KEYS: Record<string, readonly string[]> = {
|
|
75
77
|
...NAMED_GATE_KEYS,
|
|
76
78
|
exit_code: ['type', 'expect'],
|
|
79
|
+
steps_green: STEPS_GREEN_KEYS,
|
|
77
80
|
output_contains: ['type', 'value'],
|
|
78
81
|
json_schema: ['type', 'schema'],
|
|
79
82
|
};
|
|
@@ -195,6 +198,9 @@ class Validator {
|
|
|
195
198
|
// Dependents must reference real step ids and form a DAG (no cycles).
|
|
196
199
|
for (const error of stepDependencyErrors(steps, this.ids)) this.fail(error);
|
|
197
200
|
for (const error of inputBindingErrors(steps)) this.fail(error);
|
|
201
|
+
// A steps_green gate that names nothing readable is the `|| true` failure
|
|
202
|
+
// it replaces, so its references are refused at the flow level, not lowered.
|
|
203
|
+
for (const error of stepsGreenReferenceErrors(steps)) this.fail(error);
|
|
198
204
|
return this.result();
|
|
199
205
|
}
|
|
200
206
|
|
|
@@ -443,10 +449,14 @@ class Validator {
|
|
|
443
449
|
} catch (error) {
|
|
444
450
|
this.fail(error instanceof Error ? error.message : `${at}.schema: expected JSON-compatible data`);
|
|
445
451
|
}
|
|
452
|
+
// Below here are the gates the COMPILER lowers; above are the three the
|
|
453
|
+
// kernel evaluates itself. The enumeration follows the same split.
|
|
454
|
+
} else if (gate.type === 'steps_green') {
|
|
455
|
+
for (const error of stepsGreenErrors(v, at, stepType)) this.fail(error);
|
|
446
456
|
} else if (Object.hasOwn(NAMED_GATE_KEYS, gate.type)) {
|
|
447
457
|
for (const error of namedGateErrors(v, input, at)) this.fail(error);
|
|
448
458
|
} else {
|
|
449
|
-
this.fail(`${at}.type: unknown_gate_kind: expected exit_code | output_contains | json_schema | references_input | subprocess_gate | word_count_bounds | regex_match | artifact_exists`);
|
|
459
|
+
this.fail(`${at}.type: unknown_gate_kind: expected exit_code | output_contains | json_schema | steps_green | references_input | subprocess_gate | word_count_bounds | regex_match | artifact_exists`);
|
|
450
460
|
}
|
|
451
461
|
}
|
|
452
462
|
|
|
@@ -460,6 +470,12 @@ class Validator {
|
|
|
460
470
|
if (st.timeoutMs !== undefined && !isPosInt(st.timeoutMs)) {
|
|
461
471
|
this.fail(`${at}.timeoutMs: expected a positive integer`);
|
|
462
472
|
}
|
|
473
|
+
// Only the two policies the kernel enum names. A third spelling would
|
|
474
|
+
// deserialize-fail in the kernel, so it is refused where the author can
|
|
475
|
+
// still read the error.
|
|
476
|
+
if (st.onNonZero !== undefined && st.onNonZero !== 'fail' && st.onNonZero !== 'record') {
|
|
477
|
+
this.fail(`${at}.onNonZero: expected fail | record`);
|
|
478
|
+
}
|
|
463
479
|
}
|
|
464
480
|
|
|
465
481
|
private validateLlm(st: LlmStepSpec, at: string): void {
|
|
@@ -486,13 +502,7 @@ class Validator {
|
|
|
486
502
|
}
|
|
487
503
|
this.validateCli(st.cli, at);
|
|
488
504
|
this.validateModel(st.model, at);
|
|
489
|
-
|
|
490
|
-
// check` and the run agree. Not resolved against the checking directory:
|
|
491
|
-
// that would make the compiled spec (and its hash) depend on where the
|
|
492
|
-
// check ran. `f.agent` resolves before compiling, so it never lands here.
|
|
493
|
-
if (st.cwd !== undefined && (!isNonEmptyString(st.cwd) || !st.cwd.startsWith('/'))) {
|
|
494
|
-
this.fail(`${at}.cwd: expected an absolute path (got ${JSON.stringify(st.cwd)})`);
|
|
495
|
-
}
|
|
505
|
+
this.validateCwd(st, at);
|
|
496
506
|
if (st.surfaces !== undefined) this.validateSurfaces(st.surfaces, `${at}.surfaces`);
|
|
497
507
|
if (st.permissions !== undefined) this.validatePermissions(st.permissions, `${at}.permissions`);
|
|
498
508
|
}
|
|
@@ -503,6 +513,23 @@ class Validator {
|
|
|
503
513
|
}
|
|
504
514
|
}
|
|
505
515
|
|
|
516
|
+
/**
|
|
517
|
+
* The declaration half of `cwd`: lexical, so an author sees the refusal from
|
|
518
|
+
* `flows check` rather than from a dispatch. Whether the directory exists and
|
|
519
|
+
* lies inside the run root is the worker's question (`agent-cwd.ts`), asked on
|
|
520
|
+
* the host that shares the agent's filesystem.
|
|
521
|
+
*/
|
|
522
|
+
private validateCwd(st: AgentStepSpec, at: string): void {
|
|
523
|
+
if (st.cwd === undefined) return;
|
|
524
|
+
const problem = agentCwdDeclarationError(st.cwd);
|
|
525
|
+
if (problem !== undefined) {
|
|
526
|
+
this.fail(`${at}.cwd: ${problem}`);
|
|
527
|
+
return;
|
|
528
|
+
}
|
|
529
|
+
const unsupported = agentCwdTransportError(st.cwd, st.transport);
|
|
530
|
+
if (unsupported !== undefined) this.fail(`${at}.${unsupported}`);
|
|
531
|
+
}
|
|
532
|
+
|
|
506
533
|
private validateModel(model: unknown, at: string, required = false): void {
|
|
507
534
|
// Rejecting the empty string matters: it would reach the CLI as
|
|
508
535
|
// RELAYFLOW_MODEL='', which reads as "declared, and declared as
|
package/src/worker-lease.ts
CHANGED
|
@@ -1,6 +1,33 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { JournalProtocolError, type JournalClient } from './journal-client.js';
|
|
2
2
|
import type { StepDispatchEvent } from './protocol.js';
|
|
3
3
|
|
|
4
|
+
export class WorkerLeaseLostError extends Error {
|
|
5
|
+
constructor(readonly reason: 'already_expired' | 'renewal_expired' | 'completion_expired', message: string) {
|
|
6
|
+
super(message);
|
|
7
|
+
this.name = 'WorkerLeaseLostError';
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
/** No cause traversal: worker errors preserve their original identity. */
|
|
12
|
+
export function isLeaseLost(error: unknown): boolean {
|
|
13
|
+
return error instanceof WorkerLeaseLostError || (error instanceof JournalProtocolError
|
|
14
|
+
&& (error.code === 'lease_conflict' || (error.code === 'run_terminal'
|
|
15
|
+
&& ['step.heartbeat', 'step.complete', 'step.wait'].includes(error.verb ?? ''))));
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
export function onWorkerFailure(label: string, fatal: (error: unknown) => void) {
|
|
19
|
+
return (error: unknown, dispatch?: StepDispatchEvent): void => {
|
|
20
|
+
// Without the dispatch there is no attempt to hand back to the kernel: fail closed.
|
|
21
|
+
if (!isLeaseLost(error) || dispatch === undefined) { fatal(error); return; }
|
|
22
|
+
// The kernel owns this attempt's fate; its journal supplies the run outcome.
|
|
23
|
+
// stderr keeps this diagnostic out of structured reports on stdout.
|
|
24
|
+
process.emitWarning(
|
|
25
|
+
`${label}: run_id=${dispatch.run_id} step_id=${dispatch.step_id} attempt=${dispatch.attempt}: ${String(error)}`,
|
|
26
|
+
{ code: 'FLOWS_WORKER_LEASE_LOST' },
|
|
27
|
+
);
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
|
|
4
31
|
/** Hold the dispatched lease only while its subprocess is still ours to run. */
|
|
5
32
|
export async function withWorkerLease<T>(
|
|
6
33
|
client: JournalClient,
|
|
@@ -16,12 +43,15 @@ export async function withWorkerLease<T>(
|
|
|
16
43
|
const fail = (error: unknown): void => { controller.abort(error); };
|
|
17
44
|
const armExpiry = (deadline: number): number => {
|
|
18
45
|
const remaining = deadline - Date.now();
|
|
19
|
-
if (!Number.isFinite(remaining)
|
|
46
|
+
if (!Number.isFinite(remaining)) {
|
|
20
47
|
throw new Error(`Agent lease is already expired for ${dispatch.run_id}/${dispatch.step_id}.`);
|
|
21
48
|
}
|
|
49
|
+
if (remaining <= 0) {
|
|
50
|
+
throw new WorkerLeaseLostError('already_expired', `Agent lease is already expired for ${dispatch.run_id}/${dispatch.step_id}.`);
|
|
51
|
+
}
|
|
22
52
|
latestDeadline = deadline;
|
|
23
53
|
if (expiryTimer !== undefined) clearTimeout(expiryTimer);
|
|
24
|
-
expiryTimer = setTimeout(() => fail(new
|
|
54
|
+
expiryTimer = setTimeout(() => fail(new WorkerLeaseLostError('renewal_expired',
|
|
25
55
|
`Agent lease expired before renewal for ${dispatch.run_id}/${dispatch.step_id}.`,
|
|
26
56
|
)), remaining);
|
|
27
57
|
return remaining;
|
|
@@ -34,7 +64,7 @@ export async function withWorkerLease<T>(
|
|
|
34
64
|
// A response handled after local expiry cannot revive ownership, even
|
|
35
65
|
// if its future deadline was issued before this event loop stalled.
|
|
36
66
|
if (Date.now() >= latestDeadline) {
|
|
37
|
-
throw new
|
|
67
|
+
throw new WorkerLeaseLostError('renewal_expired', `Agent lease expired before renewal for ${dispatch.run_id}/${dispatch.step_id}.`);
|
|
38
68
|
}
|
|
39
69
|
const remaining = armExpiry(result.lease_deadline_ms);
|
|
40
70
|
if (!stopped) {
|
|
@@ -57,7 +87,7 @@ export async function withWorkerLease<T>(
|
|
|
57
87
|
// Timer callbacks can be delayed behind a resolved subprocess promise.
|
|
58
88
|
// Check the clock itself before permitting step.complete.
|
|
59
89
|
if (Date.now() >= latestDeadline) {
|
|
60
|
-
throw new
|
|
90
|
+
throw new WorkerLeaseLostError('completion_expired', `Agent lease expired before completion for ${dispatch.run_id}/${dispatch.step_id}.`);
|
|
61
91
|
}
|
|
62
92
|
return result;
|
|
63
93
|
} finally {
|
package/src/worker.ts
CHANGED
|
@@ -6,6 +6,7 @@ import type { JournalClient } from './journal-client.js';
|
|
|
6
6
|
import type { Pins, StepDispatchEvent } from './protocol.js';
|
|
7
7
|
import type { KernelAgentStep } from './spec.js';
|
|
8
8
|
import { runAgentCli } from './worker-cli.js';
|
|
9
|
+
import { agentStepCwd } from './agent-cwd.js';
|
|
9
10
|
import { resolveCliModel } from './cli-adapter.js';
|
|
10
11
|
import { withWorkerLease } from './worker-lease.js';
|
|
11
12
|
import { workerInstruction } from './worker-input.js';
|
|
@@ -22,6 +23,14 @@ export interface AgentWorkerOptions {
|
|
|
22
23
|
requiredStreams?: string[];
|
|
23
24
|
dataDir?: string;
|
|
24
25
|
onPtyReady?: (path: string) => void;
|
|
26
|
+
/**
|
|
27
|
+
* The run root a step's declared `cwd` is resolved against and held inside.
|
|
28
|
+
* Defaults to this process's working directory, which is what the run root
|
|
29
|
+
* is: `flows run` attaches the worker from the directory it was invoked in,
|
|
30
|
+
* and that directory is the uploaded tree on the Cloud path. Named here so
|
|
31
|
+
* the root a dispatch is measured against is a value, not an assumption.
|
|
32
|
+
*/
|
|
33
|
+
runRoot?: string;
|
|
25
34
|
}
|
|
26
35
|
|
|
27
36
|
/**
|
|
@@ -95,7 +104,7 @@ export class AgentWorker extends EventEmitter {
|
|
|
95
104
|
if (this.closing) return;
|
|
96
105
|
if (dispatch.step_type !== 'agent') return;
|
|
97
106
|
const running: Promise<void> = this.execute(dispatch).catch((error: unknown) => {
|
|
98
|
-
this.emit('error', error);
|
|
107
|
+
this.emit('error', error, dispatch);
|
|
99
108
|
});
|
|
100
109
|
this.inFlight.add(running);
|
|
101
110
|
void running.finally(() => { this.inFlight.delete(running); });
|
|
@@ -113,21 +122,28 @@ export class AgentWorker extends EventEmitter {
|
|
|
113
122
|
if (communication) {
|
|
114
123
|
if (!this.options.dataDir) throw new Error('Agent communication requires a worker data directory');
|
|
115
124
|
const { completeCommunicationDispatch } = await import('./communication/worker.js');
|
|
116
|
-
await completeCommunicationDispatch(this.client, dispatch, communication, this.options.dataDir);
|
|
125
|
+
await completeCommunicationDispatch(this.client, dispatch, communication, this.options.dataDir, this.options.runRoot);
|
|
117
126
|
return;
|
|
118
127
|
}
|
|
119
128
|
let humanIntervention = false;
|
|
120
129
|
const effectiveModel = typeof spec.cli === 'string' ? resolveCliModel(spec.cli, spec.model) : spec.model;
|
|
130
|
+
// Resolved here, before the lease, because this is the process that shares
|
|
131
|
+
// the agent's filesystem. A refusal completes the step the way a missing
|
|
132
|
+
// CLI does — journaled as `worker_error` with the reason — rather than
|
|
133
|
+
// spawning into a directory nobody established is inside the run root.
|
|
134
|
+
const cwd = agentStepCwd(spec, dispatch.step_id, this.options.runRoot);
|
|
121
135
|
const completed: WorkerCliResult = await withWorkerLease(this.client, dispatch, signal =>
|
|
122
|
-
|
|
123
|
-
?
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
136
|
+
'refusal' in cwd
|
|
137
|
+
? Promise.resolve({ exit_code: null, stdout_tail: '', stderr_tail: cwd.refusal })
|
|
138
|
+
: typeof spec.cli === 'string' && typeof spec.instruction === 'string'
|
|
139
|
+
? runAgentCli(spec.cli, workerInstruction(spec.instruction, dispatch), dispatch.wake_context, effectiveModel, undefined, signal, 'agent', this.options.dataDir === undefined ? undefined : {
|
|
140
|
+
dataDir: this.options.dataDir, runId: dispatch.run_id, stepId: dispatch.step_id, attempt: dispatch.attempt,
|
|
141
|
+
onReady: this.options.onPtyReady, onDrive: () => { humanIntervention = true; },
|
|
142
|
+
}, cwd.directory ?? (spec.transport === 'relay' ? undefined : this.options.runRoot),
|
|
143
|
+
spec.transport === 'relay' ? 'relay' : 'direct',
|
|
144
|
+
{ runId: dispatch.run_id, stepId: dispatch.step_id, idempotencyKey: dispatch.idempotency_key,
|
|
145
|
+
dataDir: this.options.dataDir, resultSchema: spec.verification?.json_schema })
|
|
146
|
+
: Promise.resolve({ exit_code: null, stdout_tail: '', stderr_tail: 'agent step has no declared CLI' }));
|
|
131
147
|
const { result, usage } = workerSpend(completed, effectiveModel);
|
|
132
148
|
const completionReason = result.exit_code === 0 ? 'success' : 'worker_error';
|
|
133
149
|
|