@henryqw/pi-herdr-rename 0.3.0 → 0.4.0

package/README.md

@@ -1,6 +1,6 @@
 # `@henryqw/pi-herdr-rename`
 
-Pi extension that gives conversations short, model-generated chat titles. It stores the title as the Pi session name and renames the current Herdr pane; the enclosing Herdr tab is renamed only when that pane is the tab's sole pane.
+Pi extension that gives conversations semantic model-generated titles. It stores each title as Pi session name and renames current Herdr pane. In a linked worktree, it creates a semantic Git branch for detached or Herdr-generated branches, then uses that branch for a generated workspace label; enclosing Herdr tab is renamed only when pane is tab's sole pane.
 
 ## Install
 
@@ -17,13 +17,13 @@ pi remove npm:@henryqw/pi-herdr-rename
 ## Behavior
 
 - On the first real, non-empty text prompt in a new session, title generation starts in the background and does not delay the main Pi response. Extension-injected prompts, empty prompts, and image-only input are ignored.
-- Successful titles are lowercase and, by default, at most four words and 40 characters. The first 1,000 characters of user text are sent to the rename model; prompt content is never logged.
-- A successful title updates the Pi session name and current Herdr pane. The enclosing Herdr tab is updated only when the current tab has one pane. Outside Herdr, only the Pi session name changes.
-- Resuming a named session reapplies its saved title without another rename-model request. Automatic rename-model errors show a warning; other automatic failures stay quiet. Failures do not change labels, fall back locally, or retry.
+- Successful titles use `type: subject`, lowercase words, and by default at most four words and 40 characters. For example, `fix: extension name` maps to Git branch `fix/extension-name`. First 1,000 characters of user text go to rename model; prompt content is never logged.
+- A successful title updates Pi session name and current Herdr pane. In a linked worktree, a detached checkout gets `git switch -c <generated-branch>`; a Herdr-generated `worktree/...` branch gets renamed. Conflicting local refs add numeric suffix such as `-2`. Existing non-generated branch remains unchanged. If workspace label still matches generated default pattern such as `worktree-brave-meadow-4aa8`, it is renamed to semantic branch; custom workspace names stay unchanged. Enclosing Herdr tab updates only when current tab has one pane. Outside Herdr, only Pi session name changes.
+- Resuming a named session reapplies saved title without another rename-model request. A configured rename-model transport/fetch failure tries current text-capable main model once. A final automatic rename-model error shows a warning; other automatic failures stay quiet. Failures do not change labels or retry.
 
 ## Manual rename
 
-Run `/rename` to generate a title from up to the three most recent user/assistant rounds. It uses text only, caps each message at 1,000 characters and the complete context at 4,000 characters, and applies the same Pi and Herdr rules. An animated widget shows `renaming...`, briefly changes to `renamed to <title>`, then disappears. The command warns without changing anything when no user text exists or generation fails. If requests overlap, the latest rename request wins.
+Run `/rename` to generate a semantic title from up to three most recent user/assistant rounds. It uses text only, caps each message at 1,000 characters and complete context at 2,000 characters, and applies same Pi, Git, and Herdr rules. Animated widget shows `renaming...`, briefly changes to `renamed to <title>`, then disappears. Command warns without changing anything when no user text exists or generation fails. If title-generation requests overlap, latest title request wins.
 
 ## Rename model
 
