@bastani/atomic 0.9.13 → 0.9.14-alpha.2

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

@@ -1,9 +1,9 @@
 import type { ExtensionContext } from "@bastani/atomic";
-import type { AgentConfig } from "../../agents/agents.ts";
-import { INTERCOM_BRIDGE_MARKER } from "../../intercom/intercom-bridge.ts";
-import type { ModelInfo } from "../../shared/model-info.ts";
-import type { CandidateModelResolver } from "../../shared/model-resolution.ts";
-import { buildTaskInstructions, type ResolvedStepBehavior } from "../../shared/settings.ts";
+import type { AgentConfig } from "../../agents/agents.js";
+import { INTERCOM_BRIDGE_MARKER } from "../../intercom/intercom-bridge.js";
+import type { ModelInfo } from "../../shared/model-info.js";
+import type { CandidateModelResolver } from "../../shared/model-resolution.js";
+import { buildTaskInstructions, type ResolvedStepBehavior } from "../../shared/settings.js";
 import type {
 	AgentProgress,
 	ArtifactConfig,
@@ -13,15 +13,15 @@ import type {
 	SingleResult,
 	SubagentState,
 	SubagentToolResult,
-} from "../../shared/types.ts";
-import { workflowSessionMetadataFromContext } from "../../shared/types-depth.ts";
-import { mapConcurrent } from "../../shared/utils.ts";
+} from "../../shared/types.js";
+import { workflowSessionMetadataFromContext } from "../../shared/types-depth.js";
+import { mapConcurrent } from "../../shared/utils.js";
 import { inheritedIntercomGroup, resolveChildIntercomGroup } from "../shared/intercom-group.js";
