plum-e2e 2.4.9 → 2.4.11

package/README.md

@@ -78,23 +78,24 @@ Full documentation is available at:
 
 ## Command Reference
 
-| Command                       | Description                                                                   |
-| ----------------------------- | ----------------------------------------------------------------------------- |
-| `plum init`                   | Initialize a new project in the current folder                                |
-| `plum server start`           | Start the full UI stack via Docker (alias: `plum start`)                      |
-| `plum server stop`            | Stop the server and preserve data (alias: `plum stop`)                        |
-| `plum restart`                | Rebuild and restart the server without prompts (alias: `plum server restart`) |
-| `plum update`                 | Update Plum to the latest version and restart the server                      |
-| `plum server reconfig`        | Re-enter server settings without starting                                     |
-| `plum run-test`               | Run all tests locally without Docker                                          |
-| `plum run-test @tag`          | Run tests matching a tag                                                      |
-| `plum run-test --parallel N`  | Run tests across N parallel workers                                           |
-| `plum run-test --browser <b>` | Run in `chromium` (default) or `firefox`                                      |
-| `plum create-step`            | Interactively scaffold a new step definition                                  |
-| `plum node start`             | Set up connectivity, start a runner node, and open the runner menu            |
-| `plum node stop`              | Stop the runner node started from this folder                                 |
-| `plum node reconfig`          | Re-enter node settings and re-register                                        |
-| `plum manage-runners`         | Open the interactive runner management menu                                   |
+| Command                       | Description                                                        |
+| ----------------------------- | ------------------------------------------------------------------ |
+| `plum init`                   | Initialize a new project in the current folder                     |
+| `plum server start`           | Start the full UI stack via Docker                                 |
+| `plum server restart`         | Rebuild Docker images and restart the server without prompts       |
+| `plum server stop`            | Stop the server (data preserved)                                   |
+| `plum server reconfig`        | Re-enter server settings without starting                          |
+| `plum update`                 | Update Plum and auto-restart whatever is running (server or node)  |
+| `plum node start`             | Set up connectivity, start a runner node, and open the runner menu |
+| `plum node restart`           | Stop, refresh dependencies, and restart the runner node            |
+| `plum node stop`              | Stop the runner node started from this folder                      |
+| `plum node reconfig`          | Re-enter node settings and re-register                             |
+| `plum run-test`               | Run all tests locally without Docker                               |
+| `plum run-test @tag`          | Run tests matching a tag                                           |
+| `plum run-test --parallel N`  | Run tests across N parallel workers                                |
+| `plum run-test --browser <b>` | Run in `chromium` (default) or `firefox`                           |
+| `plum create-step`            | Interactively scaffold a new step definition                       |
+| `plum manage-runners`         | Open the interactive runner management menu                        |
 
 ---
 

package/backend/lib/runnerProcess.js

