push.rocks/smartai
3
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ollama): preserve tool_calls in message history for native tool calling

Browse Source 
When using native tool calling, the assistant's tool_calls must be saved in
message history. Without this, the model doesn't know it already called a
tool and may loop indefinitely calling the same tool.

This fix adds tool_calls forwarding in chatStreamResponse and chatWithOptions
history formatting.
This commit is contained in:
Jürgen Kunz
2026-01-20 03:54:51 +00:00
parent d296a1b676
commit 8eb3111e7e
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ts/provider.ollama.ts
View File

@@ -345,9 +345,9 @@ export class OllamaProvider extends MultiModalModel {
const timeout = optionsArg.timeout || this.defaultTimeout; const timeout = optionsArg.timeout || this.defaultTimeout;
const modelOptions = { ...this.defaultOptions, ...optionsArg.options }; const modelOptions = { ...this.defaultOptions, ...optionsArg.options };
// Format history messages with optional images and reasoning // Format history messages with optional images, reasoning, and tool_calls
const historyMessages = optionsArg.messageHistory.map((msg) => { const historyMessages = optionsArg.messageHistory.map((msg) => {
const formatted: { role: string; content: string; images?: string[]; reasoning?: string } = { const formatted: { role: string; content: string; images?: string[]; reasoning?: string; tool_calls?: any[] } = {
role: msg.role, role: msg.role,
content: msg.content, content: msg.content,
}; };
@@ -357,6 +357,11 @@ export class OllamaProvider extends MultiModalModel {
if (msg.reasoning) { if (msg.reasoning) {
formatted.reasoning = msg.reasoning; formatted.reasoning = msg.reasoning;
} }
// CRITICAL: Include tool_calls in history for native tool calling
// Without this, the model doesn't know it already called a tool and may call it again
if ((msg as any).tool_calls && Array.isArray((msg as any).tool_calls)) {
formatted.tool_calls = (msg as any).tool_calls;
}
return formatted; return formatted;
}); });
@@ -494,7 +499,7 @@ export class OllamaProvider extends MultiModalModel {
const timeout = optionsArg.timeout || this.defaultTimeout; const timeout = optionsArg.timeout || this.defaultTimeout;
const modelOptions = { ...this.defaultOptions, ...optionsArg.options }; const modelOptions = { ...this.defaultOptions, ...optionsArg.options };
// Format history messages with optional images, reasoning, and tool role // Format history messages with optional images, reasoning, tool_calls, and tool role
const historyMessages = optionsArg.messageHistory.map((msg) => { const historyMessages = optionsArg.messageHistory.map((msg) => {
// Handle tool result messages // Handle tool result messages
if ((msg as any).role === 'tool') { if ((msg as any).role === 'tool') {
@@ -505,7 +510,7 @@ export class OllamaProvider extends MultiModalModel {
}; };
} }
const formatted: { role: string; content: string; images?: string[]; reasoning?: string } = { const formatted: { role: string; content: string; images?: string[]; reasoning?: string; tool_calls?: any[] } = {
role: msg.role, role: msg.role,
content: msg.content, content: msg.content,
}; };
@@ -515,6 +520,11 @@ export class OllamaProvider extends MultiModalModel {
if (msg.reasoning) { if (msg.reasoning) {
formatted.reasoning = msg.reasoning; formatted.reasoning = msg.reasoning;
} }
// CRITICAL: Include tool_calls in history for native tool calling
// Without this, the model doesn't know it already called a tool and may call it again
if ((msg as any).tool_calls && Array.isArray((msg as any).tool_calls)) {
formatted.tool_calls = (msg as any).tool_calls;
}
return formatted; return formatted;
}); });