fix: show wfctl secrets setup prompts (#887)

* fix: show wfctl secrets setup prompts

* fix: harden secrets setup prompt modes

* fix: satisfy secrets setup lint

* docs: clarify secrets setup modes

Author: intel352

cmd/wfctl/internal/prompt/confirm.go

@@ -2,7 +2,6 @@ package prompt
 
 import (
 	"fmt"
-	"io"
 	"strings"
 
 	tea "charm.land/bubbletea/v2"
@@ -16,19 +15,20 @@ func Confirm(question string, def bool) (bool, error) {
 	if !isTTY() {
 		return false, ErrNotInteractive
 	}
+	out, _ := outputWriter()
 	hint := "y/N"
 	if def {
 		hint = "Y/n"
 	}
 	m := &confirmModel{question: question, hint: hint, def: def}
-	p := tea.NewProgram(m, tea.WithOutput(io.Discard))
+	p := tea.NewProgram(m, tea.WithOutput(out))
 	result, err := p.Run()
 	if err != nil {
 		return false, fmt.Errorf("prompt confirm: %w", err)
 	}
 	fm := result.(*confirmModel)
 	if fm.quit {
-		return false, ErrNotInteractive
+		return false, ErrInterrupted
 	}
 	return fm.answer, nil
 }

cmd/wfctl/internal/prompt/input.go

@@ -2,7 +2,6 @@ package prompt
 
 import (
 	"fmt"
-	"io"
 
 	"charm.land/bubbles/v2/textinput"
 	tea "charm.land/bubbletea/v2"
@@ -24,6 +23,7 @@ func InputWithSuggestions(label string, masked bool, suggestions []string) (stri
 	if !isTTY() {
 		return "", ErrNotInteractive
 	}
+	out, _ := outputWriter()
 	ti := textinput.New()
 	ti.Placeholder = label
 	ti.Focus()
@@ -37,14 +37,14 @@ func InputWithSuggestions(label string, masked bool, suggestions []string) (stri
 	}
 
 	m := &inputModel{label: label, ti: ti}
-	p := tea.NewProgram(m, tea.WithOutput(io.Discard))
+	p := tea.NewProgram(m, tea.WithOutput(out))
 	result, err := p.Run()
 	if err != nil {
 		return "", fmt.Errorf("prompt input: %w", err)
 	}
 	fm := result.(*inputModel)
 	if fm.quit {
-		return "", ErrNotInteractive
+		return "", ErrInterrupted
 	}
 	return fm.ti.Value(), nil
 }

cmd/wfctl/internal/prompt/interrupt_test.go

@@ -0,0 +1,35 @@
+package prompt
+
+import (
+	"testing"
+
+	tea "charm.land/bubbletea/v2"
+)
+
+func TestPromptModelsMarkCtrlCAsInterrupted(t *testing.T) {
+	msg := tea.KeyPressMsg(tea.Key{Code: 'c', Mod: tea.ModCtrl})
+
+	input := &inputModel{}
+	input.Update(msg)
+	if !input.quit {
+		t.Fatal("inputModel did not mark ctrl+c as quit")
+	}
+
+	confirm := &confirmModel{}
+	confirm.Update(msg)
+	if !confirm.quit {
+		t.Fatal("confirmModel did not mark ctrl+c as quit")
+	}
+
+	selectModel := &selectModel{}
+	selectModel.Update(msg)
+	if !selectModel.quit {
+		t.Fatal("selectModel did not mark ctrl+c as quit")
+	}
+
+	multiSelect := &multiSelectModel{}
+	multiSelect.Update(msg)
+	if !multiSelect.quit {
+		t.Fatal("multiSelectModel did not mark ctrl+c as quit")
+	}
+}

cmd/wfctl/internal/prompt/multiselect.go

@@ -2,7 +2,6 @@ package prompt
 
 import (
 	"fmt"
-	"io"
 	"strings"
 
 	tea "charm.land/bubbletea/v2"
@@ -17,21 +16,22 @@ func MultiSelect(title string, items []Item) ([]int, error) {
 	if !isTTY() {
 		return nil, ErrNotInteractive
 	}
+	out, _ := outputWriter()
 	selected := make(map[int]bool, len(items))
 	for i, it := range items {
 		if it.Preselected {
 			selected[i] = true
 		}
 	}
 	m := &multiSelectModel{title: title, items: items, selected: selected}
-	p := tea.NewProgram(m, tea.WithOutput(io.Discard))
+	p := tea.NewProgram(m, tea.WithOutput(out))
 	result, err := p.Run()
 	if err != nil {
 		return nil, fmt.Errorf("prompt multiselect: %w", err)
 	}
 	fm := result.(*multiSelectModel)
 	if fm.quit {
-		return nil, ErrNotInteractive
+		return nil, ErrInterrupted
 	}
 	var indices []int
 	for i := range items {

cmd/wfctl/internal/prompt/output_test.go

@@ -0,0 +1,39 @@
+package prompt
+
+import (
+	"bytes"
+	"testing"
+)
+
+func TestChooseOutputWriterPrefersStderrTTY(t *testing.T) {
+	stderr := &bytes.Buffer{}
+	stdout := &bytes.Buffer{}
+	got, ok := chooseOutputWriter(true, true, stderr, stdout)
+	if !ok {
+		t.Fatal("expected output writer")
+	}
+	if got != stderr {
+		t.Fatalf("writer = %p, want stderr %p", got, stderr)
+	}
+}
+
+func TestChooseOutputWriterFallsBackToStdoutTTY(t *testing.T) {
+	stderr := &bytes.Buffer{}
+	stdout := &bytes.Buffer{}
+	got, ok := chooseOutputWriter(false, true, stderr, stdout)
+	if !ok {
+		t.Fatal("expected output writer")
+	}
+	if got != stdout {
+		t.Fatalf("writer = %p, want stdout %p", got, stdout)
+	}
+}
+
+func TestChooseOutputWriterRejectsNonTTYOutput(t *testing.T) {
+	stderr := &bytes.Buffer{}
+	stdout := &bytes.Buffer{}
+	got, ok := chooseOutputWriter(false, false, stderr, stdout)
+	if ok {
+		t.Fatalf("expected no output writer, got %p", got)
+	}
+}

cmd/wfctl/internal/prompt/prompt.go

@@ -2,14 +2,16 @@
 // charm.land/bubbletea/v2 and charm.land/bubbles/v2.
 //
 // Every public constructor checks whether stdin is an interactive terminal
-// before starting a bubbletea program. If stdin is not a terminal the
-// constructor returns (zero, ErrNotInteractive) immediately so callers in
-// CI / pipe mode can detect the condition and fall back to non-interactive
-// paths without any risk of hanging.
+// and whether stderr or stdout can render terminal output before starting a
+// bubbletea program. If either side is unavailable, the constructor returns
+// (zero, ErrNotInteractive) immediately so callers in CI / pipe mode can
+// detect the condition and fall back to non-interactive paths without any
+// risk of hanging.
 package prompt
 
 import (
 	"errors"
+	"io"
 	"os"
 
 	"github.com/mattn/go-isatty"
@@ -18,6 +20,9 @@ import (
 // ErrNotInteractive is returned by all constructors when stdin is not a terminal.
 var ErrNotInteractive = errors.New("prompt: stdin is not a terminal")
 
+// ErrInterrupted is returned when the user aborts an interactive prompt.
+var ErrInterrupted = errors.New("prompt: interrupted")
+
 // Item is a selectable entry for MultiSelect.
 type Item struct {
 	Label       string
@@ -26,5 +31,34 @@ type Item struct {
 
 // isTTY reports whether os.Stdin is an interactive terminal.
 func isTTY() bool {
-	return isatty.IsTerminal(os.Stdin.Fd())
+	return CanPrompt()
+}
+
+// CanPrompt reports whether prompts can safely read input and render output.
+func CanPrompt() bool {
+	if !isatty.IsTerminal(os.Stdin.Fd()) {
+		return false
+	}
+	_, ok := outputWriter()
+	return ok
+}
+
+func outputWriter() (io.Writer, bool) {
+	return chooseOutputWriter(
+		isatty.IsTerminal(os.Stderr.Fd()),
+		isatty.IsTerminal(os.Stdout.Fd()),
+		os.Stderr,
+		os.Stdout,
+	)
+}
+
+func chooseOutputWriter(stderrTTY, stdoutTTY bool, stderr, stdout io.Writer) (io.Writer, bool) {
+	switch {
+	case stderrTTY:
+		return stderr, true
+	case stdoutTTY:
+		return stdout, true
+	default:
+		return nil, false
+	}
 }

cmd/wfctl/internal/prompt/select.go

@@ -2,7 +2,6 @@ package prompt
 
 import (
 	"fmt"
-	"io"
 	"strings"
 
 	tea "charm.land/bubbletea/v2"
@@ -17,15 +16,16 @@ func Select(title string, opts []string) (int, error) {
 	if !isTTY() {
 		return 0, ErrNotInteractive
 	}
+	out, _ := outputWriter()
 	m := &selectModel{title: title, opts: opts}
-	p := tea.NewProgram(m, tea.WithOutput(io.Discard))
+	p := tea.NewProgram(m, tea.WithOutput(out))
 	result, err := p.Run()
 	if err != nil {
 		return 0, fmt.Errorf("prompt select: %w", err)
 	}
 	fm := result.(*selectModel)
 	if fm.quit {
-		return 0, ErrNotInteractive
+		return 0, ErrInterrupted
 	}
 	return fm.cursor, nil
 }

cmd/wfctl/secrets_setup.go

@@ -111,6 +111,10 @@ Options:
 			return err
 		}
 		if target.kind == secretsSetupTargetManifest {
+			if *autoGenKeys {
+				return fmt.Errorf("--auto-gen-keys is not supported with wfctl.yaml manifest-backed secrets setup; use --from-env, --secret NAME=VALUE, or run interactively from a terminal")
+			}
+			manifestNonInteractive := *nonInteractive || !isatty.IsTerminal(os.Stdin.Fd())
 			return runSecretsSetupManifestWithIO(&manifestSetupArgs{
 				manifestPath:   target.path,
 				lockfilePath:   *lockFile,
@@ -122,6 +126,7 @@ Options:
 				visibility:     *visibility,
 				tokenEnv:       *tokenEnv,
 				fromEnv:        *fromEnv,
+				nonInteractive: manifestNonInteractive,
 				secretLiterals: []string(secretFlag),
 				only:           only,
 				skipExisting:   *skipExisting,