worktree-bay 2.3.6 → 2.3.8

package/dist/commands/add.js

@@ -7,6 +7,7 @@ import { slugify, worktreeDirName } from '../naming.js';
 import { buildVars, bringUp, ensureStarted } from '../engine.js';
 import { mainBranch } from '../git.js';
 import { log } from '../util/log.js';
+import { color as c } from '../util/color.js';
 import { t } from '../i18n.js';
 export function resolveAdd(cfg, feature, service, branch) {
     if (!cfg.services[service])
@@ -23,11 +24,11 @@ export async function addCommand(cfg, feature, service, branch, base) {
         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(`${service}  ·  已就绪 · 槽 ${p.slot} · 端口 ${ctx.vars.port}`, `${service}  ·  ready · slot ${p.slot} · port ${ctx.vars.port}`));
+            log(c.bold(c.cyan(service)) + c.dim(t(`  ·  已就绪 · 槽 ${p.slot} · 端口 ${ctx.vars.port}`, `  ·  ready · slot ${p.slot} · port ${ctx.vars.port}`)));
             await ensureStarted(ctx);
             return;
         }
-        log(t(`${service}  ·  槽 ${p.slot} · 端口 ${ctx.vars.port} · 分支 ${br}`, `${service}  ·  slot ${p.slot} · port ${ctx.vars.port} · branch ${br}`));
+        log(c.bold(c.cyan(service)) + c.dim(t(`  ·  槽 ${p.slot} · 端口 ${ctx.vars.port} · 分支 ${br}`, `  ·  slot ${p.slot} · port ${ctx.vars.port} · branch ${br}`)));
         const resolvedBase = base ?? `origin/${mainBranch(p.repo)}`;
         try {
             await bringUp(ctx, resolvedBase, br);

package/dist/commands/claim.js

@@ -2,10 +2,11 @@ import { withLock } from '../lock.js';
 import { claim } from '../slots.js';
 import { portOf } from '../ports.js';
 import { log } from '../util/log.js';
+import { color as c } from '../util/color.js';
 import { t } from '../i18n.js';
 export async function claimCommand(cfg, feature) {
     const slot = await withLock(cfg.workspaceRoot, async () => claim(cfg, feature));
-    log(t(`功能 "${feature}" → 槽 ${slot}`, `feature "${feature}" → slot ${slot}`));
+    log(c.bold(c.cyan(t(`功能 "${feature}" → 槽 ${slot}`, `feature "${feature}" → slot ${slot}`))));
     for (const [n, sp] of Object.entries(cfg.services))
         log(`  ${n.padEnd(8)} ${portOf(sp.port, slot)}`);
 }

package/dist/commands/completion.js

@@ -19,6 +19,8 @@ export function complete(cfg, words) {
         return Object.values(readLabels(cfg));
     if (['add', 'run', 'sh', 'path'].includes(sub) && pos === 2)
         return Object.keys(cfg.services);
+    if (sub === 'run' && pos === 3)
+        return Object.keys(cfg.services[prev[2]]?.run ?? {}); // run <feature> <service> <name>：补该服务的 run 命令名
     if (sub === 'up' && pos >= 2)
         return Object.keys(cfg.services); // up 接变长服务列表
     return [];

package/dist/commands/doctor.js

@@ -3,12 +3,13 @@ import path from 'node:path';
 import { spawnSync } from 'node:child_process';
 import { repoPath } from '../config.js';
 import { log, warn } from '../util/log.js';
+import { color as c } from '../util/color.js';
 import { t } from '../i18n.js';
 // 体检：git 是否可用、配置是否有效、各服务仓是否存在且是 git 仓。返回问题数。
 export function doctor(cfg) {
     let problems = 0;
-    const ok = (m) => log(`✓ ${m}`);
-    const bad = (m) => { warn(`✗ ${m}`); problems++; };
+    const ok = (m) => log(`${c.green('✓')} ${m}`);
+    const bad = (m) => { warn(`${c.red('✗')} ${m}`); problems++; };
     if (spawnSync('git', ['--version'], { encoding: 'utf8' }).status === 0)
         ok(t('git 可用', 'git available'));
     else
@@ -23,7 +24,7 @@ export function doctor(cfg) {
         else
             ok(`${t('服务', 'service')} ${name} → ${repo}`);
     }
-    log(problems === 0 ? t('\n✓ 一切正常', '\n✓ all good') : t(`\n✗ 发现 ${problems} 个问题`, `\n✗ found ${problems} problem(s)`));
+    log(problems === 0 ? c.green(t('\n✓ 一切正常', '\n✓ all good')) : c.red(t(`\n✗ 发现 ${problems} 个问题`, `\n✗ found ${problems} problem(s)`)));
     return problems;
 }
 export function doctorCommand(cfg) { if (doctor(cfg) > 0)

package/dist/commands/ls.js

@@ -2,6 +2,7 @@ import { scanOccupancy, readLabels } from '../slots.js';
 import { portOf } from '../ports.js';
 import { log } from '../util/log.js';
 import { recordedFor, pidOnPort } from '../proc.js';
+import { color as c } from '../util/color.js';
 import { t } from '../i18n.js';
 // 该服务的约定端口是否有进程在监听（按端口判，不受 shell/pnpm 让记录 pid 漂移的影响）
 function running(cfg, dir, port) { return !!recordedFor(cfg.workspaceRoot, dir) && !!pidOnPort(port); }
@@ -11,8 +12,8 @@ export function renderSlots(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) => { const p = portOf(cfg.services[o.service].port, n); return `${o.service}@${p}${running(cfg, o.dir, p) ? ' ▸run' : ''}`; });
-        lines.push(`slot ${n}  ${labels[String(n)] ?? t('(未命名)', '(unnamed)')}  [${svc.join(', ') || t('无 worktree', 'no worktree')}]`);
+        const svc = (occ.get(n) ?? []).map((o) => { const p = portOf(cfg.services[o.service].port, n); return `${o.service}@${p}${running(cfg, o.dir, p) ? c.green(' ▸run') : ''}`; });
+        lines.push(`${c.dim('slot ' + n)}  ${c.bold(c.cyan(labels[String(n)] ?? t('(未命名)', '(unnamed)')))}  [${svc.join(', ') || c.dim(t('无 worktree', 'no worktree'))}]`);
     }
     return lines.join('\n') || t('(无槽位在用)', '(no slots in use)');
 }

