@bastani/atomic 0.9.16-alpha.2 → 0.9.16-alpha.3

package/dist/builtin/subagents/src/agents/agent-discovery.ts

@@ -1,116 +0,0 @@
-import * as fs from "node:fs";
-import * as os from "node:os";
-import * as path from "node:path";
-import { getEnvValue } from "@bastani/atomic";
-import { type AgentLoadDiagnostic, loadAgentsFromDir, loadAgentsFromDirWithDiagnostics } from "./agent-loaders.js";
-import { applyBuiltinOverrides, readMergedSubagentSettings } from "./agent-overrides.js";
-import {
-	BUILTIN_AGENTS_DIR,
-	getProjectAgentSettingsPath,
-	getProjectAgentSettingsPaths,
-	getUserAgentDirs,
-	getUserAgentSettingsPath,
-	getUserAgentSettingsPaths,
-	resolveNearestProjectAgentDirs,
-} from "./agent-paths.js";
-import { mergeAgentsForScope } from "./agent-selection.js";
-import {
-	type AgentConfig,
-	type AgentDiscoveryResult,
-	type AgentScope,
-	EMPTY_SUBAGENT_SETTINGS,
-} from "./agent-types.js";
-
-export function discoverAgents(cwd: string, scope: AgentScope): AgentDiscoveryResult {
-	const userDirOld = getUserAgentDirs();
-	const userDirNew = path.join(os.homedir(), ".agents");
-	const { readDirs: projectAgentDirs, preferredDir: projectAgentsDir } = resolveNearestProjectAgentDirs(cwd);
-	const userSettingsLoad = readMergedSubagentSettings(getUserAgentSettingsPaths());
-	const projectSettingsLoad = readMergedSubagentSettings(getProjectAgentSettingsPaths(cwd));
-	const userSettingsPath = userSettingsLoad.path ?? getUserAgentSettingsPath();
-	const projectSettingsPath = projectSettingsLoad.path ?? getProjectAgentSettingsPath(cwd);
-	const userSettings = scope === "project" ? EMPTY_SUBAGENT_SETTINGS : userSettingsLoad.settings;
-	const projectSettings = scope === "user" ? EMPTY_SUBAGENT_SETTINGS : projectSettingsLoad.settings;
-
-	const builtinAgents = applyBuiltinOverrides(
-		loadAgentsFromDir(BUILTIN_AGENTS_DIR, "builtin"),
-		userSettings,
-		projectSettings,
-		userSettingsPath,
-		projectSettingsPath,
-	);
-
-	const userAgentsOld = scope === "project" ? [] : userDirOld.flatMap((dir) => loadAgentsFromDir(dir, "user"));
-	const userAgentsNew = scope === "project" ? [] : loadAgentsFromDir(userDirNew, "user");
-	const userAgents = [...userAgentsOld, ...userAgentsNew];
-
-	const projectAgents = scope === "user" ? [] : projectAgentDirs.flatMap((dir) => loadAgentsFromDir(dir, "project"));
-	const agents = mergeAgentsForScope(scope, userAgents, projectAgents, builtinAgents).filter(
-		(agent) => agent.disabled !== true,
-	);
-
-	return { agents, projectAgentsDir };
-}
-
-export function discoverAgentsAll(cwd: string): {
-	builtin: AgentConfig[];
-	user: AgentConfig[];
-	project: AgentConfig[];
-	userDir: string;
-	projectDir: string | null;
-	userSettingsPath: string;
-	projectSettingsPath: string | null;
-	diagnostics: AgentLoadDiagnostic[];
-} {
-	const userDirOld = getUserAgentDirs();
-	const userDirNew = path.join(os.homedir(), ".agents");
-	const { readDirs: projectDirs, preferredDir: projectDir } = resolveNearestProjectAgentDirs(cwd);
-	const userSettingsLoad = readMergedSubagentSettings(getUserAgentSettingsPaths());
-	const projectSettingsLoad = readMergedSubagentSettings(getProjectAgentSettingsPaths(cwd));
-	const userSettingsPath = userSettingsLoad.path ?? getUserAgentSettingsPath();
-	const projectSettingsPath = projectSettingsLoad.path ?? getProjectAgentSettingsPath(cwd);
-	const userSettings = userSettingsLoad.settings;
-	const projectSettings = projectSettingsLoad.settings;
-
-	const diagnostics: AgentLoadDiagnostic[] = [];
-	const loadDir = (dir: string, source: "builtin" | "user" | "project"): AgentConfig[] => {
-		const result = loadAgentsFromDirWithDiagnostics(dir, source);
-		diagnostics.push(...result.diagnostics);
-		return result.agents;
-	};
-
-	const builtin = applyBuiltinOverrides(
-		loadDir(BUILTIN_AGENTS_DIR, "builtin"),
-		userSettings,
-		projectSettings,
-		userSettingsPath,
-		projectSettingsPath,
-	);
-	const user = [...userDirOld.flatMap((dir) => loadDir(dir, "user")), ...loadDir(userDirNew, "user")];
-	const projectMap = new Map<string, AgentConfig>();
-	for (const dir of projectDirs) {
-		for (const agent of loadDir(dir, "project")) {
-			projectMap.set(agent.name, agent);
-		}
-	}
-	const project = Array.from(projectMap.values());
-
-	const legacyUserAgentDir = userDirOld[0]!;
-	// ATOMIC_CODING_AGENT_DIR is already applied by getUserAgentDirs(); prefer that resolved path over ~/.agents.
-	const userDir = getEnvValue("ATOMIC_CODING_AGENT_DIR")
-		? legacyUserAgentDir
-		: fs.existsSync(userDirNew)
-			? userDirNew
-			: legacyUserAgentDir;
-
-	return {
-		builtin,
-		user,
-		project,
-		userDir,
-		projectDir,
-		userSettingsPath,
-		projectSettingsPath,
-		diagnostics,
-	};
-}

