neon 8.15.1 → 8.16.1

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-B2Gym8Lw.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 { 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";

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/run.js

@@ -11,8 +11,6 @@ const PLUGIN_SKILLS = [
 	"neon-functions",
 	"neon-object-storage",
 	"neon-postgres",
-	"neon-postgres-branches",
-	"neon-postgres-egress-optimizer",
 	"neon-realtime"
 ];
 const PLUGINS_CLI_TIMEOUT_MS = 12e4;

package/dist/plugins/targets.js

@@ -1,8 +1,7 @@
-import { detectInstalledAgents, listMcpAgentIds, tryResolveAddMcpAgentId, uniqueAgentIds } from "../mcp/agents.js";
+import { detectInstalledAgents, detectProjectAgents, listMcpAgentIds, tryResolveAddMcpAgentId, uniqueAgentIds } from "../mcp/agents.js";
 import "../init/agents.js";
 import { pluginsChildEnv } from "./child_env.js";
 import { delimiter, dirname, join, resolve } from "node:path";
-import { detectProjectAgents } from "add-mcp";
 import { spawnSync } from "node:child_process";
 import which from "which";
 // src/plugins/targets.ts
@@ -29,13 +28,15 @@ const PLUGINS_TARGET_BY_TYPE = {
 			product: "Grok Build",
 			versionPrefix: "grok"
 		}
-	}
+	},
+	"kimi-code": { target: "kimi" }
 };
 const pluginsTargets = () => [...new Set(Object.values(PLUGINS_TARGET_BY_TYPE))];
 const USER_SCOPE_ONLY_TARGETS = /* @__PURE__ */ new Set([
 	"vscode",
 	"github-copilot",
-	"grok"
+	"grok",
+	"kimi"
 ]);
 /** npx runs the plugins CLI with every `node_modules/.bin` from `cwd` up to the root ahead of PATH. */
 const pluginsCommandSearchPath = (cwd, path) => {

package/dist/skills/catalog.js

@@ -33,16 +33,6 @@ const NEON_SKILL_CATALOG = [
 		source: AGENT_SKILLS_SOURCE,
 		defaultSelected: true
 	},
-	{
-		skill: "neon-postgres-branches",
-		source: AGENT_SKILLS_SOURCE,
-		defaultSelected: true
-	},
-	{
-		skill: "neon-postgres-egress-optimizer",
-		source: AGENT_SKILLS_SOURCE,
-		defaultSelected: true
-	},
 	{
 		skill: "neon-realtime",
 		source: AGENT_SKILLS_SOURCE,

package/dist/skills/targets.js

@@ -1,6 +1,5 @@
-import { detectInstalledAgents, listMcpAgentIds, uniqueAgentIds } from "../mcp/agents.js";
+import { detectInstalledAgents, detectProjectAgents, listMcpAgentIds, uniqueAgentIds } from "../mcp/agents.js";
 import { getSkillsAgentName, supportsSkills } from "../init/agents.js";
-import { detectProjectAgents } from "add-mcp";
 // src/skills/targets.ts
 const skillsInstallableAgents = () => listMcpAgentIds().filter((id) => supportsSkills(id));
 const detectSkillsAgents = async (options) => {

package/dist/update_notifier.js

@@ -7,8 +7,8 @@ import { existsSync, readFileSync, realpathSync } from "node:fs";
 import { basename, dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { spawn } from "node:child_process";
-import which from "which";
 import semver from "semver";
+import which from "which";
 // src/update_notifier.ts
 const DAY_MS = 864e5;
 const CHECK_INTERVAL_MS = DAY_MS;

package/dist/utils/ai_gateway_notice.js

@@ -68,7 +68,7 @@ const buildAiGatewayNotice = ({ subscriptionType, modelIds, upgradeUrl, moreMode
 	};
 	if (modelIds !== void 0 && modelIds.length > 0 && !hasFlagshipModels(modelIds)) return {
 		level: "warning",
-		message: `AI Gateway is in public beta and not every model is enabled for your account yet, so some models are missing from the catalog. Request access to more models here: ${moreModelsUrl}`
+		message: `Not every model is enabled for your account yet, so some models are missing from the catalog. Request access to more models here: ${moreModelsUrl}`
 	};
 	return null;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neon",
-  "version": "8.15.1",
+  "version": "8.16.1",
   "description": "CLI tool for Neon, the cloud backend primitives built around Lakebase Postgres",
   "keywords": [
     "neon",
@@ -46,7 +46,7 @@
     "@clack/prompts": "0.10.1",
     "@hono/node-server": "2.0.4",
     "@segment/analytics-node": "1.3.0",
-    "add-mcp": "2.0.0",
+    "add-mcp": "2.6.0",
     "ajv": "^8.20.0",
     "ajv-formats": "^3.0.1",
     "chalk": "5.3.0",
@@ -55,6 +55,7 @@
     "diff": "5.2.0",
     "execa": "^9.5.2",
     "fflate": "^0.8.3",
+    "jsonc-parser": "3.3.1",
     "open": "^10.2.0",
     "openid-client": "6.8.1",
     "pg": "^8.20.0",
@@ -72,10 +73,10 @@
     "yaml": "^2.9.0",
     "yargs": "17.7.2",
     "yoctocolors": "^2.1.2",
-    "@neon/config": "1.10.0",
+    "@neon/config-runtime": "1.11.0",
     "@neon/realtime": "0.1.2",
     "@neon/sdk": "7.7.0",
-    "@neon/config-runtime": "1.11.0"
+    "@neon/config": "1.10.0"
   },
   "optionalDependencies": {
     "@napi-rs/keyring": "1.3.0",
@@ -111,11 +112,11 @@
     "tsx": "4.22.3",
     "typescript": "^5.9.0",
     "vitest": "^3.0.9",
-    "@neon-internals/cli-core": "0.0.0",
     "@neon-internals/env-core": "0.0.38",
+    "@neon-internals/cli-core": "0.0.0",
     "@neon/env": "1.6.8",
-    "@neon/e2e-harness": "0.0.0",
-    "@neon/functions": "0.11.0"
+    "@neon/functions": "0.11.0",
+    "@neon/e2e-harness": "0.0.0"
   },
   "publishConfig": {
     "access": "public",

package/dist/_chunks/{bootstrap-BDkvsAVJ.js → bootstrap-vAtWRZXa.js}

@@ -4,13 +4,13 @@ import { log } from "../log.js";
 import { recordCommandSuccessExtras, recordScaffoldedTemplate } from "../analytics.js";
 import { getCliName } from "../utils/cli_name.js";
 import { helpCsv, helpEpilogue } from "../utils/help_text.js";
-import { coerceAgentFlag } from "../utils/agent_flag.js";
-import { assertNamedAgentTooling, chooseYesAgentTooling, initPluginAgents, initSkillsMcpAgents, postScaffoldActions, projectContextFile, resolveNamedAgents } from "../init/plan.js";
 import { formatInstallCommand, inferPackageManager, installArgs, installedPackageManagers, resolvePackageManager, runCommand } from "../utils/package_manager.js";
 import { writer } from "../writer.js";
 import { FALLBACK_TEMPLATES, ensureTargetUsable, fetchTemplates, findTemplate, scaffoldTemplate, templateIds } from "../init/bootstrap.js";
 import { agentSetupDoneLabel, formatInitDone, printInitBanner, printInitDone, shouldPrintInitBanner } from "../init/chrome.js";
 import { runAuthenticatedLink } from "../init/link.js";
+import { coerceAgentFlag } from "../utils/agent_flag.js";
+import { assertNamedAgentTooling, chooseYesAgentTooling, initPluginAgents, initSkillsMcpAgents, postScaffoldActions, projectContextFile, resolveNamedAgents } from "../init/plan.js";
 import { formatTemplateTitle } from "../init/template_title.js";
 import { pickAgentSetupInteractively, pickInitLinkInteractively } from "../init/wizard.js";
 import { runAgentTooling } from "../init/tooling.js";

package/dist/_chunks/{env-BOt9AZ1j.js → env-BtG4vH55.js}

@@ -7,9 +7,9 @@ import { deprecatedServiceMessage, parseServices, servicesFlagValue, servicesOpt
 import { mergeEnvFile, readEnvFile, resolveEnvFilePath } from "../env_file.js";
 import { t as NEON_ENV_VAR_KEYS, u as isFunctionBaseUrlKey } from "./env-JgoSsmyt.js";
 import { ENV_PULL_KEY_HELP, ENV_PULL_SERVICES, envKeysForSelection, envPullFlagValue, ownedEnvServiceKeys, parseEnvPullKeys } from "../env_services.js";
-import { i as dropClaimableUnsupported, o as resolveNeonEnvVars } from "./env-CIFMBEon.js";
 import { fillSingleProject, resolveBranchRef } from "../utils/enrichers.js";
 import { warnAiGateway } from "../utils/ai_gateway_notice.js";
+import { i as dropClaimableUnsupported, o as resolveNeonEnvVars } from "./env-CIFMBEon.js";
 import { formatPulledEnv, pulledBranch } from "../commands/env_output.js";
 import { existsSync } from "node:fs";
 import chalk from "chalk";

package/dist/_chunks/{plugins-B2Gym8Lw.js → plugins-7cxVcgay.js}

@@ -2,13 +2,13 @@ import { t as __exportAll } from "./rolldown-runtime-BJohB4LM.js";
 import { log } from "../log.js";
 import { recordCommandSuccessExtras } from "../analytics.js";
 import { helpCsv, helpEpilogue } from "../utils/help_text.js";
+import { writer } from "../writer.js";
+import { noPassthrough } from "../utils/flags.js";
 import { getAgentDisplayName } from "../mcp/agents.js";
-import { NEON_MCP_URL } from "../mcp/install.js";
 import "../init/agents.js";
 import { pluginsCommandProblemText, pluginsInstallableAgents } from "../plugins/targets.js";
-import { writer } from "../writer.js";
-import { noPassthrough } from "../utils/flags.js";
 import { AGENT_PLUGIN_SKIP_MESSAGE } from "../init/copy.js";
+import { NEON_MCP_URL } from "../mcp/install.js";
 import { canPickAgentsInteractively, skippableAgentPicker } from "../utils/agent_picker.js";
 import { resolvePluginsPlan } from "../plugins/plan.js";
 import { NEON_PLUGIN_NAME, PLUGIN_SKILLS, PLUGIN_SOURCE, neonPluginsRetryCommand, pluginsAddArgs, runPluginsCli } from "../plugins/run.js";

package/dist/_chunks/{skills-DKgafm65.js → skills-Bv8oKKwE.js}

@@ -2,12 +2,12 @@ import { t as __exportAll } from "./rolldown-runtime-BJohB4LM.js";
 import { log } from "../log.js";
 import { recordCommandSuccessExtras } from "../analytics.js";
 import { helpCsv, helpEpilogue } from "../utils/help_text.js";
-import { getAgentDisplayName } from "../mcp/agents.js";
-import "../init/agents.js";
-import { mappedSkillsAgentNames, skillsInstallableAgents } from "../skills/targets.js";
 import { writer } from "../writer.js";
 import { noPassthrough } from "../utils/flags.js";
+import { getAgentDisplayName } from "../mcp/agents.js";
+import "../init/agents.js";
 import { AGENT_SKILLS_SKIP_MESSAGE } from "../init/copy.js";
+import { mappedSkillsAgentNames, skillsInstallableAgents } from "../skills/targets.js";
 import { canPickAgentsInteractively, skippableAgentPicker } from "../utils/agent_picker.js";
 import { skillsHelpValues, skillsYesHelp } from "../skills/catalog.js";
 import { lockPath, neonSkillsUpdateCommand, readLockedSkills, refreshSkillsCheckCache, scopeLabel, skillsCheckCachePath, skillsStatusRows } from "../skills/freshness.js";