ORCH-4: unified stage-engine (M-3) #5

admin · 2026-06-03T08:57:16+03:00

admin commented

2026-06-03 08:57:16 +03:00

Merge diverged _try_advance_stage (launcher+plane) into one src/stage_engine.advance_stage. launcher+plane = thin wrappers. Fixes agent-selection bug (current_stage, not next_stage). Preserves all rollback/retry/approved/conflict branches + check_review_approved. 18 new tests green; baseline preserved (136 passed, 9 pre-existing webhook failures). DO NOT MERGE until live-checked.

admin added 3 commits 2026-06-03 08:57:16 +03:00

refactor(stage): extract unified stage_engine.advance_stage (M-3) 0befc49b1e

Merge the two diverged _try_advance_stage implementations (launcher sync +
plane async) into one synchronous engine. Preserves all launcher business
logic (analyst approved-flow, reviewer REQUEST_CHANGES rollback+retry, tester
FAIL rollback+retry, architect conflict rollback) and the plane
check_review_approved PR-by-branch dispatch. Unifies the QG signature
dispatch. Fixes agent selection: advancing FROM current_stage launches
get_agent_for_stage(current_stage), not next_stage.

refactor(launcher,plane): delegate stage advance to stage_engine 51401a3ba9

launcher._try_advance_stage and plane._try_advance_stage are now thin
wrappers over stage_engine.advance_stage. The plane webhook calls the sync
engine via asyncio.to_thread so there is exactly one implementation. The
launcher forwards finished_agent so the agent-specific rollback branches still
fire; the webhook passes None (human :approved:), matching prior behavior.

Also fixes the agent-selection bug in the launcher path: it used to enqueue
get_agent_for_stage(next_stage) (skipping a stage, e.g. analysis->architecture
launched developer instead of architect). The unified engine uses
get_agent_for_stage(current_stage), consistent with plane and gitea.

test(stage): cover unified stage_engine + launcher/plane delegation 6abdc220d2

18 tests: happy-path advance per stage with correct agent (ORCH-4 fix),
QG-fail no-advance, reviewer REQUEST_CHANGES rollback+retry/alert, tester FAIL
rollback+retry/block, architect conflict rollback to analysis, analyst
approved-flow no-advance, and launcher+plane both delegating to the engine.

admin merged commit 2f0fd24670 into main

2026-06-03 08:59:52 +03:00

admin referenced this issue from a commit

2026-06-03 08:59:53 +03:00

Merge pull request 'ORCH-4: unified stage-engine (M-3)' (#5) from feature/ORCH-4-stage-engine into main

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: admin/orchestrator#5