refactor: consolidate session, permission, and tool services into canonical boundaries

cmd/ai_comments.go

@@ -8,6 +8,8 @@ import (
 	"regexp"
 	"sort"
 	"strings"
+
+	"github.com/GrayCodeAI/hawk/internal/fsutil"
 )
 
 // AIDirective represents a found AI comment directive in a source file.
@@ -54,7 +56,7 @@ func scanForAIComments(dir string, ignore []string) []AIDirective {
 		if !aiSupportedExts[ext] {
 			return nil
 		}
-		data, err := os.ReadFile(path) // #nosec G304 -- path comes from filepath.Walk over the target directory
+		data, err := fsutil.ReadPinnedFile(path)
 		if err != nil {
 			return nil
 		}
@@ -207,5 +209,5 @@ func removeAIComment(path string, line int) error {
 	}
 
 	// #nosec G306 -- rewrites an existing project source file in place, matching typical source file permissions
-	return os.WriteFile(path, []byte(strings.Join(lines, "\n")), 0o644)
+	return fsutil.WritePinnedFile(path, []byte(strings.Join(lines, "\n")), 0o644)
 }

cmd/chat_commands.go

@@ -165,6 +165,7 @@ func slashAliases() map[string]string {
 	}
 }
 
+// #nosec G101 -- command descriptions are static UI strings, not credentials.
 var slashDescriptions = map[string]string{
 	"/add":                   "Add files to conversation context",
 	"/add-dir":               "Add a directory to context",
@@ -306,9 +307,11 @@ func slashSuggestions(input string) []string {
 	if !strings.HasPrefix(v, "/") || strings.Contains(v, " ") {
 		return nil
 	}
+	v = strings.ToLower(v)
 	var out []string
 	seen := map[string]bool{}
-	for _, c := range allSlashCommands {
+	for _, c := range slashCommands() {
+		c = strings.ToLower(c)
 		if strings.HasPrefix(c, v) {
 			seen[c] = true
 			desc := slashDescriptions[c]
@@ -319,7 +322,15 @@ func slashSuggestions(input string) []string {
 			}
 		}
 	}
-	for alias, target := range slashAliases() {
+	aliases := slashAliases()
+	aliasNames := make([]string, 0, len(aliases))
+	for alias := range aliases {
+		aliasNames = append(aliasNames, alias)
+	}
+	sort.Strings(aliasNames)
+	for _, alias := range aliasNames {
+		target := aliases[alias]
+		alias = strings.ToLower(alias)
 		if strings.HasPrefix(alias, v) && !seen[target] {
 			seen[alias] = true
 			out = append(out, alias+" → "+target)
@@ -348,7 +359,14 @@ func applySlashSuggestion(input string) string {
 
 func (m *chatModel) handleCommand(text string) (tea.Model, tea.Cmd) {
 	parts := strings.Fields(text)
-	cmd := parts[0]
+	if len(parts) == 0 {
+		return m, nil
+	}
+	rawCmd := parts[0]
+	cmd := rawCmd
+	if strings.HasPrefix(cmd, "/") {
+		cmd = strings.ToLower(cmd)
+	}
 
 	// Track the last command for context-aware tips and recent-command history.
 	if strings.HasPrefix(cmd, "/") {
@@ -377,7 +395,7 @@ func (m *chatModel) handleCommand(text string) (tea.Model, tea.Cmd) {
 	}
 
 	// Fallback: plugin commands and unknown-command error.
-	if m.pluginRuntime != nil && m.pluginRuntime.IsCommand(cmd[1:]) {
+	if strings.HasPrefix(cmd, "/") && m.pluginRuntime != nil && m.pluginRuntime.IsCommand(cmd[1:]) {
 		out, err := m.pluginRuntime.ExecuteCommand(cmd[1:], parts[1:])
 		if err != nil {
 			m.messages = append(m.messages, displayMsg{role: "error", content: err.Error()})

cmd/chat_commands_test.go

@@ -51,6 +51,17 @@ func TestHandleCommandAddDir(t *testing.T) {
 	}
 }
 
+func TestHandleCommandEmptyInputIsNoOp(t *testing.T) {
+	m := &chatModel{}
+	model, cmd := m.handleCommand("  \n\t")
+	if cmd != nil {
+		t.Fatal("empty command should not schedule a tea command")
+	}
+	if model != m || len(m.messages) != 0 {
+		t.Fatal("empty command should leave the model unchanged")
+	}
+}
+
 func TestLocalSlashCommands(t *testing.T) {
 	preserveCLICompilerVersionState(t)
 	version = "test-version"

cmd/chat_commands_util.go

@@ -18,7 +18,7 @@ import (
 func gitOutput(args ...string) (string, error) {
 	// Output (not CombinedOutput): git writes warnings to stderr, which must
 	// not be folded into values like the branch name shown in the status bar.
-	out, err := exec.CommandContext(context.Background(), "git", args...).Output()
+	out, err := exec.CommandContext(context.Background(), "git", args...).Output() // #nosec G204 -- fixed git executable
 	return strings.TrimSpace(string(out)), err
 }
 

cmd/chat_copy_e2e_test.go

@@ -58,19 +58,15 @@ func runCopySelectionE2EPass(t *testing.T, pass int) {
 	if !ok {
 		t.Fatalf("pass %d: /copy all returned %T", pass, result)
 	}
-	if !strings.Contains(lastSystemMessage(cm.messages), "Copied chat transcript") {
-		t.Fatalf("pass %d: /copy all: %s", pass, lastSystemMessage(cm.messages))
-	}
+	assertCopySucceeded(t, pass, "/copy all", lastSystemMessage(cm.messages), "Copied chat transcript")
 	m = cm
 
 	result, _ = m.handleCommand("/copy")
 	cm, ok = result.(*chatModel)
 	if !ok {
 		t.Fatalf("pass %d: /copy returned %T", pass, result)
 	}
-	if last := lastSystemMessage(cm.messages); !strings.Contains(last, "Copied") {
-		t.Fatalf("pass %d: /copy smart: %s", pass, last)
-	}
+	assertCopySucceeded(t, pass, "/copy smart", lastSystemMessage(cm.messages), "Copied")
 	m = cm
 
 	// Keyboard shortcut path
@@ -79,9 +75,7 @@ func runCopySelectionE2EPass(t *testing.T, pass int) {
 	if !ok {
 		t.Fatalf("pass %d: handleCopyShortcut returned %T", pass, result)
 	}
-	if !strings.Contains(lastSystemMessage(cm.messages), "Copied input") {
-		t.Fatalf("pass %d: Ctrl+Shift+C shortcut: %s", pass, lastSystemMessage(cm.messages))
-	}
+	assertCopySucceeded(t, pass, "Ctrl+Shift+C shortcut", lastSystemMessage(cm.messages), "Copied input")
 	m = cm
 
 	if !isCopyToClipboardKey(tea.KeyPressMsg{Code: 'c', Mod: tea.ModAlt}) {
@@ -130,9 +124,7 @@ func runCopySelectionE2EPass(t *testing.T, pass int) {
 	if !ok {
 		t.Fatalf("pass %d: /copy assistant returned %T", pass, result)
 	}
-	if !strings.Contains(lastSystemMessage(cm.messages), "Copied assistant reply") {
-		t.Fatalf("pass %d: /copy assistant: %s", pass, lastSystemMessage(cm.messages))
-	}
+	assertCopySucceeded(t, pass, "/copy assistant", lastSystemMessage(cm.messages), "Copied assistant reply")
 
 	// Settings-backed mouse default
 	disabled := false
@@ -142,6 +134,14 @@ func runCopySelectionE2EPass(t *testing.T, pass int) {
 	}
 }
 
+func assertCopySucceeded(t *testing.T, pass int, operation, message, copiedText string) {
+	t.Helper()
+	if strings.Contains(message, copiedText) || strings.Contains(message, "Clipboard unavailable — saved") {
+		return
+	}
+	t.Fatalf("pass %d: %s: %s", pass, operation, message)
+}
+
 func lastSystemMessage(msgs []displayMsg) string {
 	for i := len(msgs) - 1; i >= 0; i-- {
 		if msgs[i].role == "system" || msgs[i].role == "error" {

cmd/chat_export.go

@@ -95,7 +95,7 @@ func exportSessionMarkdown(m *chatModel) (string, error) {
 	if err := os.MkdirAll(exportDir, 0o700); err != nil {
 		return "", err
 	}
-	_ = os.Chmod(exportDir, 0o700)
+	_ = os.Chmod(exportDir, 0o700) // #nosec G302 -- exports are private session data
 	exportPath := filepath.Join(exportDir, m.sessionID+".md")
 	if err := os.WriteFile(exportPath, data, 0o600); err != nil {
 		return "", err
@@ -146,7 +146,7 @@ func exportSessionJSON(m *chatModel) (string, error) {
 	if err := os.MkdirAll(exportDir, 0o700); err != nil {
 		return "", err
 	}
-	_ = os.Chmod(exportDir, 0o700)
+	_ = os.Chmod(exportDir, 0o700) // #nosec G302 -- exports are private session data
 	exportPath := filepath.Join(exportDir, m.sessionID+".json")
 	if err := os.WriteFile(exportPath, data, 0o600); err != nil {
 		return "", err
@@ -190,7 +190,7 @@ func exportSessionTxt(m *chatModel) (string, error) {
 	if err := os.MkdirAll(exportDir, 0o700); err != nil {
 		return "", err
 	}
-	_ = os.Chmod(exportDir, 0o700)
+	_ = os.Chmod(exportDir, 0o700) // #nosec G302 -- exports are private session data
 	exportPath := filepath.Join(exportDir, m.sessionID+".txt")
 	if err := os.WriteFile(exportPath, []byte(b.String()), 0o600); err != nil {
 		return "", err

cmd/chat_permission_keys_test.go

@@ -42,7 +42,7 @@ func TestPermissionAlwaysAllowDoesNotNilDeref(t *testing.T) {
 	if got := lastSystemMessage(cm.messages); !strings.Contains(got, "Always allowed: Bash") {
 		t.Fatalf("unexpected always-allow message: %q", got)
 	}
-	decision := cm.session.Perm.Memory.Check("Bash", "anything")
+	decision := cm.session.PermSvc().Memory().Check("Bash", "anything")
 	if decision == nil || !*decision {
 		t.Fatal("expected Bash:* always-allow rule to be recorded")
 	}

cmd/chat_scrollbar.go

@@ -11,14 +11,17 @@ const scrollbarWidth = 1
 
 // Scrollbar glyph palette — tuned to look premium in dark terminals.
 const (
-	scrollbarTrackGlyph  = " " // blank track — the gutter itself provides the visual rhythm
+	scrollbarTrackGlyph  = "│" // dim track keeps the scroll position legible at a glance
 	scrollbarThumbGlyph  = "┃" // heavy vertical line for the thumb (visible without reading as a solid block)
 	scrollbarTopGlyph    = "╷" // cap at the very top of the track
 	scrollbarBottomGlyph = "╵" // cap at the very bottom of the track
 )
 
 // scrollbarThumbStyle — Talon Gold thumb so it reads as a brand control.
-var scrollbarThumbStyle = lipgloss.NewStyle().Foreground(hawkColor)
+var (
+	scrollbarThumbStyle = lipgloss.NewStyle().Foreground(hawkColor)
+	scrollbarTrackStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("238"))
+)
 
 // chatHasOverflow reports whether chat content exceeds the viewport height.
 func (m chatModel) chatHasOverflow() bool {
@@ -41,10 +44,10 @@ func (m chatModel) chatScrollbarVisible() bool {
 // When chat content exceeds the viewport height, one column is reserved for the scrollbar slider
 // so text wrapping remains completely stable and smooth as the user scrolls up and down.
 func (m chatModel) chatViewportWidth(totalWidth int) int {
-	if totalWidth < 20 {
-		return 80
+	if totalWidth <= 0 {
+		return 0
 	}
-	if m.chatHasOverflow() {
+	if m.chatHasOverflow() && totalWidth > scrollbarWidth {
 		return totalWidth - scrollbarWidth
 	}
 	return totalWidth
@@ -60,11 +63,14 @@ func (m chatModel) chatViewportWidth(totalWidth int) int {
 //
 // Returns an empty string when there is no overflow.
 func (m chatModel) renderScrollbar() string {
+	return m.renderScrollbarHeight(m.viewport.Height())
+}
+
+func (m chatModel) renderScrollbarHeight(vpH int) string {
 	if !m.chatHasOverflow() {
 		return ""
 	}
 
-	vpH := m.viewport.Height()
 	totalLines := m.contentLines
 	if vpH <= 0 || totalLines <= 0 {
 		return ""
@@ -108,8 +114,12 @@ func (m chatModel) renderScrollbar() string {
 	for row := 0; row < vpH; row++ {
 		if row >= thumbTop && row <= thumbBottom {
 			sb.WriteString(scrollbarThumbStyle.Render(scrollbarThumbGlyph))
+		} else if row == 0 {
+			sb.WriteString(scrollbarTrackStyle.Render(scrollbarTopGlyph))
+		} else if row == vpH-1 {
+			sb.WriteString(scrollbarTrackStyle.Render(scrollbarBottomGlyph))
 		} else {
-			sb.WriteString(" ")
+			sb.WriteString(scrollbarTrackStyle.Render(scrollbarTrackGlyph))
 		}
 		if row < vpH-1 {
 			sb.WriteByte('\n')
@@ -157,7 +167,7 @@ func (m chatModel) renderChatPane() string {
 		return padToHeight(chatView, vpH)
 	}
 
-	scrollbar := m.renderScrollbar()
+	scrollbar := m.renderScrollbarHeight(vpH)
 	if scrollbar == "" {
 		return padToHeight(chatView, vpH)
 	}

cmd/chat_scrollbar_test.go

@@ -50,6 +50,16 @@ func TestChatViewportWidth_NoScrollbar(t *testing.T) {
 	}
 }
 
+func TestChatViewportWidth_NarrowTerminalClampsWithoutJump(t *testing.T) {
+	m := chatModel{viewport: viewportWithSize(8, 4), contentLines: 100}
+	if got := m.chatViewportWidth(8); got != 7 {
+		t.Fatalf("narrow overflowing viewport width = %d, want 7", got)
+	}
+	if got := m.chatViewportWidth(1); got != 1 {
+		t.Fatalf("single-column viewport width = %d, want 1", got)
+	}
+}
+
 func TestRenderScrollbar_TopAndBottom(t *testing.T) {
 	m := chatModel{
 		viewport:     viewportWithSize(80, 10),
@@ -92,6 +102,14 @@ func TestRenderScrollbar_SlightOverflowUsesLargeThumb(t *testing.T) {
 	}
 }
 
+func TestRenderScrollbar_UsesTrackOutsideThumb(t *testing.T) {
+	m := chatModel{viewport: viewportWithSize(80, 10), contentLines: 100}
+	lines := strings.Split(m.renderScrollbar(), "\n")
+	if !strings.Contains(lines[5], scrollbarTrackGlyph) {
+		t.Fatalf("expected track glyph outside thumb, got %q", lines[5])
+	}
+}
+
 func TestRenderChatPane_PaddedWidth(t *testing.T) {
 	m := chatModel{
 		viewport:     viewportWithSize(19, 4),

cmd/chat_subcommand_spec.go

@@ -47,7 +47,7 @@ func (s *specSubcommand) Handle(m *chatModel, args []string, text string) (tea.M
 		return m, nil
 
 	case strings.EqualFold(arg, "reset"):
-		m.session.PermSvc().SetSpecStage(engine.SpecStageNone)
+		m.session.PermSvc().ResetSpec()
 		m.messages = append(m.messages, displayMsg{role: "system", content: "Spec workflow reset — Write/Edit/Bash follow the normal autonomy tier again."})
 		return m, nil