@bastani/atomic 0.9.13 → 0.9.14-alpha.2

package/dist/builtin/subagents/src/runs/inprocess/runner.ts

@@ -24,14 +24,20 @@ import {
 	SubagentControl,
 } from "@bastani/atomic-natives";
 import type { Api, Model } from "@earendil-works/pi-ai/compat";
-import type { AgentConfig } from "../../agents/agent-types.ts";
-import { ensureArtifactsDir, writeArtifact, writeMetadata } from "../../shared/artifacts.ts";
+import type { AgentConfig } from "../../agents/agent-types.js";
+import {
+	buildSkillInjection,
+	isSubagentOrchestrationSkillSelector,
+	resolveSkillsFromCatalog,
+} from "../../agents/skills.js";
+import { ensureArtifactsDir, writeArtifact, writeMetadata } from "../../shared/artifacts.js";
 import {
 	getSubagentCodexFastModeSettings,
 	resolveSubagentCodexFastModeScope,
 	resolveSubagentModelFastMode,
-} from "../../shared/fast-mode.ts";
-import { resolveEffectiveThinking } from "../../shared/model-info.ts";
+} from "../../shared/fast-mode.js";
+import { DEFAULT_MAX_JSONL_BYTES } from "../../shared/jsonl-writer.js";
+import { resolveEffectiveThinking } from "../../shared/model-info.js";
 import {
 	type AgentProgress,
 	type ArtifactPaths,
@@ -39,10 +45,10 @@ import {
 	type MaxOutputConfig,
 	normalizeMaxSubagentDepth,
 	truncateOutput,
-} from "../../shared/types.ts";
-import { type ChildModePolicy, resolveChildModePolicy } from "./child-policy.ts";
-import { type InProcessNestedResumeOutcome, registerInProcessNestedAttempt } from "./nested-routing.ts";
-import { createInProcessChildPromptBehavior } from "./prompt-behavior.ts";
+} from "../../shared/types.js";
+import { type ChildModePolicy, resolveChildModePolicy } from "./child-policy.js";
+import { type InProcessNestedResumeOutcome, registerInProcessNestedAttempt } from "./nested-routing.js";
+import { createInProcessChildPromptBehavior, createInProcessChildSystemPromptTransform } from "./prompt-behavior.js";
 
 export type ChildStatus = NativeAgentStatus;
 export type ContinuationReason = "intercom-coordination";
@@ -73,6 +79,8 @@ export interface TestSessionOptions {
 	readonly sessionModel?: string;
 	/** Test-only effective thinking level exposed through the AgentSession accessors. */
 	readonly sessionThinkingLevel?: string;
+	/** Test-only session events emitted in order after the initial agent_start event. */
+	readonly events?: readonly AgentSessionEvent[];
 }
 
 export interface ChildSpec {
@@ -168,8 +176,12 @@ export interface AttemptSignals {
 }
 
 export type AttemptStats = SessionStats;
+export interface AttemptSkillReport {
+	readonly skills?: readonly string[];
+	readonly skillsWarning?: string;
+}
 
-export type AttemptOutcome =
+export type AttemptOutcome = (
 	| {
 			readonly status: "ok";
 			readonly output: string;
@@ -211,7 +223,9 @@ export type AttemptOutcome =
 			readonly sessionFile?: string;
 			readonly model?: string;
 			readonly thinking?: string;
-	  };
+	  }
+) &
+	AttemptSkillReport;
 
 export interface ResultEnvelope {
 	readonly path: string;
@@ -403,6 +417,9 @@ function createTestSession(sessionManager: SessionManager, spec: ChildSpec): Age
 				]);
 				if (gateResult === "aborted") return "";
 			}
