fix(webuiapps): parse inline local-model tool calls

Author: vmlinuzx

apps/webuiapps/src/lib/__tests__/llmClient.test.ts

@@ -459,6 +459,26 @@ describe('chat()', () => {
 
       expect(result.content).toBe('Hello there');
     });
+
+    it('converts inline XML-style tool call content into structured tool calls', async () => {
+      const inlineToolContent = `<tool_call>
+respond_to_user
+<arg_key>character_expression</arg_key>
+<arg_value>{"content":"What? Did I catch you off guard?","emotion":"happy"}</arg_value>
+<arg_key>user_interaction</arg_key>
+<arg_value>{"suggested_replies":["Just hanging around","What reunion?","Tell me more"]}</arg_value>
+</tool_call>`;
+      globalThis.fetch = vi.fn().mockResolvedValueOnce(makeOpenAIResponse(inlineToolContent));
+
+      const result = await chat(MOCK_MESSAGES, MOCK_TOOLS, MOCK_LLAMACPP_CONFIG);
+
+      expect(result.content).toBe('');
+      expect(result.toolCalls).toHaveLength(1);
+      expect(result.toolCalls[0].function.name).toBe('respond_to_user');
+      expect(result.toolCalls[0].function.arguments).toBe(
+        '{"character_expression":{"content":"What? Did I catch you off guard?","emotion":"happy"},"user_interaction":{"suggested_replies":["Just hanging around","What reunion?","Tell me more"]}}',
+      );
+    });
   });
 
   describe('Anthropic provider', () => {

apps/webuiapps/src/lib/llmClient.ts

@@ -88,13 +88,73 @@ interface LLMResponse {
   toolCalls: ToolCall[];
 }
 
+interface InlineToolParseResult {
+  content: string;
+  toolCalls: ToolCall[];
+}
+
 function stripThinkTags(content: string): string {
   const withoutBlocks = content
     .replace(/<think\b[^>]*>[\s\S]*?<\/think>/gi, '')
     .replace(/<\/?think\b[^>]*>/gi, '');
   return withoutBlocks === content ? content : withoutBlocks.trim();
 }
 
+function parseInlineArgValue(rawValue: string): unknown {
+  const trimmed = rawValue.trim();
+  if (!trimmed) return '';
+  try {
+    return JSON.parse(trimmed);
+  } catch {
+    return trimmed;
+  }
+}
+
+function extractInlineToolCalls(rawContent: string): InlineToolParseResult {
+  const content = stripThinkTags(rawContent);
+  if (!content.includes('<arg_key>') || !content.includes('<arg_value>')) {
+    return { content, toolCalls: [] };
+  }
+
+  const blockRegex = /(?:<tool_call>\s*|\()([a-zA-Z0-9_.-]+)\s*([\s\S]*?)<\/tool_call>/g;
+  const toolCalls: ToolCall[] = [];
+  let cleanedContent = content;
+  let matchIndex = 0;
+
+  for (const match of content.matchAll(blockRegex)) {
+    const toolName = match[1]?.trim();
+    const body = match[2] ?? '';
+    if (!toolName) continue;
+
+    const args: Record<string, unknown> = {};
+    const pairRegex =
+      /<arg_key>\s*([\s\S]*?)\s*<\/arg_key>\s*<arg_value>\s*([\s\S]*?)\s*<\/arg_value>/g;
+
+    for (const pair of body.matchAll(pairRegex)) {
+      const key = pair[1]?.trim();
+      if (!key) continue;
+      args[key] = parseInlineArgValue(pair[2] ?? '');
+    }
+
+    if (Object.keys(args).length === 0) continue;
+
+    toolCalls.push({
+      id: `inline_tool_${matchIndex++}`,
+      type: 'function',
+      function: {
+        name: toolName,
+        arguments: JSON.stringify(args),
+      },
+    });
+    cleanedContent = cleanedContent.replace(match[0], '');
+  }
+
+  return {
+    content: cleanedContent.trim(),
+    toolCalls,
+  };
+}
+
 function hasVersionSuffix(url: string): boolean {
   return /\/v\d+\/?$/.test(url);
 }
@@ -193,7 +253,8 @@ async function chatOpenAI(
 
   const data = JSON.parse(text);
   const choice = data.choices?.[0]?.message;
-  const toolCalls = choice?.tool_calls || [];
+  const parsedInline = extractInlineToolCalls(choice?.content || '');
+  const toolCalls = choice?.tool_calls?.length ? choice.tool_calls : parsedInline.toolCalls;
   const calledNames = toolCalls
     .map((tc: { function?: { name?: string } }) => tc.function?.name)
     .filter(Boolean);
@@ -205,7 +266,9 @@ async function chatOpenAI(
     calledNames,
   );
   return {
-    content: stripThinkTags(choice?.content || ''),
+    content: choice?.tool_calls?.length
+      ? stripThinkTags(choice?.content || '')
+      : parsedInline.content,
     toolCalls,
   };
 }