Address review comments

Author: gtsiolis

cmd/root.go

@@ -122,10 +122,8 @@ func startEmulator(ctx context.Context, rt runtime.Runtime, cfg *env.Env, tel *t
 	}
 
 	notifyOpts := update.NotifyOptions{
-		GitHubToken:        cfg.GitHubToken,
-		UpdatePrompt:       appConfig.CLI.UpdatePrompt,
-		SkippedVersion:     appConfig.CLI.UpdateSkippedVersion,
-		PersistSkipVersion: config.SetUpdateSkippedVersion,
+		GitHubToken:  cfg.GitHubToken,
+		UpdatePrompt: appConfig.CLI.UpdatePrompt,
 	}
 
 	if isInteractiveMode(cfg) {

internal/config/config.go

@@ -14,8 +14,7 @@ import (
 var defaultConfigTemplate string
 
 type CLIConfig struct {
-	UpdatePrompt         bool   `mapstructure:"update_prompt"`
-	UpdateSkippedVersion string `mapstructure:"update_skipped_version"`
+	UpdatePrompt bool `mapstructure:"update_prompt"`
 }
 
 type Config struct {
@@ -33,7 +32,6 @@ func setDefaults() {
 		},
 	})
 	viper.SetDefault("cli.update_prompt", true)
-	viper.SetDefault("cli.update_skipped_version", "")
 }
 
 func loadConfig(path string) error {
@@ -119,14 +117,6 @@ func DisableUpdatePrompt() error {
 	return Set("cli.update_prompt", false)
 }
 
-func SetUpdateSkippedVersion(version string) error {
-	return Set("cli.update_skipped_version", version)
-}
-
-func GetUpdateSkippedVersion() string {
-	return viper.GetString("cli.update_skipped_version")
-}
-
 func Get() (*Config, error) {
 	var cfg Config
 	if err := viper.Unmarshal(&cfg); err != nil {
@@ -135,9 +125,6 @@ func Get() (*Config, error) {
 	if !viper.InConfig("cli.update_prompt") && viper.InConfig("update_prompt") {
 		cfg.CLI.UpdatePrompt = viper.GetBool("update_prompt")
 	}
-	if !viper.InConfig("cli.update_skipped_version") && viper.InConfig("update_skipped_version") {
-		cfg.CLI.UpdateSkippedVersion = viper.GetString("update_skipped_version")
-	}
 	for i := range cfg.Containers {
 		if err := cfg.Containers[i].Validate(); err != nil {
 			return nil, fmt.Errorf("invalid container config: %w", err)

internal/config/default_config.toml

@@ -1,10 +1,6 @@
 # lstk configuration file
 # Run 'lstk config path' to see where this file lives.
 
-# CLI settings
-[cli]
-update_prompt = true
-
 # Each [[containers]] block defines an emulator instance.
 # You can define multiple to run them side by side.
 [[containers]]

internal/output/events.go

@@ -122,6 +122,7 @@ type UserInputRequestEvent struct {
 	Prompt     string
 	Options    []InputOption
 	ResponseCh chan<- InputResponse
+	Vertical   bool
 }
 
 const (

internal/ui/app.go

@@ -95,25 +95,8 @@ func (a App) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			return a, tea.Quit
 		}
 		if a.pendingInput != nil {
-			if componentsUsesVerticalPrompt(a.inputPrompt, a.pendingInput.Options) {
-				switch msg.Type {
-				case tea.KeyUp:
-					a.inputPrompt = a.inputPrompt.SetSelectedIndex(a.inputPrompt.SelectedIndex() - 1)
-					return a, nil
-				case tea.KeyDown:
-					a.inputPrompt = a.inputPrompt.SetSelectedIndex(a.inputPrompt.SelectedIndex() + 1)
-					return a, nil
-				case tea.KeyEnter:
-					idx := a.inputPrompt.SelectedIndex()
-					if idx >= 0 && idx < len(a.pendingInput.Options) {
-						opt := a.pendingInput.Options[idx]
-						a.lines = appendLine(a.lines, styledLine{text: formatResolvedInput(*a.pendingInput, opt.Key)})
-						responseCmd := sendInputResponseCmd(a.pendingInput.ResponseCh, output.InputResponse{SelectedKey: opt.Key})
-						a.pendingInput = nil
-						a.inputPrompt = a.inputPrompt.Hide()
-						return a, responseCmd
-					}
-				}
+			if a.pendingInput.Vertical {
+				return a.handleVerticalPromptKey(msg)
 			}
 			if opt := resolveOption(a.pendingInput.Options, msg); opt != nil {
 				a.lines = appendLine(a.lines, styledLine{text: formatResolvedInput(*a.pendingInput, opt.Key)})
@@ -130,7 +113,7 @@ func (a App) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		if a.spinner.Visible() {
 			a.spinner = a.spinner.SetText(output.FormatPrompt(msg.Prompt, msg.Options))
 		} else {
-			a.inputPrompt = a.inputPrompt.Show(msg.Prompt, msg.Options)
+			a.inputPrompt = a.inputPrompt.Show(msg.Prompt, msg.Options, msg.Vertical)
 		}
 	case spinner.TickMsg:
 		var cmd tea.Cmd
@@ -315,20 +298,36 @@ func (a *App) flushBufferedLines() {
 	a.bufferedLines = nil
 }
 
-func formatResolvedInput(req output.UserInputRequestEvent, selectedKey string) string {
-	// Special handling for lstk update prompt
-	if len(req.Options) > 0 && strings.Contains(req.Options[0].Label, "Update now") {
-		checkmark := styles.Success.Render(output.SuccessMarker())
-		switch selectedKey {
-		case "u":
-			return checkmark + " Updating lstk..."
-		case "s":
-			return checkmark + " Skipped this version"
-		case "n":
-			return checkmark + " Won't ask again"
+func (a App) handleVerticalPromptKey(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
+	switch msg.Type {
+	case tea.KeyUp:
+		a.inputPrompt = a.inputPrompt.SetSelectedIndex(a.inputPrompt.SelectedIndex() - 1)
+		return a, nil
+	case tea.KeyDown:
+		a.inputPrompt = a.inputPrompt.SetSelectedIndex(a.inputPrompt.SelectedIndex() + 1)
+		return a, nil
+	case tea.KeyEnter:
+		idx := a.inputPrompt.SelectedIndex()
+		if idx >= 0 && idx < len(a.pendingInput.Options) {
+			opt := a.pendingInput.Options[idx]
+			a.lines = appendLine(a.lines, styledLine{text: formatResolvedInput(*a.pendingInput, opt.Key)})
+			responseCmd := sendInputResponseCmd(a.pendingInput.ResponseCh, output.InputResponse{SelectedKey: opt.Key})
+			a.pendingInput = nil
+			a.inputPrompt = a.inputPrompt.Hide()
+			return a, responseCmd
 		}
 	}
+	if opt := resolveOption(a.pendingInput.Options, msg); opt != nil {
+		a.lines = appendLine(a.lines, styledLine{text: formatResolvedInput(*a.pendingInput, opt.Key)})
+		responseCmd := sendInputResponseCmd(a.pendingInput.ResponseCh, output.InputResponse{SelectedKey: opt.Key})
+		a.pendingInput = nil
+		a.inputPrompt = a.inputPrompt.Hide()
+		return a, responseCmd
+	}
+	return a, nil
+}
 
+func formatResolvedInput(req output.UserInputRequestEvent, selectedKey string) string {
 	formatted := output.FormatPrompt(req.Prompt, req.Options)
 	firstLine := strings.Split(formatted, "\n")[0]
 
@@ -349,10 +348,6 @@ func formatResolvedInput(req output.UserInputRequestEvent, selectedKey string) s
 	return fmt.Sprintf("%s %s", firstLine, selected)
 }
 
-func componentsUsesVerticalPrompt(prompt components.InputPrompt, options []output.InputOption) bool {
-	return prompt.Visible() && len(options) > 1 && strings.Contains(options[0].Label, "[")
-}
-
 // resolveOption finds the best matching option for a key event, in priority order:
 //  1. "any" — matches any keypress
 //  2. "enter" — matches the Enter key explicitly

internal/ui/app_test.go

@@ -417,13 +417,10 @@ func TestAppEnterSelectsHighlightedVerticalOption(t *testing.T) {
 	responseCh := make(chan output.InputResponse, 1)
 
 	model, _ := app.Update(output.UserInputRequestEvent{
-		Prompt: "Update lstk to latest version?",
-		Options: []output.InputOption{
-			{Key: "u", Label: "Update now [U]"},
-			{Key: "s", Label: "Skip this version [S]"},
-			{Key: "n", Label: "Never ask again [N]"},
-		},
+		Prompt:     "Update lstk to latest version?",
+		Options:    []output.InputOption{{Key: "u", Label: "Update now [U]"}, {Key: "s", Label: "Skip this version [S]"}, {Key: "n", Label: "Never ask again [N]"}},
 		ResponseCh: responseCh,
+		Vertical:   true,
 	})
 	app = model.(App)
 

internal/ui/components/input_prompt.go

@@ -12,17 +12,19 @@ type InputPrompt struct {
 	options       []output.InputOption
 	visible       bool
 	selectedIndex int
+	vertical      bool
 }
 
 func NewInputPrompt() InputPrompt {
 	return InputPrompt{}
 }
 
-func (p InputPrompt) Show(prompt string, options []output.InputOption) InputPrompt {
+func (p InputPrompt) Show(prompt string, options []output.InputOption, vertical bool) InputPrompt {
 	p.prompt = prompt
 	p.options = options
 	p.visible = true
 	p.selectedIndex = 0
+	p.vertical = vertical
 	return p
 }
 
@@ -51,7 +53,7 @@ func (p InputPrompt) View() string {
 		return ""
 	}
 
-	if usesVerticalOptions(p.options) {
+	if p.vertical {
 		return p.viewVertical()
 	}
 
@@ -95,14 +97,3 @@ func (p InputPrompt) viewVertical() string {
 	return sb.String()
 }
 
-func usesVerticalOptions(options []output.InputOption) bool {
-	if len(options) < 2 {
-		return false
-	}
-	for _, opt := range options {
-		if strings.Contains(opt.Label, "[") && strings.Contains(opt.Label, "]") {
-			return true
-		}
-	}
-	return false
-}

internal/ui/components/input_prompt_test.go

@@ -14,26 +14,30 @@ func TestInputPromptView(t *testing.T) {
 		name     string
 		prompt   string
 		options  []output.InputOption
+		vertical bool
 		contains []string
 		excludes []string
 	}{
 		{
 			name:     "hidden returns empty",
 			prompt:   "",
 			options:  nil,
+			vertical: false,
 			contains: nil,
 		},
 		{
 			name:   "no options",
 			prompt: "Continue?",
 			options: nil,
+			vertical: false,
 			contains: []string{"?", "Continue?"},
 			excludes: []string{"(", "["},
 		},
 		{
 			name:   "single option shows parentheses",
 			prompt: "Continue?",
 			options: []output.InputOption{{Key: "enter", Label: "Press ENTER"}},
+			vertical: false,
 			contains: []string{"?", "Continue?", "(Press ENTER)"},
 		},
 		{
@@ -43,12 +47,14 @@ func TestInputPromptView(t *testing.T) {
 				{Key: "y", Label: "Y"},
 				{Key: "n", Label: "n"},
 			},
+			vertical: false,
 			contains: []string{"?", "Configure AWS profile?", "[Y/n]"},
 		},
 		{
 			name:   "multi-line prompt renders trailing lines",
 			prompt: "First line\nSecond line\nThird line",
 			options: []output.InputOption{{Key: "y", Label: "Y"}},
+			vertical: false,
 			contains: []string{"?", "First line", "Second line", "Third line", "(Y)"},
 		},
 	}
@@ -67,7 +73,7 @@ func TestInputPromptView(t *testing.T) {
 				return
 			}
 
-			p = p.Show(tc.prompt, tc.options)
+			p = p.Show(tc.prompt, tc.options, tc.vertical)
 			view := p.View()
 
 			for _, s := range tc.contains {

internal/update/notify.go

@@ -12,10 +12,8 @@ import (
 type versionFetcher func(ctx context.Context, token string) (string, error)
 
 type NotifyOptions struct {
-	GitHubToken        string
-	UpdatePrompt       bool
-	SkippedVersion     string
-	PersistSkipVersion func(version string) error
+	GitHubToken  string
+	UpdatePrompt bool
 }
 
 const checkTimeout = 2 * time.Second
@@ -56,10 +54,6 @@ func notifyUpdateWithVersion(ctx context.Context, sink output.Sink, opts NotifyO
 		return false
 	}
 
-	if opts.SkippedVersion != "" && normalizeVersion(opts.SkippedVersion) == normalizeVersion(latest) {
-		return false
-	}
-
 	if !opts.UpdatePrompt {
 		output.EmitNote(sink, fmt.Sprintf("Update available: %s → %s (run lstk update)", current, latest))
 		return false
@@ -76,13 +70,10 @@ func promptAndUpdate(ctx context.Context, sink output.Sink, opts NotifyOptions,
 
 	responseCh := make(chan output.InputResponse, 1)
 	output.EmitUserInputRequest(sink, output.UserInputRequestEvent{
-		Prompt: "Update lstk to latest version?",
-		Options: []output.InputOption{
-			{Key: "u", Label: "Update now [U]"},
-			{Key: "r", Label: "Remind me next time [R]"},
-			{Key: "s", Label: "Skip this version [S]"},
-		},
+		Prompt:     "Update lstk to latest version?",
+		Options:    []output.InputOption{{Key: "u", Label: "Update now [U]"}, {Key: "r", Label: "Remind me next time [R]"}, {Key: "s", Label: "Skip this version [S]"}},
 		ResponseCh: responseCh,
+		Vertical:   true,
 	})
 
 	var resp output.InputResponse
@@ -107,11 +98,7 @@ func promptAndUpdate(ctx context.Context, sink output.Sink, opts NotifyOptions,
 	case "r":
 		return false
 	case "s":
-		if opts.PersistSkipVersion != nil {
-			if err := opts.PersistSkipVersion(latest); err != nil {
-				output.EmitWarning(sink, fmt.Sprintf("Failed to save preference: %v", err))
-			}
-		}
+		output.EmitNote(sink, "Skipping version " + latest)
 		return false
 	}
 

internal/update/notify_test.go

@@ -161,18 +161,3 @@ func TestNotifyUpdatePromptCancelled(t *testing.T) {
 	assert.False(t, exit)
 }
 
-func TestNotifyUpdateSkippedVersion(t *testing.T) {
-	server := newTestGitHubServer(t, "v2.0.0")
-	defer server.Close()
-
-	var events []any
-	sink := output.SinkFunc(func(event any) { events = append(events, event) })
-
-	// Should return early without prompting since v2.0.0 was skipped
-	exit := notifyUpdateWithVersion(context.Background(), sink, NotifyOptions{
-		UpdatePrompt:   true,
-		SkippedVersion: "v2.0.0",
-	}, "1.0.0", testFetcher(server.URL))
-	assert.False(t, exit)
-	assert.Empty(t, events) // No events should be emitted
-}