neon 4.14.6 → 4.16.0

package/dist/init/choices.js

@@ -0,0 +1,46 @@
+import { getCliName } from "../utils/cli_name.js";
+//#region src/init/choices.ts
+const INIT_TEMPLATE_CONFLICT = "--skip-template cannot be combined with --template.";
+const INIT_CONFIG_SERVICES_CONFLICT = "--no-config cannot be combined with --services.";
+const INIT_TEMPLATE_KEEPS_CONFIG = "A scaffolded template keeps the neon.ts it ships. --config, --no-config, and --services apply when you skip the template or set up an existing app.";
+const initTemplateInNonEmptyMessage = () => `--template is only for an empty directory. This directory already has files, so there is nothing to scaffold. Omit --template, or run \`${getCliName()} bootstrap\` in an empty folder.`;
+const resolveInitTemplateChoice = (input) => {
+	const id = input.template?.trim();
+	const hasTemplate = id !== void 0 && id.length > 0;
+	if (input.skipTemplate && hasTemplate) throw new Error(INIT_TEMPLATE_CONFLICT);
+	if (!input.empty) {
+		if (hasTemplate) throw new Error(initTemplateInNonEmptyMessage());
+		return { kind: "existing" };
+	}
+	if (input.skipTemplate) return { kind: "skip" };
+	if (hasTemplate) return {
+		kind: "template",
+		id
+	};
+	if (input.yes) return { kind: "default" };
+	return { kind: "ask" };
+};
+const resolveInitConfigChoice = (input) => {
+	if (input.flag === false && input.services !== void 0) throw new Error(INIT_CONFIG_SERVICES_CONFLICT);
+	if (input.flag === false) return { kind: "skip" };
+	if (input.existingConfig) return { kind: "write" };
+	if (input.services !== void 0) return {
+		kind: "write",
+		services: input.services
+	};
+	if (input.yes) return {
+		kind: "write",
+		services: ["none"]
+	};
+	if (input.flag === true) return { kind: "write" };
+	if (input.canAsk) return { kind: "ask" };
+	return { kind: "write" };
+};
+const configPlanFromResolution = (resolution, accepted) => {
+	if (resolution.kind === "ask") return accepted === true ? { kind: "write" } : { kind: "skip" };
+	if (resolution.kind === "skip") return { kind: "skip" };
+	return resolution;
+};
+const shouldRefreshEnvAfterNewConfig = (input) => input.wroteNewFile && typeof input.projectId === "string" && input.projectId.length > 0 && typeof input.branch === "string" && input.branch.length > 0;
+//#endregion
+export { INIT_CONFIG_SERVICES_CONFLICT, INIT_TEMPLATE_CONFLICT, INIT_TEMPLATE_KEEPS_CONFIG, configPlanFromResolution, initTemplateInNonEmptyMessage, resolveInitConfigChoice, resolveInitTemplateChoice, shouldRefreshEnvAfterNewConfig };

package/dist/init/chrome.js

