From 3e0a1592e685867e4fd34d320a2e762dd24f9d92 Mon Sep 17 00:00:00 2001 From: "CJACK." Date: Sun, 22 Feb 2026 23:19:12 +0800 Subject: [PATCH 1/2] fix(node): avoid dropping filtered tool json in sieve flush --- .../js/helpers/stream-tool-sieve/sieve.js | 8 ------- tests/node/stream-tool-sieve.test.js | 22 +++++++++++++++++++ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/internal/js/helpers/stream-tool-sieve/sieve.js b/internal/js/helpers/stream-tool-sieve/sieve.js index c10e636b8..36c12f097 100644 --- a/internal/js/helpers/stream-tool-sieve/sieve.js +++ b/internal/js/helpers/stream-tool-sieve/sieve.js @@ -207,14 +207,6 @@ function consumeToolCapture(state, toolNames) { } const parsed = parseStandaloneToolCalls(captured.slice(start, obj.end), toolNames); if (parsed.length === 0) { - if (state.toolNameSent) { - return { - ready: true, - prefix: prefixPart, - calls: [], - suffix: suffixPart, - }; - } return { ready: true, prefix: captured, diff --git a/tests/node/stream-tool-sieve.test.js b/tests/node/stream-tool-sieve.test.js index 2fc2eccfd..94e4b04a2 100644 --- a/tests/node/stream-tool-sieve.test.js +++ b/tests/node/stream-tool-sieve.test.js @@ -178,6 +178,28 @@ test('sieve emits incremental tool_call_deltas for split arguments payload', () assert.equal(argsJoined.includes('"mode":"head"'), true); }); +test('sieve preserves filtered tool json as text after incremental probe', () => { + const state = createToolSieveState(); + const first = processToolSieveChunk( + state, + '{"tool_calls":[{"name":"unknown_tool","input":{"q":"hel', + ['read_file'], + ); + const second = processToolSieveChunk( + state, + 'lo"}}]}继续正文。', + ['read_file'], + ); + const tail = flushToolSieve(state, ['read_file']); + const events = [...first, ...second, ...tail]; + const leakedText = collectText(events); + const hasToolCall = events.some((evt) => evt.type === 'tool_calls' && evt.calls?.length > 0); + assert.equal(hasToolCall, false); + assert.equal(leakedText.toLowerCase().includes('tool_calls'), true); + assert.equal(leakedText.includes('unknown_tool'), true); + assert.equal(leakedText.includes('继续正文。'), true); +}); + test('sieve still intercepts tool call after leading plain text without suffix', () => { const events = runSieve( ['我将调用工具。', '{"tool_calls":[{"name":"read_file","input":{"path":"README.MD"}}]}'], From b2c87f26d3d2af65ce3d9a696ed6331a7eb41215 Mon Sep 17 00:00:00 2001 From: "CJACK." Date: Sun, 22 Feb 2026 23:28:20 +0800 Subject: [PATCH 2/2] fix(node): re-scan suffix after filtered tool block --- .../js/helpers/stream-tool-sieve/sieve.js | 4 ++-- tests/node/stream-tool-sieve.test.js | 23 +++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/internal/js/helpers/stream-tool-sieve/sieve.js b/internal/js/helpers/stream-tool-sieve/sieve.js index 36c12f097..932ba808f 100644 --- a/internal/js/helpers/stream-tool-sieve/sieve.js +++ b/internal/js/helpers/stream-tool-sieve/sieve.js @@ -209,9 +209,9 @@ function consumeToolCapture(state, toolNames) { if (parsed.length === 0) { return { ready: true, - prefix: captured, + prefix: captured.slice(0, obj.end), calls: [], - suffix: '', + suffix: suffixPart, }; } if (state.toolNameSent) { diff --git a/tests/node/stream-tool-sieve.test.js b/tests/node/stream-tool-sieve.test.js index 94e4b04a2..43ffeaccb 100644 --- a/tests/node/stream-tool-sieve.test.js +++ b/tests/node/stream-tool-sieve.test.js @@ -200,6 +200,29 @@ test('sieve preserves filtered tool json as text after incremental probe', () => assert.equal(leakedText.includes('继续正文。'), true); }); +test('sieve re-scans suffix after filtered first tool block and still emits later valid call', () => { + const state = createToolSieveState(); + const first = processToolSieveChunk( + state, + '{"tool_calls":[{"name":"unknown_tool","input":{"q":"hel', + ['read_file'], + ); + const second = processToolSieveChunk( + state, + 'lo"}}]}{"tool_calls":[{"name":"read_file","input":{"path":"README.MD"}}]}尾文', + ['read_file'], + ); + const tail = flushToolSieve(state, ['read_file']); + const events = [...first, ...second, ...tail]; + const leakedText = collectText(events); + const emittedToolCall = events.some((evt) => evt.type === 'tool_calls' && evt.calls?.some((call) => call.name === 'read_file')); + const emittedToolDelta = events.some((evt) => evt.type === 'tool_call_deltas' && evt.deltas?.some((delta) => delta.name === 'read_file')); + + assert.equal(emittedToolCall || emittedToolDelta, true); + assert.equal(leakedText.includes('unknown_tool'), true); + assert.equal(leakedText.includes('尾文'), true); +}); + test('sieve still intercepts tool call after leading plain text without suffix', () => { const events = runSieve( ['我将调用工具。', '{"tool_calls":[{"name":"read_file","input":{"path":"README.MD"}}]}'],