@revisium/orchestrator 0.1.0 → 0.2.0-alpha.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/README.md +78 -0
- package/control-plane/bootstrap.config.json +43 -1
- package/control-plane/default-playbook/catalog/pipelines.json +941 -3
- package/control-plane/default-playbook/catalog/roles.json +54 -0
- package/dist/api/graphql-api/graphql-ws/pubsub.module.js +0 -1
- package/dist/api/graphql-api/graphql-ws/pubsub.module.js.map +1 -1
- package/dist/api/graphql-api/graphql-ws/run-progress-subscription-poller.service.js +0 -1
- package/dist/api/graphql-api/graphql-ws/run-progress-subscription-poller.service.js.map +1 -1
- package/dist/api/graphql-api/graphql-ws/subscription-bridge.service.js +0 -1
- package/dist/api/graphql-api/graphql-ws/subscription-bridge.service.js.map +1 -1
- package/dist/api/graphql-api/pr/model/pr-readiness.model.js +0 -4
- package/dist/api/graphql-api/pr/model/pr-readiness.model.js.map +1 -1
- package/dist/cli/commands/doctor-report.js +0 -18
- package/dist/cli/commands/doctor-report.js.map +1 -1
- package/dist/cli/commands/lifecycle.js +3 -71
- package/dist/cli/commands/lifecycle.js.map +1 -1
- package/dist/cli/commands/mcp.js +0 -14
- package/dist/cli/commands/mcp.js.map +1 -1
- package/dist/cli/commands/process-tree.js +4 -26
- package/dist/cli/commands/process-tree.js.map +1 -1
- package/dist/cli/commands/revisium-helpers.js +0 -6
- package/dist/cli/commands/revisium-helpers.js.map +1 -1
- package/dist/cli/commands/rogue-reaper.js +0 -34
- package/dist/cli/commands/rogue-reaper.js.map +1 -1
- package/dist/cli/index.js +0 -4
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/program.js +0 -5
- package/dist/cli/program.js.map +1 -1
- package/dist/config.js +0 -25
- package/dist/config.js.map +1 -1
- package/dist/control-plane/bootstrap.js +0 -28
- package/dist/control-plane/bootstrap.js.map +1 -1
- package/dist/control-plane/change-notifications.js +0 -1
- package/dist/control-plane/change-notifications.js.map +1 -1
- package/dist/control-plane/client-transport.js +0 -11
- package/dist/control-plane/client-transport.js.map +1 -1
- package/dist/control-plane/definitions.js +8 -17
- package/dist/control-plane/definitions.js.map +1 -1
- package/dist/control-plane/inbox.js +2 -120
- package/dist/control-plane/inbox.js.map +1 -1
- package/dist/control-plane/resolve-cwd.js +0 -61
- package/dist/control-plane/resolve-cwd.js.map +1 -1
- package/dist/control-plane/schema-migration.js +0 -9
- package/dist/control-plane/schema-migration.js.map +1 -1
- package/dist/control-plane/seed-default-playbook.js +5 -70
- package/dist/control-plane/seed-default-playbook.js.map +1 -1
- package/dist/control-plane/steps.js +0 -15
- package/dist/control-plane/steps.js.map +1 -1
- package/dist/e2e/kit/assertions.js +1 -1
- package/dist/e2e/kit/assertions.js.map +1 -1
- package/dist/engine/dbos.service.js +9 -179
- package/dist/engine/dbos.service.js.map +1 -1
- package/dist/engine/ensure-postgres.js +0 -48
- package/dist/engine/ensure-postgres.js.map +1 -1
- package/dist/host/daemon.js +2 -21
- package/dist/host/daemon.js.map +1 -1
- package/dist/host/dbos-identity.js +0 -31
- package/dist/host/dbos-identity.js.map +1 -1
- package/dist/host/ensure-host.js +1 -37
- package/dist/host/ensure-host.js.map +1 -1
- package/dist/host/ensure-revisium.js +1 -135
- package/dist/host/ensure-revisium.js.map +1 -1
- package/dist/host/host-runtime.js +0 -28
- package/dist/host/host-runtime.js.map +1 -1
- package/dist/host/host.lifecycle.js +0 -27
- package/dist/host/host.lifecycle.js.map +1 -1
- package/dist/host/queue-ownership.js +0 -42
- package/dist/host/queue-ownership.js.map +1 -1
- package/dist/host/queue-poller-census.js +1 -28
- package/dist/host/queue-poller-census.js.map +1 -1
- package/dist/http/graphql-host.module.js +0 -3
- package/dist/http/graphql-host.module.js.map +1 -1
- package/dist/mcp/mcp-capabilities.js +19 -14
- package/dist/mcp/mcp-capabilities.js.map +1 -1
- package/dist/mcp/mcp-facade.service.js +41 -23
- package/dist/mcp/mcp-facade.service.js.map +1 -1
- package/dist/mcp/mcp-http.service.js +0 -18
- package/dist/mcp/mcp-http.service.js.map +1 -1
- package/dist/mcp/mcp-tools.js +18 -40
- package/dist/mcp/mcp-tools.js.map +1 -1
- package/dist/observability/activity-signal.js +0 -4
- package/dist/observability/activity-signal.js.map +1 -1
- package/dist/observability/agent-activity-reporter.js +0 -4
- package/dist/observability/agent-activity-reporter.js.map +1 -1
- package/dist/pipeline/await-human.js +0 -40
- package/dist/pipeline/await-human.js.map +1 -1
- package/dist/pipeline/data-driven-task.workflow.js +106 -236
- package/dist/pipeline/data-driven-task.workflow.js.map +1 -1
- package/dist/pipeline/data-driven-template.js +0 -25
- package/dist/pipeline/data-driven-template.js.map +1 -1
- package/dist/pipeline/pipeline.module.js +0 -12
- package/dist/pipeline/pipeline.module.js.map +1 -1
- package/dist/pipeline/pipeline.service.js +10 -99
- package/dist/pipeline/pipeline.service.js.map +1 -1
- package/dist/pipeline-core/index.js +1 -13
- package/dist/pipeline-core/index.js.map +1 -1
- package/dist/pipeline-core/interpret.js +21 -94
- package/dist/pipeline-core/interpret.js.map +1 -1
- package/dist/pipeline-core/kit/assertions.js +0 -19
- package/dist/pipeline-core/kit/assertions.js.map +1 -1
- package/dist/pipeline-core/kit/builders.js +1 -21
- package/dist/pipeline-core/kit/builders.js.map +1 -1
- package/dist/pipeline-core/kit/drive.js +1 -31
- package/dist/pipeline-core/kit/drive.js.map +1 -1
- package/dist/pipeline-core/kit/fixtures.js +8 -82
- package/dist/pipeline-core/kit/fixtures.js.map +1 -1
- package/dist/pipeline-core/kit/index.js +0 -8
- package/dist/pipeline-core/kit/index.js.map +1 -1
- package/dist/pipeline-core/types.js +13 -52
- package/dist/pipeline-core/types.js.map +1 -1
- package/dist/pipeline-core/validate-capability.js +0 -3
- package/dist/pipeline-core/validate-capability.js.map +1 -1
- package/dist/pipeline-core/validate-conflicts.js +0 -9
- package/dist/pipeline-core/validate-conflicts.js.map +1 -1
- package/dist/pipeline-core/validate-dataflow.js +0 -17
- package/dist/pipeline-core/validate-dataflow.js.map +1 -1
- package/dist/pipeline-core/validate-diff.js +3 -36
- package/dist/pipeline-core/validate-diff.js.map +1 -1
- package/dist/pipeline-core/validate-edges.js +0 -6
- package/dist/pipeline-core/validate-edges.js.map +1 -1
- package/dist/pipeline-core/validate-graph.js +0 -11
- package/dist/pipeline-core/validate-graph.js.map +1 -1
- package/dist/pipeline-core/validate-loops.js +37 -44
- package/dist/pipeline-core/validate-loops.js.map +1 -1
- package/dist/pipeline-core/validate-parallel.js +9 -15
- package/dist/pipeline-core/validate-parallel.js.map +1 -1
- package/dist/pipeline-core/validate-sink.js +0 -7
- package/dist/pipeline-core/validate-sink.js.map +1 -1
- package/dist/pipeline-core/validate-topology.js +1 -20
- package/dist/pipeline-core/validate-topology.js.map +1 -1
- package/dist/pipeline-core/validate-verdict.js +52 -7
- package/dist/pipeline-core/validate-verdict.js.map +1 -1
- package/dist/pipeline-core/validate.js +5 -29
- package/dist/pipeline-core/validate.js.map +1 -1
- package/dist/playbook/catalog-loader.js +8 -3
- package/dist/playbook/catalog-loader.js.map +1 -1
- package/dist/playbook/import-mapper.js +1 -9
- package/dist/playbook/import-mapper.js.map +1 -1
- package/dist/poller/pr-readiness-core.js +0 -74
- package/dist/poller/pr-readiness-core.js.map +1 -1
- package/dist/revisium/inbox.service.js +0 -24
- package/dist/revisium/inbox.service.js.map +1 -1
- package/dist/revisium/playbooks.service.js +2 -4
- package/dist/revisium/playbooks.service.js.map +1 -1
- package/dist/revisium/revisium.module.js +0 -12
- package/dist/revisium/revisium.module.js.map +1 -1
- package/dist/revisium/roles.service.js +0 -6
- package/dist/revisium/roles.service.js.map +1 -1
- package/dist/revisium/run.service.js +1 -75
- package/dist/revisium/run.service.js.map +1 -1
- package/dist/revisium/tokens.js +0 -4
- package/dist/revisium/tokens.js.map +1 -1
- package/dist/run/append-event.js +0 -34
- package/dist/run/append-event.js.map +1 -1
- package/dist/run/block-run.js.map +1 -1
- package/dist/run/cancel-run.js +0 -33
- package/dist/run/cancel-run.js.map +1 -1
- package/dist/run/complete-run.js.map +1 -1
- package/dist/run/create-run.js +0 -7
- package/dist/run/create-run.js.map +1 -1
- package/dist/run/fail-run.js +0 -3
- package/dist/run/fail-run.js.map +1 -1
- package/dist/run/inspect-run.js +0 -26
- package/dist/run/inspect-run.js.map +1 -1
- package/dist/run/run-outputs.js +0 -19
- package/dist/run/run-outputs.js.map +1 -1
- package/dist/run/terminal-run-status.js +0 -12
- package/dist/run/terminal-run-status.js.map +1 -1
- package/dist/runners/claude-code.service.js +0 -11
- package/dist/runners/claude-code.service.js.map +1 -1
- package/dist/runners/codex.service.js +0 -9
- package/dist/runners/codex.service.js.map +1 -1
- package/dist/runners/gh-identity.js +0 -52
- package/dist/runners/gh-identity.js.map +1 -1
- package/dist/runners/integrator-branch-naming.js +3 -11
- package/dist/runners/integrator-branch-naming.js.map +1 -1
- package/dist/runners/integrator-git.js +0 -25
- package/dist/runners/integrator-git.js.map +1 -1
- package/dist/runners/integrator-remote.js +0 -2
- package/dist/runners/integrator-remote.js.map +1 -1
- package/dist/runners/integrator-types.js +0 -7
- package/dist/runners/integrator-types.js.map +1 -1
- package/dist/runners/integrator.js +3 -167
- package/dist/runners/integrator.js.map +1 -1
- package/dist/runners/runner.module.js +0 -6
- package/dist/runners/runner.module.js.map +1 -1
- package/dist/runners/tokens.js +0 -4
- package/dist/runners/tokens.js.map +1 -1
- package/dist/runners/worktree.service.js +1 -17
- package/dist/runners/worktree.service.js.map +1 -1
- package/dist/task-control-plane/run-watch.service.js +49 -173
- package/dist/task-control-plane/run-watch.service.js.map +1 -1
- package/dist/task-control-plane/task-control-plane-api.service.js +15 -17
- package/dist/task-control-plane/task-control-plane-api.service.js.map +1 -1
- package/dist/worker/build-context.js +0 -16
- package/dist/worker/build-context.js.map +1 -1
- package/dist/worker/claude-code-runner.js +9 -42
- package/dist/worker/claude-code-runner.js.map +1 -1
- package/dist/worker/codex-runner.js +88 -22
- package/dist/worker/codex-runner.js.map +1 -1
- package/dist/worker/git-worktree-manager.js +20 -67
- package/dist/worker/git-worktree-manager.js.map +1 -1
- package/dist/worker/process-executor.js +0 -12
- package/dist/worker/process-executor.js.map +1 -1
- package/dist/worker/result-envelope.js +33 -49
- package/dist/worker/result-envelope.js.map +1 -1
- package/dist/worker/runner-dispatch.js +0 -3
- package/dist/worker/runner-dispatch.js.map +1 -1
- package/dist/worker/runner.js.map +1 -1
- package/dist/worker/stub-runner.js +0 -7
- package/dist/worker/stub-runner.js.map +1 -1
- package/package.json +2 -2
|
@@ -14,7 +14,6 @@ export function ruleParallelJoin(template, d) {
|
|
|
14
14
|
}
|
|
15
15
|
}
|
|
16
16
|
}
|
|
17
|
-
/** Validate one parallel against its declared join (resolution, kind, quorum, membership, merge). */
|
|
18
17
|
function checkParallelAgainstJoin(template, par, joinUsedBy, d) {
|
|
19
18
|
const join = template.nodes[par.join];
|
|
20
19
|
if (!join) {
|
|
@@ -29,13 +28,10 @@ function checkParallelAgainstJoin(template, par, joinUsedBy, d) {
|
|
|
29
28
|
}
|
|
30
29
|
(joinUsedBy.get(par.join) ?? joinUsedBy.set(par.join, []).get(par.join)).push(par.id);
|
|
31
30
|
checkQuorumBound(par, join, d);
|
|
32
|
-
// Branch membership + cross-branch goto + all-reachability.
|
|
33
31
|
checkBranchMembership(template, par, join.id, d);
|
|
34
|
-
// Multi-writer fields need a merge reducer.
|
|
35
32
|
checkMergeReducers(template, par, join, d);
|
|
36
33
|
checkRejectedMergeReducers(join, d);
|
|
37
34
|
}
|
|
38
|
-
/** Quorum K must satisfy 1 ≤ K ≤ N (branch count). */
|
|
39
35
|
function checkQuorumBound(par, join, d) {
|
|
40
36
|
if (join.joinMode.kind !== 'quorum')
|
|
41
37
|
return;
|
|
@@ -46,7 +42,6 @@ function checkQuorumBound(par, join, d) {
|
|
|
46
42
|
});
|
|
47
43
|
}
|
|
48
44
|
}
|
|
49
|
-
/** Reject any merge reducer outside the allowed set (defensive; the type forbids it but data may carry it). */
|
|
50
45
|
function checkRejectedMergeReducers(join, d) {
|
|
51
46
|
for (const [field, reducer] of Object.entries(join.merge ?? {})) {
|
|
52
47
|
if (!MERGE_REDUCERS.includes(reducer)) {
|
|
@@ -61,10 +56,6 @@ function checkBranchMembership(template, par, joinId, d) {
|
|
|
61
56
|
const memberOf = buildBranchMembership(template, par, joinId, d);
|
|
62
57
|
checkCrossBranchGotos(template, memberOf, joinId, d);
|
|
63
58
|
}
|
|
64
|
-
/**
|
|
65
|
-
* Assign each branch sub-graph node to its owning branch (flagging shared membership) and, for an
|
|
66
|
-
* `all` join, flag any branch that cannot reach the join. Returns the node→branch ownership map.
|
|
67
|
-
*/
|
|
68
59
|
function buildBranchMembership(template, par, joinId, d) {
|
|
69
60
|
const memberOf = new Map();
|
|
70
61
|
for (const branch of par.branches) {
|
|
@@ -75,12 +66,20 @@ function buildBranchMembership(template, par, joinId, d) {
|
|
|
75
66
|
});
|
|
76
67
|
}
|
|
77
68
|
memberOf.set(m, branch.id);
|
|
69
|
+
checkBranchMemberDoesNotTerminateBeforeJoin(template, branch, m, joinId, d);
|
|
78
70
|
}
|
|
79
71
|
checkAllJoinReachable(template, branch, joinId, d);
|
|
80
72
|
}
|
|
81
73
|
return memberOf;
|
|
82
74
|
}
|
|
83
|
-
|
|
75
|
+
function checkBranchMemberDoesNotTerminateBeforeJoin(template, branch, member, joinId, d) {
|
|
76
|
+
const node = template.nodes[member];
|
|
77
|
+
if (node?.kind !== 'terminal')
|
|
78
|
+
return;
|
|
79
|
+
d.error('BRANCH_TERMINAL_BEFORE_JOIN', `branch "${branch.id}" can terminate at ${member} before join ${joinId}`, {
|
|
80
|
+
nodeId: member,
|
|
81
|
+
});
|
|
82
|
+
}
|
|
84
83
|
function checkAllJoinReachable(template, branch, joinId, d) {
|
|
85
84
|
const join = template.nodes[joinId];
|
|
86
85
|
if (join?.kind !== 'join' || join.joinMode.kind !== 'all')
|
|
@@ -91,7 +90,6 @@ function checkAllJoinReachable(template, branch, joinId, d) {
|
|
|
91
90
|
});
|
|
92
91
|
}
|
|
93
92
|
}
|
|
94
|
-
/** Cross-branch goto: a branch member may only goto within its own branch sub-graph or to the join. */
|
|
95
93
|
function checkCrossBranchGotos(template, memberOf, joinId, d) {
|
|
96
94
|
for (const [member, branchId] of memberOf) {
|
|
97
95
|
const node = template.nodes[member];
|
|
@@ -111,10 +109,6 @@ function checkCrossBranchGotos(template, memberOf, joinId, d) {
|
|
|
111
109
|
}
|
|
112
110
|
}
|
|
113
111
|
function checkMergeReducers(template, par, join, d) {
|
|
114
|
-
// v1 cannot statically know a node's written fields without a resultSchema model, so we use a
|
|
115
|
-
// conservative proxy: a parallel fanning out ≥2 effect (agent/script) branches writes results from
|
|
116
|
-
// >1 branch; absent a `merge` reducer those fields are unguarded (§4/§12.8). A real per-field model
|
|
117
|
-
// lands with native Revisium typing; until then the entry-kind heuristic surfaces the hazard.
|
|
118
112
|
if (par.branches.length < 2)
|
|
119
113
|
return;
|
|
120
114
|
if (Object.keys(join.merge ?? {}).length > 0)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-parallel.js","sourceRoot":"","sources":["../../src/pipeline-core/validate-parallel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAG5C,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEpF,MAAM,UAAU,gBAAgB,CAAC,QAAkB,EAAE,CAAW;IAC9D,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;IAC7B,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAA4C,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;IACtH,MAAM,UAAU,GAAG,IAAI,GAAG,EAAoB,CAAC;IAE/C,KAAK,MAAM,GAAG,IAAI,SAAS;QAAE,wBAAwB,CAAC,QAAQ,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;IAEpF,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC;QAC1C,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,CAAC,CAAC,KAAK,CAAC,yBAAyB,EAAE,SAAS,MAAM,sBAAsB,MAAM,CAAC,MAAM,YAAY,EAAE;gBACjG,MAAM,EAAE,MAAM;aACf,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC;
|
|
1
|
+
{"version":3,"file":"validate-parallel.js","sourceRoot":"","sources":["../../src/pipeline-core/validate-parallel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,3 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* validate-sink — the shared error/warning collector every §12 rule writes into.
|
|
3
|
-
*
|
|
4
|
-
* Lifted out of validate.ts so each rule module can take a `DiagSink` by type without a circular import
|
|
5
|
-
* back into the orchestrator. `validateTemplate` constructs one and passes it to every rule; rules only
|
|
6
|
-
* call `error`/`warn` on the instance they are handed.
|
|
7
|
-
*/
|
|
8
1
|
export class DiagSink {
|
|
9
2
|
items = [];
|
|
10
3
|
error(code, message, where = {}) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-sink.js","sourceRoot":"","sources":["../../src/pipeline-core/validate-sink.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"validate-sink.js","sourceRoot":"","sources":["../../src/pipeline-core/validate-sink.ts"],"names":[],"mappings":"AAQA,MAAM,OAAO,QAAQ;IACV,KAAK,GAAiB,EAAE,CAAC;IAClC,KAAK,CAAC,IAAoB,EAAE,OAAe,EAAE,QAA6B,EAAE;QAC1E,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACzE,CAAC;IACD,IAAI,CAAC,IAAoB,EAAE,OAAe,EAAE,QAA6B,EAAE;QACzE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC3E,CAAC;CACF;AAED,SAAS,KAAK,CAAC,KAA0B;IACvC,MAAM,GAAG,GAAwB,EAAE,CAAC;IACpC,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS;QAAE,GAAG,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAC1D,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS;QAAE,GAAG,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;IACvD,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS;QAAE,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;IACpD,OAAO,GAAG,CAAC;AACb,CAAC"}
|
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
import { CONDITION_OPS, TERMINAL_STATUSES, isDefaultBranch } from './types.js';
|
|
2
2
|
import { outgoingEdges } from './validate-edges.js';
|
|
3
3
|
import { guardConditionsOf, reachableFrom } from './validate-graph.js';
|
|
4
|
-
// ─────────────────────────────────────────────────────────────────────────────
|
|
5
|
-
// Rule 1 — single entry.
|
|
6
|
-
// ─────────────────────────────────────────────────────────────────────────────
|
|
7
4
|
export function ruleSingleEntry(template, ids, d) {
|
|
8
5
|
if (!template.entry) {
|
|
9
6
|
d.error('ENTRY_MISSING', 'template has no `entry`');
|
|
@@ -15,9 +12,6 @@ export function ruleSingleEntry(template, ids, d) {
|
|
|
15
12
|
});
|
|
16
13
|
}
|
|
17
14
|
}
|
|
18
|
-
// ─────────────────────────────────────────────────────────────────────────────
|
|
19
|
-
// Rule 2 — references resolve (every edge target exists).
|
|
20
|
-
// ─────────────────────────────────────────────────────────────────────────────
|
|
21
15
|
export function ruleReferencesResolve(template, ids, d) {
|
|
22
16
|
const check = (target, node, path) => {
|
|
23
17
|
if (target === undefined)
|
|
@@ -31,9 +25,6 @@ export function ruleReferencesResolve(template, ids, d) {
|
|
|
31
25
|
check(target, node, path);
|
|
32
26
|
}
|
|
33
27
|
}
|
|
34
|
-
// ─────────────────────────────────────────────────────────────────────────────
|
|
35
|
-
// Rule 3 — terminals & non-terminals.
|
|
36
|
-
// ─────────────────────────────────────────────────────────────────────────────
|
|
37
28
|
export function ruleTerminals(template, d) {
|
|
38
29
|
for (const node of Object.values(template.nodes)) {
|
|
39
30
|
if (node.kind === 'terminal') {
|
|
@@ -42,7 +33,6 @@ export function ruleTerminals(template, d) {
|
|
|
42
33
|
nodeId: node.id,
|
|
43
34
|
});
|
|
44
35
|
}
|
|
45
|
-
// The discriminated union forbids exit fields on a terminal at the type level; nothing else to check.
|
|
46
36
|
}
|
|
47
37
|
else if (outgoingEdges(node).length === 0) {
|
|
48
38
|
d.error('NONTERMINAL_NO_EXIT', `non-terminal ${node.id} (${node.kind}) has no exit edge`, {
|
|
@@ -51,9 +41,6 @@ export function ruleTerminals(template, d) {
|
|
|
51
41
|
}
|
|
52
42
|
}
|
|
53
43
|
}
|
|
54
|
-
// ─────────────────────────────────────────────────────────────────────────────
|
|
55
|
-
// Condition grammar sanity — a malformed guard can't be evaluated (feeds rules 2/4/9).
|
|
56
|
-
// ─────────────────────────────────────────────────────────────────────────────
|
|
57
44
|
export function ruleConditionGrammar(template, d) {
|
|
58
45
|
for (const node of Object.values(template.nodes)) {
|
|
59
46
|
for (const cond of guardConditionsOf(node))
|
|
@@ -97,9 +84,6 @@ function checkCondition(cond, nodeId, d) {
|
|
|
97
84
|
break;
|
|
98
85
|
}
|
|
99
86
|
}
|
|
100
|
-
// ─────────────────────────────────────────────────────────────────────────────
|
|
101
|
-
// Rule 4 — total routing (default present; no guard after default; one default).
|
|
102
|
-
// ─────────────────────────────────────────────────────────────────────────────
|
|
103
87
|
export function ruleTotalRouting(template, d) {
|
|
104
88
|
for (const node of Object.values(template.nodes)) {
|
|
105
89
|
if (node.kind !== 'choice' && node.kind !== 'humanGate')
|
|
@@ -125,12 +109,9 @@ export function ruleTotalRouting(template, d) {
|
|
|
125
109
|
}
|
|
126
110
|
}
|
|
127
111
|
}
|
|
128
|
-
// ─────────────────────────────────────────────────────────────────────────────
|
|
129
|
-
// Rule 5 — reachability (every node reachable from entry; no dead nodes).
|
|
130
|
-
// ─────────────────────────────────────────────────────────────────────────────
|
|
131
112
|
export function ruleReachability(template, ids, d) {
|
|
132
113
|
if (!template.entry || !ids.has(template.entry))
|
|
133
|
-
return;
|
|
114
|
+
return;
|
|
134
115
|
const reachable = reachableFrom(template, template.entry);
|
|
135
116
|
for (const id of ids) {
|
|
136
117
|
if (!reachable.has(id))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-topology.js","sourceRoot":"","sources":["../../src/pipeline-core/validate-topology.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAG/E,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"validate-topology.js","sourceRoot":"","sources":["../../src/pipeline-core/validate-topology.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import { CORE_VERDICTS } from './types.js';
|
|
1
|
+
import { CORE_VERDICTS, JOIN_VERDICT_REDUCER_KINDS } from './types.js';
|
|
2
2
|
import { guardConditionsOf } from './validate-graph.js';
|
|
3
3
|
export function ruleVerdictClosure(template, d) {
|
|
4
4
|
const domain = template.verdicts?.domain ?? [];
|
|
5
5
|
const domainSet = new Set(domain);
|
|
6
6
|
const core = new Set(CORE_VERDICTS);
|
|
7
|
-
// 9a no domain label shadows a core label.
|
|
8
7
|
for (const label of domain) {
|
|
9
8
|
if (core.has(label)) {
|
|
10
9
|
d.error('VERDICT_DOMAIN_SHADOWS_CORE', `domain verdict "${label}" shadows a core verdict`);
|
|
@@ -12,16 +11,15 @@ export function ruleVerdictClosure(template, d) {
|
|
|
12
11
|
}
|
|
13
12
|
const used = new Set();
|
|
14
13
|
for (const node of Object.values(template.nodes)) {
|
|
15
|
-
checkGuardVerdictLabels(node, core, domainSet, used, d);
|
|
16
|
-
checkGateOutcomesSubset(node, domainSet, used, d);
|
|
14
|
+
checkGuardVerdictLabels(node, core, domainSet, used, d);
|
|
15
|
+
checkGateOutcomesSubset(node, domainSet, used, d);
|
|
16
|
+
checkJoinVerdictReducer(node, domainSet, used, d);
|
|
17
17
|
}
|
|
18
|
-
// 9d declared-but-unused (warning).
|
|
19
18
|
for (const label of domain) {
|
|
20
19
|
if (!used.has(label))
|
|
21
20
|
d.warn('VERDICT_DECLARED_UNUSED', `domain verdict "${label}" is declared but never used`);
|
|
22
21
|
}
|
|
23
22
|
}
|
|
24
|
-
/** 9b — every verdict.* guard label on a node is a declared domain label (a core label is a hard error). */
|
|
25
23
|
function checkGuardVerdictLabels(node, core, domainSet, used, d) {
|
|
26
24
|
for (const cond of guardConditionsOf(node)) {
|
|
27
25
|
collectVerdictLabels(cond, (label) => {
|
|
@@ -39,7 +37,6 @@ function checkGuardVerdictLabels(node, core, domainSet, used, d) {
|
|
|
39
37
|
});
|
|
40
38
|
}
|
|
41
39
|
}
|
|
42
|
-
/** 9c — a humanGate's declared outcomes must all be declared domain labels. */
|
|
43
40
|
function checkGateOutcomesSubset(node, domainSet, used, d) {
|
|
44
41
|
if (node.kind !== 'humanGate')
|
|
45
42
|
return;
|
|
@@ -52,6 +49,54 @@ function checkGateOutcomesSubset(node, domainSet, used, d) {
|
|
|
52
49
|
}
|
|
53
50
|
}
|
|
54
51
|
}
|
|
52
|
+
/** 9e — a join verdictReducer forwards only declared domain labels. */
|
|
53
|
+
function checkJoinVerdictReducer(node, domainSet, used, d) {
|
|
54
|
+
if (node.kind !== 'join' || node.verdictReducer === undefined)
|
|
55
|
+
return;
|
|
56
|
+
const reducer = node.verdictReducer;
|
|
57
|
+
if (!isRecord(reducer)) {
|
|
58
|
+
d.error('VERDICT_REDUCER_BAD_SHAPE', `join ${node.id} verdictReducer must be an object`, {
|
|
59
|
+
nodeId: node.id,
|
|
60
|
+
path: 'verdictReducer',
|
|
61
|
+
});
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
const kind = reducer.kind;
|
|
65
|
+
if (typeof kind !== 'string' || !JOIN_VERDICT_REDUCER_KINDS.includes(kind)) {
|
|
66
|
+
d.error('VERDICT_REDUCER_BAD_KIND', `join ${node.id} verdictReducer kind "${String(kind)}" is not allowed`, {
|
|
67
|
+
nodeId: node.id,
|
|
68
|
+
path: 'verdictReducer.kind',
|
|
69
|
+
});
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
72
|
+
if (kind !== 'allIn')
|
|
73
|
+
return;
|
|
74
|
+
const pass = reducer.pass;
|
|
75
|
+
const passVerdict = reducer.passVerdict;
|
|
76
|
+
const failVerdict = reducer.failVerdict;
|
|
77
|
+
if (!Array.isArray(pass) ||
|
|
78
|
+
!pass.every((label) => typeof label === 'string') ||
|
|
79
|
+
typeof passVerdict !== 'string' ||
|
|
80
|
+
typeof failVerdict !== 'string') {
|
|
81
|
+
d.error('VERDICT_REDUCER_BAD_SHAPE', `join ${node.id} verdictReducer allIn shape is invalid`, {
|
|
82
|
+
nodeId: node.id,
|
|
83
|
+
path: 'verdictReducer',
|
|
84
|
+
});
|
|
85
|
+
return;
|
|
86
|
+
}
|
|
87
|
+
const labels = [...pass, passVerdict, failVerdict];
|
|
88
|
+
for (const label of labels) {
|
|
89
|
+
used.add(label);
|
|
90
|
+
if (!domainSet.has(label)) {
|
|
91
|
+
d.error('VERDICT_UNDECLARED', `join ${node.id} verdictReducer uses undeclared verdict "${label}"`, {
|
|
92
|
+
nodeId: node.id,
|
|
93
|
+
});
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
function isRecord(value) {
|
|
98
|
+
return value !== null && typeof value === 'object' && !Array.isArray(value);
|
|
99
|
+
}
|
|
55
100
|
function collectVerdictLabels(cond, visit) {
|
|
56
101
|
switch (cond.op) {
|
|
57
102
|
case 'verdict.eq':
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-verdict.js","sourceRoot":"","sources":["../../src/pipeline-core/validate-verdict.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"validate-verdict.js","sourceRoot":"","sources":["../../src/pipeline-core/validate-verdict.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,3 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* pipeline-core/validate.ts — the authoritative install-time validator (§12). Runs rules 1–12 + 14
|
|
3
|
-
* (each imported from its sibling module) and re-exports the diff classifier (rule 13) from
|
|
4
|
-
* validate-diff.ts, so the public surface (`validateTemplate`, `classifyTemplateDiff`) is unchanged.
|
|
5
|
-
*
|
|
6
|
-
* Pure: zero I/O, no clocks. Each §12 rule is its own collector; `validateTemplate` returns every
|
|
7
|
-
* finding (it does not stop at the first error). Codes are stable (tested against).
|
|
8
|
-
*/
|
|
9
1
|
import { FAILURE_POLICIES, isRevoErrorCode } from './types.js';
|
|
10
2
|
import { DiagSink } from './validate-sink.js';
|
|
11
3
|
import { ruleSingleEntry, ruleReferencesResolve, ruleTerminals, ruleConditionGrammar, ruleTotalRouting, ruleReachability, } from './validate-topology.js';
|
|
@@ -17,37 +9,28 @@ import { ruleConflictMatrix } from './validate-conflicts.js';
|
|
|
17
9
|
import { ruleCapabilityRefs } from './validate-capability.js';
|
|
18
10
|
export { classifyTemplateDiff } from './validate-diff.js';
|
|
19
11
|
const NODE_ID_PATTERN = /^[A-Za-z]\w*$/;
|
|
20
|
-
// ─────────────────────────────────────────────────────────────────────────────
|
|
21
|
-
// Public entry.
|
|
22
|
-
// ─────────────────────────────────────────────────────────────────────────────
|
|
23
|
-
/** Run all §12 rules. Returns every diagnostic; empty ⇒ the template is valid. */
|
|
24
12
|
export function validateTemplate(template) {
|
|
25
13
|
const d = new DiagSink();
|
|
26
14
|
const nodes = template.nodes ?? {};
|
|
27
15
|
const ids = new Set(Object.keys(nodes));
|
|
28
|
-
// Rules dereference `nodes` directly; a malformed parsed template (type says required, JSON may lie)
|
|
29
|
-
// would otherwise throw inside a rule instead of producing diagnostics.
|
|
30
16
|
const normalized = { ...template, nodes };
|
|
31
|
-
ruleIdHygiene(normalized, d);
|
|
17
|
+
ruleIdHygiene(normalized, d);
|
|
32
18
|
ruleSingleEntry(normalized, ids, d);
|
|
33
19
|
ruleReferencesResolve(normalized, ids, d);
|
|
34
20
|
ruleTerminals(normalized, d);
|
|
35
|
-
ruleConditionGrammar(normalized, d);
|
|
21
|
+
ruleConditionGrammar(normalized, d);
|
|
36
22
|
ruleTotalRouting(normalized, d);
|
|
37
23
|
ruleReachability(normalized, ids, d);
|
|
38
|
-
ruleFailurePolicy(normalized, d);
|
|
39
|
-
ruleLoopCap(normalized, d);
|
|
24
|
+
ruleFailurePolicy(normalized, d);
|
|
25
|
+
ruleLoopCap(normalized, d);
|
|
40
26
|
ruleCounterScopes(normalized, d);
|
|
41
27
|
ruleParallelJoin(normalized, d);
|
|
42
28
|
ruleVerdictClosure(normalized, d);
|
|
43
29
|
ruleConflictMatrix(normalized, d);
|
|
44
30
|
ruleCapabilityRefs(normalized, d);
|
|
45
|
-
ruleDataflow(normalized, ids, d);
|
|
31
|
+
ruleDataflow(normalized, ids, d);
|
|
46
32
|
return d.items;
|
|
47
33
|
}
|
|
48
|
-
// ─────────────────────────────────────────────────────────────────────────────
|
|
49
|
-
// Rule 11 — id/namespace hygiene.
|
|
50
|
-
// ─────────────────────────────────────────────────────────────────────────────
|
|
51
34
|
function ruleIdHygiene(template, d) {
|
|
52
35
|
const seen = new Set();
|
|
53
36
|
for (const [key, node] of Object.entries(template.nodes ?? {})) {
|
|
@@ -56,9 +39,7 @@ function ruleIdHygiene(template, d) {
|
|
|
56
39
|
}
|
|
57
40
|
checkCatchCodeVerdictCollisions(template, d);
|
|
58
41
|
}
|
|
59
|
-
/** One node entry's id hygiene: map-key/node-id mismatch, id pattern, and duplicate-key detection. */
|
|
60
42
|
function checkNodeKeyHygiene(key, node, seen, d) {
|
|
61
|
-
// The map key is the canonical id; a node carrying a mismatching `id` is a hygiene defect too.
|
|
62
43
|
if (node?.id !== undefined && node.id !== key) {
|
|
63
44
|
d.error('ID_BAD_PATTERN', `node "${key}" has mismatching id "${node.id}"`, { nodeId: key });
|
|
64
45
|
}
|
|
@@ -68,7 +49,6 @@ function checkNodeKeyHygiene(key, node, seen, d) {
|
|
|
68
49
|
if (seen.has(key))
|
|
69
50
|
d.error('ID_DUPLICATE', `duplicate node id "${key}"`, { nodeId: key });
|
|
70
51
|
}
|
|
71
|
-
/** revo.* error codes must never collide with a declared verdict label (disjoint namespaces, §3/§6). */
|
|
72
52
|
function checkCatchCodeVerdictCollisions(template, d) {
|
|
73
53
|
const domain = new Set(template.verdicts?.domain ?? []);
|
|
74
54
|
for (const node of Object.values(template.nodes ?? {})) {
|
|
@@ -83,16 +63,12 @@ function checkCatchCodeVerdictCollisions(template, d) {
|
|
|
83
63
|
}
|
|
84
64
|
}
|
|
85
65
|
}
|
|
86
|
-
// ─────────────────────────────────────────────────────────────────────────────
|
|
87
|
-
// Rule 6a — per-node failure policy well-formedness.
|
|
88
|
-
// ─────────────────────────────────────────────────────────────────────────────
|
|
89
66
|
function ruleFailurePolicy(template, d) {
|
|
90
67
|
for (const node of Object.values(template.nodes)) {
|
|
91
68
|
if (node.kind === 'agent' || node.kind === 'script')
|
|
92
69
|
checkNodeFailurePolicy(node, d);
|
|
93
70
|
}
|
|
94
71
|
}
|
|
95
|
-
/** Per effect-node §6 failure-policy well-formedness: known policy, valid catch codes, route/escalate. */
|
|
96
72
|
function checkNodeFailurePolicy(node, d) {
|
|
97
73
|
const policy = node.onFailure ?? 'abort';
|
|
98
74
|
if (!FAILURE_POLICIES.includes(policy)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/pipeline-core/validate.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/pipeline-core/validate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,14 @@
|
|
|
1
1
|
import { existsSync, readFileSync } from 'node:fs';
|
|
2
2
|
import { PlaybookError } from './errors.js';
|
|
3
3
|
import { resolvePathInside } from './source-resolver.js';
|
|
4
|
-
const MODEL_LEVELS = new Set([
|
|
4
|
+
const MODEL_LEVELS = new Set([
|
|
5
|
+
'cheap',
|
|
6
|
+
'standard',
|
|
7
|
+
'deep',
|
|
8
|
+
'codex-cheap',
|
|
9
|
+
'codex-standard',
|
|
10
|
+
'codex-deep',
|
|
11
|
+
]);
|
|
5
12
|
const PRODUCTION_BLOCKED_RUNNERS = new Set(['stub-agent']);
|
|
6
13
|
function asRecord(value, context) {
|
|
7
14
|
if (value && typeof value === 'object' && !Array.isArray(value))
|
|
@@ -91,8 +98,6 @@ function parseRole(value, index, root) {
|
|
|
91
98
|
path,
|
|
92
99
|
surface: stringField(record, 'surface', context),
|
|
93
100
|
rights: stringField(record, 'rights', context),
|
|
94
|
-
// allowedTools is DATA the role declares directly (no rights→tools table in code). A role's
|
|
95
|
-
// `rights` label remains a human-facing descriptor; the executable tool list is `allowed_tools`.
|
|
96
101
|
allowedTools: stringArrayField(record, 'allowed_tools', context),
|
|
97
102
|
defaultModelLevel: modelLevel,
|
|
98
103
|
runnerId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog-loader.js","sourceRoot":"","sources":["../../src/playbook/catalog-loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"catalog-loader.js","sourceRoot":"","sources":["../../src/playbook/catalog-loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAqCzD,MAAM,YAAY,GAAG,IAAI,GAAG,CAAa;IACvC,OAAO;IACP,UAAU;IACV,MAAM;IACN,aAAa;IACb,gBAAgB;IAChB,YAAY;CACb,CAAC,CAAC;AACH,MAAM,0BAA0B,GAAG,IAAI,GAAG,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;AAE3D,SAAS,QAAQ,CAAC,KAAc,EAAE,OAAe;IAC/C,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,KAAgC,CAAC;IACzG,MAAM,IAAI,aAAa,CAAC,0BAA0B,EAAE,GAAG,OAAO,oBAAoB,CAAC,CAAC;AACtF,CAAC;AAED,SAAS,WAAW,CAAC,MAA+B,EAAE,GAAW,EAAE,OAAe;IAChF,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE;QAAE,OAAO,KAAK,CAAC;IACnE,MAAM,IAAI,aAAa,CAAC,0BAA0B,EAAE,GAAG,OAAO,IAAI,GAAG,6BAA6B,CAAC,CAAC;AACtG,CAAC;AAED,SAAS,qBAAqB,CAAC,MAA+B,EAAE,GAAW,EAAE,OAAe;IAC1F,OAAO,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;AAClD,CAAC;AAED,SAAS,gBAAgB,CAAC,MAA+B,EAAE,GAAW,EAAE,OAAe;IACrF,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1B,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC;QAAE,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC;IACzF,MAAM,IAAI,aAAa,CAAC,0BAA0B,EAAE,GAAG,OAAO,IAAI,GAAG,yBAAyB,CAAC,CAAC;AAClG,CAAC;AAED,SAAS,cAAc,CAAC,MAA+B,EAAE,GAAW;IAClE,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1B,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IACnC,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAChE,MAAM,GAAG,GAA2B,EAAE,CAAC;QACvC,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3C,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;gBAC1B,MAAM,IAAI,aAAa,CAAC,0BAA0B,EAAE,GAAG,GAAG,IAAI,CAAC,mBAAmB,CAAC,CAAC;YACtF,CAAC;YACD,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACb,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IACD,MAAM,IAAI,aAAa,CAAC,0BAA0B,EAAE,GAAG,GAAG,oBAAoB,CAAC,CAAC;AAClF,CAAC;AAED,SAAS,eAAe,CAAC,OAA8B,EAAE,OAAe;IACtE,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,aAAa,CAAC,0BAA0B,EAAE,aAAa,OAAO,QAAQ,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;QAC/F,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACtB,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,OAAoB,EAAE,MAAc,EAAE,OAAe;IAC5E,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC;QAAE,OAAO;IAChC,MAAM,IAAI,aAAa,CAAC,0BAA0B,EAAE,GAAG,OAAO,gCAAgC,MAAM,EAAE,CAAC,CAAC;AAC1G,CAAC;AAED,SAAS,4BAA4B,CAAC,KAA0B,EAAE,SAAkC;IAClG,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IACtD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,aAAa,EAAE,CAAC;YAC5C,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,QAAQ,CAAC,EAAE,iBAAiB,CAAC,CAAC;QAC7E,CAAC;QACD,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,aAAa,EAAE,CAAC;YAC5C,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,QAAQ,CAAC,EAAE,iBAAiB,CAAC,CAAC;QAC7E,CAAC;QACD,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,gBAAgB,EAAE,CAAC;YAC9C,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;gBACjC,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,QAAQ,CAAC,EAAE,sBAAsB,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;YAClG,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,SAAS,CAAC,KAAc,EAAE,KAAa,EAAE,IAAY;IAC5D,MAAM,OAAO,GAAG,SAAS,KAAK,GAAG,CAAC;IAClC,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACxC,MAAM,UAAU,GAAG,WAAW,CAAC,MAAM,EAAE,qBAAqB,EAAE,OAAO,CAAC,CAAC;IACvE,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,UAAwB,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,aAAa,CAAC,0BAA0B,EAAE,GAAG,OAAO,oCAAoC,UAAU,EAAE,CAAC,CAAC;IAClH,CAAC;IACD,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAClD,MAAM,YAAY,GAAG,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACnD,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QAC9B,MAAM,IAAI,aAAa,CAAC,0BAA0B,EAAE,GAAG,OAAO,yBAAyB,IAAI,EAAE,CAAC,CAAC;IACjG,CAAC;IACD,MAAM,QAAQ,GAAG,qBAAqB,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACrE,IAAI,0BAA0B,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC7C,MAAM,IAAI,aAAa,CACrB,0BAA0B,EAC1B,GAAG,OAAO,0BAA0B,QAAQ,oDAAoD,CACjG,CAAC;IACJ,CAAC;IACD,MAAM,EAAE,GAAG,WAAW,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9C,OAAO;QACL,EAAE;QACF,IAAI;QACJ,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC;QAChD,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC;QAC9C,YAAY,EAAE,gBAAgB,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,CAAC;QAChE,iBAAiB,EAAE,UAAoD;QACvE,QAAQ;QACR,QAAQ,EAAE,cAAc,CAAC,MAAM,EAAE,UAAU,CAAC;KAC7C,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAAC,KAAc,EAAE,OAAe;IAC5D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,aAAa,CAAC,0BAA0B,EAAE,GAAG,OAAO,qCAAqC,CAAC,CAAC;IACvG,CAAC;IACD,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QAChC,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,EAAE,GAAG,OAAO,sBAAsB,KAAK,GAAG,CAAC,CAAC;QACzE,OAAO;YACL,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,sBAAsB,KAAK,GAAG,CAAC;YACnF,KAAK,EAAE,gBAAgB,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,sBAAsB,KAAK,GAAG,CAAC;YAClF,UAAU,EAAE,WAAW,CAAC,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,sBAAsB,KAAK,GAAG,CAAC;SACxF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,aAAa,CAAC,KAAc,EAAE,KAAa,EAAE,IAAY;IAChE,MAAM,OAAO,GAAG,aAAa,KAAK,GAAG,CAAC;IACtC,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACxC,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAClD,MAAM,YAAY,GAAG,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACnD,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QAC9B,MAAM,IAAI,aAAa,CAAC,0BAA0B,EAAE,GAAG,OAAO,yBAAyB,IAAI,EAAE,CAAC,CAAC;IACjG,CAAC;IACD,OAAO;QACL,EAAE,EAAE,WAAW,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC;QACtC,IAAI;QACJ,QAAQ,EAAE,gBAAgB,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC;QACvD,aAAa,EAAE,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,EAAE,OAAO,CAAC;QAClE,gBAAgB,EAAE,qBAAqB,CAAC,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC;QAC1E,aAAa,EAAE,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,EAAE,OAAO,CAAC;QAClE,UAAU,EAAE,gBAAgB,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,CAAC;QAC5D,kBAAkB,EAAE,WAAW,CAAC,MAAM,EAAE,qBAAqB,EAAE,OAAO,CAAC;QACvE,eAAe,EAAE,MAAM,CAAC,gBAAgB,IAAI,EAAE;KAC/C,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,IAAY,EAAE,OAAe;IAClD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAY,CAAC;IACjE,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAC;IACzC,MAAM,IAAI,aAAa,CAAC,0BAA0B,EAAE,GAAG,OAAO,uBAAuB,CAAC,CAAC;AACzF,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,IAAY,EAAE,QAA0B;IAC3E,MAAM,QAAQ,GAAG,iBAAiB,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAClE,MAAM,YAAY,GAAG,iBAAiB,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAC1E,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CACjF,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAC7B,CAAC;QACF,MAAM,SAAS,GAAG,aAAa,CAAC,YAAY,EAAE,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,CACjG,aAAa,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,CACrC,CAAC;QACF,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC/B,eAAe,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QACvC,4BAA4B,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC/C,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;IAC9B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,aAAa;YAAE,MAAM,KAAK,CAAC;QAChD,MAAM,IAAI,aAAa,CAAC,0BAA0B,EAAE,kCAAkC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;IACrG,CAAC;AACH,CAAC"}
|
|
@@ -77,13 +77,10 @@ function mapRole(root, playbookId, role, now) {
|
|
|
77
77
|
name: role.id,
|
|
78
78
|
system_prompt: prompt.prompt || `Code-backed role imported from playbook role ${role.id}.`,
|
|
79
79
|
model_level: role.defaultModelLevel,
|
|
80
|
-
effort: role.defaultModelLevel
|
|
80
|
+
effort: role.defaultModelLevel.endsWith('cheap') ? 'low' : 'high',
|
|
81
81
|
runner: role.runnerId,
|
|
82
82
|
runner_id: role.runnerId,
|
|
83
|
-
// allowedTools is passed through verbatim from the catalog (a role declares its tools as data;
|
|
84
|
-
// there is no rights→tools table in code).
|
|
85
83
|
allowed_tools: [...role.allowedTools],
|
|
86
|
-
// A playbook role's id IS its runtime id (identity passthrough; no name-translation table in code).
|
|
87
84
|
scope_rules: JSON.stringify({
|
|
88
85
|
surface: role.surface,
|
|
89
86
|
rights: role.rights,
|
|
@@ -128,11 +125,6 @@ export function mapPlaybookRows(options) {
|
|
|
128
125
|
const now = options.now ?? new Date().toISOString();
|
|
129
126
|
const playbookId = options.nameOverride ?? options.manifest.id;
|
|
130
127
|
const version = options.versionOverride ?? options.source.version;
|
|
131
|
-
// Map role rows first so each role's source_hash (compiled prompt hash) is available to fold into
|
|
132
|
-
// the content fingerprint. Prompt bodies are not in RoleCatalogRecord (only the path is), so a
|
|
133
|
-
// prompt-only edit would otherwise leave catalog_hash unchanged and silently skip re-seed.
|
|
134
|
-
// playbook_role_id + source_hash are both name/version/now-independent, so the hash computed here
|
|
135
|
-
// equals the one recomputed by the seed's bundledCatalogHash helper.
|
|
136
128
|
const roleRows = options.catalogs.roles.map((role) => mapRole(options.root, playbookId, role, now));
|
|
137
129
|
const catalogHash = hash({
|
|
138
130
|
manifest: options.manifest,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"import-mapper.js","sourceRoot":"","sources":["../../src/playbook/import-mapper.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"import-mapper.js","sourceRoot":"","sources":["../../src/playbook/import-mapper.ts"],"names":[],"mappings":"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"}
|