+			for (const event of testOptions.events ?? []) {
+				for (const listener of listeners) listener(event);
+			}
 			if (testOptions.fallbackModel) {
 				for (const listener of listeners) {
 					listener({
@@ -587,8 +604,16 @@ export function progressEmissionFor(eventType: AgentSessionEvent["type"]): Progr
 
 function writeEvent(pathValue: string | undefined, event: AgentSessionEvent): void {
 	if (!pathValue) return;
+	const line = `${JSON.stringify(event)}\n`;
+	let existingBytes = 0;
+	try {
+		existingBytes = statSync(pathValue).size;
+	} catch (error) {
+		if ((error as NodeJS.ErrnoException).code !== "ENOENT") throw error;
+	}
+	if (existingBytes + Buffer.byteLength(line, "utf8") > DEFAULT_MAX_JSONL_BYTES) return;
 	mkdirSync(dirname(pathValue), { recursive: true });
-	appendFileSync(pathValue, `${JSON.stringify(event)}\n`, "utf8");
+	appendFileSync(pathValue, line, "utf8");
 }
 
 /**
@@ -797,6 +822,7 @@ export class SubagentControlRuntime {
 		let termination: TerminationCauseName | undefined;
 		let terminating: Promise<void> | undefined;
 		let unsubscribe: (() => void) | undefined;
+		let skillReport: AttemptSkillReport = {};
 		const terminate = async (cause: TerminationCauseName): Promise<void> => {
 			if (terminating) return terminating;
 			termination = cause;
@@ -848,7 +874,25 @@ export class SubagentControlRuntime {
 					}),
 				);
 				await resourceLoader.reload();
+				const selectedSkills = resolveSkillsFromCatalog(
+					[...admitted.policy.skills],
+					resourceLoader.getSkillCatalog(),
+					admitted.policy.cwd,
+				);
+				skillReport = {
+					...(selectedSkills.resolved.length > 0
+						? { skills: selectedSkills.resolved.map((skill) => skill.name) }
+						: {}),
+					...(selectedSkills.missing.length > 0
+						? { skillsWarning: `Skills not found: ${selectedSkills.missing.join(", ")}` }
+						: {}),
+				};
+				if (selectedSkills.missing.some(isSubagentOrchestrationSkillSelector)) {
+					throw new Error("Skills not found: subagent");
+				}
+				const skillInjection = buildSkillInjection(selectedSkills.resolved);
 				const promptBehavior = createInProcessChildPromptBehavior(admitted.policy);
+				const systemPromptTransform = createInProcessChildSystemPromptTransform(admitted.policy, skillInjection);
 				created = {
 					session: (
 						await createAgentSession({
@@ -866,7 +910,7 @@ export class SubagentControlRuntime {
 							settingsManager,
 							orchestrationContext: admitted.spec.parent?.orchestrationContext,
 							subagentPolicy: admitted.policy,
-							systemPromptTransform: promptBehavior.systemPromptTransform,
+							systemPromptTransform,
 							initialContextTransform: promptBehavior.initialContextTransform,
 						})
 					).session,
@@ -980,6 +1024,7 @@ export class SubagentControlRuntime {
 					...(effectiveModelId === undefined ? {} : { model: effectiveModelId }),
 					...(effectiveThinking === undefined ? {} : { thinking: effectiveThinking }),
 					...(attemptedModels.length > 1 ? { attemptedModels: [...attemptedModels] } : {}),
+					...skillReport,
 				};
 			return {
 				status,
@@ -991,6 +1036,7 @@ export class SubagentControlRuntime {
 				...(effectiveModelId === undefined ? {} : { model: effectiveModelId }),
 				...(effectiveThinking === undefined ? {} : { thinking: effectiveThinking }),
 				...(status === "error" && attemptedModels.length > 1 ? { attemptedModels: [...attemptedModels] } : {}),
+				...skillReport,
 			};
 		} catch (error) {
 			const stats = statsFor(session, admitted.identity.path);
@@ -1011,6 +1057,7 @@ export class SubagentControlRuntime {
 						sessionFile: session?.sessionFile,
 						...(effectiveModelId === undefined ? {} : { model: effectiveModelId }),
 						...(effectiveThinking === undefined ? {} : { thinking: effectiveThinking }),
+						...skillReport,
 					}
 				: {
 						status,
@@ -1022,6 +1069,7 @@ export class SubagentControlRuntime {
 						...(effectiveModelId === undefined ? {} : { model: effectiveModelId }),
 						...(effectiveThinking === undefined ? {} : { thinking: effectiveThinking }),
 						...(attemptedModels.length > 1 ? { attemptedModels: [...attemptedModels] } : {}),
+						...skillReport,
 					};
 		} finally {
 			signals.abort.removeEventListener("abort", abortListener);

package/dist/builtin/subagents/src/runs/inprocess/runtime-support/nested-api.ts

@@ -6,14 +6,14 @@ export {
 	readNestedControlResults,
 	writeNestedControlRequest,
 	writeNestedControlResult,
-} from "./nested-control.ts";
+} from "./nested-control.js";
 export type {
 	NestedControlRequestRecord,
 	NestedControlResultRecord,
 	NestedEventRecord,
 	NestedRegistry,
 	NestedRoute,
-} from "./nested-core.ts";
+} from "./nested-core.js";
 export {
 	assertSafeNestedId,
 	cleanupOldNestedRuntimeDirs,
@@ -29,19 +29,19 @@ export {
 	resolveNestedParentAddressFromEnv,
 	resolveNestedRouteFromEnv,
 	validateNestedRouteShape,
-} from "./nested-core.ts";
+} from "./nested-core.js";
 export {
 	encodeNestedPathEnv,
 	MAX_NESTED_PATH_ENTRIES,
 	parseNestedPathEnv,
 	sanitizeNestedPath,
-} from "./nested-paths.ts";
+} from "./nested-paths.js";
 export {
 	attachRootChildrenToSteps,
 	hasLiveNestedDescendants,
 	updateForegroundNestedProjection,
-} from "./nested-projection.ts";
-export type { NestedRunMatch, NestedRunResolutionScope } from "./nested-registry.ts";
+} from "./nested-projection.js";
+export type { NestedRunMatch, NestedRunResolutionScope } from "./nested-registry.js";
 export {
 	findNestedRouteForRootId,
 	findNestedRun,
@@ -51,5 +51,5 @@ export {
 	projectNestedRegistryForRoot,
 	readNestedRegistry,
 	writeNestedEvent,
-} from "./nested-registry.ts";
-export { applyNestedEvent, parseNestedEventRecords, sanitizeSummary } from "./nested-sanitize.ts";
+} from "./nested-registry.js";
+export { applyNestedEvent, parseNestedEventRecords, sanitizeSummary } from "./nested-sanitize.js";

package/dist/builtin/subagents/src/runs/inprocess/runtime-support/nested-control.ts

@@ -6,7 +6,7 @@ import {
 	hasInProcessNestedRoute,
 	readInProcessControlRequests,
 	readInProcessControlResults,
-} from "../nested-routing.ts";
+} from "../nested-routing.js";
 import {
 	assertSafeId,
 	clampNumber,
@@ -18,8 +18,8 @@ import {
 	type NestedRoute,
 	stringValue,
 	validateRouteShape,
-} from "./nested-core.ts";
-import { writeRouteRecord } from "./nested-registry.ts";
+} from "./nested-core.js";
+import { writeRouteRecord } from "./nested-registry.js";
 
 export function parseNestedControlRequest(content: string, route: NestedRoute): NestedControlRequestRecord | undefined {
 	if (Buffer.byteLength(content, "utf-8") > MAX_NESTED_EVENT_BYTES) return undefined;

package/dist/builtin/subagents/src/runs/inprocess/runtime-support/nested-core.ts

@@ -1,10 +1,10 @@
 import { randomUUID } from "node:crypto";
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { type NestedRouteInfo, type NestedRunSummary, TEMP_ROOT_DIR } from "../../../shared/types.ts";
-import { MAX_SUBAGENT_NESTING_DEPTH } from "../../../shared/types-runtime.ts";
-import { registerInProcessNestedRoute } from "../nested-routing.ts";
-import { isSafeNestedPathId, type NestedPathEntry } from "./nested-paths.ts";
+import { type NestedRouteInfo, type NestedRunSummary, TEMP_ROOT_DIR } from "../../../shared/types.js";
+import { MAX_SUBAGENT_NESTING_DEPTH } from "../../../shared/types-runtime.js";
+import { registerInProcessNestedRoute } from "../nested-routing.js";
+import { isSafeNestedPathId, type NestedPathEntry } from "./nested-paths.js";
 
 export const NESTED_EVENTS_DIR = path.join(TEMP_ROOT_DIR, "nested-subagent-events");
 export const ROUTE_FILE = "route.json";

package/dist/builtin/subagents/src/runs/inprocess/runtime-support/nested-projection.ts

@@ -1,7 +1,7 @@
-import type { NestedRunSummary, SubagentState } from "../../../shared/types.ts";
-import { MAX_NESTED_CHILDREN } from "./nested-core.ts";
-import { projectNestedEvents } from "./nested-registry.ts";
-import { terminal } from "./nested-sanitize.ts";
+import type { NestedRunSummary, SubagentState } from "../../../shared/types.js";
+import { MAX_NESTED_CHILDREN } from "./nested-core.js";
+import { projectNestedEvents } from "./nested-registry.js";
+import { terminal } from "./nested-sanitize.js";
 
 export function attachRootChildrenToSteps<T extends { children?: NestedRunSummary[]; index?: number }>(
 	rootRunId: string,

package/dist/builtin/subagents/src/runs/inprocess/runtime-support/nested-registry.ts

@@ -1,9 +1,9 @@
 import { randomUUID } from "node:crypto";
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { writeAtomicJson } from "../../../shared/atomic-json.ts";
-import type { NestedRunSummary } from "../../../shared/types.ts";
-import { appendInProcessNestedEvent, hasInProcessNestedRoute, readInProcessNestedEvents } from "../nested-routing.ts";
+import { writeAtomicJson } from "../../../shared/atomic-json.js";
+import type { NestedRunSummary } from "../../../shared/types.js";
+import { appendInProcessNestedEvent, hasInProcessNestedRoute, readInProcessNestedEvents } from "../nested-routing.js";
 import {
 	assertSafeId,
 	commonRouteRoot,
@@ -17,8 +17,8 @@ import {
 	REGISTRY_FILE,
 	ROUTE_FILE,
 	validateRouteShape,
-} from "./nested-core.ts";
-import { applyNestedEvent, parseNestedEventRecords, parseRecord, sanitizeSummary } from "./nested-sanitize.ts";
+} from "./nested-core.js";
+import { applyNestedEvent, parseNestedEventRecords, parseRecord, sanitizeSummary } from "./nested-sanitize.js";
 
 const REGISTRY_LOCK_DIR = ".registry.lock";
 const REGISTRY_LOCK_TIMEOUT_MS = 2_000;

package/dist/builtin/subagents/src/runs/inprocess/runtime-support/nested-rendering.ts

@@ -1,6 +1,6 @@
-import { formatDuration, formatTokens, shortenPath } from "../../../shared/formatters.ts";
-import { formatActivityLabel } from "../../../shared/status-format.ts";
-import { type ActivityState, MAX_SUBAGENT_NESTING_DEPTH, type NestedRunSummary } from "../../../shared/types.ts";
+import { formatDuration, formatTokens, shortenPath } from "../../../shared/formatters.js";
+import { formatActivityLabel } from "../../../shared/status-format.js";
+import { type ActivityState, MAX_SUBAGENT_NESTING_DEPTH, type NestedRunSummary } from "../../../shared/types.js";
 
 export interface NestedRunCounts {
 	total: number;

package/dist/builtin/subagents/src/runs/inprocess/runtime-support/nested-sanitize.ts

@@ -1,4 +1,4 @@
-import type { NestedRunState, NestedRunSummary, NestedStepSummary } from "../../../shared/types.ts";
+import type { NestedRunState, NestedRunSummary, NestedStepSummary } from "../../../shared/types.js";
 import {
 	clampNumber,
 	isSafeNestedId,
@@ -10,8 +10,8 @@ import {
 	type NestedRegistry,
 	type NestedRoute,
 	stringValue,
-} from "./nested-core.ts";
-import { sanitizeNestedPath } from "./nested-paths.ts";
+} from "./nested-core.js";
+import { sanitizeNestedPath } from "./nested-paths.js";
 
 function sanitizeTokenUsage(value: unknown): NestedRunSummary["totalTokens"] | undefined {
 	if (!value || typeof value !== "object") return undefined;

package/dist/builtin/subagents/src/runs/inprocess.ts

@@ -1 +1 @@
-export * from "./inprocess/index.ts";
+export * from "./inprocess/index.js";

package/dist/builtin/subagents/src/runs/shared/long-running-guard.ts

@@ -1,4 +1,4 @@
-import type { ResolvedControlConfig } from "../../shared/types.ts";
+import type { ResolvedControlConfig } from "../../shared/types.js";
 
 interface LongRunningNoticeMetrics {
 	startedAt: number;

package/dist/builtin/subagents/src/runs/shared/mcp-direct-tool-allowlist.ts

@@ -3,7 +3,7 @@ import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import { getProjectConfigDirs } from "@bastani/atomic";
-import { getAgentDir } from "../../shared/utils.ts";
+import { getAgentDir } from "../../shared/utils.js";
 
 const CACHE_VERSION = 1;
 const CACHE_MAX_AGE_MS = 7 * 24 * 60 * 60 * 1000;

package/dist/builtin/subagents/src/runs/shared/model-candidate-filter.ts

@@ -1,6 +1,6 @@
-import { splitKnownThinkingSuffix } from "../../shared/model-info.ts";
-import type { ModelAttempt } from "../../shared/types.ts";
-import type { AvailableModelInfo } from "./model-fallback.ts";
+import { splitKnownThinkingSuffix } from "../../shared/model-info.js";
+import type { ModelAttempt } from "../../shared/types.js";
+import type { AvailableModelInfo } from "./model-fallback.js";
 
 export interface FilteredModelCandidates {
 	candidates: string[];

package/dist/builtin/subagents/src/runs/shared/model-fallback.ts

@@ -9,8 +9,8 @@ import {
 	type ModelInfo as AvailableModelInfo,
 	splitKnownThinkingSuffix,
 	THINKING_LEVELS,
-} from "../../shared/model-info.ts";
-import type { Usage } from "../../shared/types.ts";
+} from "../../shared/model-info.js";
+import type { Usage } from "../../shared/types.js";
 
 export type { AvailableModelInfo, ModelFallbackFailureKind, ModelFallbackFailureSignal, ModelFallbackFailureSource };
 export { errorMessage, isRetryableModelFailure, modelFailureMessage, normalizeModelFailureSignal };

package/dist/builtin/subagents/src/runs/shared/parallel-utils.ts

@@ -22,7 +22,7 @@ export interface ParallelTaskResult {
 	agent: string;
 	taskIndex?: number;
 	output: string;
-	status: import("../../shared/types.ts").SubagentAttemptStatus;
+	status: import("../../shared/types.js").SubagentAttemptStatus;
 	error?: string;
 	model?: string;
 	fastMode?: boolean;

package/dist/builtin/subagents/src/runs/shared/single-output.ts

@@ -1,6 +1,6 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
-import type { OutputMode, SavedOutputReference, SubagentAttemptStatus } from "../../shared/types.ts";
+import type { OutputMode, SavedOutputReference, SubagentAttemptStatus } from "../../shared/types.js";
 
 export interface SingleOutputSnapshot {
 	exists: boolean;

package/dist/builtin/subagents/src/runs/shared/subagent-control.ts

@@ -5,7 +5,7 @@ import type {
 	ControlEventType,
 	ControlNotificationChannel,
 	ResolvedControlConfig,
-} from "../../shared/types.ts";
+} from "../../shared/types.js";
 
 const CONTROL_EVENT_TYPES: ControlEventType[] = ["active_long_running", "needs_attention"];
 const CONTROL_NOTIFICATION_CHANNELS: ControlNotificationChannel[] = ["event", "intercom"];

package/dist/builtin/subagents/src/shared/artifacts.ts

@@ -1,9 +1,9 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { getAgentConfigPaths } from "@bastani/atomic";
-import { appendToActiveEventWriter } from "./event-jsonl-writer.ts";
+import { appendToActiveEventWriter } from "./event-jsonl-writer.js";
 import { publishFileExclusive, unlinkIfPresent } from "./exclusive-file-publication.js";
-import { type ArtifactPaths, TEMP_ARTIFACTS_DIR } from "./types.ts";
+import { type ArtifactPaths, TEMP_ARTIFACTS_DIR } from "./types.js";
 
 const CLEANUP_MARKER_FILE = ".last-cleanup";
 const CLEANUP_LOCK_FILE = ".cleanup.lock";

package/dist/builtin/subagents/src/shared/event-jsonl-writer.ts

@@ -1,6 +1,6 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
-import type { DrainableSource, JsonlWriteStream } from "./jsonl-writer.ts";
+import type { DrainableSource, JsonlWriteStream } from "./jsonl-writer.js";
 
 interface TelemetryState {
 	telemetryBytes: number;

package/dist/builtin/subagents/src/shared/fast-mode.ts

@@ -5,7 +5,7 @@ import {
 	SettingsManager,
 	shouldApplyCodexFastModeForScope,
 } from "@bastani/atomic";
-import { splitKnownThinkingSuffix } from "./model-info.ts";
+import { splitKnownThinkingSuffix } from "./model-info.js";
 
 export interface ResolveSubagentModelFastModeInput {
 	model?: string;

package/dist/builtin/subagents/src/shared/formatters.ts

@@ -2,8 +2,8 @@
  * Formatting utilities for display output
  */
 
-import { splitKnownThinkingSuffix, THINKING_LEVELS } from "./model-info.ts";
-import type { Usage } from "./types.ts";
+import { splitKnownThinkingSuffix, THINKING_LEVELS } from "./model-info.js";
+import type { Usage } from "./types.js";
 
 /**
  * Format token count with k suffix for large numbers

package/dist/builtin/subagents/src/shared/jsonl-writer.ts

@@ -12,7 +12,7 @@ export interface JsonlWriteStream {
 	end(callback?: () => void): void;
 }
 
-const DEFAULT_MAX_JSONL_BYTES = 50 * 1024 * 1024;
+export const DEFAULT_MAX_JSONL_BYTES = 50 * 1024 * 1024;
 
 interface JsonlWriterDeps {
 	createWriteStream?: (filePath: string) => JsonlWriteStream;

package/dist/builtin/subagents/src/shared/model-resolution.ts

@@ -16,7 +16,7 @@
  */
 
 import type { Api, Model } from "@earendil-works/pi-ai/compat";
-import { splitKnownThinkingSuffix, THINKING_LEVELS, type ThinkingLevel } from "./model-info.ts";
+import { splitKnownThinkingSuffix, THINKING_LEVELS, type ThinkingLevel } from "./model-info.js";
 
 /** Registry surface needed to resolve a candidate; satisfied by `ctx.modelRegistry`. */
 export interface CandidateModelLookup {

package/dist/builtin/subagents/src/shared/session-tokens.ts

@@ -1,6 +1,6 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
-import type { TokenUsage } from "./types.ts";
+import type { TokenUsage } from "./types.js";
 
 function findLatestSessionFile(sessionDir: string): string | null {
 	try {

package/dist/builtin/subagents/src/shared/settings.ts

@@ -2,8 +2,8 @@
 
 import * as fs from "node:fs";
 import * as path from "node:path";
-import type { AgentConfig } from "../agents/agents.ts";
-import type { OutputMode } from "./types.ts";
+import type { AgentConfig } from "../agents/agents.js";
+import type { OutputMode } from "./types.js";
 
 const INITIAL_PROGRESS_CONTENT = "# Progress\n\n## Status\nIn Progress\n\n## Tasks\n\n## Files Changed\n\n## Notes\n";
 
@@ -114,5 +114,5 @@ export function buildTaskInstructions(
 	return { prefix, suffix };
 }
 
-export type { ParallelTaskResult } from "../runs/shared/parallel-utils.ts";
-export { aggregateParallelOutputs } from "../runs/shared/parallel-utils.ts";
+export type { ParallelTaskResult } from "../runs/shared/parallel-utils.js";
+export { aggregateParallelOutputs } from "../runs/shared/parallel-utils.js";

package/dist/builtin/subagents/src/shared/status-format.ts

@@ -1,4 +1,4 @@
-import type { ActivityState } from "./types.ts";
+import type { ActivityState } from "./types.js";
 
 type StepStatus = "pending" | "running" | "complete" | "completed" | "failed" | "paused";
 type StepStatusLike = { status: StepStatus };

package/dist/builtin/subagents/src/shared/types-config.ts

@@ -2,10 +2,10 @@
  * Configuration, execution option, display, and event bus types.
  */
 
-import type { SessionWorkflowMetadata } from "@bastani/atomic";
+import type { AgentSessionEvent, SessionWorkflowMetadata } from "@bastani/atomic";
 import type { AgentToolResult } from "@earendil-works/pi-agent-core";
-import type { CandidateModelResolver } from "./model-resolution.ts";
-import type { NestedRouteInfo } from "./types-nested.ts";
+import type { CandidateModelResolver } from "./model-resolution.js";
+import type { NestedRouteInfo } from "./types-nested.js";
 import type {
 	ArtifactConfig,
 	ControlConfig,
@@ -15,7 +15,7 @@ import type {
 	OutputMode,
 	ResolvedControlConfig,
 	SingleResult,
-} from "./types-results.ts";
+} from "./types-results.js";
 
 // ============================================================================
 // Display
@@ -111,6 +111,16 @@ export interface RunSyncOptions {
 	preferredModelProvider?: string;
 	/** Current parent-session model to try after configured fallback models */
 	currentModel?: string;
+	/**
+	 * Current parent-session thinking level. Inherited by a child that pins no
+	 * model of its own — no frontmatter `model`, no `fallbackModels`, and no
+	 * per-call override — matching upstream pi #7897: a subagent dispatched
+	 * without a model runs on the dispatching session's model and thinking
+	 * level. An agent whose fallback chain selects its own first candidate
+	 * runs on that model, not the parent's, and keeps its own thinking
+	 * configuration.
+	 */
+	currentThinkingLevel?: string;
 	/** Skills to inject (overrides agent default if provided) */
 	skills?: string[];
 	/** Test-only in-process session stub configuration; production runs create a real AgentSession. */
@@ -131,6 +141,8 @@ export interface RunSyncOptions {
 				sessionModel?: string;
 				/** Test-only effective thinking level exposed through the AgentSession accessors. */
 				sessionThinkingLevel?: string;
+				/** Test-only session events emitted in order after the initial agent_start event. */
+				events?: readonly AgentSessionEvent[];
 		  };
 }
 

package/dist/builtin/subagents/src/shared/types-depth.ts

@@ -3,7 +3,7 @@
  */
 
 import type { ExtensionContext, SessionWorkflowMetadata } from "@bastani/atomic";
-import { DEFAULT_SUBAGENT_MAX_DEPTH, MAX_SUBAGENT_NESTING_DEPTH } from "./types-runtime.ts";
+import { DEFAULT_SUBAGENT_MAX_DEPTH, MAX_SUBAGENT_NESTING_DEPTH } from "./types-runtime.js";
 
 // Depth is admission state carried in the typed child policy, not process environment.
 

package/dist/builtin/subagents/src/shared/types-nested.ts

@@ -9,7 +9,7 @@ import type {
 	SubagentResultStatus,
 	SubagentRunMode,
 	TokenUsage,
-} from "./types-results.ts";
+} from "./types-results.js";
 
 export type NestedRunState = "queued" | "running" | "complete" | "failed" | "paused";
 export type NestedOwnerState = "live" | "gone" | "unknown";

package/dist/builtin/subagents/src/shared/types-output.ts

@@ -2,7 +2,7 @@
  * Output truncation helpers.
  */
 
-import type { MaxOutputConfig } from "./types-results.ts";
+import type { MaxOutputConfig } from "./types-results.js";
 
 interface TruncationResult {
 	text: string;

package/dist/builtin/subagents/src/shared/types-results.ts

@@ -5,7 +5,7 @@
 import type { SessionStats } from "@bastani/atomic";
 import type { AgentToolResult } from "@earendil-works/pi-agent-core";
 import type { Message } from "@earendil-works/pi-ai/compat";
-import type { NestedRunAddress, NestedRunSummary, NestedStepSummary } from "./types-nested.ts";
+import type { NestedRunAddress, NestedRunSummary, NestedStepSummary } from "./types-nested.js";
 
 export interface MaxOutputConfig {
 	bytes?: number;

package/dist/builtin/subagents/src/shared/types-runtime.ts

@@ -5,7 +5,7 @@
 import * as os from "node:os";
 import * as path from "node:path";
 import { APP_NAME } from "@bastani/atomic";
-import type { ArtifactConfig, MaxOutputConfig } from "./types-results.ts";
+import type { ArtifactConfig, MaxOutputConfig } from "./types-results.js";
 
 // Constants
 // ============================================================================

package/dist/builtin/subagents/src/shared/types.ts

@@ -5,9 +5,9 @@
  * focused sibling modules that hold the concrete type groups and helpers.
  */
 
-export * from "./types-config.ts";
-export * from "./types-depth.ts";
-export * from "./types-nested.ts";
-export * from "./types-output.ts";
-export * from "./types-results.ts";
-export * from "./types-runtime.ts";
+export * from "./types-config.js";
+export * from "./types-depth.js";
+export * from "./types-nested.js";
+export * from "./types-output.js";
+export * from "./types-results.js";
+export * from "./types-runtime.js";

package/dist/builtin/subagents/src/shared/utils.ts

@@ -5,8 +5,8 @@
 import * as path from "node:path";
 import { getAgentDir as getAtomicAgentDir } from "@bastani/atomic";
 import type { Message } from "@earendil-works/pi-ai/compat";
-import { formatToolCall } from "./formatters.ts";
-import type { AgentProgress, Details, DisplayItem, ErrorInfo, SingleResult, ToolCallSummary } from "./types.ts";
+import { formatToolCall } from "./formatters.js";
+import type { AgentProgress, Details, DisplayItem, ErrorInfo, SingleResult, ToolCallSummary } from "./types.js";
 
 // ============================================================================
 // File System Utilities
@@ -339,4 +339,4 @@ export function extractTextFromContent(content: unknown): string {
 // Concurrency Utilities
 // ============================================================================
 
-export { mapConcurrent } from "../runs/shared/parallel-utils.ts";
+export { mapConcurrent } from "../runs/shared/parallel-utils.js";