Add backward-compatible aliases for renamed fenced-example tests

internal/js/helpers/stream-tool-sieve/parse.js

@@ -10,8 +10,10 @@ const {
   parseTextKVToolCalls,
   stripFencedCodeBlocks,
 } = require('./parse_payload');
+const { TOOL_SEGMENT_KEYWORDS } = require('./tool-keywords');
 
 const TOOL_NAME_LOOSE_PATTERN = /[^a-z0-9]+/g;
+const TOOL_MARKUP_PREFIXES = ['<tool_call', '<function_call', '<invoke'];
 
 function extractToolNames(tools) {
   if (!Array.isArray(tools) || tools.length === 0) {
@@ -230,31 +232,18 @@ function resolveAllowedToolName(name, allowed, allowedCanonical) {
 
 function looksLikeToolCallSyntax(text) {
   const lower = toStringSafe(text).toLowerCase();
-  return lower.includes('tool_calls')
-    || lower.includes('<tool_call')
-    || lower.includes('<function_call')
-    || lower.includes('<invoke')
-    || lower.includes('function.name:');
+  return TOOL_SEGMENT_KEYWORDS.some((kw) => lower.includes(kw))
+    || TOOL_MARKUP_PREFIXES.some((prefix) => lower.includes(prefix));
 }
 
 function shouldSkipToolCallParsingForCodeFenceExample(text) {
-  if (!looksLikeToolCallSyntax(text) || looksLikeMarkupToolSyntax(text)) {
+  if (!looksLikeToolCallSyntax(text)) {
     return false;
   }
   const stripped = stripFencedCodeBlocks(text);
   return !looksLikeToolCallSyntax(stripped);
 }
 
-function looksLikeMarkupToolSyntax(text) {
-  const raw = toStringSafe(text);
-  if (!raw) {
-    return false;
-  }
-  return /<(?:(?:[a-z0-9_:-]+:)?(?:tool_call|function_call|invoke)\b)/i.test(raw)
-    || /<(?:[a-z0-9_:-]+:)?function_calls\b/i.test(raw)
-    || /<(?:[a-z0-9_:-]+:)?tool_use\b/i.test(raw);
-}
-
 module.exports = {
   extractToolNames,
   parseToolCalls,

internal/js/helpers/stream-tool-sieve/sieve.js

@@ -6,7 +6,7 @@ const {
 } = require('./state');
 const { parseStandaloneToolCallsDetailed } = require('./parse');
 const { extractJSONObjectFrom } = require('./jsonscan');
-
+const { TOOL_SEGMENT_KEYWORDS, earliestKeywordIndex } = require('./tool-keywords');
 function processToolSieveChunk(state, chunk, toolNames) {
   if (!state) {
     return [];
@@ -152,20 +152,9 @@ function findToolSegmentStart(state, s) {
     return -1;
   }
   const lower = s.toLowerCase();
-  const keywords = ['tool_calls', 'function.name:', '[tool_call_history]', '[tool_result_history]'];
   let offset = 0;
   while (true) {
-    let bestKeyIdx = -1;
-    let matchedKeyword = '';
-    for (const kw of keywords) {
-      const idx = lower.indexOf(kw, offset);
-      if (idx >= 0) {
-        if (bestKeyIdx < 0 || idx < bestKeyIdx) {
-          bestKeyIdx = idx;
-          matchedKeyword = kw;
-        }
-      }
-    }
+    const { index: bestKeyIdx, keyword: matchedKeyword } = earliestKeywordIndex(lower, TOOL_SEGMENT_KEYWORDS, offset);
     if (bestKeyIdx < 0) {
       return -1;
     }
@@ -185,14 +174,7 @@ function consumeToolCapture(state, toolNames) {
     return { ready: false, prefix: '', calls: [], suffix: '' };
   }
   const lower = captured.toLowerCase();
-  let keyIdx = -1;
-  const keywords = ['tool_calls', 'function.name:', '[tool_call_history]', '[tool_result_history]'];
-  for (const kw of keywords) {
-    const idx = lower.indexOf(kw);
-    if (idx >= 0 && (keyIdx < 0 || idx < keyIdx)) {
-      keyIdx = idx;
-    }
-  }
+  const { index: keyIdx } = earliestKeywordIndex(lower, TOOL_SEGMENT_KEYWORDS);
   if (keyIdx < 0) {
     return { ready: false, prefix: '', calls: [], suffix: '' };
   }
@@ -285,7 +267,6 @@ function trimWrappingJSONFence(prefix, suffix) {
   if (header && header !== 'json') {
     return { prefix, suffix };
   }
-
   const leftTrimmedSuffix = (suffix || '').replace(/^[ \t\r\n]+/g, '');
   if (!leftTrimmedSuffix.startsWith('```')) {
     return { prefix, suffix };
@@ -296,7 +277,6 @@ function trimWrappingJSONFence(prefix, suffix) {
     suffix: (suffix || '').slice(consumed + 3),
   };
 }
-
 module.exports = {
   processToolSieveChunk,
   flushToolSieve,

internal/js/helpers/stream-tool-sieve/tool-keywords.js

@@ -0,0 +1,29 @@
+'use strict';
+
+const TOOL_SEGMENT_KEYWORDS = [
+  'tool_calls',
+  'function.name:',
+  '[tool_call_history]',
+  '[tool_result_history]',
+];
+
+function earliestKeywordIndex(text, keywords = TOOL_SEGMENT_KEYWORDS, offset = 0) {
+  if (!text) {
+    return { index: -1, keyword: '' };
+  }
+  let index = -1;
+  let keyword = '';
+  for (const kw of keywords) {
+    const candidate = text.indexOf(kw, offset);
+    if (candidate >= 0 && (index < 0 || candidate < index)) {
+      index = candidate;
+      keyword = kw;
+    }
+  }
+  return { index, keyword };
+}
+
+module.exports = {
+  TOOL_SEGMENT_KEYWORDS,
+  earliestKeywordIndex,
+};