pi-subagents 0.21.4 → 0.22.0

package/src/runs/background/run-status.ts

@@ -1,10 +1,11 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import type { AgentToolResult } from "@mariozechner/pi-agent-core";
-import { formatAsyncRunList, listAsyncRuns } from "./async-status.ts";
-import { ASYNC_DIR, RESULTS_DIR, type Details } from "../../shared/types.ts";
+import { formatAsyncRunList, formatAsyncRunProgressLabel, listAsyncRuns } from "./async-status.ts";
+import { ASYNC_DIR, RESULTS_DIR, type AsyncStatus, type Details } from "../../shared/types.ts";
 import { resolveSubagentIntercomTarget } from "../../intercom/intercom-bridge.ts";
 import { resolveAsyncRunLocation } from "./async-resume.ts";
+import { flatToLogicalStepIndex, normalizeParallelGroups } from "./parallel-groups.ts";
 import { reconcileAsyncRun } from "./stale-run-reconciler.ts";
 
 interface RunStatusParams {
@@ -31,6 +32,19 @@ function canShowRevive(stepCount: number, sessionFile: unknown): sessionFile is
 	return stepCount === 1 && typeof sessionFile === "string" && fs.existsSync(sessionFile);
 }
 
+function stepLineLabel(status: AsyncStatus, index: number): string {
+	const steps = status.steps ?? [];
+	if (status.mode === "parallel") return `Agent ${index + 1}/${steps.length || 1}`;
+	if (status.mode === "chain") {
+		const chainStepCount = status.chainStepCount ?? (steps.length || 1);
+		const groups = normalizeParallelGroups(status.parallelGroups, steps.length, chainStepCount);
+		const group = groups.find((candidate) => index >= candidate.start && index < candidate.start + candidate.count);
+		if (group) return `Step ${group.stepIndex + 1}/${chainStepCount} Agent ${index - group.start + 1}/${group.count}`;
+		return `Step ${flatToLogicalStepIndex(index, chainStepCount, groups) + 1}/${chainStepCount}`;
+	}
+	return `Step ${index + 1}`;
+}
+
 export function inspectSubagentStatus(params: RunStatusParams, deps: RunStatusDeps = {}): AgentToolResult<Details> {
 	const asyncDirRoot = deps.asyncDirRoot ?? ASYNC_DIR;
 	const resultsDir = deps.resultsDir ?? RESULTS_DIR;
@@ -89,9 +103,14 @@ export function inspectSubagentStatus(params: RunStatusParams, deps: RunStatusDe
 		const logPath = path.join(asyncDir, `subagent-log-${effectiveRunId}.md`);
 		const eventsPath = path.join(asyncDir, "events.jsonl");
 		if (status) {
-			const stepsTotal = status.steps?.length ?? 1;
-			const current = status.currentStep !== undefined ? status.currentStep + 1 : undefined;
-			const stepLine = current !== undefined ? `Step: ${current}/${stepsTotal}` : `Steps: ${stepsTotal}`;
+			const progressLabel = formatAsyncRunProgressLabel({
+				mode: status.mode,
+				state: status.state,
+				currentStep: status.currentStep,
+				chainStepCount: status.chainStepCount,
+				parallelGroups: status.parallelGroups,
+				steps: (status.steps ?? []).map((step, index) => ({ index, agent: step.agent, status: step.status })),
+			});
 			const started = new Date(status.startedAt).toISOString();
 			const updated = status.lastUpdate ? new Date(status.lastUpdate).toISOString() : "n/a";
 			const statusActivityText = status.state === "running" ? activityText(status.activityState, status.lastActivityAt) : undefined;
@@ -101,7 +120,7 @@ export function inspectSubagentStatus(params: RunStatusParams, deps: RunStatusDe
 				`State: ${status.state}`,
 				statusActivityText ? `Activity: ${statusActivityText}` : undefined,
 				`Mode: ${status.mode}`,
-				stepLine,
+				`Progress: ${progressLabel}`,
 				`Started: ${started}`,
 				`Updated: ${updated}`,
 				`Dir: ${asyncDir}`,
@@ -111,7 +130,7 @@ export function inspectSubagentStatus(params: RunStatusParams, deps: RunStatusDe
 			for (const [index, step] of (status.steps ?? []).entries()) {
 				const stepActivityText = step.status === "running" ? activityText(step.activityState, step.lastActivityAt) : undefined;
 				const errorText = step.error ? `, error: ${step.error}` : "";
-				lines.push(`Step ${index + 1}: ${step.agent} ${step.status}${stepActivityText ? `, ${stepActivityText}` : ""}${errorText}`);
+				lines.push(`${stepLineLabel(status, index)}: ${step.agent} ${step.status}${stepActivityText ? `, ${stepActivityText}` : ""}${errorText}`);
 				if (step.status === "running") {
 					lines.push(`  Intercom target: ${resolveSubagentIntercomTarget(status.runId, step.agent, index)} (if registered)`);
 				}

package/src/runs/background/stale-run-reconciler.ts

@@ -1,7 +1,8 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { writeAtomicJson } from "../../shared/atomic-json.ts";
-import { RESULTS_DIR, type AsyncStatus } from "../../shared/types.ts";
+import { RESULTS_DIR, type AsyncParallelGroupStatus, type AsyncStatus, type SubagentRunMode } from "../../shared/types.ts";
+import { normalizeParallelGroups } from "./parallel-groups.ts";
 
 export type PidLiveness = "alive" | "dead" | "unknown";
 
@@ -10,8 +11,11 @@ type KillFn = (pid: number, signal?: NodeJS.Signals | 0) => boolean;
 interface StartedRunMetadata {
 	runId: string;
 	pid?: number;
-	mode?: "single" | "chain";
+	sessionId?: string;
+	mode?: SubagentRunMode;
 	agents?: string[];
+	chainStepCount?: number;
+	parallelGroups?: AsyncParallelGroupStatus[];
 	startedAt?: number;
 	sessionFile?: string;
 }
@@ -133,13 +137,21 @@ function terminalStatusFromResult(status: AsyncStatus, resultPath: string, now:
 function buildStartedStatus(asyncDir: string, startedRun: StartedRunMetadata, now: number): AsyncStatus {
 	const startedAt = startedRun.startedAt ?? now;
 	const agents = startedRun.agents?.length ? startedRun.agents : ["subagent"];
+	const chainStepCount = startedRun.chainStepCount;
+	const parallelGroups = chainStepCount !== undefined
+		? normalizeParallelGroups(startedRun.parallelGroups, agents.length, chainStepCount)
+		: [];
 	return {
 		runId: startedRun.runId || path.basename(asyncDir),
+		...(startedRun.sessionId ? { sessionId: startedRun.sessionId } : {}),
 		mode: startedRun.mode ?? "single",
 		state: "running",
 		pid: startedRun.pid,
 		startedAt,
 		lastUpdate: now,
+		currentStep: 0,
+		...(chainStepCount !== undefined ? { chainStepCount } : {}),
+		...(parallelGroups.length ? { parallelGroups } : {}),
 		steps: agents.map((agent) => ({
 			agent,
 			status: "running" as const,
@@ -197,6 +209,7 @@ function buildFailedRepair(status: AsyncStatus, asyncDir: string, now: number, r
 			timestamp: now,
 			durationMs: Math.max(0, now - status.startedAt),
 			asyncDir,
+			sessionId: status.sessionId,
 			sessionFile: status.sessionFile,
 		},
 	};

package/src/runs/background/subagent-runner.ts

@@ -16,6 +16,7 @@ import {
 	type AsyncStatus,
 	type ModelAttempt,
 	type ResolvedControlConfig,
+	type SubagentRunMode,
 	type Usage,
 	DEFAULT_MAX_OUTPUT,
 	type MaxOutputConfig,
@@ -90,7 +91,7 @@ interface SubagentRunConfig {
 	controlConfig?: ResolvedControlConfig;
 	controlIntercomTarget?: string;
 	childIntercomTargets?: Array<string | undefined>;
-	resultMode?: "single" | "parallel" | "chain";
+	resultMode?: SubagentRunMode;
 }
 
 interface StepResult {
@@ -472,7 +473,7 @@ function writeRunLog(
 	logPath: string,
 	input: {
 		id: string;
-		mode: "single" | "chain";
+		mode: SubagentRunMode;
 		cwd: string;
 		startedAt: number;
 		endedAt: number;
@@ -537,6 +538,7 @@ interface SingleStepContext {
 	piArgv1?: string;
 	registerInterrupt?: (interrupt: (() => void) | undefined) => void;
 	childIntercomTarget?: string;
+	orchestratorIntercomTarget?: string;
 	onChildEvent?: (event: ChildEvent) => void;
 }
 
@@ -603,6 +605,10 @@ async function runSingleStep(
 			mcpDirectTools: step.mcpDirectTools,
 			promptFileStem: step.agent,
 			intercomSessionName: ctx.childIntercomTarget,
+			orchestratorIntercomTarget: ctx.orchestratorIntercomTarget,
+			runId: ctx.id,
+			childAgentName: step.agent,
+			childIndex: ctx.flatIndex,
 		});
 		const run = await runPiStreaming(
 			args,
@@ -877,7 +883,8 @@ async function runSubagent(config: SubagentRunConfig): Promise<void> {
 		|| flatSteps.some((step) => Boolean(step.sessionFile));
 	const statusPayload: RunnerStatusPayload = {
 		runId: id,
-		mode: flatSteps.length > 1 ? "chain" : "single",
+		...(config.sessionId ? { sessionId: config.sessionId } : {}),
+		mode: config.resultMode ?? (flatSteps.length > 1 ? "chain" : "single"),
 		state: "running",
 		lastActivityAt: overallStartTime,
 		startedAt: overallStartTime,
@@ -1297,6 +1304,7 @@ async function runSubagent(config: SubagentRunConfig): Promise<void> {
 							piPackageRoot: config.piPackageRoot,
 							piArgv1: config.piArgv1,
 							childIntercomTarget: config.childIntercomTargets?.[fi],
+							orchestratorIntercomTarget: config.controlIntercomTarget,
 							registerInterrupt: (interrupt) => {
 								activeChildInterrupt = interrupt;
 							},
@@ -1437,6 +1445,7 @@ async function runSubagent(config: SubagentRunConfig): Promise<void> {
 				piPackageRoot: config.piPackageRoot,
 				piArgv1: config.piArgv1,
 				childIntercomTarget: config.childIntercomTargets?.[flatIndex],
+				orchestratorIntercomTarget: config.controlIntercomTarget,
 				registerInterrupt: (interrupt) => {
 					activeChildInterrupt = interrupt;
 				},

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

@@ -18,15 +18,10 @@ import { createEditorState, ensureCursorVisible, getCursorDisplayPos, handleEdit
 import { updateFrontmatterField } from "../../agents/agent-serializer.ts";
 import { serializeChain } from "../../agents/chain-serializer.ts";
 import { resolveModelCandidate, splitThinkingSuffix } from "../shared/model-fallback.ts";
+import { findModelInfo, getSupportedThinkingLevels, type ModelInfo, type ThinkingLevel } from "../../shared/model-info.ts";
 
 type ClarifyMode = 'single' | 'parallel' | 'chain';
 
-export interface ModelInfo {
-	provider: string;
-	id: string;
-	fullId: string;
-}
-
 export interface BehaviorOverride {
 	output?: string | false;
 	reads?: string[] | false;
@@ -44,9 +39,6 @@ export interface ChainClarifyResult {
 
 type EditMode = "template" | "output" | "reads" | "model" | "thinking" | "skills";
 
-const THINKING_LEVELS = ["off", "minimal", "low", "medium", "high", "xhigh"] as const;
-type ThinkingLevel = typeof THINKING_LEVELS[number];
-
 /**
  * TUI component for chain clarification.
  * Factory signature matches ctx.ui.custom: (tui, theme, kb, done) => Component
@@ -602,7 +594,10 @@ export class ChainClarifyComponent implements Component {
 			const selected = this.filteredModels[this.modelSelectedIndex];
 			if (selected) {
 				const { thinkingSuffix } = splitThinkingSuffix(this.getEffectiveModel(this.editingStep!));
-				this.updateBehavior(this.editingStep!, "model", `${selected.fullId}${thinkingSuffix}`);
+				const requestedLevel = thinkingSuffix.slice(1);
+				const selectedModel = findModelInfo(selected.fullId, this.availableModels, this.preferredProvider);
+				const suffix = getSupportedThinkingLevels(selectedModel).some((level) => level === requestedLevel) ? thinkingSuffix : "";
+				this.updateBehavior(this.editingStep!, "model", `${selected.fullId}${suffix}`);
 			}
 			this.exitEditMode();
 			return;
@@ -645,6 +640,10 @@ export class ChainClarifyComponent implements Component {
 		}
 	}
 
+	private getAvailableThinkingLevels(stepIndex: number): ThinkingLevel[] {
+		return getSupportedThinkingLevels(findModelInfo(this.getEffectiveModel(stepIndex), this.availableModels, this.preferredProvider));
+	}
+
 	/** Enter thinking level selector mode */
 	private enterThinkingSelector(): void {
 		if (!this.getEffectiveBehavior(this.selectedStep).model) {
@@ -654,15 +653,11 @@ export class ChainClarifyComponent implements Component {
 		this.editingStep = this.selectedStep;
 		this.editMode = "thinking";
 
-		const currentModel = this.getEffectiveModel(this.selectedStep);
-		const colonIdx = currentModel.lastIndexOf(":");
-		if (colonIdx !== -1) {
-			const suffix = currentModel.substring(colonIdx + 1);
-			const levelIdx = THINKING_LEVELS.indexOf(suffix as ThinkingLevel);
-			this.thinkingSelectedIndex = levelIdx >= 0 ? levelIdx : 0;
-		} else {
-			this.thinkingSelectedIndex = 0;
-		}
+		const levels = this.getAvailableThinkingLevels(this.selectedStep);
+		const { thinkingSuffix } = splitThinkingSuffix(this.getEffectiveModel(this.selectedStep));
+		const suffix = thinkingSuffix.slice(1);
+		const levelIdx = levels.findIndex((level) => level === suffix);
+		this.thinkingSelectedIndex = levelIdx >= 0 ? levelIdx : Math.max(0, levels.indexOf("off"));
 
 		this.tui.requestRender();
 	}
@@ -673,8 +668,11 @@ export class ChainClarifyComponent implements Component {
 			return;
 		}
 
+		const levels = this.getAvailableThinkingLevels(this.editingStep!);
+		if (levels.length === 0) return;
+
 		if (matchesKey(data, "return")) {
-			const selectedLevel = THINKING_LEVELS[this.thinkingSelectedIndex];
+			const selectedLevel = levels[this.thinkingSelectedIndex] ?? "off";
 			this.applyThinkingLevel(selectedLevel);
 			this.exitEditMode();
 			return;
@@ -682,14 +680,14 @@ export class ChainClarifyComponent implements Component {
 
 		if (matchesKey(data, "up")) {
 			this.thinkingSelectedIndex = this.thinkingSelectedIndex === 0
-				? THINKING_LEVELS.length - 1
+				? levels.length - 1
 				: this.thinkingSelectedIndex - 1;
 			this.tui.requestRender();
 			return;
 		}
 
 		if (matchesKey(data, "down")) {
-			this.thinkingSelectedIndex = this.thinkingSelectedIndex === THINKING_LEVELS.length - 1
+			this.thinkingSelectedIndex = this.thinkingSelectedIndex === levels.length - 1
 				? 0
 				: this.thinkingSelectedIndex + 1;
 			this.tui.requestRender();
@@ -1044,13 +1042,18 @@ export class ChainClarifyComponent implements Component {
 			"xhigh": "Maximum reasoning (ultrathink)",
 		};
 
-		for (let i = 0; i < THINKING_LEVELS.length; i++) {
-			const level = THINKING_LEVELS[i];
-			const isSelected = i === this.thinkingSelectedIndex;
-			const prefix = isSelected ? th.fg("accent", "→ ") : "  ";
-			const levelText = isSelected ? th.fg("accent", level) : level;
-			const desc = th.fg("dim", ` - ${levelDescriptions[level]}`);
-			lines.push(this.row(` ${prefix}${levelText}${desc}`));
+		const levels = this.getAvailableThinkingLevels(this.editingStep!);
+		if (levels.length === 0) {
+			lines.push(this.row(` ${th.fg("dim", "No supported thinking levels")}`));
+		} else {
+			for (let i = 0; i < levels.length; i++) {
+				const level = levels[i]!;
+				const isSelected = i === this.thinkingSelectedIndex;
+				const prefix = isSelected ? th.fg("accent", "→ ") : "  ";
+				const levelText = isSelected ? th.fg("accent", level) : level;
+				const desc = th.fg("dim", ` - ${levelDescriptions[level]}`);
+				lines.push(this.row(` ${prefix}${levelText}${desc}`));
+			}
 		}
 
 		const contentLines = lines.length;
@@ -1059,7 +1062,9 @@ export class ChainClarifyComponent implements Component {
 			lines.push(this.row(""));
 		}
 
-		const footerText = " [Enter] Select • [Esc] Cancel • ↑↓ Navigate ";
+		const footerText = levels.length === 0
+			? " [Esc] Cancel "
+			: " [Enter] Select • [Esc] Cancel • ↑↓ Navigate ";
 		lines.push(this.renderFooter(footerText));
 
 		return lines;

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

@@ -7,7 +7,8 @@ import * as path from "node:path";
 import type { AgentToolResult } from "@mariozechner/pi-agent-core";
 import type { ExtensionContext } from "@mariozechner/pi-coding-agent";
 import type { AgentConfig } from "../../agents/agents.ts";
-import { ChainClarifyComponent, type ChainClarifyResult, type BehaviorOverride, type ModelInfo } from "./chain-clarify.ts";
+import { ChainClarifyComponent, type ChainClarifyResult, type BehaviorOverride } from "./chain-clarify.ts";
+import { toModelInfo, type ModelInfo } from "../../shared/model-info.ts";
 import {
 	resolveChainTemplates,
 	createChainDir,
@@ -93,6 +94,7 @@ interface ParallelChainRunInput {
 	onControlEvent?: (event: ControlEvent) => void;
 	controlConfig: ResolvedControlConfig;
 	childIntercomTarget?: (agent: string, index: number) => string | undefined;
+	orchestratorIntercomTarget?: string;
 	foregroundControl?: {
 		updatedAt: number;
 		currentAgent?: string;
@@ -240,6 +242,7 @@ async function runParallelChainTasks(input: ParallelChainRunInput): Promise<Sing
 				controlConfig: input.controlConfig,
 				onControlEvent: input.onControlEvent,
 				intercomSessionName: input.childIntercomTarget?.(task.agent, input.globalTaskIndex + taskIndex),
+				orchestratorIntercomTarget: input.orchestratorIntercomTarget,
 				modelOverride: effectiveModel,
 				availableModels: input.availableModels,
 				preferredModelProvider: input.ctx.model?.provider,
@@ -313,6 +316,7 @@ interface ChainExecutionParams {
 	onControlEvent?: (event: ControlEvent) => void;
 	controlConfig: ResolvedControlConfig;
 	childIntercomTarget?: (agent: string, index: number) => string | undefined;
+	orchestratorIntercomTarget?: string;
 	foregroundControl?: {
 		updatedAt: number;
 		currentAgent?: string;
@@ -363,6 +367,7 @@ export async function executeChain(params: ChainExecutionParams): Promise<ChainE
 		onControlEvent,
 		controlConfig,
 		childIntercomTarget,
+		orchestratorIntercomTarget,
 		foregroundControl,
 		intercomEvents,
 		chainSkills: chainSkillsParam,
@@ -389,11 +394,7 @@ export async function executeChain(params: ChainExecutionParams): Promise<ChainE
 	let templates: ResolvedTemplates = resolveChainTemplates(chainSteps);
 	const shouldClarify = clarify !== false && ctx.hasUI && !hasParallelSteps;
 	let tuiBehaviorOverrides: (BehaviorOverride | undefined)[] | undefined;
-	const availableModels: ModelInfo[] = ctx.modelRegistry.getAvailable().map((m) => ({
-		provider: m.provider,
-		id: m.id,
-		fullId: `${m.provider}/${m.id}`,
-	}));
+	const availableModels: ModelInfo[] = ctx.modelRegistry.getAvailable().map(toModelInfo);
 	const availableSkills = discoverAvailableSkills(cwd ?? ctx.cwd);
 
 	if (shouldClarify) {
@@ -586,6 +587,7 @@ export async function executeChain(params: ChainExecutionParams): Promise<ChainE
 					controlConfig,
 					onControlEvent,
 					childIntercomTarget,
+					orchestratorIntercomTarget,
 					foregroundControl,
 					worktreeSetup,
 					maxSubagentDepth: params.maxSubagentDepth,
@@ -771,6 +773,7 @@ export async function executeChain(params: ChainExecutionParams): Promise<ChainE
 				controlConfig,
 				onControlEvent,
 				intercomSessionName: childIntercomTarget?.(seqStep.agent, globalTaskIndex),
+				orchestratorIntercomTarget,
 				modelOverride: effectiveModel,
 				availableModels,
 				preferredModelProvider: ctx.model?.provider,

package/src/runs/foreground/execution.ts

@@ -153,6 +153,10 @@ async function runSingleAttempt(
 		mcpDirectTools: agent.mcpDirectTools,
 		promptFileStem: agent.name,
 		intercomSessionName: options.intercomSessionName,
+		orchestratorIntercomTarget: options.orchestratorIntercomTarget,
+		runId: options.runId,
+		childAgentName: agent.name,
+		childIndex: options.index ?? 0,
 	});
 
 	const result: SingleResult = {

package/src/runs/foreground/subagent-executor.ts

@@ -5,7 +5,8 @@ import type { AgentToolResult } from "@mariozechner/pi-agent-core";
 import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
 import { type AgentConfig, type AgentScope } from "../../agents/agents.ts";
 import { getArtifactsDir } from "../../shared/artifacts.ts";
-import { ChainClarifyComponent, type ChainClarifyResult, type ModelInfo } from "./chain-clarify.ts";
+import { ChainClarifyComponent, type ChainClarifyResult } from "./chain-clarify.ts";
+import { toModelInfo, type ModelInfo } from "../../shared/model-info.ts";
 import { executeChain } from "./chain-execution.ts";
 import { resolveExecutionAgentScope } from "../../agents/agent-scope.ts";
 import { handleManagementAction } from "../../agents/agent-management.ts";
@@ -29,6 +30,7 @@ import {
 import { discoverAvailableSkills, normalizeSkillInput } from "../../agents/skills.ts";
 import { executeAsyncChain, executeAsyncSingle, isAsyncAvailable } from "../background/async-execution.ts";
 import { createForkContextResolver } from "../../shared/fork-context.ts";
+import { resolveCurrentSessionId } from "../../shared/session-identity.ts";
 import { applyIntercomBridgeToAgent, INTERCOM_BRIDGE_MARKER, resolveIntercomBridge, resolveIntercomSessionTarget, resolveSubagentIntercomTarget, type IntercomBridgeState } from "../../intercom/intercom-bridge.ts";
 import { formatControlIntercomMessage, formatControlNoticeMessage, resolveControlConfig, shouldNotifyControlEvent } from "../shared/subagent-control.ts";
 import { finalizeSingleOutput, injectSingleOutputInstruction, resolveSingleOutputPath, validateFileOnlyOutputMode } from "../shared/single-output.ts";
@@ -65,6 +67,7 @@ import {
 	type MaxOutputConfig,
 	type ResolvedControlConfig,
 	type SingleResult,
+	type SubagentRunMode,
 	type SubagentState,
 	DEFAULT_ARTIFACT_CONFIG,
 	SUBAGENT_ACTIONS,
@@ -332,7 +335,7 @@ async function resumeAsyncRun(input: {
 	}
 
 	const parentSessionFile = input.ctx.sessionManager.getSessionFile() ?? null;
-	input.deps.state.currentSessionId = parentSessionFile ?? `session-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+	input.deps.state.currentSessionId = resolveCurrentSessionId(input.ctx.sessionManager);
 	const effectiveCwd = target.cwd ?? input.requestCwd;
 	const scope: AgentScope = resolveExecutionAgentScope(input.params.agentScope);
 	const discoveredAgents = input.deps.discoverAgents(effectiveCwd, scope).agents;
@@ -356,11 +359,7 @@ async function resumeAsyncRun(input: {
 
 	const runId = randomUUID().slice(0, 8);
 	const artifactConfig: ArtifactConfig = { ...DEFAULT_ARTIFACT_CONFIG, enabled: input.params.artifacts !== false };
-	const availableModels = input.ctx.modelRegistry.getAvailable().map((m) => ({
-		provider: m.provider,
-		id: m.id,
-		fullId: `${m.provider}/${m.id}`,
-	}));
+	const availableModels = input.ctx.modelRegistry.getAvailable().map(toModelInfo);
 	const result = executeAsyncSingle(runId, {
 		agent: target.agent,
 		task: buildRevivedAsyncTask(target, followUp),
@@ -423,7 +422,7 @@ async function emitForegroundResultIntercom(input: {
 	pi: ExtensionAPI;
 	intercomBridge: IntercomBridgeState;
 	runId: string;
-	mode: "single" | "parallel" | "chain";
+	mode: SubagentRunMode;
 	results: SingleResult[];
 	chainSteps?: number;
 }): Promise<ReturnType<typeof buildSubagentResultIntercomPayload> | null> {
@@ -459,7 +458,7 @@ async function maybeBuildForegroundIntercomReceipt(input: {
 	pi: ExtensionAPI;
 	intercomBridge: IntercomBridgeState;
 	runId: string;
-	mode: "single" | "parallel" | "chain";
+	mode: SubagentRunMode;
 	details: Details;
 }): Promise<{ text: string; details: Details } | null> {
 	const payload = await emitForegroundResultIntercom({
@@ -780,11 +779,7 @@ function runAsyncPath(data: ExecutionContextData, deps: ExecutorDeps): AgentTool
 		currentSessionId: deps.state.currentSessionId!,
 		currentModelProvider: ctx.model?.provider,
 	};
-	const availableModels: ModelInfo[] = ctx.modelRegistry.getAvailable().map((m) => ({
-		provider: m.provider,
-		id: m.id,
-		fullId: `${m.provider}/${m.id}`,
-	}));
+	const availableModels: ModelInfo[] = ctx.modelRegistry.getAvailable().map(toModelInfo);
 	const currentMaxSubagentDepth = resolveCurrentMaxSubagentDepth(deps.config.maxSubagentDepth);
 	const currentProvider = ctx.model?.provider;
 	const controlIntercomTarget = intercomBridge.active ? intercomBridge.orchestratorTarget : undefined;
@@ -949,6 +944,7 @@ async function runChainPath(data: ExecutionContextData, deps: ExecutorDeps): Pro
 		onControlEvent,
 		controlConfig,
 		childIntercomTarget: childIntercomTarget ? (agent, index) => childIntercomTarget(runId, agent, index) : undefined,
+		orchestratorIntercomTarget: data.intercomBridge.active ? data.intercomBridge.orchestratorTarget : undefined,
 		foregroundControl,
 		chainSkills,
 		chainDir: params.chainDir,
@@ -977,11 +973,7 @@ async function runChainPath(data: ExecutionContextData, deps: ExecutorDeps): Pro
 			chain: asyncChain,
 			agents,
 			ctx: asyncCtx,
-			availableModels: ctx.modelRegistry.getAvailable().map((m) => ({
-				provider: m.provider,
-				id: m.id,
-				fullId: `${m.provider}/${m.id}`,
-			})),
+			availableModels: ctx.modelRegistry.getAvailable().map(toModelInfo),
 			cwd: effectiveCwd,
 			maxOutput: params.maxOutput,
 			artifactsDir: artifactConfig.enabled ? artifactsDir : undefined,
@@ -1043,6 +1035,7 @@ interface ForegroundParallelRunInput {
 	controlConfig: ResolvedControlConfig;
 	onControlEvent?: (event: ControlEvent) => void;
 	childIntercomTarget?: (agent: string, index: number) => string | undefined;
+	orchestratorIntercomTarget?: string;
 	foregroundControl?: SubagentState["foregroundControls"] extends Map<string, infer T> ? T : never;
 	concurrencyLimit: number;
 	liveResults: (SingleResult | undefined)[];
@@ -1201,6 +1194,7 @@ async function runForegroundParallelTasks(input: ForegroundParallelRunInput): Pr
 			controlConfig: input.controlConfig,
 			onControlEvent: input.onControlEvent,
 			intercomSessionName: input.childIntercomTarget?.(task.agent, index),
+			orchestratorIntercomTarget: input.orchestratorIntercomTarget,
 			modelOverride: input.modelOverrides[index],
 			availableModels: input.availableModels,
 			preferredModelProvider: input.ctx.model?.provider,
@@ -1305,11 +1299,7 @@ async function runParallelPath(data: ExecutionContextData, deps: ExecutorDeps):
 	}
 
 	const currentProvider = ctx.model?.provider;
-	const availableModels: ModelInfo[] = ctx.modelRegistry.getAvailable().map((m) => ({
-		provider: m.provider,
-		id: m.id,
-		fullId: `${m.provider}/${m.id}`,
-	}));
+	const availableModels: ModelInfo[] = ctx.modelRegistry.getAvailable().map(toModelInfo);
 	let taskTexts = tasks.map((t) => t.task);
 	const skillOverrides: (string[] | false | undefined)[] = tasks.map((t) =>
 		normalizeSkillInput(t.skill),
@@ -1482,6 +1472,7 @@ async function runParallelPath(data: ExecutionContextData, deps: ExecutorDeps):
 			controlConfig,
 			onControlEvent,
 			childIntercomTarget: childIntercomTarget ? (agent, index) => childIntercomTarget(runId, agent, index) : undefined,
+			orchestratorIntercomTarget: data.intercomBridge.active ? data.intercomBridge.orchestratorTarget : undefined,
 			foregroundControl,
 			concurrencyLimit: parallelConcurrency,
 			maxSubagentDepths,
@@ -1586,11 +1577,7 @@ async function runSinglePath(data: ExecutionContextData, deps: ExecutorDeps): Pr
 	}
 
 	const currentProvider = ctx.model?.provider;
-	const availableModels: ModelInfo[] = ctx.modelRegistry.getAvailable().map((m) => ({
-		provider: m.provider,
-		id: m.id,
-		fullId: `${m.provider}/${m.id}`,
-	}));
+	const availableModels: ModelInfo[] = ctx.modelRegistry.getAvailable().map(toModelInfo);
 	let task = params.task ?? "";
 	let modelOverride: string | undefined = resolveModelCandidate(
 		(params.model as string | undefined) ?? agentConfig.model,
@@ -1751,6 +1738,7 @@ async function runSinglePath(data: ExecutionContextData, deps: ExecutorDeps): Pr
 		controlConfig,
 		onControlEvent,
 		intercomSessionName: childIntercomTarget,
+		orchestratorIntercomTarget: data.intercomBridge.active ? data.intercomBridge.orchestratorTarget : undefined,
 		index: 0,
 		modelOverride,
 		availableModels,
@@ -1966,7 +1954,7 @@ export function createSubagentExecutor(deps: ExecutorDeps): {
 		const scope: AgentScope = resolveExecutionAgentScope(effectiveParams.agentScope);
 		const effectiveCwd = effectiveParams.cwd ?? ctx.cwd;
 		const parentSessionFile = ctx.sessionManager.getSessionFile() ?? null;
-		deps.state.currentSessionId = parentSessionFile ?? `session-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+		deps.state.currentSessionId = resolveCurrentSessionId(ctx.sessionManager);
 		const discoveredAgents = deps.discoverAgents(effectiveCwd, scope).agents;
 		effectiveParams = applyAgentDefaultContext(effectiveParams, discoveredAgents);
 		const sessionName = resolveIntercomSessionTarget(deps.pi.getSessionName(), ctx.sessionManager.getSessionId());

package/src/runs/shared/model-fallback.ts

@@ -1,10 +1,7 @@
+import type { ModelInfo as AvailableModelInfo } from "../../shared/model-info.ts";
 import type { Usage } from "../../shared/types.ts";
 
-export interface AvailableModelInfo {
-	provider: string;
-	id: string;
-	fullId: string;
-}
+export type { AvailableModelInfo };
 
 interface ModelAttemptSummary {
 	model: string;

package/src/runs/shared/pi-args.ts

@@ -7,6 +7,10 @@ const THINKING_LEVELS = ["off", "minimal", "low", "medium", "high", "xhigh"];
 const TASK_ARG_LIMIT = 8000;
 const PROMPT_RUNTIME_EXTENSION_PATH = path.join(path.dirname(fileURLToPath(import.meta.url)), "subagent-prompt-runtime.ts");
 export const SUBAGENT_CHILD_ENV = "PI_SUBAGENT_CHILD";
+export const SUBAGENT_ORCHESTRATOR_TARGET_ENV = "PI_SUBAGENT_ORCHESTRATOR_TARGET";
+export const SUBAGENT_RUN_ID_ENV = "PI_SUBAGENT_RUN_ID";
+export const SUBAGENT_CHILD_AGENT_ENV = "PI_SUBAGENT_CHILD_AGENT";
+export const SUBAGENT_CHILD_INDEX_ENV = "PI_SUBAGENT_CHILD_INDEX";
 
 interface BuildPiArgsInput {
 	baseArgs: string[];
@@ -25,6 +29,10 @@ interface BuildPiArgsInput {
 	mcpDirectTools?: string[];
 	promptFileStem?: string;
 	intercomSessionName?: string;
+	orchestratorIntercomTarget?: string;
+	runId?: string;
+	childAgentName?: string;
+	childIndex?: number;
 }
 
 interface BuildPiArgsResult {
@@ -119,6 +127,18 @@ export function buildPiArgs(input: BuildPiArgsInput): BuildPiArgsResult {
 	if (input.intercomSessionName) {
 		env.PI_SUBAGENT_INTERCOM_SESSION_NAME = input.intercomSessionName;
 	}
+	if (input.orchestratorIntercomTarget) {
+		env[SUBAGENT_ORCHESTRATOR_TARGET_ENV] = input.orchestratorIntercomTarget;
+	}
+	if (input.runId) {
+		env[SUBAGENT_RUN_ID_ENV] = input.runId;
+	}
+	if (input.childAgentName) {
+		env[SUBAGENT_CHILD_AGENT_ENV] = input.childAgentName;
+	}
+	if (input.childIndex !== undefined) {
+		env[SUBAGENT_CHILD_INDEX_ENV] = String(input.childIndex);
+	}
 	if (input.mcpDirectTools?.length) {
 		env.MCP_DIRECT_TOOLS = input.mcpDirectTools.join(",");
 	} else {