Fix CI formatting and toolchain hygiene

Patel230 · Patel230 · commit c49476cd6f4a · 2026-06-04T07:29:44.000+05:30
diff --git a/.github/actions/setup-deps/action.yml b/.github/actions/setup-deps/action.yml
@@ -41,4 +41,4 @@ runs:
     - name: Create workspace
       shell: bash
       run: |
-        printf 'go 1.26.3\n\nuse (\n\t.\n\t./external/eyrie\n\t./external/inspect\n\t./external/sight\n\t./external/tok\n\t./external/trace\n\t./external/yaad\n)\n' > go.work
+        printf 'go 1.26.4\n\nuse (\n\t.\n\t./external/eyrie\n\t./external/inspect\n\t./external/sight\n\t./external/tok\n\t./external/trace\n\t./external/yaad\n)\n' > go.work
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  GO_VERSION: "1.26.3"
+  GO_VERSION: "1.26.4"
 
 jobs:
   # -------------------------------------------------------------------------
@@ -260,7 +260,7 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
       - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c
         with:
-          go-version: "1.26.3"
+          go-version: "1.26.4"
           cache: true
       - name: deadcode
         run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
         with:
-          go-version: "1.26.3"
+          go-version: "1.26.4"
           cache: true
 
       - name: Run GoReleaser
diff --git a/Dockerfile b/Dockerfile
@@ -1,19 +1,16 @@
 # Build stage
-FROM golang:1.26.3-alpine AS builder
+FROM golang:1.26.4-alpine AS builder
 
 RUN apk add --no-cache git ca-certificates tzdata
 
 WORKDIR /build
 
-# Clone eyrie (unpublished dependency with local-only packages)
-RUN git clone --depth=1 https://github.com/GrayCodeAI/eyrie.git /eyrie
-
 COPY go.mod go.sum ./
 RUN go mod download
 
 COPY . .
 # Add replace after source copy so it doesn't get overwritten
-RUN echo "" >> go.mod && echo "replace github.com/GrayCodeAI/eyrie => /eyrie" >> go.mod && go mod tidy
+RUN echo "" >> go.mod && echo "replace github.com/GrayCodeAI/eyrie => ./external/eyrie" >> go.mod && go mod tidy
 
 RUN CGO_ENABLED=0 GOOS=linux go build -trimpath -mod=mod \
     -ldflags="-s -w -X main.Version=$(git describe --tags --always 2>/dev/null || echo dev)" \
diff --git a/ai_passage.md b/ai_passage.md
@@ -51,4 +51,3 @@ Artificial Intelligence represents one of the most significant technological rev
 As we continue to develop and deploy AI systems, we must remain mindful of our values and aspirations as a society. Technology is not deterministic—we have the agency to shape how AI develops and how it is used. By approaching AI with both enthusiasm for its possibilities and seriousness about its risks, we can work toward a future where artificial intelligence serves to augment human potential and contribute to the flourishing of our species.
 
 The story of AI is still being written, and we are all authors of that story. The choices we make today about research priorities, ethical guidelines, regulatory frameworks, and educational investments will determine whether AI becomes a force for broad human betterment or a source of increased inequality and social tension. The technology itself is neutral; what matters is how we choose to wield it.
-
diff --git a/cmd/autonomy_tiers.go b/cmd/autonomy_tiers.go
@@ -126,4 +126,4 @@ func autonomyFromSettings(n int) engine.AutonomyLevel {
 	default:
 		return 0
 	}
-}
+}
diff --git a/cmd/autonomy_tiers_copy_test.go b/cmd/autonomy_tiers_copy_test.go
@@ -38,4 +38,4 @@ func TestFormatAutonomyTierMessage_NoArrowJargon(t *testing.T) {
 	if !strings.Contains(msg, "Run") {
 		t.Fatalf("expected tier name in message, got %q", msg)
 	}
-}
+}
diff --git a/cmd/autonomy_tiers_test.go b/cmd/autonomy_tiers_test.go
@@ -55,4 +55,4 @@ func TestAutonomyTierColorsDistinct(t *testing.T) {
 		}
 		seen[c] = true
 	}
