neon 4.10.1 → 4.11.0

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 offers agent tooling (the Neon plugin, or skills and MCP separately — never both) and then `neon link`. `--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
 
@@ -707,7 +710,7 @@ The target directory must be empty unless you pass `--force` (a lone `.git` is i
 
 `neon init` sets up this directory for Neon.
 
-An empty directory (nothing except `.git`) runs `neon bootstrap .` and stops. With `-y` that is `neon bootstrap . --default`. Bootstrap handles scaffolding, agent tooling, and linking.
+An empty directory (nothing except `.git`) runs `neon bootstrap .` and stops. With `-y` that is `neon bootstrap . --default`. Bootstrap handles scaffolding, agent tooling, and linking. Interactive bootstrap prints a NEON banner, asks every setup question, then runs the work — dependency install last, except when a `neon.ts` needs deps before `link`.
 
 An existing app installs agent tooling, then `neon link` unless `.neon` already has a projectId, then `neon config init`. Interactive `config init` opens the services picker; `-y` uses `--services none` (starter policy).
 
@@ -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` (`claimable-postgres`, `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`).
+`--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 `claimable-postgres` or `neon-postgres-agent-platforms`.
+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

@@ -6,8 +6,12 @@ import { t as credentialInputs } from "../_chunks/auth_selection-pitMFzDe.js";
 import { writer } from "../writer.js";
 import { FALLBACK_TEMPLATES, ensureTargetUsable, fetchTemplates, findTemplate, scaffoldTemplate, templateIds } from "../init/bootstrap.js";
 import { spawnCliChild } from "../init/child.js";
-import { projectContextFile } from "../init/plan.js";
-import { runScaffoldFollowUp } from "../init/tooling.js";
+import { agentSetupDoneLabel, formatInitDone, printInitBanner, printInitDone, shouldPrintInitBanner } from "../init/chrome.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";
@@ -20,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", {
@@ -42,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
 	},
@@ -63,7 +62,7 @@ const builder = (argv) => argv.usage("$0 bootstrap [directory] [options]").posit
 		default: true
 	},
 	link: {
-		describe: `Run \`${getCliName()} link\` in the scaffolded directory after installing. In interactive mode this is offered as a prompt; use --no-link to skip without being asked.`,
+		describe: `Run \`${getCliName()} link\` after scaffolding. Templates with neon.ts link after install so env pull works; otherwise link runs before install. In interactive mode this is offered as a prompt; use --no-link to skip without being asked.`,
 		type: "boolean",
 		default: true
 	},
