pi-subagents 0.21.5 → 0.22.0

package/src/manager-ui/agent-manager-edit.ts

@@ -4,30 +4,31 @@ import { buildRuntimeName, defaultSystemPromptMode, frontmatterNameForConfig, pa
 import { createEditorState, ensureCursorVisible, getCursorDisplayPos, handleEditorInput, renderEditor, wrapText } from "../tui/text-editor.ts";
 import type { TextEditorState } from "../tui/text-editor.ts";
 import { pad, row, renderHeader, renderFooter, formatScrollInfo } from "../tui/render-helpers.ts";
+import { findModelInfo, getSupportedThinkingLevels, type ModelInfo, type ThinkingLevel } from "../shared/model-info.ts";
 
-export interface ModelInfo { provider: string; id: string; fullId: string; }
+export type { ModelInfo };
 export interface SkillInfo { name: string; source: string; description?: string; }
 export type EditScreen = "edit" | "edit-field" | "edit-prompt";
 export type EditField = typeof FIELD_ORDER[number];
 
 export interface EditState {
 	draft: AgentConfig; isNew: boolean; fieldIndex: number; fieldMode: "text" | "model" | "thinking" | "skills" | null;
-	fieldEditor: TextEditorState; promptEditor: TextEditorState; modelSearchQuery: string; modelCursor: number; filteredModels: ModelInfo[];
+	fieldEditor: TextEditorState; promptEditor: TextEditorState; modelSearchQuery: string; modelCursor: number; models: ModelInfo[]; filteredModels: ModelInfo[];
 	thinkingCursor: number; skillSearchQuery: string; skillCursor: number; filteredSkills: SkillInfo[]; skillSelected: Set<string>; error?: string;
 	fields: EditField[];
 	title?: string;
 	overrideBase?: BuiltinAgentOverrideBase;
+	preferredProvider?: string;
 }
 interface EditInputResult { action?: "save" | "discard" | "delete"; nextScreen?: EditScreen; }
 interface CreateEditStateOptions {
 	fields?: EditField[];
 	title?: string;
 	overrideBase?: BuiltinAgentOverrideBase;
+	preferredProvider?: string;
 }
 
-const THINKING_LEVELS = ["off", "minimal", "low", "medium", "high", "xhigh"] as const;
 const FIELD_ORDER = ["name", "package", "description", "model", "fallbackModels", "thinking", "systemPromptMode", "inheritProjectContext", "inheritSkills", "defaultContext", "tools", "extensions", "skills", "output", "reads", "progress", "interactive", "prompt"] as const;
-type ThinkingLevel = typeof THINKING_LEVELS[number];
 const PROMPT_VIEWPORT_HEIGHT = 16;
 const MODEL_SELECTOR_HEIGHT = 10;
 const SKILL_SELECTOR_HEIGHT = 10;
@@ -86,8 +87,8 @@ export function createEditState(draft: AgentConfig, isNew: boolean, models: Mode
 	return {
 		draft: { ...draft, tools: draft.tools ? [...draft.tools] : undefined, mcpDirectTools: draft.mcpDirectTools ? [...draft.mcpDirectTools] : undefined, skills: draft.skills ? [...draft.skills] : undefined, fallbackModels: draft.fallbackModels ? [...draft.fallbackModels] : undefined, extensions: draft.extensions ? [...draft.extensions] : draft.extensions, defaultReads: draft.defaultReads ? [...draft.defaultReads] : undefined, extraFields: draft.extraFields ? { ...draft.extraFields } : undefined },
 		isNew, fieldIndex: 0, fieldMode: null, fieldEditor: createEditorState(), promptEditor: createEditorState(draft.systemPrompt ?? ""),
-		modelSearchQuery: "", modelCursor: 0, filteredModels: [...models], thinkingCursor: 0, skillSearchQuery: "", skillCursor: 0, filteredSkills: [...skills], skillSelected: new Set(draft.skills ?? []),
-		fields: options.fields ?? [...FIELD_ORDER], title: options.title, overrideBase: options.overrideBase,
+		modelSearchQuery: "", modelCursor: 0, models: [...models], filteredModels: [...models], thinkingCursor: 0, skillSearchQuery: "", skillCursor: 0, filteredSkills: [...skills], skillSelected: new Set(draft.skills ?? []),
+		fields: options.fields ?? [...FIELD_ORDER], title: options.title, overrideBase: options.overrideBase, preferredProvider: options.preferredProvider,
 	};
 }
 
@@ -180,9 +181,16 @@ function openModelPicker(state: EditState, models: ModelInfo[]): void {
 	state.fieldIndex = state.fields.indexOf("model"); state.fieldMode = "model"; state.modelSearchQuery = ""; state.filteredModels = [...models];
 	const idx = state.filteredModels.findIndex((m) => m.fullId === state.draft.model || m.id === state.draft.model); state.modelCursor = idx >= 0 ? idx : 0;
 }
+function getDraftThinkingLevels(state: EditState): ThinkingLevel[] {
+	return getSupportedThinkingLevels(findModelInfo(state.draft.model, state.models, state.preferredProvider));
+}
+
 function openThinkingPicker(state: EditState): void {
 	state.fieldIndex = state.fields.indexOf("thinking"); state.fieldMode = "thinking";
-	const idx = THINKING_LEVELS.indexOf((state.draft.thinking ?? "off") as ThinkingLevel); state.thinkingCursor = idx >= 0 ? idx : 0;
+	const levels = getDraftThinkingLevels(state);
+	const currentLevel = state.draft.thinking ?? "off";
+	const idx = levels.findIndex((level) => level === currentLevel);
+	state.thinkingCursor = idx >= 0 ? idx : Math.max(0, levels.indexOf("off"));
 }
 function openSkillPicker(state: EditState, skills: SkillInfo[]): void {
 	state.fieldIndex = state.fields.indexOf("skills"); state.fieldMode = "skills"; state.skillSearchQuery = ""; state.filteredSkills = [...skills]; state.skillSelected = new Set(state.draft.skills ?? []); state.skillCursor = 0;
@@ -230,16 +238,22 @@ function renderThinkingPicker(state: EditState, width: number, theme: Theme): st
 		high: "Deep reasoning",
 		xhigh: "Maximum reasoning (ultrathink)",
 	};
-	for (let i = 0; i < THINKING_LEVELS.length; i++) {
-		const level = THINKING_LEVELS[i]!;
-		const isSelected = i === state.thinkingCursor;
-		const prefix = isSelected ? theme.fg("accent", "→ ") : "  ";
-		const levelText = isSelected ? theme.fg("accent", level) : level;
-		const desc = theme.fg("dim", ` - ${descriptions[level]}`);
-		lines.push(row(` ${prefix}${levelText}${desc}`, width, theme));
+	const levels = getDraftThinkingLevels(state);
+	if (levels.length === 0) {
+		lines.push(row(` ${theme.fg("dim", "No supported thinking levels")}`, width, theme));
+	} else {
+		for (let i = 0; i < levels.length; i++) {
+			const level = levels[i]!;
+			const isSelected = i === state.thinkingCursor;
+			const prefix = isSelected ? theme.fg("accent", "→ ") : "  ";
+			const levelText = isSelected ? theme.fg("accent", level) : level;
+			const desc = theme.fg("dim", ` - ${descriptions[level]}`);
+			lines.push(row(` ${prefix}${levelText}${desc}`, width, theme));
+		}
 	}
 	while (lines.length < 19) lines.push(row("", width, theme));
-	lines.push(renderFooter(" [enter] select  [esc] cancel  [↑↓] navigate ", width, theme));
+	const footer = levels.length === 0 ? " [esc] cancel " : " [enter] select  [esc] cancel  [↑↓] navigate ";
+	lines.push(renderFooter(footer, width, theme));
 	return lines;
 }
 
@@ -323,7 +337,15 @@ export function handleEditInput(screen: EditScreen, state: EditState, data: stri
 	if (screen === "edit-field") {
 		if (state.fieldMode === "model") {
 			if (matchesKey(data, "escape") || matchesKey(data, "ctrl+c")) { state.fieldMode = null; return { nextScreen: "edit" }; }
-			if (matchesKey(data, "return")) { const selected = state.filteredModels[state.modelCursor]; if (selected) state.draft.model = selected.fullId; state.fieldMode = null; return { nextScreen: "edit" }; }
+			if (matchesKey(data, "return")) {
+				const selected = state.filteredModels[state.modelCursor];
+				if (selected) {
+					state.draft.model = selected.fullId;
+					if (state.draft.thinking && !getDraftThinkingLevels(state).some((level) => level === state.draft.thinking)) state.draft.thinking = undefined;
+				}
+				state.fieldMode = null;
+				return { nextScreen: "edit" };
+			}
 			if (matchesKey(data, "up")) { if (state.filteredModels.length > 0) state.modelCursor = state.modelCursor === 0 ? state.filteredModels.length - 1 : state.modelCursor - 1; return; }
 			if (matchesKey(data, "down")) { if (state.filteredModels.length > 0) state.modelCursor = state.modelCursor === state.filteredModels.length - 1 ? 0 : state.modelCursor + 1; return; }
 			if (matchesKey(data, "backspace")) { if (state.modelSearchQuery.length > 0) state.modelSearchQuery = state.modelSearchQuery.slice(0, -1); }
@@ -334,10 +356,12 @@ export function handleEditInput(screen: EditScreen, state: EditState, data: stri
 			return;
 		}
 		if (state.fieldMode === "thinking") {
+			const levels = getDraftThinkingLevels(state);
 			if (matchesKey(data, "escape") || matchesKey(data, "ctrl+c")) { state.fieldMode = null; return { nextScreen: "edit" }; }
-			if (matchesKey(data, "return")) { const selected = THINKING_LEVELS[state.thinkingCursor]; state.draft.thinking = selected === "off" ? undefined : selected; state.fieldMode = null; return { nextScreen: "edit" }; }
-			if (matchesKey(data, "up")) { state.thinkingCursor = state.thinkingCursor === 0 ? THINKING_LEVELS.length - 1 : state.thinkingCursor - 1; return; }
-			if (matchesKey(data, "down")) { state.thinkingCursor = state.thinkingCursor === THINKING_LEVELS.length - 1 ? 0 : state.thinkingCursor + 1; return; }
+			if (levels.length === 0) return;
+			if (matchesKey(data, "return")) { const selected = levels[state.thinkingCursor] ?? "off"; state.draft.thinking = selected === "off" ? undefined : selected; state.fieldMode = null; return { nextScreen: "edit" }; }
+			if (matchesKey(data, "up")) { state.thinkingCursor = state.thinkingCursor === 0 ? levels.length - 1 : state.thinkingCursor - 1; return; }
+			if (matchesKey(data, "down")) { state.thinkingCursor = state.thinkingCursor === levels.length - 1 ? 0 : state.thinkingCursor + 1; return; }
 			return;
 		}
 		if (state.fieldMode === "skills") {

package/src/manager-ui/agent-manager.ts

@@ -45,7 +45,7 @@ interface ChainEntry { id: string; kind: "chain"; config: ChainConfig; }
 interface NameInputState { mode: "new-agent" | "clone-agent" | "clone-chain" | "new-chain"; editor: TextEditorState; scope: "user" | "project"; allowProject: boolean; sourceId?: string; template?: AgentTemplate; error?: string; }
 interface StatusMessage { text: string; type: "error" | "info"; }
 interface OverrideScopeState { selectedScope: "user" | "project"; allowProject: boolean; }
-export interface AgentManagerOptions { newShortcut?: string; }
+export interface AgentManagerOptions { newShortcut?: string; preferredModelProvider?: string; }
 
 const BUILTIN_OVERRIDE_FIELDS: EditField[] = ["model", "fallbackModels", "thinking", "systemPromptMode", "inheritProjectContext", "inheritSkills", "defaultContext", "disabled", "tools", "skills", "prompt"];
 
@@ -135,6 +135,7 @@ export class AgentManagerComponent implements Component {
 	private skills: SkillInfo[];
 	private done: (result: ManagerResult) => void;
 	private shortcuts: ListShortcuts;
+	private preferredModelProvider: string | undefined;
 
 	constructor(tui: TUI, theme: Theme, agentData: AgentData, models: ModelInfo[], skills: SkillInfo[], done: (result: ManagerResult) => void, options: AgentManagerOptions = {}) {
 		this.tui = tui;
@@ -144,6 +145,7 @@ export class AgentManagerComponent implements Component {
 		this.skills = skills;
 		this.done = done;
 		this.shortcuts = { newShortcut: options.newShortcut?.trim() || DEFAULT_AGENT_MANAGER_NEW_SHORTCUT };
+		this.preferredModelProvider = options.preferredModelProvider;
 		this.loadEntries();
 	}
 
@@ -196,7 +198,7 @@ export class AgentManagerComponent implements Component {
 
 	private enterDetail(entry: AgentEntry): void { this.currentAgentId = entry.id; this.detailState = { resolved: true, scrollOffset: 0, recentRuns: loadRunsForAgent(entry.config.name).slice(0, 5) }; this.screen = "detail"; }
 	private enterChainDetail(entry: ChainEntry): void { this.currentChainId = entry.id; this.chainDetailState = { scrollOffset: 0 }; this.screen = "chain-detail"; }
-	private enterEdit(entry: AgentEntry): void { this.currentAgentId = entry.id; this.builtinOverrideScope = null; this.editState = createEditState(entry.config, entry.isNew, this.models, this.skills); this.screen = "edit"; }
+	private enterEdit(entry: AgentEntry): void { this.currentAgentId = entry.id; this.builtinOverrideScope = null; this.editState = createEditState(entry.config, entry.isNew, this.models, this.skills, { preferredProvider: this.preferredModelProvider }); this.screen = "edit"; }
 	private enterBuiltinOverrideScope(entry: AgentEntry): void {
 		this.currentAgentId = entry.id;
 		this.overrideScopeState = { selectedScope: this.agentData.projectSettingsPath ? "project" : "user", allowProject: Boolean(this.agentData.projectSettingsPath) };
@@ -209,6 +211,7 @@ export class AgentManagerComponent implements Component {
 			fields: BUILTIN_OVERRIDE_FIELDS,
 			title: `Builtin Override: ${entry.config.name} [${scope}]`,
 			overrideBase: this.resolveBuiltinOverrideBase(entry),
+			preferredProvider: this.preferredModelProvider,
 		});
 		this.screen = "edit";
 	}

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

@@ -538,6 +538,7 @@ interface SingleStepContext {
 	piArgv1?: string;
 	registerInterrupt?: (interrupt: (() => void) | undefined) => void;
 	childIntercomTarget?: string;
+	orchestratorIntercomTarget?: string;
 	onChildEvent?: (event: ChildEvent) => void;
 }
 
@@ -604,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,
@@ -1299,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;
 							},
@@ -1439,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";
@@ -358,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),
@@ -782,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;
@@ -951,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,
@@ -979,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,
@@ -1045,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)[];
@@ -1203,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,
@@ -1307,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),
@@ -1484,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,
@@ -1588,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,
@@ -1753,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,

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 {