@baton-dx/cli 0.3.1 → 0.4.0

package/dist/{src-C3-Vz-R7.mjs → src-D41VR6ro.mjs}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { n as __require, r as __toESM, t as __commonJSMin } from "./chunk-BbwQpWto.mjs";
 import { m as require_dist } from "./context-detection-DqOTnD6_.mjs";
-import { i as AGENT_PATHS, r as evaluateDetection } from "./agent-detection-DTiVeO5W.mjs";
+import { i as AI_TOOL_PATHS, r as evaluateDetection } from "./ai-tool-detection-CMsBNa9e.mjs";
 import { d as esm_default, m as simpleGit } from "./esm-BagM-kVd.mjs";
 import { access, mkdir, readFile, readdir, rm, rmdir, stat, symlink, unlink, writeFile } from "node:fs/promises";
 import { dirname, isAbsolute, join, relative, resolve } from "node:path";
@@ -10,29 +10,29 @@ import { homedir } from "node:os";
 import { createHash } from "node:crypto";
 import { execFile } from "node:child_process";
 
-//#region ../agent-paths/src/types.ts
+//#region ../ai-tool-paths/src/types.ts
 /**
 * Error thrown when an agent is not found in the registry
 */
-var AgentNotFoundError = class extends Error {
+var AIToolNotFoundError = class extends Error {
 	constructor(message) {
 		super(message);
-		this.name = "AgentNotFoundError";
+		this.name = "AIToolNotFoundError";
 	}
 };
 
 //#endregion
-//#region ../agent-paths/src/helpers.ts
+//#region ../ai-tool-paths/src/helpers.ts
 /**
 * Retrieves the full agent configuration for a given agent key.
 *
 * @param agentKey - The unique key of the agent (e.g., 'claude-code', 'cursor')
-* @returns The full AgentPathConfig for the agent
-* @throws AgentNotFoundError if the agent key is not found in the registry
+* @returns The full AIToolPathConfig for the agent
+* @throws AIToolNotFoundError if the agent key is not found in the registry
 */
-function getAgentConfig(agentKey) {
-	const config = AGENT_PATHS.find((agent) => agent.key === agentKey);
-	if (!config) throw new AgentNotFoundError(`Agent with key '${agentKey}' not found in registry`);
+function getAIToolConfig(agentKey) {
+	const config = AI_TOOL_PATHS.find((agent) => agent.key === agentKey);
+	if (!config) throw new AIToolNotFoundError(`Agent with key '${agentKey}' not found in registry`);
 	return config;
 }
 /**
@@ -40,8 +40,8 @@ function getAgentConfig(agentKey) {
 *
 * @returns Array of all agent keys
 */
-function getAllAgentKeys() {
-	return AGENT_PATHS.map((agent) => agent.key);
+function getAllAIToolKeys() {
+	return AI_TOOL_PATHS.map((agent) => agent.key);
 }
 /**
 * Resolves a path template with tilde expansion and name placeholder replacement.
@@ -60,14 +60,14 @@ function resolvePath(template, name) {
 * Retrieves the resolved path for a given agent, config type, scope, and optional name.
 *
 * @param agentKey - The unique key of the agent
-* @param configType - The type of configuration (skills, rules, agents, memory, settings, commands)
+* @param configType - The type of configuration (skills, rules, agents, memory, commands)
 * @param scope - The scope (project or global)
 * @param name - Optional name to replace {name} placeholder
 * @returns Resolved path string
-* @throws AgentNotFoundError if the agent key is not found
+* @throws AIToolNotFoundError if the agent key is not found
 */
-function getAgentPath(agentKey, configType, scope, name) {
-	const pathTemplate = getAgentConfig(agentKey)[configType][scope];
+function getAIToolPath(agentKey, configType, scope, name) {
+	const pathTemplate = getAIToolConfig(agentKey)[configType][scope];
 	return resolvePath(pathTemplate, name);
 }
 
@@ -114,7 +114,7 @@ var VersionNotFoundError = class extends BatonError {
 /**
 * Thrown when an adapter is not found for a given agent key
 */
-var AdapterNotFoundError = class extends BatonError {
+var AIToolAdapterNotFoundError = class extends BatonError {
 	constructor(message, cause) {
 		super("ADAPTER_NOT_FOUND_ERROR", message, cause);
 	}
@@ -3783,6 +3783,10 @@ const skillItemSchema = objectType({
 */
 const rulesSchema = unionType([arrayType(stringType()), recordType(stringType(), arrayType(stringType()).optional())]);
 /**
+* Agents in profile manifest - can be either an array or an object
+*/
+const agentsSchema = unionType([arrayType(stringType()), recordType(stringType(), arrayType(stringType()).optional())]);
+/**
 * Memory file configuration item
 *
 * Convention: Use "MEMORY.md" as source for generic memory that will be
@@ -3799,18 +3803,14 @@ const memoryItemSchema = objectType({
 */
 const memorySectionSchema = arrayType(memoryItemSchema).optional();
 /**
-* Settings configuration mapping agent key to settings filename
-*/
-const settingsSchema = recordType(stringType(), stringType());
-/**
 * AI section in profile manifest
 */
 const aiSectionSchema = objectType({
 	tools: arrayType(stringType()).optional(),
 	skills: arrayType(skillItemSchema).optional(),
 	rules: rulesSchema.optional(),
+	agents: agentsSchema.optional(),
 	memory: memorySectionSchema.optional(),
-	settings: settingsSchema.optional(),
 	commands: arrayType(stringType()).optional()
 }).optional();
 /**
@@ -3874,7 +3874,8 @@ const projectManifestSchema = objectType({
 	profiles: arrayType(profileSourceSchema),
 	extras: extrasSectionSchema,
 	overrides: overridesSectionSchema,
-	variables: recordType(stringType(), stringType()).optional()
+	variables: recordType(stringType(), stringType()).optional(),
+	gitignore: booleanType().optional()
 });
 
 //#endregion
@@ -4088,11 +4089,11 @@ function parseFrontmatter(raw) {
 //#endregion
 //#region ../core/src/adapters/base-adapter.ts
 /**
-* Base adapter with default implementations for the ToolAdapter interface.
+* Base adapter with default implementations for the AIToolAdapter interface.
 *
 * Provides:
-* - isInstalled() via detectInstalledAgents()
-* - getPath() via getAgentPath()
+* - isInstalled() via detectInstalledAITools()
+* - getPath() via getAIToolPath()
 * - getLegacyPaths() returns []
 * - transform*() passthrough (return input unchanged)
 * - transformMemory() converts MEMORY.md to this.memoryFilename
@@ -4101,19 +4102,19 @@ function parseFrontmatter(raw) {
 * Subclasses only need to define `key` and `name`.
 * Override `memoryFilename` for tools that don't use AGENTS.md.
 */
-var BaseAdapter = class {
+var BaseAIToolAdapter = class {
 	/** Memory filename this tool uses. Override for non-AGENTS.md tools. */
 	memoryFilename = "AGENTS.md";
 	async isInstalled() {
 		try {
-			const { detectInstalledAgents } = await import("./agent-detection-l61K-AbU.mjs");
-			return (await detectInstalledAgents()).includes(this.key);
+			const { detectInstalledAITools } = await import("./ai-tool-detection-BFep6YS9.mjs");
+			return (await detectInstalledAITools()).includes(this.key);
 		} catch {
 			return false;
 		}
 	}
 	getPath(type, scope, name) {
-		return getAgentPath(this.key, type, scope, name);
+		return getAIToolPath(this.key, type, scope, name);
 	}
 	getLegacyPaths(_type) {
 		return [];
@@ -4147,8 +4148,7 @@ var BaseAdapter = class {
 	validateCommon(type, file) {
 		const errors = [];
 		if (typeof file !== "object" || file === null) {
-			if (type === "settings") errors.push("Settings must be a valid JSON object");
-			else errors.push(`${type} must be a valid object`);
+			errors.push(`${type} must be a valid object`);
 			return {
 				valid: false,
 				errors
@@ -4176,7 +4176,6 @@ var BaseAdapter = class {
 				if (!record.name) errors.push("Command must have a name");
 				if (!record.content) errors.push("Command must have content");
 				break;
-			case "settings": break;
 		}
 		return {
 			valid: errors.length === 0,
@@ -4191,7 +4190,7 @@ var BaseAdapter = class {
 * Amp adapter — uses canonical formats with AGENTS.md for memory.
 * Project paths: .agents/ | Global paths: ~/.config/agents/
 */
-var AmpAdapter = class extends BaseAdapter {
+var AmpAdapter = class extends BaseAIToolAdapter {
 	key = "amp";
 	name = "Amp";
 };
@@ -4204,7 +4203,7 @@ var AmpAdapter = class extends BaseAdapter {
 * Uses GEMINI.md for memory. Custom validate() adds memory filename check.
 * Paths: .agent/skills/, .agent/rules/, .agent/agents/, .agent/workflows/
 */
-var AntigravityAdapter = class extends BaseAdapter {
+var AntigravityAdapter = class extends BaseAIToolAdapter {
 	key = "antigravity";
 	name = "Antigravity";
 	memoryFilename = "GEMINI.md";
@@ -4224,7 +4223,7 @@ var AntigravityAdapter = class extends BaseAdapter {
 //#endregion
 //#region ../core/src/adapters/claude-code.ts
 /**
-* Claude Code adapter — reference implementation for ToolAdapter interface.
+* Claude Code adapter — reference implementation for AIToolAdapter interface.
 *
 * Uses canonical formats:
 * - Skills: 1:1 copy (SKILL.md with optional scripts/)
@@ -4233,7 +4232,7 @@ var AntigravityAdapter = class extends BaseAdapter {
 * - Memory: CLAUDE.md or .claude/CLAUDE.md
 * - Commands: .claude/commands/{name}.md
 */
-var ClaudeCodeAdapter = class extends BaseAdapter {
+var ClaudeCodeAdapter = class extends BaseAIToolAdapter {
 	key = "claude-code";
 	name = "Claude Code";
 	memoryFilename = "CLAUDE.md";
@@ -4245,7 +4244,7 @@ var ClaudeCodeAdapter = class extends BaseAdapter {
 * Cline adapter — uses canonical formats with AGENTS.md for memory.
 * Project paths: .cline/ | Global paths: ~/.cline/
 */
-var ClineAdapter = class extends BaseAdapter {
+var ClineAdapter = class extends BaseAIToolAdapter {
 	key = "cline";
 	name = "Cline";
 };
@@ -4258,7 +4257,7 @@ var ClineAdapter = class extends BaseAdapter {
 * Uses AGENTS.md for memory. Custom validate() adds memory filename check.
 * Settings use TOML format (config.toml), not JSON.
 */
-var CodexAdapter = class extends BaseAdapter {
+var CodexAdapter = class extends BaseAIToolAdapter {
 	key = "codex";
 	name = "Codex CLI";
 	validate(type, file) {
@@ -4284,7 +4283,7 @@ var CodexAdapter = class extends BaseAdapter {
 * - transformRule(): converts to .mdc with description, globs, alwaysApply
 * - validate(): adds Cursor-specific rules + memory checks
 */
-var CursorAdapter = class extends BaseAdapter {
+var CursorAdapter = class extends BaseAIToolAdapter {
 	key = "cursor";
 	name = "Cursor";
 	getLegacyPaths(type) {
@@ -4349,7 +4348,7 @@ var CursorAdapter = class extends BaseAdapter {
 * GitHub Copilot adapter — uses copilot-instructions.md for memory.
 * Memory path: .github/copilot-instructions.md
 */
-var GitHubCopilotAdapter = class extends BaseAdapter {
+var GitHubCopilotAdapter = class extends BaseAIToolAdapter {
 	key = "github-copilot";
 	name = "GitHub Copilot";
 	memoryFilename = "copilot-instructions.md";
@@ -4361,7 +4360,7 @@ var GitHubCopilotAdapter = class extends BaseAdapter {
 * Junie adapter — uses canonical formats with AGENTS.md for memory.
 * Project paths: .junie/ | Global paths: ~/.junie/
 */
-var JunieAdapter = class extends BaseAdapter {
+var JunieAdapter = class extends BaseAIToolAdapter {
 	key = "junie";
 	name = "Junie";
 };
@@ -4372,7 +4371,7 @@ var JunieAdapter = class extends BaseAdapter {
 * Kiro adapter — uses canonical formats with AGENTS.md for memory.
 * Project paths: .kiro/ | Global paths: ~/.kiro/
 */
-var KiroAdapter = class extends BaseAdapter {
+var KiroAdapter = class extends BaseAIToolAdapter {
 	key = "kiro";
 	name = "Kiro";
 };
@@ -4383,7 +4382,7 @@ var KiroAdapter = class extends BaseAdapter {
 * OpenCode adapter — uses canonical formats with AGENTS.md for memory.
 * Global paths: ~/.config/opencode/ (XDG Base Directory)
 */
-var OpenCodeAdapter = class extends BaseAdapter {
+var OpenCodeAdapter = class extends BaseAIToolAdapter {
 	key = "opencode";
 	name = "OpenCode";
 };
@@ -4394,7 +4393,7 @@ var OpenCodeAdapter = class extends BaseAdapter {
 * Roo adapter — uses canonical formats with AGENTS.md for memory.
 * Project paths: .roo/ | Global paths: ~/.roo/
 */
-var RooAdapter = class extends BaseAdapter {
+var RooAdapter = class extends BaseAIToolAdapter {
 	key = "roo";
 	name = "Roo";
 };
@@ -4405,7 +4404,7 @@ var RooAdapter = class extends BaseAdapter {
 * Trae adapter — uses canonical formats with AGENTS.md for memory.
 * Project paths: .trae/ | Global paths: ~/.trae/
 */
-var TraeAdapter = class extends BaseAdapter {
+var TraeAdapter = class extends BaseAIToolAdapter {
 	key = "trae";
 	name = "Trae";
 };
@@ -4420,7 +4419,7 @@ var TraeAdapter = class extends BaseAdapter {
 * - transformRule(): removes all YAML frontmatter
 * - validate(): adds Windsurf-specific rules + memory checks
 */
-var WindsurfAdapter = class extends BaseAdapter {
+var WindsurfAdapter = class extends BaseAIToolAdapter {
 	key = "windsurf";
 	name = "Windsurf";
 	getLegacyPaths(type) {
@@ -4460,7 +4459,7 @@ var WindsurfAdapter = class extends BaseAdapter {
 * Zed adapter — uses canonical formats with AGENTS.md for memory.
 * Project paths: .zed/ | Global paths: ~/.zed/
 */
-var ZedAdapter = class extends BaseAdapter {
+var ZedAdapter = class extends BaseAIToolAdapter {
 	key = "zed";
 	name = "Zed";
 };
@@ -4471,12 +4470,12 @@ var ZedAdapter = class extends BaseAdapter {
 * Registry of all tool adapters
 * Singleton instances are created lazily on first access
 */
-const adapterInstances = /* @__PURE__ */ new Map();
+const aiToolAdapterInstances = /* @__PURE__ */ new Map();
 /**
 * Initialize all adapters
 */
-function initializeAdapters() {
-	if (adapterInstances.size > 0) return;
+function initializeAIToolAdapters() {
+	if (aiToolAdapterInstances.size > 0) return;
 	const adapters = [
 		new ClaudeCodeAdapter(),
 		new CursorAdapter(),
@@ -4493,35 +4492,35 @@ function initializeAdapters() {
 		new JunieAdapter(),
 		new TraeAdapter()
 	];
-	for (const adapter of adapters) adapterInstances.set(adapter.key, adapter);
+	for (const adapter of adapters) aiToolAdapterInstances.set(adapter.key, adapter);
 }
 /**
 * Get adapter instance by tool key
-* @param agentKey - Tool key (e.g., 'claude-code', 'cursor')
+* @param toolKey - Tool key (e.g., 'claude-code', 'cursor')
 * @returns Adapter instance
-* @throws AdapterNotFoundError if adapter is not registered
+* @throws AIToolAdapterNotFoundError if adapter is not registered
 */
-function getAdapter(agentKey) {
-	initializeAdapters();
-	const adapter = adapterInstances.get(agentKey);
-	if (!adapter) throw new AdapterNotFoundError(`Adapter not found for tool: ${agentKey}. Available adapters: ${Array.from(adapterInstances.keys()).join(", ")}`);
+function getAIToolAdapter(toolKey) {
+	initializeAIToolAdapters();
+	const adapter = aiToolAdapterInstances.get(toolKey);
+	if (!adapter) throw new AIToolAdapterNotFoundError(`Adapter not found for tool: ${toolKey}. Available adapters: ${Array.from(aiToolAdapterInstances.keys()).join(", ")}`);
 	return adapter;
 }
 /**
 * Get all registered adapters
 * @returns Array of all adapter instances
 */
-function getAllAdapters() {
-	initializeAdapters();
-	return Array.from(adapterInstances.values());
+function getAllAIToolAdapters() {
+	initializeAIToolAdapters();
+	return Array.from(aiToolAdapterInstances.values());
 }
 /**
 * Get adapters for the given tool keys
 * @param keys - Array of tool keys
 * @returns Array of adapter instances
 */
-function getAdaptersForKeys(keys) {
-	return keys.map((key) => getAdapter(key));
+function getAIToolAdaptersForKeys(keys) {
+	return keys.map((key) => getAIToolAdapter(key));
 }
 
 //#endregion
@@ -4665,56 +4664,29 @@ function getRegisteredIdePlatforms() {
 //#endregion
 //#region ../core/src/utils/gitignore.ts
 /**
-* Collect gitignore patterns from the profile's declared tool support.
-*
-* Unlike collectSyncedPatterns (which uses the developer's intersection),
-* this function generates patterns for ALL tools the profile supports.
-* This ensures consistent .gitignore across all team members regardless
-* of which tools each developer has installed.
+* Extract directory from a dynamic path and add it as a pattern.
+* For static paths (no `_probe` placeholder resolved), adds the file itself.
 *
-* Returns deduplicated, sorted patterns including baton.lock.
-*/
-function collectProfileSupportPatterns(options) {
-	const patterns = /* @__PURE__ */ new Set();
-	const { profileAiTools, profileIdePlatforms, fileTargets, hasContent } = options;
-	if (profileAiTools.length > 0 && hasContent) {
-		const adapters = getAdaptersForKeys(profileAiTools);
-		for (const adapter of adapters) {
-			addDirPattern(patterns, adapter.getPath("commands", "project", "_probe"));
-			addDirPattern(patterns, adapter.getPath("skills", "project", "_probe"));
-			addPathPattern(patterns, adapter.getPath("rules", "project", "_probe"));
-			addPathPattern(patterns, adapter.getPath("memory", "project", "_probe"));
-			addDirPattern(patterns, adapter.getPath("agents", "project", "_probe"));
-			for (const legacyPath of adapter.getLegacyPaths("rules")) patterns.add(legacyPath);
-		}
-	}
-	for (const ideKey of profileIdePlatforms) {
-		const targetDir = getIdePlatformTargetDir(ideKey);
-		if (targetDir) {
-			const dir = targetDir.endsWith("/") ? targetDir : `${targetDir}/`;
-			patterns.add(dir);
-		}
-	}
-	for (const target of fileTargets) patterns.add(target);
-	patterns.add("baton.lock");
-	return [...patterns].sort();
-}
-/**
-* Extract directory from a path and add it as a pattern.
-* E.g. ".claude/commands/_probe.md" -> ".claude/commands/"
+* E.g. ".claude/commands/_probe.md" -> ".claude/commands/"  (dynamic)
+* E.g. ".github/copilot-instructions.md" -> ".github/copilot-instructions.md"  (static)
 */
 function addDirPattern(patterns, path) {
 	const lastSlash = path.lastIndexOf("/");
-	if (lastSlash > 0) patterns.add(path.substring(0, lastSlash + 1));
+	if (lastSlash > 0) if (path.includes("_probe")) patterns.add(path.substring(0, lastSlash + 1));
+	else patterns.add(path);
 }
 /**
-* Add a path pattern — directory if it contains slashes, root file otherwise.
-* E.g. ".claude/rules/_probe.md" -> ".claude/rules/"
-* E.g. "CLAUDE.md" -> "CLAUDE.md"
+* Add a path pattern. Dynamic paths (containing `_probe`) are reduced to their
+* directory; static paths and root-level files are added as-is.
+*
+* E.g. ".claude/rules/_probe.md" -> ".claude/rules/"  (dynamic)
+* E.g. ".github/copilot-instructions.md" -> ".github/copilot-instructions.md"  (static)
+* E.g. "CLAUDE.md" -> "CLAUDE.md"  (root file)
 */
 function addPathPattern(patterns, path) {
 	const lastSlash = path.lastIndexOf("/");
-	if (lastSlash > 0) patterns.add(path.substring(0, lastSlash + 1));
+	if (lastSlash > 0) if (path.includes("_probe")) patterns.add(path.substring(0, lastSlash + 1));
+	else patterns.add(path);
 	else if (path) patterns.add(path);
 }
 /**
@@ -4758,6 +4730,62 @@ async function updateGitignore(projectRoot, patterns) {
 	await writeFile(gitignorePath, newContent, "utf-8");
 	return true;
 }
+/**
+* Remove the "# Baton managed ... # End Baton managed" section from .gitignore.
+*
+* Used when the project has `gitignore: false` to clean up any previously
+* written managed section.
+*
+* @returns true if a section was removed, false if none existed
+*/
+async function removeGitignoreManagedSection(projectRoot) {
+	const gitignorePath = join(projectRoot, ".gitignore");
+	let content = "";
+	try {
+		content = await readFile(gitignorePath, "utf-8");
+	} catch {
+		return false;
+	}
+	const startIdx = content.indexOf(BATON_SECTION_START);
+	const endIdx = content.indexOf(BATON_SECTION_END);
+	if (startIdx === -1 || endIdx === -1) return false;
+	const newContent = (content.substring(0, startIdx).replace(/\n+$/, "\n") + content.substring(endIdx + 19).replace(/^\n+/, "\n")).trim();
+	await writeFile(gitignorePath, newContent ? `${newContent}\n` : "", "utf-8");
+	return true;
+}
+/**
+* Collect comprehensive gitignore patterns for ALL known AI tools and IDE platforms.
+*
+* Generates patterns for the entire tool and IDE registry, ensuring stable,
+* predictable .gitignore content regardless of which tools a profile supports
+* or a developer has installed.
+*
+* Returns deduplicated, sorted patterns including baton.lock.
+*/
+function collectComprehensivePatterns(options) {
+	const patterns = /* @__PURE__ */ new Set();
+	const { fileTargets } = options;
+	const allAdapters = getAllAIToolAdapters();
+	for (const adapter of allAdapters) {
+		addDirPattern(patterns, adapter.getPath("commands", "project", "_probe"));
+		addDirPattern(patterns, adapter.getPath("skills", "project", "_probe"));
+		addPathPattern(patterns, adapter.getPath("rules", "project", "_probe"));
+		addPathPattern(patterns, adapter.getPath("memory", "project", "_probe"));
+		addDirPattern(patterns, adapter.getPath("agents", "project", "_probe"));
+		for (const legacyPath of adapter.getLegacyPaths("rules")) patterns.add(legacyPath);
+	}
+	const allIdePlatforms = getRegisteredIdePlatforms();
+	for (const ideKey of allIdePlatforms) {
+		const targetDir = getIdePlatformTargetDir(ideKey);
+		if (targetDir) {
+			const dir = targetDir.endsWith("/") ? targetDir : `${targetDir}/`;
+			patterns.add(dir);
+		}
+	}
+	for (const target of fileTargets) patterns.add(target);
+	patterns.add("baton.lock");
+	return [...patterns].sort();
+}
 
 //#endregion
 //#region ../core/src/sources/git-clone.ts
@@ -6542,10 +6570,10 @@ async function discoverProfilesInSourceRepo(sourceRoot) {
 */
 const canonicalFiles = /* @__PURE__ */ new Map();
 /**
-* Place a file for a specific agent adapter
+* Place a file for a specific AI tool adapter
 *
 * @param content - File content to write
-* @param adapter - Agent adapter
+* @param adapter - AI tool adapter
 * @param type - Config type
 * @param scope - Scope (project or global)
 * @param name - File/directory name
@@ -6638,13 +6666,12 @@ async function readFileIfExists(path) {
 */
 async function detectLegacyPaths(projectRoot) {
 	const legacyFiles = [];
-	const adapters = getAllAdapters();
+	const adapters = getAllAIToolAdapters();
 	for (const adapter of adapters) for (const configType of [
 		"skills",
 		"rules",
 		"agents",
 		"memory",
-		"settings",
 		"commands"
 	]) {
 		const legacyPaths = adapter.getLegacyPaths(configType);
@@ -6658,7 +6685,7 @@ async function detectLegacyPaths(projectRoot) {
 					legacyPath: absoluteLegacyPath,
 					newPath: resolve(projectRoot, newPath),
 					configType,
-					agentKey: adapter.key
+					toolKey: adapter.key
 				});
 			} catch {}
 		}
@@ -7007,6 +7034,79 @@ function mergeRulesWithWarnings(profiles) {
 	};
 }
 
+//#endregion
+//#region ../core/src/merge/agents.ts
+/**
+* Merge agents with detailed conflict warnings.
+*
+* @param profiles - Array of resolved profiles in merge order (base first, overrides last)
+* @returns Agents and any same-weight conflict warnings
+*/
+function mergeAgentsWithWarnings(profiles) {
+	const agentMap = /* @__PURE__ */ new Map();
+	const lockedKeys = /* @__PURE__ */ new Set();
+	const warnings = [];
+	const keyOwner = /* @__PURE__ */ new Map();
+	for (const profile of profiles) {
+		const agents = profile.manifest.ai?.agents;
+		if (!agents) continue;
+		const weight = getProfileWeight(profile);
+		const locked = isLockedProfile(profile);
+		if (Array.isArray(agents)) for (const agentName of agents) {
+			const key = `universal:${agentName}`;
+			if (lockedKeys.has(key)) continue;
+			const existing = keyOwner.get(key);
+			if (existing && existing.weight === weight && existing.profileName !== profile.name) warnings.push({
+				key: agentName,
+				category: "agent",
+				profileA: existing.profileName,
+				profileB: profile.name,
+				weight
+			});
+			agentMap.set(key, {
+				name: agentName,
+				agents: [],
+				profileName: profile.name
+			});
+			keyOwner.set(key, {
+				profileName: profile.name,
+				weight
+			});
+			if (locked) lockedKeys.add(key);
+		}
+		else for (const [agentKey, agentNames] of Object.entries(agents)) {
+			if (!agentNames) continue;
+			for (const agentName of agentNames) {
+				const isUniversal = agentKey === "universal";
+				const key = `${agentKey}:${agentName}`;
+				if (lockedKeys.has(key)) continue;
+				const existing = keyOwner.get(key);
+				if (existing && existing.weight === weight && existing.profileName !== profile.name) warnings.push({
+					key: `${agentKey}:${agentName}`,
+					category: "agent",
+					profileA: existing.profileName,
+					profileB: profile.name,
+					weight
+				});
+				agentMap.set(key, {
+					name: agentName,
+					agents: isUniversal ? [] : [agentKey],
+					profileName: profile.name
+				});
+				keyOwner.set(key, {
+					profileName: profile.name,
+					weight
+				});
+				if (locked) lockedKeys.add(key);
+			}
+		}
+	}
+	return {
+		agents: Array.from(agentMap.values()),
+		warnings
+	};
+}
+
 //#endregion
 //#region ../core/src/merge/memory.ts
 /**
@@ -14321,12 +14421,23 @@ const globalConfigSchema = objectType({
 //#endregion
 //#region ../core/src/config/global-config.ts
 /**
+* Returns the Baton home directory path.
+*
+* Respects the `BATON_HOME` environment variable for testing and custom locations.
+* Falls back to `~/.baton` when not set.
+*
+* @returns Absolute path to the Baton home directory
+*/
+function getBatonHome() {
+	return process.env.BATON_HOME ?? join(homedir(), ".baton");
+}
+/**
 * Returns the path to the global Baton configuration file.
 *
-* @returns Absolute path to ~/.baton/config.yaml
+* @returns Absolute path to ~/.baton/config.yaml (or $BATON_HOME/config.yaml)
 */
 function getGlobalConfigPath() {
-	return join(homedir(), ".baton", "config.yaml");
+	return join(getBatonHome(), "config.yaml");
 }
 /**
 * Loads the global Baton configuration from ~/.baton/config.yaml
@@ -14359,7 +14470,7 @@ async function loadGlobalConfig() {
 async function saveGlobalConfig(config) {
 	const validated = globalConfigSchema.parse(config);
 	const configPath = getGlobalConfigPath();
-	await mkdir(join(homedir(), ".baton"), { recursive: true });
+	await mkdir(getBatonHome(), { recursive: true });
 	await writeFile(configPath, (0, import_dist.stringify)(validated), "utf-8");
 }
 /**
@@ -14681,5 +14792,5 @@ async function resolvePreferences(projectRoot) {
 }
 
 //#endregion
-export { SourceParseError as $, discoverProfilesInSourceRepo as A, getIdePlatformTargetDir as B, isLockedProfile as C, resolveProfileChain as D, resolveProfileSupport as E, writeLock as F, getAllAdapters as G, idePlatformRegistry as H, resolveVersion as I, loadLockfile as J, parseFrontmatter as K, cloneGitSource as L, removePlacedFiles as M, generateLock as N, detectLegacyPaths as O, readLock as P, FileNotFoundError as Q, collectProfileSupportPatterns as R, getProfileWeight as S, mergeContentParts as T, isKnownIdePlatform as U, getRegisteredIdePlatforms as V, getAdaptersForKeys as W, loadProjectManifest as X, loadProfileManifest as Y, KEBAB_CASE_REGEX as Z, mergeMemoryWithWarnings as _, clearIdeCache as a, mergeSkills as b, getDefaultGlobalSource as c, getGlobalSources as d, getAgentConfig as et, removeGlobalSource as f, mergeMemory as g, require_lib as h, computeIntersection as i, findSourceManifest as j, placeFile as k, getGlobalAiTools as l, setGlobalIdePlatforms as m, readProjectPreferences as n, getAllAgentKeys as nt, detectInstalledIdes as o, setGlobalAiTools as p, parseSource as q, writeProjectPreferences as r, addGlobalSource as s, resolvePreferences as t, getAgentPath as tt, getGlobalIdePlatforms as u, mergeRules as v, sortProfilesByWeight as w, mergeSkillsWithWarnings as x, mergeRulesWithWarnings as y, updateGitignore as z };
-//# sourceMappingURL=src-C3-Vz-R7.mjs.map
+export { loadLockfile as $, resolveProfileChain as A, cloneGitSource as B, mergeSkills as C, sortProfilesByWeight as D, isLockedProfile as E, removePlacedFiles as F, getIdePlatformTargetDir as G, ensureBatonDirGitignored as H, generateLock as I, isKnownIdePlatform as J, getRegisteredIdePlatforms as K, readLock as L, placeFile as M, discoverProfilesInSourceRepo as N, mergeContentParts as O, findSourceManifest as P, parseSource as Q, writeLock as R, mergeRulesWithWarnings as S, getProfileWeight as T, removeGitignoreManagedSection as U, collectComprehensivePatterns as V, updateGitignore as W, getAllAIToolAdapters as X, getAIToolAdaptersForKeys as Y, parseFrontmatter as Z, require_lib as _, clearIdeCache as a, getAIToolConfig as at, mergeAgentsWithWarnings as b, getBatonHome as c, getGlobalConfigPath as d, loadProfileManifest as et, getGlobalIdePlatforms as f, setGlobalIdePlatforms as g, setGlobalAiTools as h, computeIntersection as i, SourceParseError as it, detectLegacyPaths as j, resolveProfileSupport as k, getDefaultGlobalSource as l, removeGlobalSource as m, readProjectPreferences as n, KEBAB_CASE_REGEX as nt, detectInstalledIdes as o, getAIToolPath as ot, getGlobalSources as p, idePlatformRegistry as q, writeProjectPreferences as r, FileNotFoundError as rt, addGlobalSource as s, getAllAIToolKeys as st, resolvePreferences as t, loadProjectManifest as tt, getGlobalAiTools as u, mergeMemory as v, mergeSkillsWithWarnings as w, mergeRules as x, mergeMemoryWithWarnings as y, resolveVersion as z };
+//# sourceMappingURL=src-D41VR6ro.mjs.map