worktree-bay 2.3.8 → 2.3.9

package/dist/lock.js

@@ -1,25 +1,85 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { t } from './i18n.js';
+import { warn } from './util/log.js';
+// 工作区原子锁（mkdir）。锁目录内写 owner=pid：
+// - 锁主进程已死 / 无主（陈旧锁，多为上次进程被杀残留）→ 秒级清除重试，不再空等 30s；
+// - 锁被另一个在跑的 worktree-bay 持有 → 立刻提示在等谁，再按需等待，超时给明确指引。
+function pidAlive(pid) { if (!pid)
+    return false; try {
+    process.kill(pid, 0);
+    return true;
+}
+catch {
+    return false;
+} }
+function ownerPid(lockDir) {
+    try {
+        const n = Number(fs.readFileSync(path.join(lockDir, 'owner'), 'utf8').trim());
+        return n || null;
+    }
+    catch {
+        return null;
+    }
+}
 export async function withLock(ws, fn) {
-    const lockDir = path.join(ws, '.worktree-bay', 'lock');
-    fs.mkdirSync(path.join(ws, '.worktree-bay'), { recursive: true });
+    const baseDir = path.join(ws, '.worktree-bay');
+    const lockDir = path.join(baseDir, 'lock');
+    fs.mkdirSync(baseDir, { recursive: true });
     const start = Date.now();
+    let notified = false;
+    let ownerMissingSince = 0;
     for (;;) {
         try {
             fs.mkdirSync(lockDir);
             break;
-        }
+        } // 抢到锁
         catch {
-            if (Date.now() - start > 30000)
-                throw new Error(t('获取工作区锁超时（是否有另一个 worktree-bay 在运行？）。若确认没有，删掉 .worktree-bay/lock 目录再试。', 'timed out acquiring the workspace lock (is another worktree-bay running?). If not, delete the .worktree-bay/lock directory and retry.'));
+            const pid = ownerPid(lockDir);
+            if (pid === null) {
+                // 无 owner 文件：可能是陈旧锁（旧版/被杀残留），也可能是别人刚抢到还没写 owner（竞态）。
+                // 给 ~600ms 宽限，仍无主就当陈旧锁清掉。
+                if (ownerMissingSince === 0)
+                    ownerMissingSince = Date.now();
+                if (Date.now() - ownerMissingSince > 600) {
+                    try {
+                        fs.rmSync(lockDir, { recursive: true, force: true });
+                    }
+                    catch { /* 让下轮重试 */ }
+                    ownerMissingSince = 0;
+                    continue;
+                }
+            }
+            else {
+                ownerMissingSince = 0;
+                if (!pidAlive(pid)) {
+                    try {
+                        fs.rmSync(lockDir, { recursive: true, force: true });
+                    }
+                    catch { /* 重试 */ }
+                    continue;
+                } // 锁主已死 → 陈旧锁，清掉
+                if (!notified) {
+                    warn(t(`正在等待另一个 worktree-bay（pid ${pid}）释放工作区锁…`, `waiting for another worktree-bay (pid ${pid}) to release the workspace lock…`));
+                    notified = true;
+                }
+                if (Date.now() - start > 30000)
+                    throw new Error(t(`等待工作区锁超时：另一个 worktree-bay（pid ${pid}）仍持有。若它已卡死，结束该进程或删掉 ${lockDir} 再试。`, `timed out waiting for the workspace lock: another worktree-bay (pid ${pid}) still holds it. If stuck, kill it or delete ${lockDir}, then retry.`));
+            }
             await new Promise((r) => setTimeout(r, 50));
         }
     }
+    try {
+        fs.writeFileSync(path.join(lockDir, 'owner'), String(process.pid));
+    }
+    catch { /* 忽略：owner 仅用于陈旧检测 */ }
     try {
         return await fn();
     }
     finally {
-        fs.rmdirSync(lockDir);
+        try {
+            fs.rmSync(lockDir, { recursive: true, force: true });
+        }
+        catch { /* 已被清理 */ }
     }
 }

package/dist/mcp.js

