Merge pull request #886 from dgageot/simpler-code-3

Simpler code

Author: dgageot

pkg/acp/agent.go

@@ -278,17 +278,17 @@ func (a *Agent) handleToolCallConfirmation(ctx context.Context, acpSess *Session
 			{
 				Kind:     acp.PermissionOptionKindAllowOnce,
 				Name:     "Allow this action",
-				OptionId: acp.PermissionOptionId("allow"),
+				OptionId: "allow",
 			},
 			{
 				Kind:     acp.PermissionOptionKindAllowAlways,
 				Name:     "Allow and remember my choice",
-				OptionId: acp.PermissionOptionId("allow-always"),
+				OptionId: "allow-always",
 			},
 			{
 				Kind:     acp.PermissionOptionKindRejectOnce,
 				Name:     "Skip this action",
-				OptionId: acp.PermissionOptionId("reject"),
+				OptionId: "reject",
 			},
 		},
 	})

pkg/config/auto.go

@@ -16,7 +16,7 @@ var DefaultModels = map[string]string{
 }
 
 func AvailableProviders(ctx context.Context, modelsGateway string, env environment.Provider) []string {
-	providers := []string{}
+	var providers []string
 
 	if modelsGateway == "" {
 		switch {

pkg/rag/strategy/bm25.go

@@ -14,7 +14,7 @@ import (
 	"github.com/fsnotify/fsnotify"
 
 	v2 "github.com/docker/cagent/pkg/config/v2"
-	chunk "github.com/docker/cagent/pkg/rag/chunk"
+	"github.com/docker/cagent/pkg/rag/chunk"
 	"github.com/docker/cagent/pkg/rag/database"
 )
 

pkg/telemetry/telemetry_test.go

@@ -730,17 +730,6 @@ func TestHTTPRequestVerification(t *testing.T) {
 	})
 }
 
-// SlowMockHTTPClient creates artificial backpressure by adding delays
-type SlowMockHTTPClient struct {
-	*MockHTTPClient
-	delay time.Duration
-}
-
-func (s *SlowMockHTTPClient) RoundTrip(req *http.Request) (*http.Response, error) {
-	time.Sleep(s.delay) // Add artificial delay
-	return s.MockHTTPClient.RoundTrip(req)
-}
-
 // TestNon2xxHTTPResponseHandling ensures that 5xx responses are logged and handled gracefully
 func TestNon2xxHTTPResponseHandling(t *testing.T) {
 	logger := slog.New(slog.NewTextHandler(os.Stderr, nil))

pkg/tools/builtin/api.go

@@ -15,10 +15,6 @@ import (
 	"github.com/docker/cagent/pkg/tools"
 )
 
-const (
-	ToolNameAPI = "api"
-)
-
 type APITool struct {
 	tools.ElicitationTool
 	handler *apiHandler

pkg/tui/components/spinner/spinner.go

@@ -85,38 +85,40 @@ func (s Spinner) Init() tea.Cmd {
 	return s.Tick()
 }
 
-func (s Spinner) Update(msg tea.Msg) (layout.Model, tea.Cmd) {
-	if msg, ok := msg.(tickMsg); ok {
-		if msg.ID > 0 && msg.ID != s.id {
-			return s, nil
-		}
-		if msg.tag > 0 && msg.tag != s.tag {
-			return s, nil
-		}
-		s.tag++
+func (s Spinner) Update(message tea.Msg) (layout.Model, tea.Cmd) {
+	msg, ok := message.(tickMsg)
+	if !ok {
+		return s, nil
+	}
 
-		s.frame++
+	if msg.ID > 0 && msg.ID != s.id {
+		return s, nil
+	}
+	if msg.tag > 0 && msg.tag != s.tag {
+		return s, nil
+	}
 
-		if s.pauseFrames > 0 {
-			s.pauseFrames--
-			if s.pauseFrames == 0 {
-				s.direction = -1
-			}
-		} else {
-			s.lightPosition += s.direction
+	s.tag++
+	s.frame++
 
-			if s.direction == 1 && s.lightPosition > len(s.currentMessage)+2 {
-				s.pauseFrames = 6
-			}
+	if s.pauseFrames > 0 {
+		s.pauseFrames--
+		if s.pauseFrames == 0 {
+			s.direction = -1
+		}
+	} else {
+		s.lightPosition += s.direction
 
-			if s.direction == -1 && s.lightPosition < -3 {
-				s.direction = 1
-			}
+		if s.direction == 1 && s.lightPosition > len(s.currentMessage)+2 {
+			s.pauseFrames = 6
 		}
 
-		return s, s.Tick()
+		if s.direction == -1 && s.lightPosition < -3 {
+			s.direction = 1
+		}
 	}
-	return s, nil
+
+	return s, s.Tick()
 }
 
 func (s Spinner) View() string {

pkg/tui/components/statusbar/statusbar.go

@@ -40,10 +40,6 @@ func (s *StatusBar) formatHelpString(bindings []key.Binding) string {
 		}
 	}
 
-	if len(helpParts) == 0 {
-		return ""
-	}
-
 	// Join with proper spacing between key bindings
 	return strings.Join(helpParts, "  ")
 }

pkg/tui/styles/styles.go

@@ -50,10 +50,6 @@ const (
 	ColorLineNumber = "#565F89" // Muted blue-grey (same as ColorMutedBlue)
 	ColorSeparator  = "#414868" // Dark blue-grey (same as ColorBorderSecondary)
 
-	// Word-level diff highlight colors (visible but not harsh)
-	ColorDiffWordAddBg    = "#2D4F3F" // Medium dark teal with green tint
-	ColorDiffWordRemoveBg = "#4F2D3A" // Medium dark burgundy with red tint
-
 	// Interactive element colors
 	ColorSelected = "#364A82" // Dark blue for selected items
 	ColorHover    = "#2D3F5F" // Slightly lighter than selected