plum-e2e 2.4.13 → 2.5.0

package/backend/_scaffold/utils/browser.ts

@@ -1,8 +1,28 @@
+/*
+ * This file is part of Plum.
+ *
+ * Plum is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Plum is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Plum. If not, see https://www.gnu.org/licenses/.
+ */
+
 import { chromium, firefox, webkit, Browser, BrowserContext, Page } from 'playwright';
+import * as fs from 'fs';
+import * as path from 'path';
 
 let _browser: Browser;
 let _context: BrowserContext;
 let _page: Page;
+let _ssCounter = 0;
 
 export const page = (): Page => _page;
 
@@ -16,14 +36,39 @@ export async function setup(): Promise<void> {
 	_page = await _context.newPage();
 }
 
+export async function screenshotStep(
+	attach: (data: Buffer, mime: string) => Promise<void>
+): Promise<void> {
+	if (!_page) return;
+	try {
+		const screenshot = await _page.screenshot({ type: 'png' });
+		await attach(screenshot, 'image/png');
+	} catch {
+		// page may be navigating or already closed
+	}
+}
+
+export async function streamLiveScreenshot(stepName: string): Promise<void> {
+	const ssDir = process.env.PLUM_SS_DIR;
+	if (!ssDir || !_page) return;
+	try {
+		const seq = `${String(Date.now()).padStart(16, '0')}-${String(++_ssCounter).padStart(4, '0')}`;
+		const screenshot = await _page.screenshot({ type: 'jpeg', quality: 70 });
+		fs.writeFileSync(
+			path.join(ssDir, `${seq}.ss.json`),
+			JSON.stringify({ stepName, data: screenshot.toString('base64') })
+		);
+	} catch {
+		// ignore — live streaming is best-effort
+	}
+}
+
 export async function teardown(
 	attach: (data: Buffer, mime: string) => Promise<void>,
 	failed: boolean
 ): Promise<void> {
 	if (failed && _page) {
 		const screenshotDir = 'reports/screenshots';
-		const fs = await import('fs');
-		const path = await import('path');
 		if (!fs.existsSync(screenshotDir)) {
 			fs.mkdirSync(screenshotDir, { recursive: true });
 		}

package/backend/_scaffold/utils/hooks.ts

@@ -1,5 +1,22 @@
-import { Before, After, ITestCaseHookParameter } from '@cucumber/cucumber';
-import { setup, teardown } from './browser';
+/*
+ * This file is part of Plum.
+ *
+ * Plum is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Plum is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Plum. If not, see https://www.gnu.org/licenses/.
+ */
+
+import { Before, After, AfterStep, ITestCaseHookParameter } from '@cucumber/cucumber';
+import { setup, teardown, screenshotStep, streamLiveScreenshot } from './browser';
 import dotenv from 'dotenv';
 
 dotenv.config();
@@ -10,6 +27,12 @@ Before(async ({ pickle }: ITestCaseHookParameter) => {
 	await setup();
 });
 
+AfterStep(async function ({ pickleStep, result }: { pickleStep: any; result: any }) {
+	if (result?.status === 'SKIPPED') return;
+	await screenshotStep(this.attach.bind(this));
+	await streamLiveScreenshot(pickleStep?.text ?? '');
+});
+
 After(async function (scenario: ITestCaseHookParameter) {
 	await teardown(this.attach.bind(this), scenario.result?.status === 'FAILED');
 });

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

@@ -52,21 +52,39 @@ try {
 		`BROWSER=${browser}`,
 		'TS_NODE_TRANSPILE_ONLY=true',
 		'cucumber-js',
-		`${testsRoot}/features/**/*.feature`
+		// Pass the directory, not a glob — avoids shell globstar expansion differences
+		// across platforms and lets cucumber-js discover .feature files recursively.
+		`${testsRoot}/features`
 	];
 
-	// A dispatched run executes test files in a temp dir on a runner node. The node's
-	// own working directory ships a cucumber.json whose `require` globs point at the
-	// node's *local* tests/ — and cucumber merges config-file `require` additively with
-	// the CLI ones, so every step would match two definitions (local + dispatched) and
-	// run as "ambiguous": never executing, reporting zero duration. Point cucumber at a
-	// self-contained config inside the dispatched dir so the node's own cucumber.json is
-	// skipped entirely (an explicit --config disables auto-discovery of the cwd file).
+	// A dispatched run executes test files in a temp dir on a runner node. Running
+	// cucumber from that temp dir (cwd = testsRootAbs) makes it auto-discover the
+	// cucumber.json written there, so the node's own backend cucumber.json is never
+	// loaded — preventing step-definition conflicts without relying on --config path
+	// resolution (which is fragile when the temp path is outside the project).
+	let execCwd;
 	if (process.env.TESTS_ROOT) {
-		const testsRootAbs = path.resolve(testsRoot);
-		const configPath = path.join(testsRootAbs, 'cucumber.json');
+		const testsRootAbs = path.isAbsolute(testsRoot) ? testsRoot : path.resolve(testsRoot);
+		execCwd = testsRootAbs;
+
+		// hooks.ts calls dotenv.config() with no path, which defaults to process.cwd().
+		// When running from a temp dir there is no .env there, so vars like BASE_URL
+		// would be undefined. Pre-load BACKEND_DIR's .env so they are already in
+		// process.env before dotenv.config() runs (dotenv never overwrites existing vars).
+		const backendEnvPath = path.resolve(__dirname, '..', '..', '.env');
+		if (fs.existsSync(backendEnvPath)) {
+			for (const line of fs.readFileSync(backendEnvPath, 'utf8').split(/\r?\n/)) {
+				const m = line.match(/^([A-Za-z_]\w*)\s*=\s*(.*?)(\s*#.*)?$/);
+				if (m) {
+					const key = m[1];
+					const val = m[2].trim().replace(/^(['"])(.*)\1$/, '$2');
+					if (!(key in process.env)) process.env[key] = val;
+				}
+			}
+		}
+
 		fs.writeFileSync(
-			configPath,
+			path.join(testsRootAbs, 'cucumber.json'),
 			JSON.stringify({
 				default: {
 					requireModule: ['ts-node/register'],
@@ -77,7 +95,6 @@ try {
 				}
 			})
 		);
-		baseCommand.push('--config', path.relative(process.cwd(), configPath).replace(/\\/g, '/'));
 	} else {
 		baseCommand.push(
 			'--require-module',
@@ -102,11 +119,16 @@ try {
 	const cucumberCommand = baseCommand.join(' ');
 	execSync(cucumberCommand, {
 		stdio: 'inherit',
+		...(execCwd && { cwd: execCwd }),
 		env: {
 			...process.env,
 			NODE_PATH: process.env.NODE_PATH
 				? `${nodeModulesPath}${path.delimiter}${process.env.NODE_PATH}`
-				: nodeModulesPath
+				: nodeModulesPath,
+			// When running from a temp dir there is no tsconfig.json above it, so
+			// ts-node falls back to defaults that may conflict with the Node version.
+			// Point it at the backend tsconfig explicitly.
+			...(execCwd && { TS_NODE_PROJECT: path.resolve(__dirname, '..', '..', 'tsconfig.json') })
 		}
 	});
 } catch (error) {

package/backend/logs/runner-cmr8o2x3n0000mg01410tpuck.log

@@ -0,0 +1,20 @@
+/*
+This file is part of Plum.
+
+Plum is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Plum is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Plum. If not, see https://www.gnu.org/licenses/.
+*/
+📂 Loading tests from: /Users/silverlunah/Projects/plum/backend/tests
+Backend running on port 3002 (node/runner mode)
+(node:89713) [DEP0190] DeprecationWarning: Passing args to a child process with shell option true can lead to security vulnerabilities, as the arguments are not escaped, only concatenated.
+(Use `node --trace-deprecation ...` to show where the warning was created)

package/backend/logs/runner-cmr90hvcx0000n2016edtmrtv.log

@@ -0,0 +1,43 @@
+/*
+This file is part of Plum.
+
+Plum is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Plum is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Plum. If not, see https://www.gnu.org/licenses/.
+*/
+📂 Loading tests from: /Users/silverlunah/Projects/plum/backend/tests
+node:events:487
+      throw er; // Unhandled 'error' event
+      ^
+
+Error: listen EADDRINUSE: address already in use :::3002
+    at Server.setupListenHandle [as _listen2] (node:net:2008:16)
+    at listenInCluster (node:net:2065:12)
+    at Server.listen (node:net:2170:7)
+    at start (/Users/silverlunah/Projects/plum/backend/server.js:65:9)
+    at Object.<anonymous> (/Users/silverlunah/Projects/plum/backend/server.js:139:1)
+    at Module._compile (node:internal/modules/cjs/loader:1829:14)
+    at Module._extensions..js (node:internal/modules/cjs/loader:1969:10)
+    at Module.load (node:internal/modules/cjs/loader:1552:32)
+    at Module._load (node:internal/modules/cjs/loader:1354:12)
+    at wrapModuleLoad (node:internal/modules/cjs/loader:255:19)
+Emitted 'error' event on Server instance at:
+    at emitErrorNT (node:net:2044:8)
+    at process.processTicksAndRejections (node:internal/process/task_queues:90:21) {
+  code: 'EADDRINUSE',
+  errno: -48,
+  syscall: 'listen',
+  address: '::',
+  port: 3002
+}
+
+Node.js v25.9.0

package/backend/logs/runner-cmr90i7h20001n201g2wg6v3n.log

@@ -0,0 +1,43 @@
+/*
+This file is part of Plum.
+
+Plum is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Plum is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Plum. If not, see https://www.gnu.org/licenses/.
+*/
+📂 Loading tests from: /Users/silverlunah/Projects/plum/backend/tests
+node:events:487
+      throw er; // Unhandled 'error' event
+      ^
+
+Error: listen EADDRINUSE: address already in use :::3003
+    at Server.setupListenHandle [as _listen2] (node:net:2008:16)
+    at listenInCluster (node:net:2065:12)
+    at Server.listen (node:net:2170:7)
+    at start (/Users/silverlunah/Projects/plum/backend/server.js:65:9)
+    at Object.<anonymous> (/Users/silverlunah/Projects/plum/backend/server.js:139:1)
+    at Module._compile (node:internal/modules/cjs/loader:1829:14)
+    at Module._extensions..js (node:internal/modules/cjs/loader:1969:10)
+    at Module.load (node:internal/modules/cjs/loader:1552:32)
+    at Module._load (node:internal/modules/cjs/loader:1354:12)
+    at wrapModuleLoad (node:internal/modules/cjs/loader:255:19)
+Emitted 'error' event on Server instance at:
+    at emitErrorNT (node:net:2044:8)
+    at process.processTicksAndRejections (node:internal/process/task_queues:90:21) {
+  code: 'EADDRINUSE',
+  errno: -48,
+  syscall: 'listen',
+  address: '::',
+  port: 3003
+}
+
+Node.js v25.9.0

package/backend/logs/runner-cmr90iilm0002n201mmisva95.log

@@ -0,0 +1,43 @@
+/*
+This file is part of Plum.
+
+Plum is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Plum is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Plum. If not, see https://www.gnu.org/licenses/.
+*/
+📂 Loading tests from: /Users/silverlunah/Projects/plum/backend/tests
+node:events:487
+      throw er; // Unhandled 'error' event
+      ^
+
+Error: listen EADDRINUSE: address already in use :::3009
+    at Server.setupListenHandle [as _listen2] (node:net:2008:16)
+    at listenInCluster (node:net:2065:12)
+    at Server.listen (node:net:2170:7)
+    at start (/Users/silverlunah/Projects/plum/backend/server.js:65:9)
+    at Object.<anonymous> (/Users/silverlunah/Projects/plum/backend/server.js:139:1)
+    at Module._compile (node:internal/modules/cjs/loader:1829:14)
+    at Module._extensions..js (node:internal/modules/cjs/loader:1969:10)
+    at Module.load (node:internal/modules/cjs/loader:1552:32)
+    at Module._load (node:internal/modules/cjs/loader:1354:12)
+    at wrapModuleLoad (node:internal/modules/cjs/loader:255:19)
+Emitted 'error' event on Server instance at:
+    at emitErrorNT (node:net:2044:8)
+    at process.processTicksAndRejections (node:internal/process/task_queues:90:21) {
+  code: 'EADDRINUSE',
+  errno: -48,
+  syscall: 'listen',
+  address: '::',
+  port: 3009
+}
+
+Node.js v25.9.0

package/backend/logs/runner-cmr90j70r0003n201xz8525dz.log

@@ -0,0 +1,20 @@
+/*
+This file is part of Plum.
+
+Plum is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Plum is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Plum. If not, see https://www.gnu.org/licenses/.
+*/
+📂 Loading tests from: /Users/silverlunah/Projects/plum/backend/tests
+Backend running on port 5177 (node/runner mode)
+(node:98310) [DEP0190] DeprecationWarning: Passing args to a child process with shell option true can lead to security vulnerabilities, as the arguments are not escaped, only concatenated.
+(Use `node --trace-deprecation ...` to show where the warning was created)

package/backend/logs/runner-cmr90yup70000qp017ianc2gp.log

@@ -0,0 +1,43 @@
+/*
+This file is part of Plum.
+
+Plum is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Plum is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Plum. If not, see https://www.gnu.org/licenses/.
+*/
+📂 Loading tests from: /Users/silverlunah/Projects/plum/backend/tests
+node:events:487
+      throw er; // Unhandled 'error' event
+      ^
+
+Error: listen EADDRINUSE: address already in use :::3002
+    at Server.setupListenHandle [as _listen2] (node:net:2008:16)
+    at listenInCluster (node:net:2065:12)
+    at Server.listen (node:net:2170:7)
+    at start (/Users/silverlunah/Projects/plum/backend/server.js:65:9)
+    at Object.<anonymous> (/Users/silverlunah/Projects/plum/backend/server.js:139:1)
+    at Module._compile (node:internal/modules/cjs/loader:1829:14)
+    at Module._extensions..js (node:internal/modules/cjs/loader:1969:10)
+    at Module.load (node:internal/modules/cjs/loader:1552:32)
+    at Module._load (node:internal/modules/cjs/loader:1354:12)
+    at wrapModuleLoad (node:internal/modules/cjs/loader:255:19)
+Emitted 'error' event on Server instance at:
+    at emitErrorNT (node:net:2044:8)
+    at process.processTicksAndRejections (node:internal/process/task_queues:90:21) {
+  code: 'EADDRINUSE',
+  errno: -48,
+  syscall: 'listen',
+  address: '::',
+  port: 3002
+}
+
+Node.js v25.9.0

package/backend/logs/runner-cmr90zbtm0001qp01u9tfdkh1.log

@@ -0,0 +1,20 @@
+/*
+This file is part of Plum.
+
+Plum is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Plum is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Plum. If not, see https://www.gnu.org/licenses/.
+*/
+📂 Loading tests from: /Users/silverlunah/Projects/plum/backend/tests
+Backend running on port 5178 (node/runner mode)
+(node:825) [DEP0190] DeprecationWarning: Passing args to a child process with shell option true can lead to security vulnerabilities, as the arguments are not escaped, only concatenated.
+(Use `node --trace-deprecation ...` to show where the warning was created)

package/backend/logs/runner-cmr91a3mw0000tb01414rd1df.log

@@ -0,0 +1,20 @@
+/*
+This file is part of Plum.
+
+Plum is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Plum is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Plum. If not, see https://www.gnu.org/licenses/.
+*/
+📂 Loading tests from: /Users/silverlunah/Projects/plum/backend/tests
+Backend running on port 5178 (node/runner mode)
+(node:2599) [DEP0190] DeprecationWarning: Passing args to a child process with shell option true can lead to security vulnerabilities, as the arguments are not escaped, only concatenated.
+(Use `node --trace-deprecation ...` to show where the warning was created)

package/backend/logs/runner-cmr91dhla0001tb01jp7thjnl.log

@@ -0,0 +1,20 @@
+/*
+This file is part of Plum.
+
+Plum is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Plum is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Plum. If not, see https://www.gnu.org/licenses/.
+*/
+📂 Loading tests from: /Users/silverlunah/Projects/plum/backend/tests
+Backend running on port 5180 (node/runner mode)
+(node:3077) [DEP0190] DeprecationWarning: Passing args to a child process with shell option true can lead to security vulnerabilities, as the arguments are not escaped, only concatenated.
+(Use `node --trace-deprecation ...` to show where the warning was created)

package/backend/prisma/migrations/20260706000000_add_report_logs/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Report" ADD COLUMN "logs" TEXT;

package/backend/prisma/schema.prisma

@@ -67,6 +67,7 @@ model Report {
   testRunId   String?
   testRun     TestRun?          @relation(fields: [testRunId], references: [id], onDelete: SetNull)
   content     Json
+  logs        String?
   createdAt   DateTime          @default(now())
   testHistory TestCaseHistory[]
 }

package/backend/routes/node.routes.js

@@ -50,10 +50,13 @@ router.post('/execute', authGuard, (req, res) => {
 	const { tags, browser = 'chromium', workers = 1, tests = null } = req.body;
 	const jobId = crypto.randomUUID();
 
+	// path.resolve ensures absolute even if TMPDIR env var is set to a relative path
+	const tmpdir = path.resolve(os.tmpdir());
+
 	// Write test files sent by the primary into a per-job temp dir
 	let tempTestsDir = null;
 	if (tests && Object.keys(tests).length > 0) {
-		tempTestsDir = path.join(os.tmpdir(), `plum-job-${jobId}`);
+		tempTestsDir = path.join(tmpdir, `plum-job-${jobId}`);
 		for (const [rel, content] of Object.entries(tests)) {
 			const dest = path.join(tempTestsDir, rel);
 			fs.mkdirSync(path.dirname(dest), { recursive: true });
@@ -63,7 +66,9 @@ 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`);
+	const reportFile = path.join(tmpdir, `plum-report-${jobId}.json`);
+	const ssDir = path.join(tmpdir, `plum-ss-${jobId}`);
+	fs.mkdirSync(ssDir, { recursive: true });
 
 	jobs[jobId] = {
 		status: 'running',
@@ -72,7 +77,9 @@ router.post('/execute', authGuard, (req, res) => {
 		startedAt: Date.now(),
 		meta: { tags: tags || '', browser, workers },
 		tempTestsDir,
-		reportFile
+		reportFile,
+		ssDir,
+		pendingScreenshots: []
 	};
 
 	const env = {
@@ -82,10 +89,36 @@ router.post('/execute', authGuard, (req, res) => {
 		BROWSER: browser,
 		REPORT_RUNNERS: String(workers),
 		CUCUMBER_REPORT_FILE: reportFile,
+		PLUM_SS_DIR: ssDir,
 		...(tempTestsDir ? { TESTS_ROOT: tempTestsDir } : {})
 	};
 	if (workers > 1) env.PARALLEL = String(workers);
 
+	const seenSsFiles = new Set();
+	const ssPoller = setInterval(() => {
+		const job = jobs[jobId];
+		if (!job) {
+			clearInterval(ssPoller);
+			return;
+		}
+		try {
+			const files = fs
+				.readdirSync(ssDir)
+				.filter((f) => f.endsWith('.ss.json'))
+				.sort();
+			for (const f of files) {
+				if (seenSsFiles.has(f)) continue;
+				seenSsFiles.add(f);
+				const filePath = path.join(ssDir, f);
+				const data = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+				job.pendingScreenshots.push(data);
+				try {
+					fs.unlinkSync(filePath);
+				} catch {}
+			}
+		} catch {}
+	}, 400);
+
 	const proc = spawn('npm', ['run', 'test'], { env, shell: true, cwd: BACKEND_DIR });
 	proc.stdout.on('data', (d) => {
 		jobs[jobId].logs += d.toString();
@@ -94,6 +127,7 @@ router.post('/execute', authGuard, (req, res) => {
 		jobs[jobId].logs += d.toString();
 	});
 	proc.on('close', (code) => {
+		clearInterval(ssPoller);
 		jobs[jobId].status = code === 0 ? 'done' : 'error';
 		jobs[jobId].exitCode = code;
 
@@ -103,6 +137,8 @@ router.post('/execute', authGuard, (req, res) => {
 			}
 		} catch {}
 
+		fs.rm(ssDir, { recursive: true, force: true }, () => {});
+
 		if (jobs[jobId].tempTestsDir) {
 			fs.rm(jobs[jobId].tempTestsDir, { recursive: true, force: true }, () => {});
 		}
@@ -132,10 +168,12 @@ router.get('/execute/:jobId', authGuard, (req, res) => {
 	if (!job) return res.status(404).json({ error: 'Job not found' });
 
 	const offset = parseInt(req.query.offset || '0', 10);
+	const screenshots = job.pendingScreenshots.splice(0);
 	res.json({
 		status: job.status,
 		logs: job.logs.slice(offset),
-		exitCode: job.exitCode
+		exitCode: job.exitCode,
+		screenshots
 	});
 });
 

package/backend/services/reportService.js

@@ -168,8 +168,15 @@ function processCucumberJson(raw) {
 			const failedStepIndex = visibleSteps.findLastIndex((s) => s.result?.status === 'failed');
 
 			const steps = visibleSteps.map((step, index) => {
+				// AfterStep hook attachments land in step.after[].embeddings in Cucumber.js JSON
+				const afterStepScreenshot =
+					(step.after ?? []).flatMap(
+						(a) => a.embeddings?.filter((e) => e.mime_type === 'image/png') ?? []
+					)[0]?.data ?? null;
+
 				const screenshotData =
 					step.embeddings?.find((e) => e.mime_type === 'image/png')?.data ??
+					afterStepScreenshot ??
 					(index === failedStepIndex ? hookScreenshots[0]?.data : null) ??
 					null;
 
@@ -265,6 +272,7 @@ const getReportDetail = async (id) => {
 			runnerName: true,
 			createdAt: true,
 			content: true,
+			logs: true,
 			testRun: { select: { id: true, title: true } }
 		}
 	});
@@ -300,7 +308,8 @@ const saveReport = async ({
 	runnerName,
 	runnerId,
 	testRunId,
-	forceFail = false
+	forceFail = false,
+	logs = null
 }) => {
 	const normTrigger = normaliseTrigger(triggerType);
 	const { features, status: derivedStatus } = processCucumberJson(rawCucumberJson);
@@ -318,7 +327,8 @@ const saveReport = async ({
 			runnerId: runnerId ?? null,
 			cronJobId,
 			testRunId: testRunId ?? null,
-			content: { features }
+			content: { features },
+			logs: logs || null
 		}
 	});
 	syncAutomatedTags(report.id, features, testRunId ?? null);
@@ -345,7 +355,8 @@ const saveCombinedReport = async ({
 	tag,
 	triggerType,
 	browser,
-	testRunId
+	testRunId,
+	laneLogs = null
 }) => {
 	const featureMap = new Map();
 	for (const content of reports) {
@@ -371,6 +382,14 @@ const saveCombinedReport = async ({
 	}
 	const combined = [...featureMap.values()];
 
+	let combinedLogs = null;
+	if (laneLogs) {
+		const parts = runners
+			.map((r) => (laneLogs[r.id] ? `=== ${r.name} ===\n${laneLogs[r.id]}` : null))
+			.filter(Boolean);
+		if (parts.length > 0) combinedLogs = parts.join('\n\n');
+	}
+
 	return saveReport({
 		rawCucumberJson: combined,
 		tags: tag,
@@ -380,7 +399,8 @@ const saveCombinedReport = async ({
 		runnerName: runners.map((r) => r.name).join(', '),
 		runnerId: null,
 		testRunId: testRunId ?? null,
-		forceFail: reports.some((r) => r === null)
+		forceFail: reports.some((r) => r === null),
+		logs: combinedLogs
 	});
 };