@henryqw/pi-herdr-done 0.4.2 → 0.5.0

package/README.md

@@ -12,20 +12,21 @@ 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 or used by other Herdr tabs. |
+| `/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. |
 
 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:
 
 ```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, the current tab closes even when the parent pull fails. Concurrent completions serialize on a lock around the parent checkout.
+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.
 
-Only the current session's tab closes, so sibling tabs in the same workspace survive. When another Herdr tab still uses the current checkout, `/done` refuses and lists the blocking tabs by name; use `/done --force` to remove the checkout regardless. Command requires Pi running inside Herdr with `HERDR_ENV=1` and `HERDR_TAB_ID` set.
+Tabs in the current Herdr workspace close automatically. When 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. Command requires Pi running 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.
 

package/extensions/done.ts

@@ -5,11 +5,10 @@ import { createHerdrClient, withWorktreeLock } from "@henryqw/pi-herdr";
 type ExecResult = { stdout: string; stderr: string; code: number; killed?: boolean };
 
 type SnapshotPane = { tab_id?: unknown; cwd?: unknown };
-type TabEntry = { tab_id?: unknown; label?: unknown };
+type TabEntry = { tab_id?: unknown; workspace_id?: unknown; label?: unknown };
 
 export default function herdrDoneExtension(pi: ExtensionAPI): void {
-	const herdr = createHerdrClient<{ cwd: string }>((command, args, options) =>
-		pi.exec(command, [...args], options));
+	const herdr = createHerdrClient<{ cwd: string }>(pi.exec.bind(pi));
 
 	const execOrThrow = async (command: string, args: string[], cwd: string): Promise<string> => {
 		const result = await pi.exec(command, args, { cwd }) as unknown as ExecResult;
@@ -20,7 +19,7 @@ export default function herdrDoneExtension(pi: ExtensionAPI): void {
 	};
 
 	pi.registerCommand("done", {
-		description: "Remove the current Herdr worktree, then fast-forward its parent workspace",
+		description: "Remove the current Herdr worktree and close its workspace tabs",
 		handler: async (args, ctx) => {
 			const option = args.trim();
 			if (option && option !== "--force") throw new Error("Usage: /done [--force]");
@@ -29,9 +28,11 @@ export default function herdrDoneExtension(pi: ExtensionAPI): void {
 			}
 			const tabId = process.env.HERDR_TAB_ID?.trim();
 			if (!tabId) throw new Error("HERDR_TAB_ID is missing.");
+			const workspaceId = process.env.HERDR_WORKSPACE_ID?.trim();
+			if (!workspaceId) throw new Error("HERDR_WORKSPACE_ID is missing.");
 
 			if (option !== "--force") {
-				const confirmed = await ctx.ui.confirm("Done", "Close and remove the current Herdr worktree?");
+				const confirmed = await ctx.ui.confirm("Done", "Close its Herdr tabs and remove the current worktree?");
 				if (!confirmed) return;
 			}
 
@@ -46,28 +47,40 @@ export default function herdrDoneExtension(pi: ExtensionAPI): void {
 			const parentIsBare = mainCheckout !== checkout &&
 				worktreeFields.slice(1, worktreeFields.indexOf("")).includes("bare");
 
+			let siblingTabIds: string[] = [];
 			await withWorktreeLock(checkout, async () => {
 				// With --force, skip the dependents check entirely and let git remove the checkout.
+				let dependentIds: string[] = [];
 				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 dependentIds = [...new Set(panes
+					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" &&
 							(pane.cwd === checkout || pane.cwd.startsWith(`${checkout}/`)))
 						.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.`);
-					}
+				}
+				const listing = await herdr.json(["tab", "list"], { cwd: ctx.cwd });
+				const tabs = (listing.result as { tabs?: TabEntry[] } | undefined)?.tabs;
+				if (!Array.isArray(tabs)) throw new Error("herdr tab list returned no tabs.");
+				const tabsById = new Map(tabs
+					.filter((tab): tab is TabEntry & { tab_id: string } => typeof tab.tab_id === "string")
+					.map((tab) => [tab.tab_id, tab]));
+				if (tabsById.get(tabId)?.workspace_id !== workspaceId) {
+					throw new Error(`Herdr tab ${tabId} does not belong to workspace ${workspaceId}.`);
+				}
+				siblingTabIds = tabs
+					.filter((tab): tab is TabEntry & { tab_id: string } =>
+						typeof tab.tab_id === "string" && tab.tab_id !== tabId && tab.workspace_id === workspaceId)
+					.map((tab) => tab.tab_id);
+				const blockers = dependentIds.filter((id) => tabsById.get(id)?.workspace_id !== workspaceId);
+				if (blockers.length > 0) {
+					const names = blockers.map((id) => {
+						const label = tabsById.get(id)?.label;
+						return typeof label === "string" ? label : id;
+					});
+					throw new Error(`Worktree still used by Herdr tabs ${names.join(", ")}; close them first.`);
 				}
 
 				await execOrThrow("git", [
@@ -75,13 +88,14 @@ export default function herdrDoneExtension(pi: ExtensionAPI): void {
 				], ctx.cwd);
 			});
 			try {
+				await Promise.all(siblingTabIds.map((id) => herdr.run(["tab", "close", id], { cwd: tmpdir() })));
 				if (!parentIsBare && mainCheckout !== checkout) {
 					// Serialize concurrent completions pulling the same parent checkout.
 					// Run outside the removed checkout because its directory no longer exists.
 					await withWorktreeLock(mainCheckout, () => execOrThrow("git", ["pull", "--ff-only"], mainCheckout));
 				}
 			} finally {
-				// Close only this session's tab once its checkout is removed, even if the parent pull fails.
+				// Close this session's tab last, even if sibling cleanup or the parent pull fails.
 				await herdr.run(["tab", "close", tabId], { cwd: tmpdir() });
 			}
 		},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-herdr-done",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "description": "Close and remove the current Herdr worktree from Pi.",
   "keywords": [
     "pi-package",
@@ -27,7 +27,7 @@
     "@earendil-works/pi-coding-agent": "^0.84.2"
   },
   "dependencies": {
-    "@henryqw/pi-herdr": "^0.2.0"
+    "@henryqw/pi-herdr": "^0.3.0"
   },
   "repository": {
     "type": "git",