@@ -13,7 +13,7 @@ const INIT_BANNER_LINES = [
 const formatInitBanner = () => INIT_BANNER_LINES.join("\n");
 const shouldPrintInitBanner = (yes) => !yes && !isCi() && Boolean(process.stdout.isTTY);
 const printInitBanner = () => {
-	process.stdout.write(`\n${chalk.hex(NEON_GREEN)(formatInitBanner())}\n\n${chalk.dim("Let's get this directory set up with Neon.")}\n\n`);
+	process.stdout.write(`\n${chalk.hex(NEON_GREEN)(formatInitBanner())}\n\n${chalk.dim("Set up this directory for Neon.")}\n\n`);
 };
 const formatInitDone = (input) => {
 	const labelWidth = Math.max(0, ...input.rows.map((row) => row.label.length));
@@ -40,5 +40,28 @@ const agentSetupDoneLabel = (input) => {
 	if (!input.ran && input.setup !== "skip") return "not run";
 	return agentSetupLabel(input.setup);
 };
+const configSummaryLabel = (summary) => {
+	switch (summary) {
+		case "created": return "neon.ts created";
+		case "skipped": return "skipped";
+		case "existing": return "existing Neon config";
+		case "template": return "provided by template";
+		default: return summary;
+	}
+};
+const INIT_STEP_LABELS = {
+	bootstrap: "Creating the app from the selected template…",
+	plugins: "Installing the Neon plugin…",
+	skills: "Installing Neon agent skills…",
+	mcp: "Setting up the Neon MCP server…",
+	link: "Linking a Neon project…",
+	config: "Setting up neon.ts…",
+	env: "Refreshing Neon env vars…"
+};
+const initStepLabel = (step) => {
+	const command = step[0];
+	if (command === void 0) return;
+	return INIT_STEP_LABELS[command];
+};
 //#endregion
-export { INIT_BANNER_LINES, NEON_GREEN, agentSetupDoneLabel, agentSetupLabel, formatInitBanner, formatInitDone, printInitBanner, printInitDone, shouldPrintInitBanner };
+export { INIT_BANNER_LINES, INIT_STEP_LABELS, NEON_GREEN, agentSetupDoneLabel, agentSetupLabel, configSummaryLabel, formatInitBanner, formatInitDone, initStepLabel, printInitBanner, printInitDone, shouldPrintInitBanner };

package/dist/init/plan.js

@@ -1,4 +1,5 @@
 import { getCliName } from "../utils/cli_name.js";
+import { NO_SERVICES } from "../neon_services.js";
 import { tryResolveAddMcpAgentId, uniqueAgentIds } from "../mcp/agents.js";
 import { mcpInstallableAgents } from "../mcp/targets.js";
 import { supportsSkills } from "./agents.js";
@@ -93,6 +94,9 @@ const BOOLEAN_FLAGS = /* @__PURE__ */ new Set([
 	"--no-env-pull",
 	"--no-agent-setup",
 	"--no-link",
+	"--no-config",
+	"--skip-template",
+	"--config",
 	"--list",
 	"--list-templates",
 	"--force-auth",
@@ -218,15 +222,46 @@ const resolveNamedAgents = (raw) => {
 	}
 	return uniqueAgentIds(resolved);
 };
-const planExistingInit = (input) => {
-	const steps = [...planAgentSteps(input)];
-	if (!input.linked) steps.push(input.yes ? ["link", "--yes"] : ["link"]);
-	steps.push(input.yes ? [
+const planLinkStep = (input) => [
+	"link",
+	...input.yes ? ["--yes"] : [],
+	"--no-config",
+	...input.extra ?? []
+];
+const planConfigInitStep = (input) => {
+	if (input.services !== void 0) return [
+		"config",
+		"init",
+		"--services",
+		input.services.length === 0 ? NO_SERVICES : input.services.join(",")
+	];
+	if (input.yes) return [
 		"config",
 		"init",
 		"--services",
-		"none"
-	] : ["config", "init"]);
+		NO_SERVICES
+	];
+	return ["config", "init"];
+};
+const linkInputArgv = (input) => {
+	const args = [];
+	if (input.orgId) args.push("--org-id", input.orgId);
+	if (input.projectId) args.push("--project-id", input.projectId);
+	if (input.projectName) args.push("--project-name", input.projectName);
+	if (input.regionId) args.push("--region-id", input.regionId);
+	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) => {
@@ -243,4 +278,4 @@ const childArgv = (step, forward) => {
 	return args;
 };
 //#endregion
-export { INIT_NEEDS_YES_OR_TERMINAL, NAMED_AGENTS_MIXED, NAMED_AGENTS_UNSUPPORTED, assertNamedAgentTooling, bootstrapInitStep, childArgv, chooseYesAgentTooling, collectYesAgents, directoryIsEmpty, initPluginAgents, initSkillsMcpAgents, initYesSupportedAgents, namedAgentsMixedMessage, namedAgentsNeedSplit, noDetectedAgentsMessage, planAgentSteps, planExistingInit, planToolingSteps, planYesAgentSteps, postScaffoldActions, projectContextFile, resolveInitAgentSetup, resolveNamedAgents, resolveYesAgentList, rewriteUnknownAgentArg };
+export { INIT_NEEDS_YES_OR_TERMINAL, NAMED_AGENTS_MIXED, NAMED_AGENTS_UNSUPPORTED, assertNamedAgentTooling, bootstrapInitStep, childArgv, chooseYesAgentTooling, collectYesAgents, directoryIsEmpty, initPluginAgents, initSkillsMcpAgents, initYesSupportedAgents, linkInputArgv, namedAgentsMixedMessage, namedAgentsNeedSplit, noDetectedAgentsMessage, planAgentSteps, planConfigInitStep, planExistingInit, planLinkStep, planToolingSteps, planYesAgentSteps, postScaffoldActions, projectContextFile, resolveInitAgentSetup, resolveNamedAgents, resolveYesAgentList, rewriteUnknownAgentArg };

package/dist/init/template_title.js

@@ -0,0 +1,15 @@
+import chalk from "chalk";
+//#region src/init/template_title.ts
+const SKIP_TEMPLATE_VALUE = "skip";
+/**
+* The picker label for a template: the title first, then the Neon services it
+* uses as a dim, italic suffix. The suffix is styled with chalk.dim (and italic)
+* only — never a foreground color — so it survives the cyan/underline `prompts`
+* paints over the focused row.
+*/
+const formatTemplateTitle = (template) => {
+	if (!template.services || template.services.length === 0) return template.title;
+	return `${template.title}  ${chalk.dim.italic(template.services.join(" · "))}`;
+};
+//#endregion
+export { SKIP_TEMPLATE_VALUE, formatTemplateTitle };

package/dist/init/tooling.js

@@ -1,6 +1,7 @@
 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 { detectAgent } from "./detect_host.js";
@@ -10,7 +11,10 @@ import { detectProjectAgents } from "add-mcp";
 const defaultProjectAgents = (cwd) => detectProjectAgents(cwd);
 const runInitSteps = async (steps, options) => {
 	for (const step of steps) {
-		log.info("Running `%s %s`", getCliName(), step.join(" "));
+		const label = options.narrate === "human" ? initStepLabel(step) : void 0;
+		if (label !== void 0) log.info(label);
+		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.`);

package/dist/init/wizard.js

@@ -1,6 +1,8 @@
 import { INIT_NEEDS_YES_OR_TERMINAL } from "./plan.js";
+import { SKIP_TEMPLATE_VALUE, formatTemplateTitle } from "./template_title.js";
 import { canPickAgentsInteractively } from "../utils/agent_picker.js";
 import { NEON_PLUGIN_NAME } from "../plugins/run.js";
+import chalk from "chalk";
 import prompts from "prompts";
 //#region src/init/wizard.ts
 const restoreCursorOnAbort = (state) => {
@@ -10,19 +12,22 @@ const restoreCursorOnAbort = (state) => {
 		process.exit(1);
 	}
 };
-const pickAgentSetupInteractively = async () => {
+const requireInteractive = () => {
 	if (!canPickAgentsInteractively()) throw new Error(INIT_NEEDS_YES_OR_TERMINAL);
+};
+const pickAgentSetupInteractively = async () => {
+	requireInteractive();
 	const { setup } = await prompts({
 		onState: restoreCursorOnAbort,
 		type: "select",
 		name: "setup",
-		message: "How should coding agents get Neon in this project?",
+		message: "How would you like to set up your coding agents?",
 		initial: 0,
 		choices: [
 			{
-				title: "Plugin (recommended)",
+				title: "Neon plugin (recommended)",
 				value: "plugin",
-				description: `Install ${NEON_PLUGIN_NAME} (skills and MCP in one)`
+				description: `Install ${NEON_PLUGIN_NAME} (skills and MCP together)`
 			},
 			{
 				title: "Skills and MCP separately",
@@ -32,12 +37,59 @@ const pickAgentSetupInteractively = async () => {
 			{
 				title: "Skip agent setup",
 				value: "skip",
-				description: "Continue without a plugin, skills, or MCP"
+				description: "Continue to project setup"
 			}
 		]
 	});
 	if (setup !== "plugin" && setup !== "skills-mcp" && setup !== "skip") throw new Error("Aborted.");
 	return setup;
 };
+/** First catalog template; skip is index 0 so it stays on the first screen. */
+const INIT_TEMPLATE_PICKER_INITIAL = 1;
+const initTemplatePickerChoices = (templates) => {
+	if (templates.length === 0) throw new Error("No templates available to scaffold from.");
+	return [{
+		title: "Skip the template",
+		value: SKIP_TEMPLATE_VALUE,
+		description: "Set up agents and link a Neon project without copying template files."
+	}, ...templates.map((template) => ({
+		title: formatTemplateTitle(template),
+		value: template.id,
+		description: template.description ?? ""
+	}))];
+};
+const pickInitTemplateInteractively = async (templates) => {
+	requireInteractive();
+	const choices = initTemplatePickerChoices(templates);
+	const { id } = await prompts({
+		onState: restoreCursorOnAbort,
+		type: "select",
+		name: "id",
+		message: "How would you like to set up this directory?",
+		initial: 1,
+		choices
+	});
+	if (id === "skip") return { kind: "skip" };
+	if (typeof id !== "string" || id.length === 0) throw new Error("Aborted.");
+	const selected = templates.find((template) => template.id === id);
+	if (selected === void 0) throw new Error("Aborted.");
+	return {
+		kind: "template",
+		template: selected
+	};
+};
+const pickInitConfigInteractively = async () => {
+	requireInteractive();
+	process.stdout.write(`${chalk.dim("Choose services, then edit neon.ts and apply changes with neon config apply.")}\n`);
+	const { value } = await prompts({
+		onState: restoreCursorOnAbort,
+		type: "confirm",
+		name: "value",
+		message: "Create neon.ts to manage this project's Neon setup as code?",
+		initial: true
+	});
+	if (value === void 0) throw new Error("Aborted.");
+	return value === true;
+};
 //#endregion
-export { pickAgentSetupInteractively };
+export { INIT_TEMPLATE_PICKER_INITIAL, initTemplatePickerChoices, pickAgentSetupInteractively, pickInitConfigInteractively, pickInitTemplateInteractively };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neon",
-  "version": "4.14.6",
+  "version": "4.16.0",
   "description": "CLI tool for Neon, the cloud backend primitives built around Lakebase Postgres",
   "keywords": [
     "neon",
@@ -63,9 +63,9 @@
     "yaml": "^2.9.0",
     "yargs": "17.7.2",
     "yoctocolors": "^2.1.2",
-    "@neon/config-runtime": "1.2.3",
-    "@neon/config": "1.3.2",
-    "@neon/sdk": "4.0.0"
+    "@neon/config": "1.3.3",
+    "@neon/config-runtime": "1.2.4",
+    "@neon/sdk": "4.1.0"
   },
   "optionalDependencies": {
     "@napi-rs/keyring": "1.3.0",
@@ -98,8 +98,8 @@
     "typescript": "^5.9.0",
     "vitest": "^3.0.9",
     "@neon-internals/cli-core": "0.0.0",
+    "@neon-internals/env-core": "0.0.11",
     "@neon/e2e-harness": "0.0.0",
-    "@neon-internals/env-core": "0.0.10",
     "@neon/functions": "0.9.0"
   },
   "publishConfig": {