Fix tool call history not round-tripped in conversation context (#203)

* Fix tool call history not round-tripped in conversation context

* Hydrate tool calls and results in DatabaseConversationStore

Author: nicodevs

src/Gateway/Prism/PrismGateway.php

@@ -79,9 +79,11 @@ public function generateText(
             $this->addProviderTools($provider, $request, $tools);
         }
 
+        $prismMessages = $this->toPrismMessages($messages);
+
         try {
             $response = $request
-                ->withMessages($this->toPrismMessages($messages))
+                ->withMessages($prismMessages)
                 ->{$structured ? 'asStructured' : 'asText'}();
         } catch (PrismVendorException $e) {
             throw PrismException::toAiException($e, $provider, $model);
@@ -106,7 +108,7 @@ public function generateText(
                 PrismUsage::toLaravelUsage($response->usage),
                 new Meta($provider->name(), $response->meta->model, $citations),
             ))->withMessages(
-                PrismMessages::toLaravelMessages($response->messages)
+                PrismMessages::toLaravelMessages($response->messages)->slice(count($prismMessages))->values()
             )->withSteps(PrismSteps::toLaravelSteps($response->steps, $provider));
     }
 

src/Gateway/Prism/PrismMessages.php

@@ -31,6 +31,8 @@
 use Prism\Prism\ValueObjects\Messages\AssistantMessage as PrismAssistantMessage;
 use Prism\Prism\ValueObjects\Messages\ToolResultMessage as PrismToolResultMessage;
 use Prism\Prism\ValueObjects\Messages\UserMessage as PrismUserMessage;
+use Prism\Prism\ValueObjects\ToolCall as PrismToolCall;
+use Prism\Prism\ValueObjects\ToolResult as PrismToolResult;
 
 class PrismMessages
 {
@@ -41,6 +43,18 @@ public static function fromLaravelMessages(Collection $messages): Collection
     {
         return $messages
             ->map(function ($message) {
+                if ($message instanceof ToolResultMessage) {
+                    return new PrismToolResultMessage(
+                        $message->toolResults->map(fn ($toolResult) => new PrismToolResult(
+                            toolCallId: $toolResult->id,
+                            toolName: $toolResult->name,
+                            args: $toolResult->arguments,
+                            result: $toolResult->result,
+                            toolCallResultId: $toolResult->resultId,
+                        ))->all()
+                    );
+                }
+
                 $message = Message::tryFrom($message);
 
                 if ($message->role === MessageRole::User) {
@@ -51,7 +65,21 @@ public static function fromLaravelMessages(Collection $messages): Collection
                 }
 
                 if ($message->role === MessageRole::Assistant) {
-                    return new PrismAssistantMessage($message->content);
+                    $toolCalls = $message instanceof AssistantMessage && $message->toolCalls->isNotEmpty()
+                        ? $message->toolCalls->map(fn ($toolCall) => new PrismToolCall(
+                            id: $toolCall->id,
+                            name: $toolCall->name,
+                            arguments: $toolCall->arguments,
+                            resultId: $toolCall->resultId,
+                            reasoningId: $toolCall->reasoningId,
+                            reasoningSummary: $toolCall->reasoningSummary,
+                        ))->all()
+                        : [];
+
+                    return new PrismAssistantMessage(
+                        $message->content ?? '',
+                        toolCalls: $toolCalls,
+                    );
                 }
             })->filter()->values();
     }

src/Providers/Concerns/GeneratesText.php

@@ -73,6 +73,7 @@ public function prompt(AgentPrompt $prompt): AgentResponse
                         ->withSteps($response->steps)
                     : (new AgentResponse($invocationId, $response->text, $response->usage, $response->meta))
                         ->withMessages($response->messages)
+                        ->withToolCallsAndResults($response->toolCalls, $response->toolResults)
                         ->withSteps($response->steps);
             });
 

src/Storage/DatabaseConversationStore.php

@@ -6,9 +6,13 @@
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
 use Laravel\Ai\Contracts\ConversationStore;
+use Laravel\Ai\Messages\AssistantMessage;
 use Laravel\Ai\Messages\Message;
+use Laravel\Ai\Messages\ToolResultMessage;
 use Laravel\Ai\Prompts\AgentPrompt;
 use Laravel\Ai\Responses\AgentResponse;
+use Laravel\Ai\Responses\Data\ToolCall;
+use Laravel\Ai\Responses\Data\ToolResult;
 
 class DatabaseConversationStore implements ConversationStore
 {
@@ -107,6 +111,43 @@ public function getLatestConversationMessages(string $conversationId, int $limit
             ->get()
             ->reverse()
             ->values()
-            ->map(fn ($m) => new Message($m->role, $m->content));
+            ->flatMap(function ($record) {
+                $toolCalls = collect(json_decode($record->tool_calls, true));
+                $toolResults = collect(json_decode($record->tool_results, true));
+
+                if ($record->role === 'user') {
+                    return [new Message('user', $record->content)];
+                }
+
+                if ($toolCalls->isNotEmpty()) {
+                    $messages = [];
+
+                    $messages[] = new AssistantMessage(
+                        $record->content ?: '',
+                        $toolCalls->map(fn ($toolCall) => new ToolCall(
+                            id: $toolCall['id'],
+                            name: $toolCall['name'],
+                            arguments: $toolCall['arguments'],
+                            resultId: $toolCall['result_id'] ?? null,
+                        ))
+                    );
+
+                    if ($toolResults->isNotEmpty()) {
+                        $messages[] = new ToolResultMessage(
+                            $toolResults->map(fn ($toolResult) => new ToolResult(
+                                id: $toolResult['id'],
+                                name: $toolResult['name'],
+                                arguments: $toolResult['arguments'],
+                                result: $toolResult['result'],
+                                resultId: $toolResult['result_id'] ?? null,
+                            ))
+                        );
+                    }
+
+                    return $messages;
+                }
+
+                return [new AssistantMessage($record->content)];
+            });
     }
 }