Merge pull request '[agent/codex:gpt-5.4-mini] Read ~/spec/code/core/go/cli/RFC.md fully. Find features des...' (#54) from agent/read---spec-code-core-go-cli-rfc-md-full into dev
Some checks failed
Security Scan / security (push) Has been cancelled

This commit is contained in:
Virgil 2026-04-02 06:02:54 +00:00
commit 26abe44522
2 changed files with 27 additions and 5 deletions

View file

@ -68,6 +68,14 @@ func TestConfirm_Good(t *testing.T) {
assert.True(t, Confirm("Proceed?")) assert.True(t, Confirm("Proceed?"))
} }
func TestConfirm_Bad_EOFUsesDefault(t *testing.T) {
SetStdin(strings.NewReader(""))
defer SetStdin(nil)
assert.False(t, Confirm("Proceed?", Required()))
assert.True(t, Confirm("Proceed?", DefaultYes(), Required()))
}
func TestQuestion_Good(t *testing.T) { func TestQuestion_Good(t *testing.T) {
SetStdin(strings.NewReader("alice\n")) SetStdin(strings.NewReader("alice\n"))
defer SetStdin(nil) defer SetStdin(nil)
@ -76,6 +84,14 @@ func TestQuestion_Good(t *testing.T) {
assert.Equal(t, "alice", val) assert.Equal(t, "alice", val)
} }
func TestQuestion_Bad_EOFReturnsDefault(t *testing.T) {
SetStdin(strings.NewReader(""))
defer SetStdin(nil)
assert.Equal(t, "anonymous", Question("Name:", WithDefault("anonymous")))
assert.Equal(t, "", Question("Name:", RequiredInput()))
}
func TestChoose_Good_DefaultIndex(t *testing.T) { func TestChoose_Good_DefaultIndex(t *testing.T) {
SetStdin(strings.NewReader("\n")) SetStdin(strings.NewReader("\n"))
defer SetStdin(nil) defer SetStdin(nil)

View file

@ -119,14 +119,18 @@ func Confirm(prompt string, opts ...ConfirmOption) bool {
return cfg.defaultYes return cfg.defaultYes
} }
} else { } else {
response, _ = reader.ReadString('\n') line, err := reader.ReadString('\n')
if err != nil && line == "" {
return cfg.defaultYes
}
response = line
response = strings.ToLower(strings.TrimSpace(response)) response = strings.ToLower(strings.TrimSpace(response))
} }
// Handle empty response // Handle empty response
if response == "" { if response == "" {
if cfg.required { if cfg.required {
continue // Ask again return cfg.defaultYes
} }
return cfg.defaultYes return cfg.defaultYes
} }
@ -224,14 +228,16 @@ func Question(prompt string, opts ...QuestionOption) string {
fmt.Printf("%s ", prompt) fmt.Printf("%s ", prompt)
} }
response, _ := reader.ReadString('\n') response, err := reader.ReadString('\n')
response = strings.TrimSpace(response) response = strings.TrimSpace(response)
if err != nil && response == "" {
return cfg.defaultValue
}
// Handle empty response // Handle empty response
if response == "" { if response == "" {
if cfg.required { if cfg.required {
fmt.Println("Response required") return cfg.defaultValue
continue
} }
response = cfg.defaultValue response = cfg.defaultValue
} }