@bastani/atomic 0.9.12 → 0.9.13-alpha.2

package/dist/builtin/subagents/src/runs/foreground/subagent-executor-single.ts

@@ -19,9 +19,9 @@ import {
 	wrapForkTask,
 } from "../../shared/types.ts";
 import { compactForegroundDetails, getSingleResultOutput } from "../../shared/utils.ts";
-import { inheritedIntercomGroup, resolveChildIntercomGroup } from "../shared/intercom-group.ts";
+import { updateForegroundNestedProjection } from "../inprocess/runtime-support/nested-api.ts";
+import { inheritedIntercomGroup, resolveChildIntercomGroup } from "../shared/intercom-group.js";
 import { currentModelFullId, resolveModelCandidate } from "../shared/model-fallback.ts";
-import { updateForegroundNestedProjection } from "../shared/nested-events.ts";
 import { recordRun } from "../shared/run-history.ts";
 import {
 	finalizeSingleOutput,
@@ -196,6 +196,7 @@ export async function runSinglePath(
 			outputPath,
 			outputMode: effectiveOutputMode,
 			maxSubagentDepth,
+			parentDepth: data.parentDepth,
 			workflowStageSubagentGuard,
 			workflowSessionMetadata: workflowSessionMetadataFromContext(ctx),
 			onUpdate: forwardSingleUpdate,
@@ -238,7 +239,7 @@ export async function runSinglePath(
 		foregroundControl.toolCount = r.progress?.toolCount;
 		foregroundControl.updatedAt = Date.now();
 	}
-	recordRun(params.agent!, cleanTask, r.exitCode, r.progressSummary?.durationMs ?? 0);
+	recordRun(params.agent!, cleanTask, r.status, r.progressSummary?.durationMs ?? 0);
 
 	if (r.progress) allProgress.push(r.progress);
 	if (r.artifactPaths) allArtifactPaths.push(r.artifactPaths);
@@ -249,7 +250,7 @@ export async function runSinglePath(
 		truncatedOutput: r.truncation?.text,
 		outputPath,
 		outputMode: r.outputMode,
-		exitCode: r.exitCode,
+		status: r.status,
 		savedPath: r.savedOutputPath,
 		outputReference: r.outputReference,
 		saveError: r.outputSaveError,
@@ -262,7 +263,13 @@ export async function runSinglePath(
 		artifacts: allArtifactPaths.length ? { dir: artifactsDir, files: allArtifactPaths } : undefined,
 		truncation: r.truncation,
 	});
-	rememberForegroundRun(deps.state, { runId, mode: "single", cwd: effectiveCwd, results: details.results });
+	rememberForegroundRun(deps.state, {
+		runId,
+		mode: "single",
+		cwd: effectiveCwd,
+		results: details.results,
+		maxSubagentDepths: [maxSubagentDepth],
+	});
 
 	if (!r.detached && !r.interrupted) {
 		if (foregroundControl) updateForegroundNestedProjection(foregroundControl);
@@ -278,7 +285,7 @@ export async function runSinglePath(
 			return {
 				content: [{ type: "text", text: intercomReceipt.text }],
 				details: intercomReceipt.details,
-				...(r.exitCode !== 0 ? { isError: true } : {}),
+				...(r.status === "error" ? { isError: true } : {}),
 			};
 		}
 	}
@@ -304,7 +311,7 @@ export async function runSinglePath(
 		};
 	}
 
-	if (r.exitCode !== 0)
+	if (r.status === "error")
 		return {
 			content: [{ type: "text", text: formatFailedSingleRunOutput(r, finalizedOutput.displayOutput) }],
 			details,

package/dist/builtin/subagents/src/runs/foreground/subagent-executor-status.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI } from "@bastani/atomic";
+import { type ExtensionAPI, isStaleExtensionContextError } from "@bastani/atomic";
 import { type IntercomBridgeState, resolveSubagentIntercomTarget } from "../../intercom/intercom-bridge.ts";
 import {
 	attachNestedChildrenToResultChildren,
@@ -21,8 +21,8 @@ import {
 } from "../../shared/types.ts";
 import { compactForegroundDetails, compactForegroundResult, getSingleResultOutput } from "../../shared/utils.ts";
 import { deliverLocalCompletionNotification } from "../background/completion-notification.ts";
-import { updateForegroundNestedProjection } from "../shared/nested-events.ts";
-import { formatNestedRunStatusLines } from "../shared/nested-render.ts";
+import { updateForegroundNestedProjection } from "../inprocess/runtime-support/nested-api.ts";
+import { formatNestedRunStatusLines } from "../inprocess/runtime-support/nested-rendering.ts";
 import {
 	formatControlIntercomMessage,
 	formatControlNoticeMessage,
@@ -127,7 +127,14 @@ function takeEarlyDetachedResult(state: SubagentState, runId: string, index: num
 
 export function rememberForegroundRun(
 	state: SubagentState,
-	input: { runId: string; mode: "single" | "parallel" | "chain"; cwd: string; results: SingleResult[] },
+	input: {
+		runId: string;
+		mode: "single" | "parallel";
+		cwd: string;
+		results: SingleResult[];
+		/** Effective delegation limit per child, aligned with `results` by index. */
+		maxSubagentDepths?: readonly (number | undefined)[];
+	},
 ): void {
 	state.foregroundRuns ??= new Map();
 	state.foregroundRuns.set(input.runId, {
@@ -137,15 +144,17 @@ export function rememberForegroundRun(
 		updatedAt: Date.now(),
 		children: input.results.map((originalResult, index) => {
 			const result = takeEarlyDetachedResult(state, input.runId, index) ?? originalResult;
+			const maxSubagentDepth = input.maxSubagentDepths?.[index];
 			return {
 				agent: result.agent,
 				index,
 				status: resolveSubagentResultStatus({
-					exitCode: result.exitCode,
+					status: result.status,
 					interrupted: result.interrupted,
 					detached: result.detached,
 				}),
 				...(result.sessionFile ? { sessionFile: result.sessionFile } : {}),
+				...(maxSubagentDepth === undefined ? {} : { maxSubagentDepth }),
 				result,
 			};
 		}),
@@ -192,7 +201,7 @@ export function replaceForegroundRunChild(
 	const child = run.children.find((entry) => entry.index === index);
 	if (child?.status !== "detached") return;
 	child.status = resolveSubagentResultStatus({
-		exitCode: retainedResult.exitCode,
+		status: retainedResult.status,
 		interrupted: retainedResult.interrupted,
 		detached: retainedResult.detached,
 	});
@@ -218,7 +227,12 @@ export function emitControlNotification(input: {
 		noticeText: formatControlNoticeMessage(input.event, childIntercomTarget),
 	};
 	if (input.controlConfig.notifyChannels.includes("event")) {
-		input.pi.events.emit(SUBAGENT_CONTROL_EVENT, payload);
+		try {
+			input.pi.events.emit(SUBAGENT_CONTROL_EVENT, payload);
+		} catch (error) {
+			if (!isStaleExtensionContextError(error)) throw error;
+			// Control notices are best effort after a parent runtime replacement.
+		}
 	}
 	if (
 		input.event.type !== "active_long_running" &&
@@ -226,11 +240,16 @@ export function emitControlNotification(input: {
 		input.intercomBridge.active &&
 		input.intercomBridge.orchestratorTarget
 	) {
-		input.pi.events.emit(SUBAGENT_CONTROL_INTERCOM_EVENT, {
-			...payload,
-			to: input.intercomBridge.orchestratorTarget,
-			message: formatControlIntercomMessage(input.event, childIntercomTarget),
-		});
+		try {
+			input.pi.events.emit(SUBAGENT_CONTROL_INTERCOM_EVENT, {
+				...payload,
+				to: input.intercomBridge.orchestratorTarget,
+				message: formatControlIntercomMessage(input.event, childIntercomTarget),
+			});
+		} catch (error) {
+			if (!isStaleExtensionContextError(error)) throw error;
+			// Intercom control notices are best effort after a parent runtime replacement.
+		}
 	}
 }
 
@@ -249,7 +268,7 @@ export function createForegroundControlNotifier(
 
 function resultSummaryForIntercom(result: SingleResult): string {
 	const output = getSingleResultOutput(result);
-	if (result.exitCode !== 0 && result.error) {
+	if (result.status === "error" && result.error) {
 		return output ? `${result.error}\n\nOutput:\n${output}` : result.error;
 	}
 	return output || result.error || "(no output)";
@@ -278,9 +297,8 @@ export function notifyDetachedForegroundChildExit(input: {
 			id: runId,
 			runId,
 			agent: result.agent,
-			success: result.exitCode === 0 && !result.interrupted && !result.error,
+			status: result.status,
 			summary: resultSummaryForIntercom(result),
-			exitCode: result.exitCode,
 			...(result.interrupted ? { state: "paused" } : {}),
 			timestamp: Date.now(),
 			...(result.progressSummary?.durationMs !== undefined ? { durationMs: result.progressSummary.durationMs } : {}),
@@ -291,7 +309,11 @@ export function notifyDetachedForegroundChildExit(input: {
 			noticeLabel: "Detached subagent task",
 		},
 		`foreground-detach-${runId}-${index}`,
-	);
+	).catch((error) => {
+		if (!isStaleExtensionContextError(error)) {
+			console.error("Failed to emit detached subagent completion notification:", error);
+		}
+	});
 }
 
 async function emitForegroundResultIntercom(input: {
@@ -300,7 +322,6 @@ async function emitForegroundResultIntercom(input: {
 	runId: string;
 	mode: SubagentRunMode;
 	results: SingleResult[];
-	chainSteps?: number;
 	nestedChildren?: NestedRunSummary[];
 }): Promise<ReturnType<typeof buildSubagentResultIntercomPayload> | null> {
 	if (!input.intercomBridge.active || !input.intercomBridge.orchestratorTarget) return null;
@@ -311,7 +332,7 @@ async function emitForegroundResultIntercom(input: {
 					{
 						agent: result.agent,
 						status: resolveSubagentResultStatus({
-							exitCode: result.exitCode,
+							status: result.status,
 							interrupted: result.interrupted,
 							detached: result.detached,
 						}),
@@ -330,7 +351,6 @@ async function emitForegroundResultIntercom(input: {
 		mode: input.mode,
 		source: "foreground",
 		children: attachNestedChildrenToResultChildren(input.runId, children, input.nestedChildren),
-		...(typeof input.chainSteps === "number" ? { chainSteps: input.chainSteps } : {}),
 	});
 	const delivered = await deliverSubagentResultIntercomEvent(input.pi.events, payload);
 	if (!delivered) return null;
@@ -351,7 +371,6 @@ export async function maybeBuildForegroundIntercomReceipt(input: {
 		runId: input.runId,
 		mode: input.mode,
 		results: input.details.results,
-		...(typeof input.details.totalSteps === "number" ? { chainSteps: input.details.totalSteps } : {}),
 		...(input.nestedChildren?.length ? { nestedChildren: input.nestedChildren } : {}),
 	});
 	if (!payload) return null;

package/dist/builtin/subagents/src/runs/foreground/subagent-executor-types.ts

@@ -2,7 +2,6 @@ import type { ExtensionAPI, ExtensionContext } from "@bastani/atomic";
 import type { AgentConfig, AgentScope } from "../../agents/agents.ts";
 import type { IntercomBridgeState } from "../../intercom/intercom-bridge.ts";
 import type { ModelInfo } from "../../shared/model-info.ts";
-import type { ChainStep } from "../../shared/settings.ts";
 import type {
 	ArtifactConfig,
 	ControlConfig,
@@ -14,11 +13,12 @@ import type {
 	SubagentToolResult,
 } from "../../shared/types.ts";
 import type {
-	executeAsyncChain,
-	executeAsyncSingle,
+	AsyncExecutionResult,
+	AsyncSingleParams,
 	formatAsyncStartedMessage,
 	isAsyncAvailable,
-} from "../background/async-execution.ts";
+} from "../inprocess/background.ts";
+import type { ChildModePolicy } from "../inprocess/child-policy.ts";
 import type { runSync } from "./execution.ts";
 
 export interface TaskParam {
@@ -44,9 +44,7 @@ export interface SubagentParamsLike {
 	agent?: string;
 	task?: string;
 	message?: string;
-	chainName?: string;
 	config?: unknown;
-	chain?: ChainStep[];
 	tasks?: TaskParam[];
 	concurrency?: number;
 	worktree?: boolean;
@@ -67,13 +65,11 @@ export interface SubagentParamsLike {
 	reads?: string[] | false;
 	progress?: boolean;
 	agentScope?: string;
-	chainDir?: string;
 }
 
 export interface SubagentExecutorRuntimeDeps {
 	runSync: typeof runSync;
-	executeAsyncChain: typeof executeAsyncChain;
-	executeAsyncSingle: typeof executeAsyncSingle;
+	executeAsyncSingle: (id: string, params: AsyncSingleParams) => AsyncExecutionResult | Promise<AsyncExecutionResult>;
 	isAsyncAvailable: typeof isAsyncAvailable;
 	formatAsyncStartedMessage: typeof formatAsyncStartedMessage;
 }
@@ -88,9 +84,18 @@ export interface ExecutorDeps {
 	expandTilde: (p: string) => string;
 	discoverAgents: (cwd: string, scope: AgentScope) => { agents: AgentConfig[] };
 	allowMutatingManagementActions?: boolean;
+	/** Typed admission policy; when present it is authoritative over the legacy boolean. */
+	childPolicy?: ChildModePolicy;
 	runtime?: Partial<SubagentExecutorRuntimeDeps>;
 }
 
+export function isManagementActionsRestricted(
+	deps: Pick<ExecutorDeps, "childPolicy" | "allowMutatingManagementActions">,
+): boolean {
+	return deps.childPolicy
+		? deps.childPolicy.managementActions === "restricted"
+		: deps.allowMutatingManagementActions === false;
+}
 export interface ResolvedExecutorDeps extends Omit<ExecutorDeps, "runtime"> {
 	runtime: SubagentExecutorRuntimeDeps;
 }
@@ -109,6 +114,7 @@ export interface ExecutionContextData {
 	sessionFileForIndex: (idx?: number) => string | undefined;
 	artifactConfig: ArtifactConfig;
 	artifactsDir: string;
+	parentDepth?: number;
 	effectiveAsync: boolean;
 	controlConfig: ResolvedControlConfig;
 	intercomBridge: IntercomBridgeState;
@@ -119,10 +125,9 @@ export interface PreparedExecutionContext {
 	effectiveParams: SubagentParamsLike;
 	effectiveCwd: string;
 	runId: string;
-	hasChain: boolean;
 	hasTasks: boolean;
 	hasSingle: boolean;
-	foregroundMode: "single" | "parallel" | "chain";
+	foregroundMode: "single" | "parallel";
 	execData: ExecutionContextData;
 	foregroundControl?: SubagentState["foregroundControls"] extends Map<string, infer T> ? T : never;
 	writeNestedForegroundEvent: (

package/dist/builtin/subagents/src/runs/foreground/subagent-executor-worktree.ts

@@ -1,5 +1,5 @@
 import * as path from "node:path";
-import { type ChainStep, isParallelStep, type ResolvedStepBehavior } from "../../shared/settings.ts";
+import type { ResolvedStepBehavior } from "../../shared/settings.ts";
 import type { ExtensionConfig, SubagentToolResult } from "../../shared/types.ts";
 import { resolveChildCwd } from "../../shared/utils.ts";
 import { resolveSingleOutputPath } from "../shared/single-output.ts";
@@ -52,19 +52,6 @@ export function buildParallelWorktreeTaskCwdError(
 	return formatWorktreeTaskCwdConflict(conflict, sharedCwd);
 }
 
-export function buildChainWorktreeTaskCwdError(chain: ChainStep[], sharedCwd: string): string | undefined {
-	for (let stepIndex = 0; stepIndex < chain.length; stepIndex++) {
-		const step = chain[stepIndex]!;
-		if (!isParallelStep(step) || !step.worktree) continue;
-		const stepCwd = resolveChildCwd(sharedCwd, step.cwd);
-		const conflict = findWorktreeTaskCwdConflict(step.parallel, stepCwd);
-		if (!conflict) continue;
-		const detail = formatWorktreeTaskCwdConflict(conflict, stepCwd);
-		return `parallel chain step ${stepIndex + 1}: ${detail}`;
-	}
-	return undefined;
-}
-
 export function resolveParallelTaskCwd(
 	task: TaskParam,
 	paramsCwd: string,