@bastani/atomic 0.8.19 → 0.8.20

package/dist/builtin/subagents/src/runs/foreground/chain-execution.ts

@@ -61,6 +61,23 @@ import {
 import { resolveModelCandidate } from "../shared/model-fallback.ts";
 import { validateFileOnlyOutputMode } from "../shared/single-output.ts";
 
+type RunSyncDependency = typeof runSync;
+
+type ChainForegroundControl = {
+	updatedAt: number;
+	currentAgent?: string;
+	currentIndex?: number;
+	currentActivityState?: ActivityState;
+	lastActivityAt?: number;
+	currentTool?: string;
+	currentToolStartedAt?: number;
+	currentPath?: string;
+	turnCount?: number;
+	tokens?: number;
+	toolCount?: number;
+	interrupt?: () => boolean;
+};
+
 interface ChainExecutionDetailsInput {
 	results: SingleResult[];
 	includeProgress?: boolean;
@@ -98,23 +115,16 @@ interface ParallelChainRunInput {
 	controlConfig: ResolvedControlConfig;
 	childIntercomTarget?: (agent: string, index: number) => string | undefined;
 	orchestratorIntercomTarget?: string;
-	foregroundControl?: {
-		updatedAt: number;
-		currentAgent?: string;
-		currentIndex?: number;
-		currentActivityState?: ActivityState;
-		lastActivityAt?: number;
-		currentTool?: string;
-		currentToolStartedAt?: number;
-		interrupt?: () => boolean;
-	};
+	foregroundControl?: ChainForegroundControl;
 	results: SingleResult[];
 	allProgress: AgentProgress[];
 	chainAgents: string[];
 	totalSteps: number;
 	worktreeSetup?: WorktreeSetup;
 	maxSubagentDepth: number;
+	workflowStageSubagentGuard?: boolean;
 	nestedRoute?: NestedRouteInfo;
+	runSync: RunSyncDependency;
 }
 
 function buildChainExecutionDetails(input: ChainExecutionDetailsInput): Details {
@@ -227,7 +237,7 @@ async function runParallelChainTasks(input: ParallelChainRunInput): Promise<Sing
 				};
 			}
 
-			const result = await runSync(input.ctx.cwd, input.agents, task.agent, taskStr, {
+			const result = await input.runSync(input.ctx.cwd, input.agents, task.agent, taskStr, {
 				cwd: taskCwd,
 				signal: input.signal,
 				interruptSignal: interruptController.signal,
@@ -243,6 +253,7 @@ async function runParallelChainTasks(input: ParallelChainRunInput): Promise<Sing
 				outputPath,
 				outputMode: behavior.outputMode,
 				maxSubagentDepth,
+				workflowStageSubagentGuard: input.workflowStageSubagentGuard,
 				controlConfig: input.controlConfig,
 				onControlEvent: input.onControlEvent,
 				intercomSessionName: input.childIntercomTarget?.(task.agent, input.globalTaskIndex + taskIndex),
@@ -323,22 +334,15 @@ interface ChainExecutionParams {
 	controlConfig: ResolvedControlConfig;
 	childIntercomTarget?: (agent: string, index: number) => string | undefined;
 	orchestratorIntercomTarget?: string;
-	foregroundControl?: {
-		updatedAt: number;
-		currentAgent?: string;
-		currentIndex?: number;
-		currentActivityState?: ActivityState;
-		lastActivityAt?: number;
-		currentTool?: string;
-		currentToolStartedAt?: number;
-		interrupt?: () => boolean;
-	};
+	foregroundControl?: ChainForegroundControl;
 	chainSkills?: string[];
 	chainDir?: string;
 	maxSubagentDepth: number;
+	workflowStageSubagentGuard?: boolean;
 	nestedRoute?: NestedRouteInfo;
 	worktreeSetupHook?: string;
 	worktreeSetupHookTimeoutMs?: number;
+	runSync?: RunSyncDependency;
 }
 
 interface ChainExecutionResult {
@@ -356,6 +360,7 @@ interface ChainExecutionResult {
  * Execute a chain of subagent steps
  */
 export async function executeChain(params: ChainExecutionParams): Promise<ChainExecutionResult> {
+	const executeRunSync = params.runSync ?? runSync;
 	const {
 		chain: chainSteps,
 		agents,
@@ -402,9 +407,9 @@ export async function executeChain(params: ChainExecutionParams): Promise<ChainE
 	const shouldClarify = clarify !== false && ctx.hasUI && !hasParallelSteps;
 	let tuiBehaviorOverrides: (BehaviorOverride | undefined)[] | undefined;
 	const availableModels: ModelInfo[] = ctx.modelRegistry.getAvailable().map(toModelInfo);
-	const availableSkills = discoverAvailableSkills(cwd ?? ctx.cwd);
 
 	if (shouldClarify) {
+		const availableSkills = discoverAvailableSkills(cwd ?? ctx.cwd);
 		const seqSteps = chainSteps as SequentialStep[];
 		const agentConfigs: AgentConfig[] = [];
 		for (const step of seqSteps) {
@@ -600,6 +605,8 @@ export async function executeChain(params: ChainExecutionParams): Promise<ChainE
 					nestedRoute: params.nestedRoute,
 					worktreeSetup,
 					maxSubagentDepth: params.maxSubagentDepth,
+					workflowStageSubagentGuard: params.workflowStageSubagentGuard,
+					runSync: executeRunSync,
 				});
 				globalTaskIndex += step.parallel.length;
 
@@ -780,7 +787,7 @@ export async function executeChain(params: ChainExecutionParams): Promise<ChainE
 				};
 			}
 
-			const r = await runSync(ctx.cwd, agents, seqStep.agent, stepTask, {
+			const r = await executeRunSync(ctx.cwd, agents, seqStep.agent, stepTask, {
 				cwd: resolveChildCwd(cwd ?? ctx.cwd, seqStep.cwd),
 				signal,
 				interruptSignal: interruptController.signal,
@@ -796,6 +803,7 @@ export async function executeChain(params: ChainExecutionParams): Promise<ChainE
 				outputPath,
 				outputMode: behavior.outputMode,
 				maxSubagentDepth,
+				workflowStageSubagentGuard: params.workflowStageSubagentGuard,
 				controlConfig,
 				onControlEvent,
 				intercomSessionName: childIntercomTarget?.(seqStep.agent, globalTaskIndex),

package/dist/builtin/subagents/src/runs/foreground/execution.ts

@@ -203,7 +203,13 @@ async function runSingleAttempt(
 		lastActivityAt: startTime,
 	};
 	result.progress = progress;
-	const spawnEnv = { ...process.env, ...sharedEnv, ...getSubagentDepthEnv(options.maxSubagentDepth) };
+	const spawnEnv = {
+		...process.env,
+		...sharedEnv,
+		...getSubagentDepthEnv(options.maxSubagentDepth, {
+			workflowStageSubagentGuard: options.workflowStageSubagentGuard,
+		}),
+	};
 	let observedMutationAttempt = false;
 
 	const exitCode = await new Promise<number>((resolve) => {
@@ -405,7 +411,7 @@ async function runSingleAttempt(
 		const fireUpdate = () => {
 			if (!options.onUpdate || processClosed) return;
 			progress.durationMs = Date.now() - startTime;
-			emitUpdateSnapshot(getFinalOutput(result.messages) || "(running...)");
+			emitUpdateSnapshot(getFinalOutput(result.messages ?? []) || "(running...)");
 		};
 
 		const processLine = (line: string) => {
@@ -458,7 +464,7 @@ async function runSingleAttempt(
 			}
 
 			if (evt.type === "message_end" && evt.message) {
-				result.messages.push(evt.message);
+				result.messages?.push(evt.message);
 				if (evt.message.role === "assistant") {
 					result.usage.turns++;
 					progress.turnCount = result.usage.turns;
@@ -490,7 +496,7 @@ async function runSingleAttempt(
 			}
 
 			if (evt.type === "tool_result_end" && evt.message) {
-				result.messages.push(evt.message);
+				result.messages?.push(evt.message);
 				const resultText = extractTextFromContent(evt.message.content);
 				appendRecentOutput(progress, resultText.split("\n").slice(-10));
 				const toolSnapshot = pendingToolResult;
@@ -647,7 +653,7 @@ async function runSingleAttempt(
 		result.exitCode = 1;
 	}
 	if (result.exitCode === 0 && !result.error) {
-		const errInfo = detectSubagentError(result.messages);
+		const errInfo = detectSubagentError(result.messages ?? []);
 		if (errInfo.hasError) {
 			result.exitCode = errInfo.exitCode ?? 1;
 			result.error = errInfo.details
@@ -671,12 +677,12 @@ async function runSingleAttempt(
 		durationMs: progress.durationMs,
 	};
 
-	let fullOutput = getFinalOutput(result.messages);
+	let fullOutput = getFinalOutput(result.messages ?? []);
 	const completionGuard = result.exitCode === 0 && !result.error && agent.completionGuard !== false
 		? evaluateCompletionMutationGuard({
 			agent: agent.name,
 			task,
-			messages: result.messages,
+			messages: result.messages ?? [],
 			tools: agent.tools,
 			mcpDirectTools: agent.mcpDirectTools,
 		})