@maxiaochao/pi-toolkit 0.4.0 → 0.5.1

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 2026-09-11 - v0.5.1
+
+- fix pi-worktree: remove now cleans up the branch automatically — merged branches are deleted without prompting, unmerged ones confirm once (one prompt covers both worktree removal and branch deletion), so recreating the same name no longer silently reuses a stale branch
+
+## 2026-09-11 - v0.5.0
+
+- fix pi-worktree: new worktrees now branch from the current branch instead of a stale origin/main (worktree content no longer misses current work); add start --base <ref> to branch from an explicit ref
+
 ## 2026-09-11 - v0.4.0
 
 - bundle the chrome-cdp skill for attaching to a live Chrome with remote debugging (derived from pasky/chrome-cdp-skill, MIT); pi-worktree: add explicit start subcommand and skip dirty-workspace prompt when reusing an existing worktree

package/README.md

@@ -57,7 +57,7 @@ pi-worktree remove feat-ui # remove the worktree (refuses unmerged branches)
 pi-worktree prune          # drop stale registrations for manually deleted dirs
 ```
 
-Typical loop: `pi-worktree start <name>` to start (Tab completes existing worktree names), commit inside Pi, `pi-worktree out` + `git merge <name>` to land the work, `pi-worktree remove <name>` to clean up. New branches are created from `origin/main` (falling back to `main`, then `HEAD`), and the base commit is recorded in `branch.<name>.base` config so `info` can always tell you where the branch came from. Bash completion covers subcommands and existing worktree names (`pi-worktree feat<Tab>`).
+Typical loop: `pi-worktree start <name>` to start (Tab completes existing worktree names), commit inside Pi, `pi-worktree out` + `git merge <name>` to land the work, `pi-worktree remove <name>` to clean up. New branches are created from the branch you're currently on (or `HEAD` when detached), and the base commit is recorded in `branch.<name>.base` config so `info` can always tell you where the branch came from. Bash completion covers subcommands and existing worktree names (`pi-worktree feat<Tab>`).
 
 The bundled `web-browser` skill provides reusable scripts for starting Chrome/Chromium with remote debugging, navigating tabs, evaluating JavaScript, emulating devices, taking screenshots, dismissing cookie dialogs, and inspecting browser logs. It auto-detects common Chrome/Chromium installations on macOS and Linux, including Windows Chrome when Pi runs under WSL; set `BROWSER_BIN` when the binary is elsewhere.
 

package/bin/pi-worktree

@@ -3,6 +3,7 @@
 #
 # Usage:
 #   pi-worktree start <name> [pi args...]  # enter worktree <name> and start pi
+#   pi-worktree start --base <ref> <name> [pi args...]  # branch from <ref> instead of current branch
 #   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
@@ -39,17 +40,28 @@ in_linked_worktree() {
 
 wt_dir() { echo ".worktrees/$1"; }
 
-# Best available base ref: origin/main > main > HEAD
+# Best available base ref: current branch > HEAD (worktrees should branch
+# from where you actually are; a stale origin/main must not win)
 pick_base() {
-  if git show-ref --verify --quiet refs/remotes/origin/main; then
-    echo origin/main
-  elif git show-ref --verify --quiet refs/heads/main; then
-    echo main
+  local cur; cur=$(git branch --show-current 2>/dev/null || true)
+  if [[ -n "$cur" ]]; then
+    echo "$cur"
   else
     echo HEAD
   fi
 }
 
+# Resolve base ref for a new worktree: explicit --base wins, else current branch.
+resolve_base() {
+  if [[ -n "${BASE_OVERRIDE:-}" ]]; then
+    git rev-parse --verify --quiet "${BASE_OVERRIDE}^{commit}" >/dev/null \
+      || die "base ref not found: $BASE_OVERRIDE"
+    echo "$BASE_OVERRIDE"
+  else
+    pick_base
+  fi
+}
+
 ensure_gitignore() {
   if ! git check-ignore -q .worktrees 2>/dev/null; then
     printf '.worktrees/\n' >> .gitignore
@@ -132,12 +144,31 @@ cmd_remove() {
   [[ -d "$dir" ]] || die "worktree not found: $dir"
   # refuse to remove if the branch is not merged into main
   local branch; branch=$(git -C "$dir" branch --show-current)
+  local rm_anyway=0
   if [[ -n "$branch" ]] && ! git merge-base --is-ancestor "$branch" main 2>/dev/null; then
     warn "branch '$branch' does not appear merged into 'main' (or no main branch exists)."
     read -rp "Remove anyway? [y/N] " ans
     [[ "$ans" =~ ^[Yy]$ ]] || die "aborted"
+    rm_anyway=1
   fi
   git worktree remove "$dir" && ok "removed: $dir"
+  # The branch survives `git worktree remove`; recreating the same name would
+  # silently reuse this stale branch. Delete merged branches automatically.
+  if [[ -n "$branch" ]] && git show-ref --verify --quiet "refs/heads/$branch"; then
+    if git branch -d "$branch" 2>/dev/null; then
+      ok "deleted merged branch: $branch"
+    elif [[ "$rm_anyway" == 1 ]]; then
+      git branch -D "$branch" && ok "deleted unmerged branch: $branch (confirmed above)"
+    else
+      warn "branch '$branch' has unmerged commits."
+      read -rp "Delete anyway? [y/N] " ans
+      if [[ "$ans" =~ ^[Yy]$ ]]; then
+        git branch -D "$branch" && ok "deleted branch: $branch"
+      else
+        warn "branch '$branch' kept; 'pi-worktree start $branch' will reuse it as-is"
+      fi
+    fi
+  fi
 }
 
 cd_wt() {
@@ -177,7 +208,7 @@ cd_wt() {
       [[ -n "$mb" ]] && git config "branch.$name.base" "$(git rev-parse --short "$mb")" \
         && git config "branch.$name.baseRef" main
     else
-      local base; base=$(pick_base)
+      local base; base=$(resolve_base)
       git worktree add "$dir" -b "$name" "$base"
       git config "branch.$name.base" "$(git rev-parse --short "$base")"
       git config "branch.$name.baseRef" "$base"
@@ -197,6 +228,11 @@ case "${1:-}" in
   -p|--prune|prune) shift; subcmd_prune ;;
   -h|--help|help) sed -n '2,10p' "$0" | sed 's/^# \{0,1\}//' ;;
   start) shift
+    BASE_OVERRIDE=""
+    if [[ "${1:-}" == "--base" ]]; then
+      shift; [[ $# -ge 2 ]] || die "usage: pi-worktree start --base <ref> <name> [pi args...]"
+      BASE_OVERRIDE="$1"; shift
+    fi
     [[ $# -ge 1 ]] || die "usage: pi-worktree start <name> [pi args...]"
     name="$1"; shift; cd_wt "$name" "$@" ;;
   "")  die "usage: pi-worktree start <name> [pi args...]  (or list / info / out / remove / prune)" ;;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maxiaochao/pi-toolkit",
-  "version": "0.4.0",
+  "version": "0.5.1",
   "description": "Personal pi coding agent toolkit: /todos, /btw, /cache_export extensions, browser automation, and bundled theme/skills.",
   "type": "module",
   "keywords": [