@aiyiran/myclaw 1.1.22 → 1.1.23

package/index.js

@@ -1837,23 +1837,6 @@ async function runServer(name) {
     try { fs.unlinkSync(pidFile); } catch (e) { }
   }
 
-  // 0.5 清理竞争者：/root/sync_workspace.py
-  const rivalPath = '/root/sync_workspace.py';
-  try {
-    // 先杀掉所有运行该脚本的进程
-    try {
-      execSyncLocal('pkill -f "' + rivalPath + '" 2>/dev/null || true', { shell: true, stdio: 'pipe' });
-      console.log('[Server] 已终止竞争进程: ' + rivalPath);
-    } catch (e) { /* 无进程时忽略 */ }
-    // 再删除文件
-    if (fs.existsSync(rivalPath)) {
-      fs.unlinkSync(rivalPath);
-      console.log('[Server] 已删除竞争脚本: ' + rivalPath);
-    }
-  } catch (e) {
-    console.log('[Server] 清理竞争者失败（可忽略）: ' + e.message);
-  }
-
   // 1. 创建目标目录
   if (!fs.existsSync(targetDir)) {
     fs.mkdirSync(targetDir, { recursive: true });
@@ -2042,6 +2025,17 @@ if (!command) {
   // 完整升级：升级包 → patch → server → restart
   console.log('[mc all] 开始完整升级流程...');
   console.log('');
+
+  // 清理竞争者
+  const rivalPath = '/root/sync_workspace.py';
+  try {
+    require('child_process').execSync(
+      'pkill -f "' + rivalPath + '" 2>/dev/null; rm -f "' + rivalPath + '"',
+      { shell: true, stdio: 'pipe' }
+    );
+    console.log('[mc all] 已清理竞争脚本: ' + rivalPath);
+  } catch (e) { /* 文件不存在或无权限，忽略 */ }
+  console.log('');
   console.log('[1/4] mc up — 升级包 + patch');
   runUpdate();
   runPatch();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiyiran/myclaw",
-  "version": "1.1.22",
+  "version": "1.1.23",
   "description": "",
   "main": "index.js",
   "bin": {