@ait-co/devtools 0.1.132 → 0.1.134

package/dist/test-runner/bin.js

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
-import { r as generateTotp } from "../totp-DvOYkYim.js";
+import { m as logInfo } from "../attach-orchestrator-CE0S09YU.js";
+import { r as generateTotp } from "../totp-CZLLKfOC.js";
+import { n as runPermissionPreflight } from "../cell-BIdSQb9T.js";
 import * as path$1 from "node:path";
 import path, { basename, isAbsolute, resolve } from "node:path";
 import { parseArgs } from "node:util";
@@ -117,10 +119,10 @@ function createRelayConnectionFactory(opts) {
 	let manualPrompt = null;
 	return {
 		async open() {
-			const { prepareAttach, renderAndMaybeWait, mintAttachUrl } = await import("../attach-orchestrator-ca34r46y.js");
-			const { injectDebugIndicator, injectGlobals } = await import("../cell-rr6gL9AT.js");
-			const { loadRelaySecretReadOnly } = await import("../relay-secret-store-CFc9n0OA.js");
-			const { bootRelayFamily, buildRelayVerifyAuth } = await import("../debug-server-BBUzxZSf.js");
+			const { prepareAttach, renderAndMaybeWait, mintAttachUrl } = await import("../attach-orchestrator-CE0S09YU.js").then((n) => n.i);
+			const { injectDebugIndicator, injectGlobals } = await import("../cell-BIdSQb9T.js").then((n) => n.t);
+			const { loadRelaySecretReadOnly } = await import("../relay-secret-store-CLEGyHou.js");
+			const { bootRelayFamily, buildRelayVerifyAuth } = await import("../debug-server-DnNCoNiR.js");
 			await loadRelaySecretReadOnly({ projectRoot });
 			let resolveTunnelUp;
 			const tunnelReady = new Promise((resolve) => {
@@ -150,7 +152,7 @@ function createRelayConnectionFactory(opts) {
 				canOpenBrowser: () => !headless
 			};
 			try {
-				const { startQrHttpServer } = await import("../qr-http-server-KB147M-S.js");
+				const { startQrHttpServer } = await import("../qr-http-server-C_DTp9WU.js");
 				const getDashboardState = () => ({
 					tunnel: attachDeps.getTunnelStatus(),
 					pages: null,
@@ -224,7 +226,7 @@ function createRelayConnectionFactory(opts) {
 				qrServer?.notifyStateChange();
 			}
 			try {
-				const { injectDebugIndicator } = await import("../cell-rr6gL9AT.js");
+				const { injectDebugIndicator } = await import("../cell-BIdSQb9T.js").then((n) => n.t);
 				await injectDebugIndicator(connection, { state: "disconnected" });
 			} catch {}
 			family?.stop();
@@ -276,98 +278,6 @@ const RELAY_AUTH_REJECT_CLOSE_CODE = 4401;
 */
 const RELAY_AUTH_REJECT_REASON = "totp-rejected";
 //#endregion
-//#region src/mcp/log.ts
-/**
-* Allowed field keys that may pass through to a log line.
-* Unknown keys are dropped. Values are still redact-scanned.
-*/
-const ALLOWED_KEYS = new Set([
-	"ts",
-	"level",
-	"event",
-	"msg",
-	"port",
-	"totpEnabled",
-	"env",
-	"tool",
-	"deploymentId",
-	"errorKind",
-	"reason",
-	"prevTargetId",
-	"mode",
-	"fileCount",
-	"passed",
-	"failed",
-	"skipped"
-]);
-/**
-* Patterns that match secret values.
-* Match order matters — more-specific patterns first.
-*
-* #268 redact script covers: relay=wss://…, at=<TOTP>, _deploymentId=<uuid>.
-* Here we extend to in-process value-level patterns used in server logs.
-*/
-const SECRET_PATTERNS = [
-	/^\d{6}$/,
-	/^(aitcc_|AITCC_)/i,
-	/^[A-Za-z0-9_-]+=.{4,}/,
-	/^wss:\/\//,
-	/(?:^|[?&])at=[A-Z0-9]{6}/i
-];
-/**
-* Returns `true` when the string value matches any known-secret pattern.
-* Only string values are tested — numbers/booleans are always safe.
-*/
-function isSecretValue(value) {
-	return SECRET_PATTERNS.some((re) => re.test(value));
-}
-/**
-* Redacts a single scalar value.
-* - strings: return "***" if the value matches a secret pattern.
-* - other: return as-is.
-*/
-function redactValue(value) {
-	if (typeof value === "string" && isSecretValue(value)) return "***";
-	return value;
-}
-/**
-* Builds a safe log payload from raw fields.
-*
-* - Only keys in `ALLOWED_KEYS` are included.
-* - String values are scanned for secret patterns and replaced with "***".
-* - `ts` and `level` and `event` are always included (they are injected by the
-*   logger functions below, not by callers).
-*/
-function buildPayload(level, event, fields) {
-	const out = {
-		ts: (/* @__PURE__ */ new Date()).toISOString(),
-		level,
-		event
-	};
-	for (const [key, value] of Object.entries(fields)) {
-		if (!ALLOWED_KEYS.has(key)) continue;
-		if (key === "ts" || key === "level" || key === "event") continue;
-		out[key] = redactValue(value);
-	}
-	return out;
-}
-/**
-* Writes a single JSON log line to stderr.
-* MCP stdio transport uses stdout; all diagnostics go to stderr.
-*/
-function writeLog(level, event, fields = {}) {
-	const payload = buildPayload(level, event, fields);
-	process.stderr.write(`${JSON.stringify(payload)}\n`);
-}
-/** Log an informational structured event. */
-function logInfo(event, fields = {}) {
-	writeLog("info", event, fields);
-}
-/** Log an error structured event. */
-function logError(event, fields = {}) {
-	writeLog("error", event, fields);
-}
-//#endregion
 //#region src/mcp/chii-connection.ts
 /**
 * Production `CdpConnection` backed by the local Chii relay.
@@ -682,9 +592,13 @@ var ChiiCdpConnection = class {
 	/**
 	* Issue a CDP command and resolve with its result (Phase 2). Rejects on a CDP
 	* error frame or when no websocket is open (no page attached yet).
+	*
+	* @param opts.timeoutMs - Per-call override for this connection's command
+	*   watchdog (devtools#747) — see the `CdpConnection.send` docblock for the
+	*   contract callers racing their own longer timeout must follow.
 	*/
-	send(method, params) {
-		return this.sendCommand(method, params ?? {});
+	send(method, params, opts) {
+		return this.sendCommand(method, params ?? {}, opts);
 	}
 	/**
 	* Issue an arbitrary request→response command over the relay and resolve with
@@ -695,16 +609,22 @@ var ChiiCdpConnection = class {
 	* auto-reconnect). Caller should re-run `list_pages` or `enableDomains` to
 	* reattach.
 	*
-	* Times out after `commandTimeoutMs` (default 30s, env
-	* `AIT_CDP_COMMAND_TIMEOUT_MS`). On timeout the pending entry is cleaned up
-	* and the promise rejects with a descriptive Korean error.
+	* Times out after `opts.timeoutMs` when given, else `commandTimeoutMs`
+	* (default 30s, env `AIT_CDP_COMMAND_TIMEOUT_MS`) — see devtools#747: the
+	* default 30s watchdog used to undercut the test-runner's own longer
+	* file-evaluate race no matter what `--timeout` the caller asked for. On
+	* timeout the pending entry is cleaned up and the promise rejects with a
+	* descriptive Korean error. `Number.isFinite` guards against a non-finite
+	* override (e.g. `Infinity`, mirroring `waitForFirstTarget`'s convention)
+	* so an intentional "no watchdog" override doesn't get clamped by
+	* `setTimeout`.
 	*/
-	sendCommand(method, params = {}) {
+	sendCommand(method, params = {}, opts) {
 		if (this.connectionState === "disconnected") return Promise.reject(/* @__PURE__ */ new Error(`relay에 연결되어 있지 않습니다 (${method}). list_pages로 attach 상태를 확인하고 enableDomains()로 재연결하세요.`));
 		if (!this.ws || this.ws.readyState !== WebSocket.OPEN) return Promise.reject(/* @__PURE__ */ new Error("No mini-app page attached to the Chii relay yet. Call enableDomains() first."));
 		const id = this.nextCommandId++;
 		const ws = this.ws;
-		const timeoutMs = this.commandTimeoutMs;
+		const timeoutMs = opts?.timeoutMs !== void 0 && Number.isFinite(opts.timeoutMs) && opts.timeoutMs > 0 ? opts.timeoutMs : this.commandTimeoutMs;
 		return new Promise((resolve, reject) => {
 			const handle = setTimeout(() => {
 				this.pending.delete(id);
@@ -1289,6 +1209,14 @@ function parseCaptureLines(raw) {
 /** Maximum milliseconds to wait for a single evaluate round-trip. */
 const DEFAULT_TIMEOUT_MS = 6e4;
 /**
+* Extra headroom (ms) added on top of the rpc-level `timeoutMs` when telling
+* the underlying `CdpConnection` its per-command watchdog budget (devtools#747).
+* The rpc-level race above is the authoritative file timeout — this margin
+* only ensures the connection's own (shorter-by-default) watchdog never fires
+* first and masks the rpc-level timeout error with a connection-level one.
+*/
+const CONNECTION_TIMEOUT_MARGIN_MS = 5e3;
+/**
 * Wraps bundle code in a self-executing IIFE that:
 *   1. Evaluates the bundle (registering describe/it/test).
 *   2. Calls `__testBundle.runTestModule(...)` — the entry the runtime exports.
@@ -1335,12 +1263,15 @@ function parseRunTestsResult(rawValue) {
 * Injects `bundleCode` into the attached page and awaits test execution.
 *
 * Uses `Runtime.evaluate` with `awaitPromise: true` to wait for the
-* async IIFE to settle.  The 30-second CDP command timeout covers even
-* long-running test suites; split into smaller files if you hit it.
+* async IIFE to settle. `timeoutMs` (default 60s) is the authoritative file
+* timeout — this function races it against the evaluate call AND (devtools#747)
+* threads it down to the underlying `CdpConnection`'s own per-command watchdog
+* (plus a small margin) so that watchdog can never undercut this race. Split
+* into smaller files if you hit the timeout.
 *
 * @param connection   - Active CDP connection (relay or local).
 * @param bundleCode   - IIFE bundle string from `bundleTestFile`.
-* @param timeoutMs    - Override the default 30 s timeout.
+* @param timeoutMs    - Override the default 60 s timeout.
 *
 * SECRET-HANDLING: `bundleCode` and the raw CDP result value are never logged.
 */
@@ -1352,7 +1283,7 @@ async function injectAndRunBundle(connection, bundleCode, timeoutMs = DEFAULT_TI
 		expression,
 		returnByValue: true,
 		awaitPromise: true
-	});
+	}, { timeoutMs: timeoutMs + CONNECTION_TIMEOUT_MARGIN_MS });
 	const raceResult = await Promise.race([evalPromise.then((v) => ({
 		tag: "eval",
 		v
@@ -1451,6 +1382,8 @@ async function runTestFilesOverRelay(connection, files, opts) {
 	const manualFiles = opts?.manualFiles;
 	const manualTotal = manualFiles?.size ?? 0;
 	let manualIndex = 0;
+	let preflightPermissions;
+	if (files.length > 0) preflightPermissions = await runPermissionPreflight(connection);
 	try {
 		for (const file of files) {
 			if (pendingReconnectCheck) {
@@ -1553,7 +1486,8 @@ async function runTestFilesOverRelay(connection, files, opts) {
 		duration: Date.now() - wallStart,
 		files: fileResults,
 		totals,
-		captures
+		captures,
+		...preflightPermissions ? { preflight: { permissions: preflightPermissions } } : {}
 	};
 }
 /**
@@ -1636,6 +1570,7 @@ function serializeRelayReport(report, meta) {
 		startedAt: report.startedAt,
 		duration: report.duration,
 		totals: report.totals,
+		...report.preflight ? { preflight: report.preflight } : {},
 		files: report.files.map((f) => {
 			const file = relativise(meta.projectRoot, f.file);
 			const modeField = f.mode === "manual" ? { mode: "manual" } : {};
@@ -2106,6 +2041,6 @@ main().catch((e) => {
 	process.exitCode = 1;
 });
 //#endregion
-export { RELAY_AUTH_REJECT_REASON as a, RELAY_AUTH_REJECT_CLOSE_CODE as i, logError as n, logInfo as r, ChiiCdpConnection as t };
+export { RELAY_AUTH_REJECT_CLOSE_CODE as n, RELAY_AUTH_REJECT_REASON as r, ChiiCdpConnection as t };
 
 //# sourceMappingURL=bin.js.map