Merge pull request #704 from dgageot/remove-dead-code-exec

Remove dead code

Author: dgageot

cmd/root/alias.go

@@ -143,7 +143,7 @@ func runAliasListCommand(cmd *cobra.Command, args []string) error {
 		out.Printf("  %s%s → %s\n", name, padding, path)
 	}
 
-	out.Print("\nRun an alias with: cagent run <alias>\n")
+	out.Println("\nRun an alias with: cagent run <alias>")
 
 	return nil
 }

cmd/root/new.go

@@ -71,19 +71,19 @@ func (f *newFlags) runNewCommand(cmd *cobra.Command, args []string) error {
 			switch {
 			case os.Getenv("ANTHROPIC_API_KEY") != "":
 				modelProvider = "anthropic"
-				out.Printf("%s\n\n", cli.White("ANTHROPIC_API_KEY found, using Anthropic"))
+				out.Printf("%s\n\n", "ANTHROPIC_API_KEY found, using Anthropic")
 			case os.Getenv("OPENAI_API_KEY") != "":
 				modelProvider = "openai"
-				out.Printf("%s\n\n", cli.White("OPENAI_API_KEY found, using OpenAI"))
+				out.Printf("%s\n\n", "OPENAI_API_KEY found, using OpenAI")
 			case os.Getenv("GOOGLE_API_KEY") != "":
 				modelProvider = "google"
-				out.Printf("%s\n\n", cli.White("GOOGLE_API_KEY found, using Google"))
+				out.Printf("%s\n\n", "GOOGLE_API_KEY found, using Google")
 			default:
 				modelProvider = "dmr"
-				out.Printf("%s\n\n", cli.Yellow("⚠️ No provider credentials found, defaulting to Docker Model Runner (DMR)"))
+				out.Printf("%s\n\n", "⚠️ No provider credentials found, defaulting to Docker Model Runner (DMR)")
 			}
 			if f.modelParam == "" {
-				out.Printf("%s\n\n", cli.White("use \"--model provider/model\" to use a different model"))
+				out.Printf("%s\n\n", "use \"--model provider/model\" to use a different model")
 			}
 		} else {
 			// Using Models Gateway; default to Anthropic if not specified
@@ -95,10 +95,10 @@ func (f *newFlags) runNewCommand(cmd *cobra.Command, args []string) error {
 	if len(args) > 0 {
 		prompt = strings.Join(args, " ")
 	} else {
-		out.Printf("%s\n", cli.Blue("------- Welcome to %s! -------", cli.Bold(AppName)))
-		out.Printf("%s\n\n", cli.White("         (Ctrl+C to exit)"))
-		out.Printf("%s\n\n", cli.Blue("What should your agent/agent team do? (describe its purpose)"))
-		out.Print(cli.Blue("> "))
+		out.Printf("------- Welcome to %s! -------\n", AppName)
+		out.Printf("%s\n\n", "         (Ctrl+C to exit)")
+		out.Printf("%s\n\n", "What should your agent/agent team do? (describe its purpose)")
+		out.Print("> ")
 
 		var err error
 		prompt, err = input.ReadLine(ctx, os.Stdin)

pkg/cli/runner.go

@@ -123,11 +123,11 @@ func Run(ctx context.Context, out *Printer, cfg Config, agentFilename string, rt
 					if e.AgentName != "" && e.AgentName != "root" {
 						prefix = prefix + e.AgentName + ": "
 					}
-					out.Printf("\n%s", White(prefix))
+					out.Printf("\n%s", prefix)
 					reasoningStarted = true
 				}
 				// Continue printing reasoning content
-				out.Printf("%s", White(e.Content))
+				out.Print(e.Content)
 			case *runtime.ToolCallConfirmationEvent:
 				if llmIsTyping {
 					out.Println()
@@ -223,7 +223,7 @@ func Run(ctx context.Context, out *Printer, cfg Config, agentFilename string, rt
 
 		// If the loop ended due to Ctrl+C, inform the user succinctly
 		if ctx.Err() != nil {
-			out.Println(Yellow("\n⚠️  agent stopped  ⚠️"))
+			out.Println("\n⚠️  agent stopped  ⚠️")
 		}
 
 		// Wrap runtime errors to prevent duplicate error messages and usage display
@@ -253,9 +253,10 @@ func Run(ctx context.Context, out *Printer, cfg Config, agentFilename string, rt
 		firstQuestion := true
 		for {
 			if !firstQuestion {
-				out.Print("\n\n")
+				out.Println()
+				out.Println()
 			}
-			out.Print(Blue("> "))
+			out.Print("> ")
 			firstQuestion = false
 
 			line, err := input.ReadLine(ctx, os.Stdin)
@@ -285,21 +286,21 @@ func runUserCommand(out *Printer, userInput string, sess *session.Session, rt ru
 	case "/eval":
 		evalFile, err := evaluation.Save(sess)
 		if err == nil {
-			out.Printf("%s\n", Yellow("Evaluation saved to file %s", evalFile))
+			out.Println("Evaluation saved to file:", evalFile)
 			return true, err
 		}
 		return true, nil
 	case "/usage":
-		out.Printf("%s\n", Yellow("Input tokens: %d", sess.InputTokens))
-		out.Printf("%s\n", Yellow("Output tokens: %d", sess.OutputTokens))
+		out.Println("Input tokens:", sess.InputTokens)
+		out.Println("Output tokens:", sess.OutputTokens)
 		return true, nil
 	case "/new":
 		// Reset session items
 		sess.Messages = []session.Item{}
 		return true, nil
 	case "/compact":
 		// Generate a summary of the session and compact the history
-		out.Printf("%s\n", Yellow("Generating summary..."))
+		out.Println("Generating summary...")
 
 		// Create a channel to capture summary events
 		events := make(chan runtime.Event, 100)
@@ -314,17 +315,17 @@ func runUserCommand(out *Printer, userInput string, sess *session.Session, rt ru
 		for event := range events {
 			switch e := event.(type) {
 			case *runtime.SessionSummaryEvent:
-				out.Printf("%s\n", Yellow("Summary generated and added to session"))
-				out.Printf("Summary: %s\n", e.Summary)
+				out.Println("Summary generated and added to session")
+				out.Println("Summary:", e.Summary)
 				summaryGenerated = true
 			case *runtime.WarningEvent:
-				out.Printf("%s\n", Yellow("Warning: "+e.Message))
+				out.Println("Warning:", e.Message)
 				hasWarning = true
 			}
 		}
 
 		if !summaryGenerated && !hasWarning {
-			out.Printf("%s\n", Yellow("No summary generated"))
+			out.Println("No summary generated")
 		}
 
 		return true, nil

pkg/cli/text.go

@@ -15,18 +15,6 @@ import (
 	"github.com/docker/cagent/pkg/tools"
 )
 
-var (
-	// Let's disable the colors in non TUI mode.
-	// (dga): I kept those functions in case we find a proper way to use them in both dark and light modes.
-	blue   = fmt.Sprintf
-	yellow = fmt.Sprintf
-	red    = fmt.Sprintf
-	white  = fmt.Sprintf
-	green  = fmt.Sprintf
-
-	bold = color.New(color.Bold).SprintfFunc()
-)
-
 // ConfirmationResult represents the result of a user confirmation prompt
 type ConfirmationResult string
 
@@ -37,15 +25,7 @@ const (
 	ConfirmationAbort          ConfirmationResult = "abort"
 )
 
-// Color formatting functions (exported for use by other packages)
-var (
-	Blue   = blue
-	Yellow = yellow
-	Red    = red
-	White  = white
-	Green  = green
-	Bold   = bold
-)
+var bold = color.New(color.Bold).SprintfFunc()
 
 type Printer struct {
 	out io.Writer
@@ -71,41 +51,36 @@ func (p *Printer) Printf(format string, a ...any) (n int, err error) {
 
 // PrintWelcomeMessage prints the welcome message
 func (p *Printer) PrintWelcomeMessage(appName string) {
-	p.Printf("\n%s\n%s\n\n", blue("------- Welcome to %s! -------", bold(appName)), white("(Ctrl+C to stop the agent and exit)"))
+	p.Printf("\n------- Welcome to %s! -------\n(Ctrl+C to stop the agent and exit)\n\n", bold(appName))
 }
 
 // PrintError prints an error message
 func (p *Printer) PrintError(err error) {
-	p.Print(red("❌ %s", err))
+	p.Printf("❌ %s", err)
 }
 
 // PrintAgentName prints the agent name header
 func (p *Printer) PrintAgentName(agentName string) {
-	p.Printf("\n%s\n", blue("--- Agent: %s ---", bold(agentName)))
+	p.Printf("\n--- Agent: %s ---\n", bold(agentName))
 }
 
 // PrintToolCall prints a tool call
-func (p *Printer) PrintToolCall(toolCall tools.ToolCall, colorFunc ...func(format string, a ...any) string) {
-	c := white
-	if len(colorFunc) > 0 && colorFunc[0] != nil {
-		c = colorFunc[0]
-	}
-	p.Printf("\nCalling %s\n", c("%s%s", bold(toolCall.Function.Name), formatToolCallArguments(toolCall.Function.Arguments)))
+func (p *Printer) PrintToolCall(toolCall tools.ToolCall) {
+	p.Printf("\nCalling %s%s\n", bold(toolCall.Function.Name), formatToolCallArguments(toolCall.Function.Arguments))
 }
 
 // PrintToolCallWithConfirmation prints a tool call and prompts for confirmation
 func (p *Printer) PrintToolCallWithConfirmation(ctx context.Context, toolCall tools.ToolCall, rd io.Reader) ConfirmationResult {
-	p.Printf("\n%s\n", bold(yellow("🛠️ Tool call requires confirmation 🛠️")))
-	p.PrintToolCall(toolCall, color.New(color.FgWhite).SprintfFunc())
-	p.Printf("\n%s", bold(yellow("Can I run this tool? ([y]es/[a]ll/[n]o): ")))
+	p.Printf("\n%s\n", bold("🛠️ Tool call requires confirmation 🛠️"))
+	p.PrintToolCall(toolCall)
+	p.Printf("\n%s", bold("Can I run this tool? ([y]es/[a]ll/[n]o): "))
 
 	// Try single-character input from stdin in raw mode (no Enter required)
 	fd := int(os.Stdin.Fd())
 	if oldState, err := term.MakeRaw(fd); err == nil {
 		defer func() {
 			if err := term.Restore(fd, oldState); err != nil {
-				p.
-					Printf("\n%s\n", yellow("Failed to restore terminal state: %v", err))
+				p.Printf("\nFailed to restore terminal state: %v\n", err)
 			}
 		}()
 		buf := make([]byte, 1)
@@ -154,61 +129,53 @@ func (p *Printer) PrintToolCallWithConfirmation(ctx context.Context, toolCall to
 
 // PrintToolCallResponse prints a tool call response
 func (p *Printer) PrintToolCallResponse(toolCall tools.ToolCall, response string) {
-	p.Printf("\n%s\n", white("%s response%s", bold(toolCall.Function.Name), formatToolCallResponse(response)))
+	p.Printf("\n%s response%s\n", bold(toolCall.Function.Name), formatToolCallResponse(response))
 }
 
 // PromptMaxIterationsContinue prompts the user to continue after max iterations
 func (p *Printer) PromptMaxIterationsContinue(ctx context.Context, maxIterations int) ConfirmationResult {
-	p.Printf("\n%s\n", yellow("⚠️  Maximum iterations (%d) reached. The agent may be stuck in a loop.", maxIterations))
-	p.Printf("%s\n", white("This can happen with smaller or less capable models."))
-	p.Printf("\n%s (y/n): ", blue("Do you want to continue for 10 more iterations?"))
+	p.Printf("\n⚠️  Maximum iterations (%d) reached. The agent may be stuck in a loop.\n", maxIterations)
+	p.Printf("%s\n", "This can happen with smaller or less capable models.")
+	p.Printf("\n%s (y/n): ", "Do you want to continue for 10 more iterations?")
 
 	response, err := input.ReadLine(ctx, os.Stdin)
 	if err != nil {
-		p.
-			Printf("\n%s\n", red("Failed to read input, exiting..."))
+		p.Println("\nFailed to read input, exiting...")
 		return ConfirmationAbort
 	}
 
 	response = strings.TrimSpace(strings.ToLower(response))
 	if response == "y" || response == "yes" {
-		p.
-			Printf("%s\n\n", green("✓ Continuing..."))
+		p.Print("✓ Continuing...\n\n")
 		return ConfirmationApprove
 	} else {
-		p.
-			Printf("%s\n\n", white("Exiting..."))
+		p.Print("Exiting...\n\n")
 		return ConfirmationReject
 	}
 }
 
 // PromptOAuthAuthorization prompts the user for OAuth authorization
 func (p *Printer) PromptOAuthAuthorization(ctx context.Context, serverURL string) ConfirmationResult {
-	p.Printf("\n%s\n", yellow("🔐 OAuth Authorization Required"))
-	p.Printf("%s %s (remote)\n", white("Server:"), blue(serverURL))
-	p.Printf("%s\n", white("This server requires OAuth authentication to access its tools."))
-	p.Printf("%s\n", white("Your browser will open automatically to complete the authorization."))
-	p.Printf("\n%s (y/n): ", blue("Do you want to authorize access?"))
+	p.Println("\n🔐 OAuth Authorization Required")
+	p.Println("Server:", serverURL, "(remote)")
+	p.Println("This server requires OAuth authentication to access its tools.")
+	p.Println("Your browser will open automatically to complete the authorization.")
+	p.Printf("\n%s (y/n): ", "Do you want to authorize access?")
 
 	response, err := input.ReadLine(ctx, os.Stdin)
 	if err != nil {
-		p.
-			Printf("\n%s\n", red("Failed to read input, aborting authorization..."))
+		p.Printf("\n%s\n", "Failed to read input, aborting authorization...")
 		return ConfirmationAbort
 	}
 
 	response = strings.TrimSpace(strings.ToLower(response))
 	if response == "y" || response == "yes" {
-		p.
-			Printf("%s\n", green("✓ Starting OAuth authorization..."))
-		p.
-			Printf("%s\n", white("Please complete the authorization in your browser."))
-		p.
-			Printf("%s\n\n", white("Once completed, the agent will continue automatically."))
+		p.Println("✓ Starting OAuth authorization...")
+		p.Println("Please complete the authorization in your browser.")
+		p.Print("Once completed, the agent will continue automatically.\n\n")
 		return ConfirmationApprove
 	} else {
-		p.
-			Printf("%s\n\n", white("Authorization declined. Exiting..."))
+		p.Print("Authorization declined. Exiting...\n\n")
 		return ConfirmationReject
 	}
 }