@aiyiran/myclaw 1.1.72 → 1.1.74

package/index.js

@@ -256,7 +256,7 @@ function runLock42() {
   try {
     const ver = execSync('openclaw --version', { encoding: 'utf8' }).trim();
     console.log('[验证] ' + colors.green + ver + colors.nc);
-  } catch {}
+  } catch { }
 
   console.log('');
   console.log(bar);
@@ -920,7 +920,7 @@ function createDesktopShortcut(url) {
       );
     }
     for (const d of candidates) {
-      try { if (fs.existsSync(d)) return d; } catch {}
+      try { if (fs.existsSync(d)) return d; } catch { }
     }
     return null;
   }
@@ -954,7 +954,7 @@ URL=${url}
 Icon=text-html
 `;
     fs.writeFileSync(desktop, content, 'utf8');
-    try { execSync('chmod +x "' + desktop + '"', { stdio: 'pipe' }); } catch {}
+    try { execSync('chmod +x "' + desktop + '"', { stdio: 'pipe' }); } catch { }
     console.log('[shortcut] ✅ 桌面快捷方式已更新: OpenClaw.desktop');
   } else if (platform === 'win32') {
     // Windows: .url 文件（Internet Shortcut），Windows 原生支持，双击在默认浏览器打开
@@ -1505,11 +1505,11 @@ const MACHINE_CONFIG = [
   { name: 'Mo靖宇', claw: 'claw4', desc: 'Mo靖宇 的机器' },
   { name: '高兴', claw: 'claw5', desc: '高兴 的机器' },
   { name: '伊伊', claw: 'claw6', desc: '伊伊 的机器' },
-  { name: '雨熙', claw: 'claw7', desc: '雨熙 的机器' },
-  { name: '绍博', claw: 'claw8', desc: '绍博 的机器' },
+  { name: 'Thomas', claw: 'claw7', desc: 'Thomas 的机器' },
+  { name: 'Eric', claw: 'claw8', desc: 'Eric 的机器' },
   { name: 'Mia', claw: 'claw9', desc: 'Mia 的机器' },
-  { name: 'Thomas', claw: 'claw10', desc: 'Thomas 的机器' },
-  { name: 'Eric', claw: 'claw11', desc: 'Eric 的机器' },
+  { name: '雨熙', claw: 'claw10', desc: '雨熙 的机器' },
+  { name: '绍博', claw: 'claw11', desc: '绍博 的机器' },
 ];
 
 function openMachine(selected) {
@@ -1846,7 +1846,7 @@ function runSyncTemplates() {
       let data = '';
       res.on('data', chunk => data += chunk);
       res.on('end', () => {
-        try { cb(null, JSON.parse(data)); } catch(e) { cb(e); }
+        try { cb(null, JSON.parse(data)); } catch (e) { cb(e); }
       });
     }).on('error', cb);
   }
@@ -1975,6 +1975,19 @@ async function runServer(name) {
       if (oldPid && !isNaN(oldPid)) {
         try { process.kill(oldPid, 'SIGTERM'); } catch (e) { /* 不存在则忽略 */ }
         console.log('[Server] 已终止旧进程 PID=' + oldPid);
+        // 等待旧进程退出并释放端口（最多 5 秒）
+        await new Promise(resolve => {
+          let waited = 0;
+          const interval = setInterval(() => {
+            try {
+              process.kill(oldPid, 0); // 检查进程是否还存在
+              waited += 200;
+              if (waited >= 5000) { clearInterval(interval); resolve(); }
+            } catch {
+              clearInterval(interval); resolve(); // 进程已退出
+            }
+          }, 200);
+        });
       }
     } catch (e) { /* 读取失败忽略 */ }
     try { fs.unlinkSync(pidFile); } catch (e) { }
@@ -2085,20 +2098,20 @@ function runDelete() {
 
   const isDeep = args.includes('--deep'); // 加 --deep 则自动执行阶段2，不询问
 
-  const G  = colors.green;
-  const Y  = colors.yellow;
-  const R  = colors.red;
-  const B  = colors.blue;
-  const D  = colors.dim;
+  const G = colors.green;
+  const Y = colors.yellow;
+  const R = colors.red;
+  const B = colors.blue;
+  const D = colors.dim;
   const NC = colors.nc;
 
   const BAR = '─'.repeat(52);
 
   function fmtDate(ms) {
     if (!ms) return '未知';
-    const d   = new Date(ms);
+    const d = new Date(ms);
     const pad = n => String(n).padStart(2, '0');
-    return `${d.getFullYear()}/${pad(d.getMonth()+1)}/${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}`;
+    return `${d.getFullYear()}/${pad(d.getMonth() + 1)}/${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}`;
   }
 
   function fmtStatus(ag) {
@@ -2113,9 +2126,9 @@ function runDelete() {
     console.log(D + '  序号  状态       ID                         会话  最后更新' + NC);
     console.log(D + '  ─────────────────────────────────────────────────────' + NC);
     agents.forEach((ag, i) => {
-      const num     = String(i + 1).padStart(3, ' ');
-      const idPad   = ag.id.padEnd(28, ' ').slice(0, 28);
-      const cnt     = String(ag.sessionCount).padStart(4, ' ');
+      const num = String(i + 1).padStart(3, ' ');
+      const idPad = ag.id.padEnd(28, ' ').slice(0, 28);
+      const cnt = String(ag.sessionCount).padStart(4, ' ');
       const updated = fmtDate(ag.lastUpdated);
       console.log(`  ${num}.  ${fmtStatus(ag)} ${idPad} ${cnt}  ${D}${updated}${NC}`);
     });
@@ -2317,20 +2330,20 @@ function runListAgents() {
     return;
   }
 
-  const G  = colors.green;
-  const Y  = colors.yellow;
-  const D  = colors.dim;
+  const G = colors.green;
+  const Y = colors.yellow;
+  const D = colors.dim;
   const NC = colors.nc;
 
   console.log('');
   console.log('序号  状态       ID                         会话  最后更新');
   console.log('─'.repeat(62));
   agents.forEach((ag, i) => {
-    const num     = String(i + 1).padStart(3);
-    const idPad   = ag.id.padEnd(28).slice(0, 28);
-    const cnt     = String(ag.sessionCount).padStart(4);
-    const date    = ag.lastUpdated ? new Date(ag.lastUpdated).toLocaleDateString('zh-CN') : '未知';
-    const status  = ag.inJson ? G + '● 已注册' + NC : Y + '○ 孤立  ' + NC;
+    const num = String(i + 1).padStart(3);
+    const idPad = ag.id.padEnd(28).slice(0, 28);
+    const cnt = String(ag.sessionCount).padStart(4);
+    const date = ag.lastUpdated ? new Date(ag.lastUpdated).toLocaleDateString('zh-CN') : '未知';
+    const status = ag.inJson ? G + '● 已注册' + NC : Y + '○ 孤立  ' + NC;
     console.log(`${num}.  ${status} ${idPad} ${cnt}  ${D}${date}${NC}`);
   });
   console.log('');

package/package.json

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