worktree-bay 2.3.1 → 2.3.3

package/dist/engine.js

@@ -7,7 +7,7 @@ import { addWorktree } from './git.js';
 import { runShellLive, run, spliceArgv, isTTY } from './util/exec.js';
 import { warn, log } from './util/log.js';
 import { withProgress } from './util/progress.js';
-import { startDetached, recordedFor, pidAlive, stopManaged, readLogTail } from './proc.js';
+import { startDetached, recordedFor, pidAlive, setPid, pidOnPort, readLogTail } from './proc.js';
 import { t } from './i18n.js';
 export function mergeEnvText(text, kv) {
     const lines = text.split('\n');
@@ -88,28 +88,28 @@ export async function ensureStarted(ctx) {
     }
     const cmd = renderTemplate(sp.start, vars);
     const r = startDetached(ws, dir, service, slug, port, cmd);
-    // 验证没立刻挂：轮询 ~3s，端口起来=成功，pid 没了=启动失败（命令多半不对）
-    const alive = await waitStartup(r.pid, port, 3000);
-    if (alive) {
-        log(t(`  ▸ 已后台启动 ${service} dev server（pid ${r.pid}，端口 ${port}）  日志: ${r.log}`, `  ▸ started ${service} dev server in background (pid ${r.pid}, port ${port})  log: ${r.log}`));
+    // 等它在【约定端口】上监听（最多 ~12s）。起来后按端口查出真实 pid 回填（shell/pnpm 会让记录 pid 漂移）。
+    const up = await waitForListen(port, 12000);
+    if (up) {
+        const real = pidOnPort(port);
+        if (real && real > 0)
+            setPid(ws, dir, real);
+        log(t(`  ▸ 已后台启动 ${service} dev server（pid ${real || r.pid}，端口 ${port}）  日志: ${r.log}`, `  ▸ started ${service} dev server in background (pid ${real || r.pid}, port ${port})  log: ${r.log}`));
     }
     else {
-        stopManaged(ws, dir); // 进程已死，清掉登记，别留假状态
         const tail = readLogTail(r.log);
-        warn(t(`  ✗ ${service} dev server 启动后立即退出——start 命令多半不对。\n     命令: ${cmd}\n     请在 worktree 里手动跑一遍排查: cd ${dir} && ${cmd}\n     日志(${r.log}):\n${tail || '（空）'}`, `  ✗ ${service} dev server exited immediately — the start command is likely wrong.\n     command: ${cmd}\n     reproduce in the worktree: cd ${dir} && ${cmd}\n     log (${r.log}):\n${tail || '(empty)'}`));
+        warn(t(`  ✗ ${service} dev server 未在约定端口 ${port} 上监听（12s 内）。多半是 start 命令不对，或端口被占后退避了——建议给 vite 加 --strictPort。\n     命令: ${cmd}\n     手动排查: cd ${dir} && ${cmd}\n     日志(${r.log}):\n${tail || '（空）'}`, `  ✗ ${service} dev server is not listening on the expected port ${port} (within 12s). The start command may be wrong, or it fell back to another port — add --strictPort for vite.\n     command: ${cmd}\n     reproduce: cd ${dir} && ${cmd}\n     log (${r.log}):\n${tail || '(empty)'}`));
     }
 }
-// 端口起来→true（成功）；pid 死了→false（崩了）；超时仍存活→true（还在启动，如 vite 冷启动较慢）
-async function waitStartup(pid, port, ms) {
+// 轮询直到约定端口被监听（true），或超时（false）
+async function waitForListen(port, ms) {
     const end = Date.now() + ms;
     for (;;) {
-        if (!pidAlive(pid))
-            return false;
         if (!(await isPortFree(port)))
             return true;
         if (Date.now() >= end)
-            return pidAlive(pid);
-        await new Promise((r) => setTimeout(r, 150));
+            return false;
+        await new Promise((r) => setTimeout(r, 200));
     }
 }
 export function execArgv(ctx, cmd) {

package/dist/git.js

@@ -20,9 +20,10 @@ export async function removeWorktree(repo, dir, force) {
     git(repo, ...a); // 尽力移除；残留交给下面兜底（调用方已先过脏/未推保护，到这里删除是安全的）
     // git worktree remove 不会删被忽略的文件（前端 node_modules 等）→ 目录残留报 "Directory not empty"；
     // 它还可能先摘了登记再删目录失败，留下「git 不认但磁盘还在」的孤儿。统一兜底：物理删目录 + prune 同步元数据。
-    // 用异步 rm，让删 node_modules（可能数秒）时上层 spinner 能转。
+    // 用异步 rm，让删 node_modules（可能数秒）时上层 spinner 能转；
+    // maxRetries 兜底 Windows 上刚杀进程、句柄尚未释放导致的 EBUSY/ENOTEMPTY。
     if (fs.existsSync(dir))
-        await fs.promises.rm(dir, { recursive: true, force: true });
+        await fs.promises.rm(dir, { recursive: true, force: true, maxRetries: 5, retryDelay: 300 });
     git(repo, 'worktree', 'prune');
 }
 export function isDirty(dir) { return ok(dir, 'status', '--porcelain').trim().length > 0; }

package/dist/proc.js

@@ -9,7 +9,8 @@ catch {
     return [];
 } }
 function writeProcs(ws, recs) { fs.mkdirSync(path.join(ws, '.worktree-bay'), { recursive: true }); fs.writeFileSync(regPath(ws), JSON.stringify(recs, null, 2) + '\n'); }
-export function pidAlive(pid) { try {
+export function pidAlive(pid) { if (!pid || pid < 1)
+    return false; try {
     process.kill(pid, 0);
     return true;
 }
@@ -17,6 +18,10 @@ catch {
     return false;
 } }
 export function recordedFor(ws, dir) { return readProcs(ws).find((r) => r.dir === dir); }
+export function setPid(ws, dir, pid) { const recs = readProcs(ws); const r = recs.find((x) => x.dir === dir); if (r) {
+    r.pid = pid;
+    writeProcs(ws, recs);
+} }
 export function readLogTail(file, lines = 15) {
     try {
         return fs.readFileSync(file, 'utf8').split(/\r?\n/).filter(Boolean).slice(-lines).join('\n');
@@ -25,13 +30,43 @@ export function readLogTail(file, lines = 15) {
         return '';
     }
 }
+// 找出监听某端口的进程 pid（shell/pnpm 等中间层会让记录的 pid 漂移，按端口查最可靠）。
+export function pidOnPort(port) {
+    if (process.platform === 'win32') {
+        const r = spawnSync('netstat', ['-ano', '-p', 'tcp'], { encoding: 'utf8' });
+        for (const line of (r.stdout || '').split(/\r?\n/)) {
+            const m = new RegExp(`[:.]${port}\\s+\\S+\\s+LISTENING\\s+(\\d+)`, 'i').exec(line);
+            if (m)
+                return Number(m[1]);
+        }
+        return undefined;
+    }
+    let r = spawnSync('lsof', ['-ti', `tcp:${port}`, '-sTCP:LISTEN'], { encoding: 'utf8' });
+    if (r.status === 0 && r.stdout.trim()) {
+        const pid = parseInt(r.stdout.trim().split(/\s+/)[0], 10);
+        if (pid)
+            return pid;
+    }
+    r = spawnSync('ss', ['-ltnp'], { encoding: 'utf8' });
+    if (r.status === 0) {
+        const m = new RegExp(`:${port}\\s.*pid=(\\d+)`).exec(r.stdout || '');
+        if (m)
+            return Number(m[1]);
+    }
+    return undefined;
+}
 export function startDetached(ws, dir, service, slug, port, cmd) {
     const logDir = path.join(ws, '.worktree-bay', 'logs');
     fs.mkdirSync(logDir, { recursive: true });
     const log = path.join(logDir, `${slug}-${service}.log`);
     const fd = fs.openSync(log, 'a');
-    // detached + unref：脱离本进程，CLI 退出后 dev server 继续跑；stdout/stderr 落日志文件。
-    const child = spawn(cmd, { cwd: dir, shell: true, detached: true, stdio: ['ignore', fd, fd], windowsHide: true });
+    // 后台启动、CLI 退出后仍存活、且不弹窗：
+    // - Windows：不要 detached（detached 会新开控制台窗口、且与 windowsHide 冲突）；用 windowsHide 抑制窗口，
+    //   子进程在父进程正常退出后不会被自动杀（Windows 默认不 kill-on-parent-exit），kill 时用 taskkill /T 杀进程树。
+    // - 类 Unix：detached 建新进程组，便于用 kill(-pid) 整组结束。
+    // 两边都把 stdout/stderr 落日志文件，并 unref 让本进程能直接退出。
+    const detached = process.platform !== 'win32';
+    const child = spawn(cmd, { cwd: dir, shell: true, detached, stdio: ['ignore', fd, fd], windowsHide: true });
     const pid = child.pid ?? -1;
     child.unref();
     const rec = { dir, service, port, pid, cmd, log, startedAt: Date.now() };
@@ -54,13 +89,21 @@ function killTree(pid) {
     }
 }
 // 停掉某 worktree 的托管进程（含进程树），并从账本移除。返回被停的记录（无则 undefined）。
+// 同时按「记录 pid」和「当前端口占用 pid」双杀——shell/pnpm 中间层会让记录 pid 漂移，按端口兜底最稳。
 export function stopManaged(ws, dir) {
     const recs = readProcs(ws);
     const rec = recs.find((r) => r.dir === dir);
     if (!rec)
         return undefined;
-    if (pidAlive(rec.pid))
-        killTree(rec.pid);
+    const targets = new Set();
+    if (rec.pid > 0)
+        targets.add(rec.pid);
+    const onPort = pidOnPort(rec.port);
+    if (onPort)
+        targets.add(onPort);
+    for (const pid of targets)
+        if (pidAlive(pid))
+            killTree(pid);
     writeProcs(ws, recs.filter((r) => r.dir !== dir));
     return rec;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "worktree-bay",
-  "version": "2.3.1",
+  "version": "2.3.3",
   "description": "Per-feature git worktree + port slots for parallel multi-service development: auto deps, env wiring, frontend-to-backend, merge-aware reclaim, plus an MCP server for AI agents.",
   "keywords": [
     "git",