@bastani/atomic 0.9.12 → 0.9.13-alpha.2

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

@@ -1,140 +0,0 @@
-import type { AgentConfig } from "../../agents/agents.ts";
-import type { AgentProgress, ControlEvent, RunSyncOptions, SingleResult } from "../../shared/types.ts";
-import { nextLongRunningTrigger } from "../shared/long-running-guard.ts";
-import {
-	buildControlEvent,
-	claimControlNotification,
-	DEFAULT_CONTROL_CONFIG,
-	deriveActivityState,
-	shouldNotifyControlEvent,
-} from "../shared/subagent-control.ts";
-
-export type NeedsAttentionInput = {
-	message?: string;
-	reason?: ControlEvent["reason"];
-	recentFailureSummary?: string;
-	currentTool?: string;
-	currentPath?: string;
-	currentToolDurationMs?: number;
-};
-
-export type AttemptControlRuntime = {
-	config: NonNullable<RunSyncOptions["controlConfig"]>;
-	allControlEvents: ControlEvent[];
-	drainPendingControlEvents(): ControlEvent[] | undefined;
-	emitNeedsAttention(now: number, input?: NeedsAttentionInput): boolean;
-	updateActivityState(now: number): boolean;
-};
-
-export function createAttemptControlRuntime(input: {
-	options: RunSyncOptions;
-	agent: AgentConfig;
-	result: SingleResult;
-	progress: AgentProgress;
-	startTime: number;
-}): AttemptControlRuntime {
-	const controlConfig = input.options.controlConfig ?? DEFAULT_CONTROL_CONFIG;
-	const allControlEvents: ControlEvent[] = [];
-	let pendingControlEvents: ControlEvent[] = [];
-	const emittedControlEventKeys = new Set<string>();
-	let activeLongRunningNotified = false;
-
-	const currentToolDurationMs = (now: number) =>
-		input.progress.currentToolStartedAt ? Math.max(0, now - input.progress.currentToolStartedAt) : undefined;
-
-	const emitControlEvent = (event: ControlEvent) => {
-		if (!shouldNotifyControlEvent(controlConfig, event)) return;
-		if (!claimControlNotification(controlConfig, event, emittedControlEventKeys)) return;
-		allControlEvents.push(event);
-		pendingControlEvents.push(event);
-		input.options.onControlEvent?.(event);
-	};
-
-	const emitNeedsAttention = (now: number, details: NeedsAttentionInput = {}): boolean => {
-		if (!controlConfig.enabled) return false;
-		const previous = input.progress.activityState;
-		input.progress.activityState = "needs_attention";
-		emitControlEvent(
-			buildControlEvent({
-				type: "needs_attention",
-				from: previous,
-				to: "needs_attention",
-				runId: input.options.runId,
-				agent: input.agent.name,
-				index: input.options.index,
-				ts: now,
-				lastActivityAt: input.progress.lastActivityAt,
-				message: details.message,
-				reason: details.reason ?? "idle",
-				turns: input.result.usage.turns,
-				tokens: input.progress.tokens,
-				toolCount: input.progress.toolCount,
-				currentTool: details.currentTool ?? input.progress.currentTool,
-				currentToolDurationMs: details.currentToolDurationMs ?? currentToolDurationMs(now),
-				currentPath: details.currentPath ?? input.progress.currentPath,
-				recentFailureSummary: details.recentFailureSummary,
-			}),
-		);
-		return previous !== "needs_attention";
-	};
-
-	const emitActiveLongRunning = (now: number, reason: ControlEvent["reason"]): boolean => {
-		if (!controlConfig.enabled || activeLongRunningNotified || input.progress.activityState === "needs_attention")
-			return false;
-		activeLongRunningNotified = true;
-		const previous = input.progress.activityState;
-		input.progress.activityState = "active_long_running";
-		emitControlEvent(
-			buildControlEvent({
-				type: "active_long_running",
-				from: previous,
-				to: "active_long_running",
-				runId: input.options.runId,
-				agent: input.agent.name,
-				index: input.options.index,
-				ts: now,
-				message: `${input.agent.name} is still active but long-running`,
-				reason,
-				turns: input.result.usage.turns,
-				tokens: input.progress.tokens,
-				toolCount: input.progress.toolCount,
-				currentTool: input.progress.currentTool,
-				currentToolDurationMs: currentToolDurationMs(now),
-				currentPath: input.progress.currentPath,
-				elapsedMs: now - input.startTime,
-			}),
-		);
-		return true;
-	};
-
-	return {
-		config: controlConfig,
-		allControlEvents,
-		drainPendingControlEvents: () => {
-			if (pendingControlEvents.length === 0) return undefined;
-			const events = pendingControlEvents;
-			pendingControlEvents = [];
-			return events;
-		},
-		emitNeedsAttention,
-		updateActivityState: (now: number) => {
-			if (!controlConfig.enabled) return false;
-			const idleState = deriveActivityState({
-				config: controlConfig,
-				startedAt: input.startTime,
-				lastActivityAt: input.progress.lastActivityAt,
-				now,
-			});
-			if (idleState === "needs_attention") {
-				return input.progress.activityState === "needs_attention" ? false : emitNeedsAttention(now);
-			}
-			const activeReason = nextLongRunningTrigger(controlConfig, {
-				startedAt: input.startTime,
-				now,
-				turns: input.result.usage.turns,
-				tokens: input.progress.tokens,
-			});
-			return activeReason ? emitActiveLongRunning(now, activeReason) : false;
-		},
-	};
-}

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

