neon 4.17.4 → 4.18.1

package/README.md

@@ -736,6 +736,8 @@ neon function domains delete docs.example.com
 
 Register prints the record, then an INFO line `CNAME <domain> to <cname_target>`. The domain goes live after that CNAME resolves and a certificate is issued on the first request.
 
+A `neon.ts` `customDomains` list is applied by `neon config plan`, `neon config apply`, and `neon checkout` only on the project's default branch. Other branches still deploy the function. Set `customDomains` in the `branch` closure to register a hostname on a child. See [`@neon/config` Default-branch-only fields](../config/README.md#default-branch-only-fields).
+
 When a package cannot be bundled — a native addon with no esbuild loader, or an optional peer dependency a library references on an untaken code path — list it in that function's `externalPackages` and the bundler leaves the import alone. `neon dev` honours the same list. It does not make the package resolvable in the deployed archive (there is no `node_modules` next to the bundle), so it only unblocks an import that is never evaluated — a dependency the handler actually calls has to be bundled, and a natively-backed one cannot be. See [`@neon/config`](../config/README.md#unbundleable-dependencies-externalpackages).
 
 ## Scaffold a project (`bootstrap`)

package/dist/analytics.js

@@ -195,6 +195,30 @@ const trackEvent = (event, properties) => {
 	});
 	log.debug("Sent CLI event: %s", event);
 };
