McRitchie Studio

Agent Context

Session retro improvements #2,#4,#5 (keep as 3 separate testable functions in bin/release). #2 BATCH ADOPT: bin/release merge currently does gh pr merge + a cold-start heroku-run adopt! PER PR; 3 in a loop blew the 2-min tool timeout and one adopt timed out MID-run leaving a half-state (PR merged, task stuck reviewed). Make 'bin/release merge <slug...>' accept multiple slugs and run ALL the Release::Conductor.adopt! calls in a SINGLE heroku run (one dyno spin-up, N flips) instead of one heroku run each. #4 SHIP PREFLIGHT: bin/release ship ffs main + runs bin/rails test ON THE PRIMARY CHECKOUT; twice this session that checkout was dirty (stale schema.rb) or left on a leftover pr-161 branch by a review agent, nearly breaking the ff. Add a preflight at the top of ship that asserts the primary checkout is on 'main' and the tree is clean — abort loudly with the offending branch/dirty files (or auto-stash with a clear message) BEFORE the ff. #5 OVERLAP PLANNER: #159 passed review then conflicted on release because siblings all touched task.rb/docs/helpers first (wasted rework). Before a batch merge, fetch each PR's changed files (gh pr view <n> --json files), compute pairwise overlap, print the overlapping files + a suggested merge order + which PR will need a post-merge rebase. DOCS: update docs/agents/system/devops-cycle-design.md and the release-conductor mechanics module.