myagent-ai 1.24.1 → 1.24.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myagent-ai",
-  "version": "1.24.1",
+  "version": "1.24.3",
   "description": "本地桌面端执行型AI助手 - Open Interpreter 风格 | Local Desktop Execution-Oriented AI Assistant",
   "main": "main.py",
   "bin": {

package/start.js

@@ -624,7 +624,7 @@ function cleanPycache(pkgDir) {
 function cmdUninstall() {
   const venvDir = getVenvDir();
   const dataDir = getDataDir();
-  const purgeArg = process.argv.includes("--purge") || process.argv.includes("-p");
+  const keepData = process.argv.includes("--keep-data");
 
   console.log("");
   console.log("  \x1b[36mMyAgent 卸载\x1b[0m");
@@ -641,19 +641,37 @@ function cmdUninstall() {
     if (IS_WIN) {
       execSync('taskkill /F /IM python.exe /FI "WINDOWTITLE eq myagent*" 2>nul', { encoding: "utf8", timeout: 5000 });
     } else {
-      execSync("pkill -f 'myagent|main.py' 2>/dev/null", { encoding: "utf8", timeout: 10000 });
+      // 排除当前进程 PID，避免 pkill 杀掉 uninstall 脚本自身
+      const selfPid = process.pid;
+      execSync(
+        `pgrep -f 'myagent|main.py' | grep -v '^${selfPid}$' | xargs -r kill 2>/dev/null; sleep 1; ` +
+        `pgrep -f 'myagent|main.py' | grep -v '^${selfPid}$' | xargs -r kill -9 2>/dev/null`,
+        { encoding: "utf8", timeout: 10000 }
+      );
     }
   } catch (_) {}
 
+  // 卸载 npm 全局包
   try {
     execFileSync("npm", ["uninstall", "-g", PKG_NAME], {
       encoding: "utf8", stdio: "inherit", timeout: 60000,
     });
   } catch (_) {}
 
-  if (purgeArg && fs.existsSync(dataDir)) {
-    fs.rmSync(dataDir, { recursive: true, force: true });
-    console.log("  数据已清除");
+  // 清理数据目录（默认删除，--keep-data 保留）
+  if (fs.existsSync(dataDir)) {
+    if (keepData) {
+      console.log("  数据已保留: " + dataDir);
+    } else {
+      try {
+        const data_size = execSync(`du -sh "${dataDir}" 2>/dev/null`, { encoding: "utf8" }).trim().split(/\s+/)[0] || "?";
+        console.log("  清除数据目录: " + dataDir + " (" + data_size + ")");
+        fs.rmSync(dataDir, { recursive: true, force: true });
+        console.log("  \x1b[32m✓\x1b[0m 数据已清除");
+      } catch (e) {
+        console.log("  \x1b[33m⚠ 数据目录清理失败，可手动删除: " + dataDir + "\x1b[0m");
+      }
+    }
   }
   console.log("");
   console.log("  \x1b[32m✓ 卸载完成\x1b[0m");