refactor debug messages

Author: ezynda3

cmd/root.go

@@ -18,6 +18,7 @@ import (
 	"github.com/mark3labs/mcphost/internal/models"
 	"github.com/mark3labs/mcphost/internal/session"
 	"github.com/mark3labs/mcphost/internal/tokens"
+	"github.com/mark3labs/mcphost/internal/tools"
 	"github.com/mark3labs/mcphost/internal/ui"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -386,15 +387,23 @@ func runNormalMode(ctx context.Context) error {
 	}
 
 	// Create the agent using the factory
-	mcpAgent, err := agent.CreateAgent(ctx, &agent.AgentCreationOptions{
-		ModelConfig:      modelConfig,
+	// Use a buffered debug logger to capture messages during initialization
+	var bufferedLogger *tools.BufferedDebugLogger
+	var debugLogger tools.DebugLogger
+	if viper.GetBool("debug") {
+		bufferedLogger = tools.NewBufferedDebugLogger(true)
+		debugLogger = bufferedLogger
+	}
+
+	mcpAgent, err := agent.CreateAgent(ctx, &agent.AgentCreationOptions{ModelConfig: modelConfig,
 		MCPConfig:        mcpConfig,
 		SystemPrompt:     systemPrompt,
 		MaxSteps:         viper.GetInt("max-steps"),
 		StreamingEnabled: viper.GetBool("stream"),
 		ShowSpinner:      true,
 		Quiet:            quietFlag,
 		SpinnerFunc:      spinnerFunc,
+		DebugLogger:      debugLogger,
 	})
 	if err != nil {
 		return fmt.Errorf("failed to create agent: %v", err)
@@ -441,6 +450,16 @@ func runNormalMode(ctx context.Context) error {
 		return fmt.Errorf("failed to setup CLI: %v", err)
 	}
 
+	// Display buffered debug messages if any
+	if bufferedLogger != nil && cli != nil {
+		messages := bufferedLogger.GetMessages()
+		if len(messages) > 0 {
+			// Combine all messages into a single debug output
+			combinedMessage := strings.Join(messages, "\n  ")
+			cli.DisplayDebugMessage(combinedMessage)
+		}
+	}
+
 	// Display debug configuration if debug mode is enabled
 	if !quietFlag && cli != nil && viper.GetBool("debug") {
 		debugConfig := map[string]any{

cmd/script.go

@@ -15,6 +15,7 @@ import (
 	"github.com/mark3labs/mcphost/internal/config"
 	"github.com/mark3labs/mcphost/internal/hooks"
 	"github.com/mark3labs/mcphost/internal/models"
+	"github.com/mark3labs/mcphost/internal/tools"
 	"github.com/mark3labs/mcphost/internal/ui"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -596,6 +597,12 @@ func runScriptMode(ctx context.Context, mcpConfig *config.Config, prompt string,
 	}
 
 	// Create the agent using the factory (scripts don't need spinners)
+	// Use a simple debug logger for scripts
+	var debugLogger tools.DebugLogger
+	if finalDebug {
+		debugLogger = tools.NewSimpleDebugLogger(true)
+	}
+
 	mcpAgent, err := agent.CreateAgent(ctx, &agent.AgentCreationOptions{
 		ModelConfig:      modelConfig,
 		MCPConfig:        mcpConfig,
@@ -605,6 +612,7 @@ func runScriptMode(ctx context.Context, mcpConfig *config.Config, prompt string,
 		ShowSpinner:      false, // Scripts don't need spinners
 		Quiet:            quietFlag,
 		SpinnerFunc:      nil, // No spinner function needed
+		DebugLogger:      debugLogger,
 	})
 	if err != nil {
 		return fmt.Errorf("failed to create agent: %v", err)

internal/agent/agent.go

@@ -23,6 +23,7 @@ type AgentConfig struct {
 	SystemPrompt     string
 	MaxSteps         int
 	StreamingEnabled bool
+	DebugLogger      tools.DebugLogger // Optional debug logger
 }
 
 // ToolCallHandler is a function type for handling tool calls as they happen
@@ -68,6 +69,11 @@ func NewAgent(ctx context.Context, config *AgentConfig) (*Agent, error) {
 	// Set the model for sampling support
 	toolManager.SetModel(providerResult.Model)
 
+	// Set the debug logger if provided
+	if config.DebugLogger != nil {
+		toolManager.SetDebugLogger(config.DebugLogger)
+	}
+
 	if err := toolManager.LoadTools(ctx, config.MCPConfig); err != nil {
 		return nil, fmt.Errorf("failed to load MCP tools: %v", err)
 	}

internal/agent/factory.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/mark3labs/mcphost/internal/config"
 	"github.com/mark3labs/mcphost/internal/models"
+	"github.com/mark3labs/mcphost/internal/tools"
 )
 
 // SpinnerFunc is a function type for showing spinners during agent creation
@@ -19,9 +20,10 @@ type AgentCreationOptions struct {
 	SystemPrompt     string
 	MaxSteps         int
 	StreamingEnabled bool
-	ShowSpinner      bool        // For Ollama models
-	Quiet            bool        // Skip spinner if quiet
-	SpinnerFunc      SpinnerFunc // Function to show spinner (provided by caller)
+	ShowSpinner      bool              // For Ollama models
+	Quiet            bool              // Skip spinner if quiet
+	SpinnerFunc      SpinnerFunc       // Function to show spinner (provided by caller)
+	DebugLogger      tools.DebugLogger // Optional debug logger
 }
 
 // CreateAgent creates an agent with optional spinner for Ollama models
@@ -32,6 +34,7 @@ func CreateAgent(ctx context.Context, opts *AgentCreationOptions) (*Agent, error
 		SystemPrompt:     opts.SystemPrompt,
 		MaxSteps:         opts.MaxSteps,
 		StreamingEnabled: opts.StreamingEnabled,
+		DebugLogger:      opts.DebugLogger,
 	}
 
 	var agent *Agent