@bastani/atomic 0.9.13 → 0.9.14-alpha.2

package/dist/builtin/subagents/src/agents/skills.ts

@@ -4,14 +4,15 @@
 
 import * as fs from "node:fs";
 import * as path from "node:path";
+import type { SkillCatalog } from "@bastani/atomic";
 import {
 	buildSkillPaths,
 	clearSkillPathDiscoveryCache,
 	inferSkillSource,
 	type SkillSearchPath,
-} from "./skills-paths.ts";
+} from "./skills-paths.js";
 
-export { __setGlobalNpmRootExecSyncForTest } from "./skills-paths.ts";
+export { __setGlobalNpmRootExecSyncForTest } from "./skills-paths.js";
 
 export type SkillSource =
 	| "project"
@@ -24,7 +25,7 @@ export type SkillSource =
 	| "builtin"
 	| "unknown";
 
-interface ResolvedSkill {
+export interface ResolvedSkill {
 	name: string;
 	path: string;
 	content: string;
@@ -52,6 +53,16 @@ const LOAD_SKILLS_CACHE_TTL_MS = 5000;
 
 const SUBAGENT_ORCHESTRATION_SKILL = "subagent";
 
+/** Bare skill name from `/skill:name` or `/skill:name@qualifier`. */
+export function skillSelectorBaseName(selector: string): string {
+	const separator = selector.indexOf("@");
+	return separator === -1 ? selector : selector.slice(0, separator);
+}
+
+export function isSubagentOrchestrationSkillSelector(selector: string): boolean {
+	return skillSelectorBaseName(selector) === SUBAGENT_ORCHESTRATION_SKILL;
+}
+
 const SOURCE_PRIORITY: Record<SkillSource, number> = {
 	project: 700,
 	"project-settings": 650,
@@ -206,9 +217,10 @@ export function resolveSkillPath(skillName: string, cwd: string): { path: string
 }
 
 function readSkill(skillName: string, skillPath: string, source: SkillSource): ResolvedSkill | undefined {
+	const cacheKey = `${skillPath}\0${skillName}`;
 	try {
 		const stat = fs.statSync(skillPath);
-		const cached = skillCache.get(skillPath);
+		const cached = skillCache.get(cacheKey);
 		if (cached && cached.mtime === stat.mtimeMs) {
 			return cached.skill;
 		}
@@ -222,7 +234,7 @@ function readSkill(skillName: string, skillPath: string, source: SkillSource): R
 			source,
 		};
 
-		skillCache.set(skillPath, { mtime: stat.mtimeMs, skill });
+		skillCache.set(cacheKey, { mtime: stat.mtimeMs, skill });
 		if (skillCache.size > MAX_CACHE_SIZE) {
 			const firstKey = skillCache.keys().next().value;
 			if (firstKey) skillCache.delete(firstKey);
@@ -235,6 +247,52 @@ function readSkill(skillName: string, skillPath: string, source: SkillSource): R
 	}
 }
 
+function catalogSkillSource(
+	skillPath: string,
+	cwd: string,
+	catalogSource: {
+		readonly scope: "user" | "project" | "temporary";
+		readonly origin: "package" | "top-level";
+		readonly configurationOrigin?: string;
+	},
+): SkillSource {
+	if (catalogSource.configurationOrigin === "bundled") return "builtin";
+	if (catalogSource.scope === "project") return catalogSource.origin === "package" ? "project-package" : "project";
+	if (catalogSource.scope === "user") return catalogSource.origin === "package" ? "user-package" : "user";
+	return inferSkillSource(skillPath, cwd);
+}
+
+export function resolveSkillsFromCatalog(
+	skillNames: string[],
+	catalog: SkillCatalog,
+	cwd: string,
+): { resolved: ResolvedSkill[]; missing: string[] } {
+	const resolved: ResolvedSkill[] = [];
+	const missing: string[] = [];
+	for (const name of skillNames) {
+		const selector = name.trim();
+		if (!selector) continue;
+		if (isSubagentOrchestrationSkillSelector(selector)) {
+			missing.push(selector);
+			continue;
+		}
+		const resolution = catalog.resolve(selector);
+		if (!resolution.ok) {
+			missing.push(selector);
+			continue;
+		}
+		const candidate = resolution.candidate;
+		const skill = readSkill(
+			selector,
+			candidate.skill.filePath,
+			catalogSkillSource(candidate.skill.filePath, cwd, candidate.skill.sourceInfo),
+		);
+		if (skill) resolved.push(skill);
+		else missing.push(selector);
+	}
+	return { resolved, missing };
+}
+
 export function resolveSkills(skillNames: string[], cwd: string): { resolved: ResolvedSkill[]; missing: string[] } {
 	const resolved: ResolvedSkill[] = [];
 	const missing: string[] = [];
@@ -242,7 +300,7 @@ export function resolveSkills(skillNames: string[], cwd: string): { resolved: Re
 	for (const name of skillNames) {
 		const trimmed = name.trim();
 		if (!trimmed) continue;
-		if (trimmed === SUBAGENT_ORCHESTRATION_SKILL) {
+		if (isSubagentOrchestrationSkillSelector(trimmed)) {
 			missing.push(trimmed);
 			continue;
 		}

package/dist/builtin/subagents/src/extension/config.ts

@@ -1,6 +1,6 @@
 import * as fs from "node:fs";
 import { getAgentConfigPaths } from "@bastani/atomic";
-import type { ExtensionConfig } from "../shared/types.ts";
+import type { ExtensionConfig } from "../shared/types.js";
 
 export function loadConfig(): ExtensionConfig {
 	for (const configPath of getAgentConfigPaths("extensions", "subagent", "config.json")) {

package/dist/builtin/subagents/src/extension/control-notices.ts

@@ -1,6 +1,6 @@
 import type { ExtensionAPI } from "@bastani/atomic";
-import { controlNotificationKey, formatControlNoticeMessage } from "../runs/shared/subagent-control.ts";
-import type { ControlEvent, SubagentState } from "../shared/types.ts";
+import { controlNotificationKey, formatControlNoticeMessage } from "../runs/shared/subagent-control.js";
+import type { ControlEvent, SubagentState } from "../shared/types.js";
 
 export const SUBAGENT_CONTROL_MESSAGE_TYPE = "subagent_control_notice";
 

package/dist/builtin/subagents/src/extension/doctor.ts

@@ -1,9 +1,9 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { type AgentSource, discoverAgentsAll } from "../agents/agents.ts";
-import { discoverAvailableSkills, type SkillSource } from "../agents/skills.ts";
-import { diagnoseIntercomBridge, type IntercomBridgeDiagnostic } from "../intercom/intercom-bridge.ts";
-import { type ExtensionConfig, type SubagentState, TEMP_ROOT_DIR } from "../shared/types.ts";
+import { type AgentSource, discoverAgentsAll } from "../agents/agents.js";
+import { discoverAvailableSkills, type SkillSource } from "../agents/skills.js";
+import { diagnoseIntercomBridge, type IntercomBridgeDiagnostic } from "../intercom/intercom-bridge.js";
+import { type ExtensionConfig, type SubagentState, TEMP_ROOT_DIR } from "../shared/types.js";
 
 interface DoctorPaths {
 	tempRootDir: string;
@@ -115,7 +115,17 @@ function formatDiscovery(input: DoctorReportInput, deps: DoctorDeps): string[] {
 				user: discovered.user.length,
 				project: discovered.project.length,
 			};
-			return `- agents: total ${agentCounts.builtin + agentCounts.user + agentCounts.project} (${formatSourceCounts(agentCounts)})`;
+			const lines = [
+				`- agents: total ${agentCounts.builtin + agentCounts.user + agentCounts.project} (${formatSourceCounts(agentCounts)})`,
+			];
+			// A file whose frontmatter is invalid YAML is skipped by discovery;
+			// without these lines it would vanish with no signal at all.
+			for (const diagnostic of discovered.diagnostics) {
+				lines.push(
+					`- agents: warning — ${diagnostic.path}: invalid YAML frontmatter (${diagnostic.message}); file skipped`,
+				);
+			}
+			return lines.join("\n");
 		}),
 		lineFromCheck("skills", () => {
 			const skills = deps.discoverAvailableSkills(input.cwd);

package/dist/builtin/subagents/src/extension/fanout-child.ts

@@ -4,23 +4,23 @@ import * as path from "node:path";
 import type { ExtensionAPI, ToolDefinition } from "@bastani/atomic";
 import { APP_NAME } from "@bastani/atomic";
 
-import { discoverAgents } from "../agents/agents.ts";
-import { resolveSubagentIntercomTarget } from "../intercom/intercom-bridge.ts";
-import { deliverSubagentIntercomMessageEvent } from "../intercom/result-intercom.ts";
-import { createSubagentExecutor, type SubagentParamsLike } from "../runs/foreground/subagent-executor.ts";
-import type { ChildModePolicy } from "../runs/inprocess/child-policy.ts";
-import { hasInProcessNestedRoute, subscribeInProcessControlRequests } from "../runs/inprocess/nested-routing.ts";
+import { discoverAgents } from "../agents/agents.js";
+import { resolveSubagentIntercomTarget } from "../intercom/intercom-bridge.js";
+import { deliverSubagentIntercomMessageEvent } from "../intercom/result-intercom.js";
+import { createSubagentExecutor, type SubagentParamsLike } from "../runs/foreground/subagent-executor.js";
+import type { ChildModePolicy } from "../runs/inprocess/child-policy.js";
+import { hasInProcessNestedRoute, subscribeInProcessControlRequests } from "../runs/inprocess/nested-routing.js";
 import {
 	type NestedRoute,
 	readNestedControlRequests,
 	resolveNestedRouteFromEnv,
 	writeNestedControlResult,
-} from "../runs/inprocess/runtime-support/nested-api.ts";
-import { getArtifactsDir } from "../shared/artifacts.ts";
-import type { Details, SubagentState } from "../shared/types.ts";
-import { beginApiLifecycle } from "./api-lifecycle.ts";
-import { loadConfig } from "./config.ts";
-import { SubagentParams } from "./schemas.ts";
+} from "../runs/inprocess/runtime-support/nested-api.js";
+import { getArtifactsDir } from "../shared/artifacts.js";
+import type { Details, SubagentState } from "../shared/types.js";
+import { beginApiLifecycle } from "./api-lifecycle.js";
+import { loadConfig } from "./config.js";
+import { SubagentParams } from "./schemas.js";
 
 function getSubagentSessionRoot(parentSessionFile: string | null): string {
 	if (parentSessionFile) {

package/dist/builtin/subagents/src/extension/index.ts

@@ -20,34 +20,34 @@ import {
 	visibleWidth,
 	wrapTextWithAnsi,
 } from "@earendil-works/pi-tui";
-import { discoverAgents } from "../agents/agents.ts";
-import registerSubagentNotify, { type SubagentNotifyDetails } from "../runs/foreground/notify.ts";
-import { createSubagentExecutor, type SubagentParamsLike } from "../runs/foreground/subagent-executor.ts";
-import { getArtifactsDir } from "../shared/artifacts.ts";
-import { formatDuration, shortenPath } from "../shared/formatters.ts";
-import { resolveCurrentSessionId } from "../shared/session-identity.ts";
-import { registerPromptTemplateDelegationBridge } from "../slash/prompt-template-bridge.ts";
-import { registerSlashSubagentBridge } from "../slash/slash-bridge.ts";
-import { registerSlashCommands } from "../slash/slash-commands.ts";
+import { discoverAgents } from "../agents/agents.js";
+import registerSubagentNotify, { type SubagentNotifyDetails } from "../runs/foreground/notify.js";
+import { createSubagentExecutor, type SubagentParamsLike } from "../runs/foreground/subagent-executor.js";
+import { getArtifactsDir } from "../shared/artifacts.js";
+import { formatDuration, shortenPath } from "../shared/formatters.js";
+import { resolveCurrentSessionId } from "../shared/session-identity.js";
+import { registerPromptTemplateDelegationBridge } from "../slash/prompt-template-bridge.js";
+import { registerSlashSubagentBridge } from "../slash/slash-bridge.js";
+import { registerSlashCommands } from "../slash/slash-commands.js";
 import {
 	clearSlashSnapshots,
 	getSlashRenderableSnapshot,
 	resolveSlashMessageDetails,
 	restoreSlashFinalSnapshots,
 	type SlashMessageDetails,
-} from "../slash/slash-live-state.ts";
+} from "../slash/slash-live-state.js";
 import {
 	advanceResultPulseFrame,
 	renderLiveSubagentResult,
 	renderSubagentResult,
 	type SubagentResultRenderState,
 	stopResultAnimations,
-} from "../tui/render.ts";
-import { loadConfig } from "./config.ts";
-import { parseSubagentNotifyContent } from "./notification-content.ts";
-import { DEFAULT_PROMPT_GUIDANCE } from "./prompt-guidance.ts";
-import { SubagentParams } from "./schemas.ts";
-import { SUBAGENT_TOOL_DESCRIPTION } from "./tool-description.ts";
+} from "../tui/render.js";
+import { loadConfig } from "./config.js";
+import { parseSubagentNotifyContent } from "./notification-content.js";
+import { DEFAULT_PROMPT_GUIDANCE } from "./prompt-guidance.js";
+import { SubagentParams } from "./schemas.js";
+import { SUBAGENT_TOOL_DESCRIPTION } from "./tool-description.js";
 
 export {
 	PROMPT_TEMPLATE_SUBAGENT_CANCEL_EVENT,
@@ -56,8 +56,8 @@ export {
 	PROMPT_TEMPLATE_SUBAGENT_STARTED_EVENT,
 	PROMPT_TEMPLATE_SUBAGENT_UPDATE_EVENT,
 	registerPromptTemplateBridgeRequestSettlement,
-} from "../slash/prompt-template-bridge.ts";
-export { SUBAGENT_TOOL_DESCRIPTION } from "./tool-description.ts";
+} from "../slash/prompt-template-bridge.js";
+export { SUBAGENT_TOOL_DESCRIPTION } from "./tool-description.js";
 
 import {
 	DEFAULT_ARTIFACT_CONFIG,
@@ -65,18 +65,18 @@ import {
 	SLASH_RESULT_TYPE,
 	SUBAGENT_CONTROL_EVENT,
 	type SubagentState,
-} from "../shared/types.ts";
-import { beginApiLifecycle, getApiScopedSet } from "./api-lifecycle.ts";
+} from "../shared/types.js";
+import { beginApiLifecycle, getApiScopedSet } from "./api-lifecycle.js";
 import {
 	clearPendingForegroundControlNotices,
 	formatSubagentControlNotice,
 	handleSubagentControlNotice,
 	SUBAGENT_CONTROL_MESSAGE_TYPE,
 	type SubagentControlMessageDetails,
-} from "./control-notices.ts";
-import { createSubagentStartupMaintenance } from "./startup-maintenance.ts";
+} from "./control-notices.js";
+import { createSubagentStartupMaintenance } from "./startup-maintenance.js";
 
-export { loadConfig } from "./config.ts";
+export { loadConfig } from "./config.js";
 
 function getSubagentSessionRoot(parentSessionFile: string | null): string {
 	if (parentSessionFile) {

package/dist/builtin/subagents/src/extension/notification-content.ts

@@ -1,4 +1,4 @@
-import type { SubagentNotifyDetails } from "../runs/foreground/notify.ts";
+import type { SubagentNotifyDetails } from "../runs/foreground/notify.js";
 
 const HEADER_STATUSES = ["completed", "failed", "paused"] as const;
 

package/dist/builtin/subagents/src/extension/schemas.ts

@@ -3,7 +3,7 @@
  */
 
 import { Type } from "typebox";
-import { MAX_PARALLEL_TASKS, MAX_SUBAGENT_NESTING_DEPTH, SUBAGENT_ACTIONS } from "../shared/types.ts";
+import { MAX_PARALLEL_TASKS, MAX_SUBAGENT_NESTING_DEPTH, SUBAGENT_ACTIONS } from "../shared/types.js";
 
 const SkillOverride = Type.Unsafe({
 	anyOf: [{ type: "array", items: { type: "string" } }, { type: "boolean" }, { type: "string" }],

package/dist/builtin/subagents/src/extension/startup-maintenance.ts

@@ -1,8 +1,8 @@
 import * as path from "node:path";
 import type { ExtensionContext } from "@bastani/atomic";
-import { cleanupOldNestedRuntimeDirs } from "../runs/inprocess/runtime-support/nested-api.ts";
-import { cleanupAllArtifactDirs, cleanupOldArtifacts, getArtifactsDir } from "../shared/artifacts.ts";
-import type { SubagentState } from "../shared/types.ts";
+import { cleanupOldNestedRuntimeDirs } from "../runs/inprocess/runtime-support/nested-api.js";
+import { cleanupAllArtifactDirs, cleanupOldArtifacts, getArtifactsDir } from "../shared/artifacts.js";
+import type { SubagentState } from "../shared/types.js";
 
 export interface SubagentStartupMaintenance {
 	scheduleStartupCleanup(): void;

package/dist/builtin/subagents/src/intercom/intercom-bridge.ts

@@ -4,9 +4,9 @@ import * as os from "node:os";
 import * as path from "node:path";
 import { fileURLToPath } from "node:url";
 import { APP_NAME, createChildProcessEnvironment, getEnvValue, getProjectConfigDirs } from "@bastani/atomic";
-import type { AgentConfig } from "../agents/agents.ts";
-import type { ExtensionConfig, IntercomBridgeConfig, IntercomBridgeMode } from "../shared/types.ts";
-import { getAgentDir } from "../shared/utils.ts";
+import type { AgentConfig } from "../agents/agents.js";
+import type { ExtensionConfig, IntercomBridgeConfig, IntercomBridgeMode } from "../shared/types.js";
+import { getAgentDir } from "../shared/utils.js";
 
 const PI_INTERCOM_PACKAGE_NAME = "pi-intercom";
 

package/dist/builtin/subagents/src/intercom/result-intercom.ts

@@ -14,7 +14,7 @@ import {
 	type SubagentResultIntercomPayload,
 	type SubagentResultStatus,
 	type SubagentRunMode,
-} from "../shared/types.ts";
+} from "../shared/types.js";
 
 export function resolveSubagentResultStatus(input: {
 	status?: SubagentAttemptStatus;

package/dist/builtin/subagents/src/intercom/supervisor-authorization.ts

@@ -1,5 +1,5 @@
 import { isStaleExtensionContextError } from "@bastani/atomic";
-import type { IntercomEventBus } from "../shared/types.ts";
+import type { IntercomEventBus } from "../shared/types.js";
 
 export const SUBAGENT_SUPERVISOR_AUTHORIZATION_EVENT = "subagent:supervisor-authorization";
 

package/dist/builtin/subagents/src/runs/foreground/completion-notification.ts

@@ -1,5 +1,5 @@
-import type { IntercomEventBus } from "../../shared/types.ts";
-import { SUBAGENT_COMPLETE_EVENT } from "../../shared/types.ts";
+import type { IntercomEventBus } from "../../shared/types.js";
+import { SUBAGENT_COMPLETE_EVENT } from "../../shared/types.js";
 
 export interface CompletionNotificationEnvelope extends Record<string, unknown> {
 	notificationId: string;

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

@@ -1,4 +1,4 @@
-import type { IntercomDetachRoute } from "./execution-detach-route.ts";
+import type { IntercomDetachRoute } from "./execution-detach-route.js";
 
 interface Reservation {
 	route: IntercomDetachRoute;

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

@@ -2,9 +2,9 @@ import {
 	INTERCOM_DETACH_REQUEST_EVENT,
 	INTERCOM_DETACH_RESPONSE_EVENT,
 	type RunSyncOptions,
-} from "../../shared/types.ts";
-import { IntercomDetachReservations } from "./execution-detach-reservations.ts";
-import { type IntercomDetachRoute, matchesIntercomDetachRoute } from "./execution-detach-route.ts";
+} from "../../shared/types.js";
+import { IntercomDetachReservations } from "./execution-detach-reservations.js";
+import { type IntercomDetachRoute, matchesIntercomDetachRoute } from "./execution-detach-route.js";
 
 interface ExecutionIntercomDetachState {
 	readonly isUnavailable: () => boolean;

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

@@ -1 +1 @@
-export { runSingleInProcess, runSync } from "./inprocess-run-sync.ts";
+export { runSingleInProcess, runSync } from "./inprocess-run-sync.js";

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

@@ -1,6 +1,6 @@
 import type { AgentToolResult } from "@earendil-works/pi-agent-core";
-import type { Details } from "../../shared/types.ts";
-import { isRetryableModelFailure } from "../shared/model-fallback.ts";
+import type { Details } from "../../shared/types.js";
+import { isRetryableModelFailure } from "../shared/model-fallback.js";
 
 export type RunSyncUpdate = AgentToolResult<Details>;
 

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

@@ -1,4 +1,4 @@
-import type { AgentProgress, SingleResult, Usage } from "../../shared/types.ts";
+import type { AgentProgress, SingleResult, Usage } from "../../shared/types.js";
 
 export const artifactOutputByResult = new WeakMap<SingleResult, string>();
 export const modelFailureSignalByResult = new WeakMap<SingleResult, unknown>();

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

@@ -2,5 +2,5 @@
  * Public foreground subagent execution API.
  */
 
-export { runSync } from "./execution-run-sync.ts";
-export { shouldSuppressIntermediateRetryableFailureUpdate } from "./execution-updates.ts";
+export { runSync } from "./execution-run-sync.js";
+export { shouldSuppressIntermediateRetryableFailureUpdate } from "./execution-updates.js";

package/dist/builtin/subagents/src/runs/foreground/inprocess-run-sync.ts

@@ -1,13 +1,13 @@
 import { existsSync, statSync } from "node:fs";
 import { join } from "node:path";
 import type { CodexFastModeResolvedSettings, CodexFastModeScope } from "@bastani/atomic";
-import type { AgentConfig } from "../../agents/agent-types.ts";
-import { ensureArtifactsDir, getArtifactPaths, writeArtifact } from "../../shared/artifacts.ts";
+import type { AgentConfig } from "../../agents/agent-types.js";
+import { ensureArtifactsDir, getArtifactPaths, writeArtifact } from "../../shared/artifacts.js";
 import {
 	getSubagentCodexFastModeSettings,
 	resolveSubagentCodexFastModeScope,
 	resolveSubagentModelFastMode,
-} from "../../shared/fast-mode.ts";
+} from "../../shared/fast-mode.js";
 import type {
 	AgentProgress,
 	ArtifactPaths,
@@ -17,12 +17,12 @@ import type {
 	SingleResult,
 	SubagentToolResult,
 	Usage,
-} from "../../shared/types.ts";
-import { getOrCreateSubagentControl } from "../inprocess/control-registry.ts";
-import type { AttemptOutcome, ChildSpec, ParentContext } from "../inprocess/runner.ts";
-import { filterSpawnableModelCandidates } from "../shared/model-candidate-filter.ts";
-import { buildModelCandidates } from "../shared/model-fallback.ts";
-import { registerExecutionIntercomDetach } from "./execution-intercom-detach.ts";
+} from "../../shared/types.js";
+import { getOrCreateSubagentControl } from "../inprocess/control-registry.js";
+import type { AttemptOutcome, ChildSpec, ParentContext } from "../inprocess/runner.js";
+import { filterSpawnableModelCandidates } from "../shared/model-candidate-filter.js";
+import { buildModelCandidates } from "../shared/model-fallback.js";
+import { registerExecutionIntercomDetach } from "./execution-intercom-detach.js";
 
 function emptyUsage(): Usage {
 	return {
@@ -129,6 +129,8 @@ function resultFromOutcome(
 				? { attemptedModels: [...outcome.attemptedModels] }
 				: {}
 			: {}),
+		...(outcome.skills?.length ? { skills: [...outcome.skills] } : {}),
+		...(outcome.skillsWarning ? { skillsWarning: outcome.skillsWarning } : {}),
 		finalOutput: output,
 		sessionFile: outcome.sessionFile,
 		progress: progressFor(agent, task, outcome, startedAt, fastModeEnabled),
@@ -199,6 +201,18 @@ export async function runSingleInProcess(
 		return noSpawnableCandidatesResult(agent, task, filteredCandidates.skippedAttempts);
 	const candidate = filteredCandidates.candidates[0];
 	const fallbackCandidates = filteredCandidates.candidates.slice(1);
+	// Upstream pi #7897: a subagent that pins no model of its own inherits the
+	// dispatching session's model AND thinking level. Atomic resolves the
+	// parent's model as the trailing candidate, so the parent's thinking level
+	// applies only when nothing the agent configured can outrank it: no
+	// frontmatter `model`, no `fallbackModels` (an agent whose fallback chain
+	// selects its own first candidate runs on that model, not the parent's),
+	// and no per-call override. An agent's own `thinking` still wins over the
+	// inherited level, and a candidate `:level` suffix wins over both.
+	const inheritsDispatchConfig =
+		agent.model === undefined &&
+		(agent.fallbackModels === undefined || agent.fallbackModels.length === 0) &&
+		options.modelOverride === undefined;
 	// The candidate is only a string. `createAgentSession` selects a model from a
 	// `Model<Api>` object and otherwise restores the model persisted in the
 	// session file — which, for a fork-context child, is the parent's model.
@@ -254,7 +268,9 @@ export async function runSingleInProcess(
 		mcpDirectTools: agent.mcpDirectTools,
 		skills: options.skills ?? agent.skills,
 		model: resolvedCandidate?.model,
-		thinkingLevel: (resolvedCandidate?.thinkingLevel ?? agent.thinking) as ChildSpec["thinkingLevel"],
+		thinkingLevel: (resolvedCandidate?.thinkingLevel ??
+			agent.thinking ??
+			(inheritsDispatchConfig ? options.currentThinkingLevel : undefined)) as ChildSpec["thinkingLevel"],
 		parent,
 		intercom: options.orchestratorIntercomTarget
 			? {
@@ -273,7 +289,7 @@ export async function runSingleInProcess(
 						: {}),
 				}
 			: undefined,
-		artifactJsonlPath: artifactPaths?.jsonlPath,
+		artifactJsonlPath: options.artifactConfig?.includeJsonl === true ? artifactPaths?.jsonlPath : undefined,
 		...(fallbackCandidates.length ? { fallbackModels: fallbackCandidates } : {}),
 		onProgress: options.onUpdate
 			? (progress) => {

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

@@ -3,13 +3,13 @@
  */
 
 import { type ExtensionAPI, isStaleExtensionContextError } from "@bastani/atomic";
-import { resolveSubagentIntercomTarget } from "../../intercom/intercom-bridge.ts";
+import { resolveSubagentIntercomTarget } from "../../intercom/intercom-bridge.js";
 import {
 	SUBAGENT_COMPLETE_EVENT,
 	SUBAGENT_TERMINAL_ORDERING_BARRIER_EVENT,
 	type SubagentAttemptStatus,
-} from "../../shared/types.ts";
-import type { CompletionNotificationEnvelope } from "./completion-notification.ts";
+} from "../../shared/types.js";
+import type { CompletionNotificationEnvelope } from "./completion-notification.js";
 
 interface SubagentStepResult {
 	agent: string;

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

@@ -2,17 +2,17 @@ import { randomUUID } from "node:crypto";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import type { ExtensionContext } from "@bastani/atomic";
-import { resolveExecutionAgentScope } from "../../agents/agent-scope.ts";
+import { resolveExecutionAgentScope } from "../../agents/agent-scope.js";
 import {
 	applyIntercomBridgeToAgent,
 	resolveIntercomBridge,
 	resolveIntercomSessionTarget,
 	resolveSubagentIntercomTarget,
-} from "../../intercom/intercom-bridge.ts";
-import { getArtifactsDir } from "../../shared/artifacts.ts";
-import { createForkContextResolver } from "../../shared/fork-context.ts";
-import { resolveCurrentSessionId } from "../../shared/session-identity.ts";
-import { buildReadInstruction } from "../../shared/settings.ts";
+} from "../../intercom/intercom-bridge.js";
+import { getArtifactsDir } from "../../shared/artifacts.js";
+import { createForkContextResolver } from "../../shared/fork-context.js";
+import { resolveCurrentSessionId } from "../../shared/session-identity.js";
+import { buildReadInstruction } from "../../shared/settings.js";
 import {
 	type ArtifactConfig,
 	checkSubagentDepth,
@@ -20,28 +20,28 @@ import {
 	resolveSubagentDepthPolicy,
 	type SubagentToolResult,
 	subagentDepthBlockedMessage,
-} from "../../shared/types.ts";
+} from "../../shared/types.js";
 
 import {
 	createNestedRoute,
 	resolveInheritedNestedRouteFromEnv,
 	resolveNestedParentAddressFromEnv,
 	writeNestedEvent,
-} from "../inprocess/runtime-support/nested-api.ts";
-import { resolveControlConfig } from "../shared/subagent-control.ts";
+} from "../inprocess/runtime-support/nested-api.js";
+import { resolveControlConfig } from "../shared/subagent-control.js";
 import {
 	applyAgentDefaultContext,
 	normalizeRepeatedParallelCounts,
 	toExecutionErrorResult,
 	validateExecutionInput,
 	withForkContext,
-} from "./subagent-executor-input.ts";
+} from "./subagent-executor-input.js";
 import type {
 	ExecutionContextBuildResult,
 	ExecutorDeps,
 	ResolvedExecutorDeps,
 	SubagentParamsLike,
-} from "./subagent-executor-types.ts";
+} from "./subagent-executor-types.js";
 
 export function checkDepthForExecution(
 	ctx: ExtensionContext,

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

@@ -1,6 +1,6 @@
-import type { AgentConfig } from "../../agents/agents.ts";
-import type { Details, SubagentToolResult } from "../../shared/types.ts";
-import type { SubagentParamsLike, TaskParam } from "./subagent-executor-types.ts";
+import type { AgentConfig } from "../../agents/agents.js";
+import type { Details, SubagentToolResult } from "../../shared/types.js";
+import type { SubagentParamsLike, TaskParam } from "./subagent-executor-types.js";
 
 export function validateExecutionInput(
 	params: SubagentParamsLike,