* fix(#2590): emit Workflow scripts the Workflow tool accepts; make the backend reachable Every emitted script was rejected. Four invalid constructs, the first fatal on its own, so the Workflow backend could never dispatch a wave: 1. no `export const meta = {…}` first statement -> whole script rejected 2. resumeFromRunId("<id>") -> "resumeFromRunId is not defined". It is a Workflow TOOL INPUT parameter, not a script function. The run id still reaches the caller via summary.resumeRunId, to pass as that input. 3. budget(<n>) -> "budget is not a function". `budget` is a read-only object { total, spent(), remaining() } fed by the caller's token directive; a script cannot set it. Recorded as intent in a comment. 4. parallel(agent(…), agent(…)) -> "parallel() expects an array of functions". Now parallel([() => agent(…), …]) — passing agent() results directly also started every agent eagerly, before parallel() could bound concurrency. The single-plan stage had its own branch with the same parallel() defect; both branches are now one array-emitting path. Waves also emit phase() calls whose titles match meta.phases exactly, so progress groups correctly. Two secondary defects kept the script from ever being REACHED — which is why this shipped undetected: 5. NOTHING resolved the Agent SDK version. The fragment claimed there was "no scriptable way" to introspect it and told callers to omit the flag, so gate 5 returned agent_sdk_version_unknown on every automated run while `capability state` still reported active:true. True for bash, false for Node: the router now reads the installed @anthropic-ai/claude-agent-sdk version, walking node_modules up the tree and reading package.json directly — require.resolve throws ERR_PACKAGE_PATH_NOT_EXPORTED because the SDK's exports map does not expose ./package.json. Precedence: explicit flag > GSD_AGENT_SDK_VERSION > installed. Fail-closed is preserved; an unresolvable version still declines to inline. A too-old SDK now reports the truthful agent_sdk_version_below_floor instead of unknown. 6. The runtime fallback was `--runtime > GSD_RUNTIME > 'unknown'`, diverging from the canonical `GSD_RUNTIME > config.runtime > 'claude'`, so any invocation without --runtime reported runtime_not_claude on an ordinary Claude project. Now delegates to runtime-slash.resolveRuntime. The fragment's `${AGENT_SDK_VERSION:+--agent-sdk-version "$AGENT_SDK_VERSION"}` snippet is removed rather than repaired: it was also shell-dependent — zsh does not word-split unquoted parameter expansions, so it collapsed to a single argv element, argValue() never matched, and the run failed into the same agent_sdk_version_unknown, indistinguishable from genuinely unknown. Auto- resolution removes the need for the construct entirely. Verified with the issue's own repro: no flags now reaches the version gate; an SDK above the floor yields backend:"workflow" with a script that parses as a real ES module. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_015TCwhbMuY37DzRMCfzTABJ * fix(#2590): sync generated registry, repair sibling tests, reject duplicate wave ids Findings from the isolated review, all fixed. HIGH — gsd-core/bin/lib/capability-registry.cjs was stale, and `lint:ci` was already RED because of it. The registry embeds the fragment text INLINE, so the shipped/installed copy still taught the exact broken contract this PR fixes: the old `${AGENT_SDK_VERSION:+…}` bash line and the "OMIT the flag when unknown" guidance. Regenerated. (I had read `lint:ci` by grepping its output instead of checking its exit code, so I recorded a red chain as green — checking $? now.) HIGH — three existing tests asserted the OLD broken shape and would have failed CI; none was touched by the first commit: tests/fix-2285-claude-orchestration-wiring.test.cjs — matched resumeFromRunId("…") tests/claude-orchestration.test.cjs — .includes('budget(') tests/claude-orchestration-command-router.test.cjs — .includes('budget(') Each now asserts the corrected contract: the id/pool reaches the caller via summary, and neither construct is ever CALLED. Two sibling assertions had also gone vacuous — `.includes('resumeFromRunId')` still passed, but only because the new explanatory COMMENT contains that substring, not because anything is wired. Rewritten to assert the real property. MEDIUM — duplicate wave ids were never rejected. Plan-id uniqueness was checked within a wave, but nothing checked wave ids across waves. That was harmless before; it is not now, because each wave emits a `phase("Wave <id>")` call plus a matching meta.phases entry and the tool matches titles by exact string — two waves sharing an id would collapse into one progress group and misattribute the second wave's agents to the first. Rejected at validation, with tests either side of the boundary. MEDIUM — the fragment contradicted itself (its "Manifest construction" header still listed $AGENT_SDK_VERSION as orchestrator-built) and, more seriously, never told the orchestrator to pass summary.resumeRunId as the Workflow tool's resumeFromRunId INPUT. Since this PR moves resume from a broken in-script call to a tool-invocation input, an implementer following only the fragment would have silently regressed phase-resume to a no-op. Both fixed. MEDIUM — docs/how-to/enable-claude-orchestration-workflow-backend.md and docs/explanation/claude-orchestration-capability.md documented `resumeFromRunId("<id>")` and `budget(<tokens>)` as current correct output — teaching the bug as the feature. Updated to the real contract, including the required meta block and the thunk-array parallel() form. (The changeset is `Fixed`, so the docs gate exempts this; it is corrected because it is wrong, not because a gate demanded it.) LOW — the router's top-of-file comment still described the divergent `--runtime > GSD_RUNTIME > 'unknown'` chain as current, ninety lines above the fix; and inserting resolveInstalledAgentSdkVersion had orphaned resolveDetectionArgs' JSDoc above the wrong function. Both repaired. lint:ci now exits 0 (verified by exit code, not by reading output). Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_015TCwhbMuY37DzRMCfzTABJ * chore(#2590): backfill changeset pr number (#2681) --------- Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Tom Boucher
@@ -41,17 +41,24 @@ resolve the dispatch backend through the single composed CLI seam:
|
||||
gsd-tools claude-orchestration resolve-wave-dispatch \
|
||||
--waves "$WAVE_MANIFEST_PATH" --run-id "$PHASE_RUN_ID" \
|
||||
--runtime "$RUNTIME" \
|
||||
${AGENT_SDK_VERSION:+--agent-sdk-version "$AGENT_SDK_VERSION"} \
|
||||
--phase-dir "$PHASE_DIR" --raw
|
||||
```
|
||||
|
||||
`--agent-sdk-version` is no longer passed here (#2590). The router resolves the
|
||||
installed Agent SDK version itself; see **Agent SDK version** below. The former
|
||||
`${AGENT_SDK_VERSION:+--agent-sdk-version "$AGENT_SDK_VERSION"}` line was also
|
||||
**shell-dependent**: zsh does not word-split unquoted parameter expansions, so it
|
||||
collapsed to a SINGLE argv element there, `argValue()` never matched, and the run
|
||||
failed into `agent_sdk_version_unknown` — indistinguishable from genuinely
|
||||
unknown. Pass `--agent-sdk-version <ver>` explicitly only to pin a version.
|
||||
|
||||
This composes `detectWorkflowBackend` (the gate ladder above) with
|
||||
`emitWorkflowScript` (the wave→plan mapping below) in ONE call — the pure
|
||||
function backing it is `resolveWaveDispatch` in
|
||||
`gsd-core/bin/lib/claude-orchestration.cjs`. Response shape:
|
||||
`{ backend: 'inline'|'workflow', reason, script?, summary? }`.
|
||||
|
||||
### Manifest construction (`$WAVE_MANIFEST_PATH`, `$PHASE_RUN_ID`, `$PHASE_DIR`, `$AGENT_SDK_VERSION`)
|
||||
### Manifest construction (`$WAVE_MANIFEST_PATH`, `$PHASE_RUN_ID`, `$PHASE_DIR`)
|
||||
|
||||
These are NOT pre-existing execute-phase.md variables — the orchestrator builds
|
||||
them at this step, from data it already has in-context from `discover_and_group_plans`
|
||||
@@ -116,15 +123,27 @@ them at this step, from data it already has in-context from `discover_and_group_
|
||||
#2285 finding 1). **Never** hardcode `true` — that would force worktree
|
||||
isolation on a plan the inline path explicitly keeps out of worktrees.
|
||||
|
||||
4. **`$AGENT_SDK_VERSION`** — see below; OMIT when unknown (fails closed).
|
||||
4. **`$AGENT_SDK_VERSION`** — no longer built here; the router resolves it.
|
||||
|
||||
**Agent SDK version:** the orchestrator has no scriptable (bash-computable) way
|
||||
to introspect the live Agent SDK version. When it can determine the version
|
||||
(e.g. from a host-exposed value it can read directly), pass
|
||||
`--agent-sdk-version`. When it cannot, OMIT the flag — `resolveWaveDispatch`'s
|
||||
gate 5 (`agent_sdk_version_unknown`) then fails closed to `inline` by design;
|
||||
this is not a bug, it is the same fail-closed posture documented above applied
|
||||
to a real absence of information.
|
||||
**Agent SDK version:** the orchestrator has no *bash-computable* way to
|
||||
introspect the live Agent SDK version — but the router runs in Node, so it
|
||||
resolves the version itself (#2590), in this order:
|
||||
|
||||
1. an explicit `--agent-sdk-version <ver>` (pin a version),
|
||||
2. `GSD_AGENT_SDK_VERSION`,
|
||||
3. the **installed** `@anthropic-ai/claude-agent-sdk` package version, read from
|
||||
its `package.json` on disk by walking `node_modules` up the tree. (Read
|
||||
directly rather than via `require.resolve`: the SDK's `exports` map does not
|
||||
expose `./package.json`, so `require.resolve` throws
|
||||
`ERR_PACKAGE_PATH_NOT_EXPORTED`.)
|
||||
|
||||
Previously nothing computed this at all, so gate 5 returned
|
||||
`agent_sdk_version_unknown` on **every** automated run and the Workflow backend
|
||||
could never activate — while `gsd-tools capability state` still reported the
|
||||
capability `active: true`. Fail-closed is preserved: when no version can be
|
||||
resolved, gate 5 still declines to `inline`. What changed is that a resolvable
|
||||
version is now actually found, so a genuinely-too-old SDK reports
|
||||
`agent_sdk_version_below_floor` — the truthful reason — instead of `unknown`.
|
||||
|
||||
**If `backend == "workflow"`:** run the emitted `script` via the Workflow tool
|
||||
for THIS wave instead of the per-message `Agent()` loop in step 3. The script
|
||||
@@ -142,8 +161,12 @@ worktree isolation applied PER PLAN from the manifest's `use_worktree` field
|
||||
gate (#2772 / #2285 finding 1).
|
||||
- **`files_modified` overlap → separate sequential stages** — the same overlap
|
||||
rule execute-phase already applies inline (step 1 of the wave loop).
|
||||
- **`resumeFromRunId`** — wired to the phase run id, so an interrupted phase
|
||||
resumes without re-running completed plans.
|
||||
- **`resumeFromRunId`** — **pass `summary.resumeRunId` as the Workflow tool's
|
||||
`resumeFromRunId` INPUT when you invoke the tool.** It is a tool parameter,
|
||||
not a script function; the script deliberately does not call it (#2590 — doing
|
||||
so threw "resumeFromRunId is not defined" and rejected the entire script).
|
||||
Omitting it from the tool invocation silently regresses phase-resume to a
|
||||
no-op: an interrupted phase re-runs completed plans.
|
||||
|
||||
The orchestrator still runs steps 4–5.8 (wait for completion, worktree cleanup,
|
||||
post-merge gate, tracking update) exactly as it does for inline dispatch — the
|
||||
|
||||
Reference in New Issue
Block a user