neon 8.15.0 → 8.16.0

package/dist/init/copy.js

@@ -1,4 +1,5 @@
 import { getCliName } from "../utils/cli_name.js";
+import { pluginsCommandProblemText } from "../plugins/targets.js";
 // src/init/copy.ts
 const INIT_SUBTITLE = "Set up coding agents and this directory for Neon.";
 const MODE_MESSAGE = "How would you like to set up Neon?";
@@ -16,7 +17,7 @@ const AGENT_SETUP_SKIP_DESCRIPTION = "Continue to project setup without changing
 const AGENT_PICKER_MESSAGE = "Which coding agents should receive Neon tooling? (space to toggle, enter to confirm)";
 const AGENT_DETECTED_DESCRIPTION = "Detected on this machine or in this directory.";
 const AGENT_OTHER_DESCRIPTION = "Install for this agent.";
-const agentMissingCommandDescription = (command) => `Detected, but "${command}" was not found on PATH. Its plugin cannot install.`;
+const agentUnusableCommandDescription = (row) => `Detected, but "${row.command.name}" ${pluginsCommandProblemText(row)}. Its plugin cannot install.`;
 const AGENT_PLUGIN_SKIP_MESSAGE = "No agents selected. Continue without installing the Neon plugin?";
 const AGENT_SKILLS_PICKER_MESSAGE = "Which coding agents should receive Neon skills? (space to toggle, enter to confirm)";
 const AGENT_MCP_PICKER_MESSAGE = "Which coding agents should receive the Neon MCP server? (space to toggle, enter to confirm)";
@@ -184,4 +185,4 @@ const headingForOutcome = (outcome) => {
 		default: return outcome;
 	}
 };
-export { AGENTS_NOT_INSTALLED, AGENT_DETECTED_DESCRIPTION, AGENT_MCP_PICKER_MESSAGE, AGENT_MCP_SKIP_MESSAGE, AGENT_OTHER_DESCRIPTION, AGENT_PICKER_MESSAGE, AGENT_PLUGIN_SKIP_MESSAGE, AGENT_SETUP_MESSAGE, AGENT_SETUP_PLUGIN_DESCRIPTION, AGENT_SETUP_PLUGIN_TITLE, AGENT_SETUP_SKILLS_DESCRIPTION, AGENT_SETUP_SKILLS_TITLE, AGENT_SETUP_SKIP_DESCRIPTION, AGENT_SETUP_SKIP_TITLE, AGENT_SKILLS_PICKER_MESSAGE, AGENT_SKILLS_SKIP_MESSAGE, CANCELLED_BODY, CLAIMABLE_ACCOUNT_FLAGS, CLAIMABLE_ALREADY_LINKED, CLAIMABLE_MCP_API_KEY, CLAIMABLE_NO_LINK, CONFIG_CONFIRM_HINT, CONFIG_CONFIRM_MESSAGE, HEADING_CANCELLED, HEADING_COMPLETE, HEADING_FAILED, HEADING_PENDING, INIT_NEEDS_YES, INIT_SUBTITLE, MCP_API_KEY_NEEDS_AUTH, MCP_AUTH_API_KEY_DESCRIPTION, MCP_AUTH_API_KEY_TITLE, MCP_AUTH_MESSAGE, MCP_AUTH_OAUTH_DESCRIPTION, MCP_AUTH_OAUTH_TITLE, MCP_OAUTH_FALLBACK, MCP_SCOPED_NEEDS_PROJECT, MCP_SCOPE_GLOBAL_DESCRIPTION, MCP_SCOPE_GLOBAL_TITLE, MCP_SCOPE_MESSAGE, MCP_SCOPE_PROJECT_DESCRIPTION, MCP_SCOPE_PROJECT_TITLE, MODE_CUSTOM_DESCRIPTION, MODE_CUSTOM_TITLE, MODE_MESSAGE, MODE_RECOMMENDED_DESCRIPTION, MODE_RECOMMENDED_TITLE, NON_TTY_AGENT_SETUP, NON_TTY_LINK_NEEDS_AUTH, NO_AGENTS_FALLBACK_STATUS, NO_AGENT_SETUP_CONFLICT, PACKAGE_MANAGER_MESSAGE, PROGRESS, PROJECT_PINNED_OFFLINE, PROJECT_SETUP_CLAIMABLE_DESCRIPTION, PROJECT_SETUP_CLAIMABLE_TITLE, PROJECT_SETUP_LINK_DESCRIPTION, PROJECT_SETUP_LINK_TITLE, PROJECT_SETUP_MESSAGE, SERVICES_HINT, SERVICES_MESSAGE, SKILLS_PICKER_MESSAGE, agentMissingCommandDescription, claimableNext, claimableThenServicesNext, configInitNext, envPullFailedNext, existingConfigNext, headingForOutcome, installFailedNext, mcpAfterLinkNext, mcpConfigLocationSkipped, mcpConfigLocationUnavailable, mcpKeyFailedNext, namedAgentsUnavailable, newConfigNext, offlinePinNext, skippedLinkNext, toolingFailedNext, unattendedUnauthedNext };
+export { AGENTS_NOT_INSTALLED, AGENT_DETECTED_DESCRIPTION, AGENT_MCP_PICKER_MESSAGE, AGENT_MCP_SKIP_MESSAGE, AGENT_OTHER_DESCRIPTION, AGENT_PICKER_MESSAGE, AGENT_PLUGIN_SKIP_MESSAGE, AGENT_SETUP_MESSAGE, AGENT_SETUP_PLUGIN_DESCRIPTION, AGENT_SETUP_PLUGIN_TITLE, AGENT_SETUP_SKILLS_DESCRIPTION, AGENT_SETUP_SKILLS_TITLE, AGENT_SETUP_SKIP_DESCRIPTION, AGENT_SETUP_SKIP_TITLE, AGENT_SKILLS_PICKER_MESSAGE, AGENT_SKILLS_SKIP_MESSAGE, CANCELLED_BODY, CLAIMABLE_ACCOUNT_FLAGS, CLAIMABLE_ALREADY_LINKED, CLAIMABLE_MCP_API_KEY, CLAIMABLE_NO_LINK, CONFIG_CONFIRM_HINT, CONFIG_CONFIRM_MESSAGE, HEADING_CANCELLED, HEADING_COMPLETE, HEADING_FAILED, HEADING_PENDING, INIT_NEEDS_YES, INIT_SUBTITLE, MCP_API_KEY_NEEDS_AUTH, MCP_AUTH_API_KEY_DESCRIPTION, MCP_AUTH_API_KEY_TITLE, MCP_AUTH_MESSAGE, MCP_AUTH_OAUTH_DESCRIPTION, MCP_AUTH_OAUTH_TITLE, MCP_OAUTH_FALLBACK, MCP_SCOPED_NEEDS_PROJECT, MCP_SCOPE_GLOBAL_DESCRIPTION, MCP_SCOPE_GLOBAL_TITLE, MCP_SCOPE_MESSAGE, MCP_SCOPE_PROJECT_DESCRIPTION, MCP_SCOPE_PROJECT_TITLE, MODE_CUSTOM_DESCRIPTION, MODE_CUSTOM_TITLE, MODE_MESSAGE, MODE_RECOMMENDED_DESCRIPTION, MODE_RECOMMENDED_TITLE, NON_TTY_AGENT_SETUP, NON_TTY_LINK_NEEDS_AUTH, NO_AGENTS_FALLBACK_STATUS, NO_AGENT_SETUP_CONFLICT, PACKAGE_MANAGER_MESSAGE, PROGRESS, PROJECT_PINNED_OFFLINE, PROJECT_SETUP_CLAIMABLE_DESCRIPTION, PROJECT_SETUP_CLAIMABLE_TITLE, PROJECT_SETUP_LINK_DESCRIPTION, PROJECT_SETUP_LINK_TITLE, PROJECT_SETUP_MESSAGE, SERVICES_HINT, SERVICES_MESSAGE, SKILLS_PICKER_MESSAGE, agentUnusableCommandDescription, claimableNext, claimableThenServicesNext, configInitNext, envPullFailedNext, existingConfigNext, headingForOutcome, installFailedNext, mcpAfterLinkNext, mcpConfigLocationSkipped, mcpConfigLocationUnavailable, mcpKeyFailedNext, namedAgentsUnavailable, newConfigNext, offlinePinNext, skippedLinkNext, toolingFailedNext, unattendedUnauthedNext };

