worktree-bay 2.2.1 → 2.2.2

package/dist/commands/gc.js

@@ -3,7 +3,7 @@ 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 { log, warn } from '../util/log.js';
 import { t } from '../i18n.js';
 export function classifyForGc(s) {
@@ -26,7 +26,8 @@ export async function gcCommand(cfg, apply) {
                         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);
                     }

package/dist/commands/rm.js

@@ -3,7 +3,7 @@ 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 { log, warn } from '../util/log.js';
 import { t } from '../i18n.js';
 export function resolveRm(cfg, feature, service) {
@@ -26,7 +26,8 @@ export async function rmCommand(cfg, feature, service, force) {
             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}`));

package/dist/engine.js

@@ -4,7 +4,7 @@ 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 { t } from './i18n.js';
@@ -64,10 +64,9 @@ 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)})`));

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.2.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",