package/dist/commands/rm.js

@@ -7,6 +7,7 @@ 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 { color as c } from '../util/color.js';
 import { t } from '../i18n.js';
 export function resolveRm(cfg, feature, service) {
     const slot = slotOfFeature(cfg, feature);
@@ -23,13 +24,13 @@ export async function rmCommand(cfg, feature, service, force) {
             const repo = repoPath(cfg, o.service);
             const branch = currentBranch(o.dir);
             if (!force && (isDirty(o.dir) || hasUnpushed(repo, branch))) {
-                warn(t(`${o.service}  ·  跳过：有未提交或未推送的改动。先提交/推送，或加 -f 强删（会丢改动）。`, `${o.service}  ·  skipped: uncommitted or unpushed changes. Commit/push first, or pass -f to force-remove (discards them).`));
+                warn(c.yellow(t(`${o.service}  ·  跳过：有未提交或未推送的改动。先提交/推送，或加 -f 强删（会丢改动）。`, `${o.service}  ·  skipped: uncommitted or unpushed changes. Commit/push first, or pass -f to force-remove (discards them).`)));
                 continue;
             }
-            log(t(`${o.service}  ·  拆除…`, `${o.service}  ·  tearing down…`));
+            log(c.bold(c.cyan(o.service)) + c.dim(t('  ·  拆除…', '  ·  tearing down…')));
             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})`));
+                log(`  ${c.green('✓')} ` + 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 });
@@ -43,7 +44,7 @@ export async function rmCommand(cfg, feature, service, force) {
         if (!service && (scanOccupancy(cfg).get(slot) ?? []).length === 0) {
             removeLabel(cfg, slot);
             if (removed === 0)
-                log(t(`✓ 释放空槽预约 "${feature}"（槽 ${slot}）`, `✓ released empty slot reservation "${feature}" (slot ${slot})`));
+                log(`${c.green('✓')} ` + t(`释放空槽预约 "${feature}"（槽 ${slot}）`, `released empty slot reservation "${feature}" (slot ${slot})`));
         }
     });
 }

package/dist/engine.js

@@ -7,6 +7,7 @@ import { addWorktree } from './git.js';
 import { runShellLive, run, spliceArgv, isTTY } from './util/exec.js';
 import { warn, log } from './util/log.js';
 import { withProgress } from './util/progress.js';
+import { color as cc } from './util/color.js';
 import { startDetached, recordedFor, pidAlive, setPid, pidOnPort, readLogTail } from './proc.js';
 import { t } from './i18n.js';
 export function mergeEnvText(text, kv) {
@@ -78,11 +79,11 @@ export async function ensureStarted(ctx) {
     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})`));
