neon 3.2.0 → 3.2.2

package/README.md

@@ -673,7 +673,7 @@ $ neon init
 
 Run in a terminal it prompts you through those steps. This is what the retired `neon-init` package used to do; `npx neon init` replaces it.
 
-Two side effects worth knowing before you run it. It **installs or upgrades `neonctl` globally**, with whichever package manager invoked it — the flow drives Neon by shelling out to the CLI rather than calling the API in-process. And it **writes `.neon`** in the project directory, the same context file `neon link` and `neon checkout` use.
+Two side effects worth knowing before you run it. It **installs or upgrades `neon` globally**, with whichever package manager invoked it — the flow drives Neon by shelling out to the CLI rather than calling the API in-process. And it **writes `.neon`** in the project directory, the same context file `neon link` and `neon checkout` use.
 
 ### Agent mode
 

package/dist/init/auth.js

@@ -5,7 +5,7 @@ import { log } from "@clack/prompts";
 import { execa } from "execa";
 //#region src/init/auth.ts
 /**
-* Ensures neonctl is authenticated by running a command that triggers auth if needed
+* Ensures the Neon CLI is authenticated by running a command that triggers auth if needed
 * This will automatically start the OAuth flow if the user isn't already authenticated
 */
 async function ensureNeonctlAuth(options) {
@@ -14,7 +14,7 @@ async function ensureNeonctlAuth(options) {
 	try {
 		await execa("npx", [
 			"-y",
-			"neonctl",
+			"neon",
 			"me"
 		], {
 			stdio: "inherit",
@@ -32,7 +32,7 @@ async function ensureNeonctlAuth(options) {
 	}
 }
 /**
-* Checks whether neonctl has stored OAuth credentials.
+* Checks whether the Neon CLI has stored OAuth credentials.
 */
 async function isAuthenticated() {
 	return await getNeonctlAccessToken() !== null;

package/dist/init/neonctl.js

@@ -3,12 +3,14 @@ import { lstatSync } from "node:fs";
 import { execa } from "execa";
 //#region src/init/neonctl.ts
 /**
-* Returns the Neon CLI command prefix: "CI= npx -y neon".
+* Returns the Neon CLI command prefix emitted to users and agents:
+* `CI= npx -y neon`.
 *
 * The CLI reads NEON_API_HOST and NEON_OAUTH_HOST from the environment
-* directly, so no extra flags are needed. The `neon` package ships both the
-* `neon` and `neonctl` binaries; we surface the cleaner `neon` command in the
-* examples emitted to users and agents.
+* directly, so no extra flags are needed. The published package is `neon`
+* (its binary is `neon`; the older `neonctl` alias is no longer shipped). `npx`
+* runs it with zero global-install assumptions, and the leading `CI=` keeps the
+* CLI non-interactive.
 *
 * Usage: `${neonctlCmd()} orgs list --output json`
 */
@@ -16,12 +18,19 @@ function neonctlCmd() {
 	return "CI= npx -y neon";
 }
 /**
-* Gets the currently available neonctl version.
-* Tries the global binary first, then falls back to npx.
+* The global binaries that indicate the Neon CLI is installed. The current
+* package ships `neon`; `neonctl` is the legacy alias, kept in the probe so an
+* older global install still counts as "installed" (and isn't reinstalled).
 */
-async function getNeonctlVersion() {
-	try {
-		const match = (await execa("neonctl", ["--version"], {
+const NEON_CLI_BINARIES = ["neon", "neonctl"];
+/**
+* Gets the currently installed Neon CLI version, probing the `neon` binary
+* first and falling back to the legacy `neonctl` alias. Returns null when the
+* CLI isn't on PATH.
+*/
+async function getNeonCliVersion() {
+	for (const bin of NEON_CLI_BINARIES) try {
+		const match = (await execa(bin, ["--version"], {
 			stdio: "pipe",
 			timeout: 5e3
 		})).stdout.trim().match(/(\d+\.\d+\.\d+)/);
@@ -30,10 +39,10 @@ async function getNeonctlVersion() {
 	return null;
 }
 /**
-* Checks whether the neonctl CLI is globally installed and whether it's up to date.
+* Checks whether the Neon CLI is globally installed and whether it's up to date.
 */
 async function checkNeonctl() {
-	const currentVersion = await getNeonctlVersion();
+	const currentVersion = await getNeonCliVersion();
 	if (!currentVersion) return {
 		installed: false,
 		currentVersion: null,
@@ -44,7 +53,7 @@ async function checkNeonctl() {
 	try {
 		latestVersion = (await execa("npm", [
 			"view",
-			"neonctl",
+			"neon",
 			"version"
 		], {
 			stdio: "pipe",
@@ -82,9 +91,9 @@ function isOlderVersion(current, latest) {
 function isLocalDevSymlink() {
 	try {
 		const home = process.env.HOME || process.env.USERPROFILE || "";
-		const candidates = [`${process.env.NVM_DIR || `${home}/.nvm`}/versions/node/${process.version}/lib/node_modules/neonctl`, `${home}/.nvm/versions/node/${process.version}/lib/node_modules/neonctl`];
-		for (const candidate of candidates) try {
-			if (lstatSync(candidate).isSymbolicLink()) return true;
+		const roots = [`${process.env.NVM_DIR || `${home}/.nvm`}/versions/node/${process.version}/lib/node_modules`, `${home}/.nvm/versions/node/${process.version}/lib/node_modules`];
+		for (const root of roots) for (const pkg of NEON_CLI_BINARIES) try {
+			if (lstatSync(`${root}/${pkg}`).isSymbolicLink()) return true;
 		} catch {}
 		return false;
 	} catch {
@@ -98,7 +107,7 @@ function isLocalDevSymlink() {
 async function ensureNeonctl() {
 	if (isLocalDevSymlink()) return {
 		status: "already_current",
-		version: await getNeonctlVersion() ?? "dev"
+		version: await getNeonCliVersion() ?? "dev"
 	};
 	const check = await checkNeonctl();
 	if (check.installed && !check.needsUpdate) return {
@@ -106,7 +115,7 @@ async function ensureNeonctl() {
 		version: check.currentVersion ?? void 0
 	};
 	const pm = resolveInvokingPackageManager();
-	const install = globalInstallCommand(pm, "neonctl");
+	const install = globalInstallCommand(pm, "neon");
 	if (!install) return {
 		status: "failed",
 		error: "Could not install the Neon CLI: this machine has no package manager that can perform a global install. npm, pnpm and bun are not on PATH (yarn Berry has no global install). Install npm, pnpm or bun, then run this again."
@@ -117,7 +126,7 @@ async function ensureNeonctl() {
 			stdio: "pipe",
 			timeout: 6e4
 		});
-		const version = await getNeonctlVersion();
+		const version = await getNeonCliVersion();
 		return {
 			status: check.installed ? "updated" : "installed",
 			version: version ?? void 0

package/dist/init/phases/setup.js

@@ -111,7 +111,7 @@ async function buildBulkInspection(options) {
 			].join("\n"),
 			checks: [
 				{
-					id: "neonctl",
+					id: "neon",
 					description: "The Neon CLI will be installed or updated automatically (no action needed from the agent)",
 					lookFor: []
 				},
@@ -294,27 +294,27 @@ async function executeBatchedInstallation(options) {
 	switch (neonctlResult.status) {
 		case "already_current":
 			results.push({
-				id: "neonctl",
+				id: "neon",
 				description: `Neon CLI is up to date (v${neonctlResult.version})`,
 				status: "success"
 			});
 			break;
 		case "installed":
 			results.push({
-				id: "neonctl",
+				id: "neon",
 				description: `Installed Neon CLI (v${neonctlResult.version})`,
 				status: "success"
 			});
 			break;
 		case "updated":
 			results.push({
-				id: "neonctl",
+				id: "neon",
 				description: `Updated Neon CLI to v${neonctlResult.version}`,
 				status: "success"
 			});
 			break;
 		case "failed": results.push({
-			id: "neonctl",
+			id: "neon",
 			description: "Failed to install Neon CLI",
 			status: "failed",
 			error: neonctlResult.error

package/dist/init/resolve_context.js

@@ -30,7 +30,7 @@ function extractNeonHost(cwd) {
 *
 * Strategy:
 * 1. Extract endpoint hostname from .env
-* 2. List orgs via neonctl
+* 2. List orgs via the Neon CLI
 * 3. For each org, list projects
 * 4. For each project, get connection string and compare hostnames
 * 5. Return the matching org/project
@@ -42,7 +42,7 @@ async function resolveNeonContext(cwd) {
 	try {
 		const result = await execa("npx", [
 			"-y",
-			"neonctl",
+			"neon",
 			"orgs",
 			"list",
 			"--output",
@@ -65,7 +65,7 @@ async function resolveNeonContext(cwd) {
 		try {
 			const result = await execa("npx", [
 				"-y",
-				"neonctl",
+				"neon",
 				"projects",
 				"list",
 				"--org-id",
@@ -87,7 +87,7 @@ async function resolveNeonContext(cwd) {
 		for (const project of projects) try {
 			if ((await execa("npx", [
 				"-y",
-				"neonctl",
+				"neon",
 				"connection-string",
 				"--project-id",
 				project.id

package/package.json

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