tidy a few small functions

Author: dgageot

pkg/config/hooks.go

@@ -11,55 +11,41 @@ import (
 // Each string is treated as a shell command to run.
 // Empty strings are silently skipped.
 func HooksFromCLI(preToolUse, postToolUse, sessionStart, sessionEnd, onUserInput []string) *latest.HooksConfig {
-	hooks := &latest.HooksConfig{}
-
-	if len(preToolUse) > 0 {
-		var defs []latest.HookDefinition
-		for _, cmd := range preToolUse {
-			if strings.TrimSpace(cmd) == "" {
-				continue
-			}
-			defs = append(defs, latest.HookDefinition{Type: "command", Command: cmd})
-		}
-		if len(defs) > 0 {
-			hooks.PreToolUse = []latest.HookMatcherConfig{{Hooks: defs}}
-		}
+	hooks := &latest.HooksConfig{
+		PreToolUse:   matcherFromCommands(preToolUse),
+		PostToolUse:  matcherFromCommands(postToolUse),
+		SessionStart: defsFromCommands(sessionStart),
+		SessionEnd:   defsFromCommands(sessionEnd),
+		OnUserInput:  defsFromCommands(onUserInput),
 	}
 
-	if len(postToolUse) > 0 {
-		var defs []latest.HookDefinition
-		for _, cmd := range postToolUse {
-			if strings.TrimSpace(cmd) == "" {
-				continue
-			}
-			defs = append(defs, latest.HookDefinition{Type: "command", Command: cmd})
-		}
-		if len(defs) > 0 {
-			hooks.PostToolUse = []latest.HookMatcherConfig{{Hooks: defs}}
-		}
+	if hooks.IsEmpty() {
+		return nil
 	}
+	return hooks
+}
 
-	for _, cmd := range sessionStart {
-		if strings.TrimSpace(cmd) != "" {
-			hooks.SessionStart = append(hooks.SessionStart, latest.HookDefinition{Type: "command", Command: cmd})
-		}
-	}
-	for _, cmd := range sessionEnd {
-		if strings.TrimSpace(cmd) != "" {
-			hooks.SessionEnd = append(hooks.SessionEnd, latest.HookDefinition{Type: "command", Command: cmd})
-		}
-	}
-	for _, cmd := range onUserInput {
-		if strings.TrimSpace(cmd) != "" {
-			hooks.OnUserInput = append(hooks.OnUserInput, latest.HookDefinition{Type: "command", Command: cmd})
+// defsFromCommands turns a list of CLI shell commands into hook definitions,
+// skipping any blank entries.
+func defsFromCommands(cmds []string) []latest.HookDefinition {
+	var defs []latest.HookDefinition
+	for _, cmd := range cmds {
+		if strings.TrimSpace(cmd) == "" {
+			continue
 		}
+		defs = append(defs, latest.HookDefinition{Type: "command", Command: cmd})
 	}
+	return defs
+}
 
-	if hooks.IsEmpty() {
+// matcherFromCommands wraps the result of defsFromCommands in a single
+// HookMatcherConfig so the commands apply to all tools (empty matcher).
+func matcherFromCommands(cmds []string) []latest.HookMatcherConfig {
+	defs := defsFromCommands(cmds)
+	if len(defs) == 0 {
 		return nil
 	}
-
-	return hooks
+	return []latest.HookMatcherConfig{{Hooks: defs}}
 }
 
 // MergeHooks merges CLI hooks into an existing HooksConfig.

pkg/hooks/handler.go

@@ -10,6 +10,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"slices"
+	"strings"
 	"sync"
 
 	"github.com/docker/docker-agent/pkg/shellpath"
@@ -155,23 +156,22 @@ func hookEnv(base []string, overrides map[string]string) []string {
 	if len(env) == 0 {
 		env = os.Environ()
 	}
+
+	// Map each existing key to its position so overrides can replace in place.
 	index := make(map[string]int, len(env))
 	for i, entry := range env {
-		for j, ch := range entry {
-			if ch == '=' {
-				index[entry[:j]] = i
-				break
-			}
+		if key, _, ok := strings.Cut(entry, "="); ok {
+			index[key] = i
 		}
 	}
+
 	for key, value := range overrides {
 		entry := key + "=" + value
 		if i, ok := index[key]; ok {
 			env[i] = entry
-			continue
+		} else {
+			env = append(env, entry)
 		}
-		index[key] = len(env)
-		env = append(env, entry)
 	}
 	return env
 }

pkg/tui/service/supervisor/supervisor.go

@@ -167,9 +167,7 @@ func (s *Supervisor) handleRuntimeEvent(sessionID string, msg tea.Msg) {
 	case *runtime.StreamStoppedEvent:
 		runner.IsRunning = false
 		runner.PendingEvent = nil // Clear any pending attention event since stream ended
-		if runner.NeedsAttn {
-			runner.NeedsAttn = false
-		}
+		runner.NeedsAttn = false
 		s.notifyTabsUpdated()
 
 	case *runtime.SessionTitleEvent:
@@ -350,14 +348,14 @@ func (s *Supervisor) Spawner() SessionSpawner {
 }
 
 // CloseSession closes a session and removes it from the supervisor.
-func (s *Supervisor) CloseSession(sessionID string) (nextActiveID string) {
+func (s *Supervisor) CloseSession(sessionID string) string {
 	s.mu.Lock()
 
 	runner, ok := s.runners[sessionID]
 	if !ok {
-		nextActiveID = s.activeID
+		activeID := s.activeID
 		s.mu.Unlock()
-		return nextActiveID
+		return activeID
 	}
 
 	// Cancel the session context
@@ -379,24 +377,23 @@ func (s *Supervisor) CloseSession(sessionID string) (nextActiveID string) {
 	// If this was the active session, switch to the previous tab (or the
 	// first one when closing the first tab).
 	if s.activeID == sessionID {
-		if len(s.order) > 0 {
-			prevIdx := max(closedIdx-1, 0)
-			s.activeID = s.order[prevIdx]
-		} else {
+		if len(s.order) == 0 {
 			s.activeID = ""
+		} else {
+			s.activeID = s.order[max(closedIdx-1, 0)]
 		}
 	}
 
 	s.notifyTabsUpdated()
-	nextActiveID = s.activeID
+	activeID := s.activeID
 	s.mu.Unlock()
 
 	// Run cleanup outside the lock so it can't deadlock.
 	if cleanup != nil {
 		go cleanup()
 	}
 
-	return nextActiveID
+	return activeID
 }
 
 // Count returns the number of sessions.