Skip to content

Fix stored tool conversation replay order #621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pushpak1300 merged 4 commits into from
Jun 30, 2026
Merged

Fix stored tool conversation replay order #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f253b09
Fix stored tool conversation replay order
May 19, 2026
5513c92
Merge remote-tracking branch 'origin/0.x' into fix/database-conversat…
pushpak1300 Jun 30, 2026
19797e7
Keep final text on tool call message when no tool results stored
pushpak1300 Jun 30, 2026
038bf7f
Drop resultless tool calls when replaying stored conversations
pushpak1300 Jun 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions src/Storage/DatabaseConversationStore.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,17 +156,24 @@ public function getLatestConversationMessages(string $conversationId, int $limit
}

if ($toolCalls->isNotEmpty()) {
if ($toolResults->isEmpty()) {
return filled($record->content)
? [new AssistantMessage($record->content)]
: [];
}

$messages = [
new AssistantMessage(
$record->content ?: '',
'',
$toolCalls->map(ToolCall::fromArray(...)),
),
new ToolResultMessage(
$toolResults->map(ToolResult::fromArray(...)),
),
];

if ($toolResults->isNotEmpty()) {
$messages[] = new ToolResultMessage(
$toolResults->map(ToolResult::fromArray(...)),
);
if (filled($record->content)) {
$messages[] = new AssistantMessage($record->content);
}

return $messages;
Expand Down
102 changes: 100 additions & 2 deletions tests/Feature/Storage/DatabaseConversationStoreTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,109 @@

$messages = $store->getLatestConversationMessages($conversationId, 10);

expect($messages)->toHaveCount(2)
expect($messages)->toHaveCount(3)
->and($messages[0])->toBeInstanceOf(AssistantMessage::class)
->and($messages[0]->toolCalls->keys()->all())->toBe([0, 1])
->and($messages[1])->toBeInstanceOf(ToolResultMessage::class)
->and($messages[1]->toolResults->keys()->all())->toBe([0, 1]);
->and($messages[1]->toolResults->keys()->all())->toBe([0, 1])
->and($messages[2])->toBeInstanceOf(AssistantMessage::class)
->and($messages[2]->content)->toBe('The order has shipped.');
});

test('it replays stored tool conversations before the final assistant response', function () {
$store = new DatabaseConversationStore;
$conversationId = $store->storeConversation(1, 'Tool conversation');

DB::table('agent_conversation_messages')->insert([
'id' => 'message-1',
'conversation_id' => $conversationId,
'user_id' => 1,
'agent' => ToolUsingAgent::class,
'role' => 'assistant',
'content' => 'The order has shipped.',
'attachments' => '[]',
'tool_calls' => json_encode([
['id' => 'call-1', 'name' => 'lookup_order', 'arguments' => ['id' => 1], 'result_id' => 'result-1'],
]),
'tool_results' => json_encode([
['id' => 'call-1', 'name' => 'lookup_order', 'arguments' => ['id' => 1], 'result' => ['status' => 'shipped'], 'result_id' => 'result-1'],
]),
'usage' => '[]',
'meta' => '[]',
'created_at' => now(),
'updated_at' => now(),
]);

$messages = $store->getLatestConversationMessages($conversationId, 10);

expect($messages)->toHaveCount(3)
->and($messages[0])->toBeInstanceOf(AssistantMessage::class)
->and($messages[0]->content)->toBe('')
->and($messages[0]->toolCalls)->toHaveCount(1)
->and($messages[0]->toolCalls[0]->resultId)->toBe('result-1')
->and($messages[1])->toBeInstanceOf(ToolResultMessage::class)
->and($messages[1]->toolResults)->toHaveCount(1)
->and($messages[1]->toolResults[0]->resultId)->toBe('result-1')
->and($messages[2])->toBeInstanceOf(AssistantMessage::class)
->and($messages[2]->content)->toBe('The order has shipped.')
->and($messages[2]->toolCalls)->toBeEmpty();
});

test('it drops resultless tool calls and replays only the final assistant text', function () {
$store = new DatabaseConversationStore;
$conversationId = $store->storeConversation(1, 'Tool conversation');

DB::table('agent_conversation_messages')->insert([
'id' => 'message-1',
'conversation_id' => $conversationId,
'user_id' => 1,
'agent' => ToolUsingAgent::class,
'role' => 'assistant',
'content' => 'The order has shipped.',
'attachments' => '[]',
'tool_calls' => json_encode([
['id' => 'call-1', 'name' => 'lookup_order', 'arguments' => ['id' => 1], 'result_id' => 'result-1'],
]),
'tool_results' => '[]',
'usage' => '[]',
'meta' => '[]',
'created_at' => now(),
'updated_at' => now(),
]);

$messages = $store->getLatestConversationMessages($conversationId, 10);

expect($messages)->toHaveCount(1)
->and($messages[0])->toBeInstanceOf(AssistantMessage::class)
->and($messages[0]->content)->toBe('The order has shipped.')
->and($messages[0]->toolCalls)->toBeEmpty();
});

test('it drops resultless tool calls with no final text entirely', function () {
$store = new DatabaseConversationStore;
$conversationId = $store->storeConversation(1, 'Tool conversation');

DB::table('agent_conversation_messages')->insert([
'id' => 'message-1',
'conversation_id' => $conversationId,
'user_id' => 1,
'agent' => ToolUsingAgent::class,
'role' => 'assistant',
'content' => '',
'attachments' => '[]',
'tool_calls' => json_encode([
['id' => 'call-1', 'name' => 'lookup_order', 'arguments' => ['id' => 1], 'result_id' => 'result-1'],
]),
'tool_results' => '[]',
'usage' => '[]',
'meta' => '[]',
'created_at' => now(),
'updated_at' => now(),
]);

$messages = $store->getLatestConversationMessages($conversationId, 10);

expect($messages)->toBeEmpty();
});

test('it rehydrates reasoning encrypted content on stored tool calls', function () {
Expand Down