neon 3.4.0 → 3.5.0

package/dist/init/phases/setup.js

@@ -1,9 +1,10 @@
 import { FALLBACK_TEMPLATES, fetchTemplates, findTemplate, scaffoldTemplate } from "../bootstrap.js";
 import { detectIde, isCursorInstalled, isVSCodeInstalled } from "../detect_agent.js";
-import { resolveAddMcpAgentId } from "../agents.js";
+import { agentSupportsProjectMcp, getSkillsAgentName, listMcpAgentIds, resolveAddMcpAgentId, supportsSkills, tryResolveAddMcpAgentId } from "../agents.js";
 import { NEON_EXTENSION_ID, downloadVsix } from "../vsix.js";
 import { findEditorCommand } from "../extension.js";
 import { inspectProject } from "../inspect.js";
+import { installNeonMcpServer } from "../install_mcp.js";
 import { ensureNeonctl } from "../neonctl.js";
 import { ensureSkillsUpToDate } from "../skills.js";
 import { writeFileSync } from "node:fs";
@@ -105,7 +106,7 @@ async function buildBulkInspection(options) {
 				"",
 				"GROUPING: Preferences that share the same `group` field should be presented together in a single message (e.g. list all customize options at once and let the user answer them together). Preferences without a `group` must be asked individually.",
 				"",
-				detectedIde ? `The CLI has detected the IDE as: ${detectedIde.toLowerCase()}. Include this as the "ide" field in your reportBack data. IMPORTANT: The IDE and the agent are different — you may be Claude Code (agent) running inside Cursor (IDE). The extension installs into the IDE, so if the IDE is Cursor/VS Code/Windsurf, the extension IS applicable even if you are Claude Code.` : installedEditors.length > 0 ? `No IDE detected, but the following editors are installed: ${installedEditors.join(", ")}. The "installedEditors" field in this response lists them. If the user wants the extension installed, ask which editor to install it for and include that as the "ide" field in your reportBack data. If not, set "ide" to "none".` : `No IDE or supported editors detected. Set "ide" to "none" in your reportBack data.`,
+				detectedIde ? `The CLI has detected the IDE as: ${detectedIde.toLowerCase()}. Include this as the "ide" field in your reportBack data. IMPORTANT: The IDE and the agent are different — you may be Claude Code (agent) running inside Cursor (IDE). The extension installs into the IDE, so if the IDE is Cursor or VS Code, the extension IS applicable even if you are Claude Code.` : installedEditors.length > 0 ? `No IDE detected, but the following editors are installed: ${installedEditors.join(", ")}. The "installedEditors" field in this response lists them. If the user wants the extension installed, ask which editor to install it for and include that as the "ide" field in your reportBack data. If not, set "ide" to "none".` : `No IDE or supported editors detected. Set "ide" to "none" in your reportBack data.`,
 				"",
 				"After all questions are answered, call reportBack with a single --data JSON containing: agent, ide, mcpConfigured, and all preference answers. The CLI will inspect the project and merge results automatically."
 			].join("\n"),
