更新 parse-xml-tool-calls.js 和 streaming.js 文件

Author: bobo334

src/parse-xml-tool-calls.js

@@ -30,7 +30,35 @@ function hasFunctionCallOpenTag(text) {
   if (typeof text !== 'string') return false;
   return /<function_calls\s*>/i.test(text)
     || /\[function_calls\]/i.test(text)
-    || /\[tool_calls\]\s*$/m.test(text);
+    || /\[tool_calls\]\s*$/m.test(text)
+    || /<([a-z_][a-z0-9_-]*)\b[^<>]*question\s*=/i.test(text);
+}
+
+function hasStandaloneToolCallTags(text) {
+  if (typeof text !== 'string') return false;
+  return /<([a-z_][a-z0-9_-]*)\b[^<>]*\/>\s*$/i.test(text)
+    || /<([a-z_][a-z0-9_-]*)\b[^<>]*>[^<]*<\/\1>/i.test(text);
+}
+
+function extractStandaloneToolCallTags(text) {
+  if (typeof text !== 'string') return [];
+
+  const toolCalls = [];
+  const selfClosingRegex = /<([a-z_][a-z0-9_-]*)\b([^>]*)\/>/gi;
+  let match;
+
+  while ((match = selfClosingRegex.exec(text)) !== null) {
+    const tagName = match[1].trim();
+    const attrsText = match[2] || '';
+
+    if (shouldSkipContainerTag(tagName)) continue;
+    if (!/(?:question|command|path|file_path|content|url|query|text|follow_up)\s*=/i.test(attrsText)) continue;
+
+    const argumentsParsed = parseXmlAttributes(attrsText);
+    toolCalls.push(buildToolCall(toolCalls.length, tagName, argumentsParsed));
+  }
+
+  return toolCalls;
 }
 
 // 从文本中提取所有 function_calls / tool_calls 块
@@ -506,6 +534,8 @@ function extractTextToolCallField(block, fieldName) {
 module.exports = {
   hasFunctionCalls,
   hasFunctionCallOpenTag,
+  hasStandaloneToolCallTags,
+  extractStandaloneToolCallTags,
   extractFunctionCallsBlocks,
   parseFunctionCallsBlock,
   parseXmlToolCallsFromText,

src/streaming.js

@@ -1,7 +1,7 @@
 const crypto = require('crypto');
 const { normalizeError, createHttpError } = require('./errors');
 const { normalizeUsage, sanitizeAssistantContent } = require('./helpers');
-const { hasFunctionCallOpenTag, stripXmlToolCalls } = require('./parse-xml-tool-calls');
+const { hasFunctionCallOpenTag, hasStandaloneToolCallTags, stripXmlToolCalls } = require('./parse-xml-tool-calls');
 
 function writeSseEvent(response, payload) {
   response.write(`data: ${payload}\n\n`);
@@ -60,7 +60,7 @@ function emitContentDelta(response, streamState, delta) {
   streamState.accumulatedContent += delta;
   streamState.contentBuffer += delta;
 
-  if (!streamState.inToolCallMode && hasFunctionCallOpenTag(streamState.accumulatedContent)) {
+  if (!streamState.inToolCallMode && (hasFunctionCallOpenTag(streamState.accumulatedContent) || hasStandaloneToolCallTags(streamState.accumulatedContent))) {
     streamState.inToolCallMode = true;
     streamState.contentBuffer = '';
     return;

src/tool-calls.js

@@ -5,7 +5,9 @@ const {
   stripXmlToolCalls,
   hasJsonToolCall,
   parseJsonToolCallsFromText,
-  parseTextToolCalls
+  parseTextToolCalls,
+  hasStandaloneToolCallTags,
+  extractStandaloneToolCallTags
 } = require('./parse-xml-tool-calls');
 const { normalizeUsage } = require('./helpers');
 
@@ -22,6 +24,10 @@ function buildOpenAiResponse(model, content, events) {
     toolCalls = parseTextToolCalls(content);
   }
 
+  if (toolCalls.length === 0 && hasStandaloneToolCallTags(content)) {
+    toolCalls = extractStandaloneToolCallTags(content);
+  }
+
   const cleanContent = stripXmlToolCalls(content);
 
   const message = { role: 'assistant', content: cleanContent || '' };
@@ -64,6 +70,10 @@ function detectToolCalls(content) {
     toolCalls = parseTextToolCalls(content);
   }
 
+  if (toolCalls.length === 0 && hasStandaloneToolCallTags(content)) {
+    toolCalls = extractStandaloneToolCallTags(content);
+  }
+
   if (!toolCalls.length) return null;
   return buildOpenAiToolCalls(toolCalls);
 }