worktree-bay 2.2.0 → 2.2.1

package/dist/commands/add.js

@@ -41,6 +41,8 @@ export async function addCommand(cfg, feature, service, branch, base) {
 }
 // up: 一条命令为功能批量起多个服务（claim 自动 + 各服务默认分支）
 export async function upCommand(cfg, feature, services, base) {
-    for (const service of services)
-        await addCommand(cfg, feature, service, undefined, base);
+    for (let i = 0; i < services.length; i++) {
+        log(t(`▶ [${i + 1}/${services.length}] 起 ${services[i]} …`, `▶ [${i + 1}/${services.length}] bringing up ${services[i]} …`));
+        await addCommand(cfg, feature, services[i], undefined, base);
+    }
 }

package/dist/engine.js

@@ -6,6 +6,7 @@ import { scanOccupancy } from './slots.js';
 import { addWorktree } from './git.js';
 import { runShell, 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';
 export function mergeEnvText(text, kv) {
     const lines = text.split('\n');
@@ -41,10 +42,12 @@ export async function bringUp(ctx, base, branch) {
     const { sp, dir, repo, vars } = ctx;
     if (!(await isPortFree(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);
     for (const rel of sp.copy ?? []) {
-        // dereference: vendor/node_modules 含符号链接，Windows 下原样复制符号链接会失败，跟随并拷目标内容
-        fs.cpSync(path.join(repo, rel), path.join(dir, rel), { recursive: true, dereference: true });
+        // 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 }));
         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'))
@@ -60,7 +63,9 @@ export async function bringUp(ctx, base, branch) {
         fs.writeFileSync(fp, mergeEnvText(cur, rendered));
     }
     if (sp.setup) {
-        const r = runShell(renderTemplate(sp.setup, vars), { cwd: dir });
+        const cmd = renderTemplate(sp.setup, vars);
+        log(t(`  → 执行 setup：${cmd}`, `  → running setup: ${cmd}`));
+        const r = runShell(cmd, { cwd: dir });
         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).`));
     }

package/dist/util/progress.js

@@ -0,0 +1,25 @@
+import { log } from './log.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) {
+        log(`  → ${label} …`);
+        const r = await fn();
+        log(`  ✓ ${label}（${secs()}s）`);
+        return r;
+    }
+    let i = 0;
+    const timer = setInterval(() => { process.stderr.write(`\r  ${FRAMES[i++ % FRAMES.length]} ${label} ${secs()}s `); }, 120);
+    if (typeof timer.unref === 'function')
+        timer.unref();
+    try {
+        return await fn();
+    }
+    finally {
+        clearInterval(timer);
+        process.stderr.write(`\r  ✓ ${label}（${secs()}s）          \n`);
+    }
+}

package/package.json

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