Merge pull request #1162 from dgageot/simplifications

Misc simplifications

Author: dgageot

cmd/root/alias.go

@@ -139,9 +139,7 @@ func runAliasListCommand(cmd *cobra.Command, args []string) error {
 	// Find max name width for alignment (using display width for proper Unicode handling)
 	maxLen := 0
 	for _, name := range names {
-		if w := runewidth.StringWidth(name); w > maxLen {
-			maxLen = w
-		}
+		maxLen = max(maxLen, runewidth.StringWidth(name))
 	}
 
 	for _, name := range names {

cmd/root/catalog.go

@@ -1,6 +1,7 @@
 package root
 
 import (
+	"cmp"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -98,10 +99,7 @@ func fetchHubRepos(ctx context.Context, org string) ([]hubRepo, error) {
 		_ = resp.Body.Close()
 
 		for _, r := range page.Results {
-			ns := r.Namespace
-			if ns == "" {
-				ns = org
-			}
+			ns := cmp.Or(r.Namespace, org)
 			repos = append(repos, hubRepo{
 				Namespace:   ns,
 				Name:        r.Name,

cmd/root/root.go

@@ -1,6 +1,7 @@
 package root
 
 import (
+	"cmp"
 	"context"
 	"errors"
 	"fmt"
@@ -169,10 +170,7 @@ func (f *rootFlags) setupLogging() error {
 		return nil
 	}
 
-	path := strings.TrimSpace(f.logFilePath)
-	if path == "" {
-		path = filepath.Join(paths.GetDataDir(), "cagent.debug.log")
-	}
+	path := cmp.Or(strings.TrimSpace(f.logFilePath), filepath.Join(paths.GetDataDir(), "cagent.debug.log"))
 
 	if err := os.MkdirAll(filepath.Dir(path), 0o700); err != nil {
 		return err

pkg/a2a/adapter.go

@@ -1,6 +1,7 @@
 package a2a
 
 import (
+	"cmp"
 	"fmt"
 	"iter"
 	"log/slog"
@@ -23,10 +24,7 @@ func newCAgentAdapter(t *team.Team, agentName string) (agent.Agent, error) {
 		return nil, fmt.Errorf("failed to get agent %s: %w", agentName, err)
 	}
 
-	desc := a.Description()
-	if desc == "" {
-		desc = fmt.Sprintf("Agent %s", agentName)
-	}
+	desc := cmp.Or(a.Description(), fmt.Sprintf("Agent %s", agentName))
 
 	return agent.New(agent.Config{
 		Name:        agentName,

pkg/acp/agent.go

@@ -1,6 +1,7 @@
 package acp
 
 import (
+	"cmp"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -472,10 +473,7 @@ func (a *Agent) handleMaxIterationsReached(ctx context.Context, acpSess *Session
 // buildToolCallStart creates a tool call start update
 func buildToolCallStart(toolCall tools.ToolCall, tool tools.Tool) acp.SessionUpdate {
 	kind := determineToolKind(toolCall.Function.Name, tool)
-	title := tool.Annotations.Title
-	if title == "" {
-		title = toolCall.Function.Name
-	}
+	title := cmp.Or(tool.Annotations.Title, toolCall.Function.Name)
 
 	args := parseToolCallArguments(toolCall.Function.Arguments)
 	locations := extractLocations(args)
@@ -670,10 +668,7 @@ func extractDiffContent(toolCall tools.ToolCall, _ string) *acp.ToolCallContent
 // buildToolCallUpdate creates a tool call update for permission requests
 func buildToolCallUpdate(toolCall tools.ToolCall, tool tools.Tool, status acp.ToolCallStatus) acp.RequestPermissionToolCall {
 	kind := acp.ToolKindExecute
-	title := tool.Annotations.Title
-	if title == "" {
-		title = toolCall.Function.Name
-	}
+	title := cmp.Or(tool.Annotations.Title, toolCall.Function.Name)
 
 	if tool.Annotations.ReadOnlyHint {
 		kind = acp.ToolKindRead

pkg/agent/agent_test.go

@@ -11,33 +11,27 @@ import (
 )
 
 type stubToolSet struct {
-	startErr     error
-	tools        []tools.Tool
-	listErr      error
-	instructions string
+	tools.BaseToolSet
+	startErr error
+	tools    []tools.Tool
+	listErr  error
 }
 
 func newStubToolSet(startErr error, toolsList []tools.Tool, listErr error) tools.ToolSet {
 	return &stubToolSet{
-		startErr:     startErr,
-		tools:        toolsList,
-		listErr:      listErr,
-		instructions: "stub",
+		startErr: startErr,
+		tools:    toolsList,
+		listErr:  listErr,
 	}
 }
 
 func (s *stubToolSet) Start(context.Context) error { return s.startErr }
-func (s *stubToolSet) Stop(context.Context) error  { return nil }
 func (s *stubToolSet) Tools(context.Context) ([]tools.Tool, error) {
 	if s.listErr != nil {
 		return nil, s.listErr
 	}
 	return s.tools, nil
 }
-func (s *stubToolSet) Instructions() string                           { return s.instructions }
-func (s *stubToolSet) SetElicitationHandler(tools.ElicitationHandler) {}
-func (s *stubToolSet) SetOAuthSuccessHandler(func())                  {}
-func (s *stubToolSet) SetManagedOAuth(bool)                           {}
 
 func TestAgentTools(t *testing.T) {
 	tests := []struct {

pkg/cli/runner.go

@@ -1,6 +1,7 @@
 package cli
 
 import (
+	"cmp"
 	"context"
 	"encoding/base64"
 	"encoding/json"
@@ -69,10 +70,7 @@ func Run(ctx context.Context, out *Printer, cfg Config, rt runtime.Runtime, sess
 		messageText, attachPath := parseAttachCommand(userInput)
 
 		// Use either the per-message attachment or the global one
-		finalAttachPath := attachPath
-		if finalAttachPath == "" {
-			finalAttachPath = cfg.AttachmentPath
-		}
+		finalAttachPath := cmp.Or(attachPath, cfg.AttachmentPath)
 
 		sess.AddMessage(createUserMessageWithAttachment(messageText, finalAttachPath))
 

pkg/config/resolve.go

@@ -1,6 +1,7 @@
 package config
 
 import (
+	"cmp"
 	_ "embed"
 	"fmt"
 	"log/slog"
@@ -104,9 +105,7 @@ func Resolve(agentFilename string) (Source, error) {
 
 // resolve resolves an agent reference, handling aliases and defaults
 func resolve(agentFilename string) (string, error) {
-	if agentFilename == "" {
-		agentFilename = "default"
-	}
+	agentFilename = cmp.Or(agentFilename, "default")
 
 	// Try to resolve as an alias first
 	if aliasStore, err := aliases.Load(); err == nil {

pkg/creator/agent.go

@@ -19,27 +19,13 @@ import (
 var agentBuilderInstructions string
 
 type fsToolset struct {
-	tools.ElicitationTool
-
-	inner                    tools.ToolSet
+	tools.ToolSet
 	originalWriteFileHandler tools.ToolHandler
 	path                     string
 }
 
-func (f *fsToolset) Instructions() string {
-	return f.inner.Instructions()
-}
-
-func (f *fsToolset) Start(ctx context.Context) error {
-	return f.inner.Start(ctx)
-}
-
-func (f *fsToolset) Stop(ctx context.Context) error {
-	return f.inner.Stop(ctx)
-}
-
 func (f *fsToolset) Tools(ctx context.Context) ([]tools.Tool, error) {
-	innerTools, err := f.inner.Tools(ctx)
+	innerTools, err := f.ToolSet.Tools(ctx)
 	if err != nil {
 		return nil, err
 	}
@@ -111,7 +97,7 @@ Can you explain to me what the agent will be used for?`,
 
 	// Custom tool registry to include fsToolset
 	fsToolset := fsToolset{
-		inner: builtin.NewFilesystemTool([]string{runConfig.WorkingDir}),
+		ToolSet: builtin.NewFilesystemTool([]string{runConfig.WorkingDir}),
 	}
 
 	registry := teamloader.NewDefaultToolsetRegistry()

pkg/evaluation/save.go

@@ -1,6 +1,7 @@
 package evaluation
 
 import (
+	"cmp"
 	"encoding/json"
 	"fmt"
 	"os"
@@ -15,10 +16,7 @@ func Save(sess *session.Session, filename string) (string, error) {
 	}
 
 	// Use provided filename if given, otherwise default to session ID
-	baseName := filename
-	if baseName == "" {
-		baseName = sess.ID
-	}
+	baseName := cmp.Or(filename, sess.ID)
 
 	evalFile := filepath.Join("evals", fmt.Sprintf("%s.json", baseName))
 	for number := 1; ; number++ {