@@ -71,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();
@@ -99,6 +102,12 @@ 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);
@@ -106,7 +115,7 @@ const handler = async (props) => {
 	ensureTargetUsable(targetDir, props.force);
 	await scaffold(template, targetDir);
 	printScaffolded(template, targetDir);
-	await runPostScaffoldSteps(props, targetDir, interactive);
+	await runPostScaffoldSteps(props, targetDir, interactive, template, named);
 };
 /**
 * The template list to choose from. When --template is given we try the
@@ -179,83 +188,155 @@ const scaffold = async (template, targetDir) => {
 	log.info("Scaffolded %d files into %s.", filesWritten, targetDir);
 	return filesWritten;
 };
-const runPostScaffoldSteps = async (props, targetDir, interactive) => {
+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);
+		await runDefaultSteps(props, targetDir, defaultPm, neonConfig, template, named);
 		return;
 	}
 	if (!interactive) {
-		printNextSteps(targetDir, defaultPm, {
+		printDoneSummary({
+			heading: "Project scaffolded.",
+			template,
+			targetDir,
+			pm: defaultPm,
 			installed: false,
-			suggestLink: true
+			installFailed: false,
+			gitFailed: false,
+			git: false,
+			agentSetup: "skip",
+			linked: false,
+			skippedLinkForDeps: false,
+			suggestLink: true,
+			agentsRan: false
 		});
 		return;
 	}
 	let pm = defaultPm;
-	let installed = false;
-	if (props.install && await confirm(installPrompt(inferred))) {
-		pm = inferred ?? await selectPackageManager();
-		installed = await runCommand(pm, installArgs(pm), targetDir);
-	}
-	if (props.git && !isGitRepo(targetDir) && await confirm("Initialize a git repository?")) await initGitRepo(targetDir);
-	const skipLink = shouldSkipLinkForDeps(targetDir, installed);
-	if (props.link && skipLink) logSkippedLink(pm);
-	const kids = bootstrapChildren(props, targetDir);
-	await runScaffoldFollowUp({
-		cwd: targetDir,
+	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" : 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,
-		skipAgentSetup: props.agentSetup === false,
-		shouldLink: false,
-		linkYes: false,
-		...kids,
-		...props.pickAgentSetup ? { pickAgentSetup: props.pickAgentSetup } : {},
-		...props.hasProjectPlugins ? { hasProjectPlugins: props.hasProjectPlugins } : {}
+		lockAgentSetup: named.length === 0,
+		pm,
+		git: wantGit,
+		agentSetup,
+		install: wantInstall,
+		link: wantLink,
+		hasNeonConfig: neonConfig,
+		named
 	});
-	if (props.link && !skipLink && await confirm(`Link this project to a Neon project now? (runs ${getCliName()} link)`)) {
-		await runScaffoldFollowUp({
-			cwd: targetDir,
-			yes: false,
-			skipAgentSetup: true,
-			shouldLink: true,
-			linkYes: false,
-			...kids
-		});
-		printNextSteps(targetDir, pm, {
-			installed,
-			suggestLink: false
-		});
-		return;
-	}
-	printNextSteps(targetDir, pm, {
-		installed,
-		suggestLink: true
+	finishPostScaffold({
+		heading: "Project scaffolded.",
+		template,
+		targetDir,
+		pm,
+		...outcome,
+		suggestLink: !outcome.linked
 	});
 };
 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) => {
+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.");
-	let installed = false;
-	if (props.install) installed = await runCommand(pm, installArgs(pm), targetDir);
-	if (props.git && !isGitRepo(targetDir)) await initGitRepo(targetDir);
-	const skipLink = shouldSkipLinkForDeps(targetDir, installed);
-	if (props.link && skipLink) logSkippedLink(pm);
-	await runScaffoldFollowUp({
-		cwd: targetDir,
+	const wantGit = props.git && !isGitRepo(targetDir);
+	const agentSetup = props.agentSetup === false ? "skip" : named.length > 0 ? chooseYesAgentTooling(named).setup : "skills-mcp";
+	const outcome = await executePostScaffold(props, targetDir, {
 		yes: true,
-		skipAgentSetup: props.agentSetup === false,
-		shouldLink: props.link && !skipLink,
-		linkYes: true,
-		...bootstrapChildren(props, targetDir),
-		...props.pickAgentSetup ? { pickAgentSetup: props.pickAgentSetup } : {},
-		...props.hasProjectPlugins ? { hasProjectPlugins: props.hasProjectPlugins } : {}
+		lockAgentSetup: false,
+		pm,
+		git: wantGit,
+		agentSetup,
+		install: props.install,
+		link: props.link,
+		hasNeonConfig: neonConfig,
+		named
 	});
-	printNextSteps(targetDir, pm, {
-		installed,
-		suggestLink: !(props.link && !skipLink)
+	finishPostScaffold({
+		heading: "Project scaffolded.",
+		template,
+		targetDir,
+		pm,
+		...outcome,
+		suggestLink: !outcome.linked
+	});
+};
+const executePostScaffold = async (props, targetDir, choices) => {
+	const kids = bootstrapChildren(props, targetDir);
+	let installed = false;
+	let installFailed = false;
+	let gitFailed = false;
+	let git = false;
+	let linked = false;
+	let skippedLinkForDeps = false;
+	let agentSetup = choices.agentSetup;
+	let agentsRan = false;
+	const actions = postScaffoldActions({
+		git: choices.git,
+		agentSetup: choices.agentSetup,
+		install: choices.install,
+		link: choices.link,
+		hasNeonConfig: choices.hasNeonConfig
 	});
+	for (const action of actions) {
+		if (action === "git") {
+			git = await initGitRepo(targetDir);
+			if (!git) {
+				gitFailed = true;
+				break;
+			}
+			continue;
+		}
+		if (action === "agent") {
+			agentSetup = await runAgentTooling({
+				cwd: targetDir,
+				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.detectProjectAgents ? { detectProjectAgents: props.detectProjectAgents } : {},
+				...props.detectAgent ? { detectAgent: props.detectAgent } : {},
+				command: "bootstrap"
+			});
+			agentsRan = true;
+			continue;
+		}
+		if (action === "install") {
+			installed = await runCommand(choices.pm, installArgs(choices.pm), targetDir);
+			if (!installed) installFailed = true;
+			continue;
+		}
+		if (action !== "link") throw new Error(`Unhandled post-scaffold action: ${action}`);
+		if (choices.hasNeonConfig && !installed) {
+			skippedLinkForDeps = true;
+			logSkippedLink(choices.pm);
+			continue;
+		}
+		await runInitSteps([choices.yes ? ["link", "--yes"] : ["link"]], {
+			cwd: targetDir,
+			...kids
+		});
+		linked = true;
+	}
+	return {
+		installed,
+		installFailed,
+		gitFailed,
+		git,
+		linked,
+		skippedLinkForDeps,
+		agentSetup,
+		agentsRan
+	};
 };
 const isGitRepo = (dir) => existsSync(join(dir, ".git"));
 const NEON_CONFIG_FILENAMES = [
@@ -265,7 +346,6 @@ const NEON_CONFIG_FILENAMES = [
 	"neon.mjs"
 ];
 const hasNeonConfig = (dir) => NEON_CONFIG_FILENAMES.some((name) => existsSync(join(dir, name)));
-const shouldSkipLinkForDeps = (dir, installed) => !installed && hasNeonConfig(dir);
 const logSkippedLink = (pm) => {
 	log.info(`Skipping the Neon link step: \`${getCliName()} link\` reads this project's neon.ts to pull env vars, which needs its dependencies. Run \`${formatInstallCommand(pm)}\`, then \`${getCliName()} link\`.`);
 };
@@ -288,9 +368,7 @@ const bootstrapChildren = (props, targetDir) => {
 * deliberately don't auto-commit, both to avoid failing on a machine with no
 * git identity configured and to leave the first commit to the user.
 */