+let commandSuccessExtras = {};
+const recordCommandSuccessExtras = (patch) => {
+	commandSuccessExtras = {
+		...commandSuccessExtras,
+		...patch
+	};
+};
+const recordScaffoldedTemplate = (templateId) => {
+	recordCommandSuccessExtras({ template: templateId });
+};
+const takeCommandSuccessExtras = () => {
+	const extras = commandSuccessExtras;
+	commandSuccessExtras = {};
+	return extras;
+};
+const commandSuccessProperties = (args) => ({
+	...getAnalyticsEventProperties(args),
+	projectId: args.projectId,
+	branchId: args.branchId,
+	accountId: args.accountId,
+	authMethod: args.authMethod,
+	authData: args.authData,
+	...takeCommandSuccessExtras()
+});
 const analyticsCommand = (args) => {
 	const command = args._.join(" ");
 	const raw = args._[0] !== "ask" || typeof args.prompt !== "string" ? command : `${command} ${args.prompt}`;
@@ -209,4 +233,4 @@ const getAnalyticsEventProperties = (args) => ({
 	githubEnvVars: getGithubEnvVars(process.env)
 });
 //#endregion
-export { analyticsMiddleware, analyticsUserId, closeAnalytics, getAnalyticsEventProperties, getErrorAnalyticsEventProperties, initAnalyticsClientMiddleware, sendError, storedCredentialAttribution, telemetryCredential, trackEvent };
+export { analyticsMiddleware, analyticsUserId, closeAnalytics, commandSuccessProperties, getAnalyticsEventProperties, getErrorAnalyticsEventProperties, initAnalyticsClientMiddleware, recordCommandSuccessExtras, recordScaffoldedTemplate, sendError, storedCredentialAttribution, takeCommandSuccessExtras, telemetryCredential, trackEvent };

package/dist/commands/bootstrap.js

@@ -1,6 +1,7 @@
 import { t as __exportAll } from "../_chunks/rolldown-runtime-8H4AJuhK.js";
 import { isCi } from "../env.js";
 import { log } from "../log.js";
+import { recordCommandSuccessExtras, recordScaffoldedTemplate } from "../analytics.js";
 import { t as credentialInputs } from "../_chunks/auth_selection-pitMFzDe.js";
 import { getCliName } from "../utils/cli_name.js";
 import { helpCsv, helpEpilogue } from "../utils/help_text.js";
@@ -114,8 +115,11 @@ const handler = async (props) => {
 	const targetDir = await resolveTargetDir(props, interactive, template);
 	ensureTargetUsable(targetDir, props.force);
 	await scaffold(template, targetDir);
+	recordScaffoldedTemplate(template.id);
 	printScaffolded(template, targetDir);
-	return runPostScaffoldSteps(props, targetDir, interactive, template, named);
+	const result = await runPostScaffoldSteps(props, targetDir, interactive, template, named);
+	recordCommandSuccessExtras({ agent_setup: result.agentSetup });
+	return result;
 };
 /**
 * The template list to choose from. When --template is given we try the

package/dist/commands/config.js

@@ -12,7 +12,7 @@ import { loadEnvFileIntoProcess } from "../env_file.js";
 import { writer } from "../writer.js";
 import { assertAiGatewayProvisionable, warnAiGateway } from "../utils/ai_gateway_notice.js";
 import { announceTargetBranch } from "../utils/branch_notice.js";
-import { renderAppliedChanges, renderBranchSettingConflicts } from "../utils/config_diff.js";
+import { renderAppliedChanges, renderBranchSettingConflicts, renderCustomDomainFollowup } from "../utils/config_diff.js";
 import { fillSingleProject, resolveBranchRef } from "../utils/enrichers.js";
 import { formatInstallCommand, installArgs, resolvePackageManager, runCommand } from "../utils/package_manager.js";
 import { bundleEntry } from "../utils/esbuild.js";
@@ -70,6 +70,7 @@ const neonctlBundler = async (fn) => {
 	assertZipWithinLimits(fn.slug, zip, entries);
 	return zip;
 };
+const reasonAllowsUpdateExisting = (reason) => reason.includes("Pass `updateExisting: true`");
 const INSPECT_FIELDS = [
 	"project",
 	"branch",
@@ -381,6 +382,7 @@ const planCmd = async (props) => {
 	});
 	const services = utilizedServices(config);
 	reportPushResult(props, result, "plan", services);
+	if (result.conflicts.some((conflict) => conflict.field === "customDomain" && !reasonAllowsUpdateExisting(conflict.reason))) process.exitCode = 1;
 	if (services.includes("AI Gateway")) await warnAiGateway({
 		apiClient: props.apiClient,
 		projectId: props.projectId,
@@ -411,7 +413,8 @@ const applyCmd = async (props) => {
 	} catch (err) {
 		if (err instanceof PushConflictError) {
 			reportConflicts(props, err.conflicts);
-			throw new Error("Branch settings conflict with the policy. Re-run with --update-existing to apply the changes shown above.");
+			const overrideable = err.conflicts.every((c) => reasonAllowsUpdateExisting(c.reason));
+			throw new Error(overrideable ? "Branch settings conflict with the policy. Re-run with --update-existing to apply the changes shown above." : "The policy conflicts with remote state. --update-existing will not resolve every conflict shown above.");
 		}
 		throw err;
 	}
@@ -472,9 +475,16 @@ const reportPushResult = (props, result, mode, services) => {
 	}
 	const color = props.color !== false;
 	const out = writer(props);
-	const noChanges = appliedChanges.length === 0;
+	const noChanges = appliedChanges.length === 0 && result.conflicts.length === 0;
 	const appliedText = renderAppliedChanges(appliedChanges, mode === "plan" ? "Planned changes" : "Applied changes", { color });
 	if (appliedText) out.text(`${appliedText}\n`);
+	if (result.conflicts.length > 0) {
+		const conflictText = renderBranchSettingConflicts(result.conflicts, { color });
+		if (conflictText) out.text(`\n${conflictText}\n`);
+		for (const conflict of result.conflicts) if (!reasonAllowsUpdateExisting(conflict.reason)) out.text(`  ! ${conflict.field}: ${conflict.reason}\n`);
+	}
+	const followup = renderCustomDomainFollowup(result, { color });
+	if (followup) out.text(`\n${followup}\n`);
 	if (functionUrlBySlug.size > 0) {
 		const heading = mode === "plan" ? "Function URLs (after apply)" : "Function URLs";
 		out.text(`\n${isCi() ? heading : chalk.bold(heading)}\n`);
@@ -498,7 +508,7 @@ const reportConflicts = (props, conflicts) => {
 	const out = writer(props);
 	const text = renderBranchSettingConflicts([...conflicts], { color: props.color !== false });
 	if (text) out.text(`${text}\n`);
-	for (const conflict of conflicts) if (!/updateExisting/i.test(conflict.reason)) out.text(`  ! ${conflict.field}: ${conflict.reason}\n`);
+	for (const conflict of conflicts) if (!reasonAllowsUpdateExisting(conflict.reason)) out.text(`  ! ${conflict.field}: ${conflict.reason}\n`);
 };
 /**
 * Block provisioning the AI Gateway on a Free plan from the `checkout` policy paths, which
@@ -565,11 +575,20 @@ const applyPolicyOnCreate = async (props) => {
 */
 const logPolicyResult = (result, opts) => {
 	const changes = result.applied.filter((c) => c.action !== "noop");
-	if (changes.length === 0) {
+	if (changes.length === 0 && result.conflicts.length === 0) {
 		log.info("neon.ts applied — no changes were needed.");
+		const followup = renderCustomDomainFollowup(result, opts);
+		if (followup) log.info("%s", followup);
 		return;
 	}
-	log.info("%s", renderAppliedChanges(changes, `neon.ts applied — ${changes.length} change${changes.length === 1 ? "" : "s"}:`, opts));
+	if (changes.length > 0) log.info("%s", renderAppliedChanges(changes, `neon.ts applied — ${changes.length} change${changes.length === 1 ? "" : "s"}:`, opts));
+	if (result.conflicts.length > 0) {
+		const conflictText = renderBranchSettingConflicts(result.conflicts, opts);
+		if (conflictText) log.info("%s", conflictText);
+		for (const conflict of result.conflicts) if (!reasonAllowsUpdateExisting(conflict.reason)) log.info("  ! %s: %s", conflict.field, conflict.reason);
+	}
+	const followup = renderCustomDomainFollowup(result, opts);
+	if (followup) log.info("%s", followup);
 };
 /**
 * Create a branch **from** the local `neon.ts` policy. Returns `null` when there is no

package/dist/commands/init.js

@@ -1,6 +1,7 @@
 import { t as __exportAll } from "../_chunks/rolldown-runtime-8H4AJuhK.js";
 import { log } from "../log.js";
 import { contextBranch, readContextFile } from "../context.js";
+import { recordCommandSuccessExtras } from "../analytics.js";
 import { t as credentialInputs } from "../_chunks/auth_selection-pitMFzDe.js";
 import { getCliName } from "../utils/cli_name.js";
 import { deprecatedServiceMessage, parseServices, servicesFlagValue, servicesOption } from "../neon_services.js";
@@ -184,6 +185,12 @@ const noteTemplateKeepsShippedConfig = (config, services) => {
 	if (config === void 0 && services === void 0) return;
 	log.warning(INIT_TEMPLATE_KEEPS_CONFIG);
 };
+const recordInitSuccess = (kind, agentSetup) => {
+	recordCommandSuccessExtras({
+		init_kind: kind,
+		...agentSetup !== void 0 ? { agent_setup: agentSetup } : {}
+	});
+};
 const handler = async (props) => {
 	if (props.output === "json" || props.output === "yaml") throw new Error(`\`${getCliName()} init\` does not support --output. The commands it runs print their own output.`);
 	const cwd = props.cwd ?? process.cwd();
@@ -228,6 +235,7 @@ const handler = async (props) => {
 			...templateChoice.kind === "template" ? { id: templateChoice.id } : {}
 		}, linkInputs));
 		printNestedBootstrapDone(result, cwd, templateChoice.kind === "template" ? templateChoice.id : "default");
+		recordInitSuccess("empty-template", result?.agentSetup);
 		return;
 	}
 	if (templateChoice.kind === "ask") {
@@ -242,6 +250,7 @@ const handler = async (props) => {
 				useDefault: false
 			}, linkInputs));
 			printNestedBootstrapDone(result, cwd, picked.template.id);
+			recordInitSuccess("empty-template", result?.agentSetup);
 			return;
 		}
 	}
@@ -351,6 +360,7 @@ Run \`${getCliName()} env pull\` once resolved.`, message);
 		],
 		next: []
 	}));
+	recordInitSuccess(templateChoice.kind === "existing" ? "existing" : "empty-skip", agentSetup);
 };
 //#endregion
 export { builder, command, describe, handler, initChildEnv, init_exports as t };

package/dist/commands/mcp.js

@@ -1,6 +1,7 @@
 import { t as __exportAll } from "../_chunks/rolldown-runtime-8H4AJuhK.js";
 import { log } from "../log.js";
 import { readContextFile } from "../context.js";
+import { recordCommandSuccessExtras } from "../analytics.js";
 import { getCliName } from "../utils/cli_name.js";
 import { helpCsv, helpEpilogue } from "../utils/help_text.js";
 import { writer } from "../writer.js";
@@ -217,6 +218,7 @@ const handler = async (props) => {
 	if (minted) log.info("Minted API key %s (id %d, %s). Revoke with: %s", minted.name, minted.id, minted.projectId ? "project" : "account", mintedKeyRevokeCommand(minted));
 	if (plan.auth === "oauth") log.info("The agent will prompt for Neon sign-in on first use.");
 	if (failedAgents.length > 0) throw new Error(`Failed to write Neon MCP config for: ${failedAgents.join(", ")}.`);
+	recordCommandSuccessExtras({ scope: plan.scope });
 };
 //#endregion
 export { builder, command, describe, handler, mcp_exports as t };

package/dist/commands/plugins.js

@@ -1,5 +1,6 @@
 import { t as __exportAll } from "../_chunks/rolldown-runtime-8H4AJuhK.js";
 import { log } from "../log.js";
+import { recordCommandSuccessExtras } from "../analytics.js";
 import { helpCsv, helpEpilogue } from "../utils/help_text.js";
 import { writer } from "../writer.js";
 import { noPassthrough } from "../utils/flags.js";
@@ -124,6 +125,7 @@ const handler = async (props) => {
 	});
 	out.end();
 	if (failed.length === 0) {
+		recordCommandSuccessExtras({ scope: plan.scope });
 		log.info(plan.scope === "project" ? "Installed the Neon plugin (project)." : "Installed the Neon plugin (user).");
 		return;
 	}

package/dist/commands/skills.js

@@ -1,5 +1,6 @@
 import { t as __exportAll } from "../_chunks/rolldown-runtime-8H4AJuhK.js";
 import { log } from "../log.js";
+import { recordCommandSuccessExtras } from "../analytics.js";
 import { helpCsv, helpEpilogue } from "../utils/help_text.js";
 import { writer } from "../writer.js";
 import { noPassthrough } from "../utils/flags.js";
@@ -160,6 +161,7 @@ const handler = async (props) => {
 	});
 	out.end();
 	if (failed.length === 0) {
+		recordCommandSuccessExtras({ scope: plan.scope });
 		log.info(plan.scope === "project" ? "Wrote skills in this directory." : "Wrote user-level skills.");
 		return;
 	}

package/dist/commands/triggers.js

@@ -27,17 +27,112 @@ async function withTriggerNotFound(triggerId, branchId, run) {
 		throw err;
 	}
 }
+const TRIGGER_COMMON_FIELDS = [
+	"trigger_id",
+	"name",
+	"function_slug",
+	"function_path",
+	"enabled",
+	"inherited"
+];
 const TRIGGER_FIELDS = [
 	"trigger_id",
 	"name",
+	"type",
 	"function_slug",
 	"function_path",
 	"schedule",
+	"storage",
 	"enabled",
 	"inherited",
 	"next_run_at"
 ];
-const renderColumns = { schedule: (t) => t.schedule?.cron ?? "" };
+function storageMatch(config) {
+	return config.prefix === void 0 ? config.bucket_name : `${config.bucket_name} ${config.prefix}`;
+}
+function triggerTableRow(t) {
+	if (t.type === "schedule") return {
+		trigger_id: t.trigger_id,
+		name: t.name,
+		type: t.type,
+		function_slug: t.function_slug,
+		function_path: t.function_path,
+		schedule: t.schedule.cron,
+		storage: "",
+		enabled: t.enabled,
+		inherited: t.inherited,
+		next_run_at: t.next_run_at ?? ""
+	};
+	return {
+		trigger_id: t.trigger_id,
+		name: t.name,
+		type: t.type,
+		function_slug: t.function_slug,
+		function_path: t.function_path,
+		schedule: "",
+		storage: storageMatch(t.storage_object_created),
+		enabled: t.enabled,
+		inherited: t.inherited,
+		next_run_at: ""
+	};
+}
+function writeTrigger(props, data, extra) {
+	if (props.output !== "table") {
+		writer(props).end(data, {
+			fields: TRIGGER_COMMON_FIELDS,
+			...extra
+		});
+		return;
+	}
+	const rows = Array.isArray(data) ? data.map(triggerTableRow) : triggerTableRow(data);
+	writer(props).end(rows, {
+		fields: TRIGGER_FIELDS,
+		...extra
+	});
+}
+function enabledPatch(type, enabled) {
+	if (type === "schedule") return {
+		type: "schedule",
+		enabled
+	};
+	return {
+		type: "storage_object_created",
+		enabled
+	};
+}
+function updatePatch(type, props) {
+	if (type === "schedule") {
+		const body = { type: "schedule" };
+		if (props["function-slug"] !== void 0) body.function_slug = props["function-slug"];
+		if (props.name !== void 0) body.name = props.name;
+		if (props.cron !== void 0) body.schedule = { cron: props.cron };
+		if (props["function-path"] !== void 0) body.function_path = props["function-path"];
+		if (props.enabled !== void 0) body.enabled = props.enabled;
+		return body;
+	}
+	const body = { type: "storage_object_created" };
+	if (props["function-slug"] !== void 0) body.function_slug = props["function-slug"];
+	if (props.name !== void 0) body.name = props.name;
+	if (props["function-path"] !== void 0) body.function_path = props["function-path"];
+	if (props.enabled !== void 0) body.enabled = props.enabled;
+	return body;
+}
+function noFieldsToUpdateMessage(type) {
+	const flags = type === "schedule" ? [
+		"--function-slug",
+		"--name",
+		"--cron",
+		"--function-path",
+		"--enabled"
+	] : [
+		"--function-slug",
+		"--name",
+		"--function-path",
+		"--enabled"
+	];
+	const last = flags[flags.length - 1];
+	return `No fields to update. Pass at least one of ${flags.slice(0, -1).join(", ")}, or ${last}.`;
+}
 const command = "triggers";
 const describe = "Manage function triggers";
 const aliases = ["trigger"];
@@ -117,19 +212,12 @@ const handler = (args) => {
 const list = async (props) => {
 	const branchId = await branchIdFromProps(props);
 	const { data } = await props.apiClient.listProjectBranchTriggers(props.projectId, branchId);
-	writer(props).end(data.triggers, {
-		fields: TRIGGER_FIELDS,
-		renderColumns,
-		emptyMessage: "No triggers found on this branch."
-	});
+	writeTrigger(props, data.triggers, { emptyMessage: "No triggers found on this branch." });
 };
 const get = async (props) => {
 	const branchId = await branchIdFromProps(props);
 	const { data } = await withTriggerNotFound(props.id, branchId, () => props.apiClient.getProjectBranchTrigger(props.projectId, branchId, props.id));
-	writer(props).end(data.trigger, {
-		fields: TRIGGER_FIELDS,
-		renderColumns
-	});
+	writeTrigger(props, data.trigger);
 };
 const create = async (props) => {
 	const branchId = await branchIdFromProps(props);
@@ -142,36 +230,23 @@ const create = async (props) => {
 	if (props["function-path"] !== void 0) body.function_path = props["function-path"];
 	if (props.enabled !== void 0) body.enabled = props.enabled;
 	const { data } = await retryOnLock(() => props.apiClient.createProjectBranchTrigger(props.projectId, branchId, body));
-	writer(props).end(data.trigger, {
-		fields: TRIGGER_FIELDS,
-		renderColumns
-	});
+	writeTrigger(props, data.trigger);
 };
 const update = async (props) => {
 	const branchId = await branchIdFromProps(props);
-	const body = { type: "schedule" };
-	if (props["function-slug"] !== void 0) body.function_slug = props["function-slug"];
-	if (props.name !== void 0) body.name = props.name;
-	if (props.cron !== void 0) body.schedule = { cron: props.cron };
-	if (props["function-path"] !== void 0) body.function_path = props["function-path"];
-	if (props.enabled !== void 0) body.enabled = props.enabled;
-	if (Object.keys(body).filter((k) => k !== "type").length === 0) throw new Error("No fields to update. Pass at least one of --function-slug, --name, --cron, --function-path, or --enabled.");
+	const { data: existing } = await withTriggerNotFound(props.id, branchId, () => props.apiClient.getProjectBranchTrigger(props.projectId, branchId, props.id));
+	const trigger = existing.trigger;
+	if (props.cron !== void 0 && trigger.type !== "schedule") throw new Error(`Trigger ${props.id} is type ${trigger.type}; --cron applies to schedule triggers.`);
+	const body = updatePatch(trigger.type, props);
+	if (Object.keys(body).filter((k) => k !== "type").length === 0) throw new Error(noFieldsToUpdateMessage(trigger.type));
 	const { data } = await withTriggerNotFound(props.id, branchId, () => retryOnLock(() => props.apiClient.updateProjectBranchTrigger(props.projectId, branchId, props.id, body)));
-	writer(props).end(data.trigger, {
-		fields: TRIGGER_FIELDS,
-		renderColumns
-	});
+	writeTrigger(props, data.trigger);
 };
 const setEnabled = async (props, enabled) => {
 	const branchId = await branchIdFromProps(props);
-	const { data } = await withTriggerNotFound(props.id, branchId, () => retryOnLock(() => props.apiClient.updateProjectBranchTrigger(props.projectId, branchId, props.id, {
-		type: "schedule",
-		enabled
-	})));
-	writer(props).end(data.trigger, {
-		fields: TRIGGER_FIELDS,
-		renderColumns
-	});
+	const { data: existing } = await withTriggerNotFound(props.id, branchId, () => props.apiClient.getProjectBranchTrigger(props.projectId, branchId, props.id));
+	const { data } = await withTriggerNotFound(props.id, branchId, () => retryOnLock(() => props.apiClient.updateProjectBranchTrigger(props.projectId, branchId, props.id, enabledPatch(existing.trigger.type, enabled))));
+	writeTrigger(props, data.trigger);
 };
 const deleteTrigger = async (props) => {
 	const branchId = await branchIdFromProps(props);

package/dist/index.js

@@ -5,7 +5,7 @@ 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 { analyticsMiddleware, closeAnalytics, commandSuccessProperties, initAnalyticsClientMiddleware, sendError, takeCommandSuccessExtras, 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";
@@ -187,14 +187,7 @@ async function handleError(msg, err, canRetry) {
 	const MAX_ATTEMPTS = 2;
 	while (attempts < MAX_ATTEMPTS) try {
 		const args = await builder.argv;
-		trackEvent("cli_command_success", {
-			...getAnalyticsEventProperties(args),
-			projectId: args.projectId,
-			branchId: args.branchId,
-			accountId: args.accountId,
-			authMethod: args.authMethod,
-			authData: args.authData
-		});
+		trackEvent("cli_command_success", commandSuccessProperties(args));
 		if (args._.length === 0 || args.help) {
 			await showHelp(builder);
 			process.exit(0);
@@ -202,6 +195,7 @@ async function handleError(msg, err, canRetry) {
 		await closeAnalytics();
 		break;
 	} catch (err) {
+		takeCommandSuccessExtras();
 		attempts++;
 		if (!await handleError("", err, attempts < MAX_ATTEMPTS) || attempts >= MAX_ATTEMPTS) {
 			await closeAnalytics();

package/dist/utils/config_diff.js

@@ -75,11 +75,19 @@ const renderBranchGroups = (byBranch, paint) => {
 	return lines;
 };
 /** Friendly label for a service change identifier (`bucket:x` → `bucket x`). */
-const serviceLabel = (identifier) => {
+const serviceLabel = (identifier, details) => {
 	if (identifier === "auth") return "Neon Auth";
 	if (identifier === "dataApi") return "Data API";
 	if (identifier.startsWith("bucket:")) return `bucket ${identifier.slice(7)}`;
 	if (identifier.startsWith("function:")) return `function ${identifier.slice(9)}`;
+	if (identifier.startsWith("domain:")) {
+		const domain = identifier.slice(7);
+		const previous = typeof details?.previousSlug === "string" ? details.previousSlug : void 0;
+		const slug = typeof details?.slug === "string" ? details.slug : void 0;
+		if (previous !== void 0 && slug !== void 0) return `domain ${domain}: ${previous} → ${slug}`;
+		if (slug !== void 0) return `domain ${domain} -> ${slug}`;
+		return `domain ${domain}`;
+	}
 	return identifier;
 };
 /**
@@ -110,7 +118,7 @@ const renderAppliedChanges = (changes, title, opts) => {
 	const lines = [paint.title(title)];
 	const services = changes.filter((c) => c.kind === "service").sort((a, b) => a.identifier.localeCompare(b.identifier));
 	for (const service of services) {
-		const label = serviceLabel(service.identifier);
+		const label = serviceLabel(service.identifier, service.details);
 		const line = service.action === "create" ? `+ ${label}` : service.action === "delete" ? `- ${label}` : `~ ${label}`;
 		lines.push(`  ${service.action === "create" ? paint.added(line) : service.action === "delete" ? paint.removed(line) : paint.arrow(line)}`);
 	}
@@ -122,22 +130,39 @@ const renderAppliedChanges = (changes, title, opts) => {
 	lines.push(...renderBranchGroups(byBranch, paint));
 	return lines.join("\n");
 };
-/**
-* Render branch-setting **conflicts** (drift the policy wants to change but that
-* needs `--update-existing`) as a `git diff`-style before→after report: grouped
-* per branch, sorted by field, `current → desired` with the old value in red and
-* the new in green. Conflicts already carry both sides, so this is the fullest
-* form of the diff. Returns "" when there are no conflicts.
-*/
+const isOverrideableConflict = (conflict) => conflict.reason.includes("Pass `updateExisting: true`");
+const CUSTOM_DOMAIN_REASON = /^custom domain "([^"]+)"/;
+const labeledConflictField = (conflict) => {
+	if (conflict.field !== "customDomain") return conflict.field;
+	const match = CUSTOM_DOMAIN_REASON.exec(conflict.reason);
+	return match?.[1] !== void 0 ? `customDomain ${match[1]}` : conflict.field;
+};
 const renderBranchSettingConflicts = (conflicts, opts) => {
 	if (conflicts.length === 0) return "";
 	const paint = palette(opts.color);
 	const byBranch = /* @__PURE__ */ new Map();
 	for (const conflict of conflicts) {
 		const existing = byBranch.get(conflict.identifier) ?? [];
-		byBranch.set(conflict.identifier, [...existing, ...expandField(conflict.field, conflict.current, conflict.desired)]);
+		byBranch.set(conflict.identifier, [...existing, ...expandField(labeledConflictField(conflict), conflict.current, conflict.desired)]);
+	}
+	const heading = conflicts.every(isOverrideableConflict) ? "Branch settings differ (re-run with --update-existing to apply)" : "Branch settings differ";
+	return [paint.title(heading), ...renderBranchGroups(byBranch, paint)].join("\n");
+};
+const renderCustomDomainFollowup = (result, opts) => {
+	const paint = palette(opts.color);
+	const lines = [];
+	const cnames = (result.customDomains ?? []).filter((d) => d.cnameTarget !== void 0 && d.cnameTarget !== "");
+	if (cnames.length > 0) {
+		lines.push(paint.title("Custom domains"));
+		for (const d of cnames) lines.push(`  CNAME ${d.domain} -> ${d.cnameTarget}`);
+		lines.push("  Point each hostname at the CNAME target. Neon does not create DNS records.");
 	}
-	return [paint.title("Branch settings differ (re-run with --update-existing to apply)"), ...renderBranchGroups(byBranch, paint)].join("\n");
+	if (result.warnings.length > 0) {
+		if (lines.length > 0) lines.push("");
+		lines.push(paint.title("Warnings"));
+		for (const warning of result.warnings) lines.push(`  ${warning}`);
+	}
+	return lines.join("\n");
 };
 //#endregion
-export { renderAppliedChanges, renderBranchSettingConflicts };
+export { renderAppliedChanges, renderBranchSettingConflicts, renderCustomDomainFollowup };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neon",
-  "version": "4.17.4",
+  "version": "4.18.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.4.3",
-    "@neon/sdk": "5.0.0",
-    "@neon/config-runtime": "1.3.3"
+    "@neon/config-runtime": "1.4.1",
+    "@neon/sdk": "6.0.0",
+    "@neon/config": "1.5.1"
   },
   "optionalDependencies": {
     "@napi-rs/keyring": "1.3.0",
@@ -97,9 +97,9 @@
     "tsx": "4.22.3",
     "typescript": "^5.9.0",
     "vitest": "^3.0.9",
-    "@neon-internals/env-core": "0.0.15",
     "@neon-internals/cli-core": "0.0.0",
     "@neon/e2e-harness": "0.0.0",
+    "@neon-internals/env-core": "0.0.17",
     "@neon/functions": "0.10.0"
   },
   "publishConfig": {