worktree-bay 4.0.3 → 4.0.4

package/dist/commands/lifecycle.js

@@ -8,17 +8,17 @@ import { color as c } from '../util/color.js';
 import { t } from '../i18n.js';
 // dev server + infra 生命周期：stop/start/restart 同时管 node（managed 进程）与 docker（stop 钩子 + setup 恢复），不动 worktree。
 // services 为空 = 整功能；否则只这些服务
+// 幂等：未占槽 / 指定服务当前未占用 → 返回空，交调用方按 no-op 处理（重复执行不报错）。
+// 仅对「未知服务名」（typo，根本不在 config）报错。
 function occupantsOf(cfg, feature, services = []) {
+    for (const s of services)
+        if (!cfg.services[s])
+            throw new Error(t(`未知服务「${s}」。运行 \`worktree-bay doctor\` 查看配置里有哪些服务。`, `unknown service "${s}". Run \`worktree-bay doctor\` to see configured services.`));
     const slot = slotOfFeature(cfg, feature);
     if (slot === undefined)
-        throw new Error(t(`功能「${feature}」未占槽。先 \`worktree-bay up ${feature} <服务...>\` 起它。`, `feature "${feature}" hasn't claimed a slot. Run \`worktree-bay up ${feature} <services...>\` first.`));
+        return [];
     const all = scanOccupancy(cfg).get(slot) ?? [];
-    if (!services.length)
-        return all;
-    for (const s of services)
-        if (!all.some((o) => o.service === s))
-            throw new Error(t(`服务「${s}」不在功能「${feature}」里。用 \`worktree-bay ls\` 看已起的服务。`, `service "${s}" is not in feature "${feature}". See \`worktree-bay ls\`.`));
-    return all.filter((o) => services.includes(o.service));
+    return services.length ? all.filter((o) => services.includes(o.service)) : all;
 }
 function ctxOf(cfg, o) {
     const base = { cfg, service: o.service, sp: cfg.services[o.service], slot: o.slot, slug: o.slug, dir: o.dir, repo: repoPath(cfg, o.service) };
@@ -37,7 +37,7 @@ export async function stopCommand(cfg, feature, services = []) {
             await stopRuntime(ctxOf(cfg, o));
         }
         if (!any)
-            log(t('没有可停止的运行体（相关服务未配置 start/stop）', 'nothing to stop (no start/stop configured for those services)'));
+            log(c.dim(t('没有可停止的运行体（功能未占槽，或相关服务未配置 start/stop）', 'nothing to stop (feature has no slot, or those services have no start/stop)')));
     });
 }
 export async function startCommand(cfg, feature, services = []) {
@@ -51,14 +51,16 @@ export async function startCommand(cfg, feature, services = []) {
             await ensureRuntime(ctxOf(cfg, o));
         }
         if (!any)
-            log(t('没有可启动的运行体（相关服务未配置 start/stop）', 'nothing to start (no start/stop configured for those services)'));
+            log(c.dim(t(`没有可启动的运行体（功能未占槽——先 \`worktree-bay up ${feature} <服务...>\`，或相关服务未配 start/stop）`, `nothing to start (feature has no slot — run \`worktree-bay up ${feature} <services...>\` first, or those services have no start/stop)`)));
     });
 }
 export async function restartCommand(cfg, feature, services = []) {
     await withLock(cfg.workspaceRoot, async () => {
+        let any = false;
         for (const o of occupantsOf(cfg, feature, services)) {
             if (!hasRuntime(cfg, o.service))
                 continue;
+            any = true;
             const ctx = ctxOf(cfg, o);
             log(c.bold(c.cyan(o.service)) + c.dim(t('  ·  重启…', '  ·  restarting…')));
             await stopRuntime(ctx);
@@ -69,5 +71,7 @@ export async function restartCommand(cfg, feature, services = []) {
             } // 等端口释放
             await ensureRuntime(ctx);
         }
+        if (!any)
+            log(c.dim(t('没有可重启的运行体（功能未占槽，或相关服务未配置 start/stop）', 'nothing to restart (feature has no slot, or those services have no start/stop)')));
     });
 }

package/dist/commands/rm.js