+        log(cc.dim(t(`  • ${service} dev server 已在跑（pid ${rec.pid}，端口 ${port}）`, `  • ${service} dev server already running (pid ${rec.pid}, port ${port})`)));
         return;
     }
     if (await portInUse(port)) {
-        log(t(`  • 端口 ${port} 已在监听，视为 ${service} dev server 在跑，跳过启动`, `  • port ${port} already listening; treating ${service} dev server as up, skip`));
+        log(cc.dim(t(`  • 端口 ${port} 已在监听，视为 ${service} dev server 在跑，跳过启动`, `  • port ${port} already listening; treating ${service} dev server as up, skip`)));
         return;
     }
     const cmd = renderTemplate(sp.start, vars);
@@ -94,12 +95,12 @@ export async function ensureStarted(ctx) {
         const real = pidOnPort(port);
         if (real && real > 0)
             setPid(ws, dir, real);
-        log(t(`  ▸ 已后台启动 ${service} dev server（pid ${real || r.pid}，端口 ${port}）  日志: ${r.log}`, `  ▸ started ${service} dev server in background (pid ${real || r.pid}, port ${port})  log: ${r.log}`));
+        log(cc.green('  ▸') + t(` 已后台启动 ${service} dev server（pid ${real || r.pid}，端口 ${port}）  `, ` started ${service} dev server in background (pid ${real || r.pid}, port ${port})  `) + cc.dim(t(`日志: ${r.log}`, `log: ${r.log}`)));
     }
     else {
         // 超时不等于失败：dev server 可能仍在启动/重启。给中性提示 + 日志末尾，让用户稍后 ls 复查或排查。
         const tail = readLogTail(r.log);
-        warn(t(`  • ${service} dev server 已在后台启动，但 25s 内端口 ${port} 还没就绪——可能仍在启动/重启。\n     稍后用 \`worktree-bay ls\` 看是否 ▸run；若起不来，多半是 start 命令不对或端口被占退避（vite 建议加 --strictPort）。\n     命令: ${cmd}    日志: ${r.log}\n     ${tail ? '日志末尾:\n' + tail : ''}`, `  • ${service} dev server launched, but port ${port} isn't ready within 25s — it may still be starting/restarting.\n     Check \`worktree-bay ls\` shortly for ▸run; if it never comes up, the start command is likely wrong or it fell back to another port (add --strictPort for vite).\n     command: ${cmd}    log: ${r.log}\n     ${tail ? 'log tail:\n' + tail : ''}`));
+        warn(cc.yellow(t(`  • ${service} dev server 已在后台启动，但 25s 内端口 ${port} 还没就绪——可能仍在启动/重启。\n     稍后用 \`worktree-bay ls\` 看是否 ▸run；若起不来，多半是 start 命令不对或端口被占退避（vite 建议加 --strictPort）。\n     命令: ${cmd}    日志: ${r.log}`, `  • ${service} dev server launched, but port ${port} isn't ready within 25s — it may still be starting/restarting.\n     Check \`worktree-bay ls\` shortly for ▸run; if it never comes up, the start command is likely wrong or it fell back to another port (add --strictPort for vite).\n     command: ${cmd}    log: ${r.log}`)) + (tail ? '\n' + cc.dim(tail) : ''));
     }
 }
 // 轮询直到约定端口被监听（true），或超时（false）

package/dist/util/color.js

