neon 8.13.1 → 8.13.2

package/README.md

@@ -891,6 +891,8 @@ Unauthenticated `-y` skips linking and prints the next step: sign up at https://
 
 When init picks MCP auth (no `--mcp-auth`) and the CLI credential is an organization or project-scoped API key, which cannot mint the MCP server's key, init configures MCP with OAuth instead and continues. With `--mcp-auth api-key`, init skips MCP, finishes linking and `neon.ts`, then reports `Neon setup failed.` with the `neon mcp` commands to retry and exits 1.
 
+When the Neon plugin, skills, or MCP setup fails for an agent, init runs the remaining agent steps, links (or writes `.neon` offline), and writes `neon.ts` as it would have, then reports `Neon setup failed.` with the error and the `neon plugins`, `neon skills`, or `neon mcp` command to retry, and exits 1.
+
 Custom asks how to add Neon to coding agents (plugin, skills and MCP separately, or skip), then how to get a project (sign in and link, or a claimable project when you are not signed in), then which services `neon.ts` should declare. Skills and MCP use separate agent pickers, and either can be skipped. Postgres is listed first as always included. The package manager is inferred from the directory; Custom asks only when none is detected. `--skill` selects skills (not the plugin) and skips that picker. MCP flags (`--mcp-config-location`, `--mcp-auth`, `--mcp-project-scoped`) select skills and MCP. `--mcp-config-location` is where the config is written: `global` maps to `neon mcp`, and `project` maps to `neon mcp --project`. With `-y`, the location defaults to `global`; interactive Custom asks. If some selected agents cannot write that location, init warns and skips MCP for those agents while continuing with the supported agents. It fails when none of the selected agents support the location. `--mcp-project-scoped` limits MCP tools to the linked Neon project by passing its ID to `neon mcp --project-id`. Omitted is false, including in Custom; there is no prompt. `--no-agent-setup` skips agent setup.
 
 Empty directories are set up in place. `neon init` does not scaffold starter files.

package/dist/_chunks/{plugins-DqD7BDO1.js → plugins-Dj0H6lDA.js}

@@ -132,7 +132,7 @@ const pluginsInstallError = (outcome) => {
 		global: scope === "global"
 	});
 	if (first.message.includes("needs npx (Node.js)")) return new Error(first.message);
-	const detail = failed.map((row) => row.message).join("\n");
+	const detail = [...new Set(failed.map((row) => row.message))].join("\n");
 	if (failed.length === rows.length) return /* @__PURE__ */ new Error(`${detail}\nRetry with: ${retry}`);
 	return /* @__PURE__ */ new Error(`Failed to install the Neon plugin for: ${failed.flatMap((row) => row.agents).join(", ")}.\n${detail}\nRetry with: ${retry}`);
 };

package/dist/analytics.js

@@ -356,4 +356,4 @@ const getAnalyticsEventProperties = (args) => ({
 	githubEnvVars: getGithubEnvVars(process.env)
 });
 //#endregion
-export { analyticsIdentity, analyticsMiddleware, closeAnalytics, commandSuccessProperties, getAnalyticsEventProperties, getErrorAnalyticsEventProperties, initAnalyticsClientMiddleware, isAnalyticsActive, recordCommandSuccessExtras, recordScaffoldedTemplate, sendError, storedCredentialAttribution, takeCommandSuccessExtras, telemetryCredential, trackCommandSuccess, trackEvent, useAnalyticsClientForTests };
+export { analyticsIdentity, analyticsMiddleware, closeAnalytics, commandSuccessProperties, getAnalyticsEventProperties, getErrorAnalyticsEventProperties, initAnalyticsClientMiddleware, isAnalyticsActive, recordCommandSuccessExtras, recordScaffoldedTemplate, redactCredentialTokenIds, sendError, storedCredentialAttribution, takeCommandSuccessExtras, telemetryCredential, trackCommandSuccess, trackEvent, useAnalyticsClientForTests };

package/dist/commands/index.js

@@ -7,7 +7,7 @@ import { c as config_exports } from "../_chunks/config-BH_qRHiG.js";
 import { u as projects_exports } from "../_chunks/projects-BwI2Uo0z.js";
 import { a as link_exports } from "../_chunks/link-BgtkOBws.js";
 import { o as mcp_exports } from "../_chunks/mcp-Bo-7TKc7.js";
-import { c as plugins_exports } from "../_chunks/plugins-DqD7BDO1.js";
+import { c as plugins_exports } from "../_chunks/plugins-Dj0H6lDA.js";
 import { l as skills_exports } from "../_chunks/skills-BP6pIm7O.js";
 import { t as bootstrap_exports } from "../_chunks/bootstrap-wPZWa1sT.js";
 import { r as branches_exports } from "../_chunks/branches-BNa1xX1L.js";

package/dist/commands/plugins.js

