include tool call ids

Author: jahooma

packages/internal/src/openai-compatible/chat/convert-to-openai-compatible-chat-messages.test.ts

@@ -147,6 +147,7 @@ describe('tool calls', () => {
       {
         role: 'tool',
         content: JSON.stringify({ oof: '321rab' }),
+        name: 'thwomp',
         tool_call_id: 'quux',
       },
     ])
@@ -196,6 +197,7 @@ describe('tool calls', () => {
       {
         role: 'tool',
         content: 'It is sunny today',
+        name: 'getWeather',
         tool_call_id: 'call-1',
       },
     ])
@@ -541,11 +543,13 @@ describe('provider-specific metadata merging', () => {
       {
         role: 'tool',
         tool_call_id: 'call123',
+        name: 'calculator',
         content: JSON.stringify({ stepOne: 'data chunk 1' }),
       },
       {
         role: 'tool',
         tool_call_id: 'call123',
+        name: 'calculator',
         content: JSON.stringify({ stepTwo: 'data chunk 2' }),
         partial: true,
       },

packages/internal/src/openai-compatible/chat/convert-to-openai-compatible-chat-messages.ts

@@ -124,6 +124,7 @@ export function convertToOpenAICompatibleChatMessages(
           messages.push({
             role: 'tool',
             tool_call_id: toolResponse.toolCallId,
+            name: toolResponse.toolName,
             content: contentValue,
             ...toolResponseMetadata,
           })

packages/internal/src/openai-compatible/chat/openai-compatible-api-types.ts

@@ -59,5 +59,6 @@ export interface OpenAICompatibleMessageToolCall extends JsonRecord {
 export interface OpenAICompatibleToolMessage extends JsonRecord {
   role: 'tool';
   content: string;
+  name?: string;
   tool_call_id: string;
 }

packages/internal/src/openai-compatible/chat/openai-compatible-prepare-tools.test.ts

@@ -0,0 +1,45 @@
+import { describe, expect, it } from 'bun:test'
+
+import { prepareTools } from './openai-compatible-prepare-tools'
+
+describe('prepareTools', () => {
+  it('adds stable ids to function tool definitions', () => {
+    const result = prepareTools({
+      tools: [
+        {
+          type: 'function',
+          name: 'read_files',
+          description: 'Read files',
+          inputSchema: { type: 'object' },
+        },
+        {
+          type: 'function',
+          name: 'write_todos',
+          description: 'Write todos',
+          inputSchema: { type: 'object' },
+        },
+      ],
+    })
+
+    expect(result.tools).toEqual([
+      {
+        id: 'tool_1',
+        type: 'function',
+        function: {
+          name: 'read_files',
+          description: 'Read files',
+          parameters: { type: 'object' },
+        },
+      },
+      {
+        id: 'tool_2',
+        type: 'function',
+        function: {
+          name: 'write_todos',
+          description: 'Write todos',
+          parameters: { type: 'object' },
+        },
+      },
+    ])
+  })
+})

packages/internal/src/openai-compatible/chat/openai-compatible-prepare-tools.ts

@@ -16,6 +16,7 @@ export function prepareTools({
   tools:
     | undefined
     | Array<{
+        id: string;
         type: 'function';
         function: {
           name: string;
@@ -41,6 +42,7 @@ export function prepareTools({
   }
 
   const openaiCompatTools: Array<{
+    id: string;
     type: 'function';
     function: {
       name: string;
@@ -49,11 +51,12 @@ export function prepareTools({
     };
   }> = [];
 
-  for (const tool of tools) {
+  for (const [index, tool] of tools.entries()) {
     if (tool.type === 'provider-defined') {
       toolWarnings.push({ type: 'unsupported-tool', tool });
     } else {
       openaiCompatTools.push({
+        id: `tool_${index + 1}`,
         type: 'function',
         function: {
           name: tool.name,

packages/internal/src/openrouter-ai-sdk/chat/convert-to-openrouter-chat-messages.test.ts

@@ -481,6 +481,7 @@ describe('cache control', () => {
       {
         role: 'tool',
         tool_call_id: 'call-123',
+        name: 'calculator',
         content: JSON.stringify({ answer: 42 }),
         cache_control: { type: 'ephemeral' },
       },

packages/internal/src/openrouter-ai-sdk/chat/convert-to-openrouter-chat-messages.ts

@@ -198,6 +198,7 @@ export function convertToOpenRouterChatMessages(
           messages.push({
             role: 'tool',
             tool_call_id: toolResponse.toolCallId,
+            name: toolResponse.toolName,
             content,
             cache_control:
               getCacheControl(providerOptions) ??

packages/internal/src/openrouter-ai-sdk/chat/index.test.ts

@@ -629,6 +629,7 @@ describe('doGenerate', () => {
       messages: [{ role: 'user', content: [{ type: 'text', text: 'Hello' }] }],
       tools: [
         {
+          id: 'tool_1',
           type: 'function',
           function: {
             name: 'test-tool',

packages/internal/src/openrouter-ai-sdk/chat/index.ts

@@ -166,7 +166,8 @@ export class OpenRouterChatLanguageModel implements LanguageModelV2 {
       // TODO: support built-in tools
       const mappedTools = tools
         .filter((tool) => tool.type === 'function')
-        .map((tool) => ({
+        .map((tool, index) => ({
+          id: `tool_${index + 1}`,
           type: 'function' as const,
           function: {
             name: tool.name,

packages/internal/src/openrouter-ai-sdk/types/openrouter-chat-completions-input.ts

@@ -73,6 +73,7 @@ export interface ChatCompletionMessageToolCall {
 export interface ChatCompletionToolMessageParam {
   role: 'tool'
   content: string
+  name?: string
   tool_call_id: string
   cache_control?: OpenRouterCacheControl
 }