* enhance(#2483): env-guard the claude reviewer leg against CLAUDE.md injection
The claude reviewer in workflows/review.md was a bare headless `claude -p`
spawn run from the project cwd, so it inherited the invoking user's global
CLAUDE.md, the project CLAUDE.md, and Claude Code auto-memory.
That made it the only reviewer leg seeing anything beyond the prompt file.
gather_context assembles PROJECT.md, the roadmap section, every PLAN file,
CONTEXT.md, RESEARCH.md and REQUIREMENTS.md into the prompt before any
reviewer runs; the gemini leg receives only that prompt and the codex leg
runs --ephemeral. Beyond the measured ~4k tokens/spawn, the asymmetry cuts
at the workflow's own premise: "independent review" meant something
different for the claude leg than for the other two.
Guard both dispatch lines with a per-invocation
`env CLAUDE_CODE_DISABLE_CLAUDE_MDS=1`. `env`, never `export` — the flag
must not leak into the orchestrating session (which may itself be Claude
Code on the SELF_CLI="auto" path) or into any later spawn.
review.md is the only claude -p call site in the installed tree, so this is
two lines on one surface. The self-skip logic is untouched.
* enhance(#2483): fix CRLF-fragile split and regenerate workflow baselines
Two CI failures from the first push, both mine:
1. lint-tests: the new regression test split readFileSync content on a
literal "\n". On a Windows git-autocrlf checkout that leaves a trailing
"\r" on every line (local/no-crlf-fragile-split). Use .split(/\r?\n/).
2. golden-install-parity / workflow-size-budget / workflow-compat: editing
gsd-core/workflows/review.md changes its content hash and byte size, and
both are pinned in committed baselines. Regenerated via the repo's own
generators (npm run size:baseline, npm run gen:golden).
The regenerated diffs are review.md-only: exactly one hash line per
golden-install-parity fixture and one size entry in workflow-size-baseline
— no unrelated drift swept in.
Full suite now green locally: 2113 pass, 0 fail, 3 skipped (run with HOME
and CLAUDE_CONFIG_DIR overridden to throwaway dirs; live profile verified
untouched afterward).
* enhance(#2483): adapt guard-test matcher to the effort-args dispatch reshape
The effortSurface wiring (#2481) reshaped the bare-model dispatch to
`claude $CLAUDE_EFFORT_ARGS -p -`; the invocation matcher's dash-first
form could no longer see it, and the count assertion failed exactly as
designed. The matcher now tolerates variable expansions between `claude`
and its first literal flag. Negative-controlled both ways: a stripped
guard and a deleted dispatch line each still fail.
* enhance(#2483): also guard the claude leg against auto-memory injection
CLAUDE_CODE_DISABLE_CLAUDE_MDS suppresses CLAUDE.md file loading;
auto-memory is an independently-toggled mechanism with its own flag.
Add CLAUDE_CODE_DISABLE_AUTO_MEMORY=1 to both dispatch lines, correct
the docs/COMMANDS.md and changeset claims that credited the first flag
with covering auto-memory, and extend the regression test to require
both flags on every claude invocation (negative-controlled: 2/4
assertions fail with the new flag removed).
* enhance(#2483): match the claude binary in command position, not argument position
The line-oriented invocation matcher counted any line where the token
`claude` was followed by a flag. #2589 (landed on next as 920a5f3f)
reshaped the effort-args lookup from
--host claude 2>/dev/null | jq -r '.effort_argv_string // ""'
to
--host claude --pick effort_argv_string
which put a flag immediately after `claude` and made the config query
read as a third claude dispatch, failing the count assertion.
The defect class is a binary name in *argument* position being read as a
command. Fixed at the class rather than the instance: tokenise the line
and skip any `claude` whose preceding token is a flag. That also covers
the latent sibling one line away in review.md (`command -v claude`),
which escaped today only because its next token is a redirect.
Negative-controlled four ways: stripping CLAUDE_CODE_DISABLE_AUTO_MEMORY=1
fails, stripping the whole env guard fails, adding a genuine third
unguarded dispatch (`timeout 900 claude --output-format text -p -`) still
fails — so the narrowing did not blind the matcher to reshapes, which is
the property the count assertion exists for — and the pre-#2589 jq form of
the lookup still passes, so the matcher is not pinned to today's base.
* enhance(#2483): carry the claude reviewer's memory guard as declared lane data
ADR-2782 Phase 5b replaced the hand-authored per-CLI dispatch legs in
review.md with the declared lane table, so the two `env`-prefixed shell
lines this PR previously added no longer have a surface to live on. The
guard is reimplemented where the lane contract now lives.
`SpawnInvoke` gains an optional `env`, the claude lane declares the pair,
the resolver folds own string-valued entries into `SpawnPlan.env` (absent
or empty resolves to null, so the runner has one shape to test), and the
runner passes it to spawn. Production merges it OVER `process.env` into a
fresh object for that one child, so nothing reaches the orchestrating
session or any other lane in the run.
Declared data rather than a handler (D6): the pairs are static per lane,
which is precisely what the manifest vocabulary is for. The capability
manifest carries the same field, because the lane-fidelity test compares
manifest and descriptor over the union of `invoke`'s keys.
The regression test is rewritten against the resolver and runner rather
than review.md's text. It gains the property the source-text assertions
could only approximate: that `process.env` is never mutated.
Scope boundary, asserted rather than left in prose: `env` is not part of
the trust-disclosure surface, which is safe only while no manifest body
reaches the resolver — the registry's reviewer bodies contribute slugs to
the parity check and execution resolves from `REVIEWER_LANES`. The new
test fails first if that ever changes.
* enhance(#2483): restate the guard's mechanism in the docs and changeset
Both described the fix as two `env`-prefixed dispatch lines, which is the
surface ADR-2782 Phase 5b removed. The user-visible behaviour is
unchanged; the carrier is not, and a changeset that ships a description
of a mechanism the tree does not have is a CHANGELOG entry nobody can
verify against the code.
* enhance(#2483): cover the production spawn wiring end to end
The unit tests stop at the runner's `deps.spawn` seam — every one injects
a spy. Production supplies that seam in `gsd-core/bin/gsd-tools.cjs` as a
hand-written object no test constructs, so the chain could be correct all
the way to `SpawnPlan.env` and the merge could still be wrong or absent
with the suite green. Deleting those four lines was the one mutation that
left every other control silent.
This runs the real `spawnSync` through `gsd-tools review-lane invoke`,
with a `claude` shim on PATH that records the environment it was handed.
It asserts both halves in one test: the pair arrives, and an unrelated
inherited variable survives — a wiring that REPLACED the environment
rather than merging over it would satisfy the first and break every
lane's PATH and HOME.
POSIX-only; mediating a Windows `.cmd` shim is a separate concern the
repo already tests on its own.
Noted rather than fixed: `timeout`, `killSignal`, `maxBuffer` and
`shell: false` on that same object are equally uncovered. That is the
epic's gap, not this change's, and closing it is not in scope here.
* enhance(#2483): validate the invoke.env shape and register it as spawn-only
`env` was the one spawn-invoke field with no shape enforcement: every sibling in
`validateSpawnInvoke` is checked, and a manifest declaring `env` as an array, a
string, a number, or an object with non-string values passed validation in
silence. That matters more than an ordinary schema gap here, because
`resolveLanePlan` DROPS a non-string value rather than coercing it — so an
unvalidated manifest declares a pair that never reaches the spawn, which is the
failure a memory guard can least afford.
Two registrations, not one. `env` was also absent from
`SPAWN_ONLY_INVOKE_FIELDS`, which is the list the openai-http arm rejects
against — so `invoke.env` was accepted on a transport that issues an HTTP POST
and has no child environment at all. It was the only spawn-shaped field accepted
there; the other six each produce two errors. Self-found while sweeping the
class, not raised in review.
Keys are held to the portable POSIX environment-name grammar. That is a policy,
not a claim about what an environment can hold: measured, only NUL is actually
rejected by `spawnSync`, while `=`, a leading digit, a dash and a space are all
carried through to the child (an `A=B` key arrives as the raw entry `A=B=value`).
They are refused because a name outside the grammar is not portably addressable
by the program meant to read it.
`__proto__` is refused for a different and concrete reason. It passes that
grammar and is a real own key once a manifest is JSON-parsed, but assigning it
onto a plain accumulator goes through the inherited `__proto__` setter rather
than creating an own property — and for the string values this field permits the
setter is a no-op that does not even change the prototype. The pair would
validate and then simply vanish before the spawn. (An environment CAN carry a
literal `__proto__` entry; this is about the resolver's accumulator, and the
error message says so.)
Deliberately narrower than the sibling reserved-name guards in this file, which
also reject `constructor`/`prototype`: those guard bracket lookups that resolve
prototype members, whereas this reads via `Object.keys` plus an own-value read,
where `constructor` assigns as an ordinary key the spawn could carry.
`effortChannel` is deliberately left in neither field list: ADR-2782 D2 defines
it for both transports, so it is shared rather than spawn-only.
Reversion-controlled, three mutations, all three fire a named test: dropping
`env` from the discriminator fails `httpTransportRejectsEnv`; removing the
`__proto__` arm fails `envRejectsProtoKeyThatWouldSilentlyVanish`; disabling
the block fails four.
(#2483)
* enhance(#2483): amend ADR-2782 D2 for the invoke.env vocabulary widening
D2 records the spawn `invoke` shape as a closed vocabulary, and its Amendments
section carries a dated entry for every prior widening (Phase 1 #2794, Phase 2
corrections #2795, Phase 5b #2799). This change extended that vocabulary in code
without touching the ADR governing it, so the ADR contradicted the
implementation — and the repo's own convention, recorded in CONTEXT.md, is that
the ADR is amended in the same PR precisely because the prior widenings did it
correctly.
Adds the `invoke.env` row to the D2 table and a dated Amendments entry.
The entry also corrects the authority this change cited. The source comment
pointed at D6, which governs the closed `handler` enum — imperative behavior
admitted first-party — and says nothing about the `invoke` field vocabulary.
That is D2's territory, so the citation never covered the gap.
Two claims are corrected rather than restated, both about the trust boundary
that justifies leaving `env` out of the D5 disclosure signature:
- The regression test does not enforce that boundary. On one forged lane it
shows the resolver folds whatever it is handed, so a future path feeding it
manifest lanes would not make any assertion in that test fail. Its comment
claimed it "will fail first"; that was wrong, and both the comment and the
ADR now say the boundary is a property of the production call chain instead.
- The ADR is internally inconsistent on whether third-party manifest lanes
execute at all: Consequences says adding a reviewer needs "no core patch",
while `gsd-tools.cjs` rejects every slug absent from the first-party
REVIEWER_LANES map. CONTEXT.md, `workflows/review.md` and the resolver's own
header take the first view. #2483 did not create that inconsistency and does
not resolve it; the entry records it rather than settling it in its own favour.
(#2483)
* enhance(#2483): document invoke.env in the capability-manifest reference
ADR-2782 points capability and plugin authors at
`docs/reference/capability-manifest.md` as where the lane vocabulary must be
visible, and its `invoke` row enumerates the spawn sub-shape field by field.
`env` was absent from that table while being part of the real shape, so the one
document a third-party capability author would actually consult to learn the
field exists did not mention it.
Squarely Diataxis reference material — a field-by-field schema description — so
it goes here rather than in the user-facing prose, which was already updated.
States the constraints a manifest author can actually trip, and is explicit that
the name grammar is a portability policy rather than an OS limit, so a reader
does not take it for a claim about what an environment can hold.
(#2483)
* enhance(#2483): disclose and sign the reviewer lane's env and residual invoke fields
`invoke.env` was undisclosed at install time. That was defensible while manifest
lanes could not execute — the premise this PR's own ADR amendment recorded — and
#2927/#3062 retired it: `routeReviewLane` now merges installed overlay `reviewer`
bodies into its lane map via `mergeReviewerLanes`, which is a field-identical merge
by ADR-2782 D1 and deliberately does not deep-validate. An overlay's whole `invoke`
therefore reaches `resolveLanePlan`, and `env` reaches the spawned child. A consented
third-party capability could set `NODE_OPTIONS=--require ./evil.js` on a reviewer lane
with no install-time disclosure and no re-consent.
The same file already decided what `env` means in a manifest: MCP servers fold it into
the disclosure signature and render each key and value in the consent prompt, with an
inline rationale naming this exact shape. Reviewer lanes get the identical treatment.
`env` was the ninth unsigned invoke field, not the first. `defaultHost` (the manifest's
OWN fallback egress host, used whenever the config key resolves to nothing),
`path`, `outputChannel`/`outputArg`, `modelArg`, `effortChannel` and `modelDiscovery`
all reach `resolveLanePlan` and none was bound. Enumerating a ninth name leaves the
tenth open, so the lane signature carries a RESIDUAL of every other declared `invoke`
key — the completeness backstop `rawConfig` already gives the MCP line (#1459 finding 5),
and the "sign the whole object" remedy the recorded decision on this class prefers.
`defaultHost` is also rendered: `resolvedHost` comes from user config, so a lane whose
key is unset displayed "(unresolved …)" — which reads as "no destination" — while the
runtime egresses the plan and review text to the address the manifest picked.
D4.5 is preserved one level down: the extra element is appended ONLY when the lane
declares something beyond the eight already-bound fields, so an env-free lane's
signature stays byte-identical and no already-consented capability is re-prompted for
a field it does not use. A lane that does declare one re-consents, which is the point.
Execution-primitive env names are FLAGGED in the prompt, not refused in the validator.
A denylist cannot be the boundary here: `PATH` alone is a complete execution primitive
for a spawn lane and can never be refused, the child is an arbitrary third-party binary
so the true set spans every interpreter's injection vars, and the MCP `env` this mirrors
refuses nothing and discloses everything. Missing a name costs a quieter line, never a
boundary.
Refs #2483.
* enhance(#2483): exercise the real overlay merge path in the guard test
The test named for the manifest/first-party boundary did not test it. It built a
forged lane locally, handed it straight to `resolveLanePlan`, and asserted that
`REVIEWER_LANES` did not contain it — so no assertion in it depended on the claim its
name made, and a code path that fed manifest lanes to the resolver would not have made
it fail. Its own comment said as much, and named the production chain as the real
carrier of the guarantee: "gsd-tools.cjs builds its lane map solely from REVIEWER_LANES".
That sentence is now false. #3062 merged overlay reviewer bodies into that map, so the
test's premise and its subject both moved.
The replacement routes through `mergeReviewerLanes` — the real helper the production
path calls — and asserts the overlay lane is admitted, resolves, and carries its `env`
into `SpawnPlan.env`. That makes the security property falsifiable instead of narrated.
It then asserts what now backs it: the env is disclosed on the surface, rendered key
and value in the consent prompt, flagged when the name is an execution primitive, and
bound to the signature so a value change, an addition, or a removal each force
re-consent.
Three further cases, because the finding's generative half is what stops it recurring:
the residual backstop is asserted against five fields including one that does not exist
(`aFieldThatDoesNotExistYet`), so a future vocabulary widening cannot silently re-open
this; a fully-enumerated lane is pinned to its original 8-tuple, which is what keeps the
fix from re-prompting every consented capability; and an http lane's manifest-declared
`defaultHost` is asserted to reach both the prompt and the signature.
Reversion-controlled, seven mutations, all seven fail a named test: env dropped from the
surface, the prompt's env line removed, the execution-primitive warning removed, the
signature's extra element never appended, the residual emptied, the defaultHost line
removed, and the declares-something test un-widened. The last of those was SILENT on its
first run and its test was written in response, then the control re-run.
Refs #2483.
* enhance(#2483): correct the ADR amendment's manifest-lane premise
The amendment argued `env` needed no D5 disclosure because a manifest's `invoke`
fields never reach `resolveLanePlan`. That was true when written and #3062 retired it
22 hours after this branch's last commit: `routeReviewLane` now builds its lane map
from `mergeReviewerLanes(REVIEWER_LANES, loadRegistry({includeInstalled: true}))`, and
D1's no-translation-layer rule makes that a field-identical merge, so an overlay's
whole `invoke` reaches the resolver and executes.
The entry had named this exact trigger — "were manifest lanes ever made executable,
`env` must join the disclosed surface in that change, and nothing here will trip if it
does not." Nothing tripped. The premise is rewritten to current truth rather than
annotated, because an ADR is read in fragments and a superseded paragraph left standing
reads as live reasoning to the next author; a one-line dated tombstone points at git for
the withdrawn text.
The rewritten entry records four things the first draft could not: that the enumeration
itself was the defect (`env` was the ninth unbound `invoke` field, and `defaultHost` and
`path` are egress-relevant on their own), that the residual is what closes the class,
that D4.5's byte-identical-signature property is preserved by appending the residual only
when a lane declares something beyond the eight bound fields, and that consent — not
shape validation — is the boundary, since no honest env denylist can exclude `PATH`.
It also closes the internal inconsistency the previous entry could only record. This ADR,
`CONTEXT.md`, `gsd-core/workflows/review.md` and `resolveLanePlan`'s own header all said
overlay lanes reach the resolver while the runtime said otherwise; #3062 resolved that in
the documents' favour, which is what makes the disclosure mandatory rather than defensive.
Refs #2483.
* enhance(#2483): record in the manifest reference that invoke fields are consent-bound
`docs/reference/capability-manifest.md` is the field table ADR-2782 points capability
authors at, and it described `invoke` purely as a schema. A third-party author reading it
could not learn that everything they declare there is shown to the user at install and
bound to the consent signature — which is exactly what they need to know now that an
overlay reviewer lane executes (#2927/#3062).
States the two things the schema alone cannot: that `env` and `defaultHost` are named in
the consent prompt and the rest is covered by a residual, so any change to a declared
`invoke` field forces re-consent; and that `env`'s validation is a portability policy
rather than a safety boundary, since `PATH` is a complete execution primitive and cannot
be refused. Names that are execution primitives are highlighted in the prompt instead.
Refs #2483.
* enhance(#2483): add a Security changeset for the reviewer-lane disclosure
The existing fragment describes the enhancement this PR was opened for and stays as it
is. The disclosure fix is a separate user-visible change of a different type: a
capability declaring `invoke.env` or `invoke.defaultHost` will ask for consent once
more, and users are entitled to read why in the changelog rather than discover it as an
unexplained prompt.
Type is `Security` rather than `Changed` because the entry describes a closed
code-execution disclosure gap, not a behaviour adjustment.
Refs #2483.
* enhance(#2483): correct this round's own claim about who gets re-prompted
Self-found while auditing the round's claims before publishing them. The changeset and
the ADR entry both stated that a capability declaring `invoke.env` or `defaultHost`
"will ask for consent once more". That is wrong, and it overstated the cost of the fix
in the one direction a maintainer would have had to take on trust.
A code change to `disclosureSignature` re-prompts nobody. `hasProjectConsent` matches on
the recomputed bundle `contentHash` — the signature has not been the security binding
since #1459 CB-1/CB-2 — and the upgrade path's `executableSetChanged(old, new)` compares
two disclosures both computed by the CURRENT code, so widening the signature moves both
sides of that comparison equally. First-party capabilities never reach the path at all:
the install flow blocks a first-party id before trust evaluation.
What the widening actually buys is forward-looking, and is the real argument for it: an
upgrade whose manifest edits a declared `invoke` field now registers as an
executable-surface change and re-consents, where before it could change what the lane
runs in silence.
Also measured and recorded, because the D4.5 property was stated more strongly than it
deserved: of the twelve first-party reviewer capabilities, ZERO are in the
byte-identical-signature class — every real lane declares at least `effortChannel`. The
property is a guarantee about minimal lanes, not a description of the fleet, and the ADR
now says so.
Refs #2483.
* enhance(#2483): sign and disclose the probe binary and the lane's outer fields
Found by this round's own adversarial review, and it is the same defect one level out:
the `invoke` residual cannot reach the lane body's OUTER fields, and `probeLane` SPAWNS
`probe.binary` with `--help` before dispatch (`review-lane-runner.cts`, the
`command-exists`/`command-capability` arms). An overlay naming an arbitrary probe binary
therefore executes it — unsigned and undisclosed, exactly as `invoke.env` was, and
reachable on the same #3062 path.
The lane element now carries a second residual over the outer fields, and the probe
binary is shown in the consent prompt when it differs from the dispatch binary — it is a
program that runs, and the user is entitled to see it.
TWO fields stay excluded, and that is a decision rather than an omission:
`reviewsSection` and `timeoutFloorMs` are ADR-2782's cosmetic carve-outs (matrix
A10/A13), where re-consenting would present a prompt carrying no security information.
A test pins that they remain excluded, so a later widening cannot quietly reverse D4.5
while claiming to complete this fix.
Also corrects a miscount introduced by the previous commit: the source comment said the
enumeration had fallen behind by "seven fields" and omitted `fallbackModel`, while
asserting `env` was the ninth. `resolveLanePlan` reads twelve `inv.*` fields and four
were bound, so the number is eight. The comment now states the derivation rather than
just the total.
Reversion-controlled: emptying the outer residual fails "repointing the probe binary must
force re-consent"; removing the render line fails its own named assertion.
Refs #2483.
* enhance(#2483): refuse execution-primitive env names as defence in depth
Adopts the review's B5 after this round's own adversarial pass refuted my reason for
declining it. I had argued a denylist was worthless because `PATH` can never be refused.
That was wrong on the facts: no shipped reviewer manifest declares `PATH`, so it can be
refused, and it is the most complete primitive in the set — repoint it at a directory
holding a fake binary and the declared `invoke.binary` is irrelevant. A list that cannot
be exhaustive can still close the highest-confidence, lowest-legitimacy routes.
So the validator now rejects `PATH`, `NODE_OPTIONS`, `LD_PRELOAD`, `DYLD_INSERT_LIBRARIES`,
`BASH_ENV`, `PYTHONPATH`, `PERL5OPT`, `RUBYOPT`, `GIT_SSH_COMMAND`, `JAVA_TOOL_OPTIONS`
and their siblings on a reviewer lane. A lane needing a specific executable declares an
absolute `invoke.binary` instead of reshaping the child's environment.
The comment states plainly that this is defence in depth and NOT the boundary — the
boundary is install-time consent, which discloses every declared pair and binds it to the
signature, so an unlisted name is still SEEN before it runs. That framing is load-bearing:
a future reader who mistakes the denylist for the control will under-invest in the one
that is, which is the failure mode I was trying to avoid by declining it outright.
Two tests: the rejection itself across ten names, and a guard asserting no shipped
reviewer capability declares a denied key — so if the list ever outgrows its evidence,
that surfaces as a decision rather than a silent removal.
Refs #2483.
* enhance(#2483): fix two stale D5 enumerations elsewhere in the ADR
The previous commit rewrote the amendment's premise but swept only the amendment. Two
normative passages earlier in the same ADR still enumerated the old closed field list and
now contradicted it: the `executableSetChanged` trigger list, and the split-binding note
asserting the seven manifest-derived fields were "everything that is SHA-pinned".
That is the failure the rewrite-don't-annotate rule exists to prevent, one section over —
an ADR is read in fragments, and a fragment carries no supersession marker, so a reader
landing on either passage would have taken the superseded enumeration as current.
Both now name the residual as the mechanism rather than restating a list, which is also
what stops them going stale the next time the vocabulary widens.
Found by this round's adversarial review, which grepped the whole document rather than
the section under edit.
Refs #2483.
* enhance(#2483): stop the probe disclosure claiming a spawn that does not happen
The probe line added one commit ago rendered "probes by running: <binary> --help" for
every lane. That is false for `kind: "command-exists"`, which only calls `hasBinary` — a
PATH/filesystem scan that starts no process. Only `command-capability` spawns.
A false statement in a consent prompt is worse than a missing one: the prompt is the
surface a user is asked to trust, and this one overstated what a lane does. Worse, the
test I wrote to prove the fix used `command-exists` — the kind that does NOT spawn — so
it pinned the wrong claim and would have kept the error green forever.
The surface now carries `probeKind` and the two kinds render differently: a spawn is
described as a spawn, a presence check as a presence check. The test exercises both, and
asserts the `command-exists` path never emits the spawn wording.
Also corrects the field-count parenthetical to state its derivation unambiguously —
`resolveLanePlan` reads thirteen `inv.*` fields including `env` (twelve before this PR),
four were bound, so eight were unbound before `env` and nine including it. The bare
"twelve" was true only of the pre-PR tree and read as a claim about the current one.
And retires two comments that argued AGAINST the validator denylist this round then
shipped. Leaving them would have handed the next reader the reasoning for removing it.
Reversion-controlled: conflating the two probe kinds fails a named test.
Refs #2483.
* enhance(#2483): match the reviewer-lane env denylist case-insensitively
The denylist added one commit ago compared exact case, so `Path`, `path`, `node_options`
and `Node_Options` all passed it. Windows environment lookup is case-insensitive, so
those reach the child as `PATH` and `NODE_OPTIONS` — the exact inputs the list names.
An exactly-cased denylist is worse than none: it reads as a control while admitting the
input it was written to refuse, and the next reader has no reason to doubt it. Members
are stored uppercase and the key is folded before lookup; the name grammar already
constrains keys to ASCII, so a plain fold is sufficient.
Reversion-controlled: restoring the exact-case compare fails `envDenylistIsCaseInsensitive`
on `Path`.
Refs #2483.
* enhance(#2483): correct the docs that still described the denylist as absent
Both the ADR and the manifest reference still said `env` carries no denylist and that
`PATH` "can never be refused" — written when that was this round's position, and left
standing after the round reversed it. A reader landing on either passage would have taken
the superseded argument as current, which is precisely the failure the rewrite-don't-
annotate rule exists to prevent.
Both now describe the denylist, name `PATH`'s inclusion and the case-insensitive match,
and keep the limit explicit: the list cannot be complete against an arbitrary child and
disclosure runs before validation, so consent remains the boundary.
The ADR's byte-identical-signature claim is also corrected rather than softened. With the
outer residual in place, a lane producing no residual is one the validator rejects — it
declares no `flags`, `probe`, `emptyOutput`, `evidenceClass`, `requiresBinaries` or
`promptBudgetKey`. So the property is about the ENCODING, not a claim that any real
signature is unchanged, and it is not the argument for the change being safe. That
argument is that consent binds to the bundle contentHash and no existing consent is
invalidated at all.
Refs #2483.
* test(#2483): cover the three new lane disclosure fields in the injection-safety parity guard
The PARITY test in section N exists to catch a renderer field that skips
`renderValueForPrompt` (#3248). Its payload manifest is hand-maintained, so it
covers the fields that existed when it was written — slug, binary, args,
hostConfigKey, handler — and none of the fields this PR adds.
This PR renders three further manifest-supplied values into consent-prompt
lines: `invoke.env` (keys and values), `invoke.defaultHost` and `probe.binary`.
The gap was silent rather than theoretical: with the lane env line reverted to
the pre-#3248 raw form, the whole 948-test lane/capability/trust-disclosure
suite stayed green.
Two manifests, because the shapes render disjoint lines — `defaultHost` only on
the openai-http branch, `env`/`probe` only where declared, and the probe line
only when the probe binary differs from the dispatch binary.
Non-vacuity is asserted on the typed disclosure object and on structural line
counts, not by substring-matching rendered prose: CONTRIBUTING.md forbids raw
text matching on test output, and this section's own header promises structural
assertions only, so a prose match here would have made that promise false.
Negative-controlled three ways against the merged tree, each producing exactly
one named failure: env rendered raw, defaultHost rendered raw, probe binary
rendered raw.
* docs(#2483): extend the #3248 render-site comment to the fields this PR adds
The comment enumerates every manifest-supplied value that must pass through
`renderValueForPrompt`, and it stopped at `handler` — the reviewer-lane fields
that existed when #3248 landed. This PR renders three more (`defaultHost`, the
probe binary, and the env keys and values), so the list understated its own
contract in the one place a future author would check before adding a fourth.
A comment enumerating a closed set is a set that can silently fall behind the
code it describes; the parity test added alongside is what makes the omission
fail loudly rather than read as deliberate.
---------
Co-authored-by: Tom Boucher <trekkie@nomorestars.com>
This commit is contained in:
0xdhx
@@ -233,6 +233,56 @@ interface ReviewerLaneSurface {
|
||||
promptChannel: string;
|
||||
/** The first-party handler module name that post-processes this lane's output, or '' when undeclared. */
|
||||
handler: string;
|
||||
/**
|
||||
* spawn: the per-invocation environment pairs the lane declares (#2483), string-filtered for the
|
||||
* human summary exactly as `args` is. Folded into the signature, and rendered key-by-key in the
|
||||
* consent prompt, for the SAME reason MCP's `env` already is: env changes WHAT a command does
|
||||
* without touching the command (`NODE_OPTIONS=--require evil.js`, `LD_PRELOAD`). Empty when the
|
||||
* lane declares none, which keeps an env-free lane's signature byte-identical (D4.5).
|
||||
*/
|
||||
env: Record<string, string>;
|
||||
/**
|
||||
* openai-http: the destination host the MANIFEST itself declares, used at runtime whenever
|
||||
* `hostConfigKey` resolves to nothing (`resolveLanePlan`: `configured ?? declaredDefault`). It is
|
||||
* NOT `resolvedHost` — that one is resolved from user config and is deliberately excluded from the
|
||||
* signature (design constraint 2). This one is a pure function of the manifest, so it both signs
|
||||
* and renders: without it a lane whose config key is unset discloses `(unresolved)` at consent
|
||||
* time while shipping the egress payload classes to an address of the manifest's own choosing.
|
||||
*/
|
||||
defaultHost: string;
|
||||
/**
|
||||
* Every OTHER own key the declared `invoke` object carries — the completeness backstop, and the
|
||||
* direct analogue of `McpServerSurface.rawConfig` (#1459 finding 5). The explicit fields above are
|
||||
* kept first for readability and stability; this catches the rest, so a field ADDED to the invoke
|
||||
* vocabulary later is signed from the day it exists rather than from the day someone remembers to
|
||||
* widen this list. The enumerated fields (`binary`/`args`/`hostConfigKey`/`promptChannel`) are
|
||||
* excluded because they are already bound above; `env` and `defaultHost` are deliberately NOT
|
||||
* excluded, mirroring the MCP line's own explicit-then-rawConfig overlap.
|
||||
*/
|
||||
residualInvoke: Record<string, unknown>;
|
||||
/**
|
||||
* The same backstop for the lane body's OUTER fields, which `invoke`'s residual cannot reach.
|
||||
* `probe` is the reason it exists and is not a hypothetical: `probeLane` SPAWNS `probe.binary`
|
||||
* with `--help` (`review-lane-runner.cts`, `command-exists`/`command-capability`), so an overlay
|
||||
* naming an arbitrary probe binary executes it — the same class as `invoke.env`, one level out.
|
||||
* `requiresBinaries`, `emptyOutput`, `promptBudgetKey` and `modelConfigKey` ride along for the
|
||||
* same reason the invoke residual exists: enumerating "the ones that matter" is what failed.
|
||||
*
|
||||
* TWO fields are deliberately excluded, and the exclusion is a DECISION, not an oversight:
|
||||
* `reviewsSection` and `timeoutFloorMs` (D4.5 / matrix A10/A13 — cosmetic, and folding them in
|
||||
* would force a re-consent prompt carrying no security information, training click-through).
|
||||
* `slug`/`transport`/`handler`/`invoke` are excluded because they are already bound.
|
||||
*/
|
||||
residualLane: Record<string, unknown>;
|
||||
/**
|
||||
* spawn: the binary this lane's availability probe touches, or '' when none. Paired with
|
||||
* `probeKind` because the two probe kinds do DIFFERENT things and the prompt must not conflate
|
||||
* them: `command-capability` SPAWNS `<binary> --help` and parses the output, while
|
||||
* `command-exists` only asks `hasBinary` (a PATH/filesystem scan that spawns nothing).
|
||||
*/
|
||||
probeBinary: string;
|
||||
/** The declared probe `kind`, or '' — decides how `probeBinary` is described to the human. */
|
||||
probeKind: string;
|
||||
/**
|
||||
* The data classes that egress to this lane on every run (`EGRESS_PAYLOAD_CLASSES`) — named
|
||||
* honestly (Kerckhoffs's Principle) rather than disclosed as an unhelpful "sends data to the tool".
|
||||
@@ -664,6 +714,42 @@ function collectReviewerLaneSurfaces(
|
||||
const hostConfigKey = asString(invoke['hostConfigKey']);
|
||||
const promptChannel = asString(invoke['promptChannel']);
|
||||
|
||||
// #2483: the declared env pairs. String-filtered for the human line exactly as `args` is, and
|
||||
// prototype-safe (own enumerable keys only, dangerous keys never copied) exactly as `rawConfig`
|
||||
// is. Disclosure runs BEFORE validation, so a non-object or non-string-valued `env` reaches here
|
||||
// and must degrade to "declares none" rather than throw.
|
||||
const env: Record<string, string> = {};
|
||||
const envRaw = invoke['env'];
|
||||
if (typeof envRaw === 'object' && envRaw !== null && !Array.isArray(envRaw)) {
|
||||
for (const [k, v] of Object.entries(envRaw as Record<string, unknown>)) {
|
||||
if (k === '__proto__' || k === 'constructor' || k === 'prototype') continue;
|
||||
if (typeof v === 'string') env[k] = v;
|
||||
}
|
||||
}
|
||||
const defaultHost = asString(invoke['defaultHost']);
|
||||
// The completeness backstop (mirrors rawConfig). Everything the invoke object declares that the
|
||||
// explicit fields above do not already bind. Same prototype-safe copy.
|
||||
const residualInvoke: Record<string, unknown> = {};
|
||||
for (const [k, v] of Object.entries(invoke)) {
|
||||
if (k === '__proto__' || k === 'constructor' || k === 'prototype') continue;
|
||||
if (k === 'binary' || k === 'args' || k === 'hostConfigKey' || k === 'promptChannel') continue;
|
||||
residualInvoke[k] = v;
|
||||
}
|
||||
// The outer half of the same backstop. `probe` is the one that matters most — its `binary` is
|
||||
// spawned before dispatch — and the two exclusions below are ADR-2782's deliberate cosmetic
|
||||
// carve-outs, not fields nobody got round to.
|
||||
const residualLane: Record<string, unknown> = {};
|
||||
for (const [k, v] of Object.entries(rec)) {
|
||||
if (k === '__proto__' || k === 'constructor' || k === 'prototype') continue;
|
||||
if (k === 'slug' || k === 'transport' || k === 'handler' || k === 'invoke') continue;
|
||||
if (k === 'reviewsSection' || k === 'timeoutFloorMs') continue;
|
||||
residualLane[k] = v;
|
||||
}
|
||||
const probeRaw = rec['probe'];
|
||||
const probeIsObj = typeof probeRaw === 'object' && probeRaw !== null && !Array.isArray(probeRaw);
|
||||
const probeBinary = probeIsObj ? asString((probeRaw as Record<string, unknown>)['binary']) : '';
|
||||
const probeKind = probeIsObj ? asString((probeRaw as Record<string, unknown>)['kind']) : '';
|
||||
|
||||
// An EMPTY (or wholly unrecognised) reviewer body declares no lane and must
|
||||
// not be treated as one. Without this, `reviewer: {}` alone flips
|
||||
// hasExecutable true and perturbs the disclosure signature — producing a
|
||||
@@ -677,9 +763,13 @@ function collectReviewerLaneSurfaces(
|
||||
// enough. Requiring specifically a binary, or specifically a slug, would let
|
||||
// a lane declaring only the other slip through unconsented, which is the far
|
||||
// worse failure.
|
||||
// `env`/`defaultHost` join the test for the reason the comment above gives for keeping it broad:
|
||||
// a lane declaring ONLY an `env` pair would otherwise declare "nothing", disclose nothing, and
|
||||
// still hand those pairs to a spawned child once #2927/#3062 made overlay lanes executable —
|
||||
// the exact slip-through the broad test exists to refuse.
|
||||
const declaresSomething = Boolean(
|
||||
slug || transport || handler || binary || hostConfigKey || promptChannel
|
||||
|| rawArgsDeclared.length > 0,
|
||||
|| rawArgsDeclared.length > 0 || Object.keys(env).length > 0 || defaultHost || probeBinary,
|
||||
);
|
||||
if (!declaresSomething) return [];
|
||||
|
||||
@@ -725,6 +815,12 @@ function collectReviewerLaneSurfaces(
|
||||
isLocalDestination,
|
||||
promptChannel,
|
||||
handler,
|
||||
env,
|
||||
defaultHost,
|
||||
residualInvoke,
|
||||
residualLane,
|
||||
probeBinary,
|
||||
probeKind,
|
||||
// B5: every lane receives the same named egress payload classes — a fresh copy per surface so
|
||||
// no caller can mutate the shared constant through a returned surface.
|
||||
egressPayloadClasses: [...EGRESS_PAYLOAD_CLASSES],
|
||||
@@ -1186,10 +1282,40 @@ function disclosureSignature(d: Disclosure): string {
|
||||
// 2 — the loader has no config resolver and must compute the SAME signature as the lifecycle, or a
|
||||
// resolver-bearing caller and a resolver-less caller would permanently disagree on one manifest's
|
||||
// signature).
|
||||
// #2483: the eight-field enumeration above was a CLOSED list over an OPEN vocabulary, and it had
|
||||
// already fallen behind by EIGHT fields before `env` made the ninth — `defaultHost` (the manifest's
|
||||
// OWN fallback egress host), `path` (appended to it to build the URL), `outputChannel`, `outputArg`,
|
||||
// `modelArg`, `effortChannel`, `modelDiscovery` and `fallbackModel` all reach `resolveLanePlan` and
|
||||
// none was signed. Counted, because the number is easy to state ambiguously: `resolveLanePlan`
|
||||
// reads THIRTEEN distinct `inv.*` fields once `env` is included (twelve before this PR added it),
|
||||
// of which the pre-#2483 tuple bound four — so eight were unbound before `env`, nine including it.
|
||||
// So the fix is not a ninth name: it is a residual, the same completeness backstop `rawConfig` gives
|
||||
// the MCP line one screen up (#1459 finding 5). `env`/`defaultHost` are ALSO named explicitly,
|
||||
// mirroring that line's deliberate explicit-then-backstop overlap, because they are the two the
|
||||
// human summary renders and a reader should be able to find them in the signature by name.
|
||||
//
|
||||
// APPENDED ONLY WHEN NON-EMPTY, which is D4.5 one level down: a lane declaring nothing beyond the
|
||||
// eight already-bound fields keeps a BYTE-IDENTICAL signature, so this cannot re-prompt every
|
||||
// consented capability for a field it does not use. A lane that DOES declare one re-consents — which
|
||||
// is the correct outcome, not a cost: those fields were executable and undisclosed.
|
||||
const lanes = d.reviewerLanes
|
||||
.map((l) =>
|
||||
stableJson(['lane', l.slug, l.transport, l.binary, l.rawArgs || [], l.hostConfigKey, l.promptChannel, l.handler]),
|
||||
)
|
||||
.map((l) => {
|
||||
const tuple: unknown[] = [
|
||||
'lane', l.slug, l.transport, l.binary, l.rawArgs || [], l.hostConfigKey, l.promptChannel, l.handler,
|
||||
];
|
||||
const extra = {
|
||||
env: l.env || {},
|
||||
defaultHost: l.defaultHost || '',
|
||||
residual: l.residualInvoke || {},
|
||||
laneResidual: l.residualLane || {},
|
||||
};
|
||||
const declaresExtra = Object.keys(extra.env).length > 0
|
||||
|| extra.defaultHost !== ''
|
||||
|| Object.keys(extra.residual).length > 0
|
||||
|| Object.keys(extra.laneResidual).length > 0;
|
||||
if (declaresExtra) tuple.push(extra);
|
||||
return stableJson(tuple);
|
||||
})
|
||||
.sort();
|
||||
// D4.5 (the highest-consequence line in this phase): the lane element is appended ONLY when at
|
||||
// least one lane is declared. A lane-free manifest's signature stays BYTE-IDENTICAL to before this
|
||||
@@ -1226,6 +1352,22 @@ function signatureForManifest(manifest: CapabilityManifest, stagedDir?: string):
|
||||
/** Max characters of an env VALUE shown in the human consent prompt before it is truncated. */
|
||||
const ENV_VALUE_MAX = 60;
|
||||
|
||||
/**
|
||||
* Environment names that turn a declared pair into arbitrary code execution in a spawned child
|
||||
* (#2483). This list drives the consent prompt's WARNING line. The capability validator carries its
|
||||
* own denylist that REFUSES these names outright (`DENIED_LANE_ENV_KEYS`); the two are deliberately
|
||||
* separate layers rather than one, because they answer different questions: the validator refuses a
|
||||
* manifest it can reject, and this list makes sure anything that DOES reach a prompt is read loudly.
|
||||
* Neither is the boundary — install-time consent is, since no enumeration of execution-primitive
|
||||
* names can be complete against an arbitrary third-party child.
|
||||
*/
|
||||
const EXECUTION_PRIMITIVE_ENV = new Set([
|
||||
'NODE_OPTIONS', 'NODE_REPL_EXTERNAL_MODULE', 'LD_PRELOAD', 'LD_AUDIT', 'LD_LIBRARY_PATH',
|
||||
'DYLD_INSERT_LIBRARIES', 'DYLD_LIBRARY_PATH', 'PYTHONSTARTUP', 'PYTHONPATH', 'BASH_ENV', 'ENV',
|
||||
'PERL5OPT', 'RUBYOPT', 'JAVA_TOOL_OPTIONS', '_JAVA_OPTIONS', 'CLASSPATH', 'NODE_PATH',
|
||||
'GIT_SSH_COMMAND', 'GIT_EXTERNAL_DIFF', 'PATH',
|
||||
]);
|
||||
|
||||
/** Truncate a long env value for the human prompt (the full value is still in the signature). */
|
||||
function truncateEnvValue(v: string): string {
|
||||
if (typeof v !== 'string') return '';
|
||||
@@ -1324,7 +1466,8 @@ function summarizeInstructionSurfaces(disclosure: Disclosure): string[] {
|
||||
*
|
||||
* #3248: every manifest-supplied value interpolated into a line (hook event/script, command
|
||||
* family/module/router, MCP name/transport/url/command/argv/header-keys/env-keys+values/cwd,
|
||||
* reviewer-lane slug/hostConfigKey/resolvedHost/binary/rawArgs/handler, missingArtifacts entries)
|
||||
* reviewer-lane slug/hostConfigKey/resolvedHost/defaultHost/binary/rawArgs/handler/probe-binary/
|
||||
* env-keys+values, missingArtifacts entries)
|
||||
* goes through `renderValueForPrompt` first, which escapes forging/rewriting control characters and
|
||||
* bounds the length. These lines are joined with `\n` and written RAW to stderr on the
|
||||
* needs-consent path (`capability-command-router.cjs`), so an unescaped value could forge a line or
|
||||
@@ -1421,6 +1564,15 @@ function summarizeDisclosure(disclosure: Disclosure): string[] {
|
||||
const localTag = l.isLocalDestination ? ' [local]' : '';
|
||||
const hostConfigKey = l.hostConfigKey ? renderValueForPrompt(l.hostConfigKey) : '(hostConfigKey?)';
|
||||
lines.push(` - ${slug} -> [openai-http] ${hostConfigKey} => ${renderValueForPrompt(l.resolvedHost)}${localTag}`);
|
||||
// #2483: the MANIFEST's own fallback host, which `resolveLanePlan` uses whenever the config
|
||||
// key resolves to nothing (`configured ?? declaredDefault`). Without this line a lane whose
|
||||
// key is unset renders as "(unresolved)" — which reads as "no destination" — while actually
|
||||
// shipping the egress payload classes below to an address the manifest chose. That is the
|
||||
// understating-the-disclosure failure the branch test one comment up already refuses.
|
||||
// Escaped like every other rendered value (#3248): it is manifest-supplied by the same route.
|
||||
if (l.defaultHost) {
|
||||
lines.push(` fallback destination declared by this capability: ${renderValueForPrompt(l.defaultHost)}`);
|
||||
}
|
||||
} else {
|
||||
// Render the RAW declared args, not the string-filtered view. The raw
|
||||
// array is what the host receives and what the consent signature binds,
|
||||
@@ -1435,6 +1587,44 @@ function summarizeDisclosure(disclosure: Disclosure): string[] {
|
||||
lines.push(` - ${slug} -> ${cmd || '(no binary declared)'}`);
|
||||
}
|
||||
if (l.handler) lines.push(` handler: ${renderValueForPrompt(l.handler)}`);
|
||||
// The probe binary belongs in the prompt beside the dispatch binary when it differs — but the
|
||||
// two probe kinds are NOT the same disclosure and must not be rendered as one.
|
||||
// `command-capability` SPAWNS `<binary> --help`; `command-exists` only asks `hasBinary`, which
|
||||
// scans PATH and spawns nothing. An earlier revision of this line asserted the spawn for both,
|
||||
// which is a FALSE statement in a consent prompt — the one place a claim must be exact.
|
||||
if (l.probeBinary && l.probeBinary !== l.binary) {
|
||||
const probeBinary = renderValueForPrompt(l.probeBinary);
|
||||
lines.push(l.probeKind === 'command-capability'
|
||||
? ` probes by running: ${probeBinary} --help`
|
||||
: ` probes for the presence of: ${probeBinary} (no process is started)`);
|
||||
}
|
||||
// #2483: identical treatment to the MCP `env` line above, for the identical reason stated
|
||||
// there — env changes WHAT runs without touching the command, so the user consents to this
|
||||
// exact environment or not at all. The parity is byte-level and deliberate: since #3248 the
|
||||
// MCP line escapes BOTH key and value through `renderValueForPrompt`, and a lane's env is
|
||||
// manifest-supplied by the same route — so rendering it raw here would reintroduce, on the
|
||||
// newer surface, precisely the prompt-forging vector #3248 closed on the older one.
|
||||
const laneEnvKeys = l.env ? Object.keys(l.env) : [];
|
||||
if (laneEnvKeys.length > 0) {
|
||||
lines.push(` env: ${laneEnvKeys
|
||||
.map((k) => `${renderValueForPrompt(k)}=${renderValueForPrompt(truncateEnvValue(l.env[k]))}`)
|
||||
.join(', ')}`);
|
||||
// Names that make an environment pair an EXECUTION primitive rather than configuration.
|
||||
// The validator REFUSES these on a reviewer lane (`DENIED_LANE_ENV_KEYS`), so in practice a
|
||||
// first-party or freshly-validated manifest never reaches this line. It still earns its
|
||||
// place, and the reason is the reason to keep both layers:
|
||||
// - Disclosure runs BEFORE validation, and on manifests validation would reject outright.
|
||||
// A user consenting to an already-installed or hand-placed capability sees this line
|
||||
// whether or not the validator ever ran on it.
|
||||
// - No enumeration of execution-primitive names is complete against an arbitrary
|
||||
// third-party child, so consent — not either list — is the boundary. A name missing from
|
||||
// both costs a quieter line on a value that is still SHOWN, which is the only
|
||||
// incompleteness budget an enumeration like this can honestly carry.
|
||||
const flagged = laneEnvKeys.filter((k) => EXECUTION_PRIMITIVE_ENV.has(k));
|
||||
if (flagged.length > 0) {
|
||||
lines.push(` WARNING — ${flagged.map(renderValueForPrompt).join(', ')} can make this lane run code of the capability's choosing`);
|
||||
}
|
||||
}
|
||||
lines.push(` sends: ${l.egressPayloadClasses.join(', ')}`);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -136,6 +136,15 @@ export interface SpawnInvoke {
|
||||
/** `null` when the lane accepts no model override. */
|
||||
modelArg: string | null;
|
||||
effortChannel: EffortChannel;
|
||||
/**
|
||||
* Per-invocation environment pairs, merged over the inherited environment at spawn time (#2483).
|
||||
* Declared data, not a handler (D6): the pairs are static per lane. Scoped to the one spawn —
|
||||
* the orchestrating session's environment is never mutated. First-party lanes only today: the
|
||||
* resolver sees exactly `REVIEWER_LANES`, so no third-party manifest can reach this field; if
|
||||
* manifest lanes are ever wired to execute, `env` must join the trust disclosure
|
||||
* (`capability-trust`) before it is honored there.
|
||||
*/
|
||||
env?: Readonly<Record<string, string>>;
|
||||
}
|
||||
|
||||
export interface HttpInvoke {
|
||||
@@ -261,6 +270,15 @@ export const REVIEWER_LANES: ReadonlyArray<ReviewerLane> = Object.freeze([
|
||||
...SPAWN_STDIN_STDOUT,
|
||||
modelArg: '--model',
|
||||
effortChannel: 'argv',
|
||||
// #2483: without these the claude leg is the only reviewer that additionally inherits the
|
||||
// invoking user's global CLAUDE.md, the project CLAUDE.md, and Claude Code auto-memory —
|
||||
// a context asymmetry against the independent-review premise (gemini sees only the
|
||||
// assembled prompt; codex runs --ephemeral). Both flags, not just the first: CLAUDE.md
|
||||
// loading and auto-memory are independently-toggled mechanisms, and an environment
|
||||
// exporting CLAUDE_CODE_DISABLE_AUTO_MEMORY=0 forces auto-memory back ON — the explicit
|
||||
// pair is robust against that. Applies when /gsd:review runs from a non-Claude-Code host;
|
||||
// inside Claude Code the claude lane self-skips for independence.
|
||||
env: { CLAUDE_CODE_DISABLE_CLAUDE_MDS: '1', CLAUDE_CODE_DISABLE_AUTO_MEMORY: '1' },
|
||||
},
|
||||
timeoutFloorMs: 1_200_000,
|
||||
emptyOutput: 'stub-with-stderr',
|
||||
|
||||
@@ -95,6 +95,12 @@ export interface SpawnPlan {
|
||||
handler: LaneHandler;
|
||||
requiresBinaries: readonly string[];
|
||||
probe: LaneProbe;
|
||||
/**
|
||||
* Per-invocation environment pairs merged over the inherited environment at spawn, or `null`
|
||||
* when the lane declares none (#2483). Only string-valued own entries survive resolution — a
|
||||
* non-string value is dropped, not coerced, for the same reason model values are not (below).
|
||||
*/
|
||||
env: Readonly<Record<string, string>> | null;
|
||||
}
|
||||
|
||||
export interface HttpPlan {
|
||||
@@ -459,6 +465,22 @@ export function resolveLanePlan(input: ResolveInput): ResolveResult {
|
||||
}
|
||||
}
|
||||
|
||||
// Per-invocation env pairs (#2483). Own string-valued entries only — a non-string is dropped,
|
||||
// never coerced, and prototype members never resolve (same lookup discipline as the argv
|
||||
// expansions above). An empty or absent declaration resolves to `null`, so the runner has one
|
||||
// shape to test.
|
||||
let env: Record<string, string> | null = null;
|
||||
const declaredEnv: unknown = inv.env;
|
||||
if (declaredEnv !== null && typeof declaredEnv === 'object' && !Array.isArray(declaredEnv)) {
|
||||
const source = declaredEnv as Record<string, unknown>;
|
||||
const pairs: Record<string, string> = {};
|
||||
for (const k of Object.keys(source)) {
|
||||
const v = source[k];
|
||||
if (typeof v === 'string') pairs[k] = v;
|
||||
}
|
||||
if (Object.keys(pairs).length > 0) env = pairs;
|
||||
}
|
||||
|
||||
return {
|
||||
ok: true,
|
||||
warnings,
|
||||
@@ -477,6 +499,7 @@ export function resolveLanePlan(input: ResolveInput): ResolveResult {
|
||||
handler,
|
||||
requiresBinaries,
|
||||
probe: lane.probe,
|
||||
env,
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
@@ -47,8 +47,12 @@ export interface SpawnOutcome {
|
||||
}
|
||||
|
||||
export interface RunnerDeps {
|
||||
/** Bounded synchronous spawn. Production wires `child_process.spawnSync`. */
|
||||
spawn: (binary: string, argv: string[], opts: { input?: string; timeoutMs: number }) => SpawnOutcome;
|
||||
/**
|
||||
* Bounded synchronous spawn. Production wires `child_process.spawnSync`.
|
||||
* `env` pairs are merged OVER the inherited environment for this one child (#2483) — an absent
|
||||
* `env` inherits unchanged, and the parent process environment is never mutated either way.
|
||||
*/
|
||||
spawn: (binary: string, argv: string[], opts: { input?: string; timeoutMs: number; env?: Readonly<Record<string, string>> }) => SpawnOutcome;
|
||||
/** Bounded HTTP POST/GET returning the RAW body — never pre-parsed, so errors stay diagnosable. */
|
||||
httpJson: (url: string, opts: { method: 'GET' | 'POST'; body?: string; timeoutMs: number }) =>
|
||||
Promise<{ ok: boolean; status: number; body: string; error?: string }>;
|
||||
@@ -663,7 +667,11 @@ function runSpawnLane(plan: SpawnPlan, deps: RunnerDeps, repoRoot: string): Lane
|
||||
? antigravityArgv(plan.argv, plan.promptPath, repoRoot, deps)
|
||||
: plan.argv;
|
||||
|
||||
const out = deps.spawn(plan.binary, argv, { input, timeoutMs: plan.timeoutMs });
|
||||
const out = deps.spawn(plan.binary, argv, {
|
||||
input,
|
||||
timeoutMs: plan.timeoutMs,
|
||||
...(plan.env ? { env: plan.env } : {}),
|
||||
});
|
||||
// #3086: surface spawn errors (ENOENT, ETIMEDOUT, etc.) that would otherwise
|
||||
// be silently dropped — the review path read only stdout/stderr and treated
|
||||
// an empty-stderr spawn failure as "the model had nothing to say".
|
||||
|
||||
Reference in New Issue
Block a user