-import { currentModelFullId } from "../shared/model-fallback.ts";
-import { injectSingleOutputInstruction, resolveSingleOutputPath } from "../shared/single-output.ts";
-import type { WorktreeSetup } from "../shared/worktree.ts";
-import type { SubagentExecutorRuntimeDeps, TaskParam } from "./subagent-executor-types.ts";
-import { resolveParallelTaskCwd } from "./subagent-executor-worktree.ts";
+import { currentModelFullId } from "../shared/model-fallback.js";
+import { injectSingleOutputInstruction, resolveSingleOutputPath } from "../shared/single-output.js";
+import type { WorktreeSetup } from "../shared/worktree.js";
+import type { SubagentExecutorRuntimeDeps, TaskParam } from "./subagent-executor-types.js";
+import { resolveParallelTaskCwd } from "./subagent-executor-worktree.js";
 
 interface ForegroundParallelRunInput {
 	tasks: TaskParam[];
@@ -47,7 +47,7 @@ interface ForegroundParallelRunInput {
 	modelOverrides: (string | undefined)[];
 	behaviors: ResolvedStepBehavior[];
 	firstProgressIndex: number;
-	controlConfig: import("../../shared/types.ts").ResolvedControlConfig;
+	controlConfig: import("../../shared/types.js").ResolvedControlConfig;
 	onControlEvent?: (event: ControlEvent) => void;
 	childIntercomTarget?: (agent: string, index: number) => string | undefined;
 	orchestratorIntercomTarget?: string;
@@ -149,6 +149,7 @@ export async function runForegroundParallelTasks(input: ForegroundParallelRunInp
 				resolveCandidateModel: input.resolveCandidateModel,
 				preferredModelProvider: input.ctx.model?.provider,
 				currentModel: currentModelFullId(input.ctx.model),
+				currentThinkingLevel: input.ctx.thinkingLevel,
 				skills: effectiveSkills === false ? [] : effectiveSkills,
 				onUpdate: input.onUpdate
 					? (progressUpdate) => {

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

@@ -1,14 +1,14 @@
-import type { AgentConfig } from "../../agents/agents.ts";
-import { normalizeSkillInput } from "../../agents/skills.ts";
-import { resolveSubagentIntercomTarget } from "../../intercom/intercom-bridge.ts";
-import { collectKnownModelProviders, type ModelInfo, toModelInfo } from "../../shared/model-info.ts";
-import { createCandidateModelResolver } from "../../shared/model-resolution.ts";
+import type { AgentConfig } from "../../agents/agents.js";
+import { normalizeSkillInput } from "../../agents/skills.js";
+import { resolveSubagentIntercomTarget } from "../../intercom/intercom-bridge.js";
+import { collectKnownModelProviders, type ModelInfo, toModelInfo } from "../../shared/model-info.js";
+import { createCandidateModelResolver } from "../../shared/model-resolution.js";
 import {
 	resolveStepBehavior,
 	type StepOverrides,
 	suppressProgressForReadOnlyTask,
 	writeInitialProgressFile,
-} from "../../shared/settings.ts";
+} from "../../shared/settings.js";
 import {
 	type AgentProgress,
 	type ArtifactPaths,
@@ -19,25 +19,25 @@ import {
 	type SingleResult,
 	type SubagentToolResult,
 	wrapForkTask,
-} from "../../shared/types.ts";
-import { compactForegroundDetails, getSingleResultOutput } from "../../shared/utils.ts";
-import { updateForegroundNestedProjection } from "../inprocess/runtime-support/nested-api.ts";
+} from "../../shared/types.js";
+import { compactForegroundDetails, getSingleResultOutput } from "../../shared/utils.js";
+import { updateForegroundNestedProjection } from "../inprocess/runtime-support/nested-api.js";
 import { sharedAutoGroupForSet } from "../shared/intercom-group.js";
-import { resolveModelCandidate } from "../shared/model-fallback.ts";
-import { aggregateParallelOutputs } from "../shared/parallel-utils.ts";
-import { recordRun } from "../shared/run-history.ts";
-import { resolveSingleOutputPath, validateFileOnlyOutputMode } from "../shared/single-output.ts";
-import { cleanupWorktrees, type WorktreeSetup } from "../shared/worktree.ts";
-import { createDetachedCleanupBarrier } from "./detached-cleanup-barrier.ts";
-import { runForegroundParallelTasks } from "./subagent-executor-parallel-task.ts";
+import { resolveModelCandidate } from "../shared/model-fallback.js";
+import { aggregateParallelOutputs } from "../shared/parallel-utils.js";
+import { recordRun } from "../shared/run-history.js";
+import { resolveSingleOutputPath, validateFileOnlyOutputMode } from "../shared/single-output.js";
+import { cleanupWorktrees, type WorktreeSetup } from "../shared/worktree.js";
+import { createDetachedCleanupBarrier } from "./detached-cleanup-barrier.js";
+import { runForegroundParallelTasks } from "./subagent-executor-parallel-task.js";
 import {
 	createForegroundControlNotifier,
 	maybeBuildForegroundIntercomReceipt,
 	notifyDetachedForegroundChildExit,
 	rememberForegroundRun,
 	replaceForegroundRunChild,
-} from "./subagent-executor-status.ts";
-import type { ExecutionContextData, ResolvedExecutorDeps, TaskParam } from "./subagent-executor-types.ts";
+} from "./subagent-executor-status.js";
+import type { ExecutionContextData, ResolvedExecutorDeps, TaskParam } from "./subagent-executor-types.js";
 import {
 	buildParallelModeError,
 	buildParallelWorktreeSuffix,
@@ -45,7 +45,7 @@ import {
 	createParallelWorktreeSetup,
 	findDuplicateParallelOutputPath,
 	resolveParallelTaskCwd,
-} from "./subagent-executor-worktree.ts";
+} from "./subagent-executor-worktree.js";
 
 export async function runParallelPath(
 	data: ExecutionContextData,

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

@@ -1,5 +1,5 @@
-import { runSync } from "./execution.ts";
-import type { SubagentExecutorRuntimeDeps } from "./subagent-executor-types.ts";
+import { runSync } from "./execution.js";
+import type { SubagentExecutorRuntimeDeps } from "./subagent-executor-types.js";
 
 const defaultSubagentExecutorRuntimeDeps: SubagentExecutorRuntimeDeps = {
 	runSync,

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

@@ -1,14 +1,14 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { normalizeSkillInput } from "../../agents/skills.ts";
-import { INTERCOM_BRIDGE_MARKER, resolveSubagentIntercomTarget } from "../../intercom/intercom-bridge.ts";
-import { collectKnownModelProviders, type ModelInfo, toModelInfo } from "../../shared/model-info.ts";
-import { createCandidateModelResolver } from "../../shared/model-resolution.ts";
+import { normalizeSkillInput } from "../../agents/skills.js";
+import { INTERCOM_BRIDGE_MARKER, resolveSubagentIntercomTarget } from "../../intercom/intercom-bridge.js";
+import { collectKnownModelProviders, type ModelInfo, toModelInfo } from "../../shared/model-info.js";
+import { createCandidateModelResolver } from "../../shared/model-resolution.js";
 import {
 	injectSingleProgressInstruction,
 	resolveSingleProgress,
 	writeInitialProgressFile,
-} from "../../shared/settings.ts";
+} from "../../shared/settings.js";
 import {
 	type AgentProgress,
 	type ArtifactPaths,
@@ -18,27 +18,27 @@ import {
 	type SubagentToolResult,
 	workflowSessionMetadataFromContext,
 	wrapForkTask,
-} from "../../shared/types.ts";
-import { compactForegroundDetails, getSingleResultOutput } from "../../shared/utils.ts";
-import { updateForegroundNestedProjection } from "../inprocess/runtime-support/nested-api.ts";
+} from "../../shared/types.js";
+import { compactForegroundDetails, getSingleResultOutput } from "../../shared/utils.js";
+import { updateForegroundNestedProjection } from "../inprocess/runtime-support/nested-api.js";
 import { inheritedIntercomGroup, resolveChildIntercomGroup } from "../shared/intercom-group.js";
-import { currentModelFullId, resolveModelCandidate } from "../shared/model-fallback.ts";
-import { recordRun } from "../shared/run-history.ts";
+import { currentModelFullId, resolveModelCandidate } from "../shared/model-fallback.js";
+import { recordRun } from "../shared/run-history.js";
 import {
 	finalizeSingleOutput,
 	injectSingleOutputInstruction,
 	normalizeSingleOutputOverride,
 	resolveSingleOutputPath,
 	validateFileOnlyOutputMode,
-} from "../shared/single-output.ts";
+} from "../shared/single-output.js";
 import {
 	createForegroundControlNotifier,
 	maybeBuildForegroundIntercomReceipt,
 	notifyDetachedForegroundChildExit,
 	rememberForegroundRun,
 	replaceForegroundRunChild,
-} from "./subagent-executor-status.ts";
-import type { ExecutionContextData, ForegroundControl, ResolvedExecutorDeps } from "./subagent-executor-types.ts";
+} from "./subagent-executor-status.js";
+import type { ExecutionContextData, ForegroundControl, ResolvedExecutorDeps } from "./subagent-executor-types.js";
 
 function formatFailedSingleRunOutput(result: SingleResult, displayOutput: string): string {
 	const error = result.error || "Failed";
@@ -229,6 +229,7 @@ export async function runSinglePath(
 			resolveCandidateModel: createCandidateModelResolver(ctx.modelRegistry, currentProvider),
 			preferredModelProvider: currentProvider,
 			currentModel: currentModelFullId(ctx.model),
+			currentThinkingLevel: ctx.thinkingLevel,
 			skills: effectiveSkills,
 		});
 	} catch (error) {

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

@@ -1,5 +1,5 @@
 import { type ExtensionAPI, isStaleExtensionContextError } from "@bastani/atomic";
-import { type IntercomBridgeState, resolveSubagentIntercomTarget } from "../../intercom/intercom-bridge.ts";
+import { type IntercomBridgeState, resolveSubagentIntercomTarget } from "../../intercom/intercom-bridge.js";
 import {
 	attachNestedChildrenToResultChildren,
 	buildSubagentResultIntercomPayload,
@@ -7,7 +7,7 @@ import {
 	formatSubagentResultReceipt,
 	resolveSubagentResultStatus,
 	stripDetailsOutputsForIntercomReceipt,
-} from "../../intercom/result-intercom.ts";
+} from "../../intercom/result-intercom.js";
 import {
 	type ControlEvent,
 	type Details,
@@ -18,17 +18,17 @@ import {
 	type SubagentRunMode,
 	type SubagentState,
 	type SubagentToolResult,
-} from "../../shared/types.ts";
-import { compactForegroundDetails, compactForegroundResult, getSingleResultOutput } from "../../shared/utils.ts";
-import { updateForegroundNestedProjection } from "../inprocess/runtime-support/nested-api.ts";
-import { formatNestedRunStatusLines } from "../inprocess/runtime-support/nested-rendering.ts";
+} from "../../shared/types.js";
+import { compactForegroundDetails, compactForegroundResult, getSingleResultOutput } from "../../shared/utils.js";
+import { updateForegroundNestedProjection } from "../inprocess/runtime-support/nested-api.js";
+import { formatNestedRunStatusLines } from "../inprocess/runtime-support/nested-rendering.js";
 import {
 	formatControlIntercomMessage,
 	formatControlNoticeMessage,
 	shouldNotifyControlEvent,
-} from "../shared/subagent-control.ts";
-import { deliverLocalCompletionNotification } from "./completion-notification.ts";
-import type { ExecutionContextData, ExecutorDeps, ForegroundControl } from "./subagent-executor-types.ts";
+} from "../shared/subagent-control.js";
+import { deliverLocalCompletionNotification } from "./completion-notification.js";
+import type { ExecutionContextData, ExecutorDeps, ForegroundControl } from "./subagent-executor-types.js";
 
 export function getForegroundControl(state: SubagentState, runId: string | undefined): ForegroundControl | undefined {
 	if (runId) return state.foregroundControls.get(runId);

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

@@ -1,7 +1,7 @@
 import type { ExtensionAPI, ExtensionContext } from "@bastani/atomic";
-import type { AgentConfig, AgentScope } from "../../agents/agents.ts";
-import type { IntercomBridgeState } from "../../intercom/intercom-bridge.ts";
-import type { ModelInfo } from "../../shared/model-info.ts";
+import type { AgentConfig, AgentScope } from "../../agents/agents.js";
+import type { IntercomBridgeState } from "../../intercom/intercom-bridge.js";
+import type { ModelInfo } from "../../shared/model-info.js";
 import type {
 	ArtifactConfig,
 	ControlConfig,
@@ -11,9 +11,9 @@ import type {
 	SUBAGENT_ACTIONS,
 	SubagentState,
 	SubagentToolResult,
-} from "../../shared/types.ts";
-import type { ChildModePolicy } from "../inprocess/child-policy.ts";
-import type { runSync } from "./execution.ts";
+} from "../../shared/types.js";
+import type { ChildModePolicy } from "../inprocess/child-policy.js";
+import type { runSync } from "./execution.js";
 
 export interface TaskParam {
 	agent: string;
@@ -66,7 +66,7 @@ export interface SubagentExecutorRuntimeDeps {
 export interface ExecutorDeps {
 	pi: ExtensionAPI;
 	state: SubagentState;
-	config: import("../../shared/types.ts").ExtensionConfig;
+	config: import("../../shared/types.js").ExtensionConfig;
 	tempArtifactsDir: string;
 	getSubagentSessionRoot: (parentSessionFile: string | null) => string;
 	expandTilde: (p: string) => string;

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

@@ -1,8 +1,8 @@
 import * as path from "node:path";
-import type { ResolvedStepBehavior } from "../../shared/settings.ts";
-import type { ExtensionConfig, SubagentToolResult } from "../../shared/types.ts";
-import { resolveChildCwd } from "../../shared/utils.ts";
-import { resolveSingleOutputPath } from "../shared/single-output.ts";
+import type { ResolvedStepBehavior } from "../../shared/settings.js";
+import type { ExtensionConfig, SubagentToolResult } from "../../shared/types.js";
+import { resolveChildCwd } from "../../shared/utils.js";
+import { resolveSingleOutputPath } from "../shared/single-output.js";
 import {
 	createWorktrees,
 	diffWorktrees,
@@ -10,8 +10,8 @@ import {
 	formatWorktreeDiffSummary,
 	formatWorktreeTaskCwdConflict,
 	type WorktreeSetup,
-} from "../shared/worktree.ts";
-import type { TaskParam } from "./subagent-executor-types.ts";
+} from "../shared/worktree.js";
+import type { TaskParam } from "./subagent-executor-types.js";
 
 export function buildParallelModeError(message: string): SubagentToolResult {
 	return {

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

@@ -1,25 +1,25 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import type { ExtensionContext } from "@bastani/atomic";
-import { handleManagementAction } from "../../agents/agent-management.ts";
-import { resolveExecutionAgentScope } from "../../agents/agent-scope.ts";
-import { clearPendingForegroundControlNotices } from "../../extension/control-notices.ts";
-import { buildDoctorReport } from "../../extension/doctor.ts";
+import { handleManagementAction } from "../../agents/agent-management.js";
+import { resolveExecutionAgentScope } from "../../agents/agent-scope.js";
+import { clearPendingForegroundControlNotices } from "../../extension/control-notices.js";
+import { buildDoctorReport } from "../../extension/doctor.js";
 import {
 	INTERCOM_BRIDGE_MARKER,
 	resolveIntercomBridge,
 	resolveIntercomSessionTarget,
 	resolveSubagentIntercomTarget,
-} from "../../intercom/intercom-bridge.ts";
-import { requestSupervisorAuthorization } from "../../intercom/supervisor-authorization.ts";
-import { getArtifactsDir } from "../../shared/artifacts.ts";
-import { collectKnownModelProviders, toModelInfo } from "../../shared/model-info.ts";
-import { createCandidateModelResolver } from "../../shared/model-resolution.ts";
+} from "../../intercom/intercom-bridge.js";
+import { requestSupervisorAuthorization } from "../../intercom/supervisor-authorization.js";
+import { getArtifactsDir } from "../../shared/artifacts.js";
+import { collectKnownModelProviders, toModelInfo } from "../../shared/model-info.js";
+import { createCandidateModelResolver } from "../../shared/model-resolution.js";
 import {
 	injectSingleProgressInstruction,
 	resolveSingleProgress,
 	writeInitialProgressFile,
-} from "../../shared/settings.ts";
+} from "../../shared/settings.js";
 import {
 	DEFAULT_ARTIFACT_CONFIG,
 	getCurrentSubagentDepth,
@@ -30,34 +30,34 @@ import {
 	SUBAGENT_ACTIONS,
 	type SubagentToolResult,
 	workflowSessionMetadataFromContext,
-} from "../../shared/types.ts";
+} from "../../shared/types.js";
 import {
 	inspectInProcessChildStatus,
 	interruptInProcessChild,
 	resumeInProcessChild,
-} from "../inprocess/control-status.ts";
+} from "../inprocess/control-status.js";
 import { inheritedIntercomGroup } from "../shared/intercom-group.js";
-import { currentModelFullId } from "../shared/model-fallback.ts";
-import { resolveControlConfig } from "../shared/subagent-control.ts";
-import { checkDepthForExecution, prepareExecutionContext } from "./subagent-executor-context.ts";
-import { toExecutionErrorResult, withForkContext } from "./subagent-executor-input.ts";
-import { runParallelPath } from "./subagent-executor-parallel.ts";
-import { resolveRequestedCwd } from "./subagent-executor-resume.ts";
-import { resolveSubagentExecutorRuntimeDeps } from "./subagent-executor-runtime.ts";
-import { createForwardSingleUpdate, runSinglePath } from "./subagent-executor-single.ts";
+import { currentModelFullId } from "../shared/model-fallback.js";
+import { resolveControlConfig } from "../shared/subagent-control.js";
+import { checkDepthForExecution, prepareExecutionContext } from "./subagent-executor-context.js";
+import { toExecutionErrorResult, withForkContext } from "./subagent-executor-input.js";
+import { runParallelPath } from "./subagent-executor-parallel.js";
+import { resolveRequestedCwd } from "./subagent-executor-resume.js";
+import { resolveSubagentExecutorRuntimeDeps } from "./subagent-executor-runtime.js";
+import { createForwardSingleUpdate, runSinglePath } from "./subagent-executor-single.js";
 import {
 	foregroundStatusResult,
 	getForegroundControl,
 	notifyDetachedForegroundChildExit,
 	replaceForegroundRunChild,
 	retainedForegroundStatusResult,
-} from "./subagent-executor-status.ts";
+} from "./subagent-executor-status.js";
 import {
 	type ExecutorDeps,
 	isManagementActionsRestricted,
 	type ResolvedExecutorDeps,
 	type SubagentParamsLike,
-} from "./subagent-executor-types.ts";
+} from "./subagent-executor-types.js";
 
 async function resumeRetainedForegroundChild(
 	params: SubagentParamsLike,
@@ -154,6 +154,7 @@ async function resumeRetainedForegroundChild(
 			resolveCandidateModel: createCandidateModelResolver(ctx.modelRegistry, ctx.model?.provider),
 			preferredModelProvider: ctx.model?.provider,
 			currentModel: currentModelFullId(ctx.model),
+			currentThinkingLevel: ctx.thinkingLevel,
 			onUpdate: forwardSingleUpdate,
 			onDetachedExit: (detachedResult) => {
 				cleanupProgress();
@@ -190,7 +191,7 @@ const MUTATING_MANAGEMENT_ACTIONS = new Set(["create", "update", "delete"]);
 const READ_ONLY_MANAGEMENT_ACTIONS = new Set(["list", "get", "status", "doctor"]);
 const FANOUT_REFUSAL_MESSAGE = "Subagent fanout is not authorized for this child.";
 
-export type { SubagentExecutorRuntimeDeps, SubagentParamsLike } from "./subagent-executor-types.ts";
+export type { SubagentExecutorRuntimeDeps, SubagentParamsLike } from "./subagent-executor-types.js";
 
 async function handleManagementRequest(input: {
 	params: SubagentParamsLike;

package/dist/builtin/subagents/src/runs/inprocess/control-registry.ts

@@ -1,5 +1,5 @@
 import type { ChildIdentity } from "@bastani/atomic-natives";
-import { createSubagentControl, type ParentContext, type SubagentControlRuntime } from "./runner.ts";
+import { createSubagentControl, type ParentContext, type SubagentControlRuntime } from "./runner.js";
 
 /**
  * Host-local registry for the Rust control planes owned by the current Atomic

package/dist/builtin/subagents/src/runs/inprocess/control-status.ts

@@ -1,6 +1,6 @@
-import type { SubagentToolResult } from "../../shared/types.ts";
-import { findSubagentControl, listSubagentControls } from "./control-registry.ts";
-import type { ModelCandidate } from "./runner.ts";
+import type { SubagentToolResult } from "../../shared/types.js";
+import { findSubagentControl, listSubagentControls } from "./control-registry.js";
+import type { ModelCandidate } from "./runner.js";
 
 function canonicalChildren(control: NonNullable<ReturnType<typeof findSubagentControl>>) {
 	return [...control.listChildren()].sort((left, right) => left.path.localeCompare(right.path));

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

@@ -14,7 +14,7 @@ export {
 	resumeInProcessNestedAttempt,
 	subscribeInProcessControlRequests,
 	unregisterInProcessNestedRoute,
-} from "./nested-routing.ts";
+} from "./nested-routing.js";
 export type {
 	AdmissionRefusal,
 	AdmittedResult,
@@ -36,7 +36,7 @@ export type {
 	RunningAttempt,
 	TerminalStatus,
 	TerminationCauseName,
-} from "./runner.ts";
+} from "./runner.js";
 export {
 	AdmittedChild,
 	admit_child_session,
@@ -47,4 +47,4 @@ export {
 	run_child_attempt,
 	SubagentControlRuntime,
 	terminate_child_attempt,
-} from "./runner.ts";
+} from "./runner.js";

package/dist/builtin/subagents/src/runs/inprocess/prompt-behavior.ts

@@ -26,7 +26,7 @@ const PARENT_ONLY_CUSTOM_MESSAGE_TYPES = new Set([
 	"subagent-control",
 	"subagent-control-notice",
 ]);
-const SUBAGENT_ORCHESTRATION_SKILL_NAME_PATTERN = /<name>\s*subagent\s*<\/name>/;
+const SUBAGENT_ORCHESTRATION_SKILL_NAME_PATTERN = /<name>\s*subagent(?:@[^<\s]*)?\s*<\/name>/;
 const PROJECT_CONTEXT_HEADER = "\n\n# Project Context\n\nProject-specific instructions and guidelines:\n\n";
 const SKILLS_HEADER = "\n\nThe following skills provide specialized instructions for specific tasks.";
 const DATE_HEADER = "\nCurrent date:";
@@ -68,7 +68,7 @@ export function stripInheritedSkills(prompt: string): string {
 
 export function stripSubagentOrchestrationSkill(prompt: string): string {
 	return prompt
-		.replace(/\n{0,2}<skill\s+name=["']subagent["'][^>]*>[\s\S]*?<\/skill>\n{0,2}/g, "\n\n")
+		.replace(/\n{0,2}<skill\s+name=["']subagent(?:@[^"']*)?["'][^>]*>[\s\S]*?<\/skill>\n{0,2}/g, "\n\n")
 		.replace(/[ \t]*<skill>\s*[\s\S]*?<\/skill>\s*/g, (block) =>
 			SUBAGENT_ORCHESTRATION_SKILL_NAME_PATTERN.test(block) ? "" : block,
 		);
@@ -146,15 +146,24 @@ export interface InProcessChildPromptBehavior {
 	readonly initialContextTransform: (messages: AgentMessage[]) => AgentMessage[];
 }
 
+export function createInProcessChildSystemPromptTransform(
+	policy: ChildPromptPolicy,
+	explicitSkillInjection = "",
+): (prompt: string) => string {
+	return (prompt) => {
+		const rewritten = rewriteSubagentPrompt(prompt, {
+			inheritProjectContext: policy.inheritProjectContext,
+			inheritSkills: policy.inheritSkills,
+			fanoutChild: policy.fanoutAuthorized,
+		});
+		return explicitSkillInjection ? `${rewritten}\n\n${explicitSkillInjection}` : rewritten;
+	};
+}
+
 /** Build the construction-time transforms for one admitted in-process child. */
 export function createInProcessChildPromptBehavior(policy: ChildPromptPolicy): InProcessChildPromptBehavior {
 	return {
-		systemPromptTransform: (prompt) =>
-			rewriteSubagentPrompt(prompt, {
-				inheritProjectContext: policy.inheritProjectContext,
-				inheritSkills: policy.inheritSkills,
-				fanoutChild: policy.fanoutAuthorized,
-			}),
+		systemPromptTransform: createInProcessChildSystemPromptTransform(policy),
 		initialContextTransform: (messages) => stripParentOnlySubagentMessages(messages, policy.fanoutAuthorized),
 	};
 }