neonctl 2.25.0 → 2.26.1

package/README.md

@@ -369,17 +369,22 @@ If you'd rather not keep env vars on disk, inject them at runtime instead with `
 
 ## Config as code (`config` / `deploy`)
 
-Describe a branch's desired state in a `neon.ts` policy and reconcile it from the CLI — the Neon equivalent of `terraform status` / `plan` / `apply`. The policy is a function of the branch it's being evaluated for; you switch on the branch (`name`, `isDefault`, …) and return the config you want (auth, Data API, compute settings, TTL, protection, and Preview features like Functions and buckets):
+Describe a branch's desired state in a `neon.ts` policy and reconcile it from the CLI — the Neon equivalent of `terraform status` / `plan` / `apply`. A policy splits into a **static** existential set — top-level `auth` / `dataApi` toggles and the beta `preview` block (Functions, buckets, AI Gateway) that decide what _exists_ — and a **dynamic** `branch` closure that tunes each branch (compute settings, TTL, protection, `parent`) based on the branch it's evaluated for (`name`, `isDefault`, …):
 
 ```ts
 // neon.ts
 import { defineConfig } from '@neondatabase/config/v1';
 
-export default defineConfig((branch) => {
-  if (branch.isDefault) {
-    return { protected: true, auth: {} };
-  }
-  return { parent: 'main', ttl: '7d' };
+export default defineConfig({
+  // Static: what exists on every branch (drives the typed env).
+  auth: true,
+  // Dynamic: per-branch tuning only — cannot add/remove services.
+  branch: (branch) => {
+    if (branch.isDefault) {
+      return { protected: true };
+    }
+    return { parent: 'main', ttl: '7d' };
+  },
 });
 ```
 

package/commands/functions.js

@@ -1,4 +1,4 @@
-import { existsSync } from 'node:fs';
+import { existsSync, statSync } from 'node:fs';
 import { join } from 'node:path';
 import { isAxiosError } from 'axios';
 import { retryOnLock } from '../api.js';
@@ -40,6 +40,8 @@ const writeDeploymentErrorSection = (out, dep) => {
 };
 const SLUG_PATTERN = /^[a-z0-9]{1,20}$/;
 const SLUG_HELP = 'Use 1-20 lowercase letters and digits (no hyphens or other characters).';
+// Entry-point discovery order inside --src.
+const ENTRY_CANDIDATES = ['index.ts', 'index.mjs', 'index.js'];
 // Overridable so tests can poll fast; defaults to 2s in real use.
 const POLL_INTERVAL_MS = Number(process.env.NEON_FUNCTIONS_POLL_INTERVAL_MS) || 2000;
 // Upper bound on --wait polling so the CLI never hangs (e.g. if our deployment
