@enderfga/claw-orchestrator 7.14.0 → 7.16.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 +162 -135
- package/configs/autoloop-reviewer-prompt.md +1 -1
- package/configs/engines/README.md +31 -11
- package/dist/bin/acp-server.js +7 -12
- package/dist/bin/acp-server.js.map +1 -1
- package/dist/bin/cli.js +84 -46
- package/dist/bin/cli.js.map +1 -1
- package/dist/bin/mcp-server.js +2 -54
- package/dist/bin/mcp-server.js.map +1 -1
- package/dist/src/acp-server.d.ts +17 -9
- package/dist/src/acp-server.js +149 -30
- package/dist/src/acp-server.js.map +1 -1
- package/dist/src/autoloop/agent-tools.d.ts +2 -0
- package/dist/src/autoloop/agent-tools.js +7 -0
- package/dist/src/autoloop/agent-tools.js.map +1 -1
- package/dist/src/autoloop/dispatcher.d.ts +6 -0
- package/dist/src/autoloop/dispatcher.js +72 -9
- package/dist/src/autoloop/dispatcher.js.map +1 -1
- package/dist/src/autoloop/planner-tools.js +2 -0
- package/dist/src/autoloop/planner-tools.js.map +1 -1
- package/dist/src/claude-goal-session.d.ts +147 -0
- package/dist/src/claude-goal-session.js +355 -0
- package/dist/src/claude-goal-session.js.map +1 -0
- package/dist/src/council.d.ts +8 -0
- package/dist/src/council.js +45 -12
- package/dist/src/council.js.map +1 -1
- package/dist/src/dashboard/index.html +28 -14
- package/dist/src/embedded-server.js +27 -8
- package/dist/src/embedded-server.js.map +1 -1
- package/dist/src/engine-spawn.js +3 -1
- package/dist/src/engine-spawn.js.map +1 -1
- package/dist/src/fanout.d.ts +13 -3
- package/dist/src/fanout.js +10 -0
- package/dist/src/fanout.js.map +1 -1
- package/dist/src/inbox-manager.d.ts +9 -0
- package/dist/src/inbox-manager.js +8 -2
- package/dist/src/inbox-manager.js.map +1 -1
- package/dist/src/index.d.ts +2 -0
- package/dist/src/index.js +135 -53
- package/dist/src/index.js.map +1 -1
- package/dist/src/kernel/agent-step.d.ts +6 -0
- package/dist/src/kernel/agent-step.js.map +1 -1
- package/dist/src/kernel/conditions.d.ts +1 -1
- package/dist/src/kernel/conditions.js +1 -1
- package/dist/src/kernel/engine.d.ts +28 -8
- package/dist/src/kernel/engine.js +93 -19
- package/dist/src/kernel/engine.js.map +1 -1
- package/dist/src/kernel/nodes/agent.js +2 -0
- package/dist/src/kernel/nodes/agent.js.map +1 -1
- package/dist/src/kernel/nodes/council.js +9 -4
- package/dist/src/kernel/nodes/council.js.map +1 -1
- package/dist/src/kernel/nodes/fanout.js +5 -0
- package/dist/src/kernel/nodes/fanout.js.map +1 -1
- package/dist/src/kernel/nodes/goal.d.ts +19 -5
- package/dist/src/kernel/nodes/goal.js +81 -34
- package/dist/src/kernel/nodes/goal.js.map +1 -1
- package/dist/src/kernel/nodes/subflow.js +9 -1
- package/dist/src/kernel/nodes/subflow.js.map +1 -1
- package/dist/src/kernel/nodes/ultraapp.d.ts +1 -0
- package/dist/src/kernel/nodes/ultraapp.js +1 -0
- package/dist/src/kernel/nodes/ultraapp.js.map +1 -1
- package/dist/src/kernel/nodes/verifier.js +5 -1
- package/dist/src/kernel/nodes/verifier.js.map +1 -1
- package/dist/src/kernel/projections.d.ts +1 -0
- package/dist/src/kernel/projections.js +7 -1
- package/dist/src/kernel/projections.js.map +1 -1
- package/dist/src/kernel/templates/index.d.ts +16 -11
- package/dist/src/kernel/templates/index.js +14 -8
- package/dist/src/kernel/templates/index.js.map +1 -1
- package/dist/src/kernel/types.d.ts +37 -13
- package/dist/src/kernel/types.js.map +1 -1
- package/dist/src/logger.d.ts +6 -0
- package/dist/src/logger.js +14 -0
- package/dist/src/logger.js.map +1 -1
- package/dist/src/mcp-annotations.d.ts +13 -0
- package/dist/src/mcp-annotations.js +100 -0
- package/dist/src/mcp-annotations.js.map +1 -0
- package/dist/src/models.d.ts +7 -0
- package/dist/src/models.js +9 -0
- package/dist/src/models.js.map +1 -1
- package/dist/src/openai-compat.d.ts +11 -5
- package/dist/src/openai-compat.js +55 -54
- package/dist/src/openai-compat.js.map +1 -1
- package/dist/src/persistent-acp-session.d.ts +7 -0
- package/dist/src/persistent-acp-session.js +26 -2
- package/dist/src/persistent-acp-session.js.map +1 -1
- package/dist/src/persistent-codex-app-session.d.ts +2 -0
- package/dist/src/persistent-codex-app-session.js +18 -9
- package/dist/src/persistent-codex-app-session.js.map +1 -1
- package/dist/src/persistent-codex-session.d.ts +14 -3
- package/dist/src/persistent-codex-session.js +22 -19
- package/dist/src/persistent-codex-session.js.map +1 -1
- package/dist/src/persistent-custom-session.d.ts +9 -0
- package/dist/src/persistent-custom-session.js +41 -21
- package/dist/src/persistent-custom-session.js.map +1 -1
- package/dist/src/persistent-grok-session.js +1 -1
- package/dist/src/persistent-grok-session.js.map +1 -1
- package/dist/src/persistent-session.d.ts +9 -0
- package/dist/src/persistent-session.js +23 -0
- package/dist/src/persistent-session.js.map +1 -1
- package/dist/src/run-ledger.d.ts +3 -3
- package/dist/src/session-manager.d.ts +45 -1
- package/dist/src/session-manager.js +199 -34
- package/dist/src/session-manager.js.map +1 -1
- package/dist/src/types.d.ts +34 -11
- package/dist/src/types.js.map +1 -1
- package/dist/src/ultraapp/build.d.ts +5 -11
- package/dist/src/ultraapp/build.js +5 -11
- package/dist/src/ultraapp/build.js.map +1 -1
- package/dist/src/ultraapp/council-adapter.d.ts +5 -2
- package/dist/src/ultraapp/council-adapter.js +6 -6
- package/dist/src/ultraapp/council-adapter.js.map +1 -1
- package/dist/src/ultraapp/files.d.ts +7 -0
- package/dist/src/ultraapp/files.js +7 -1
- package/dist/src/ultraapp/files.js.map +1 -1
- package/dist/src/ultraapp/manager.d.ts +23 -3
- package/dist/src/ultraapp/manager.js +170 -72
- package/dist/src/ultraapp/manager.js.map +1 -1
- package/dist/src/ultraapp/narrator.js +1 -1
- package/dist/src/ultraapp/narrator.js.map +1 -1
- package/dist/src/ultraapp/versions.d.ts +27 -5
- package/dist/src/ultraapp/versions.js +58 -13
- package/dist/src/ultraapp/versions.js.map +1 -1
- package/openclaw.plugin.json +4 -13
- package/package.json +13 -6
- package/skills/SKILL.md +52 -24
- package/skills/references/acp.md +140 -61
- package/skills/references/autoloop.md +148 -38
- package/skills/references/claude-cli-tracking.md +9 -6
- package/skills/references/cli.md +139 -108
- package/skills/references/council.md +44 -22
- package/skills/references/dashboard.md +37 -21
- package/skills/references/getting-started.md +49 -15
- package/skills/references/inbox.md +13 -8
- package/skills/references/mcp.md +25 -17
- package/skills/references/multi-engine.md +161 -145
- package/skills/references/observability.md +90 -58
- package/skills/references/openai-compat.md +172 -82
- package/skills/references/sessions.md +101 -65
- package/skills/references/tools.md +217 -158
- package/skills/references/ultra.md +7 -7
- package/skills/references/ultraapp.md +101 -56
- package/skills/references/verification.md +112 -56
- package/skills/references/workflow.md +275 -97
- package/assets/banner.jpg +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"goal.js","sourceRoot":"","sources":["../../../../src/kernel/nodes/goal.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"goal.js","sourceRoot":"","sources":["../../../../src/kernel/nodes/goal.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,13 +47,21 @@ export function makeSubflowExecutor(kernel, resolve) {
|
|
|
47
47
|
message: `[subflow] ${spec.id} → run ${record.runId}`,
|
|
48
48
|
});
|
|
49
49
|
const finished = (await kernel.wait(record.runId)) ?? record;
|
|
50
|
+
// Only a verdict that stands is adopted. A child that ended `unverified`
|
|
51
|
+
// has none — its checks may have passed on a tree that moved since — and
|
|
52
|
+
// reporting its evidence as not passed would make the parent `refuted`.
|
|
53
|
+
const judged = finished.outcome !== 'unverified';
|
|
50
54
|
return {
|
|
51
55
|
childRunId: record.runId,
|
|
52
56
|
ok: finished.state === 'completed',
|
|
53
57
|
output: `subflow ${finished.runId}: ${finished.state} / ${finished.outcome}`,
|
|
54
58
|
error: finished.state === 'completed' ? undefined : (finished.error ?? `subflow ended ${finished.state}`),
|
|
55
|
-
evidenceId: finished.evidenceId,
|
|
59
|
+
evidenceId: judged ? finished.evidenceId : undefined,
|
|
56
60
|
passed: finished.outcome === 'verified',
|
|
61
|
+
// The digest goes with the verdict: without it, any workspace-touching node
|
|
62
|
+
// the parent runs afterwards finds nothing to compare and downgrades it.
|
|
63
|
+
treeFingerprint: finished.verdict?.treeFingerprint,
|
|
64
|
+
fingerprintCwd: finished.verdict?.fingerprintCwd ?? finished.cwd,
|
|
57
65
|
costUsd: finished.costUsd,
|
|
58
66
|
};
|
|
59
67
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subflow.js","sourceRoot":"","sources":["../../../../src/kernel/nodes/subflow.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAQH,MAAM,UAAU,mBAAmB,CAAC,MAAiB,EAAE,OAA0B;IAC/E,OAAO,KAAK,UAAU,kBAAkB,CAAC,IAAc,EAAE,GAAgB;QACvE,MAAM,IAAI,GAAG,IAAmB,CAAC;QACjC,MAAM,KAAK,GAAG,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;QAC3F,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,qBAAqB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QAC7E,CAAC;QAED,wEAAwE;QACxE,2EAA2E;QAC3E,yEAAyE;QACzE,sEAAsE;QACtE,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE;YACvC,GAAG,EAAE,GAAG,CAAC,GAAG;YACZ,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,8FAA8F;YAC9F,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,SAAS;SAChC,CAAC,CAAC;QACH,2EAA2E;QAC3E,2CAA2C;QAC3C,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC3B,4EAA4E;QAC5E,sEAAsE;QACtE,0EAA0E;QAC1E,uEAAuE;QACvE,wEAAwE;QACxE,yEAAyE;QACzE,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACvB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC5B,OAAO;gBACL,UAAU,EAAE,MAAM,CAAC,KAAK;gBACxB,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE,WAAW;aACnB,CAAC;QACJ,CAAC;QACD,GAAG,CAAC,IAAI,CAAC;YACP,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YAC5B,IAAI,EAAE,KAAK;YACX,KAAK,EAAE,MAAM;YACb,OAAO,EAAE,aAAa,IAAI,CAAC,EAAE,UAAU,MAAM,CAAC,KAAK,EAAE;SACtD,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,MAAM,CAAC;QAC7D,OAAO;YACL,UAAU,EAAE,MAAM,CAAC,KAAK;YACxB,EAAE,EAAE,QAAQ,CAAC,KAAK,KAAK,WAAW;YAClC,MAAM,EAAE,WAAW,QAAQ,CAAC,KAAK,KAAK,QAAQ,CAAC,KAAK,MAAM,QAAQ,CAAC,OAAO,EAAE;YAC5E,KAAK,EAAE,QAAQ,CAAC,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,IAAI,iBAAiB,QAAQ,CAAC,KAAK,EAAE,CAAC;YACzG,UAAU,EAAE,QAAQ,CAAC,UAAU;
|
|
1
|
+
{"version":3,"file":"subflow.js","sourceRoot":"","sources":["../../../../src/kernel/nodes/subflow.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAQH,MAAM,UAAU,mBAAmB,CAAC,MAAiB,EAAE,OAA0B;IAC/E,OAAO,KAAK,UAAU,kBAAkB,CAAC,IAAc,EAAE,GAAgB;QACvE,MAAM,IAAI,GAAG,IAAmB,CAAC;QACjC,MAAM,KAAK,GAAG,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;QAC3F,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,qBAAqB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QAC7E,CAAC;QAED,wEAAwE;QACxE,2EAA2E;QAC3E,yEAAyE;QACzE,sEAAsE;QACtE,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE;YACvC,GAAG,EAAE,GAAG,CAAC,GAAG;YACZ,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,8FAA8F;YAC9F,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,SAAS;SAChC,CAAC,CAAC;QACH,2EAA2E;QAC3E,2CAA2C;QAC3C,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC3B,4EAA4E;QAC5E,sEAAsE;QACtE,0EAA0E;QAC1E,uEAAuE;QACvE,wEAAwE;QACxE,yEAAyE;QACzE,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACvB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC5B,OAAO;gBACL,UAAU,EAAE,MAAM,CAAC,KAAK;gBACxB,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE,WAAW;aACnB,CAAC;QACJ,CAAC;QACD,GAAG,CAAC,IAAI,CAAC;YACP,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YAC5B,IAAI,EAAE,KAAK;YACX,KAAK,EAAE,MAAM;YACb,OAAO,EAAE,aAAa,IAAI,CAAC,EAAE,UAAU,MAAM,CAAC,KAAK,EAAE;SACtD,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,MAAM,CAAC;QAC7D,yEAAyE;QACzE,yEAAyE;QACzE,wEAAwE;QACxE,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,KAAK,YAAY,CAAC;QACjD,OAAO;YACL,UAAU,EAAE,MAAM,CAAC,KAAK;YACxB,EAAE,EAAE,QAAQ,CAAC,KAAK,KAAK,WAAW;YAClC,MAAM,EAAE,WAAW,QAAQ,CAAC,KAAK,KAAK,QAAQ,CAAC,KAAK,MAAM,QAAQ,CAAC,OAAO,EAAE;YAC5E,KAAK,EAAE,QAAQ,CAAC,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,IAAI,iBAAiB,QAAQ,CAAC,KAAK,EAAE,CAAC;YACzG,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;YACpD,MAAM,EAAE,QAAQ,CAAC,OAAO,KAAK,UAAU;YACvC,4EAA4E;YAC5E,yEAAyE;YACzE,eAAe,EAAE,QAAQ,CAAC,OAAO,EAAE,eAAe;YAClD,cAAc,EAAE,QAAQ,CAAC,OAAO,EAAE,cAAc,IAAI,QAAQ,CAAC,GAAG;YAChE,OAAO,EAAE,QAAQ,CAAC,OAAO;SAC1B,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ultraapp.js","sourceRoot":"","sources":["../../../../src/kernel/nodes/ultraapp.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;
|
|
1
|
+
{"version":3,"file":"ultraapp.js","sourceRoot":"","sources":["../../../../src/kernel/nodes/ultraapp.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AA6CH,MAAM,UAAU,yBAAyB,CAAC,IAAsB;IAC9D,OAAO,KAAK,UAAU,wBAAwB,CAAC,IAAc,EAAE,GAAgB;QAC7E,MAAM,IAAI,GAAG,IAAyB,CAAC;QACvC,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;QACjE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC;YAC9B,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,MAAM,EAAE,GAAG,CAAC,MAAM;SACnB,CAAC,CAAC;QACH,OAAO;YACL,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,MAAM,EAAE,MAAM,CAAC,EAAE;gBACf,CAAC,CAAC,mCAAmC,MAAM,CAAC,MAAM,WAAW;gBAC7D,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,IAAI,0BAA0B,CAAC;YACjD,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,IAAI,0BAA0B,CAAC;YAC5E,IAAI,EAAE,EAAE,YAAY,EAAE,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;SACnE,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,IAAsB;IAC/D,OAAO,KAAK,UAAU,yBAAyB,CAAC,IAAc,EAAE,GAAgB;QAC9E,MAAM,IAAI,GAAG,IAA0B,CAAC;QACxC,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;QACjE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC;YAC/B,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,MAAM,EAAE,GAAG,CAAC,MAAM;SACnB,CAAC,CAAC;QACH,OAAO;YACL,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,MAAM,CAAC,GAAG,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,IAAI,eAAe,CAAC;YAClG,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,IAAI,eAAe,CAAC;YACjE,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,IAAI,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE;SACjD,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -16,10 +16,14 @@ import { runContract } from '../../verify/runner.js';
|
|
|
16
16
|
function makeFixer(ctx, nodeId) {
|
|
17
17
|
if (!ctx.manager)
|
|
18
18
|
return undefined;
|
|
19
|
+
// Scoped to this visit and attempt, like an agent node's session: an
|
|
20
|
+
// abandoned attempt may still be inside its fixer, and its teardown would
|
|
21
|
+
// stop a retry's or a revisit's fixer of the same name.
|
|
22
|
+
const visit = ctx.record.nodes[nodeId]?.visits ?? 1;
|
|
19
23
|
return async ({ cwd, failingCheck, tail, round }) => {
|
|
20
24
|
await runAgentStep({
|
|
21
25
|
manager: ctx.manager,
|
|
22
|
-
sessionName: `${ctx.runId}-${nodeId}-fix-${round}`,
|
|
26
|
+
sessionName: `${ctx.runId}-${nodeId}-v${visit}a${ctx.attempt}-fix-${round}`,
|
|
23
27
|
parentRunId: ctx.runId,
|
|
24
28
|
logger: ctx.logger,
|
|
25
29
|
config: { cwd, permissionMode: 'bypassPermissions' },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verifier.js","sourceRoot":"","sources":["../../../../src/kernel/nodes/verifier.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACtF,OAAO,EAAE,WAAW,EAAqB,MAAM,wBAAwB,CAAC;AAExE,SAAS,SAAS,CAAC,GAAgB,EAAE,MAAc;IACjD,IAAI,CAAC,GAAG,CAAC,OAAO;QAAE,OAAO,SAAS,CAAC;IACnC,OAAO,KAAK,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;QAClD,MAAM,YAAY,CAAC;YACjB,OAAO,EAAE,GAAG,CAAC,OAAQ;YACrB,WAAW,EAAE,GAAG,GAAG,CAAC,KAAK,IAAI,MAAM,QAAQ,KAAK,EAAE;
|
|
1
|
+
{"version":3,"file":"verifier.js","sourceRoot":"","sources":["../../../../src/kernel/nodes/verifier.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,6 +32,7 @@ export interface FanoutNodeData {
|
|
|
32
32
|
agentCount: number;
|
|
33
33
|
results: FanoutAgentResult[];
|
|
34
34
|
synthesis?: string;
|
|
35
|
+
synthesisError?: string;
|
|
35
36
|
}
|
|
36
37
|
export declare function toFanoutSession(record: RunRecord): FanoutSession;
|
|
37
38
|
export declare function toUltraplanResult(record: RunRecord, plan: string | undefined): UltraplanResult;
|
|
@@ -31,6 +31,10 @@ function isDone(state) {
|
|
|
31
31
|
export function toCouncilSession(record) {
|
|
32
32
|
const data = node(record)?.data;
|
|
33
33
|
const declared = spec(record);
|
|
34
|
+
// A council that throws during setup publishes `running` on its first event
|
|
35
|
+
// and nothing after, so a finished run would read as running forever.
|
|
36
|
+
const reported = data?.councilStatus === 'running' && isDone(record.state) ? undefined : data?.councilStatus;
|
|
37
|
+
const error = node(record)?.error ?? record.error;
|
|
34
38
|
return {
|
|
35
39
|
id: record.runId,
|
|
36
40
|
task: data?.task ?? declared?.task ?? record.workflow,
|
|
@@ -44,11 +48,12 @@ export function toCouncilSession(record) {
|
|
|
44
48
|
// run's state stands in. A run that was cancelled or failed before the
|
|
45
49
|
// council spoke has no council status to report, and inventing `consensus`
|
|
46
50
|
// for it would be the exact kind of claim this release removes.
|
|
47
|
-
status:
|
|
51
|
+
status: reported ?? (record.state === 'running' ? 'running' : 'error'),
|
|
48
52
|
startTime: record.createdAt,
|
|
49
53
|
endTime: record.endedAt,
|
|
50
54
|
finalSummary: data?.finalSummary,
|
|
51
55
|
compactContext: data?.compactContext,
|
|
56
|
+
...(error ? { error } : {}),
|
|
52
57
|
};
|
|
53
58
|
}
|
|
54
59
|
export function toFanoutSession(record) {
|
|
@@ -70,6 +75,7 @@ export function toFanoutSession(record) {
|
|
|
70
75
|
finishedAt: record.endedAt,
|
|
71
76
|
results: data?.results ?? [],
|
|
72
77
|
synthesis: data?.synthesis,
|
|
78
|
+
synthesisError: data?.synthesisError,
|
|
73
79
|
error: record.error,
|
|
74
80
|
};
|
|
75
81
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projections.js","sourceRoot":"","sources":["../../../src/kernel/projections.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAMH,4FAA4F;AAC5F,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC;AAElC,SAAS,IAAI,CAAC,MAAiB,EAAE,EAAE,GAAG,WAAW;IAC/C,OAAO,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;AAC1B,CAAC;AAED;;;;GAIG;AACH,SAAS,IAAI,CAAI,MAAiB,EAAE,EAAE,GAAG,WAAW;IAClD,OAAO,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAkB,CAAC;AACvE,CAAC;AAED,+EAA+E;AAC/E,SAAS,MAAM,CAAC,KAAe;IAC7B,OAAO,KAAK,KAAK,WAAW,IAAI,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,WAAW,CAAC;AAC9E,CAAC;AAeD,MAAM,UAAU,gBAAgB,CAAC,MAAiB;IAChD,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,IAAmC,CAAC;IAC/D,MAAM,QAAQ,GAAG,IAAI,CAAmF,MAAM,CAAC,CAAC;IAChH,OAAO;QACL,EAAE,EAAE,MAAM,CAAC,KAAK;QAChB,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,QAAQ,EAAE,IAAI,IAAI,MAAM,CAAC,QAAQ;QACrD,MAAM,EAAE;YACN,MAAM,EAAE,IAAI,EAAE,MAAM,IAAI,QAAQ,EAAE,MAAM,IAAI,EAAE;YAC9C,SAAS,EAAE,IAAI,EAAE,SAAS,IAAI,QAAQ,EAAE,SAAS,IAAI,CAAC;YACtD,UAAU,EAAE,IAAI,EAAE,UAAU,IAAI,MAAM,CAAC,GAAG;SAC3C;QACD,SAAS,EAAE,IAAI,EAAE,SAAS,IAAI,EAAE;QAChC,4EAA4E;QAC5E,uEAAuE;QACvE,2EAA2E;QAC3E,gEAAgE;QAChE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"projections.js","sourceRoot":"","sources":["../../../src/kernel/projections.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
* caller's task, agents, and cwd.
|
|
8
8
|
*/
|
|
9
9
|
import { type AcceptanceContract } from '../../verify/contract.js';
|
|
10
|
-
import type { CouncilNode, FanoutAgentSpec, FanoutNode, GoalNode, WorkflowSpec } from '../types.js';
|
|
10
|
+
import type { CouncilAgentSpec, CouncilNode, FanoutAgentSpec, FanoutNode, GoalNode, WorkflowSpec } from '../types.js';
|
|
11
11
|
/** Worst case for a fan-out node: each agent in turn, including its start, then synthesis. */
|
|
12
12
|
export declare function fanoutNodeBudget(agents: number, synthesize: boolean | undefined, agentTimeoutMs?: number): number;
|
|
13
13
|
/**
|
|
@@ -22,7 +22,8 @@ export interface CommonArgs {
|
|
|
22
22
|
contract?: AcceptanceContract;
|
|
23
23
|
}
|
|
24
24
|
export interface CouncilArgs extends CommonArgs {
|
|
25
|
-
agents:
|
|
25
|
+
agents: CouncilAgentSpec[];
|
|
26
|
+
/** Default `DEFAULT_MAX_ROUNDS`, as for `council_start`. */
|
|
26
27
|
maxRounds?: number;
|
|
27
28
|
}
|
|
28
29
|
/**
|
|
@@ -46,6 +47,7 @@ export interface SolveArgs extends CommonArgs {
|
|
|
46
47
|
implementer?: {
|
|
47
48
|
engine?: FanoutAgentSpec['engine'];
|
|
48
49
|
model?: string;
|
|
50
|
+
acpAgent?: string;
|
|
49
51
|
};
|
|
50
52
|
/** Reviewers that read the finished change. */
|
|
51
53
|
reviewers?: FanoutAgentSpec[];
|
|
@@ -55,7 +57,7 @@ export interface SolveArgs extends CommonArgs {
|
|
|
55
57
|
maxRepairs?: number;
|
|
56
58
|
}
|
|
57
59
|
/**
|
|
58
|
-
* The flagship: triage → (gate) → implement → verify → repair-until-green
|
|
60
|
+
* The flagship: triage → (gate) → implement → (review) → verify → repair-until-green.
|
|
59
61
|
*
|
|
60
62
|
* The repair loop is the part that needs the kernel rather than a prompt: the
|
|
61
63
|
* router sends control back to the implementer while the verifier is red and the
|
|
@@ -64,13 +66,15 @@ export interface SolveArgs extends CommonArgs {
|
|
|
64
66
|
*/
|
|
65
67
|
export declare function solveWorkflow(args: SolveArgs): WorkflowSpec;
|
|
66
68
|
export interface GoalArgs extends CommonArgs {
|
|
67
|
-
/**
|
|
69
|
+
/** Who runs the goal: a Codex `codex-app` thread (default) or a Claude Code session. */
|
|
70
|
+
engine?: GoalNode['engine'];
|
|
71
|
+
/** Model for the goal's thread; omitted means the engine's own default. */
|
|
68
72
|
model?: string;
|
|
69
73
|
effort?: string;
|
|
70
74
|
sandboxMode?: GoalNode['sandboxMode'];
|
|
71
|
-
/** Argv prefix
|
|
75
|
+
/** Argv prefix the engine runs under, e.g. a sandbox wrapper. */
|
|
72
76
|
launcher?: string[];
|
|
73
|
-
/** Start on this existing
|
|
77
|
+
/** Start on this existing thread or Claude session (its goal is replaced). */
|
|
74
78
|
threadId?: string;
|
|
75
79
|
tokenBudget?: number;
|
|
76
80
|
/** Wall-clock budget for one goal pass. Omitted means none. */
|
|
@@ -79,12 +83,12 @@ export interface GoalArgs extends CommonArgs {
|
|
|
79
83
|
maxRepairs?: number;
|
|
80
84
|
}
|
|
81
85
|
/**
|
|
82
|
-
* A
|
|
86
|
+
* A `/goal` judged by checks it did not write: goal → verify → repair.
|
|
83
87
|
*
|
|
84
|
-
* The goal runs on one `codex-app` thread
|
|
85
|
-
*
|
|
86
|
-
*
|
|
87
|
-
* repair budget remains.
|
|
88
|
+
* The goal runs on one thread — a Codex `codex-app` thread, or a Claude Code
|
|
89
|
+
* session — until the agent calls it complete. That is the agent's opinion;
|
|
90
|
+
* the verifier's contract is the verdict. On red, the router sends control
|
|
91
|
+
* back to the same thread with the failing checks while repair budget remains.
|
|
88
92
|
*/
|
|
89
93
|
export declare function goalWorkflow(args: GoalArgs): WorkflowSpec;
|
|
90
94
|
import type { EngineType } from '../../types.js';
|
|
@@ -106,6 +110,7 @@ export interface LegacyFanoutArgs {
|
|
|
106
110
|
synthesize?: boolean;
|
|
107
111
|
synthesisEngine?: FanoutNode['synthesisEngine'];
|
|
108
112
|
synthesisModel?: string;
|
|
113
|
+
synthesisAcpAgent?: string;
|
|
109
114
|
synthesisPermissionMode?: string;
|
|
110
115
|
maxTurnsPerAgent?: number;
|
|
111
116
|
maxBudgetUsd?: number;
|
|
@@ -37,6 +37,7 @@ export function councilNodeBudget(agents, maxRounds, agentTimeoutMs = COUNCIL_AG
|
|
|
37
37
|
* recorded on the run.
|
|
38
38
|
*/
|
|
39
39
|
export function councilWorkflow(args) {
|
|
40
|
+
const maxRounds = args.maxRounds ?? DEFAULT_MAX_ROUNDS;
|
|
40
41
|
return {
|
|
41
42
|
name: 'council',
|
|
42
43
|
cwd: args.cwd,
|
|
@@ -48,9 +49,9 @@ export function councilWorkflow(args) {
|
|
|
48
49
|
task: args.task,
|
|
49
50
|
agents: args.agents,
|
|
50
51
|
projectDir: args.cwd,
|
|
51
|
-
maxRounds
|
|
52
|
+
maxRounds,
|
|
52
53
|
agentTimeoutMs: COUNCIL_AGENT_TIMEOUT_MS,
|
|
53
|
-
timeoutMs: councilNodeBudget(args.agents.length,
|
|
54
|
+
timeoutMs: councilNodeBudget(args.agents.length, maxRounds),
|
|
54
55
|
},
|
|
55
56
|
],
|
|
56
57
|
};
|
|
@@ -75,7 +76,7 @@ export function fanoutWorkflow(args) {
|
|
|
75
76
|
};
|
|
76
77
|
}
|
|
77
78
|
/**
|
|
78
|
-
* The flagship: triage → (gate) → implement → verify → repair-until-green
|
|
79
|
+
* The flagship: triage → (gate) → implement → (review) → verify → repair-until-green.
|
|
79
80
|
*
|
|
80
81
|
* The repair loop is the part that needs the kernel rather than a prompt: the
|
|
81
82
|
* router sends control back to the implementer while the verifier is red and the
|
|
@@ -105,6 +106,7 @@ export function solveWorkflow(args) {
|
|
|
105
106
|
prompt: args.task,
|
|
106
107
|
engine: args.implementer?.engine,
|
|
107
108
|
model: args.implementer?.model,
|
|
109
|
+
acpAgent: args.implementer?.acpAgent,
|
|
108
110
|
cwd: args.cwd,
|
|
109
111
|
// A failed implementation attempt still goes to the verifier, so the
|
|
110
112
|
// evidence bundle records what was actually wrong rather than just "the
|
|
@@ -175,12 +177,12 @@ export function solveWorkflow(args) {
|
|
|
175
177
|
};
|
|
176
178
|
}
|
|
177
179
|
/**
|
|
178
|
-
* A
|
|
180
|
+
* A `/goal` judged by checks it did not write: goal → verify → repair.
|
|
179
181
|
*
|
|
180
|
-
* The goal runs on one `codex-app` thread
|
|
181
|
-
*
|
|
182
|
-
*
|
|
183
|
-
* repair budget remains.
|
|
182
|
+
* The goal runs on one thread — a Codex `codex-app` thread, or a Claude Code
|
|
183
|
+
* session — until the agent calls it complete. That is the agent's opinion;
|
|
184
|
+
* the verifier's contract is the verdict. On red, the router sends control
|
|
185
|
+
* back to the same thread with the failing checks while repair budget remains.
|
|
184
186
|
*/
|
|
185
187
|
export function goalWorkflow(args) {
|
|
186
188
|
const maxRepairs = args.maxRepairs ?? 1;
|
|
@@ -188,6 +190,7 @@ export function goalWorkflow(args) {
|
|
|
188
190
|
id: 'goal',
|
|
189
191
|
kind: 'goal',
|
|
190
192
|
objective: args.task,
|
|
193
|
+
...(args.engine ? { engine: args.engine } : {}),
|
|
191
194
|
cwd: args.cwd,
|
|
192
195
|
model: args.model,
|
|
193
196
|
effort: args.effort,
|
|
@@ -288,6 +291,7 @@ export function legacyFanoutWorkflow(args) {
|
|
|
288
291
|
synthesize: args.synthesize,
|
|
289
292
|
synthesisEngine: args.synthesisEngine,
|
|
290
293
|
synthesisModel: args.synthesisModel,
|
|
294
|
+
synthesisAcpAgent: args.synthesisAcpAgent,
|
|
291
295
|
synthesisPermissionMode: args.synthesisPermissionMode,
|
|
292
296
|
maxTurnsPerAgent: args.maxTurnsPerAgent,
|
|
293
297
|
maxBudgetUsd: args.maxBudgetUsd,
|
|
@@ -331,6 +335,7 @@ export function legacyUltraplanWorkflow(args) {
|
|
|
331
335
|
model: args.model,
|
|
332
336
|
permissionMode: 'plan',
|
|
333
337
|
effort: 'max',
|
|
338
|
+
appendSystemPrompt: ULTRAPLAN_SYSTEM_PROMPT,
|
|
334
339
|
timeoutMs: args.timeoutMs,
|
|
335
340
|
prompt: `# Ultraplan Task\n\n${args.task}\n\nExplore the project, understand the codebase, analyze ` +
|
|
336
341
|
`feasibility, and produce a comprehensive implementation plan. Take your time (up to 30 minutes). ` +
|
|
@@ -362,6 +367,7 @@ export function ultraappWorkflow(args) {
|
|
|
362
367
|
appRunId: args.appRunId,
|
|
363
368
|
runDir: args.runDir,
|
|
364
369
|
slug: args.slug,
|
|
370
|
+
codebasePath: args.codebasePath,
|
|
365
371
|
// The synth stage is a three-agent, eight-round council (ultraapp/council-adapter.ts).
|
|
366
372
|
timeoutMs: councilNodeBudget(3, 8),
|
|
367
373
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/kernel/templates/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EACL,wBAAwB,EACxB,uBAAuB,EACvB,6BAA6B,GAE9B,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/kernel/templates/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,15 +16,17 @@ import type { TestSnapshot } from '../verify/protected-tests.js';
|
|
|
16
16
|
import type { AcceptanceContract } from '../verify/contract.js';
|
|
17
17
|
import type { AgentBinding, EngineType } from '../types.js';
|
|
18
18
|
/**
|
|
19
|
-
* `completed` is
|
|
20
|
-
*
|
|
21
|
-
*
|
|
19
|
+
* `completed` is entered from `running` once control runs out of nodes; a
|
|
20
|
+
* verifier holds the run in `verifying` only while its checks run. A run
|
|
21
|
+
* carrying a contract whose evidence is red goes to `failed`, never to
|
|
22
|
+
* `completed` — that is the whole point of the state machine — and so does a
|
|
23
|
+
* run that declares a run-level contract and ends without having run it.
|
|
22
24
|
*/
|
|
23
25
|
export type RunState = 'pending' | 'running' | 'awaiting_human' | 'verifying' | 'completed' | 'failed' | 'cancelled';
|
|
24
26
|
/**
|
|
25
27
|
* Whether anything independent of the agent checked the work.
|
|
26
28
|
* - `verified` — a contract ran and every required check passed.
|
|
27
|
-
* - `unverified` — no contract
|
|
29
|
+
* - `unverified` — no contract ran, or its verdict no longer describes the tree. We do not know.
|
|
28
30
|
* - `refuted` — a contract ran and a required check failed.
|
|
29
31
|
*/
|
|
30
32
|
export type RunOutcome = 'verified' | 'unverified' | 'refuted';
|
|
@@ -51,6 +53,8 @@ export interface AgentNode extends NodeBase, AgentBinding {
|
|
|
51
53
|
/** Reuse a named session across nodes; omitted means one session per attempt. */
|
|
52
54
|
sessionName?: string;
|
|
53
55
|
permissionMode?: string;
|
|
56
|
+
/** Standing instructions for the session, appended to its system prompt. */
|
|
57
|
+
appendSystemPrompt?: string;
|
|
54
58
|
}
|
|
55
59
|
/**
|
|
56
60
|
* One agent in a fan-out or council.
|
|
@@ -85,6 +89,8 @@ export interface FanoutNode extends NodeBase {
|
|
|
85
89
|
synthesize?: boolean;
|
|
86
90
|
synthesisEngine?: EngineType;
|
|
87
91
|
synthesisModel?: string;
|
|
92
|
+
/** The ACP agent preset for a synthesis pass on engine `acp`. */
|
|
93
|
+
synthesisAcpAgent?: string;
|
|
88
94
|
synthesisPermissionMode?: string;
|
|
89
95
|
maxTurnsPerAgent?: number;
|
|
90
96
|
maxBudgetUsd?: number;
|
|
@@ -96,11 +102,16 @@ export interface FanoutNode extends NodeBase {
|
|
|
96
102
|
*/
|
|
97
103
|
agentTimeoutMs?: number;
|
|
98
104
|
}
|
|
105
|
+
/** One council seat: a fan-out agent plus the emoji its charter and transcript show. */
|
|
106
|
+
export interface CouncilAgentSpec extends FanoutAgentSpec {
|
|
107
|
+
emoji?: string;
|
|
108
|
+
}
|
|
99
109
|
export interface CouncilNode extends NodeBase {
|
|
100
110
|
kind: 'council';
|
|
101
111
|
task: string;
|
|
102
|
-
agents:
|
|
112
|
+
agents: CouncilAgentSpec[];
|
|
103
113
|
projectDir?: string;
|
|
114
|
+
/** Omitted means `DEFAULT_MAX_ROUNDS`, the same default `council_start` uses. */
|
|
104
115
|
maxRounds?: number;
|
|
105
116
|
maxTurnsPerAgent?: number;
|
|
106
117
|
maxBudgetUsd?: number;
|
|
@@ -177,8 +188,9 @@ export interface AutoloopNode extends NodeBase {
|
|
|
177
188
|
config: Record<string, unknown>;
|
|
178
189
|
}
|
|
179
190
|
/**
|
|
180
|
-
* A
|
|
181
|
-
*
|
|
191
|
+
* A `/goal`: one thread working on one objective, turn after turn on its own,
|
|
192
|
+
* until the goal leaves `active`. A Codex `codex-app` thread by default, or a
|
|
193
|
+
* Claude Code session with `engine: 'claude'`.
|
|
182
194
|
*
|
|
183
195
|
* The thread id is checkpointed on the node, so a resumed run reattaches the
|
|
184
196
|
* same thread rather than starting the objective over. A revisit after a red
|
|
@@ -189,11 +201,14 @@ export interface AutoloopNode extends NodeBase {
|
|
|
189
201
|
export interface GoalNode extends NodeBase {
|
|
190
202
|
kind: 'goal';
|
|
191
203
|
objective: string;
|
|
204
|
+
/** Who runs the goal. Default `codex`. */
|
|
205
|
+
engine?: 'codex' | 'claude';
|
|
192
206
|
cwd?: string;
|
|
193
207
|
model?: string;
|
|
194
208
|
effort?: string;
|
|
209
|
+
/** Codex's own sandbox; Claude Code has no equivalent and ignores it. */
|
|
195
210
|
sandboxMode?: 'read-only' | 'workspace-write' | 'danger-full-access';
|
|
196
|
-
/** Argv prefix
|
|
211
|
+
/** Argv prefix the engine runs under, e.g. a sandbox wrapper. Caller-authored. */
|
|
197
212
|
launcher?: string[];
|
|
198
213
|
/**
|
|
199
214
|
* Start on this existing codex-app thread instead of a new one: its goal is
|
|
@@ -235,6 +250,8 @@ export interface UltraappSynthNode extends NodeBase {
|
|
|
235
250
|
/** Absolute per-run directory; the council project and the codebase live under it. */
|
|
236
251
|
runDir: string;
|
|
237
252
|
slug: string;
|
|
253
|
+
/** Where to put the consensus codebase. Absent on runs recorded before builds were versioned: `versions/v1/codebase`. */
|
|
254
|
+
codebasePath?: string;
|
|
238
255
|
}
|
|
239
256
|
export interface UltraappDeployNode extends NodeBase {
|
|
240
257
|
kind: 'ultraapp_deploy';
|
|
@@ -252,7 +269,10 @@ export interface WorkflowSpec {
|
|
|
252
269
|
cwd?: string;
|
|
253
270
|
/**
|
|
254
271
|
* Run-level acceptance contract. When present the kernel appends an implicit
|
|
255
|
-
* terminal verifier
|
|
272
|
+
* terminal verifier unless the spec places its own `contract: 'run'` one, and a
|
|
273
|
+
* run that ends without a verdict from such a verifier fails — so `completed`
|
|
274
|
+
* always means "this contract ran and passed". An outcome of `unverified` on a
|
|
275
|
+
* completed run says the verdict stopped describing the tree afterwards.
|
|
256
276
|
*/
|
|
257
277
|
contract?: AcceptanceContract;
|
|
258
278
|
/** Loop bound. Exceeding it fails the run rather than spinning. Default 50. */
|
|
@@ -313,7 +333,10 @@ export interface RunRecord {
|
|
|
313
333
|
baseSha?: string;
|
|
314
334
|
/**
|
|
315
335
|
* The test files and test configuration as the run found them, for the
|
|
316
|
-
* protected-tests check. Taken only when the
|
|
336
|
+
* protected-tests check. Taken only when the run-level contract or a
|
|
337
|
+
* verifier's inline contract has a `command` check and does not set
|
|
338
|
+
* `protectTests: false`, or the spec has a subflow (`needsTestSnapshot`). A
|
|
339
|
+
* subflow child uses its parent's, when the parent has one.
|
|
317
340
|
*/
|
|
318
341
|
baseTests?: TestSnapshot;
|
|
319
342
|
/** Recorded for the record. Never consulted to decide completion. */
|
|
@@ -338,9 +361,10 @@ export interface RunRecord {
|
|
|
338
361
|
sideEffectSeq: number;
|
|
339
362
|
};
|
|
340
363
|
/**
|
|
341
|
-
* Count of
|
|
342
|
-
* `
|
|
343
|
-
* the
|
|
364
|
+
* Count of node results absorbed from kinds that can touch the workspace —
|
|
365
|
+
* every kind but `verifier`, `router` and `human_gate` (`SIDE_EFFECT_KINDS` in
|
|
366
|
+
* the engine). Compared against the value stored on the verdict, so the
|
|
367
|
+
* kernel knows whether anything ran after the checks at all.
|
|
344
368
|
*/
|
|
345
369
|
sideEffectSeq?: number;
|
|
346
370
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/kernel/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/kernel/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAoZH,MAAM,CAAC,MAAM,mBAAmB,GAAwB,CAAC,WAAW,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;AAE7F,MAAM,UAAU,kBAAkB,CAAC,CAAW;IAC5C,OAAO,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;AACzC,CAAC"}
|
package/dist/src/logger.d.ts
CHANGED
|
@@ -12,5 +12,11 @@ export interface Logger {
|
|
|
12
12
|
}
|
|
13
13
|
/** Create a console-backed logger with optional prefix and env-var level control. */
|
|
14
14
|
export declare function createConsoleLogger(prefix?: string): Logger;
|
|
15
|
+
/**
|
|
16
|
+
* Every level to stderr, filtered by OPENCLAW_LOG_LEVEL like the console logger.
|
|
17
|
+
*
|
|
18
|
+
* For the stdio servers, whose stdout carries nothing but protocol frames.
|
|
19
|
+
*/
|
|
20
|
+
export declare function createStderrLogger(prefix?: string): Logger;
|
|
15
21
|
/** No-op logger — useful in tests to suppress output. */
|
|
16
22
|
export declare const nullLogger: Logger;
|
package/dist/src/logger.js
CHANGED
|
@@ -34,6 +34,20 @@ export function createConsoleLogger(prefix) {
|
|
|
34
34
|
},
|
|
35
35
|
};
|
|
36
36
|
}
|
|
37
|
+
/**
|
|
38
|
+
* Every level to stderr, filtered by OPENCLAW_LOG_LEVEL like the console logger.
|
|
39
|
+
*
|
|
40
|
+
* For the stdio servers, whose stdout carries nothing but protocol frames.
|
|
41
|
+
*/
|
|
42
|
+
export function createStderrLogger(prefix) {
|
|
43
|
+
const threshold = LEVELS[parseLevel(process.env.OPENCLAW_LOG_LEVEL)];
|
|
44
|
+
const pfx = prefix ? `[${prefix}] ` : '';
|
|
45
|
+
const at = (level) => (msg, ...args) => {
|
|
46
|
+
if (threshold <= LEVELS[level])
|
|
47
|
+
console.error(`${pfx}${msg}`, ...args);
|
|
48
|
+
};
|
|
49
|
+
return { debug: at('debug'), info: at('info'), warn: at('warn'), error: at('error') };
|
|
50
|
+
}
|
|
37
51
|
/** No-op logger — useful in tests to suppress output. */
|
|
38
52
|
export const nullLogger = {
|
|
39
53
|
debug: () => { },
|