@bastani/atomic 0.9.12 → 0.9.13-alpha.2

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

@@ -1,109 +0,0 @@
-import { normalizeSkillInput } from "../../agents/skills.ts";
-import { resolveSubagentIntercomTarget } from "../../intercom/intercom-bridge.ts";
-import type { ChainStep } from "../../shared/settings.ts";
-import { resolveSubagentDepthPolicy } from "../../shared/types.ts";
-import { compactForegroundDetails } from "../../shared/utils.ts";
-import { updateForegroundNestedProjection } from "../shared/nested-events.ts";
-import { executeChain } from "./chain-execution.ts";
-import { wrapChainTasksForFork } from "./subagent-executor-input.ts";
-import {
-	createForegroundControlNotifier,
-	maybeBuildForegroundIntercomReceipt,
-	notifyDetachedForegroundChildExit,
-	rememberForegroundRun,
-	replaceForegroundRunChild,
-} from "./subagent-executor-status.ts";
-import type { ExecutionContextData, ResolvedExecutorDeps } from "./subagent-executor-types.ts";
-
-export async function runChainPath(
-	data: ExecutionContextData,
-	deps: ResolvedExecutorDeps,
-): Promise<import("../../shared/types.ts").SubagentToolResult> {
-	const {
-		params,
-		effectiveCwd,
-		agents,
-		ctx,
-		signal,
-		runId,
-		shareEnabled,
-		sessionDirForIndex,
-		sessionFileForIndex,
-		artifactsDir,
-		artifactConfig,
-		onUpdate,
-		controlConfig,
-	} = data;
-	const onControlEvent = createForegroundControlNotifier(data, deps);
-	const childIntercomTarget = data.intercomBridge.active ? resolveSubagentIntercomTarget : undefined;
-	const foregroundControl = deps.state.foregroundControls.get(runId);
-	const normalized = normalizeSkillInput(params.skill);
-	const chainSkills = normalized === false ? [] : (normalized ?? []);
-	const chain = wrapChainTasksForFork(params.chain as ChainStep[], params.context);
-	const depthPolicy = resolveSubagentDepthPolicy(ctx, deps.config.maxSubagentDepth);
-	const currentMaxSubagentDepth = depthPolicy.maxSubagentDepth;
-	const workflowStageSubagentGuard = depthPolicy.workflowStageSubagentGuard;
-	const chainResult = await executeChain({
-		chain,
-		task: params.task,
-		group: params.group,
-		agents,
-		ctx,
-		intercomEvents: deps.pi.events,
-		signal,
-		runId,
-		cwd: effectiveCwd,
-		shareEnabled,
-		sessionDirForIndex,
-		sessionFileForIndex,
-		artifactsDir,
-		artifactConfig,
-		includeProgress: params.includeProgress,
-		onUpdate,
-		onControlEvent,
-		controlConfig,
-		childIntercomTarget: childIntercomTarget ? (agent, index) => childIntercomTarget(runId, agent, index) : undefined,
-		orchestratorIntercomTarget: data.intercomBridge.active ? data.intercomBridge.orchestratorTarget : undefined,
-		foregroundControl,
-		nestedRoute: foregroundControl?.nestedRoute,
-		chainSkills,
-		chainDir: params.chainDir,
-		dynamicFanoutMaxItems: deps.config.chain?.dynamicFanout?.maxItems,
-		maxSubagentDepth: currentMaxSubagentDepth,
-		workflowStageSubagentGuard,
-		worktreeSetupHook: deps.config.worktreeSetupHook,
-		worktreeSetupHookTimeoutMs: deps.config.worktreeSetupHookTimeoutMs,
-		runSync: deps.runtime.runSync,
-		onDetachedExit: (index, result) => {
-			replaceForegroundRunChild(deps.state, runId, index, result);
-			notifyDetachedForegroundChildExit({ pi: deps.pi, runId, mode: "chain", index, result });
-		},
-	});
-
-	const chainDetails = chainResult.details ? compactForegroundDetails({ ...chainResult.details, runId }) : undefined;
-	if (foregroundControl) updateForegroundNestedProjection(foregroundControl);
-	if (chainDetails)
-		rememberForegroundRun(deps.state, { runId, mode: "chain", cwd: effectiveCwd, results: chainDetails.results });
-	const intercomReceipt =
-		chainDetails && !chainDetails.results.some((result) => result.interrupted || result.detached)
-			? await maybeBuildForegroundIntercomReceipt({
-					pi: deps.pi,
-					intercomBridge: data.intercomBridge,
-					runId,
-					mode: "chain",
-					details: chainDetails,
-					...(foregroundControl?.nestedChildren?.length
-						? { nestedChildren: foregroundControl.nestedChildren }
-						: {}),
-				})
-			: null;
-	if (intercomReceipt) {
-		return {
-			...chainResult,
-			content: [{ type: "text", text: intercomReceipt.text }],
-			details: intercomReceipt.details,
-		};
-	}
-
-	return chainDetails ? { ...chainResult, details: chainDetails } : chainResult;
-}

