@henryqw/pi-herdr-clone 0.2.6 → 0.2.8

package/extensions/clone-tab.ts

@@ -12,7 +12,7 @@ import {
 import {
 	createHerdrClient,
 	herdrCommandFailure,
-	hasHerdrErrorCode,
+	startPiAgent,
 	withWorktreeLock,
 	type HerdrClient,
 	type HerdrExecResult,
@@ -129,14 +129,12 @@ async function createBranchedClone(
 	const createdClone = session.createBranchedSession(source.leafId);
 	if (!createdClone) throw new Error("Pi did not create a persisted clone session file.");
 	const cloneFile = resolve(createdClone);
-	let cloneStat;
 	try {
-		cloneStat = await stat(cloneFile);
+		if ((await stat(cloneFile)).isFile()) return cloneFile;
 	} catch (error) {
 		throw new Error(`Pi clone session file was not created: ${cloneFile}`, { cause: error });
 	}
-	if (!cloneStat.isFile()) throw new Error(`Pi clone session path is not a file: ${cloneFile}`);
-	return cloneFile;
+	throw new Error(`Pi clone session path is not a file: ${cloneFile}`);
 }
 
 // A worktree layout plugin (e.g. herdr-plus) can start its own agent in a new
@@ -201,24 +199,25 @@ async function launchCloneAgent(
 ): Promise<string> {
 	const agentName = `clone-${randomUUID().replaceAll("-", "").slice(0, 24)}`;
 	try {
-		for (let attempt = 1; attempt <= 5; attempt += 1) {
-			const startArgs = [
-				"agent", "start", agentName, "--kind", "pi", "--pane", rootPaneId,
-				"--", "--session", cloneFile,
-			];
-			const result = await herdr.exec(startArgs, { cwd: ctx.cwd });
-			if (result.code === 0 && !result.killed) return agentName;
-			if (hasHerdrErrorCode(result, "agent_pane_busy") && onPaneBusy) {
-				({ rootPaneId, retained } = await onPaneBusy());
-				onPaneBusy = undefined;
-				continue;
-			}
-			if (!hasHerdrErrorCode(result, "agent_pane_busy") || attempt === 5) {
-				throw new Error(herdrCommandFailure(startArgs, result));
-			}
-			await delay(250);
-		}
-		throw new Error("Herdr agent start retry loop exited unexpectedly.");
+		const result = await startPiAgent(herdr, {
+			name: agentName,
+			pane: rootPaneId,
+			args: ["--session", cloneFile],
+			options: { cwd: ctx.cwd },
+			onPaneBusy: onPaneBusy
+				? async () => {
+					const next = await onPaneBusy!();
+					rootPaneId = next.rootPaneId;
+					retained = next.retained;
+					return rootPaneId;
+				}
+				: undefined,
+		});
+		if (result.code === 0 && !result.killed) return agentName;
+		const startArgs = [
+			"agent", "start", agentName, "--kind", "pi", "--pane", rootPaneId, "--", "--session", cloneFile,
+		];
+		throw new Error(herdrCommandFailure(startArgs, result));
 	} catch (error) {
 		throw new Error(
 			`Clone launch could not be confirmed after starting agent ${agentName}; retained ${retained}: ${errorMessage(error)}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-herdr-clone",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "description": "Clone the current Pi conversation path into a new Herdr tab.",
   "keywords": [
     "pi-package",
@@ -28,7 +28,7 @@
     "@earendil-works/pi-coding-agent": "^0.84.2"
   },
   "dependencies": {
-    "@henryqw/pi-herdr": "^0.3.0"
+    "@henryqw/pi-herdr": "^0.4.0"
   },
   "repository": {
     "type": "git",