@baton-dx/cli 0.3.1 → 0.4.0

package/dist/index.mjs

@@ -1,13 +1,12 @@
 #!/usr/bin/env node
 import { r as __toESM } from "./chunk-BbwQpWto.mjs";
 import { a as Ne, c as Ve, d as bt, f as je, g as runMain, h as defineCommand, i as Le, l as We, m as require_dist, o as R, p as Ct, r as Je, s as Re, t as findSourceRoot, u as Ze } from "./context-detection-DqOTnD6_.mjs";
-import { $ as SourceParseError, A as discoverProfilesInSourceRepo, B as getIdePlatformTargetDir, C as isLockedProfile, D as resolveProfileChain, E as resolveProfileSupport, F as writeLock, G as getAllAdapters, H as idePlatformRegistry, I as resolveVersion, J as loadLockfile, K as parseFrontmatter, L as cloneGitSource, M as removePlacedFiles, N as generateLock, O as detectLegacyPaths, P as readLock, Q as FileNotFoundError, R as collectProfileSupportPatterns, S as getProfileWeight, T as mergeContentParts, U as isKnownIdePlatform, V as getRegisteredIdePlatforms, W as getAdaptersForKeys, X as loadProjectManifest, Y as loadProfileManifest, Z as KEBAB_CASE_REGEX, _ as mergeMemoryWithWarnings, a as clearIdeCache, b as mergeSkills, c as getDefaultGlobalSource, d as getGlobalSources, et as getAgentConfig, f as removeGlobalSource, g as mergeMemory, h as require_lib, i as computeIntersection, j as findSourceManifest, k as placeFile, l as getGlobalAiTools, m as setGlobalIdePlatforms, n as readProjectPreferences, nt as getAllAgentKeys, o as detectInstalledIdes, p as setGlobalAiTools, q as parseSource, r as writeProjectPreferences, s as addGlobalSource, t as resolvePreferences, tt as getAgentPath, u as getGlobalIdePlatforms, v as mergeRules, w as sortProfilesByWeight, x as mergeSkillsWithWarnings, y as mergeRulesWithWarnings, z as updateGitignore } from "./src-C3-Vz-R7.mjs";
-import { n as detectInstalledAgents, t as clearAgentCache } from "./agent-detection-DTiVeO5W.mjs";
+import { $ as loadLockfile, A as resolveProfileChain, B as cloneGitSource, C as mergeSkills, D as sortProfilesByWeight, E as isLockedProfile, F as removePlacedFiles, G as getIdePlatformTargetDir, H as ensureBatonDirGitignored, I as generateLock, J as isKnownIdePlatform, K as getRegisteredIdePlatforms, L as readLock, M as placeFile, N as discoverProfilesInSourceRepo, O as mergeContentParts, P as findSourceManifest, Q as parseSource, R as writeLock, S as mergeRulesWithWarnings, T as getProfileWeight, U as removeGitignoreManagedSection, V as collectComprehensivePatterns, W as updateGitignore, X as getAllAIToolAdapters, Y as getAIToolAdaptersForKeys, Z as parseFrontmatter, _ as require_lib, a as clearIdeCache, at as getAIToolConfig, b as mergeAgentsWithWarnings, c as getBatonHome, d as getGlobalConfigPath, et as loadProfileManifest, f as getGlobalIdePlatforms, g as setGlobalIdePlatforms, h as setGlobalAiTools, i as computeIntersection, it as SourceParseError, j as detectLegacyPaths, k as resolveProfileSupport, l as getDefaultGlobalSource, m as removeGlobalSource, n as readProjectPreferences, nt as KEBAB_CASE_REGEX, o as detectInstalledIdes, ot as getAIToolPath, p as getGlobalSources, q as idePlatformRegistry, r as writeProjectPreferences, rt as FileNotFoundError, s as addGlobalSource, st as getAllAIToolKeys, t as resolvePreferences, tt as loadProjectManifest, u as getGlobalAiTools, v as mergeMemory, w as mergeSkillsWithWarnings, x as mergeRules, y as mergeMemoryWithWarnings, z as resolveVersion } from "./src-D41VR6ro.mjs";
+import { n as detectInstalledAITools, t as clearAIToolCache } from "./ai-tool-detection-CMsBNa9e.mjs";
 import { d as esm_default } from "./esm-BagM-kVd.mjs";
 import { access, mkdir, readFile, readdir, rm, stat, writeFile } from "node:fs/promises";
 import { dirname, isAbsolute, join, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
-import { homedir } from "node:os";
 
 //#region src/commands/ai-tools/configure.ts
 const aiToolsConfigureCommand = defineCommand({
@@ -40,7 +39,7 @@ async function runGlobalMode$1(nonInteractive) {
 		Le("No changes made.");
 		return;
 	}
-	const options = getAllAdapters().map((adapter) => {
+	const options = getAllAIToolAdapters().map((adapter) => {
 		const isSaved = currentTools.includes(adapter.key);
 		return {
 			value: adapter.key,
@@ -126,7 +125,7 @@ async function runProjectMode$1(nonInteractive) {
 		Le("Configuration complete.");
 		return;
 	}
-	const allAdapters = getAllAdapters();
+	const allAdapters = getAllAIToolAdapters();
 	const currentProjectTools = existing?.ai.useGlobal === false ? existing.ai.tools : globalTools;
 	const options = allAdapters.map((adapter) => {
 		const isGlobal = globalTools.includes(adapter.key);
@@ -182,37 +181,37 @@ const aiToolsListCommand = defineCommand({
 	async run({ args }) {
 		if (!args.json) We("Baton - AI Tools");
 		const savedTools = await getGlobalAiTools();
-		const allAgentKeys = getAllAgentKeys();
-		const keysToShow = args.all ? allAgentKeys : savedTools.length > 0 ? savedTools : allAgentKeys;
-		const agentStatuses = await Promise.all(keysToShow.map(async (agentKey) => {
-			const isSaved = savedTools.includes(agentKey);
+		const allAIToolKeys = getAllAIToolKeys();
+		const keysToShow = args.all ? allAIToolKeys : savedTools.length > 0 ? savedTools : allAIToolKeys;
+		const toolStatuses = await Promise.all(keysToShow.map(async (toolKey) => {
+			const isSaved = savedTools.includes(toolKey);
 			let skillCount = 0;
 			let ruleCount = 0;
-			let agentCount = 0;
+			let aiToolConfigCount = 0;
 			let memoryCount = 0;
 			let commandCount = 0;
 			if (isSaved) {
-				skillCount = await countConfigs(agentKey, "skills", "project");
-				ruleCount = await countConfigs(agentKey, "rules", "project");
-				agentCount = await countConfigs(agentKey, "agents", "project");
-				memoryCount = await countConfigs(agentKey, "memory", "project");
-				commandCount = await countConfigs(agentKey, "commands", "project");
+				skillCount = await countConfigs(toolKey, "skills", "project");
+				ruleCount = await countConfigs(toolKey, "rules", "project");
+				aiToolConfigCount = await countConfigs(toolKey, "agents", "project");
+				memoryCount = await countConfigs(toolKey, "memory", "project");
+				commandCount = await countConfigs(toolKey, "commands", "project");
 			}
 			const paths = {
-				skills: getAgentPath(agentKey, "skills", "project", ""),
-				rules: getAgentPath(agentKey, "rules", "project", ""),
-				agents: getAgentPath(agentKey, "agents", "project", ""),
-				memory: getAgentPath(agentKey, "memory", "project", ""),
-				commands: getAgentPath(agentKey, "commands", "project", "")
+				skills: getAIToolPath(toolKey, "skills", "project", ""),
+				rules: getAIToolPath(toolKey, "rules", "project", ""),
+				agents: getAIToolPath(toolKey, "agents", "project", ""),
+				memory: getAIToolPath(toolKey, "memory", "project", ""),
+				commands: getAIToolPath(toolKey, "commands", "project", "")
 			};
 			return {
-				key: agentKey,
-				name: getAgentConfig(agentKey).name,
+				key: toolKey,
+				name: getAIToolConfig(toolKey).name,
 				saved: isSaved,
 				counts: {
 					skills: skillCount,
 					rules: ruleCount,
-					agents: agentCount,
+					agents: aiToolConfigCount,
 					memory: memoryCount,
 					commands: commandCount
 				},
@@ -220,23 +219,23 @@ const aiToolsListCommand = defineCommand({
 			};
 		}));
 		if (args.json) {
-			console.log(JSON.stringify(agentStatuses, null, 2));
+			console.log(JSON.stringify(toolStatuses, null, 2));
 			return;
 		}
 		if (savedTools.length === 0) {
 			R.warn("No AI tools saved in global config.");
 			R.info("Run 'baton ai-tools scan' to detect and save your AI tools.");
 			console.log("");
-			R.info(`All ${allAgentKeys.length} supported tools:`);
-			for (const key of allAgentKeys) {
-				const config = getAgentConfig(key);
+			R.info(`All ${allAIToolKeys.length} supported tools:`);
+			for (const key of allAIToolKeys) {
+				const config = getAIToolConfig(key);
 				console.log(`  \x1b[90m- ${config.name}\x1b[0m`);
 			}
 			Le("Run 'baton ai-tools scan' to get started.");
 			return;
 		}
 		console.log(`\nSaved AI tools (${savedTools.length}):\n`);
-		for (const agent of agentStatuses) {
+		for (const agent of toolStatuses) {
 			const statusColor = agent.saved ? "\x1B[32m" : "\x1B[90m";
 			const status = agent.saved ? "✓" : "✗";
 			console.log(`${statusColor}${status} ${agent.name.padEnd(20)}`);
@@ -257,11 +256,11 @@ const aiToolsListCommand = defineCommand({
 	}
 });
 /**
-* Count config files of a given type for an agent
+* Count config files of a given type for a tool
 */
-async function countConfigs(agentKey, configType, scope) {
+async function countConfigs(toolKey, configType, scope) {
 	try {
-		const dirPath = getAgentPath(agentKey, configType, scope, "").replace(/{name}.*$/, "").replace(/\/$/, "");
+		const dirPath = getAIToolPath(toolKey, configType, scope, "").replace(/{name}.*$/, "").replace(/\/$/, "");
 		if (!(await stat(dirPath)).isDirectory()) return 0;
 		return (await readdir(dirPath)).length;
 	} catch (_error) {
@@ -285,15 +284,15 @@ const aiToolsScanCommand = defineCommand({
 		We("Baton - AI Tool Scanner");
 		const spinner = bt();
 		spinner.start("Scanning for AI tools...");
-		clearAgentCache();
-		const detectedAgents = await detectInstalledAgents();
-		const allAdapters = getAllAdapters();
+		clearAIToolCache();
+		const detectedAITools = await detectInstalledAITools();
+		const allAdapters = getAllAIToolAdapters();
 		const currentTools = await getGlobalAiTools();
 		spinner.stop("Scan complete.");
-		if (detectedAgents.length > 0) R.success(`Found ${detectedAgents.length} AI tool${detectedAgents.length !== 1 ? "s" : ""} on your system.`);
+		if (detectedAITools.length > 0) R.success(`Found ${detectedAITools.length} AI tool${detectedAITools.length !== 1 ? "s" : ""} on your system.`);
 		else R.warn("No AI tools detected on your system.");
 		if (args.yes) {
-			const detectedKeys = detectedAgents;
+			const detectedKeys = detectedAITools;
 			if (detectedKeys.length !== currentTools.length || detectedKeys.some((key) => !currentTools.includes(key))) {
 				await setGlobalAiTools(detectedKeys);
 				R.success(`Saved ${detectedKeys.length} detected tool(s) to global config.`);
@@ -302,7 +301,7 @@ const aiToolsScanCommand = defineCommand({
 			return;
 		}
 		const options = allAdapters.map((adapter) => {
-			const isDetected = detectedAgents.includes(adapter.key);
+			const isDetected = detectedAITools.includes(adapter.key);
 			return {
 				value: adapter.key,
 				label: isDetected ? `${adapter.name} (detected)` : adapter.name
@@ -311,7 +310,7 @@ const aiToolsScanCommand = defineCommand({
 		const selected = await je({
 			message: "Select which AI tools to save:",
 			options,
-			initialValues: detectedAgents
+			initialValues: detectedAITools
 		});
 		if (Ct(selected)) {
 			Le("Scan finished (not saved).");
@@ -421,7 +420,6 @@ function formatIntersectionSummary(intersection) {
 
 //#endregion
 //#region src/commands/config.ts
-const CONFIG_FILE = join(homedir(), ".baton", "config.yaml");
 const VALID_KEYS = [
 	"cache-dir",
 	"default-scope",
@@ -429,16 +427,18 @@ const VALID_KEYS = [
 	"default-tools"
 ];
 async function loadConfig() {
+	const configFile = getGlobalConfigPath();
 	try {
-		await access(CONFIG_FILE);
+		await access(configFile);
 	} catch {
 		return {};
 	}
-	return (0, import_dist.parse)(await readFile(CONFIG_FILE, "utf-8"));
+	return (0, import_dist.parse)(await readFile(configFile, "utf-8"));
 }
 async function saveConfig(config) {
-	await mkdir(dirname(CONFIG_FILE), { recursive: true });
-	await writeFile(CONFIG_FILE, (0, import_dist.stringify)(config), "utf-8");
+	const configFile = getGlobalConfigPath();
+	await mkdir(getBatonHome(), { recursive: true });
+	await writeFile(configFile, (0, import_dist.stringify)(config), "utf-8");
 }
 async function showDashboard() {
 	We("Baton Dashboard");
@@ -467,7 +467,7 @@ async function showDashboard() {
 			if (resolvedAiTools.length > 0) {
 				const toolNames = resolvedAiTools.map((key) => {
 					try {
-						return getAgentConfig(key).name;
+						return getAIToolConfig(key).name;
 					} catch {
 						return key;
 					}
@@ -485,7 +485,7 @@ async function showDashboard() {
 		if (aiTools.length > 0) {
 			const toolNames = aiTools.map((key) => {
 				try {
-					return getAgentConfig(key).name;
+					return getAIToolConfig(key).name;
 				} catch {
 					return key;
 				}
@@ -727,7 +727,7 @@ const diffCommand = defineCommand({
 			spinner.stop("Configurations merged");
 			spinner.start("Computing tool intersection...");
 			const globalAiTools = await getGlobalAiTools();
-			const detectedAgents = await detectInstalledAgents();
+			const detectedAITools = await detectInstalledAITools();
 			let syncedAiTools;
 			if (globalAiTools.length > 0) {
 				const developerTools = {
@@ -740,13 +740,13 @@ const diffCommand = defineCommand({
 					if (intersection) for (const tool of intersection.aiTools.synced) aggregatedSyncedAi.add(tool);
 				} catch {}
 				syncedAiTools = aggregatedSyncedAi.size > 0 ? [...aggregatedSyncedAi] : [];
-			} else syncedAiTools = detectedAgents;
+			} else syncedAiTools = detectedAITools;
 			if (syncedAiTools.length === 0) {
 				spinner.stop("No AI tools in intersection");
 				Ne("No AI tools match. Run `baton ai-tools scan`.");
 				process.exit(1);
 			}
-			const adapters = getAdaptersForKeys(syncedAiTools);
+			const adapters = getAIToolAdaptersForKeys(syncedAiTools);
 			spinner.stop(`Comparing for: ${syncedAiTools.join(", ")}`);
 			spinner.start("Comparing remote sources with placed files...");
 			const diffs = [];
@@ -1339,7 +1339,7 @@ async function promptFirstRunPreferences(projectRoot, nonInteractive) {
 	let aiTools = [];
 	if (aiMode === "customize") {
 		const globalTools = await getGlobalAiTools();
-		const allAdapters = getAllAdapters();
+		const allAdapters = getAllAIToolAdapters();
 		const selected = await je({
 			message: "Select AI tools for this project:",
 			options: allAdapters.map((adapter) => ({
@@ -1650,7 +1650,22 @@ const initCommand = defineCommand({
 			}
 		}
 		await showProfileIntersections(profileSources);
-		const yamlContent = (0, import_dist.stringify)({ profiles: profileSources.map((source) => ({ source })) });
+		let gitignoreSetting = true;
+		if (isInteractive) {
+			const shouldGitignore = await Re({
+				message: "Add synced AI tool and IDE config files to .gitignore?",
+				initialValue: true
+			});
+			if (Ct(shouldGitignore)) {
+				Ne("Setup cancelled.");
+				process.exit(0);
+			}
+			gitignoreSetting = shouldGitignore;
+		}
+		const yamlContent = (0, import_dist.stringify)({
+			profiles: profileSources.map((source) => ({ source })),
+			gitignore: gitignoreSetting
+		});
 		spinner.start("Creating baton.yaml...");
 		await writeFile(join(cwd, "baton.yaml"), yamlContent, "utf-8");
 		spinner.stop("✅ Created baton.yaml");
@@ -1660,10 +1675,11 @@ const initCommand = defineCommand({
 		try {
 			gitignoreContent = await readFile(gitignorePath, "utf-8");
 		} catch (_error) {}
-		if (!gitignoreContent.includes(".baton/")) {
-			await writeFile(gitignorePath, gitignoreContent ? `${gitignoreContent}\n\n# Baton cache\n.baton/\n` : "# Baton cache\n.baton/\n", "utf-8");
-			spinner.stop("✅ Added .baton/ to .gitignore");
-		} else spinner.stop("✅ .gitignore already contains .baton/");
+		if (!gitignoreContent.includes(".baton/")) await writeFile(gitignorePath, gitignoreContent ? `${gitignoreContent}\n\n# Baton cache\n.baton/\n` : "# Baton cache\n.baton/\n", "utf-8");
+		if (gitignoreSetting) {
+			await updateGitignore(cwd, collectComprehensivePatterns({ fileTargets: [] }));
+			spinner.stop("✅ Updated .gitignore with managed file patterns");
+		} else spinner.stop("✅ Added .baton/ to .gitignore");
 		spinner.start("Creating .baton directory...");
 		try {
 			await mkdir(join(cwd, ".baton"), { recursive: true });
@@ -1695,8 +1711,8 @@ async function autoScanAiTools(spinner, isInteractive) {
 		return;
 	}
 	spinner.start("Scanning for installed AI tools...");
-	clearAgentCache();
-	const detectedTools = await detectInstalledAgents();
+	clearAIToolCache();
+	const detectedTools = await detectInstalledAITools();
 	spinner.stop(detectedTools.length > 0 ? `Found ${detectedTools.length} AI tool${detectedTools.length !== 1 ? "s" : ""}: ${detectedTools.join(", ")}` : "No AI tools detected.");
 	if (detectedTools.length === 0) {
 		R.warn("No AI tools detected. You can run 'baton ai-tools scan' later.");
@@ -2038,7 +2054,7 @@ async function handleConfigureAiTools(cwd) {
 		R.success("Project configured to use global AI tools.");
 		return;
 	}
-	const allAdapters = getAllAdapters();
+	const allAdapters = getAllAIToolAdapters();
 	const currentProjectTools = existing?.ai.useGlobal === false ? existing.ai.tools : globalTools;
 	const options = allAdapters.map((adapter) => ({
 		value: adapter.key,
@@ -2132,6 +2148,31 @@ async function handleConfigureIdes(cwd) {
 	});
 	R.success(`Project configured with ${selectedKeys.length} IDE platform(s).`);
 }
+async function handleConfigureGitignore(cwd) {
+	const manifestPath = join(cwd, "baton.yaml");
+	const manifest = await loadProjectManifestSafe(cwd);
+	if (!manifest) {
+		R.error("Could not load baton.yaml");
+		return;
+	}
+	const currentSetting = manifest.gitignore !== false;
+	R.info(currentSetting ? "Currently: synced files ARE gitignored" : "Currently: synced files are NOT gitignored (committed to repo)");
+	const newSetting = await Re({
+		message: "Add synced AI tool and IDE config files to .gitignore?",
+		initialValue: currentSetting
+	});
+	if (Ct(newSetting)) {
+		R.warn("Cancelled.");
+		return;
+	}
+	if (newSetting === currentSetting) {
+		R.info("No change.");
+		return;
+	}
+	manifest.gitignore = newSetting;
+	await writeFile(manifestPath, (0, import_dist.stringify)(manifest), "utf-8");
+	R.success(newSetting ? "Enabled .gitignore management. Run 'baton sync' to update." : "Disabled .gitignore management. Run 'baton sync' to clean up.");
+}
 const manageCommand = defineCommand({
 	meta: {
 		name: "manage",
@@ -2174,6 +2215,11 @@ const manageCommand = defineCommand({
 						label: "Configure IDEs for this project",
 						hint: "Choose which IDEs to sync"
 					},
+					{
+						value: "configure-gitignore",
+						label: "Configure .gitignore",
+						hint: "Choose whether synced files are gitignored"
+					},
 					{
 						value: "remove-baton",
 						label: "Remove Baton",
@@ -2209,6 +2255,10 @@ const manageCommand = defineCommand({
 				console.log("");
 				await handleConfigureIdes(cwd);
 				console.log("");
+			} else if (action === "configure-gitignore") {
+				console.log("");
+				await handleConfigureGitignore(cwd);
+				console.log("");
 			} else if (action === "remove-baton") {
 				console.log("");
 				if (await handleRemoveBaton(cwd)) {
@@ -2229,8 +2279,8 @@ const profileCommand = defineCommand({
 		description: "Manage profiles (create, list, remove)"
 	},
 	subCommands: {
-		create: () => import("./create-BOcW-DBk.mjs").then((m) => m.createCommand),
-		list: () => import("./list-DmzVXCNF.mjs").then((m) => m.profileListCommand),
+		create: () => import("./create-SYKl8g0B.mjs").then((m) => m.createCommand),
+		list: () => import("./list-UzuMEqbc.mjs").then((m) => m.profileListCommand),
 		remove: () => import("./remove-BBs6Mv8t.mjs").then((m) => m.profileRemoveCommand)
 	}
 });
@@ -2688,35 +2738,25 @@ async function copyDirectoryRecursive(sourceDir, targetDir) {
 	return placed;
 }
 /**
-* Collect profile-support-based .gitignore patterns and update .gitignore.
-* Uses ALL tools the profile supports (not just the developer's intersection)
-* to ensure consistent .gitignore across all team members.
+* Handle .gitignore update based on the project manifest's gitignore setting.
+*
+* When gitignore is enabled (default): writes comprehensive patterns for ALL
+* known AI tools and IDE platforms to ensure stable, dev-independent content.
+* When disabled: removes any existing managed section.
+* Always ensures .baton/ is gitignored regardless of setting.
 */
-async function updateGitignorePatterns(params) {
-	const { allIntersections, adapters, ideMap, mergedSkills, mergedRules, mergedMemory, mergedCommandCount, fileMap, projectRoot, spinner } = params;
-	const profileSupportedAiTools = /* @__PURE__ */ new Set();
-	const profileSupportedIdePlatforms = /* @__PURE__ */ new Set();
-	if (allIntersections) for (const intersection of allIntersections.values()) {
-		for (const tool of intersection.aiTools.synced) profileSupportedAiTools.add(tool);
-		for (const tool of intersection.aiTools.unavailable) profileSupportedAiTools.add(tool);
-		for (const plat of intersection.idePlatforms.synced) profileSupportedIdePlatforms.add(plat);
-		for (const plat of intersection.idePlatforms.unavailable) profileSupportedIdePlatforms.add(plat);
-	}
-	else {
-		for (const adapter of adapters) profileSupportedAiTools.add(adapter.key);
-		for (const entry of ideMap.values()) profileSupportedIdePlatforms.add(entry.ideKey);
-	}
-	const hasContent = mergedSkills.length > 0 || mergedRules.length > 0 || mergedMemory.length > 0 || mergedCommandCount > 0;
-	const gitignorePatterns = collectProfileSupportPatterns({
-		profileAiTools: [...profileSupportedAiTools],
-		profileIdePlatforms: [...profileSupportedIdePlatforms],
-		fileTargets: [...fileMap.values()].map((f) => f.target),
-		hasContent
-	});
-	if (gitignorePatterns.length > 0) {
+async function handleGitignoreUpdate(params) {
+	const { projectManifest, fileMap, projectRoot, spinner } = params;
+	const gitignoreEnabled = projectManifest.gitignore !== false;
+	await ensureBatonDirGitignored(projectRoot);
+	if (gitignoreEnabled) {
 		spinner.start("Updating .gitignore...");
-		const updated = await updateGitignore(projectRoot, gitignorePatterns);
-		spinner.stop(updated ? "Updated .gitignore with synced patterns" : ".gitignore already up to date");
+		const updated = await updateGitignore(projectRoot, collectComprehensivePatterns({ fileTargets: [...fileMap.values()].map((f) => f.target) }));
+		spinner.stop(updated ? "Updated .gitignore with managed patterns" : ".gitignore already up to date");
+	} else {
+		spinner.start("Checking .gitignore...");
+		const removed = await removeGitignoreManagedSection(projectRoot);
+		spinner.stop(removed ? "Removed managed section from .gitignore" : ".gitignore unchanged");
 	}
 }
 /**
@@ -2893,6 +2933,9 @@ const syncCommand = defineCommand({
 			const rulesResult = mergeRulesWithWarnings(weightSortedProfiles);
 			const mergedRules = rulesResult.rules;
 			allWeightWarnings.push(...rulesResult.warnings);
+			const agentsResult = mergeAgentsWithWarnings(weightSortedProfiles);
+			const mergedAgents = agentsResult.agents;
+			allWeightWarnings.push(...agentsResult.warnings);
 			const memoryResult = mergeMemoryWithWarnings(weightSortedProfiles);
 			const mergedMemory = memoryResult.entries;
 			allWeightWarnings.push(...memoryResult.warnings);
@@ -2991,11 +3034,11 @@ const syncCommand = defineCommand({
 				}
 			}
 			const mergedIdeCount = ideMap.size;
-			spinner.stop(`Merged: ${mergedSkills.length} skills, ${mergedRules.length} rules, ${mergedMemory.length} memory files, ${mergedCommandCount} commands, ${mergedFileCount} files, ${mergedIdeCount} IDE configs`);
+			spinner.stop(`Merged: ${mergedSkills.length} skills, ${mergedRules.length} rules, ${mergedAgents.length} agents, ${mergedMemory.length} memory files, ${mergedCommandCount} commands, ${mergedFileCount} files, ${mergedIdeCount} IDE configs`);
 			if (allWeightWarnings.length > 0) for (const w of allWeightWarnings) R.warn(`Weight conflict: "${w.profileA}" and "${w.profileB}" both define ${w.category} "${w.key}" with weight ${w.weight}. Last declared wins.`);
 			spinner.start("Computing tool intersection...");
 			const prefs = await resolvePreferences(projectRoot);
-			const detectedAgents = await detectInstalledAgents();
+			const detectedAITools = await detectInstalledAITools();
 			if (verbose) {
 				R.info(`AI tools: ${prefs.ai.tools.join(", ") || "(none)"} (from ${prefs.ai.source} preferences)`);
 				R.info(`IDE platforms: ${prefs.ide.platforms.join(", ") || "(none)"} (from ${prefs.ide.source} preferences)`);
@@ -3022,14 +3065,14 @@ const syncCommand = defineCommand({
 				syncedAiTools = aggregatedSyncedAi.size > 0 ? [...aggregatedSyncedAi] : [];
 				syncedIdePlatforms = [...aggregatedSyncedIde];
 			} else {
-				syncedAiTools = detectedAgents;
+				syncedAiTools = detectedAITools;
 				syncedIdePlatforms = null;
-				if (detectedAgents.length > 0) {
+				if (detectedAITools.length > 0) {
 					R.warn("No AI tools configured. Run `baton ai-tools scan` to configure your tools.");
-					R.info(`Falling back to detected tools: ${detectedAgents.join(", ")}`);
+					R.info(`Falling back to detected tools: ${detectedAITools.join(", ")}`);
 				}
 			}
-			if (syncedAiTools.length === 0 && detectedAgents.length === 0) {
+			if (syncedAiTools.length === 0 && detectedAITools.length === 0) {
 				spinner.stop("No AI tools available");
 				Ne("No AI tools found. Install an AI coding tool first.");
 				process.exit(1);
@@ -3058,7 +3101,7 @@ const syncCommand = defineCommand({
 				}
 			} else spinner.stop("No legacy files found");
 			spinner.start("Processing configurations...");
-			const adapters = getAdaptersForKeys(syncedAiTools);
+			const adapters = getAIToolAdaptersForKeys(syncedAiTools);
 			const placementConfig = {
 				mode: "copy",
 				projectRoot
@@ -3173,6 +3216,7 @@ const syncCommand = defineCommand({
 			if (!dryRun && syncAi) for (const adapter of adapters) {
 				if (verbose) R.step(`[${adapter.key}] Placing rules...`);
 				for (const ruleEntry of mergedRules) try {
+					const ruleName = ruleEntry.name.replace(/\.md$/, "");
 					const isUniversal = ruleEntry.agents.length === 0;
 					const isForThisAdapter = ruleEntry.agents.includes(adapter.key);
 					if (!isUniversal && !isForThisAdapter) continue;
@@ -3181,7 +3225,7 @@ const syncCommand = defineCommand({
 						spinner.message(`Warning: Could not resolve local path for profile ${ruleEntry.profileName}`);
 						continue;
 					}
-					const ruleSourcePath = resolve(profileDir, "ai", "rules", isUniversal ? "universal" : ruleEntry.agents[0], `${ruleEntry.name}.md`);
+					const ruleSourcePath = resolve(profileDir, "ai", "rules", isUniversal ? "universal" : ruleEntry.agents[0], `${ruleName}.md`);
 					let rawContent;
 					try {
 						rawContent = await readFile(ruleSourcePath, "utf-8");
@@ -3191,12 +3235,12 @@ const syncCommand = defineCommand({
 					}
 					const parsed = parseFrontmatter(rawContent);
 					const ruleFile = {
-						name: ruleEntry.name,
+						name: ruleName,
 						content: rawContent,
 						frontmatter: Object.keys(parsed.data).length > 0 ? parsed.data : void 0
 					};
 					const transformed = adapter.transformRule(ruleFile);
-					const targetPath = adapter.getPath("rules", "project", ruleEntry.name);
+					const targetPath = adapter.getPath("rules", "project", ruleName);
 					const absolutePath = targetPath.startsWith("/") ? targetPath : resolve(projectRoot, targetPath);
 					const existing = contentAccumulator.get(absolutePath);
 					if (existing) {
@@ -3206,7 +3250,7 @@ const syncCommand = defineCommand({
 						parts: [transformed.content],
 						adapter,
 						type: "rules",
-						name: ruleEntry.name,
+						name: ruleName,
 						profiles: new Set([ruleEntry.profileName])
 					});
 				} catch (error) {
@@ -3214,6 +3258,53 @@ const syncCommand = defineCommand({
 					stats.errors++;
 				}
 			}
+			if (!dryRun && syncAi) for (const adapter of adapters) {
+				if (verbose) R.step(`[${adapter.key}] Placing agents...`);
+				for (const agentEntry of mergedAgents) try {
+					const agentName = agentEntry.name.replace(/\.md$/, "");
+					const isUniversal = agentEntry.agents.length === 0;
+					const isForThisAdapter = agentEntry.agents.includes(adapter.key);
+					if (!isUniversal && !isForThisAdapter) continue;
+					const profileDir = profileLocalPaths.get(agentEntry.profileName);
+					if (!profileDir) {
+						spinner.message(`Warning: Could not resolve local path for profile ${agentEntry.profileName}`);
+						continue;
+					}
+					const agentSourcePath = resolve(profileDir, "ai", "agents", isUniversal ? "universal" : agentEntry.agents[0], `${agentName}.md`);
+					let rawContent;
+					try {
+						rawContent = await readFile(agentSourcePath, "utf-8");
+					} catch {
+						spinner.message(`Warning: Could not read agent file: ${agentSourcePath}`);
+						continue;
+					}
+					const parsed = parseFrontmatter(rawContent);
+					const frontmatter = Object.keys(parsed.data).length > 0 ? parsed.data : { name: agentName };
+					const agentFile = {
+						name: agentName,
+						content: rawContent,
+						description: frontmatter.description,
+						frontmatter
+					};
+					const transformed = adapter.transformAgent(agentFile);
+					const targetPath = adapter.getPath("agents", "project", agentName);
+					const absolutePath = targetPath.startsWith("/") ? targetPath : resolve(projectRoot, targetPath);
+					const existing = contentAccumulator.get(absolutePath);
+					if (existing) {
+						existing.parts.push(transformed.content);
+						existing.profiles.add(agentEntry.profileName);
+					} else contentAccumulator.set(absolutePath, {
+						parts: [transformed.content],
+						adapter,
+						type: "agents",
+						name: agentName,
+						profiles: new Set([agentEntry.profileName])
+					});
+				} catch (error) {
+					spinner.message(`Error placing agent ${agentEntry.name} for ${adapter.name}: ${error}`);
+					stats.errors++;
+				}
+			}
 			if (!dryRun && syncAi) for (const [absolutePath, entry] of contentAccumulator) try {
 				const combinedContent = entry.parts.join("\n\n");
 				const result = await placeFile(combinedContent, entry.adapter, entry.type, "project", entry.name, placementConfig);
@@ -3327,14 +3418,8 @@ const syncCommand = defineCommand({
 				stats.errors++;
 			}
 			spinner.stop(dryRun ? `Would place files for ${adapters.length} agent(s)` : `Placed ${stats.created} file(s) for ${adapters.length} agent(s)`);
-			if (!dryRun) await updateGitignorePatterns({
-				allIntersections,
-				adapters,
-				ideMap,
-				mergedSkills,
-				mergedRules,
-				mergedMemory,
-				mergedCommandCount,
+			if (!dryRun) await handleGitignoreUpdate({
+				projectManifest,
 				fileMap,
 				projectRoot,
 				spinner
@@ -3359,6 +3444,7 @@ const syncCommand = defineCommand({
 				if (syncAi) {
 					parts.push(`  • ${mergedSkills.length} skills`);
 					parts.push(`  • ${mergedRules.length} rules`);
+					parts.push(`  • ${mergedAgents.length} agents`);
 					parts.push(`  • ${mergedMemory.length} memory files`);
 					parts.push(`  • ${mergedCommandCount} commands`);
 				}