@@ -9,24 +9,32 @@ 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';
-// services 为空 = 整功能；否则只这些服务（顺带校验服务名确实在该功能里）
+// services 为空 = 整功能；否则只这些服务。幂等：未占槽 / 指定服务当前未占用 → 返回空（no-op），
+// 仅对「未知服务名」（typo，根本不在 config）报错。
 export function resolveRm(cfg, feature, services = []) {
+    for (const s of services)
+        if (!cfg.services[s])
+            throw new Error(t(`未知服务「${s}」。运行 \`worktree-bay doctor\` 查看配置里有哪些服务。`, `unknown service "${s}". Run \`worktree-bay doctor\` to see configured services.`));
     const slot = slotOfFeature(cfg, feature);
     if (slot === undefined)
-        throw new Error(t(`功能「${feature}」未占槽，无需拆除。用 \`worktree-bay ls\` 看在用的功能。`, `feature "${feature}" has no slot — nothing to tear down. See \`worktree-bay ls\`.`));
+        return [];
     const all = scanOccupancy(cfg).get(slot) ?? [];
-    if (!services.length)
-        return all;
-    for (const s of services)
-        if (!all.some((o) => o.service === s))
-            throw new Error(t(`服务「${s}」不在功能「${feature}」里。用 \`worktree-bay ls\` 看已起的服务。`, `service "${s}" is not in feature "${feature}". See \`worktree-bay ls\`.`));
-    return all.filter((o) => services.includes(o.service));
+    return services.length ? all.filter((o) => services.includes(o.service)) : all;
 }
 export async function rmCommand(cfg, feature, services, force) {
     await withLock(cfg.workspaceRoot, async () => {
+        const slot = slotOfFeature(cfg, feature);
+        if (slot === undefined) {
+            log(c.green('✓') + ' ' + t(`功能「${feature}」未占槽，无需拆除（已是目标状态）`, `feature "${feature}" has no slot — nothing to tear down (already in target state)`));
+            return;
+        }
         let removed = 0;
         const wholeFeature = services.length === 0;
         const occs = resolveRm(cfg, feature, services);
+        if (occs.length === 0) {
+            log(c.dim(t('指定服务当前未占用，无需拆除（已是目标状态）', 'those services aren\'t occupied — nothing to tear down (already in target state)')));
+            return;
+        }
         for (const o of occs) {
             const repo = repoPath(cfg, o.service);
             const branch = currentBranch(o.dir);
@@ -47,7 +55,6 @@ export async function rmCommand(cfg, feature, services, force) {
             await withProgress(t(`移除 ${o.service} 的 worktree`, `removing ${o.service} worktree`), () => removeWorktree(repo, o.dir, force));
             removed++;
         }
-        const slot = slotOfFeature(cfg, feature);
         if (wholeFeature && (scanOccupancy(cfg).get(slot) ?? []).length === 0) {
             removeLabel(cfg, slot);
             if (removed === 0)

package/package.json

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

package/skill.md

@@ -161,6 +161,7 @@ worktree-bay gc                        # 回收已合并的
 
 ## 工作原理要点
 
+- **全命令幂等**：`up / down / start / stop / restart` 重复执行都收敛到同一目标态、不报错——`up` 重入＝复用 worktree + 恢复运行体；`start`/`stop` 已在目标态则跳过/仍逐服务给状态；`down` 对未占槽或已拆的服务是友好 no-op。仅「未知服务名」（typo，不在 config）才报错。
 - **占用真相 = 文件系统**：扫各服务 `.worktrees/s<N>-*`；`.worktree-bay-slots.json` 只是「功能名→槽号」标签账本（预约）。
 - **dev server 托管**：`start` 进程后台 detach 启动、日志落 `.worktree-bay/logs/`、按端口追踪真实 pid；`ls` 行首 `●` 标在跑（绿）/未跑（灰）；`stop`/`down` 按端口可靠停。
 - **运行状态判断 = 端口**：`ls`/`start`/`stop` 判「在不在跑」全用 `pidOnPort`（netstat/lsof，与 ls 同源），不用 connect 探测（docker 发布端口两者会不一致）、也不只看 pid 账本（dir 形态会漂移、docker 无账本记录）。`start` 端口已在监听就跳过、不再误报「恢复」。