@@ -1 +1 @@
-export { t as aliases, n as builder, r as command, i as describe, a as handler, o as installPlugins, s as pluginsInstallError, l as reportPluginsInstall } from "../_chunks/plugins-DqD7BDO1.js";
+export { t as aliases, n as builder, r as command, i as describe, a as handler, o as installPlugins, s as pluginsInstallError, l as reportPluginsInstall } from "../_chunks/plugins-Dj0H6lDA.js";

package/dist/init/copy.js

@@ -158,6 +158,17 @@ const mcpKeyFailedNext = (reason, mcp) => [
 	"Or with OAuth:",
 	`${mcp} --oauth`
 ];
+const AGENTS_NOT_INSTALLED = "not installed";
+const TOOLING_FAILED = {
+	plugins: "The Neon plugin was not installed. Retry with:",
+	skills: "Neon skills were not installed. Retry with:",
+	mcp: "The Neon MCP server was not configured. Retry with:"
+};
+const toolingFailedNext = (failures) => failures.flatMap((failure, index) => [
+	...index > 0 ? [""] : [],
+	TOOLING_FAILED[failure.kind],
+	failure.command
+]);
 const mcpAfterLinkNext = (mcp) => ["Then configure the Neon MCP server for that project:", mcp];
 const envPullFailedNext = () => ({
 	heading: HEADING_FAILED,
@@ -174,4 +185,4 @@ const headingForOutcome = (outcome) => {
 	}
 };
 //#endregion
-export { AGENT_DETECTED_DESCRIPTION, AGENT_MCP_PICKER_MESSAGE, AGENT_MCP_SKIP_MESSAGE, AGENT_OTHER_DESCRIPTION, AGENT_PICKER_MESSAGE, AGENT_PLUGIN_SKIP_MESSAGE, AGENT_SETUP_MESSAGE, AGENT_SETUP_PLUGIN_DESCRIPTION, AGENT_SETUP_PLUGIN_TITLE, AGENT_SETUP_SKILLS_DESCRIPTION, AGENT_SETUP_SKILLS_TITLE, AGENT_SETUP_SKIP_DESCRIPTION, AGENT_SETUP_SKIP_TITLE, AGENT_SKILLS_PICKER_MESSAGE, AGENT_SKILLS_SKIP_MESSAGE, CANCELLED_BODY, CLAIMABLE_ACCOUNT_FLAGS, CLAIMABLE_ALREADY_LINKED, CLAIMABLE_MCP_API_KEY, CLAIMABLE_NO_LINK, CONFIG_CONFIRM_HINT, CONFIG_CONFIRM_MESSAGE, HEADING_CANCELLED, HEADING_COMPLETE, HEADING_FAILED, HEADING_PENDING, INIT_NEEDS_YES, INIT_SUBTITLE, MCP_API_KEY_NEEDS_AUTH, MCP_AUTH_API_KEY_DESCRIPTION, MCP_AUTH_API_KEY_TITLE, MCP_AUTH_MESSAGE, MCP_AUTH_OAUTH_DESCRIPTION, MCP_AUTH_OAUTH_TITLE, MCP_OAUTH_FALLBACK, MCP_SCOPED_NEEDS_PROJECT, MCP_SCOPE_GLOBAL_DESCRIPTION, MCP_SCOPE_GLOBAL_TITLE, MCP_SCOPE_MESSAGE, MCP_SCOPE_PROJECT_DESCRIPTION, MCP_SCOPE_PROJECT_TITLE, MODE_CUSTOM_DESCRIPTION, MODE_CUSTOM_TITLE, MODE_MESSAGE, MODE_RECOMMENDED_DESCRIPTION, MODE_RECOMMENDED_TITLE, NON_TTY_AGENT_SETUP, NON_TTY_LINK_NEEDS_AUTH, NO_AGENTS_FALLBACK_STATUS, NO_AGENT_SETUP_CONFLICT, PACKAGE_MANAGER_MESSAGE, PROGRESS, PROJECT_PINNED_OFFLINE, PROJECT_SETUP_CLAIMABLE_DESCRIPTION, PROJECT_SETUP_CLAIMABLE_TITLE, PROJECT_SETUP_LINK_DESCRIPTION, PROJECT_SETUP_LINK_TITLE, PROJECT_SETUP_MESSAGE, SERVICES_HINT, SERVICES_MESSAGE, SKILLS_PICKER_MESSAGE, agentMissingCommandDescription, claimableNext, claimableThenServicesNext, configInitNext, envPullFailedNext, existingConfigNext, headingForOutcome, installFailedNext, mcpAfterLinkNext, mcpConfigLocationSkipped, mcpConfigLocationUnavailable, mcpKeyFailedNext, namedAgentsUnavailable, newConfigNext, offlinePinNext, skippedLinkNext, unattendedUnauthedNext };
+export { AGENTS_NOT_INSTALLED, AGENT_DETECTED_DESCRIPTION, AGENT_MCP_PICKER_MESSAGE, AGENT_MCP_SKIP_MESSAGE, AGENT_OTHER_DESCRIPTION, AGENT_PICKER_MESSAGE, AGENT_PLUGIN_SKIP_MESSAGE, AGENT_SETUP_MESSAGE, AGENT_SETUP_PLUGIN_DESCRIPTION, AGENT_SETUP_PLUGIN_TITLE, AGENT_SETUP_SKILLS_DESCRIPTION, AGENT_SETUP_SKILLS_TITLE, AGENT_SETUP_SKIP_DESCRIPTION, AGENT_SETUP_SKIP_TITLE, AGENT_SKILLS_PICKER_MESSAGE, AGENT_SKILLS_SKIP_MESSAGE, CANCELLED_BODY, CLAIMABLE_ACCOUNT_FLAGS, CLAIMABLE_ALREADY_LINKED, CLAIMABLE_MCP_API_KEY, CLAIMABLE_NO_LINK, CONFIG_CONFIRM_HINT, CONFIG_CONFIRM_MESSAGE, HEADING_CANCELLED, HEADING_COMPLETE, HEADING_FAILED, HEADING_PENDING, INIT_NEEDS_YES, INIT_SUBTITLE, MCP_API_KEY_NEEDS_AUTH, MCP_AUTH_API_KEY_DESCRIPTION, MCP_AUTH_API_KEY_TITLE, MCP_AUTH_MESSAGE, MCP_AUTH_OAUTH_DESCRIPTION, MCP_AUTH_OAUTH_TITLE, MCP_OAUTH_FALLBACK, MCP_SCOPED_NEEDS_PROJECT, MCP_SCOPE_GLOBAL_DESCRIPTION, MCP_SCOPE_GLOBAL_TITLE, MCP_SCOPE_MESSAGE, MCP_SCOPE_PROJECT_DESCRIPTION, MCP_SCOPE_PROJECT_TITLE, MODE_CUSTOM_DESCRIPTION, MODE_CUSTOM_TITLE, MODE_MESSAGE, MODE_RECOMMENDED_DESCRIPTION, MODE_RECOMMENDED_TITLE, NON_TTY_AGENT_SETUP, NON_TTY_LINK_NEEDS_AUTH, NO_AGENTS_FALLBACK_STATUS, NO_AGENT_SETUP_CONFLICT, PACKAGE_MANAGER_MESSAGE, PROGRESS, PROJECT_PINNED_OFFLINE, PROJECT_SETUP_CLAIMABLE_DESCRIPTION, PROJECT_SETUP_CLAIMABLE_TITLE, PROJECT_SETUP_LINK_DESCRIPTION, PROJECT_SETUP_LINK_TITLE, PROJECT_SETUP_MESSAGE, SERVICES_HINT, SERVICES_MESSAGE, SKILLS_PICKER_MESSAGE, agentMissingCommandDescription, claimableNext, claimableThenServicesNext, configInitNext, envPullFailedNext, existingConfigNext, headingForOutcome, installFailedNext, mcpAfterLinkNext, mcpConfigLocationSkipped, mcpConfigLocationUnavailable, mcpKeyFailedNext, namedAgentsUnavailable, newConfigNext, offlinePinNext, skippedLinkNext, toolingFailedNext, unattendedUnauthedNext };

package/dist/init/funnel.js

@@ -1,6 +1,10 @@
 import pkg_default from "../pkg.js";
-import { trackEvent } from "../analytics.js";
+import { codeFromBody, isNeonApiError } from "../api.js";
+import { isNetworkError, matchErrorCode } from "../errors.js";
+import { redactCredentialTokenIds, trackEvent } from "../analytics.js";
+import { AuthRefreshError } from "../auth.js";
 import { randomUUID } from "node:crypto";
+import { stripVTControlCharacters } from "node:util";
 //#region src/init/funnel.ts
 const CLI_INIT_START = "cli_init_start";
 const CLI_INIT_END = "cli_init_end";
@@ -70,17 +74,45 @@ const initStartProperties = (input) => ({
 	detected_agents: input.detection.detectedAgents,
 	ci: input.detection.ci
 });
-const initEndProperties = (input) => ({
-	init_run_id: input.initRunId,
-	cli_version: pkg_default.version,
-	mode: input.mode,
-	agent_setup: input.agentSetup,
-	agents_installed: input.agentsInstalled,
-	link: input.link,
-	config: input.config,
-	services: input.services,
-	outcome: input.outcome
-});
+/** Longer messages are cut so one plugin CLI dump cannot dominate the event. */
+const ERROR_MESSAGE_LIMIT = 2e3;
+/**
+* The `errCode` the top-level failure handler (`index.ts`) sends on `CLI Error` for the same
+* error, so a run's `error_code` and its `CLI Error` event agree.
+*/
+const initErrorCode = (error) => {
+	if (error instanceof AuthRefreshError) return "AUTH_FAILED";
+	if (isNetworkError(error)) return "NETWORK_ERROR";
+	if (isNeonApiError(error)) {
+		if (error.code === "ECONNABORTED") return "REQUEST_TIMEOUT";
+		const bodyCode = codeFromBody(error.data);
+		if (error.status === 401 || bodyCode === "SSO_AUTHORIZATION_REQUIRED" || bodyCode === "SSO_ORG_CREDS_ONLY") return "AUTH_FAILED";
+		return "API_ERROR";
+	}
+	return matchErrorCode(error instanceof Error ? error.message : void 0);
+};
+const initErrorMessage = (error) => {
+	const raw = error instanceof Error ? error.message : String(error);
+	return redactCredentialTokenIds(stripVTControlCharacters(raw)).slice(0, ERROR_MESSAGE_LIMIT);
+};
+const initEndProperties = (input) => {
+	const reported = input.errors.find((entry) => entry.error === input.exitError) ?? input.errors[0];
+	return {
+		init_run_id: input.initRunId,
+		cli_version: pkg_default.version,
+		mode: input.mode,
+		agent_setup: input.agentSetup,
+		agents_installed: input.agentsInstalled,
+		link: input.link,
+		config: input.config,
+		services: input.services,
+		outcome: input.outcome,
+		error_step: reported?.step ?? null,
+		error_code: reported === void 0 ? null : initErrorCode(reported.error),
+		error_message: reported === void 0 ? null : initErrorMessage(reported.error),
+		error_steps: [...new Set(input.errors.map((entry) => entry.step))]
+	};
+};
 const emitInitStart = (properties) => {
 	trackEvent(CLI_INIT_START, properties);
 };
@@ -95,8 +127,22 @@ const createInitFunnel = (initRunId = createInitRunId()) => ({
 	link: null,
 	config: null,
 	services: null,
+	errors: [],
+	exitError: void 0,
 	ended: false
 });
+/** Records a failure once: a deferred error rethrown at the end keeps the step it failed in. */
+const recordInitError = (state, step, error) => {
+	if (state.errors.some((entry) => entry.error === error)) return;
+	state.errors.push({
+		step,
+		error
+	});
+};
+const recordInitExit = (state, step, error) => {
+	recordInitError(state, step, error);
+	state.exitError = error;
+};
 const finishInitFunnel = (state, outcome, analytics) => {
 	if (state.ended || !analytics) return;
 	state.ended = true;
@@ -108,8 +154,10 @@ const finishInitFunnel = (state, outcome, analytics) => {
 		link: state.link,
 		config: state.config,
 		services: state.services,
-		outcome
+		outcome,
+		errors: state.errors,
+		exitError: state.exitError
 	}));
 };
 //#endregion
