pi-herdr-agents 0.1.0 → 0.1.2

package/README.md

@@ -78,12 +78,6 @@ pi
 
 herdr is the only supported terminal environment. The extension requires `HERDR_ENV=1` and the `herdr` CLI to be available.
 
-If your shell startup is slow and subagent commands sometimes get dropped before the prompt is ready, set `PI_SUBAGENT_SHELL_READY_DELAY_MS` to a higher value (defaults to `500`):
-
-```bash
-export PI_SUBAGENT_SHELL_READY_DELAY_MS=2500
-```
-
 ### Troubleshooting completion delivery
 
 If a child finishes but the parent returns an empty or unrelated response, first verify that the result reached the parent session:
@@ -429,7 +423,7 @@ herdr_workflow({ action: "cancel", runId: "run-1" });
 
 - Cancel claims a process-global terminal gate. Completion, failure, interruption, and cancellation cannot each produce a terminal outcome.
 - Queued `agent()` calls resolve as cancelled; no later reviewer or synthesizer starts.
-- Active panes are queried through Herdr process-info before close so foreground process identities can be waited on.
+- New panes are queried through Herdr process-info until their interactive shell is ready before launch. Active panes are queried again before close so foreground process identities can be waited on.
 - After synchronous pane close, cancel waits for pane absence and captured process exit before disposing the reader checkout.
 - If process identity cannot be captured for an active pane, the pane remains present after close, or any captured process still lives after the bounded wait, the checkout is retained and the run ends `failed` with `cancel_termination_failed`. Successful cancellation is not reported in that case.
 - A successful cancel writes one `cancelled` terminal journal event and one result-free delivery. Repeated cancel is idempotent and returns the authoritative terminal outcome (including a prior fail-closed result).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-herdr-agents",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Asynchronous Pi subagents and approved review workflows in Herdr, with optional isolated Git worktrees",
   "keywords": [
     "pi-package",
@@ -49,9 +49,9 @@
     ]
   },
   "devDependencies": {
-    "@earendil-works/pi-ai": "^0.83.0",
-    "@earendil-works/pi-coding-agent": "^0.83.0",
-    "@earendil-works/pi-tui": "^0.83.0",
+    "@earendil-works/pi-ai": "^0.84.0",
+    "@earendil-works/pi-coding-agent": "^0.84.0",
+    "@earendil-works/pi-tui": "^0.84.0",
     "@sinclair/typebox": "^0.34.52",
     "oxlint": "^1.73.0"
   }

package/pi-extension/subagents/herdr.ts

@@ -129,6 +129,10 @@ function getHerdrParentPaneId(): string {
   return paneId;
 }
 
