feat(tui): restyle the ADR split and import overlays (#144) (#150)

Slice 5 of the map #136 cut: the ADR split review flow and the forge
import flow move onto internal/tui/theme and internal/tui/widget, and the
two overlay-adjacent leftovers the earlier slices recorded are taken with
them - the section 4 step 1 backdrop dim and the pointer package's raw
reverse-video escape.

Both overlays are widget.Overlay panels: the rounded borders are deleted,
rows carry a semantic kind that picks the token, pointer targets are
structural, and the busy states adopt the bubbles spinner and progress
bar. adrsplit/view.go and issueimport/view.go leave the seam allowlist,
which is down to one entry.

Author: aksOps

go.mod

@@ -28,6 +28,7 @@ require (
 	github.com/aymanbagabas/go-udiff v0.4.1 // indirect
 	github.com/aymerick/douceur v0.2.0 // indirect
 	github.com/catppuccin/go v0.2.0 // indirect
+	github.com/charmbracelet/harmonica v0.2.0 // indirect
 	github.com/charmbracelet/ultraviolet v0.0.0-20260811164956-006e29f97886 // indirect
 	github.com/charmbracelet/x/exp/ordered v0.1.0 // indirect
 	github.com/charmbracelet/x/exp/slice v0.0.0-20250327172914-2fdc97757edf // indirect

go.sum

@@ -28,6 +28,8 @@ github.com/catppuccin/go v0.2.0 h1:ktBeIrIP42b/8FGiScP9sgrWOss3lw0Z5SktRoithGA=
 github.com/catppuccin/go v0.2.0/go.mod h1:8IHJuMGaUUjQM82qBrGNBv7LFq6JI3NnQCF6MOlZjpc=
 github.com/charmbracelet/colorprofile v0.4.3 h1:QPa1IWkYI+AOB+fE+mg/5/4HRMZcaXex9t5KX76i20Q=
 github.com/charmbracelet/colorprofile v0.4.3/go.mod h1:/zT4BhpD5aGFpqQQqw7a+VtHCzu+zrQtt1zhMt9mR4Q=
+github.com/charmbracelet/harmonica v0.2.0 h1:8NxJWRWg/bzKqqEaaeFNipOu77YR5t8aSwG4pgaUBiQ=
+github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=
 github.com/charmbracelet/ultraviolet v0.0.0-20260811164956-006e29f97886 h1:rdnVWKgJpTVXKuKuJyxDJ+NFJdUaUqGvyGy61OcvlbA=
 github.com/charmbracelet/ultraviolet v0.0.0-20260811164956-006e29f97886/go.mod h1:nAw0d9PhFp1qdzi2xhQU5YOu5sVpDIHWlaW2Uz/bCro=
 github.com/charmbracelet/x/ansi v0.11.8 h1:JMFwp0CgDC2+jcOB162HH5k7I3FVbgFSMMYg7dSPBQQ=

internal/tui/adrsplit/model.go

@@ -8,9 +8,11 @@ import (
 	"io"
 	"os"
 	"strings"
+	"sync"
 	"unicode"
 	"unicode/utf8"
 
+	"charm.land/bubbles/v2/spinner"
 	"charm.land/bubbles/v2/textarea"
 	"charm.land/bubbles/v2/textinput"
 	tea "charm.land/bubbletea/v2"
@@ -20,6 +22,7 @@ import (
 	"github.com/RandomCodeSpace/kb/internal/board"
 	"github.com/RandomCodeSpace/kb/internal/store"
 	"github.com/RandomCodeSpace/kb/internal/tui/pointer"
+	"github.com/RandomCodeSpace/kb/internal/tui/theme"
 )
 
 const (
@@ -126,6 +129,32 @@ type Model struct {
 	scroll        int
 	manualScroll  bool
 	pointerState  pointer.State
+	styles        *theme.Styles
+	spin          spinner.Model
+}
+
+// SetStyles hands the overlay the resolved design system. Spec section 6.2:
+// styles are built once by the root and threaded down, never constructed here.
+func (m *Model) SetStyles(styles *theme.Styles) {
+	if styles == nil {
+		return
+	}
+	m.styles = styles
+	m.spin.Spinner = styles.Spinner
+}
+
+// fallbackStyles is the palette a Model rendered without SetStyles draws with.
+// It is built once and never mutated; the root resolves its own on construction
+// and again on tea.BackgroundColorMsg (spec section 6.3).
+var fallbackStyles = sync.OnceValue(func() *theme.Styles { return theme.New(true) })
+
+// themeStyles is the resolved design system, defaulting to the dark reference
+// palette until the root hands over its own.
+func (m Model) themeStyles() *theme.Styles {
+	if m.styles != nil {
+		return m.styles
+	}
+	return fallbackStyles()
 }
 
 // New creates a closed overlay. Nil dependencies keep the feature unavailable
@@ -135,6 +164,7 @@ func New(st Store, runner Runner, user string, ctx context.Context) Model {
 		ctx = context.Background()
 	}
 	m := Model{store: st, runner: runner, user: user, ctx: ctx}
+	m.spin = spinner.New(spinner.WithSpinner(fallbackStyles().Spinner))
 	m.resetInputs()
 	return m
 }
@@ -193,13 +223,31 @@ func IsMessage(message tea.Msg) bool {
 		return true
 	}
 	switch message.(type) {
-	case fileLoadedMsg, splitCompletedMsg, cardAddedMsg, pointerActionMsg:
+	case fileLoadedMsg, splitCompletedMsg, cardAddedMsg, pointerActionMsg, spinner.TickMsg:
 		return true
 	default:
 		return false
 	}
 }
 
+// busy reports whether a spinner-worthy operation is in flight.
+func (m Model) busy() bool { return m.operation != "" || m.adding }
+
+// spinTick advances the busy indicator. Spec section 5.2 adopts the bubbles
+// spinner for every busy state that used to be static text; the tick loop stops
+// as soon as nothing is in flight, so an idle overlay costs no timers.
+func (m *Model) spinTick(msg spinner.TickMsg) tea.Cmd {
+	if !m.busy() {
+		return nil
+	}
+	var command tea.Cmd
+	m.spin, command = m.spin.Update(msg)
+	return command
+}
+
+// startSpinner is the command that begins the tick loop for a new operation.
+func (m Model) startSpinner() tea.Cmd { return m.spin.Tick }
+
 // Update applies user input and scoped asynchronous results.
 func (m *Model) Update(message tea.Msg) tea.Cmd {
 	if !m.open {
@@ -211,6 +259,8 @@ func (m *Model) Update(message tea.Msg) tea.Cmd {
 		return command
 	}
 	switch msg := message.(type) {
+	case spinner.TickMsg:
+		return m.spinTick(msg)
 	case fileLoadedMsg:
 		if msg.session != m.session || msg.generation != m.generation || m.operation != "reading file" {
 			return nil
@@ -468,10 +518,10 @@ func (m *Model) startSplit() tea.Cmd {
 	ctx, cancel := context.WithCancel(m.ctx)
 	m.cancel, m.operation = cancel, "reading file"
 	m.status, m.statusIsError = "reading ADR file...", false
-	return func() tea.Msg {
+	return tea.Batch(m.startSpinner(), func() tea.Msg {
 		text, err := readADRFile(ctx, path)
 		return fileLoadedMsg{session: session, generation: generation, text: text, err: err}
-	}
+	})
 }
 
 func (m *Model) startRun(text string) tea.Cmd {
@@ -480,10 +530,10 @@ func (m *Model) startRun(text string) tea.Cmd {
 	ctx, cancel := context.WithCancel(m.ctx)
 	m.cancel, m.operation = cancel, "splitting ADR"
 	m.status, m.statusIsError = "splitting ADR...", false
-	return func() tea.Msg {
+	return tea.Batch(m.startSpinner(), func() tea.Msg {
 		run, err := m.runner.RunSkill(ctx, m.user, ai.ScopeReadOnly, "adr-split", text, maximum, splitMaxTokens)
 		return splitCompletedMsg{session: session, generation: generation, run: run, err: err}
-	}
+	})
 }
 
 func (m *Model) cancelOperation() {
@@ -532,7 +582,7 @@ func (m *Model) startAdd() tea.Cmd {
 	m.adding, m.addPosition = true, 0
 	m.addGeneration++
 	m.status, m.statusIsError = fmt.Sprintf("creating card 1 of %d...", len(m.addQueue)), false
-	return m.addNext()
+	return tea.Batch(m.startSpinner(), m.addNext())
 }
 
 func (m *Model) addNext() tea.Cmd {
@@ -800,8 +850,11 @@ func cycleInt(value, low, high int, key string) int {
 	return value
 }
 
+// effortValues is the effort cycle, in order. The view names the same order.
+func effortValues() []string { return []string{"", "S", "M", "L"} }
+
 func cycleEffort(value, key string) string {
-	values := []string{"", "S", "M", "L"}
+	values := effortValues()
 	index := 0
 	for i, candidate := range values {
 		if candidate == value {

internal/tui/adrsplit/model_test.go

@@ -11,6 +11,7 @@ import (
 	"strings"
 	"testing"
 
+	"charm.land/bubbles/v2/spinner"
 	tea "charm.land/bubbletea/v2"
 	"github.com/charmbracelet/x/ansi"
 
@@ -66,12 +67,34 @@ func newTestModel() (*Model, *fakeStore, *fakeRunner) {
 	return &m, st, runner
 }
 
+// commandMsg runs a command and returns the overlay message it produced. An
+// operation that also starts the busy spinner returns a batch, so the batch is
+// walked and the spinner tick - which is a timer, not a result - is skipped.
 func commandMsg(t *testing.T, command tea.Cmd) tea.Msg {
 	t.Helper()
 	if command == nil {
 		t.Fatal("command is nil")
 	}
-	return command()
+	message := command()
+	batch, batched := message.(tea.BatchMsg)
+	if !batched {
+		return message
+	}
+	for _, sub := range batch {
+		if sub == nil {
+			continue
+		}
+		if result := sub(); !isSpinnerTick(result) {
+			return result
+		}
+	}
+	t.Fatal("batch produced no overlay message")
+	return nil
+}
+
+func isSpinnerTick(message tea.Msg) bool {
+	_, tick := message.(spinner.TickMsg)
+	return tick
 }
 
 func TestAvailabilitySessionsAndCloseLifecycle(t *testing.T) {
@@ -543,7 +566,7 @@ func TestPointerControlsAreRenderDerivedAndSessionScoped(t *testing.T) {
 	m.rows = rowsFromDrafts([]ai.Draft{testDraft("one"), testDraft("two")})
 	m.focus = "include:0"
 	handler = m.MouseHandler(80, 24)
-	line, x = visibleTextPosition(t, m.View(80, 24), "[x] include")
+	line, x = visibleTextPosition(t, m.View(80, 24), "1 include")
 	message = pointerRelease(m, handler, x, line)()
 	if _, ok := message.(pointerActionMsg); !ok {
 		t.Fatalf("review release message=%T", message)
@@ -580,7 +603,7 @@ func TestPointerControlsClipScrolledRowsAndGuardBusyWork(t *testing.T) {
 		t.Fatal("small viewport rendered an offscreen row")
 	}
 	handler := m.MouseHandler(50, 10)
-	line, x := visibleTextPosition(t, view, "[x] include")
+	line, x := visibleTextPosition(t, view, "1 include")
 	if command := pointerRelease(m, handler, x, line); command == nil {
 		t.Fatal("visible review control had no hit region")
 	}
@@ -686,7 +709,7 @@ func TestPointerControlsActivateEveryVisibleInputAndReviewControl(t *testing.T)
 	review, _, _ := newTestModel()
 	review.stage = stageReview
 	review.rows = rowsFromDrafts([]ai.Draft{testDraft("one"), testDraft("two")})
-	pointerActivate(t, review, "[x] include")
+	pointerActivate(t, review, "1 include")
 	if review.rows[0].include {
 		t.Fatal("pointer include did not toggle the selected row")
 	}
@@ -790,8 +813,11 @@ func TestDirtyCloseButtonActivatesAfterPressedRerender(t *testing.T) {
 	if press == nil || m.Update(press()) != nil {
 		t.Fatal("dirty-close discard did not enter pressed state")
 	}
-	if view := ansi.Strip(m.View(80, 24)); !strings.Contains(view, "[>Discard<]") {
-		t.Fatalf("dirty-close discard omitted pressed feedback:\n%s", view)
+	// The feedback is theme.Styles.Pressed now, not a text substitution, so it
+	// is the reverse-video attribute in the composed frame that says "pressed".
+	view := m.View(80, 24)
+	if !strings.Contains(view, "\x1b[7m") || !strings.Contains(ansi.Strip(view), "[ Discard ]") {
+		t.Fatalf("dirty-close discard omitted pressed feedback:\n%s", ansi.Strip(view))
 	}
 	release := m.MouseHandler(80, 24)(tea.MouseReleaseMsg{X: x, Y: line, Button: tea.MouseNone})
 	if release == nil {
@@ -826,20 +852,25 @@ func TestCreatedReviewRowsKeepPointerTargetsAligned(t *testing.T) {
 	m.stage = stageReview
 	m.rows = rowsFromDrafts([]ai.Draft{testDraft("created"), testDraft("pending")})
 	m.rows[0].created = true
-	lines := m.bodyLines(80)
-	targets := m.controlRows()
-	for line, rendered := range lines {
+	for _, row := range m.bodyRows(80) {
 		want := ""
 		switch {
-		case strings.Contains(rendered, "Destination:"):
+		case strings.Contains(row.plain(), "Destination:"):
 			want = "dest"
-		case strings.Contains(rendered, "[ Back to source ]"):
+		case strings.Contains(row.plain(), "[ Back to source ]"):
 			want = "back"
-		case strings.Contains(rendered, "[ Add selected"):
+		case strings.Contains(row.plain(), "[ Add selected"):
 			want = "add"
 		}
-		if want != "" && targets[line] != want {
-			t.Fatalf("line %d %q target=%q want %q", line, rendered, targets[line], want)
+		if want != "" && row.target != want {
+			t.Fatalf("row %q target=%q want %q", row.plain(), row.target, want)
+		}
+	}
+	// A created story keeps its rows in the list but never a focus target, so
+	// the batch cannot be told to write it twice.
+	for _, row := range m.bodyRows(80) {
+		if strings.Contains(row.plain(), "created") && row.target != "" {
+			t.Fatalf("created row %q carries target %q", row.plain(), row.target)
 		}
 	}
 }