Merge pull request #1140 from trungutt/feat/save-tool-definitions-with-messages

Save tool definitions with assistant messages

Author: dgageot

pkg/chat/chat.go

@@ -52,6 +52,10 @@ type Message struct {
 	// For Role=assistant prompts this may be set to the tool calls generated by the model, such as function calls.
 	ToolCalls []tools.ToolCall `json:"tool_calls,omitempty"`
 
+	// ToolDefinitions contains the definitions of tools referenced in ToolCalls.
+	// This is used to provide tool metadata (name, description, category) when loading historical sessions.
+	ToolDefinitions []tools.Tool `json:"tool_definitions,omitempty"`
+
 	// For Role=tool prompts this should be set to the ID given in the assistant's prior request to call a tool.
 	ToolCallID string `json:"tool_call_id,omitempty"`
 

pkg/runtime/runtime.go

@@ -704,13 +704,28 @@ func (r *LocalRuntime) RunStream(ctx context.Context, sess *session.Session) <-c
 			// Add assistant message to conversation history, but skip empty assistant messages
 			// Providers reject assistant messages that have neither content nor tool calls.
 			if strings.TrimSpace(res.Content) != "" || len(res.Calls) > 0 {
+				// Build tool definitions for the tool calls
+				var toolDefs []tools.Tool
+				if len(res.Calls) > 0 {
+					toolMap := make(map[string]tools.Tool, len(agentTools))
+					for _, t := range agentTools {
+						toolMap[t.Name] = t
+					}
+					for _, call := range res.Calls {
+						if def, ok := toolMap[call.Function.Name]; ok {
+							toolDefs = append(toolDefs, def)
+						}
+					}
+				}
+
 				assistantMessage := chat.Message{
 					Role:              chat.MessageRoleAssistant,
 					Content:           res.Content,
 					ReasoningContent:  res.ReasoningContent,
 					ThinkingSignature: res.ThinkingSignature,
 					ThoughtSignature:  res.ThoughtSignature,
 					ToolCalls:         res.Calls,
+					ToolDefinitions:   toolDefs,
 					CreatedAt:         time.Now().Format(time.RFC3339),
 				}