package/dist/builtin/subagents/src/runs/shared/attempt-watchdog.ts

@@ -1,126 +0,0 @@
-import type { ChildProcess } from "node:child_process";
-import { trySignalChild } from "../../shared/post-exit-stdio-guard.ts";
-
-const DEFAULT_IDLE_MS = 5 * 60_000;
-const DEFAULT_WALL_MS = 60 * 60_000;
-const DEFAULT_KILL_GRACE_MS = 3_000;
-
-export interface AttemptTimeoutConfig {
-	idleMs: number;
-	wallMs: number;
-	killGraceMs: number;
-}
-
-export interface AttemptWatchdog {
-	activity(): void;
-	clear(): void;
-}
-
-/** Parse a millisecond override from the environment. Non-numeric values are
- * silently ignored (the default applies). Zero or negative values are clamped
- * to `0`, which callers treat as "timeout disabled". */
-function envMs(name: string): number | undefined {
-	const raw = process.env[name];
-	if (!raw) return undefined;
-	const value = Number(raw);
-	if (!Number.isFinite(value)) return undefined;
-	return value > 0 ? Math.floor(value) : 0;
-}
-
-function positiveEnvMs(name: string): number | undefined {
-	const value = envMs(name);
-	return value !== undefined && value > 0 ? value : undefined;
-}
-
-export function resolveAttemptTimeoutConfig(): AttemptTimeoutConfig {
-	return {
-		// `0` (or a negative value) disables the corresponding timeout entirely.
-		idleMs: envMs("ATOMIC_SUBAGENT_ATTEMPT_IDLE_TIMEOUT_MS") ?? DEFAULT_IDLE_MS,
-		wallMs: envMs("ATOMIC_SUBAGENT_ATTEMPT_TIMEOUT_MS") ?? DEFAULT_WALL_MS,
-		// The SIGTERM→SIGKILL grace period intentionally cannot be disabled: once a
-		// watchdog trips, escalation must always be bounded. `0`, negative, or
-		// non-numeric values fall back to the default.
-		killGraceMs: positiveEnvMs("ATOMIC_SUBAGENT_ATTEMPT_KILL_GRACE_MS") ?? DEFAULT_KILL_GRACE_MS,
-	};
-}
-
-export function idleTimeoutMessage(idleMs: number): string {
-	return `Subagent model attempt timed out after ${idleMs}ms without child activity.`;
-}
-
-export function wallTimeoutMessage(wallMs: number): string {
-	return `Subagent model attempt timed out after ${wallMs}ms.`;
-}
-
-export function createAttemptWatchdog(params: {
-	child: ChildProcess;
-	config?: Partial<AttemptTimeoutConfig>;
-	onTimeout: (message: string) => void;
-	isSettled: () => boolean;
-	/** Reports whether a tool call is currently executing in the child. A slow tool
-	 * (long build, large test suite) can legitimately stay silent past the idle
-	 * window, so an in-flight tool execution counts as activity and defers the idle
-	 * trip. The wall-clock cap still bounds the whole attempt. */
-	isToolActive?: () => boolean;
-}): AttemptWatchdog {
-	const config = { ...resolveAttemptTimeoutConfig(), ...(params.config ?? {}) };
-	let idleTimer: NodeJS.Timeout | undefined;
-	let wallTimer: NodeJS.Timeout | undefined;
-	let killTimer: NodeJS.Timeout | undefined;
-	let tripped = false;
-
-	const clearIdle = () => {
-		if (!idleTimer) return;
-		clearTimeout(idleTimer);
-		idleTimer = undefined;
-	};
-	const clearAll = () => {
-		clearIdle();
-		if (wallTimer) {
-			clearTimeout(wallTimer);
-			wallTimer = undefined;
-		}
-		if (killTimer) {
-			clearTimeout(killTimer);
-			killTimer = undefined;
-		}
-	};
-	const trip = (message: string) => {
-		if (tripped || params.isSettled()) return;
-		tripped = true;
-		clearIdle();
-		params.onTimeout(message);
-		trySignalChild(params.child, "SIGTERM");
-		killTimer = setTimeout(() => {
-			if (!params.isSettled()) trySignalChild(params.child, "SIGKILL");
-		}, config.killGraceMs);
-		killTimer.unref?.();
-	};
-	const scheduleIdle = () => {
-		clearIdle();
-		if (config.idleMs <= 0) return; // idle watchdog disabled
-		idleTimer = setTimeout(() => {
-			if (params.isToolActive?.()) {
-				// Do not kill a healthy attempt that is busy inside a slow tool call;
-				// re-arm the idle window and let the wall-clock cap bound the attempt.
-				scheduleIdle();
-				return;
-			}
-			trip(idleTimeoutMessage(config.idleMs));
-		}, config.idleMs);
-		idleTimer.unref?.();
-	};
-
-	scheduleIdle();
-	if (config.wallMs > 0) {
-		wallTimer = setTimeout(() => trip(wallTimeoutMessage(config.wallMs)), config.wallMs);
-		wallTimer.unref?.();
-	}
-
-	return {
-		activity() {
-			if (!tripped && !params.isSettled()) scheduleIdle();
-		},
-		clear: clearAll,
-	};
-}

