@maxiaochao/pi-toolkit 0.13.14 → 0.13.15

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2026-10-27 - v0.13.15
+
+- worktree v0.4.2: support removing multiple worktrees in order
+- Allow bundled pi-worktree to remove multiple worktrees in one command.
+
 ## 2026-10-26 - v0.13.14
 
 - herdr-subagents v0.7.6: Esc in a child waits abortGraceSeconds (default 30) for a correction before publishing child_aborted

package/README.md

@@ -108,4 +108,4 @@ The read-only check verifies remote tag commits, waits for the matching `publish
 
 ## Safety and evidence boundaries
 
-Cache Export reports provider/Pi usage, not measured server cache state. Main requests and auxiliary calls are separate; missing reasoning or retention remains unknown. Relative paths use the session cwd. Herdr children get at most one missing-report reminder and report unconfirmed outcomes explicitly. Codex Edit preflights path hierarchy conflicts and preserves executable bits on moves. Account-pool transient refresh errors never justify rotation, and delivered output forbids replay. Worktree reuse always returns the worktree root. Browser profile reset requires Chrome to be stopped.
+Cache Export reports provider/Pi usage, not measured server cache state. Main requests and auxiliary calls are separate; missing reasoning or retention remains unknown. Relative paths use the session cwd. Herdr children get at most one missing-report reminder and report unconfirmed outcomes explicitly. Codex Edit preflights path hierarchy conflicts and preserves executable bits on moves. Account-pool transient refresh errors never justify rotation, and delivered output forbids replay. Worktree reuse always returns the worktree root; `pi-worktree remove` accepts multiple names. Browser profile reset requires Chrome to be stopped.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maxiaochao/pi-toolkit",
-  "version": "0.13.14",
+  "version": "0.13.15",
   "description": "Personal pi coding agent toolkit: background tasks, scheduler, /btw, /cache_export, apply_patch, browser automation, and bundled theme/skills.",
   "type": "module",
   "workspaces": [

package/packages/worktree/CHANGELOG.md

@@ -1,5 +1,10 @@
 # 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

package/packages/worktree/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,12 +65,14 @@ 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

package/packages/worktree/TESTING.md

@@ -19,6 +19,7 @@
 - 已删除的 CLI `start` 和 `prepare` 会显式失败。
 - `list` 标记主 checkout 和子 worktree。
 - `info` 报告 clean、branch、base 和 ahead。
+- `remove` 支持多个名称，逐个确认风险；拒绝时停止且保留后续 worktree。补全支持后续名称。
 - postinstall 把可执行 CLI 与 completion 复制到隔离 HOME，并保持执行权限。
 
 ## 最近验证结果

package/packages/worktree/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

package/packages/worktree/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/packages/worktree/package.json

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

package/packages/worktree/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

package/packages/worktree/tests/run-tests.sh

@@ -127,6 +127,49 @@ mkdir "$ROOT/symlink-repo" "$ROOT/outside-worktrees"
 )
 
 bash "$PACKAGE_DIR/bin/pi-worktree" --help | grep -q 'pi-worktree create'
+bash "$PACKAGE_DIR/bin/pi-worktree" remove feature attachable
+test ! -d .worktrees/feature && test ! -d .worktrees/attachable
+! git show-ref --verify --quiet refs/heads/feature
+! git show-ref --verify --quiet refs/heads/attachable
+
+bash "$PACKAGE_DIR/bin/pi-worktree" create --json batch-dirty >/dev/null
+bash "$PACKAGE_DIR/bin/pi-worktree" create --json batch-later >/dev/null
+echo dirty >> .worktrees/batch-dirty/tracked.txt
+if printf 'n\n' | bash "$PACKAGE_DIR/bin/pi-worktree" rm batch-dirty batch-later; then
+  echo "remove ignored a declined confirmation" >&2
+  exit 1
+fi
+test -d .worktrees/batch-dirty && test -d .worktrees/batch-later
+printf 'y\n' | bash "$PACKAGE_DIR/bin/pi-worktree" -r batch-dirty batch-later
+test ! -d .worktrees/batch-dirty && test ! -d .worktrees/batch-later
+
+bash "$PACKAGE_DIR/bin/pi-worktree" create --json batch-first >/dev/null
+bash "$PACKAGE_DIR/bin/pi-worktree" create --json batch-last >/dev/null
+if bash "$PACKAGE_DIR/bin/pi-worktree" --remove batch-first missing-name batch-last; then
+  echo "remove ignored a missing worktree" >&2
+  exit 1
+fi
+test ! -d .worktrees/batch-first && test -d .worktrees/batch-last
+bash "$PACKAGE_DIR/bin/pi-worktree" create --json batch-unmerged >/dev/null
+git -C .worktrees/batch-unmerged commit --allow-empty -qm unmerged
+if printf 'n\n' | bash "$PACKAGE_DIR/bin/pi-worktree" remove batch-unmerged batch-last; then
+  echo "remove ignored an unmerged branch confirmation" >&2
+  exit 1
+fi
+test -d .worktrees/batch-unmerged && test -d .worktrees/batch-last
+printf 'y\n' | bash "$PACKAGE_DIR/bin/pi-worktree" remove batch-unmerged batch-last
+! git show-ref --verify --quiet refs/heads/batch-unmerged
+test ! -d .worktrees/batch-last
+
+if bash "$PACKAGE_DIR/bin/pi-worktree" remove >/dev/null 2>&1; then
+  echo "remove accepted no names" >&2
+  exit 1
+fi
+source "$PACKAGE_DIR/bin/pi-worktree-completion.bash"
+COMP_WORDS=(pi-worktree remove prepared f)
+COMP_CWORD=3
+_pi_worktree
+[[ " ${COMPREPLY[*]} " == *" from-subdir "* ]]
 if bash "$PACKAGE_DIR/bin/pi-worktree" prepare feature >/dev/null 2>&1; then
   echo "removed prepare command is still accepted" >&2
   exit 1