-}
+}
diff --git a/cmd/chat_config_constants.go b/cmd/chat_config_constants.go
@@ -17,10 +17,10 @@ var configTabLabels = []string{"Gateways", "Models"}
 
 // Config entry overlays (configEntry).
 const (
-	configEntryNone        = ""
-	configEntryAPIKeyPaste = "apikey-paste"
-	configEntryOllamaURL   = "ollama-url"
-	configEntryKeyView     = "key-view"
+	configEntryNone         = ""
+	configEntryAPIKeyPaste  = "apikey-paste"
+	configEntryOllamaURL    = "ollama-url"
+	configEntryKeyView      = "key-view"
 	configEntryXiaomiRegion = "xiaomi-region"
 )
 
@@ -29,4 +29,4 @@ const (
 	configProviderOllama = "ollama"
 )
 
-const configDefaultOllamaURL = "http://localhost:11434/v1"
+const configDefaultOllamaURL = "http://localhost:11434/v1"
diff --git a/cmd/chat_config_deployment.go b/cmd/chat_config_deployment.go
@@ -223,4 +223,4 @@ func (m chatModel) rebuildSessionTransport() (chatModel, tea.Cmd) {
 	syncSessionFromPersistedSelection(m.session, m.settings)
 	m.invalidateConnStatus()
 	return m, nil
-}
+}
diff --git a/cmd/chat_config_gateways.go b/cmd/chat_config_gateways.go
@@ -206,7 +206,7 @@ func (m chatModel) configGatewaysView() string {
 		if targetIdx >= 0 && targetIdx < len(rows) && rows[targetIdx].ID == hawkconfig.ProviderXiaomiTokenPlan {
 			hint = "Token Plan: enter pick region (cn/sgp/ams) then key · g change region"
 		}
-		b.WriteString("\n" + mutedStyle.Render(indent + hint))
+		b.WriteString("\n" + mutedStyle.Render(indent+hint))
 	} else {
 		hints := "enter use gateway · k view key · delete remove · r refresh"
 		if targetIdx >= 0 && targetIdx < len(rows) && rows[targetIdx].ID == hawkconfig.ProviderXiaomiTokenPlan {
diff --git a/cmd/chat_config_keys.go b/cmd/chat_config_keys.go
@@ -172,4 +172,4 @@ func (m chatModel) handleConfigKeyViewKey(msg tea.KeyMsg) (chatModel, tea.Cmd) {
 		return m, nil
 	}
 	return m, nil
-}
+}
diff --git a/cmd/chat_config_keys_test.go b/cmd/chat_config_keys_test.go
@@ -4,9 +4,9 @@ import (
 	"strings"
 	"testing"
 
-	tea "github.com/charmbracelet/bubbletea"
 	"github.com/GrayCodeAI/eyrie/credentials"
 	hawkconfig "github.com/GrayCodeAI/hawk/internal/config"
+	tea "github.com/charmbracelet/bubbletea"
 )
 
 func TestConfigGatewaysView_KeyHintsWithCredentials(t *testing.T) {
@@ -139,4 +139,4 @@ func TestOpenConfigRemoveKeyPanel_OpensGatewaysTab(t *testing.T) {
 	if next.configNotice != "No stored API keys" {
 		t.Fatalf("notice = %q", next.configNotice)
 	}
-}
+}
diff --git a/cmd/chat_config_remove_test.go b/cmd/chat_config_remove_test.go
@@ -84,4 +84,4 @@ func TestConfigTabLabels(t *testing.T) {
 	if len(configTabLabels) != 2 || configTabLabels[0] != "Gateways" {
 		t.Fatalf("tabs = %v", configTabLabels)
 	}
-}
+}
diff --git a/cmd/chat_config_save_flow_test.go b/cmd/chat_config_save_flow_test.go
@@ -6,9 +6,9 @@ import (
 	"strings"
 	"testing"
 
-	tea "github.com/charmbracelet/bubbletea"
 	"github.com/GrayCodeAI/eyrie/credentials"
 	hawkconfig "github.com/GrayCodeAI/hawk/internal/config"
+	tea "github.com/charmbracelet/bubbletea"
 )
 
 func TestFinishConfigEntry_APIKeyPaste_SavesBeforeProbe(t *testing.T) {
@@ -163,4 +163,4 @@ func TestHandleConfigKey_EnterOnPasteSubmits(t *testing.T) {
 	if next.configEntry != configEntryNone {
 		t.Fatalf("entry should close on submit, got %q", next.configEntry)
 	}
-}
+}
diff --git a/cmd/chat_config_tabs_test.go b/cmd/chat_config_tabs_test.go
@@ -43,4 +43,4 @@ func TestOpenConfigPanel_FirstRunOpensGateways(t *testing.T) {
 	if !strings.Contains(next.configNotice, "Select a gateway") {
 		t.Fatalf("notice = %q", next.configNotice)
 	}
-}
+}
diff --git a/cmd/chat_config_xiaomi.go b/cmd/chat_config_xiaomi.go
@@ -117,4 +117,4 @@ func (m chatModel) handleConfigXiaomiRegionKey(msg tea.KeyMsg) (chatModel, tea.C
 	default:
 		return m, nil
 	}
