worktree-bay 2.3.0 → 2.3.2

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 } from './proc.js';
+import { startDetached, recordedFor, pidAlive, stopManaged, readLogTail } from './proc.js';
 import { t } from './i18n.js';
 export function mergeEnvText(text, kv) {
     const lines = text.split('\n');
@@ -86,8 +86,31 @@ export async function ensureStarted(ctx) {
         log(t(`  • 端口 ${port} 已在监听，视为 ${service} dev server 在跑，跳过启动`, `  • port ${port} already listening; treating ${service} dev server as up, skip`));
         return;
     }
-    const r = startDetached(ws, dir, service, slug, port, renderTemplate(sp.start, vars));
-    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}`));
+    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}`));
+    }
+    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)'}`));
+    }
+}
+// 端口起来→true（成功）；pid 死了→false（崩了）；超时仍存活→true（还在启动，如 vite 冷启动较慢）
+async function waitStartup(pid, 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));
+    }
 }
 export function execArgv(ctx, cmd) {
     const tpl = (ctx.sp.exec ?? ['sh', '-c', '{cmd...}']).map((el) => el === '{cmd...}' ? el : renderTemplate(el, ctx.vars));

package/dist/proc.js

@@ -17,13 +17,26 @@ catch {
     return false;
 } }
 export function recordedFor(ws, dir) { return readProcs(ws).find((r) => r.dir === dir); }
+export function readLogTail(file, lines = 15) {
+    try {
+        return fs.readFileSync(file, 'utf8').split(/\r?\n/).filter(Boolean).slice(-lines).join('\n');
+    }
+    catch {
+        return '';
+    }
+}
 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() };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "worktree-bay",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "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",