test message

Author: bmf-san

cmd/interactive.go

@@ -53,6 +53,7 @@ func NewUI() *UI {
 }
 
 var commands = []CommandInfo{
+	{"help", "Show help message"},
 	{"add <file>", "Add a specific file to the index"},
 	{"add .", "Add all changes to index"},
 	{"add -p", "Add changes interactively"},
@@ -100,9 +101,9 @@ var commands = []CommandInfo{
 	{"status short", "Show concise status (porcelain format)"},
 	{"rebase interactive", "Interactive rebase"},
 	{"remote list", "List all remote repositories"},
-	{"remote add <name> <url>", "Add remote repository"},
-	{"remote remove <name>", "Remove remote repository"},
-	{"remote set-url <name> <url>", "Change remote URL"},
+	{"remote add <n> <url>", "Add remote repository"},
+	{"remote remove <n>", "Remove remote repository"},
+	{"remote set-url <n> <url>", "Change remote URL"},
 	{"quit", "Exit interactive mode"},
 }
 
@@ -115,33 +116,36 @@ func InteractiveUI() []string {
 
 // Run executes the interactive UI
 func (ui *UI) Run() []string {
-	fd := int(os.Stdin.Fd())
-	oldState, err := ui.term.makeRaw(fd)
-	if err != nil {
-		fmt.Fprintln(ui.stderr, "Failed to set terminal to raw mode:", err)
-		return nil
-	}
-	defer func() {
-		if err := ui.term.restore(fd, oldState); err != nil {
-			fmt.Fprintln(ui.stderr, "failed to restore terminal state:", err)
+	// ターミナルの生モード設定は標準入力がターミナルの場合のみ行う
+	var oldState *term.State
+	if f, ok := ui.stdin.(*os.File); ok {
+		fd := int(f.Fd())
+		var err error
+		oldState, err = ui.term.makeRaw(fd)
+		if err != nil {
+			fmt.Fprintln(ui.stderr, "Failed to set terminal to raw mode:", err)
+			return nil
 		}
-	}()
+		defer func() {
+			if err := ui.term.restore(fd, oldState); err != nil {
+				fmt.Fprintln(ui.stderr, "failed to restore terminal state:", err)
+			}
+		}()
+	}
 
 	reader := bufio.NewReader(ui.stdin)
 	selected := 0
 	input := ""
 
 	for {
-		if _, err := fmt.Fprint(ui.stdout, "\033[H\033[2J\033[H"); err != nil {
-			fmt.Fprintln(ui.stderr, "failed to write clear screen sequence:", err)
-		}
+		fmt.Fprint(ui.stdout, "\033[H\033[2J\033[H") // Clear screen
 		fmt.Fprintf(ui.stdout, "Select a command (incremental search: type to filter, ctrl+n: down, ctrl+p: up, enter: execute, ctrl+c: quit)\n")
 		fmt.Fprintf(ui.stdout, "\rSearch: %s\n\n", input)
 
 		// Filtering
 		filtered := []CommandInfo{}
 		for _, cmd := range commands {
-			if strings.Contains(cmd.Command, input) {
+			if strings.HasPrefix(cmd.Command, input) {
 				filtered = append(filtered, cmd)
 			}
 		}
@@ -182,11 +186,18 @@ func (ui *UI) Run() []string {
 
 		b, err := reader.ReadByte()
 		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
 			continue
 		}
 		if b == 3 { // Ctrl+C in raw mode
-			if err := ui.term.restore(fd, oldState); err != nil {
-				fmt.Fprintln(ui.stderr, "failed to restore terminal state:", err)
+			if oldState != nil {
+				if f, ok := ui.stdin.(*os.File); ok {
+					if err := ui.term.restore(int(f.Fd()), oldState); err != nil {
+						fmt.Fprintln(ui.stderr, "failed to restore terminal state:", err)
+					}
+				}
 			}
 			fmt.Fprintln(ui.stdout, "\nExiting...")
 			os.Exit(0)
@@ -196,8 +207,12 @@ func (ui *UI) Run() []string {
 			}
 			if len(filtered) > 0 {
 				fmt.Fprintf(ui.stdout, "\nExecute: %s\n", filtered[selected].Command)
-				if err := ui.term.restore(fd, oldState); err != nil {
-					fmt.Fprintln(ui.stderr, "failed to restore terminal state:", err)
+				if oldState != nil {
+					if f, ok := ui.stdin.(*os.File); ok {
+						if err := ui.term.restore(int(f.Fd()), oldState); err != nil {
+							fmt.Fprintln(ui.stderr, "failed to restore terminal state:", err)
+						}
+					}
 				}
 				// Placeholder detection
 				cmdTemplate := filtered[selected].Command

cmd/interactive_test.go

@@ -60,13 +60,13 @@ func TestUI_Run(t *testing.T) {
 		},
 		{
 			name:         "helpと入力してEnterを押した場合",
-			input:        []byte("help\r"),
+			input:        []byte{'h', 'e', 'l', 'p', 13}, // 'h','e','l','p' + Enter
 			expectedArgs: []string{"ggc", "help"},
 			expectNil:    false,
 		},
 		{
 			name:      "存在しないコマンドを入力した場合",
-			input:     []byte("nonexistent\r"),
+			input:     []byte{'x', 'y', 'z', 13}, // 'x','y','z' + Enter
 			expectNil: true,
 		},
 	}