worktree-bay 2.1.0 → 2.1.1

package/dist/cli.js

@@ -119,8 +119,13 @@ catch (e) {
 program.command('version').description('显示版本号').action(() => log(pkg.version));
 program.command('__complete', { hidden: true }).allowUnknownOption().action(() => {
     const words = process.argv.slice(process.argv.indexOf('--') + 1);
+    let cfg = null;
     try {
-        console.log(complete(loadConfig(process.cwd()), words).join('\n'));
+        cfg = loadConfig(process.cwd());
+    }
+    catch { /* 无配置：仍补全子命令，只是补不了 feature/service */ }
+    try {
+        console.log(complete(cfg, words).join('\n'));
     }
     catch { /* 静默 */ }
 });

package/dist/commands/completion.js

@@ -9,6 +9,8 @@ export function complete(cfg, words) {
     const prev = words.slice(1);
     if (prev.length === 0)
         return SUBCMDS;
+    if (!cfg)
+        return []; // 无配置（不在工作区内）：子命令已补全，feature/service 无从读取
     const sub = prev[0];
     const pos = prev.length;
     const featureSubs = ['up', 'add', 'rm', 'down', 'run', 'sh', 'path'];
@@ -24,8 +26,9 @@ export function completionScript(shell) {
     // 脚本只传"光标前已完成的词"，不含当前正在补的词，与 complete() 的模型一致
     if (shell === 'bash')
         return `_worktree_bay(){ COMPREPLY=( $(worktree-bay __complete -- "\${COMP_WORDS[@]:0:\$COMP_CWORD}") ); }\ncomplete -F _worktree_bay worktree-bay`;
+    // zsh 默认不对 $(...) 做单词分割，必须用 ${(f)...} 按行拆成多个候选，否则多行输出会变成单个候选
     if (shell === 'zsh')
-        return `#compdef worktree-bay\n_worktree_bay(){ compadd -- $(worktree-bay __complete -- "\${(@)words[1,CURRENT-1]}") }\ncompdef _worktree_bay worktree-bay`;
+        return `#compdef worktree-bay\n_worktree_bay(){ compadd -- \${(f)"$(worktree-bay __complete -- "\${(@)words[1,CURRENT-1]}")"} }\ncompdef _worktree_bay worktree-bay`;
     if (shell === 'fish')
         return `complete -c worktree-bay -f -a '(worktree-bay __complete -- (commandline -opc))'`;
     throw new Error('unsupported shell: ' + shell);

package/dist/git.js

@@ -1,11 +1,20 @@
 import { spawnSync } from 'node:child_process';
+import fs from 'node:fs';
 function git(repo, ...a) { return spawnSync('git', ['-C', repo, ...a], { encoding: 'utf8' }); }
 function ok(repo, ...a) { const r = git(repo, ...a); if (r.status !== 0)
     throw new Error(`git ${a.join(' ')}: ${r.stderr || r.stdout}`); return r.stdout; }
 export function addWorktree(repo, dir, branch, base) { ok(repo, 'worktree', 'add', '-b', branch, dir, base); }
-export function removeWorktree(repo, dir, force) { const a = ['worktree', 'remove', dir]; if (force)
-    a.push('--force'); const r = git(repo, ...a); if (r.status !== 0)
-    throw new Error('worktree remove: ' + (r.stderr || r.stdout)); git(repo, 'worktree', 'prune'); }
+export function removeWorktree(repo, dir, force) {
+    const a = ['worktree', 'remove', dir];
+    if (force)
+        a.push('--force');
+    git(repo, ...a); // 尽力移除；残留交给下面兜底（调用方已先过脏/未推保护，到这里删除是安全的）
+    // git worktree remove 不会删被忽略的文件（前端 node_modules 等）→ 目录残留报 "Directory not empty"；
+    // 它还可能先摘了登记再删目录失败，留下「git 不认但磁盘还在」的孤儿。统一兜底：物理删目录 + prune 同步元数据。
+    if (fs.existsSync(dir))
+        fs.rmSync(dir, { recursive: true, force: true });
+    git(repo, 'worktree', 'prune');
+}
 export function isDirty(dir) { return ok(dir, 'status', '--porcelain').trim().length > 0; }
 export function currentBranch(dir) { return ok(dir, 'rev-parse', '--abbrev-ref', 'HEAD').trim(); }
 export function mainBranch(repo) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "worktree-bay",
-  "version": "2.1.0",
+  "version": "2.1.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",
@@ -54,6 +54,6 @@
     "@types/node": "^22.0.0",
     "tsx": "^4.19.0",
     "typescript": "^5.6.0",
-    "vitest": "^2.1.0"
+    "vitest": "^4.1.0"
   }
 }