Operator CLI UX: FormRunner, huh pickers, Lipgloss chrome

cmd/ship/main.go

@@ -47,7 +47,7 @@ func MainWith(args []string, stdout, stderr io.Writer, dir string, up update.Por
 		return 0
 	}
 
-	created, err := (run.Init{Out: stderr}).Config(dir)
+	created, err := (run.Init{}).Config(dir)
 	if err != nil {
 		fmt.Fprintln(stderr, err)
 		return 1
@@ -78,16 +78,21 @@ func MainWith(args []string, stdout, stderr io.Writer, dir string, up update.Por
 	}
 
 	gh := &ticket.GitHub{}
+	color := colorEnabled(stderr)
+	obs := observe.New(dir, stderr)
+	obs.Color = color
 	orchestrator := run.Orchestrator{
 		Tickets:  gh,
-		Queue:    run.Interactive{Out: stderr},
+		Queue:    run.Interactive{},
 		Agent:    port,
 		PRs:      gh,
 		Repo:     gitops.Repo{Dir: dir},
 		Config:   cfg,
-		Throbber: throbber.Line{Out: stderr, Color: true},
-		Observer: observe.New(dir, stderr),
+		Throbber: throbber.Line{Out: stderr, Color: color},
+		Observer: obs,
 		Herdr:    herdr.Reporter{},
+		Header:   stderr,
+		Color:    color,
 		Stdout:   stdout,
 	}
 	if err := orchestrator.Run(context.Background()); err != nil {
@@ -120,7 +125,7 @@ func runUpdate(stdout, stderr io.Writer, up update.Port) int {
 }
 
 func runInit(stderr io.Writer, dir string) int {
-	created, err := (run.Init{Out: stderr}).Config(dir)
+	created, err := (run.Init{}).Config(dir)
 	if err != nil {
 		fmt.Fprintln(stderr, err)
 		return 1
@@ -150,3 +155,16 @@ func wantsVersion(args []string) bool {
 	}
 	return false
 }
+
+// colorEnabled is true when w is a terminal character device (TTY).
+func colorEnabled(w io.Writer) bool {
+	f, ok := w.(*os.File)
+	if !ok {
+		return false
+	}
+	fi, err := f.Stat()
+	if err != nil {
+		return false
+	}
+	return fi.Mode()&os.ModeCharDevice != 0
+}

go.mod

@@ -2,4 +2,36 @@ module github.com/maxBRT/ship-cli
 
 go 1.26.5
 
-require gopkg.in/yaml.v3 v3.0.1
+require (
+	github.com/charmbracelet/bubbles v0.21.1-0.20250623103423-23b8fd6302d7
+	github.com/charmbracelet/bubbletea v1.3.6
+	github.com/charmbracelet/huh v1.0.0
+	github.com/charmbracelet/lipgloss v1.1.0
+	github.com/charmbracelet/x/ansi v0.9.3
+	gopkg.in/yaml.v3 v3.0.1
+)
+
+require (
+	github.com/atotto/clipboard v0.1.4 // indirect
+	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
+	github.com/catppuccin/go v0.3.0 // indirect
+	github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
+	github.com/charmbracelet/x/cellbuf v0.0.13 // indirect
+	github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0 // indirect
+	github.com/charmbracelet/x/term v0.2.1 // indirect
+	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
+	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-localereader v0.0.1 // indirect
+	github.com/mattn/go-runewidth v0.0.16 // indirect
+	github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
+	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
+	github.com/muesli/cancelreader v0.2.2 // indirect
+	github.com/muesli/termenv v0.16.0 // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
+	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
+	golang.org/x/sync v0.15.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/text v0.23.0 // indirect
+)

go.sum

@@ -1,3 +1,78 @@
+github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
+github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
+github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
+github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
+github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
+github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
+github.com/aymanbagabas/go-udiff v0.3.1 h1:LV+qyBQ2pqe0u42ZsUEtPiCaUoqgA9gYRDs3vj1nolY=
+github.com/aymanbagabas/go-udiff v0.3.1/go.mod h1:G0fsKmG+P6ylD0r6N/KgQD/nWzgfnl8ZBcNLgcbrw8E=
+github.com/catppuccin/go v0.3.0 h1:d+0/YicIq+hSTo5oPuRi5kOpqkVA5tAsU6dNhvRu+aY=
+github.com/catppuccin/go v0.3.0/go.mod h1:8IHJuMGaUUjQM82qBrGNBv7LFq6JI3NnQCF6MOlZjpc=
+github.com/charmbracelet/bubbles v0.21.1-0.20250623103423-23b8fd6302d7 h1:JFgG/xnwFfbezlUnFMJy0nusZvytYysV4SCS2cYbvws=
+github.com/charmbracelet/bubbles v0.21.1-0.20250623103423-23b8fd6302d7/go.mod h1:ISC1gtLcVilLOf23wvTfoQuYbW2q0JevFxPfUzZ9Ybw=
+github.com/charmbracelet/bubbletea v1.3.6 h1:VkHIxPJQeDt0aFJIsVxw8BQdh/F/L2KKZGsK6et5taU=
+github.com/charmbracelet/bubbletea v1.3.6/go.mod h1:oQD9VCRQFF8KplacJLo28/jofOI2ToOfGYeFgBBxHOc=
+github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc h1:4pZI35227imm7yK2bGPcfpFEmuY1gc2YSTShr4iJBfs=
+github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc/go.mod h1:X4/0JoqgTIPSFcRA/P6INZzIuyqdFY5rm8tb41s9okk=
+github.com/charmbracelet/huh v1.0.0 h1:wOnedH8G4qzJbmhftTqrpppyqHakl/zbbNdXIWJyIxw=
+github.com/charmbracelet/huh v1.0.0/go.mod h1:5YVc+SlZ1IhQALxRPpkGwwEKftN/+OlJlnJYlDRFqN4=
+github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY=
+github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
+github.com/charmbracelet/x/ansi v0.9.3 h1:BXt5DHS/MKF+LjuK4huWrC6NCvHtexww7dMayh6GXd0=
+github.com/charmbracelet/x/ansi v0.9.3/go.mod h1:3RQDQ6lDnROptfpWuUVIUG64bD2g2BgntdxH0Ya5TeE=
+github.com/charmbracelet/x/cellbuf v0.0.13 h1:/KBBKHuVRbq1lYx5BzEHBAFBP8VcQzJejZ/IA3iR28k=
+github.com/charmbracelet/x/cellbuf v0.0.13/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs=
+github.com/charmbracelet/x/conpty v0.1.0 h1:4zc8KaIcbiL4mghEON8D72agYtSeIgq8FSThSPQIb+U=
+github.com/charmbracelet/x/conpty v0.1.0/go.mod h1:rMFsDJoDwVmiYM10aD4bH2XiRgwI7NYJtQgl5yskjEQ=
+github.com/charmbracelet/x/errors v0.0.0-20240508181413-e8d8b6e2de86 h1:JSt3B+U9iqk37QUU2Rvb6DSBYRLtWqFqfxf8l5hOZUA=
+github.com/charmbracelet/x/errors v0.0.0-20240508181413-e8d8b6e2de86/go.mod h1:2P0UgXMEa6TsToMSuFqKFQR+fZTO9CNGUNokkPatT/0=
+github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91 h1:payRxjMjKgx2PaCWLZ4p3ro9y97+TVLZNaRZgJwSVDQ=
+github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U=
+github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0 h1:qko3AQ4gK1MTS/de7F5hPGx6/k1u0w4TeYmBFwzYVP4=
+github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0/go.mod h1:pBhA0ybfXv6hDjQUZ7hk1lVxBiUbupdw5R31yPUViVQ=
+github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ=
+github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg=
+github.com/charmbracelet/x/termios v0.1.1 h1:o3Q2bT8eqzGnGPOYheoYS8eEleT5ZVNYNy8JawjaNZY=
+github.com/charmbracelet/x/termios v0.1.1/go.mod h1:rB7fnv1TgOPOyyKRJ9o+AsTU/vK5WHJ2ivHeut/Pcwo=
+github.com/charmbracelet/x/xpty v0.1.2 h1:Pqmu4TEJ8KeA9uSkISKMU3f+C1F6OGBn8ABuGlqCbtI=
+github.com/charmbracelet/x/xpty v0.1.2/go.mod h1:XK2Z0id5rtLWcpeNiMYBccNNBrP2IJnzHI0Lq13Xzq4=
+github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s=
+github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
+github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
+github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
+github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
+github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
+github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
+github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
+github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
+github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
+github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4=
+github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE=
+github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
+github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
+github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
+github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
+github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc=
+github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
+github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
+github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
+github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
+github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
+golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=
+golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
+golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
+golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

internal/observe/doc.go

@@ -1,5 +1,5 @@
 // Package observe defines curated Run observability events, the Sink Agent
 // adapters emit into, and the Run-owned Observer that writes Phase logs under
-// .ship/runs, dumps one high-signal tools+tokens line after each Phase, and
-// prints an Abort banner with report paths and last tools on Phase failure.
+// .ship/runs, dumps a dense tools + in/out strip after each Phase, and prints
+// a loud Abort banner with report paths and last tools on Phase failure.
 package observe

internal/observe/observer.go

@@ -9,6 +9,9 @@ import (
 	"strings"
 	"sync"
 	"time"
+
+	"github.com/charmbracelet/lipgloss"
+	"github.com/maxBRT/ship-cli/internal/theme"
 )
 
 // Port is the Run-owned observability surface: it receives curated events
@@ -18,11 +21,11 @@ type Port interface {
 	// BeginPhase starts buffering for one Phase and returns the Sink Agent
 	// adapters emit into. Mid-Phase Emit must not write tool lines to Out.
 	BeginPhase(phase string) Sink
-	// EndPhase dumps one high-signal line with the tool total and token
-	// totals collected since BeginPhase, then clears the buffer.
+	// EndPhase dumps one dense strip with the tool total and compact
+	// in/out token totals collected since BeginPhase, then clears the buffer.
 	EndPhase()
-	// Abort prints a stderr banner with the Run report directory, Phase log
-	// path, and last tool lines, then clears the buffer. Used on Phase
+	// Abort prints a loud stderr banner with the Run report directory, Phase
+	// log path, and last tool lines, then clears the buffer. Used on Phase
 	// failure instead of EndPhase so the banner does not rely on the
 	// success dump.
 	Abort()
@@ -32,8 +35,9 @@ type Port interface {
 // when EndPhase is called. Safe for concurrent Emit from an Agent adapter.
 // Dir is the workspace root; Phase reports land under Dir/.ship/runs/<run-id>/.
 type Observer struct {
-	Dir string
-	Out io.Writer
+	Dir   string
+	Out   io.Writer
+	Color bool // red Abort chrome; plain when false
 
 	mu       sync.Mutex
 	events   []Event
@@ -96,8 +100,9 @@ func (o *Observer) Emit(e Event) {
 	_ = enc.Encode(e)
 }
 
-// EndPhase writes one high-signal line with the tool total and any token
-// totals, then clears the buffer. Per-tool detail stays in the Phase log.
+// EndPhase writes one dense strip with the tool total and compact in/out
+// token totals, then clears the buffer. Per-tool detail and cache fields
+// stay in the Phase log.
 func (o *Observer) EndPhase() {
 	o.mu.Lock()
 	events := o.events
@@ -120,16 +125,16 @@ func (o *Observer) EndPhase() {
 		return
 	}
 	if tokens == nil {
-		fmt.Fprintf(o.Out, "tools  %d\n", tools)
+		fmt.Fprintf(o.Out, "  tools  %d\n", tools)
 		return
 	}
-	fmt.Fprintf(o.Out, "tools  %d  tokens  input=%d output=%d cache_read=%d cache_write=%d\n",
-		tools, tokens.Input, tokens.Output, tokens.CacheRead, tokens.CacheWrite)
+	fmt.Fprintf(o.Out, "  tools  %d  ·  in %s  ·  out %s\n",
+		tools, compactCount(tokens.Input), compactCount(tokens.Output))
 }
 
-// Abort writes a banner with Run report and Phase log paths plus the last
-// handful of tool one-liners, then clears the buffer without running the
-// success dump.
+// Abort writes a loud banner with Run report and Phase log paths plus the
+// last handful of tool one-liners, then clears the buffer without running the
+// success dump. When Color is false, marks stay plain (no ANSI).
 func (o *Observer) Abort() {
 	o.mu.Lock()
 	runDir := o.runDir
@@ -138,12 +143,19 @@ func (o *Observer) Abort() {
 	o.events = nil
 	o.mu.Unlock()
 
-	fmt.Fprintf(o.Out, "Abort: Phase failed\n")
+	mark := "✗ Abort"
+	sep := "────────────────────────────────────────────"
+	if o.Color {
+		style := lipgloss.NewStyle().Foreground(theme.Red)
+		mark = style.Render("✗ Abort")
+		sep = style.Render(sep)
+	}
+	fmt.Fprintf(o.Out, "%s  Phase failed\n", mark)
 	if runDir != "" {
-		fmt.Fprintf(o.Out, "Run report: %s\n", runDir)
+		fmt.Fprintf(o.Out, "  report  %s\n", runDir)
 	}
 	if phaseLog != "" {
-		fmt.Fprintf(o.Out, "Phase log: %s\n", phaseLog)
+		fmt.Fprintf(o.Out, "  phase log  %s\n", phaseLog)
 	}
 
 	var tools []Event
@@ -155,9 +167,31 @@ func (o *Observer) Abort() {
 	if n := len(tools); n > abortToolLimit {
 		tools = tools[n-abortToolLimit:]
 	}
+	if len(tools) > 0 {
+		fmt.Fprintln(o.Out, sep)
+	}
 	for _, e := range tools {
-		fmt.Fprintf(o.Out, "tool  %s  %dms  %s\n", e.Name, e.DurationMS, e.Status)
+		fmt.Fprintf(o.Out, "  %s  %dms  %s\n", e.Name, e.DurationMS, e.Status)
+	}
+}
+
+// compactCount renders token totals for the dense observe strip (e.g. 18.4k).
+func compactCount(n int64) string {
+	if n < 1000 {
+		return fmt.Sprintf("%d", n)
+	}
+	if n < 1_000_000 {
+		v := float64(n) / 1000
+		if v == float64(int64(v)) {
+			return fmt.Sprintf("%.0fk", v)
+		}
+		return fmt.Sprintf("%.1fk", v)
+	}
+	v := float64(n) / 1_000_000
+	if v == float64(int64(v)) {
+		return fmt.Sprintf("%.0fM", v)
 	}
+	return fmt.Sprintf("%.1fM", v)
 }
 
 // abortToolLimit is how many trailing tool lines the Abort banner keeps.