package/dist/init/detect.js

@@ -2,13 +2,12 @@ import { t as storeFor } from "../_chunks/credential_io-DbeSh3Pl.js";
 import { isCi } from "../env.js";
 import { h as resolveProfile, u as locationOf } from "../_chunks/profiles-DTazQtjK.js";
 import { i as selectCredential, t as credentialInputs } from "../_chunks/auth_selection-CwGLN9Qz.js";
-import { detectInstalledAgents, uniqueAgentIds } from "../mcp/agents.js";
+import { detectInstalledAgents, detectProjectAgents, uniqueAgentIds } from "../mcp/agents.js";
 import "./agents.js";
 import { directoryIsEmpty } from "./plan.js";
 import { detectAgent } from "./detect_host.js";
 import { canPickAgentsInteractively } from "../utils/agent_picker.js";
 import { existsSync, readdirSync } from "node:fs";
-import { detectProjectAgents } from "add-mcp";
 // src/init/detect.ts
 const listingHasCredentials = (configDir, profile) => {
 	try {

package/dist/init/link.js

@@ -4,7 +4,7 @@ import "../config.js";
 import "../auth.js";
 import { c as ensureAuth } from "../_chunks/auth-rup6nemJ.js";
 import { recoverFrom401 } from "../auth_recovery.js";
-import { s as runLink } from "../_chunks/link-nAiuWKfg.js";
+import { s as runLink } from "../_chunks/link-CNO-HxHN.js";
 // src/init/link.ts
 const isUnauthorized = (error) => isNeonApiError(error) && error.status === 401;
 const authenticationFailed = () => /* @__PURE__ */ new Error("Authentication failed.");

package/dist/init/plan.js

@@ -1,8 +1,8 @@
 import { getCliName } from "../utils/cli_name.js";
 import { tryResolveAddMcpAgentId, uniqueAgentIds } from "../mcp/agents.js";
-import { mcpInstallableAgents } from "../mcp/targets.js";
 import { supportsSkills } from "./agents.js";
 import { pluginsInstallableAgents } from "../plugins/targets.js";
+import { mcpInstallableAgents } from "../mcp/targets.js";
 import { skillsInstallableAgents } from "../skills/targets.js";
 import { agentArgv } from "../utils/agent_flag.js";
 import { isAbsolute, join, relative, resolve } from "node:path";
@@ -92,67 +92,6 @@ const noDetectedAgentsMessage = (input) => {
 	return `${lead} ${hint} Supported agents: ${input.supported.join(", ")}`;
 };
 const INIT_NEEDS_YES_OR_TERMINAL = "No interactive terminal. Pass -y to use defaults, or run this command in a terminal to pick.";
-const UNKNOWN_AGENT_COMMANDS = ["link"];
-const unknownAgentArgHint = (command, cliName) => `${cliName} ${command} has no --agent. Pass --project-id <id> to link without a TTY, or run ${cliName} ${command} in a terminal.`;
-const BOOLEAN_FLAGS = /* @__PURE__ */ new Set([
-	"-y",
-	"--yes",
-	"--default",
-	"--force",
-	"-h",
-	"--help",
-	"-v",
-	"--version",
-	"--color",
-	"--no-color",
-	"--analytics",
-	"--no-analytics",
-	"--oauth",
-	"--project",
-	"--global",
-	"--read-only",
-	"--readonly",
-	"--clear",
-	"--checks",
-	"--no-checks",
-	"--env-pull",
-	"--no-env-pull",
-	"--no-agent-setup",
-	"--no-link",
-	"--no-config",
-	"--claimable",
-	"--config",
-	"--list",
-	"--list-templates",
-	"--force-auth",
-	"--no-force-auth"
-]);
-const isUnknownAgentCommand = (token) => {
-	for (const command of UNKNOWN_AGENT_COMMANDS) if (command === token) return true;
-	return false;
-};
-const commandFromArgv = (argv) => {
-	let skipValue = false;
-	for (const token of argv) {
-		if (skipValue) {
-			skipValue = false;
-			continue;
-		}
-		if (token === "--") break;
-		if (token.startsWith("-")) {
-			const flag = token.split("=")[0];
-			if (flag !== void 0 && !token.includes("=") && !BOOLEAN_FLAGS.has(flag)) skipValue = true;
-			continue;
-		}
-		if (isUnknownAgentCommand(token)) return token;
-	}
-};
-const rewriteUnknownAgentArg = (input) => {
-	if (input.message !== "Unknown argument: agent" && input.message !== "Unknown argument: a") return;
-	const command = commandFromArgv(input.argv);
-	if (command === void 0) return;
-	return unknownAgentArgHint(command, input.cliName);
-};
 const initYesSupportedAgents = () => uniqueAgentIds([
 	...pluginsInstallableAgents("project"),
 	...skillsInstallableAgents(),
@@ -385,4 +324,4 @@ const resolveInitAgentSetup = async (input) => {
 	if (input.interactive) return input.pick();
 	throw new Error(INIT_NEEDS_YES_OR_TERMINAL);
 };
-export { FALLBACK_SKILLS_AGENTS, INIT_NEEDS_YES_OR_TERMINAL, NAMED_AGENTS_MIXED, NAMED_AGENTS_UNSUPPORTED, assertNamedAgentTooling, bootstrapInitStep, chooseYesAgentTooling, collectYesAgents, directoryIsEmpty, funnelAgentSetup, initPluginAgents, initSkillsMcpAgents, initYesSupportedAgents, linkInputArgv, namedAgentsMixedMessage, namedAgentsNeedSplit, noDetectedAgentsMessage, planAgentSteps, planConfigInitStep, planInitToolingSteps, planLinkStep, planToolingSteps, planYesAgentSteps, postScaffoldActions, projectContextFile, recommendedTooling, resolveInitAgentSetup, resolveNamedAgents, resolveYesAgentList, rewriteUnknownAgentArg, splitInitTooling };
+export { FALLBACK_SKILLS_AGENTS, INIT_NEEDS_YES_OR_TERMINAL, NAMED_AGENTS_MIXED, NAMED_AGENTS_UNSUPPORTED, assertNamedAgentTooling, bootstrapInitStep, chooseYesAgentTooling, collectYesAgents, directoryIsEmpty, funnelAgentSetup, initPluginAgents, initSkillsMcpAgents, initYesSupportedAgents, linkInputArgv, namedAgentsMixedMessage, namedAgentsNeedSplit, noDetectedAgentsMessage, planAgentSteps, planConfigInitStep, planInitToolingSteps, planLinkStep, planToolingSteps, planYesAgentSteps, postScaffoldActions, projectContextFile, recommendedTooling, resolveInitAgentSetup, resolveNamedAgents, resolveYesAgentList, splitInitTooling };

package/dist/init/run.js

@@ -9,23 +9,23 @@ import { getCliName } from "../utils/cli_name.js";
 import { servicesFlagValue } from "../neon_services.js";
 import { CONFIG_INIT_SERVICES, parseConfigInitServices } from "../config_template.js";
 import { hasNeonConfigFile, neonConfigFilename } from "../project.js";
-import { getAgentDisplayName } from "../mcp/agents.js";
-import { mcpInstallableAgents } from "../mcp/targets.js";
-import { missingPluginsCommands, pluginsInstallableAgents } from "../plugins/targets.js";
-import { skillsInstallableAgents } from "../skills/targets.js";
-import { FALLBACK_SKILLS_AGENTS, assertNamedAgentTooling, funnelAgentSetup, planInitToolingSteps, recommendedTooling, resolveNamedAgents, splitInitTooling } from "./plan.js";
 import { inferPackageManager, resolvePackageManager } from "../utils/package_manager.js";
+import { getAgentDisplayName } from "../mcp/agents.js";
+import { missingPluginsCommands, pluginsCommandProblemText, pluginsInstallableAgents, unusablePluginsCommands } from "../plugins/targets.js";
 import { AGENTS_NOT_INSTALLED, CANCELLED_BODY, CLAIMABLE_ACCOUNT_FLAGS, CLAIMABLE_ALREADY_LINKED, CLAIMABLE_MCP_API_KEY, CLAIMABLE_NO_LINK, MCP_API_KEY_NEEDS_AUTH, MCP_SCOPED_NEEDS_PROJECT, NON_TTY_LINK_NEEDS_AUTH, NO_AGENTS_FALLBACK_STATUS, PROGRESS, PROJECT_PINNED_OFFLINE, claimableNext, claimableThenServicesNext, configInitNext, envPullFailedNext, existingConfigNext, installFailedNext, mcpAfterLinkNext, mcpConfigLocationSkipped, mcpConfigLocationUnavailable, mcpKeyFailedNext, namedAgentsUnavailable, newConfigNext, offlinePinNext, skippedLinkNext, toolingFailedNext, unattendedUnauthedNext } from "./copy.js";
 import { agentsRowValue, configRowValue, formatInitDone, headingForKind, printInitBanner, printInitDone, printInitProgress, projectRowValue, shouldPrintInitBanner } from "./chrome.js";
-import { h as initCmd, t as ConfigInstallFailed } from "../_chunks/config-BjCm5cfr.js";
-import { o as quoteFlagValue, s as runLink } from "../_chunks/link-nAiuWKfg.js";
+import { h as initCmd, t as ConfigInstallFailed } from "../_chunks/config-CgtJH8xE.js";
+import { o as quoteFlagValue, s as runLink } from "../_chunks/link-CNO-HxHN.js";
 import { runAuthenticatedLink } from "./link.js";
+import { mcpInstallableAgents } from "../mcp/targets.js";
+import { skillsInstallableAgents } from "../skills/targets.js";
+import { FALLBACK_SKILLS_AGENTS, assertNamedAgentTooling, funnelAgentSetup, planInitToolingSteps, recommendedTooling, resolveNamedAgents, splitInitTooling } from "./plan.js";
 import { CannotMintApiKeyError } from "../mcp/mint.js";
 import { pullInitEnv, resolveInitConfigApi } from "./auth.js";
 import { InitCancelled, raceSigint, restoreCursor } from "./cancelled.js";
 import { pickAgentSetupInteractively, pickInitAgentsInteractively, pickInitConfigInteractively, pickInitMcpAuthInteractively, pickInitMcpConfigLocationInteractively, pickInitModeInteractively, pickInitPackageManagerInteractively, pickInitProjectSetupInteractively, pickInitServicesInteractively, pickInitSkillsInteractively } from "./wizard.js";
 import { runToolingSteps, toolingStepCommandText } from "./tooling.js";
-import { l as create } from "../_chunks/claim-DlLZmcq0.js";
+import { l as create } from "../_chunks/claim-m5sIJdm5.js";
 import { INIT_CONFIG_SERVICES_CONFLICT, configPlanFromResolution, initEnvPullAfterConfig, resolveInitConfigChoice } from "./choices.js";
 import { detectInitEnvironment } from "./detect.js";
 import { createInitFunnel, emitInitStart, finishInitFunnel, initStartProperties, recordInitError, recordInitExit } from "./funnel.js";
@@ -67,10 +67,10 @@ const pluginScopeFor = (agents, preferred) => {
 	const project = new Set(pluginsInstallableAgents("project"));
 	return agents.some((id) => !project.has(id) && pluginsInstallableAgents("global").includes(id)) ? "global" : "project";
 };
-const warnMissingPluginCommands = (missing, tooling) => {
+const warnUnusablePluginCommands = (unusable, tooling) => {
 	if (tooling.setup !== "skills-mcp" && tooling.setup !== "mixed") return;
 	const routed = /* @__PURE__ */ new Set([...tooling.skillsAgents, ...tooling.mcpAgents]);
-	for (const { agent, command } of missing) if (routed.has(agent)) log.warning("%s: \"%s\" was not found on PATH, so its plugin cannot install. Installing Neon skills and MCP instead.", getAgentDisplayName(agent), command);
+	for (const row of unusable) if (routed.has(row.agent)) log.warning("%s: \"%s\" %s, so its plugin cannot install. Installing Neon skills and MCP instead.", getAgentDisplayName(row.agent), row.command.name, pluginsCommandProblemText(row));
 };
 const nonEmptyAgents = (ids, fallback) => {
 	const [first, ...rest] = ids;
@@ -124,7 +124,7 @@ const pickOrDetectAgents = async (input) => {
 		available: [...input.available],
 		detected,
 		preselected,
-		...input.missingCommands !== void 0 ? { missingCommands: input.missingCommands } : {},
+		...input.unusableCommands !== void 0 ? { unusableCommands: input.unusableCommands } : {},
 		setup: input.setup
 	});
 	return detected;
@@ -265,9 +265,18 @@ const runInit = async (props) => {
 		}
 		const recommended = mode === "recommended";
 		const targets = named.length > 0 ? named : detection.detectedAgents;
-		const missingPluginCommands = missingPluginsCommands(targets, { cwd });
-		const unavailablePluginAgents = missingPluginCommands.map((row) => row.agent);
-		const pluginReady = (agents) => agents.filter((id) => !unavailablePluginAgents.includes(id));
+		let probedPluginCommands;
+		const unusablePluginCommands = () => {
+			probedPluginCommands ??= unusablePluginsCommands(targets, { cwd });
+			return probedPluginCommands;
+		};
+		let missingCommands;
+		const missingPluginCommands = () => {
+			missingCommands ??= missingPluginsCommands(targets, { cwd });
+			return missingCommands;
+		};
+		const unavailablePluginAgents = () => unusablePluginCommands().map((row) => row.agent);
+		const pluginReady = (agents) => agents.filter((id) => !unavailablePluginAgents().includes(id));
 		let tooling = { setup: "skip" };
 		let mcpAuth = props.mcpAuth;
 		let mcpAuthChosen = props.mcpAuth !== void 0;
@@ -277,9 +286,9 @@ const runInit = async (props) => {
 		let pluginScope = recommended ? "global" : "project";
 		if (recommended) {
 			pluginScope = "global";
-			tooling = named.length > 0 ? splitInitTooling(named, "global", "global", unavailablePluginAgents) : recommendedTooling(detection.detectedAgents, unavailablePluginAgents);
+			tooling = named.length > 0 ? splitInitTooling(named, "global", "global", unavailablePluginAgents()) : recommendedTooling(detection.detectedAgents, unavailablePluginAgents());
 			if (named.length === 0 && detection.detectedAgents.length === 0) printInitProgress(NO_AGENTS_FALLBACK_STATUS);
-			warnMissingPluginCommands(missingPluginCommands, tooling);
+			warnUnusablePluginCommands(unusablePluginCommands(), tooling);
 			mcpAuth = !detection.authenticated && (tooling.setup === "skills-mcp" || tooling.setup === "mixed") ? "oauth" : mcpAuth;
 		} else {
 			const inferred = inferInitAgentSetup({
@@ -294,8 +303,8 @@ const runInit = async (props) => {
 			else if (inferred.kind === "auto") {
 				const autoAgents = named.length > 0 ? named : detection.detectedAgents;
 				pluginScope = pluginScopeFor(pluginReady(autoAgents), "project");
-				tooling = splitInitTooling(autoAgents, pluginScope, mcpConfigLocation, unavailablePluginAgents);
-				warnMissingPluginCommands(missingPluginCommands, tooling);
+				tooling = splitInitTooling(autoAgents, pluginScope, mcpConfigLocation, unavailablePluginAgents());
+				warnUnusablePluginCommands(unusablePluginCommands(), tooling);
 				if (tooling.setup === "skip" && yes && named.length === 0) {
 					tooling = recommendedTooling([]);
 					printInitProgress(NO_AGENTS_FALLBACK_STATUS);
@@ -310,8 +319,8 @@ const runInit = async (props) => {
 						available,
 						detected: detection.detectedAgents,
 						...setup === "plugin" ? {
-							preselected: pluginReady(detection.detectedAgents),
-							missingCommands: missingPluginCommands
+							preselected: detection.detectedAgents.filter((id) => !missingPluginCommands().some((row) => row.agent === id)),
+							unusableCommands: missingPluginCommands()
 						} : {},
 						interactive: detection.interactive,
 						setup,

package/dist/init/tooling.js

@@ -1,17 +1,17 @@
 import { log } from "../log.js";
 import { getCliName } from "../utils/cli_name.js";
-import { assertNamedAgentTooling, chooseYesAgentTooling, collectYesAgents, initYesSupportedAgents, noDetectedAgentsMessage, planAgentSteps, planToolingSteps, planYesAgentSteps, resolveInitAgentSetup } from "./plan.js";
+import { detectProjectAgents } from "../mcp/agents.js";
 import { MCP_OAUTH_FALLBACK, PROGRESS } from "./copy.js";
+import { assertNamedAgentTooling, chooseYesAgentTooling, collectYesAgents, initYesSupportedAgents, noDetectedAgentsMessage, planAgentSteps, planToolingSteps, planYesAgentSteps, resolveInitAgentSetup } from "./plan.js";
 import { CannotMintApiKeyError } from "../mcp/mint.js";
 import { detectAgent } from "./detect_host.js";
 import { AgentSelectionSkipped, canPickAgentsInteractively } from "../utils/agent_picker.js";
-import { a as mcpInstallError, s as reportMcpInstall } from "../_chunks/mcp-BznTRK3w.js";
-import { l as reportPluginsInstall, o as installPlugins, s as pluginsInstallError } from "../_chunks/plugins-CKOcBuuP.js";
-import { c as skillsInstallError, o as installSkills, s as reportSkillsInstall } from "../_chunks/skills-DKgafm65.js";
+import { a as mcpInstallError, s as reportMcpInstall } from "../_chunks/mcp-SvqWzHnT.js";
+import { l as reportPluginsInstall, o as installPlugins, s as pluginsInstallError } from "../_chunks/plugins-7cxVcgay.js";
+import { c as skillsInstallError, o as installSkills, s as reportSkillsInstall } from "../_chunks/skills-Bv8oKKwE.js";
 import { runAuthenticatedMcp } from "./auth.js";
 import { raceSigint } from "./cancelled.js";
 import { pickAgentSetupInteractively } from "./wizard.js";
-import { detectProjectAgents } from "add-mcp";
 // src/init/tooling.ts
 const defaultProjectAgents = (cwd) => detectProjectAgents(cwd);
 const TOOLING_STEP_LABELS = {

package/dist/init/unknown_agent_arg.js

@@ -0,0 +1,63 @@
+// src/init/unknown_agent_arg.ts
+const UNKNOWN_AGENT_COMMANDS = ["link"];
+const unknownAgentArgHint = (command, cliName) => `${cliName} ${command} has no --agent. Pass --project-id <id> to link without a TTY, or run ${cliName} ${command} in a terminal.`;
+const BOOLEAN_FLAGS = /* @__PURE__ */ new Set([
+	"-y",
+	"--yes",
+	"--default",
+	"--force",
+	"-h",
+	"--help",
+	"-v",
+	"--version",
+	"--color",
+	"--no-color",
+	"--analytics",
+	"--no-analytics",
+	"--oauth",
+	"--project",
+	"--global",
+	"--read-only",
+	"--readonly",
+	"--clear",
+	"--checks",
+	"--no-checks",
+	"--env-pull",
+	"--no-env-pull",
+	"--no-agent-setup",
+	"--no-link",
+	"--no-config",
+	"--claimable",
+	"--config",
+	"--list",
+	"--list-templates",
+	"--force-auth",
+	"--no-force-auth"
+]);
+const isUnknownAgentCommand = (token) => {
+	for (const command of UNKNOWN_AGENT_COMMANDS) if (command === token) return true;
+	return false;
+};
+const commandFromArgv = (argv) => {
+	let skipValue = false;
+	for (const token of argv) {
+		if (skipValue) {
+			skipValue = false;
+			continue;
+		}
+		if (token === "--") break;
+		if (token.startsWith("-")) {
+			const flag = token.split("=")[0];
+			if (flag !== void 0 && !token.includes("=") && !BOOLEAN_FLAGS.has(flag)) skipValue = true;
+			continue;
+		}
+		if (isUnknownAgentCommand(token)) return token;
+	}
+};
+const rewriteUnknownAgentArg = (input) => {
+	if (input.message !== "Unknown argument: agent" && input.message !== "Unknown argument: a") return;
+	const command = commandFromArgv(input.argv);
+	if (command === void 0) return;
+	return unknownAgentArgHint(command, input.cliName);
+};
+export { rewriteUnknownAgentArg };

package/dist/init/wizard.js

@@ -1,9 +1,9 @@
 import { CONFIG_INIT_SERVICES } from "../config_template.js";
-import { getAgentDisplayName, listMcpAgentIds } from "../mcp/agents.js";
-import { INIT_NEEDS_YES_OR_TERMINAL } from "./plan.js";
 import { installedPackageManagers } from "../utils/package_manager.js";
-import { AGENT_DETECTED_DESCRIPTION, AGENT_MCP_PICKER_MESSAGE, AGENT_MCP_SKIP_MESSAGE, AGENT_OTHER_DESCRIPTION, AGENT_PICKER_MESSAGE, AGENT_PLUGIN_SKIP_MESSAGE, AGENT_SETUP_MESSAGE, AGENT_SETUP_PLUGIN_DESCRIPTION, AGENT_SETUP_PLUGIN_TITLE, AGENT_SETUP_SKILLS_DESCRIPTION, AGENT_SETUP_SKILLS_TITLE, AGENT_SETUP_SKIP_DESCRIPTION, AGENT_SETUP_SKIP_TITLE, AGENT_SKILLS_PICKER_MESSAGE, AGENT_SKILLS_SKIP_MESSAGE, CONFIG_CONFIRM_HINT, CONFIG_CONFIRM_MESSAGE, MCP_AUTH_API_KEY_DESCRIPTION, MCP_AUTH_API_KEY_TITLE, MCP_AUTH_MESSAGE, MCP_AUTH_OAUTH_DESCRIPTION, MCP_AUTH_OAUTH_TITLE, MCP_SCOPE_GLOBAL_DESCRIPTION, MCP_SCOPE_GLOBAL_TITLE, MCP_SCOPE_MESSAGE, MCP_SCOPE_PROJECT_DESCRIPTION, MCP_SCOPE_PROJECT_TITLE, MODE_CUSTOM_DESCRIPTION, MODE_CUSTOM_TITLE, MODE_MESSAGE, MODE_RECOMMENDED_DESCRIPTION, MODE_RECOMMENDED_TITLE, PACKAGE_MANAGER_MESSAGE, PROJECT_SETUP_CLAIMABLE_DESCRIPTION, PROJECT_SETUP_CLAIMABLE_TITLE, PROJECT_SETUP_LINK_DESCRIPTION, PROJECT_SETUP_LINK_TITLE, PROJECT_SETUP_MESSAGE, SERVICES_HINT, SERVICES_MESSAGE, SKILLS_PICKER_MESSAGE, agentMissingCommandDescription } from "./copy.js";
+import { getAgentDisplayName, listMcpAgentIds } from "../mcp/agents.js";
+import { AGENT_DETECTED_DESCRIPTION, AGENT_MCP_PICKER_MESSAGE, AGENT_MCP_SKIP_MESSAGE, AGENT_OTHER_DESCRIPTION, AGENT_PICKER_MESSAGE, AGENT_PLUGIN_SKIP_MESSAGE, AGENT_SETUP_MESSAGE, AGENT_SETUP_PLUGIN_DESCRIPTION, AGENT_SETUP_PLUGIN_TITLE, AGENT_SETUP_SKILLS_DESCRIPTION, AGENT_SETUP_SKILLS_TITLE, AGENT_SETUP_SKIP_DESCRIPTION, AGENT_SETUP_SKIP_TITLE, AGENT_SKILLS_PICKER_MESSAGE, AGENT_SKILLS_SKIP_MESSAGE, CONFIG_CONFIRM_HINT, CONFIG_CONFIRM_MESSAGE, MCP_AUTH_API_KEY_DESCRIPTION, MCP_AUTH_API_KEY_TITLE, MCP_AUTH_MESSAGE, MCP_AUTH_OAUTH_DESCRIPTION, MCP_AUTH_OAUTH_TITLE, MCP_SCOPE_GLOBAL_DESCRIPTION, MCP_SCOPE_GLOBAL_TITLE, MCP_SCOPE_MESSAGE, MCP_SCOPE_PROJECT_DESCRIPTION, MCP_SCOPE_PROJECT_TITLE, MODE_CUSTOM_DESCRIPTION, MODE_CUSTOM_TITLE, MODE_MESSAGE, MODE_RECOMMENDED_DESCRIPTION, MODE_RECOMMENDED_TITLE, PACKAGE_MANAGER_MESSAGE, PROJECT_SETUP_CLAIMABLE_DESCRIPTION, PROJECT_SETUP_CLAIMABLE_TITLE, PROJECT_SETUP_LINK_DESCRIPTION, PROJECT_SETUP_LINK_TITLE, PROJECT_SETUP_MESSAGE, SERVICES_HINT, SERVICES_MESSAGE, SKILLS_PICKER_MESSAGE, agentUnusableCommandDescription } from "./copy.js";
 import { POSTGRES_SERVICE_CHOICE, keepPostgresSelected } from "../utils/service_picker.js";
+import { INIT_NEEDS_YES_OR_TERMINAL } from "./plan.js";
 import { canPickAgentsInteractively, pickAgentsInteractively } from "../utils/agent_picker.js";
 import { NEON_SKILL_CATALOG, listSkillIds } from "../skills/catalog.js";
 import { InitCancelled, restoreCursorVisibilityOnAbort } from "./cancelled.js";
@@ -72,18 +72,18 @@ const pickAgentSetupInteractively = async () => {
 const pickInitAgentsInteractively = async (input) => {
 	requireInteractive();
 	const detected = new Set(input.detected);
-	const missing = new Map((input.missingCommands ?? []).map((row) => [row.agent, row.command]));
+	const unusable = new Map((input.unusableCommands ?? []).map((row) => [row.agent, row]));
 	const selected = await pickAgentsInteractively({
 		onCancel: aborted,
 		message: input.setup === "skills" ? AGENT_SKILLS_PICKER_MESSAGE : input.setup === "mcp" ? AGENT_MCP_PICKER_MESSAGE : AGENT_PICKER_MESSAGE,
 		skipMessage: input.setup === "plugin" ? AGENT_PLUGIN_SKIP_MESSAGE : input.setup === "skills" ? AGENT_SKILLS_SKIP_MESSAGE : AGENT_MCP_SKIP_MESSAGE,
 		selected: input.preselected ?? input.detected,
 		choices: input.available.map((id) => {
-			const command = missing.get(id);
+			const row = unusable.get(id);
 			return {
 				id,
 				title: `${getAgentDisplayName(id)} (${id})`,
-				description: command !== void 0 ? agentMissingCommandDescription(command) : detected.has(id) ? AGENT_DETECTED_DESCRIPTION : AGENT_OTHER_DESCRIPTION
+				description: row !== void 0 ? agentUnusableCommandDescription(row) : detected.has(id) ? AGENT_DETECTED_DESCRIPTION : AGENT_OTHER_DESCRIPTION
 			};
 		})
 	});

package/dist/mcp/agents.js

@@ -1,5 +1,7 @@
-import { agents, detectGlobalAgents, getAgentTypes } from "add-mcp";
+import { agents, detectGlobalAgents, detectProjectAgents as detectProjectAgents$1, getAgentTypes } from "add-mcp";
 // src/mcp/agents.ts
+const UNSUPPORTED_AGENTS = /* @__PURE__ */ new Set(["mastracode"]);
+const isSupportedAgent = (id) => !UNSUPPORTED_AGENTS.has(id);
 const AGENT_ALIASES = {
 	cursor: "cursor",
 	copilot: "vscode",
@@ -25,10 +27,25 @@ const AGENT_ALIASES = {
 	mcporter: "mcporter",
 	zed: "zed",
 	grok: "grok-build",
-	"grok-build": "grok-build"
+	"grok-build": "grok-build",
+	"factory-droid": "factory-droid",
+	droid: "factory-droid",
+	factory: "factory-droid",
+	fx: "fx",
+	hermes: "hermes",
+	"hermes-agent": "hermes",
+	junie: "junie",
+	"kilo-code": "kilo-code",
+	kilo: "kilo-code",
+	"kimi-code": "kimi-code",
+	kimi: "kimi-code",
+	"kimi-code-cli": "kimi-code",
+	"kiro-cli": "kiro-cli",
+	kiro: "kiro-cli",
+	pi: "pi"
 };
 function listMcpAgentIds() {
-	return getAgentTypes();
+	return getAgentTypes().filter(isSupportedAgent);
 }
 function getAgentDisplayName(id) {
 	return agents[id].displayName;
@@ -48,7 +65,10 @@ function resolveAddMcpAgentId(rawAgent) {
 	return resolved;
 }
 async function detectInstalledAgents() {
-	return detectGlobalAgents();
+	return (await detectGlobalAgents()).filter(isSupportedAgent);
+}
+function detectProjectAgents(cwd) {
+	return detectProjectAgents$1(cwd).filter(isSupportedAgent);
 }
 function uniqueAgentIds(ids) {
 	const seen = /* @__PURE__ */ new Set();
@@ -60,4 +80,4 @@ function uniqueAgentIds(ids) {
 	}
 	return out;
 }
-export { agentSupportsHttpMcp, agentSupportsProjectMcp, detectInstalledAgents, getAgentDisplayName, listMcpAgentIds, resolveAddMcpAgentId, tryResolveAddMcpAgentId, uniqueAgentIds };
+export { agentSupportsHttpMcp, agentSupportsProjectMcp, detectInstalledAgents, detectProjectAgents, getAgentDisplayName, listMcpAgentIds, resolveAddMcpAgentId, tryResolveAddMcpAgentId, uniqueAgentIds };

package/dist/mcp/install.js

@@ -1,7 +1,9 @@
-import { chmodSync, existsSync, readFileSync, writeFileSync } from "node:fs";
-import { basename, dirname, join } from "node:path";
-import { agents, upsertServer } from "add-mcp";
+import { getCliName } from "../utils/cli_name.js";
+import { chmodSync, existsSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { basename, dirname, join, relative } from "node:path";
 import { execFileSync } from "node:child_process";
+import { agents, upsertServer } from "add-mcp";
+import { parse } from "jsonc-parser";
 // src/mcp/install.ts
 const NEON_MCP_URL = "https://mcp.neon.tech/mcp";
 const NEON_MCP_NAME = "Neon";
@@ -45,6 +47,7 @@ function neonMcpUrl(options = {}) {
 }
 const BEARER_RE = /Bearer\s+([^\s"]+)/i;
 function nestedValue(root, key) {
+	if (key === "") return root;
 	let current = root;
 	for (const part of key.split(".")) {
 		if (!current || typeof current !== "object" || Array.isArray(current)) return;
@@ -77,35 +80,50 @@ function neonApiKeyFromFile(path, configKey) {
 	} catch {
 		return;
 	}
-	try {
-		return bearerFromNeonMcpConfig(neonServers(nestedValue(JSON.parse(raw), configKey)));
-	} catch {
-		const neonBlock = raw.match(/\[mcp_servers\.Neon\][\s\S]*?(?=\n\[|$)/)?.[0];
-		if (!neonBlock) return;
-		const url = neonBlock.match(/^url\s*=\s*"([^"]*)"/m)?.[1];
-		if (!url || !isNeonMcpUrl(url)) return;
-		return BEARER_RE.exec(neonBlock)?.[1];
-	}
+	const errors = [];
+	const parsed = parse(raw, errors, { allowTrailingComma: true });
+	if (errors.length === 0) return bearerFromNeonMcpConfig(neonServers(nestedValue(parsed, configKey)));
+	const neonBlock = raw.match(/\[mcp_servers\.Neon\][\s\S]*?(?=\n\[|$)/)?.[0];
+	if (!neonBlock) return;
+	const url = neonBlock.match(/^url\s*=\s*"([^"]*)"/m)?.[1];
+	if (!url || !isNeonMcpUrl(url)) return;
+	return BEARER_RE.exec(neonBlock)?.[1];
+}
+/**
+* Claude Code installs first so that a GitHub Copilot CLI install in the same run resolves to
+* the `.mcp.json` Claude Code creates, rather than to `.github/mcp.json`.
+*/
+function mcpInstallOrder(selected) {
+	return [...selected.filter((agent) => agent === "claude-code"), ...selected.filter((agent) => agent !== "claude-code")];
 }
-function configPathFor(agent, scope, cwd) {
+/** The file add-mcp's `upsertServer` writes for this agent when `selected` install in `mcpInstallOrder`. */
+function configPathFor(agent, scope, cwd, selected) {
 	const spec = agents[agent];
-	if (scope === "project") {
-		if (!spec.localConfigPath) return;
-		return join(cwd, spec.localConfigPath);
-	}
-	return spec.configPath;
+	const local = scope === "project";
+	if (local && !spec.localConfigPath) return;
+	if (local && agent === "github-copilot-cli" && selected.includes("claude-code")) return join(cwd, ".mcp.json");
+	if (spec.resolveConfigPath) return spec.resolveConfigPath(spec, {
+		local,
+		cwd
+	});
+	return local && spec.localConfigPath ? join(cwd, spec.localConfigPath) : spec.configPath;
 }
-function configKeyFor(agent, scope) {
+/** Where an existing Neon entry can sit, depending on the file's current layout. */
+function configKeysFor(agent, scope) {
 	const spec = agents[agent];
-	if (scope === "project" && spec.localConfigKey) return spec.localConfigKey;
-	return spec.configKey;
+	if (agent === "opencode") return ["mcp.servers", "mcp"];
+	if (agent === "github-copilot-cli" && scope === "project") return ["mcpServers", ""];
+	if (scope === "project" && spec.localConfigKey) return [spec.localConfigKey];
+	return [spec.configKey];
 }
 function existingNeonApiKey(options) {
 	for (const agent of options.agents) {
-		const path = configPathFor(agent, options.scope, options.cwd);
+		const path = configPathFor(agent, options.scope, options.cwd, options.agents);
 		if (!path) continue;
-		const key = neonApiKeyFromFile(path, configKeyFor(agent, options.scope));
-		if (key) return key;
+		for (const configKey of configKeysFor(agent, options.scope)) {
+			const key = neonApiKeyFromFile(path, configKey);
+			if (key) return key;
+		}
 	}
 }
 function isTrackedByGit(cwd, relativePath) {
@@ -129,15 +147,31 @@ function isTrackedByGit(cwd, relativePath) {
 }
 function trackedProjectMcpConfig(options) {
 	for (const agent of options.agents) {
-		const relativePath = agents[agent].localConfigPath;
-		if (!relativePath) continue;
+		const path = configPathFor(agent, "project", options.cwd, options.agents);
+		if (!path) continue;
+		const relativePath = relative(options.cwd, path);
 		if (isTrackedByGit(options.cwd, relativePath)) return relativePath;
 	}
 }
-function mcpUnsupportedReason(agent, scope) {
+function mcpUnsupportedReason(agent, scope, auth) {
 	const spec = agents[agent];
 	if (!spec.supportedTransports.includes("http")) return spec.unsupportedTransportMessage ?? `${spec.displayName} does not support remote HTTP MCP servers.`;
 	if (scope === "project" && !spec.localConfigPath) return `${spec.displayName} does not support project-level MCP config.`;
+	if (agent === "fx" && auth === "api-key") return `fx does not accept an API key in its MCP config. Run \`${getCliName()} mcp --oauth --agent fx\`.`;
+}
+/**
+* add-mcp refuses a project-level Claude Code install while `.github/mcp.json` exists without
+* `.mcp.json`, because GitHub Copilot CLI reads `.mcp.json` first once it exists. Neon writes
+* Claude Code's file anyway, so it creates `.mcp.json` before calling add-mcp.
+*/
+function createClaudeProjectConfig(cwd) {
+	const path = join(cwd, ".mcp.json");
+	if (existsSync(path) || !existsSync(join(cwd, ".github", "mcp.json"))) return;
+	writeFileSync(path, "{\n  \"mcpServers\": {}\n}\n");
+	return path;
+}
+function errorMessage(err) {
+	return err instanceof Error ? err.message : String(err);
 }
 function gitignoreProjectConfig(path) {
 	const dir = dirname(path);
@@ -171,7 +205,7 @@ function redactSecrets(text) {
 function installNeonMcpServer(options) {
 	const auth = options.auth ?? { kind: "oauth" };
 	const url = options.url ?? "https://mcp.neon.tech/mcp";
-	const unsupported = mcpUnsupportedReason(options.agent, options.scope);
+	const unsupported = mcpUnsupportedReason(options.agent, options.scope, auth.kind);
 	if (unsupported) return {
 		ok: false,
 		unsupported: true,
@@ -185,10 +219,41 @@ function installNeonMcpServer(options) {
 		type: "http",
 		url
 	};
+	const cwd = options.cwd ?? process.cwd();
+	let created;
+	if (options.agent === "claude-code" && options.scope === "project") try {
+		created = createClaudeProjectConfig(cwd);
+	} catch (err) {
+		return {
+			ok: false,
+			unsupported: false,
+			error: `Could not create ${join(cwd, ".mcp.json")}: ${errorMessage(err)}`
+		};
+	}
+	if (options.scope === "project" && auth.kind === "api-key") {
+		const tracked = trackedProjectMcpConfig({
+			agents: [options.agent],
+			cwd
+		});
+		if (tracked) return {
+			ok: false,
+			unsupported: false,
+			error: `${tracked} is tracked by git. Untrack it before writing an API key, or pass --oauth.`
+		};
+	}
 	const result = upsertServer(options.agent, NEON_MCP_NAME, server, {
 		local: options.scope === "project",
-		cwd: options.cwd
+		cwd
 	});
+	if (!result.success && created) try {
+		rmSync(created, { force: true });
+	} catch (err) {
+		return {
+			ok: false,
+			unsupported: false,
+			error: `${redactSecrets(result.error ?? "Failed to write Neon MCP server config")} Could not remove ${created}: ${errorMessage(err)}`
+		};
+	}
 	if (result.success) {
 		if (auth.kind === "api-key") {
 			const paths = [result.path, ...result.extraPaths ?? []];
@@ -212,4 +277,4 @@ function installNeonMcpServer(options) {
 		error: redactSecrets(result.error ?? "Failed to write Neon MCP server config")
 	};
 }
-export { NEON_MCP_CATEGORIES, NEON_MCP_NAME, NEON_MCP_URL, existingNeonApiKey, installNeonMcpServer, isMcpCategory, isNeonMcpUrl, mcpUnsupportedReason, neonMcpUrl, parseMcpCategories, trackedProjectMcpConfig };
+export { NEON_MCP_CATEGORIES, NEON_MCP_NAME, NEON_MCP_URL, existingNeonApiKey, installNeonMcpServer, isMcpCategory, isNeonMcpUrl, mcpInstallOrder, mcpUnsupportedReason, neonMcpUrl, parseMcpCategories, trackedProjectMcpConfig };

package/dist/mcp/targets.js

@@ -1,6 +1,5 @@
-import { detectInstalledAgents, listMcpAgentIds, resolveAddMcpAgentId, uniqueAgentIds } from "./agents.js";
+import { detectInstalledAgents, detectProjectAgents, listMcpAgentIds, resolveAddMcpAgentId, uniqueAgentIds } from "./agents.js";
 import { mcpUnsupportedReason } from "./install.js";
-import { detectProjectAgents } from "add-mcp";
 // src/mcp/targets.ts
 function mcpInstallableAgents(scope) {
 	return listMcpAgentIds().filter((id) => mcpUnsupportedReason(id, scope) === void 0);
@@ -14,7 +13,7 @@ function resolveInstallTargets(options) {
 	const install = [];
 	const skipped = [];
 	for (const agent of requested) {
-		const error = mcpUnsupportedReason(agent, options.scope);
+		const error = mcpUnsupportedReason(agent, options.scope, options.auth);
 		if (error) skipped.push({
 			agent,
 			error

package/dist/plugins/child_env.js

@@ -0,0 +1,10 @@
+// src/plugins/child_env.ts
+const TELEMETRY_BLOCKERS = ["DISABLE_TELEMETRY", "DO_NOT_TRACK"];
+/** The env the plugins CLI and the agent CLIs it calls run with. */
+const pluginsChildEnv = (base = process.env) => {
+	const env = { ...base };
+	for (const key of TELEMETRY_BLOCKERS) delete env[key];
+	for (const key of Object.keys(env)) if (key.toUpperCase() === "NEON_API_KEY") delete env[key];
+	return env;
+};
+export { pluginsChildEnv };