@@ -123,7 +124,7 @@ async function buildBulkInspection(options) {
 				{
 					id: "agent_type",
 					description: "Identify which coding agent is running this command",
-					lookFor: ["Determine which agent you are: cursor, claude-code, copilot, vscode, windsurf, codex, cline, gemini-cli, goose, opencode, or antigravity", "Report your own agent identifier — this is used to configure the MCP server for the correct tool"]
+					lookFor: [`Determine which agent you are: ${listMcpAgentIds().join(", ")}`, "Report your own agent identifier — this is used to configure the MCP server for the correct tool"]
 				},
 				...detectedIde ? [{
 					id: "extension_installed",
@@ -150,7 +151,7 @@ async function buildBulkInspection(options) {
 				...(() => {
 					const isPartialSkills = String(options.skillsScope ?? "").includes("partial");
 					const needsMcpChoice = !options.mcpConfigured;
-					const needsSkillsChoice = !options.skillsInstalled && !isPartialSkills;
+					const needsSkillsChoice = !options.skillsInstalled && !isPartialSkills && !(options.agent && !supportsSkills(options.agent));
 					if (!(needsMcpChoice || needsSkillsChoice)) return [];
 					return [{
 						id: "mode",
@@ -176,10 +177,14 @@ async function buildBulkInspection(options) {
 							value: "global",
 							label: "Global (available in all projects)"
 						},
-						{
-							value: "project",
-							label: "Project-level (scoped to this project only)"
-						},
+						...(() => {
+							const known = options.agent ? tryResolveAddMcpAgentId(options.agent) : void 0;
+							if (known && !agentSupportsProjectMcp(known)) return [];
+							return [{
+								value: "project",
+								label: "Project-level (scoped to this project only)"
+							}];
+						})(),
 						{
 							value: "none",
 							label: "Skip — do not install the MCP server"
@@ -192,7 +197,7 @@ async function buildBulkInspection(options) {
 					},
 					group: "customize"
 				},
-				...!options.skillsInstalled && !String(options.skillsScope ?? "").includes("partial") ? [{
+				...!options.skillsInstalled && !String(options.skillsScope ?? "").includes("partial") && !(options.agent && !supportsSkills(options.agent)) ? [{
 					id: "skillsScope",
 					question: "Where should Neon agent skills be installed?",
 					context: "Only ask if skills are not already installed.",
@@ -223,7 +228,7 @@ async function buildBulkInspection(options) {
 						label: "No"
 					}],
 					default: "true",
-					context: "The extension installs into the IDE, NOT the agent. If the CLI detected the IDE (see detectedIde field), use that — e.g. Claude Code running inside Cursor means the IDE is Cursor and the extension IS applicable. Only applicable for VS Code-based IDEs (VS Code, Cursor, Windsurf). SKIP this question if the user is NOT in a VS Code-based IDE, or if the extension_installed check found it is already installed. Set installExtension to false in reportBack if skipped.",
+					context: "The extension installs into the IDE, NOT the agent. If the CLI detected the IDE (see detectedIde field), use that — e.g. Claude Code running inside Cursor means the IDE is Cursor and the extension IS applicable. Only applicable for VS Code and Cursor. SKIP this question if the user is NOT in VS Code or Cursor, or if the extension_installed check found it is already installed. Set installExtension to false in reportBack if skipped.",
 					condition: {
 						preferenceId: "mode",
 						equals: "customize"
@@ -245,7 +250,9 @@ async function buildBulkInspection(options) {
 						const needsSkillsChoice = !options.skillsInstalled && !hasPartial;
 						const hasModeQuestion = needsMcpChoice || needsSkillsChoice;
 						const modeField = hasModeQuestion ? ", mode: string" : "";
-						const mcpField = hasModeQuestion ? ", mcpScope?: 'global'|'project'|'none'" : "";
+						const knownAgent = options.agent ? tryResolveAddMcpAgentId(options.agent) : void 0;
+						const mcpScopeUnion = knownAgent && !agentSupportsProjectMcp(knownAgent) ? "'global'|'none'" : "'global'|'project'|'none'";
+						const mcpField = hasModeQuestion ? `, mcpScope?: ${mcpScopeUnion}` : "";
 						const skillsField = needsSkillsChoice ? ", skillsScope?: string" : "";
 						const extField = hasModeQuestion ? ", installExtension?: bool" : "";
 						return `<json: { agent: string, ide: string, mcpConfigured: bool${options.skillsInstalled || hasPartial ? `, skillsScope: "${options.skillsInstalled ? options.skillsScope || "project" : partialScope}"` : skillsField}${previewFlag}${modeField}${mcpField}${extField}${hasApp ? ", features?: string" : ", template: string"} }>`;
@@ -332,22 +339,12 @@ async function executeBatchedInstallation(options) {
 		status: "success"
 	});
 	else {
-		const mcpArgs = [
-			"-y",
-			"add-mcp",
-			"https://mcp.neon.tech/mcp",
-			...mcpScope === "global" ? ["-g"] : [],
-			"-n",
-			"Neon",
-			"-y",
-			"-a",
-			mcpAgentId
-		];
-		try {
-			await execa("npx", mcpArgs, {
-				stdio: "pipe",
-				timeout: 6e4
-			});
+		const installed = installNeonMcpServer({
+			agent: mcpAgentId,
+			scope: mcpScope === "project" ? "project" : "global",
+			cwd: process.cwd()
+		});
+		if (installed.ok) {
 			results.push({
 				id: "install_mcp",
 				description: `Installed Neon MCP server (${mcpScope} scope)`,
@@ -366,20 +363,32 @@ async function executeBatchedInstallation(options) {
 				status: "success",
 				manualAction: true
 			});
-		} catch (err) {
+		} else if (installed.unsupported) {
+			const projectUnsupported = mcpScope === "project" && !agentSupportsProjectMcp(mcpAgentId);
 			results.push({
 				id: "install_mcp",
-				description: "Failed to install Neon MCP server",
-				status: "failed",
-				error: err instanceof Error ? err.message : "Unknown error"
+				description: installed.error,
+				status: projectUnsupported ? "failed" : "success",
+				...projectUnsupported ? { error: installed.error } : { manualAction: true }
 			});
-		}
+		} else results.push({
+			id: "install_mcp",
+			description: "Failed to install Neon MCP server",
+			status: "failed",
+			error: installed.error
+		});
 	}
+	const skillsAgent = getSkillsAgentName(agentId);
 	if (isBootstrap) results.push({
 		id: "install_skills",
 		description: "Neon agent skills included in template",
 		status: "success"
 	});
+	else if (!skillsAgent) results.push({
+		id: "skip_skills",
+		description: "No Neon agent skills target for this agent",
+		status: "success"
+	});
 	else {
 		const skillsScope = options.skillsScope ?? "project";
 		if (await ensureSkillsUpToDate(agentId, skillsScope, options.preview)) results.push({
@@ -389,7 +398,7 @@ async function executeBatchedInstallation(options) {
 		});
 		else {
 			const { getSkillList } = await import("../skills.js");
-			const cmds = getSkillList(options.preview).map((s) => `skills add neondatabase/agent-skills --skill ${s} --agent ${agentId}${skillsScope === "global" ? " -g" : ""} -y`);
+			const cmds = getSkillList(options.preview).map((s) => `skills add neondatabase/agent-skills --skill ${s} --agent ${skillsAgent}${skillsScope === "global" ? " -g" : ""} -y`);
 			results.push({
 				id: "install_skills",
 				description: "Failed to install Neon agent skills automatically. Run these commands to install manually:",
@@ -478,7 +487,7 @@ async function mergeCliInspection(options) {
 function isVscodeBasedIde(options) {
 	if (options.ide) {
 		const ide = options.ide.toLowerCase();
-		return ide === "cursor" || ide === "vscode" || ide === "vs-code" || ide === "windsurf";
+		return ide === "cursor" || ide === "vscode" || ide === "vs-code";
 	}
 	return options.isVscodeIde === true;
 }

package/dist/init/phases/skills.js

@@ -1,5 +1,5 @@
 import { getSkillsAgentName } from "../agents.js";
-import { SKILL_REFERENCE_URLS } from "../skills.js";
+import { SKILL_REFERENCE_URLS, getSkillList } from "../skills.js";
 //#region src/init/phases/skills.ts
 async function handleSkillsPhase(options) {
 	const agentArgs = options.agent ? [
@@ -8,6 +8,14 @@ async function handleSkillsPhase(options) {
 		"--json"
 	] : ["--json"];
 	const skillsAgent = options.agent ? getSkillsAgentName(options.agent) : "claude-code";
+	if (options.agent && !skillsAgent) return {
+		phase: "tooling",
+		status: "skipped",
+		nextAction: {
+			type: "run_neon_init",
+			args: agentArgs
+		}
+	};
 	if (options.status) return {
 		phase: "tooling",
 		status: "skills_check",
@@ -34,7 +42,7 @@ async function handleSkillsPhase(options) {
 		status: "installing_skills",
 		nextAction: {
 			type: "run_command",
-			command: `npx -y skills add neondatabase/agent-skills --skill neon-postgres --agent ${skillsAgent} -y`,
+			command: getSkillList().map((skill) => `npx -y skills add neondatabase/agent-skills --skill ${skill} --agent ${skillsAgent ?? "claude-code"} -y`).join(" && "),
 			description: `Installing Neon agent skills for ${skillsAgent}.`,
 			timeout: 3e4,
 			onSuccess: {

package/dist/init/phases/status.js

@@ -1,7 +1,8 @@
+import { supportsSkills, tryResolveAddMcpAgentId } from "../agents.js";
 import { isAuthenticated } from "../auth.js";
 import { inspectProject } from "../inspect.js";
 //#region src/init/phases/status.ts
-async function handleStatusPhase(_options) {
+async function handleStatusPhase(options) {
 	const authed = await isAuthenticated();
 	const inspection = await inspectProject([
 		{
@@ -41,7 +42,8 @@ async function handleStatusPhase(_options) {
 		message: "No DATABASE_URL found in .env",
 		command: `neon init --agent --data '{"step":"db"}'`
 	});
-	if (!skillsInstalled) recommendations.push({
+	const statusAgent = options.agent ? tryResolveAddMcpAgentId(options.agent) : void 0;
+	if (!skillsInstalled && (!statusAgent || supportsSkills(statusAgent))) recommendations.push({
 		priority: "medium",
 		message: "Neon agent skills not detected in this project",
 		command: `neon init --agent --data '{"step":"skills","install":true}'`

package/dist/init/skills.js

@@ -3,8 +3,8 @@ import { getSkillsAgentName } from "./agents.js";
 import { existsSync, statSync } from "node:fs";
 import { resolve } from "node:path";
 import { log, spinner } from "@clack/prompts";
-import { execa } from "execa";
 import { dim } from "yoctocolors";
+import { execa } from "execa";
 //#region src/init/skills.ts
 /**
 * Ensures the `skills` CLI is globally installed so npx doesn't need
@@ -51,41 +51,20 @@ const SKILL_REFERENCE_URLS = {
 	neonJs: `${SKILL_BASE_URL}/neon-js.md`
 };
 /**
-* Maps Editor display names to the skills CLI agent name.
-*/
-function editorToSkillsAgent(editor) {
-	switch (editor) {
-		case "Cursor": return "cursor";
-		case "VS Code":
-		case "GitHub Copilot CLI": return "github-copilot";
-		case "Claude CLI": return "claude-code";
-		case "Codex": return "codex";
-		case "OpenCode": return "opencode";
-		case "Antigravity": return "antigravity";
-		case "Cline":
-		case "Cline CLI": return "cline";
-		case "Gemini CLI": return "gemini-cli";
-		case "Goose": return "goose";
-		case "Claude Desktop": return "claude-code";
-		case "MCPorter": return "mcporter";
-		case "Zed": return "zed";
-		default: return "";
-	}
-}
-/**
 * Installs Neon agent skills using Vercel's skills CLI.
 */
-async function installAgentSkills(selectedEditors, options) {
+async function installAgentSkills(selectedAgents, options) {
 	const quiet = options?.json === true;
-	const editorsWithSkills = selectedEditors.filter((e) => editorToSkillsAgent(e) !== "");
-	if (editorsWithSkills.length === 0) return true;
+	const agentsWithSkills = selectedAgents.filter((id) => getSkillsAgentName(id) !== void 0);
+	if (agentsWithSkills.length === 0) return true;
 	const skillsSpinner = quiet ? null : spinner();
 	skillsSpinner?.start("Installing agent skills for Neon in this project...");
 	let anyFailed = false;
 	await ensureSkillsCli();
 	const skills = getSkillList(options?.preview);
-	for (const editor of editorsWithSkills) {
-		const agentName = editorToSkillsAgent(editor);
+	for (const agent of agentsWithSkills) {
+		const agentName = getSkillsAgentName(agent);
+		if (!agentName) continue;
 		for (const skill of skills) try {
 			await execa("skills", [
 				"add",
@@ -101,7 +80,7 @@ async function installAgentSkills(selectedEditors, options) {
 				timeout: 12e4
 			});
 		} catch (error) {
-			if (!quiet) log.error(`Failed to install skill ${skill} for ${editor}: ${error instanceof Error ? error.message : "Unknown error"}`);
+			if (!quiet) log.error(`Failed to install skill ${skill} for ${agent}: ${error instanceof Error ? error.message : "Unknown error"}`);
 			anyFailed = true;
 		}
 	}
@@ -126,9 +105,42 @@ const GLOBAL_SKILLS_DIRS = (() => {
 		"claude-code": [resolve(home, ".claude", "skills"), agentsDir],
 		"github-copilot": [resolve(home, ".vscode", "skills"), agentsDir],
 		codex: [resolve(home, ".codex", "skills"), agentsDir],
-		cline: [resolve(home, ".cline", "skills"), agentsDir]
+		cline: [resolve(home, ".cline", "skills"), agentsDir],
+		grok: [resolve(home, ".grok", "skills"), agentsDir]
 	};
 })();
+const PROJECT_SKILLS_DIRS = {
+	cursor: [".cursor/skills", ".agents/skills"],
+	"claude-code": [".claude/skills", ".agents/skills"],
+	"github-copilot": [".vscode/skills", ".agents/skills"],
+	codex: [".codex/skills", ".agents/skills"],
+	cline: [".cline/skills", ".agents/skills"],
+	grok: [".grok/skills", ".agents/skills"]
+};
+function skillDirsForAgent(skillsId, scope, cwd, home) {
+	if (scope === "global") return [.../* @__PURE__ */ new Set([...GLOBAL_SKILLS_DIRS[skillsId] ?? [], resolve(home, ".agents", "skills")])];
+	return [...new Set([...PROJECT_SKILLS_DIRS[skillsId] ?? [], ".agents/skills"].map((dir) => resolve(cwd, dir)))];
+}
+function missingSkillsForAgent(agent, options = {}) {
+	const skillsId = getSkillsAgentName(agent);
+	if (!skillsId) return [];
+	const cwd = options.cwd ?? process.cwd();
+	const home = process.env.HOME || process.env.USERPROFILE || "";
+	const dirs = skillDirsForAgent(skillsId, options.scope ?? "project", cwd, home);
+	return getSkillList(options.preview).filter((skill) => !dirs.some((dir) => existsSync(resolve(dir, skill, "SKILL.md"))));
+}
+function skillsInstalledForAgent(agent, cwd = process.cwd(), preview = false) {
+	if (!getSkillsAgentName(agent)) return true;
+	return missingSkillsForAgent(agent, {
+		cwd,
+		scope: "project",
+		preview
+	}).length === 0 || missingSkillsForAgent(agent, {
+		cwd,
+		scope: "global",
+		preview
+	}).length === 0;
+}
 /**
 * Checks whether skills were recently updated (within the freshness window).
 * Checks both project-level (skills-lock.json mtime) and global (skills dir mtime).
@@ -136,18 +148,16 @@ const GLOBAL_SKILLS_DIRS = (() => {
 function skillsAreFresh(agent, requiredSkills) {
 	const now = Date.now();
 	const cwd = process.cwd();
-	const projectSkillDirs = [
-		".agents",
-		".cursor",
-		".claude"
-	];
+	const skillsId = getSkillsAgentName(agent);
+	const projectDirs = (skillsId ? PROJECT_SKILLS_DIRS[skillsId] : void 0)?.map((dir) => resolve(cwd, dir)) ?? [];
 	const lockPath = resolve(cwd, "skills-lock.json");
-	if (existsSync(lockPath)) try {
+	if (existsSync(lockPath) && projectDirs.length > 0) try {
 		if (now - statSync(lockPath).mtimeMs < SKILLS_FRESHNESS_MS) {
-			if (requiredSkills.every((skill) => projectSkillDirs.some((dir) => existsSync(resolve(cwd, dir, "skills", skill, "SKILL.md"))))) return true;
+			if (requiredSkills.every((skill) => projectDirs.some((dir) => existsSync(resolve(dir, skill, "SKILL.md"))))) return true;
 		}
 	} catch {}
 	const agentName = getSkillsAgentName(agent);
+	if (!agentName) return false;
 	const globalDirs = GLOBAL_SKILLS_DIRS[agentName] ?? [];
 	for (const dir of globalDirs) if (requiredSkills.every((skill) => existsSync(resolve(dir, skill, "SKILL.md")))) try {
 		if (now - statSync(resolve(dir, requiredSkills[0], "SKILL.md")).mtimeMs < SKILLS_FRESHNESS_MS) return true;
@@ -163,23 +173,15 @@ function skillsAreFresh(agent, requiredSkills) {
 */
 async function ensureSkillsUpToDate(agent, scope, preview) {
 	const resolvedAgent = agent || "cursor";
-	const skills = getSkillList(preview);
-	if (skillsAreFresh(resolvedAgent, skills)) return true;
-	await ensureSkillsCli();
 	const agentName = getSkillsAgentName(resolvedAgent);
+	if (!agentName) return true;
+	if (skillsAreFresh(resolvedAgent, getSkillList(preview))) return true;
+	await ensureSkillsCli();
 	let allOk = true;
-	const home = process.env.HOME || process.env.USERPROFILE || "";
-	const cwd = process.cwd();
-	const checkDirs = scope === "global" ? [
-		resolve(home, ".cursor", "skills"),
-		resolve(home, ".claude", "skills"),
-		resolve(home, ".agents", "skills")
-	] : [
-		resolve(cwd, ".cursor", "skills"),
-		resolve(cwd, ".claude", "skills"),
-		resolve(cwd, ".agents", "skills")
-	];
-	const missingSkills = skills.filter((skill) => !checkDirs.some((dir) => existsSync(resolve(dir, skill, "SKILL.md"))));
+	const missingSkills = missingSkillsForAgent(resolvedAgent, {
+		scope: scope ?? "project",
+		preview
+	});
 	if (missingSkills.length === 0) return true;
 	for (const skill of missingSkills) try {
 		await execa("skills", [
@@ -201,4 +203,4 @@ async function ensureSkillsUpToDate(agent, scope, preview) {
 	return allOk;
 }
 //#endregion
-export { SKILL_REFERENCE_URLS, ensureSkillsUpToDate, getSkillList, installAgentSkills };
+export { SKILL_REFERENCE_URLS, ensureSkillsUpToDate, getSkillList, installAgentSkills, missingSkillsForAgent, skillsInstalledForAgent };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neon",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "description": "CLI tool for Neon, the cloud backend primitives built around Lakebase Postgres",
   "keywords": [
     "neon",
@@ -46,6 +46,7 @@
     "@clack/prompts": "0.10.1",
     "@hono/node-server": "2.0.4",
     "@segment/analytics-node": "1.3.0",
+    "add-mcp": "2.0.0",
     "chalk": "5.3.0",
     "chokidar": "5.0.0",
     "cli-table": "0.3.11",
@@ -63,8 +64,8 @@
     "yaml": "^2.9.0",
     "yargs": "17.7.2",
     "yoctocolors": "^2.1.2",
-    "@neon/config": "1.0.0",
     "@neon/sdk": "2.0.0",
+    "@neon/config": "1.0.0",
     "@neon/config-runtime": "1.0.0"
   },
   "optionalDependencies": {