neon 2.44.0 → 2.46.0

package/dist/commands/link.js

@@ -4,6 +4,7 @@ import { applyContext, contextBranch, readContextFile, setContext, updateContext
 import { isCi } from "../env.js";
 import { log } from "../log.js";
 import { createBranch, pickBranchInteractively, } from "../utils/branch_picker.js";
+import { getCliName } from "../utils/cli_name.js";
 import { hasNeonConfigFile, initCmd } from "./config.js";
 import { autoPullEnvAfterPin, renderAgentPullNote } from "./env.js";
 import { REGIONS } from "./projects.js";
@@ -34,7 +35,7 @@ export const builder = (argv) => argv
         alias: "branch-id",
         describe: "Branch name or ID to pin in the context (resolved to its ID before writing). " +
             "Without it, link only resolves the org and project — pin a branch with " +
-            "`neonctl checkout <branch>` (link never guesses a default).",
+            `\`${getCliName()} checkout <branch>\` (link never guesses a default).`,
         type: "string",
     },
     params: {
@@ -76,7 +77,7 @@ export const builder = (argv) => argv
     .example([
     [
         "$0 link --project-id polished-snowflake-12345678",
-        "Link an existing project (org is inferred); pin a branch later with 'neonctl checkout'",
+        `Link an existing project (org is inferred); pin a branch later with '${getCliName()} checkout'`,
     ],
     [
         "$0 link --org-id org-… --project-name my-app --region-id aws-us-east-2",
@@ -120,9 +121,9 @@ export const handler = async (props) => {
             "Missing inputs and CI environment detected (no TTY for prompts).",
             "",
             "Use one of:",
-            "  neonctl link --agent                                                    (JSON state machine for agents)",
-            "  neonctl link --project-id <project>                                     (link to an existing project; org is inferred)",
-            "  neonctl link --org-id <org> --project-name <name> --region-id <region>  (create a new project and link)",
+            `  ${getCliName()} link --agent                                                    (JSON state machine for agents)`,
+            `  ${getCliName()} link --project-id <project>                                     (link to an existing project; org is inferred)`,
+            `  ${getCliName()} link --org-id <org> --project-name <name> --region-id <region>  (create a new project and link)`,
         ].join("\n"));
         process.exit(1);
         return;
@@ -180,7 +181,7 @@ const validateInputs = (inputs) => {
         throw new Error("Conflicting inputs: --project-id selects an existing project; --project-name and --region-id describe a new one. Pass only one set.");
     }
     if (inputs.projectName && inputs.branch) {
-        throw new Error("Conflicting inputs: --branch pins a branch of an existing project, but --project-name creates a new one. Create the project first, then `neonctl checkout <branch>`.");
+        throw new Error(`Conflicting inputs: --branch pins a branch of an existing project, but --project-name creates a new one. Create the project first, then \`${getCliName()} checkout <branch>\`.`);
     }
 };
 /**
@@ -338,7 +339,7 @@ const resolveBranchRef = async (props, projectId, branchRef) => {
             .map((b) => `${b.id}${b.name ? ` (${b.name})` : ""}`)
             .join(", ")
         : "(none)";
-    throw new LinkInputError(`Branch '${branchRef}' not found in project '${projectId}'. Available branches: ${available}. Pin one with \`neonctl checkout <branch>\`.`, "NOT_FOUND");
+    throw new LinkInputError(`Branch '${branchRef}' not found in project '${projectId}'. Available branches: ${available}. Pin one with \`${getCliName()} checkout <branch>\`.`, "NOT_FOUND");
 };
 /**
  * The value to persist for a branch: prefer its human-readable **name** (nicer
@@ -717,7 +718,7 @@ const runAgent = async (props, inputs) => {
             context_file: props.contextFile,
             context: { orgId, projectId },
             project: { id: projectId },
-            message: `Linked ${props.contextFile} to project ${projectId}${orgSuffix}. No branch pinned — run \`neonctl checkout <branch>\` (omit the branch to list options) to pin one and pull its env vars.`,
+            message: `Linked ${props.contextFile} to project ${projectId}${orgSuffix}. No branch pinned — run \`${getCliName()} checkout <branch>\` (omit the branch to list options) to pin one and pull its env vars.`,
         });
         return;
     }
@@ -737,7 +738,7 @@ const runAgent = async (props, inputs) => {
                 name: region.name,
                 default: region.default,
             })),
-            next_command_template: `neonctl link --agent --org-id ${shellArg(orgId)} --project-name ${shellArg(projectName)} --region-id <region_id>`,
+            next_command_template: `${getCliName()} link --agent --org-id ${shellArg(orgId)} --project-name ${shellArg(projectName)} --region-id <region_id>`,
         });
         return;
     }
@@ -781,7 +782,7 @@ const runAgent = async (props, inputs) => {
     // the instruction rather than silently dropped.
     const projects = await listAllProjects(props, orgId);
     const branchNote = branch
-        ? ` A branch was requested (--branch ${branch}) but a branch can only be pinned once a project is chosen — re-run with --project-id first, then \`neonctl checkout ${branch}\`.`
+        ? ` A branch was requested (--branch ${branch}) but a branch can only be pinned once a project is chosen — re-run with --project-id first, then \`${getCliName()} checkout ${branch}\`.`
         : "";
     emitAgent({
         status: "needs_project",
@@ -796,9 +797,9 @@ const runAgent = async (props, inputs) => {
         })),
         create_option: {
             instruction: "To create a new project, ask the user for a project name. The region can be omitted to receive a follow-up needs_project_details response that lists available regions.",
-            next_command_template: `neonctl link --agent --org-id ${shellArg(orgId)} --project-name <name> --region-id <region_id>`,
+            next_command_template: `${getCliName()} link --agent --org-id ${shellArg(orgId)} --project-name <name> --region-id <region_id>`,
         },
-        next_command_template: `neonctl link --agent --org-id ${shellArg(orgId)} --project-id <project_id>`,
+        next_command_template: `${getCliName()} link --agent --org-id ${shellArg(orgId)} --project-id <project_id>`,
     });
 };
 const emitAgent = (response) => {
@@ -865,7 +866,7 @@ const buildNeedsOrgResponse = (resolution) => {
             status: "needs_org",
             instruction: "This Neon API key is organization-scoped, so the CLI cannot list the user's organizations and no existing project was found to auto-detect the org ID. Ask the user for their Neon organization ID (visible in the Neon Console under the org's Settings page, formatted like `org-bitter-breeze-12345678`) and re-run the next_command_template with that --org-id.",
             options: [],
-            next_command_template: "neonctl link --agent --org-id <org_id>",
+            next_command_template: `${getCliName()} link --agent --org-id <org_id>`,
         };
     }
     const orgs = resolution.orgs;
@@ -875,7 +876,7 @@ const buildNeedsOrgResponse = (resolution) => {
             ? "The user does not belong to any organizations. Ask them to create one in the Neon Console (https://console.neon.tech/) before linking."
             : `Ask the user which of these ${orgs.length} organization${orgs.length === 1 ? "" : "s"} they want to link the current directory to. After they pick one, re-run the next_command_template with the chosen --org-id value.`,
         options: orgs.map((org) => ({ id: org.id, name: org.name })),
-        next_command_template: "neonctl link --agent --org-id <org_id>",
+        next_command_template: `${getCliName()} link --agent --org-id <org_id>`,
     };
 };
 const toAgentError = (err) => {
@@ -954,7 +955,7 @@ const resolveInteractiveBranch = async (props, projectId) => {
     const picked = await pickBranchInteractively(branches, {
         message: "Which branch would you like to link?",
         nonInteractiveMessage: "No branch could be selected without an interactive terminal. " +
-            "Re-run `neonctl link` interactively, or `neonctl checkout <branch>` to pin one.",
+            `Re-run \`${getCliName()} link\` interactively, or \`${getCliName()} checkout <branch>\` to pin one.`,
     });
     if (picked.kind === "existing") {
         const existing = branches.find((b) => b.id === picked.branchId);
@@ -1031,7 +1032,7 @@ const printSummary = (_props, summary) => {
     }
     else if (summary.projectId && !summary.branch && !summary.orgOnly) {
         lines.push("");
-        lines.push("No branch pinned. Run `neonctl checkout <branch>` to pin a branch and pull its env vars.");
+        lines.push(`No branch pinned. Run \`${getCliName()} checkout <branch>\` to pin a branch and pull its env vars.`);
     }
     lines.push("");
     process.stdout.write(`${lines.join("\n")}\n`);

package/dist/commands/projects.js

@@ -4,6 +4,7 @@ import { updateContextFile } from "../context.js";
 import { isCi } from "../env.js";
 import { log } from "../log.js";
 import { projectCreateRequest, projectUpdateRequest, } from "../parameters.gen.js";
+import { getCliName } from "../utils/cli_name.js";
 import { getComputeUnits } from "../utils/compute_units.js";
 import { psql } from "../utils/psql.js";
 import { writer } from "../writer.js";
@@ -392,11 +393,11 @@ The organization ID has been saved in ${props.contextFile}
 
 If you'd like to change the default organization later, use
 
-    neonctl link --org-id <org_id>
+    ${getCliName()} link --org-id <org_id>
 
 Or to clear the context file and forget the default organization
 
-    neonctl link --clear
+    ${getCliName()} link --clear
 
 `);
     }

package/dist/commands/set_context.js

@@ -1,7 +1,8 @@
 import { applyContext } from "../context.js";
 import { log } from "../log.js";
+import { getCliName } from "../utils/cli_name.js";
 export const command = "set-context";
-export const describe = "Deprecated: use `neonctl link`. Set the .neon context (raw write).";
+export const describe = `Deprecated: use \`${getCliName()} link\`. Set the .neon context (raw write).`;
 export const builder = (argv) => argv.usage("$0 set-context [options]").options({
     "project-id": {
         describe: "Project ID",
@@ -17,9 +18,9 @@ export const builder = (argv) => argv.usage("$0 set-context [options]").options(
     },
 });
 export const handler = (props) => {
-    log.warning("`neonctl set-context` is deprecated and will be removed in a future release. " +
-        "Use `neonctl link` instead — it verifies inputs and infers the org for you " +
-        "(or `neonctl link --no-checks` for the same write-without-checks behavior).");
+    log.warning(`\`${getCliName()} set-context\` is deprecated and will be removed in a future release. ` +
+        `Use \`${getCliName()} link\` instead — it verifies inputs and infers the org for you ` +
+        `(or \`${getCliName()} link --no-checks\` for the same write-without-checks behavior).`);
     const context = {
         projectId: props.projectId,
         orgId: props.orgId,

package/dist/current_branch_fast_path.js

@@ -1,5 +1,6 @@
 import { contextBranch, currentContextFile, readContextFile, } from "./context.js";
 import { log } from "./log.js";
+import { getCliName } from "./utils/cli_name.js";
 /**
  * Offline fast path for `(config) status --current-branch` (used by shell prompts).
  *
@@ -35,7 +36,7 @@ cwd = process.cwd()) => {
         process.stdout.write(`${branch}\n`);
     }
     else {
-        log.info("No branch pinned. Run `neonctl checkout <branch>` to pin a branch and pull its env vars.");
+        log.info(`No branch pinned. Run \`${getCliName()} checkout <branch>\` to pin a branch and pull its env vars.`);
         process.exitCode = 1;
     }
     return true;

package/dist/dev/env.js

@@ -2,6 +2,7 @@ import { loadConfigFromFile } from "@neon/config";
 import { plan, pullConfig } from "@neon/config-runtime";
 import { fetchEnvReusingSecrets, } from "@neon/env/runtime";
 import { log } from "../log.js";
+import { getCliName } from "../utils/cli_name.js";
 /** The API-targeting options every runtime call forwards from the context. */
 const apiOptions = (ctx) => ({
     ...(ctx.apiKey ? { apiKey: ctx.apiKey } : {}),
@@ -58,7 +59,7 @@ export const resolveNeonEnvVars = async (ctx) => {
     if (config) {
         if (!ctx.projectId || !ctx.branchId) {
             throw new MissingBranchContextError("Found a neon.ts but could not resolve the project/branch. " +
-                "Run `neonctl link` and `neonctl checkout <branch>`, or pass " +
+                `Run \`${getCliName()} link\` and \`${getCliName()} checkout <branch>\`, or pass ` +
                 "--project-id / --branch.");
         }
         // Resolve env from the policy with its `preview.functions` removed. Functions carry no
@@ -86,8 +87,8 @@ export const resolveNeonEnvVars = async (ctx) => {
         // the functions API here and only mints a storage credential when a bucket exists.
         return await fetchAndProject(pulled.config, ctx);
     }
-    throw new MissingBranchContextError("No project/branch context found. Link a branch (`neonctl link` / " +
-        "`neonctl checkout`) or pass --project-id and --branch.");
+    throw new MissingBranchContextError(`No project/branch context found. Link a branch (\`${getCliName()} link\` / ` +
+        `\`${getCliName()} checkout\`) or pass --project-id and --branch.`);
 };
 /**
  * `neon dev`'s env resolver: {@link resolveNeonEnvVars} with graceful degradation.
@@ -113,8 +114,8 @@ export const resolveDevEnv = async (ctx) => {
             return {
                 vars: {},
                 skipped: {
-                    reason: "no linked Neon branch — run `neonctl link`, then " +
-                        "`neonctl checkout <branch>`, to inject DATABASE_URL and friends",
+                    reason: `no linked Neon branch — run \`${getCliName()} link\`, then ` +
+                        `\`${getCliName()} checkout <branch>\`, to inject DATABASE_URL and friends`,
                 },
             };
         }
@@ -167,8 +168,8 @@ const assertPolicyMatchesBranch = async (config, ctx) => {
     const names = missing.map((change) => change.identifier).join(", ");
     throw new DevEnvMismatchError(`Your neon.ts declares ${names} for branch ${ctx.branchId}, but the branch ` +
         "does not have it yet, so the matching env vars cannot be injected. " +
-        "Provision it first with `neonctl deploy` (or `neonctl config apply`), " +
-        "then re-run `neonctl dev`.");
+        `Provision it first with \`${getCliName()} deploy\` (or \`${getCliName()} config apply\`), ` +
+        `then re-run \`${getCliName()} dev\`.`);
 };
 /**
  * A planned change that provisions a branch-level resource the branch lacks: a

package/dist/dev/runtime.js

@@ -2,6 +2,7 @@ import { createServer } from "node:http";
 import { resolve } from "node:path";
 import { pathToFileURL } from "node:url";
 import { getRequestListener } from "@hono/node-server";
+import { createUpgradeListener, installWebSocketBridge, } from "./websocket.js";
 const isFunction = (value) => typeof value === "function";
 const hasFetchMethod = (value) => typeof value === "object" &&
     value !== null &&
@@ -27,6 +28,30 @@ export const resolveFetchHandler = (mod) => {
         "  export default { fetch(req) { /* ... */ } }\n" +
         "  export default function (req) { /* ... */ }");
 };
+const hasUpgradeMethod = (value) => typeof value === "object" &&
+    value !== null &&
+    "upgrade" in value &&
+    typeof value.upgrade === "function";
+/**
+ * Resolve the user's optional WebSocket entrypoint: a named `export function upgrade`,
+ * or an `upgrade` method on the default export. `undefined` when the module has
+ * neither, which is the common case — a function without one either uses
+ * `upgradeWebSocket()` inside `fetch` or serves no WebSockets at all.
+ *
+ * Resolution order matches the deployed runtime exactly (named export first, then the
+ * default-export method), so a module that resolves one way locally cannot resolve the
+ * other way once deployed.
+ */
+export const resolveUpgradeHandler = (mod) => {
+    if (typeof mod.upgrade === "function")
+        return mod.upgrade;
+    const defaultExport = mod.default;
+    if (hasUpgradeMethod(defaultExport)) {
+        const target = defaultExport;
+        return (req, socket, head) => target.upgrade(req, socket, head);
+    }
+    return undefined;
+};
 /**
  * Wrap a fetch handler so user errors become a 500 response (with the message
  * in the body during dev) instead of crashing the child process.
@@ -87,11 +112,30 @@ const listen = (server, port, hostname) => new Promise((resolveListen, rejectLis
 export const startRuntime = async ({ source, port, hostname, }) => {
     const absoluteSource = resolve(process.cwd(), source);
     const mod = (await import(pathToFileURL(absoluteSource).href));
-    const handler = withErrorBoundary(resolveFetchHandler(mod));
+    const fetchHandler = resolveFetchHandler(mod);
+    const handler = withErrorBoundary(fetchHandler);
+    // Publish the bridge `upgradeWebSocket()` reads before the user module can serve a
+    // request, so the helper resolves locally exactly as it does when deployed.
+    installWebSocketBridge();
     const listener = getRequestListener(handler, { hostname });
     const server = createServer((incoming, outgoing) => {
         void listener(incoming, outgoing);
     });
+    // Node emits 'upgrade' rather than 'request' for a WebSocket handshake. Without
+    // this listener Node hands the handshake to the ordinary request handler, which
+    // answers 200 on a connection the client expects to be a 101 — so a function's
+    // WebSocket code silently never ran under `neon dev`.
+    //
+    // The upgrade path takes the RAW handler, not the error-boundary-wrapped one. The
+    // boundary turns a throw into a 500 Response, which on this path is
+    // indistinguishable from a handler that deliberately declined the upgrade — so a
+    // crashing handler would answer 501 ("no WebSocket support") instead of surfacing
+    // the error. The upgrade listener has its own equivalent boundary, and reports a
+    // throw as the 502 the deployed runtime returns.
+    server.on("upgrade", createUpgradeListener({
+        fetch: fetchHandler,
+        upgrade: resolveUpgradeHandler(mod),
+    }));
     const boundPort = await bindPort(server, port, hostname);
     process.stdout.write(`neon-dev:ready ${boundPort}\n`);
     return boundPort;