@henryqw/pi-herdr-done 2.0.0 → 2.0.2

package/README.md

@@ -1,6 +1,6 @@
 # `@henryqw/pi-herdr-done`
 
-Finish a Herdr-managed linked worktree task by removing its checkout, closing its tabs, and updating the parent. One command performs cleanup and refuses unsafe removal unless you explicitly force it.
+Finish a Herdr-managed linked-worktree task by removing its checkout, closing its workspace tabs, and fast-forwarding its primary checkout when possible. Normal removal refuses dirty worktrees and worktrees in use by another Herdr workspace; `--force` can delete uncommitted work and leave those tabs pointing at the removed checkout.
 
 ## Install
 
@@ -8,7 +8,7 @@ Finish a Herdr-managed linked worktree task by removing its checkout, closing it
 pi install npm:@henryqw/pi-herdr-done
 ```
 
-Requires the Herdr CLI and a Pi session running inside a Herdr-managed linked worktree.
+Requires the Herdr CLI and Pi running inside a Herdr-managed linked worktree.
 
 ## Works with
 
@@ -18,37 +18,23 @@ Requires the Herdr CLI and a Pi session running inside a Herdr-managed linked wo
 
 ## Use
 
-Commit or discard current changes, then run `/done` and confirm. The command waits for Pi to become idle before cleanup.
+Commit or discard changes, then run `/done` and confirm. It removes the checkout and closes every tab in the same Herdr workspace.
 
 | Surface | Type | Purpose |
 | --- | --- | --- |
-| `/done` | command | Remove the current worktree checkout, close its Herdr workspace's tabs, and fast-forward the parent workspace. |
-| `/done --force` | command | Same, even when the worktree is dirty or used by tabs in another workspace. |
+| `/done [--force]` | command | Remove the current worktree and close its Herdr workspace tabs; `--force` skips confirmation and permits forced removal without checking for tabs in other workspaces. |
 
 ## Flow
 
 ![Sequence of /done safety gates, cleanup order, and conditional parent update.](./docs/done-flow.svg)
 
-Both forms wait for Pi to become idle before cleanup. `/done` asks for confirmation. `/done --force` skips confirmation because the flag already states intent.
+Normal `/done` asks for confirmation before waiting for Pi to become idle; declining leaves the checkout untouched. `/done --force` skips confirmation. Both wait for Pi to become idle before cleanup.
 
-Normal removal runs:
-
-```bash
-git worktree remove .
-herdr tab close <other-tabs-in-$HERDR_WORKSPACE_ID>
-git -C <parent> pull --ff-only
-herdr tab close "$HERDR_TAB_ID"
-```
-
-- The parent pull runs only when this session ran in a linked worktree with a non-bare primary.
-- It fails safely when the parent has diverged.
-- Parent tabs do not block worktree removal or the parent pull.
-- Once removal succeeds, every tab in the current Herdr workspace closes, even when the parent pull fails.
-- Concurrent completions serialize on a lock around the parent checkout.
+Normal cleanup checks whether a tab in another Herdr workspace is using the checkout, removes it with `git worktree remove <checkout>`, closes every other tab in the current Herdr workspace, and runs `git pull --ff-only` from the primary checkout when this was a linked worktree and the primary is non-bare. It closes the current tab last. Tabs using the primary checkout do not block removal or the pull. Concurrent completions serialize on locks around the worktree and primary checkout.
 
 ## Limits and recovery
 
-- Tabs in the current Herdr workspace close automatically.
-- If a tab from another workspace still uses the current checkout, `/done` refuses and lists it by name. Use `/done --force` to remove the checkout regardless.
+- `/done` refuses to remove a dirty worktree. Commit or discard changes first. `/done --force` passes `--force` to Git and can irreversibly delete uncommitted work.
+- A tab in another Herdr workspace that uses this checkout blocks normal removal. `/done` lists the tab label, or its ID when no label is available. Close the tab and retry, or use `/done --force` only if you accept removing the checkout while that tab still refers to it. Tabs in other workspaces are not closed.
 - The command requires Pi inside Herdr with `HERDR_ENV=1`, `HERDR_WORKSPACE_ID`, and `HERDR_TAB_ID` set.
-- Dirty worktrees make `/done` fail. Commit or discard changes, or use `/done --force` to explicitly delete them.
+- The primary checkout update runs only after worktree removal. If `git pull --ff-only` fails, for example because the primary has diverged or has local changes, the worktree is already gone and the current tab still closes. Resolve the primary checkout issue, then retry with `git -C <primary-checkout> pull --ff-only`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-herdr-done",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "Close and remove the current Herdr worktree from Pi.",
   "keywords": [
     "pi-package",
@@ -25,7 +25,7 @@
     "pack:check": "npm pack --dry-run"
   },
   "peerDependencies": {
-    "@earendil-works/pi-coding-agent": "^0.86.0"
+    "@earendil-works/pi-coding-agent": ">=0.86.0 <0.88.0"
   },
   "dependencies": {
     "@henryqw/pi-herdr": "^0.4.1"
@@ -47,6 +47,6 @@
     ]
   },
   "devDependencies": {
-    "@earendil-works/pi-coding-agent": "0.86.0"
+    "@earendil-works/pi-coding-agent": "0.87.0"
   }
 }