@bastani/atomic 0.9.12 → 0.9.13-alpha.2

package/dist/builtin/subagents/src/runs/shared/pi-args.ts

@@ -1,339 +0,0 @@
-import * as fs from "node:fs";
-import * as os from "node:os";
-import * as path from "node:path";
-import { fileURLToPath } from "node:url";
-import {
-	APP_NAME,
-	type CodexFastModeResolvedSettings,
-	type CodexFastModeScope,
-	ENV_CODEX_FAST_MODE,
-	getEnvValue,
-	type SessionWorkflowMetadata,
-	WORKFLOW_SESSION_METADATA_ENV,
-} from "@bastani/atomic";
-import { THINKING_LEVELS } from "../../shared/model-info.ts";
-import type { JsonSchemaObject } from "../../shared/types.ts";
-import { MAX_SUBAGENT_NESTING_DEPTH } from "../../shared/types-runtime.ts";
-import { resolveMcpDirectToolNames } from "./mcp-direct-tool-allowlist.ts";
-import { encodeNestedPathEnv, type NestedPathEntry, parseNestedPathEnv } from "./nested-path.ts";
-import { STRUCTURED_OUTPUT_CAPTURE_ENV, STRUCTURED_OUTPUT_SCHEMA_ENV } from "./structured-output.ts";
-
-const TASK_ARG_LIMIT = 8000;
-export const SUBAGENT_PARENT_MAX_DEPTH = MAX_SUBAGENT_NESTING_DEPTH;
-export const PROMPT_RUNTIME_EXTENSION_PATH = path.join(
-	path.dirname(fileURLToPath(import.meta.url)),
-	"subagent-prompt-runtime.ts",
-);
-const ENV_PREFIX = APP_NAME.toUpperCase();
-export const FANOUT_CHILD_EXTENSION_PATH = path.join(
-	path.dirname(fileURLToPath(import.meta.url)),
-	"..",
-	"..",
-	"extension",
-	"fanout-child.ts",
-);
-export const SUBAGENT_CHILD_ENV = `${ENV_PREFIX}_SUBAGENT_CHILD`;
-export const SUBAGENT_ORCHESTRATOR_TARGET_ENV = `${ENV_PREFIX}_SUBAGENT_ORCHESTRATOR_TARGET`;
-export const SUBAGENT_RUN_ID_ENV = `${ENV_PREFIX}_SUBAGENT_RUN_ID`;
-export const SUBAGENT_CHILD_AGENT_ENV = `${ENV_PREFIX}_SUBAGENT_CHILD_AGENT`;
-export const SUBAGENT_CHILD_INDEX_ENV = `${ENV_PREFIX}_SUBAGENT_CHILD_INDEX`;
-export const SUBAGENT_FANOUT_CHILD_ENV = `${ENV_PREFIX}_SUBAGENT_FANOUT_CHILD`;
-export const SUBAGENT_PARENT_EVENT_SINK_ENV = `${ENV_PREFIX}_SUBAGENT_PARENT_EVENT_SINK`;
-export const SUBAGENT_PARENT_CONTROL_INBOX_ENV = `${ENV_PREFIX}_SUBAGENT_PARENT_CONTROL_INBOX`;
-export const SUBAGENT_PARENT_ROOT_RUN_ID_ENV = `${ENV_PREFIX}_SUBAGENT_PARENT_ROOT_RUN_ID`;
-export const SUBAGENT_PARENT_RUN_ID_ENV = `${ENV_PREFIX}_SUBAGENT_PARENT_RUN_ID`;
-export const SUBAGENT_PARENT_CHILD_INDEX_ENV = `${ENV_PREFIX}_SUBAGENT_PARENT_CHILD_INDEX`;
-export const SUBAGENT_PARENT_DEPTH_ENV = `${ENV_PREFIX}_SUBAGENT_PARENT_DEPTH`;
-export const SUBAGENT_PARENT_PATH_ENV = `${ENV_PREFIX}_SUBAGENT_PARENT_PATH`;
-export const SUBAGENT_PARENT_CAPABILITY_TOKEN_ENV = `${ENV_PREFIX}_SUBAGENT_PARENT_CAPABILITY_TOKEN`;
-export const SUBAGENT_INHERIT_PROJECT_CONTEXT_ENV = `${ENV_PREFIX}_SUBAGENT_INHERIT_PROJECT_CONTEXT`;
-export const SUBAGENT_INHERIT_SKILLS_ENV = `${ENV_PREFIX}_SUBAGENT_INHERIT_SKILLS`;
-export const SUBAGENT_INTERCOM_SESSION_NAME_ENV = `${ENV_PREFIX}_SUBAGENT_INTERCOM_SESSION_NAME`;
-export const SUBAGENT_SUPERVISOR_CAPABILITY_ENV = `${ENV_PREFIX}_SUBAGENT_SUPERVISOR_CAPABILITY`;
-export const SUBAGENT_SUPERVISOR_SESSION_ID_ENV = `${ENV_PREFIX}_SUBAGENT_SUPERVISOR_SESSION_ID`;
-/** Intercom home-group env key (not a _SUBAGENT_ key); resolves ATOMIC_/PI_ variants. */
-export const INTERCOM_GROUP_ENV = `${ENV_PREFIX}_INTERCOM_GROUP`;
-const STRUCTURED_OUTPUT_TOOL_NAME = "structured_output";
-
-interface BuildPiArgsInput {
-	baseArgs: string[];
-	task: string;
-	sessionEnabled: boolean;
-	sessionDir?: string;
-	sessionFile?: string;
-	model?: string;
-	thinking?: string;
-	systemPromptMode?: "append" | "replace";
-	inheritProjectContext: boolean;
-	inheritSkills: boolean;
-	tools?: string[];
-	extensions?: string[];
-	systemPrompt?: string | null;
-	mcpDirectTools?: string[];
-	cwd?: string;
-	promptFileStem?: string;
-	intercomSessionName?: string;
-	orchestratorIntercomTarget?: string;
-	intercomGroup?: string;
-	supervisorAuthorization?: { capability: string; supervisorSessionId: string };
-	runId?: string;
-	childAgentName?: string;
-	childIndex?: number;
-	parentEventSink?: string;
-	parentControlInbox?: string;
-	parentRootRunId?: string;
-	parentRunId?: string;
-	parentChildIndex?: number;
-	parentDepth?: number;
-	parentPath?: NestedPathEntry[];
-	parentCapabilityToken?: string;
-	codexFastModeSettings?: CodexFastModeResolvedSettings;
-	codexFastModeScope?: CodexFastModeScope;
-	workflowSessionMetadata?: SessionWorkflowMetadata;
-	structuredOutput?: {
-		schema: JsonSchemaObject;
-		schemaPath: string;
-		outputPath: string;
-	};
-}
-
-interface BuildPiArgsResult {
-	args: string[];
-	env: Record<string, string | undefined>;
-	tempDir?: string;
-}
-
-export function applyThinkingSuffix(model: string | undefined, thinking: string | undefined): string | undefined {
-	if (!model || !thinking || thinking === "off") return model;
-	const colonIdx = model.lastIndexOf(":");
-	if (colonIdx !== -1 && THINKING_LEVELS.some((level) => level === model.substring(colonIdx + 1))) return model;
-	return `${model}:${thinking}`;
-}
-
-function serializeChildCodexFastModeSettings(settings: CodexFastModeResolvedSettings): string {
-	return `chat=${settings.chat ? "1" : "0"};workflow=${settings.workflow ? "1" : "0"}`;
-}
-
-function mapChildCodexFastModeSettings(
-	settings: CodexFastModeResolvedSettings,
-	scope: CodexFastModeScope,
-): CodexFastModeResolvedSettings {
-	return {
-		chat: settings[scope],
-		workflow: settings.workflow,
-	};
-}
-
-export function buildPiArgs(input: BuildPiArgsInput): BuildPiArgsResult {
-	const args = [...input.baseArgs];
-
-	if (input.sessionFile) {
-		fs.mkdirSync(path.dirname(input.sessionFile), { recursive: true });
-		args.push("--session", input.sessionFile);
-	} else {
-		if (!input.sessionEnabled) {
-			args.push("--no-session");
-		}
-		if (input.sessionDir) {
-			fs.mkdirSync(input.sessionDir, { recursive: true });
-			args.push("--session-dir", input.sessionDir);
-		}
-	}
-
-	const modelArg = applyThinkingSuffix(input.model, input.thinking);
-	if (modelArg) {
-		args.push("--model", modelArg);
-	}
-
-	const declaredBuiltinTools =
-		input.tools?.filter((tool) => !(tool.includes("/") || tool.endsWith(".ts") || tool.endsWith(".js"))) ?? [];
-	const fanoutAuthorized = declaredBuiltinTools.includes("subagent");
-	const toolExtensionPaths: string[] = [];
-	if (input.tools !== undefined) {
-		const builtinTools = [...declaredBuiltinTools];
-		// Path-only extension entries are passed via --extension, not --tools. An
-		// extension-only list intentionally emits no --tools flag, so default built-ins
-		// remain available; do not synthesize a built-in allowlist just to add
-		// structured_output and accidentally make that case restrictive.
-		const shouldAutoAllowStructuredOutput =
-			input.structuredOutput && (declaredBuiltinTools.length > 0 || input.tools.length === 0);
-		if (shouldAutoAllowStructuredOutput && !builtinTools.includes(STRUCTURED_OUTPUT_TOOL_NAME)) {
-			builtinTools.push(STRUCTURED_OUTPUT_TOOL_NAME);
-		}
-		for (const tool of input.tools) {
-			if (
-				!declaredBuiltinTools.includes(tool) &&
-				(tool.includes("/") || tool.endsWith(".ts") || tool.endsWith(".js"))
-			) {
-				toolExtensionPaths.push(tool);
-			}
-		}
-		if (builtinTools.length > 0) {
-			if (input.mcpDirectTools?.length) {
-				for (const resolvedTool of resolveMcpDirectToolNames(input.mcpDirectTools, input.cwd)) {
-					if (!builtinTools.includes(resolvedTool)) {
-						builtinTools.push(resolvedTool);
-					}
-				}
-			}
-			args.push("--tools", builtinTools.join(","));
-		}
-	}
-
-	// Keep the prompt runtime first: schema-backed children get structured_output
-	// from this extension before the child session refreshes explicit --tools allowlists.
-	const runtimeExtensions = fanoutAuthorized
-		? [PROMPT_RUNTIME_EXTENSION_PATH, FANOUT_CHILD_EXTENSION_PATH]
-		: [PROMPT_RUNTIME_EXTENSION_PATH];
-	if (input.extensions !== undefined) {
-		args.push("--no-extensions");
-		for (const extPath of [...new Set([...runtimeExtensions, ...toolExtensionPaths, ...input.extensions])]) {
-			args.push("--extension", extPath);
-		}
-	} else {
-		for (const extPath of [...new Set([...runtimeExtensions, ...toolExtensionPaths])]) {
-			args.push("--extension", extPath);
-		}
-	}
-
-	if (!input.inheritSkills) {
-		args.push("--no-skills");
-	}
-
-	let tempDir: string | undefined;
-	if (input.systemPrompt !== undefined && input.systemPrompt !== null) {
-		tempDir = fs.mkdtempSync(path.join(os.tmpdir(), `${APP_NAME}-subagent-`));
-		const stem = (input.promptFileStem ?? "prompt").replace(/[^\w.-]/g, "_");
-		const promptPath = path.join(tempDir, `${stem}.md`);
-		fs.writeFileSync(promptPath, input.systemPrompt, { mode: 0o600 });
-		args.push(input.systemPromptMode === "replace" ? "--system-prompt" : "--append-system-prompt", promptPath);
-	}
-
-	if (input.task.length > TASK_ARG_LIMIT) {
-		if (!tempDir) {
-			tempDir = fs.mkdtempSync(path.join(os.tmpdir(), `${APP_NAME}-subagent-`));
-		}
-		const taskFilePath = path.join(tempDir, "task.md");
-		fs.writeFileSync(taskFilePath, `Task: ${input.task}`, { mode: 0o600 });
-		args.push(`@${taskFilePath}`);
-	} else {
-		args.push(`Task: ${input.task}`);
-	}
-
-	const env: Record<string, string | undefined> = {};
-	env[SUBAGENT_CHILD_ENV] = "1";
-	env[SUBAGENT_FANOUT_CHILD_ENV] = fanoutAuthorized ? "1" : "0";
-	if (input.workflowSessionMetadata) {
-		env[WORKFLOW_SESSION_METADATA_ENV] = JSON.stringify(input.workflowSessionMetadata);
-	}
-	if (input.codexFastModeSettings) {
-		env[ENV_CODEX_FAST_MODE] = serializeChildCodexFastModeSettings(
-			mapChildCodexFastModeSettings(input.codexFastModeSettings, input.codexFastModeScope ?? "chat"),
-		);
-	}
-	const parentEventSinkEnv = getEnvValue(SUBAGENT_PARENT_EVENT_SINK_ENV);
-	const parentControlInboxEnv = getEnvValue(SUBAGENT_PARENT_CONTROL_INBOX_ENV);
-	const parentRootRunIdEnv = getEnvValue(SUBAGENT_PARENT_ROOT_RUN_ID_ENV);
-	const parentRunIdEnv = getEnvValue(SUBAGENT_PARENT_RUN_ID_ENV);
-	const parentChildIndexEnv = getEnvValue(SUBAGENT_PARENT_CHILD_INDEX_ENV);
-	const parentDepthEnv = getEnvValue(SUBAGENT_PARENT_DEPTH_ENV);
-	const parentPathEnv = getEnvValue(SUBAGENT_PARENT_PATH_ENV);
-	const parentCapabilityTokenEnv = getEnvValue(SUBAGENT_PARENT_CAPABILITY_TOKEN_ENV);
-	const inheritedNestedRoute = Boolean(parentEventSinkEnv && parentRootRunIdEnv && parentCapabilityTokenEnv);
-	const parentRunId =
-		input.parentRunId ??
-		input.runId ??
-		(inheritedNestedRoute ? getEnvValue(SUBAGENT_RUN_ID_ENV) : undefined) ??
-		parentRunIdEnv ??
-		"";
-	const parentChildIndex =
-		input.parentChildIndex !== undefined
-			? String(input.parentChildIndex)
-			: input.childIndex !== undefined
-				? String(input.childIndex)
-				: (parentChildIndexEnv ?? "");
-	const inheritedDepth = Number(parentDepthEnv);
-	const unclampedParentDepth =
-		input.parentDepth ?? (inheritedNestedRoute && Number.isFinite(inheritedDepth) ? inheritedDepth + 1 : 1);
-	const parentDepth = Math.min(Math.max(1, unclampedParentDepth), SUBAGENT_PARENT_MAX_DEPTH);
-	const parentPath = input.parentPath ?? [
-		...parseNestedPathEnv(parentPathEnv),
-		...(parentRunId
-			? [
-					{
-						runId: parentRunId,
-						...(parentChildIndex && /^\d+$/.test(parentChildIndex)
-							? { stepIndex: Number(parentChildIndex) }
-							: {}),
-						...(input.childAgentName ? { agent: input.childAgentName } : {}),
-					},
-				]
-			: []),
-	];
-	env[SUBAGENT_PARENT_EVENT_SINK_ENV] = fanoutAuthorized ? (input.parentEventSink ?? parentEventSinkEnv ?? "") : "";
-	env[SUBAGENT_PARENT_CONTROL_INBOX_ENV] = fanoutAuthorized
-		? (input.parentControlInbox ?? parentControlInboxEnv ?? "")
-		: "";
-	env[SUBAGENT_PARENT_ROOT_RUN_ID_ENV] = fanoutAuthorized
-		? (input.parentRootRunId ?? parentRootRunIdEnv ?? input.runId ?? "")
-		: "";
-	env[SUBAGENT_PARENT_RUN_ID_ENV] = fanoutAuthorized ? parentRunId : "";
-	env[SUBAGENT_PARENT_CHILD_INDEX_ENV] = fanoutAuthorized ? parentChildIndex : "";
-	env[SUBAGENT_PARENT_DEPTH_ENV] = fanoutAuthorized ? String(parentDepth) : "";
-	env[SUBAGENT_PARENT_PATH_ENV] = fanoutAuthorized ? encodeNestedPathEnv(parentPath) : "";
-	env[SUBAGENT_PARENT_CAPABILITY_TOKEN_ENV] = fanoutAuthorized
-		? (input.parentCapabilityToken ?? parentCapabilityTokenEnv ?? "")
-		: "";
-	env[SUBAGENT_INHERIT_PROJECT_CONTEXT_ENV] = input.inheritProjectContext ? "1" : "0";
-	env[SUBAGENT_INHERIT_SKILLS_ENV] = input.inheritSkills ? "1" : "0";
-	if (input.intercomSessionName) {
-		env[SUBAGENT_INTERCOM_SESSION_NAME_ENV] = input.intercomSessionName;
-	}
-	if (input.orchestratorIntercomTarget) {
-		env[SUBAGENT_ORCHESTRATOR_TARGET_ENV] = input.orchestratorIntercomTarget;
-	}
-	// Always override inherited capability metadata: a child must never pass its
-	// own supervisor authority to a descendant that lacks a freshly issued grant.
-	env[SUBAGENT_SUPERVISOR_CAPABILITY_ENV] = input.supervisorAuthorization?.capability ?? "";
-	env[SUBAGENT_SUPERVISOR_SESSION_ID_ENV] = input.supervisorAuthorization?.supervisorSessionId ?? "";
-	// Assign a workflow/explicit group only when the child has Intercom access;
-	// otherwise clear ambient group state so a restricted child receives none.
-	const hasIntercomAccess = Boolean(input.intercomSessionName || input.orchestratorIntercomTarget);
-	if (!hasIntercomAccess) {
-		env[INTERCOM_GROUP_ENV] = "";
-	} else if (input.intercomGroup) {
-		env[INTERCOM_GROUP_ENV] = input.intercomGroup;
-	}
-	if (input.runId) {
-		env[SUBAGENT_RUN_ID_ENV] = input.runId;
-	}
-	if (input.childAgentName) {
-		env[SUBAGENT_CHILD_AGENT_ENV] = input.childAgentName;
-	}
-	if (input.childIndex !== undefined) {
-		env[SUBAGENT_CHILD_INDEX_ENV] = String(input.childIndex);
-	}
-	// Bare MCP_DIRECT_TOOLS is the MCP adapter contract: unset means config defaults, __none__ forces no direct tools.
-	if (input.mcpDirectTools?.length) {
-		env.MCP_DIRECT_TOOLS = input.mcpDirectTools.join(",");
-	} else {
-		env.MCP_DIRECT_TOOLS = "__none__";
-	}
-	if (input.structuredOutput) {
-		env[STRUCTURED_OUTPUT_CAPTURE_ENV] = input.structuredOutput.outputPath;
-		env[STRUCTURED_OUTPUT_SCHEMA_ENV] = input.structuredOutput.schemaPath;
-	}
-
-	return { args, env, tempDir };
-}
-
-export const parseParentPathEnv = parseNestedPathEnv;
-
-export function cleanupTempDir(tempDir: string | null | undefined): void {
-	if (!tempDir) return;
-	try {
-		fs.rmSync(tempDir, { recursive: true, force: true });
-	} catch {
-		// Temp cleanup is best effort.
-	}
-}