@@ -1,108 +0,0 @@
-import type { AgentProgress, ControlEvent, RunSyncOptions, SingleResult } from "../../shared/types.ts";
-import { detectSubagentError, getFinalOutput } from "../../shared/utils.ts";
-import { formatSavedOutputReference, resolveSingleOutput } from "../shared/single-output.ts";
-import { readStructuredOutput } from "../shared/structured-output.ts";
-import type { RunSingleAttemptShared } from "./execution-attempt-types.ts";
-import { artifactOutputByResult, snapshotProgress, snapshotResult } from "./execution-utils.ts";
-
-export function finalizeSingleAttempt(input: {
-	result: SingleResult;
-	progress: AgentProgress;
-	exitCode: number;
-	interruptedByControl: boolean;
-	allControlEvents: ControlEvent[];
-	options: RunSyncOptions;
-	shared: RunSingleAttemptShared;
-	startTime: number;
-}): SingleResult {
-	const { result, progress, options, shared, allControlEvents } = input;
-	result.exitCode = input.exitCode;
-	if (input.interruptedByControl) {
-		result.exitCode = 0;
-		result.interrupted = true;
-		result.error = undefined;
-		result.finalOutput = result.finalOutput || "Interrupted. Waiting for explicit next action.";
-		result.controlEvents = allControlEvents.length ? allControlEvents : undefined;
-		progress.activityState = undefined;
-		progress.durationMs = Date.now() - input.startTime;
-		result.progressSummary = {
-			toolCount: progress.toolCount,
-			tokens: progress.tokens,
-			durationMs: progress.durationMs,
-		};
-		return result;
-	}
-	if (result.detached) {
-		result.exitCode = -2;
-		result.finalOutput = "Detached for intercom coordination; awaiting the child's eventual result.";
-		return result;
-	}
-
-	if (result.error && result.exitCode === 0) result.exitCode = 1;
-	if (result.exitCode === 0 && !result.error) {
-		const errInfo = detectSubagentError(result.messages ?? []);
-		if (errInfo.hasError) {
-			result.exitCode = errInfo.exitCode ?? 1;
-			result.error = errInfo.details
-				? `${errInfo.errorType} failed (exit ${errInfo.exitCode}): ${errInfo.details}`
-				: `${errInfo.errorType} failed with exit code ${errInfo.exitCode}`;
-		}
-	}
-	if (options.structuredOutput && result.exitCode === 0 && !result.error) {
-		const structured = readStructuredOutput(options.structuredOutput);
-		result.structuredOutputSchemaPath = options.structuredOutput.schemaPath;
-		result.structuredOutputPath = options.structuredOutput.outputPath;
-		if (structured.error) {
-			result.exitCode = 1;
-			result.error = structured.error;
-		} else {
-			result.structuredOutput = structured.value;
-		}
-	}
-
-	progress.status = result.exitCode === 0 ? "completed" : "failed";
-	progress.durationMs = Date.now() - input.startTime;
-	if (result.error) {
-		progress.error = result.error;
-		if (progress.currentTool) progress.failedTool = progress.currentTool;
-	}
-
-	result.progressSummary = {
-		toolCount: progress.toolCount,
-		tokens: progress.tokens,
-		durationMs: progress.durationMs,
-	};
-
-	let fullOutput = getFinalOutput(result.messages ?? []);
-	if (options.outputPath && result.exitCode === 0) {
-		const resolvedOutput = resolveSingleOutput(options.outputPath, fullOutput, shared.outputSnapshot);
-		fullOutput = resolvedOutput.fullOutput;
-		result.savedOutputPath = resolvedOutput.savedPath;
-		result.outputSaveError = resolvedOutput.saveError;
-		if (resolvedOutput.savedPath) {
-			result.outputReference = formatSavedOutputReference(resolvedOutput.savedPath, fullOutput);
-		}
-	}
-	artifactOutputByResult.set(result, fullOutput);
-	result.outputMode = options.outputMode ?? "inline";
-	result.finalOutput =
-		options.outputMode === "file-only" && result.savedOutputPath && result.outputReference
-			? result.outputReference.message
-			: fullOutput;
-	result.controlEvents = allControlEvents.length ? allControlEvents : undefined;
-	if (options.onUpdate) {
-		const finalText = result.finalOutput || result.error || "(no output)";
-		const progressSnapshot = snapshotProgress(progress);
-		const resultSnapshot = snapshotResult(result, progressSnapshot);
-		options.onUpdate({
-			content: [{ type: "text", text: finalText }],
-			details: {
-				mode: "single",
-				results: [resultSnapshot],
-				progress: [progressSnapshot],
-				controlEvents: allControlEvents.length ? allControlEvents : undefined,
-			},
-		});
-	}
-	return result;
-}

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

@@ -1,17 +0,0 @@
-import type { CodexFastModeResolvedSettings, CodexFastModeScope } from "@bastani/atomic";
-import type { ArtifactPaths } from "../../shared/types.ts";
-import type { SingleOutputSnapshot } from "../shared/single-output.ts";
-
-export type RunSingleAttemptShared = {
-	sessionEnabled: boolean;
-	systemPrompt: string;
-	resolvedSkillNames?: string[];
-	skillsWarning?: string;
-	jsonlPath?: string;
-	artifactPaths?: ArtifactPaths;
-	attemptNotes: string[];
-	outputSnapshot?: SingleOutputSnapshot;
-	fastModeSettings: CodexFastModeResolvedSettings;
-	fastModeScope: CodexFastModeScope;
-	originalTask?: string;
-};