neon 6.0.0 → 6.2.0

package/dist/init/auth.js

@@ -0,0 +1,84 @@
+import { isNeonApiError } from "../api.js";
+import { r as defaultDir } from "../_chunks/paths-DMq0Lt7a.js";
+import "../config.js";
+import "../auth.js";
+import { ensureAuth } from "../commands/auth.js";
+import { recoverFrom401 } from "../auth_recovery.js";
+import { pull } from "../commands/env.js";
+import { setupNeonMcp } from "../commands/mcp.js";
+//#region src/init/auth.ts
+const isUnauthorized = (error) => isNeonApiError(error) && error.status === 401;
+const authenticationFailed = () => /* @__PURE__ */ new Error("Authentication failed.");
+/**
+* Fills in the fields `ensureAuth` requires beyond `InitAuthOptions`, and sets `_` so
+* `ensureAuth`'s per-command branches (`isMcpCommand`, `isSkillsCommand`, ...) treat this
+* exactly like the standalone command it names — mirrors `init/link.ts`'s `runAuthenticatedLink`.
+*/
+const authContext = (options, command) => ({
+	...options,
+	_: [...command],
+	configDir: options.configDir ?? defaultDir,
+	oauthHost: options.oauthHost ?? process.env.NEON_OAUTH_HOST ?? "https://oauth2.neon.tech",
+	clientId: options.clientId ?? "neonctl",
+	help: false
+});
+/**
+* Resolves Neon auth the same way a standalone `neon mcp` invocation would, then runs
+* `setupNeonMcp`. `init`/`bootstrap` never resolve a shared `apiClient` of their own for
+* this (see `InitAuthOptions` above), so this is what does it, per call.
+*
+* Skips `ensureAuth` entirely when `options.oauth` is true: `setupNeonMcp`'s oauth branch
+* never reads `apiClient`/`apiKey`, and `ensureAuth`'s own `isMcpOauth` skip reads the real
+* `process.argv` for `--oauth` (documented there as required because that middleware runs
+* before flag parsing) — which never contains it for a `neon init`/`bootstrap` process, so
+* `ensureAuth` would otherwise try to resolve credentials it doesn't need and can fail on
+* an unrelated bad profile or expired session.
+*/
+const runAuthenticatedMcp = async (options) => {
+	if (options.oauth === true) return setupNeonMcp(options);
+	const authenticated = authContext(options, ["mcp"]);
+	await ensureAuth(authenticated);
+	try {
+		return await setupNeonMcp(authenticated);
+	} catch (error) {
+		if (!isUnauthorized(error)) throw error;
+		if (!await recoverFrom401(true)) throw authenticationFailed();
+	}
+	await ensureAuth(authenticated);
+	try {
+		return await setupNeonMcp(authenticated);
+	} catch (error) {
+		if (!isUnauthorized(error)) throw error;
+		await recoverFrom401(false);
+		throw authenticationFailed();
+	}
+};
+/**
+* Resolves Neon auth the same way a standalone `neon env pull` invocation would, then runs
+* `pull` — the same function `link`/`checkout` already call directly via
+* `autoPullEnvAfterPin` (see `commands/env.ts`).
+*/
+const pullInitEnv = async (props) => {
+	const authenticated = authContext(props, ["env", "pull"]);
+	await ensureAuth(authenticated);
+	const opts = {
+		announce: true,
+		implyAiGateway: true
+	};
+	try {
+		return await pull(authenticated, opts);
+	} catch (error) {
+		if (!isUnauthorized(error)) throw error;
+		if (!await recoverFrom401(true)) throw authenticationFailed();
+	}
+	await ensureAuth(authenticated);
+	try {
+		return await pull(authenticated, opts);
+	} catch (error) {
+		if (!isUnauthorized(error)) throw error;
+		await recoverFrom401(false);
+		throw authenticationFailed();
+	}
+};
+//#endregion
+export { pullInitEnv, runAuthenticatedMcp };

package/dist/init/cancelled.js

@@ -5,6 +5,31 @@ var InitCancelled = class extends Error {
 		this.name = "InitCancelled";
 	}
 };