-}
+}
diff --git a/cmd/chat_config_xiaomi_test.go b/cmd/chat_config_xiaomi_test.go
@@ -51,4 +51,4 @@ func TestHandleConfigGatewaysSelect_TokenPlanNoKeyShowsRegionPicker(t *testing.T
 	if next.configEntry != configEntryXiaomiRegion {
 		t.Fatalf("entry = %q, want region picker", next.configEntry)
 	}
-}
+}
diff --git a/cmd/chat_focus.go b/cmd/chat_focus.go
@@ -138,4 +138,4 @@ func (m chatModel) renderScrollbackFocusBar(width int) string {
 	}
 	style := lipgloss.NewStyle().Foreground(infoSky).Bold(true).Inline(true)
 	return style.Render("  " + hint)
-}
+}
diff --git a/cmd/chat_focus_test.go b/cmd/chat_focus_test.go
@@ -37,4 +37,4 @@ func TestRouteKeyToViewport_ScrollbackFocus(t *testing.T) {
 	if !m.routeKeyToViewport(tea.KeyMsg{Type: tea.KeyUp}) {
 		t.Fatal("up should scroll in scrollback focus")
 	}
-}
+}
diff --git a/cmd/chat_layout_test.go b/cmd/chat_layout_test.go
@@ -40,4 +40,4 @@ func TestView_PinsWelcomeAboveViewport(t *testing.T) {
 	if !strings.Contains(got, "Default") && !strings.Contains(got, "Container:") {
 		t.Fatalf("footer should be present at bottom")
 	}
-}
+}
diff --git a/cmd/chat_scrollbar.go b/cmd/chat_scrollbar.go
@@ -19,4 +19,4 @@ func (m chatModel) chatViewportWidth(totalWidth int) int {
 
 func (m chatModel) renderChatPane() string {
 	return m.viewport.View()
-}
+}
diff --git a/cmd/chat_scrollbar_test.go b/cmd/chat_scrollbar_test.go
@@ -39,4 +39,4 @@ func TestChatViewportWidth_FullTerminalWidth(t *testing.T) {
 
 func viewportWithSize(width, height int) viewport.Model {
 	return viewport.New(width, height)
-}
+}
diff --git a/cmd/chat_submit.go b/cmd/chat_submit.go
@@ -128,4 +128,4 @@ func (m chatModel) submitUserMessage() (chatModel, tea.Cmd) {
 	m.partial.Reset()
 	m.startStream()
 	return m, nil
-}
+}
diff --git a/cmd/chat_viewport.go b/cmd/chat_viewport.go
@@ -62,4 +62,4 @@ func (m *chatModel) applyViewportScroll(msg tea.KeyMsg) (bool, tea.Cmd) {
 		m.streamFollow = false
 	}
 	return true, cmd
-}
+}
diff --git a/cmd/chat_viewport_test.go b/cmd/chat_viewport_test.go
@@ -39,4 +39,4 @@ func TestWelcomeHeader_AlwaysFull(t *testing.T) {
 	if !strings.Contains(got, "HAWK LOGO") {
 		t.Fatalf("welcome should remain in fixed pane: %q", got)
 	}
-}
+}
diff --git a/cmd/compact_ui.go b/cmd/compact_ui.go
@@ -244,4 +244,4 @@ func runManualCompactCmd(ctx context.Context, sess *engine.Session) tea.Cmd {
 			afterCount:   sess.MessageCount(),
 		}
 	}
