@henryqw/pi-herdr-btw 1.1.6 → 1.1.7

package/extensions/btw.ts

@@ -1,6 +1,6 @@
 import { randomUUID } from "node:crypto";
 import type { ExtensionAPI, ExtensionCommandContext, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { createHerdrClient, hasHerdrErrorCode } from "@henryqw/pi-herdr";
+import { createHerdrClient, hasHerdrErrorCode, startPiAgent } from "@henryqw/pi-herdr";
 import {
 	resolveConfiguredTaskRoutes,
 	type ResolvedTaskRoute,
@@ -53,8 +53,6 @@ const BTW_TASK = "pi-herdr-btw/btw";
 const CHILD_HEARTBEAT_INTERVAL_MS = 5 * 60 * 1_000;
 const LITERAL_DRAFT_PREFIX = "\u200b";
 const MERGE_POLL_INTERVAL_MS = 3_000;
-const AGENT_START_BUSY_RETRIES = 5;
-const AGENT_START_RETRY_DELAY_MS = 250;
 
 function childPayloadPathFromArgv(): string | undefined {
 	const index = process.argv.indexOf(CHILD_PAYLOAD_ARG);
@@ -703,20 +701,16 @@ export async function registerBtwExtension(
 				}
 
 				// Step 2: adopt pi into the new pane; herdr waits for readiness.
-				const agentStartArgs = buildAgentStartArgs(launchOptions, paneId);
+				const agentStartArgs = buildAgentStartArgs(launchOptions);
 				let result;
 				try {
-					result = await herdr.exec(agentStartArgs, { timeout: 45_000 });
-					for (let attempt = 1; attempt < AGENT_START_BUSY_RETRIES; attempt += 1) {
-						if (
-							launchGeneration !== sessionGeneration ||
-							result.killed ||
-							!hasHerdrErrorCode(result, "agent_pane_busy")
-						) break;
-						await new Promise((resolve) => setTimeout(resolve, AGENT_START_RETRY_DELAY_MS));
-						if (launchGeneration !== sessionGeneration) break;
-						result = await herdr.exec(agentStartArgs, { timeout: 45_000 });
-					}
+					result = await startPiAgent(herdr, {
+						name: launchOptions.paneName,
+						pane: paneId,
+						args: agentStartArgs,
+						options: { timeout: 45_000 },
+						shouldRetry: (candidate) => !candidate.killed && launchGeneration === sessionGeneration,
+					});
 				} catch (error) {
 					const message = error instanceof Error ? error.message : String(error);
 					await reportKnownPaneFailure(`/btw failed: ${message.slice(0, 500)}`, paneId, payloadPath);

package/internal/core.ts

@@ -335,20 +335,9 @@ export function isAgentStartReady(
 	}
 }
 
-/**
- * Step 2 of the launch: start pi in the freshly split pane. Herdr prepends
- * the canonical executable for `--kind pi`, so only pi's own args follow `--`.
- */
-export function buildAgentStartArgs(options: HerdrLaunchOptions, paneId: string): string[] {
+/** The child Pi arguments for the Herdr agent-start boundary. */
+export function buildAgentStartArgs(options: HerdrLaunchOptions): string[] {
 	return [
-		"agent",
-		"start",
-		options.paneName,
-		"--kind",
-		"pi",
-		"--pane",
-		paneId,
-		"--",
 		"--no-session",
 		"--model",
 		options.model,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-herdr-btw",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "description": "Open and merge tool-enabled Pi side threads in Herdr panes.",
   "keywords": [
     "pi-package",
@@ -46,7 +46,7 @@
     ]
   },
   "dependencies": {
-    "@henryqw/pi-herdr": "^0.3.0",
+    "@henryqw/pi-herdr": "^0.4.0",
     "@henryqw/pi-task-models": "^1.0.0",
     "proper-lockfile": "^4.1.2"
   },