package/dist/builtin/subagents/src/agents/agent-loaders.ts

@@ -1,216 +0,0 @@
-import * as fs from "node:fs";
-import * as path from "node:path";
-import { splitToolList } from "./agent-overrides.js";
-import { shouldPreserveAgentExtraField } from "./agent-serializer.js";
-import {
-	type AgentConfig,
-	type AgentSource,
-	defaultInheritProjectContext,
-	defaultInheritSkills,
-	defaultSystemPromptMode,
-} from "./agent-types.js";
-import { type FrontmatterValue, parseFrontmatter } from "./frontmatter.js";
-import { buildRuntimeName, parsePackageName } from "./identity.js";
-
-function listFilesRecursive(dir: string, predicate: (fileName: string) => boolean): string[] {
-	const files: string[] = [];
-	if (!fs.existsSync(dir)) return files;
-
-	let entries: fs.Dirent[];
-	try {
-		entries = fs.readdirSync(dir, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name));
-	} catch {
-		return files;
-	}
-
-	for (const entry of entries) {
-		const filePath = path.join(dir, entry.name);
-		if (entry.isDirectory()) {
-			files.push(...listFilesRecursive(filePath, predicate));
-			continue;
-		}
-		if (!entry.isFile() && !entry.isSymbolicLink()) continue;
-		if (!predicate(entry.name)) continue;
-		files.push(filePath);
-	}
-	return files;
-}
-
-function parseCommaSeparatedList(value: string | undefined): string[] | undefined {
-	const parsed = value
-		?.split(",")
-		.map((item) => item.trim())
-		.filter(Boolean);
-	return parsed && parsed.length > 0 ? parsed : undefined;
-}
-
-/**
- * Narrow a frontmatter value to its scalar spelling. A YAML sequence where a
- * scalar belongs (`model: [anthropic, x]`) reads as undefined rather than a
- * stringified list, matching upstream's `typeof` narrowing.
- */
-function frontmatterString(value: FrontmatterValue | undefined): string | undefined {
-	return typeof value === "string" ? value : undefined;
-}
-
-/**
- * Narrow a frontmatter value to a boolean. The real YAML parser yields true
- * booleans for the unquoted spellings `serializeAgent` itself writes
- * (`interactive: true`); quoted or hand-written `"true"`/`"false"` strings
- * from the legacy line-reader era stay accepted.
- */
-function frontmatterBoolean(value: FrontmatterValue | undefined): boolean | undefined {
-	if (typeof value === "boolean") return value;
-	if (value === "true") return true;
-	if (value === "false") return false;
-	return undefined;
-}
-
-/**
- * Normalize a frontmatter `tools` value to a list of tool names.
- *
- * Both spellings are valid YAML and both are in use (upstream pi #7598):
- *
- *     tools: read, bash        # string, comma-separated
- *     tools: [read, bash]      # flow sequence
- *     tools:                   # block sequence
- *       - read
- *       - bash
- *
- * so accept either. Anything else yields no tools rather than throwing: this
- * runs inside agent discovery, where a single bad file must not take down
- * every other agent in the same directory.
- */
-function parseToolList(value: FrontmatterValue | undefined): string[] | undefined {
-	const raw = Array.isArray(value) ? value : typeof value === "string" ? value.split(",") : [];
-	const tools = raw
-		.filter((tool): tool is string => typeof tool === "string")
-		.map((tool) => tool.trim())
-		.filter(Boolean);
-	return tools.length > 0 ? tools : undefined;
-}
-
-export interface AgentLoadDiagnostic {
-	/** Absolute path of the skipped file. */
-	path: string;
-	/** Why the file was skipped, from the YAML parser when it threw. */
-	message: string;
-}
-
-export interface AgentDirLoadResult {
-	agents: AgentConfig[];
-	diagnostics: AgentLoadDiagnostic[];
-}
-
-/**
- * Load every agent file in a directory, collecting a diagnostic per file
- * skipped for invalid YAML frontmatter. The real YAML parser is stricter
- * than the line reader it replaced (`description: Deploy: fast` is a
- * nested-mapping error, not a description), so without this record those
- * files would vanish from discovery with no signal.
- */
-export function loadAgentsFromDirWithDiagnostics(dir: string, source: AgentSource): AgentDirLoadResult {
-	const agents: AgentConfig[] = [];
-	const diagnostics: AgentLoadDiagnostic[] = [];
-
-	for (const filePath of listFilesRecursive(dir, (fileName) => fileName.endsWith(".md"))) {
-		let content: string;
-		try {
-			content = fs.readFileSync(filePath, "utf-8");
-		} catch {
-			continue;
-		}
-
-		const { frontmatter, body, parseError } = parseFrontmatter(content);
-		if (parseError !== undefined) {
-			diagnostics.push({ path: filePath, message: parseError });
-			continue;
-		}
-
-		// Sequences are legal frontmatter but not valid `name`/`description`
-		// spellings; a file whose identity fields are not plain strings is
-		// skipped whole, exactly as upstream's loader does.
-		const localName = frontmatterString(frontmatter.name);
-		const description = frontmatterString(frontmatter.description);
-		if (!localName || !description) {
-			continue;
-		}
-
-		const parsedPackage = parsePackageName(frontmatterString(frontmatter.package), `Agent '${localName}' package`);
-		if (parsedPackage.error) continue;
-		const packageName = parsedPackage.packageName;
-		const runtimeName = buildRuntimeName(localName, packageName);
-
-		const rawTools = parseToolList(frontmatter.tools);
-		const parsedTools = splitToolList(rawTools);
-		const inheritProjectContextRaw = frontmatterBoolean(frontmatter.inheritProjectContext);
-		const inheritSkillsRaw = frontmatterBoolean(frontmatter.inheritSkills);
-		const defaultContextRaw = frontmatterString(frontmatter.defaultContext);
-		const extensionsRaw = frontmatterString(frontmatter.extensions);
-		const systemPromptModeRaw = frontmatterString(frontmatter.systemPromptMode);
-		const defaultReads = parseCommaSeparatedList(frontmatterString(frontmatter.defaultReads));
-		const skillStr = frontmatterString(frontmatter.skill) || frontmatterString(frontmatter.skills) || undefined;
-		const skills = parseCommaSeparatedList(skillStr);
-		const fallbackModels = parseCommaSeparatedList(frontmatterString(frontmatter.fallbackModels));
-		const fallbackThinkingLevels = parseCommaSeparatedList(frontmatterString(frontmatter.fallbackThinkingLevels));
-		const inheritProjectContext = inheritProjectContextRaw ?? defaultInheritProjectContext(localName);
-		const inheritSkills = inheritSkillsRaw ?? defaultInheritSkills();
-		const systemPromptMode =
-			systemPromptModeRaw === "replace"
-				? "replace"
-				: systemPromptModeRaw === "append"
-					? "append"
-					: defaultSystemPromptMode(localName);
-		const defaultContext =
-			defaultContextRaw === "fork"
-				? ("fork" as const)
-				: defaultContextRaw === "fresh"
-					? ("fresh" as const)
-					: undefined;
-		let extensions: string[] | undefined;
-		if (extensionsRaw !== undefined) {
-			extensions = extensionsRaw
-				.split(",")
-				.map((extension) => extension.trim())
-				.filter(Boolean);
-		}
-
-		const extraFields: Record<string, FrontmatterValue> = {};
-		for (const [key, value] of Object.entries(frontmatter)) {
-			if (shouldPreserveAgentExtraField(key)) extraFields[key] = value;
-		}
-
-		agents.push({
-			name: runtimeName,
-			localName,
-			packageName,
-			description,
-			tools: parsedTools.tools,
-			mcpDirectTools: parsedTools.mcpDirectTools,
-			model: frontmatterString(frontmatter.model),
-			fallbackModels,
-			fallbackThinkingLevels,
-			thinking: frontmatterString(frontmatter.thinking),
-			systemPromptMode,
-			inheritProjectContext,
-			inheritSkills,
-			defaultContext,
-			systemPrompt: body,
-			source,
-			filePath,
-			skills,
-			extensions,
-			output: frontmatterString(frontmatter.output),
-			defaultReads,
-			defaultProgress: frontmatterBoolean(frontmatter.defaultProgress) === true,
-			interactive: frontmatterBoolean(frontmatter.interactive) === true,
-			extraFields: Object.keys(extraFields).length > 0 ? extraFields : undefined,
-		});
-	}
-
-	return { agents, diagnostics };
-}
-
-export function loadAgentsFromDir(dir: string, source: AgentSource): AgentConfig[] {
-	return loadAgentsFromDirWithDiagnostics(dir, source).agents;
-}

