Skip to content

[Phase 12] Wire conflict recovery actions into the TUI #56

Description

@cosentinode

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.

Metadata

Metadata

Assignees

No one assigned

    Labels

    guardrailsSafety, confirmations, policy, and destructive-operation preventionphaseImplementation phase or milestonepriority:highHigh priority worktuiTerminal user interface work

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions