@selvajs/cli 4.7.4-beta.0 → 4.8.0-beta.10

package/src/commands/migrate.js

@@ -2,47 +2,46 @@
 // provider packages), remove stale selva.config.js, update ecosystem.config.cjs.
 // Idempotent; mirrors update's lifecycle (stop/mutate/start with rollback on failure).
 
-import {
-	existsSync,
-	readFileSync,
-	writeFileSync,
-	copyFileSync,
-	rmSync
-} from 'node:fs';
+import { existsSync, readFileSync, writeFileSync, copyFileSync, rmSync, renameSync } from 'node:fs';
 import { join } from 'node:path';
-import { spawnSync, execSync } from 'node:child_process';
+import { execSync } from 'node:child_process';
 import * as p from '@clack/prompts';
 import pc from 'picocolors';
 import { requireDeploymentDir, resolveDeploymentDir } from '../paths.js';
-
-const APP_NAME = 'selva-compute';
-
-// Packages we own. Everything in this set is rewritten wholesale by migrate;
-// anything outside it (operator's own deps) gets dropped, which is the
-// explicit design choice — operators with custom deps should fork the
-// template rather than hand-patch the deployment package.json.
-const SELVA_DEPS = new Set([
-	'@selvajs/cli',
-	'@selvajs/selva',
-	'@selvajs/runtime', // legacy — removed during migrate
-	'@selvajs/platform', // legacy — bundled into @selvajs/selva
-	'@selvajs/local-provider', // legacy — bundled into @selvajs/selva
-	'@selvajs/supabase-provider', // legacy — bundled into @selvajs/selva
-	'@selvajs/header-auth-provider', // legacy — bundled into @selvajs/selva
-	'@selvajs/create' // legacy CLI — removed during migrate
-]);
-
-const CANONICAL_SCRIPTS = {
-	start: 'selva start',
-	stop: 'selva stop',
-	restart: 'selva restart',
-	logs: 'selva logs',
-	doctor: 'selva doctor',
-	update: 'selva update'
-};
-
-export async function runMigrate() {
-	const dir = resolveDeploymentDir();
+import { renameEnvKeys, RENAMED_ENV_VARS } from '../env.js';
+import {
+	buildDeploymentPackageJson,
+	CANONICAL_FIELDS,
+	DEPENDENCIES,
+	LEGACY_DEPENDENCIES
+} from '../deployment-package.js';
+import { APP_NAME, runPm2 } from './pm2.js';
+
+/**
+ * Where `migrate` parks the old node_modules while npm installs the new one.
+ * Left behind only if the process is killed mid-migration — `detectDrift`
+ * reports it, because a stray copy of the dependency tree is both confusing and
+ * large enough to matter on a small VM.
+ */
+export const NODE_MODULES_STASH = 'node_modules.selva-migrate-bak';
+
+/**
+ * @param {object} [deps] Seams for tests. The rollback path destroys and
+ *   restores a real dependency tree, so it has to be exercised against a real
+ *   directory — but not against a real npm or a real pm2 daemon.
+ */
+export async function runMigrate(
+	_argv,
+	{
+		dir: injectedDir,
+		// --prefer-online bypasses the stale-packument trap: npm can otherwise
+		// resolve a cached packument that predates the release being migrated to.
+		install = (cwd) => execSync('npm install --prefer-online', { cwd, stdio: 'pipe' }),
+		confirm = (message) => p.confirm({ message, initialValue: true }),
+		pm2 = runPm2
+	} = {}
+) {
+	const dir = injectedDir ?? resolveDeploymentDir();
 	requireDeploymentDir(dir);
 
 	p.intro(pc.bgCyan(pc.black(' selva migrate ')));
@@ -66,9 +65,31 @@ export async function runMigrate() {
 	const ecoHasStaleRuntime =
 		existsSync(ecoPath) && readFileSync(ecoPath, 'utf8').includes('@selvajs/runtime');
 
+	// Deprecated env keys. The server reads the old names for one more minor
+	// version, so this is a warning today and a silent fallback to defaults once
+	// that shim goes — rewriting now is what keeps a tuned value tuned.
+	const envPath = join(dir, '.env');
+	const envBefore = existsSync(envPath) ? readFileSync(envPath, 'utf8') : null;
+	const envRename = envBefore
+		? renameEnvKeys(envBefore, RENAMED_ENV_VARS)
+		: { text: '', changes: [] };
+
 	const sideFileChanges = [];
-	if (hasStaleConfig) sideFileChanges.push(`${pc.red('-')} selva.config.js ${pc.dim('(no longer needed; providers are env-driven)')}`);
-	if (ecoHasStaleRuntime) sideFileChanges.push(`${pc.yellow('~')} ecosystem.config.cjs ${pc.dim('(rewrite: @selvajs/runtime → @selvajs/selva)')}`);
+	if (hasStaleConfig)
+		sideFileChanges.push(
+			`${pc.red('-')} selva.config.js ${pc.dim('(no longer needed; providers are env-driven)')}`
+		);
+	if (ecoHasStaleRuntime)
+		sideFileChanges.push(
+			`${pc.yellow('~')} ecosystem.config.cjs ${pc.dim('(rewrite: @selvajs/runtime → @selvajs/selva)')}`
+		);
+	for (const [oldName, newName, action] of envRename.changes) {
+		sideFileChanges.push(
+			action === 'dropped'
+				? `${pc.red('-')} .env ${pc.dim(`${oldName} (deprecated; ${newName} is already set)`)}`
+				: `${pc.yellow('~')} .env ${pc.dim(`${oldName} → ${newName}`)}`
+		);
+	}
 
 	if (pkgDiff.length === 0 && sideFileChanges.length === 0) {
 		p.outro(pc.green('Already on the current layout — nothing to migrate.'));
@@ -79,19 +100,22 @@ export async function runMigrate() {
 	for (const line of pkgDiff) console.log('  ' + line);
 	for (const line of sideFileChanges) console.log('  ' + line);
 
-	const confirmed = await p.confirm({
-		message: 'Apply these changes, reinstall, and restart?',
-		initialValue: true
-	});
+	const confirmed = await confirm('Apply these changes, reinstall, and restart?');
 	if (p.isCancel(confirmed) || !confirmed) {
 		p.cancel('Cancelled.');
 		return;
 	}
 
 	// Stop pm2 before npm rewrites (SvelteKit lazy-loads chunks; see update command).
-	const stopStatus = runPm2(dir, ['stop', APP_NAME], { inherit: false });
-	if (stopStatus !== 0) {
-		p.log.warn('pm2 stop did not succeed — selva-compute may not be running. Continuing.');
+	// A legacy deployment may predate the local-pm2 layout, so a missing binary
+	// is not fatal here — there is nothing running for us to stop.
+	try {
+		const stopStatus = pm2(dir, ['stop', APP_NAME], { inherit: false });
+		if (stopStatus !== 0) {
+			p.log.warn('pm2 stop did not succeed — selva-compute may not be running. Continuing.');
+		}
+	} catch {
+		p.log.warn('No deployment-local pm2 to stop — continuing.');
 	}
 
 	// Back up for rollback on npm-install failure.
@@ -114,22 +138,33 @@ export async function runMigrate() {
 		writeFileSync(ecoPath, ecoContent, 'utf8');
 	}
 
-	// Clean install required (major version changes break legacy lockfile).
-	rmSync(join(dir, 'node_modules'), { recursive: true, force: true });
-	rmSync(join(dir, 'package-lock.json'), { force: true });
+	if (envRename.changes.length > 0) {
+		copyFileSync(envPath, envPath + '.bak');
+		writeFileSync(envPath, envRename.text, 'utf8');
+	}
+
+	// A clean install is required — a legacy lockfile pins the old package set
+	// across a major bump. But node_modules is also where pm2 lives, and the
+	// rollback below has to restart the app, so deleting it outright leaves a
+	// failed migration with no way back up. Rename instead: atomic, keeps the
+	// .bin symlinks intact, and restorable until the install succeeds.
+	const nodeModules = join(dir, 'node_modules');
+	const nodeModulesBak = join(dir, NODE_MODULES_STASH);
+	const lockPath = join(dir, 'package-lock.json');
+
+	rmSync(nodeModulesBak, { recursive: true, force: true });
+	if (existsSync(nodeModules)) renameSync(nodeModules, nodeModulesBak);
+	const lockBak = existsSync(lockPath) ? readFileSync(lockPath, 'utf8') : null;
+	rmSync(lockPath, { force: true });
 
 	const s = p.spinner();
 	s.start('Installing new dependencies (this can take a minute)');
 	try {
-		// --prefer-online to bypass the stale-packument trap documented in
-		// docs/Hotfix-CLI-Runtime.md.
-		execSync('npm install --prefer-online', {
-			cwd: dir,
-			stdio: 'pipe'
-		});
+		install(dir);
 		s.stop('Dependencies installed');
+		rmSync(nodeModulesBak, { recursive: true, force: true });
 	} catch (err) {
-		s.stop(pc.red('npm install failed — rolling back package.json'));
+		s.stop(pc.red('npm install failed — rolling back'));
 		copyFileSync(bakPath, pkgPath);
 		if (hasStaleConfig && existsSync(configPath + '.bak')) {
 			copyFileSync(configPath + '.bak', configPath);
@@ -137,16 +172,32 @@ export async function runMigrate() {
 		if (ecoHasStaleRuntime && existsSync(ecoPath + '.bak')) {
 			copyFileSync(ecoPath + '.bak', ecoPath);
 		}
-		// Try to bring the process back up (best-effort; at least package.json is consistent).
-		runPm2(dir, ['start', APP_NAME, '--update-env'], { inherit: false });
+		if (envRename.changes.length > 0 && existsSync(envPath + '.bak')) {
+			copyFileSync(envPath + '.bak', envPath);
+		}
+
+		// Restore the dependency tree the app was running on. A half-installed
+		// node_modules from the failed attempt is worse than the old one.
+		rmSync(nodeModules, { recursive: true, force: true });
+		if (existsSync(nodeModulesBak)) renameSync(nodeModulesBak, nodeModules);
+		if (lockBak !== null) writeFileSync(lockPath, lockBak, 'utf8');
+
+		restartAfterRollback(dir, pm2);
 		p.outro(pc.red(`Migration aborted: ${err.message ?? err}`));
 		process.exit(1);
 	}
 
-	const status = runPm2(dir, ['start', APP_NAME, '--update-env'], { inherit: false });
+	let status;
+	try {
+		status = pm2(dir, ['start', APP_NAME, '--update-env'], { inherit: false });
+	} catch (err) {
+		status = 1;
+		p.log.error(`Could not invoke pm2: ${err instanceof Error ? err.message : err}`);
+	}
 	const backupHints = ['package.json.bak'];
 	if (hasStaleConfig) backupHints.push('selva.config.js.bak');
 	if (ecoHasStaleRuntime) backupHints.push('ecosystem.config.cjs.bak');
+	if (envRename.changes.length > 0) backupHints.push('.env.bak');
 
 	if (status === 0) {
 		p.outro(
@@ -161,23 +212,39 @@ export async function runMigrate() {
 	}
 }
 
-// Build target package.json with canonical dependencies (wholesale replace).
-// Drops non-canonical @selvajs/* and operator's own deps (by design).
-function buildTargetPackageJson(current) {
-	const deps = {
-		'@selvajs/cli': 'latest',
-		'@selvajs/selva': 'latest',
-		pm2: '^5.4.0'
-	};
+/**
+ * Bring the app back up after a failed migration.
+ *
+ * Never throws: the migration is already aborting, and an exception here would
+ * replace the rollback's diagnosis with a stack trace. A failure to restart is
+ * the operator's problem to act on, so it must be stated, not swallowed — the
+ * old code returned a bare 1 and printed nothing.
+ */
+function restartAfterRollback(dir, pm2 = runPm2) {
+	try {
+		const status = pm2(dir, ['start', APP_NAME, '--update-env'], { inherit: false });
+		if (status === 0) {
+			p.log.success(`Rolled back and restarted ${APP_NAME}.`);
+			return;
+		}
+		p.log.error(
+			`Rolled back, but \`pm2 start\` exited ${status}. The app may be down — ` +
+				`check \`pm2 logs ${APP_NAME}\` and start it with \`selva start\`.`
+		);
+	} catch (err) {
+		p.log.error(
+			`Rolled back, but pm2 could not be invoked (${err instanceof Error ? err.message : err}). ` +
+				`The app is likely down — run \`npm install\` then \`selva start\`.`
+		);
+	}
+}
 
-	return {
+function buildTargetPackageJson(current) {
+	return buildDeploymentPackageJson({
 		name: current.name ?? 'selva-deployment',
 		version: current.version ?? '0.1.0',
-		private: true,
-		type: 'module',
-		scripts: { ...CANONICAL_SCRIPTS },
-		dependencies: deps
-	};
+		engines: current.engines
+	});
 }
 
 // Format package.json diff for confirmation prompt (concise, not full diff).
@@ -209,38 +276,36 @@ function diffPackageJson(before, after) {
 		}
 	}
 
+	// Anything outside the canonical set is discarded by the rewrite.
+	// devDependencies and description used to vanish without appearing here, so
+	// the operator confirmed a change they were never shown.
+	for (const key of Object.keys(before).sort()) {
+		if (CANONICAL_FIELDS.has(key)) continue;
+		lines.push(`${pc.red('-')} ${key} ${pc.dim(summarize(before[key]))}`);
+	}
+
 	return lines;
 }
 
-// Local pm2 runner (avoid circular dep; duplication is small).
-function runPm2(dir, args, { inherit = true } = {}) {
-	const local = join(dir, 'node_modules', '.bin', process.platform === 'win32' ? 'pm2.cmd' : 'pm2');
-	const bin = existsSync(local) ? local : 'pm2';
-	const result = spawnSync(bin, args, {
-		cwd: dir,
-		stdio: inherit ? 'inherit' : 'pipe',
-		shell: process.platform === 'win32'
-	});
-	if (result.error) return 1;
-	return result.status ?? 0;
+// One-line preview of a dropped field, enough to recognise what is being lost.
+function summarize(value) {
+	if (value === null || typeof value !== 'object') return String(value);
+	const keys = Object.keys(value);
+	if (Array.isArray(value)) return `[${keys.length} item${keys.length === 1 ? '' : 's'}]`;
+	return keys.length ? `{${keys.join(', ')}}` : '{}';
 }
 
 // Exported for `selva doctor` to check layout drift without duplication.
 export function detectDrift(pkgJson, dir) {
 	const deps = pkgJson?.dependencies ?? {};
 	const reasons = [];
-	if (deps['@selvajs/runtime']) reasons.push('@selvajs/runtime is the old runtime package');
-	if (deps['@selvajs/create']) reasons.push('@selvajs/create is the old CLI package');
-	if (deps['@selvajs/platform']) reasons.push('@selvajs/platform is now bundled into @selvajs/selva');
-	if (deps['@selvajs/local-provider'])
-		reasons.push('@selvajs/local-provider is now bundled into @selvajs/selva');
-	if (deps['@selvajs/supabase-provider'])
-		reasons.push('@selvajs/supabase-provider is now bundled into @selvajs/selva');
-	if (deps['@selvajs/header-auth-provider'])
-		reasons.push('@selvajs/header-auth-provider is now bundled into @selvajs/selva');
-	if (!deps['@selvajs/selva']) reasons.push('@selvajs/selva is missing');
-	if (!deps['@selvajs/cli']) reasons.push('@selvajs/cli is missing');
-	if (!deps['pm2']) reasons.push('pm2 is not in dependencies');
+
+	for (const [name, why] of Object.entries(LEGACY_DEPENDENCIES)) {
+		if (deps[name]) reasons.push(`${name} is ${why}`);
+	}
+	for (const name of Object.keys(DEPENDENCIES)) {
+		if (!deps[name]) reasons.push(`${name} is missing`);
+	}
 
 	if (dir) {
 		const configPath = join(dir, 'selva.config.js');
@@ -251,10 +316,16 @@ export function detectDrift(pkgJson, dir) {
 		if (existsSync(ecoPath) && readFileSync(ecoPath, 'utf8').includes('@selvajs/runtime')) {
 			reasons.push('ecosystem.config.cjs still references @selvajs/runtime');
 		}
+		const envPath = join(dir, '.env');
+		if (existsSync(envPath)) {
+			const { changes } = renameEnvKeys(readFileSync(envPath, 'utf8'), RENAMED_ENV_VARS);
+			for (const [oldName, newName] of changes) {
+				reasons.push(`.env still uses ${oldName} (renamed to ${newName})`);
+			}
+		}
 	}
 
 	return reasons;
 }
 
-// Re-exported for tests to verify without running migrate.
-export { buildTargetPackageJson, SELVA_DEPS };
+export { buildTargetPackageJson, diffPackageJson };

package/src/commands/pm2.js

@@ -9,10 +9,10 @@ import * as p from '@clack/prompts';
 import pc from 'picocolors';
 import { requireDeploymentDir, resolveDeploymentDir } from '../paths.js';
 
-const APP_NAME = 'selva-compute';
+export const APP_NAME = 'selva-compute';
 
 // Resolve to deployment-local pm2 (no global fallback; prevents version skew).
-function pm2Bin(dir) {
+export function pm2Bin(dir) {
 	const local = join(dir, 'node_modules', '.bin', process.platform === 'win32' ? 'pm2.cmd' : 'pm2');
 	if (!existsSync(local)) {
 		throw new Error(
@@ -25,7 +25,36 @@ function pm2Bin(dir) {
 	return local;
 }
 
-// Check for daemon/CLI version mismatch; run `pm2 update` if stale.
+// Parse the two versions pm2 prints alongside its out-of-date warning:
+//   In memory PM2 version: 6.0.14
+//   Local PM2 version: 5.4.3
+// Returns nulls when the shape changes — callers then fall back to resyncing,
+// which is the pre-existing behaviour.
+export function parsePm2Skew(output) {
+	// eslint-disable-next-line no-control-regex -- pm2 colourises via chalk on a TTY
+	const clean = output.replace(/\[[0-9;]*m/g, '');
+	const daemon = /In memory PM2 version:\s*v?(\d+\.\d+\.\d+)/i.exec(clean);
+	const local = /Local PM2 version:\s*v?(\d+\.\d+\.\d+)/i.exec(clean);
+	return { daemon: daemon?.[1] ?? null, local: local?.[1] ?? null };
+}
+
+/**
+ * True when the running daemon is newer than the deployment-local pm2 — i.e. a
+ * foreign global pm2 owns it. `pm2 update` cannot fix that direction: it
+ * downgrades the daemon and hands it a dump from a newer version, which drops
+ * the process table so selva-compute is never re-registered (issue #118).
+ */
+export function daemonOutranksCli(daemon, local) {
+	if (!daemon || !local) return false;
+	const [a, b] = [daemon.split('.').map(Number), local.split('.').map(Number)];
+	for (let i = 0; i < 3; i++) {
+		if (a[i] > b[i]) return true;
+		if (a[i] < b[i]) return false;
+	}
+	return false;
+}
+
+// Check for daemon/CLI version mismatch; run `pm2 update` only when it can help.
 function ensurePm2InSync(dir) {
 	const bin = pm2Bin(dir);
 	const probe = spawnSync(bin, ['ping'], {
@@ -36,6 +65,16 @@ function ensurePm2InSync(dir) {
 	const output = (probe.stdout ?? '') + (probe.stderr ?? '');
 	if (!/out-of-date/i.test(output)) return;
 
+	const { daemon, local } = parsePm2Skew(output);
+	if (daemonOutranksCli(daemon, local)) {
+		throw new Error(
+			`The running PM2 daemon (v${daemon}) is NEWER than this deployment's pm2 (v${local}), ` +
+				`so a global pm2 owns it. Running \`pm2 update\` would downgrade the daemon and drop ` +
+				`its process table, leaving ${APP_NAME} unregistered. Resolve the conflict first: ` +
+				`\`which -a pm2\`, \`pm2 -v\`, \`pm2 ping\`.`
+		);
+	}
+
 	p.log.warn(
 		'PM2 in-memory daemon is a different version than the deployment-local pm2 — ' +
 			'running `pm2 update` to resync (this briefly restarts managed processes).'
@@ -53,8 +92,14 @@ function ensurePm2InSync(dir) {
 	}
 }
 
-function runPm2(dir, args, { inherit = true } = {}) {
-	const bin = pm2Bin(dir);
+/**
+ * Run the deployment-local pm2.
+ *
+ * `bin` overrides where pm2 is resolved from — `selva migrate` wipes
+ * node_modules mid-flight and passes the binary it stashed beforehand, because
+ * resolving from the deployment at that moment would find nothing.
+ */
+export function runPm2(dir, args, { inherit = true, bin = pm2Bin(dir) } = {}) {
 	const result = spawnSync(bin, args, {
 		cwd: dir,
 		stdio: inherit ? 'inherit' : 'pipe',

package/src/deployment-package.js

@@ -0,0 +1,102 @@
+// The package.json a deployment directory gets. `create` writes it at scaffold
+// time and `migrate` rewrites an existing one onto it, so it lives here rather
+// than in either command — two copies drifted once already, and the pm2 pin is
+// exactly the field where a silent difference costs the most.
+
+/**
+ * pm2 is pinned exactly, not caret-ranged.
+ *
+ * pm2's CLI and its long-running daemon must be the same version. A range lets
+ * two deployments installed a week apart resolve differently, and the newer one
+ * silently adopts the daemon the older one started — the skew `ensurePm2InSync`
+ * has to detect and, in the daemon-is-newer direction, cannot repair (#118).
+ */
+const PM2_VERSION = '5.4.3';
+
+const SCRIPTS = {
+	start: 'selva start',
+	stop: 'selva stop',
+	restart: 'selva restart',
+	logs: 'selva logs',
+	doctor: 'selva doctor',
+	update: 'selva update'
+};
+
+/**
+ * Packages a deployment carries. Providers are bundled into `@selvajs/selva`;
+ * the CLI is a dependency so `npm run start` resolves the `selva` bin locally
+ * instead of relying on a global install.
+ */
+const DEPENDENCIES = {
+	'@selvajs/cli': 'latest',
+	'@selvajs/selva': 'latest',
+	pm2: PM2_VERSION
+};
+
+/**
+ * Legacy `@selvajs/*` packages that a deployment may still list. Each was
+ * either renamed or folded into `@selvajs/selva`; `migrate` drops them and
+ * `doctor` reports them as layout drift.
+ */
+export const LEGACY_DEPENDENCIES = {
+	'@selvajs/runtime': 'the old runtime package',
+	'@selvajs/create': 'the old CLI package',
+	'@selvajs/platform': 'now bundled into @selvajs/selva',
+	'@selvajs/local-provider': 'now bundled into @selvajs/selva',
+	'@selvajs/supabase-provider': 'now bundled into @selvajs/selva',
+	'@selvajs/header-auth-provider': 'now bundled into @selvajs/selva'
+};
+
+/**
+ * Build the canonical deployment package.json.
+ *
+ * Dependencies are replaced wholesale rather than merged, so an operator's own
+ * additions are dropped. That is deliberate — a deployment directory is
+ * generated output, and anyone needing custom dependencies should depend on
+ * `@selvajs/selva` from their own project instead of editing this file.
+ *
+ * `engines` is the one exception, carried over when present: npm only enforces
+ * it under `engine-strict`, so an operator who pinned a Node floor did it
+ * deliberately, and dropping it removes a guard whose absence shows up only
+ * under real traffic (issue #176). Everything else a migration discards is
+ * listed by `diffPackageJson` before the operator confirms.
+ */
+export function buildDeploymentPackageJson({ name, version = '0.1.0', engines }) {
+	const pkg = {
+		name: sanitizePackageName(name),
+		version,
+		private: true,
+		type: 'module',
+		scripts: { ...SCRIPTS },
+		dependencies: { ...DEPENDENCIES }
+	};
+	if (engines && typeof engines === 'object') pkg.engines = { ...engines };
+	return pkg;
+}
+
+/**
+ * Top-level keys the canonical package.json defines. Anything outside this set
+ * that an operator added is dropped by `migrate` — `diffPackageJson` reports
+ * them so the loss is declared rather than discovered later.
+ */
+export const CANONICAL_FIELDS = new Set([
+	'name',
+	'version',
+	'private',
+	'type',
+	'scripts',
+	'dependencies',
+	'engines'
+]);
+
+export function sanitizePackageName(name) {
+	// npm package names: lowercase, no spaces, limited punctuation.
+	return (
+		String(name ?? '')
+			.toLowerCase()
+			.replace(/[^a-z0-9._-]+/g, '-')
+			.replace(/^[-._]+|[-._]+$/g, '') || 'selva-deployment'
+	);
+}
+
+export { DEPENDENCIES, SCRIPTS, PM2_VERSION };

package/src/env.js

@@ -2,6 +2,29 @@
 
 import { readFileSync, writeFileSync, existsSync } from 'node:fs';
 
+/**
+ * Old env name → its replacement, for keys renamed without changing meaning.
+ * The server still reads each old name for one minor version and warns at boot
+ * (`readRenamed` in `@selvajs/server` `resolveComputeLimits`); `selva doctor`
+ * reports them and `selva migrate` rewrites them. Keep in sync with that list,
+ * and drop an entry when the server stops reading it.
+ */
+export const RENAMED_ENV_VARS = {
+	COMPUTE_DEFINITION_BYTE_CACHE_MB: 'COMPUTE_DEFINITION_CACHE_MB',
+	COMPUTE_RESPONSE_CACHE_MB: 'COMPUTE_SOLVE_CACHE_MB',
+	DEFINITION_CACHE_TTL_MS: 'REMOTE_DEFINITION_CACHE_TTL_MS',
+	MAX_SOLVE_DURATION_MS: 'COMPUTE_SOLVE_DEADLINE_MS'
+};
+
+/**
+ * Deprecated vars whose replacement changes the VALUE too, so they can't be
+ * rewritten by renaming a key. `selva doctor` reports these; migrate leaves
+ * them alone rather than guessing.
+ */
+export const REPLACED_ENV_VARS = {
+	SELVA_FLAG_COMPUTE_DEBUG_VERBOSE: 'SELVA_FLAG_COMPUTE_DEBUG=verbose'
+};
+
 // Parse a .env file into { key: value }. Preserves nothing else.
 export function parseEnv(text) {
 	const out = {};
@@ -78,6 +101,48 @@ export function writeEnvFile(path, template, values) {
 	writeFileSync(path, mergeEnv(template, values), 'utf8');
 }
 
+/**
+ * Rewrite deprecated keys to their current names, in place. `renames` maps old
+ * name → new name. Only the key is touched — the value, comments, ordering and
+ * spacing survive, so an operator's tuned file stays recognisably theirs.
+ *
+ * A key already present under its new name is left alone and its old line is
+ * dropped: the server resolves the same way (new name wins), so keeping both
+ * would preserve a line that does nothing.
+ *
+ * Returns `{ text, changes }` where `changes` is `[oldName, newName, 'renamed'
+ * | 'dropped']` per line acted on; an empty array means the file was already
+ * current and nothing should be written.
+ */
+export function renameEnvKeys(text, renames) {
+	const present = new Set(Object.keys(parseEnv(text)));
+	const changes = [];
+	const out = [];
+
+	for (const line of text.split(/\r?\n/)) {
+		const stripped = line.trim();
+		const eq = stripped.indexOf('=');
+		if (!stripped || stripped.startsWith('#') || eq === -1) {
+			out.push(line);
+			continue;
+		}
+		const key = stripped.slice(0, eq).trim();
+		const newName = renames[key];
+		if (!newName) {
+			out.push(line);
+			continue;
+		}
+		if (present.has(newName)) {
+			changes.push([key, newName, 'dropped']);
+			continue;
+		}
+		out.push(line.replace(key, newName));
+		changes.push([key, newName, 'renamed']);
+	}
+
+	return { text: out.join('\n'), changes };
+}
+
 function quoteIfNeeded(value) {
 	const s = String(value);
 	if (s === '') return '""';