@@ -41,7 +41,7 @@ The selection is saved in:
 }
 ```
 
-`maxWords` and `maxChars` accept positive integers and default to 4 and 40. Invalid limits use their defaults. Missing, malformed, or unavailable model selection never falls back to another model.
+`maxWords` must be at least 2 and `maxChars` at least 6; defaults are 4 and 40. Invalid limits use defaults. Missing, malformed, or unavailable model selection does not fall back; a configured-model transport/fetch failure uses current text-capable main model once.
 
 ## Development
 

package/extensions/rename.ts

@@ -6,21 +6,47 @@ import {
 	type ExtensionAPI,
 	type ExtensionContext,
 } from "@earendil-works/pi-coding-agent";
+import { createHerdrClient } from "@henryqw/pi-herdr";
 
 const WIDGET_KEY = "pi-herdr-rename";
 const WIDGET_RESULT_MS = 2_000;
 const MAX_MESSAGE_CHARS = 1_000;
-const MAX_CONTEXT_CHARS = 4_000;
+const MAX_CONTEXT_CHARS = 2_000;
 const DEFAULT_MAX_WORDS = 4;
 const DEFAULT_MAX_CHARS = 40;
+const HERDR_DEFAULT_WORKTREE_NAME = /^(?:worktree[-/])?(?:brave|calm|clear|green|lucky|quiet|rapid|silver)-(?:river|cloud|field|forest|harbor|meadow|stone|valley)-[0-9a-f]{4}$/;
 const configPath = () => join(getAgentDir(), "config", "pi-herdr-rename.json");
 
 type RenameConfig = { model?: string; maxWords: number; maxChars: number };
 
+const isTransportFailure = (message: string) => /\b(?:fetch failed|network[- ]error|connection[- ]error|timed? out|timeout)\b/i.test(message);
+
 class RenameModelError extends Error {}
 
-const positiveInteger = (value: unknown, fallback: number) =>
-	typeof value === "number" && Number.isInteger(value) && value > 0 ? value : fallback;
+const positiveInteger = (value: unknown, fallback: number, minimum = 1) =>
+	typeof value === "number" && Number.isInteger(value) && value >= minimum ? value : fallback;
+
+function branchFromTitle(title: string): string | undefined {
+	const match = /^([a-z][a-z0-9-]*): ([a-z0-9]+(?: [a-z0-9]+)*)$/.exec(title);
+	return match ? `${match[1]}/${match[2].replaceAll(" ", "-")}` : undefined;
+}
+
+function branchAvailable(candidate: string, branches: string[]): boolean {
+	return branches.every((branch) => branch !== candidate && !branch.startsWith(`${candidate}/`) && !candidate.startsWith(`${branch}/`));
+}
+
+function availableBranch(branch: string, branches: string[]): string {
+	const [type, subject] = branch.split("/");
+	for (let suffix = 1; suffix <= branches.length + 1; suffix++) {
+		const candidate = suffix === 1 ? branch : `${type}/${subject}-${suffix}`;
+		if (branchAvailable(candidate, branches)) return candidate;
+	}
+	for (let suffix = 2; suffix <= branches.length + 2; suffix++) {
+		const candidate = `${type}-${suffix}/${subject}`;
+		if (branchAvailable(candidate, branches)) return candidate;
+	}
+	throw new Error("Could not choose an available semantic branch.");
+}
 
 async function configured(): Promise<RenameConfig> {
 	try {
@@ -29,8 +55,8 @@ async function configured(): Promise<RenameConfig> {
 			const values = config as { model?: unknown; maxWords?: unknown; maxChars?: unknown };
 			return {
 				model: typeof values.model === "string" && /^[^\s/]+\/\S+$/.test(values.model) ? values.model : undefined,
-				maxWords: positiveInteger(values.maxWords, DEFAULT_MAX_WORDS),
-				maxChars: positiveInteger(values.maxChars, DEFAULT_MAX_CHARS),
+				maxWords: positiveInteger(values.maxWords, DEFAULT_MAX_WORDS, 2),
+				maxChars: positiveInteger(values.maxChars, DEFAULT_MAX_CHARS, 6),
 			};
 		}
 	} catch {}
@@ -108,18 +134,38 @@ async function generateTitle(text: string, ctx: ExtensionContext, signal: AbortS
 		.find((candidate) => candidate.provider === provider && candidate.id === id && candidate.input.includes("text"));
 	if (!model) throw new Error(`Rename model unavailable: ${key}. Run /rename-model.`);
 
-	const response = await ctx.modelRegistry.complete(
-		model,
-		{
-			systemPrompt: `Return only a short chat title for the current conversation topic, prioritizing the most recent user intent: lowercase, at most ${maxWords} words, and at most ${maxChars} characters.`,
-			messages: [{ role: "user", content: text.slice(0, MAX_CONTEXT_CHARS), timestamp: Date.now() }],
-		},
-		{ signal, maxRetries: 0, maxTokens: 64 },
-	);
-	if (response.stopReason === "error") {
-		throw new RenameModelError(response.errorMessage || "Rename model failed.");
+	const completionContext = {
+		systemPrompt: `Return only a semantic title for latest user intent. Format: type: subject. Use lowercase type and lowercase alphanumeric subject words separated by spaces. No other punctuation; at most ${maxWords} words and at most ${maxChars} characters.`,
+		messages: [{ role: "user" as const, content: text.slice(0, MAX_CONTEXT_CHARS), timestamp: Date.now() }],
+	};
+	const complete = async (target: NonNullable<ExtensionContext["model"]>) => {
+		let response;
+		try {
+			response = await ctx.modelRegistry.complete(target, completionContext, { signal, maxRetries: 0, maxTokens: 64 });
+		} catch (error) {
+			if (signal.aborted) throw error;
+			throw new RenameModelError(error instanceof Error ? error.message : "Rename model failed.");
+		}
+		if (response.stopReason === "error") throw new RenameModelError(response.errorMessage || "Rename model failed.");
+		if (response.stopReason !== "stop") throw new Error("Rename model did not return a complete title.");
+		return response;
+	};
+
+	let response: Awaited<ReturnType<typeof complete>>;
+	try {
+		response = await complete(model);
+	} catch (error) {
+		const fallback = ctx.model;
+		if (
+			!(error instanceof RenameModelError && isTransportFailure(error.message)) ||
+			signal.aborted ||
+			!fallback?.input.includes("text") ||
+			(fallback.provider === model.provider && fallback.id === model.id)
+		) {
+			throw error;
+		}
+		response = await complete(fallback);
 	}
-	if (response.stopReason !== "stop") throw new Error("Rename model did not return a complete title.");
 
 	const title = response.content
 		.filter((part) => part.type === "text")
@@ -128,21 +174,15 @@ async function generateTitle(text: string, ctx: ExtensionContext, signal: AbortS
 		.trim()
 		.toLowerCase()
 		.replace(/\s+/g, " ");
-	if (!title || title.length > maxChars || title.split(" ").length > maxWords) {
+	if (!title || title.length > maxChars || title.split(" ").length > maxWords || !branchFromTitle(title)) {
 		throw new Error("Rename model returned an invalid title.");
 	}
 	return title;
 }
 
-async function herdr(pi: ExtensionAPI, args: string[], signal: AbortSignal): Promise<string> {
-	const result = await pi.exec("herdr", args, { signal });
-	if (result.code !== 0 || result.killed) {
-		throw new Error(`Herdr ${args[0]} failed: ${result.stderr.trim() || `exit code ${result.code}`}`);
-	}
-	return result.stdout;
-}
-
 export default function herdrRenameExtension(pi: ExtensionAPI): void {
+	const herdr = createHerdrClient<{ signal: AbortSignal }>((command, args, options) =>
+		pi.exec(command, [...args], options));
 	let latestUserText: string | undefined;
 	let automaticStarted = false;
 	let sequence = 0;
@@ -158,21 +198,54 @@ export default function herdrRenameExtension(pi: ExtensionAPI): void {
 		if (!paneId) return;
 
 		if (!isCurrent(request, controller)) return;
-		await herdr(pi, ["pane", "rename", paneId, title], controller.signal);
+		await herdr.run(["pane", "rename", paneId, title], { signal: controller.signal });
 		if (!isCurrent(request, controller)) return;
 
-		const paneResponse: unknown = JSON.parse(
-			await herdr(pi, ["pane", "get", paneId], controller.signal),
-		);
-		const tabId = (paneResponse as { result?: { pane?: { tab_id?: unknown } } }).result?.pane?.tab_id;
+		const paneResponse: unknown = await herdr.json(["pane", "get", paneId], { signal: controller.signal });
+		const pane = (paneResponse as { result?: { pane?: { tab_id?: unknown; workspace_id?: unknown } } }).result?.pane;
+		const tabId = pane?.tab_id;
 		if (typeof tabId !== "string" || !tabId) throw new Error("Herdr pane response omitted tab_id.");
 		if (!isCurrent(request, controller)) return;
 
-		const tabResponse: unknown = JSON.parse(await herdr(pi, ["tab", "get", tabId], controller.signal));
+		const tabResponse: unknown = await herdr.json(["tab", "get", tabId], { signal: controller.signal });
 		const paneCount = (tabResponse as { result?: { tab?: { pane_count?: unknown } } }).result?.tab?.pane_count;
 		if (typeof paneCount !== "number") throw new Error("Herdr tab response omitted pane_count.");
 		if (paneCount === 1 && isCurrent(request, controller)) {
-			await herdr(pi, ["tab", "rename", tabId, title], controller.signal);
+			await herdr.run(["tab", "rename", tabId, title], { signal: controller.signal });
+		}
+		if (!isCurrent(request, controller)) return;
+
+		const workspaceId = pane?.workspace_id;
+		if (typeof workspaceId !== "string" || !workspaceId) throw new Error("Herdr pane response omitted workspace_id.");
+		const workspaceResponse: unknown = await herdr.json(["workspace", "get", workspaceId], { signal: controller.signal });
+		const workspace = (workspaceResponse as { result?: { workspace?: { label?: unknown; worktree?: { checkout_path?: unknown; is_linked_worktree?: unknown } } } }).result?.workspace;
+		const workspaceName = workspace?.label;
+		if (typeof workspaceName !== "string") throw new Error("Herdr workspace response omitted label.");
+		const worktree = workspace?.worktree;
+		const checkoutPath = worktree?.checkout_path;
+		if (worktree?.is_linked_worktree !== true || typeof checkoutPath !== "string" || !checkoutPath) return;
+
+		const runGit = async (args: string[]) => {
+			const result = await pi.exec("git", args, { cwd: checkoutPath, signal: controller.signal });
+			if (result.code !== 0 || result.killed) {
+				throw new Error(`git ${args.join(" ")} failed: ${result.stderr.trim() || result.stdout.trim() || (result.killed ? "killed" : `exit ${result.code}`)}`);
+			}
+			return result.stdout.trim();
+		};
+
+		let branch = await runGit(["branch", "--show-current"]);
+		if (!branch || branch.startsWith("worktree/")) {
+			const generatedBranch = branchFromTitle(title);
+			if (!generatedBranch || !isCurrent(request, controller)) return;
+			const branches = (await runGit(["for-each-ref", "--format=%(refname:short)", "refs/heads"]))
+				.split("\n")
+				.filter(Boolean);
+			const semanticBranch = availableBranch(generatedBranch, branches);
+			await runGit(branch ? ["branch", "-m", semanticBranch] : ["switch", "-c", semanticBranch]);
+			branch = semanticBranch;
+		}
+		if (HERDR_DEFAULT_WORKTREE_NAME.test(workspaceName) && isCurrent(request, controller)) {
+			await herdr.run(["workspace", "rename", workspaceId, branch], { signal: controller.signal });
 		}
 	};
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-herdr-rename",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Generate short Pi chat titles and rename the current Herdr location.",
   "keywords": [
     "pi-package",
@@ -42,5 +42,8 @@
     "extensions": [
       "./extensions"
     ]
+  },
+  "dependencies": {
+    "@henryqw/pi-herdr": "^0.1.0"
   }
 }