neon 8.3.0 → 8.3.2

package/README.md

@@ -839,7 +839,9 @@ The target directory must be empty unless you pass `--force` (a lone `.git` is i
 
 Recommended installs the Neon plugin for every detected agent (global config, project folders, and the host CLI). Plugin-capable agents get the plugin; the rest get skills and MCP. If none are detected, it installs the default Neon skills for Cursor and Codex in this directory (`./.agents/skills`) and does not configure MCP. It then links a project when the CLI is authenticated, and writes a default `neon.ts` (Postgres only) using the package manager already in the directory.
 
-Unauthenticated `-y` skips linking and prints the next step: sign up at https://neon.com/signup, then `neon login`, `neon link`, or `neon claim create` (no account, expires in 72 hours unless claimed). `-y` never opens a browser. `-y` with `--project-id` or other account flags links when the CLI is already signed in; otherwise it errors and names `neon login` or `--claimable`.
+Unauthenticated `-y` skips linking and prints the next step: sign up at https://neon.com/signup, then `neon login`, `neon link`, or `neon claim create` (no account, expires in 72 hours unless claimed). `-y` never opens a browser. `-y` with `--project-id` or other account flags links when the CLI is already signed in. Without credentials, `--org-id`, `--project-id`, and `--branch` together write `.neon` offline (as `neon link --no-checks` does), and init prints `neon login` as the next step; Neon checks the IDs on the first command that reaches it. With only some of those flags, init still installs agent tooling and writes `neon.ts`, then prints `neon login` and the `neon link` command with those flags.
+
+When init picks MCP auth (no `--mcp-auth`) and the CLI credential is an organization or project-scoped API key, which cannot mint the MCP server's key, init configures MCP with OAuth instead and continues. With `--mcp-auth api-key`, init skips MCP, finishes linking and `neon.ts`, then reports `Neon setup failed.` with the `neon mcp` commands to retry and exits 1.
 
 Custom asks how to add Neon to coding agents (plugin, skills and MCP separately, or skip), then how to get a project (sign in and link, or a claimable project when you are not signed in), then which services `neon.ts` should declare. Skills and MCP use separate agent pickers, and either can be skipped. Postgres is listed first as always included. The package manager is inferred from the directory; Custom asks only when none is detected. `--skill` selects skills (not the plugin) and skips that picker. MCP flags (`--mcp-config-location`, `--mcp-auth`, `--mcp-project-scoped`) select skills and MCP. `--mcp-config-location` is where the config is written: `global` maps to `neon mcp`, and `project` maps to `neon mcp --project`. With `-y`, the location defaults to `global`; interactive Custom asks. If some selected agents cannot write that location, init warns and skips MCP for those agents while continuing with the supported agents. It fails when none of the selected agents support the location. `--mcp-project-scoped` limits MCP tools to the linked Neon project by passing its ID to `neon mcp --project-id`. Omitted is false, including in Custom; there is no prompt. `--no-agent-setup` skips agent setup.
 

package/dist/commands/snapshots.js

@@ -1,8 +1,8 @@
 import { t as __exportAll } from "../_chunks/rolldown-runtime-8H4AJuhK.js";
 import { log } from "../log.js";
-import { retryOnLock } from "../api.js";
+import { isNeonApiError, retryOnLock } from "../api.js";
 import { writer } from "../writer.js";
-import { looksLikeLSN, looksLikeTimestamp, toIso } from "../utils/formats.js";
+import { looksLikeBranchId, looksLikeLSN, looksLikeSnapshotId, looksLikeTimestamp, toIso } from "../utils/formats.js";
 import { branchIdResolve, fillSingleProject, resolveBranchRef } from "../utils/enrichers.js";
 import { BRANCH_FIELDS } from "./branches.js";
 //#region src/commands/snapshots.ts
@@ -166,6 +166,25 @@ const resolveSnapshot = async (props) => {
 	if (byName.length > 1) throw new Error(`Multiple snapshots are named "${props.id}". Re-run with the snapshot id:\n${byName.map((s) => `  ${s.id}`).join("\n")}`);
 	throw new Error(`Snapshot "${props.id}" not found.\nAvailable snapshots: ${snapshots.map((s) => `${s.name} (${s.id})`).join(", ") || "none"}`);
 };
+/**
+* Runs `call` on the snapshot `props.id` names. An id goes straight to the API without the
+* listing; a 404 sends it through {@link resolveSnapshot}, since a name can look like an id.
+* When the listing has that id, the 404 was about something else (a target branch), so it stands.
+*/
+const withSnapshotId = async (props, call) => {
+	let notFound;
+	if (looksLikeSnapshotId(props.id)) try {
+		return await call(props.id);
+	} catch (err) {
+		if (!(isNeonApiError(err) && err.status === 404)) throw err;
+		notFound = err;
+	}
+	const snapshot = await resolveSnapshot(props);
+	if (notFound && snapshot.id === props.id) throw notFound;
+	return call(snapshot.id);
+};
+/** A `br-…` id needs no branch listing; a name or the context/default branch does. */
+const snapshotBranchId = async (props) => props.branch && looksLikeBranchId(props.branch) ? props.branch : (await resolveBranchRef(props)).branchId;
 const list = async (props) => {
 	const { data: { snapshots } } = await props.apiClient.listSnapshots(props.projectId);
 	writer(props).end(snapshots, {
@@ -185,10 +204,7 @@ const get = async (props) => {
 const create = async (props) => {
 	if (props.lsn !== void 0 && !looksLikeLSN(props.lsn)) throw new Error(`Invalid --lsn value: "${props.lsn}". Expected an LSN like 0/1F3C8A0.`);
 	if (props.timestamp !== void 0 && !looksLikeTimestamp(props.timestamp)) throw new Error(`Invalid --timestamp value: "${props.timestamp}". Use an RFC 3339 timestamp, e.g. 2025-01-01T00:00:00Z.`);
-	const { branchId } = await resolveBranchRef({
-		...props,
-		branch: props.branch
-	});
+	const branchId = await snapshotBranchId(props);
 	const { data } = await retryOnLock(() => props.apiClient.createSnapshot(props.projectId, branchId, {
 		name: props.name,
 		timestamp: props.timestamp,
@@ -203,12 +219,11 @@ const create = async (props) => {
 };
 const update = async (props) => {
 	if (props.name === void 0 && props.expiresAt === void 0 && !props.clearExpiration) throw new Error("Nothing to update. Pass --name, --expires-at, or --clear-expiration.");
-	const snapshot = await resolveSnapshot(props);
 	const expiresAt = props.clearExpiration ? null : props.expiresAt !== void 0 ? toIso(props.expiresAt, "--expires-at") : void 0;
-	const { data } = await retryOnLock(() => props.apiClient.updateSnapshot(props.projectId, snapshot.id, { snapshot: {
+	const { data } = await withSnapshotId(props, (snapshotId) => retryOnLock(() => props.apiClient.updateSnapshot(props.projectId, snapshotId, { snapshot: {
 		name: props.name,
 		expires_at: expiresAt
-	} }));
+	} })));
 	writer(props).end(data.snapshot, {
 		fields: SNAPSHOT_FIELDS,
 		renderColumns: { expires_at: (s) => s.expires_at || "never" }
@@ -223,17 +238,18 @@ const deleteSnapshot = async (props) => {
 	});
 };
 const restore = async (props) => {
-	const snapshot = await resolveSnapshot(props);
-	const targetBranchId = props.targetBranch ? await branchIdResolve({
-		branch: props.targetBranch,
-		projectId: props.projectId,
-		apiClient: props.apiClient
-	}) : void 0;
-	const { data } = await retryOnLock(() => props.apiClient.restoreSnapshot(props.projectId, snapshot.id, {
-		name: props.name,
-		target_branch_id: targetBranchId,
-		finalize_restore: props.finalize
-	}));
+	const { data } = await withSnapshotId(props, async (snapshotId) => {
+		const targetBranchId = props.targetBranch ? await branchIdResolve({
+			branch: props.targetBranch,
+			projectId: props.projectId,
+			apiClient: props.apiClient
+		}) : void 0;
+		return retryOnLock(() => props.apiClient.restoreSnapshot(props.projectId, snapshotId, {
+			name: props.name,
+			target_branch_id: targetBranchId,
+			finalize_restore: props.finalize
+		}));
+	});
 	const out = writer(props).write(data.branch, {
 		fields: BRANCH_FIELDS,
 		title: "restored branch"
@@ -259,10 +275,7 @@ const finalize = async (props) => {
 	});
 };
 const scheduleGet = async (props) => {
-	const { branchId } = await resolveBranchRef({
-		...props,
-		branch: props.branch
-	});
+	const branchId = await snapshotBranchId(props);
 	const { data } = await props.apiClient.getSnapshotSchedule(props.projectId, branchId);
 	writer(props).end(data.schedule, {
 		fields: SCHEDULE_FIELDS,
@@ -304,10 +317,6 @@ const parseScheduleJson = (raw) => {
 	});
 };
 const scheduleSet = async (props) => {
-	const { branchId } = await resolveBranchRef({
-		...props,
-		branch: props.branch
-	});
 	let schedule;
 	if (props.schedule) schedule = parseScheduleJson(props.schedule);
 	else if (props.frequency) {
@@ -318,6 +327,7 @@ const scheduleSet = async (props) => {
 		if (props.retention !== void 0) item.retention_seconds = props.retention;
 		schedule = [item];
 	} else throw new Error("Provide --frequency (optionally with --hour/--day/--month/--retention) or --schedule <json>.");
+	const branchId = await snapshotBranchId(props);
 	await retryOnLock(() => props.apiClient.setSnapshotSchedule(props.projectId, branchId, { schedule }));
 	writer(props).end(schedule, {
 		fields: SCHEDULE_FIELDS,