Skip to content

Fix: Improve init confirmation prompts and API key validation #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thomas-vilte merged 1 commit into from
Jul 30, 2026
Merged

Fix: Improve init confirmation prompts and API key validation #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 29 additions & 8 deletions internal/commands/config/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ func runFullSetup(ctx context.Context, command *cli.Command, reader *bufio.Reade

printConfigSummary(cfg, t)

if ui.AskConfirmation(t.GetMessage("init.prompt_run_again", 0, nil)) {
if askConfirmation(reader, t.GetMessage("init.prompt_run_again", 0, nil)) {
return runFullSetup(ctx, command, reader, cfg, t)
}

Expand Down Expand Up @@ -163,7 +163,7 @@ func configureWelcome(ctx context.Context, reader *bufio.Reader, cfg *config.Con
if apiKey != "" {
if !validateGeminiAPIKey(ctx, apiKey, t) {
ui.PrintWarning(t.GetMessage("config.api_key_saved_unverified", 0, nil))
if ui.AskConfirmation(t.GetMessage("config.retry_api_key", 0, nil)) {
if askConfirmation(reader, t.GetMessage("config.retry_api_key", 0, nil)) {
return configureWelcome(ctx, reader, cfg, t)
}
}
Expand Down Expand Up @@ -230,7 +230,7 @@ func configureVCS(reader *bufio.Reader, cfg *config.Config, t *i18n.Translations

printSection(t.GetMessage("init.section_vcs", 0, nil))

if !ui.AskConfirmation(t.GetMessage("init.prompt_vcs_enable_blank_no", 0, struct{ Providers string }{vcsProvidersStr})) {
if !askConfirmation(reader, t.GetMessage("init.prompt_vcs_enable_blank_no", 0, struct{ Providers string }{vcsProvidersStr})) {
fmt.Println(t.GetMessage("init.info_vcs_skipped", 0, nil))
return nil
}
Expand Down Expand Up @@ -260,7 +260,7 @@ func configureVCS(reader *bufio.Reader, cfg *config.Config, t *i18n.Translations

if !isValid {
ui.PrintWarning(t.GetMessage("config.token_saved_unverified", 0, nil))
if ui.AskConfirmation(t.GetMessage("config.retry_token", 0, nil)) {
if askConfirmation(reader, t.GetMessage("config.retry_token", 0, nil)) {
continue
}
}
Expand All @@ -286,7 +286,7 @@ func configureTickets(reader *bufio.Reader, cfg *config.Config, t *i18n.Translat

printSection(t.GetMessage("init.section_tickets", 0, nil))

if !ui.AskConfirmation(t.GetMessage("init.prompt_ticket_enable_blank_no", 0, struct{ Providers string }{ticketProvidersStr})) {
if !askConfirmation(reader, t.GetMessage("init.prompt_ticket_enable_blank_no", 0, struct{ Providers string }{ticketProvidersStr})) {
disableTickets(cfg)
return nil
}
Expand All @@ -310,7 +310,7 @@ func configureTickets(reader *bufio.Reader, cfg *config.Config, t *i18n.Translat

if !isValidURL(jiraURL) {
ui.PrintWarning(t.GetMessage("init.warning_invalid_url", 0, nil))
if !ui.AskConfirmation(t.GetMessage("init.confirm_continue_anyway", 0, nil)) {
if !askConfirmation(reader, t.GetMessage("init.confirm_continue_anyway", 0, nil)) {
continue
}
}
Expand Down Expand Up @@ -351,7 +351,7 @@ func configureTickets(reader *bufio.Reader, cfg *config.Config, t *i18n.Translat

if !isValid {
ui.PrintWarning(t.GetMessage("config.jira_saved_unverified", 0, nil))
if ui.AskConfirmation(t.GetMessage("config.retry_jira", 0, nil)) {
if askConfirmation(reader, t.GetMessage("config.retry_jira", 0, nil)) {
continue
}
}
Expand Down Expand Up @@ -450,13 +450,22 @@ func validateGeminiAPIKey(ctx context.Context, apiKey string, t *i18n.Translatio
testCtx, cancel := context.WithTimeout(ctx, 10*time.Second)
defer cancel()

_, err := gemini.NewGeminiCommitSummarizer(testCtx, testCfg, nil)
summarizer, err := gemini.NewGeminiCommitSummarizer(testCtx, testCfg, nil)
if err != nil {
spinner.Error(t.GetMessage("config.api_key_invalid", 0, nil))
ui.PrintError(os.Stdout, t.GetMessage("config.check_api_key_error", 0, struct{ Error string }{err.Error()}))
return false
}

// Constructing the client above only validates the key locally (it never
// contacts the API), so an actual request is required to confirm the key
// is authorized — CountTokens is the cheapest real call available.
if _, err := summarizer.CountTokens(testCtx, "ping"); err != nil {
spinner.Error(t.GetMessage("config.api_key_invalid", 0, nil))
ui.PrintError(os.Stdout, t.GetMessage("config.check_api_key_error", 0, struct{ Error string }{err.Error()}))
return false
}

spinner.Success(t.GetMessage("config.api_key_valid", 0, nil))
return true
}
Expand Down Expand Up @@ -658,6 +667,18 @@ func printSection(title string) {
fmt.Println(title)
}

// askConfirmation mirrors ui.AskConfirmation but reads from the wizard's
// shared bufio.Reader instead of calling fmt.Scanln directly on os.Stdin.
// The init wizard interleaves buffered ReadString('\n') prompts with y/n
// confirmations; fmt.Scanln reads ahead independently of that buffer, so
// mixing the two desyncs stdin and misdelivers answers to the wrong prompt.
func askConfirmation(reader *bufio.Reader, question string) bool {
fmt.Printf("\n%s (y/n): ", ui.Info.Sprint(question))
line, _ := reader.ReadString('\n')
line = strings.ToLower(strings.TrimSpace(line))
return line == "y" || line == "yes" || line == "s" || line == "si"
}

func toStrings[T ~string](vals []T) []string {
out := make([]string, 0, len(vals))
for _, v := range vals {
Expand Down
3 changes: 1 addition & 2 deletions internal/commands/config/init_local.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (

"github.com/thomas-vilte/matecommit/internal/config"
"github.com/thomas-vilte/matecommit/internal/i18n"
"github.com/thomas-vilte/matecommit/internal/ui"
"github.com/urfave/cli/v3"
)

Expand Down Expand Up @@ -45,7 +44,7 @@ func runFullSetupLocal(ctx context.Context, command *cli.Command, reader *bufio.
printConfigSummary(cfg, t)
fmt.Println(t.GetMessage("config_local.saved_successfully", 0, nil))

if ui.AskConfirmation(t.GetMessage("init.prompt_run_again", 0, nil)) {
if askConfirmation(reader, t.GetMessage("init.prompt_run_again", 0, nil)) {
return runFullSetupLocal(ctx, command, reader, cfg, t)
}

Expand Down
Loading