@selvajs/cli 4.8.0-beta.6 → 4.8.0-beta.8

package/README.md

@@ -25,11 +25,11 @@ selva keys rotate at-rest   # rotate SELVA_AT_REST_KEY (compute API key needs re
 
 All operator commands run inside the deployment directory (the one that contains `.env` and `ecosystem.config.cjs`).
 
-## Idempotency rules
+## Re-running a command is safe
 
 - `npx @selvajs/cli` refuses to overwrite a non-empty directory without `--force`.
 - `selva init` reads the current `.env`, lets the user edit, and **never** regenerates `SELVA_HMAC_KEY` / `SELVA_AT_REST_KEY` if they're already set.
-- A `.selva-version` marker is written so future CLI versions can migrate config schema cleanly.
+- A `.selva-version` marker is written so a future CLI version knows which config layout it is looking at and can upgrade it cleanly.
 
 ## Relationship to `@selvajs/selva`
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@selvajs/cli",
-  "version": "4.8.0-beta.6",
+  "version": "4.8.0-beta.8",
   "description": "Scaffold and operate a Selva white-label deployment. `npx @selvajs/cli <dir>` to bootstrap, `selva <cmd>` to manage.",
   "license": "MIT",
   "author": "VektorNode",
@@ -28,7 +28,10 @@
   },
   "files": [
     "bin",
-    "src"
+    "src",
+    "!**/__tests__/**",
+    "!**/*.test.*",
+    "!**/*.spec.*"
   ],
   "engines": {
     "node": ">=22.0.0"

package/src/commands/keys.js

@@ -14,8 +14,7 @@ const TARGETS = {
 		warning: [
 			'This will:',
 			pc.red('  • log every signed-in user out (existing session cookies stop verifying)'),
-			pc.red('  • invalidate share-link and invite tokens that fell back to this key'),
-			pc.dim('    (only relevant when SHARE_LINK_SECRET / INVITE_TOKEN_SECRET are unset)')
+			pc.red('  • invalidate every share link and pending invite')
 		].join('\n')
 	},
 	'at-rest': {

package/src/__tests__/doctor-node-engine.test.js

@@ -1,97 +0,0 @@
-// Node engine detection in `selva doctor` (issue #176).
-//
-// The CLI carries its own range check rather than importing @selvajs/server:
-// it scaffolds the deployment that installs the runtime, so it cannot depend on
-// it. These pin the two behaviours that matter — the incident direction is
-// caught, and an unparseable range never produces a false failure that would
-// tell an operator to upgrade a Node that is already fine.
-//
-// Run by `pnpm test` via node's built-in runner.
-
-import { test } from 'node:test';
-import assert from 'node:assert/strict';
-import { satisfiesNodeRange } from '../commands/doctor.js';
-
-test('catches the reported incident — Node 20 host, runtime requiring >=22', () => {
-	assert.equal(satisfiesNodeRange('20.20.2', '>=22.0.0'), false);
-});
-
-test('accepts a host that satisfies the floor', () => {
-	assert.equal(satisfiesNodeRange('22.0.0', '>=22.0.0'), true);
-	assert.equal(satisfiesNodeRange('24.16.0', '>=22.0.0'), true);
-});
-
-test('accepts a v-prefixed version, as process.version reports it', () => {
-	assert.equal(satisfiesNodeRange('v22.4.0', '>=22.0.0'), true);
-});
-
-test('is exact at the boundary', () => {
-	assert.equal(satisfiesNodeRange('21.9.9', '>=22.0.0'), false);
-	assert.equal(satisfiesNodeRange('22.0.0', '>22.0.0'), false);
-});
-
-test('handles caret, tilde, alternatives and conjunctions', () => {
-	assert.equal(satisfiesNodeRange('22.5.0', '^22.0.0'), true);
-	assert.equal(satisfiesNodeRange('23.0.0', '^22.0.0'), false);
-	assert.equal(satisfiesNodeRange('22.1.5', '~22.1.0'), true);
-	assert.equal(satisfiesNodeRange('20.0.0', '^18.0.0 || ^20.0.0'), true);
-	assert.equal(satisfiesNodeRange('19.0.0', '^18.0.0 || ^20.0.0'), false);
-	assert.equal(satisfiesNodeRange('20.0.0', '>=18 <21'), true);
-	assert.equal(satisfiesNodeRange('21.0.0', '>=18 <21'), false);
-});
-
-test('treats a bare major or x-range as the whole line', () => {
-	assert.equal(satisfiesNodeRange('22.7.1', '22'), true);
-	assert.equal(satisfiesNodeRange('22.7.1', '22.x'), true);
-	assert.equal(satisfiesNodeRange('23.0.0', '22.x'), false);
-});
-
-test('returns null — never a false failure — when it cannot parse', () => {
-	// A wrong `false` would tell an operator to upgrade a Node that is fine.
-	assert.equal(satisfiesNodeRange('22.0.0', 'lts/*'), null);
-	assert.equal(satisfiesNodeRange('not-a-version', '>=22.0.0'), null);
-	assert.equal(satisfiesNodeRange('22.0.0', ''), null);
-});
-
-test('agrees with @selvajs/server satisfiesRange on the shared cases', () => {
-	// The two implementations are duplicated by necessity; if they diverge, the
-	// admin UI and the CLI would disagree about the same deployment.
-	const cases = [
-		['20.20.2', '>=22.0.0', false],
-		['22.0.0', '>=22.0.0', true],
-		['22.5.0', '^22.0.0', true],
-		['23.0.0', '^22.0.0', false],
-		['20.0.0', '>=18 <21', true],
-		['22.0.0', 'lts/*', null]
-	];
-	for (const [version, range, expected] of cases) {
-		assert.equal(satisfiesNodeRange(version, range), expected, `${version} vs ${range}`);
-	}
-});
-
-// ── The floor itself must not be hardcoded ──────────────────────────────
-
-test('requiredNodeRange reads the CLI package.json, not a copy in code', async () => {
-	const { requiredNodeRange } = await import('../paths.js');
-	const { readFileSync } = await import('node:fs');
-	const { join, dirname } = await import('node:path');
-	const { fileURLToPath } = await import('node:url');
-
-	const here = dirname(fileURLToPath(import.meta.url));
-	const pkg = JSON.parse(readFileSync(join(here, '..', '..', 'package.json'), 'utf8'));
-
-	// If someone bumps engines.node, this follows automatically. A hardcoded
-	// literal anywhere in the scaffolder would fail here.
-	assert.equal(requiredNodeRange(), pkg.engines.node);
-});
-
-test('the create-time guard tracks a bumped floor', async () => {
-	const { requiredNodeRange } = await import('../paths.js');
-	const range = requiredNodeRange();
-	assert.ok(range, 'engines.node must be declared for the scaffolder to enforce it');
-
-	// The floor is whatever package.json says; a host below it is refused.
-	const floorMajor = Number(/(\d+)/.exec(range)[1]);
-	assert.equal(satisfiesNodeRange(`${floorMajor - 1}.0.0`, range), false);
-	assert.equal(satisfiesNodeRange(`${floorMajor}.0.0`, range), true);
-});

package/src/__tests__/env-rename.test.js

@@ -1,65 +0,0 @@
-// `selva migrate` rewrites the operator's .env in place, so these pin the
-// blast radius: only the key changes, and only on lines that are live config.
-// Run by `pnpm test` via node's built-in runner.
-
-import { test } from 'node:test';
-import assert from 'node:assert/strict';
-import { renameEnvKeys, RENAMED_ENV_VARS, REPLACED_ENV_VARS } from '../env.js';
-
-test('renames a deprecated key and leaves everything else byte-identical', () => {
-	const before = [
-		'# Selva deployment',
-		'ORIGIN=https://example.com',
-		'',
-		'# Longest a solve may run.',
-		'MAX_SOLVE_DURATION_MS=45000',
-		'COMPUTE_RATE_LIMIT_MAX=120',
-		''
-	].join('\n');
-
-	const { text, changes } = renameEnvKeys(before, RENAMED_ENV_VARS);
-
-	assert.deepEqual(changes, [['MAX_SOLVE_DURATION_MS', 'COMPUTE_SOLVE_DEADLINE_MS', 'renamed']]);
-	assert.equal(text, before.replace('MAX_SOLVE_DURATION_MS', 'COMPUTE_SOLVE_DEADLINE_MS'));
-});
-
-test('preserves the value verbatim, including quotes and spacing', () => {
-	const { text } = renameEnvKeys(
-		'COMPUTE_RESPONSE_CACHE_MB="512"\n   DEFINITION_CACHE_TTL_MS = 60000\n',
-		RENAMED_ENV_VARS
-	);
-	assert.match(text, /^COMPUTE_SOLVE_CACHE_MB="512"$/m);
-	assert.match(text, /^ {3}REMOTE_DEFINITION_CACHE_TTL_MS = 60000$/m);
-});
-
-test('drops the old line when the new name is already set', () => {
-	const { text, changes } = renameEnvKeys(
-		'MAX_SOLVE_DURATION_MS=45000\nCOMPUTE_SOLVE_DEADLINE_MS=30000\n',
-		RENAMED_ENV_VARS
-	);
-	// The server resolves the same way (new name wins), so keeping both would
-	// preserve a line that does nothing.
-	assert.deepEqual(changes, [['MAX_SOLVE_DURATION_MS', 'COMPUTE_SOLVE_DEADLINE_MS', 'dropped']]);
-	assert.equal(text, 'COMPUTE_SOLVE_DEADLINE_MS=30000\n');
-});
-
-test('reports no changes for an already-current file', () => {
-	const { changes } = renameEnvKeys('COMPUTE_SOLVE_DEADLINE_MS=30000\n', RENAMED_ENV_VARS);
-	assert.deepEqual(changes, []);
-});
-
-test('ignores a commented-out old name — it is not active config', () => {
-	const before = '# MAX_SOLVE_DURATION_MS=100000\n';
-	const { text, changes } = renameEnvKeys(before, RENAMED_ENV_VARS);
-	assert.deepEqual(changes, []);
-	assert.equal(text, before);
-});
-
-test('leaves value-changing replacements alone — migrate must not guess', () => {
-	const before = 'SELVA_FLAG_COMPUTE_DEBUG_VERBOSE=true\n';
-	const { text, changes } = renameEnvKeys(before, RENAMED_ENV_VARS);
-	assert.deepEqual(changes, []);
-	assert.equal(text, before);
-	// It is still reported by `selva doctor`, just not auto-fixed.
-	assert.ok(REPLACED_ENV_VARS.SELVA_FLAG_COMPUTE_DEBUG_VERBOSE);
-});

package/src/__tests__/pm2-skew.test.js

@@ -1,60 +0,0 @@
-// PM2 daemon/CLI skew direction (issue #118, defect 2).
-//
-// The old check treated any `out-of-date` report as "run `pm2 update`". That is
-// only correct when the daemon is OLDER than the deployment-local CLI. In the
-// reported incident a global pm2 v6 owned the daemon while the deployment pinned
-// v5.4.3 — `pm2 update` ran the v5 CLI against it, downgrading the daemon and
-// feeding it a v6 dump, so the process table came back empty and selva-compute
-// was never re-registered.
-//
-// Run by `pnpm test` via node's built-in runner.
-
-import { test } from 'node:test';
-import assert from 'node:assert/strict';
-import { parsePm2Skew, daemonOutranksCli } from '../commands/pm2.js';
-
-// pm2 colourises through chalk on a TTY; build the codes rather than embedding
-// raw control characters in the source.
-const ESC = String.fromCharCode(27);
-const colour = (s) => `${ESC}[34m${ESC}[1m${s}${ESC}[22m${ESC}[39m`;
-
-const REAL_OUTPUT =
-	`${ESC}[31m${ESC}[1m>>>> In-memory PM2 is out-of-date, do:\n>>>> $ pm2 update${ESC}[22m${ESC}[39m\n` +
-	`In memory PM2 version: ${colour('6.0.14')}\n` +
-	`Local PM2 version: ${colour('5.4.3')}\n`;
-
-test('parses both versions out of real colourised pm2 output', () => {
-	assert.deepEqual(parsePm2Skew(REAL_OUTPUT), { daemon: '6.0.14', local: '5.4.3' });
-});
-
-test('parses plain uncoloured output (non-TTY)', () => {
-	const plain = 'In memory PM2 version: 5.4.3\nLocal PM2 version: 5.4.3\n';
-	assert.deepEqual(parsePm2Skew(plain), { daemon: '5.4.3', local: '5.4.3' });
-});
-
-test('returns nulls when the message shape changes, so callers fall back to resync', () => {
-	assert.deepEqual(parsePm2Skew('something else entirely'), { daemon: null, local: null });
-});
-
-test('flags the incident direction — global daemon newer than the pinned CLI', () => {
-	assert.equal(daemonOutranksCli('6.0.14', '5.4.3'), true);
-});
-
-test('allows the repairable direction — daemon older than the CLI', () => {
-	assert.equal(daemonOutranksCli('5.4.3', '6.0.14'), false);
-});
-
-test('is false when the versions match', () => {
-	assert.equal(daemonOutranksCli('5.4.3', '5.4.3'), false);
-});
-
-test('compares minor and patch, not just major', () => {
-	assert.equal(daemonOutranksCli('5.5.0', '5.4.3'), true);
-	assert.equal(daemonOutranksCli('5.4.4', '5.4.3'), true);
-	assert.equal(daemonOutranksCli('5.4.3', '5.4.4'), false);
-});
-
-test('never blocks on an unparseable version — resync stays the default', () => {
-	assert.equal(daemonOutranksCli(null, '5.4.3'), false);
-	assert.equal(daemonOutranksCli('6.0.14', null), false);
-});