Fix Hawk CI lint and ACP test

Patel230 · Patel230 · commit f497a4cea984 · 2026-06-04T07:50:56.000+05:30
diff --git a/cmd/braille_spinner.go b/cmd/braille_spinner.go
@@ -30,9 +30,6 @@ var hawkSpinnerGlyphs = []string{"◐", "◓", "◑", "◒"}
 // hawkQuadBlockGlyphs is the legacy QUADBLOCK animation (kept for tests / bubbles compat).
 var hawkQuadBlockGlyphs = []string{"▛", "▜", "▟", "▙"}
 
-// hawkSpinnerBG is the chat viewport background (chat_view.go).
-var hawkSpinnerBG = [3]int{30, 30, 40}
-
 // spinnerFrames maps style names to their animation frames.
 var spinnerFrames = map[SpinnerStyle][]string{
 	SpinnerBraille:     {"⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"},
diff --git a/cmd/chat_focus.go b/cmd/chat_focus.go
@@ -83,13 +83,6 @@ func (m chatModel) scrollPositionLabel() string {
 	return fmt.Sprintf("%d-%d/%d", top, bottom, m.contentLines)
 }
 
-func (m chatModel) uiFocusLabel() string {
-	if m.inScrollbackFocus() {
-		return "scrollback"
-	}
-	return "prompt"
-}
-
 func formatSessionContextUsage(m *chatModel) string {
 	if m == nil || m.session == nil {
 		return "No active session."
@@ -136,6 +129,6 @@ func (m chatModel) renderScrollbackFocusBar(width int) string {
 	if width < len(hint)+4 {
 		width = len(hint) + 4
 	}
-	style := lipgloss.NewStyle().Foreground(infoSky).Bold(true).Inline(true)
+	style := lipgloss.NewStyle().Foreground(infoSky).Bold(true).Inline(true).Width(width)
 	return style.Render("  " + hint)
 }
diff --git a/cmd/chat_model.go b/cmd/chat_model.go
@@ -47,12 +47,9 @@ var (
 	containerErrStyle   = lipgloss.NewStyle().Foreground(errorCoral)
 	containerLabelStyle = lipgloss.NewStyle().Foreground(containerBlue)
 
-	// Backwards-compatible aliases for callers that still use the old
-	// names. New code should use the purpose-named constants in theme.go.
-	tealColor  = successTeal
-	dimColor   = textDisabled
-	errorColor = errorCoral
-	toolColor  = toolGold
+	// Backwards-compatible alias for callers that still use the old name.
+	// New code should use the purpose-named constants in theme.go.
+	dimColor = textDisabled
 )
 
 // hawkSpinnerFrames feeds the bubbles spinner (matches BrailleSpinner default).
@@ -205,7 +202,6 @@ type chatModel struct {
 	uiFocus             uiFocusArea
 	contentLines        int // total lines in scrollback content (for footer position)
 	vim                 *VimState
-	contextViz          *ContextVisualization
 	wal                 *session.WAL
 	startedAt           time.Time // per-turn timer (spinner + turn elapsed)
 	sessionStartedAt    time.Time // whole chat session (footer duration)
diff --git a/cmd/chat_status.go b/cmd/chat_status.go
@@ -339,17 +339,6 @@ func formatContextUsedLabel(tokens int) string {
 	return formatModelTableContext(tokens)
 }
 
-func contextUsageStyle(pct int) lipgloss.Style {
-	switch {
-	case pct >= 95:
-		return lipgloss.NewStyle().Foreground(errorCoral).Inline(true)
-	case pct >= 80:
-		return lipgloss.NewStyle().Foreground(warnAmber).Inline(true)
-	default:
-		return configMutedStyle().Inline(true)
-	}
-}
-
 // chatBottomRightStatus is the deployment line on the input bar.
 func (m *chatModel) chatBottomRightStatus() string {
 	return m.chatConnectionStatus()
diff --git a/cmd/chat_view.go b/cmd/chat_view.go
@@ -46,14 +46,6 @@ func renderSetupCompleteMessage(model string) string {
 	)
 }
 
-// welcomeHeader returns the welcome text for /config overlay only (main TUI uses a fixed pane).
-func (m chatModel) welcomeHeader() string {
-	if !m.showWelcomeBanner() {
-		return ""
-	}
-	return m.welcomeCache + "\n\n"
-}
-
 // sanitizeIdentity replaces model self-identifications with "hawk" / "GrayCode AI".
 var (
 	reModelName = regexp.MustCompile(`(?i)\b(I['` + "\u2018\u2019" + `]m|I am|my name is)\s+\*{0,2}(ChatGPT|GPT-?\d*[o]?|Claude|Gemini|Gemma|Kimi|DeepSeek|Llama|Qwen|Mistral|Mixtral|Grok|Copilot|Bard|Command R|Yi|Phi|Nova|Titan|BLOOM|Falcon|PaLM|LaMDA|Chinchilla|Vicuna|Alpaca|WizardLM|Orca|Nemotron|Granite|DBRX|OLMo|Pixtral|Ernie|PanGu|Sarvam|MiMo|GLM|Codex|Jurassic|Cohere|Jais|Step|Velvet|Alice|Apertus|Param|YandexGPT|MiniMax)\*{0,2}`)
diff --git a/cmd/compact_ui.go b/cmd/compact_ui.go
@@ -231,12 +231,12 @@ func runManualCompactCmd(ctx context.Context, sess *engine.Session) tea.Cmd {
 			return compactDoneMsg{err: fmt.Errorf("no session")}
 		}
 		before := sess.MessageCount()
-		strat, tokBefore, tokAfter, err := sess.CompactConversation(ctx)
+		compactStrategy, tokBefore, tokAfter, err := sess.CompactConversation(ctx)
 		if errors.Is(ctx.Err(), context.DeadlineExceeded) && err == nil {
 			err = ctx.Err()
 		}
 		return compactDoneMsg{
-			strategy:     strat,
+			strategy:     compactStrategy,
 			tokensBefore: tokBefore,
 			tokensAfter:  tokAfter,
 			err:          err,
diff --git a/cmd/config_table.go b/cmd/config_table.go
@@ -106,15 +106,6 @@ func renderConfigTableRow(values []string, cursor, active, markEnd bool, layout
 	return prefix + renderConfigTableLine(cols, layout, styles)
 }
 
-func renderConfigTableActionRow(label string, cursor bool, rowStyle, cursorStyle lipgloss.Style) string {
-	prefix := strings.Repeat(" ", configTableIndent)
-	if cursor {
-		prefix = strings.Repeat(" ", configTableIndent-2) + cursorStyle.Render(iconPrompt) + " "
-		return prefix + cursorStyle.Render(label)
-	}
-	return rowStyle.Render(prefix + label)
-}
-
 func renderConfigTableLine(values []string, layout configTableLayout, styles []lipgloss.Style) string {
 	parts := make([]string, len(values))
 	for i, v := range values {
diff --git a/cmd/statusbar.go b/cmd/statusbar.go
@@ -169,7 +169,7 @@ func renderContainerFooterDetail(detail string, sess *engine.Session) string {
 	if !found {
 		return statusStyle.Render(detail)
 	}
-	level := DefaultContainerAutonomy
+	var level engine.AutonomyLevel
 	if sess != nil && sess.Autonomy != 0 {
 		level = sess.Autonomy
 	} else {
diff --git a/cmd/theme.go b/cmd/theme.go
@@ -189,9 +189,6 @@ const (
 	// message in the viewport.
 	iconAssistantPrefix = "⛬"
 
-	// Tool result / error bullet (used in the non-TUI exit dump).
-	iconToolBullet = "●"
-
 	// Typing indicator dots — one filled, two empty. See braille_spinner.go.
 	iconDotFilled = "▪"
 	iconDotEmpty  = "▫"
@@ -202,15 +199,6 @@ const (
 	// Warning / permission prompt prefix.
 	iconWarn = "⚠"
 
-	// Tool / skill activation indicator.
-	iconTool = "⚡"
-
-	// Markdown bullet.
-	iconBullet = "•"
-
-	// Star (used in config tabs to mark "highlighted" rows).
-	iconStar = "★"
-
 	// quitFooterHint — exit hint in splash/footer chrome (work TUI uses double Ctrl+C).
 	quitFooterHint = "ctrl+c · quit"
 
diff --git a/cmd/welcome_banner.go b/cmd/welcome_banner.go
@@ -50,17 +50,6 @@ const welcomeToBannerMinWidth = 61
 // welcomeToPhraseMinWidth is the visible width for the combined "WELCOME TO" block.
 var welcomeToPhraseMinWidth = blockLinesWidth(welcomeToPhraseLines)
 
-// welcomeGateBannerWidth returns the widest row across WELCOME + TO blocks.
-func welcomeGateBannerWidth() int {
-	w := welcomeToPhraseMinWidth
-	for _, line := range welcomeToWordLines {
-		if n := runewidth.StringWidth(line); n > w {
-			w = n
-		}
-	}
-	return w
-}
-
 func composeHawkBlockLines(text string) []string {
 	rows := make([]string, 5)
 	words := strings.Fields(text)
diff --git a/cmd/welcome_gate.go b/cmd/welcome_gate.go
@@ -46,27 +46,6 @@ func (m chatModel) gateActionHint() (primary string, needsSetup bool) {
 	return "Press Enter to start", false
 }
 
-func welcomeGateRule(width int) string {
-	const ornament = " · "
-	ruleW := width - 4
-	if ruleW > 56 {
-		ruleW = 56
-	}
-	if ruleW < len(ornament)+8 {
-		ruleW = len(ornament) + 8
-	}
-	side := (ruleW - len(ornament)) / 2
-	if side < 2 {
-		side = 2
-	}
-	rule := strings.Repeat("─", side) + ornament + strings.Repeat("─", ruleW-side-len(ornament))
-	return lipgloss.NewStyle().
-		Width(width).
-		Align(lipgloss.Center).
-		Foreground(borderDim).
-		Render(rule)
-}
-
 func (m chatModel) renderWelcomeGateActionRow(width int) string {
 	primary, needsSetup := m.gateActionHint()
 	textStyle := lipgloss.NewStyle().Foreground(hudLabelPink).Bold(true).Inline(true)
diff --git a/internal/acp/server_test.go b/internal/acp/server_test.go
@@ -18,7 +18,7 @@ import (
 // so prompts complete without a real provider.
 func testFactory() (*engine.Session, error) {
 	registry := tool.NewRegistry(tool.FileReadTool{})
-	s := engine.NewSession("", "", "test", registry)
+	s := engine.NewSession("test", "mock-model", "test", registry)
 	s.SetTestClient(engine.NewMockClientForTest())
 	return s, nil
 }
diff --git a/internal/config/xiaomi_setup.go b/internal/config/xiaomi_setup.go
@@ -63,9 +63,7 @@ func XiaomiTokenPlanRegionLabel() string {
 
 // ApplyXiaomiTokenPlanRegionEnv sets process env from provider.json before credential probe.
 func ApplyXiaomiTokenPlanRegionEnv(ctx context.Context) {
-	if ctx == nil {
-		ctx = context.Background()
-	}
+	_ = ctx
 	cfg := eyriecfg.LoadProviderConfig("")
 	if cfg == nil {
 		return
diff --git a/internal/engine/compact_provider_native.go b/internal/engine/compact_provider_native.go
@@ -142,7 +142,7 @@ func anthropicNativeCompact(ctx context.Context, sess *Session, tokensBefore int
 	if err != nil {
 		return nil, err
 	}
-	defer resp.Body.Close()
+	defer func() { _ = resp.Body.Close() }()
 	respBody, _ := io.ReadAll(resp.Body)
 	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
 		return nil, fmt.Errorf("anthropic compaction HTTP %d: %s", resp.StatusCode, truncateErrBody(respBody))
diff --git a/internal/engine/context_governor.go b/internal/engine/context_governor.go
@@ -113,8 +113,8 @@ func (s *Session) ManageContextBeforeTurn(ctx context.Context) (strategy string,
 	s.messages = ctxmgr.CollapseRepeatedMessages(s.messages)
 
 	s.EnsureAutoCompactor()
-	if strat, ok := s.AutoCompactor.AutoCompactIfNeeded(ctx, s); ok {
-		return strat, true // recordCompaction emitted inside AutoCompactIfNeeded
+	if compactStrategy, ok := s.AutoCompactor.AutoCompactIfNeeded(ctx, s); ok {
+		return compactStrategy, true // recordCompaction emitted inside AutoCompactIfNeeded
 	}
 
 	if len(s.messages) > maxContextMessages {
diff --git a/internal/engine/stream.go b/internal/engine/stream.go
@@ -173,15 +173,15 @@ func (s *Session) agentLoop(ctx context.Context, ch chan<- StreamEvent) {
 		if s.WillCompactBeforeTurn() {
 			ch <- StreamEvent{Type: "compact_start"}
 		}
-		if strat, didCompact := s.ManageContextBeforeTurn(ctx); didCompact {
+		if compactStrategy, didCompact := s.ManageContextBeforeTurn(ctx); didCompact {
 			tokensAfter := EstimateTokens(s.messages)
 			s.log.Info("context compacted", map[string]interface{}{
-				"strategy": strat,
+				"strategy": compactStrategy,
 				"messages": len(s.messages),
 			})
 			ch <- StreamEvent{
 				Type:         "compact",
-				Content:      strat,
+				Content:      compactStrategy,
 				TokensBefore: tokensBefore,
 				TokensAfter:  tokensAfter,
 			}

Original file line number	Diff line number	Diff line change
`@@ -46,14 +46,6 @@ func renderSetupCompleteMessage(model string) string {`
`46`	`46`	`)`
`47`	`47`	`}`
`48`	`48`
`49`		`-// welcomeHeader returns the welcome text for /config overlay only (main TUI uses a fixed pane).`
`50`		`-func (m chatModel) welcomeHeader() string {`
`51`		`- if !m.showWelcomeBanner() {`
`52`		`- return ""`
`53`		`- }`
`54`		`- return m.welcomeCache + "\n\n"`
`55`		`-}`
`56`		`-`
`57`	`49`	`// sanitizeIdentity replaces model self-identifications with "hawk" / "GrayCode AI".`
`58`	`50`	`var (`
`59`	`51`	reModelName = regexp.MustCompile(`(?i)\b(I['` + "\u2018\u2019" + `]m\|I am\|my name is)\s+\{0,2}(ChatGPT\|GPT-?\d[o]?\|Claude\|Gemini\|Gemma\|Kimi\|DeepSeek\|Llama\|Qwen\|Mistral\|Mixtral\|Grok\|Copilot\|Bard\|Command R\|Yi\|Phi\|Nova\|Titan\|BLOOM\|Falcon\|PaLM\|LaMDA\|Chinchilla\|Vicuna\|Alpaca\|WizardLM\|Orca\|Nemotron\|Granite\|DBRX\|OLMo\|Pixtral\|Ernie\|PanGu\|Sarvam\|MiMo\|GLM\|Codex\|Jurassic\|Cohere\|Jais\|Step\|Velvet\|Alice\|Apertus\|Param\|YandexGPT\|MiniMax)\*{0,2}`)
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ func renderContainerFooterDetail(detail string, sess *engine.Session) string {`
`169`	`169`	`if !found {`
`170`	`170`	`return statusStyle.Render(detail)`
`171`	`171`	`}`
`172`		`- level := DefaultContainerAutonomy`
	`172`	`+ var level engine.AutonomyLevel`
`173`	`173`	`if sess != nil && sess.Autonomy != 0 {`
`174`	`174`	`level = sess.Autonomy`
`175`	`175`	`} else {`