fix(pi-herdr-rename): rename workspace on command

Author: HenryQW

package-lock.json

@@ -13,7 +13,7 @@ Git-safe branch combining task type with display-title words: `Update task logic
 _Avoid_: display title, raw generated branch, arbitrary Git mutation
 
 **Generated worktree label**:
-Herdr linked-worktree label matching its `worktree-<adjective>-<noun>-<hex>` default. It is replaced with current display title; custom workspace labels remain unchanged.
+Herdr linked-worktree label matching its `worktree-<adjective>-<noun>-<hex>` default. It is replaced automatically with current display title; an explicit rename may also replace a custom workspace label.
 _Avoid_: semantic branch, custom workspace name
 
 **Sole-pane tab**:

packages/pi-herdr-rename/CONTEXT.md

@@ -34,6 +34,6 @@ Shared [`pi-task-models` config](../pi-task-models#config) at `~/.pi/agent/confi
 
 Display titles are natural task phrases, preferably three or four words and always at most four words and 20 characters. Model classification stays internal: `refactor: update task logic` displays as `Update task logic` and maps to Git branch `refactor/update-task-logic`.
 
-In a linked worktree, a detached checkout or Herdr `worktree/...` branch is renamed; an existing non-generated branch stays. A generated workspace label such as `worktree-brave-meadow-4aa8` becomes display title; custom workspace names stay. Enclosing Herdr tab updates only when this pane is tab's only pane. Outside Herdr, only Pi session name changes.
+In a linked worktree, a detached checkout or Herdr `worktree/...` branch is renamed; an existing non-generated branch stays. A generated workspace label such as `worktree-brave-meadow-4aa8` becomes the display title automatically; `/rename` also replaces a custom workspace name. Enclosing Herdr tab updates only when this pane is tab's only pane. Outside Herdr, only Pi session name changes.
 
 Tries assigned profile primary, then fallback, while honoring configured thinking level. Never substitutes current session model. No viable route leaves titles unchanged. Resuming a session created by this version reapplies saved display title and semantic branch without another model request. Older titles receive no migration.

packages/pi-herdr-rename/README.md

