🔧 Git Operations UX Overhaul

[vasconceloscezar]

Summary

Comprehensive improvement to git operations transparency and usability. Multiple team feedbacks highlighted confusion around merge behavior, PR workflows, conflict handling, and pre-commit integration.

Problems Identified

1. Local Merge Confusion (High Priority)

Current: "Approve and Merge" performs LOCAL merge but UI doesn't clarify this.
Impact: Users don't know they still need to push to remote.

Solution:

• Rename button to "Merge Local" or add clear tooltip
• Confirmation dialog: "This merge is LOCAL to branch 'dev'"
• Show commits count and files changed before merge
• Post-merge toast with commit SHA and "Push Now" option

2. PR Button Dual Behavior

Current: Same button does "Create PR" (no PR) or "Push to PR" (has PR).
Impact: Users can't tell which action will occur.

Solution:

• Separate into "Create Pull Request" and "Update PR 123"
• Show PR badge with number and status when PR exists
• Real-time status updates

3. No Conflict Resolution Guidance

Current: Conflicts detected and shown, but no help resolving them.

Solution:

• Clear step-by-step resolution instructions
• Option to initiate guided rebase
• Preview of conflicting files with diff view
• "Resolve in Editor" quick action

4. Pre-commit Hook Handling (High Priority)

Current: Pre-commit failures cause task to enter "limbo" state. No feedback to LLM.
Impact: Tasks get stuck, user doesn't know what happened, no self-healing.

Solution:

• Show progress indicator during hook execution
• Surface hook errors clearly in UI
• Feed failure details back to LLM for auto-fix attempt
• Clear status throughout the process

5. Git Actions Visibility

Current: Git operations hidden and hard to discover.
Reference: VSCode/Windsurf source control panel as better UX.

Solution:

• Clearer staging area (which files to stage)
• Visual diff before commit
• Pull/push/sync status always visible
• Branch status at a glance

Acceptance Criteria

• Merge dialog shows "LOCAL" warning and commit details
• PR buttons clearly separated based on state
• Conflict resolution has guided workflow
• Pre-commit failures shown with option for LLM retry
• Git status visible without opening task details

Related Issues

• ✨ Feature: Git Pull/Push Remote Operations #244 (Git Pull/Push Remote Operations)

Team Feedback Sources

• Feedback 1: Issue docs: refresh upstream divergence analysis #5 (pre-commit handling)
• Feedback 2: Issues feat: add Dracula theme and animated anvil component #2, Merge upstream vibe-kanban updates (76 commits) #3, zero-shot-feature-attempt-codex (automagik-forge) #4 (merge, PR, conflicts)
• Feedback 6: Git actions visibility

Priority

🔴 P0 - High (5/6 feedbacks mentioned git-related pain points)