Single select for switch command to select a worktree to switch to

Author: shogs

cmd/input.go

@@ -370,3 +370,110 @@ func redrawMultiSelect(title string, items []MultiSelectItem, cursor int, totalL
 	}
 	fmt.Print(color.New(color.Faint).Sprint("↑/k up  ↓/j down  space select  enter confirm  q cancel"))
 }
+
+// promptSingleSelect displays a navigable single-select list
+// Navigation: arrow keys or hjkl, enter to select, q to cancel
+// Returns selected item, whether user confirmed (false if cancelled), error
+func promptSingleSelect(title string, items []string) (string, bool, error) {
+	if len(items) == 0 {
+		return "", false, fmt.Errorf("no items provided")
+	}
+
+	cursor := 0
+	totalLines := len(items) + 2 // title + items + help line
+
+	// Print initial display
+	printSingleSelect(title, items, cursor)
+
+	for {
+		// Get terminal into raw mode for reading input
+		oldState, err := term.MakeRaw(int(os.Stdin.Fd()))
+		if err != nil {
+			return "", false, fmt.Errorf("failed to set raw mode: %w", err)
+		}
+
+		// Read input
+		b := make([]byte, 3) // Up to 3 bytes for arrow keys
+		n, err := os.Stdin.Read(b)
+
+		// Restore terminal before processing
+		term.Restore(int(os.Stdin.Fd()), oldState)
+
+		if err != nil {
+			return "", false, fmt.Errorf("failed to read input: %w", err)
+		}
+
+		needsRedraw := false
+
+		// Handle input
+		if n == 1 {
+			switch b[0] {
+			case 'q', 27, 3: // q, ESC, or Ctrl+C
+				fmt.Println()
+				return "", false, nil
+			case '\r', '\n': // Enter - select current item
+				fmt.Println()
+				return items[cursor], true, nil
+			case 'k': // Vim up
+				if cursor > 0 {
+					cursor--
+					needsRedraw = true
+				}
+			case 'j': // Vim down
+				if cursor < len(items)-1 {
+					cursor++
+					needsRedraw = true
+				}
+			}
+		} else if n == 3 && b[0] == 27 && b[1] == 91 {
+			// Arrow keys: ESC [ A/B/C/D
+			switch b[2] {
+			case 65: // Up arrow
+				if cursor > 0 {
+					cursor--
+					needsRedraw = true
+				}
+			case 66: // Down arrow
+				if cursor < len(items)-1 {
+					cursor++
+					needsRedraw = true
+				}
+			}
+		}
+
+		if needsRedraw {
+			redrawSingleSelect(title, items, cursor, totalLines)
+		}
+	}
+}
+
+// printSingleSelect prints the initial single-select display
+func printSingleSelect(title string, items []string, cursor int) {
+	fmt.Println(title)
+	for i, item := range items {
+		prefix := "  "
+		if i == cursor {
+			prefix = color.CyanString("> ")
+		}
+		fmt.Printf("%s%s\n", prefix, item)
+	}
+	fmt.Print(color.New(color.Faint).Sprint("↑/k up  ↓/j down  enter select  q cancel"))
+}
+
+// redrawSingleSelect redraws the single-select display (called with terminal in normal mode)
+func redrawSingleSelect(title string, items []string, cursor int, totalLines int) {
+	// Move cursor up to the title line and clear to end of screen
+	fmt.Printf("\033[%dF", totalLines-1)
+	fmt.Print("\033[J")
+
+	// Redraw everything
+	fmt.Println(title)
+	for i, item := range items {
+		prefix := "  "
+		if i == cursor {
+			prefix = color.CyanString("> ")
+		}
+		fmt.Printf("%s%s\n", prefix, item)
+	}
+	fmt.Print(color.New(color.Faint).Sprint("↑/k up  ↓/j down  enter select  q cancel"))
+}

cmd/switch.go

@@ -14,16 +14,62 @@ var (
 )
 
 var switchCmd = &cobra.Command{
-	Use:   "switch <branch>",
+	Use:   "switch [branch]",
 	Short: "Switch to a worktree",
-	Long:  `Changes to the worktree directory for the specified branch.`,
-	Args:  cobra.ExactArgs(1),
+	Long:  `Changes to the worktree directory for the specified branch. If no branch specified, shows interactive selection.`,
+	Args:  cobra.MaximumNArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
 		if err := ensureGitRepo(); err != nil {
 			return err
 		}
 
-		branch := args[0]
+		var branch string
+
+		if len(args) == 0 {
+			// Interactive mode - show single-select
+			worktrees, err := getWorktrees()
+			if err != nil {
+				return fmt.Errorf("failed to get worktrees: %w", err)
+			}
+
+			// Get git root to filter out main worktree
+			gitRoot, err := getGitRoot()
+			if err != nil {
+				return fmt.Errorf("failed to get git root: %w", err)
+			}
+
+			// Build list of selectable worktrees (exclude main)
+			var items []string
+			for _, wt := range worktrees {
+				if wt.Path == gitRoot {
+					continue // Skip main worktree
+				}
+				if wt.Branch == "" {
+					continue // Skip detached worktrees
+				}
+				items = append(items, wt.Branch)
+			}
+
+			if len(items) == 0 {
+				fmt.Println("No worktrees available to switch to.")
+				return nil
+			}
+
+			// Show single-select
+			selected, confirmed, err := promptSingleSelect("Select worktree:", items)
+			if err != nil {
+				return fmt.Errorf("failed to get selection: %w", err)
+			}
+
+			if !confirmed {
+				fmt.Println("Cancelled.")
+				return nil
+			}
+
+			branch = selected
+		} else {
+			branch = args[0]
+		}
 
 		// Find worktree
 		wt, err := findWorktreeByBranch(branch)