Add orch control commands

docs/implementation-roadmap.md

@@ -24,13 +24,13 @@ As of now:
 - a reusable Codex skill package for `inbox` now exists under `skills/inbox/`, with a formal `SKILL.md`, `agents/openai.yaml`, and a bundled CLI binary asset
 - an inbox skill forward-test plan directory now exists under `docs/tests/inbox-skill/`, with a shared execution template and multiple scenario cases
 - an execution-roadmap workflow now exists under `docs/roadmaps/active/` and `docs/roadmaps/archive/` for agent-level work traces and completion archives
-- `orch` now implements `run init/show`, `task add`, `dep add`, `ready`, `dispatch`, `reconcile`, `blocked`, `answer`, and `status`
-- `orch` can create runs, gate tasks through dependencies, dispatch work through `inbox`, reconcile worker thread state back into task state, answer blocked tasks, and create per-attempt Git worktrees during strict dispatch
+- `orch` now implements `run init/show`, `task add`, `dep add`, `ready`, `dispatch`, `reconcile`, `wait`, `blocked`, `answer`, `retry`, `reassign`, `cancel`, `cleanup`, and `status`
+- `orch` can create runs, gate tasks through dependencies, dispatch work through `inbox`, reconcile worker thread state back into task state, answer blocked tasks, retry or reassign work, cancel tasks or runs, clean attempt worktrees, and create per-attempt Git worktrees during strict dispatch
 - `orch dispatch` now supports `--repo-path`, `--workspace-root`, and `--strict-worktree`, resolves committed base revisions, records workspace metadata on attempts, and writes that metadata into inbox task payloads
 - `orch wait` now blocks on run-scoped task events and reconciles inbox state while polling so leader waits can wake on worker progress without manual sleep loops
-- automated integration tests now cover the main `orch` scheduler slice, including dependency gating, dispatch, blocked-answer flow, reconcile, strict worktree creation, dirty-repo rejection rules, and wait wake/timeout behavior
+- automated integration tests now cover the main `orch` scheduler slice, including dependency gating, dispatch, blocked-answer flow, retry, reassign, cancel, cleanup, strict worktree creation, dirty-repo rejection rules, and wait wake/timeout behavior
 
-This means the project now has a working `orch` core scheduler with strict worktree-backed dispatch and leader-side wait support, and is ready for the remaining retry/reassign/cancel/cleanup controls.
+This means the project now has a working `orch` core scheduler with strict worktree-backed dispatch and the main leader-side control loop, and is ready for worktree ergonomics follow-up plus council workflows.
 
 ## Source Of Truth
 
@@ -74,7 +74,7 @@ Current implementation status:
 - `Milestone 5: Strict Worktree Support` is complete for the current explicit dispatch worktree mode
 - `Milestone 6: Waiting Primitives` is complete
 
-The next practical coding target is the remaining leader-side scheduler controls: `retry`, `reassign`, `cancel`, and `cleanup`.
+The next practical coding target is the remaining worktree ergonomics item: automatic code-task detection for worktree mode selection.
 
 ### Milestone 1: Go Skeleton
 
@@ -235,14 +235,19 @@ Completed so far:
 - `orch ready`
 - `orch dispatch`
 - `orch reconcile`
+- `orch wait`
 - `orch blocked`
 - `orch answer`
+- `orch retry`
+- `orch reassign`
+- `orch cancel`
+- `orch cleanup`
 - `orch status`
-- CLI integration tests cover single-task dispatch/reconcile, dependency gating, blocked-answer flow, and non-ready dispatch rejection
+- CLI integration tests cover dispatch/reconcile, dependency gating, blocked-answer flow, wait wake/timeout, retry, reassign, cancel, cleanup, and non-ready dispatch rejection
 
 Remaining:
 
-- retry, reassign, cancel, and cleanup workflows
+- none for the current scheduler control surface
 
 ### Milestone 5: Strict Worktree Support
 
@@ -272,12 +277,12 @@ Completed so far:
 - dispatch creates a fresh branch and Git worktree per attempt and persists `base_ref`, `base_commit`, `branch_name`, `worktree_path`, and `workspace_status`
 - dispatch writes workspace metadata into the inbox task payload for worker runtimes
 - reconcile now advances `workspace_status` from `created` to `active`, `completed`, or `abandoned` based on thread state
-- CLI integration tests cover strict worktree creation, explicit-base dispatch on dirty repos, and strict dirty-repo rejection
+- `orch cleanup` removes completed or abandoned worktrees and marks attempt workspace state as `cleaned`
+- CLI integration tests cover strict worktree creation, explicit-base dispatch on dirty repos, strict dirty-repo rejection, and cleanup
 
 Remaining:
 
 - automatic code-task detection so worktree mode can be selected without explicit flags
-- `orch cleanup` for removing completed or abandoned worktrees
 
 ### Milestone 6: Waiting Primitives
 
@@ -329,11 +334,11 @@ Definition of done:
 
 If a new agent is taking over now, the next concrete step should be:
 
-1. implement the remaining leader-side scheduler controls: `retry`, `reassign`, `cancel`, and `cleanup`
-2. decide whether task retry should reuse prior task metadata or allow dispatch-time overrides per retry
+1. decide whether worktree mode should be selected automatically for code tasks without explicit flags
+2. either implement that worktree-mode auto-selection or explicitly defer it
 3. keep the authored inbox test-plan set in `docs/tests/inbox/` synchronized if CLI behavior changes during further `orch` work
 
-The inbox implementation and its human-readable test-plan set are already in place, and `orch` now supports strict worktree-backed dispatch plus leader-side waiting, so the next meaningful project step is to finish the remaining scheduler control commands.
+The inbox implementation and its human-readable test-plan set are already in place, and `orch` now supports strict worktree-backed dispatch plus the main leader-side control loop, so the next meaningful project step is to smooth worktree ergonomics and then move on to council workflows.
 
 ## Recommended Driver Choices
 
@@ -358,6 +363,7 @@ Completed so far:
 - orch blocked-question and answer coverage
 - orch strict worktree creation and dirty-repo policy coverage
 - orch wait wake and timeout coverage
+- orch retry, reassign, cancel, and cleanup coverage
 
 Still recommended before the codebase grows too much: