Revert "include tool call ids"

jahooma · jahooma · commit b1d8b3115978 · 2026-04-28T17:14:55.000-07:00
This reverts commit 8c63e6a.
diff --git a/packages/internal/src/openai-compatible/chat/convert-to-openai-compatible-chat-messages.test.ts b/packages/internal/src/openai-compatible/chat/convert-to-openai-compatible-chat-messages.test.ts
@@ -147,7 +147,6 @@ describe('tool calls', () => {
       {
         role: 'tool',
         content: JSON.stringify({ oof: '321rab' }),
-        name: 'thwomp',
         tool_call_id: 'quux',
       },
     ])
@@ -197,7 +196,6 @@ describe('tool calls', () => {
       {
         role: 'tool',
         content: 'It is sunny today',
-        name: 'getWeather',
         tool_call_id: 'call-1',
       },
     ])
@@ -543,13 +541,11 @@ 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,
       },
diff --git a/packages/internal/src/openai-compatible/chat/convert-to-openai-compatible-chat-messages.ts b/packages/internal/src/openai-compatible/chat/convert-to-openai-compatible-chat-messages.ts
@@ -124,7 +124,6 @@ export function convertToOpenAICompatibleChatMessages(
           messages.push({
             role: 'tool',
             tool_call_id: toolResponse.toolCallId,
-            name: toolResponse.toolName,
             content: contentValue,
             ...toolResponseMetadata,
           })
diff --git a/packages/internal/src/openai-compatible/chat/openai-compatible-api-types.ts b/packages/internal/src/openai-compatible/chat/openai-compatible-api-types.ts
@@ -59,6 +59,5 @@ export interface OpenAICompatibleMessageToolCall extends JsonRecord {
 export interface OpenAICompatibleToolMessage extends JsonRecord {
   role: 'tool';
   content: string;
-  name?: string;
   tool_call_id: string;
 }
diff --git a/packages/internal/src/openai-compatible/chat/openai-compatible-prepare-tools.test.ts b/packages/internal/src/openai-compatible/chat/openai-compatible-prepare-tools.test.ts
diff --git a/packages/internal/src/openai-compatible/chat/openai-compatible-prepare-tools.ts b/packages/internal/src/openai-compatible/chat/openai-compatible-prepare-tools.ts
@@ -16,7 +16,6 @@ export function prepareTools({
   tools:
     | undefined
     | Array<{
-        id: string;
         type: 'function';
         function: {
           name: string;
@@ -42,7 +41,6 @@ export function prepareTools({
   }
 
   const openaiCompatTools: Array<{
-    id: string;
     type: 'function';
     function: {
       name: string;
@@ -51,12 +49,11 @@ export function prepareTools({
     };
   }> = [];
 
-  for (const [index, tool] of tools.entries()) {
+  for (const tool of tools) {
     if (tool.type === 'provider-defined') {
       toolWarnings.push({ type: 'unsupported-tool', tool });
     } else {
       openaiCompatTools.push({
-        id: `tool_${index + 1}`,
         type: 'function',
         function: {
           name: tool.name,
diff --git a/packages/internal/src/openrouter-ai-sdk/chat/convert-to-openrouter-chat-messages.test.ts b/packages/internal/src/openrouter-ai-sdk/chat/convert-to-openrouter-chat-messages.test.ts
@@ -481,7 +481,6 @@ describe('cache control', () => {
       {
         role: 'tool',
         tool_call_id: 'call-123',
-        name: 'calculator',
         content: JSON.stringify({ answer: 42 }),
         cache_control: { type: 'ephemeral' },
       },
diff --git a/packages/internal/src/openrouter-ai-sdk/chat/convert-to-openrouter-chat-messages.ts b/packages/internal/src/openrouter-ai-sdk/chat/convert-to-openrouter-chat-messages.ts
@@ -198,7 +198,6 @@ export function convertToOpenRouterChatMessages(
           messages.push({
             role: 'tool',
             tool_call_id: toolResponse.toolCallId,
-            name: toolResponse.toolName,
             content,
             cache_control:
               getCacheControl(providerOptions) ??
diff --git a/packages/internal/src/openrouter-ai-sdk/chat/index.test.ts b/packages/internal/src/openrouter-ai-sdk/chat/index.test.ts
@@ -629,7 +629,6 @@ describe('doGenerate', () => {
       messages: [{ role: 'user', content: [{ type: 'text', text: 'Hello' }] }],
       tools: [
         {
-          id: 'tool_1',
           type: 'function',
           function: {
             name: 'test-tool',
diff --git a/packages/internal/src/openrouter-ai-sdk/chat/index.ts b/packages/internal/src/openrouter-ai-sdk/chat/index.ts
@@ -166,8 +166,7 @@ export class OpenRouterChatLanguageModel implements LanguageModelV2 {
       // TODO: support built-in tools
       const mappedTools = tools
         .filter((tool) => tool.type === 'function')
-        .map((tool, index) => ({
-          id: `tool_${index + 1}`,
+        .map((tool) => ({
           type: 'function' as const,
           function: {
             name: tool.name,
diff --git a/packages/internal/src/openrouter-ai-sdk/types/openrouter-chat-completions-input.ts b/packages/internal/src/openrouter-ai-sdk/types/openrouter-chat-completions-input.ts
@@ -73,7 +73,6 @@ export interface ChatCompletionMessageToolCall {
 export interface ChatCompletionToolMessageParam {
   role: 'tool'
   content: string
-  name?: string
   tool_call_id: string
   cache_control?: OpenRouterCacheControl
 }
diff --git a/web/src/llm-api/types.ts b/web/src/llm-api/types.ts
@@ -28,21 +28,9 @@ export interface ChatMessage {
   tool_call_id?: string
 }
 
-export interface ChatCompletionTool {
-  id?: string
-  type: string
-  function?: {
-    name: string
-    description?: string
-    parameters?: unknown
-    strict?: boolean
-  }
-}
-
 export interface ChatCompletionRequestBody {
   model: string
   messages: ChatMessage[]
-  tools?: ChatCompletionTool[]
   stream?: boolean
   temperature?: number
   max_tokens?: number

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,5 @@ export interface OpenAICompatibleMessageToolCall extends JsonRecord {`
`59`	`59`	`export interface OpenAICompatibleToolMessage extends JsonRecord {`
`60`	`60`	`role: 'tool';`
`61`	`61`	`content: string;`
`62`		`- name?: string;`
`63`	`62`	`tool_call_id: string;`
`64`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -481,7 +481,6 @@ describe('cache control', () => {`
`481`	`481`	`{`
`482`	`482`	`role: 'tool',`
`483`	`483`	`tool_call_id: 'call-123',`
`484`		`- name: 'calculator',`
`485`	`484`	`content: JSON.stringify({ answer: 42 }),`
`486`	`485`	`cache_control: { type: 'ephemeral' },`
`487`	`486`	`},`
Original file line number	Diff line number	Diff line change
`@@ -629,7 +629,6 @@ describe('doGenerate', () => {`
`629`	`629`	`messages: [{ role: 'user', content: [{ type: 'text', text: 'Hello' }] }],`
`630`	`630`	`tools: [`
`631`	`631`	`{`
`632`		`- id: 'tool_1',`
`633`	`632`	`type: 'function',`
`634`	`633`	`function: {`
`635`	`634`	`name: 'test-tool',`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,6 @@ export interface ChatCompletionMessageToolCall {`
`73`	`73`	`export interface ChatCompletionToolMessageParam {`
`74`	`74`	`role: 'tool'`
`75`	`75`	`content: string`
`76`		`- name?: string`
`77`	`76`	`tool_call_id: string`
`78`	`77`	`cache_control?: OpenRouterCacheControl`
`79`	`78`	`}`