@ait-co/devtools 0.1.126 → 0.1.128

package/dist/mcp/cli.js

@@ -10,7 +10,7 @@ import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"
 import { CallToolRequestSchema, ListToolsRequestSchema } from "@modelcontextprotocol/sdk/types.js";
 import { homedir, platform } from "node:os";
 import * as path from "node:path";
-import { isAbsolute, join, resolve } from "node:path";
+import { basename, isAbsolute, join, resolve } from "node:path";
 import { randomBytes } from "node:crypto";
 import { Tunnel, bin, install } from "cloudflared";
 import * as fs from "node:fs/promises";
@@ -2024,7 +2024,7 @@ async function readMcpSdkVersion() {
 * some test environments that skip the build step).
 */
 function readDevtoolsVersion() {
-	return "0.1.126";
+	return "0.1.128";
 }
 /**
 * Derives the next recommended action from a completed diagnostics snapshot.
@@ -3395,7 +3395,7 @@ function parseCaptureLines(raw) {
 //#endregion
 //#region src/test-runner/rpc.ts
 /** Maximum milliseconds to wait for a single evaluate round-trip. */
-const DEFAULT_TIMEOUT_MS = 3e4;
+const DEFAULT_TIMEOUT_MS = 6e4;
 /**
 * Wraps bundle code in a self-executing IIFE that:
 *   1. Evaluates the bundle (registering describe/it/test).
@@ -3454,13 +3454,22 @@ function parseRunTestsResult(rawValue) {
 */
 async function injectAndRunBundle(connection, bundleCode, timeoutMs = DEFAULT_TIMEOUT_MS) {
 	const expression = buildRunTestsExpression(bundleCode);
-	const timeoutPromise = new Promise((_, reject) => setTimeout(() => reject(/* @__PURE__ */ new Error(`rpc: evaluate timed out after ${timeoutMs}ms`)), timeoutMs));
+	const TIMEOUT_SENTINEL = Symbol("timeout");
+	const timeoutPromise = new Promise((resolve) => setTimeout(() => resolve(TIMEOUT_SENTINEL), timeoutMs));
 	const evalPromise = connection.send("Runtime.evaluate", {
 		expression,
 		returnByValue: true,
 		awaitPromise: true
 	});
-	const cdpResult = await Promise.race([evalPromise, timeoutPromise]);
+	const raceResult = await Promise.race([evalPromise.then((v) => ({
+		tag: "eval",
+		v
+	})), timeoutPromise.then(() => ({ tag: "timeout" }))]);
+	if (raceResult.tag === "timeout") return {
+		ok: false,
+		error: `rpc: evaluate timed out after ${timeoutMs}ms`
+	};
+	const cdpResult = raceResult.v;
 	if (cdpResult.exceptionDetails) {
 		const msg = cdpResult.exceptionDetails.exception?.description ?? cdpResult.exceptionDetails.text ?? "Runtime.evaluate threw an exception";
 		throw new Error(`rpc.injectAndRunBundle: ${msg}`);
@@ -3470,6 +3479,14 @@ async function injectAndRunBundle(connection, bundleCode, timeoutMs = DEFAULT_TI
 //#endregion
 //#region src/test-runner/relay-worker.ts
 /**
+* Sentinel string embedded in the error message by `injectAndRunBundle` when
+* the per-file evaluate race hits the timeout. Used by the retry guard so only
+* genuine timeouts get a second attempt — not bundle errors or parse failures.
+*
+* Exported for unit tests that assert the retry path is taken.
+*/
+const EVALUATE_TIMEOUT_MARKER = "rpc: evaluate timed out after";
+/**
 * Runs all `files` sequentially over the given CDP `connection`.
 *
 * For each file:
@@ -3512,15 +3529,53 @@ async function runTestFilesOverRelay(connection, files, opts) {
 			let fileEntry;
 			try {
 				const { code } = await bundleTestFile(file, opts?.bundleOptions);
-				const rpcResult = await injectAndRunBundle(connection, code, opts?.timeoutMs);
-				if (rpcResult.ok) fileEntry = {
-					file,
-					result: rpcResult.report
-				};
-				else fileEntry = {
-					file,
-					result: { error: rpcResult.error }
+				/**
+				* Runs one evaluate attempt and returns a FileResult, or `null` when the
+				* result is a genuine timeout and the caller should retry.
+				*
+				* We need to distinguish:
+				*   - `rpcResult.ok = false` + timeout error → retry candidate (`return null`)
+				*   - `rpcResult.ok = false` + other error   → final error, no retry
+				*   - `injectAndRunBundle` throws             → CDP exceptionDetails (page
+				*     engine threw); treated as a final (non-retryable) error.
+				*
+				* The Promise.race timeout in rpc.ts RETURNS `{ok:false, error: '…'}` (it
+				* does NOT throw/reject).  Only genuine CDP `exceptionDetails` cause a throw.
+				* This distinction is what makes the EVALUATE_TIMEOUT_MARKER gate below
+				* reachable — the timeout result surfaces as `rpcResult.ok=false` with the
+				* marker string, not as a caught exception.
+				*/
+				const attempt = async () => {
+					let rpcResult;
+					try {
+						rpcResult = await injectAndRunBundle(connection, code, opts?.timeoutMs);
+					} catch (e) {
+						return {
+							file,
+							result: { error: e instanceof Error ? e.message : String(e) }
+						};
+					}
+					if (rpcResult.ok) return {
+						file,
+						result: rpcResult.report
+					};
+					if (rpcResult.error.includes("rpc: evaluate timed out after")) return null;
+					return {
+						file,
+						result: { error: rpcResult.error }
+					};
 				};
+				const firstResult = await attempt();
+				if (firstResult !== null) fileEntry = firstResult;
+				else {
+					process.stderr.write(`relay-worker: evaluate timed out for ${file} — retrying once\n`);
+					const retryResult = await attempt();
+					if (retryResult !== null) fileEntry = retryResult;
+					else fileEntry = {
+						file,
+						result: { error: `${EVALUATE_TIMEOUT_MARKER} ${opts?.timeoutMs ?? 3e4}ms (after retry)` }
+					};
+				}
 			} catch (e) {
 				fileEntry = {
 					file,
@@ -3640,6 +3695,42 @@ EXAMPLE
 
 `.trimStart();
 /**
+* Renders per-file result lines and the aggregate totals line to a string.
+*
+* Each file gets one line:
+*   - Error/timeout:  `FAIL <basename>: <error-class>`
+*   - Pass (0 tests): `OK   <basename>: 0 passed (empty file)`
+*   - Pass:           `OK   <basename>: N passed[, M failed][, K skipped]`
+*
+* The aggregate totals line always follows.
+*
+* SECRET-HANDLING: only `basename(file)` is used — no absolute paths, relay
+* URLs, wss URLs, scheme URLs, or TOTP codes appear in the output. The error
+* string comes from `result.error` which is already secret-free (relay-worker
+* produces only error-class messages like "rpc: evaluate timed out after
+* 30000ms").
+*
+* Exported so unit tests can assert the per-file lines without spawning a
+* subprocess or going through the full relay attach flow.
+*/
+function renderSummary(report) {
+	const lines = [];
+	for (const { file, result } of report.files) {
+		const name = basename(file);
+		if ("error" in result) lines.push(`FAIL ${name}: ${result.error}`);
+		else {
+			const parts = [`${result.passed} passed`];
+			if (result.failed > 0) parts.push(`${result.failed} failed`);
+			if (result.skipped > 0) parts.push(`${result.skipped} skipped`);
+			const suffix = result.passed + result.failed + result.skipped === 0 ? " (empty file)" : "";
+			lines.push(`OK   ${name}: ${parts.join(", ")}${suffix}`);
+		}
+	}
+	const { totals, duration } = report;
+	lines.push(`\ndevtools-test: ${totals.passed} passed, ${totals.failed} failed, ${totals.skipped} skipped (${duration}ms)`);
+	return lines.join("\n");
+}
+/**
 * Runs `files` over `connection` and returns the aggregate report.
 * This pure function is the testable core of the CLI (and is what the
 * `run_tests` MCP tool calls against the daemon's attached connection); it is
@@ -3647,10 +3738,7 @@ EXAMPLE
 */
 async function runWithConnection(connection, files, opts) {
 	const report = await runTestFilesOverRelay(connection, files, opts);
-	if (opts?.printSummary) {
-		const { totals } = report;
-		process.stdout.write(`\ndevtools-test: ${totals.passed} passed, ${totals.failed} failed, ${totals.skipped} skipped (${report.duration}ms)\n`);
-	}
+	if (opts?.printSummary) process.stdout.write(`\n${renderSummary(report)}\n`);
 	return report;
 }
 //#endregion
@@ -6710,7 +6798,7 @@ function createDebugServer(deps) {
 	};
 	const server = new Server({
 		name: "ait-debug",
-		version: "0.1.126"
+		version: "0.1.128"
 	}, { capabilities: { tools: { listChanged: true } } });
 	server.setRequestHandler(ListToolsRequestSchema, () => {
 		const conn = router.active;
@@ -8682,7 +8770,7 @@ function createDevServer(deps = {}) {
 	const aitSource = deps.aitSource ?? new HttpAitSource({ stateEndpoint });
 	const server = new Server({
 		name: "ait-devtools",
-		version: "0.1.126"
+		version: "0.1.128"
 	}, { capabilities: { tools: {} } });
 	server.setRequestHandler(ListToolsRequestSchema, () => ({ tools: DEV_TOOL_DEFINITIONS.map((tool) => ({ ...tool })) }));
 	server.setRequestHandler(CallToolRequestSchema, async (request) => {