@stigmer/runner 3.11.0 → 3.11.1-dev.20260812192248
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/README.md +2 -0
- package/dist/.build-fingerprint +1 -1
- package/dist/activities/discover-mcp-server.d.ts +7 -0
- package/dist/activities/discover-mcp-server.js +6 -4
- package/dist/activities/discover-mcp-server.js.map +1 -1
- package/dist/activities/emit-event.d.ts +14 -2
- package/dist/activities/emit-event.js +52 -17
- package/dist/activities/emit-event.js.map +1 -1
- package/dist/activities/execute-cursor/error-classifier.d.ts +19 -0
- package/dist/activities/execute-cursor/error-classifier.js +34 -3
- package/dist/activities/execute-cursor/error-classifier.js.map +1 -1
- package/dist/activities/execute-cursor/index.d.ts +46 -10
- package/dist/activities/execute-cursor/index.js +126 -36
- package/dist/activities/execute-cursor/index.js.map +1 -1
- package/dist/activities/execute-cursor/model-pricing-data.d.ts +2 -0
- package/dist/activities/execute-cursor/model-pricing-data.js +13 -3
- package/dist/activities/execute-cursor/model-pricing-data.js.map +1 -1
- package/dist/activities/execute-cursor/prompt-builder.d.ts +33 -0
- package/dist/activities/execute-cursor/prompt-builder.js +37 -0
- package/dist/activities/execute-cursor/prompt-builder.js.map +1 -1
- package/dist/activities/execute-cursor/turn-recovery.d.ts +52 -0
- package/dist/activities/execute-cursor/turn-recovery.js +193 -0
- package/dist/activities/execute-cursor/turn-recovery.js.map +1 -0
- package/dist/activities/execute-deep-agent/setup.js +16 -7
- package/dist/activities/execute-deep-agent/setup.js.map +1 -1
- package/dist/activities/execute-deep-agent/shell-env.d.ts +5 -1
- package/dist/activities/execute-deep-agent/shell-env.js +7 -9
- package/dist/activities/execute-deep-agent/shell-env.js.map +1 -1
- package/dist/activities/execute-deep-agent/subagent-transformer.js +7 -1
- package/dist/activities/execute-deep-agent/subagent-transformer.js.map +1 -1
- package/dist/activities/execute-deep-agent/subagent-wiring.d.ts +17 -3
- package/dist/activities/execute-deep-agent/subagent-wiring.js +14 -2
- package/dist/activities/execute-deep-agent/subagent-wiring.js.map +1 -1
- package/dist/activities/hydrate-workflow-execution.js +8 -5
- package/dist/activities/hydrate-workflow-execution.js.map +1 -1
- package/dist/activities/run-command.d.ts +5 -2
- package/dist/activities/run-command.js +22 -10
- package/dist/activities/run-command.js.map +1 -1
- package/dist/activities/run-env.d.ts +40 -0
- package/dist/activities/run-env.js +66 -0
- package/dist/activities/run-env.js.map +1 -0
- package/dist/bootstrap.js +5 -0
- package/dist/bootstrap.js.map +1 -1
- package/dist/client/stigmer-client.d.ts +83 -26
- package/dist/client/stigmer-client.js +88 -24
- package/dist/client/stigmer-client.js.map +1 -1
- package/dist/encryption/config.d.ts +41 -9
- package/dist/encryption/config.js +63 -23
- package/dist/encryption/config.js.map +1 -1
- package/dist/middleware/index.d.ts +3 -0
- package/dist/middleware/index.js +7 -0
- package/dist/middleware/index.js.map +1 -1
- package/dist/middleware/path-normalization.d.ts +57 -0
- package/dist/middleware/path-normalization.js +109 -0
- package/dist/middleware/path-normalization.js.map +1 -0
- package/dist/middleware/types.d.ts +8 -0
- package/dist/payload-codecs.d.ts +2 -1
- package/dist/payload-codecs.js +7 -3
- package/dist/payload-codecs.js.map +1 -1
- package/dist/runner-manager.js +17 -3
- package/dist/runner-manager.js.map +1 -1
- package/dist/runner.js +7 -3
- package/dist/runner.js.map +1 -1
- package/dist/shared/artifact-storage.d.ts +23 -1
- package/dist/shared/artifact-storage.js +51 -10
- package/dist/shared/artifact-storage.js.map +1 -1
- package/dist/shared/checkpointer/http-saver.d.ts +4 -20
- package/dist/shared/checkpointer/http-saver.js +15 -57
- package/dist/shared/checkpointer/http-saver.js.map +1 -1
- package/dist/shared/conversation-catchup.d.ts +9 -2
- package/dist/shared/conversation-catchup.js +39 -6
- package/dist/shared/conversation-catchup.js.map +1 -1
- package/dist/shared/grpc-retry.d.ts +5 -1
- package/dist/shared/grpc-retry.js +5 -1
- package/dist/shared/grpc-retry.js.map +1 -1
- package/dist/shared/http-retry.d.ts +51 -9
- package/dist/shared/http-retry.js +60 -9
- package/dist/shared/http-retry.js.map +1 -1
- package/dist/shared/mcp-manager.d.ts +8 -4
- package/dist/shared/mcp-manager.js +30 -4
- package/dist/shared/mcp-manager.js.map +1 -1
- package/dist/shared/mcp-schema-sanitizer.d.ts +70 -0
- package/dist/shared/mcp-schema-sanitizer.js +197 -0
- package/dist/shared/mcp-schema-sanitizer.js.map +1 -0
- package/dist/shared/model-client.d.ts +6 -0
- package/dist/shared/model-client.js +14 -3
- package/dist/shared/model-client.js.map +1 -1
- package/dist/shared/model-pricing-data.d.ts +2 -0
- package/dist/shared/model-pricing-data.js +13 -3
- package/dist/shared/model-pricing-data.js.map +1 -1
- package/dist/shared/model-registry.js +3 -2
- package/dist/shared/model-registry.js.map +1 -1
- package/dist/shared/plan-mode-permissions.d.ts +7 -0
- package/dist/shared/plan-mode-permissions.js +7 -0
- package/dist/shared/plan-mode-permissions.js.map +1 -1
- package/dist/shared/registry-endpoint.d.ts +20 -0
- package/dist/shared/registry-endpoint.js +25 -0
- package/dist/shared/registry-endpoint.js.map +1 -1
- package/dist/shared/runner-credential-keys.d.ts +24 -0
- package/dist/shared/runner-credential-keys.js +47 -0
- package/dist/shared/runner-credential-keys.js.map +1 -0
- package/dist/workflow-engine/resolve.d.ts +19 -1
- package/dist/workflow-engine/resolve.js +37 -2
- package/dist/workflow-engine/resolve.js.map +1 -1
- package/dist/workflows/connect-mcp-server.js +2 -0
- package/dist/workflows/connect-mcp-server.js.map +1 -1
- package/dist/workflows/types.d.ts +8 -0
- package/package.json +3 -4
- package/src/__test-utils__/__tests__/vitest-global-setup.test.ts +37 -0
- package/src/__test-utils__/vitest-global-setup.ts +50 -0
- package/src/__tests__/bootstrap.test.ts +43 -0
- package/src/__tests__/encryption-codec.test.ts +53 -0
- package/src/__tests__/preflight.test.ts +15 -0
- package/src/activities/__tests__/discover-mcp-server.test.ts +39 -1
- package/src/activities/__tests__/error-classifier.test.ts +94 -2
- package/src/activities/__tests__/run-command.test.ts +221 -0
- package/src/activities/discover-mcp-server.ts +16 -2
- package/src/activities/emit-event.ts +65 -21
- package/src/activities/execute-cursor/__tests__/build-prompt.test.ts +111 -2
- package/src/activities/execute-cursor/__tests__/model-pricing.test.ts +62 -1
- package/src/activities/execute-cursor/__tests__/turn-recovery.test.ts +160 -0
- package/src/activities/execute-cursor/error-classifier.ts +40 -3
- package/src/activities/execute-cursor/index.ts +154 -38
- package/src/activities/execute-cursor/model-pricing-data.ts +22 -3
- package/src/activities/execute-cursor/prompt-builder.ts +51 -0
- package/src/activities/execute-cursor/turn-recovery.ts +208 -0
- package/src/activities/execute-deep-agent/__tests__/plan-mode-path-normalization.test.ts +174 -0
- package/src/activities/execute-deep-agent/__tests__/shell-env.test.ts +24 -10
- package/src/activities/execute-deep-agent/__tests__/subagent-plan-mode-permissions.test.ts +22 -17
- package/src/activities/execute-deep-agent/setup.ts +16 -8
- package/src/activities/execute-deep-agent/shell-env.ts +8 -9
- package/src/activities/execute-deep-agent/subagent-transformer.ts +7 -1
- package/src/activities/execute-deep-agent/subagent-wiring.ts +26 -3
- package/src/activities/hydrate-workflow-execution.ts +8 -5
- package/src/activities/run-command.ts +25 -12
- package/src/activities/run-env.ts +79 -0
- package/src/bootstrap.ts +5 -0
- package/src/client/__tests__/stigmer-client.test.ts +104 -5
- package/src/client/stigmer-client.ts +128 -29
- package/src/encryption/config.ts +87 -23
- package/src/middleware/__tests__/path-normalization.test.ts +140 -0
- package/src/middleware/index.ts +8 -0
- package/src/middleware/path-normalization.ts +125 -0
- package/src/middleware/types.ts +11 -0
- package/src/payload-codecs.ts +8 -2
- package/src/runner-manager.ts +21 -3
- package/src/runner.ts +7 -3
- package/src/shared/__tests__/artifact-storage.test.ts +145 -2
- package/src/shared/__tests__/conversation-catchup.test.ts +24 -0
- package/src/shared/__tests__/http-retry.test.ts +5 -4
- package/src/shared/__tests__/mcp-manager.test.ts +53 -13
- package/src/shared/__tests__/mcp-schema-sanitizer.test.ts +267 -0
- package/src/shared/__tests__/model-client.test.ts +46 -0
- package/src/shared/__tests__/model-pricing.test.ts +62 -2
- package/src/shared/__tests__/model-registry.test.ts +22 -0
- package/src/shared/artifact-storage.ts +75 -10
- package/src/shared/checkpointer/http-saver.ts +15 -60
- package/src/shared/conversation-catchup.ts +39 -6
- package/src/shared/grpc-retry.ts +5 -1
- package/src/shared/http-retry.ts +98 -9
- package/src/shared/mcp-manager.ts +35 -4
- package/src/shared/mcp-schema-sanitizer.ts +224 -0
- package/src/shared/model-client.ts +21 -3
- package/src/shared/model-pricing-data.ts +22 -3
- package/src/shared/model-registry.ts +7 -2
- package/src/shared/plan-mode-permissions.ts +7 -0
- package/src/shared/registry-endpoint.ts +27 -0
- package/src/shared/runner-credential-keys.ts +46 -0
- package/src/workflow-engine/__tests__/tasks/emit-event.test.ts +127 -49
- package/src/workflow-engine/resolve.ts +48 -2
- package/src/workflows/__tests__/connect-mcp-server.test.ts +25 -0
- package/src/workflows/connect-mcp-server.ts +2 -0
- package/src/workflows/types.ts +8 -0
- package/dist/activities/execute-cursor/mcp-config.d.ts +0 -30
- package/dist/activities/execute-cursor/mcp-config.js +0 -39
- package/dist/activities/execute-cursor/mcp-config.js.map +0 -1
- package/src/activities/execute-cursor/mcp-config.ts +0 -66
|
@@ -360,11 +360,17 @@ export async function compileSubagents(transformed, opts) {
|
|
|
360
360
|
// Structural coupling (DD-19): a sub-agent gate flows gitignored writes into
|
|
361
361
|
// CAS iff a CAS observer backs that sub-agent's filesystem backend. Deriving
|
|
362
362
|
// both from the same `casObserver` makes "unobserved unreviewable bytes"
|
|
363
|
-
// impossible by construction.
|
|
363
|
+
// impossible by construction. Same idiom for path normalization
|
|
364
|
+
// (issue #429): derived from the same `permissions` baked into the graph
|
|
365
|
+
// below, so a rule-bearing graph always carries the shim that keeps
|
|
366
|
+
// prompt-compliant relative paths from dying in rule validation.
|
|
364
367
|
const middleware = buildSubAgentMiddleware({
|
|
365
368
|
costCap: opts.costCap,
|
|
366
369
|
approvalGate: opts.approvalGate,
|
|
367
370
|
captureIgnored: !!opts.casObserver,
|
|
371
|
+
...(opts.permissions?.length
|
|
372
|
+
? { pathNormalization: { rootDir: opts.workspaceRootDir } }
|
|
373
|
+
: {}),
|
|
368
374
|
});
|
|
369
375
|
const modelName = spec.model ?? opts.parentModelName;
|
|
370
376
|
// Use a configured model instance (proxy base URL + auth, plus registry
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subagent-transformer.js","sourceRoot":"","sources":["../../../src/activities/execute-deep-agent/subagent-transformer.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"subagent-transformer.js","sourceRoot":"","sources":["../../../src/activities/execute-deep-agent/subagent-transformer.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,12 @@
|
|
|
2
2
|
* Sub-agent middleware composition for ExecuteDeepAgent.
|
|
3
3
|
*
|
|
4
4
|
* Each sub-agent gets its own middleware stack with:
|
|
5
|
+
* - Path normalization (issue #429), FIRST and only on permission-rule-
|
|
6
|
+
* bearing graphs (plan mode) — workspace-relative paths are rewritten to
|
|
7
|
+
* workspace-absolute before deepagents' permission validation refuses
|
|
8
|
+
* them, exactly as on the parent. `compileSubagents` derives it from the
|
|
9
|
+
* same `permissions` option it bakes into the graph, keeping the rules
|
|
10
|
+
* and their normalization shim coupled.
|
|
5
11
|
* - Fresh loop detection (independent cycle tracking)
|
|
6
12
|
* - Fresh tool truncation (same limits as parent)
|
|
7
13
|
* - Periodic execution budget (interval=30, max=4 advisories)
|
|
@@ -26,7 +32,7 @@
|
|
|
26
32
|
* the gate runs inside the sub-agent in the first place — omitting it here was
|
|
27
33
|
* the live HITL bypass this wiring closes.
|
|
28
34
|
*/
|
|
29
|
-
import type { StigmerMiddleware, ToolTruncationConfig } from "../../middleware/types.js";
|
|
35
|
+
import type { StigmerMiddleware, ToolTruncationConfig, PathNormalizationConfig } from "../../middleware/types.js";
|
|
30
36
|
import type { CostCapMiddleware } from "../../middleware/index.js";
|
|
31
37
|
import { type ApprovalGateConfig } from "../../middleware/approval-gate.js";
|
|
32
38
|
export interface SubAgentMiddlewareOptions {
|
|
@@ -47,13 +53,21 @@ export interface SubAgentMiddlewareOptions {
|
|
|
47
53
|
* unobserved backend would apply unreviewable bytes.
|
|
48
54
|
*/
|
|
49
55
|
readonly captureIgnored?: boolean;
|
|
56
|
+
/**
|
|
57
|
+
* Workspace-relative path normalization (issue #429). Present iff this
|
|
58
|
+
* sub-agent's graph carries filesystem permission rules — the caller
|
|
59
|
+
* derives it from the same `permissions` value it bakes into the graph.
|
|
60
|
+
*/
|
|
61
|
+
readonly pathNormalization?: PathNormalizationConfig;
|
|
50
62
|
}
|
|
51
63
|
/**
|
|
52
64
|
* Build the middleware stack for a single sub-agent.
|
|
53
65
|
*
|
|
54
66
|
* Returns an ordered array mirroring the parent composition:
|
|
55
|
-
* loop detection → execution budget (periodic) →
|
|
56
|
-
* [approval gate] → cost cap view → error hints.
|
|
67
|
+
* [path normalization] → loop detection → execution budget (periodic) →
|
|
68
|
+
* tool truncation → [approval gate] → cost cap view → error hints.
|
|
69
|
+
* Normalization is outermost so everything downstream observes canonical
|
|
70
|
+
* workspace-absolute paths (matching the parent). The gate sits before the
|
|
57
71
|
* cost-cap view so an approval pause happens before budget accounting, and
|
|
58
72
|
* error hints come after the gate — both matching the parent order
|
|
59
73
|
* (…→ truncation → graceful-stop → approval gate → cost cap → error hints …),
|
|
@@ -2,6 +2,12 @@
|
|
|
2
2
|
* Sub-agent middleware composition for ExecuteDeepAgent.
|
|
3
3
|
*
|
|
4
4
|
* Each sub-agent gets its own middleware stack with:
|
|
5
|
+
* - Path normalization (issue #429), FIRST and only on permission-rule-
|
|
6
|
+
* bearing graphs (plan mode) — workspace-relative paths are rewritten to
|
|
7
|
+
* workspace-absolute before deepagents' permission validation refuses
|
|
8
|
+
* them, exactly as on the parent. `compileSubagents` derives it from the
|
|
9
|
+
* same `permissions` option it bakes into the graph, keeping the rules
|
|
10
|
+
* and their normalization shim coupled.
|
|
5
11
|
* - Fresh loop detection (independent cycle tracking)
|
|
6
12
|
* - Fresh tool truncation (same limits as parent)
|
|
7
13
|
* - Periodic execution budget (interval=30, max=4 advisories)
|
|
@@ -26,6 +32,7 @@
|
|
|
26
32
|
* the gate runs inside the sub-agent in the first place — omitting it here was
|
|
27
33
|
* the live HITL bypass this wiring closes.
|
|
28
34
|
*/
|
|
35
|
+
import { createPathNormalizationMiddleware } from "../../middleware/path-normalization.js";
|
|
29
36
|
import { createLoopDetectionMiddleware } from "../../middleware/loop-detection.js";
|
|
30
37
|
import { createToolTruncationMiddleware } from "../../middleware/tool-truncation.js";
|
|
31
38
|
import { createExecutionBudgetMiddleware } from "../../middleware/execution-budget.js";
|
|
@@ -37,8 +44,10 @@ const SUB_AGENT_MAX_ADVISORIES = 4;
|
|
|
37
44
|
* Build the middleware stack for a single sub-agent.
|
|
38
45
|
*
|
|
39
46
|
* Returns an ordered array mirroring the parent composition:
|
|
40
|
-
* loop detection → execution budget (periodic) →
|
|
41
|
-
* [approval gate] → cost cap view → error hints.
|
|
47
|
+
* [path normalization] → loop detection → execution budget (periodic) →
|
|
48
|
+
* tool truncation → [approval gate] → cost cap view → error hints.
|
|
49
|
+
* Normalization is outermost so everything downstream observes canonical
|
|
50
|
+
* workspace-absolute paths (matching the parent). The gate sits before the
|
|
42
51
|
* cost-cap view so an approval pause happens before budget accounting, and
|
|
43
52
|
* error hints come after the gate — both matching the parent order
|
|
44
53
|
* (…→ truncation → graceful-stop → approval gate → cost cap → error hints …),
|
|
@@ -46,6 +55,9 @@ const SUB_AGENT_MAX_ADVISORIES = 4;
|
|
|
46
55
|
*/
|
|
47
56
|
export function buildSubAgentMiddleware(options = {}) {
|
|
48
57
|
const stack = [];
|
|
58
|
+
if (options.pathNormalization) {
|
|
59
|
+
stack.push(createPathNormalizationMiddleware(options.pathNormalization));
|
|
60
|
+
}
|
|
49
61
|
stack.push(createLoopDetectionMiddleware({ enabled: true }));
|
|
50
62
|
stack.push(createExecutionBudgetMiddleware({
|
|
51
63
|
warningInterval: SUB_AGENT_ADVISORY_INTERVAL,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subagent-wiring.js","sourceRoot":"","sources":["../../../src/activities/execute-deep-agent/subagent-wiring.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"subagent-wiring.js","sourceRoot":"","sources":["../../../src/activities/execute-deep-agent/subagent-wiring.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AAQH,OAAO,EAAE,iCAAiC,EAAE,MAAM,wCAAwC,CAAC;AAC3F,OAAO,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AACnF,OAAO,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AACrF,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AACvF,OAAO,EACL,4BAA4B,GAE7B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAE7E,MAAM,2BAA2B,GAAG,EAAE,CAAC;AACvC,MAAM,wBAAwB,GAAG,CAAC,CAAC;AA4BnC;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,uBAAuB,CACrC,UAAqC,EAAE;IAEvC,MAAM,KAAK,GAAwB,EAAE,CAAC;IAEtC,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;QAC9B,KAAK,CAAC,IAAI,CAAC,iCAAiC,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,6BAA6B,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAE7D,KAAK,CAAC,IAAI,CAAC,+BAA+B,CAAC;QACzC,eAAe,EAAE,2BAA2B;QAC5C,WAAW,EAAE,wBAAwB;KACtC,CAAC,CAAC,CAAC;IAEJ,KAAK,CAAC,IAAI,CAAC,8BAA8B,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC;IAEnE,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;QACzB,6EAA6E;QAC7E,6EAA6E;QAC7E,uEAAuE;QACvE,0EAA0E;QAC1E,6EAA6E;QAC7E,uEAAuE;QACvE,+EAA+E;QAC/E,2EAA2E;QAC3E,+EAA+E;QAC/E,KAAK,CAAC,IAAI,CAAC,4BAA4B,CACrC,OAAO,CAAC,cAAc;YACpB,CAAC,CAAC,OAAO,CAAC,YAAY;YACtB,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,cAAc,EAAE,KAAK,EAAE,mBAAmB,EAAE,SAAS,EAAE,CACvF,CAAC,CAAC;IACL,CAAC;IAED,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,0BAA0B,EAAE,CAAC,CAAC;IAEzC,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
@@ -175,11 +175,14 @@ function parseWorkflowYaml(yaml, workflowId) {
|
|
|
175
175
|
}
|
|
176
176
|
}
|
|
177
177
|
async function fetchAndFlattenEnv(client, executionId) {
|
|
178
|
-
//
|
|
179
|
-
//
|
|
180
|
-
//
|
|
181
|
-
//
|
|
182
|
-
//
|
|
178
|
+
// The runner acquires a token scoped to this workflow execution so the
|
|
179
|
+
// server's decrypt gate binds the read: a desktop runner exchanges its
|
|
180
|
+
// bootstrap credential (#156, hard error on failure — the bootstrap
|
|
181
|
+
// credential no longer decrypts since stigmer-cloud#218, so proceeding
|
|
182
|
+
// would hydrate redacted placeholders), and an OSS runner asks the
|
|
183
|
+
// credential-less best-effort exchange (oss#535 — the OSS server redacts
|
|
184
|
+
// EC reads by default and mints execution-scoped tokens). No-op for cloud
|
|
185
|
+
// sandbox runners, whose ambient credential is already scoped.
|
|
183
186
|
const scopedToken = await client.acquireScopedRunnerToken({
|
|
184
187
|
workflowExecutionId: executionId,
|
|
185
188
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hydrate-workflow-execution.js","sourceRoot":"","sources":["../../src/activities/hydrate-workflow-execution.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"hydrate-workflow-execution.js","sourceRoot":"","sources":["../../src/activities/hydrate-workflow-execution.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,8 +5,11 @@
|
|
|
5
5
|
* - RunScript: writes inline code to a temp file, executes via node/python
|
|
6
6
|
* - RunShell: executes a shell command directly
|
|
7
7
|
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
8
|
+
* The child environment follows the declare-to-receive contract in
|
|
9
|
+
* run-env.ts: a minimal base plus the task's declared `environment`,
|
|
10
|
+
* with runtime placeholders (JIT secrets) resolved here in the activity
|
|
11
|
+
* so secret values never enter Temporal history. Both activities capture
|
|
12
|
+
* stdout as the activity result.
|
|
10
13
|
*/
|
|
11
14
|
import type { RunCommandConfig } from "../workflow-engine/types.js";
|
|
12
15
|
export declare function createRunCommandActivities(): {
|
|
@@ -5,8 +5,11 @@
|
|
|
5
5
|
* - RunScript: writes inline code to a temp file, executes via node/python
|
|
6
6
|
* - RunShell: executes a shell command directly
|
|
7
7
|
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
8
|
+
* The child environment follows the declare-to-receive contract in
|
|
9
|
+
* run-env.ts: a minimal base plus the task's declared `environment`,
|
|
10
|
+
* with runtime placeholders (JIT secrets) resolved here in the activity
|
|
11
|
+
* so secret values never enter Temporal history. Both activities capture
|
|
12
|
+
* stdout as the activity result.
|
|
10
13
|
*/
|
|
11
14
|
import { execFile, exec } from "node:child_process";
|
|
12
15
|
import { writeFile, mkdtemp, rm } from "node:fs/promises";
|
|
@@ -14,7 +17,9 @@ import { tmpdir } from "node:os";
|
|
|
14
17
|
import { join } from "node:path";
|
|
15
18
|
import { promisify } from "node:util";
|
|
16
19
|
import { ApplicationFailure } from "@temporalio/activity";
|
|
20
|
+
import { RuntimePlaceholderResolutionError } from "../workflow-engine/resolve.js";
|
|
17
21
|
import { startHeartbeat } from "../shared/heartbeat.js";
|
|
22
|
+
import { buildRunEnv } from "./run-env.js";
|
|
18
23
|
const execFileAsync = promisify(execFile);
|
|
19
24
|
const execAsync = promisify(exec);
|
|
20
25
|
export function createRunCommandActivities() {
|
|
@@ -45,7 +50,7 @@ async function runScriptImpl(config) {
|
|
|
45
50
|
}
|
|
46
51
|
const language = config.language;
|
|
47
52
|
const code = config.code;
|
|
48
|
-
const env =
|
|
53
|
+
const env = buildTaskEnv(config);
|
|
49
54
|
const ext = language === "js" ? ".js" : ".py";
|
|
50
55
|
const interpreter = language === "js" ? "node" : "python3";
|
|
51
56
|
let tempDir;
|
|
@@ -82,7 +87,7 @@ async function runShellImpl(config) {
|
|
|
82
87
|
const fullCommand = args.length > 0
|
|
83
88
|
? `${command} ${args.join(" ")}`
|
|
84
89
|
: command;
|
|
85
|
-
const env =
|
|
90
|
+
const env = buildTaskEnv(config);
|
|
86
91
|
try {
|
|
87
92
|
const { stdout } = await execAsync(fullCommand, {
|
|
88
93
|
env,
|
|
@@ -98,14 +103,21 @@ async function runShellImpl(config) {
|
|
|
98
103
|
throw err;
|
|
99
104
|
}
|
|
100
105
|
}
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
+
/**
|
|
107
|
+
* Build the child env per the run-env.ts contract, translating a missing
|
|
108
|
+
* placeholder key into a non-retryable failure — retrying cannot conjure
|
|
109
|
+
* a variable the workflow's runtime env does not have.
|
|
110
|
+
*/
|
|
111
|
+
function buildTaskEnv(config) {
|
|
112
|
+
try {
|
|
113
|
+
return buildRunEnv(config.environment, config.runtimeEnv);
|
|
114
|
+
}
|
|
115
|
+
catch (err) {
|
|
116
|
+
if (err instanceof RuntimePlaceholderResolutionError) {
|
|
117
|
+
throw ApplicationFailure.nonRetryable(err.message, "RUN_ENV_UNRESOLVED_PLACEHOLDER", { variable: err.variableName });
|
|
106
118
|
}
|
|
119
|
+
throw err;
|
|
107
120
|
}
|
|
108
|
-
return base;
|
|
109
121
|
}
|
|
110
122
|
function buildArgsList(args) {
|
|
111
123
|
if (!args)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../../src/activities/run-command.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../../src/activities/run-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Environment contract for the workflow `run` task (shell and script modes).
|
|
3
|
+
*
|
|
4
|
+
* Declare-to-receive, the same rule the stdio MCP contract adopted after
|
|
5
|
+
* #256 (PR #383): the child process sees ONLY
|
|
6
|
+
*
|
|
7
|
+
* 1. a minimal base copied from the runner process
|
|
8
|
+
* ({@link RUN_ENV_BASE_KEYS} — the six variables the MCP SDK pins),
|
|
9
|
+
* 2. the task's declared `environment` map, with `${.secrets.KEY}` /
|
|
10
|
+
* `${.env_vars.KEY}` placeholders resolved just-in-time from the
|
|
11
|
+
* workflow's runtime env. Resolution happens here in the activity,
|
|
12
|
+
* never in the deterministic workflow phase, so secret values stay
|
|
13
|
+
* out of Temporal history.
|
|
14
|
+
*
|
|
15
|
+
* Runner credentials (STIGMER_TOKEN, the HITL secret, provider keys) are
|
|
16
|
+
* structurally absent rather than denylisted — a workflow-authored
|
|
17
|
+
* `printenv` cannot read what was never passed (oss#384). A missing
|
|
18
|
+
* placeholder key fails loudly: running a command with a silently-empty
|
|
19
|
+
* credential produces cryptic downstream failures.
|
|
20
|
+
*
|
|
21
|
+
* Placeholders resolve only in declared environment VALUES, never in
|
|
22
|
+
* `command` / `code` strings — argv is visible to `ps` on the host, so
|
|
23
|
+
* the environment is the sanctioned channel for secrets.
|
|
24
|
+
*/
|
|
25
|
+
/**
|
|
26
|
+
* Base variables copied from the runner process when present — the same
|
|
27
|
+
* six the MCP SDK provides to stdio servers, so "undeclared subprocess
|
|
28
|
+
* environment" has one platform-wide answer. `PATH` keeps interpreters
|
|
29
|
+
* and tools findable; the rest keep shells and language runtimes sane.
|
|
30
|
+
*/
|
|
31
|
+
export declare const RUN_ENV_BASE_KEYS: readonly string[];
|
|
32
|
+
/**
|
|
33
|
+
* Build the environment for a run task's child process: minimal base +
|
|
34
|
+
* declared overlay with strict placeholder resolution (declared wins on
|
|
35
|
+
* conflict with the base).
|
|
36
|
+
*
|
|
37
|
+
* @throws RuntimePlaceholderResolutionError when a declared value
|
|
38
|
+
* references a runtime key that does not exist.
|
|
39
|
+
*/
|
|
40
|
+
export declare function buildRunEnv(declaredEnv: Readonly<Record<string, string>> | undefined, runtimeEnv: Readonly<Record<string, unknown>>, baseEnv?: NodeJS.ProcessEnv): Record<string, string>;
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Environment contract for the workflow `run` task (shell and script modes).
|
|
3
|
+
*
|
|
4
|
+
* Declare-to-receive, the same rule the stdio MCP contract adopted after
|
|
5
|
+
* #256 (PR #383): the child process sees ONLY
|
|
6
|
+
*
|
|
7
|
+
* 1. a minimal base copied from the runner process
|
|
8
|
+
* ({@link RUN_ENV_BASE_KEYS} — the six variables the MCP SDK pins),
|
|
9
|
+
* 2. the task's declared `environment` map, with `${.secrets.KEY}` /
|
|
10
|
+
* `${.env_vars.KEY}` placeholders resolved just-in-time from the
|
|
11
|
+
* workflow's runtime env. Resolution happens here in the activity,
|
|
12
|
+
* never in the deterministic workflow phase, so secret values stay
|
|
13
|
+
* out of Temporal history.
|
|
14
|
+
*
|
|
15
|
+
* Runner credentials (STIGMER_TOKEN, the HITL secret, provider keys) are
|
|
16
|
+
* structurally absent rather than denylisted — a workflow-authored
|
|
17
|
+
* `printenv` cannot read what was never passed (oss#384). A missing
|
|
18
|
+
* placeholder key fails loudly: running a command with a silently-empty
|
|
19
|
+
* credential produces cryptic downstream failures.
|
|
20
|
+
*
|
|
21
|
+
* Placeholders resolve only in declared environment VALUES, never in
|
|
22
|
+
* `command` / `code` strings — argv is visible to `ps` on the host, so
|
|
23
|
+
* the environment is the sanctioned channel for secrets.
|
|
24
|
+
*/
|
|
25
|
+
import { resolveRuntimePlaceholdersStrict } from "../workflow-engine/resolve.js";
|
|
26
|
+
/**
|
|
27
|
+
* Base variables copied from the runner process when present — the same
|
|
28
|
+
* six the MCP SDK provides to stdio servers, so "undeclared subprocess
|
|
29
|
+
* environment" has one platform-wide answer. `PATH` keeps interpreters
|
|
30
|
+
* and tools findable; the rest keep shells and language runtimes sane.
|
|
31
|
+
*/
|
|
32
|
+
export const RUN_ENV_BASE_KEYS = [
|
|
33
|
+
"HOME",
|
|
34
|
+
"LOGNAME",
|
|
35
|
+
"PATH",
|
|
36
|
+
"SHELL",
|
|
37
|
+
"TERM",
|
|
38
|
+
"USER",
|
|
39
|
+
];
|
|
40
|
+
/**
|
|
41
|
+
* Build the environment for a run task's child process: minimal base +
|
|
42
|
+
* declared overlay with strict placeholder resolution (declared wins on
|
|
43
|
+
* conflict with the base).
|
|
44
|
+
*
|
|
45
|
+
* @throws RuntimePlaceholderResolutionError when a declared value
|
|
46
|
+
* references a runtime key that does not exist.
|
|
47
|
+
*/
|
|
48
|
+
export function buildRunEnv(declaredEnv, runtimeEnv, baseEnv = process.env) {
|
|
49
|
+
const env = {};
|
|
50
|
+
for (const key of RUN_ENV_BASE_KEYS) {
|
|
51
|
+
const value = baseEnv[key];
|
|
52
|
+
if (value !== undefined)
|
|
53
|
+
env[key] = value;
|
|
54
|
+
}
|
|
55
|
+
if (!declaredEnv || Object.keys(declaredEnv).length === 0) {
|
|
56
|
+
// The only case whose behavior changed in oss#384 (previously the
|
|
57
|
+
// child inherited the full runner env) — leave a trace for operators.
|
|
58
|
+
console.log("run task declares no environment — child receives the minimal base env only");
|
|
59
|
+
return env;
|
|
60
|
+
}
|
|
61
|
+
for (const [key, value] of Object.entries(declaredEnv)) {
|
|
62
|
+
env[key] = resolveRuntimePlaceholdersStrict(value, runtimeEnv, `environment "${key}"`);
|
|
63
|
+
}
|
|
64
|
+
return env;
|
|
65
|
+
}
|
|
66
|
+
//# sourceMappingURL=run-env.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-env.js","sourceRoot":"","sources":["../../src/activities/run-env.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,gCAAgC,EAAE,MAAM,+BAA+B,CAAC;AAEjF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAsB;IAClD,MAAM;IACN,SAAS;IACT,MAAM;IACN,OAAO;IACP,MAAM;IACN,MAAM;CACP,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,UAAU,WAAW,CACzB,WAAyD,EACzD,UAA6C,EAC7C,UAA6B,OAAO,CAAC,GAAG;IAExC,MAAM,GAAG,GAA2B,EAAE,CAAC;IAEvC,KAAK,MAAM,GAAG,IAAI,iBAAiB,EAAE,CAAC;QACpC,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;QAC3B,IAAI,KAAK,KAAK,SAAS;YAAE,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IAC5C,CAAC;IAED,IAAI,CAAC,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1D,kEAAkE;QAClE,sEAAsE;QACtE,OAAO,CAAC,GAAG,CAAC,6EAA6E,CAAC,CAAC;QAC3F,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;QACvD,GAAG,CAAC,GAAG,CAAC,GAAG,gCAAgC,CACzC,KAAK,EACL,UAAU,EACV,gBAAgB,GAAG,GAAG,CACvB,CAAC;IACJ,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}
|
package/dist/bootstrap.js
CHANGED
|
@@ -69,6 +69,11 @@ export async function resolveRunnerBootstrap(options, clientFactory = defaultCli
|
|
|
69
69
|
// (OSS / no signing key) and is handled by the runner, not treated as fatal.
|
|
70
70
|
runnerAccessToken: discovered.runnerAccessToken,
|
|
71
71
|
runnerAccessTokenExpiresInSeconds: discovered.runnerAccessTokenExpiresInSeconds,
|
|
72
|
+
// Server-managed payload-encryption keys ride the same best-effort lane:
|
|
73
|
+
// absent on OSS (env-configured keys) and on cloud servers predating key
|
|
74
|
+
// management. Note the explicit-address and localhost branches above return
|
|
75
|
+
// none by construction — key management only exists where discovery does.
|
|
76
|
+
payloadEncryption: discovered.payloadEncryption,
|
|
72
77
|
};
|
|
73
78
|
}
|
|
74
79
|
/**
|
package/dist/bootstrap.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../src/bootstrap.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAeH,MAAM,sBAAsB,GAAG,gBAAgB,CAAC;AAChD,MAAM,0BAA0B,GAAG,SAAS,CAAC;AA0B7C,MAAM,oBAAoB,GAA2B,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE;IAC7E,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,4BAA4B,CAAC,CAAC;IACrE,OAAO,IAAI,aAAa,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;AAChD,CAAC,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,OAA+B,EAC/B,gBAAwC,oBAAoB;IAE5D,MAAM,QAAQ,GAAG,OAAO,CAAC,eAAe,EAAE,IAAI,EAAE,CAAC;IACjD,MAAM,SAAS,GAAG,OAAO,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,0BAA0B,CAAC;IAElF,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,iBAAiB,EAAE,SAAS,EAAE,CAAC;IACrE,CAAC;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC;IACpC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO;YACL,eAAe,EAAE,sBAAsB;YACvC,iBAAiB,EAAE,SAAS;SAC7B,CAAC;IACJ,CAAC;IAED,IAAI,UAAiC,CAAC;IACtC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;QACnE,UAAU,GAAG,MAAM,MAAM,CAAC,wBAAwB,EAAE,CAAC;IACvD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,MAAM,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAChE,MAAM,IAAI,KAAK,CACb,gDAAgD,OAAO,CAAC,eAAe,KAAK,MAAM,IAAI;YACpF,qFAAqF;YACrF,uDAAuD,CAC1D,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,IAAI,EAAE,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CACb,yBAAyB,OAAO,CAAC,eAAe,uCAAuC;YACrF,+FAA+F,CAClG,CAAC;IACJ,CAAC;IAED,OAAO;QACL,eAAe,EAAE,UAAU,CAAC,eAAe,CAAC,IAAI,EAAE;QAClD,iBAAiB,EAAE,UAAU,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,0BAA0B;QACrF,6EAA6E;QAC7E,6EAA6E;QAC7E,iBAAiB,EAAE,UAAU,CAAC,iBAAiB;QAC/C,iCAAiC,EAAE,UAAU,CAAC,iCAAiC;
|
|
1
|
+
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../src/bootstrap.ts"],"names":[],"mappings":"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"}
|