diff --git a/pkg/agent/loop.go b/pkg/agent/loop.go
index ed69712ff..6d0a61375 100644
--- a/pkg/agent/loop.go
+++ b/pkg/agent/loop.go
@@ -602,6 +602,7 @@ func (al *AgentLoop) runLLMIteration(ctx context.Context, agent *AgentInstance,
 					Name:      tc.Name,
 					Arguments: string(argumentsJSON),
 				},
+				Name: tc.Name,
 			})
 		}
 		messages = append(messages, assistantMsg)
diff --git a/pkg/tools/toolloop.go b/pkg/tools/toolloop.go
index 1302079b4..b07b14adb 100644
--- a/pkg/tools/toolloop.go
+++ b/pkg/tools/toolloop.go
@@ -109,6 +109,7 @@ func RunToolLoop(ctx context.Context, config ToolLoopConfig, messages []provider
 					Name:      tc.Name,
 					Arguments: string(argumentsJSON),
 				},
+				Name: tc.Name,
 			})
 		}
 		messages = append(messages, assistantMsg)