@@ -139,9 +139,26 @@ function statusOf(id, registry = loadRegistry()) {
  */
 function prepareEnv() {
 	const stdio = ['ignore', 'inherit', 'inherit'];
-	if (!fs.existsSync(path.join(BACKEND_DIR, 'node_modules'))) {
+
+	// Re-run npm install when node_modules is missing OR when the plum package
+	// version has changed (npm install -g wipes node_modules on upgrade).
+	const markerPath = path.join(BACKEND_DIR, 'node_modules', '.plum-version');
+	let installedVersion = null;
+	try {
+		installedVersion = fs.readFileSync(markerPath, 'utf8').trim();
+	} catch {}
+	const currentVersion = JSON.parse(
+		fs.readFileSync(path.join(BACKEND_DIR, '..', 'package.json'), 'utf8')
+	).version;
+
+	if (
+		!fs.existsSync(path.join(BACKEND_DIR, 'node_modules')) ||
+		installedVersion !== currentVersion
+	) {
 		execSync('npm install', { cwd: BACKEND_DIR, stdio, shell: true });
+		fs.writeFileSync(markerPath, currentVersion, 'utf8');
 	}
+
 	execSync('npx playwright install chromium firefox', { cwd: BACKEND_DIR, stdio, shell: true });
 }
 

package/bin/plum.js

@@ -324,7 +324,7 @@ async function serverStart() {
 }
 
 async function serverRestart() {
-	clack.intro(pc.bgMagenta(pc.white('  🟣 Plum — Restart  ')));
+	clack.intro(pc.bgMagenta(pc.white('  🟣 Plum — Server Restart  ')));
 	const { loadServerConfig } = serverConfigLib();
 	const cfg = loadServerConfig(process.cwd());
 	applyServerConfig(cfg);
@@ -349,7 +349,7 @@ async function serverRestart() {
 	s.stop(ready ? pc.green('✓ Server is ready') : pc.yellow('Server may still be starting'));
 	clack.log.info(`UI:  ${pc.cyan(`http://localhost:${cfg.frontendPort}`)}`);
 	clack.log.info(`API: ${pc.cyan(`http://localhost:${cfg.backendPort}`)}`);
-	clack.outro(pc.green('Plum restarted.'));
+	clack.outro(pc.green('Server restarted.'));
 }
 
 async function serverUpdate() {
@@ -357,8 +357,33 @@ async function serverUpdate() {
 	clack.log.step('Fetching latest Plum version…');
 	execSync('npm install -g plum-e2e@latest', { stdio: 'inherit' });
 	clack.log.success('Plum CLI updated.');
-	clack.log.step('Rebuilding server with new version…');
-	await serverRestart();
+
+	const serverCfgPath = path.join(process.cwd(), '.plum-server.json');
+	const hasServerCfg = fs.existsSync(serverCfgPath);
+
+	const { loadNodeConfig } = nodeRegisterLib();
+	const { loadRegistry, isAlive } = runnerProcessLib();
+	const nodeCfg = loadNodeConfig(process.cwd());
+	const registry = loadRegistry();
+	const nodeRunning = !!(
+		nodeCfg.id &&
+		registry[String(nodeCfg.id)]?.pid &&
+		isAlive(registry[String(nodeCfg.id)].pid)
+	);
+
+	if (hasServerCfg) {
+		clack.log.step('Rebuilding server with new version…');
+		await serverRestart();
+	}
+
+	if (nodeRunning) {
+		clack.log.step('Restarting node runner with new version…');
+		await nodeRestart();
+	}
+
+	if (!hasServerCfg && !nodeRunning) {
+		clack.outro(pc.green('Plum updated. Run `plum server start` or `plum node start` to launch.'));
+	}
 }
 
 async function serverReconfig() {
@@ -528,6 +553,46 @@ async function nodeStart({ reconfig }) {
 	clack.outro(`Manage runners anytime: ${pc.cyan('plum manage-runners')}`);
 }
 
+async function nodeRestart() {
+	clack.intro(pc.bgMagenta(pc.white('  🟣 Plum — Node Restart  ')));
+	const { loadNodeConfig } = nodeRegisterLib();
+	const { prepareEnv, stopNode, startNode } = runnerProcessLib();
+	const cfg = loadNodeConfig(process.cwd());
+
+	if (!cfg.id) {
+		clack.log.warn('No node configured in this folder — run `plum node start` first.');
+		clack.outro(pc.dim('Done.'));
+		return;
+	}
+
+	const stopped = stopNode(String(cfg.id));
+	if (stopped) {
+		clack.log.success(`Stopped runner "${cfg.name ?? cfg.id}".`);
+	} else {
+		clack.log.info('Node was not running — starting fresh.');
+	}
+
+	clack.log.step('Refreshing dependencies…');
+	try {
+		prepareEnv();
+	} catch (e) {
+		clack.log.warn(`Dependency refresh failed: ${e.message}`);
+	}
+
+	try {
+		const entry = startNode({ id: String(cfg.id), port: cfg.port, token: cfg.token });
+		clack.log.success(
+			pc.green(
+				`Node "${cfg.name}" restarted (pid ${entry.pid}) — logs at backend/logs/runner-${cfg.id}.log`
+			)
+		);
+	} catch (e) {
+		clack.log.warn(`Could not restart node: ${e.message}`);
+	}
+
+	clack.outro(pc.green('Node restarted.'));
+}
+
 async function nodeReconfig() {
 	clack.intro(pc.bgMagenta(pc.white('  🟣 Plum — Reconfigure Node  ')));
 	const cfg = await configureNode({ force: true });
@@ -809,11 +874,17 @@ switch (command) {
 	// intentional fall-through
 
 	case 'start':
-		await serverStart();
+		console.log(
+			`\nSpecify what to start:\n  ${pc.cyan('plum server start')}   — start the web UI stack (Docker)\n  ${pc.cyan('plum node start')}     — start a runner node\n`
+		);
+		process.exit(1);
 		break;
 
 	case 'restart':
-		await serverRestart();
+		console.log(
+			`\nSpecify what to restart:\n  ${pc.cyan('plum server restart')}  — rebuild and restart the server\n  ${pc.cyan('plum node restart')}    — restart the runner node\n`
+		);
+		process.exit(1);
 		break;
 
 	case 'update':
@@ -894,14 +965,10 @@ switch (command) {
 	}
 
 	case 'stop':
-		console.log('--------------------------------------\n');
-		console.log('🛑 Stopping Plum...');
-		execSync('docker compose down', {
-			cwd: plumRoot,
-			stdio: 'inherit'
-		});
-		console.log('✅ Plum stopped. Your data is preserved in the database volume.\n');
-		console.log('--------------------------------------\n');
+		console.log(
+			`\nSpecify what to stop:\n  ${pc.cyan('plum server stop')}    — stop the web UI stack\n  ${pc.cyan('plum node stop')}      — stop the runner node\n`
+		);
+		process.exit(1);
 		break;
 
 	case 'node': {
@@ -942,6 +1009,11 @@ switch (command) {
 			break;
 		}
 
+		if (subcommand === 'restart') {
+			await nodeRestart();
+			break;
+		}
+
 		if (subcommand === 'reconfig') {
 			await nodeReconfig();
 			break;
@@ -1006,16 +1078,16 @@ switch (command) {
 		console.log('--------------------------------------\n');
 		console.log('Usage: plum <command>\n');
 		console.log('  init                 Set up a new Plum project');
-		console.log('  server start         Start the full UI stack (interactive; alias: plum start)');
+		console.log('  server start         Start the full UI stack (interactive)');
 		console.log('    --headless <bool>  Run browsers headless (true/false)');
 		console.log('    --backend-port <n> Host port for the backend/API (default: 3001)');
 		console.log('    --frontend-port <n> Host port for the UI (default: 5173)');
+		console.log('  server restart       Rebuild Docker images and restart the server (no prompts)');
+		console.log('  server stop          Stop the server (data preserved)');
 		console.log('  server reconfig      Re-enter server settings without starting');
 		console.log(
-			'  server restart       Rebuild and restart the server (no prompts; alias: plum restart)'
+			'  update               Update Plum and restart whichever is running (server/node)'
 		);
-		console.log('  server stop          Stop the server  (alias: plum stop)');
-		console.log('  update               Update Plum to the latest version and restart the server');
 		console.log('  node start           Start a runner node (interactive), then open runner menu');
 		console.log('    --primary <url>    Primary Plum server to auto-register with');
 		console.log('    --url <url>        Address the primary calls back (default: <lan-ip>:<port>;');
@@ -1026,6 +1098,7 @@ switch (command) {
 		console.log('    --token <secret>   Auth token (auto-generated + saved if omitted)');
 		console.log('    --name <name>      Runner name shown on the primary (default: node-<rand>)');
 		console.log('    --browser <name>   chromium | firefox (default: chromium)');
+		console.log('  node restart         Stop, refresh deps, and restart the node runner');
 		console.log('  node reconfig        Re-enter node settings + re-register, without starting');
 		console.log('  node stop            Stop the runner node started from this folder');
 		console.log('  manage-runners       Open the runner management menu');

package/frontend/src/routes/reports/[id]/+page.svelte

@@ -532,6 +532,7 @@
 		max-width: 240px;
 		overflow: hidden;
 		text-overflow: ellipsis;
+		margin-top: 3px;
 	}
 
 	h1 {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "plum-e2e",
-	"version": "2.4.9",
+	"version": "2.4.11",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/silverlunah/plum.git"