-export { CLI_INIT_END, CLI_INIT_START, createInitFunnel, createInitRunId, emitInitEnd, emitInitStart, finishInitFunnel, initEndProperties, initFlagsFromArgv, initStartProperties };
+export { CLI_INIT_END, CLI_INIT_START, createInitFunnel, createInitRunId, emitInitEnd, emitInitStart, finishInitFunnel, initEndProperties, initErrorCode, initErrorMessage, initFlagsFromArgv, initStartProperties, recordInitError, recordInitExit };

package/dist/init/run.js

@@ -15,7 +15,7 @@ import { missingPluginsCommands, pluginsInstallableAgents } from "../plugins/tar
 import { skillsInstallableAgents } from "../skills/targets.js";
 import { FALLBACK_SKILLS_AGENTS, assertNamedAgentTooling, funnelAgentSetup, planInitToolingSteps, recommendedTooling, resolveNamedAgents, splitInitTooling } from "./plan.js";
 import { inferPackageManager, resolvePackageManager } from "../utils/package_manager.js";
-import { CANCELLED_BODY, CLAIMABLE_ACCOUNT_FLAGS, CLAIMABLE_ALREADY_LINKED, CLAIMABLE_MCP_API_KEY, CLAIMABLE_NO_LINK, MCP_API_KEY_NEEDS_AUTH, MCP_SCOPED_NEEDS_PROJECT, NON_TTY_LINK_NEEDS_AUTH, NO_AGENTS_FALLBACK_STATUS, PROGRESS, PROJECT_PINNED_OFFLINE, claimableNext, claimableThenServicesNext, configInitNext, envPullFailedNext, existingConfigNext, installFailedNext, mcpAfterLinkNext, mcpConfigLocationSkipped, mcpConfigLocationUnavailable, mcpKeyFailedNext, namedAgentsUnavailable, newConfigNext, offlinePinNext, skippedLinkNext, unattendedUnauthedNext } from "./copy.js";
+import { AGENTS_NOT_INSTALLED, CANCELLED_BODY, CLAIMABLE_ACCOUNT_FLAGS, CLAIMABLE_ALREADY_LINKED, CLAIMABLE_MCP_API_KEY, CLAIMABLE_NO_LINK, MCP_API_KEY_NEEDS_AUTH, MCP_SCOPED_NEEDS_PROJECT, NON_TTY_LINK_NEEDS_AUTH, NO_AGENTS_FALLBACK_STATUS, PROGRESS, PROJECT_PINNED_OFFLINE, claimableNext, claimableThenServicesNext, configInitNext, envPullFailedNext, existingConfigNext, installFailedNext, mcpAfterLinkNext, mcpConfigLocationSkipped, mcpConfigLocationUnavailable, mcpKeyFailedNext, namedAgentsUnavailable, newConfigNext, offlinePinNext, skippedLinkNext, toolingFailedNext, unattendedUnauthedNext } from "./copy.js";
 import { agentsRowValue, configRowValue, formatInitDone, headingForKind, printInitBanner, printInitDone, printInitProgress, projectRowValue, shouldPrintInitBanner } from "./chrome.js";
 import { h as initCmd, t as ConfigInstallFailed } from "../_chunks/config-BH_qRHiG.js";
 import { o as quoteFlagValue, s as runLink } from "../_chunks/link-BgtkOBws.js";