-const initGitRepo = async (dir) => {
-	await runCommand("git", ["init"], dir);
-};
+const initGitRepo = async (dir) => runCommand("git", ["init"], dir);
 const confirm = async (message) => {
 	const { value } = await prompts({
 		onState: onPromptState,
@@ -324,22 +402,56 @@ const selectPackageManager = async () => {
 	return pm ?? "npm";
 };
 const printScaffolded = (template, targetDir) => {
-	log.info("");
-	log.info("Done. Scaffolded \"%s\" into %s.", template.title, isCurrentDir(targetDir) ? "the current directory" : displayDir(targetDir));
+	log.info("Scaffolded \"%s\" into %s.", template.title, isCurrentDir(targetDir) ? "the current directory" : displayDir(targetDir));
 };
-/**
-* The closing "Next steps" hint. Skips `cd` for the current directory, omits
-* the install line once deps are in, and only nudges `neon link` when linking
-* wasn't already offered/run — so the user never sees a step they just did.
-*/
-const printNextSteps = (targetDir, pm, opts) => {
-	log.info("");
-	log.info("Next steps:");
-	if (!isCurrentDir(targetDir)) log.info("  cd %s", displayDir(targetDir));
-	if (!opts.installed) log.info("  %s", formatInstallCommand(pm));
-	if (opts.suggestLink) log.info(`  ${getCliName()} link`);
-	log.info("  See the README to run it.");
-	log.info("");
+const printDoneSummary = (input) => {
+	const unfinished = input.installFailed || input.gitFailed;
+	const heading = unfinished ? "Setup did not finish." : input.heading;
+	const deps = input.installFailed ? "install failed" : input.installed ? `installed with ${input.pm}` : "skipped";
+	const git = input.gitFailed ? "init failed" : input.git ? "initialized" : "skipped";
+	const project = input.linked ? "linked" : input.skippedLinkForDeps ? "skipped (needs dependencies)" : "not linked";
+	const next = [];
+	if (!isCurrentDir(input.targetDir)) next.push(`cd ${displayDir(input.targetDir)}`);
+	if (!input.installed) next.push(formatInstallCommand(input.pm));
+	if (input.suggestLink) next.push(`${getCliName()} link`);
+	if (!unfinished) next.push("See the README to run it.");
+	printInitDone(formatInitDone({
+		heading,
+		rows: [
+			{
+				label: "Template",
+				value: input.template.title
+			},
+			{
+				label: "Directory",
+				value: displayDir(input.targetDir)
+			},
+			{
+				label: "Dependencies",
+				value: deps
+			},
+			{
+				label: "Git",
+				value: git
+			},
+			{
+				label: "Agents",
+				value: agentSetupDoneLabel({
+					setup: input.agentSetup,
+					ran: input.agentsRan
+				})
+			},
+			{
+				label: "Project",
+				value: project
+			}
+		],
+		next
+	}));
+};
+const finishPostScaffold = (input) => {
+	printDoneSummary(input);
+	if (input.installFailed || input.gitFailed) throw new Error("Setup did not finish.");
 };
 const isCurrentDir = (targetDir) => relative(process.cwd(), targetDir) === "";
 /**

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