worktree-bay 2.2.1 → 2.3.0

package/dist/commands/add.js

@@ -4,9 +4,9 @@ import { repoPath } from '../config.js';
 import { withLock } from '../lock.js';
 import { claim } from '../slots.js';
 import { slugify, worktreeDirName } from '../naming.js';
-import { buildVars, bringUp } from '../engine.js';
+import { buildVars, bringUp, ensureStarted } from '../engine.js';
 import { mainBranch } from '../git.js';
-import { log, warn } from '../util/log.js';
+import { log } from '../util/log.js';
 import { t } from '../i18n.js';
 export function resolveAdd(cfg, feature, service, branch) {
     if (!cfg.services[service])
@@ -20,12 +20,13 @@ export async function addCommand(cfg, feature, service, branch, base) {
     await withLock(cfg.workspaceRoot, async () => {
         const p = resolveAdd(cfg, feature, service, br);
         const sp = cfg.services[service];
-        if (fs.existsSync(p.dir)) { // 幂等：该服务已在本功能下开过 worktree → 跳过（让 up 可安全重跑）
-            warn(t(`• ${service} 已在功能 "${feature}"（槽 ${p.slot}），跳过。要重建先 \`worktree-bay rm ${feature} ${service}\`。`, `• ${service} already in "${feature}" (slot ${p.slot}), skipping. To recreate: \`worktree-bay rm ${feature} ${service}\`.`));
-            return;
-        }
         const ctxBase = { cfg, service, sp, slot: p.slot, slug: p.slug, dir: p.dir, repo: p.repo };
         const ctx = { ...ctxBase, vars: buildVars(cfg, ctxBase) };
+        if (fs.existsSync(p.dir)) { // 幂等重入：worktree 已在 → 不重建/不重跑 setup，但确保 dev server 在跑
+            log(t(`  • 已就绪（槽 ${p.slot}，端口 ${ctx.vars.port}）`, `  • ready (slot ${p.slot}, port ${ctx.vars.port})`));
+            await ensureStarted(ctx);
+            return;
+        }
         const resolvedBase = base ?? `origin/${mainBranch(p.repo)}`;
         try {
             await bringUp(ctx, resolvedBase, br);
@@ -36,6 +37,7 @@ export async function addCommand(cfg, feature, service, branch, base) {
                 throw new Error(t(`基分支「${resolvedBase}」无效（该仓可能没有 origin 或对应主分支）。给 add 显式传 base，例如：worktree-bay add ${feature} ${service} ${br} HEAD`, `invalid base ref "${resolvedBase}" (this repo may have no origin or main branch). Pass an explicit base to add, e.g.: worktree-bay add ${feature} ${service} ${br} HEAD`));
             throw e;
         }
+        await ensureStarted(ctx);
         log(t(`✓ ${service} 挂入 "${feature}"（槽 ${p.slot}，端口 ${ctx.vars.port}，分支 ${br}）`, `✓ ${service} added to "${feature}" (slot ${p.slot}, port ${ctx.vars.port}, branch ${br})`));
     });
 }

package/dist/commands/gc.js

@@ -3,7 +3,9 @@ import { withLock } from '../lock.js';
 import { scanOccupancy, pruneEmptyLabels, removeLabel } from '../slots.js';
 import { buildVars } from '../engine.js';
 import { currentBranch, isDirty, hasUnpushed, isMergedToMain, remoteBranchGone, removeWorktree } from '../git.js';
-import { runShell } from '../util/exec.js';
+import { runShellLive } from '../util/exec.js';
+import { withProgress } from '../util/progress.js';
+import { stopManaged } from '../proc.js';
 import { log, warn } from '../util/log.js';
 import { t } from '../i18n.js';
 export function classifyForGc(s) {
@@ -23,12 +25,14 @@ export async function gcCommand(cfg, apply) {
                 if (v === 'auto-remove') {
                     log(t(`[gc] ${o.service} (槽 ${slot}) 已合并且干净 → 移除`, `[gc] ${o.service} (slot ${slot}) merged & clean → remove`));
                     if (apply) {
+                        stopManaged(cfg.workspaceRoot, o.dir);
                         const sp = cfg.services[o.service];
                         if (sp.teardown) {
                             const vars = buildVars(cfg, { cfg, service: o.service, sp, slot, slug: o.slug, dir: o.dir, repo });
-                            runShell(renderTemplate(sp.teardown, vars), { cwd: repo });
+                            const cmd = renderTemplate(sp.teardown, vars);
+                            await runShellLive(cmd, { cwd: repo }, t(`teardown ${o.service}：${cmd}`, `teardown ${o.service}: ${cmd}`));
                         }
-                        removeWorktree(repo, o.dir, false);
+                        await withProgress(t(`移除 ${o.service} 的 worktree`, `removing ${o.service} worktree`), () => removeWorktree(repo, o.dir, false));
                     }
                 }
                 else if (v === 'flag')

package/dist/commands/ls.js

@@ -1,14 +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 { t } from '../i18n.js';
+// 该 worktree 是否有存活的托管 dev server（用于 ls 标注 ▸run）
+function running(cfg, dir) { const r = recordedFor(cfg.workspaceRoot, dir); return !!r && pidAlive(r.pid); }
 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)}`);
+        const svc = (occ.get(n) ?? []).map((o) => `${o.service}@${portOf(cfg.services[o.service].port, n)}${running(cfg, o.dir) ? ' ▸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)');
@@ -19,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 })),
+        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) })),
     }));
 }
 export function lsCommand(cfg, json = false) { log(json ? JSON.stringify(slotsData(cfg), null, 2) : renderSlots(cfg)); }