@@ -24,11 +24,11 @@ import { CannotMintApiKeyError } from "../mcp/mint.js";
 import { pullInitEnv } from "./auth.js";
 import { InitCancelled, raceSigint, restoreCursor } from "./cancelled.js";
 import { pickAgentSetupInteractively, pickInitAgentsInteractively, pickInitConfigInteractively, pickInitMcpAuthInteractively, pickInitMcpConfigLocationInteractively, pickInitModeInteractively, pickInitPackageManagerInteractively, pickInitProjectSetupInteractively, pickInitServicesInteractively, pickInitSkillsInteractively } from "./wizard.js";
-import { runToolingSteps } from "./tooling.js";
+import { runToolingSteps, toolingStepCommandText } from "./tooling.js";
 import { l as create } from "../_chunks/claim-DqAvAvDm.js";
 import { INIT_CONFIG_SERVICES_CONFLICT, configPlanFromResolution, initEnvPullAfterConfig, resolveInitConfigChoice } from "./choices.js";
 import { detectInitEnvironment } from "./detect.js";
-import { createInitFunnel, emitInitStart, finishInitFunnel, initStartProperties } from "./funnel.js";
+import { createInitFunnel, emitInitStart, finishInitFunnel, initStartProperties, recordInitError, recordInitExit } from "./funnel.js";
 import { assertAgentSetupFlags, hasInitMcpFlags, inferInitAgentSetup, resolveInitMode } from "./mode.js";
 import { resolve } from "node:path";
 //#region src/init/run.ts