@@ -216,6 +216,7 @@ export default function herdrRenameExtension(pi: ExtensionAPI): void {
 		displayTitle: string,
 		branchCandidate: string,
 		previousDisplayTitle: string | undefined,
+		forceWorkspaceRename: boolean,
 		request: number,
 		controller: AbortController,
 	): Promise<void> => {
@@ -247,6 +248,16 @@ export default function herdrRenameExtension(pi: ExtensionAPI): void {
 		const workspaceName = workspace?.label;
 		if (typeof workspaceName !== "string") throw new Error("Herdr workspace response omitted label.");
 		const worktree = workspace?.worktree;
+		if (
+			workspaceName !== displayTitle &&
+			(forceWorkspaceRename ||
+				(worktree?.is_linked_worktree === true &&
+					(HERDR_DEFAULT_WORKTREE_NAME.test(workspaceName) || workspaceName === previousDisplayTitle))) &&
+			isCurrent(request, controller)
+		) {
+			await herdr.run(["workspace", "rename", workspaceId, displayTitle], { signal: controller.signal });
+		}
+
 		const checkoutPath = worktree?.checkout_path;
 		if (worktree?.is_linked_worktree !== true || typeof checkoutPath !== "string" || !checkoutPath) return;
 
@@ -267,13 +278,6 @@ export default function herdrRenameExtension(pi: ExtensionAPI): void {
 			const semanticBranch = availableBranch(branchCandidate, branches);
 			await runGit(branch ? ["branch", "-m", semanticBranch] : ["switch", "-c", semanticBranch]);
 		}
-		if (
-			workspaceName !== displayTitle &&
-			(HERDR_DEFAULT_WORKTREE_NAME.test(workspaceName) || workspaceName === previousDisplayTitle) &&
-			isCurrent(request, controller)
-		) {
-			await herdr.run(["workspace", "rename", workspaceId, displayTitle], { signal: controller.signal });
-		}
 	};
 
 	const begin = () => {
@@ -300,7 +304,7 @@ export default function herdrRenameExtension(pi: ExtensionAPI): void {
 			const previousDisplayTitle = saved && pi.getSessionName() === saved.display ? saved.display : undefined;
 			pi.setSessionName(title.display);
 			pi.appendEntry(TITLE_STATE_TYPE, title);
-			await applyHerdr(title.display, title.branch, previousDisplayTitle, request, controller);
+			await applyHerdr(title.display, title.branch, previousDisplayTitle, manual, request, controller);
 			return title.display;
 		} catch (error) {
 			if (isCurrent(request, controller) && (manual || error instanceof RenameModelError)) {
@@ -341,7 +345,7 @@ export default function herdrRenameExtension(pi: ExtensionAPI): void {
 		if (!title || title !== saved?.display) return;
 
 		const { request, controller } = begin();
-		void applyHerdr(title, saved.branch, saved.display, request, controller)
+		void applyHerdr(title, saved.branch, saved.display, false, request, controller)
 			.catch(() => undefined)
 			.finally(() => finish(request, controller));
 	});

packages/pi-herdr-rename/extensions/rename.ts

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-herdr-rename",
-  "version": "2.1.7",
+  "version": "2.1.8",
   "description": "Generate short Pi display titles and rename the current Herdr location.",
   "keywords": [
     "pi-package",

packages/pi-herdr-rename/package.json

@@ -270,38 +270,40 @@ test("saved display titles keep semantic branches, replace generated branches, a
 	});
 });
 
-test("manual rename updates its previous generated workspace title", async () => {
+test("manual rename updates generated and custom workspace titles", async () => {
 	await withAgentDir(async () => {
 		process.env.HERDR_PANE_ID = "pane-1";
-		const app = harness({
-			sessionName: "Saved title",
-			branch: [
-				{ type: "custom", customType: "pi-herdr-rename/title", data: { display: "Saved title", branch: "fix/saved-title" } },
-				{ type: "message", message: { role: "user", content: "update task logic" } },
-			],
-			complete: async () => response("refactor: update task logic"),
-			exec: async (args) => {
-				if (args.join("\0") === "branch\0--show-current") return success("fix/saved-title\n");
-				if (args[0] === "pane" && args[1] === "get") {
-					return success(JSON.stringify({ result: { pane: { tab_id: "tab-1", workspace_id: "workspace-1" } } }));
-				}
-				if (args[0] === "tab" && args[1] === "get") {
-					return success(JSON.stringify({ result: { tab: { pane_count: 1 } } }));
-				}
-				if (args[0] === "workspace" && args[1] === "get") {
-					return success(JSON.stringify({ result: { workspace: { label: "Saved title", worktree: { checkout_path: "/repo/worktree", is_linked_worktree: true } } } }));
-				}
-				return success("{}");
-			},
-		});
-		await app.handlers.get("session_start")?.({}, app.ctx);
-		await eventually(() => app.execCalls.some((args) => args[0] === "workspace" && args[1] === "get"));
-		await app.commands.get("rename")?.("", app.ctx);
+		for (const workspaceName of ["Saved title", "Custom workspace"]) {
+			const app = harness({
+				sessionName: "Saved title",
+				branch: [
+					{ type: "custom", customType: "pi-herdr-rename/title", data: { display: "Saved title", branch: "fix/saved-title" } },
+					{ type: "message", message: { role: "user", content: "update task logic" } },
+				],
+				complete: async () => response("refactor: update task logic"),
+				exec: async (args) => {
+					if (args.join("\0") === "branch\0--show-current") return success("fix/saved-title\n");
+					if (args[0] === "pane" && args[1] === "get") {
+						return success(JSON.stringify({ result: { pane: { tab_id: "tab-1", workspace_id: "workspace-1" } } }));
+					}
+					if (args[0] === "tab" && args[1] === "get") {
+						return success(JSON.stringify({ result: { tab: { pane_count: 1 } } }));
+					}
+					if (args[0] === "workspace" && args[1] === "get") {
+						return success(JSON.stringify({ result: { workspace: { label: workspaceName, worktree: { checkout_path: "/repo/worktree", is_linked_worktree: true } } } }));
+					}
+					return success("{}");
+				},
+			});
+			await app.handlers.get("session_start")?.({}, app.ctx);
+			await eventually(() => app.execCalls.some((args) => args[0] === "workspace" && args[1] === "get"));
+			await app.commands.get("rename")?.("", app.ctx);
 
-		assert.deepEqual(
-			app.execCalls.filter((args) => args[0] === "workspace" && args[1] === "rename"),
-			[["workspace", "rename", "workspace-1", "Update task logic"]],
-		);
+			assert.deepEqual(
+				app.execCalls.filter((args) => args[0] === "workspace" && args[1] === "rename"),
+				[["workspace", "rename", "workspace-1", "Update task logic"]],
+			);
+		}
 	});
 });