Repository navigation
revert: restore subagent persistence and codex contract tests broken by #11960 - #12088
Conversation
Design Review (Fable 5) — ✅ PASSDesign-level review of Design-Verdict: PASS Confirm the three red lanes (Backend Tests, Coverage Gate, Real Adapter Contract Tests) go green on this head before merging. [DESIGN-REVIEWED] 15a4514 |
GPT 5.6 Review — ✅ no blocking findingsGPT 5.6 completed its review of This comment is updated in place on each push. Review detailsNo findings. False positive or not applicable? A repository writer can comment: |
First Principles Review (Fable 5) — ✅ PASSPremise-level review of First-Principles-Verdict: PASS Confirm this diff is byte-identical to What this change shipsInventory (8 items) — 8 justifiedIntent: repair red
All eight are one atomic [FIRST-PRINCIPLES-REVIEWED] 15a4514 |
Opus 4.8 Review — ✅ no blocking findingsReviewed Verdict parsed from the review's SHA-scoped output markers for commit False positive or not applicable? A repository writer can comment: |
144c367 to
15a4514
Compare
|
Re-landed as #12101, rebased onto One addition to the diagnosis here, recorded because the next reader of this revert will want it: the stale merge clobbered three upstream commits, not two. Alongside #11780 and #11946 it also collapsed It surfaced from diffing every file the merged commit touched against the revert base and confirming each changed line belonged to the feature, rather than repairing only the two reported failures. #12101 is built the same way: for each contested file it takes Two numbers from #12101, for the lane specifically: |
Problem / Motivation
mainis red since6c21f0d4d9(#11960), merged one second before #11947 (whose own breakage #12091 has already reverted). #11960 was authored against a base that predates both #11780 (bc0d2b0cfc) and #11946 (bf3fccf7d5), and its merge re-applied that stale state:test/test_subagent_continuable.pycallssubagent_persistence._run_agent_identity_path, which refactor(memory): simplify member memory to one SQLite store #11780 removed; 25 tests fail on every Backend Tests shard.test/test_codex_session_mcp.pylost the three@pytest.mark.real_adaptermarkers and therequire_real_adapterguard that ci: run the real adapter contract tests in a lane #11946 added, so the Real Adapter Contract Tests lane selects 1 test where it requires at least 4 and fails closed.Why it matters
Every PR now inherits a red CI workflow (Backend Tests, Coverage Gate, Real Adapter Contract Tests), so
PR Readinesscannot pass for anyone untilmainis repaired. With #11947 already reverted onmain(#12091), this is what still keepsmainred.What changed (motivation → approach → change)
A clean
git revertof6c21f0d4d9, no other edits. The feature (continuing a codex subagent from its persisted thread) is worth re-landing, but on the currentsubagent_persistenceAPI and with #11946's contract-test markers kept; that is a fresh PR against greenmain.Backwards compatibility
Compatible: restores the codex subagent continuation code, tests and docs to the state before #11960; nothing that worked before that merge changes.
Tests
No new tests. On this branch
test/test_codex_session_mcp.pycarries the threereal_adaptermarkers again. On this branch (rebased ontomainafter #12091)test_subagent_continuable.py,test_codex_session_mcp.py,test_member_memory_runtime.pyandtest_subagent_persistence*.pypass locally: 469 passed, 3 skipped; mypy is clean oncontext.py,dashboard/state.pyandsubagent_persistence.py.Manual verification
N/A — the failures are a missing test-only attribute and missing pytest markers; the revert restores both verbatim.
Related Issues
no linked issue: reverts #11960; follows #12091 (revert of #11947).
Pattern harvest
Rule candidate: review-prompt
Pattern: two PRs merged within the same second on stale bases each re-applied files a refactor merged hours earlier had rewritten;
PR Readinessshould not reportpassedfor a head whose last CI ran against a base that has since moved in the PR's own files (green_age.pyexit 30 measures exactly this locally).Checklist
feat|fix|docs|refactor|perf|test|chore|ci|build|revert: ...)