pi-cohort 7.1.2 → 7.2.1

package/src/runs/foreground/chain-execution.ts

@@ -32,6 +32,7 @@ import {
 } from "../../shared/settings.ts";
 import { discoverAvailableSkills, normalizeSkillInput } from "../../agents/skills.ts";
 import { runSync } from "./execution.ts";
+import type { PiRuntimeIdentity } from "../shared/pi-spawn.ts";
 import { buildChainSummary } from "../../shared/formatters.ts";
 import { compactForegroundDetails, getSingleResultOutput, mapConcurrent, resolveChildCwd } from "../../shared/utils.ts";
 import { recordRun } from "../shared/run-history.ts";
@@ -85,6 +86,7 @@ interface ChainExecutionDetailsInput {
 }
 
 interface ParallelChainRunInput {
+	runtime: PiRuntimeIdentity;
 	step: ParallelStep;
 	parallelTemplates: string[];
 	parallelBehaviors: ResolvedStepBehavior[];
@@ -260,6 +262,7 @@ async function runParallelChainTasks(input: ParallelChainRunInput): Promise<Sing
 				? createStructuredOutputRuntime(task.outputSchema, path.join(input.chainDir, "structured-output"))
 				: undefined;
 			const result = await runSync(input.ctx.cwd, input.agents, task.agent, taskStr, {
+				runtime: input.runtime,
 				cwd: taskCwd,
 				signal: input.signal,
 				interruptSignal: interruptController.signal,
@@ -347,6 +350,7 @@ async function runParallelChainTasks(input: ParallelChainRunInput): Promise<Sing
 }
 
 interface ChainExecutionParams {
+	runtime: PiRuntimeIdentity;
 	chain: ChainStep[];
 	task?: string;
 	agents: AgentConfig[];
@@ -629,6 +633,7 @@ export async function executeChain(params: ChainExecutionParams): Promise<ChainE
 				createParallelDirs(chainDir, stepIndex, step.parallel.length, agentNames);
 
 				const parallelResults = await runParallelChainTasks({
+					runtime: params.runtime,
 					step,
 					parallelTemplates,
 					parallelBehaviors,
@@ -822,6 +827,7 @@ export async function executeChain(params: ChainExecutionParams): Promise<ChainE
 			progressCreated = ensureParallelProgressFile(chainDir, progressCreated, parallelBehaviors);
 			createParallelDirs(chainDir, stepIndex, dynamicParallelStep.parallel.length, dynamicParallelStep.parallel.map((task) => task.agent));
 			const parallelResults = await runParallelChainTasks({
+				runtime: params.runtime,
 				step: dynamicParallelStep,
 				parallelTemplates,
 				parallelBehaviors,
@@ -1021,6 +1027,7 @@ export async function executeChain(params: ChainExecutionParams): Promise<ChainE
 				? createStructuredOutputRuntime(seqStep.outputSchema, path.join(chainDir, "structured-output"))
 				: undefined;
 			const r = await runSync(ctx.cwd, agents, seqStep.agent, stepTask, {
+				runtime: params.runtime,
 				cwd: resolveChildCwd(cwd ?? ctx.cwd, seqStep.cwd),
 				signal,
 				interruptSignal: interruptController.signal,

package/src/runs/foreground/execution.ts

@@ -41,7 +41,8 @@ import {
 } from "../../shared/utils.ts";
 import { buildSkillInjection, resolveSkillsWithFallback } from "../../agents/skills.ts";
 import { blockedLine } from "../shared/completion-guard.ts";
-import { getPiSpawnCommand } from "../shared/pi-spawn.ts";
+import { getPiSpawnCommand, PiRuntimeLaunchError } from "../shared/pi-spawn.ts";
+import { PINNED_AGENT_DIR_OVERRIDE } from "../../shared/agent-dir.ts";
 import { createJsonlWriter } from "../../shared/jsonl-writer.ts";
 import { attachPostExitStdioGuard, trySignalChild } from "../../shared/post-exit-stdio-guard.ts";
 import { buildPiArgs, cleanupTempDir } from "../shared/pi-args.ts";
@@ -170,11 +171,11 @@ async function runSingleAttempt(
 	let interruptedByControl = false;
 	let pendingControlEvents: ControlEvent[] = init.pendingControlEvents;
 	const controlConfig = init.controlConfig;
-	const spawnEnv = { ...process.env, ...sharedEnv, ...getSubagentDepthEnv(options.maxSubagentDepth) };
+	const spawnEnv = { ...process.env, ...sharedEnv, ...getSubagentDepthEnv(options.maxSubagentDepth), ...(PINNED_AGENT_DIR_OVERRIDE ? { PI_CODING_AGENT_DIR: PINNED_AGENT_DIR_OVERRIDE } : {}) };
 	let observedMutationAttempt = false;
 
-	const exitCode = await new Promise<number>((resolve) => {
-		const spawnSpec = getPiSpawnCommand(args);
+	const exitCode = await new Promise<number>((resolve, reject) => {
+		const spawnSpec = getPiSpawnCommand(args, options.runtime);
 		const proc = spawn(spawnSpec.command, spawnSpec.args, {
 			cwd: options.cwd ?? runtimeCwd,
 			env: spawnEnv,
@@ -553,6 +554,7 @@ async function runSingleAttempt(
 			if (!result.error) {
 				result.error = error instanceof Error ? error.message : String(error);
 			}
+			reject(new PiRuntimeLaunchError(`${options.runtime.nodeExecPath} ${options.runtime.piEntryPath}: ${error.message}`));
 			finish(1);
 		});
 
@@ -591,7 +593,7 @@ async function runSingleAttempt(
 				removeInterruptListener = () => options.interruptSignal?.removeEventListener("abort", interrupt);
 			}
 		}
-	});
+	}).finally(() => cleanupTempDir(tempDir));
 	result.exitCode = exitCode;
 	return finalizeSingleAttempt(result, progress, {
 		agent,
@@ -640,6 +642,12 @@ export async function runSync(
 		};
 	}
 
+	try {
+		getPiSpawnCommand([], options.runtime);
+	} catch (error) {
+		return failedResult(agentName, task, error instanceof Error ? error.message : String(error));
+	}
+
 	const childCwd = options.cwd ?? runtimeCwd;
 	let backendSelection: ExecutionBackendSelectionResult;
 	try {
@@ -717,6 +725,7 @@ export async function runSync(
 		try {
 			externalOwner = await (dependencies.createExternalOwner ?? createExternalExecution)({
 				backend: backendSelection.selection.backend,
+				runtime: options.runtime,
 				runId: options.runId,
 				childId,
 				cwd: childCwd,
@@ -724,8 +733,8 @@ export async function runSync(
 				signal: options.signal ?? NEVER_ABORTED_SIGNAL,
 			});
 			await externalOwner.ready;
-		} catch {
-			lastResult = failedResult(agentName, task, safeExternalFailure("startup"));
+		} catch (error) {
+			lastResult = failedResult(agentName, task, error instanceof PiRuntimeLaunchError ? error.message : safeExternalFailure("startup"));
 		}
 	}
 
@@ -746,6 +755,7 @@ export async function runSync(
 			originalTask: task,
 		};
 		let result: SingleResult;
+		let runtimeFailure = false;
 		if (externalOwner) {
 			try {
 				result = await (dependencies.runExternalAttempt ?? runExternalSingleAttempt)({
@@ -758,13 +768,20 @@ export async function runSync(
 					options,
 					shared,
 				});
-			} catch {
-				result = failedResult(agentName, task, safeExternalFailure("attempt"));
+			} catch (error) {
+				runtimeFailure = error instanceof PiRuntimeLaunchError;
+				result = failedResult(agentName, task, runtimeFailure ? (error as Error).message : safeExternalFailure("attempt"));
 			}
 		} else {
-			result = await (dependencies.runNativeAttempt ?? runSingleAttempt)(
-				runtimeCwd, effectiveAgent, taskWithAcceptance, candidate, options, shared,
-			);
+			try {
+				result = await (dependencies.runNativeAttempt ?? runSingleAttempt)(
+					runtimeCwd, effectiveAgent, taskWithAcceptance, candidate, options, shared,
+				);
+			} catch (error) {
+				if (!(error instanceof PiRuntimeLaunchError)) throw error;
+				runtimeFailure = true;
+				result = failedResult(agentName, task, error.message);
+			}
 		}
 		lastResult = result;
 		sumUsage(aggregateUsage, result.usage);
@@ -782,7 +799,7 @@ export async function runSync(
 		if (attemptSucceeded) {
 			break;
 		}
-		if (blockedLine(result.error ?? "") || !isRetryableModelFailure(result.error) || i === modelsToTry.length - 1) {
+		if (runtimeFailure || blockedLine(result.error ?? "") || !isRetryableModelFailure(result.error) || i === modelsToTry.length - 1) {
 			break;
 		}
 		attemptNotes.push(formatModelAttemptNote(attempt, modelsToTry[i + 1]));

package/src/runs/foreground/external-single-attempt.ts

@@ -12,6 +12,7 @@ import type { RunSyncOptions, SingleResult, Usage } from "../../shared/types.ts"
 import { getSubagentDepthEnv } from "../../shared/types.ts";
 import { buildPiArgs, cleanupTempDir } from "../shared/pi-args.ts";
 import { getPiSpawnCommand } from "../shared/pi-spawn.ts";
+import { PINNED_AGENT_DIR_OVERRIDE } from "../../shared/agent-dir.ts";
 import { isMutatingTool } from "../shared/long-running-guard.ts";
 import type { ExternalAttemptResult, ExternalExecution } from "../shared/external-execution.ts";
 import { type AttemptSharedInit, finalizeSingleAttempt, initializeAttempt } from "./attempt-finalization.ts";
@@ -104,8 +105,8 @@ export async function runExternalSingleAttempt(input: RunExternalSingleAttemptIn
 		args.push("--extension", REPORTING_EXTENSION_PATH);
 		if (taskArg !== undefined) args.push(taskArg);
 
-		const spawnSpec = getPiSpawnCommand(args);
-		const mergedEnv: Record<string, string | undefined> = { ...process.env, ...sharedEnv, ...getSubagentDepthEnv(options.maxSubagentDepth) };
+		const spawnSpec = getPiSpawnCommand(args, options.runtime);
+		const mergedEnv: Record<string, string | undefined> = { ...process.env, ...sharedEnv, ...getSubagentDepthEnv(options.maxSubagentDepth), ...(PINNED_AGENT_DIR_OVERRIDE ? { PI_CODING_AGENT_DIR: PINNED_AGENT_DIR_OVERRIDE } : {}) };
 		const environment: Record<string, string> = {};
 		for (const [key, value] of Object.entries(mergedEnv)) {
 			if (value !== undefined) environment[key] = value;