package/dist/builtin/subagents/src/runs/shared/pi-spawn.ts

@@ -1,165 +0,0 @@
-import * as fs from "node:fs";
-import * as path from "node:path";
-import { fileURLToPath } from "node:url";
-import { APP_NAME, PACKAGE_NAME } from "@bastani/atomic";
-
-export const CODING_AGENT_PACKAGE = PACKAGE_NAME;
-export const PI_CODING_AGENT_PACKAGE = CODING_AGENT_PACKAGE;
-
-export function findPiPackageRootFromEntry(entryPoint: string): string | undefined {
-	let dir = path.dirname(entryPoint);
-	while (dir !== path.dirname(dir)) {
-		const packageJsonPath = path.join(dir, "package.json");
-		if (fs.existsSync(packageJsonPath)) {
-			const pkg = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8")) as { name?: unknown };
-			if (pkg.name === CODING_AGENT_PACKAGE) return dir;
-		}
-		dir = path.dirname(dir);
-	}
-	return undefined;
-}
-
-export function resolveInstalledPiPackageRoot(): string | undefined {
-	return findPiPackageRootFromEntry(fileURLToPath(import.meta.resolve(CODING_AGENT_PACKAGE)));
-}
-
-export function resolvePiPackageRoot(): string | undefined {
-	try {
-		const entry = process.argv[1];
-		return entry ? findPiPackageRootFromEntry(fs.realpathSync(entry)) : undefined;
-	} catch {
-		// process.argv[1] probing is best-effort; callers can fall back to PATH/package resolution.
-		return undefined;
-	}
-}
-
-export interface PiSpawnDeps {
-	platform?: NodeJS.Platform;
-	execPath?: string;
-	argv1?: string;
-	existsSync?: (filePath: string) => boolean;
-	readFileSync?: (filePath: string, encoding: "utf-8") => string;
-	resolvePackageJson?: () => string;
-	resolvePackageEntry?: () => string;
-	piPackageRoot?: string;
-	statSync?: (filePath: string) => fs.Stats;
-}
-
-export type PiSpawnCwdValidationResult = { ok: true } | { ok: false; error: string };
-
-export function validatePiSpawnCwd(cwd: string, deps: PiSpawnDeps = {}): PiSpawnCwdValidationResult {
-	const statSync = deps.statSync ?? fs.statSync;
-	try {
-		const cwdStats = statSync(cwd);
-		if (!cwdStats.isDirectory()) return { ok: false, error: `cwd is not a directory: ${cwd}` };
-		return { ok: true };
-	} catch (error) {
-		const fsError = error as NodeJS.ErrnoException;
-		if (fsError.code === "ENOENT") return { ok: false, error: `cwd does not exist: ${cwd}` };
-		if (fsError.code === "ENOTDIR")
-			return { ok: false, error: `cwd path contains a non-directory component: ${cwd}` };
-		const details = fsError.message ? ` (${fsError.message})` : "";
-		return { ok: false, error: `cwd is not accessible: ${cwd}${details}` };
-	}
-}
-
-export function formatPiSpawnError(error: Error, spawnSpec: PiSpawnCommand, cwd: string): string {
-	const spawnError = error as NodeJS.ErrnoException;
-	const message = error.message || String(error);
-	if (spawnError.code === "ENOENT") {
-		return `failed to spawn subagent runtime '${spawnSpec.command}' from cwd '${cwd}': runtime executable was not found or could not be launched (${message})`;
-	}
-	return `failed to spawn subagent runtime '${spawnSpec.command}' from cwd '${cwd}': ${message}`;
-}
-
-export interface PiSpawnCommand {
-	command: string;
-	args: string[];
-}
-
-function isGenericBunRuntime(execPath: string, platform: NodeJS.Platform): boolean {
-	const pathImpl = platform === "win32" ? path.win32 : path;
-	const executableName = pathImpl.basename(execPath).toLowerCase();
-	return executableName === "bun" || executableName === "bun.exe";
-}
-
-function isRunnableCliScript(
-	filePath: string,
-	execPath: string,
-	platform: NodeJS.Platform,
-	existsSync: (filePath: string) => boolean,
-): boolean {
-	if (!existsSync(filePath)) return false;
-	if (/\.(?:mjs|cjs|js)$/i.test(filePath)) return true;
-	return /\.ts$/i.test(filePath) && isGenericBunRuntime(execPath, platform);
-}
-
-function normalizePath(filePath: string, platform: NodeJS.Platform): string {
-	const pathImpl = platform === "win32" ? path.win32 : path;
-	return pathImpl.isAbsolute(filePath) ? filePath : pathImpl.resolve(filePath);
-}
-
-export function resolvePiCliScript(deps: PiSpawnDeps = {}): string | undefined {
-	const existsSync = deps.existsSync ?? fs.existsSync;
-	const readFileSync = deps.readFileSync ?? ((filePath, encoding) => fs.readFileSync(filePath, encoding));
-	const platform = deps.platform ?? process.platform;
-	const execPath = deps.execPath ?? process.execPath;
-	const argv1 = Object.hasOwn(deps, "argv1") ? deps.argv1 : process.argv[1];
-	const pathImpl = platform === "win32" ? path.win32 : path;
-
-	if (argv1) {
-		const argvPath = normalizePath(argv1, platform);
-		if (isRunnableCliScript(argvPath, execPath, platform, existsSync)) {
-			return argvPath;
-		}
-	}
-
-	try {
-		const resolvePackageJson =
-			deps.resolvePackageJson ??
-			(() => {
-				const root = deps.piPackageRoot ?? resolvePiPackageRoot();
-				if (root) return pathImpl.join(root, "package.json");
-				const packageRoot = deps.resolvePackageEntry
-					? findPiPackageRootFromEntry(deps.resolvePackageEntry())
-					: resolveInstalledPiPackageRoot();
-				if (!packageRoot) throw new Error(`Could not resolve ${CODING_AGENT_PACKAGE} package root`);
-				return pathImpl.join(packageRoot, "package.json");
-			});
-		const packageJsonPath = resolvePackageJson();
-		const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8")) as {
-			bin?: string | Record<string, string>;
-		};
-		const binField = packageJson.bin;
-		const binPath =
-			typeof binField === "string"
-				? binField
-				: (binField?.[APP_NAME] ?? binField?.pi ?? Object.values(binField ?? {})[0]);
-		if (!binPath) return undefined;
-		const candidate = pathImpl.resolve(pathImpl.dirname(packageJsonPath), binPath);
-		if (isRunnableCliScript(candidate, execPath, platform, existsSync)) {
-			return candidate;
-		}
-	} catch {
-		// Windows CLI resolution is optional; falling back to the app command lets PATH handle execution.
-		return undefined;
-	}
-
-	return undefined;
-}
-
-export function resolveWindowsPiCliScript(deps: PiSpawnDeps = {}): string | undefined {
-	return resolvePiCliScript(deps);
-}
-
-export function getPiSpawnCommand(args: string[], deps: PiSpawnDeps = {}): PiSpawnCommand {
-	const cliPath = resolvePiCliScript(deps);
-	if (cliPath) {
-		return {
-			command: deps.execPath ?? process.execPath,
-			args: [cliPath, ...args],
-		};
-	}
-
-	return { command: APP_NAME, args };
-}