-}
+}
diff --git a/cmd/compact_ui_test.go b/cmd/compact_ui_test.go
@@ -57,4 +57,4 @@ func TestFormatContextPercentLabel(t *testing.T) {
 	if got := formatContextPercentLabel(50_000, 100_000); got != "50%" {
 		t.Fatalf("half usage = %q, want 50%%", got)
 	}
-}
+}
diff --git a/cmd/footer_layout.go b/cmd/footer_layout.go
@@ -105,4 +105,4 @@ func formatTokenCountCompact(tokens int) string {
 		return fmt.Sprintf("%dk", (tokens+500)/1000)
 	}
 	return fmt.Sprintf("%d", tokens)
-}
+}
diff --git a/cmd/footer_layout_clip_test.go b/cmd/footer_layout_clip_test.go
@@ -83,4 +83,4 @@ func TestLayoutFooterRow_StyledRowNeverExceedsTarget(t *testing.T) {
 		}
 		t.Logf("row exceeds width but tokens kept: rowW=%d", rowW)
 	}
-}
+}
diff --git a/cmd/footer_layout_width_test.go b/cmd/footer_layout_width_test.go
@@ -64,4 +64,4 @@ func TestLayoutFooterRow_LipglossMatchesRunewidthOnPlain(t *testing.T) {
 		t.Fatalf("layout width mismatch: lipgloss=%d runewidth=%d",
 			lipgloss.Width(row), runewidth.StringWidth(row))
 	}
-}
+}
diff --git a/cmd/footer_lipgloss_width_test.go b/cmd/footer_lipgloss_width_test.go
@@ -15,4 +15,4 @@ func TestLayoutFooterRow_NarrowRightBlockStillShowsBullet(t *testing.T) {
 			t.Fatalf("remain=%d dropped tokens: %q", remain, rb)
 		}
 	}
-}
+}
diff --git a/cmd/spinner_wave.go b/cmd/spinner_wave.go
@@ -98,4 +98,4 @@ func frameContainsSpinnerWave(s string) bool {
 	c := spinnerWaveColors[0]
 	needle := fmt.Sprintf("38;2;%d;%d;%d", c[0], c[1], c[2])
 	return strings.Contains(s, needle)
-}
+}
diff --git a/cmd/spinner_wave_test.go b/cmd/spinner_wave_test.go
@@ -60,4 +60,4 @@ func TestSpinnerWave_GlyphUsesWaveColor(t *testing.T) {
 func fmtSpinnerWaveNeedle(index int) string {
 	c := spinnerWaveColors[index%spinnerWaveLen]
 	return fmt.Sprintf("38;2;%d;%d;%d", c[0], c[1], c[2])
-}
+}
diff --git a/cmd/statusbar_test.go b/cmd/statusbar_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/charmbracelet/lipgloss"
 	"github.com/GrayCodeAI/hawk/internal/engine"
