@henryqw/pi-herdr-done 0.3.0 → 0.4.0

package/README.md

@@ -13,7 +13,7 @@ pi install npm:@henryqw/pi-herdr-done
 | Surface | Type | Purpose |
 | --- | --- | --- |
 | `/done` | command | Remove the current worktree checkout, fast-forward the parent workspace, and close only this session's tab. |
-| `/done --force` | command | Same, even when the worktree is dirty. |
+| `/done --force` | command | Same, even when the worktree is dirty or used by other Herdr tabs. |
 
 Both forms wait for Pi to become idle. `/done` asks for confirmation first; `/done --force` skips it because the flag already states intent. Normal removal runs:
 
@@ -25,7 +25,7 @@ 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 is skipped when the parent has diverged (`--ff-only` fails safely) or when another Herdr tab is working in the parent. Concurrent completions serialize on a lock around the parent checkout.
 
-Only the current session's tab closes, so sibling tabs in the same workspace survive. Command requires Pi running inside Herdr with `HERDR_ENV=1` and `HERDR_TAB_ID` set.
+Only the current session's tab closes, so sibling tabs in the same workspace survive. When another Herdr tab still uses the checkout or its parent, `/done` refuses and lists the blocking tabs by name; use `/done --force` to remove the checkout regardless of other tabs. Command requires Pi running inside Herdr with `HERDR_ENV=1` and `HERDR_TAB_ID` set.
 
 Dirty worktrees make `/done` fail. Commit or discard changes, or use `/done --force` to explicitly delete them.
 

package/extensions/done.ts

@@ -6,6 +6,7 @@ import { lock } from "proper-lockfile";
 type ExecResult = { stdout: string; stderr: string; code: number; killed?: boolean };
 
 type SnapshotPane = { tab_id?: unknown; cwd?: unknown };
+type TabEntry = { tab_id?: unknown; label?: unknown };
 
 export default function herdrDoneExtension(pi: ExtensionAPI): void {
 	const herdr = createHerdrClient<{ cwd: string }>((command, args, options) =>
@@ -48,19 +49,30 @@ export default function herdrDoneExtension(pi: ExtensionAPI): void {
 
 			const release = await lock(checkout);
 			try {
-				const snapshot = await herdr.json(["api", "snapshot"], { cwd: ctx.cwd });
-				const panes = (snapshot.result as { snapshot?: { panes?: SnapshotPane[] } } | undefined)?.snapshot?.panes;
-				if (!Array.isArray(panes)) throw new Error("herdr api snapshot returned no panes.");
-				const guarded = mainCheckout === checkout ? [checkout] : [checkout, mainCheckout];
-				const isGuarded = (cwd: string) =>
-					guarded.some((root) => cwd === root || cwd.startsWith(`${root}/`));
-				const dependents = [...new Set(panes
-					.filter((pane): pane is SnapshotPane & { tab_id: string; cwd: string } =>
-						typeof pane.tab_id === "string" && pane.tab_id !== tabId &&
-						typeof pane.cwd === "string" && isGuarded(pane.cwd))
-					.map((pane) => pane.tab_id))];
-				if (dependents.length > 0) {
-					throw new Error(`Worktree still used by Herdr tabs ${dependents.join(", ")}; close them first.`);
+				// With --force, skip the dependents check entirely and let git remove the checkout.
+				if (option !== "--force") {
+					const snapshot = await herdr.json(["api", "snapshot"], { cwd: ctx.cwd });
+					const panes = (snapshot.result as { snapshot?: { panes?: SnapshotPane[] } } | undefined)?.snapshot?.panes;
+					if (!Array.isArray(panes)) throw new Error("herdr api snapshot returned no panes.");
+					const guarded = mainCheckout === checkout ? [checkout] : [checkout, mainCheckout];
+					const isGuarded = (cwd: string) =>
+						guarded.some((root) => cwd === root || cwd.startsWith(`${root}/`));
+					const dependentIds = [...new Set(panes
+						.filter((pane): pane is SnapshotPane & { tab_id: string; cwd: string } =>
+							typeof pane.tab_id === "string" && pane.tab_id !== tabId &&
+							typeof pane.cwd === "string" && isGuarded(pane.cwd))
+						.map((pane) => pane.tab_id))];
+					if (dependentIds.length > 0) {
+						const listing = await herdr.json(["tab", "list"], { cwd: ctx.cwd });
+						const tabs = (listing.result as { tabs?: TabEntry[] } | undefined)?.tabs;
+						const labels = new Map(
+							(Array.isArray(tabs) ? tabs : [])
+								.filter((tab): tab is TabEntry & { tab_id: string; label: string } =>
+									typeof tab.tab_id === "string" && typeof tab.label === "string")
+								.map((tab) => [tab.tab_id, tab.label]));
+						const names = [...new Set(dependentIds.map((id) => labels.get(id) ?? id))];
+						throw new Error(`Worktree still used by Herdr tabs ${names.join(", ")}; close them first.`);
+					}
 				}
 
 				await execOrThrow("git", [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-herdr-done",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Close and remove the current Herdr worktree from Pi.",
   "keywords": [
     "pi-package",