@henryqw/pi-herdr-done 0.2.0 → 0.3.0

package/README.md

@@ -12,16 +12,20 @@ pi install npm:@henryqw/pi-herdr-done
 
 | Surface | Type | Purpose |
 | --- | --- | --- |
-| `/done` | command | Close current Herdr worktree workspace and remove its clean checkout. |
-| `/done --force` | command | Close workspace and remove checkout even when worktree is dirty. |
+| `/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. |
 
 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
-herdr worktree remove --workspace "$HERDR_WORKSPACE_ID"
+git worktree remove .
+git -C <parent> pull --ff-only
+herdr tab close "$HERDR_TAB_ID"
 ```
 
-Herdr closes the worktree workspace and removes its checkout. Command requires Pi running inside Herdr with `HERDR_ENV=1` and `HERDR_WORKSPACE_ID` set.
+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.
 
 Dirty worktrees make `/done` fail. Commit or discard changes, or use `/done --force` to explicitly delete them.
 

package/extensions/done.ts

@@ -1,20 +1,34 @@
+import { tmpdir } from "node:os";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { createHerdrClient } from "@henryqw/pi-herdr";
+import { lock } from "proper-lockfile";
+
+type ExecResult = { stdout: string; stderr: string; code: number; killed?: boolean };
+
+type SnapshotPane = { tab_id?: unknown; cwd?: unknown };
 
 export default function herdrDoneExtension(pi: ExtensionAPI): void {
 	const herdr = createHerdrClient<{ cwd: string }>((command, args, options) =>
 		pi.exec(command, [...args], options));
 
+	const execOrThrow = async (command: string, args: string[], cwd: string): Promise<string> => {
+		const result = await pi.exec(command, args, { cwd }) as unknown as ExecResult;
+		if (result.code !== 0 || result.killed) {
+			throw new Error(`${command} ${args[0]} failed: ${result.stderr.trim() || "killed"}`);
+		}
+		return result.stdout;
+	};
+
 	pi.registerCommand("done", {
-		description: "Close and remove the current Herdr worktree",
+		description: "Remove the current Herdr worktree, then fast-forward its parent workspace",
 		handler: async (args, ctx) => {
 			const option = args.trim();
 			if (option && option !== "--force") throw new Error("Usage: /done [--force]");
 			if (process.env.HERDR_ENV !== "1") {
 				throw new Error("/done requires the current Pi session inside Herdr (HERDR_ENV=1).");
 			}
-			const workspaceId = process.env.HERDR_WORKSPACE_ID?.trim();
-			if (!workspaceId) throw new Error("HERDR_WORKSPACE_ID is missing.");
+			const tabId = process.env.HERDR_TAB_ID?.trim();
+			if (!tabId) throw new Error("HERDR_TAB_ID is missing.");
 
 			if (option !== "--force") {
 				const confirmed = await ctx.ui.confirm("Done", "Close and remove the current Herdr worktree?");
@@ -22,10 +36,52 @@ export default function herdrDoneExtension(pi: ExtensionAPI): void {
 			}
 
 			await ctx.waitForIdle();
-			await herdr.run([
-				"worktree", "remove", "--workspace", workspaceId,
-				...(option === "--force" ? ["--force"] : []),
-			], { cwd: ctx.cwd });
+			const checkout = (await execOrThrow("git", ["rev-parse", "--show-toplevel"], ctx.cwd)).trim();
+			// First record of the NUL-delimited list is always the main worktree;
+			// -z keeps paths containing newlines parseable.
+			const worktreeFields = (await execOrThrow("git", ["worktree", "list", "--porcelain", "-z"], checkout)).split("\0");
+			const mainCheckout = worktreeFields[0]?.startsWith("worktree ") ? worktreeFields[0].slice("worktree ".length) : undefined;
+			if (!mainCheckout) throw new Error("git worktree list returned no main worktree.");
+			// A bare primary has no working tree to pull into.
+			const parentIsBare = mainCheckout !== checkout &&
+				worktreeFields.slice(1, worktreeFields.indexOf("")).includes("bare");
+
+			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.`);
+				}
+
+				await execOrThrow("git", [
+					"worktree", "remove", ...(option === "--force" ? ["--force"] : []), checkout,
+				], ctx.cwd);
+			} finally {
+				await release();
+			}
+			if (!parentIsBare && mainCheckout !== checkout) {
+				// Serialize concurrent completions pulling the same parent checkout.
+				// Run outside the removed checkout because its directory no longer exists.
+				const releasePull = await lock(mainCheckout);
+				try {
+					await execOrThrow("git", ["pull", "--ff-only"], mainCheckout);
+				} finally {
+					await releasePull();
+				}
+			}
+			// Close only this session's tab so unrelated tabs survive.
+			// Run outside the removed checkout because its directory no longer exists.
+			await herdr.run(["tab", "close", tabId], { cwd: tmpdir() });
 		},
 	});
 }

package/package.json

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