@lark-apaas/coding-templates 0.1.43-alpha.10 → 0.1.43-alpha.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/coding-templates",
-  "version": "0.1.43-alpha.10",
+  "version": "0.1.43-alpha.12",
   "description": "OpenClaw project templates for mclaw CLI",
   "publishConfig": {
     "access": "public"

package/template-vite-react/package.json

@@ -44,7 +44,7 @@
     "@radix-ui/react-toggle": "^1.1.9",
     "@radix-ui/react-toggle-group": "^1.1.10",
     "@radix-ui/react-tooltip": "^1.1.18",
-    "@lark-apaas/client-toolkit-lite": "1.1.7-alpha.11",
+    "@lark-apaas/client-toolkit-lite": "1.1.7-alpha.14",
     "@formkit/auto-animate": "^0.9.0",
     "@gsap/react": "^2.1.2",
     "framer-motion": "^12.38.0",
@@ -80,7 +80,7 @@
     "@types/react": "^19",
     "@types/react-dom": "^19",
     "@lark-apaas/coding-presets": "^1.0.0",
-    "@lark-apaas/coding-vite-preset": "1.0.7-alpha.8",
+    "@lark-apaas/coding-vite-preset": "1.0.7-alpha.10",
     "concurrently": "^9",
     "eslint": "^9",
     "eslint-plugin-react-hooks": "^7",

package/template-vite-react/scripts/dev.cjs

@@ -11,20 +11,28 @@
  *   - vite      → 8001（CLIENT_DEV_PORT 可覆盖）
  *   - mock-health → 3000（占位，老沙箱探针兼容用）
  *
- * Ctrl+C / SIGTERM 时 kill 整个进程组。
+ * 进程组与孤儿清理：
+ * - 子进程 detached: true → 自己一个 PGID，cleanup 时 process.kill(-pid) 整组带走
+ * - 监听 SIGINT/SIGTERM/SIGHUP/uncaughtException 触发 cleanup
+ * - 启动前 killOrphansByPort 清理端口残留孤儿（应对沙箱保活重启）
+ *
+ * 触发重启场景：
+ * - `pkill -f "npm run dev"` 杀 npm 进程 → dev.cjs 收 SIGHUP → cleanup
+ * - 沙箱保活机制重启 npm run dev → 新 dev.cjs → killOrphansByPort 清理旧 vite/mock-health
  */
 'use strict';
 
 const fs = require('fs');
 const path = require('path');
 const readline = require('readline');
-const { spawn } = require('child_process');
+const { spawn, execSync } = require('child_process');
 
 const ROOT = path.resolve(__dirname, '..');
 process.chdir(ROOT);
 
 const LOG_DIR = process.env.LOG_DIR || 'logs';
 const CLIENT_DEV_PORT = process.env.CLIENT_DEV_PORT || '8001';
+const HEALTH_PORT = '3000';
 
 fs.mkdirSync(LOG_DIR, { recursive: true });
 
@@ -37,6 +45,38 @@ function timestamp() {
   );
 }
 
+function log(msg) {
+  const line = `[${timestamp()}] [dev] ${msg}\n`;
+  try { process.stdout.write(line); } catch {}
+}
+
+/**
+ * 启动前清理端口占用的孤儿进程（沙箱保活重启时关键）：
+ * 之前 dev.cjs 被 pkill 杀掉后，子进程的 vite/mock-health 可能没被一起带走，
+ * 保活机制重启新 dev.cjs 时发现端口被占，导致 vite/mock-health 起不来。
+ */
+function killOrphansByPort(port) {
+  try {
+    const out = execSync(`lsof -ti:${port}`, { stdio: ['ignore', 'pipe', 'ignore'] })
+      .toString()
+      .trim();
+    if (!out) return [];
+    const pids = out.split('\n').filter(Boolean);
+    for (const pid of pids) {
+      try {
+        process.kill(Number(pid), 'SIGKILL');
+        log(`killed orphan pid=${pid} on :${port}`);
+      } catch {
+        // 进程可能已退出
+      }
+    }
+    return pids;
+  } catch {
+    // lsof 没找到任何占用，正常情况
+    return [];
+  }
+}
+
 const managed = [];
 
 function startProcess({ name, command, args, logFileName }) {
@@ -69,6 +109,10 @@ function startProcess({ name, command, args, logFileName }) {
   return child;
 }
 
+// 先清掉可能残留的孤儿进程，再启动新子进程
+killOrphansByPort(CLIENT_DEV_PORT);
+killOrphansByPort(HEALTH_PORT);
+
 startProcess({
   name: 'client',
   command: 'npx',
@@ -87,6 +131,8 @@ let stopping = false;
 function cleanup(signal) {
   if (stopping) return;
   stopping = true;
+  log(`cleanup triggered by ${signal}`);
+
   for (const { child } of managed) {
     if (!child.pid) continue;
     try { process.kill(-child.pid, signal || 'SIGTERM'); } catch {}
@@ -96,12 +142,19 @@ function cleanup(signal) {
       if (!child.pid) continue;
       try { process.kill(-child.pid, 'SIGKILL'); } catch {}
     }
+    // 兜底再扫一次端口，确保孤儿被清理
+    killOrphansByPort(CLIENT_DEV_PORT);
+    killOrphansByPort(HEALTH_PORT);
     process.exit(0);
   }, 2000);
 }
 
 process.on('SIGINT', () => cleanup('SIGTERM'));
 process.on('SIGTERM', () => cleanup('SIGTERM'));
+// pkill -f "npm run dev" 把 npm 杀掉后，dev.cjs 会收到 SIGHUP（controlling
+// tty 关闭），Node 默认行为是直接退出不跑 handler。注册 SIGHUP handler 触发
+// cleanup，让子进程组跟着一起死，避免变孤儿
+process.on('SIGHUP', () => cleanup('SIGTERM'));
 
 // 任意子进程退出就触发整体 cleanup，避免半残留
 Promise.race(