xiaozhou-chat 1.0.25 → 1.0.26

package/bin/cli.js

@@ -253,6 +253,13 @@ async function mainChat(input) {
     // 准备 Tools
     const tools = [...builtInTools];
     
+    // 合并 MCP Tools
+    for (const client of mcpClients.values()) {
+        if (client.initialized && client.tools.length > 0) {
+            tools.push(...client.getOpenAITools());
+        }
+    }
+    
     abortController = new AbortController();
     
     const ctx = {
@@ -497,8 +504,13 @@ ${JSON.stringify(toCompress)}
     }
 
     // Default: Chat
-    await mainChat(input);
-    rl.prompt();
+    isProcessing = true;
+    try {
+        await mainChat(input);
+    } finally {
+        isProcessing = false;
+        rl.prompt();
+    }
 });
 
 function addToContext(content) {

package/lib/chat.js

@@ -438,25 +438,19 @@ export async function chatStream(context, userInput = null, options = {}) {
                     
                     // 2. Try MCP
                     if (!result && mcpClients) {
-                         // Find which client has this tool?
-                         // We assume caller knows or we iterate.
-                         // For now, simplify: mcpClients is a Map<name, client>
-                         // We need to know which client provides which tool.
-                         // Or we iterate all clients (slow?).
-                         // In original cli.js, it wasn't fully implemented for *execution* via MCP map iteration?
-                         // Ah, original cli.js didn't iterate mcpClients for execution in the snippet I saw.
-                         // It only had `builtInTools`.
-                         // But the todo said "integrate MCP support".
-                         // I should check if I missed MCP execution logic.
-                         // Assuming mcpClients have a `callTool` method.
                          for (const client of mcpClients.values()) {
+                             // Optimization: Check if client has the tool before calling
+                             if (!client.tools.some(t => t.name === funcName)) continue;
+                             
                              try {
                                  const mcpRes = await client.callTool(funcName, args);
                                  if (mcpRes) {
                                      result = JSON.stringify(mcpRes);
                                      break;
                                  }
-                             } catch {}
+                             } catch (e) {
+                                 console.error(`MCP Call Error (${funcName}):`, e.message);
+                             }
                          }
                     }
                 } catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xiaozhou-chat",
-  "version": "1.0.25",
+  "version": "1.0.26",
   "description": "CLI chatbot based on NewAPI",
   "bin": {
     "xiaozhou-chat": "bin/cli.js"