worktree-bay 0.1.1 → 1.0.1

package/dist/cli.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+import { readFileSync } from 'node:fs';
 import { Command } from 'commander';
 import { loadConfig } from './config.js';
 import { claimCommand } from './commands/claim.js';
@@ -9,42 +10,51 @@ import { rmCommand } from './commands/rm.js';
 import { gcCommand } from './commands/gc.js';
 import { complete, completionCommand } from './commands/completion.js';
 import { die } from './util/log.js';
+const pkg = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8'));
 const program = new Command();
-program.name('worktree-bay').description('worktree 槽位+端口编排器').version('0.1.0');
+program.name('worktree-bay').description('worktree 槽位+端口编排器').version(pkg.version);
 const sync = (fn) => { try {
     fn(loadConfig(process.cwd()));
 }
 catch (e) {
     die(e.message);
 } };
-program.command('claim <feature>').action(async (f) => { try {
+program.command('claim <feature>').description('为功能占一个槽位（端口块）')
+    .action(async (f) => { try {
     await claimCommand(loadConfig(process.cwd()), f);
 }
 catch (e) {
     die(e.message);
 } });
-program.command('ls').action(() => sync(lsCommand));
-program.command('add <feature> <service> <branch> [base]').action(async (f, s, b, base) => { try {
+program.command('ls').description('列出所有槽位与占用状态')
+    .action(() => sync(lsCommand));
+program.command('add <feature> <service> <branch> [base]').description('在某服务为功能开 worktree 并挂入其槽位')
+    .action(async (f, s, b, base) => { try {
     await addCommand(loadConfig(process.cwd()), f, s, b, base);
 }
 catch (e) {
     die(e.message);
 } });
-program.command('run <feature> <service> <name> [args...]').action((f, s, n, args) => sync((c) => runCommand(c, f, s, n, args ?? [])));
-program.command('sh <feature> <service>').action((f, s) => sync((c) => shCommand(c, f, s)));
-program.command('rm <feature> [service]').option('-f, --force').action(async (f, s, o) => { try {
+program.command('run <feature> <service> <name> [args...]').description('在服务运行体里跑 run.<name> 命令（透传 args）')
+    .action((f, s, n, args) => sync((c) => runCommand(c, f, s, n, args ?? [])));
+program.command('sh <feature> <service>').description('进入服务运行体的 shell')
+    .action((f, s) => sync((c) => shCommand(c, f, s)));
+program.command('rm <feature> [service]').description('拆除某服务或整槽的 worktree（默认查脏/未推保护）').option('-f, --force', '跳过脏/未推检查强制删除')
+    .action(async (f, s, o) => { try {
     await rmCommand(loadConfig(process.cwd()), f, s, !!o.force);
 }
 catch (e) {
     die(e.message);
 } });
-program.command('gc').option('--apply').action(async (o) => { try {
+program.command('gc').description('合并感知回收（默认 dry-run）').option('--apply', '实际执行回收')
+    .action(async (o) => { try {
     await gcCommand(loadConfig(process.cwd()), !!o.apply);
 }
 catch (e) {
     die(e.message);
 } });
-program.command('completion <shell>').action((sh) => { try {
+program.command('completion <shell>').description('打印 shell 补全脚本（bash|zsh|fish）')
+    .action((sh) => { try {
     completionCommand(sh);
 }
 catch (e) {

package/dist/commands/add.js

@@ -4,6 +4,7 @@ import { withLock } from '../lock.js';
 import { claim } from '../slots.js';
 import { slugify, worktreeDirName } from '../naming.js';
 import { buildVars, bringUp } from '../engine.js';
+import { mainBranch } from '../git.js';
 import { log } from '../util/log.js';
 export function resolveAdd(cfg, feature, service, branch) {
     if (!cfg.services[service])
@@ -18,7 +19,7 @@ export async function addCommand(cfg, feature, service, branch, base) {
         const sp = cfg.services[service];
         const ctxBase = { cfg, service, sp, slot: p.slot, slug: p.slug, dir: p.dir, repo: p.repo };
         const ctx = { ...ctxBase, vars: buildVars(cfg, ctxBase) };
-        await bringUp(ctx, base ?? 'origin/HEAD', branch);
+        await bringUp(ctx, base ?? `origin/${mainBranch(p.repo)}`, branch);
         log(`✓ ${service} 挂入 "${feature}"（槽 ${p.slot}，端口 ${ctx.vars.port}）`);
     });
 }

package/dist/commands/ls.js

@@ -9,7 +9,7 @@ export function renderSlots(cfg) {
     for (const n of [...slots].sort((a, b) => a - b)) {
         const base = blockBase(cfg.portBase, cfg.slotSpan, n);
         const svc = (occ.get(n) ?? []).map((o) => `${o.service}@${base + cfg.services[o.service].offset}`);
-        lines.push(`slot ${n}  ${labels[String(n)] ?? '(unnamed)'}  api=${base + 1}  [${svc.join(', ') || 'no worktree'}]`);
+        lines.push(`slot ${n}  ${labels[String(n)] ?? '(unnamed)'}  block=${base}  [${svc.join(', ') || 'no worktree'}]`);
     }
     return lines.join('\n') || '(no slots in use)';
 }

package/dist/commands/rm.js

@@ -14,6 +14,7 @@ export function resolveRm(cfg, feature, service) {
 }
 export async function rmCommand(cfg, feature, service, force) {
     await withLock(cfg.workspaceRoot, async () => {
+        let removed = 0;
         for (const o of resolveRm(cfg, feature, service)) {
             const repo = repoPath(cfg, o.service);
             const branch = currentBranch(o.dir);
@@ -28,9 +29,13 @@ export async function rmCommand(cfg, feature, service, force) {
             }
             removeWorktree(repo, o.dir, force);
             log(`✓ 移除 ${o.service}`);
+            removed++;
         }
         const slot = slotOfFeature(cfg, feature);
-        if (!service && (scanOccupancy(cfg).get(slot) ?? []).length === 0)
+        if (!service && (scanOccupancy(cfg).get(slot) ?? []).length === 0) {
             removeLabel(cfg, slot);
+            if (removed === 0)
+                log(`✓ 释放空槽预约 "${feature}"（槽 ${slot}）`);
+        }
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "worktree-bay",
-  "version": "0.1.1",
+  "version": "1.0.1",
   "description": "Config-driven git worktree slot + port orchestrator for parallel multi-service development",
   "keywords": [
     "git",