worktree-bay 2.3.3 → 2.3.5

package/dist/commands/ls.js

@@ -1,17 +1,17 @@
 import { scanOccupancy, readLabels } from '../slots.js';
 import { portOf } from '../ports.js';
 import { log } from '../util/log.js';
-import { recordedFor, pidAlive } from '../proc.js';
+import { recordedFor, pidOnPort } from '../proc.js';
 import { t } from '../i18n.js';
-// 该 worktree 是否有存活的托管 dev server（用于 ls 标注 ▸run）
-function running(cfg, dir) { const r = recordedFor(cfg.workspaceRoot, dir); return !!r && pidAlive(r.pid); }
+// 该服务的约定端口是否有进程在监听（按端口判，不受 shell/pnpm 让记录 pid 漂移的影响）
+function running(cfg, dir, port) { return !!recordedFor(cfg.workspaceRoot, dir) && !!pidOnPort(port); }
 export function renderSlots(cfg) {
     const occ = scanOccupancy(cfg);
     const labels = readLabels(cfg);
     const slots = new Set([...occ.keys(), ...Object.keys(labels).map(Number)]);
     const lines = [];
     for (const n of [...slots].sort((a, b) => a - b)) {
-        const svc = (occ.get(n) ?? []).map((o) => `${o.service}@${portOf(cfg.services[o.service].port, n)}${running(cfg, o.dir) ? ' ▸run' : ''}`);
+        const svc = (occ.get(n) ?? []).map((o) => { const p = portOf(cfg.services[o.service].port, n); return `${o.service}@${p}${running(cfg, o.dir, p) ? ' ▸run' : ''}`; });
         lines.push(`slot ${n}  ${labels[String(n)] ?? t('(未命名)', '(unnamed)')}  [${svc.join(', ') || t('无 worktree', 'no worktree')}]`);
     }
     return lines.join('\n') || t('(无槽位在用)', '(no slots in use)');
@@ -22,7 +22,7 @@ export function slotsData(cfg) {
     const slots = new Set([...occ.keys(), ...Object.keys(labels).map(Number)]);
     return [...slots].sort((a, b) => a - b).map((n) => ({
         slot: n, feature: labels[String(n)] ?? null,
-        services: (occ.get(n) ?? []).map((o) => ({ service: o.service, port: portOf(cfg.services[o.service].port, n), dir: o.dir, running: running(cfg, o.dir) })),
+        services: (occ.get(n) ?? []).map((o) => { const p = portOf(cfg.services[o.service].port, n); return { service: o.service, port: p, dir: o.dir, running: running(cfg, o.dir, p) }; }),
     }));
 }
 export function lsCommand(cfg, json = false) { log(json ? JSON.stringify(slotsData(cfg), null, 2) : renderSlots(cfg)); }

package/dist/engine.js

@@ -1,7 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { renderTemplate } from './config.js';
-import { portOf, isPortFree } from './ports.js';
+import { portOf, portInUse } from './ports.js';
 import { scanOccupancy } from './slots.js';
 import { addWorktree } from './git.js';
 import { runShellLive, run, spliceArgv, isTTY } from './util/exec.js';
@@ -41,7 +41,7 @@ export function buildVars(cfg, ctx) {
 }
 export async function bringUp(ctx, base, branch) {
     const { sp, dir, repo, vars } = ctx;
-    if (!(await isPortFree(Number(vars.port))))
+    if (await portInUse(Number(vars.port)))
         throw new Error(t(`端口 ${vars.port} 已被占用。先停掉占用它的进程，或用 \`worktree-bay gc\`/\`worktree-bay down <功能>\` 释放其它槽后重试。`, `port ${vars.port} is already in use. Stop whatever is using it, or free a slot with \`worktree-bay gc\`/\`worktree-bay down <feature>\`, then retry.`));
     log(t(`  → 创建 worktree（分支 ${branch}）…`, `  → creating worktree (branch ${branch})…`));
     addWorktree(repo, dir, branch, base);
@@ -82,14 +82,15 @@ export async function ensureStarted(ctx) {
         log(t(`  • ${service} dev server 已在跑（pid ${rec.pid}，端口 ${port}）`, `  • ${service} dev server already running (pid ${rec.pid}, port ${port})`));
         return;
     }
-    if (!(await isPortFree(port))) {
+    if (await portInUse(port)) {
         log(t(`  • 端口 ${port} 已在监听，视为 ${service} dev server 在跑，跳过启动`, `  • port ${port} already listening; treating ${service} dev server as up, skip`));
         return;
     }
     const cmd = renderTemplate(sp.start, vars);
     const r = startDetached(ws, dir, service, slug, port, cmd);
-    // 等它在【约定端口】上监听（最多 ~12s）。起来后按端口查出真实 pid 回填（shell/pnpm 会让记录 pid 漂移）。
-    const up = await waitForListen(port, 12000);
+    // 等它在【约定端口】上监听（最多 ~25s，给 vite 冷启动 + 偶发 restart 留足时间）。
+    // 起来后按端口查出真实 pid 回填（shell/pnpm 会让记录 pid 漂移）。
+    const up = await waitForListen(port, 25000);
     if (up) {
         const real = pidOnPort(port);
         if (real && real > 0)
@@ -97,15 +98,16 @@ export async function ensureStarted(ctx) {
         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 {
+        // 超时不等于失败：dev server 可能仍在启动/重启。给中性提示 + 日志末尾，让用户稍后 ls 复查或排查。
         const tail = readLogTail(r.log);
-        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)'}`));
+        warn(t(`  • ${service} dev server 已在后台启动，但 25s 内端口 ${port} 还没就绪——可能仍在启动/重启。\n     稍后用 \`worktree-bay ls\` 看是否 ▸run；若起不来，多半是 start 命令不对或端口被占退避（vite 建议加 --strictPort）。\n     命令: ${cmd}    日志: ${r.log}\n     ${tail ? '日志末尾:\n' + tail : ''}`, `  • ${service} dev server launched, but port ${port} isn't ready within 25s — it may still be starting/restarting.\n     Check \`worktree-bay ls\` shortly for ▸run; if it never comes up, the start command is likely wrong or it fell back to another port (add --strictPort for vite).\n     command: ${cmd}    log: ${r.log}\n     ${tail ? 'log tail:\n' + tail : ''}`));
     }
 }
 // 轮询直到约定端口被监听（true），或超时（false）
 async function waitForListen(port, ms) {
     const end = Date.now() + ms;
     for (;;) {
-        if (!(await isPortFree(port)))
+        if (await portInUse(port))
             return true;
         if (Date.now() >= end)
             return false;

package/dist/ports.js

@@ -9,3 +9,16 @@ export function isPortFree(port) {
         srv.listen(port, '127.0.0.1');
     });
 }
+// 端口是否已被监听（连接探测，同时试 IPv4 与 IPv6 回环）。
+// 比 bind 探测可靠：Windows 上 vite 等常监听 IPv6（::），单纯在 127.0.0.1 上 bind 测试会漏判。
+export function portInUse(port) {
+    const probe = (host) => new Promise((resolve) => {
+        const sock = net.connect({ port, host });
+        const finish = (v) => { sock.destroy(); resolve(v); };
+        sock.setTimeout(1500);
+        sock.once('connect', () => finish(true));
+        sock.once('timeout', () => finish(false));
+        sock.once('error', () => resolve(false));
+    });
+    return Promise.all([probe('127.0.0.1'), probe('::1')]).then((r) => r.some(Boolean));
+}

package/package.json

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