@@ -69,13 +71,19 @@ export const builder = (argv) => argv
     demandOption: true,
 })
     .options({
+    src: {
+        describe: 'Function source: a directory containing index.ts, index.mjs, or index.js, or a path to the entry file',
+        type: 'string',
+    },
+    // Removed flags, kept hidden so old invocations fail loudly instead
+    // of being silently ignored (the CLI has no .strictOptions()).
     path: {
-        describe: 'Base directory for the function (resolves --entry)',
         type: 'string',
+        hidden: true,
     },
     entry: {
-        describe: 'Entry file to bundle, relative to --path',
         type: 'string',
+        hidden: true,
     },
     runtime: {
         describe: 'Function runtime',
@@ -146,27 +154,36 @@ const isTransient = (err) => isAxiosError(err) &&
         err.response.status === 404 ||
         err.response.status >= 500);
 const deploy = async (props) => {
+    if (props.path !== undefined || props.entry !== undefined) {
+        throw new Error('--path and --entry were removed. Use --src <dir>; the entry point ' +
+            'is discovered as index.ts, index.mjs, or index.js in that directory.');
+    }
     // At least one deploy option must be passed (--wait is excluded: it controls
     // output, not what gets deployed).
-    const hasOption = props.path !== undefined ||
-        props.entry !== undefined ||
+    const hasOption = props.src !== undefined ||
         props.env !== undefined ||
         props.runtime !== undefined;
     if (!hasOption) {
-        throw new Error('Provide at least one option to deploy, e.g. --path, --entry, or --env. ' +
+        throw new Error('Provide at least one option to deploy, e.g. --src or --env. ' +
             'See: neonctl functions deploy --help.');
     }
     // Cheap, offline validation first - fail before any network round-trip.
     if (!SLUG_PATTERN.test(props.slug)) {
         throw new Error(`Invalid function slug "${props.slug}". ${SLUG_HELP}`);
     }
-    const path = props.path ?? '.';
-    const entry = props.entry ?? 'index.ts';
+    const src = props.src ?? '.';
     const runtime = props.runtime ?? 'nodejs24';
     const environment = parseEnv(props.env);
-    const source = join(path, entry);
-    if (!existsSync(source)) {
-        throw new Error(`Entry file not found: ${source}. Pass --entry to point at your function's entry file (defaults to index.ts).`);
+    const srcStat = statSync(src, { throwIfNoEntry: false });
+    if (srcStat === undefined) {
+        throw new Error(`--src path not found: ${src}.`);
+    }
+    // A file is used as the entry point directly; a directory triggers discovery.
+    const source = srcStat.isFile()
+        ? src
+        : ENTRY_CANDIDATES.map((name) => join(src, name)).find((p) => existsSync(p));
+    if (source === undefined) {
+        throw new Error(`No entry file found in ${src}. Expected one of: ${ENTRY_CANDIDATES.join(', ')}.`);
     }
     // Bundle before any network round-trip so a bundling failure fails fast.
     const zip = zipBundle(await bundleEntry(source));

package/commands/init.js

@@ -1,27 +1,6 @@
-import { init } from 'neon-init';
+import { interactiveInit, orchestrate } from 'neon-init';
 import { sendError } from '../analytics.js';
 import { log } from '../log.js';
-const AGENT_FLAG_VALUES = ['cursor', 'copilot', 'claude'];
-function parseAgentToEditor(value) {
-    const normalized = value.trim().toLowerCase();
-    switch (normalized) {
-        case 'cursor':
-            return 'Cursor';
-        case 'github-copilot':
-        case 'copilot':
-        case 'vs code':
-        case 'vscode':
-        case 'vs-code':
-            return 'VS Code';
-        case 'claude-code':
-        case 'claude cli':
-        case 'claude-cli':
-        case 'claude':
-            return 'Claude CLI';
-        default:
-            return null;
-    }
-}
 export const command = 'init';
 export const describe = 'Initialize a project with Neon using your AI coding assistant';
 export const builder = (yargs) => yargs
@@ -31,23 +10,38 @@ export const builder = (yargs) => yargs
     .option('agent', {
     alias: 'a',
     type: 'string',
-    describe: 'Agent to configure (cursor, copilot, code).',
+    describe: 'Agent to configure (cursor, copilot, claude, etc.).',
+})
+    .option('skip-neon-auth', {
+    type: 'boolean',
+    default: false,
+    describe: 'Skip the Neon Auth setup phase.',
+})
+    .option('skip-migrations', {
+    type: 'boolean',
+    default: false,
+    describe: 'Skip the migrations phase.',
+})
+    .option('preview', {
+    type: 'boolean',
+    default: false,
+    describe: 'Enable preview features (e.g. project bootstrapping from templates).',
 })
     .strict(false);
 export const handler = async (argv) => {
-    let options;
-    const agentArg = argv.agent;
-    if (agentArg !== undefined) {
-        const editor = parseAgentToEditor(agentArg);
-        if (editor === null) {
-            log.error(`Invalid --agent value: "${agentArg}". Supported: ${AGENT_FLAG_VALUES.join(', ')}`);
-            process.exit(1);
-            return;
-        }
-        options = { agent: editor };
-    }
     try {
-        await init(options);
+        if (argv.agent !== undefined) {
+            const result = await orchestrate({
+                agent: argv.agent || undefined,
+                skipNeonAuth: argv.skipNeonAuth,
+                skipMigrations: argv.skipMigrations,
+                preview: argv.preview,
+            });
+            log.info(JSON.stringify(result, null, 2));
+        }
+        else {
+            await interactiveInit({ preview: argv.preview });
+        }
     }
     catch {
         const exitError = new Error(`failed to run neon-init`);

package/commands/link.js

@@ -586,6 +586,13 @@ const promptOrgFromList = async (orgs) => {
     if (!orgs.length) {
         throw new Error(`You don't belong to any organizations. Create one in the Neon Console first: https://console.neon.tech/`);
     }
+    // A single organization leaves nothing to choose, so skip the prompt and link
+    // it directly — go straight on to the project step.
+    if (orgs.length === 1) {
+        const [only] = orgs;
+        log.info(`Linking organization ${only.name} (${only.id}).`);
+        return only.id;
+    }
     const { orgId } = await prompts({
         onState: onPromptState,
         type: 'select',

package/package.json

@@ -5,7 +5,7 @@
     "url": "git+ssh://git@github.com/neondatabase/neonctl.git"
   },
   "type": "module",
-  "version": "2.25.0",
+  "version": "2.26.1",
   "description": "CLI tool for NeonDB Cloud management",
   "main": "index.js",
   "author": "NeonDB",
@@ -59,9 +59,9 @@
   "dependencies": {
     "@hono/node-server": "2.0.4",
     "@neondatabase/api-client": "2.7.1",
-    "@neondatabase/config": "0.7.0",
-    "@neondatabase/config-runtime": "0.7.0",
-    "@neondatabase/env": "0.5.0",
+    "@neondatabase/config": "0.7.1",
+    "@neondatabase/config-runtime": "0.7.1",
+    "@neondatabase/env": "0.5.1",
     "@segment/analytics-node": "1.3.0",
     "axios": "1.7.2",
     "axios-debug-log": "1.0.0",
@@ -71,7 +71,7 @@
     "cliui": "8.0.1",
     "diff": "5.2.0",
     "fflate": "^0.8.3",
-    "neon-init": "0.15.0",
+    "neon-init": "0.16.1",
     "open": "10.1.0",
     "openid-client": "6.8.1",
     "pg-protocol": "^1.14.0",