core/cli
8
0
Fork 0
Code Issues 5 Pull requests 1 Projects Releases Packages Wiki Activity Actions 1

Merge pull request '[agent/codex:gpt-5.4-mini] Read ~/spec/code/core/go/cli/RFC.md fully. Find features des...' (#74) from agent/read---spec-code-core-go-cli-rfc-md-full into dev
All checks were successful
Security Scan / security (push) Successful in 27s
Details

Browse source
This commit is contained in:
Virgil 2026-04-02 10:54:08 +00:00
commit 125d5e76a1
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
pkg/cli/utils.go
View file

@ -38,6 +38,14 @@ type confirmConfig struct {
timeout time.Duration timeout time.Duration
} }
func promptHint(msg string) {
fmt.Println(DimStyle.Render(compileGlyphs(msg)))
}
func promptWarning(msg string) {
fmt.Println(WarningStyle.Render(compileGlyphs(msg)))
}
// DefaultYes sets the default response to "yes" (pressing Enter confirms). // DefaultYes sets the default response to "yes" (pressing Enter confirms).
func DefaultYes() ConfirmOption { func DefaultYes() ConfirmOption {
return func(c *confirmConfig) { return func(c *confirmConfig) {
@ -137,7 +145,7 @@ func Confirm(prompt string, opts ...ConfirmOption) bool {
// Handle empty response // Handle empty response
if response == "" { if response == "" {
if readErr == nil && cfg.required { if readErr == nil && cfg.required {
fmt.Println("Please enter y or n, then press Enter.") promptHint("Please enter y or n, then press Enter.")
continue continue
} }
if cfg.required { if cfg.required {
@ -156,7 +164,7 @@ func Confirm(prompt string, opts ...ConfirmOption) bool {
// Invalid response // Invalid response
if cfg.required { if cfg.required {
fmt.Println("Please enter y or n, then press Enter.") promptHint("Please enter y or n, then press Enter.")
continue continue
} }
@ -250,7 +258,7 @@ func Question(prompt string, opts ...QuestionOption) string {
// Handle empty response // Handle empty response
if response == "" { if response == "" {
if cfg.required { if cfg.required {
fmt.Println("Please enter a value, then press Enter.") promptHint("Please enter a value, then press Enter.")
continue continue
} }
response = cfg.defaultValue response = cfg.defaultValue
@ -259,7 +267,7 @@ func Question(prompt string, opts ...QuestionOption) string {
// Validate if validator provided // Validate if validator provided
if cfg.validator != nil { if cfg.validator != nil {
if err := cfg.validator(response); err != nil { if err := cfg.validator(response); err != nil {
fmt.Printf("Invalid: %v\n", err) promptWarning(fmt.Sprintf("Invalid: %v", err))
continue continue
} }
} }
@ -375,10 +383,10 @@ func Choose[T any](prompt string, items []T, opts ...ChooseOption[T]) T {
return items[idx] return items[idx]
} }
if cfg.defaultN >= 0 { if cfg.defaultN >= 0 {
fmt.Printf("Default selection is not available in the current list. Narrow the list or choose another number.\n") promptHint("Default selection is not available in the current list. Narrow the list or choose another number.")
continue continue
} }
fmt.Printf("Please enter a number between 1 and %d.\n", len(visible)) promptHint(fmt.Sprintf("Please enter a number between 1 and %d.", len(visible)))
continue continue
} }
@ -394,14 +402,14 @@ func Choose[T any](prompt string, items []T, opts ...ChooseOption[T]) T {
if cfg.filter { if cfg.filter {
nextVisible := filterVisible(items, visible, response, cfg.displayFn) nextVisible := filterVisible(items, visible, response, cfg.displayFn)
if len(nextVisible) == 0 { if len(nextVisible) == 0 {
fmt.Printf("No matches for %q. Try a shorter search term or clear the filter.\n", response) promptHint(fmt.Sprintf("No matches for %q. Try a shorter search term or clear the filter.", response))
continue continue
} }
visible = nextVisible visible = nextVisible
continue continue
} }
fmt.Printf("Please enter a number between 1 and %d.\n", len(visible)) promptHint(fmt.Sprintf("Please enter a number between 1 and %d.", len(visible)))
} }
} }
@ -462,7 +470,7 @@ func ChooseMulti[T any](prompt string, items []T, opts ...ChooseOption[T]) []T {
return []T{items[idx]} return []T{items[idx]}
} }
if cfg.defaultN >= 0 { if cfg.defaultN >= 0 {
fmt.Printf("Default selection is not available in the current list. Narrow the list or choose another number.\n") promptHint("Default selection is not available in the current list. Narrow the list or choose another number.")
continue continue
} }
return nil return nil
@ -474,13 +482,13 @@ func ChooseMulti[T any](prompt string, items []T, opts ...ChooseOption[T]) []T {
if cfg.filter && !looksLikeMultiSelectionInput(response) { if cfg.filter && !looksLikeMultiSelectionInput(response) {
nextVisible := filterVisible(items, visible, response, cfg.displayFn) nextVisible := filterVisible(items, visible, response, cfg.displayFn)
if len(nextVisible) == 0 { if len(nextVisible) == 0 {
fmt.Printf("No matches for %q. Try a shorter search term or clear the filter.\n", response) promptHint(fmt.Sprintf("No matches for %q. Try a shorter search term or clear the filter.", response))
continue continue
} }
visible = nextVisible visible = nextVisible
continue continue
} }
fmt.Printf("Invalid selection %q: enter numbers like 1 3 or 1-3.\n", response) promptWarning(fmt.Sprintf("Invalid selection %q: enter numbers like 1 3 or 1-3.", response))
continue continue
} }