Skip to content

Remove direct gh pr merge from TUI — daemon handles merging #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bearmug merged 1 commit into from
Mar 17, 2026
Merged

Remove direct gh pr merge from TUI — daemon handles merging #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
121 changes: 25 additions & 96 deletions tui/internal/tui/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,9 @@ type Model struct {
glowDir int // 1 or -1 for ping-pong
inputMode bool // text input active (for + add PR)
inputBuffer string // text being typed
mergePickerVisible bool // merge strategy picker showing
mergePickerPR *client.TrackedPR // PR being merged (may be nil for config-only mode)
mergePickerPRKey string // "owner/repo#N" — used for SetMergeMethod
mergePickerForConfig bool // true when picker is for configuring method (new repo), not immediate merge
mergePickerVisible bool // merge method picker showing
mergePickerPR *client.TrackedPR // PR being configured (for display)
mergePickerPRKey string // "owner/repo#N" — used for SetMergeMethod
scrollOffset int // scroll position in zoom body
}

Expand Down Expand Up @@ -240,7 +239,6 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
}
m.mergePickerPR = found
m.mergePickerPRKey = msg.prKey
m.mergePickerForConfig = true
m.mergePickerVisible = true
return m, nil
}
Expand Down Expand Up @@ -504,126 +502,63 @@ end tell`, tabIdx, tabIdx)
}

case "m":
// Merge selected PR — show merge strategy picker (immediate merge + persist).
// Set merge method for selected PR — daemon handles the actual merge.
if pr := m.selectedPR(); pr != nil {
m.mergePickerPR = pr
m.mergePickerPRKey = prKey(pr)
m.mergePickerForConfig = false
m.mergePickerVisible = true
return m, nil
}

case "M":
// Change merge method for selected PR — picker in config-only mode.
if pr := m.selectedPR(); pr != nil {
m.mergePickerPR = pr
m.mergePickerPRKey = prKey(pr)
m.mergePickerForConfig = true
m.mergePickerVisible = true
return m, nil
}

case "1":
// Merge picker: squash automerge.
if m.mergePickerVisible && (m.mergePickerPR != nil || m.mergePickerForConfig) {
pr := m.mergePickerPR
// Merge picker: squash.
if m.mergePickerVisible {
key := m.mergePickerPRKey
forConfig := m.mergePickerForConfig
m.mergePickerVisible = false
m.mergePickerPR = nil
m.mergePickerPRKey = ""
m.mergePickerForConfig = false
return m, func() tea.Msg {
_ = m.client.SetMergeMethod(key, "squash")
if forConfig {
return actionResultMsg{action: "merge method set: squash"}
}
err := exec.Command("gh", "pr", "merge",
fmt.Sprintf("%d", pr.Number),
"--repo", fmt.Sprintf("%s/%s", pr.Owner, pr.Repo),
"--squash", "--auto").Run()
if err != nil {
return actionResultMsg{action: "squash merge", err: err}
}
return actionResultMsg{action: "squash automerge enabled"}
return actionResultMsg{action: "merge method: squash"}
}
}

case "2":
// Merge picker: rebase automerge.
if m.mergePickerVisible && (m.mergePickerPR != nil || m.mergePickerForConfig) {
pr := m.mergePickerPR
// Merge picker: rebase.
if m.mergePickerVisible {
key := m.mergePickerPRKey
forConfig := m.mergePickerForConfig
m.mergePickerVisible = false
m.mergePickerPR = nil
m.mergePickerPRKey = ""
m.mergePickerForConfig = false
return m, func() tea.Msg {
_ = m.client.SetMergeMethod(key, "rebase")
if forConfig {
return actionResultMsg{action: "merge method set: rebase"}
}
err := exec.Command("gh", "pr", "merge",
fmt.Sprintf("%d", pr.Number),
"--repo", fmt.Sprintf("%s/%s", pr.Owner, pr.Repo),
"--rebase", "--auto").Run()
if err != nil {
return actionResultMsg{action: "rebase merge", err: err}
}
return actionResultMsg{action: "rebase automerge enabled"}
return actionResultMsg{action: "merge method: rebase"}
}
}

case "3":
// Merge picker: Aviator merge queue.
if m.mergePickerVisible && (m.mergePickerPR != nil || m.mergePickerForConfig) {
pr := m.mergePickerPR
// Merge picker: Aviator.
if m.mergePickerVisible {
key := m.mergePickerPRKey
forConfig := m.mergePickerForConfig
m.mergePickerVisible = false
m.mergePickerPR = nil
m.mergePickerPRKey = ""
m.mergePickerForConfig = false
return m, func() tea.Msg {
_ = m.client.SetMergeMethod(key, "aviator")
if forConfig {
return actionResultMsg{action: "merge method set: aviator"}
}
err := exec.Command("gh", "pr", "comment",
fmt.Sprintf("%d", pr.Number),
"--repo", fmt.Sprintf("%s/%s", pr.Owner, pr.Repo),
"--body", "/aviator merge").Run()
if err != nil {
return actionResultMsg{action: "aviator merge", err: err}
}
return actionResultMsg{action: "aviator merge queued"}
return actionResultMsg{action: "merge method: aviator"}
}
}

case "4":
// Merge picker: merge commit automerge.
if m.mergePickerVisible && (m.mergePickerPR != nil || m.mergePickerForConfig) {
pr := m.mergePickerPR
// Merge picker: merge commit.
if m.mergePickerVisible {
key := m.mergePickerPRKey
forConfig := m.mergePickerForConfig
m.mergePickerVisible = false
m.mergePickerPR = nil
m.mergePickerPRKey = ""
m.mergePickerForConfig = false
return m, func() tea.Msg {
_ = m.client.SetMergeMethod(key, "merge")
if forConfig {
return actionResultMsg{action: "merge method set: merge commit"}
}
err := exec.Command("gh", "pr", "merge",
fmt.Sprintf("%d", pr.Number),
"--repo", fmt.Sprintf("%s/%s", pr.Owner, pr.Repo),
"--merge", "--auto").Run()
if err != nil {
return actionResultMsg{action: "merge commit", err: err}
}
return actionResultMsg{action: "merge commit automerge enabled"}
return actionResultMsg{action: "merge method: merge commit"}
}
}

Expand All @@ -632,7 +567,6 @@ end tell`, tabIdx, tabIdx)
m.mergePickerVisible = false
m.mergePickerPR = nil
m.mergePickerPRKey = ""
m.mergePickerForConfig = false
} else if m.inputMode {
m.inputMode = false
m.inputBuffer = ""
Expand Down Expand Up @@ -751,27 +685,22 @@ func (m Model) View() string {

bottomHeight := stripHeight + hintsHeight

// Merge strategy picker overlay.
if m.mergePickerVisible && (m.mergePickerPR != nil || m.mergePickerForConfig) {
// Merge method picker overlay.
if m.mergePickerVisible {
var header string
if m.mergePickerForConfig {
if m.mergePickerPR != nil {
pr := m.mergePickerPR
header = fmt.Sprintf(" Set merge method for #%d %s\n", pr.Number, pr.Title)
} else {
header = fmt.Sprintf(" Set merge method for %s\n", m.mergePickerPRKey)
}
} else {
if m.mergePickerPR != nil {
pr := m.mergePickerPR
header = fmt.Sprintf(" Merge #%d %s\n", pr.Number, pr.Title)
header = fmt.Sprintf(" Set merge method for #%d %s\n", pr.Number, pr.Title)
} else {
header = fmt.Sprintf(" Set merge method for %s\n", m.mergePickerPRKey)
}
picker := lipgloss.NewStyle().Padding(1, 2).Render(
styleZoomHeader.Render(header) + "\n" +
lipgloss.NewStyle().Foreground(colorFg).Render(
" [1] Squash automerge\n"+
" [2] Rebase automerge\n"+
" [1] Squash\n"+
" [2] Rebase\n"+
" [3] Aviator merge queue\n"+
" [4] Merge commit automerge\n"+
" [4] Merge commit\n"+
" [Esc] Cancel"))

return lipgloss.JoinVertical(lipgloss.Left,
Expand Down
5 changes: 2 additions & 3 deletions tui/internal/tui/hints.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ func renderHints(queueVisible bool, hasPending bool, isPRSelected bool, width in
// PR-specific hints.
keys = append(keys, hint{"Enter", "open PR"})
keys = append(keys, hint{"a", "autopilot"})
keys = append(keys, hint{"m", "merge"})
keys = append(keys, hint{"M", "set method"})
keys = append(keys, hint{"m", "method"})
keys = append(keys, hint{"+", "add PR"})
keys = append(keys, hint{"-", "remove"})
} else {
Expand Down Expand Up @@ -110,7 +109,7 @@ func renderHelp(width, height, scrollOffset int) string {
{"a", "Cycle PR autopilot: OFF → AUTO → YOLO"},
{"+", "Add PR to tracking (paste URL)"},
{"-", "Remove selected PR"},
{"m", "Merge — pick strategy"},
{"m", "Set merge method (daemon handles actual merge)"},
{"o", "Open PR in browser"},
{"", ""},
{"h", "Toggle this help screen"},
Expand Down
4 changes: 2 additions & 2 deletions tui/internal/tui/hints_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ func TestRenderHints_MergedNavigate(t *testing.T) {
func TestRenderHints_PRSelected(t *testing.T) {
out := renderHints(false, false, true, 200)
// Should show PR-specific hints.
if !strings.Contains(out, "merge") {
t.Error("PR selected: hints should contain 'merge'")
if !strings.Contains(out, "method") {
t.Error("PR selected: hints should contain 'method'")
}
if !strings.Contains(out, "add PR") {
t.Error("PR selected: hints should contain 'add PR'")
Expand Down
Loading