@@ -197,6 +197,8 @@ const runInit = async (props) => {
 	const funnel = createInitFunnel();
 	let outcome = "error";
 	let printed = false;
+	let step = "setup";
+	let deferredFailureNext = () => [];
 	try {
 		const detectOpts = {
 			cwd,
@@ -332,7 +334,23 @@ const runInit = async (props) => {
 		const mcpOauth = mcpAuth === "oauth";
 		const earlyTooling = delayMcp ? withoutMcp(tooling) : tooling;
 		const mcpState = {};
-		const reportedTooling = () => mcpState.error === void 0 && mcpState.deferredPin === void 0 ? tooling : withoutMcp(tooling);
+		const toolingFailures = [];
+		const reportedTooling = () => {
+			const dropped = new Set(toolingFailures.map((failure) => failure.kind));
+			if (mcpState.error !== void 0 || mcpState.deferredPin !== void 0) dropped.add("mcp");
+			return withoutKinds(tooling, dropped);
+		};
+		const agentsRow = () => {
+			const reported = reportedTooling();
+			return toolingFailures.length > 0 && reported.setup === "skip" ? AGENTS_NOT_INSTALLED : agentsRowValue({
+				tooling: reported,
+				installed: funnel.agentsInstalled
+			});
+		};
+		const toolingFailedNextLines = () => toolingFailedNext(toolingFailures.map((failure) => ({
+			kind: failure.kind,
+			command: failure.command
+		})));
 		const mcpCommand = (projectIdArg) => [
 			`${getCliName()} mcp -y`,
 			...mcpConfigLocation === "project" ? ["--project"] : [],
@@ -340,25 +358,35 @@ const runInit = async (props) => {
 			...("mcpAgents" in tooling ? tooling.mcpAgents : []).map((agent) => `--agent ${agent}`)
 		].join(" ");
 		const mcpFailedNext = () => mcpState.error === void 0 ? [] : mcpKeyFailedNext(mcpState.reason ?? "cannot-mint", mcpCommand(mcpState.pinId !== void 0 ? quoteFlagValue(mcpState.pinId) : void 0));
+		deferredFailureNext = () => joinNext(toolingFailedNextLines(), mcpFailedNext());
 		const mcpDeferredNext = () => mcpState.deferredPin === void 0 ? [] : mcpAfterLinkNext(`${mcpCommand(mcpState.deferredPin)}${mcpOauth ? " --oauth" : ""}`);
 		const runTooling = async (steps, plan) => {
-			let ran = plan;
-			try {
-				await runToolingSteps(steps, {
-					cwd,
-					output: props.output,
-					auth,
-					operations: props.operations,
-					narrate: "human",
-					mcpOauthFallback: !mcpAuthChosen
-				});
-			} catch (error) {
-				if (!(error instanceof CannotMintApiKeyError)) throw error;
-				mcpState.error = error;
-				mcpState.reason = "cannot-mint";
-				ran = withoutMcp(plan);
+			for (const toolingStep of steps) {
+				let completed;
+				try {
+					completed = await runToolingSteps([toolingStep], {
+						cwd,
+						output: props.output,
+						auth,
+						operations: props.operations,
+						narrate: "human",
+						mcpOauthFallback: !mcpAuthChosen
+					});
+				} catch (error) {
+					if (error instanceof InitCancelled) throw error;
+					if (error instanceof CannotMintApiKeyError) {
+						mcpState.error = error;
+						mcpState.reason = "cannot-mint";
+					} else toolingFailures.push({
+						kind: toolingStep.kind,
+						command: `${getCliName()} ${toolingStepCommandText(toolingStep)}`,
+						error
+					});
+					recordInitError(funnel, toolingStep.kind, error);
+					continue;
+				}
+				if (completed.includes(toolingStep.kind)) funnel.agentsInstalled = uniqueAgents([...funnel.agentsInstalled, ...agentsForStep(plan, toolingStep.kind)]);
 			}
-			funnel.agentsInstalled = uniqueAgents([...funnel.agentsInstalled, ...agentsFromTooling(ran)]);
 		};
 		const toolingSteps = planInitToolingSteps({
 			tooling: earlyTooling,
@@ -370,6 +398,7 @@ const runInit = async (props) => {
 			...selectedSkills !== void 0 ? { skills: selectedSkills } : {}
 		});
 		if (toolingSteps.length > 0) await runTooling(toolingSteps, earlyTooling);
+		step = "link";
 		let projectSetup = "skip";
 		let claimExpiresAt;
 		const noLink = props.link === false;
@@ -419,6 +448,7 @@ const runInit = async (props) => {
 		};
 		if (usesMcp && mcpAuth === "api-key" && (projectSetup === "claimable" || props.claimable === true)) throw new Error(CLAIMABLE_MCP_API_KEY);
 		if (projectSetup === "claimable") {
+			step = "claimable";
 			printInitProgress(PROGRESS.claim);
 			await (props.createClaimable ?? defaultCreateClaimable)({
 				cwd,
@@ -432,12 +462,14 @@ const runInit = async (props) => {
 			funnel.link = "claimable";
 			claimExpiresAt = readLinkedClaimableCredentials(configDir, readContextFile(contextFile))?.expiresAt;
 		} else if (projectSetup === "link") {
+			step = "link";
 			printInitProgress(detection.authenticated ? PROGRESS.link : PROGRESS.auth);
 			await (props.linkProject ?? runAuthenticatedLink)(linkProps);
 			funnel.link = "linked";
 		}
 		const pinnedOffline = funnel.link === "skipped" && !noLink && linkInputs.orgId !== void 0 && linkInputs.projectId !== void 0 && linkInputs.branch !== void 0 && linkInputs.projectName === void 0 && linkInputs.regionId === void 0;
 		if (pinnedOffline) {
+			step = "link";
 			await runLink({
 				...linkProps,
 				checks: false,
@@ -449,9 +481,11 @@ const runInit = async (props) => {
 		else if (delayMcp && tooling.setup !== "skip" && mcpAuth === "api-key" && yes && !detection.authenticated) {
 			mcpState.error = new Error(MCP_API_KEY_NEEDS_AUTH);
 			mcpState.reason = "signed-out";
+			recordInitError(funnel, "mcp", mcpState.error);
 			const linkedId = readContextFile(contextFile).projectId;
 			if (props.mcpProjectScoped === true && typeof linkedId === "string") mcpState.pinId = linkedId;
 		} else if (delayMcp && tooling.setup !== "skip") {
+			step = "mcp";
 			const linkedId = readContextFile(contextFile).projectId;
 			let pinId;
 			if (props.mcpProjectScoped === true) {
@@ -479,6 +513,7 @@ const runInit = async (props) => {
 			mcpState.pinId = pinId;
 			if (mcpSteps.length > 0) await runTooling(mcpSteps, mcpOnly);
 		}
+		step = "config";
 		const canAskConfig = props.pickConfig !== void 0 || detection.interactive;
 		const configResolution = resolveInitConfigChoice({
 			flag: recommended ? props.config ?? true : props.config,
@@ -536,7 +571,7 @@ const runInit = async (props) => {
 						heading: failed.heading,
 						body: failed.body,
 						rows: [],
-						next: joinNext(failed.next, mcpFailedNext())
+						next: joinNext(failed.next, joinNext(toolingFailedNextLines(), mcpFailedNext()))
 					}));
 					printed = true;
 					outcome = "error";
@@ -557,48 +592,48 @@ const runInit = async (props) => {
 			...typeof context.projectId === "string" ? { projectId: context.projectId } : {},
 			...branch !== void 0 ? { branch } : {}
 		});
-		if (envPullPlan.kind !== "skip") try {
-			if (typeof context.projectId !== "string" || typeof branch !== "string") throw new Error("Env pull requires a linked project and branch.");
-			printInitProgress(PROGRESS.env);
-			await raceSigint((props.envPull ?? pullInitEnv)({
-				...auth,
-				output: props.output,
-				cwd,
-				projectId: context.projectId,
-				branch,
-				...envPullPlan.kind === "services" ? {
-					services: envPullPlan.services,
-					envKeys: envPullPlan.envKeys
-				} : {}
-			}));
-		} catch (error) {
-			if (error instanceof InitCancelled) throw error;
-			const failed = envPullFailedNext();
-			printInitDone(formatInitDone({
-				heading: failed.heading,
-				body: failed.body,
-				rows: [
-					{
-						label: "Agents",
-						value: agentsRowValue({
-							tooling: reportedTooling(),
-							installed: funnel.agentsInstalled
-						})
-					},
-					{
-						label: "Project",
-						value: projectRowValue(funnel.link)
-					},
-					{
-						label: "Config",
-						value: configRowValue(funnel.config, existingFilename)
-					}
-				],
-				next: joinNext(failed.next, mcpFailedNext())
-			}));
-			printed = true;
-			outcome = "error";
-			throw error;
+		if (envPullPlan.kind !== "skip") {
+			step = "env_pull";
+			try {
+				if (typeof context.projectId !== "string" || typeof branch !== "string") throw new Error("Env pull requires a linked project and branch.");
+				printInitProgress(PROGRESS.env);
+				await raceSigint((props.envPull ?? pullInitEnv)({
+					...auth,
+					output: props.output,
+					cwd,
+					projectId: context.projectId,
+					branch,
+					...envPullPlan.kind === "services" ? {
+						services: envPullPlan.services,
+						envKeys: envPullPlan.envKeys
+					} : {}
+				}));
+			} catch (error) {
+				if (error instanceof InitCancelled) throw error;
+				const failed = envPullFailedNext();
+				printInitDone(formatInitDone({
+					heading: failed.heading,
+					body: failed.body,
+					rows: [
+						{
+							label: "Agents",
+							value: agentsRow()
+						},
+						{
+							label: "Project",
+							value: projectRowValue(funnel.link)
+						},
+						{
+							label: "Config",
+							value: configRowValue(funnel.config, existingFilename)
+						}
+					],
+					next: joinNext(failed.next, joinNext(toolingFailedNextLines(), mcpFailedNext()))
+				}));
+				printed = true;
+				outcome = "error";
+				throw error;
+			}
 		}
 		const pendingUnauthed = funnel.link === "skipped" && !noLink;
 		const pendingServices = extraServices && linked;
@@ -640,16 +675,14 @@ const runInit = async (props) => {
 		outcome = pending && !pendingUnauthed && noLink ? "success" : pending ? "pending" : "success";
 		if (pendingUnauthed) outcome = "pending";
 		if (noLink && !pendingUnauthed && !pendingServices && !pendingExisting) outcome = "success";
-		if (mcpState.error !== void 0) outcome = "error";
+		const deferredError = toolingFailures[0]?.error ?? mcpState.error;
+		if (deferredError !== void 0) outcome = "error";
 		printInitDone(formatInitDone({
 			heading: headingForKind(outcome),
 			rows: [
 				{
 					label: "Agents",
-					value: agentsRowValue({
-						tooling: reportedTooling(),
-						installed: funnel.agentsInstalled
-					})
+					value: agentsRow()
 				},
 				{
 					label: "Project",
@@ -660,10 +693,10 @@ const runInit = async (props) => {
 					value: configRowValue(funnel.config, existingFilename)
 				}
 			],
-			next: joinNext(mcpFailedNext(), next)
+			next: joinNext(joinNext(toolingFailedNextLines(), mcpFailedNext()), next)
 		}));
 		printed = true;
-		if (mcpState.error !== void 0) throw mcpState.error;
+		if (deferredError !== void 0) throw deferredError;
 		takeCommandSuccessExtras();
 		recordCommandSuccessExtras({
 			init_kind: detection.emptyDirectory ? "empty-skip" : "existing",
@@ -682,6 +715,13 @@ const runInit = async (props) => {
 			throw error;
 		}
 		outcome = "error";
+		recordInitExit(funnel, step, error);
+		const deferred = deferredFailureNext();
+		if (!printed && deferred.length > 0) printInitDone(formatInitDone({
+			heading: headingForKind("error"),
+			rows: [],
+			next: deferred
+		}));
 		throw error;
 	} finally {
 		finishInitFunnel(funnel, outcome, analytics);
@@ -702,31 +742,46 @@ const joinNext = (first, second) => first.length === 0 || second.length === 0 ?
 	"",
 	...second
 ];
-const withoutMcp = (tooling) => {
-	if (tooling.setup === "mixed") return {
-		...tooling,
-		mcpAgents: []
-	};
-	if (tooling.setup === "skills-mcp") return tooling.skillsAgents.length === 0 ? { setup: "skip" } : {
-		...tooling,
-		mcpAgents: []
-	};
-	return tooling;
+const withoutKinds = (tooling, kinds) => {
+	switch (tooling.setup) {
+		case "skip": return tooling;
+		case "plugin": return kinds.has("plugins") ? { setup: "skip" } : tooling;
+		case "skills": return kinds.has("skills") ? { setup: "skip" } : tooling;
+		case "skills-mcp": {
+			const skillsAgents = kinds.has("skills") ? [] : tooling.skillsAgents;
+			const mcpAgents = kinds.has("mcp") ? [] : tooling.mcpAgents;
+			return skillsAgents.length === 0 && mcpAgents.length === 0 ? { setup: "skip" } : {
+				...tooling,
+				skillsAgents,
+				mcpAgents
+			};
+		}
+		case "mixed": {
+			const skillsAgents = kinds.has("skills") ? [] : tooling.skillsAgents;
+			const mcpAgents = kinds.has("mcp") ? [] : tooling.mcpAgents;
+			if (!kinds.has("plugins")) return {
+				...tooling,
+				skillsAgents,
+				mcpAgents
+			};
+			return skillsAgents.length === 0 && mcpAgents.length === 0 ? { setup: "skip" } : {
+				setup: "skills-mcp",
+				skillsAgents,
+				mcpAgents
+			};
+		}
+		default: return tooling;
+	}
 };
+const withoutMcp = (tooling) => withoutKinds(tooling, /* @__PURE__ */ new Set(["mcp"]));
 /** The Neon plugin bundles the skills. */
 const installsSkills = (tooling) => tooling.setup === "skills-mcp" ? tooling.skillsAgents.length > 0 : tooling.setup !== "skip";
-const agentsFromTooling = (tooling) => {
-	switch (tooling.setup) {
-		case "skip": return [];
-		case "plugin": return [...tooling.agents];
-		case "skills": return [...tooling.agents];
-		case "skills-mcp": return uniqueAgents([...tooling.skillsAgents, ...tooling.mcpAgents]);
-		case "mixed": return uniqueAgents([
-			...tooling.pluginAgents,
-			...tooling.skillsAgents,
-			...tooling.mcpAgents
-		]);
-		default: return tooling;
+const agentsForStep = (tooling, kind) => {
+	switch (kind) {
+		case "plugins": return tooling.setup === "plugin" ? [...tooling.agents] : tooling.setup === "mixed" ? [...tooling.pluginAgents] : [];
+		case "skills": return tooling.setup === "skills" ? [...tooling.agents] : tooling.setup === "skills-mcp" || tooling.setup === "mixed" ? [...tooling.skillsAgents] : [];
+		case "mcp": return tooling.setup === "skills-mcp" || tooling.setup === "mixed" ? [...tooling.mcpAgents] : [];
+		default: return kind;
 	}
 };
 //#endregion

package/dist/init/tooling.js

@@ -6,7 +6,7 @@ import { CannotMintApiKeyError } from "../mcp/mint.js";
 import { detectAgent } from "./detect_host.js";
 import { AgentSelectionSkipped, canPickAgentsInteractively } from "../utils/agent_picker.js";
 import { a as mcpInstallError, s as reportMcpInstall } from "../_chunks/mcp-Bo-7TKc7.js";
-import { l as reportPluginsInstall, o as installPlugins, s as pluginsInstallError } from "../_chunks/plugins-DqD7BDO1.js";
+import { l as reportPluginsInstall, o as installPlugins, s as pluginsInstallError } from "../_chunks/plugins-Dj0H6lDA.js";
 import { c as skillsInstallError, o as installSkills, s as reportSkillsInstall } from "../_chunks/skills-BP6pIm7O.js";
 import { runAuthenticatedMcp } from "./auth.js";
 import { raceSigint } from "./cancelled.js";
@@ -19,7 +19,7 @@ const TOOLING_STEP_LABELS = {
 	skills: PROGRESS.skills,
 	mcp: PROGRESS.mcp
 };
-/** Reconstructs a display-only, `neon <command> <flags>` style string for a step. Never executed — only ever logged. */
+/** The `<command> <flags>` a user can run to repeat this step on its own. Never executed here. */
 const toolingStepCommandText = (step) => {
 	const flags = [];
 	switch (step.kind) {
@@ -185,4 +185,4 @@ const runAgentTooling = async (options) => {
 	}));
 };
 //#endregion
-export { runAgentTooling, runToolingSteps };
+export { runAgentTooling, runToolingSteps, toolingStepCommandText };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neon",
-  "version": "8.13.1",
+  "version": "8.13.2",
   "description": "CLI tool for Neon, the cloud backend primitives built around Lakebase Postgres",
   "keywords": [
     "neon",
@@ -113,8 +113,8 @@
     "vitest": "^3.0.9",
     "@neon-internals/cli-core": "0.0.0",
     "@neon-internals/env-core": "0.0.36",
-    "@neon/env": "1.6.6",
     "@neon/e2e-harness": "0.0.0",
+    "@neon/env": "1.6.6",
     "@neon/functions": "0.11.0"
   },
   "publishConfig": {