worktree-bay 2.3.4 → 2.3.5

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,7 +82,7 @@ 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;
     }
@@ -107,7 +107,7 @@ export async function ensureStarted(ctx) {
 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.4",
+  "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",