+	"github.com/charmbracelet/lipgloss"
 )
 
 func TestRenderStatusBar_SignatureExists(t *testing.T) {
diff --git a/cmd/theme.go b/cmd/theme.go
@@ -74,10 +74,12 @@ var doneGreen = lipgloss.Color("#4CAF50")
 var containerBlue = lipgloss.Color("#3BAADA")
 
 // Autonomy tier colors (Inspect → Edit → Run → Trust), coolest to hottest.
-var tierInspect = lipgloss.Color("#75B1E2") // infoSky — read-only
-var tierEdit    = lipgloss.Color("#4ECDC4") // successTeal — default work
-var tierRun     = lipgloss.Color("#FFB347") // warnAmber — shell
-var tierTrust   = lipgloss.Color("#FF6B6B") // errorCoral — minimal gates
+var (
+	tierInspect = lipgloss.Color("#75B1E2") // infoSky — read-only
+	tierEdit    = lipgloss.Color("#4ECDC4") // successTeal — default work
+	tierRun     = lipgloss.Color("#FFB347") // warnAmber — shell
+	tierTrust   = lipgloss.Color("#FF6B6B") // errorCoral — minimal gates
+)
 
 // ---------------------------------------------------------------------------
 // 5. HUD overlay
diff --git a/external/eyrie b/external/eyrie
@@ -1 +1 @@
-Subproject commit 415a0530bffd54969e7d84504f5801c0c05f09fe
+Subproject commit 20c71690e23e2afa832bf3e174757c7a8fa05247
diff --git a/go.mod b/go.mod
diff --git a/go.work b/go.work
@@ -1,4 +1,4 @@
-go 1.26.3
+go 1.26.4
 
 use (
 	.
diff --git a/internal/config/xiaomi_setup.go b/internal/config/xiaomi_setup.go
@@ -76,4 +76,4 @@ func ApplyXiaomiTokenPlanRegionEnv(ctx context.Context) {
 	if base, err := eyriecfg.ResolveXiaomiOpenAIBase(ProviderXiaomiTokenPlan, cfg); err == nil && base != "" {
 		_ = os.Setenv(eyriecfg.EnvXiaomiTokenPlanBaseURL, base)
 	}
-}
+}
diff --git a/internal/config/xiaomi_setup_test.go b/internal/config/xiaomi_setup_test.go
@@ -11,8 +11,8 @@ func TestSetXiaomiTokenPlanRegion_ClearsStaleBaseHost(t *testing.T) {
 	dir := t.TempDir()
 	t.Setenv("HAWK_CONFIG_DIR", dir)
 	cfg := &eyriecfg.ProviderConfig{
-		Version:                   "2",
-		XiaomiMimoTokenPlanRegion: "cn",
+		Version:                    "2",
+		XiaomiMimoTokenPlanRegion:  "cn",
 		XiaomiMimoTokenPlanBaseURL: "https://token-plan-cn.xiaomimimo.com/v1",
 	}
 	if err := eyriecfg.SaveProviderConfig(cfg, ""); err != nil {
@@ -49,4 +49,4 @@ func TestNeedsXiaomiTokenPlanRegion_InvalidAndMissing(t *testing.T) {
 	if NeedsXiaomiTokenPlanRegion(ProviderXiaomiTokenPlan) {
 		t.Fatal("expected false after valid region set")
 	}
-}
+}
diff --git a/internal/engine/compact_provider_native.go b/internal/engine/compact_provider_native.go
@@ -14,8 +14,8 @@ import (
 )
 
 const (
-	anthropicCompactBeta   = "compact-2026-01-12"
-	anthropicCompactEdit   = "compact_20260112"
+	anthropicCompactBeta    = "compact-2026-01-12"
+	anthropicCompactEdit    = "compact_20260112"
 	anthropicMinCompactTrig = 50_000
 )
 
@@ -263,4 +263,4 @@ func truncateErrBody(b []byte) string {
 		return s[:200] + "..."
 	}
 	return s
-}
+}
diff --git a/internal/engine/compact_provider_native_test.go b/internal/engine/compact_provider_native_test.go
diff --git a/internal/engine/context_compaction.go b/internal/engine/context_compaction.go
diff --git a/internal/engine/context_compaction_test.go b/internal/engine/context_compaction_test.go
diff --git a/internal/engine/context_governor.go b/internal/engine/context_governor.go
diff --git a/internal/engine/context_governor_test.go b/internal/engine/context_governor_test.go
diff --git a/internal/engine/cost/cost_table_test.go b/internal/engine/cost/cost_table_test.go
diff --git a/internal/engine/cost_reexports.go b/internal/engine/cost_reexports.go
diff --git a/internal/engine/session.go b/internal/engine/session.go
diff --git a/internal/engine/stream_usage.go b/internal/engine/stream_usage.go
diff --git a/internal/engine/tool_output_spill.go b/internal/engine/tool_output_spill.go

Original file line number	Diff line number	Diff line change
`@@ -126,4 +126,4 @@ func autonomyFromSettings(n int) engine.AutonomyLevel {`
`126`	`126`	`default:`
`127`	`127`	`return 0`
`128`	`128`	`}`
`129`		`-}`
	`129`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -38,4 +38,4 @@ func TestFormatAutonomyTierMessage_NoArrowJargon(t *testing.T) {`
`38`	`38`	`if !strings.Contains(msg, "Run") {`
`39`	`39`	`t.Fatalf("expected tier name in message, got %q", msg)`
`40`	`40`	`}`
`41`		`-}`
	`41`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -55,4 +55,4 @@ func TestAutonomyTierColorsDistinct(t *testing.T) {`
`55`	`55`	`}`
`56`	`56`	`seen[c] = true`
`57`	`57`	`}`
`58`		`-}`
	`58`	`+}`