show spinner when running tool calls

Author: ezynda3

cmd/root.go

@@ -253,6 +253,22 @@ func runNonInteractiveMode(ctx context.Context, mcpAgent *agent.Agent, cli *ui.C
 				cli.DisplayToolCallMessage(toolName, toolArgs)
 			}
 		},
+		// Tool execution handler - called when tool execution starts/ends
+		func(toolName string, isStarting bool) {
+			if !quiet && cli != nil {
+				if isStarting {
+					// Start spinner for tool execution
+					currentSpinner = ui.NewSpinner(fmt.Sprintf("Executing %s...", toolName))
+					currentSpinner.Start()
+				} else {
+					// Stop spinner when tool execution completes
+					if currentSpinner != nil {
+						currentSpinner.Stop()
+						currentSpinner = nil
+					}
+				}
+			}
+		},
 		// Tool result handler - called when a tool execution completes
 		func(toolName, toolArgs, result string, isError bool) {
 			if !quiet && cli != nil {
@@ -372,6 +388,20 @@ func runInteractiveMode(ctx context.Context, mcpAgent *agent.Agent, cli *ui.CLI,
 				}
 				cli.DisplayToolCallMessage(toolName, toolArgs)
 			},
+			// Tool execution handler - called when tool execution starts/ends
+			func(toolName string, isStarting bool) {
+				if isStarting {
+					// Start spinner for tool execution
+					currentSpinner = ui.NewSpinner(fmt.Sprintf("Executing %s...", toolName))
+					currentSpinner.Start()
+				} else {
+					// Stop spinner when tool execution completes
+					if currentSpinner != nil {
+						currentSpinner.Stop()
+						currentSpinner = nil
+					}
+				}
+			},
 			// Tool result handler - called when a tool execution completes
 			func(toolName, toolArgs, result string, isError bool) {
 				cli.DisplayToolMessage(toolName, toolArgs, result, isError)

internal/agent/agent.go

@@ -52,6 +52,9 @@ type AgentConfig struct {
 // ToolCallHandler is a function type for handling tool calls as they happen
 type ToolCallHandler func(toolName, toolArgs string)
 
+// ToolExecutionHandler is a function type for handling tool execution start/end
+type ToolExecutionHandler func(toolName string, isStarting bool)
+
 // ToolResultHandler is a function type for handling tool results
 type ToolResultHandler func(toolName, toolArgs, result string, isError bool)
 
@@ -348,7 +351,7 @@ func (a *Agent) Stream(ctx context.Context, input []*schema.Message, opts ...com
 
 // GenerateWithLoop processes messages with a custom loop that displays tool calls in real-time
 func (a *Agent) GenerateWithLoop(ctx context.Context, messages []*schema.Message, 
-	onToolCall ToolCallHandler, onToolResult ToolResultHandler, onResponse ResponseHandler, onToolCallContent ToolCallContentHandler) (*schema.Message, error) {
+	onToolCall ToolCallHandler, onToolExecution ToolExecutionHandler, onToolResult ToolResultHandler, onResponse ResponseHandler, onToolCallContent ToolCallContentHandler) (*schema.Message, error) {
 
 	// Create a copy of messages to avoid modifying the original
 	workingMessages := make([]*schema.Message, len(messages))
@@ -408,7 +411,18 @@ func (a *Agent) GenerateWithLoop(ctx context.Context, messages []*schema.Message
 
 				// Execute the tool
 				if selectedTool, exists := toolMap[toolCall.Function.Name]; exists {
+					// Notify tool execution start
+					if onToolExecution != nil {
+						onToolExecution(toolCall.Function.Name, true)
+					}
+					
 					output, err := selectedTool.(tool.InvokableTool).InvokableRun(ctx, toolCall.Function.Arguments)
+					
+					// Notify tool execution end
+					if onToolExecution != nil {
+						onToolExecution(toolCall.Function.Name, false)
+					}
+					
 					if err != nil {
 						errorMsg := fmt.Sprintf("Tool execution error: %v", err)
 						toolMessage := schema.ToolMessage(errorMsg, toolCall.ID)