+function buildCurrentPaneArgs(): string[] {
+	return ["pane", "current", "--current"];
+}
+
 function getHerdrCurrentPaneInfo(): {
   pane_id: string;
   tab_id: string;
@@ -141,7 +145,7 @@ function getHerdrCurrentPaneInfo(): {
   // Fall back to `herdr pane current` if any identity env var is missing —
   // older herdr versions may not set all three.
   if (!paneId || !tabId || !workspaceId) {
-    const output = herdrExec(["pane", "current"]);
+    const output = herdrExec(buildCurrentPaneArgs());
     const parsed = parseHerdrJson(output);
 		const pane = (parsed as { result?: { pane?: unknown } } | null)?.result
 			?.pane as
@@ -449,6 +453,46 @@ export function getHerdrPaneProcessInfo(surface: string): HerdrPaneProcessInfo {
 	);
 }
 
+async function getHerdrPaneProcessInfoAsync(
+	surface: string,
+): Promise<HerdrPaneProcessInfo> {
+	return parsePaneProcessInfo(
+		await herdrExecAsync(["pane", "process-info", "--pane", surface]),
+		surface,
+	);
+}
+
+function isHerdrShellReady(info: HerdrPaneProcessInfo): boolean {
+	return (
+		info.shellPid != null &&
+		info.foregroundProcessGroupId === info.shellPid
+	);
+}
+
+export async function waitForHerdrShellReady(
+	surface: string,
+	options: { timeoutMs?: number; intervalMs?: number; signal?: AbortSignal } = {},
+): Promise<void> {
+	const timeoutMs = options.timeoutMs ?? 10_000;
+	const intervalMs = options.intervalMs ?? 50;
+	const deadline = Date.now() + timeoutMs;
+	let lastError = "no interactive shell foreground process";
+
+	while (Date.now() <= deadline) {
+		if (options.signal?.aborted) throw new Error("Shell readiness wait cancelled.");
+		try {
+			if (isHerdrShellReady(await getHerdrPaneProcessInfoAsync(surface))) return;
+		} catch (error) {
+			lastError = error instanceof Error ? error.message : String(error);
+		}
+		if (Date.now() >= deadline) break;
+		await new Promise((resolve) => setTimeout(resolve, intervalMs));
+	}
+	throw new Error(
+		`Timed out waiting for interactive shell in Herdr pane ${surface}: ${lastError}`,
+	);
+}
+
 export function isProcessAlive(pid: number): boolean {
 	try {
 		process.kill(pid, 0);
@@ -529,6 +573,7 @@ export function renameHerdrWorkspace(title: string): void {
 }
 
 export const __herdrTest__ = {
+  buildCurrentPaneArgs,
   buildTabCreateArgs,
   buildWorktreeCreateArgs,
   parseHerdrJson,
@@ -538,4 +583,5 @@ export const __herdrTest__ = {
   parsePaneGetOutput,
   parsePaneGetError,
 	parsePaneProcessInfo,
+	isHerdrShellReady,
 };

package/pi-extension/subagents/index.ts

@@ -39,6 +39,7 @@ import {
 	readPaneAsync,
 	inspectPane,
 	getPaneProcessInfo,
+	waitForShellReady,
 	waitForPaneAbsence,
 	waitForProcessesExit,
 } from "./terminal.ts";
@@ -803,19 +804,6 @@ function formatElapsed(seconds: number): string {
 	return `${m}m ${s}s`;
 }
 
-/**
- * Wait long enough for a freshly created pane to finish shell startup.
- *
- * Some environments do extra shell-init work before the prompt is ready
- * (for example direnv/devenv), so the delay is configurable for users who hit
- * dropped commands. Keep the historical default at 500ms.
- */
-function getShellReadyDelayMs(): number {
-	const raw = process.env.PI_SUBAGENT_SHELL_READY_DELAY_MS?.trim();
-	const parsed = raw ? Number.parseInt(raw, 10) : Number.NaN;
-	return Number.isFinite(parsed) && parsed >= 0 ? parsed : 500;
-}
-
 function muxUnavailableResult() {
 	return {
 		content: [
@@ -1984,7 +1972,6 @@ function buildWorkflowChildCommand(params: {
 
 export const __test__ = {
 	borderLine,
-	getShellReadyDelayMs,
 	renderSubagentWidgetLines,
 	loadAgentDefaults,
 	discoverAgentDefinitions,
@@ -2218,13 +2205,8 @@ async function launchSubagent(
 		});
 	}
 
-	// Use pre-created surface (parallel mode) or create a new one.
-	// For new surfaces, pause briefly so the shell is ready before sending the command.
-	if (!options?.surface) {
-		await new Promise<void>((resolve) =>
-			setTimeout(resolve, getShellReadyDelayMs()),
-		);
-	}
+	// `pane run` is safe only after the shell owns the foreground process group.
+	await waitForShellReady(surface);
 
 	const launchBehavior = resolveLaunchBehavior(params, agentDefs);
 
@@ -3009,9 +2991,7 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 			mkdirSync(dirname(sessionFile), { recursive: true });
 			surface = createSubagentPane(`${candidate.runId}: ${roleName}`);
 			owner.children.set(id, { controller: childController, surface });
-			await new Promise<void>((done) =>
-				setTimeout(done, getShellReadyDelayMs()),
-			);
+			await waitForShellReady(surface, { signal: childController.signal });
 			if (childController.signal.aborted)
 				return workflowFailure("cancelled", "Workflow cancelled.");
 			const command = buildWorkflowChildCommand({
@@ -4182,9 +4162,7 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 				const entryCountBefore = getNewEntries(params.sessionPath, 0).length;
 
 				const surface = createSubagentPane(name);
-				await new Promise<void>((resolve) =>
-					setTimeout(resolve, getShellReadyDelayMs()),
-				);
+				await waitForShellReady(surface);
 
 				// Build pi resume command
 				const parts = ["pi", "--session", shellQuote(params.sessionPath)];
@@ -4418,9 +4396,7 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 
 				sessionFile = createBtwSessionSnapshot(parentSessionFile, leafId);
 				surface = createSubagentPane("BTW");
-				await new Promise<void>((resolve) =>
-					setTimeout(resolve, getShellReadyDelayMs()),
-				);
+				await waitForShellReady(surface);
 
 				const artifactDir = getArtifactDir(
 					ctx.sessionManager.getSessionDir(),

package/pi-extension/subagents/terminal.ts

@@ -7,6 +7,7 @@ import {
   createHerdrSurfaceSplit,
   createHerdrWorktree,
 	getHerdrPaneProcessInfo,
+	waitForHerdrShellReady,
   isHerdrAvailable,
 	isProcessAlive,
   readHerdrScreen,
@@ -152,6 +153,14 @@ export function getPaneProcessInfo(paneId: PaneId): HerdrPaneProcessInfo {
 	return getHerdrPaneProcessInfo(paneId);
 }
 
+export async function waitForShellReady(
+	paneId: PaneId,
+	options?: { timeoutMs?: number; intervalMs?: number; signal?: AbortSignal },
+): Promise<void> {
+	assertTerminalAvailable();
+	return waitForHerdrShellReady(paneId, options);
+}
+
 export async function waitForPaneAbsence(
 	paneId: PaneId,
 	options?: { timeoutMs?: number; intervalMs?: number },