feat: tone down worktrees UI in TUI implementation

Skip the branch warning dialog entirely when there are no conflicts
(not on a protected branch and no other PRD running in the same
directory). For protected branches, recommend "Create branch only"
instead of worktrees. Remove the "(current directory)" label from
the picker for entries without branches.

https://claude.ai/code/session_01V27fcymZwAuZxwfqDtUxM8

Author: claude

internal/tui/app.go

@@ -629,16 +629,19 @@ func (a App) startLoopForPRD(prdName string) (tea.Model, tea.Cmd) {
 	isProtected := git.IsProtectedBranch(branch)
 	anotherRunningInSameDir := a.isAnotherPRDRunningInSameDir(prdName)
 
+	if !isProtected && !anotherRunningInSameDir {
+		// No conflicts: skip the dialog entirely and start the loop directly
+		return a.doStartLoop(prdName, prdDir)
+	}
+
 	var dialogCtx DialogContext
 	if isProtected {
 		dialogCtx = DialogProtectedBranch
-	} else if anotherRunningInSameDir {
-		dialogCtx = DialogAnotherPRDRunning
 	} else {
-		dialogCtx = DialogNoConflicts
+		dialogCtx = DialogAnotherPRDRunning
 	}
 
-	// Show the enhanced dialog
+	// Show the dialog only for protected branch or another PRD running
 	a.branchWarning.SetSize(a.width, a.height)
 	a.branchWarning.SetContext(branch, prdName, relWorktreePath)
 	a.branchWarning.SetDialogContext(dialogCtx)

internal/tui/branch_warning.go

@@ -84,15 +84,15 @@ func (b *BranchWarning) buildOptions() {
 	case DialogProtectedBranch:
 		b.options = []dialogOption{
 			{
-				label:       "Create worktree + branch",
-				hint:        b.worktreePath,
+				label:       "Create branch only",
+				hint:        "./ (current directory)",
 				recommended: true,
-				option:      BranchOptionCreateWorktree,
+				option:      BranchOptionCreateBranch,
 			},
 			{
-				label:  "Create branch only",
-				hint:   "./ (current directory)",
-				option: BranchOptionCreateBranch,
+				label:  "Create worktree + branch",
+				hint:   b.worktreePath,
+				option: BranchOptionCreateWorktree,
 			},
 			{
 				label:  fmt.Sprintf("Continue on %s", b.currentBranch),
@@ -289,7 +289,7 @@ func (b *BranchWarning) renderHeader(content *strings.Builder, modalWidth int) {
 		messageStyle := lipgloss.NewStyle().Foreground(TextColor)
 		content.WriteString(messageStyle.Render(fmt.Sprintf("You are on the '%s' branch.", b.currentBranch)))
 		content.WriteString("\n")
-		content.WriteString(messageStyle.Render("It's recommended to isolate work in a worktree."))
+		content.WriteString(messageStyle.Render("It's recommended to create a separate branch."))
 		content.WriteString("\n\n")
 
 	case DialogAnotherPRDRunning:

internal/tui/branch_warning_test.go

@@ -16,22 +16,22 @@ func TestBranchWarningProtectedBranch(t *testing.T) {
 		t.Fatalf("expected 4 options for protected branch, got %d", len(bw.options))
 	}
 
-	// First option should be "Create worktree + branch" (recommended)
-	if bw.options[0].option != BranchOptionCreateWorktree {
-		t.Errorf("expected first option to be CreateWorktree, got %v", bw.options[0].option)
+	// First option should be "Create branch only" (recommended)
+	if bw.options[0].option != BranchOptionCreateBranch {
+		t.Errorf("expected first option to be CreateBranch, got %v", bw.options[0].option)
 	}
 	if !bw.options[0].recommended {
 		t.Error("expected first option to be recommended")
 	}
 
 	// Default selection should be first option
-	if bw.GetSelectedOption() != BranchOptionCreateWorktree {
-		t.Errorf("expected default selection to be CreateWorktree, got %v", bw.GetSelectedOption())
+	if bw.GetSelectedOption() != BranchOptionCreateBranch {
+		t.Errorf("expected default selection to be CreateBranch, got %v", bw.GetSelectedOption())
 	}
 
-	// Second option should be "Create branch only"
-	if bw.options[1].option != BranchOptionCreateBranch {
-		t.Errorf("expected second option to be CreateBranch, got %v", bw.options[1].option)
+	// Second option should be "Create worktree + branch"
+	if bw.options[1].option != BranchOptionCreateWorktree {
+		t.Errorf("expected second option to be CreateWorktree, got %v", bw.options[1].option)
 	}
 
 	// Third option should be "Continue on main"
@@ -209,11 +209,11 @@ func TestBranchWarningPathHints(t *testing.T) {
 	bw.SetDialogContext(DialogProtectedBranch)
 
 	// Check that options have correct path hints
-	if bw.options[0].hint != ".chief/worktrees/auth/" {
-		t.Errorf("expected worktree path hint, got %q", bw.options[0].hint)
+	if bw.options[0].hint != "./ (current directory)" {
+		t.Errorf("expected current dir hint for branch only, got %q", bw.options[0].hint)
 	}
-	if bw.options[1].hint != "./ (current directory)" {
-		t.Errorf("expected current dir hint for branch only, got %q", bw.options[1].hint)
+	if bw.options[1].hint != ".chief/worktrees/auth/" {
+		t.Errorf("expected worktree path hint, got %q", bw.options[1].hint)
 	}
 	if bw.options[2].hint != "./ (current directory)" {
 		t.Errorf("expected current dir hint for continue, got %q", bw.options[2].hint)

internal/tui/picker.go

@@ -604,13 +604,6 @@ func (p *PRDPicker) renderEntry(entry PRDEntry, selected bool, width int) string
 				infoStr := p.formatBranchPath(branchStr, pathStr, remaining)
 				line.WriteString(branchPathStyle.Render(infoStr))
 			}
-		} else if entry.Branch == "" && p.hasAnyBranch() {
-			// If other entries have branches, show "(current directory)" for alignment
-			branchPathStyle := lipgloss.NewStyle().Foreground(MutedColor)
-			remaining := width - 32
-			if remaining > 20 {
-				line.WriteString(branchPathStyle.Render("  (current directory)"))
-			}
 		}
 	}
 
@@ -673,16 +666,6 @@ func (p *PRDPicker) formatBranchPath(branch, path string, maxWidth int) string {
 	return prefix + string(branchRunes)
 }
 
-// hasAnyBranch returns true if any entry has a branch set.
-func (p *PRDPicker) hasAnyBranch() bool {
-	for _, entry := range p.entries {
-		if entry.Branch != "" {
-			return true
-		}
-	}
-	return false
-}
-
 // renderLoopStateIndicator renders a visual indicator for the loop state.
 func (p *PRDPicker) renderLoopStateIndicator(entry PRDEntry) string {
 	switch entry.LoopState {

internal/tui/picker_test.go

@@ -64,7 +64,7 @@ func TestRenderEntryNoBranch(t *testing.T) {
 	}
 }
 
-func TestRenderEntryNoBranchShowsCurrentDirectoryWhenOthersHaveBranch(t *testing.T) {
+func TestRenderEntryNoBranchOmitsCurrentDirectoryLabel(t *testing.T) {
 	p := &PRDPicker{
 		basePath:   "/project",
 		currentPRD: "",
@@ -87,10 +87,10 @@ func TestRenderEntryNoBranchShowsCurrentDirectoryWhenOthersHaveBranch(t *testing
 		},
 	}
 
-	// Render the entry without a branch — should show "(current directory)" since another has a branch
+	// Render the entry without a branch — should NOT show "(current directory)" to keep worktrees low-key
 	result := p.renderEntry(p.entries[0], false, 80)
-	if !containsText(result, "(current directory)") {
-		t.Errorf("expected '(current directory)' for branchless entry when others have branches, got: %s", result)
+	if containsText(result, "(current directory)") {
+		t.Errorf("expected no '(current directory)' label for branchless entry, got: %s", result)
 	}
 }
 
@@ -176,28 +176,6 @@ func TestWorktreeDisplayPathWithoutWorktree(t *testing.T) {
 	}
 }
 
-func TestHasAnyBranch(t *testing.T) {
-	p := &PRDPicker{
-		entries: []PRDEntry{
-			{Name: "a", Branch: ""},
-			{Name: "b", Branch: "chief/b"},
-		},
-	}
-	if !p.hasAnyBranch() {
-		t.Error("expected hasAnyBranch() to return true when one entry has a branch")
-	}
-
-	p2 := &PRDPicker{
-		entries: []PRDEntry{
-			{Name: "a", Branch: ""},
-			{Name: "c", Branch: ""},
-		},
-	}
-	if p2.hasAnyBranch() {
-		t.Error("expected hasAnyBranch() to return false when no entries have branches")
-	}
-}
-
 func TestRenderEntryWithLoadError(t *testing.T) {
 	p := &PRDPicker{
 		basePath: "/project",