romtuck/openclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ollama): fall back to raw text when model ignores reasoning tags

Browse Source
This commit is contained in:
Baek, JH 2026-01-27 11:48:04 -08:00
parent 4740bfe4bb
commit 906f797ef0
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/agents/pi-embedded-subscribe.handlers.messages.ts
View File

@ -107,10 +107,12 @@ export function handleMessageUpdate(
inlineCode: createInlineCodeState(), inlineCode: createInlineCodeState(),
}) })
.trim(); .trim();
if (next && next !== ctx.state.lastStreamedAssistant) { if (next && next !== ctx.state.lastStreamedAssistant) {
const previousText = ctx.state.lastStreamedAssistant ?? ""; const previousText = ctx.state.lastStreamedAssistant ?? "";
const { text: cleanedText, mediaUrls } = parseReplyDirectives(next); const { text: cleanedText, mediaUrls } = parseReplyDirectives(next);
const { text: previousCleanedText } = parseReplyDirectives(previousText); const { text: previousCleanedText } = parseReplyDirectives(previousText);
if (cleanedText.startsWith(previousCleanedText)) { if (cleanedText.startsWith(previousCleanedText)) {
const deltaText = cleanedText.slice(previousCleanedText.length); const deltaText = cleanedText.slice(previousCleanedText.length);
ctx.state.lastStreamedAssistant = next; ctx.state.lastStreamedAssistant = next;

14
src/agents/pi-embedded-subscribe.ts
View File

@ -265,6 +265,7 @@ export function subscribeEmbeddedPiSession(params: SubscribeEmbeddedPiSessionPar
// 1. Handle <think> blocks (stateful, strip content inside) // 1. Handle <think> blocks (stateful, strip content inside)
let processed = ""; let processed = "";
let everInThinking = state.thinking;
THINKING_TAG_SCAN_RE.lastIndex = 0; THINKING_TAG_SCAN_RE.lastIndex = 0;
let lastIndex = 0; let lastIndex = 0;
let inThinking = state.thinking; let inThinking = state.thinking;
@ -276,6 +277,7 @@ export function subscribeEmbeddedPiSession(params: SubscribeEmbeddedPiSessionPar
} }
const isClose = match[1] === "/"; const isClose = match[1] === "/";
inThinking = !isClose; inThinking = !isClose;
if (inThinking) everInThinking = true;
lastIndex = idx + match[0].length; lastIndex = idx + match[0].length;
} }
if (!inThinking) { if (!inThinking) {
@ -300,10 +302,12 @@ export function subscribeEmbeddedPiSession(params: SubscribeEmbeddedPiSessionPar
let lastFinalIndex = 0; let lastFinalIndex = 0;
let inFinal = state.final; let inFinal = state.final;
let everInFinal = state.final; let everInFinal = state.final;
let everSawAnyFinalTag = state.final;
for (const match of processed.matchAll(FINAL_TAG_SCAN_RE)) { for (const match of processed.matchAll(FINAL_TAG_SCAN_RE)) {
const idx = match.index ?? 0; const idx = match.index ?? 0;
if (finalCodeSpans.isInside(idx)) continue; if (finalCodeSpans.isInside(idx)) continue;
everSawAnyFinalTag = true;
const isClose = match[1] === "/"; const isClose = match[1] === "/";
if (!inFinal && !isClose) { if (!inFinal && !isClose) {
@ -327,7 +331,17 @@ export function subscribeEmbeddedPiSession(params: SubscribeEmbeddedPiSessionPar
// Strict Mode: If enforcing final tags, we MUST NOT return content unless // Strict Mode: If enforcing final tags, we MUST NOT return content unless
// we have seen a <final> tag. Otherwise, we leak "thinking out loud" text // we have seen a <final> tag. Otherwise, we leak "thinking out loud" text
// (e.g. "**Locating Manulife**...") that the model emitted without <think> tags. // (e.g. "**Locating Manulife**...") that the model emitted without <think> tags.
//
// Fallback: If the model never used ANY reasoning tags (<think>/<final>,
// open or close), it likely doesn't support the tag format at all (e.g.
// small Ollama models). In that case, return the processed text as-is
// rather than silently dropping the entire response.
if (!everInFinal) { if (!everInFinal) {
if (!everInThinking && !everSawAnyFinalTag) {
// Model doesn't use reasoning tags at all — pass through.
state.inlineCode = finalCodeSpans.inlineState;
return stripTagsOutsideCodeSpans(processed, FINAL_TAG_SCAN_RE, finalCodeSpans.isInside);
}
return ""; return "";
} }