Merge pull request #87 from heshengtao/dev

Dev

Author: heshengtao

config/locales.json

@@ -14,6 +14,7 @@
         "tool_result":"工具结果",
         "KB_search":"知识库搜索中，请稍候...",
         "enter_search_stage":"进入搜索阶段",
+        "enter_answer_stage":"进入回答阶段",
         "need_more_search":"需要更多搜索"
     },
     "en-US":{
@@ -31,6 +32,7 @@
         "tool_result":"Tool result",
         "KB_search":"Knowledge base search, please wait...",
         "enter_search_stage":"Enter the search stage",
+        "enter_answer_stage":"Enter the answer stage",
         "need_more_search":"Need more search"
     }
 }

config/settings_template.json

@@ -96,5 +96,12 @@
       "e2b_api_key": "",
       "sandbox_url":"http://127.0.0.1:8080"
     },
-    "custom_http":[]
+    "custom_http":[],
+    "qqBotConfig": {
+      "QQAgent":"super-model",
+      "memoryLimit":30,
+      "appid": "",
+      "secret": "",
+      "separators": ["。", "\n", "？", "！"]
+    }
 }

main.js

@@ -7,6 +7,7 @@ const fs = require('fs')
 const os = require('os');
 
 let pythonExec;
+let isQuitting = false;
 
 // 判断操作系统
 if (os.platform() === 'win32') {
@@ -436,6 +437,16 @@ app.whenReady().then(async () => {
         y: arg.y
       });
     });
+    // 监听关闭事件
+    ipcMain.handle('request-stop-qqbot', async (event) => {
+      const win = BrowserWindow.getAllWindows()[0]; // 获取主窗口
+      if (win && !win.isDestroyed()) {
+        // 通过webContents执行渲染进程方法
+        await win.webContents.executeJavaScript(`
+          window.stopQQBotHandler && window.stopQQBotHandler()
+        `);
+      }
+    });
     // 其他IPC处理...
     ipcMain.on('open-external', (event, url) => {
       shell.openExternal(url)
@@ -481,17 +492,48 @@ app.whenReady().then(async () => {
   }
 })
 
+
+
 // 应用退出处理
-app.on('before-quit', () => {
-  app.isQuitting = true
-  if (backendProcess) {
-    if (process.platform === 'win32') {
-      spawn('taskkill', ['/pid', backendProcess.pid, '/f', '/t'])
-    } else {
-      backendProcess.kill('SIGKILL')
+app.on('before-quit', async (event) => {
+  // 防止重复处理退出事件
+  if (isQuitting) return;
+  
+  // 标记退出状态并阻止默认退出行为
+  isQuitting = true;
+  event.preventDefault();
+  
+  try {
+    const mainWindow = BrowserWindow.getAllWindows()[0];
+    
+    // 1. 尝试停止QQ机器人
+    if (mainWindow && !mainWindow.isDestroyed()) {
+      await mainWindow.webContents.executeJavaScript(`
+        if (window.stopQQBotHandler) {
+          window.stopQQBotHandler();
+        }
+      `);
+      
+      // 等待机器人停止（最多1秒）
+      await new Promise(resolve => setTimeout(resolve, 1000));
+    }
+    
+    // 2. 停止后端进程
+    if (backendProcess) {
+      if (process.platform === 'win32') {
+        spawn('taskkill', ['/pid', backendProcess.pid, '/f', '/t']);
+      } else {
+        backendProcess.kill('SIGKILL');
+      }
+      backendProcess = null;
     }
+  } catch (error) {
+    console.error('退出时发生错误:', error);
+  } finally {
+    // 3. 最终退出应用
+    app.exit(0);
   }
-})
+});
 
 // 自动退出处理
 app.on('window-all-closed', () => {

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "super-agent-party",
-  "version": "v0.1.7",
+  "version": "v0.1.8",
   "description": "超级智能体派对 | 链接一切模型、知识库、搜索引擎、MCP服务器、A2A服务器；可以web端、桌面端、API等多种方式使用",
   "main": "main.js",
   "asar": false,

package.json

@@ -1,6 +1,6 @@
 [project]
 name = "super-agent-party"
-version = "v0.1.7"
+version = "v0.1.8"
 description = "超级智能体派对 | 链接一切模型、知识库、搜索引擎、MCP服务器、A2A服务器；可以web端、桌面端、API等多种方式使用"
 readme = "README.md"
 requires-python = ">=3.12"
@@ -38,4 +38,5 @@ dependencies = [
     "uvicorn[standard]>=0.34.2",
     "mem0ai>=0.1.101",
     "e2b-code-interpreter>=1.5.0",
+    "botpy",
 ]

pyproject.toml

@@ -31,4 +31,5 @@ rank_bm25
 fastapi_mcp
 mem0ai
 pyinstaller
-e2b-code-interpreter
+e2b-code-interpreter
+qq-botpy