@maxiaochao/pi-worktree 0.4.0 → 0.4.2

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 2026-10-27 - v0.4.2
+
+- support removing multiple worktrees in order
+- Allow removing multiple worktrees in order, retaining individual safety confirmations and stopping on failure.
+
+## 2026-10-23 - v0.4.1
+
+- return the worktree root from already-active nested directories
+- Return Git's canonical worktree root for already-active create calls made from a nested directory; preserve the dirty flag.
+
 ## 2026-10-12 - v0.4.0
 
 - Replace CLI start and prepare with the create-only command

package/README.md

@@ -17,7 +17,7 @@ pi-worktree create feature
 pi-worktree create --base main --json feature
 pi-worktree info feature
 pi-worktree out
-pi-worktree remove feature
+pi-worktree remove feature another-feature
 ```
 
 `create` 从当前分支（或显式 `--base`）创建或复用 `.worktrees/feature` 并记录 base，不启动 Pi。`--json` 提供相同操作的机器可读结果。
@@ -65,10 +65,16 @@ pi-worktree create [--base <ref>] [--json] <name>
 pi-worktree list
 pi-worktree info <name>
 pi-worktree out
-pi-worktree remove <name>
+pi-worktree remove <name> [<name> ...]
 pi-worktree prune
 ```
 
 `create` 是幂等接口；`create --json` 供 Extension 和其他宿主使用，返回 `created`、`attached`、`reused` 或 `already-active`，以及绝对路径、分支和 dirty 状态。已有 worktree 会复用；已存在但未挂载的同名分支会挂载；stale 注册、非法名称和路径冲突会显式失败。
 
+`remove` 按顺序删除指定 worktree；每个脏 worktree 或未合并分支仍需单独确认。遇到错误或拒绝确认时停止，已经删除的 worktree 不会恢复。
+
 Agent 用法见 `skills/pi-worktree/SKILL.md`。测试流程、夹具和结果见 [TESTING.md](TESTING.md)。
+
+## Already-active paths
+
+`pi-worktree create --json <current-worktree-name>` returns the canonical Git worktree root, even when called from a nested directory. The `already-active` status and whole-worktree `dirty` flag remain unchanged. The extension uses the same CLI result.

package/TESTING.md

@@ -19,8 +19,13 @@
 - 已删除的 CLI `start` 和 `prepare` 会显式失败。
 - `list` 标记主 checkout 和子 worktree。
 - `info` 报告 clean、branch、base 和 ahead。
+- `remove` 支持多个名称，逐个确认风险；拒绝时停止且保留后续 worktree。补全支持后续名称。
 - postinstall 把可执行 CLI 与 completion 复制到隔离 HOME，并保持执行权限。
 
 ## 最近验证结果
 
 验收要求全部 Node/shell 断言通过，Extension 能被 Pi 单独加载，且 `npm pack --dry-run` 包含 `bin/`、`extensions/`、`skills/` 和 `scripts/install.mjs`。
+
+## Review regressions
+
+The CLI integration suite also calls `create --json` from a nested linked-worktree directory. It asserts `already-active`, the canonical worktree root, and the whole-worktree dirty flag. Load the extension with `pi -ne -ns --no-session -e ./packages/worktree/extensions/worktree.ts`; this package has no `load-test` npm script.

package/bin/pi-worktree

@@ -6,7 +6,7 @@
 #   pi-worktree -l | --list                # list worktrees (main checkout marked "main checkout")
 #   pi-worktree -i <name>                  # show base commit, ahead/behind, unique commits
 #   pi-worktree -o | --out                 # cd back to the main checkout
-#   pi-worktree -r <name>                  # remove worktree <name> (must be clean & merged)
+#   pi-worktree -r <name> [<name> ...]     # remove worktrees (confirms dirty or unmerged)
 #   pi-worktree -p | --prune               # drop stale worktree registrations
 set -euo pipefail
 
@@ -150,7 +150,14 @@ cmd_info() {
 
 cmd_remove() {
   require_repo
-  [[ $# -eq 1 ]] || die "usage: pi-worktree -r <name>"
+  [[ $# -ge 1 ]] || die "usage: pi-worktree -r <name> [<name> ...]"
+  local name
+  for name in "$@"; do
+    remove_one "$name"
+  done
+}
+
+remove_one() {
   local dir; dir="$(wt_dir "$1")"
   local branch registered rm_anyway=0 force=0
   if [[ ! -d "$dir" ]]; then
@@ -246,7 +253,7 @@ create_wt() {
     [[ "$current_branch" == "$name" ]] \
       || die "already inside linked worktree '$current_branch'; return to the main checkout first"
     CREATE_STATUS="already-active"
-    CREATE_DIR=$(pwd -P)
+    CREATE_DIR=$(cd "$(git rev-parse --show-toplevel)" && pwd -P)
     CREATE_BRANCH="$current_branch"
     CREATE_DIRTY=false
     if [[ -n "$(git status --porcelain)" ]]; then CREATE_DIRTY=true; fi

package/bin/pi-worktree-completion.bash

@@ -23,9 +23,11 @@ _pi_worktree() {
   fi
 
   case "$first" in
-    -i|--info|info|-r|--remove|remove|rm|create)
-      # only the second word of info/remove completes worktree names;
-      # later words offer nothing (info/remove take no further args)
+    -r|--remove|remove|rm)
+      COMPREPLY=($(compgen -W "$wts" -- "$cur"))
+      ;;
+    -i|--info|info|create)
+      # info and create accept one name
       if (( COMP_CWORD == 2 )); then
         COMPREPLY=($(compgen -W "$wts" -- "$cur"))
       else

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maxiaochao/pi-worktree",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Git worktree CLI, Pi extension, and skill for isolated coding tasks.",
   "type": "module",
   "keywords": [

package/skills/pi-worktree/SKILL.md

@@ -19,7 +19,7 @@ Installed by the package postinstall hook to `~/.local/bin/pi-worktree`, with ba
 | `pi-worktree list` | All worktrees; the main checkout is marked `(main checkout)`, stale registrations are flagged. |
 | `pi-worktree info <name>` | Clean/dirty status, branch and HEAD, base commit, ahead/behind `main`, unique commits. |
 | `pi-worktree out` | Open a shell in the main checkout (for merging). |
-| `pi-worktree remove <name>` | Remove the worktree and its branch; asks before discarding dirty files or unmerged commits. |
+| `pi-worktree remove <name> [<name> ...]` | Remove worktrees and branches in order; asks before discarding dirty files or unmerged commits. Stops on failure without undoing earlier removals. |
 | `pi-worktree prune` | Drop registrations whose directory was deleted by hand. |
 
 ## Isolating a task