package/dist/commands/rm.js

@@ -3,7 +3,9 @@ import { withLock } from '../lock.js';
 import { scanOccupancy, slotOfFeature, removeLabel } from '../slots.js';
 import { buildVars } from '../engine.js';
 import { isDirty, hasUnpushed, currentBranch, removeWorktree } from '../git.js';
-import { runShell } from '../util/exec.js';
+import { runShellLive } from '../util/exec.js';
+import { withProgress } from '../util/progress.js';
+import { stopManaged } from '../proc.js';
 import { log, warn } from '../util/log.js';
 import { t } from '../i18n.js';
 export function resolveRm(cfg, feature, service) {
@@ -16,20 +18,27 @@ export function resolveRm(cfg, feature, service) {
 export async function rmCommand(cfg, feature, service, force) {
     await withLock(cfg.workspaceRoot, async () => {
         let removed = 0;
-        for (const o of resolveRm(cfg, feature, service)) {
+        const occs = resolveRm(cfg, feature, service);
+        for (let i = 0; i < occs.length; i++) {
+            const o = occs[i];
             const repo = repoPath(cfg, o.service);
             const branch = currentBranch(o.dir);
+            const tag = t(`[${i + 1}/${occs.length}]`, `[${i + 1}/${occs.length}]`);
             if (!force && (isDirty(o.dir) || hasUnpushed(repo, branch))) {
-                warn(t(`跳过 ${o.service}：有未提交或未推送的改动。先提交/推送，或加 -f 强制删除（会丢这些改动）。`, `skipped ${o.service}: it has uncommitted or unpushed changes. Commit/push first, or pass -f to force-remove (discards them).`));
+                warn(t(`▶ ${tag} 跳过 ${o.service}：有未提交或未推送的改动。先提交/推送，或加 -f 强制删除（会丢这些改动）。`, `▶ ${tag} skipped ${o.service}: uncommitted or unpushed changes. Commit/push first, or pass -f to force-remove (discards them).`));
                 continue;
             }
+            log(t(`▶ ${tag} 拆除 ${o.service} …`, `▶ ${tag} removing ${o.service} …`));
+            const stopped = stopManaged(cfg.workspaceRoot, o.dir); // 先停 dev server（释放对 worktree 文件的占用）
+            if (stopped)
+                log(t(`  ▸ 已停止 dev server（pid ${stopped.pid}）`, `  ▸ stopped dev server (pid ${stopped.pid})`));
             const sp = cfg.services[o.service];
             if (sp.teardown) {
                 const vars = buildVars(cfg, { cfg, service: o.service, sp, slot: o.slot, slug: o.slug, dir: o.dir, repo });
-                runShell(renderTemplate(sp.teardown, vars), { cwd: repo });
+                const cmd = renderTemplate(sp.teardown, vars);
+                await runShellLive(cmd, { cwd: repo }, t(`teardown ${o.service}：${cmd}`, `teardown ${o.service}: ${cmd}`));
             }
-            removeWorktree(repo, o.dir, force);
-            log(t(`✓ 移除 ${o.service}`, `✓ removed ${o.service}`));
+            await withProgress(t(`移除 ${o.service} 的 worktree`, `removing ${o.service} worktree`), () => removeWorktree(repo, o.dir, force));
             removed++;
         }
         const slot = slotOfFeature(cfg, feature);

package/dist/engine.js

@@ -4,9 +4,10 @@ import { renderTemplate } from './config.js';
 import { portOf, isPortFree } from './ports.js';
 import { scanOccupancy } from './slots.js';
 import { addWorktree } from './git.js';
-import { runShell, run, spliceArgv, isTTY } from './util/exec.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 { t } from './i18n.js';
 export function mergeEnvText(text, kv) {
     const lines = text.split('\n');
@@ -47,7 +48,7 @@ export async function bringUp(ctx, base, branch) {
     for (const rel of sp.copy ?? []) {
         // dereference: vendor/node_modules 含符号链接，Windows 下原样复制符号链接会失败，跟随并拷目标内容。
         // 用异步 cp + spinner，让大目录（如 vendor ~238MB）拷贝时不像卡死。
-        await withProgress(t(`从主 checkout 拷贝 ${rel}（首次较慢）`, `copying ${rel} from main checkout (first time is slow)`), () => fs.promises.cp(path.join(repo, rel), path.join(dir, rel), { recursive: true, dereference: true }));
+        await withProgress(t(`拷贝 ${rel}`, `copying ${rel}`), () => fs.promises.cp(path.join(repo, rel), path.join(dir, rel), { recursive: true, dereference: true }));
         for (const lock of ['composer.lock', 'pnpm-lock.yaml', 'package-lock.json']) {
             const a = path.join(repo, lock), b = path.join(dir, lock);
             if (fs.existsSync(a) && fs.existsSync(b) && fs.readFileSync(a, 'utf8') !== fs.readFileSync(b, 'utf8'))
@@ -64,13 +65,29 @@ export async function bringUp(ctx, base, branch) {
     }
     if (sp.setup) {
         const cmd = renderTemplate(sp.setup, vars);
-        log(t(`  → 执行 setup：${cmd}`, `  → running setup: ${cmd}`));
-        const r = runShell(cmd, { cwd: dir });
+        const r = await runShellLive(cmd, { cwd: dir }, t(`setup：${cmd}`, `setup: ${cmd}`));
         if (r.code !== 0)
-            throw new Error(t(`setup 命令失败（退出码 ${r.code}）。查看上面的输出排查；修好后可重跑 add（已建的 worktree 会被复用，不会重复创建）。`, `setup command failed (exit code ${r.code}). Check the output above; after fixing, re-run add (the existing worktree is reused, not recreated).`));
+            throw new Error(t(`setup 命令失败（退出码 ${r.code}）。完整输出见上；修好后可重跑 add（已建的 worktree 会被复用，不会重复创建）。`, `setup command failed (exit code ${r.code}). Full output is above; after fixing, re-run add (the existing worktree is reused, not recreated).`));
     }
-    if (sp.start)
-        log(t(`  启动: (cd ${dir} && ${renderTemplate(sp.start, vars)})`, `  start: (cd ${dir} && ${renderTemplate(sp.start, vars)})`));
+}
+// 托管启动 dev server（start）：端口已在监听 / 已登记进程存活 → 跳过；否则后台 detach 启动并登记。
+// 让 up 可重入（再跑一次只补起没在跑的），并由 down 负责停。
+export async function ensureStarted(ctx) {
+    const { cfg, sp, dir, service, slug, vars } = ctx;
+    if (!sp.start)
+        return;
+    const ws = cfg.workspaceRoot, port = Number(vars.port);
+    const rec = recordedFor(ws, dir);
+    if (rec && pidAlive(rec.pid)) {
+        log(t(`  • ${service} dev server 已在跑（pid ${rec.pid}，端口 ${port}）`, `  • ${service} dev server already running (pid ${rec.pid}, port ${port})`));
+        return;
+    }
+    if (!(await isPortFree(port))) {
+        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}`));
 }
 export function execArgv(ctx, cmd) {
     const tpl = (ctx.sp.exec ?? ['sh', '-c', '{cmd...}']).map((el) => el === '{cmd...}' ? el : renderTemplate(el, ctx.vars));

package/dist/git.js

@@ -13,15 +13,16 @@ export function addWorktree(repo, dir, branch, base) {
     else
         ok(repo, 'worktree', 'add', '-b', branch, dir, base);
 }
-export function removeWorktree(repo, dir, force) {
+export async function removeWorktree(repo, dir, force) {
     const a = ['worktree', 'remove', dir];
     if (force)
         a.push('--force');
     git(repo, ...a); // 尽力移除；残留交给下面兜底（调用方已先过脏/未推保护，到这里删除是安全的）
     // git worktree remove 不会删被忽略的文件（前端 node_modules 等）→ 目录残留报 "Directory not empty"；
     // 它还可能先摘了登记再删目录失败，留下「git 不认但磁盘还在」的孤儿。统一兜底：物理删目录 + prune 同步元数据。
+    // 用异步 rm，让删 node_modules（可能数秒）时上层 spinner 能转。
     if (fs.existsSync(dir))
-        fs.rmSync(dir, { recursive: true, force: true });
+        await fs.promises.rm(dir, { recursive: true, force: true });
     git(repo, 'worktree', 'prune');
 }
 export function isDirty(dir) { return ok(dir, 'status', '--porcelain').trim().length > 0; }

package/dist/proc.js

@@ -0,0 +1,58 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { spawn, spawnSync } from 'node:child_process';
+function regPath(ws) { return path.join(ws, '.worktree-bay', 'processes.json'); }
+export function readProcs(ws) { const p = regPath(ws); try {
+    return fs.existsSync(p) ? JSON.parse(fs.readFileSync(p, 'utf8')) : [];
+}
+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 {
+    process.kill(pid, 0);
+    return true;
+}
+catch {
+    return false;
+} }
+export function recordedFor(ws, dir) { return readProcs(ws).find((r) => r.dir === dir); }
+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 });
+    const pid = child.pid ?? -1;
+    child.unref();
+    const rec = { dir, service, port, pid, cmd, log, startedAt: Date.now() };
+    writeProcs(ws, [...readProcs(ws).filter((r) => r.dir !== dir), rec]);
+    return rec;
+}
+function killTree(pid) {
+    if (process.platform === 'win32')
+        spawnSync('taskkill', ['/PID', String(pid), '/T', '/F']);
+    else {
+        try {
+            process.kill(-pid, 'SIGTERM');
+        }
+        catch {
+            try {
+                process.kill(pid, 'SIGTERM');
+            }
+            catch { /* 已退出 */ }
+        }
+    }
+}
+// 停掉某 worktree 的托管进程（含进程树），并从账本移除。返回被停的记录（无则 undefined）。
+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);
+    writeProcs(ws, recs.filter((r) => r.dir !== dir));
+    return rec;
+}

package/dist/util/exec.js

@@ -1,4 +1,5 @@
-import { spawnSync } from 'node:child_process';
+import { spawnSync, spawn } from 'node:child_process';
+import { t } from '../i18n.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) {
@@ -8,3 +9,46 @@ export function spliceArgv(template, cmd) { const out = []; for (const el of tem
         out.push(el);
 } return out; }
 export function isTTY() { return Boolean(process.stdout.isTTY && process.stdin.isTTY); }
+const SPIN = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
+// 折叠式执行 setup/teardown 这类外部命令：TTY 下把输出收进单行临时进度（spinner + 秒数 + 最后一行），
+// 成功收成「✓ label（Ns）」，失败才吐完整日志便于排查；非 TTY（CI/管道/MCP）原样透传保留完整日志。
+export function runShellLive(line, opts, label) {
+    if (!process.stderr.isTTY) {
+        const r = spawnSync(line, { cwd: opts.cwd, stdio: 'inherit', shell: true });
+        return Promise.resolve({ code: r.status ?? 1 });
+    }
+    return new Promise((resolve) => {
+        const t0 = Date.now();
+        const child = spawn(line, { cwd: opts.cwd, shell: true });
+        const buf = [];
+        let last = '';
+        let fi = 0;
+        const render = () => {
+            const secs = Math.floor((Date.now() - t0) / 1000);
+            const head = `  ${SPIN[fi++ % SPIN.length]} ${label} ${secs}s `;
+            const room = Math.max(0, (process.stderr.columns || 80) - head.length - 1);
+            process.stderr.write('\r\x1b[2K' + head + last.slice(0, room));
+        };
+        const timer = setInterval(render, 120);
+        const onData = (d) => {
+            const s = d.toString();
+            buf.push(s);
+            const lines = s.split(/[\r\n]+/).map((l) => l.trim()).filter(Boolean);
+            if (lines.length)
+                last = lines[lines.length - 1];
+        };
+        child.stdout?.on('data', onData);
+        child.stderr?.on('data', onData);
+        child.on('error', () => { clearInterval(timer); process.stderr.write('\r\x1b[2K'); resolve({ code: 1 }); });
+        child.on('close', (code) => {
+            clearInterval(timer);
+            const secs = ((Date.now() - t0) / 1000).toFixed(1);
+            process.stderr.write('\r\x1b[2K');
+            if (code === 0)
+                process.stderr.write(t(`  ✓ ${label}（${secs}s）\n`, `  ✓ ${label} (${secs}s)\n`));
+            else
+                process.stderr.write(t(`  ✗ ${label} 失败（退出码 ${code}，${secs}s）↓\n`, `  ✗ ${label} failed (exit ${code}, ${secs}s) ↓\n`) + buf.join(''));
+            resolve({ code: code ?? 1 });
+        });
+    });
+}

package/package.json

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