@@ -0,0 +1,13 @@
+// 轻量 ANSI 着色：仅在 TTY 且未设 NO_COLOR 时上色，否则原样返回（管道/CI/重定向不带控制符）。
+const enabled = (!!process.stdout.isTTY || !!process.stderr.isTTY) && !process.env.NO_COLOR && process.env.TERM !== 'dumb';
+const paint = (code) => (s) => (enabled ? `\x1b[${code}m${s}\x1b[0m` : s);
+export const color = {
+    enabled,
+    green: paint('32'),
+    red: paint('31'),
+    yellow: paint('33'),
+    cyan: paint('36'),
+    blue: paint('34'),
+    dim: paint('2'),
+    bold: paint('1'),
+};

package/dist/util/exec.js

@@ -1,5 +1,6 @@
 import { spawnSync, spawn } from 'node:child_process';
 import { t } from '../i18n.js';
+import { color as c } 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) {
@@ -25,9 +26,9 @@ export function runShellLive(line, opts, label) {
         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 head = `  ${c.cyan(SPIN[fi++ % SPIN.length])} ${label} ${c.dim(secs + 's')} `;
+            const room = Math.max(0, (process.stderr.columns || 80) - (`  x ${label} ${secs}s `).length - 1);
+            process.stderr.write('\r\x1b[2K' + head + c.dim(last.slice(0, room)));
         };
         const timer = setInterval(render, 120);
         const onData = (d) => {
@@ -45,9 +46,9 @@ export function runShellLive(line, opts, label) {
             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`));
+                process.stderr.write(`  ${c.green('✓')} ${label}${c.dim(`（${secs}s）`)}\n`);
             else
-                process.stderr.write(t(`  ✗ ${label} 失败（退出码 ${code}，${secs}s）↓\n`, `  ✗ ${label} failed (exit ${code}, ${secs}s) ↓\n`) + buf.join(''));
+                process.stderr.write(c.red(t(`  ✗ ${label} 失败（退出码 ${code}，${secs}s）↓`, `  ✗ ${label} failed (exit ${code}, ${secs}s) ↓`)) + '\n' + buf.join(''));
             resolve({ code: code ?? 1 });
         });
     });

package/dist/util/log.js

@@ -1,3 +1,4 @@
+import { color as c } from './color.js';
 export const log = (...a) => console.log(...a);
 export const warn = (...a) => console.warn(...a);
-export const die = (m) => { console.error('worktree-bay: ' + m); process.exit(1); };
+export const die = (m) => { console.error(c.red('worktree-bay:') + ' ' + m); process.exit(1); };

package/dist/util/progress.js

@@ -1,4 +1,5 @@
 import { log } from './log.js';
+import { color as c } from './color.js';
 const FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
 // 给长耗时异步步骤一个「在干活」的反馈：TTY 下转圈 + 秒数（写 stderr，用 \r 原地刷新），
 // 非 TTY（管道 / CI / MCP）下退化为「开始…」「✓ 完成（Ns）」两行，避免刷屏。
@@ -8,11 +9,11 @@ export async function withProgress(label, fn) {
     if (!process.stderr.isTTY) {
         log(`  → ${label} …`);
         const r = await fn();
-        log(`  ✓ ${label}（${secs()}s）`);
+        log(`  ${c.green('✓')} ${label}${c.dim(`（${secs()}s）`)}`);
         return r;
     }
     let i = 0;
-    const timer = setInterval(() => { process.stderr.write(`\r  ${FRAMES[i++ % FRAMES.length]} ${label} ${secs()}s `); }, 120);
+    const timer = setInterval(() => { process.stderr.write(`\r  ${c.cyan(FRAMES[i++ % FRAMES.length])} ${label} ${c.dim(secs() + 's')} `); }, 120);
     if (typeof timer.unref === 'function')
         timer.unref();
     try {
@@ -20,6 +21,6 @@ export async function withProgress(label, fn) {
     }
     finally {
         clearInterval(timer);
-        process.stderr.write(`\r  ✓ ${label}（${secs()}s）          \n`);
+        process.stderr.write(`\r  ${c.green('✓')} ${label}${c.dim(`（${secs()}s）`)}          \n`);
     }
 }

package/package.json

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