neon 4.16.0 → 4.17.1

package/dist/help.js

@@ -1,8 +1,75 @@
+import { globalOptionsTrailer, helpWidth, wrapHelpText } from "./utils/help_text.js";
 import { consumeBlockIfMatches, consumeNextMatching, drawPointer, splitColumns } from "./utils/ui.js";
 import chalk from "chalk";
 import cliui from "cliui";
 //#region src/help.ts
 const SPACE_WIDTH = 20;
+const DESCRIPTION_GUTTER = 4;
+const wrapDescription = (text) => wrapHelpText(text, Math.max(1, helpWidth() - SPACE_WIDTH - DESCRIPTION_GUTTER));
+const isGlobalOptionsHeader = (header) => /global options:/i.test(header);
+const isTopLevelUsage = (usage) => /^\S+ <command>/.test(usage);
+const renderOptionBlock = (optionsBlock) => {
+	const result = [];
+	const [header, ...body] = optionsBlock;
+	if (header === void 0) return result;
+	result.push(header);
+	body.forEach((line) => {
+		const [option, description] = splitColumns(line);
+		const ui = cliui({
+			width: helpWidth(),
+			wrap: false
+		});
+		if (option.startsWith("-")) {
+			ui.div({
+				text: chalk.green(option),
+				padding: [
+					0,
+					0,
+					0,
+					0
+				]
+			});
+			ui.div({
+				text: chalk.gray(drawPointer(SPACE_WIDTH)),
+				width: SPACE_WIDTH,
+				padding: [
+					0,
+					2,
+					0,
+					0
+				]
+			}, {
+				text: chalk.rgb(210, 210, 210)(wrapDescription(description ?? "")),
+				padding: [
+					0,
+					0,
+					0,
+					0
+				]
+			});
+		} else ui.div({
+			padding: [
+				0,
+				0,
+				0,
+				0
+			],
+			text: "",
+			width: SPACE_WIDTH
+		}, {
+			text: chalk.rgb(210, 210, 210)(wrapDescription(option)),
+			padding: [
+				0,
+				0,
+				0,
+				0
+			]
+		});
+		result.push(ui.toString());
+	});
+	result.push("");
+	return result;
+};
 const formatHelp = (help) => {
 	const lines = help.split("\n");
 	const result = [];
@@ -11,11 +78,16 @@ const formatHelp = (help) => {
 		result.push(chalk.bold(topLevelCommand.replace("[options]", chalk.reset.green("[options]"))));
 		result.push("");
 	}
-	const commandsBlock = consumeBlockIfMatches(lines, /^Commands:/);
-	if (commandsBlock.length > 0) {
+	const consumeCommands = () => {
+		const commandsBlock = consumeBlockIfMatches(lines, /^Commands:/);
+		if (commandsBlock.length === 0) return;
 		const header = commandsBlock.shift();
+		if (header === void 0) return;
 		result.push(header);
-		const ui = cliui({ width: 0 });
+		const ui = cliui({
+			width: helpWidth(),
+			wrap: false
+		});
 		commandsBlock.forEach((line) => {
 			if (/^\s{3,}/.exec(line)) {
 				ui.div({
@@ -28,7 +100,7 @@ const formatHelp = (help) => {
 						0
 					]
 				}, {
-					text: line.trim(),
+					text: wrapDescription(line.trim()),
 					padding: [
 						0,
 						0,
@@ -54,7 +126,7 @@ const formatHelp = (help) => {
 					0
 				]
 			}, {
-				text: description,
+				text: wrapDescription(description),
 				padding: [
 					0,
 					0,
@@ -65,12 +137,17 @@ const formatHelp = (help) => {
 		});
 		result.push(ui.toString());
 		result.push("");
-	}
-	const positionalsBlock = consumeBlockIfMatches(lines, /Positionals:/);
-	if (positionalsBlock.length > 0) {
+	};
+	const consumePositionals = () => {
+		const positionalsBlock = consumeBlockIfMatches(lines, /Positionals:/);
+		if (positionalsBlock.length === 0) return;
 		const header = positionalsBlock.shift();
+		if (header === void 0) return;
 		result.push(header);
-		const ui = cliui({ width: 0 });
+		const ui = cliui({
+			width: helpWidth(),
+			wrap: false
+		});
 		positionalsBlock.forEach((line) => {
 			const [positional, description] = splitColumns(line);
 			ui.div({
@@ -83,7 +160,7 @@ const formatHelp = (help) => {
 					0
 				]
 			}, {
-				text: description,
+				text: wrapDescription(description),
 				padding: [
 					0,
 					0,
@@ -94,73 +171,42 @@ const formatHelp = (help) => {
 		});
 		result.push(ui.toString());
 		result.push("");
-	}
+	};
+	consumeCommands();
+	consumePositionals();
 	const descriptionBlock = consumeBlockIfMatches(lines, /^(?!.*options:)/i);
 	if (descriptionBlock.length > 0) {
 		result.push(...descriptionBlock);
 		result.push("");
 	}
+	consumeCommands();
+	consumePositionals();
+	const optionBlocks = [];
 	while (true) {
 		const optionsBlock = consumeBlockIfMatches(lines, /.*options:/i);
 		if (optionsBlock.length === 0) break;
-		result.push(optionsBlock.shift());
-		optionsBlock.forEach((line) => {
-			const [option, description] = splitColumns(line);
-			const ui = cliui({ width: 0 });
-			if (option.startsWith("-")) {
-				ui.div({
-					text: chalk.green(option),
-					padding: [
-						0,
-						0,
-						0,
-						0
-					]
-				});
-				ui.div({
-					text: chalk.gray(drawPointer(SPACE_WIDTH)),
-					width: SPACE_WIDTH,
-					padding: [
-						0,
-						2,
-						0,
-						0
-					]
-				}, {
-					text: chalk.rgb(210, 210, 210)(description ?? ""),
-					padding: [
-						0,
-						0,
-						0,
-						0
-					]
-				});
-			} else ui.div({
-				padding: [
-					0,
-					0,
-					0,
-					0
-				],
-				text: "",
-				width: SPACE_WIDTH
-			}, {
-				text: chalk.rgb(210, 210, 210)(option),
-				padding: [
-					0,
-					0,
-					0,
-					0
-				]
-			});
-			result.push(ui.toString());
-		});
+		optionBlocks.push(optionsBlock);
+	}
+	for (const block of optionBlocks) {
+		const header = block[0];
+		if (header !== void 0 && !isGlobalOptionsHeader(header)) result.push(...renderOptionBlock(block));
+	}
+	const globalBlocks = optionBlocks.filter((block) => {
+		const header = block[0];
+		return header !== void 0 && isGlobalOptionsHeader(header);
+	});
+	if (topLevelCommand !== null && isTopLevelUsage(topLevelCommand)) for (const block of globalBlocks) result.push(...renderOptionBlock(block));
+	else if (globalBlocks.length > 0 && topLevelCommand !== null) {
+		result.push(globalOptionsTrailer(topLevelCommand));
 		result.push("");
 	}
 	const exampleBlock = consumeBlockIfMatches(lines, /Examples:/);
 	if (exampleBlock.length > 0) {
 		result.push(exampleBlock.shift());
-		const ui = cliui({ width: 0 });
+		const ui = cliui({
+			width: helpWidth(),
+			wrap: false
+		});
 		for (const line of exampleBlock) {
 			const [command, description] = splitColumns(line);
 			ui.div({
@@ -173,7 +219,7 @@ const formatHelp = (help) => {
 				]
 			});
 			ui.div({
-				text: chalk.reset(description),
+				text: chalk.reset(wrapDescription(description)),
 				padding: [
 					0,
 					0,
@@ -188,7 +234,16 @@ const formatHelp = (help) => {
 };
 const showHelp = async (argv) => {
 	const help = await argv.getHelp();
-	process.stderr.write(formatHelp(help).join("\n") + "\n");
+	const text = `${formatHelp(help).join("\n")}\n`;
+	await new Promise((resolve, reject) => {
+		process.stdout.write(text, (err) => {
+			if (err) {
+				reject(err);
+				return;
+			}
+			resolve();
+		});
+	});
 	process.exit(0);
 };
 //#endregion

package/dist/index.js

@@ -1,17 +1,17 @@
-import { t as storeFor } from "./_chunks/credential_io-D8AR-jvB.js";
 import { log } from "./log.js";
 import pkg_default from "./pkg.js";
 import { isNeonApiError, messageFromBody } from "./api.js";
-import { authFailureMessage, getAuthContext, locationFromContext } from "./auth_context.js";
+import { getAuthContext } from "./auth_context.js";
 import { r as defaultDir } from "./_chunks/paths-DMq0Lt7a.js";
 import { ensureConfigDir } from "./config.js";
 import { currentContextFile, enrichFromContext } from "./context.js";
 import { analyticsMiddleware, closeAnalytics, getAnalyticsEventProperties, initAnalyticsClientMiddleware, sendError, trackEvent } from "./analytics.js";
 import { NETWORK_ERROR_MESSAGE, isNetworkError, matchErrorCode } from "./errors.js";
 import { AuthRefreshError, defaultClientID } from "./auth.js";
+import { ensureAuth } from "./commands/auth.js";
+import { recoverFrom401 } from "./auth_recovery.js";
 import { getCliName } from "./utils/cli_name.js";
 import { showHelp } from "./help.js";
-import { ensureAuth, isAccessTokenUsable, refreshStoredCredentials } from "./commands/auth.js";
 import { rewriteUnknownAgentArg } from "./init/plan.js";
 import commands_default from "./commands/index.js";
 import { fillInArgs, resolveApiKeyFromEnv } from "./utils/middlewares.js";
@@ -100,6 +100,7 @@ builder = builder.scriptName(pkg_default.name).locale("en").usage("$0 <command>
 	},
 	"context-file": {
 		describe: "Context file",
+		group: "Global options:",
 		type: "string",
 		default: currentContextFile
 	},
@@ -124,63 +125,6 @@ builder = builder.scriptName(pkg_default.name).locale("en").usage("$0 <command>
 }).alias("help", "h").middleware(async (args) => {
 	if (args.help || args._.length === 1 && !NO_SUBCOMMANDS_VERBS.includes(args._[0])) await showHelp(builder);
 }).middleware(ensureAuth).middleware(enrichFromContext).middleware(analyticsMiddleware).command(commands_default).strictCommands().version(pkg_default.version).group("version", "Global options:").alias("version", "v").completion().scriptName(getCliName()).epilog("For more information, visit https://neon.com/docs/reference/neon-cli").wrap(null).fail(false);
-function supersededOnDisk(rejectedToken) {
-	if (rejectedToken === void 0) return false;
-	const context = getAuthContext();
-	if (context === null) return false;
-	const at = locationFromContext(context);
-	if (at === null) return false;
-	try {
-		const loaded = storeFor(context.configDir).read(at);
-		return loaded !== null && loaded.credentials.access_token !== rejectedToken && isAccessTokenUsable(loaded.credentials, Date.now());
-	} catch {
-		return false;
-	}
-}
-async function recoverFrom401(canRetry) {
-	const context = getAuthContext();
-	if (context === null || context.source !== "stored-credentials") {
-		log.error(authFailureMessage(context));
-		return false;
-	}
-	if (context.refreshed === true) {
-		log.error(authFailureMessage(context));
-		return false;
-	}
-	if (!canRetry) {
-		log.error(authFailureMessage(context));
-		return false;
-	}
-	if (supersededOnDisk(context.accessToken)) {
-		log.debug("The rejected token has already been replaced on disk; retrying with the current one");
-		return true;
-	}
-	const at = locationFromContext(context);
-	if (at === null || context.oauthHost === void 0 || context.clientId === void 0) {
-		log.error(authFailureMessage(context));
-		return false;
-	}
-	try {
-		if (await refreshStoredCredentials(at, {
-			apiHost: "",
-			oauthHost: context.oauthHost,
-			clientId: context.clientId,
-			configDir: context.configDir
-		})) {
-			log.debug("Refreshed the stored session after a 401; retrying");
-			return true;
-		}
-	} catch (err) {
-		if (err instanceof AuthRefreshError) {
-			log.error(err.message);
-			if (err.terminal) log.error(`Run \`neon auth --profile ${context.profile ?? "DEFAULT"}\` to sign in again.`);
-			return false;
-		}
-		log.debug("Refresh after 401 failed: %s", err instanceof Error ? err.message : "unknown error");
-	}
-	log.error(authFailureMessage(context));
-	return false;
-}
 async function handleError(msg, err, canRetry) {
 	if (process.argv.some((arg) => arg === "--help" || arg === "-h")) {
 		await showHelp(builder);

package/dist/init/link.js

@@ -0,0 +1,38 @@
+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 { runLink } from "../commands/link.js";
+//#region src/init/link.ts
+const isUnauthorized = (error) => isNeonApiError(error) && error.status === 401;
+const authenticationFailed = () => /* @__PURE__ */ new Error("Authentication failed.");
+const runAuthenticatedLink = async (props) => {
+	const authenticated = {
+		...props,
+		_: ["link"],
+		configDir: props.configDir ?? defaultDir,
+		oauthHost: props.oauthHost ?? process.env.NEON_OAUTH_HOST ?? "https://oauth2.neon.tech",
+		clientId: props.clientId ?? "neonctl",
+		help: false
+	};
+	await ensureAuth(authenticated);
+	try {
+		await runLink(authenticated);
+		return;
+	} catch (error) {
+		if (!isUnauthorized(error)) throw error;
+		if (!await recoverFrom401(true)) throw authenticationFailed();
+	}
+	await ensureAuth(authenticated);
+	try {
+		await runLink(authenticated);
+	} catch (error) {
+		if (!isUnauthorized(error)) throw error;
+		await recoverFrom401(false);
+		throw authenticationFailed();
+	}
+};
+//#endregion
+export { runAuthenticatedLink };

package/dist/init/wizard.js

@@ -91,5 +91,17 @@ const pickInitConfigInteractively = async () => {
 	if (value === void 0) throw new Error("Aborted.");
 	return value === true;
 };
+const pickInitLinkInteractively = async () => {
+	requireInteractive();
+	const { value } = await prompts({
+		onState: restoreCursorOnAbort,
+		type: "confirm",
+		name: "value",
+		message: "Link this project to a Neon project now?",
+		initial: true
+	});
+	if (value === void 0) throw new Error("Aborted.");
+	return value === true;
+};
 //#endregion
-export { INIT_TEMPLATE_PICKER_INITIAL, initTemplatePickerChoices, pickAgentSetupInteractively, pickInitConfigInteractively, pickInitTemplateInteractively };
+export { INIT_TEMPLATE_PICKER_INITIAL, initTemplatePickerChoices, pickAgentSetupInteractively, pickInitConfigInteractively, pickInitLinkInteractively, pickInitTemplateInteractively };

package/dist/test_utils/fixtures.js

@@ -85,6 +85,7 @@ const test = test$1.extend({
 						expect(code).toBe(options?.code ?? 0);
 						if (options.snapshot !== false) expect(output).toMatchSnapshot();
 						if (options.stderr !== void 0) expect(strip(error).replace(/\s+/g, " ").trim()).toEqual(typeof options.stderr === "string" ? options.stderr.toString().replace(/\s+/g, " ") : options.stderr);
+						if (options.stdout !== void 0) expect(strip(output).replace(/\s+/g, " ").trim()).toEqual(typeof options.stdout === "string" ? options.stdout.toString().replace(/\s+/g, " ") : options.stdout);
 						resolve({
 							stdout: output,
 							stderr: error,

package/dist/utils/help_text.js

@@ -1,10 +1,13 @@
+import { parseColumns } from "../human_table.js";
 //#region src/utils/help_text.ts
 const HELP_WRAP = 78;
 const WRAP_INDENT = "    ";
 const helpWidth = () => {
-	const columns = process.stderr.columns ?? process.stdout.columns;
-	if (typeof columns !== "number" || !Number.isFinite(columns) || columns < 1) return 78;
-	return Math.max(24, columns - 1);
+	const fromStdout = process.stdout.columns;
+	if (typeof fromStdout === "number" && Number.isFinite(fromStdout) && fromStdout >= 1) return Math.max(24, fromStdout - 1);
+	const fromEnv = parseColumns(process.env.COLUMNS);
+	if (fromEnv !== void 0) return Math.max(24, fromEnv - 1);
+	return 78;
 };
 const helpCsv = (label, items, width = helpWidth()) => {
 	if (items.length === 0) return "";
@@ -24,6 +27,31 @@ const helpCsv = (label, items, width = helpWidth()) => {
 	lines.push(line);
 	return lines.join("\n");
 };
+const wrapHelpText = (text, width) => {
+	if (width < 1) return text;
+	const words = text.trim().split(/\s+/).filter((word) => word !== "");
+	if (words.length === 0) return text;
+	const lines = [];
+	let line = "";
+	for (const word of words) {
+		if (line === "") {
+			line = word;
+			continue;
+		}
+		if (line.length + 1 + word.length <= width) {
+			line = `${line} ${word}`;
+			continue;
+		}
+		lines.push(line);
+		line = word;
+	}
+	if (line !== "") lines.push(line);
+	return lines.join("\n");
+};
 const helpEpilogue = (...blocks) => ["", ...blocks.filter((block) => block !== "")].join("\n");
+const globalOptionsTrailer = (usage) => {
+	const cli = usage.trim().split(/\s+/)[0];
+	return `Global options: see ${cli === "" ? "neon" : cli} --help`;
+};
 //#endregion
-export { HELP_WRAP, helpCsv, helpEpilogue, helpWidth };
+export { HELP_WRAP, globalOptionsTrailer, helpCsv, helpEpilogue, helpWidth, wrapHelpText };

package/dist/writer.js

@@ -7,7 +7,8 @@ const writeYaml = (chunks) => {
 	return YAML.stringify(chunks.length === 1 ? chunks[0].data : Object.fromEntries(chunks.map(({ config, data }, idx) => [config.title ? toSnakeCase(config.title) : idx, data])), null, 2);
 };
 const writeJson = (chunks) => {
-	return JSON.stringify(chunks.length === 1 ? chunks[0].data : Object.fromEntries(chunks.map(({ config, data }, idx) => [config.title ? toSnakeCase(config.title) : idx, data])), null, 2);
+	const json = JSON.stringify(chunks.length === 1 ? chunks[0].data : Object.fromEntries(chunks.map(({ config, data }, idx) => [config.title ? toSnakeCase(config.title) : idx, data])), null, 2);
+	return json === void 0 ? json : `${json}\n`;
 };
 const writeTable = (chunks, out, width) => {
 	chunks.forEach(({ data, config }, i) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neon",
-  "version": "4.16.0",
+  "version": "4.17.1",
   "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": "1.3.3",
-    "@neon/config-runtime": "1.2.4",
-    "@neon/sdk": "4.1.0"
+    "@neon/config": "1.4.0",
+    "@neon/sdk": "4.1.0",
+    "@neon/config-runtime": "1.3.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.12",
     "@neon/functions": "0.9.0"
   },
   "publishConfig": {