package/dist/builtin/subagents/src/runs/shared/spawn-env.ts

@@ -1,21 +0,0 @@
-import { scrubInteractiveEngineEnv } from "@bastani/atomic";
-
-/**
- * Build a child environment from ordered layers, then remove Atomic's
- * interactive-engine control variables.
- *
- * Atomic already deletes those variables from its own `process.env` at startup;
- * scrubbing here is defense in depth for a caller-supplied or shared
- * environment that reintroduces one. The scrub deliberately runs LAST, after
- * `process.env`, the caller environment, and the subagent depth/workflow guards
- * have been merged, so no later layer can put a key back.
- */
-export function buildSubagentSpawnEnv(
-	...layers: Array<NodeJS.ProcessEnv | Record<string, string> | undefined>
-): NodeJS.ProcessEnv {
-	const merged: NodeJS.ProcessEnv = {};
-	for (const layer of layers) {
-		if (layer) Object.assign(merged, layer);
-	}
-	return scrubInteractiveEngineEnv(merged);
-}

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

@@ -1,150 +0,0 @@
-import * as fs from "node:fs";
-import * as os from "node:os";
-import * as path from "node:path";
-import { APP_NAME } from "@bastani/atomic";
-import type { Message } from "@earendil-works/pi-ai/compat";
-import { Compile } from "typebox/compile";
-import type { JsonSchemaObject } from "../../shared/types.ts";
-
-const ENV_PREFIX = APP_NAME.toUpperCase();
-export const STRUCTURED_OUTPUT_SCHEMA_ENV = `${ENV_PREFIX}_SUBAGENT_STRUCTURED_OUTPUT_SCHEMA`;
-export const STRUCTURED_OUTPUT_CAPTURE_ENV = `${ENV_PREFIX}_SUBAGENT_STRUCTURED_OUTPUT_CAPTURE`;
-export const STRUCTURED_OUTPUT_TOOL_NAME = "structured_output";
-export const STRUCTURED_OUTPUT_MAX_CORRECTIVE_PROMPTS = 3;
-export const STRUCTURED_OUTPUT_MISSING_ERROR =
-	"Missing structured_output call; this step has outputSchema and must finish by calling structured_output.";
-
-export interface StructuredOutputRuntime {
-	schema: JsonSchemaObject;
-	schemaPath: string;
-	outputPath: string;
-}
-
-export function assertJsonSchemaDescriptor(
-	schema: unknown,
-	label = "outputSchema",
-): asserts schema is JsonSchemaObject {
-	if (!schema || typeof schema !== "object" || Array.isArray(schema)) {
-		throw new Error(`${label} must be a JSON Schema object descriptor.`);
-	}
-}
-
-export function createStructuredOutputRuntime(schema: JsonSchemaObject, baseDir?: string): StructuredOutputRuntime {
-	const rootDir = baseDir ?? os.tmpdir();
-	fs.mkdirSync(rootDir, { recursive: true });
-	const dir = fs.mkdtempSync(path.join(rootDir, "pi-subagent-structured-"));
-	const schemaPath = path.join(dir, "schema.json");
-	const outputPath = path.join(dir, "output.json");
-	fs.writeFileSync(schemaPath, JSON.stringify(schema), { mode: 0o600 });
-	return { schema, schemaPath, outputPath };
-}
-
-export function validateStructuredOutputValue(
-	schema: JsonSchemaObject,
-	value: unknown,
-): { status: "valid" } | { status: "invalid"; message: string } {
-	try {
-		const validator = (
-			Compile as (schema: unknown) => {
-				Check(value: unknown): boolean;
-				Errors(value: unknown): Iterable<{ instancePath?: string; message?: string }>;
-			}
-		)(schema);
-		if (validator.Check(value)) return { status: "valid" };
-		const errors = [...validator.Errors(value)].slice(0, 8).map((error) => {
-			const pathText = error.instancePath ? error.instancePath.replace(/^\//, "").replace(/\//g, ".") : "root";
-			return `${pathText}: ${error.message}`;
-		});
-		return { status: "invalid", message: errors.join("; ") || "schema validation failed" };
-	} catch (error) {
-		return {
-			status: "invalid",
-			message: `invalid outputSchema: ${error instanceof Error ? error.message : String(error)}`,
-		};
-	}
-}
-
-function textFromContent(content: unknown): string | undefined {
-	if (!Array.isArray(content)) return undefined;
-	const text = content
-		.map((block) => {
-			if (!block || typeof block !== "object") return "";
-			const record = block as { readonly type?: unknown; readonly text?: unknown };
-			return record.type === "text" && typeof record.text === "string" ? record.text : "";
-		})
-		.join("\n")
-		.trim();
-	return text.length > 0 ? text : undefined;
-}
-
-export function latestStructuredOutputToolErrorFromMessages(
-	messages: readonly Message[] | undefined,
-): string | undefined {
-	if (!messages) return undefined;
-	for (let index = messages.length - 1; index >= 0; index -= 1) {
-		const message = messages[index];
-		if (message?.role !== "toolResult") continue;
-		if (message.toolName !== STRUCTURED_OUTPUT_TOOL_NAME) continue;
-		if (message.isError !== true) continue;
-		return textFromContent(message.content) ?? "structured_output tool call failed schema validation.";
-	}
-	return undefined;
-}
-
-export function isStructuredOutputContractError(error: string | undefined): boolean {
-	if (error === undefined) return false;
-	return (
-		error === STRUCTURED_OUTPUT_MISSING_ERROR ||
-		error.startsWith("Structured output validation failed:") ||
-		error.startsWith("Failed to read structured output:")
-	);
-}
-
-export function formatStructuredOutputCorrectionPrompt(args: {
-	readonly originalTask: string;
-	readonly error: string;
-	readonly attempt: number;
-	readonly maxAttempts?: number;
-}): string {
-	const maxAttempts = args.maxAttempts ?? STRUCTURED_OUTPUT_MAX_CORRECTIVE_PROMPTS;
-	return [
-		"The previous response failed this subagent's structured-output contract.",
-		"",
-		`Corrective attempt ${args.attempt}/${maxAttempts}.`,
-		"",
-		"Error:",
-		args.error,
-		"",
-		"You must finish by calling the `structured_output` tool exactly once with arguments matching the registered schema.",
-		"Do not answer with plain JSON text, Markdown, or prose. If you attempted `structured_output` and validation failed, correct the tool arguments and call `structured_output` again.",
-		"If the requested work is already complete, do not redo side effects unnecessarily; just report the completed result through `structured_output`.",
-		"",
-		"Original task:",
-		args.originalTask,
-	].join("\n");
-}
-
-export function readStructuredOutput(runtime: StructuredOutputRuntime): { value?: unknown; error?: string } {
-	if (!fs.existsSync(runtime.outputPath)) {
-		return { error: STRUCTURED_OUTPUT_MISSING_ERROR };
-	}
-	try {
-		const value = JSON.parse(fs.readFileSync(runtime.outputPath, "utf-8")) as unknown;
-		const validation = validateStructuredOutputValue(runtime.schema, value);
-		if (validation.status === "invalid") {
-			return { error: `Structured output validation failed: ${validation.message}` };
-		}
-		return { value };
-	} catch (error) {
-		return { error: `Failed to read structured output: ${error instanceof Error ? error.message : String(error)}` };
-	}
-}
-
-export function cleanupStructuredOutputRuntime(runtime: StructuredOutputRuntime | undefined): void {
-	if (!runtime) return;
-	try {
-		fs.rmSync(path.dirname(runtime.schemaPath), { recursive: true, force: true });
-	} catch {
-		// Best-effort temp cleanup.
-	}
-}