Scope
Show active operation, unresolved count, and applicable continue/abort/rebase-skip actions in normal and compact layouts using the existing plan/preview/confirmation/audit path; update smoke documentation.
Acceptance Criteria
- Merge/rebase states and actions are prominent in both layouts.
- Conflict rows remain first and continue explains resolve/stage prerequisites.
- Uppercase Y is required for recovery actions.
- Every result refreshes state and appears in repo-aware audit history.
- TUI remains responsive and restores the terminal.
Verification
- cargo fmt --all --check
- cargo clippy --locked --workspace --all-targets -- -D warnings
- cargo test --locked --workspace
- Manual temporary-repository merge/rebase smoke
Notes
Child of #14 and final Phase 12 slice.
Scope
Show active operation, unresolved count, and applicable continue/abort/rebase-skip actions in normal and compact layouts using the existing plan/preview/confirmation/audit path; update smoke documentation.
Acceptance Criteria
Verification
Notes
Child of #14 and final Phase 12 slice.