support xml

renderer/src/components/main-panel/chat/core/handle-tool-calls.ts

@@ -112,15 +112,16 @@ function parseErrorObject(error: any): string {
  * @param callId2Index ID到索引的映射表
  * @returns 映射后的索引值
  */
-export function idAsIndexAdapter(toolCall: ToolCall, callId2Index: Map<string, number>): IToolCallIndex {
+export function idAsIndexAdapter(toolCall: ToolCall | string, callId2Index: Map<string, number>): IToolCallIndex {
     // grok 采用 id 作为 index，需要将 id 映射到 zero-based 的 index
-    if (!toolCall.id) {
+    const id = typeof toolCall === 'string' ? toolCall : toolCall.id;
+    if (!id) {
         return 0;
     }
-    if (!callId2Index.has(toolCall.id)) {
+    if (!callId2Index.has(id)) {
-        callId2Index.set(toolCall.id, callId2Index.size);
+        callId2Index.set(id, callId2Index.size);
     }
-    return callId2Index.get(toolCall.id)!;
+    return callId2Index.get(id)!;
 }
 
 
@@ -163,3 +164,8 @@ export function getToolCallIndexAdapter(llm: BasicLlmDescription, chatData: Chat
 
     return defaultIndexAdapter;
 }
+
+export function getIdAsIndexAdapter() {
+    const callId2Index = new Map<string, number>();
+    return (toolCall: ToolCall) => idAsIndexAdapter(toolCall, callId2Index);
+}

renderer/src/components/main-panel/chat/core/xml-wrapper.ts

@@ -3,6 +3,7 @@ import { MessageState, type ToolCall } from '../chat-box/chat';
 import { mcpClientAdapter } from '@/views/connect/core';
 import { handleToolResponse, type IToolCallIndex, type ToolCallResult } from './handle-tool-calls';
 import type { ChatStorage, EnableToolItem } from "../chat-box/chat";
+import type { ToolCallContent } from '@/hook/type';
 
 export interface XmlToolCall {
     server: string;
@@ -225,6 +226,42 @@ export async function getToolCallFromXmlString(xmlString: string): Promise<XmlTo
     }
 }
 
+
+export async function getToolResultFromXmlString(xmlString: string) {
+    try {
+        const result = await new Promise<any>((resolve, reject) => {
+            parseString(xmlString, (err, result) => {
+                if (err) reject(err);
+                else resolve(result);
+            });
+        });
+
+        if (!result?.function_results?.result) {
+            return null;
+        }
+
+        const resultData = result.function_results.result[0];
+        const callId = resultData.$.call_id;
+        
+        // 提取所有评论文本
+        const toolcallContent = [] as ToolCallContent[];
+        const content = resultData._;
+
+        toolcallContent.push({
+            type: 'text',
+            text: content
+        });
+
+        return {
+            callId,
+            toolcallContent
+        };
+    } catch (error) {
+        console.error('Failed to parse function results:', error);
+        return null;
+    }
+}
+
 export function toNormaliseToolcall(xmlToolcall: XmlToolCall, toolcallIndexAdapter: (toolCall: ToolCall) => IToolCallIndex): ToolCall {
     const toolcall = {
         id: xmlToolcall.callId,

renderer/src/components/main-panel/chat/index.vue

@@ -1,10 +1,10 @@
 <template>
     <div class="chat-container" :ref="el => chatContainerRef = el">
-        <el-scrollbar ref="scrollbarRef" :height="'90%'" @scroll="handleScroll" v-if="renderMessages.length > 0 || isLoading">
+        <el-scrollbar ref="scrollbarRef" :height="'90%'" @scroll="handleScroll"
+            v-if="renderMessages.length > 0 || isLoading">
             <div class="message-list" :ref="el => messageListRef = el">
                 <div v-for="(message, index) in renderMessages" :key="index"
-                    :class="['message-item', message.role.split('/')[0], message.role.split('/')[1]]"
+                    :class="['message-item', message.role.split('/')[0], message.role.split('/')[1]]">
-                >
                     <div class="message-avatar" v-if="message.role === 'assistant/content'">
                         <span class="iconfont icon-robot"></span>
                     </div>
@@ -23,10 +23,8 @@
 
                     <!-- 助手调用的工具部分 -->
                     <div class="message-content" v-else-if="message.role === 'assistant/tool_calls'">
-                        <Message.Toolcall
+                        <Message.Toolcall :message="message" :tab-id="props.tabId"
-                            :message="message" :tab-id="props.tabId"
+                            @update:tool-result="(value, toolIndex, index) => message.toolResults[toolIndex][index] = value" />
-                            @update:tool-result="(value, toolIndex, index) => message.toolResults[toolIndex][index] = value"
-                        />
                     </div>
                 </div>
 
@@ -47,23 +45,22 @@
             </div>
         </div>
 
-        <ChatBox
+        <ChatBox :ref="el => footerRef = el" :tab-id="props.tabId" />
-            :ref="el => footerRef = el"
-            :tab-id="props.tabId"
-        />
     </div>
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted, defineComponent, defineProps, onUnmounted, computed, nextTick, watch, provide } from 'vue';
+import { ref, defineComponent, defineProps, onUnmounted, computed, nextTick, watch, provide, watchEffect } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { ElMessage, type ScrollbarInstance } from 'element-plus';
+import { type ScrollbarInstance } from 'element-plus';
 import { tabs } from '../panel';
 import type { ChatMessage, ChatStorage, IRenderMessage, ToolCall } from './chat-box/chat';
 import { MessageState } from './chat-box/chat';
 
 import * as Message from './message';
 import ChatBox from './chat-box/index.vue';
+import { getToolCallFromXmlString, getToolResultFromXmlString, getXmlsFromString, toNormaliseToolcall } from './core/xml-wrapper';
+import { getIdAsIndexAdapter } from './core/handle-tool-calls';
 
 
 defineComponent({ name: 'chat' });
@@ -85,18 +82,71 @@ if (!tabStorage.messages) {
     tabStorage.messages = [] as ChatMessage[];
 }
 
-const renderMessages = computed(() => {
+function getXmlToolCalls(message: ChatMessage) {
-    const messages: IRenderMessage[] = [];
+    if (message.role !== 'assistant' && message.role !== 'user') {
+        return [];
+    }
+
+    const enableXmlTools = message.extraInfo?.enableXmlWrapper ?? false;
+    
+    if (!enableXmlTools) {
+        return [];
+    }
+
+    const xmls = getXmlsFromString(message.content);
+
+    return xmls || [];
+}
+
+const renderMessages = ref<IRenderMessage[]>([]);
+
+watchEffect(async () => {
+    renderMessages.value = [];
+
     for (const message of tabStorage.messages) {
+        const indexAdapter = getIdAsIndexAdapter();        
+        const xmls = getXmlToolCalls(message);
+
         if (message.role === 'user') {
-            messages.push({
+            if (xmls.length > 0 && message.extraInfo.enableXmlWrapper) {
+                // 判断是否是 xml 模式，如果是 xml 模式且存在有效的 xml，则按照工具来判定
+                // 往前寻找 assistant/tool_calls 并自动加入其中
+                const lastAssistantMessage = renderMessages.value[renderMessages.value.length - 1];
+                if (lastAssistantMessage.role === 'assistant/tool_calls') {
+
+                    const toolCallResultXmls = getXmlsFromString(message.content);
+
+                    for (const xml of toolCallResultXmls) {
+                        const toolResult = await getToolResultFromXmlString(xml);
+                        if (toolResult) {
+                            const index = indexAdapter(toolResult.callId);
+
+                            lastAssistantMessage.toolResults[index] = toolResult.toolcallContent;
+
+                            if (lastAssistantMessage.extraInfo.state === MessageState.Unknown) {
+                                lastAssistantMessage.extraInfo.state = message.extraInfo.state;
+                            } else if (lastAssistantMessage.extraInfo.state === MessageState.Success
+                                || message.extraInfo.state !== MessageState.Success
+                            ) {
+                                lastAssistantMessage.extraInfo.state = message.extraInfo.state;
+                            }
+
+                            lastAssistantMessage.extraInfo.usage = lastAssistantMessage.extraInfo.usage || message.extraInfo.usage;
+                        }
+                    }
+                }
+
+            } else {
+                renderMessages.value.push({
                     role: 'user',
                     content: message.content,
                     extraInfo: message.extraInfo
                 });
+            }
+
         } else if (message.role === 'assistant') {
             if (message.tool_calls) {
-                messages.push({
+                renderMessages.value.push({
                     role: 'assistant/tool_calls',
                     content: message.content,
                     toolResults: Array(message.tool_calls.length).fill([]),
@@ -108,16 +158,46 @@ const renderMessages = computed(() => {
                     }
                 });
             } else {
-                messages.push({
+                if (xmls.length > 0 && message.extraInfo.enableXmlWrapper) {
+                    // 判断是否是 xml 模式，如果是 xml 模式且存在有效的 xml，则按照工具来判定
+                    const toolCalls = [];
+                    for (const xml of xmls) {
+                        const xmlToolCall = await getToolCallFromXmlString(xml);
+                        if (xmlToolCall) {
+                            toolCalls.push(
+                                toNormaliseToolcall(xmlToolCall, indexAdapter)
+                            );
+                        }
+                    }
+                    const renderAssistantMessage = message.content.replace(/```xml[\s\S]*?```/g, '');
+
+                    console.log(toolCalls);
+
+
+                    renderMessages.value.push({
+                        role: 'assistant/tool_calls',
+                        content: renderAssistantMessage,
+                        toolResults: Array(toolCalls.length).fill([]),
+                        tool_calls: toolCalls,
+                        showJson: ref(false),
+                        extraInfo: {
+                            ...message.extraInfo,
+                            state: MessageState.Unknown
+                        }
+                    });
+                } else {
+                    renderMessages.value.push({
                         role: 'assistant/content',
                         content: message.content,
                         extraInfo: message.extraInfo
                     });
                 }
 
+            }
+
         } else if (message.role === 'tool') {
             // 如果是工具，则合并进入 之前 assistant 一起渲染
-            const lastAssistantMessage = messages[messages.length - 1];
+            const lastAssistantMessage = renderMessages.value[renderMessages.value.length - 1];
             if (lastAssistantMessage.role === 'assistant/tool_calls') {
                 lastAssistantMessage.toolResults[message.index] = message.content;
 
@@ -133,10 +213,9 @@ const renderMessages = computed(() => {
             }
         }
     }
-
-    return messages;
 });
 
+
 const isLoading = ref(false);
 
 const streamingContent = ref('');
@@ -232,14 +311,14 @@ watch(streamingToolCalls, () => {
     padding-top: 70px;
 }
 
-.chat-openmcp-icon > div {
+.chat-openmcp-icon>div {
     display: flex;
     flex-direction: column;
     align-items: left;
     font-size: 28px;
 }
 
-.chat-openmcp-icon > div > span {
+.chat-openmcp-icon>div>span {
     margin-bottom: 23px;
 }
 
@@ -285,7 +364,7 @@ watch(streamingToolCalls, () => {
     width: 100%;
 }
 
-.user .message-text > span {
+.user .message-text>span {
     border-radius: .9em;
     background-color: var(--main-light-color);
     padding: 10px 15px;
@@ -340,9 +419,12 @@ watch(streamingToolCalls, () => {
 
 
 @keyframes spin {
-    0% { transform: rotate(0deg); }
+    0% {
-    100% { transform: rotate(360deg); }
+        transform: rotate(0deg);
+    }
+
+    100% {
+        transform: rotate(360deg);
+    }
 }
-
-
 </style>

renderer/src/components/main-panel/chat/message/toolcall.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="message-role">
         <span class="message-reminder" v-if="callingTools">
-            Agent 正在使用工具
+            Agent {{ t('using-tool') }}
             <span class="tool-loading iconfont icon-double-loading">
             </span>
         </span>

renderer/src/i18n/ar.json

@@ -175,5 +175,6 @@
     "enable-xml-wrapper": "تمكين تغليف تعليمات XML",
     "tool-manage": "إدارة الأدوات",
     "enable-all-tools": "تفعيل جميع الأدوات",
-    "disable-all-tools": "تعطيل جميع الأدوات"
+    "disable-all-tools": "تعطيل جميع الأدوات",
+    "using-tool": "جاري استخدام الأداة"
 }

renderer/src/i18n/de.json

@@ -175,5 +175,6 @@
     "enable-xml-wrapper": "XML-Befehlsverpackung aktivieren",
     "tool-manage": "Werkzeugverwaltung",
     "enable-all-tools": "Alle Tools aktivieren",
-    "disable-all-tools": "Alle Tools deaktivieren"
+    "disable-all-tools": "Alle Tools deaktivieren",
+    "using-tool": "Werkzeug wird verwendet"
 }

renderer/src/i18n/en.json

@@ -175,5 +175,6 @@
     "enable-xml-wrapper": "Enable XML command wrapping",
     "tool-manage": "Tool Management",
     "enable-all-tools": "Activate all tools",
-    "disable-all-tools": "Disable all tools"
+    "disable-all-tools": "Disable all tools",
+    "using-tool": "Using tool"
 }

renderer/src/i18n/fr.json

@@ -175,5 +175,6 @@
     "enable-xml-wrapper": "Activer l'encapsulation de commande XML",
     "tool-manage": "Gestion des outils",
     "enable-all-tools": "Activer tous les outils",
-    "disable-all-tools": "Désactiver tous les outils"
+    "disable-all-tools": "Désactiver tous les outils",
+    "using-tool": "Utilisation de l'outil"
 }

renderer/src/i18n/ja.json

@@ -175,5 +175,6 @@
     "enable-xml-wrapper": "XMLコマンドラッピングを有効にする",
     "tool-manage": "ツール管理",
     "enable-all-tools": "すべてのツールを有効にする",
-    "disable-all-tools": "すべてのツールを無効にする"
+    "disable-all-tools": "すべてのツールを無効にする",
+    "using-tool": "ツール使用中"
 }

renderer/src/i18n/ko.json

@@ -175,5 +175,6 @@
     "enable-xml-wrapper": "XML 명령 래핑 활성화",
     "tool-manage": "도구 관리",
     "enable-all-tools": "모든 도구 활성화",
-    "disable-all-tools": "모든 도구 비활성화"
+    "disable-all-tools": "모든 도구 비활성화",
+    "using-tool": "도구 사용 중"
 }

renderer/src/i18n/ru.json

@@ -175,5 +175,6 @@
     "enable-xml-wrapper": "Включить обёртку XML-команд",
     "tool-manage": "Управление инструментами",
     "enable-all-tools": "Активировать все инструменты",
-    "disable-all-tools": "Отключить все инструменты"
+    "disable-all-tools": "Отключить все инструменты",
+    "using-tool": "Использование инструмента"
 }

renderer/src/i18n/zh-cn.json

@@ -175,5 +175,6 @@
     "enable-xml-wrapper": "开启 XML 指令包裹",
     "tool-manage": "工具管理",
     "enable-all-tools": "激活所有工具",
-    "disable-all-tools": "禁用所有工具"
+    "disable-all-tools": "禁用所有工具",
+    "using-tool": "正在使用工具"
 }

renderer/src/i18n/zh-tw.json

@@ -175,5 +175,6 @@
     "enable-xml-wrapper": "開啟 XML 指令包裹",
     "tool-manage": "工具管理",
     "enable-all-tools": "啟用所有工具",
-    "disable-all-tools": "禁用所有工具"
+    "disable-all-tools": "禁用所有工具",
+    "using-tool": "正在使用工具"
 }