package/dist/builtin/subagents/src/runs/shared/chain-outputs.ts

@@ -1,126 +0,0 @@
-import { type ChainStep, isDynamicParallelStep, isParallelStep, type SequentialStep } from "../../shared/settings.ts";
-import type { ChainOutputMap, ChainOutputMapEntry, SingleResult } from "../../shared/types.ts";
-import { getSingleResultOutput } from "../../shared/utils.ts";
-import {
-	type DynamicFanoutConfig,
-	DynamicFanoutError,
-	hasDynamicFanoutFields,
-	validateDynamicStepShape,
-} from "./dynamic-fanout.ts";
-
-const OUTPUT_REF_PATTERN = /\{outputs\.([^}]*)\}/g;
-const SAFE_OUTPUT_NAME_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
-
-export class ChainOutputValidationError extends Error {}
-
-function outputNamesForStep(step: ChainStep): string[] {
-	if (isParallelStep(step))
-		return step.parallel.map((task) => task.as).filter((name): name is string => Boolean(name));
-	if (isDynamicParallelStep(step)) return [step.collect.as];
-	const name = (step as SequentialStep).as;
-	return name ? [name] : [];
-}
-
-function taskTemplatesForStep(step: ChainStep): string[] {
-	if (isParallelStep(step)) return step.parallel.map((task) => task.task ?? "{previous}");
-	if (isDynamicParallelStep(step))
-		return [step.parallel.task ?? "{previous}", step.parallel.label ?? ""].filter(Boolean);
-	return [(step as SequentialStep).task ?? "{previous}"];
-}
-
-export function validateChainOutputBindings(steps: ChainStep[], dynamicFanoutConfig: DynamicFanoutConfig = {}): void {
-	const available = new Set<string>();
-	const seen = new Set<string>();
-	for (let stepIndex = 0; stepIndex < steps.length; stepIndex++) {
-		const step = steps[stepIndex]!;
-		if (hasDynamicFanoutFields(step)) {
-			if (!isDynamicParallelStep(step)) {
-				throw new ChainOutputValidationError(
-					`Dynamic chain step ${stepIndex + 1} requires expand, a single parallel template object, and collect; dynamic expand/collect cannot be mixed with static parallel arrays.`,
-				);
-			}
-			try {
-				validateDynamicStepShape(step, stepIndex, dynamicFanoutConfig);
-			} catch (error) {
-				if (error instanceof DynamicFanoutError) throw new ChainOutputValidationError(error.message);
-				throw error;
-			}
-			if (!available.has(step.expand.from.output)) {
-				throw new ChainOutputValidationError(
-					`Dynamic chain step ${stepIndex + 1} references unknown output '${step.expand.from.output}'. Named outputs are only available after producing step/group completes.`,
-				);
-			}
-		}
-		for (const name of outputNamesForStep(step)) {
-			if (!SAFE_OUTPUT_NAME_PATTERN.test(name)) {
-				throw new ChainOutputValidationError(
-					`Invalid chain output name '${name}' at step ${stepIndex + 1}. Use /^[A-Za-z_][A-Za-z0-9_]*$/.`,
-				);
-			}
-			if (seen.has(name)) {
-				throw new ChainOutputValidationError(`Duplicate chain output name '${name}'. Each as name must be unique.`);
-			}
-			seen.add(name);
-		}
-		for (const template of taskTemplatesForStep(step)) {
-			for (const match of template.matchAll(OUTPUT_REF_PATTERN)) {
-				const rawReference = match[0];
-				const name = match[1]!;
-				if (!SAFE_OUTPUT_NAME_PATTERN.test(name)) {
-					throw new ChainOutputValidationError(
-						`Invalid chain output reference '${rawReference}' at step ${stepIndex + 1}. Use {outputs.name} with /^[A-Za-z_][A-Za-z0-9_]*$/ names.`,
-					);
-				}
-				if (!available.has(name)) {
-					throw new ChainOutputValidationError(
-						`Unknown chain output reference '${rawReference}' at step ${stepIndex + 1}. Named outputs are only available after producing step/group completes.`,
-					);
-				}
-			}
-		}
-		for (const name of outputNamesForStep(step)) {
-			available.add(name);
-		}
-	}
-}
-
-export function resolveOutputReferences(template: string, outputs: ChainOutputMap): string {
-	return template.replace(OUTPUT_REF_PATTERN, (rawReference, name: string) => {
-		if (!SAFE_OUTPUT_NAME_PATTERN.test(name)) {
-			throw new ChainOutputValidationError(
-				`Invalid chain output reference '${rawReference}'. Use {outputs.name} with /^[A-Za-z_][A-Za-z0-9_]*$/ names.`,
-			);
-		}
-		const entry = outputs[name];
-		if (!entry) throw new ChainOutputValidationError(`Unknown chain output reference '${rawReference}'.`);
-		return entry.text;
-	});
-}
-
-function compactStructuredText(value: unknown): string {
-	return JSON.stringify(value);
-}
-
-export function outputEntryFromResult(result: SingleResult, stepIndex: number): ChainOutputMapEntry {
-	return {
-		text:
-			result.structuredOutput !== undefined
-				? compactStructuredText(result.structuredOutput)
-				: getSingleResultOutput(result),
-		...(result.structuredOutput !== undefined ? { structured: result.structuredOutput } : {}),
-		agent: result.agent,
-		stepIndex,
-	};
-}
-
-export function outputEntryFromAsyncResult(
-	result: { agent: string; output: string; structuredOutput?: unknown },
-	stepIndex: number,
-): ChainOutputMapEntry {
-	return {
-		text: result.structuredOutput !== undefined ? compactStructuredText(result.structuredOutput) : result.output,
-		...(result.structuredOutput !== undefined ? { structured: result.structuredOutput } : {}),
-		agent: result.agent,
-		stepIndex,
-	};
-}