neon 4.10.2 → 4.11.1

package/README.md

@@ -683,7 +683,7 @@ When a package cannot be bundled — a native addon with no esbuild loader, or a
 
 `neon bootstrap` copies a Neon starter template into a new (or current) directory — conceptually like `degit`, but it only pulls from a small set of templates we maintain in the public [`neondatabase/examples`](https://github.com/neondatabase/examples) repo. The template copy needs no Neon login: it downloads files from GitHub.
 
-After scaffolding, an interactive terminal asks about dependency install, git, agent tooling (the Neon plugin, or skills and MCP separately — never both), and `neon link` before running those steps. Dependency install is last, except when the template has a `neon.ts` and you chose to link — then install runs first so link can pull env. `--default` / `-y` skips the template, install, git, and agent pickers, then runs `link --yes`. `link --yes` still asks for a project unless one is already linked. `--no-agent-setup` and `--no-link` skip those. Non-interactive without `--default` prints next steps and does not install, set up agents, or link.
+After scaffolding, an interactive terminal asks about dependency install, git, agent tooling (the Neon plugin, or skills and MCP separately — never both), and `neon link` before running those steps. Dependency install is last, except when the template has a `neon.ts` and you chose to link — then install runs first so link can pull env. `--default` / `-y` skips the template, install, git, and agent pickers, then installs agent tooling for project folders, else the host CLI agent. If none are found, it exits: pass `--agent <name>`, run from a supported agent, or omit `--default` / `-y` in a terminal to pick. `--agent` / `-a` names coding agents, skips agent selection, and is forwarded to `plugins`, or to `skills` and `mcp`, not both. `link --yes` still asks for a project unless one is already linked. `--no-agent-setup` and `--no-link` skip those. Non-interactive without `--default` prints next steps and does not install, set up agents, or link.
 
 Pass a target directory (or `.` for the current one). In an interactive terminal you pick the template from a list; in CI / non-interactive contexts pass `--template <id>`.
 
@@ -694,6 +694,9 @@ $ neon bootstrap my-app
 # Scaffold a specific template into the current directory (skips the template picker)
 $ neon bootstrap . --template hono
 
+# Skip agent selection; install the plugin for those agents
+$ neon bootstrap my-app --agent cursor --agent claude-code
+
 # List templates
 $ neon bootstrap --list-templates
 
@@ -716,11 +719,16 @@ In an interactive terminal it offers one of: the Neon plugin (`neon plugins`), s
 ```bash
 $ neon init
 $ neon init -y
+$ neon init --agent cursor --agent claude-code
 ```
 
-`-y` skips the template picker and the agent-setup offer. Empty dir: `bootstrap --default`. Existing app: plugin when a project-level plugin agent is detected (Cursor, Claude Code, Codex); otherwise skills and MCP. VS Code, GitHub Copilot CLI, and Grok only take the plugin user-level (`neon plugins --global`), so `-y` uses skills and MCP for those.
+Without a TTY, pass `-y`. `--agent` skips agent selection but does not replace `-y` for link or templates.
+
+`-y` skips the template picker and the agent-setup offer. Empty dir: `bootstrap --default`. Existing app: plugin when Cursor, Claude Code, or Codex is in project folders, else the host CLI agent; otherwise skills and MCP. If none are found, it exits: pass `--agent <name>`, run from a supported agent, or omit `-y` in a terminal to pick. VS Code, GitHub Copilot CLI, and Grok only take the plugin user-level (`neon plugins --global`), so `-y` uses skills and MCP for those.
+
+`--agent` / `-a` (repeatable) names coding agents and skips agent selection, interactive or with `-y`. Init forwards those names to `plugins`, or to `skills` and `mcp`, not both.
 
-`-y` forwards `-y` to `plugins` or `skills`/`mcp`, `--default` to `bootstrap`, `--yes` to `link`, and `--services none` to `config init`. `link --yes` only skips the "already linked" confirmation; it still asks for a project unless one is already linked.
+`-y` forwards `-y` to `plugins` or `skills`/`mcp`, `--default` to `bootstrap`, `--yes` to `link`, and `--services none` to `config init`. `--agent` is forwarded with them. `mcp -y` is the global install. `link --yes` only skips the "already linked" confirmation; it still asks for a project unless one is already linked.
 
 A failed step stops the rest. `--profile` and `--config-dir` are forwarded to each child. `--output json` and `--output yaml` are refused; the commands init runs print their own output.
 
@@ -734,17 +742,18 @@ A failed step stops the rest. `--profile` and `--config-dir` are forwarded to ea
 # Interactive: global or project, then agents, then API key or OAuth, then confirm.
 $ neon mcp
 
-# Skip prompts. Global config, every globally detected agent, reuse or mint an API key.
+# Skip prompts. Global config, installed apps else the host CLI agent, reuse or mint an API key.
 $ neon mcp -y
 
 # OAuth: no API key minted. The agent prompts for Neon sign-in on first use.
 $ neon mcp --oauth
 
+# Named agents.
+$ neon mcp --agent cursor --agent claude-code
+
 # Project-level config. A minted key is still account-wide unless a project is pinned.
 $ neon mcp --project
 
-$ neon mcp --agent cursor --agent claude-code
-
 # Hide write tools. Does not change the minted key.
 $ neon mcp --read-only
 
@@ -757,9 +766,9 @@ $ neon mcp --category querying --category schema
 
 On a TTY the command asks for config location (global is the default), then agents, then API key vs OAuth, then a summary to confirm before it writes. Detected agents start selected: globally installed agents or project-folder markers such as `.cursor` when the install is project.
 
-`-y` skips those questions. `neon mcp -y` writes `https://mcp.neon.tech/mcp` into global config for every globally detected agent, reuses an existing Neon MCP API key or mints an account-wide key, leaves write tools enabled, exposes every tool category, and does not pin a project (including from `.neon`). `--project`, `--oauth` and `--agent` skip the question they answer and still apply with `-y`. `--read-only` and `--category` are flags only and are never prompted. A linked project-folder install asks whether to pin MCP tools to that `.neon` project (`?projectId=`). If you pin and selected API-key auth, the minted key is limited to that project too. An unlinked project folder does not ask. Global installs never add that param unless you pass `--project-id`. Without a TTY, pass `-y` to mint into every detected agent, `--agent` to name the agents or `--oauth` to write the URL only. `neon mcp --help` lists the server URL, those `-y` defaults, the supported `--agent` names, and the `--category` values.
+`-y` skips those questions. `neon mcp -y` writes `https://mcp.neon.tech/mcp` into global config for globally installed apps, else the host CLI agent, reuses an existing Neon MCP API key or mints an account-wide key, leaves write tools enabled, exposes every tool category, and does not pin a project (including from `.neon`). `--agent`, `--project`, `--oauth`, `--read-only`, `--project-id` and `--category` still apply with `-y`. `--read-only` and `--category` are flags only and are never prompted. A linked project-folder install asks whether to pin MCP tools to that `.neon` project (`?projectId=`). If you pin and selected API-key auth, the minted key is limited to that project too. An unlinked project folder does not ask. Global installs never add that param unless you pass `--project-id`. Without a TTY, pass `-y` to mint into every detected agent, `--agent <name>` to name them, or `--oauth` to write the URL only. If `-y` finds no agent, it exits: pass `--agent <name>`, run from a supported agent, or omit `-y` in a terminal to pick. `neon mcp --help` lists the server URL, those `-y` defaults, the supported agent names, and the `--category` values.
 
-`--agent` names: `antigravity`, `cline`, `cline-cli`, `claude-code`, `codex`, `cursor`, `gemini-cli`, `goose`, `github-copilot-cli`, `grok-build`, `mcporter`, `opencode`, `vscode`, `windsurf`, `zed`. Project installs drop `antigravity`, `cline`, `cline-cli`, `goose` and `windsurf`. `claude-desktop` is a known name that is then skipped.
+Supported agents: `antigravity`, `cline`, `cline-cli`, `claude-code`, `codex`, `cursor`, `gemini-cli`, `goose`, `github-copilot-cli`, `grok-build`, `mcporter`, `opencode`, `vscode`, `windsurf`, `zed`. Project installs drop `antigravity`, `cline`, `cline-cli`, `goose` and `windsurf`. `claude-desktop` is a known name that is then skipped.
 
 The default mints an account-wide API key (or reuses the Bearer already configured for Neon at `https://mcp.neon.tech/mcp`) and writes it into each selected agent's config. That key reaches everything the account can, in every organization. Revoke it with `neon api-keys revoke <id>`. `--oauth` writes the URL with no `Authorization` header; the agent signs in on first use. `--project` writes into the project config (`.cursor/mcp.json` and similar). `--read-only` adds `?readonly=true`. `--project-id` adds `?projectId=` and, when a key is minted, limits that key to the named project. Accepting the linked-project pin does the same. Revoke a project-scoped key with `neon api-keys revoke <id> --org-id <org>`. A reused Bearer keeps the scope it already has. `--category` adds `?category=` (repeatable or comma-separated: `projects`, `branches`, `schema`, `querying`, `neon_auth`, `data_api`, `observability`, `docs`). `--read-only` and `--category` restrict which MCP tools the server exposes; they do not change what the minted key can do.
 
@@ -771,12 +780,14 @@ The default mints an account-wide API key (or reuses the Bearer already configur
 # Interactive: this directory, then agents, then skills, then confirm.
 $ neon skills
 
-# Skip prompts. This directory, every detected agent, the default skills.
+# Skip prompts. This directory, detected agents (project folders, else the host CLI agent), the default skills.
 $ neon skills -y
 
-$ neon skills -s neon -s neon-ai-gateway --agent cursor
+# Named skills into detected agents.
+$ neon skills -y -s neon -s neon-ai-gateway
 
-$ neon skills --agent cursor --agent claude-code
+# Named skills into a named agent.
+$ neon skills -s neon -s neon-ai-gateway --agent cursor
 
 # User-level skills.
 $ neon skills --global
@@ -789,11 +800,11 @@ $ neon skills update --global -y
 
 On a TTY the command asks which agents and which skills, then shows a summary to confirm. Detected agents start selected from project-folder markers such as `.cursor`. Default skills start selected. `neon-postgres-agent-platforms` is offered and starts unselected.
 
-`-y` skips those questions and installs the default skills. `--skill` / `-s` names specific skills and skips the skill picker. `--agent` and `--global` still apply. Without a TTY, pass `-y` or `--skill`. `--agent` alone is not enough.
+`-y` skips those questions and installs the default skills into detected agents: project-folder markers such as `.cursor`, else the agent driving the CLI. `--agent` / `-a` names coding agents and skips the agent picker. `--skill` / `-s` names specific skills and skips the skill picker; it does not select agents. `--global -y` uses installed apps, else the host CLI agent. Without a TTY, pass `-y`, or `--skill <name>` (add `--agent <name>` to name agents). If `-y` finds no agent, it exits: pass `--agent <name>`, run from a supported agent, or omit `-y` in a terminal to pick.
 
 `--skill` names by source repo: `neondatabase/agent-skills` (`neon`, `neon-ai-gateway`, `neon-functions`, `neon-object-storage`, `neon-postgres`, `neon-postgres-branches`, `neon-postgres-egress-optimizer`); `neondatabase/neon-for-agent-platforms` (`neon-postgres-agent-platforms`).
 
-`--agent` names match `neon mcp`, minus agents that cannot install skills: `antigravity`, `cline`, `cline-cli`, `claude-code`, `claude-desktop`, `codex`, `cursor`, `gemini-cli`, `goose`, `github-copilot-cli`, `grok-build`, `opencode`, `vscode`, `windsurf`, `zed`. `mcporter` is a known MCP name that is then skipped. `neon skills --help` lists the same skill and agent values, and that `-y` leaves out `neon-postgres-agent-platforms`.
+Supported agents match `neon mcp`, minus agents that cannot install skills: `antigravity`, `cline`, `cline-cli`, `claude-code`, `claude-desktop`, `codex`, `cursor`, `gemini-cli`, `goose`, `github-copilot-cli`, `grok-build`, `opencode`, `vscode`, `windsurf`, `zed`. `mcporter` is a known MCP name that is then skipped. `neon skills --help` lists the same skill and agent values, and that `-y` leaves out `neon-postgres-agent-platforms`.
 
 ## Install the Neon plugin (`plugins`)
 
@@ -803,27 +814,27 @@ On a TTY the command asks which agents and which skills, then shows a summary to
 # Interactive: agents, then confirm.
 $ neon plugins
 
-# Skip prompts. Every detected agent.
+# Skip prompts. Detected agents (project folders, else the host CLI agent).
 $ neon plugins -y
 
+# Named agents.
 $ neon plugins --agent cursor --agent claude-code
 
 # User-level install.
 $ neon plugins --global
-$ neon plugins --global --agent vscode
 ```
 
 On a TTY the command asks which agents, then shows a summary to confirm. Detected agents start selected from project-folder markers such as `.cursor`. There is one plugin (`neon-postgres`); there is no plugin picker and no `update` subcommand.
 
-`-y` skips those questions and installs into every detected agent. `--agent` names specific agents and skips the agent picker. Without a TTY, pass `-y` or `--agent`. `--agent` alone is enough because the plugin is fixed.
+`-y` skips those questions and installs into detected agents: project-folder markers such as `.cursor`, else the agent driving the CLI. `--agent` / `-a` names coding agents and skips the agent picker. `--global -y` uses installed apps, else the host CLI agent. Without a TTY, pass `-y` or `--agent <name>`. If `-y` finds no agent, it exits: pass `--agent <name>`, run from a supported agent, or omit `-y` in a terminal to pick.
 
-Default scope is `project`. `--global` is `user`. On macOS and Linux, Cursor and Claude Code store the plugin cache under `~/.claude/plugins`; on Windows, Cursor installs into Cursor extensions. `project` vs `user` is the scope field the plugins CLI records, not a directory in the repo. VS Code, GitHub Copilot CLI, and Grok Build only install user-level: they are skipped at the default scope with a warning, and `--agent vscode` without `--global` fails if nothing else is selected.
+Default scope is `project`. `--global` is `user`. On macOS and Linux, Cursor and Claude Code store the plugin cache under `~/.claude/plugins`; on Windows, Cursor installs into Cursor extensions. `project` vs `user` is the scope field the plugins CLI records, not a directory in the repo. VS Code, GitHub Copilot CLI, and Grok Build only install user-level: they are skipped at the default scope with a warning, and a VS Code-only project fails if nothing else is selected. Pass `--global` for those.
 
-`--agent` names with a plugins mapping: `claude-code`, `claude-desktop`, `codex`, `cursor`, `github-copilot-cli`, `grok-build`, `vscode`. `claude-desktop` installs as Claude Code; naming both produces one install and lists both names in the table. `mcporter` is a known MCP name that is then skipped.
+Supported agents with a plugins mapping: `claude-code`, `claude-desktop`, `codex`, `cursor`, `github-copilot-cli`, `grok-build`, `vscode`. `claude-desktop` installs as Claude Code; detecting both produces one install and lists both names in the table. `mcporter` is a known MCP name that is then skipped.
 
 The plugins CLI installs every plugin it finds in the Neon plugin package. Today that is `neon-postgres` from `neondatabase/agent-skills`. It includes the Neon MCP server (`https://mcp.neon.tech/mcp`) and these skills: `neon`, `neon-ai-gateway`, `neon-functions`, `neon-object-storage`, `neon-postgres`, `neon-postgres-branches`, `neon-postgres-egress-optimizer`. It does not include `neon-postgres-agent-platforms`.
 
-`neon plugins --help` lists the plugin, those contents, and the supported `--agent` names.
+`neon plugins --help` lists the plugin, those contents, and the supported agent names.
 
 ## Snapshots (`snapshots`)
 

package/dist/commands/bootstrap.js

@@ -7,9 +7,11 @@ import { writer } from "../writer.js";
 import { FALLBACK_TEMPLATES, ensureTargetUsable, fetchTemplates, findTemplate, scaffoldTemplate, templateIds } from "../init/bootstrap.js";
 import { spawnCliChild } from "../init/child.js";
 import { agentSetupDoneLabel, formatInitDone, printInitBanner, printInitDone, shouldPrintInitBanner } from "../init/chrome.js";
-import { postScaffoldActions, projectContextFile } from "../init/plan.js";
+import { coerceAgentFlag } from "../utils/agent_flag.js";
+import { assertNamedAgentTooling, chooseYesAgentTooling, initPluginAgents, initSkillsMcpAgents, postScaffoldActions, projectContextFile, resolveNamedAgents } from "../init/plan.js";
 import { pickAgentSetupInteractively } from "../init/wizard.js";
 import { runAgentTooling, runInitSteps } from "../init/tooling.js";
+import { helpCsv, helpEpilogue } from "../utils/help_text.js";
 import { formatInstallCommand, inferPackageManager, installArgs, installedPackageManagers, resolvePackageManager, runCommand } from "../utils/package_manager.js";
 import { existsSync } from "node:fs";
 import { join, relative, resolve } from "node:path";
@@ -22,7 +24,6 @@ var bootstrap_exports = /* @__PURE__ */ __exportAll({
 	describe: () => describe,
 	handler: () => handler
 });
-const removedAgent = () => `\`${getCliName()} bootstrap --agent\` was removed. List templates with \`${getCliName()} bootstrap --list-templates --output json\`. Scaffold with \`${getCliName()} bootstrap <directory> --template <id>\` or \`${getCliName()} bootstrap <directory> --default\`.`;
 const command = "bootstrap [directory]";
 const describe = "Scaffold a new project from a Neon starter template, then install agent tooling and link a Neon project";
 const builder = (argv) => argv.usage("$0 bootstrap [directory] [options]").positional("directory", {
@@ -44,13 +45,9 @@ const builder = (argv) => argv.usage("$0 bootstrap [directory] [options]").posit
 		type: "boolean",
 		default: false
 	},
-	agent: {
-		hidden: true,
-		type: "boolean"
-	},
 	default: {
 		alias: "y",
-		describe: "Quick start: scaffold the default template (or --template), then install, git, agent tooling, and link --yes. Skips those pickers; link --yes still asks for a project unless one is already linked",
+		describe: "Quick start: scaffold the default template (or --template), then install, git, agent tooling (project folders, else the host CLI agent; if none, pass --agent or omit --default in a terminal), and link --yes. Skips those pickers; link --yes still asks for a project unless one is already linked",
 		type: "boolean",
 		default: false
 	},
@@ -73,11 +70,15 @@ const builder = (argv) => argv.usage("$0 bootstrap [directory] [options]").posit
 		type: "boolean",
 		default: true,
 		describe: "After scaffolding, install the Neon plugin or skills and MCP. Use --no-agent-setup to skip"
+	},
+	agent: {
+		alias: "a",
+		type: "array",
+		string: true,
+		describe: "Coding agent to install into (repeatable). Forwarded to plugins, or to skills and mcp. Skips agent selection. Values listed below",
+		coerce: coerceAgentFlag
 	}
-}).example("$0 bootstrap my-app", "Create ./my-app from an interactively chosen template").example("$0 bootstrap . --template hono", "Scaffold the Hono template into the current directory").example("$0 bootstrap my-app --default", "Skip the pickers; link --yes still asks for a project unless one is already linked").example("$0 bootstrap --list-templates --output json", "Print the template catalog as JSON").check((argv) => {
-	if (argv.agent === true) throw new Error(removedAgent());
-	return true;
-}).strict();
+}).example("$0 bootstrap my-app", "Create ./my-app from an interactively chosen template").example("$0 bootstrap . --template hono", "Scaffold the Hono template into the current directory").example("$0 bootstrap my-app --default", "Skip the pickers; link --yes still asks for a project unless one is already linked").example("$0 bootstrap --list-templates --output json", "Print the template catalog as JSON").example("$0 bootstrap my-app --agent cursor --agent claude-code", "Skip agent selection; install the plugin for those agents").epilogue(helpEpilogue("--agent / -a is forwarded to plugins, or to skills and mcp, not both. It skips agent selection, including with --default.", helpCsv("Plugin agents", initPluginAgents()), helpCsv("Skills and MCP agents", initSkillsMcpAgents()))).strict();
 const handler = async (props) => {
 	if (props.listTemplates) {
 		const templates = await fetchTemplates();
@@ -102,6 +103,11 @@ const handler = async (props) => {
 		return;
 	}
 	if (shouldPrintInitBanner(props.default)) printInitBanner();
+	const named = resolveNamedAgents(props.agent ?? []);
+	if (props.agentSetup !== false) assertNamedAgentTooling(named, "bootstrap", {
+		...props.directory !== void 0 && props.directory.length > 0 ? { directory: props.directory } : {},
+		...props.default ? { yes: true } : {}
+	});
 	const templates = await resolveTemplateList(props);
 	const interactive = !props.default && Boolean(process.stdout.isTTY) && !isCi();
 	const template = await resolveSelectedTemplate(props, interactive, templates);
@@ -109,7 +115,7 @@ const handler = async (props) => {
 	ensureTargetUsable(targetDir, props.force);
 	await scaffold(template, targetDir);
 	printScaffolded(template, targetDir);
-	await runPostScaffoldSteps(props, targetDir, interactive, template);
+	await runPostScaffoldSteps(props, targetDir, interactive, template, named);
 };
 /**
 * The template list to choose from. When --template is given we try the
@@ -182,12 +188,12 @@ const scaffold = async (template, targetDir) => {
 	log.info("Scaffolded %d files into %s.", filesWritten, targetDir);
 	return filesWritten;
 };
-const runPostScaffoldSteps = async (props, targetDir, interactive, template) => {
+const runPostScaffoldSteps = async (props, targetDir, interactive, template, named) => {
 	const inferred = inferPackageManager(targetDir);
 	const defaultPm = resolvePackageManager(targetDir);
 	const neonConfig = hasNeonConfig(targetDir);
 	if (props.default) {
-		await runDefaultSteps(props, targetDir, defaultPm, neonConfig, template);
+		await runDefaultSteps(props, targetDir, defaultPm, neonConfig, template, named);
 		return;
 	}
 	if (!interactive) {
@@ -212,19 +218,20 @@ const runPostScaffoldSteps = async (props, targetDir, interactive, template) =>
 	const wantInstall = props.install && await confirm(installPrompt(inferred));
 	if (wantInstall) pm = inferred ?? await selectPackageManager();
 	const wantGit = props.git && !isGitRepo(targetDir) && await confirm("Initialize a git repository?");
-	const agentSetup = props.agentSetup === false ? "skip" : await (props.pickAgentSetup ?? pickAgentSetupInteractively)();
+	const agentSetup = props.agentSetup === false ? "skip" : named.length > 0 ? chooseYesAgentTooling(named).setup : await (props.pickAgentSetup ?? pickAgentSetupInteractively)();
 	const canLink = props.link && !(neonConfig && !wantInstall);
 	if (props.link && !canLink) logSkippedLink(pm);
 	const wantLink = canLink && await confirm(`Link this project to a Neon project now? (runs ${getCliName()} link)`);
 	const outcome = await executePostScaffold(props, targetDir, {
 		yes: false,
-		lockAgentSetup: true,
+		lockAgentSetup: named.length === 0,
 		pm,
 		git: wantGit,
 		agentSetup,
 		install: wantInstall,
 		link: wantLink,
-		hasNeonConfig: neonConfig
+		hasNeonConfig: neonConfig,
+		named
 	});
 	finishPostScaffold({
 		heading: "Project scaffolded.",
@@ -237,10 +244,10 @@ const runPostScaffoldSteps = async (props, targetDir, interactive, template) =>
 };
 const installPrompt = (inferred) => inferred ? `Install dependencies with ${inferred}?` : "Install dependencies?";
 /** `link --yes` still asks for a project unless one is already linked. */
-const runDefaultSteps = async (props, targetDir, pm, neonConfig, template) => {
+const runDefaultSteps = async (props, targetDir, pm, neonConfig, template, named) => {
 	log.info("Quick start (--default): skipping the template, install, git, and agent pickers. link --yes still asks for a project unless one is already linked.");
 	const wantGit = props.git && !isGitRepo(targetDir);
-	const agentSetup = props.agentSetup === false ? "skip" : "skills-mcp";
+	const agentSetup = props.agentSetup === false ? "skip" : named.length > 0 ? chooseYesAgentTooling(named).setup : "skills-mcp";
 	const outcome = await executePostScaffold(props, targetDir, {
 		yes: true,
 		lockAgentSetup: false,
@@ -249,7 +256,8 @@ const runDefaultSteps = async (props, targetDir, pm, neonConfig, template) => {
 		agentSetup,
 		install: props.install,
 		link: props.link,
-		hasNeonConfig: neonConfig
+		hasNeonConfig: neonConfig,
+		named
 	});
 	finishPostScaffold({
 		heading: "Project scaffolded.",
@@ -292,8 +300,12 @@ const executePostScaffold = async (props, targetDir, choices) => {
 				yes: choices.yes,
 				...choices.lockAgentSetup ? { agentSetup: choices.agentSetup } : {},
 				...kids,
+				...choices.named.length > 0 ? { agents: choices.named } : {},
 				...props.pickAgentSetup ? { pickAgentSetup: props.pickAgentSetup } : {},
-				...props.hasProjectPlugins ? { hasProjectPlugins: props.hasProjectPlugins } : {}
+				...props.hasProjectPlugins ? { hasProjectPlugins: props.hasProjectPlugins } : {},
+				...props.detectProjectAgents ? { detectProjectAgents: props.detectProjectAgents } : {},
+				...props.detectAgent ? { detectAgent: props.detectAgent } : {},
+				command: "bootstrap"
 			});
 			agentsRan = true;
 			continue;

package/dist/commands/checkout.js

@@ -208,7 +208,6 @@ const resolveProjectId = async (props) => {
 	if (!runLink) throw new Error("Aborted: no project selected. Re-run with --project-id or link a project first.");
 	await handler$1({
 		...props,
-		agent: false,
 		yes: false,
 		clear: false,
 		checks: true

package/dist/commands/init.js

@@ -4,9 +4,11 @@ import { getCliName } from "../utils/cli_name.js";
 import { t as credentialInputs } from "../_chunks/auth_selection-pitMFzDe.js";
 import { initChildEnv, spawnCliChild } from "../init/child.js";
 import { agentSetupLabel, formatInitDone, printInitBanner, printInitDone, shouldPrintInitBanner } from "../init/chrome.js";
-import { bootstrapInitStep, directoryIsEmpty, planExistingInit } from "../init/plan.js";
+import { coerceAgentFlag } from "../utils/agent_flag.js";
+import { INIT_NEEDS_YES_OR_TERMINAL, assertNamedAgentTooling, bootstrapInitStep, directoryIsEmpty, initPluginAgents, initSkillsMcpAgents, planExistingInit, resolveNamedAgents } from "../init/plan.js";
+import { canPickAgentsInteractively } from "../utils/agent_picker.js";
 import { runAgentTooling, runInitSteps } from "../init/tooling.js";
-import { helpEpilogue } from "../utils/help_text.js";
+import { helpCsv, helpEpilogue } from "../utils/help_text.js";
 import { existsSync, readdirSync } from "node:fs";
 import { resolve } from "node:path";
 //#region src/commands/init.ts
@@ -19,15 +21,18 @@ var init_exports = /* @__PURE__ */ __exportAll({
 });
 const command = "init";
 const describe = "Set up this directory for Neon: agent tooling, a linked project, and neon.ts. In an empty directory, scaffolds a template first. Skills needs Node.js 22.20 or newer.";
-const removedProtocol = () => `\`${getCliName()} init --agent\` and \`--data\` were removed. Run \`${getCliName()} init\` or \`${getCliName()} init -y\`.`;
+const removedProtocol = () => `\`${getCliName()} init --data\` was removed. Run \`${getCliName()} init\` or \`${getCliName()} init -y\`.`;
 const builder = (yargs) => yargs.usage("$0 init [options]").option("context-file", { hidden: true }).option("yes", {
 	alias: "y",
 	type: "boolean",
 	default: false,
-	describe: "Empty dir: bootstrap --default. Otherwise plugin when a project plugin agent is detected, else skills and MCP, then link --yes and config init --services none. link --yes still asks for a project unless one is already linked"
+	describe: "Empty dir: bootstrap --default. Otherwise plugin, or skills and MCP, for project folders, else the host CLI agent. Exits if none. Then link --yes and config init --services none. link --yes still asks for a project unless one is already linked"
 }).option("agent", {
-	hidden: true,
-	type: "boolean"
+	alias: "a",
+	type: "array",
+	string: true,
+	describe: "Coding agent to install into (repeatable). Forwarded to plugins, or to skills and mcp. Skips agent selection. Values listed below",
+	coerce: coerceAgentFlag
 }).option("data", {
 	hidden: true,
 	type: "string"
@@ -35,8 +40,8 @@ const builder = (yargs) => yargs.usage("$0 init [options]").option("context-file
 	alias: "o",
 	hidden: true,
 	describe: "Not supported; the commands init runs print their own output"
-}).example("$0 init", "Empty dir: bootstrap (scaffold, agent tooling, link). Existing app: agent tooling, link, config init").example("$0 init -y", "Same steps, using each child's defaults").epilogue(helpEpilogue("Interactive agent setup: plugin (recommended), skills and MCP separately, or skip agent setup. Never both plugin and skills+MCP.", "-y installs the plugin when Cursor, Claude Code, or Codex is detected in the project. Otherwise skills and MCP. Then link unless already linked. link --yes may still ask for a project.")).check((argv) => {
-	if (argv.agent === true || argv.data !== void 0) throw new Error(removedProtocol());
+}).example("$0 init", "Empty dir: bootstrap (scaffold, agent tooling, link). Existing app: agent tooling, link, config init").example("$0 init -y", "Same steps, using each child's defaults").example("$0 init --agent cursor --agent claude-code", "Skip agent selection; install the plugin for those agents").epilogue(helpEpilogue("Interactive agent setup: plugin (recommended), skills and MCP separately, or skip agent setup. Never both plugin and skills+MCP.", "-y installs the plugin when Cursor, Claude Code, or Codex is in project folders, else the host CLI agent. Otherwise skills and MCP. If none are found, it exits: pass --agent <name>, run from a supported agent, or omit -y in a terminal to pick. Then link unless already linked. link --yes may still ask for a project.", "--agent / -a is forwarded to plugins, or to skills and mcp, not both. It skips agent selection, including with -y.", helpCsv("Plugin agents", initPluginAgents()), helpCsv("Skills and MCP agents", initSkillsMcpAgents()))).check((argv) => {
+	if (argv.data !== void 0) throw new Error(removedProtocol());
 	if (argv.help !== true && (argv.output === "json" || argv.output === "yaml")) throw new Error(`\`${getCliName()} init\` does not support --output. The commands it runs print their own output.`);
 	return true;
 }).strict();
@@ -50,6 +55,8 @@ const handler = async (props) => {
 	const names = existsSync(cwd) ? readdirSync(cwd) : [];
 	const contextFile = resolve(cwd, props.contextFile);
 	const yes = props.yes === true;
+	const named = resolveNamedAgents(props.agent ?? []);
+	assertNamedAgentTooling(named, "init", yes ? { yes: true } : void 0);
 	const run = props.run ?? spawnCliChild;
 	const explicitKey = props.profile ? "" : credentialInputs().apiKeyFlag;
 	const authEnv = explicitKey ? { NEON_API_KEY: explicitKey } : void 0;
@@ -61,7 +68,8 @@ const handler = async (props) => {
 		...props.analytics === false ? { analytics: false } : {}
 	};
 	if (directoryIsEmpty(names)) {
-		await runInitSteps([bootstrapInitStep(yes)], {
+		if (!yes && !canPickAgentsInteractively()) throw new Error(INIT_NEEDS_YES_OR_TERMINAL);
+		await runInitSteps([bootstrapInitStep(yes, named)], {
 			cwd,
 			run,
 			forward,
@@ -77,8 +85,12 @@ const handler = async (props) => {
 		run,
 		forward,
 		authEnv,
+		...named.length > 0 ? { agents: named } : {},
 		...props.pickAgentSetup ? { pickAgentSetup: props.pickAgentSetup } : {},
-		...props.hasProjectPlugins ? { hasProjectPlugins: props.hasProjectPlugins } : {}
+		...props.detectProjectAgents ? { detectProjectAgents: props.detectProjectAgents } : {},
+		...props.detectAgent ? { detectAgent: props.detectAgent } : {},
+		...props.hasProjectPlugins ? { hasProjectPlugins: props.hasProjectPlugins } : {},
+		command: "init"
 	});
 	await runInitSteps(planExistingInit({
 		linked: alreadyLinked,

package/dist/commands/link.js

@@ -4,10 +4,10 @@ import { log } from "../log.js";
 import { isNeonApiError, messageFromBody } from "../api.js";
 import { applyContext, contextBranch, readContextFile, setContext, updateContextFile } from "../context.js";
 import { getCliName } from "../utils/cli_name.js";
+import { helpEpilogue } from "../utils/help_text.js";
 import { createBranch, pickBranchInteractively } from "../utils/branch_picker.js";
 import { autoPullEnvAfterPin } from "./env.js";
 import { hasNeonConfigFile, initCmd } from "./config.js";
-import { helpEpilogue } from "../utils/help_text.js";
 import { REGIONS } from "./projects.js";
 import prompts from "prompts";
 //#region src/commands/link.ts
@@ -31,7 +31,6 @@ const nonInteractiveLinkCommands = () => {
 };
 const nonInteractiveLinkHelp = () => nonInteractiveLinkCommands().map((command) => `  ${command}`).join("\n");
 const orgScopedKeyHint = "Organization-scoped API keys cannot list orgs; pass --org-id.";
-const removedAgent = () => `\`${getCliName()} link --agent\` was removed.\nUse:\n${nonInteractiveLinkHelp()}\n${orgScopedKeyHint}`;
 const command = "link";
 const describe = "Link the current directory to a Neon project";
 const builder = (argv) => argv.usage("$0 link [options]").options({
@@ -60,10 +59,6 @@ const builder = (argv) => argv.usage("$0 link [options]").options({
 		describe: "JSON object with link parameters, e.g. '{\"orgId\":\"...\",\"projectId\":\"...\"}' or '{\"orgId\":\"...\",\"projectName\":\"...\",\"regionId\":\"...\"}'. Flags take precedence over fields in --params.",
 		type: "string"
 	},
-	agent: {
-		hidden: true,
-		type: "boolean"
-	},
 	yes: {
 		alias: "y",
 		describe: "Skip the \"already linked\" confirmation, and pin the project's default branch when linking a project that has more than one.",
@@ -92,10 +87,7 @@ const builder = (argv) => argv.usage("$0 link [options]").options({
 	["$0 link --branch-id br-…", "Pin a branch in the already-linked project"],
 	["$0 link --no-checks --org-id org-… --project-id polished-snowflake-12345678", "Write the context offline (no API calls, no verification)"],
 	["$0 link --clear", "Forget the current org/project/branch context"]
-]).epilogue(helpEpilogue("Non-interactive (CI, scripts, agents):", ...nonInteractiveLinkCommands().map((command) => `  ${command}`), orgScopedKeyHint)).check((argv) => {
-	if (argv.agent === true) throw new Error(removedAgent());
-	return true;
-});
+]).epilogue(helpEpilogue("Non-interactive (CI, scripts, agents):", ...nonInteractiveLinkCommands().map((command) => `  ${command}`), orgScopedKeyHint)).strict();
 const handler = async (props) => {
 	if (props.clear) {
 		clearContext(props.contextFile);

package/dist/commands/mcp.js

@@ -4,11 +4,11 @@ import { readContextFile } from "../context.js";
 import { getCliName } from "../utils/cli_name.js";
 import { writer } from "../writer.js";
 import { noPassthrough, single } from "../utils/flags.js";
+import { NEON_MCP_CATEGORIES, NEON_MCP_URL, existingNeonApiKey, installNeonMcpServer, neonMcpUrl, parseMcpCategories, trackedProjectMcpConfig } from "../mcp/install.js";
+import { mcpInstallableAgents, resolveInstallTargets } from "../mcp/targets.js";
 import { canPickAgentsInteractively } from "../utils/agent_picker.js";
 import { helpCsv, helpEpilogue } from "../utils/help_text.js";
-import { NEON_MCP_CATEGORIES, NEON_MCP_URL, existingNeonApiKey, installNeonMcpServer, neonMcpUrl, parseMcpCategories, trackedProjectMcpConfig } from "../mcp/install.js";
 import { mintMcpApiKey, mintedKeyRevokeCommand, withdrawMintedKey } from "../mcp/mint.js";
-import { mcpInstallableAgents, resolveInstallTargets } from "../mcp/targets.js";
 import { confirmMcpInstall } from "../mcp/wizard.js";
 import { resolveMcpPlan } from "../mcp/plan.js";
 //#region src/commands/mcp.ts
@@ -38,7 +38,7 @@ const builder = (argv) => argv.usage("$0 mcp [options]").options({
 		alias: "y",
 		type: "boolean",
 		default: false,
-		describe: "Skip prompts. Defaults listed below. --project, --oauth, --agent, --read-only, --project-id and --category still apply"
+		describe: "Skip prompts. Defaults listed below. --agent, --project, --oauth, --read-only, --project-id and --category still apply"
 	},
 	agent: {
 		alias: "a",
@@ -86,7 +86,7 @@ const builder = (argv) => argv.usage("$0 mcp [options]").options({
 			return parseMcpCategories(parts);
 		}
 	}
-}).example("$0 mcp", "Interactive: config location, agents, auth, then confirm").example("$0 mcp -y", "Global config, detected agents, reuse or mint an API key").example("$0 mcp --oauth", "Install with OAuth; the agent signs in on first use").example("$0 mcp --project", "Write project-level config").example("$0 mcp --agent cursor --agent claude-code", "Install into specific agents").example("$0 mcp --read-only", "Hide write tools via ?readonly=true").example("$0 mcp --project-id <id>", "Pin tools to one project via ?projectId=").example("$0 mcp --category querying --category schema", "Limit tools to those categories").epilogue(helpEpilogue(`Installs ${NEON_MCP_URL}`, helpCsv("Supported agents at global scope", mcpGlobalAgents), helpCsv("--project does not support", mcpProjectDroppedAgents), helpCsv("Supported categories", NEON_MCP_CATEGORIES), "neon mcp -y:", "  global config", "  every globally detected agent", "  reuse an existing Neon MCP API key, else mint an account-wide key", "  write tools on, all categories", "  no project pin (including from .neon)")).strict().check(noPassthrough("mcp"));
+}).example("$0 mcp", "Interactive: config location, agents, auth, then confirm").example("$0 mcp -y", "Global config, installed apps else the host CLI agent, reuse or mint an API key").example("$0 mcp --oauth", "Install with OAuth; the agent signs in on first use").example("$0 mcp --agent cursor --agent claude-code", "Install into specific agents").example("$0 mcp --project", "Write project-level config").example("$0 mcp --read-only", "Hide write tools via ?readonly=true").example("$0 mcp --project-id <id>", "Pin tools to one project via ?projectId=").example("$0 mcp --category querying --category schema", "Limit tools to those categories").epilogue(helpEpilogue(`Installs ${NEON_MCP_URL}`, helpCsv("Supported agents at global scope", mcpGlobalAgents), helpCsv("--project does not support", mcpProjectDroppedAgents), helpCsv("Supported categories", NEON_MCP_CATEGORIES), "neon mcp -y:", "  global config", "  globally installed apps, else the host CLI agent", "  reuse an existing Neon MCP API key, else mint an account-wide key", "  write tools on, all categories", "  no project pin (including from .neon)")).strict().check(noPassthrough("mcp"));
 const handler = async (props) => {
 	const cwd = process.cwd();
 	const interactive = canPickAgentsInteractively() && props.yes !== true;

package/dist/commands/plugins.js

@@ -3,22 +3,22 @@ import { log } from "../log.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 { pluginsInstallableAgents } from "../plugins/targets.js";
 import { canPickAgentsInteractively } from "../utils/agent_picker.js";
 import { NEON_PLUGIN_NAME, PLUGIN_SKILLS, PLUGIN_SOURCE, neonPluginsRetryCommand, pluginsAddArgs, runPluginsCli } from "../plugins/run.js";
 import { helpCsv, helpEpilogue } from "../utils/help_text.js";
-import { NEON_MCP_URL } from "../mcp/install.js";
 import { resolvePluginsPlan } from "../plugins/plan.js";
 import { confirmPluginsInstall } from "../plugins/wizard.js";
 //#region src/commands/plugins.ts
 var plugins_exports = /* @__PURE__ */ __exportAll({
+	aliases: () => aliases,
 	builder: () => builder,
 	command: () => command,
 	describe: () => describe,
 	handler: () => handler
 });
-const scopeLabel = (scope) => scope === "project" ? "project" : "user";
 const coerceAgents = (value) => {
 	if (value === void 0) return [];
 	const list = Array.isArray(value) ? value : [value];
@@ -28,7 +28,9 @@ const coerceAgents = (value) => {
 		return item;
 	});
 };
+const scopeLabel = (scope) => scope === "project" ? "project" : "user";
 const command = "plugins";
+const aliases = ["plugin"];
 const describe = "Install the Neon plugin into coding agents";
 const pluginProjectAgents = pluginsInstallableAgents("project");
 const pluginGlobalOnlyAgents = pluginsInstallableAgents("global").filter((id) => !pluginProjectAgents.includes(id));
@@ -37,7 +39,7 @@ const builder = (argv) => argv.usage("$0 plugins [options]").options({
 		alias: "y",
 		type: "boolean",
 		default: false,
-		describe: "Skip prompts"
+		describe: "Skip prompts. Detected agents (project folders, else the host CLI agent). --global uses installed apps, else the host CLI agent"
 	},
 	global: {
 		type: "boolean",
@@ -51,7 +53,7 @@ const builder = (argv) => argv.usage("$0 plugins [options]").options({
 		describe: "Coding agent to install into (repeatable). Skips the agent picker. Values listed below",
 		coerce: coerceAgents
 	}
-}).example("$0 plugins", "Interactive: agents, then confirm").example("$0 plugins -y", "Detected agents, skip prompts").example("$0 plugins --agent cursor --agent claude-code", "Install into specific agents").example("$0 plugins --global", "Install user-level").epilogue(helpEpilogue(helpCsv("Supported agents at project scope", pluginProjectAgents), helpCsv("Also with --global", pluginGlobalOnlyAgents), `Currently one plugin: ${NEON_PLUGIN_NAME} from ${PLUGIN_SOURCE}.`, `It includes the Neon MCP server (${NEON_MCP_URL})`, helpCsv("and these skills", PLUGIN_SKILLS))).strict().check(noPassthrough("plugins"));
+}).example("$0 plugins", "Interactive: agents, then confirm").example("$0 plugins -y", "Detected agents (project folders, else the host CLI agent), skip prompts").example("$0 plugins --agent cursor --agent claude-code", "Install into specific agents").example("$0 plugins --global", "Install user-level").epilogue(helpEpilogue(helpCsv("Supported agents at project scope", pluginProjectAgents), helpCsv("Also with --global", pluginGlobalOnlyAgents), `Currently one plugin: ${NEON_PLUGIN_NAME} from ${PLUGIN_SOURCE}.`, `It includes the Neon MCP server (${NEON_MCP_URL})`, helpCsv("and these skills", PLUGIN_SKILLS))).strict().check(noPassthrough("plugins"));
 const handler = async (props) => {
 	const cwd = process.cwd();
 	const yes = props.yes === true;
@@ -137,4 +139,4 @@ const handler = async (props) => {
 	throw new Error(`Failed to install the Neon plugin for: ${failed.flatMap((row) => row.agents).join(", ")}.\n${detail}\nRetry with: ${retry}`);
 };
 //#endregion
-export { builder, command, describe, handler, plugins_exports as t };
+export { aliases, builder, command, describe, handler, plugins_exports as t };

package/dist/commands/skills.js

@@ -4,15 +4,16 @@ import { writer } from "../writer.js";
 import { noPassthrough } from "../utils/flags.js";
 import { getAgentDisplayName } from "../mcp/agents.js";
 import "../init/agents.js";
+import { mappedSkillsAgentNames, skillsInstallableAgents } from "../skills/targets.js";
 import { canPickAgentsInteractively } from "../utils/agent_picker.js";
 import { helpCsv, helpEpilogue } from "../utils/help_text.js";
 import { skillsHelpValues, skillsYesHelp } from "../skills/catalog.js";
-import { mappedSkillsAgentNames, skillsInstallableAgents } from "../skills/targets.js";
 import { confirmSkillsInstall, confirmSkillsUpdate } from "../skills/wizard.js";
 import { assertSkillsCanRun, resolveSkillsPlan } from "../skills/plan.js";
 import { assertSkillsNode, neonSkillsRetryCommand, neonSkillsUpdateRetryCommand, runSkillsCli, skillsAddArgs, skillsMetadata, skillsUpdateArgs, skillsUpdateDetail, skillsUpdateHadNothing } from "../skills/run.js";
 //#region src/commands/skills.ts
 var skills_exports = /* @__PURE__ */ __exportAll({
+	aliases: () => aliases,
 	builder: () => builder,
 	command: () => command,
 	describe: () => describe,
@@ -38,12 +39,16 @@ const coerceSkills = (value) => {
 	});
 };
 const command = "skills";
+const aliases = ["skill"];
 const describe = "Install Neon agent skills into coding agents";
-const builder = (argv) => argv.usage("$0 skills [command] [options]").command("update", "Update installed skills to the latest versions", (yargs) => yargs.usage("$0 skills update [options]").options({ global: {
-	type: "boolean",
-	default: false,
-	describe: "Update user-level skills (skills CLI -g). Default is this directory"
-} }).example("$0 skills update", "Interactive: confirm, then update skills in this directory").example("$0 skills update -y", "Update skills in this directory without prompting").example("$0 skills update --global -y", "Update user-level skills").strict().hide("agent").hide("skill").check((args) => {
+const builder = (argv) => argv.usage("$0 skills [command] [options]").command("update", "Update installed skills to the latest versions", (yargs) => yargs.usage("$0 skills update [options]").options({
+	yes: { describe: "Skip the confirm prompt" },
+	global: {
+		type: "boolean",
+		default: false,
+		describe: "Update user-level skills (skills CLI -g). Default is this directory"
+	}
+}).example("$0 skills update", "Interactive: confirm, then update skills in this directory").example("$0 skills update -y", "Update skills in this directory without prompting").example("$0 skills update --global -y", "Update user-level skills").strict().hide("agent").hide("skill").check((args) => {
 	noPassthrough("skills update")(args);
 	const agents = args.agent;
 	if (Array.isArray(agents) && agents.length > 0) throw new Error("neon skills update does not take --agent. It refreshes every installed skill in this directory (or --global).");
@@ -55,7 +60,7 @@ const builder = (argv) => argv.usage("$0 skills [command] [options]").command("u
 		alias: "y",
 		type: "boolean",
 		default: false,
-		describe: "Skip prompts"
+		describe: "Skip prompts. Detected agents (project folders, else the host CLI agent). --global uses installed apps, else the host CLI agent"
 	},
 	global: {
 		type: "boolean",
@@ -73,10 +78,10 @@ const builder = (argv) => argv.usage("$0 skills [command] [options]").command("u
 		alias: "s",
 		type: "array",
 		string: true,
-		describe: "Skill to install (repeatable). Skips the skill picker. Values listed below",
+		describe: "Skill to install (repeatable). Skips the skill picker. Does not select agents. Values listed below",
 		coerce: coerceSkills
 	}
-}).example("$0 skills", "Interactive: this directory, agents, skills, then confirm").example("$0 skills -y", "This directory, detected agents, the default skills").example("$0 skills -s neon -s neon-ai-gateway --agent cursor", "Install named skills into specific agents").example("$0 skills --global", "Install user-level skills").epilogue(helpEpilogue(helpCsv("Supported agents", skillsInstallableAgents()), "Supported skills, by source repo:", skillsHelpValues(), skillsYesHelp())).strict().check(noPassthrough("skills"));
+}).example("$0 skills", "Interactive: this directory, agents, skills, then confirm").example("$0 skills -y", "This directory, detected agents (project folders, else the host CLI agent), the default skills").example("$0 skills -y -s neon -s neon-ai-gateway", "Named skills into detected agents").example("$0 skills -s neon -s neon-ai-gateway --agent cursor", "Named skills into a named agent").example("$0 skills --global", "Install user-level skills").epilogue(helpEpilogue(helpCsv("Supported agents", skillsInstallableAgents()), "Supported skills, by source repo:", skillsHelpValues(), skillsYesHelp())).strict().check(noPassthrough("skills"));
 const handler = async (props) => {
 	assertSkillsNode();
 	const cwd = process.cwd();
@@ -222,4 +227,4 @@ const updateHandler = async (props) => {
 	if (failure !== void 0) throw new Error(failure.includes("needs npx (Node.js)") || failure.includes("needs Node.js") ? failure : `${failure}\nRetry with: ${neonSkillsUpdateRetryCommand(scope === "global")}`);
 };
 //#endregion
-export { builder, command, describe, handler, skills_exports as t };
+export { aliases, builder, command, describe, handler, skills_exports as t };

package/dist/context.js

@@ -52,8 +52,8 @@ const isClaimCommand = (args) => args._[0] === "claim" || args._[0] === "claimab
 */
 const isApiKeysCommand = (args) => args._[0] === "api-keys" || args._[0] === "api-key";
 const isMcpCommand = (args) => args._[0] === "mcp";
-const isSkillsCommand = (args) => args._[0] === "skills";
-const isPluginsCommand = (args) => args._[0] === "plugins";
+const isSkillsCommand = (args) => args._[0] === "skills" || args._[0] === "skill";
+const isPluginsCommand = (args) => args._[0] === "plugins" || args._[0] === "plugin";
 /** Raw argv is required because auth middleware runs before MCP flags are parsed. */
 const isMcpOauth = (args) => isMcpCommand(args) && argvEnablesMcpOauth(process.argv);
 const OAUTH_FALSE = /* @__PURE__ */ new Set([

package/dist/index.js

@@ -11,6 +11,7 @@ import { defaultClientID } from "./auth.js";
 import { getCliName } from "./utils/cli_name.js";
 import { showHelp } from "./help.js";
 import { deleteCredentialsAt, ensureAuth } from "./commands/auth.js";
+import { rewriteUnknownAgentArg } from "./init/plan.js";
 import commands_default from "./commands/index.js";
 import { fillInArgs, resolveApiKeyFromEnv } from "./utils/middlewares.js";
 import yargs from "yargs";
@@ -31,7 +32,9 @@ const NO_SUBCOMMANDS_VERBS = [
 	"init",
 	"mcp",
 	"plugins",
+	"plugin",
 	"skills",
+	"skill",
 	"dev",
 	"deploy",
 	"diff",
@@ -125,6 +128,19 @@ async function handleError(msg, err) {
 		process.exit(0);
 	}
 	if (err instanceof Error && err.stack) log.debug("Stack: %s", err.stack);
+	if (err instanceof Error) {
+		const rewritten = rewriteUnknownAgentArg({
+			message: err.message,
+			argv: process.argv,
+			cliName: getCliName()
+		});
+		if (rewritten !== void 0) {
+			const error = new Error(rewritten);
+			sendError(error, matchErrorCode(error.message));
+			log.error(error.message);
+			return false;
+		}
+	}
 	if (isNetworkError(err)) {
 		log.error(NETWORK_ERROR_MESSAGE);
 		const error = err instanceof Error ? err : new Error(NETWORK_ERROR_MESSAGE);

package/dist/init/detect_host.js

@@ -0,0 +1,38 @@
+//#region src/init/detect_host.ts
+const CLAUDE_ENV = ["CLAUDECODE", "CLAUDE_CODE_CHILD_SESSION"];
+const CURSOR_ENV = [
+	"CURSOR_TRACE_ID",
+	"CURSOR_EXTENSION_HOST_ROLE",
+	"CURSOR_LAYOUT",
+	"CURSOR_SPAWNED_BY_EXTENSION_ID"
+];
+const CURSOR_PATH_ENV = [
+	"GIT_ASKPASS",
+	"VSCODE_GIT_ASKPASS_NODE",
+	"VSCODE_GIT_ASKPASS_MAIN",
+	"VSCODE_IPC_HOOK_CLI"
+];
+const looksLikeCursor = (value) => {
+	const lower = value.toLowerCase();
+	return lower.includes("cursor.app") || lower.includes("/cursor/") || lower.includes("/.cursor/");
+};
+const isSet = (value) => value !== void 0;
+const isNonEmpty = (value) => typeof value === "string" && value.trim() !== "";
+function detectAgent(env = process.env) {
+	if (CLAUDE_ENV.some((key) => env[key] === "1")) return "claude-code";
+	if (env.CODEX === "1") return "codex";
+	if (isNonEmpty(env.CODEX_THREAD_ID) || isNonEmpty(env.CODEX_SESSION_ID)) return "codex";
+	if (env.GEMINI_CLI === "1") return "gemini-cli";
+	if (env.OPENCODE === "1") return "opencode";
+	if (env.GOOSE_TERMINAL === "1" || env.AGENT === "goose") return "goose";
+	if (env.TERM_PROGRAM === "cursor" || CURSOR_ENV.some((key) => isSet(env[key])) || CURSOR_PATH_ENV.some((key) => {
+		const value = env[key];
+		return typeof value === "string" && looksLikeCursor(value);
+	})) return "cursor";
+	if (env.TERM_PROGRAM === "windsurf") return "windsurf";
+	if (env.TERM_PROGRAM === "zed") return "zed";
+	if (env.TERM_PROGRAM === "vscode" || isSet(env.VSCODE_PID) || isSet(env.VSCODE_CWD)) return "vscode";
+	return null;
+}
+//#endregion
+export { detectAgent };

package/dist/init/plan.js

@@ -1,11 +1,18 @@
+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 { skillsInstallableAgents } from "../skills/targets.js";
+import { agentArgv } from "../utils/agent_flag.js";
 import { isAbsolute, join, relative, resolve } from "node:path";
 //#region src/init/plan.ts
 const directoryIsEmpty = (names) => names.filter((name) => name !== ".git").length === 0;
-const bootstrapInitStep = (yes) => yes ? [
+const bootstrapInitStep = (yes, agents = []) => [...yes ? [
 	"bootstrap",
 	".",
 	"--default"
-] : ["bootstrap", "."];
+] : ["bootstrap", "."], ...agentArgv(agents)];
 const projectContextFile = (projectDir, contextFile) => {
 	const resolved = isAbsolute(contextFile) ? contextFile : resolve(projectDir, contextFile);
 	const rel = relative(projectDir, resolved);
@@ -33,6 +40,184 @@ const planAgentSteps = (input) => {
 	if (input.agentSetup === "skills-mcp") return [["skills", ...y], ["mcp", ...y]];
 	return [];
 };
+const planToolingSteps = (tooling, options) => {
+	const prefix = options.yes ? ["-y"] : [];
+	const flagsFor = (ids) => options.named ? [...prefix, ...agentArgv(ids)] : [...prefix];
+	switch (tooling.setup) {
+		case "skip": return [];
+		case "plugin": return [["plugins", ...flagsFor(tooling.agents)]];
+		case "skills-mcp": {
+			const steps = [];
+			if (tooling.skillsAgents.length > 0) steps.push(["skills", ...flagsFor(tooling.skillsAgents)]);
+			if (tooling.mcpAgents.length > 0) steps.push(["mcp", ...flagsFor(tooling.mcpAgents)]);
+			return steps;
+		}
+		default: return tooling;
+	}
+};
+const noDetectedAgentsMessage = (input) => {
+	const lead = input.scope === "project" ? "No coding agents detected in this project." : "No coding agents detected.";
+	const name = input.nameAgent === true;
+	let hint;
+	if (input.fix === "pass-yes") {
+		const detected = input.scope === "project" ? "Pass -y to use project folders, else the host CLI agent" : "Pass -y to use installed apps, else the host CLI agent";
+		hint = name ? `${detected}, --agent <name> to name them, or run from a terminal to pick one.` : `${detected}, or run from a terminal to pick one.`;
+	} else hint = name ? "Pass --agent <name>, run this command from a supported agent, or omit -y in a terminal to pick one." : "Run this command from a supported agent, or omit -y in a terminal to pick one.";
+	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",
+	"--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(),
+	...mcpInstallableAgents("global")
+]);
+const initPluginAgents = () => pluginsInstallableAgents("project");
+const initSkillsMcpAgents = () => {
+	const plugin = new Set(initPluginAgents());
+	return initYesSupportedAgents().filter((id) => !plugin.has(id));
+};
+const resolveYesAgentList = (input) => {
+	if (input.detected.length > 0) return uniqueAgentIds(input.detected);
+	if (input.host !== null) return [input.host];
+	return [];
+};
+async function collectYesAgents(sources) {
+	const detected = await sources.detected();
+	if (detected.length > 0) return resolveYesAgentList({
+		detected,
+		host: null
+	});
+	const rawHost = sources.detectAgent();
+	const accept = sources.acceptHost ?? (() => true);
+	const host = rawHost !== null && accept(rawHost) ? rawHost : null;
+	return resolveYesAgentList({
+		detected,
+		host
+	});
+}
+const chooseYesAgentTooling = (agents) => {
+	const projectPlugin = new Set(pluginsInstallableAgents("project"));
+	const [pluginFirst, ...pluginRest] = agents.filter((id) => projectPlugin.has(id));
+	if (pluginFirst !== void 0) return {
+		setup: "plugin",
+		agents: [pluginFirst, ...pluginRest]
+	};
+	const globalMcp = new Set(mcpInstallableAgents("global"));
+	const skillsAgents = agents.filter((id) => supportsSkills(id));
+	const mcpAgents = agents.filter((id) => globalMcp.has(id));
+	if (skillsAgents.length === 0 && mcpAgents.length === 0) return { setup: "skip" };
+	return {
+		setup: "skills-mcp",
+		skillsAgents,
+		mcpAgents
+	};
+};
+const planYesAgentSteps = (tooling) => planToolingSteps(tooling, {
+	yes: true,
+	named: false
+});
+const NAMED_AGENTS_UNSUPPORTED = "None of the selected agents can install the Neon plugin, skills, or MCP.";
+const NAMED_AGENTS_MIXED = "Cannot install the plugin and skills/MCP in one run.";
+const quoteIfNeeded = (value) => /[\s"'\\]/.test(value) ? `"${value.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}"` : value;
+const mixedRerun = (command, ids, context) => {
+	const tokens = [getCliName(), command];
+	if (command === "bootstrap" && context?.directory !== void 0 && context.directory.length > 0) tokens.push(quoteIfNeeded(context.directory));
+	if (context?.yes === true) tokens.push(command === "bootstrap" ? "--default" : "-y");
+	tokens.push(...ids.flatMap((id) => ["--agent", id]));
+	return `\`${tokens.join(" ")}\``;
+};
+const namedAgentsMixedMessage = (named, command, context) => {
+	const plugin = new Set(initPluginAgents());
+	const pluginNamed = uniqueAgentIds(named.filter((id) => plugin.has(id)));
+	const otherNamed = uniqueAgentIds(named.filter((id) => !plugin.has(id)));
+	return `${NAMED_AGENTS_MIXED} Plugin: ${pluginNamed.join(", ")}. Skills/MCP: ${otherNamed.join(", ")}. Re-run ${mixedRerun(command, pluginNamed, context)} or ${mixedRerun(command, otherNamed, context)}.`;
+};
+const namedAgentsNeedSplit = (named, tooling) => {
+	if (tooling.setup === "skip") return false;
+	if (tooling.setup === "plugin") {
+		const used = new Set(tooling.agents);
+		const leftover = named.filter((id) => !used.has(id));
+		return chooseYesAgentTooling(leftover).setup !== "skip";
+	}
+	const used = /* @__PURE__ */ new Set([...tooling.skillsAgents, ...tooling.mcpAgents]);
+	return named.some((id) => !used.has(id));
+};
+const assertNamedAgentTooling = (named, command = "init", context) => {
+	if (named.length === 0) return;
+	const tooling = chooseYesAgentTooling(named);
+	if (tooling.setup === "skip") throw new Error(`${NAMED_AGENTS_UNSUPPORTED} Supported agents: ${initYesSupportedAgents().join(", ")}`);
+	if (namedAgentsNeedSplit(named, tooling)) throw new Error(namedAgentsMixedMessage(named, command, context));
+};
+const resolveNamedAgents = (raw) => {
+	if (raw.length === 0) return [];
+	const available = initYesSupportedAgents();
+	const resolved = [];
+	for (const item of raw) {
+		if (item === "*") throw new Error("--agent * is not accepted. Pass --agent <name> for each coding agent, or omit --agent to detect or pick.");
+		const id = tryResolveAddMcpAgentId(item);
+		if (!id) throw new Error(`Unknown agent: "${item}". Supported agents: ${available.join(", ")}`);
+		resolved.push(id);
+	}
+	return uniqueAgentIds(resolved);
+};
 const planExistingInit = (input) => {
 	const steps = [...planAgentSteps(input)];
 	if (!input.linked) steps.push(input.yes ? ["link", "--yes"] : ["link"]);
@@ -45,9 +230,8 @@ const planExistingInit = (input) => {
 	return steps;
 };
 const resolveInitAgentSetup = async (input) => {
-	if (input.yes) return input.hasProjectPlugins ? "plugin" : "skills-mcp";
 	if (input.interactive) return input.pick();
-	return "skills-mcp";
+	throw new Error(INIT_NEEDS_YES_OR_TERMINAL);
 };
 const childArgv = (step, forward) => {
 	const args = [...step];
@@ -59,4 +243,4 @@ const childArgv = (step, forward) => {
 	return args;
 };
 //#endregion
-export { bootstrapInitStep, childArgv, directoryIsEmpty, planAgentSteps, planExistingInit, postScaffoldActions, projectContextFile, resolveInitAgentSetup };
+export { INIT_NEEDS_YES_OR_TERMINAL, NAMED_AGENTS_MIXED, NAMED_AGENTS_UNSUPPORTED, assertNamedAgentTooling, bootstrapInitStep, childArgv, chooseYesAgentTooling, collectYesAgents, directoryIsEmpty, initPluginAgents, initSkillsMcpAgents, initYesSupportedAgents, namedAgentsMixedMessage, namedAgentsNeedSplit, noDetectedAgentsMessage, planAgentSteps, planExistingInit, planToolingSteps, planYesAgentSteps, postScaffoldActions, projectContextFile, resolveInitAgentSetup, resolveNamedAgents, resolveYesAgentList, rewriteUnknownAgentArg };

package/dist/init/tooling.js

@@ -1,17 +1,13 @@
 import { log } from "../log.js";
 import { getCliName } from "../utils/cli_name.js";
 import { AUTH_CHILD } from "./child.js";
-import { childArgv, planAgentSteps, resolveInitAgentSetup } from "./plan.js";
-import { detectInstallablePluginsAgents } from "../plugins/targets.js";
+import { assertNamedAgentTooling, childArgv, chooseYesAgentTooling, collectYesAgents, initYesSupportedAgents, noDetectedAgentsMessage, planAgentSteps, planToolingSteps, planYesAgentSteps, resolveInitAgentSetup } from "./plan.js";
 import { canPickAgentsInteractively } from "../utils/agent_picker.js";
+import { detectAgent } from "./detect_host.js";
 import { pickAgentSetupInteractively } from "./wizard.js";
+import { detectProjectAgents } from "add-mcp";
 //#region src/init/tooling.ts
-const defaultHasProjectPlugins = async (cwd) => {
-	return (await detectInstallablePluginsAgents({
-		scope: "project",
-		cwd
-	})).length > 0;
-};
+const defaultProjectAgents = (cwd) => detectProjectAgents(cwd);
 const runInitSteps = async (steps, options) => {
 	for (const step of steps) {
 		log.info("Running `%s %s`", getCliName(), step.join(" "));
@@ -20,14 +16,53 @@ const runInitSteps = async (steps, options) => {
 		if (!await options.run(argv, options.cwd, command !== void 0 && AUTH_CHILD.has(command) ? options.authEnv : void 0)) throw new Error(`\`${getCliName()} ${step.join(" ")}\` failed.`);
 	}
 };
+const yesAgentsFromOptions = async (options) => collectYesAgents({
+	detected: () => (options.detectProjectAgents ?? defaultProjectAgents)(options.cwd),
+	detectAgent: options.detectAgent ?? detectAgent
+});
+const yesMiss = () => new Error(noDetectedAgentsMessage({
+	scope: "project",
+	supported: initYesSupportedAgents(),
+	fix: "run-without-yes",
+	nameAgent: true
+}));
 const runAgentTooling = async (options) => {
 	const yes = options.yes;
-	const hasProjectPlugins = yes ? await (options.hasProjectPlugins ?? defaultHasProjectPlugins)(options.cwd) : false;
-	const interactive = !yes && (options.pickAgentSetup !== void 0 || canPickAgentsInteractively());
-	const agentSetup = options.agentSetup ?? await resolveInitAgentSetup({
-		yes,
+	const named = options.agents ?? [];
+	if (named.length > 0) {
+		assertNamedAgentTooling(named, options.command ?? "init");
+		const tooling = chooseYesAgentTooling(named);
+		await runInitSteps(planToolingSteps(tooling, {
+			yes,
+			named: true
+		}), options);
+		return tooling.setup;
+	}
+	if (options.agentSetup !== void 0) {
+		await runInitSteps(planAgentSteps({
+			yes,
+			agentSetup: options.agentSetup
+		}), options);
+		return options.agentSetup;
+	}
+	if (yes) {
+		if (options.hasProjectPlugins !== void 0) {
+			const agentSetup = await options.hasProjectPlugins(options.cwd) ? "plugin" : "skills-mcp";
+			await runInitSteps(planAgentSteps({
+				yes: true,
+				agentSetup
+			}), options);
+			return agentSetup;
+		}
+		const agents = await yesAgentsFromOptions(options);
+		const tooling = chooseYesAgentTooling(agents);
+		if (tooling.setup === "skip") throw yesMiss();
+		await runInitSteps(planYesAgentSteps(tooling), options);
+		return tooling.setup;
+	}
+	const interactive = options.pickAgentSetup !== void 0 || canPickAgentsInteractively();
+	const agentSetup = await resolveInitAgentSetup({
 		interactive,
-		hasProjectPlugins,
 		pick: options.pickAgentSetup ?? pickAgentSetupInteractively
 	});
 	await runInitSteps(planAgentSteps({

package/dist/init/wizard.js

@@ -1,3 +1,4 @@
+import { INIT_NEEDS_YES_OR_TERMINAL } from "./plan.js";
 import { canPickAgentsInteractively } from "../utils/agent_picker.js";
 import { NEON_PLUGIN_NAME } from "../plugins/run.js";
 import prompts from "prompts";
@@ -10,7 +11,7 @@ const restoreCursorOnAbort = (state) => {
 	}
 };
 const pickAgentSetupInteractively = async () => {
-	if (!canPickAgentsInteractively()) throw new Error("No interactive terminal. Pass -y to use defaults, or run this command in a terminal.");
+	if (!canPickAgentsInteractively()) throw new Error(INIT_NEEDS_YES_OR_TERMINAL);
 	const { setup } = await prompts({
 		onState: restoreCursorOnAbort,
 		type: "select",

package/dist/mcp/plan.js

@@ -1,22 +1,35 @@
 import { tryResolveAddMcpAgentId } from "./agents.js";
-import { agentChoicesFrom, pickAgentsInteractively, resolveAgentSelection } from "../utils/agent_picker.js";
 import { detectMcpAgents, mcpInstallableAgents } from "./targets.js";
+import { collectYesAgents, noDetectedAgentsMessage } from "../init/plan.js";
+import { agentChoicesFrom, pickAgentsInteractively, resolveAgentSelection } from "../utils/agent_picker.js";
+import { detectAgent } from "../init/detect_host.js";
 import { pickMcpAuth, pickMcpProjectPin, pickMcpScope } from "./wizard.js";
 //#region src/mcp/plan.ts
 async function resolveMcpPlan(options) {
 	const prompt = options.interactive && !options.yes;
 	const scope = options.project ? "project" : prompt ? await (options.pickScope ?? pickMcpScope)() : "global";
 	const available = mcpInstallableAgents(scope);
-	const detected = await detectMcpAgents({
+	const availableSet = new Set(available);
+	const scoped = await detectMcpAgents({
 		scope,
 		cwd: options.cwd
 	});
+	const detected = options.yes && options.agents.length === 0 ? await collectYesAgents({
+		detected: () => scoped,
+		detectAgent: options.detectAgent ?? detectAgent,
+		acceptHost: (id) => availableSet.has(id)
+	}) : scoped;
 	const agents = await resolveAgentSelection({
 		specified: options.agents,
 		choices: agentChoicesFrom(available, detected),
 		detected,
 		message: "Which coding agents should get the Neon MCP server? (space to toggle, enter to confirm)",
-		nonInteractiveMessage: scope === "project" ? `No coding agents detected in this project. Pass --agent <name>. Supported agents: ${available.join(", ")}` : `No coding agents detected. Pass --agent <name>. Supported agents: ${available.join(", ")}`,
+		nonInteractiveMessage: noDetectedAgentsMessage({
+			scope,
+			supported: available,
+			fix: options.yes ? "run-without-yes" : "pass-yes",
+			nameAgent: true
+		}),
 		resolveSpecified: (raw) => {
 			const id = tryResolveAddMcpAgentId(raw);
 			if (!id) throw new Error(`Unknown agent: "${raw}". Supported agents: ${available.join(", ")}`);

package/dist/plugins/plan.js

@@ -1,11 +1,13 @@
 import { getAgentDisplayName, tryResolveAddMcpAgentId } from "../mcp/agents.js";
 import "../init/agents.js";
 import { detectPluginsAgents, getPluginsTargetName, isUserScopeOnlyPluginsTarget, mappedPluginsTargets, pluginsInstallableAgents } from "./targets.js";
+import { collectYesAgents, noDetectedAgentsMessage } from "../init/plan.js";
 import { agentChoicesFrom, pickAgentsInteractively, resolveAgentSelection } from "../utils/agent_picker.js";
+import { detectAgent } from "../init/detect_host.js";
 //#region src/plugins/plan.ts
 const assertPluginsCanRun = (options) => {
 	if (options.yes || options.interactive || options.hasAgents) return;
-	throw new Error("No interactive terminal. Pass -y to install into detected agents, or --agent <name>.");
+	throw new Error("No interactive terminal. Pass -y to install into detected agents, or --agent <name> to name them.");
 };
 async function resolvePluginsPlan(options) {
 	assertPluginsCanRun({
@@ -16,16 +18,28 @@ async function resolvePluginsPlan(options) {
 	const prompt = options.interactive && !options.yes;
 	const scope = options.global ? "global" : "project";
 	const available = pluginsInstallableAgents(scope);
-	const detected = await detectPluginsAgents({
+	const availableSet = new Set(available);
+	const scoped = await detectPluginsAgents({
 		scope,
-		cwd: options.cwd
+		cwd: options.cwd,
+		...options.detectInstalledAgents ? { detectInstalledAgents: options.detectInstalledAgents } : {}
 	});
+	const detected = options.yes && options.agents.length === 0 ? await collectYesAgents({
+		detected: () => scoped,
+		detectAgent: options.detectAgent ?? detectAgent,
+		acceptHost: (id) => availableSet.has(id) || getPluginsTargetName(id) !== void 0
+	}) : scoped;
 	const selected = await resolveAgentSelection({
 		specified: options.agents,
 		choices: agentChoicesFrom(available, detected),
 		detected,
 		message: "Which coding agents should get the Neon plugin? (space to toggle, enter to confirm)",
-		nonInteractiveMessage: scope === "project" ? `No coding agents detected in this project. Pass --agent <name>. Supported agents: ${available.join(", ")}` : `No coding agents detected. Pass --agent <name>. Supported agents: ${available.join(", ")}`,
+		nonInteractiveMessage: noDetectedAgentsMessage({
+			scope,
+			supported: available,
+			fix: options.yes ? "run-without-yes" : "pass-yes",
+			nameAgent: true
+		}),
 		resolveSpecified: (raw) => {
 			if (raw === "*") throw new Error("neon plugins does not accept --agent *. Pass --agent <name> for each coding agent, or omit --agent to use detected agents.");
 			const id = tryResolveAddMcpAgentId(raw);

package/dist/plugins/targets.js

@@ -35,7 +35,7 @@ const pluginsInstallableAgents = (scope) => pluginsMappedAgents().filter((id) =>
 	return target !== void 0 && !isUserScopeOnlyPluginsTarget(target);
 });
 const detectPluginsAgents = async (options) => {
-	const detected = options.scope === "project" ? detectProjectAgents(options.cwd) : await detectInstalledAgents();
+	const detected = options.scope === "project" ? detectProjectAgents(options.cwd) : await (options.detectInstalledAgents ?? detectInstalledAgents)();
 	return uniqueAgentIds(detected).filter((id) => supportsPlugins(id));
 };
 const detectInstallablePluginsAgents = async (options) => {

package/dist/skills/plan.js

@@ -1,8 +1,10 @@
 import { tryResolveAddMcpAgentId } from "../mcp/agents.js";
 import "../init/agents.js";
+import { detectSkillsAgents, skillsInstallableAgents } from "./targets.js";
+import { collectYesAgents, noDetectedAgentsMessage } from "../init/plan.js";
 import { agentChoicesFrom, pickAgentsInteractively, resolveAgentSelection } from "../utils/agent_picker.js";
+import { detectAgent } from "../init/detect_host.js";
 import { invocationsForSelection, resolveSkillId, uniqueSkillEntries, yesInstallInvocations } from "./catalog.js";
-import { detectSkillsAgents, skillsInstallableAgents } from "./targets.js";
 import { pickSkillsInteractively } from "./wizard.js";
 //#region src/skills/plan.ts
 const assertSkillsCanRun = (options) => {
@@ -11,7 +13,7 @@ const assertSkillsCanRun = (options) => {
 		throw new Error("No interactive terminal. Pass -y to update installed skills.");
 	}
 	if (options.yes || options.interactive || options.hasSkills === true) return;
-	throw new Error("No interactive terminal. Pass -y to install the default skills, or --skill <name>.");
+	throw new Error("No interactive terminal. Pass -y to install the default skills into detected agents, or --skill <name>.");
 };
 async function resolveSkillsPlan(options) {
 	assertSkillsCanRun({
@@ -24,16 +26,28 @@ async function resolveSkillsPlan(options) {
 	const prompt = options.interactive && !options.yes;
 	const scope = options.global ? "global" : "project";
 	const available = skillsInstallableAgents();
-	const detected = await detectSkillsAgents({
+	const availableSet = new Set(available);
+	const scoped = await detectSkillsAgents({
 		scope,
-		cwd: options.cwd
+		cwd: options.cwd,
+		...options.detectInstalledAgents ? { detectInstalledAgents: options.detectInstalledAgents } : {}
 	});
+	const detected = options.yes && options.agents.length === 0 ? await collectYesAgents({
+		detected: () => scoped,
+		detectAgent: options.detectAgent ?? detectAgent,
+		acceptHost: (id) => availableSet.has(id)
+	}) : scoped;
 	const selected = await resolveAgentSelection({
 		specified: options.agents,
 		choices: agentChoicesFrom(available, detected),
 		detected,
 		message: "Which coding agents should get Neon agent skills? (space to toggle, enter to confirm)",
-		nonInteractiveMessage: scope === "project" ? `No coding agents detected in this project. Pass --agent <name>. Supported agents: ${available.join(", ")}` : `No coding agents detected. Pass --agent <name>. Supported agents: ${available.join(", ")}`,
+		nonInteractiveMessage: noDetectedAgentsMessage({
+			scope,
+			supported: available,
+			fix: options.yes ? "run-without-yes" : "pass-yes",
+			nameAgent: true
+		}),
 		resolveSpecified: (raw) => {
 			if (raw === "*") throw new Error("neon skills does not accept --agent *. Pass --agent <name> for each coding agent, or omit --agent to use detected agents.");
 			const id = tryResolveAddMcpAgentId(raw);

package/dist/skills/targets.js

@@ -4,7 +4,7 @@ import { detectProjectAgents } from "add-mcp";
 //#region src/skills/targets.ts
 const skillsInstallableAgents = () => listMcpAgentIds().filter((id) => supportsSkills(id));
 const detectSkillsAgents = async (options) => {
-	const detected = options.scope === "project" ? detectProjectAgents(options.cwd) : await detectInstalledAgents();
+	const detected = options.scope === "project" ? detectProjectAgents(options.cwd) : await (options.detectInstalledAgents ?? detectInstalledAgents)();
 	return uniqueAgentIds(detected).filter((id) => supportsSkills(id));
 };
 const mappedSkillsAgentNames = (agents) => {

package/dist/skills/wizard.js

@@ -12,7 +12,7 @@ const restoreCursorOnAbort = (state) => {
 	}
 };
 const pickSkillsInteractively = async () => {
-	if (!canPickAgentsInteractively()) throw new Error("No interactive terminal. Pass -y to install the default skills, or --skill <name>.");
+	if (!canPickAgentsInteractively()) throw new Error("No interactive terminal. Pass -y to install the default skills into detected agents.");
 	const { skills } = await prompts({
 		onState: restoreCursorOnAbort,
 		type: "multiselect",

package/dist/utils/agent_flag.js

@@ -0,0 +1,13 @@
+//#region src/utils/agent_flag.ts
+const coerceAgentFlag = (value) => {
+	if (value === void 0) return [];
+	const list = Array.isArray(value) ? value : [value];
+	if (list.length === 0) throw new Error("--agent needs a value. Pass one, or omit the flag entirely.");
+	return list.map((item) => {
+		if (typeof item !== "string" || item.trim() === "") throw new Error("--agent needs a value. Pass one, or omit the flag entirely.");
+		return item;
+	});
+};
+const agentArgv = (agents) => agents.flatMap((id) => ["--agent", id]);
+//#endregion
+export { agentArgv, coerceAgentFlag };

package/dist/utils/agent_picker.js

@@ -4,7 +4,7 @@ import prompts from "prompts";
 //#region src/utils/agent_picker.ts
 const canPickAgentsInteractively = () => !isCi() && Boolean(process.stdout.isTTY) && Boolean(process.stdin.isTTY);
 const pickAgentsInteractively = async (options) => {
-	if (!canPickAgentsInteractively()) throw new Error("No interactive terminal. Pass --agent <name>, or run this command in a terminal to pick agents.");
+	if (!canPickAgentsInteractively()) throw new Error("No interactive terminal. Pass -y, or run this command in a terminal to pick agents.");
 	if (options.choices.length === 0) throw new Error("No coding agents are available to pick.");
 	const selected = new Set(options.selected ?? []);
 	const { agents } = await prompts({
@@ -48,7 +48,7 @@ const resolveAgentSelection = async (options) => {
 			choices: options.choices,
 			selected: options.detected.filter((id) => options.choices.some((choice) => choice.id === id))
 		});
-		if (selected.length === 0) throw new Error("No agents selected. Pass --agent <name>, or pick at least one agent.");
+		if (selected.length === 0) throw new Error("No agents selected. Pick at least one agent, or pass -y to use detected agents.");
 		return uniqueAgentIds(selected);
 	}
 	if (options.detected.length > 0) return uniqueAgentIds(options.detected);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neon",
-  "version": "4.10.2",
+  "version": "4.11.1",
   "description": "CLI tool for Neon, the cloud backend primitives built around Lakebase Postgres",
   "keywords": [
     "neon",