plum-e2e 1.3.5 → 1.3.7

package/backend/config/scripts/run-tests.js

@@ -27,7 +27,9 @@ const runners = parallel || process.env.REPORT_RUNNERS || '1';
 const tag = process.env.TAG || process.argv.slice(2).find((a) => a.startsWith('@'));
 const browser = process.env.BROWSER || 'chromium';
 
-const reportFile = path.resolve(process.cwd(), 'reports', 'cucumber_report.json');
+const reportFile =
+	process.env.CUCUMBER_REPORT_FILE ||
+	path.resolve(process.cwd(), 'reports', 'cucumber_report.json');
 
 // Wipe any previous report so a crashed/empty run can never return stale results.
 try {
@@ -87,7 +89,7 @@ try {
 		);
 	}
 
-	baseCommand.push('--format', 'json:reports/cucumber_report.json');
+	baseCommand.push('--format', `json:${reportFile.replace(/\\/g, '/')}`);
 
 	if (tag) {
 		baseCommand.push('--tags', `"${tag}"`);

package/backend/routes/node.routes.js

@@ -50,13 +50,18 @@ router.post('/execute', authGuard, (req, res) => {
 		}
 	}
 
+	// Each job writes to its own temp file so concurrent jobs on the same node
+	// cannot clobber each other's reports (shared cucumber_report.json race condition).
+	const reportFile = path.join(os.tmpdir(), `plum-report-${jobId}.json`);
+
 	jobs[jobId] = {
 		status: 'running',
 		logs: '',
 		exitCode: null,
 		startedAt: Date.now(),
 		meta: { tags: tags || '', browser, workers },
-		tempTestsDir
+		tempTestsDir,
+		reportFile
 	};
 
 	const env = {
@@ -65,6 +70,7 @@ router.post('/execute', authGuard, (req, res) => {
 		TRIGGER: TRIGGER_REMOTE,
 		BROWSER: browser,
 		REPORT_RUNNERS: String(workers),
+		CUCUMBER_REPORT_FILE: reportFile,
 		...(tempTestsDir ? { TESTS_ROOT: tempTestsDir } : {})
 	};
 	if (workers > 1) env.PARALLEL = String(workers);
@@ -81,9 +87,8 @@ router.post('/execute', authGuard, (req, res) => {
 		jobs[jobId].exitCode = code;
 
 		try {
-			const reportPath = path.resolve(process.cwd(), 'reports', 'cucumber_report.json');
-			if (fs.existsSync(reportPath)) {
-				jobs[jobId].reportContent = fs.readFileSync(reportPath, 'utf8');
+			if (fs.existsSync(reportFile)) {
+				jobs[jobId].reportContent = fs.readFileSync(reportFile, 'utf8');
 			}
 		} catch {}
 
@@ -91,7 +96,12 @@ router.post('/execute', authGuard, (req, res) => {
 			fs.rm(jobs[jobId].tempTestsDir, { recursive: true, force: true }, () => {});
 		}
 
-		setTimeout(() => delete jobs[jobId], 600_000);
+		setTimeout(() => {
+			try {
+				fs.unlinkSync(reportFile);
+			} catch {}
+			delete jobs[jobId];
+		}, 600_000);
 	});
 
 	res.json({ jobId, status: 'started' });

package/backend/services/runnerService.js

@@ -28,7 +28,22 @@ const getAll = () => prisma.runner.findMany({ orderBy: { createdAt: 'asc' } });
 const create = ({ name, url, token, browser = 'chromium' }) =>
 	prisma.runner.create({ data: { name, url, token, browser } });
 
-const remove = (id) => prisma.runner.delete({ where: { id } });
+async function remove(id) {
+	// Scrub the deleted runner from any cron job's runnerIds string before
+	// deleting, since that field has no relational constraint.
+	const jobs = await prisma.cronJob.findMany({ select: { id: true, runnerIds: true } });
+	for (const job of jobs) {
+		const ids = job.runnerIds
+			.split(',')
+			.map((s) => s.trim())
+			.filter((s) => s && s !== id);
+		await prisma.cronJob.update({
+			where: { id: job.id },
+			data: { runnerIds: ids.length > 0 ? ids.join(',') : 'built-in' }
+		});
+	}
+	return prisma.runner.delete({ where: { id } });
+}
 
 const update = (id, data) => prisma.runner.update({ where: { id }, data });
 

package/bin/plum.js

@@ -323,7 +323,7 @@ async function configureNode({ force }) {
 
 	if (interactive) {
 		const primaryVal = await clack.text({
-			message: 'Primary server URL',
+			message: 'Your Plum server backend URL',
 			placeholder: primary || 'http://localhost:3001',
 			defaultValue: primary
 		});
@@ -331,7 +331,7 @@ async function configureNode({ force }) {
 		primary = primaryVal || primary;
 
 		const portVal = await clack.text({
-			message: 'Local port this node listens on',
+			message: 'Local port this Plum node listens on',
 			placeholder: port,
 			defaultValue: port
 		});
@@ -340,7 +340,7 @@ async function configureNode({ force }) {
 
 		const defaultUrl = url || `http://${detectLanIp()}:${port}`;
 		const urlVal = await clack.text({
-			message: 'URL the primary calls back (advertised)',
+			message: 'The URL your Plum server calls to communicate with this node',
 			placeholder: defaultUrl,
 			defaultValue: defaultUrl
 		});

package/frontend/src/lib/components/layout/RunnerPanel.svelte

@@ -234,7 +234,7 @@
 	function adjustWorkers(delta) {
 		runnerConfig.update((c) => ({
 			...c,
-			workers: Math.max(1, Math.min(16, c.workers + delta))
+			workers: Math.max(1, Math.min(10, c.workers + delta))
 		}));
 	}
 
@@ -353,7 +353,7 @@
 					<button
 						class="step-btn"
 						on:click={() => adjustWorkers(1)}
-						disabled={cfg.workers >= 16 || state.running}>+</button
+						disabled={cfg.workers >= 10 || state.running}>+</button
 					>
 				</div>
 			</div>

package/frontend/src/lib/constants.js

@@ -27,8 +27,6 @@ export const TRIGGER_TYPES = Object.freeze({
 	CLI: 'command-line-trigger'
 });
 
-export const WORKER_OPTIONS = [1, 2, 4, 8];
-
 export const REPORTS_PER_PAGE = 15;
 
 export const COPY_TIMEOUT_MS = 1400;

package/frontend/src/routes/scheduled-tests/+page.svelte

@@ -26,7 +26,7 @@
 	} from '$lib/api/schedules';
 	import { fetchRunners } from '$lib/api/runners';
 	import { activeCronJobs } from '$lib/stores/runner';
-	import { BROWSERS, WORKER_OPTIONS, TOAST_TIMEOUT_MS } from '$lib/constants';
+	import { BROWSERS, TOAST_TIMEOUT_MS } from '$lib/constants';
 	import { stagger } from '$lib/utils/format';
 	import Button from '$lib/components/ui/Button.svelte';
 	import Badge from '$lib/components/ui/Badge.svelte';
@@ -124,6 +124,10 @@
 		form.runnerIds = current.includes(id) ? current.filter((r) => r !== id) : [...current, id];
 	}
 
+	function adjustFormWorkers(delta) {
+		form.workers = Math.max(1, Math.min(10, (form.workers || 1) + delta));
+	}
+
 	function openAddModal() {
 		isEditing = false;
 		editTaskName = '';
@@ -144,14 +148,16 @@
 	function openEditModal(job) {
 		isEditing = true;
 		editTaskName = job.taskName;
+		const validIds = new Set(['built-in', ...availableRunners.map((r) => r.id)]);
 		const storedIds = job.runnerIds ? job.runnerIds.split(',').map((s) => s.trim()) : ['built-in'];
+		const prunedIds = storedIds.filter((id) => validIds.has(id));
 		form = {
 			taskName: job.taskName,
 			cronExpression: job.cronExpression,
 			tags: job.tags,
 			workers: job.workers ?? 1,
 			browser: job.browser ?? 'chromium',
-			runnerIds: storedIds
+			runnerIds: prunedIds.length > 0 ? prunedIds : ['built-in']
 		};
 		const isPreset = scheduleOptions.some((o) => o.value === job.cronExpression);
 		useCustomCron = !isPreset;
@@ -303,18 +309,20 @@
 				<span>Workers</span>
 				<span class="field-hint">Parallel workers for this job</span>
 			</div>
-			<div class="seg-control">
-				{#each WORKER_OPTIONS as n}
-					<button
-						type="button"
-						class="seg-btn"
-						class:active={form.workers === n}
-						on:click={() => (form.workers = n)}
-					>
-						<span class="seg-num">{n}</span>
-						<span class="seg-label">{n === 1 ? 'worker' : 'workers'}</span>
-					</button>
-				{/each}
+			<div class="stepper">
+				<button
+					type="button"
+					class="step-btn"
+					on:click={() => adjustFormWorkers(-1)}
+					disabled={form.workers <= 1}>−</button
+				>
+				<span class="step-val">{form.workers}</span>
+				<button
+					type="button"
+					class="step-btn"
+					on:click={() => adjustFormWorkers(1)}
+					disabled={form.workers >= 10}>+</button
+				>
 			</div>
 		</div>
 
@@ -663,6 +671,57 @@
 		color: var(--fail);
 	}
 
+	/* Workers stepper */
+	.stepper {
+		display: flex;
+		align-items: center;
+		background: var(--bg-subtle);
+		border: 1px solid var(--border);
+		border-radius: var(--radius-sm);
+		overflow: hidden;
+		width: fit-content;
+	}
+
+	.step-btn {
+		width: 28px;
+		height: 30px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		border: none;
+		background: transparent;
+		color: var(--text-muted);
+		cursor: pointer;
+		font-size: 0.875rem;
+		font-weight: 400;
+		line-height: 1;
+		transition:
+			color var(--duration-fast),
+			background var(--duration-fast);
+	}
+
+	.step-btn:hover:not(:disabled) {
+		color: var(--text);
+		background: var(--bg-elevated);
+	}
+
+	.step-btn:disabled {
+		opacity: 0.3;
+		cursor: default;
+	}
+
+	.step-val {
+		min-width: 28px;
+		text-align: center;
+		font-size: 0.85rem;
+		font-weight: 500;
+		color: var(--text);
+		font-family: 'JetBrains Mono', monospace;
+		line-height: 30px;
+		border-left: 1px solid var(--border);
+		border-right: 1px solid var(--border);
+	}
+
 	/* Segmented control */
 	.seg-control {
 		display: flex;

package/package.json

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