Polish setup TUI status and gateway rows

Author: Patel230

cmd/chat_config_gateways.go

@@ -126,9 +126,11 @@ func (m chatModel) configGatewaysView() string {
 		if row.HasKey {
 			key = "✓"
 		}
-		models := "—"
-		if row.ModelCount > 0 {
+		models := "key required"
+		if row.HasKey && row.ModelCount > 0 {
 			models = fmt.Sprintf("%d", row.ModelCount)
+		} else if row.HasKey {
+			models = "—"
 		}
 		tableData[i] = []string{row.DisplayName, key, models, ""}
 		layoutData[i] = append([]string(nil), tableData[i]...)
@@ -173,7 +175,7 @@ func (m chatModel) configGatewaysView() string {
 	ctx := context.Background()
 	indent := strings.Repeat(" ", configTableIndent)
 	if !hawkconfig.HasConfiguredDeploymentCached(ctx) {
-		b.WriteString("\n" + mutedStyle.Render(indent+"Catalog = models in eyrie cache · add key in Keys tab to use them"))
+		b.WriteString("\n" + mutedStyle.Render(indent+"Catalog count appears after a saved key · key required to use a gateway"))
 	} else {
 		b.WriteString("\n" + configTableSelectionFooter(len(rows), m.configScroll, end, mutedStyle, "r refresh · enter select · ↓ refresh row"))
 	}
@@ -236,6 +238,13 @@ func (m chatModel) focusConfigActiveGateway() chatModel {
 	rows := m.configGatewayRows()
 	if i := m.activeGatewayRowIndex(rows); i >= 0 {
 		m.configGatewayFocus = i
+		m.configSel = i
+		if m.configSel < m.configScroll {
+			m.configScroll = m.configSel
+		}
+		if m.configSel >= m.configScroll+configWindowSize {
+			m.configScroll = m.configSel - configWindowSize + 1
+		}
 	}
 	return m
 }

cmd/chat_config_gateways_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/GrayCodeAI/hawk/internal/engine"
 )
 
-func TestConfigGatewaysView_CatalogHeaderWithoutKeys(t *testing.T) {
+func TestConfigGatewaysView_RequiresKeyForModelCounts(t *testing.T) {
 	hawkconfig.InvalidateConfigUICache()
 	store := &credentials.MapStore{}
 	credentials.SetDefaultStore(store)
@@ -23,8 +23,11 @@ func TestConfigGatewaysView_CatalogHeaderWithoutKeys(t *testing.T) {
 	if !strings.Contains(view, "Catalog") {
 		t.Fatalf("expected Catalog column header, got:\n%s", view)
 	}
-	if !strings.Contains(view, "add key in Keys tab") {
-		t.Fatalf("expected keys hint without credentials, got:\n%s", view)
+	if !strings.Contains(view, "key required") {
+		t.Fatalf("expected key-required model cells without credentials, got:\n%s", view)
+	}
+	if !strings.Contains(view, "Catalog count appears after a saved key") {
+		t.Fatalf("expected key requirement hint without credentials, got:\n%s", view)
 	}
 }
 
@@ -77,6 +80,38 @@ func TestConfigGatewayRefreshTargetIndex_UsesFocusOnRefreshRow(t *testing.T) {
 	}
 }
 
+func TestFocusConfigActiveGateway_SelectsActiveRow(t *testing.T) {
+	hawkconfig.InvalidateConfigUICache()
+	store := &credentials.MapStore{}
+	credentials.SetDefaultStore(store)
+	t.Cleanup(func() {
+		credentials.SetDefaultStore(nil)
+		hawkconfig.InvalidateConfigUICache()
+	})
+	_ = store.Set(t.Context(), credentials.AccountForEnv("OPENROUTER_API_KEY"), "sk-or-test-key-1234567890")
+	hawkconfig.InvalidateConfigUICache()
+
+	sess := &engine.Session{}
+	sess.SetProvider("openrouter")
+	m := chatModel{
+		configTab:           configTabGateways,
+		session:             sess,
+		configModelProvider: "openrouter",
+	}
+	next := m.focusConfigActiveGateway()
+	rows := next.configGatewayRows()
+	active := next.activeGatewayRowIndex(rows)
+	if active < 0 {
+		t.Fatal("expected active gateway row")
+	}
+	if next.configSel != active {
+		t.Fatalf("configSel = %d, want active row %d", next.configSel, active)
+	}
+	if next.configScroll > next.configSel || next.configSel >= next.configScroll+configWindowSize {
+		t.Fatalf("active row not visible: sel=%d scroll=%d", next.configSel, next.configScroll)
+	}
+}
+
 func TestHandleConfigGatewaysSelect_NoKeyRedirectsToKeys(t *testing.T) {
 	hawkconfig.InvalidateConfigUICache()
 	store := &credentials.MapStore{}

cmd/chat_config_panel.go

@@ -303,7 +303,7 @@ func (m chatModel) configModelsBody() string {
 	rowStyle := configRowStyle()
 	cursorStyle := configSelectedStyle()
 	activeStyle := configActiveStyle()
-	freeStyle := lipgloss.NewStyle().Foreground(successTeal)
+	freeStyle := lipgloss.NewStyle().Foreground(doneGreen)
 
 	opts := m.configFilteredModelOptions()
 	total := len(opts)
@@ -647,8 +647,8 @@ func (m chatModel) selectConfigModelFromOptions(opts []configModelOption) (chatM
 	next = next.closeConfigPanel()
 	if !hawkconfig.EvaluateSetupCached(context.Background()).NeedsSetup {
 		next.messages = append(next.messages, displayMsg{
-			role:    "system",
-			content: fmt.Sprintf("Setup complete — chatting with %s", next.session.Model()),
+			role:    "setup_complete",
+			content: next.session.Model(),
 		})
 	}
 	return next, cmd

cmd/chat_config_tabs.go

@@ -141,5 +141,8 @@ func (m chatModel) openConfigAtTab(tab int) (chatModel, tea.Cmd) {
 		m.configNotice = "Select Add API key · press enter · paste your key"
 		m.configSel = 0
 	}
+	if tab == configTabGateways {
+		m = m.focusConfigActiveGateway()
+	}
 	return m, nil
 }

cmd/chat_config_ui.go

@@ -16,11 +16,9 @@ func configTitleStyle() lipgloss.Style {
 }
 
 func configSelectedStyle() lipgloss.Style {
-	// Brand orange (bold) — the selected item, matching the rest of
-	// the TUI's hawk voice. The title uses plain orange + bold so the
-	// selected item is visually heavier than the title, but the hue is
-	// the same.
-	return lipgloss.NewStyle().Foreground(hawkColor).Bold(true).Underline(true)
+	// Brand orange (bold) marks the focused row. Keep it distinct from
+	// the active/current value, which uses configActiveStyle.
+	return lipgloss.NewStyle().Foreground(hawkColor).Bold(true)
 }
 
 func configAccentStyle() lipgloss.Style {
@@ -81,10 +79,9 @@ func renderConfigStatusLine(m chatModel) string {
 }
 
 func configActiveStyle() lipgloss.Style {
-	// The current gateway/model name in the status line — pink to match
-	// the active-selection color so the "current" indicator and the
-	// "focus" indicator share a visual language.
-	return lipgloss.NewStyle().Foreground(hawkColor)
+	// Current gateway/model value. Teal keeps "active/current" separate
+	// from the orange cursor selection.
+	return lipgloss.NewStyle().Foreground(successTeal).Bold(true)
 }
 
 func configRowStyle() lipgloss.Style {
@@ -142,6 +139,10 @@ func renderConfigNotice(notice string) string {
 
 func (m chatModel) configHelpLine() string {
 	muted := configMutedStyle()
+	indent := strings.Repeat(" ", configTableIndent)
+	renderMainHelp := func(text string) string {
+		return muted.Render(indent + text)
+	}
 	if m.configSaving {
 		return muted.Render(m.spinner.View() + " working…")
 	}
@@ -156,15 +157,15 @@ func (m chatModel) configHelpLine() string {
 	}
 	if m.configTab == configTabKeys && m.configKeysPendingRemove != "" {
 		if m.configKeysRemoveStep >= 2 {
-			return muted.Render("enter again to permanently remove · esc cancel")
+			return renderMainHelp("enter again to permanently remove · esc cancel")
 		}
-		return muted.Render("enter continue · esc cancel")
+		return renderMainHelp("enter continue · esc cancel")
 	}
 	if m.configTab == configTabModels {
 		if m.configModelSearchActive {
-			return muted.Render("↑/↓ navigate · enter select · esc clear search")
+			return renderMainHelp("↑/↓ navigate · enter select · esc clear search")
 		}
-		return muted.Render("↑/↓ navigate · enter select · / search · esc close")
+		return renderMainHelp("↑/↓ navigate · enter select · / search · esc close")
 	}
-	return muted.Render("←/→ tabs · ↑/↓ · enter · esc close")
+	return renderMainHelp("←/→ tabs · ↑/↓ · enter · esc close")
 }

cmd/chat_status.go

@@ -149,10 +149,8 @@ func (m chatModel) renderConnectionStatusSplit() (modelRendered string, modelVis
 
 func renderChatConnectionModel(gateway, model string) (string, int) {
 	muted := configMutedStyle().Inline(true)
-	// Gateway (provider name) is rendered in agentGold so the user can
-	// tell it apart from the model, which is the brand orange focus.
-	gatewayStyle := lipgloss.NewStyle().Foreground(agentGold).Inline(true)
-	active := configActiveStyle().Inline(true) // model — brand orange
+	gatewayStyle := configAccentStyle().Inline(true)
+	active := configActiveStyle().Inline(true)
 	sep := muted.Render(" · ")
 	const sepVis = 3
 
@@ -301,7 +299,7 @@ func contextPercentColor(pct int) lipgloss.Color {
 	case pct >= 80:
 		return warnAmber
 	default:
-		return successTeal
+		return doneGreen
 	}
 }
 

cmd/chat_view.go

@@ -28,6 +28,24 @@ func (m chatModel) hasChatMessages() bool {
 	return false
 }
 
+func renderSetupCompleteMessage(model string) string {
+	success := lipgloss.NewStyle().Foreground(doneGreen).Bold(true).Inline(true)
+	muted := configMutedStyle().Inline(true)
+	active := configActiveStyle().Inline(true)
+	model = strings.TrimSpace(model)
+	if model == "" {
+		model = "selected model"
+	}
+	return lipgloss.JoinHorizontal(
+		lipgloss.Left,
+		success.Render("Setup complete"),
+		muted.Render(" · ready to chat with "),
+		active.Render(model),
+		muted.Render(" "),
+		success.Render("✓"),
+	)
+}
+
 // welcomeHeader returns the full logo before chat, then a one-line banner after.
 func (m chatModel) welcomeHeader() string {
 	if !m.showWelcomeBanner() {
@@ -337,6 +355,8 @@ func (m *chatModel) updateViewportContent() {
 		case "system":
 			sysWrapped := wrapText(msg.content, viewWidth-2, 0)
 			chatContent.WriteString(dimStyle.Render(sysWrapped))
+		case "setup_complete":
+			chatContent.WriteString(renderSetupCompleteMessage(msg.content))
 		case "permission":
 			chatContent.WriteString(renderPermissionBox(msg.content, viewWidth))
 		case "question":
@@ -415,28 +435,17 @@ func (m chatModel) View() string {
 			totalW = 80
 		}
 		slashOpen := m.slashMenuOpen()
-		var leftBold, leftDim string
-		leftBold, leftDim = containerFooterLeft(m)
+		leftRendered, leftVisLen := renderContainerFooterLeft(m)
 		modelRendered, modelVisLen, ctxRendered, ctxVisLen := m.renderConnectionStatusSplit()
 		const ctxSepVis = 3
 		rightVisLen := modelVisLen + ctxVisLen
 		if ctxVisLen > 0 && modelVisLen > 0 {
 			rightVisLen += ctxSepVis
 		}
-		leftPlain := leftBold + leftDim
-		leftVisLen := runewidth.StringWidth(leftPlain)
 		gap := totalW - leftVisLen - rightVisLen
 		if gap < 1 {
 			gap = 1
 		}
-		var leftRendered string
-		if m.containerEnabled && m.containerErr != nil {
-			leftRendered = containerErrStyle.Bold(true).Render(leftBold) + containerErrStyle.Render(leftDim)
-		} else if m.containerEnabled {
-			leftRendered = containerLabelStyle.Render(leftBold) + dimStyle.Render(leftDim)
-		} else {
-			leftRendered = lipgloss.NewStyle().Bold(true).Render(leftBold) + dimStyle.Render(leftDim)
-		}
 		rightLine := modelRendered
 		if ctxVisLen > 0 {
 			if modelVisLen > 0 {

cmd/model_table.go

@@ -188,7 +188,7 @@ func renderModelTableHeader(layout modelTableLayout, headerStyle, metaStyle lipg
 func renderModelTableRow(row modelTableRow, cursor, active bool, layout modelTableLayout, _, cursorStyle, activeStyle, metaStyle, freeStyle lipgloss.Style) string {
 	meta := metaStyle
 	priceStyle := metaStyle
-	if row.Free && !cursor && !active {
+	if row.Free {
 		priceStyle = freeStyle
 	}
 	if active && !cursor {
@@ -266,15 +266,15 @@ func truncateRunes(s string, maxCols int) string {
 	return b.String() + "…"
 }
 
-func modelTableScrollHint(above, below int, muted lipgloss.Style) string {
+func modelTableScrollHint(above, below int, style lipgloss.Style) string {
 	prefix := strings.Repeat(" ", modelTableIndent)
 	switch {
 	case above > 0 && below > 0:
-		return muted.Render(fmt.Sprintf("%s↑ %d above · ↓ %d below", prefix, above, below))
+		return style.Render(fmt.Sprintf("%s↑ %d above · ↓ %d below", prefix, above, below))
 	case above > 0:
-		return muted.Render(fmt.Sprintf("%s↑ %d above", prefix, above))
+		return style.Render(fmt.Sprintf("%s↑ %d above", prefix, above))
 	case below > 0:
-		return muted.Render(fmt.Sprintf("%s↓ %d below", prefix, below))
+		return style.Render(fmt.Sprintf("%s↓ %d below", prefix, below))
 	default:
 		return ""
 	}

cmd/statusbar.go

@@ -69,7 +69,7 @@ func renderStatusBarRight(m *chatModel) (rendered string, visLen int) {
 
 	tokenStyle := lipgloss.NewStyle().Foreground(statusTokenColor).Inline(true)
 	costStyle := lipgloss.NewStyle().Foreground(statusCostColor).Inline(true)
-	timeStyle := lipgloss.NewStyle().Foreground(tealColor).Inline(true)
+	timeStyle := lipgloss.NewStyle().Foreground(hudLabelPink).Inline(true)
 	dim := lipgloss.NewStyle().Foreground(dimColor).Inline(true)
 
 	tokens := m.session.Cost.PromptTokens + m.session.Cost.CompletionTokens
@@ -146,6 +146,35 @@ func formatTokenCountWithCommas(tokens int) string {
 	return p.Sprintf("%d tokens", tokens)
 }
 
+func renderContainerFooterLeft(m chatModel) (rendered string, visLen int) {
+	bold, dim := containerFooterLeft(m)
+	visLen = runewidth.StringWidth(bold + dim)
+
+	if m.containerEnabled && m.containerErr != nil {
+		return containerErrStyle.Bold(true).Render(bold) + containerErrStyle.Render(dim), visLen
+	}
+	if m.containerEnabled {
+		return containerLabelStyle.Render(bold) + renderContainerFooterDetail(dim), visLen
+	}
+
+	labelStyle := lipgloss.NewStyle().Foreground(warnAmber).Bold(true)
+	return labelStyle.Render(bold) + dimStyle.Render(dim), visLen
+}
+
+func renderContainerFooterDetail(detail string) string {
+	if detail == "" {
+		return ""
+	}
+	statusStyle := lipgloss.NewStyle().Foreground(textPlaceholder).Inline(true)
+	okStyle := lipgloss.NewStyle().Foreground(doneGreen).Inline(true)
+	sep := " · "
+	status, ok, found := strings.Cut(detail, sep)
+	if !found {
+		return statusStyle.Render(detail)
+	}
+	return statusStyle.Render(status) + configMutedStyle().Inline(true).Render(sep) + okStyle.Render(ok)
+}
+
 // containerFooterLeft is the bold + dim text on the top footer row (left side).
 func containerFooterLeft(m chatModel) (bold, dim string) {
 	if !m.containerEnabled {

cmd/theme.go

@@ -35,10 +35,8 @@ var hawkColor = lipgloss.Color("#FF5E0E")
 // 2. UI state
 // ---------------------------------------------------------------------------
 
-// (No separate active-selection color — the selected item uses the
-// brand hawk orange so the entire TUI stays on one accent. The title
-// and the selected item share hawkColor; the selected item is
-// distinguished by bold + underline.)
+// The selected/focused item uses brand orange. Active/current values use
+// configActiveStyle so they remain visually distinct from the cursor.
 
 // ---------------------------------------------------------------------------
 // 3. Semantic feedback