@@ -58,7 +58,8 @@ export const TOOLS = [
         inputSchema: { type: 'object', properties: {} }, toArgs: () => ['skill'] },
 ];
 function runCli(args) {
-    const r = spawnSync(process.execPath, [CLI, ...args], { encoding: 'utf8' });
+    // 强制非交互：给 AI 的输出不带颜色/spinner 控制符，保留完整日志
+    const r = spawnSync(process.execPath, [CLI, ...args], { encoding: 'utf8', env: { ...process.env, WORKTREE_BAY_NONINTERACTIVE: '1' } });
     return [r.stdout, r.stderr].filter(Boolean).join('\n').trim() || '(无输出)';
 }
 export function handle(msg) {

package/dist/util/color.js

@@ -1,5 +1,14 @@
-// 轻量 ANSI 着色：仅在 TTY 且未设 NO_COLOR 时上色，否则原样返回（管道/CI/重定向不带控制符）。
-const enabled = (!!process.stdout.isTTY || !!process.stderr.isTTY) && !process.env.NO_COLOR && process.env.TERM !== 'dumb';
+// 终端是否「类 TTY」（可上色/动画）。Git Bash/mintty 下 Node 的 isTTY 会误报 false，
+// 但其实是交互终端、支持 ANSI（MSYSTEM/TERM_PROGRAM 可识别）。MCP/脚本可设 WORKTREE_BAY_NONINTERACTIVE 强制纯文本。
+export function ttyLike(stream) {
+    if (process.env.WORKTREE_BAY_NONINTERACTIVE)
+        return false;
+    if (stream?.isTTY)
+        return true;
+    return !!(process.env.MSYSTEM || process.env.TERM_PROGRAM === 'mintty');
+}
+// 轻量 ANSI 着色：仅在类 TTY 且未设 NO_COLOR 时上色，否则原样返回（管道/CI/重定向/MCP 不带控制符）。
+const enabled = (ttyLike(process.stdout) || ttyLike(process.stderr)) && !process.env.NO_COLOR && process.env.TERM !== 'dumb';
 const paint = (code) => (s) => (enabled ? `\x1b[${code}m${s}\x1b[0m` : s);
 export const color = {
     enabled,

package/dist/util/exec.js

@@ -1,6 +1,6 @@
 import { spawnSync, spawn } from 'node:child_process';
 import { t } from '../i18n.js';
-import { color as c } from './color.js';
+import { color as c, ttyLike } from './color.js';
 export function run(cmd, args, opts = {}) { const r = spawnSync(cmd, args, { cwd: opts.cwd, stdio: 'inherit', shell: false }); return { code: r.status ?? 1 }; }
 export function runShell(line, opts = {}) { const r = spawnSync(line, { cwd: opts.cwd, stdio: 'inherit', shell: true }); return { code: r.status ?? 1 }; }
 export function spliceArgv(template, cmd) { const out = []; for (const el of template) {
@@ -14,7 +14,7 @@ const SPIN = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '
 // 折叠式执行 setup/teardown 这类外部命令：TTY 下把输出收进单行临时进度（spinner + 秒数 + 最后一行），
 // 成功收成「✓ label（Ns）」，失败才吐完整日志便于排查；非 TTY（CI/管道/MCP）原样透传保留完整日志。
 export function runShellLive(line, opts, label) {
-    if (!process.stderr.isTTY) {
+    if (!ttyLike(process.stderr)) {
         const r = spawnSync(line, { cwd: opts.cwd, stdio: 'inherit', shell: true });
         return Promise.resolve({ code: r.status ?? 1 });
     }

package/dist/util/progress.js

@@ -1,12 +1,12 @@
 import { log } from './log.js';
-import { color as c } from './color.js';
+import { color as c, ttyLike } from './color.js';
 const FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
 // 给长耗时异步步骤一个「在干活」的反馈：TTY 下转圈 + 秒数（写 stderr，用 \r 原地刷新），
 // 非 TTY（管道 / CI / MCP）下退化为「开始…」「✓ 完成（Ns）」两行，避免刷屏。
 export async function withProgress(label, fn) {
     const t0 = Date.now();
     const secs = () => ((Date.now() - t0) / 1000).toFixed(1);
-    if (!process.stderr.isTTY) {
+    if (!ttyLike(process.stderr)) {
         log(`  → ${label} …`);
         const r = await fn();
         log(`  ${c.green('✓')} ${label}${c.dim(`（${secs()}s）`)}`);

package/package.json

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