worktree-bay 2.3.9 → 2.4.0

package/dist/cli.js

@@ -7,6 +7,7 @@ import { lsCommand } from './commands/ls.js';
 import { addCommand, upCommand } from './commands/add.js';
 import { runCommand, shCommand, pathCommand } from './commands/passthrough.js';
 import { rmCommand } from './commands/rm.js';
+import { startCommand, stopCommand, restartCommand } from './commands/lifecycle.js';
 import { gcCommand } from './commands/gc.js';
 import { doctorCommand } from './commands/doctor.js';
 import { complete, completionCommand, installCompletion } from './commands/completion.js';
@@ -82,6 +83,27 @@ program.command('run <feature> <service> <name> [args...]').description(t('在
     .action((f, s, n, args) => sync((c) => runCommand(c, f, s, n, args ?? [])));
 program.command('sh <feature> <service>').description(t('进入服务运行体的 shell', 'open a shell inside the service runtime'))
     .action((f, s) => sync((c) => shCommand(c, f, s)));
+program.command('start <feature> [service]').description(t('启动该功能的 dev server（worktree 已在，只起 start 进程，不动 worktree）', 'start the feature\'s dev server(s) (worktree already exists; runs the start process only)'))
+    .action(async (f, s) => { try {
+    await startCommand(loadConfig(process.cwd()), f, s);
+}
+catch (e) {
+    die(e.message);
+} });
+program.command('stop <feature> [service]').description(t('停止该功能的 dev server（保留 worktree）', 'stop the feature\'s dev server(s) (keeps the worktree)'))
+    .action(async (f, s) => { try {
+    await stopCommand(loadConfig(process.cwd()), f, s);
+}
+catch (e) {
+    die(e.message);
+} });
+program.command('restart <feature> [service]').description(t('重启该功能的 dev server（停掉再起）', 'restart the feature\'s dev server(s) (stop then start)'))
+    .action(async (f, s) => { try {
+    await restartCommand(loadConfig(process.cwd()), f, s);
+}
+catch (e) {
+    die(e.message);
+} });
 program.command('down <feature>').description(t('拆除整个功能的所有服务 worktree（= rm <feature>）', 'tear down all of a feature\'s service worktrees (= rm <feature>)')).option('-f, --force', t('跳过脏/未推检查强制删除', 'skip dirty/unpushed checks and force-remove'))
     .action(async (f, o) => { try {
     await rmCommand(loadConfig(process.cwd()), f, undefined, !!o.force);

package/dist/commands/completion.js

@@ -4,7 +4,7 @@ import path from 'node:path';
 import { readLabels } from '../slots.js';
 import { log } from '../util/log.js';
 import { t } from '../i18n.js';
-const SUBCMDS = ['init', 'doctor', 'claim', 'up', 'add', 'ls', 'path', 'gc', 'down', 'rm', 'run', 'sh', 'completion', 'mcp', 'skill', 'version', 'help'];
+const SUBCMDS = ['init', 'doctor', 'claim', 'up', 'add', 'ls', 'path', 'gc', 'down', 'rm', 'run', 'sh', 'start', 'stop', 'restart', 'completion', 'mcp', 'skill', 'version', 'help'];
 // words = 命令名 + 光标前已输入完的词（不含当前正在补的词）
 export function complete(cfg, words) {
     const prev = words.slice(1);
@@ -14,10 +14,10 @@ export function complete(cfg, words) {
         return []; // 无配置（不在工作区内）：子命令已补全，feature/service 无从读取
     const sub = prev[0];
     const pos = prev.length;
-    const featureSubs = ['up', 'add', 'rm', 'down', 'run', 'sh', 'path'];
+    const featureSubs = ['up', 'add', 'rm', 'down', 'run', 'sh', 'path', 'start', 'stop', 'restart'];
     if (featureSubs.includes(sub) && pos === 1)
         return Object.values(readLabels(cfg));
-    if (['add', 'run', 'sh', 'path'].includes(sub) && pos === 2)
+    if (['add', 'run', 'sh', 'path', 'start', 'stop', 'restart'].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 命令名

package/dist/commands/lifecycle.js

@@ -0,0 +1,65 @@
+import { repoPath } from '../config.js';
+import { withLock } from '../lock.js';
+import { scanOccupancy, slotOfFeature } from '../slots.js';
+import { buildVars, ensureStarted } from '../engine.js';
+import { stopManaged } from '../proc.js';
+import { portInUse } from '../ports.js';
+import { log, warn } from '../util/log.js';
+import { color as c } from '../util/color.js';
+import { t } from '../i18n.js';
+// dev server 生命周期：start/stop/restart（只管 start 配置起的进程，不动 worktree）
+function occupantsOf(cfg, feature, service) {
+    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.`));
+    const all = scanOccupancy(cfg).get(slot) ?? [];
+    return service ? all.filter((o) => o.service === service) : all;
+}
+function ctxOf(cfg, o) {
+    const sp = cfg.services[o.service];
+    const base = { cfg, service: o.service, sp, slot: o.slot, slug: o.slug, dir: o.dir, repo: repoPath(cfg, o.service) };
+    return { ...base, vars: buildVars(cfg, base) };
+}
+export async function startCommand(cfg, feature, service) {
+    await withLock(cfg.workspaceRoot, async () => {
+        let any = false;
+        for (const o of occupantsOf(cfg, feature, service)) {
+            if (!cfg.services[o.service].start)
+                continue;
+            any = true;
+            log(c.bold(c.cyan(o.service)));
+            await ensureStarted(ctxOf(cfg, o));
+        }
+        if (!any)
+            warn(t('没有可启动的 dev server（相关服务未配置 start）', 'nothing to start (those services have no start configured)'));
+    });
+}
+export async function stopCommand(cfg, feature, service) {
+    await withLock(cfg.workspaceRoot, async () => {
+        let any = false;
+        for (const o of occupantsOf(cfg, feature, service)) {
+            const stopped = stopManaged(cfg.workspaceRoot, o.dir);
+            if (stopped) {
+                any = true;
+                log(`${c.green('✓')} ` + t(`已停止 ${o.service} dev server（pid ${stopped.pid}）`, `stopped ${o.service} dev server (pid ${stopped.pid})`));
+            }
+        }
+        if (!any)
+            log(t('没有在跑的 dev server', 'no running dev server'));
+    });
+}
+export async function restartCommand(cfg, feature, service) {
+    await withLock(cfg.workspaceRoot, async () => {
+        for (const o of occupantsOf(cfg, feature, service)) {
+            const sp = cfg.services[o.service];
+            if (!sp.start)
+                continue;
+            log(c.bold(c.cyan(o.service)) + c.dim(t('  ·  重启…', '  ·  restarting…')));
+            stopManaged(cfg.workspaceRoot, o.dir);
+            const port = Number(ctxOf(cfg, o).vars.port);
+            for (let i = 0; i < 40 && (await portInUse(port)); i++)
+                await new Promise((r) => setTimeout(r, 100)); // 等端口释放（最多 ~4s）
+            await ensureStarted(ctxOf(cfg, o));
+        }
+    });
+}

package/package.json

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

package/skill.md

@@ -35,6 +35,9 @@ worktree-bay completion install   # 一键装 shell 补全（可选）
 | `worktree-bay path <feature> <service>` | 打印某服务 worktree 的绝对路径（可 `cd $(worktree-bay path f api)`） |
 | `worktree-bay run <feature> <service> <name> [args...]` | 在某服务运行体里跑配置的 `run.<name>`（如 test），透传 args |
 | `worktree-bay sh <feature> <service>` | 进入某服务运行体的 shell |
+| `worktree-bay start <feature> [service]` | 启动该功能的 dev server（worktree 已在，只起 `start` 进程，不动 worktree） |
+| `worktree-bay stop <feature> [service]` | 停止该功能的 dev server（保留 worktree） |
+| `worktree-bay restart <feature> [service]` | 重启 dev server（停掉再起；改了配置/端口卡住时用） |
 | `worktree-bay down <feature> [-f]` | 拆除整个功能的所有服务 worktree（= `rm <feature>`） |
 | `worktree-bay rm <feature> [service] [-f]` | 拆除某服务或整槽。默认查脏/未推保护，`-f` 强删 |
 | `worktree-bay gc [--apply]` | 合并感知回收：默认 dry-run 只列建议，`--apply` 才删「已合并且干净」的 |