fix(build/orchestrator): 4-fault mitosis-oasis batch (FEATURE_REDO findings + monitor + pytest-cov + Gemini model) + critical /ship hardening#103
Merged
anbangr merged 8 commits intoMay 26, 2026
Conversation
…h FEATURE_REDO Plumbing-only commit for Bug A in ~/.claude/plans/fix-orchestrator-mitosis-oasis-may-26-faults.md. Three structural changes, no behavioral change yet: - New optional `pendingFeatureReviewOutputPath?: string` field on PhaseState (types.ts). Documents the FEATURE_REDO hygiene-deadlock bug class this field exists to close. - `resetPhaseStateForRedo(state, phaseIndex, opts?)` now accepts an optional `featureReviewOutputPath` option. When set, the path is written to phaseState.pendingFeatureReviewOutputPath. When unset (every other caller — startup --reset-phase, tests), the field is explicitly deleted to prevent stale-path bleed-through across unrelated resets. Backwards compatible: existing 2-arg callers compile and behave identically. - FEATURE_REDO dispatch (cli.ts:7499) now passes outputFilePath into the reset call for every named phase. The phase state now carries the findings path; the impl dispatch will read it in the next commit. No reader exists yet — the field is plumbed but unconsumed. Commit 2 (coming next) wires the primary-impl dispatch to read the field and thread the findings into buildGeminiPromptBody's reviewFeedback parameter, completing the fix. Closes the bug-class evidence: - ~/.gstack/skill-faults/manual-1779768463981/MANUAL_INVESTIGATION:0:b335a492.md - ~/.gstack/skill-faults/manual-1779766926082/MANUAL_INVESTIGATION:0:efe61aab.md Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
…impl on FEATURE_REDO Closes the FEATURE_REDO hygiene-deadlock bug class. Pairs with the plumbing commit (c09c75f) which added the pendingFeatureReviewOutputPath field; this commit is the reader. Before this commit: FEATURE_REDO reset a phase to pending, the orchestrator re-entered the phase, hit the RUN_GEMINI action, and called buildGeminiPromptBody WITHOUT the 4th `reviewFeedback` parameter. The impl agent saw the standard phase description, observed the existing worktree code looked fine (the prior pass already shipped work), made no commit, and the hygiene gate rejected "primary implementor did not create a new commit". The phase paused, requiring manual operator intervention: read the feature-review output by hand, make the code change, --mark-phase-committed. After this commit: 1. cli.ts RUN_GEMINI dispatch reads phaseState.pendingFeatureReviewOutputPath when set. If the file is readable, its contents are passed as the 4th argument to buildGeminiPromptBody. The impl agent now receives a "## Previous review findings" block (with the prompt-injection defenses buildGeminiPromptBody already implements) AND has access to the existing NO_CHANGES_NEEDED sentinel for the legitimate "work already done in HEAD" case. 2. cli.ts logs `↻ FEATURE_REDO: threading feature-review findings from <path>` when wiring fires. If the file is missing or unreadable, logs a warning and falls back to the standard prompt rather than crashing — best-effort delivery. 3. phase-runner.ts applyResult(RUN_GEMINI) unconditionally clears pendingFeatureReviewOutputPath on the returned next-state. The findings have been delivered to the impl call; whether impl succeeded or failed, the directive's purpose is fulfilled. The next impl attempt comes from either a fresh FEATURE_REDO cycle (which re-sets the field via resetPhaseStateForRedo) or from --reset-phase (which clears it via the else branch added in the plumbing commit). Existing tests pass unchanged: 179/179 in drift + hygiene-sibling + phase-runner suites. Behavioral regression test for the wiring lands in commit 7 (the consolidated test suite for this batch). Closes the bug-class evidence: - ~/.gstack/skill-faults/manual-1779768463981/MANUAL_INVESTIGATION:0:b335a492.md - ~/.gstack/skill-faults/manual-1779766926082/MANUAL_INVESTIGATION:0:efe61aab.md Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
…ailability (Bug C)
Closes Bug C in
~/.claude/plans/fix-orchestrator-mitosis-oasis-may-26-faults.md.
Before this commit: injectCoverageFlags unconditionally appended
`--cov --cov-report term-missing` whenever the testCmd matched
`\bpytest\b`. Projects that intentionally disable coverage in CI
(mitosis-oasis CLAUDE.md:294 is the canonical case) hit
`pytest: error: unrecognized arguments: --cov=...` and exit 4
during argparse, before any tests run. The test-fixer role then
iterated 3 times unable to fix a missing system dependency, and
the hygiene gate rejected the no-op fix attempts.
After this commit:
1. New exported `hasPytestCov(cwd)` helper. Two cheap signals,
either sufficient: pyproject.toml text grep for `pytest-cov`,
or `python -c "import pytest_cov"` exit 0. Returns false on any
error (no python, no pyproject.toml, timeout, etc.) — better to
skip injection than crash pytest.
2. `injectCoverageFlags(testCmd: string, cwd: string)` — added
required `cwd` parameter. Idempotent short-circuit
(`testCmd.includes("--cov")`) fires first so the probe is only
run when actually needed. When the probe returns false, the
command is returned unchanged with a one-line console warning
naming the missing dep and the bug ID.
3. Single existing call site at `cli.ts:8527` updated to pass `cwd`
(already in scope).
4. Existing `injectCoverageFlags` tests updated for the new signature:
beforeAll sets up two temp dirs (one with pytest-cov in
pyproject.toml, one without). Pytest tests use the cov-available
cwd to preserve the existing "appends --cov" behavior; new T-C2
asserts the missing-cov cwd skips injection.
235/235 pass in sub-agents.test.ts (was 234/234 plus the new T-C2).
Closes the bug-class evidence:
- ~/.gstack/skill-faults/manual-1779768446214/MANUAL_INVESTIGATION:0:a076e67f.md
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
…hildren are alive (Bug B leg 1) Closes Bug B leg 1 in ~/.claude/plans/fix-orchestrator-mitosis-oasis-may-26-faults.md. Before this commit: monitor.ts:713-715 declared `stale = true` based solely on `lastUpdatedAt` ageing past staleWindowMs (default 30s). Long Codex /qa or Claude /review calls (3-10 minutes is normal) produce no state.json writes during execution, so the timestamp aged out and the monitor fired USER_ACTION_REQUIRED → supervisor escalation. The supervisor's verdict was always "re-enter the monitor", which immediately fired the same false alarm again. Loop-guard caught the pattern after 3 escalations in 7 minutes but the underlying re-entry cycle burned a Codex supervisor call per loop until then. After this commit: 1. New exported helper `hasActiveSubagentChild(orchPid)` runs `ps -e -o ppid=,comm=`, filters lines whose ppid matches the orchestrator PID, and returns true if any `comm` basename contains `codex`, `claude`, `gemini`, or `kimi`. POSIX-portable ps invocation (avoids Linux-only --ppid). Defensive — returns false on any error (no ps, timeout, parse failure), so the caller falls back to the unmodified stale check rather than silently breaking the alarm. 2. `readRunSnapshot` calls hasActiveSubagentChild(pid) once per poll and ANDs the result (negated) into the `stale` boolean. When a subagent child is alive, stale is false regardless of how old `lastUpdatedAt` is. When no subagent is alive AND lastUpdatedAt is old, the alarm still fires (preserves real hang detection). 3. Leg 2 (next commit) adds a complementary status-aware threshold for in-flight subagent statuses, defense-in-depth in case `ps` returns empty (e.g., child wrapped in a shell). 43/43 monitor tests pass. Closes the bug-class evidence: - ~/.gstack/skill-faults/manual-1779768454543/MANUAL_INVESTIGATION:0:3f09e1bc.md Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
…flight subagent calls (Bug B leg 2) Defense-in-depth complement to leg 1 (a580461). The child-process check is the primary signal, but it returns false when: - subagent is wrapped in a shell that doesn't propagate the binary name - subagent runs inside a sandbox that hides the child from ps - ps itself is unavailable or times out In any of those cases, the unmodified stale check would fire spuriously. This leg adds a second signal: if any phase in state.phases is in a *_running status, multiply the stale window by 30x (default 30s → 15 min, matching the worst-case subagent timeout). Conservative: applies to ALL phases, not just the "current" one, since multiple phases could be in flight via parallel features. Status set: test_spec_running, gemini_running, test_fix_running, codex_running, dual_impl_running, dual_tests_running, dual_judge_running. Detection is `status.endsWith("_running")` so any future *_running state automatically participates. 43/43 monitor tests pass. Closes the bug-class evidence: - ~/.gstack/skill-faults/manual-1779768454543/MANUAL_INVESTIGATION:0:3f09e1bc.md Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
…probe (Bug D)
Closes Bug D in
~/.claude/plans/fix-orchestrator-mitosis-oasis-may-26-faults.md.
Two parts:
1. configure.cm: replace all 5 occurrences of "gemini-3.5-flash" with
"gemini-2.5-flash". Confirmed valid via `echo "ping" | gemini -m
gemini-2.5-flash` (returned "pong"). The 3.5-flash identifier
returns HTTP 404 ModelNotFoundError on every primary call,
burning ~10s before falling back to Codex.
Affected roles: testWriter (primary + backup), primaryImpl (backup),
testFixer (primary), ship (backup), land (backup). All Gemini-touching
roles realigned at once — partial fixes invite confusion about which
roles are still misconfigured.
2. New `parseGeminiModelProbeStderr(stderr)` pure function — parses
Gemini CLI stderr for ModelNotFoundError / code: 404 / "Requested
entity was not found" signals. Returns `{ok, reason?, model?}`.
Pure, no I/O — testable without network.
3. New `assertGeminiModel(model)` async function — sends a 1-token
ping prompt with `-m <model>` once per (model, session), parses
stderr via the pure function, caches the result, emits ONE startup
warning per invalid model with remediation pointer to configure.cm.
Gated by GSTACK_DISABLE_AUTH_PREFLIGHT=1 env knob (consistent with
the existing auth preflights).
4. runGeminiTask call site (sub-agents.ts:1930+) calls assertGeminiModel
fire-and-forget (`void`) after auth succeeds. Non-blocking — the
actual call proceeds regardless, falls back via the existing backup
path on real failure. The probe cache ensures we don't burn an
extra Gemini API call per phase; the warning fires once per session
per invalid model.
5. _resetAuthPreflightForTests() now also clears the model probe cache
+ warned set, so the integration tests can re-assert wiring without
stale state.
235/235 pass in sub-agents.test.ts. Unit tests for the parser land
in commit 7.
Closes the bug-class evidence:
- ~/.gstack/skill-faults/manual-1779768437194/MANUAL_INVESTIGATION:0:856e5242.md
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
…asis batch Three new test files, 29 tests total, all passing. Pairs with commits c09c75f..cc1fafd. feature-redo-findings-injection.test.ts (12 tests): - T-A1a/b/c: resetPhaseStateForRedo persists / clears / explicit-undefined-clears the pendingFeatureReviewOutputPath field - T-A2a/b: buildGeminiPromptBody emits the findings block + prompt- injection defenses ONLY when the 4th arg is set - T-A3a/b/c: applyResult(RUN_GEMINI) clears the pending field on success / exit-fail / timeout - T-A4a: file-read contributes contents to prompt body (graceful fallback for missing files is exercised at the cli.ts dispatch site, covered by T-A5b's static-grep) - T-A5a/b/c: static-grep wiring guards — FEATURE_REDO dispatch passes outputFilePath, RUN_GEMINI dispatch reads + threads the field, applyResult clears the field. Future refactors that break any of these silently regress to the bug class. monitor-stale-subagent-child.test.ts (6 tests): - T-B1a: hasActiveSubagentChild handles null / non-positive pid - T-B1b: returns false when no subagent-named child exists - T-B1c: returns true when a child binary literally named "codex" exists. Uses the cp /bin/sleep → /tmp/.../codex trick because kernel exec semantics mean a shebang script reports comm="sh", not the script name. - T-B5a/b/c: static-grep guards for both legs — leg 1 calls hasActiveSubagentChild(pid), leg 1 ANDs !subagentChildAlive into the stale conditional, leg 2's anyPhaseRunning detection + baseStaleWindowMs * 30 multiplier survive future refactors. gemini-model-probe.test.ts (11 tests): - T-D1a-h: pure-function tests for parseGeminiModelProbeStderr. Empty / unrelated noise → ok:true. ModelNotFoundError / code: 404 / "Requested entity was not found" / case-insensitive matching → ok:false. Model name extraction when present, absent when not. - T-D2a: configure.cm grep — no stale "gemini-3.5-flash" refs, required "gemini-2.5-flash" present. - T-D2b: runGeminiTask call site invokes assertGeminiModel fire-and-forget. - T-D2c: _resetAuthPreflightForTests clears both the probe cache and the warned-set so test isolation survives. Bug C (pytest-cov gate) regression test landed inline with commit c28ca03 as T-C-NEW in sub-agents.test.ts — keeps the per-bug isolation while consolidating the helper coverage. 443/443 pass across all impacted suites. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
… review (critical fixes)
Six tightening fixes from the /ship-time pre-landing + adversarial
reviews. All inline so the deliverable PR ships safe, none of them
deferred to a follow-up branch.
1. **Bug A path containment + size cap (CRITICAL — credential exfil
primitive).** `cli.ts:8005-8030`. state.json is operator-editable,
so `pendingFeatureReviewOutputPath` is untrusted input at read
time. A tampered state pointing the field at `~/.ssh/id_rsa`,
`~/.gstack/security/device-salt`, `~/.aws/credentials` etc. would
slurp the file via `fs.readFileSync`, run it through the existing
sanitizeReviewFeedback (which only redacts GATE markers, NOT
arbitrary secrets), and embed it in the impl prompt sent to the
Gemini API — exfiltrating secrets. Fix: route the path through
the existing `validateLogPathInScope(rawPath, state.slug)` helper
(same pattern used at cli.ts:7115, 7625, 8113); reject out-of-scope
paths with a warn. Add a 1 MiB size cap via fs.statSync before the
read so a pathological huge findings file (or symlink to /dev/zero)
can't OOM the orchestrator. T-A4c pins the wiring statically.
2. **Bug B exact-basename match instead of substring (HIGH-IMPACT
FP-vector tightening).** `monitor.ts:341-348`. The original
`comm.includes(name)` would match any process whose basename
contained `codex` / `claude` / `gemini` / `kimi` as a substring —
`mycodex-wrapper`, `kimichi`, `unkimi`, `notgemini` would all
silently suppress the stale alarm forever. Tightened to exact-
equality match against the basename (still handles the path-prefix
case via the basename strip above). T-B1d pins the regression with
a real `mycodex-wrapper` child process spawn.
3. **Bug C python3 fallback (silent feature loss on modern macOS).**
`sub-agents.ts:3307-3322`. The original `spawnSync("python", ...)`
ENOENT'd on macOS 12+ and many Linux distros (only `python3`
ships by default), silently disabling the --cov injection for
projects that DID install pytest-cov via pip/conda. Loop now tries
`python3` first, falls back to `python`.
4. **Bug D async spawn (non-blocking probe).** `sub-agents.ts:443-490`.
The original `spawnSync` inside `assertGeminiModel` blocked the
orchestrator event loop for up to 15 seconds on the FIRST probe per
unique model — visible as a stall before phase work started. The
`void` modifier discards the Promise but does NOT make spawnSync
non-blocking. Switched to async `spawn` + accumulated stderr with
a 15s timeout. The probe is now genuinely fire-and-forget.
5. **Bug D Promise-cache (concurrent-probe race).** `sub-agents.ts:
416-422`. Caching the resolved RESULT (not the Promise) still
raced: two `assertGeminiModel(model)` calls landing within the same
tick would both miss the cache before the first spawn returned and
both fire full probes. Caching the Promise (and inserting it
BEFORE the spawn returns) means concurrent callers for the same
model share one in-flight probe.
6. **Bug D .catch on call site (unhandled-rejection safety).**
`sub-agents.ts:2056`. Changed `void assertGeminiModel(opts.model)`
to `assertGeminiModel(opts.model).catch(() => {})`. If
assertGeminiModel ever rejects (refactor, new code path), the
.catch swallows it so the probe can never crash a phase. The
internal try/catch already returns `{ok: true}` on probe-throw,
but defense in depth is cheap.
Tests:
- T-A4b: cli.ts dispatch wraps fs.readFileSync in try/catch +
warn message (static-grep wiring guard)
- T-A4c: cli.ts dispatch calls validateLogPathInScope + applies
FINDINGS_MAX_BYTES cap (static-grep wiring guard)
- T-B1d: mycodex-wrapper child does NOT match (real-process
regression test for the substring-FP tightening)
- T-D2b updated: call site uses .catch(...) instead of `void`
446/446 pass across the 7 impacted suites.
Review provenance:
- Pre-landing review (Claude subagent): findings #1, #2, #3, #4
- Adversarial review (Claude subagent): findings #1 (CRITICAL),
#3 (path containment), #4 (size cap), #5 (substring FP), #7
(python3), #8 (Promise cache), #9 (event-loop block)
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
6 tasks
anbangr
added a commit
that referenced
this pull request
May 26, 2026
… worktrees (--add-dir + recovery fallback + critical /ship hardening) (#104) * feat(build/orchestrator): inject --add-dir for Codex on linked worktrees (Bug E Leg 1) Closes Bug E in ~/.claude/plans/fix-codex-sandbox-linked-worktree-commit.md. Before this commit: Codex spawned with `-s workspace-write -C <worktree-path>` could not commit work performed inside a git linked worktree. The workspace-write sandbox grants write access to the cwd, /tmp, and $TMPDIR — but linked worktrees store ALL commit metadata (index, HEAD, logs, refs, objects) in `<parent-repo>/.git/worktrees/ <run-name>/` and `<parent-repo>/.git/`, both OUTSIDE the sandbox. Every git commit failed with `Unable to create .git/worktrees/<name>/ index.lock: Operation not permitted`. Codex produced the deliverable correctly (56 valid LegislativePipeline fixtures in the canonical fault) but the hygiene gate then rejected "primary implementor did not create a new commit" — the same misleading symptom PR #103 addressed for a different root cause (FEATURE_REDO findings deadlock). After this commit: 1. New exported helper `computeCodexWritableRoots(cwd)` runs `git -C <cwd> rev-parse --git-dir --git-common-dir` and returns the absolute paths IF they resolve outside cwd (linked-worktree shape) or `[]` otherwise (main-worktree shape, non-repo, or git failure — defensive fallback to existing behavior). 2. `cachedComputeCodexWritableRoots(cwd)` wraps it with a per-cwd Map cache. 3 Codex spawns per phase × 50 phases = 150 spawns; cache prevents subprocess churn. 3. `buildCodexAddDirArgs({cwd, sandbox})` returns the repeatable `--add-dir <path>` argv block. Returns [] unless sandbox is `workspace-write` (read-only / danger-full-access don't need it). 4. All 3 Codex spawn sites in sub-agents.ts inject the args between the `-s sandbox` flag and the `-c model_reasoning_effort` flag. No behavioral change for non-worktree case. 5. `_resetCodexWritableRootsCacheForTests()` exposed for test isolation. Codex CLI flag confirmed via `codex exec --help`: --add-dir <DIR> Additional directories that should be writable alongside the primary workspace Leg 2 (recovery fallback in recoverMutableAgentCommit) lands in the next commit as defense-in-depth — if Leg 1's path-resolution heuristic misses (sandbox semantics change, nested worktrees, etc.), the orchestrator detects the EPERM signal and commits on the impl's behalf. Piggyback test-robustness fix: T-C "skips --cov when pytest-cov is NOT installed (Bug C)" in sub-agents.test.ts now checks the OS-level Python first. If pytest-cov is in the global site-packages (common on dev machines), the test logs a skip and returns rather than asserting an unreachable contract. Production behavior unchanged — only the test precondition got more honest. Adversarial reviewer flagged this exact flake class in PR #103; piggybacking here while the surface is open. 235/235 sub-agents tests pass. Closes the bug-class evidence: - ~/.gstack/skill-faults/manual-1779772477125/MANUAL_INVESTIGATION:0:8fb43d58.md Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(build/orchestrator): route Codex sandbox-blocked commits through host-side recovery (Bug E Leg 2) Closes Bug E Leg 2. Pairs with Leg 1 (24d2298) which prevents the sandbox-blocked-commit by injecting `--add-dir` for linked worktrees. This commit is the defense-in-depth backstop for when Leg 1's path resolution misses (sandbox semantics change in a future Codex release, nested worktrees, the parent repo at a non-standard location, or any other variation where the heuristic can't compute the writable roots). The actual gap was subtler than the plan anticipated: `recoverMutableAgentCommit` was already designed to commit on the impl's behalf when the tree is dirty in summary-listed files. The function works fine. The problem was applyMutableAgentHygiene's early-return at the top: if (opts.result.timedOut || opts.result.exitCode !== 0) { return opts.result; } This fires BEFORE recovery is reached. When Codex's git commit fails inside the sandbox, Codex itself exits non-zero, the early-return takes effect, recovery never runs. So the fix is at the EARLY-RETURN GATE, not inside the recovery function. Changes: 1. New exported regex `CODEX_SANDBOX_EPERM_RE` matches the canonical `Unable to create <path>/.git/worktrees/<name>/index.lock ... Operation not permitted` string. Exported because the regression suite (commit 3) needs to assert the wiring statically. 2. applyMutableAgentHygiene checks stdout+stderr for the signal BEFORE the early-return. When present, logs `↻ <label>: detected Codex sandbox-blocked commit ... routing through host-side recovery` and bypasses the early-return so recovery runs. 3. recoverMutableAgentCommit accepts a new optional `recoveryReason` string. When set, the commit message gets a structured trailer: `Recovery-Reason: codex sandbox blocked commit`. Operators reading git log can distinguish normal recovery (agent forgot to commit) from sandbox recovery (agent tried to commit but workspace-write blocked it). 4. applyMutableAgentHygiene threads `recoveryReason: sandboxBlockedCommit ? "codex sandbox blocked commit" : undefined` into the recovery call. The order of legs matters operationally: Leg 1 prevents the bug entirely in the common case (no failed commit attempt, no extra wall time, no recovery commit clutter). Leg 2 catches the residue when Leg 1 misses. Same defense-in-depth pattern as PR #102/#103. 428/428 pass across sub-agents + phase-runner + test-writer-drift + hygiene-sibling-repos + feature-redo-findings-injection. Behavioral regression tests for both legs land in commit 3. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * test(build/orchestrator): regression suite for Bug E (Codex sandbox + recovery) + fix exit-code preservation Two new test files (18 tests) cover both legs of the Bug E fix. The regression suite caught one additional gap during execution that's also fixed in this commit. codex-sandbox-writable-roots.test.ts (9 tests): - T-E1: non-git dir → [] (defensive) - T-E4: main worktree → [] (--git-dir resolves inside cwd) - T-E2: real linked worktree → [parent .git, parent .git/worktrees/<name>] Uses fs.realpathSync on both sides to handle macOS /private prefix. - T-E5a: cache returns same array reference on repeated calls - T-E5b: read-only sandbox → [] (no waste) - T-E5c: danger-full-access sandbox → [] (no waste) - T-E5d: workspace-write in non-repo → [] (defensive) - T-E-WIRE-1: every `"-s",\n sandbox,` site in sub-agents.ts has buildCodexAddDirArgs within 5 lines (>= 3 sites). Static-grep catches future refactors that drop the injection. - T-E-WIRE-2: helper + cache-reset are exported codex-sandbox-recovery.test.ts (9 tests): - T-E-RE-1/2: CODEX_SANDBOX_EPERM_RE matches canonical signature + variants (quoted paths, prefix noise) - T-E-RE-3: does NOT match unrelated EPERM messages (low FP rate — main-worktree index.lock, generic EPERM, missing git) - T-E-REC-1: sandbox-blocked + dirty tree + summary listing files → recovery runs, commits with Recovery-Reason trailer, returns exitCode 0 (success synthesis — see follow-up fix below) - T-E-REC-2: non-zero exit WITHOUT sandbox signal → original early-return preserved (no regression for the unrelated-failure case) - T-E-REC-3: clean exit + normal recovery → no Recovery-Reason trailer attached (no false attribution to sandbox) - T-E-LEG2-WIRE-1/2/3: static-grep guards on the cli.ts wiring Leg 2 follow-up fix (in cli.ts applyMutableAgentHygiene): The regression suite caught a real gap. When sandbox-blocked recovery succeeded, the function returned opts.result unchanged — but opts.result.exitCode was still 1 (Codex itself exited non-zero because its commit failed). The caller would then mark the phase as failed despite recovery committing the work cleanly. Fix: on the sandbox-blocked-AND-recovered path, synthesize a success result with exitCode 0 (preserving log path + appending a `[hygiene] codex sandbox blocked commit; host-side recovery committed as <sha>` line to stdout for operator visibility). The original non-sandbox recovery path is unchanged (already returns opts.result with the agent's exit code, which is 0 in that flow). This makes the operational story coherent: sandbox-blocked-recovered phases look exactly like normal-recovered phases downstream. The difference is visible only in the git log (Recovery-Reason trailer) and the hygiene stdout note. 446/446 pass across all 7 impacted suites (the 2 new files + 5 re-verified). Closes the test side of: - ~/.gstack/skill-faults/manual-1779772477125/MANUAL_INVESTIGATION:0:8fb43d58.md Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(build/orchestrator): security + correctness hardening from /ship review (Bug E) Five tightening fixes from the /ship-time pre-landing + adversarial reviews. All inline so the deliverable PR ships safe. 1. **CRITICAL: EPERM regex requires git's `fatal:` prefix (F1 exploit vector).** cli.ts:2342. Adversarial reviewer caught that a compromised or off-task agent could emit the EPERM string in its own stdout summary to force host-side recovery to commit a dirty tree the orchestrator was explicitly trying to reject (non-zero exit). The previous regex matched anywhere in the agent's combined output, so stdout spoofing was trivially trivial. Anchoring on git's canonical `fatal:` prefix raises the bar — an attacker now has to deliberately fake git's error shape, which is visible in the audit trail. Also added a negative lookahead after `index.lock` to require a delimiter character (`['"\s:—-]`) so `index.lock.bak` and `index.lock/extra/file` no longer over-match. 2. **All-or-nothing rev-parse probing (F2 partial-success state).** sub-agents.ts:553-580. Previous version swallowed per-flag failures and returned whatever succeeded. If `--git-dir` returned but `--git-common-dir` timed out, Codex got one root, committed its index, then EPERM'd on the shared objects/refs — leaving loose objects orphaned in the shared dir. Now bails to `[]` on ANY probe failure (Leg 2's recovery fallback catches the resulting EPERM if it was a real linked worktree). 3. **Cache realpath-keyed + non-empty-only (F4 collision + empty- transient-caching).** sub-agents.ts:582-606. Symlinks or relative-vs- absolute path callers no longer create cache fragmentation for the same physical worktree (`fs.realpathSync(cwd)` is the key). Empty results are NOT cached — a transient git failure that produced `[]` gets a re-probe on the next call instead of permanently degrading the session to pre-fix behavior. 4. **Preserve original stderr with sentinel prefix (F5 fault-triage signal loss).** cli.ts:6358-6370. Wiping stderr to `""` on the sandbox-recovery success path lost the EPERM line that fault-triage greps depend on. Now prefixes original stderr with `[hygiene] suppressed sandbox EPERM (recovered as <sha>):\n` so downstream phase routing still sees exit 0, fault grep still finds "Operation not permitted". 5. **Dedupe Recovery-Reason trailer (F6 collision with agent footers).** cli.ts:3179-3199. If the agent's summary happens to contain a `Recovery-Reason:` line (its own footer conventions, or an artifact of output-summary parsing), the resulting commit would carry TWO trailers and log-parsing tools would key off the wrong one. Now strips pre-existing `^Recovery-Reason:` lines from the agent's message before appending the orchestrator's authoritative one. Tests: - T-E-RE-4: spoofed EPERM without `fatal:` prefix is REJECTED (F1) - T-E-RE-5: `index.lock.bak` and `index.lock/extra` over-matches are REJECTED - T-E-REC-1 updated: asserts stderr is PRESERVED with sentinel prefix - T-E-REC-4 (new): agent summary with `Recovery-Reason:` line gets deduped — exactly ONE trailer on final commit 449/449 pass across 7 impacted suites (was 446, +3 new tests). Review provenance: - Adversarial review: F1 (critical exploit vector), F2, F4, F5, F6 - Pre-landing review: same F1, F2 (cache transient-caching), F4 (regex over-match), F5 (stderr preservation), F6 (regex split across newlines — accepted as same-line assumption; documented) Deferred (not blocking, flagged for follow-up): - F3 (alternates / submodules in writable_roots): structural, needs design - F7 (cwd starting with `-`): defensive validation, low risk - F9 (--add-dir max count): not verified; codex CLI internal limit unknown - F10 (worktree-removed-mid-session race): rare; recovery already fails loud - F8 (T-C piggyback masks CI regression): test design discussion, not a bug Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
anbangr
added a commit
that referenced
this pull request
May 26, 2026
…s into production code (Bug H) (#106) * fix(build/orchestrator): codex test-writer wrapper prompt over-reaches into production code (Bug H) Closes Bug H — the third hidden bug class behind the canonical PR #102 "agent's output summary listed N non-test file(s)" role-boundary refusal. PRs #102/#103/#104/#105 stacked the safety nets; this PR fixes the upstream cause: the wrapper prompt sub-agents/buildCodexImplArgv emits for EVERY codex role hardcodes implementor language ("Implement the changes autonomously... Do NOT change test assertions — only make tests pass"). When that prompt reaches a test-writer role, codex obediently writes the production code AND the tests, then PR #102's downstream boundary catches and refuses the output. The polis-mesh F5 build (2026-05-26T17:23 CST) was the canonical incident: 30 minutes after `configure.cm` flipped testWriter from gemini/gemini-2.5-flash (passively role-restrained by being weaker) to codex/gpt-5.5 (eager generalist), the very next test-writer phase produced `?? experiments/harness/sla/satisfaction.py`, `?? experiments/harness/llm_proxy/polis_prompt.py`, and the matching test file. Codex even ran the tests (11/11 passing, 94% cov). PR #102 refused. Phase halted dirty. Fix shape: 1. `buildCodexImplArgv` (sub-agents.ts) accepts a new optional `roleId?: "test-writer" | "test-fixer" | "primary-impl" | string` parameter and switches the prompt block based on it: - "test-writer": "You are the TEST WRITER", "Touch ONLY test files", "Do NOT write production code", "Do NOT make existing tests pass" - everything else (including undefined): the legacy implementor prompt, unchanged for back-compat with primary-impl, test-fixer, dual-impl tournament, and every existing call site 2. `runCodexImpl` (sub-agents.ts) accepts and forwards `roleId` into the spread-passed buildCodexImplArgv opts. 3. `runRoleTask` (cli.ts) accepts `roleId` and threads it through to the codex branch's runCodexImpl call. 4. The test-writer dispatch site at RUN_GEMINI_TEST_SPEC (cli.ts:8520) passes `roleId: "test-writer"`. Test-fixer + primary-impl call sites intentionally don't set roleId — they EXPECT the implementor prompt (their phase contract is "make tests pass"). Defense-in-depth preserved: PR #102's role boundary still fires on any agent that bypasses the prompt instruction (adversarial or otherwise). The new prompt is the FIRST line of defense; PR #102 stays as the backstop. The fix moves the refusal upstream — codex now declines at the prompt level rather than the post-spawn refusal level — so the worktree stays clean and operators don't need `--mark-phase-committed` to recover. Tests (T-H1 through T-H6, 8 tests in build/orchestrator/__tests__/codex-role-prompt.test.ts): - T-H1: roleId "test-writer" → test-writer prompt; asserts legacy copy is gone from the prompt - T-H2: roleId undefined → legacy implementor prompt (back-compat) - T-H3: roleId "primary-impl" → legacy implementor prompt - T-H4: roleId "test-fixer" → legacy implementor prompt (intentional) - preserves sandbox + --add-dir + reasoning flags regardless of roleId - T-H5a/b/c: static-grep guards on the cli.ts threading wiring (signature, runCodexImpl forward, dispatch-site literal) 8/8 pass. Architectural payoff for the "no commit / dirty tree" symptom space: | Bug | Symptom | Resolved by | |---|---|---| | A | FEATURE_REDO loop: impl gets no findings, makes no commit | PR #103 | | E | Codex sandbox EPERM on .git/worktrees/<run>/index.lock | PR #104 | | F | Prose summary lacks parseable paths, recovery refuses | PR #105 | | H | Codex test-writer over-reaches into production code | THIS PR | After this lands, a codex/gpt-5.5 (or any future codex model) in the test-writer role gets instructions matching the role's hygiene contract, and the only remaining "no commit" path is the agent genuinely doing nothing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(build/orchestrator): tighten Bug H test-writer prompt + reuse RoleHygieneId (inline hardening from /review pipeline) Four reviewers — testing specialist, red-team specialist, Codex adversarial review (P1, 9/10), Codex structured review (P2) — all independently flagged the SAME contradiction in the initial Bug H fix: the test-writer prompt promised codex that `*_test.go` files were allowed, but classifyTestWriterCommit's enforcer regex at cli.ts:2138 (`/(^|\/)(__tests__|test|tests|spec|specs)\//i` + `/\.(test|spec)\.[a-z]+$/i`) only accepts directory-prefixed paths and `.test.*` / `.spec.*` suffixes. A codex test-writer in a Go project would follow the new prompt, commit `pkg/foo_test.go`, then PR #102's boundary refuse it — re-creating the exact Bug H symptom with a different cause. Multi-source confirmation across 4 independent reviewers makes this a true HIGH finding (combined confidence 9/10). This commit: 1. Rewrites the test-writer prompt to match the enforcer surface exactly. Drops the `*_test.* (Go)` claim. Adds a 10-line comment block at the prompt site naming the cli.ts enforcer literal and warning future maintainers to keep prompt NARROWER than enforcer (never wider). Also clarifies the "RED expected" wording so codex can't misread it as "make existing tests fail" — separates "ADD NEW failing tests" from "leave existing passing tests untouched" (separate red-team MEDIUM finding). 2. Reuses cli.ts's canonical `RoleHygieneId` strict union (11 role IDs) instead of the inline ad-hoc union (3 + `| string` escape). Maintainability finding from the testing specialist: the inline union loses TypeScript exhaustiveness checking; the canonical type was already exported and enumerates all role IDs in the orchestrator. `import type` keeps the cli ↔ sub-agents reference cycle compile-time-only (erased at runtime), preserving the existing module boundary. 3. Adds `roleId?: RoleHygieneId` to `RunConfiguredRoleTaskOpts` as defensive future-proofing. Today no configure.cm role is a test-writer (slash-command paths flow through runCodexReview, not buildCodexImplArgv), so this is documentation-only. Comment says so. The benefit: if a future skill adds a configured test-writer, the threading is ready and resolveFallbackForConfigured preserves it across the backup hop via `...parentOpts`. 4. Five new tests (T-H5d + T-H6a/b/c/d, in a second `describe` block "Bug H — prompt-enforcer drift guard"): - T-H5d: counts `roleId: "test-writer"` occurrences in cli.ts and asserts exactly 2 (the runRoleTask dispatch + the applyMutableAgentHygiene call). Prevents accidental copy-paste onto a non-test-writer dispatch. - T-H6a: prompt enumerates the 5 enforcer-accepted dir prefixes. - T-H6b: prompt does NOT mention `*_test.go` (the pattern that caused this hardening cycle). - T-H6c: prompt clarifies "ADD new failing tests" vs "do not modify existing passing tests". - T-H6d: extracts the enforcer's TEST_PATH_RE dir-alternation group from cli.ts source and asserts the prompt mentions every directory the enforcer accepts. A divergence in either direction fails CI and forces prompt + enforcer to be updated together. Updated T-H1 to assert against the new prompt copy. 5. Adds 10-line comment block at the test-writer dispatch site naming the enforcer cross-reference (matches the comment on buildCodexImplArgv). 13/13 pass on the regression suite. All four reviewers' single-confirmed findings addressed (1 HIGH inline-fixed, 1 multi-confirmed HIGH inline-fixed, 1 MEDIUM inline-fixed, 1 MEDIUM inline-added-test). Low findings deferred as plan follow-ups. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
4 tasks
anbangr
added a commit
that referenced
this pull request
May 27, 2026
…tead of "exited 0" (Bug I) + side-fix rsync preserves user BUGREPORTs (#107) Closes Bug I — `RUN_GEMINI_TEST_SPEC` failure handler in phase-runner.ts was the lone holdout still calling `renderRoleStepFailureMessage` directly, while every other dispatcher (primary-impl, test-fixer, dual-impl, judge, etc.) already used `geminiExitError`. The difference matters: when applyMutableAgentHygiene catches an empty output / no commit / recovery-refused failure and wraps the success result as exitCode=1 via hygieneFailureResult, the legacy `renderRoleStepFailureMessage` rendered the misleading "test-spec writer exited 1" message that hid the actual reason behind a forged exit code. The operator hunting for an LLM crash that never happened. `geminiExitError` already implements the right idiom: pull the first non-header line of the hygiene body ("left an empty output summary", "did not create a new commit", "recovery refused", etc.) and fall through to the legacy `exited N; see <log>` shape when no hygiene marker is present. This PR aligns RUN_GEMINI_TEST_SPEC with the rest of the codebase — one helper swap, 18 lines including a 14-line comment explaining the historical context. The canonical incident: AGNT2 operator on 2026-05-26 hit Phase 3.1 test-writer halts 4 times in a row. Every halt surfaced as `✗ Phase 3.1 ... failed: test-spec writer exited 0`. Worktree clean, monitor agent JSON 0 bytes, no commit, no obvious crash. The operator had to grep the hygiene-log file separately to discover the actual reason was an empty output summary from the codex backup. After this PR lands, the same incident would surface as `✗ Phase 3.1 ... failed: test-spec writer hygiene failed: test-writer left an empty output summary: <path>; see <hygiene-log>` — the operator sees the cause and the forensics pointer in one line. Side-fix in the same PR: `gstack-upgrade` Phase 4 rsync now uses `--exclude 'inbox/BUGREPORT-*'` to preserve user-filed bug reports in the install dir's inbox/. Without this, the AGNT2 incident's other half repeats: the operator filed `~/.claude/skills/gstack/inbox/BUGREPORT-test-writer-fixer-exit-nonzero-with-valid-work.md` directly into the install dir, then the next /gstack-upgrade rsync `--delete`d it because the source repo's inbox/ didn't have that file. Bug reports are USER state, not skill state. The exclude pattern preserves `BUGREPORT-*` files only; example bug reports tracked in the source repo's inbox/ still sync normally. Tests (T-I1 through T-I4 in build/orchestrator/__tests__/test-spec-writer-hygiene-error-attribution.test.ts): - T-I1: hygieneFailure result → next.error names the hygiene reason and includes the agent log path for forensics; the legacy misleading "test-spec writer exited N" shape MUST NOT appear. - T-I2: vanilla nonzero exit (no hygiene marker) → legacy "exited N" shape preserved. Important: when codex genuinely crashed with exit 2, "exited 2" is the right signal — only hygiene-converted failures need the new attribution. - T-I3: static-grep guard that RUN_GEMINI_TEST_SPEC uses geminiExitError("test-spec writer", result) literally. - T-I4: static-grep guard that phase-runner.ts has at least 3 geminiExitError callers — pin the helper-adoption ratio so a future regression that swaps in renderRoleStepFailureMessage shows up at review time. 4/4 pass. Architectural payoff for the "no commit / dirty tree" symptom space: | Bug | Symptom | Resolved by | |---|---|---| | A | FEATURE_REDO findings deadlock | PR #103 | | E | Codex sandbox EPERM on .git/worktrees/<run>/index.lock | PR #104 | | F | Prose summary lacks parseable paths, recovery refuses | PR #105 | | H | Codex test-writer over-reaches into production code | PR #106 | | I | "test-spec writer exited 0" hides the actual hygiene reason | THIS PR | After this lands, every test-writer failure carries a one-line operator-facing reason that names the actual gate it tripped. The "no commit" symptom becomes a real "agent did nothing" signal — matched only when the LLM CLI itself exited cleanly without making any changes — not a catch-all for hygiene conversions, missing specs, or empty outputs. Note: the bug report (BUGREPORT-gstack-build-hygiene-gate-kills-test-writer-work.md) also names a secondary contributing factor — the codex-bridge `ps` probe race that produces `exit=null, timedOut=false` on primary calls. That's a deeper infrastructure fix (process-group tracking, setsid + PGID kill semantics) deliberately out of scope for this PR. Once Bug I lands, the operator-facing message for that case will also be clearer because the fallback's empty output will be named specifically, instead of buried behind the bridge's exit=null. Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Merged
3 tasks
anbangr
added a commit
that referenced
this pull request
May 27, 2026
…erdict write (Bug J) (#108) * fix(build/orchestrator): codex /review read-only sandbox blocks own verdict write (Bug J) Closes Bug J — `runReviewGates`'s `runGate` closure forced `-s read-only` on every codex /review call where `phase.kind !== "code"` or `auditOnly === true`. The intent was to prevent the reviewer from modifying source on non-code phases. The result: codex couldn't write its own verdict file either, because stageCodexIO stages the output inside the worktree (so it survives the cwd-restricted sandbox), but read-only blocks ALL writes including the staged output. Canonical incident (filed by `/build investigate` from the live mitosis run, ~/.gstack/skill-faults/inbox/BUGREPORT-2026-05-27-build-manual-investigation-d4b344.md): mitosis-oasis-phase1-part2 phase 5.1 (GovernanceRegistry fixture review) failed all 4 review iterations with 0-byte output files. Codex log shows: ERROR codex_core::tools::router: error=patch rejected: writing is blocked by read-only sandbox; rejected by user approval settings BLOCKED: read-only sandbox prevented writing <worktree>/.llm-tmp/gstack-codex-5.1-4-review-output.md Empty output -> parser sees no GATE PASS/FAIL line -> orchestrator triggers primary-impl-rerun recovery -> recovery fails its own hygiene check with "blind execution -- input file unreachable; changes discarded" -> phase FAILED. Affects every codex review call when review.provider=codex on a non-code phase. Estimated to hit 5+ more phases in F5-F9 if not fixed. Fix: drop the read-only force-default. The source-mutation concern that motivated the heuristic is already covered by the SAME defense-in-depth model the feature-review path (sub-agents.ts:3921-3944) uses: 1. Prompt forbids worktree edits (verdict-only output target). 2. applyGateHygiene runs after every gate and catches any worktree mutation post-spawn, converting it to HYGIENE_FAULT. 3. Same-shape repeat detector halts the loop after 2 identical HYGIENE_FAULTs (caller upstream). The `attempt.sandbox` explicit-override path (used by shouldRetryCodexGateWithDangerFullAccess for the sandbox-retry fallback) is preserved verbatim. The env-driven override at `GSTACK_BUILD_CODEX_REVIEW_SANDBOX` still wins. Source-mutation enforcement comes from the hygiene gate, not from forcing read-only at launch. 22-line comment block at the runGate call site documents: - What the bug looked like (read-only blocks verdict write) - Why the heuristic was dropped (broken intent: blocks own writes) - Where source-mutation enforcement actually lives (applyGateHygiene + same-shape repeat detector) - What overrides still work (attempt.sandbox, env var) Tests (T-J1 through T-J4 in build/orchestrator/__tests__/codex-review-sandbox-bug-j.test.ts): - T-J1: static-grep guard — no `const readOnlyArtifactGate =` in cli.ts. The identifier name appears once in the Bug J comment block as intentional documentation; the regex matches the const declaration form (the actual bug source), not the bare token. - T-J2: static-grep guard — no `attempt?.sandbox ?? (readOnlyArtifactGate` or `readOnlyArtifactGate ? "read-only"` patterns. Pins both half-revert scenarios at the bit level. - T-J3: static-grep guard — runGate closure now reads `const sandbox = attempt?.sandbox;` AND the cli.ts contains "Bug J" + "applyGateHygiene" tokens (the comment block cross-reference is required so the next maintainer who touches the runGate dispatcher sees the historical context). - T-J4: behavioral guard — the runGate closure block (matched as source range) MUST NOT contain `"read-only"` literal. Other `"read-only"` literals in cli.ts (judge sandbox at runJudgeRole, runtime sandbox-retry paths) are fine; this test specifically scopes the assertion to the runGate dispatcher. 4/4 pass. Architectural payoff for the "no commit / dirty tree" symptom space: | Bug | Symptom | Resolved by | |---|---|---| | A | FEATURE_REDO findings deadlock | PR #103 | | E | Codex sandbox EPERM on .git/worktrees/<run>/index.lock | PR #104 | | F | Prose summary lacks parseable paths, recovery refuses | PR #105 | | H | Codex test-writer over-reaches into production code | PR #106 | | I | "test-spec writer exited 0" hides hygiene reason | PR #107 | | J | Codex /review read-only sandbox blocks own verdict write | THIS PR | After Bug J lands, the same defense-in-depth that secured feature-review now secures phase-review. Source mutations stay blocked by the hygiene gate (post-spawn detection + HYGIENE_FAULT classification + same-shape repeat halting), and codex's verdict write succeeds on the first try — no cascading primary-impl-rerun recovery, no operator intervention. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(build/orchestrator): scope review-gate auto-commit to qa only + tighten test guards (Bug J inline hardening) Inline hardening from /review pipeline. Security specialist (HIGH) and Codex adversarial (P0, 9/10) both independently flagged the same MULTI-CONFIRMED security regression in the initial Bug J commit: The initial Bug J fix dropped the read-only sandbox floor on non-code review gates. The PR comment claimed defense-in-depth via applyGateHygiene converting reviewer source mutations to HYGIENE_FAULT. That claim is WRONG. `phaseAllowsGateSourceFixes(opts.phase)` returns true for research/writing/experiment/manual phases unconditionally, which means applyGateHygiene's auto-commit path (`maybeAutoCommitTestOnlyDirty` with `allowNonTestPaths: true`) AUTO-COMMITS the reviewer's source mutations instead of rejecting them. Net effect of the unhardened Bug J: silent reviewer-driven commits on every non-code phase. A prompt-injection in a reviewed artifact could persist source changes through the review gate, and the operator would see a clean GATE PASS. This hardening commit: 1. Scopes the `allowNonTestPaths` escape hatch to the QA gate ONLY. review and reviewSecondary gates are READ-ONLY by contract — they evaluate the implementation and emit a verdict; they don't fix code. QA keeps fix-on-review semantics (that's intentional — QA was designed for it). Introduces a local `gateAllowsSourceFixes` const that ANDs `name === "qa"` with the existing `phaseAllowsGateSourceFixes(opts.phase)` heuristic. Applied at both applyGateHygiene call sites in runReviewGates (primary + sandbox-retry paths). 2. 14-line comment block at the runGate call site documents: - Why the qa-only scoping exists (security regression class) - Why QA is exempt (fix-on-review is intentional for QA) - What the read-only sandbox used to protect structurally (now via hygiene-gate scope rather than OS sandbox) 3. Adds T-J5 (positive static-grep guard): pins the new `gateAllowsSourceFixes` local + both applyGateHygiene call sites using it. 4. Adds T-J6 (negative static-grep guard): runReviewGates block (whole function body via regex match) must NOT contain `allowNonTestPaths: phaseAllowsGateSourceFixes(opts.phase)` — the unhardened code form. A refactor that re-collapses the source fails CI. 5. Widens T-J4 regex window from 2500 → 5000 chars (adversarial Finding 5: original block was at 2249/2500, one new if-block away from overflowing the window and crashing the test with TypeError on the non-null assertion). 6/6 pass on the regression suite (T-J1..T-J6). Deferred concerns (multi-source adversarial findings, will become Bug K): - HEAD-advance not blocked on review gates (Codex P0 #2): a reviewer can `git commit` source changes (the new workspace-write sandbox allows it), write GATE PASS, leave the tree clean — no HYGIENE_FAULT because validatePostAgentHygiene doesn't check `requireNewCommit` for review gates. Fix: pass `requireNewCommit: false` AND add a separate "HEAD must not advance" check on review/reviewSecondary gates. - Failed/timed-out reviewers skip hygiene entirely (Codex P1 #3): applyGateHygiene early-returns on `timedOut || exitCode !== 0` at cli.ts:6177. A reviewer can edit source, crash before verdict, retry runs against the mutated tree. Fix: always run dirty-discard check for review gates regardless of exit code, OR add explicit `discardWorktreeChangesOnFailure: true` opt for review gate calls. - .git/ directory mutations not caught by git status (Security MEDIUM #2): hooks, .git/config remote rewrites, .git/info/exclude tampering all bypass validatePostAgentHygiene because git status doesn't report them. Fix: snapshot mtime+sha256 of .git/config, .git/hooks/*, .git/info/exclude, .git/HEAD in captureGitSnapshot. These three are separate architectural concerns on the same surface that deserve their own dedicated PR (Bug K) rather than a panic patch on Bug J. This PR's qa-only scoping closes the multi-confirmed P0 from 2 of 3 reviewers; Bug K will close the residuals from codex adversarial. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Merged
5 tasks
anbangr
added a commit
that referenced
this pull request
May 27, 2026
… from PR #108 (Bug K) (#109) Closes Bug K (K1+K2+K3) — three trust-boundary residuals left open after PR #108's qa-only `gateAllowsSourceFixes` scoping. All three were multi-source confirmed by the security specialist + Codex adversarial in PR #108's review pipeline, documented in the PR comment, and queued as follow-up. This PR closes them together. The underlying architectural shift: PR #108 dropped the read-only sandbox floor on review/reviewSecondary gates so codex could write its verdict file. The PR comment promised defense-in-depth via post-spawn `applyGateHygiene`. Three gaps remained: K1 — HEAD-advance not blocked (HIGH, codex P0 #2) A reviewer can `git commit` source changes under the new workspace-write sandbox, write GATE PASS, leave the tree clean, and the gate accepts the commit silently. validatePostAgentHygiene only checked dirty deltas; HEAD advance was invisible. Fix: `applyGateHygiene` accepts `requireNoHeadAdvance?: boolean`. When true, compares before/after HEAD; mismatch emits "reviewer roles are read-only; only QA may fix-on-review". runReviewGates passes `requireNoHeadAdvance: gateIsReviewer` (true for review/reviewSecondary, false for QA — QA's contract IS to commit fix-on-review changes). K2 — Failed/timed-out reviewers skipped hygiene entirely (MEDIUM, codex P1 #3) Pre-fix early-return at applyGateHygiene's top preserved any worktree mutations the reviewer left behind. The next retry / recovery path ran against the mutated tree. Fix: `applyGateHygiene` accepts `discardOnFailure?: boolean`. When true AND the gate spawn failed (timedOut || exitCode !== 0), call `discardBlindExecutionChanges` to roll back worktree mutations before returning. The original result (failed exit code, timeout flag) is preserved — this is a side-effect cleanup, not a result rewrite. runReviewGates passes `discardOnFailure: true` for ALL gate roles (review/reviewSecondary/qa) because all three share the workspace-write-with-no-OS-floor failure mode. K3 — `.git/` directory mutations bypassed hygiene gate (MEDIUM, security #2) `git status --porcelain` doesn't report mutations under `.git/`: - `.git/config` (remote URL rewrites for exfiltration) - `.git/hooks/*` (post-merge hook injection) - `.git/info/exclude` (silently exclude files from `git add`) - `.git/HEAD` (silent branch swap) - `.git/packed-refs` (ref tampering) Pre-PR-#108 the OS read-only sandbox blocked all of these at the syscall level. With workspace-write, nothing did. Fix: - `GitSnapshot` interface gains optional `gitDirHashes?: Map<string, string>` - `captureGitSnapshot` accepts `captureGitDirContents?: boolean`. When true, sha256-hashes HEAD, config, info/exclude, packed-refs, plus a sorted-listing hash of `hooks/` (with executable-bit detection so chmod +x on a previously-disarmed hook also surfaces). Uses `git rev-parse --git-dir` AND `--git-common-dir` so linked worktrees track BOTH their per-worktree files (HEAD, index) AND the shared common dir's hooks/config (mirrors the Bug E --add-dir resolution pattern). - New `validateGitDirUnchanged` validator diffs before/after gitDirHashes. Each mismatch produces one error naming the exact `.git/` path so operators can grep. - runReviewGates upgrades its `captureGitSnapshot` call to `{ captureContents: true, captureGitDirContents: true }`. - `applyGateHygiene` checks list now includes `validateGitDirUnchanged` alongside the existing two validators. No-op when `before.gitDirHashes` is absent (back-compat: only gates that opt in to capturing get the K3 check). Tests (T-K1..T-K6 + T-K6a..T-K6f in build/orchestrator/__tests__/bug-k-review-gate-trust-boundary.test.ts): Behavioral (K3 enforcement): - T-K1: captureGitSnapshot populates gitDirHashes when requested. - T-K2: gitDirHashes is absent by default (back-compat). - T-K3: validateGitDirUnchanged detects post-merge hook injection (creates `.git/hooks/post-merge` between snapshots, asserts error contains "hooks/" + "reviewer/QA roles must NOT modify git metadata"). - T-K4: validateGitDirUnchanged detects .git/config rewrite (uses `git remote add evil <url>` between snapshots). - T-K5: validateGitDirUnchanged is a no-op when the before snapshot doesn't have gitDirHashes (back-compat regression guard). Static-grep wiring (K1/K2/K3 surface guards): - T-K6a: applyGateHygiene declares requireNoHeadAdvance + discardOnFailure opts. - T-K6b: BOTH runReviewGates call sites (primary gate + sandbox-retry) pass requireNoHeadAdvance=gateIsReviewer + discardOnFailure=true. - T-K6c: captureGitSnapshot accepts captureGitDirContents; runReviewGates passes both captureContents AND captureGitDirContents true. - T-K6d: applyGateHygiene checks list now includes validateGitDirUnchanged. - T-K6e: K1 error message names the exact regression class. - T-K6f: K2 failed-gate cleanup wires through discardBlindExecutionChanges. 11/11 pass on the regression suite. Architectural payoff: | Bug | Symptom | Resolved by | |---|---|---| | A | FEATURE_REDO findings deadlock | PR #103 | | E | Codex sandbox EPERM on linked worktrees | PR #104 | | F | Prose summary lacks parseable paths, recovery refuses | PR #105 | | H | Codex test-writer over-reaches into production code | PR #106 | | I | "test-spec writer exited 0" hides hygiene reason | PR #107 | | J | Codex /review read-only sandbox blocks own verdict | PR #108 | | K | 3 review-gate trust-boundary residuals from PR #108 | THIS PR | After Bug K lands, the review-gate trust boundary is structurally sound: - Reviewer mutations to source: caught by validatePostAgentHygiene (existing) + scoped allowNonTestPaths (PR #108) - Reviewer commits: caught by K1 requireNoHeadAdvance - Reviewer mutations on failed runs: discarded by K2 discardOnFailure - Reviewer mutations to .git metadata: caught by K3 validateGitDirUnchanged The same defense-in-depth model now matches feature-review's (sub-agents.ts:3921-3944) but with full git-state coverage instead of just worktree-state. Plan reference: ~/.claude/plans/fixing-plan-bugs-k-through-n-post-pr-108.md PR #108 comment: #108 (comment) Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
anbangr
added a commit
that referenced
this pull request
May 31, 2026
sub-agents.ts imported spawn/spawnSync directly from node:child_process (re-introduced by #103), violating Decision 3C (all spawns route through the registry so signal handlers reap detached children) and failing the no-bare-spawn invariant. Drop the bare import; the gemini model probe now uses registeredSpawn and the two git/pytest-cov probes use registeredSpawnSync. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Closes 4 distinct build/orchestrator bug classes from the May 26 mitosis-oasis fault batch, plus 6 critical/high-impact hardening fixes caught at /ship-time review (including a credential-exfiltration primitive that the structural fix would have shipped without).
4 bugs, 8 commits, +1028/-29 across 10 files.
Bug A — FEATURE_REDO findings injection (commits
c09c75ff+3c41a117)When
dispatch_feature_reviewreturnedFEATURE_REDO, the orchestrator reset the named phases topendingand re-entered them, but the nextRUN_GEMINIdispatch calledbuildGeminiPromptBodyWITHOUT the existing 4threviewFeedbackparameter. The impl agent saw the standard phase description, observed the existing worktree code looked fine (the prior pass already shipped work), made no commit, and the hygiene gate rejected "primary implementor did not create a new commit". The phase paused, requiring manual operator intervention: read `feature-N-review-K-output.md` by hand, make the code change, `--mark-phase-committed`.Fix:
pendingFeatureReviewOutputPath?: stringfield onPhaseState.resetPhaseStateForRedo(state, phaseIndex, opts?: { featureReviewOutputPath?: string })accepts the option; when set, persists the path on phase state. Without the option, the field is explicitly cleared (no stale bleed across unrelated resets).outputFilePathto every reset call.RUN_GEMINIdispatch readsphaseState.pendingFeatureReviewOutputPath, threads contents intobuildGeminiPromptBody(..., reviewFeedback). ExistingNO_CHANGES_NEEDEDsentinel handles the legit no-op case.applyResult(RUN_GEMINI)unconditionally clears the field on every completion (success / failure / timeout).Bug B — Monitor stale-state false positive (commits
a580461b+5db7693b)monitor.tsdeclaredstale=truebased solely onlastUpdatedAtageing paststaleWindowMs(default 30s). Long Codex/qaor Claude/reviewcalls (3-10 minutes is normal) produced no state.json writes during execution, so the timestamp aged out and the monitor firedUSER_ACTION_REQUIRED→ supervisor escalation → "re-enter the monitor" → same false alarm. Loop-guard caught the pattern after 3 escalations in 7 minutes but burned a Codex supervisor call per loop until then.Fix: two complementary signals.
hasActiveSubagentChild(orchPid)helper runsps -e -o ppid=,comm=(POSIX-portable), filters to direct children of the orchestrator PID, returns true if any basename exactly matchescodex/claude/gemini/kimi. Wired into the stale conditional with&& !subagentChildAlive. Defensive — returns false on any error (no ps, timeout, parse failure)._running, multiplystaleWindowMsby 30x (15 min default). Catches sandbox-wrapped subagents that don't surface a recognizable comm.Bug C — pytest --cov injected without pytest-cov installed (commit
c28ca036)injectCoverageFlagsunconditionally appended--cov --cov-report term-missingwhenever the testCmd matched\bpytest\b. Projects intentionally disabling coverage in CI (mitosis-oasis CLAUDE.md:294 is the canonical case) hitpytest: error: unrecognized arguments: --cov=...and exit 4 during argparse, before any tests ran. The test-fixer role then iterated 3 times unable to fix a missing system dependency.Fix:
hasPytestCov(cwd)helper. Two cheap signals (either sufficient): pyproject.toml text grep forpytest-cov, ORpython3 -c \"import pytest_cov\"(fallback topythonfor older systems) exit 0.injectCoverageFlags(testCmd, cwd)adds requiredcwdparameter. Idempotent short-circuit (testCmd.includes(\"--cov\")) fires first so the probe only runs when needed. WhenhasPytestCovreturns false, command returned unchanged with one-line warning naming the missing dep.cli.ts:8527updated.Bug D — Stale Gemini model in configure.cm (commit
cc1fafd8)configure.cmreferencedgemini-3.5-flash(5 occurrences across testWriter, primaryImpl backup, testFixer, ship backup, land backup). Google's API returns HTTP 404 ModelNotFoundError for that identifier — every primary call burned ~10s before falling back to Codex.Fix:
configure.cm: 5 occurrencesgemini-3.5-flash→gemini-2.5-flash(confirmed valid via live probe).parseGeminiModelProbeStderr(stderr)pure function — detectsModelNotFoundError/code: 404/Requested entity was not found(case-insensitive).assertGeminiModel(model)— async (NOTspawnSync— non-blocking), Promise-cached per (model, session), emits ONE startup warning per invalid model with remediation pointer.runRoleTaskinvokes viaassertGeminiModel(opts.model).catch(() => {})— fire-and-forget, never crashes a phase.Critical /ship-time hardening (commit
59c0cca1)The structural fix above would have shipped with a credential exfiltration primitive — Bug A's read site used
fs.readFileSync(phaseState.pendingFeatureReviewOutputPath, ...)with no path validation. state.json is operator-editable; a tampered path (or one corrupted by a faulty restore) pointing at~/.ssh/id_rsa,~/.gstack/security/device-salt,~/.aws/credentialsetc. would slurp the file, run it through the existing GATE-marker-only sanitizer, and embed it in the impl prompt sent to the Gemini API.6 inline fixes from the pre-landing + adversarial reviews:
pendingFeatureReviewOutputPaththrough the existingvalidateLogPathInScope(rawPath, state.slug)helper before reading (same pattern as cli.ts:7115, 7625, 8113). Reject out-of-scope paths with a warn. Add 1 MiB read cap viafs.statSyncbefore the read so a pathological huge findings file (or symlink to /dev/zero) can't OOM the orchestrator.comm.includes(name)would matchmycodex-wrapper,kimichi,notgeminietc. — silently suppressing the stale alarm forever for any user script with a substring collision. Tightened to exact equality.python3ships by default), silently disabling --cov injection for projects that DID install pytest-cov via pip/conda. Loop triespython3first, falls back topython.spawnSyncblocked the event loop for up to 15s on first probe per model (thevoidmodifier discards the Promise but doesn't make spawnSync non-blocking). Switched to asyncspawn+ accumulated stderr with 15s timeout.void assertGeminiModel(...)leaks unhandled rejections under Node's default..catch(() => {})swallows any future rejection so the probe can never crash a phase.Test Coverage
446/446 pass across 7 impacted test files (4.5s for the targeted set).
feature-redo-findings-injection.test.ts(new)monitor-stale-subagent-child.test.ts(new)gemini-model-probe.test.ts(new)sub-agents.test.ts(extended)hasPytestCovintegrated intoinjectCoverageFlagstest block (13 cases inc. "skips --cov injection when pytest-cov is NOT installed")phase-runner.test.tstest-writer-drift.test.tshygiene-sibling-repos.test.tsCoverage gate: 100% paths covered, 0 gaps.
Pre-Landing Review
Pre-landing review found 4 issues (1 critical, 3 informational). Adversarial review found 11 issues (1 critical credential-exfil, 5 high-impact fixables, 5 informational). All critical and high-impact findings fixed inline in commit
59c0cca1before this PR's first push.Remaining INVESTIGATE-class findings (not blocking, flagged for follow-up):
setStatus(\"primary_impl_running\")and the natural clear, state.json keeps_runningindefinitely → 15-min stale window forever. Needs a heartbeat-mtime cap on TOP of status check. Follow-up.{ok:true}→ no warning. Follow-up./pytest-cov\b/matches# DO NOT install pytest-covin a comment. Extreme edge case. Follow-up.Adversarial Review
10 specific attack-surface probes performed. Synthesis:
validateLogPathInScope+ 1 MiB cap.comm.includes()(adversarial v1.25.0.0 chore: merge upstream gstack v1.25.0.0 #5) — fixed with exact-equality.Plan Completion
14 DONE, 3 CHANGED (consolidated test placement + sibling-function vs inline extension — defensible), 4 deferred (per plan's own out-of-scope section), 1 unverifiable (manual replay).
All 4 bugs implemented end-to-end per the plan. The CHANGED items are defensible improvements: field clearing centralized in
applyResult(rather than at dispatch site) survives the{...phaseState}shallow copy;assertGeminiModelas a sibling function (rather than extendingassertGeminiAuth) keeps auth and model probes independently testable.Pre-existing test failures
Same 2 tests fail on this branch AND on clean main (verified earlier this session):
plan-review-resynth-resolved.test.tsT11,coverage-matrix.test.ts:222. Neither touches files modified on this branch. REPO_MODE=collaborative; flagged in PR body, not blocking.Versioning
Fork-local skill release. Per
CLAUDE.mdFork versioning rule, this PR changesbuild/orchestrator/*+build/configure.cmonly — no top-level VERSION / package.json / CHANGELOG bump.FORK_LOCAL_SKILL_RELEASE=1.Architectural notes
RoleHygieneIdplumbing — the newpendingFeatureReviewOutputPathfield uses the same role-aware state machinery. Stacks cleanly.spawnSyncto asyncspawnis a real win — previously the orchestrator stalled before phase work started while probing each unique model. Now the probe runs concurrently with the actual phase work.Test plan
bun test build/orchestrator/__tests__/feature-redo-findings-injection.test.ts build/orchestrator/__tests__/monitor-stale-subagent-child.test.ts build/orchestrator/__tests__/gemini-model-probe.test.ts build/orchestrator/__tests__/sub-agents.test.ts build/orchestrator/__tests__/phase-runner.test.ts build/orchestrator/__tests__/test-writer-drift.test.ts build/orchestrator/__tests__/hygiene-sibling-repos.test.ts— 446/446 pass (24s)plan-review-resynth-resolved.test.tsandcoverage-matrix.test.ts(both fail on clean main, neither touches this branch's surface)gemini-2.5-flashconfirmed valid ("ping" → "pong")Bug reports:
~/.gstack/skill-faults/manual-1779768437194/,1779768446214/,1779768454543/,1779768463981/,1779766926082/Plan:
~/.claude/plans/fix-orchestrator-mitosis-oasis-may-26-faults.md🤖 Generated with Claude Code