+/**
+* Rejects with {@link InitCancelled} on SIGINT while `work` is pending, so a step that runs
+* fully in-process (no spawned child of its own to die and report the signal back) still
+* unwinds through `runInit`'s normal cancellation handling — the "Neon setup cancelled."
+* summary and the funnel's final telemetry — instead of Node's default SIGINT disposition
+* killing the process with no chance to run either.
+*
+* Does not cancel `work` itself: there is no cooperative cancellation to ask for here, so a
+* lost race leaves it running in the background, its eventual settlement discarded. That is
+* fine — the process is already unwinding to exit on the `InitCancelled` path.
+*/
+const raceSigint = (work) => new Promise((resolve, reject) => {
+	const onSigint = () => reject(new InitCancelled());
+	process.once("SIGINT", onSigint);
+	const stop = () => {
+		process.removeListener("SIGINT", onSigint);
+	};
+	work.then((value) => {
+		stop();
+		resolve(value);
+	}, (error) => {
+		stop();
+		reject(error);
+	});
+});
 const restoreCursor = () => {
 	process.stdout.write("\x1B[?25h");
 	process.stdout.write("\n");
@@ -13,4 +38,4 @@ const restoreCursorVisibilityOnAbort = (state) => {
 	if (state.aborted) process.stdout.write("\x1B[?25h");
 };
 //#endregion
-export { InitCancelled, restoreCursor, restoreCursorVisibilityOnAbort };
+export { InitCancelled, raceSigint, restoreCursor, restoreCursorVisibilityOnAbort };

package/dist/init/chrome.js

@@ -1,5 +1,5 @@
 import { isCi } from "../env.js";
-import { HEADING_CANCELLED, HEADING_COMPLETE, HEADING_FAILED, HEADING_PENDING, INIT_SUBTITLE, PROGRESS } from "./copy.js";
+import { HEADING_CANCELLED, HEADING_COMPLETE, HEADING_FAILED, HEADING_PENDING, INIT_SUBTITLE } from "./copy.js";
 import chalk from "chalk";
 //#region src/init/chrome.ts
 const NEON_GREEN = "#4BB578";
@@ -89,23 +89,6 @@ const configRowValue = (config, filename) => {
 	if (config === "skipped" || config === null) return "skipped";
 	return config;
 };
-const INIT_STEP_LABELS = {
-	bootstrap: "Creating the app from the selected template...",
-	plugins: PROGRESS.plugins,
-	skills: PROGRESS.skills,
-	mcp: PROGRESS.mcp,
-	auth: PROGRESS.auth,
-	link: PROGRESS.link,
-	claim: PROGRESS.claim,
-	config: PROGRESS.config,
-	env: PROGRESS.env
-};
-const initStepLabel = (step) => {
-	const command = step[0];
-	if (command === void 0) return;
-	if (command === "config") return INIT_STEP_LABELS.config;
-	return INIT_STEP_LABELS[command];
-};
 const headingForKind = (kind) => {
 	switch (kind) {
 		case "success": return HEADING_COMPLETE;
@@ -116,4 +99,4 @@ const headingForKind = (kind) => {
 	}
 };
 //#endregion
-export { INIT_BANNER_LINES, INIT_STEP_LABELS, NEON_GREEN, agentSetupDoneLabel, agentSetupLabel, agentsRowValue, configRowValue, configSummaryLabel, formatInitBanner, formatInitDone, headingForKind, initStepLabel, printInitBanner, printInitDone, printInitProgress, projectRowValue, shouldPrintInitBanner };
+export { INIT_BANNER_LINES, NEON_GREEN, agentSetupDoneLabel, agentSetupLabel, agentsRowValue, configRowValue, configSummaryLabel, formatInitBanner, formatInitDone, headingForKind, printInitBanner, printInitDone, printInitProgress, projectRowValue, shouldPrintInitBanner };

package/dist/init/detect.js

@@ -5,8 +5,8 @@ import { i as selectCredential, t as credentialInputs } from "../_chunks/auth_se
 import { detectInstalledAgents, uniqueAgentIds } from "../mcp/agents.js";
 import "./agents.js";
 import { directoryIsEmpty } from "./plan.js";
-import { canPickAgentsInteractively } from "../utils/agent_picker.js";
 import { detectAgent } from "./detect_host.js";
+import { canPickAgentsInteractively } from "../utils/agent_picker.js";
 import { existsSync, readdirSync } from "node:fs";
 import { detectProjectAgents } from "add-mcp";
 //#region src/init/detect.ts

package/dist/init/plan.js

@@ -36,21 +36,47 @@ const postScaffoldActions = (input) => {
 	return actions;
 };
 const planAgentSteps = (input) => {
-	const y = input.yes ? ["-y"] : [];
-	if (input.agentSetup === "plugin") return [["plugins", ...y]];
-	if (input.agentSetup === "skills-mcp") return [["skills", ...y], ["mcp", ...y]];
+	if (input.agentSetup === "plugin") return [{
+		kind: "plugins",
+		options: { yes: input.yes }
+	}];
+	if (input.agentSetup === "skills-mcp") return [{
+		kind: "skills",
+		options: { yes: input.yes }
+	}, {
+		kind: "mcp",
+		options: { yes: input.yes }
+	}];
 	return [];
 };
 const planToolingSteps = (tooling, options) => {
-	const prefix = options.yes ? ["-y"] : [];
-	const flagsFor = (ids) => options.named ? [...prefix, ...agentArgv(ids)] : [...prefix];
+	const agentsFor = (ids) => options.named ? { agents: ids } : {};
+	const agentFor = (ids) => options.named ? { agent: [...ids] } : {};
 	switch (tooling.setup) {
 		case "skip": return [];
-		case "plugin": return [["plugins", ...flagsFor(tooling.agents)]];
+		case "plugin": return [{
+			kind: "plugins",
+			options: {
+				yes: options.yes,
+				...agentsFor(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)]);
+			if (tooling.skillsAgents.length > 0) steps.push({
+				kind: "skills",
+				options: {
+					yes: options.yes,
+					...agentsFor(tooling.skillsAgents)
+				}
+			});
+			if (tooling.mcpAgents.length > 0) steps.push({
+				kind: "mcp",
+				options: {
+					yes: options.yes,
+					...agentFor(tooling.mcpAgents)
+				}
+			});
 			return steps;
 		}
 		default: return tooling;
@@ -209,46 +235,63 @@ const recommendedTooling = (detected) => {
 	return split;
 };
 const planInitToolingSteps = (input) => {
-	const y = input.yes ? ["-y"] : [];
-	const pluginPrefix = [
-		"plugins",
-		...input.pluginScope === "global" ? ["--global"] : [],
-		...y
-	];
-	const skillFlags = (input.skills ?? []).flatMap((skill) => ["--skill", skill]);
-	const skillsPrefix = [
-		"skills",
-		...input.skillsGlobal ? ["--global"] : [],
-		...y,
-		...skillFlags
-	];
-	const mcpPrefix = [
-		"mcp",
-		...y,
-		...input.mcpOauth ? ["--oauth"] : [],
-		...input.mcpProject === true ? ["--project"] : [],
-		...input.mcpProjectId !== void 0 ? ["--project-id", input.mcpProjectId] : []
-	];
-	const named = (ids) => agentArgv(ids);
+	const pluginOptions = (agents) => ({
+		yes: input.yes,
+		global: input.pluginScope === "global",
+		agents
+	});
+	const skillsOptions = (agents) => ({
+		yes: input.yes,
+		global: input.skillsGlobal,
+		agents,
+		...input.skills !== void 0 ? { skills: input.skills } : {}
+	});
+	const mcpOptions = (agents) => ({
+		yes: input.yes,
+		oauth: input.mcpOauth,
+		project: input.mcpProject === true,
+		agent: [...agents],
+		...input.mcpProjectId !== void 0 ? { projectId: input.mcpProjectId } : {}
+	});
 	switch (input.tooling.setup) {
 		case "skip": return [];
-		case "plugin": return [[...pluginPrefix, ...named(input.tooling.agents)]];
-		case "skills": return [[
-			"skills",
-			...y,
-			...skillFlags,
-			...named(input.tooling.agents)
-		]];
+		case "plugin": return [{
+			kind: "plugins",
+			options: pluginOptions(input.tooling.agents)
+		}];
+		case "skills": return [{
+			kind: "skills",
+			options: {
+				yes: input.yes,
+				agents: input.tooling.agents,
+				...input.skills !== void 0 ? { skills: input.skills } : {}
+			}
+		}];
 		case "skills-mcp": {
 			const steps = [];
-			if (input.tooling.skillsAgents.length > 0) steps.push([...skillsPrefix, ...named(input.tooling.skillsAgents)]);
-			if (input.tooling.mcpAgents.length > 0) steps.push([...mcpPrefix, ...named(input.tooling.mcpAgents)]);
+			if (input.tooling.skillsAgents.length > 0) steps.push({
+				kind: "skills",
+				options: skillsOptions(input.tooling.skillsAgents)
+			});
+			if (input.tooling.mcpAgents.length > 0) steps.push({
+				kind: "mcp",
+				options: mcpOptions(input.tooling.mcpAgents)
+			});
 			return steps;
 		}
 		case "mixed": {
-			const steps = [[...pluginPrefix, ...named(input.tooling.pluginAgents)]];
-			if (input.tooling.skillsAgents.length > 0) steps.push([...skillsPrefix, ...named(input.tooling.skillsAgents)]);
-			if (input.tooling.mcpAgents.length > 0) steps.push([...mcpPrefix, ...named(input.tooling.mcpAgents)]);
+			const steps = [{
+				kind: "plugins",
+				options: pluginOptions(input.tooling.pluginAgents)
+			}];
+			if (input.tooling.skillsAgents.length > 0) steps.push({
+				kind: "skills",
+				options: skillsOptions(input.tooling.skillsAgents)
+			});
+			if (input.tooling.mcpAgents.length > 0) steps.push({
+				kind: "mcp",
+				options: mcpOptions(input.tooling.mcpAgents)
+			});
 			return steps;
 		}
 		default: return input.tooling;
@@ -333,30 +376,9 @@ const linkInputArgv = (input) => {
 	if (input.branch) args.push("--branch", input.branch);
 	return args;
 };
-const planExistingInit = (input) => {
-	const steps = [...planAgentSteps(input)];
-	if (!input.linked) steps.push(planLinkStep({
-		yes: input.yes,
-		extra: input.linkExtra
-	}));
-	if (input.config.kind === "write") steps.push(planConfigInitStep({
-		yes: input.yes,
-		services: input.config.services
-	}));
-	return steps;
-};
 const resolveInitAgentSetup = async (input) => {
 	if (input.interactive) return input.pick();
 	throw new Error(INIT_NEEDS_YES_OR_TERMINAL);
 };
-const childArgv = (step, forward) => {
-	const args = [...step];
-	if (forward.configDir) args.push("--config-dir", forward.configDir);
-	if (forward.profile) args.push("--profile", forward.profile);
-	args.push("--api-host", forward.apiHost);
-	args.push("--context-file", forward.contextFile);
-	if (forward.analytics === false) args.push("--no-analytics");
-	return args;
-};
 //#endregion
-export { FALLBACK_SKILLS_AGENTS, INIT_NEEDS_YES_OR_TERMINAL, NAMED_AGENTS_MIXED, NAMED_AGENTS_UNSUPPORTED, assertNamedAgentTooling, bootstrapInitStep, childArgv, chooseYesAgentTooling, collectYesAgents, directoryIsEmpty, funnelAgentSetup, initPluginAgents, initSkillsMcpAgents, initYesSupportedAgents, linkInputArgv, namedAgentsMixedMessage, namedAgentsNeedSplit, noDetectedAgentsMessage, planAgentSteps, planConfigInitStep, planExistingInit, planInitToolingSteps, planLinkStep, planToolingSteps, planYesAgentSteps, postScaffoldActions, projectContextFile, recommendedTooling, resolveInitAgentSetup, resolveNamedAgents, resolveYesAgentList, rewriteUnknownAgentArg, splitInitTooling };
+export { FALLBACK_SKILLS_AGENTS, INIT_NEEDS_YES_OR_TERMINAL, NAMED_AGENTS_MIXED, NAMED_AGENTS_UNSUPPORTED, assertNamedAgentTooling, bootstrapInitStep, chooseYesAgentTooling, collectYesAgents, directoryIsEmpty, funnelAgentSetup, initPluginAgents, initSkillsMcpAgents, initYesSupportedAgents, linkInputArgv, namedAgentsMixedMessage, namedAgentsNeedSplit, noDetectedAgentsMessage, planAgentSteps, planConfigInitStep, planInitToolingSteps, planLinkStep, planToolingSteps, planYesAgentSteps, postScaffoldActions, projectContextFile, recommendedTooling, resolveInitAgentSetup, resolveNamedAgents, resolveYesAgentList, rewriteUnknownAgentArg, splitInitTooling };

package/dist/init/run.js

@@ -3,14 +3,11 @@ import { r as defaultDir } from "../_chunks/paths-DMq0Lt7a.js";
 import "../config.js";
 import { contextBranch, readContextFile } from "../context.js";
 import { recordCommandSuccessExtras, takeCommandSuccessExtras } from "../analytics.js";
-import { t as credentialInputs } from "../_chunks/auth_selection-pitMFzDe.js";
 import "../claimable/api.js";
 import { readLinkedClaimableCredentials } from "../claimable/state.js";
 import { getCliName } from "../utils/cli_name.js";
 import { deprecatedServiceMessage, parseServices, servicesFlagValue } from "../neon_services.js";
 import { CONFIG_INIT_NONE_MEANS, CONFIG_INIT_SERVICES, CONFIG_INIT_UNAVAILABLE } from "../config_template.js";
-import { InitCancelled, restoreCursor } from "./cancelled.js";
-import { initChildEnv, spawnCliChild } from "./child.js";
 import { CANCELLED_BODY, CLAIMABLE_ACCOUNT_FLAGS, CLAIMABLE_ALREADY_LINKED, CLAIMABLE_MCP_API_KEY, CLAIMABLE_NO_LINK, MCP_SCOPED_NEEDS_PROJECT, NON_TTY_LINK_NEEDS_AUTH, NO_AGENTS_FALLBACK_STATUS, PROGRESS, YES_LINK_NEEDS_AUTH, claimableNext, claimableThenServicesNext, envPullFailedNext, existingConfigNext, extraServicesNext, installFailedNext, mcpConfigLocationSkipped, mcpConfigLocationUnavailable, namedAgentsUnavailable, skippedLinkNext, unattendedUnauthedNext } from "./copy.js";
 import { agentsRowValue, configRowValue, formatInitDone, headingForKind, printInitBanner, printInitDone, printInitProgress, projectRowValue, shouldPrintInitBanner } from "./chrome.js";
 import { inferPackageManager, resolvePackageManager } from "../utils/package_manager.js";
@@ -20,8 +17,10 @@ import { mcpInstallableAgents } from "../mcp/targets.js";
 import { pluginsInstallableAgents } from "../plugins/targets.js";
 import { skillsInstallableAgents } from "../skills/targets.js";
 import { FALLBACK_SKILLS_AGENTS, assertNamedAgentTooling, funnelAgentSetup, planInitToolingSteps, recommendedTooling, resolveNamedAgents, splitInitTooling } from "./plan.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 { runInitSteps } from "./tooling.js";
+import { runToolingSteps } from "./tooling.js";
 import { create } from "../commands/claim.js";
 import { INIT_CONFIG_SERVICES_CONFLICT, configPlanFromResolution, isBareInitServices, resolveInitConfigChoice, shouldPullEnvAfterInitConfig } from "./choices.js";
 import { detectInitEnvironment } from "./detect.js";
@@ -153,16 +152,18 @@ const runInit = async (props) => {
 		...props.mcpAuth !== void 0 ? { mcpAuth: props.mcpAuth } : {},
 		...props.mcpProjectScoped === true ? { mcpProjectScoped: true } : {}
 	});
-	const run = props.run ?? spawnCliChild;
-	const explicitKey = props.profile ? "" : credentialInputs().apiKeyFlag;
-	const authEnv = explicitKey ? { NEON_API_KEY: explicitKey } : void 0;
 	const configDir = props.configDir ?? defaultDir;
-	const forward = {
-		...props.configDir ? { configDir: props.configDir } : {},
-		...props.profile ? { profile: props.profile } : {},
+	const auth = {
+		apiClient: props.apiClient,
+		apiKey: props.apiKey,
 		apiHost: props.apiHost,
 		contextFile,
-		...props.analytics === false ? { analytics: false } : {}
+		...props.configDir ? { configDir: props.configDir } : {},
+		...props.profile ? { profile: props.profile } : {},
+		...props.oauthHost ? { oauthHost: props.oauthHost } : {},
+		...props.clientId ? { clientId: props.clientId } : {},
+		...props.forceAuth !== void 0 ? { forceAuth: props.forceAuth } : {},
+		...props.allowUnsafeTls !== void 0 ? { allowUnsafeTls: props.allowUnsafeTls } : {}
 	};
 	const servicesFlag = parsedInitServices(props.services);
 	if (props.config === false && servicesFlag !== void 0) throw new Error(INIT_CONFIG_SERVICES_CONFLICT);
@@ -320,11 +321,11 @@ const runInit = async (props) => {
 			...selectedSkills !== void 0 ? { skills: selectedSkills } : {}
 		});
 		if (toolingSteps.length > 0) {
-			await runInitSteps(toolingSteps, {
+			await runToolingSteps(toolingSteps, {
 				cwd,
-				run,
-				forward,
-				authEnv,
+				output: props.output,
+				auth,
+				operations: props.operations,
 				narrate: "human"
 			});
 			funnel.agentsInstalled = agentsFromTooling(earlyTooling);
@@ -420,11 +421,11 @@ const runInit = async (props) => {
 				...pinId !== void 0 ? { mcpProjectId: pinId } : {}
 			});
 			if (mcpSteps.length > 0) {
-				await runInitSteps(mcpSteps, {
+				await runToolingSteps(mcpSteps, {
 					cwd,
-					run,
-					forward,
-					authEnv,
+					output: props.output,
+					auth,
+					operations: props.operations,
 					narrate: "human"
 				});
 				funnel.agentsInstalled = uniqueAgents([...funnel.agentsInstalled, ...agentsFromTooling(mcpOnly)]);
@@ -509,14 +510,17 @@ const runInit = async (props) => {
 			...typeof context.projectId === "string" ? { projectId: context.projectId } : {},
 			...branch !== void 0 ? { branch } : {}
 		})) try {
-			await runInitSteps([["env", "pull"]], {
+			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,
-				run,
-				forward,
-				authEnv,
-				narrate: "human"
-			});
+				projectId: context.projectId,
+				branch
+			}));
 		} catch (error) {
+			if (error instanceof InitCancelled) throw error;
 			const failed = envPullFailedNext();
 			printInitDone(formatInitDone({
 				heading: failed.heading,
@@ -638,4 +642,4 @@ const agentsFromTooling = (tooling) => {
 	}
 };
 //#endregion
-export { initChildEnv, runInit };
+export { runInit };

package/dist/init/tooling.js

@@ -1,23 +1,109 @@
 import { log } from "../log.js";
 import { getCliName } from "../utils/cli_name.js";
-import { AUTH_CHILD } from "./child.js";
-import { initStepLabel } from "./chrome.js";
-import { assertNamedAgentTooling, childArgv, chooseYesAgentTooling, collectYesAgents, initYesSupportedAgents, noDetectedAgentsMessage, planAgentSteps, planToolingSteps, planYesAgentSteps, resolveInitAgentSetup } from "./plan.js";
-import { canPickAgentsInteractively } from "../utils/agent_picker.js";
+import { PROGRESS } from "./copy.js";
+import { assertNamedAgentTooling, chooseYesAgentTooling, collectYesAgents, initYesSupportedAgents, noDetectedAgentsMessage, planAgentSteps, planToolingSteps, planYesAgentSteps, resolveInitAgentSetup } from "./plan.js";
 import { detectAgent } from "./detect_host.js";
+import { canPickAgentsInteractively } from "../utils/agent_picker.js";
+import { mcpInstallError, reportMcpInstall } from "../commands/mcp.js";
+import { installPlugins, pluginsInstallError, reportPluginsInstall } from "../commands/plugins.js";
+import { installSkills, reportSkillsInstall, skillsInstallError } from "../commands/skills.js";
+import { runAuthenticatedMcp } from "./auth.js";
+import { raceSigint } from "./cancelled.js";
 import { pickAgentSetupInteractively } from "./wizard.js";
 import { detectProjectAgents } from "add-mcp";
 //#region src/init/tooling.ts
 const defaultProjectAgents = (cwd) => detectProjectAgents(cwd);
-const runInitSteps = async (steps, options) => {
+const TOOLING_STEP_LABELS = {
+	plugins: PROGRESS.plugins,
+	skills: PROGRESS.skills,
+	mcp: PROGRESS.mcp
+};
+/** Reconstructs a display-only, `neon <command> <flags>` style string for a step. Never executed — only ever logged. */
+const toolingStepCommandText = (step) => {
+	const flags = [];
+	switch (step.kind) {
+		case "plugins": {
+			const { options } = step;
+			if (options.yes) flags.push("-y");
+			if (options.global) flags.push("--global");
+			for (const agent of options.agents ?? []) flags.push("--agent", agent);
+			break;
+		}
+		case "skills": {
+			const { options } = step;
+			if (options.yes) flags.push("-y");
+			if (options.global) flags.push("--global");
+			for (const skill of options.skills ?? []) flags.push("--skill", skill);
+			for (const agent of options.agents ?? []) flags.push("--agent", agent);
+			break;
+		}
+		case "mcp": {
+			const { options } = step;
+			if (options.yes) flags.push("-y");
+			if (options.oauth) flags.push("--oauth");
+			if (options.project) flags.push("--project");
+			if (options.projectId !== void 0) flags.push("--project-id", options.projectId);
+			for (const agent of options.agent ?? []) flags.push("--agent", agent);
+			break;
+		}
+		default: return step;
+	}
+	return [step.kind, ...flags].join(" ");
+};
+/**
+* Runs plugins/skills/mcp installs in-process, in order, via {@link ToolingOperations}. This
+* replaces re-executing the `neon` binary as a child process (`neon plugins`, `neon skills`,
+* `neon mcp`) to reuse those commands — see `packages/cli/AGENTS.md`.
+*/
+const runToolingSteps = async (steps, options) => {
+	const ops = {
+		installPlugins,
+		installSkills,
+		installMcp: (stepOptions) => runAuthenticatedMcp({
+			...stepOptions,
+			...options.auth
+		}),
+		...options.operations
+	};
+	const reportProps = { output: options.output };
 	for (const step of steps) {
-		const label = options.narrate === "human" ? initStepLabel(step) : void 0;
+		const label = options.narrate === "human" ? TOOLING_STEP_LABELS[step.kind] : void 0;
 		if (label !== void 0) process.stdout.write(`${label}\n`);
-		else log.info("Running `%s %s`", getCliName(), step.join(" "));
-		log.debug("Running `%s %s`", getCliName(), step.join(" "));
-		const argv = childArgv(step, options.forward);
-		const command = step[0];
-		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.`);
+		else log.info("Running `%s %s`", getCliName(), toolingStepCommandText(step));
+		log.debug("Running `%s %s`", getCliName(), toolingStepCommandText(step));
+		switch (step.kind) {
+			case "plugins": {
+				const outcome = await raceSigint(ops.installPlugins({
+					...step.options,
+					cwd: options.cwd
+				}));
+				reportPluginsInstall(reportProps, outcome);
+				const error = pluginsInstallError(outcome);
+				if (error) throw error;
+				break;
+			}
+			case "skills": {
+				const outcome = await raceSigint(ops.installSkills({
+					...step.options,
+					cwd: options.cwd
+				}));
+				reportSkillsInstall(reportProps, outcome);
+				const error = skillsInstallError(outcome);
+				if (error) throw error;
+				break;
+			}
+			case "mcp": {
+				const outcome = await raceSigint(ops.installMcp({
+					...step.options,
+					cwd: options.cwd
+				}));
+				reportMcpInstall(reportProps, outcome);
+				const error = mcpInstallError(outcome);
+				if (error) throw error;
+				break;
+			}
+			default: return step;
+		}
 	}
 };
 const yesAgentsFromOptions = async (options) => collectYesAgents({
@@ -36,14 +122,14 @@ const runAgentTooling = async (options) => {
 	if (named.length > 0) {
 		assertNamedAgentTooling(named, options.command ?? "init");
 		const tooling = chooseYesAgentTooling(named);
-		await runInitSteps(planToolingSteps(tooling, {
+		await runToolingSteps(planToolingSteps(tooling, {
 			yes,
 			named: true
 		}), options);
 		return tooling.setup;
 	}
 	if (options.agentSetup !== void 0) {
-		await runInitSteps(planAgentSteps({
+		await runToolingSteps(planAgentSteps({
 			yes,
 			agentSetup: options.agentSetup
 		}), options);
@@ -52,7 +138,7 @@ const runAgentTooling = async (options) => {
 	if (yes) {
 		if (options.hasProjectPlugins !== void 0) {
 			const agentSetup = await options.hasProjectPlugins(options.cwd) ? "plugin" : "skills-mcp";
-			await runInitSteps(planAgentSteps({
+			await runToolingSteps(planAgentSteps({
 				yes: true,
 				agentSetup
 			}), options);
@@ -61,7 +147,7 @@ const runAgentTooling = async (options) => {
 		const agents = await yesAgentsFromOptions(options);
 		const tooling = chooseYesAgentTooling(agents);
 		if (tooling.setup === "skip") throw yesMiss();
-		await runInitSteps(planYesAgentSteps(tooling), options);
+		await runToolingSteps(planYesAgentSteps(tooling), options);
 		return tooling.setup;
 	}
 	const interactive = options.pickAgentSetup !== void 0 || canPickAgentsInteractively();
@@ -69,15 +155,11 @@ const runAgentTooling = async (options) => {
 		interactive,
 		pick: options.pickAgentSetup ?? pickAgentSetupInteractively
 	});
-	await runInitSteps(planAgentSteps({
+	await runToolingSteps(planAgentSteps({
 		yes,
 		agentSetup
 	}), options);
 	return agentSetup;
 };
-const runScaffoldFollowUp = async (options) => {
-	if (!options.skipAgentSetup) await runAgentTooling(options);
-	if (options.shouldLink) await runInitSteps([options.linkYes ? ["link", "--yes"] : ["link"]], options);
-};
 //#endregion
-export { runAgentTooling, runInitSteps, runScaffoldFollowUp };
+export { runAgentTooling, runToolingSteps };

package/dist/init/wizard.js

@@ -1,5 +1,4 @@
 import { CONFIG_INIT_SERVICES } from "../config_template.js";
-import { InitCancelled, restoreCursorVisibilityOnAbort } from "./cancelled.js";
 import { AGENT_DETECTED_DESCRIPTION, AGENT_OTHER_DESCRIPTION, AGENT_PICKER_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, CONFIG_CONFIRM_HINT, CONFIG_CONFIRM_MESSAGE, MCP_AUTH_API_KEY_DESCRIPTION, MCP_AUTH_API_KEY_TITLE, MCP_AUTH_MESSAGE, MCP_AUTH_OAUTH_DESCRIPTION, MCP_AUTH_OAUTH_TITLE, MCP_SCOPE_GLOBAL_DESCRIPTION, MCP_SCOPE_GLOBAL_TITLE, MCP_SCOPE_MESSAGE, MCP_SCOPE_PROJECT_DESCRIPTION, MCP_SCOPE_PROJECT_TITLE, MODE_CUSTOM_DESCRIPTION, MODE_CUSTOM_TITLE, MODE_MESSAGE, MODE_RECOMMENDED_DESCRIPTION, MODE_RECOMMENDED_TITLE, PACKAGE_MANAGER_MESSAGE, PROJECT_SETUP_CLAIMABLE_DESCRIPTION, PROJECT_SETUP_CLAIMABLE_TITLE, PROJECT_SETUP_LINK_DESCRIPTION, PROJECT_SETUP_LINK_TITLE, PROJECT_SETUP_MESSAGE, SERVICES_HINT, SERVICES_MESSAGE, SKILLS_PICKER_MESSAGE } from "./copy.js";
 import { installedPackageManagers } from "../utils/package_manager.js";
 import { POSTGRES_SERVICE_CHOICE, keepPostgresSelected } from "../utils/service_picker.js";
@@ -7,6 +6,7 @@ import { getAgentDisplayName, listMcpAgentIds } from "../mcp/agents.js";
 import { INIT_NEEDS_YES_OR_TERMINAL } from "./plan.js";
 import { canPickAgentsInteractively } from "../utils/agent_picker.js";
 import { NEON_SKILL_CATALOG, listSkillIds } from "../skills/catalog.js";
+import { InitCancelled, restoreCursorVisibilityOnAbort } from "./cancelled.js";
 import chalk from "chalk";
 import prompts from "prompts";
 //#region src/init/wizard.ts