@henryqw/pi-herdr-done 0.2.2 → 0.3.0

package/README.md

@@ -12,16 +12,19 @@ pi install npm:@henryqw/pi-herdr-done
 
 | Surface | Type | Purpose |
 | --- | --- | --- |
-| `/done` | command | Remove the current worktree checkout and close only this session's tab. |
+| `/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
 git worktree remove .
+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 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

@@ -20,7 +20,7 @@ export default function herdrDoneExtension(pi: ExtensionAPI): void {
 	};
 
 	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]");
@@ -37,17 +37,27 @@ export default function herdrDoneExtension(pi: ExtensionAPI): void {
 
 			await ctx.waitForIdle();
 			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" &&
-						(pane.cwd === checkout || pane.cwd.startsWith(`${checkout}/`)))
+						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.`);
@@ -59,6 +69,16 @@ export default function herdrDoneExtension(pi: ExtensionAPI): void {
 			} 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.2",
+  "version": "0.3.0",
   "description": "Close and remove the current Herdr worktree from Pi.",
   "keywords": [
     "pi-package",