package/dist/builtin/subagents/src/agents/agent-management-helpers.ts

@@ -1,221 +0,0 @@
-import type { SkillCatalog } from "@bastani/atomic";
-import type { SubagentToolResult } from "../shared/types.js";
-import type { ManagementContext, ManagementScope } from "./agent-management.js";
-import type { AgentConfig, AgentScope } from "./agents.js";
-import { discoverAgentsAll, parsePackageName } from "./agents.js";
-import { discoverAvailableSkills, resolveSkillsFromCatalog } from "./skills.js";
-
-export function result(text: string, isError = false): SubagentToolResult {
-	return { content: [{ type: "text", text }], isError, details: { mode: "management", results: [] } };
-}
-
-export function parseCsv(value: string): string[] {
-	return [
-		...new Set(
-			value
-				.split(",")
-				.map((v) => v.trim())
-				.filter(Boolean),
-		),
-	];
-}
-
-export function configObject(config: unknown): { value?: Record<string, unknown>; error?: string } {
-	let val = config;
-	if (typeof val === "string") {
-		try {
-			val = JSON.parse(val);
-		} catch (error) {
-			const message = error instanceof Error ? error.message : String(error);
-			return { error: `config must be valid JSON: ${message}` };
-		}
-	}
-	if (!val || typeof val !== "object" || Array.isArray(val)) return {};
-	return { value: val as Record<string, unknown> };
-}
-
-export function hasKey(obj: Record<string, unknown>, key: string): boolean {
-	return Object.hasOwn(obj, key);
-}
-
-export function asDisambiguationScope(scope: unknown): ManagementScope | undefined {
-	if (scope === "user" || scope === "project") return scope;
-	return undefined;
-}
-
-export function normalizeListScope(scope: unknown): AgentScope | undefined {
-	if (scope === undefined) return "both";
-	if (scope === "user" || scope === "project" || scope === "both") return scope;
-	return undefined;
-}
-
-export function sanitizeName(name: string): string {
-	return name
-		.toLowerCase()
-		.trim()
-		.replace(/\s+/g, "-")
-		.replace(/[^a-z0-9-]/g, "")
-		.replace(/-+/g, "-")
-		.replace(/^-+|-+$/g, "");
-}
-
-export function parsePackageConfig(value: unknown): { packageName?: string; error?: string } {
-	return parsePackageName(value, "config.package");
-}
-
-export function allAgents(d: { builtin: AgentConfig[]; user: AgentConfig[]; project: AgentConfig[] }): AgentConfig[] {
-	return [...d.builtin, ...d.user, ...d.project];
-}
-
-export function availableNames(cwd: string): string[] {
-	const d = discoverAgentsAll(cwd);
-	return [...new Set(allAgents(d).map((agent) => agent.name))].sort((a, b) => a.localeCompare(b));
-}
-
-export function findAgents(name: string, cwd: string, scope: AgentScope = "both"): AgentConfig[] {
-	const d = discoverAgentsAll(cwd);
-	const raw = name.trim();
-	const sanitized = sanitizeName(raw);
-	return allAgents(d)
-		.filter((a) => (scope === "both" || a.source === scope) && (a.name === raw || a.name === sanitized))
-		.sort((a, b) => a.source.localeCompare(b.source));
-}
-
-export function nameExistsInScope(cwd: string, scope: ManagementScope, name: string, excludePath?: string): boolean {
-	const d = discoverAgentsAll(cwd);
-	return (scope === "user" ? d.user : d.project).some(
-		(agent) => agent.name === name && agent.filePath !== excludePath,
-	);
-}
-
-export function modelWarning(ctx: ManagementContext, model: string | undefined): string | undefined {
-	if (!model) return undefined;
-	const found = ctx.modelRegistry.getAvailable().some((m) => `${m.provider}/${m.id}` === model || m.id === model);
-	return found ? undefined : `Warning: model '${model}' is not in the current model registry.`;
-}
-
-export function fallbackModelsWarning(
-	ctx: ManagementContext,
-	fallbackModels: string[] | undefined,
-): string | undefined {
-	if (!fallbackModels || fallbackModels.length === 0) return undefined;
-	const available = new Set(ctx.modelRegistry.getAvailable().flatMap((m) => [`${m.provider}/${m.id}`, m.id]));
-	const missing = fallbackModels.filter((model) => !available.has(model));
-	return missing.length
-		? `Warning: fallback models not in the current model registry: ${missing.join(", ")}.`
-		: undefined;
-}
-
-export function skillsWarning(cwd: string, skills: string[] | undefined, catalog?: SkillCatalog): string | undefined {
-	if (!skills || skills.length === 0) return undefined;
-	const missing = catalog
-		? resolveSkillsFromCatalog(skills, catalog, cwd).missing
-		: skills.filter((skill) => !new Set(discoverAvailableSkills(cwd).map((entry) => entry.name)).has(skill));
-	return missing.length ? `Warning: skills not found: ${missing.join(", ")}.` : undefined;
-}
-
-export function parseTools(raw: string): { tools?: string[]; mcpDirectTools?: string[] } {
-	const tools: string[] = [];
-	const mcpDirectTools: string[] = [];
-	for (const item of parseCsv(raw)) {
-		if (item.startsWith("mcp:")) {
-			const direct = item.slice(4).trim();
-			if (direct) mcpDirectTools.push(direct);
-		} else tools.push(item);
-	}
-	return {
-		tools: tools.length ? tools : undefined,
-		mcpDirectTools: mcpDirectTools.length ? mcpDirectTools : undefined,
-	};
-}
-
-export function applyAgentConfig(target: AgentConfig, cfg: Record<string, unknown>): string | undefined {
-	if (hasKey(cfg, "systemPrompt")) {
-		if (cfg.systemPrompt === false || cfg.systemPrompt === "") target.systemPrompt = "";
-		else if (typeof cfg.systemPrompt === "string") target.systemPrompt = cfg.systemPrompt;
-		else return "config.systemPrompt must be a string or false when provided.";
-	}
-	if (hasKey(cfg, "model")) {
-		if (cfg.model === false || cfg.model === "") target.model = undefined;
-		else if (typeof cfg.model === "string") target.model = cfg.model.trim() || undefined;
-		else return "config.model must be a string or false when provided.";
-	}
-	if (hasKey(cfg, "fallbackModels")) {
-		if (cfg.fallbackModels === false || cfg.fallbackModels === "") target.fallbackModels = undefined;
-		else if (typeof cfg.fallbackModels === "string") {
-			const models = parseCsv(cfg.fallbackModels);
-			target.fallbackModels = models.length ? models : undefined;
-		} else if (Array.isArray(cfg.fallbackModels)) {
-			const models = cfg.fallbackModels
-				.filter((value): value is string => typeof value === "string")
-				.map((value) => value.trim())
-				.filter(Boolean);
-			target.fallbackModels = models.length ? [...new Set(models)] : undefined;
-		} else return "config.fallbackModels must be a comma-separated string, string array, or false when provided.";
-	}
-	if (hasKey(cfg, "tools")) {
-		if (cfg.tools === false || cfg.tools === "") {
-			target.tools = undefined;
-			target.mcpDirectTools = undefined;
-		} else if (typeof cfg.tools === "string") {
-			const parsed = parseTools(cfg.tools);
-			target.tools = parsed.tools;
-			target.mcpDirectTools = parsed.mcpDirectTools;
-		} else return "config.tools must be a comma-separated string or false when provided.";
-	}
-	if (hasKey(cfg, "skills")) {
-		if (cfg.skills === false || cfg.skills === "") target.skills = undefined;
-		else if (typeof cfg.skills === "string") {
-			const skills = parseCsv(cfg.skills);
-			target.skills = skills.length ? skills : undefined;
-		} else return "config.skills must be a comma-separated string or false when provided.";
-	}
-	if (hasKey(cfg, "extensions")) {
-		if (cfg.extensions === false) target.extensions = undefined;
-		else if (cfg.extensions === "") target.extensions = [];
-		else if (typeof cfg.extensions === "string") target.extensions = parseCsv(cfg.extensions);
-		else return "config.extensions must be a comma-separated string, empty string, or false when provided.";
-	}
-	if (hasKey(cfg, "thinking")) {
-		if (cfg.thinking === false || cfg.thinking === "") target.thinking = undefined;
-		else if (typeof cfg.thinking === "string") target.thinking = cfg.thinking.trim() || undefined;
-		else return "config.thinking must be a string or false when provided.";
-	}
-	if (hasKey(cfg, "systemPromptMode")) {
-		if (cfg.systemPromptMode === "append" || cfg.systemPromptMode === "replace")
-			target.systemPromptMode = cfg.systemPromptMode;
-		else return "config.systemPromptMode must be 'append' or 'replace' when provided.";
-	}
-	if (hasKey(cfg, "inheritProjectContext")) {
-		if (typeof cfg.inheritProjectContext !== "boolean")
-			return "config.inheritProjectContext must be a boolean when provided.";
-		target.inheritProjectContext = cfg.inheritProjectContext;
-	}
-	if (hasKey(cfg, "inheritSkills")) {
-		if (typeof cfg.inheritSkills !== "boolean") return "config.inheritSkills must be a boolean when provided.";
-		target.inheritSkills = cfg.inheritSkills;
-	}
-	if (hasKey(cfg, "defaultContext")) {
-		if (cfg.defaultContext === false || cfg.defaultContext === "") target.defaultContext = undefined;
-		else if (cfg.defaultContext === "fresh" || cfg.defaultContext === "fork")
-			target.defaultContext = cfg.defaultContext;
-		else return "config.defaultContext must be 'fresh', 'fork', or false when provided.";
-	}
-	if (hasKey(cfg, "output")) {
-		if (cfg.output === false || cfg.output === "") target.output = undefined;
-		else if (typeof cfg.output === "string") target.output = cfg.output;
-		else return "config.output must be a string or false when provided.";
-	}
-	if (hasKey(cfg, "reads")) {
-		if (cfg.reads === false || cfg.reads === "") target.defaultReads = undefined;
-		else if (typeof cfg.reads === "string") {
-			const reads = parseCsv(cfg.reads);
-			target.defaultReads = reads.length ? reads : undefined;
-		} else return "config.reads must be a comma-separated string or false when provided.";
-	}
-	if (hasKey(cfg, "progress")) {
-		if (typeof cfg.progress !== "boolean") return "config.progress must be a boolean when provided.";
-		target.defaultProgress = cfg.progress;
-	}
-	return undefined;
-}