@henryqw/pi-herdr-btw 1.1.5 → 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/config.ts

@@ -1,4 +1,4 @@
-import { chmod, mkdir, readFile, rename, rm, writeFile } from "node:fs/promises";
+import { mkdir, readFile, rename, rm, writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
 import { lock } from "proper-lockfile";
@@ -138,8 +138,6 @@ export class ConfigStore {
 	}
 
 	private async saveUnlocked(validated: BtwConfig): Promise<void> {
-		const directory = dirname(this.path);
-		await mkdir(directory, { recursive: true, mode: 0o700 });
 		const temporaryPath = `${this.path}.${process.pid}.${Date.now()}.tmp`;
 		try {
 			await writeFile(temporaryPath, `${JSON.stringify(validated, null, 2)}\n`, {
@@ -147,7 +145,6 @@ export class ConfigStore {
 				flag: "wx",
 				mode: 0o600,
 			});
-			await chmod(temporaryPath, 0o600);
 			await rename(temporaryPath, this.path);
 		} catch (error) {
 			await rm(temporaryPath, { force: true }).catch(() => undefined);

package/internal/context-store.ts

@@ -78,7 +78,6 @@ export class ContextStore {
 				flag: "wx",
 				mode: 0o600,
 			});
-			await chmod(payloadPath, 0o600);
 			return payloadPath;
 		} catch (error) {
 			await rm(launchDir, { recursive: true, force: true }).catch(() => undefined);
@@ -88,7 +87,6 @@ export class ContextStore {
 
 	async read(payloadPath: string): Promise<BtwPayload> {
 		const canonicalPath = await this.validateLaunchFile(payloadPath, PAYLOAD_FILE);
-		if (!canonicalPath) throw new Error(`Missing /btw context payload: ${payloadPath}`);
 		const parsed: unknown = JSON.parse(await readFile(canonicalPath, "utf8"));
 		if (!isBtwPayload(parsed)) {
 			throw new Error("Invalid or unsupported /btw context payload");
@@ -204,7 +202,6 @@ export class ContextStore {
 				flag: "wx",
 				mode: 0o600,
 			});
-			await chmod(temporaryPath, 0o600);
 			await rename(temporaryPath, targetPath);
 		} catch (error) {
 			await rm(temporaryPath, { force: true }).catch(() => undefined);
@@ -218,6 +215,8 @@ export class ContextStore {
 		return JSON.parse(await readFile(canonicalPath, "utf8")) as unknown;
 	}
 
+	private validateLaunchFile(payloadPath: string, fileName: typeof PAYLOAD_FILE): Promise<string>;
+	private validateLaunchFile(payloadPath: string, fileName: string): Promise<string | undefined>;
 	private async validateLaunchFile(
 		payloadPath: string,
 		fileName: string,

package/internal/core.ts

@@ -249,13 +249,13 @@ export function buildParentContextMessage(contextDocument: string): AgentMessage
  * here, after the reusable parent prefix, so the system prompt and parent
  * messages stay byte-identical to the parent's own requests.
  */
-export function buildNativeBridgeMessage(instructions: string, draftHint?: string): AgentMessage {
+export function buildNativeBridgeMessage(instructions: string): AgentMessage {
 	return {
 		role: "user",
 		content: [
 			{
 				type: "text",
-				text: `The conversation above is a read-only snapshot of the parent session, replayed as reference context for this side conversation. It is not new work to continue.\n\n${instructions}${draftHint ? `\n\n${draftHint}` : ""}`,
+				text: `The conversation above is a read-only snapshot of the parent session, replayed as reference context for this side conversation. It is not new work to continue.\n\n${instructions}`,
 			},
 		],
 		timestamp: 0,
@@ -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.5",
+  "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"
   },