From 2092d1a73b1f248dc75eacb58541f7451c2742b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=89=BA=E9=9F=AC=28yangyitao=29?= Date: Sat, 21 Mar 2026 02:27:10 +0000 Subject: [PATCH] fix(ollama): guard against reasoning="off" truthy string, add test case MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Check `options.reasoning !== "off"` before setting think: true - Simplify else-if to just `else if (options)` - Add test: reasoning="off" → think: false Addresses review feedback from greptile-apps, codex-connector, and @Kaspre --- src/agents/ollama-stream.test.ts | 27 +++++++++++++++++++++++++++ src/agents/ollama-stream.ts | 4 ++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/agents/ollama-stream.test.ts b/src/agents/ollama-stream.test.ts index 3e465ec8368..03d35834db7 100644 --- a/src/agents/ollama-stream.test.ts +++ b/src/agents/ollama-stream.test.ts @@ -598,6 +598,33 @@ describe("createOllamaStreamFn", () => { }, ); }); + + it("sends think:false when reasoning is 'off'", async () => { + await withMockNdjsonFetch( + [ + '{"model":"m","created_at":"t","message":{"role":"assistant","content":"ok"},"done":false}', + '{"model":"m","created_at":"t","message":{"role":"assistant","content":""},"done":true,"prompt_eval_count":1,"eval_count":1}', + ], + async (fetchMock) => { + const streamFn = createOllamaStreamFn("http://ollama-host:11434"); + const stream = await streamFn( + { + id: "deepseek-r1:32b", + api: "ollama", + provider: "ollama", + contextWindow: 131072, + } as never, + { messages: [{ role: "user", content: "hello" }] } as never, + { reasoning: "off" } as never, + ); + await collectStreamEvents(stream); + + const [, reqInit] = fetchMock.mock.calls[0] as unknown as [string, RequestInit]; + const body = JSON.parse(reqInit.body as string) as { think?: boolean }; + expect(body.think).toBe(false); + }, + ); + }); }); describe("resolveOllamaBaseUrlForRun", () => { diff --git a/src/agents/ollama-stream.ts b/src/agents/ollama-stream.ts index e92b0897144..1c3048b67a1 100644 --- a/src/agents/ollama-stream.ts +++ b/src/agents/ollama-stream.ts @@ -464,9 +464,9 @@ export function createOllamaStreamFn( // `think` boolean. Forward the reasoning level so `think: false` is // sent explicitly when thinking is disabled (#46680). const thinkParam: { think?: boolean } = {}; - if (options?.reasoning) { + if (options?.reasoning && options.reasoning !== "off") { thinkParam.think = true; - } else if (options && !options.reasoning) { + } else if (options) { // Thinking explicitly disabled – tell Ollama not to think. thinkParam.think = false; }