@mgcrea/mcp-ios-simulator 0.3.1 → 0.4.1

package/dist/cli.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
-import { N as BUILD_INFO, a as createServer, n as loadConfig, t as defaultConfigPath } from "./config-D0JgmT_U.js";
+import { N as BUILD_INFO, a as createServer, n as loadConfig, t as defaultConfigPath } from "./config-SdCcoXC3.js";
 import { ZodError } from "zod";
 import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
-//#region src/cli.ts
+// src/cli.ts
 const stderrLogger = {
 	debug: (...args) => {
 		if (process.env.IOS_SIMULATOR_DEBUG) console.error("[ios-simulator-mcp]", ...args);
@@ -41,7 +41,6 @@ main().catch((err) => {
 	console.error(`[ios-simulator-mcp] fatal: ${describeFatal(err)}`);
 	process.exit(1);
 });
-//#endregion
 export {};
 
 //# sourceMappingURL=cli.js.map

package/dist/{config-D0JgmT_U.js → config-SdCcoXC3.js}

@@ -1,13 +1,13 @@
 import { McpServer } from "@modelcontextprotocol/server";
-import { readFileSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
-import { CommandError, CommandTimeoutError, DEFAULT_CRASH_KINDS, IosError, IosError as IosError$1, ToolchainError, WdaClient, WdaError, WdaUnavailableError, assertNoShellMetachars, crashKind, crashProcessName, createArgs, createExec, readLogFile, registerInputTools, registerScreenTools, summarizeCrashReport, wrap } from "@mgcrea/mcp-ios-core";
+import { CommandError, CommandError as CommandError$1, CommandTimeoutError, DEFAULT_CRASH_KINDS, IosError, IosError as IosError$1, ToolchainError, WdaClient, WdaError, WdaUnavailableError, assertNoShellMetachars, crashKind, crashProcessName, createArgs, createExec, readLogFile, registerInputTools, registerScreenTools, summarizeCrashReport, wrap } from "@mgcrea/mcp-ios-core";
 import { mkdir, mkdtemp, open, readFile, readdir, rm, stat, writeFile } from "node:fs/promises";
 import { homedir, tmpdir } from "node:os";
 import { z } from "zod";
 import { spawn } from "node:child_process";
 import { fileURLToPath } from "node:url";
-//#region src/build-info.ts
+// src/build-info.ts
 const readPackageJson = () => {
 	try {
 		const pkgUrl = new URL("../package.json", import.meta.url);
@@ -23,11 +23,10 @@ const pkg = readPackageJson();
 const BUILD_INFO = {
 	name: pkg.name,
 	version: pkg.version,
-	gitCommit: "b6a6636",
-	gitCommitDate: "2026-10-08T23:42:11+02:00"
+	gitCommit: "6789bb6",
+	gitCommitDate: "2026-11-04T10:23:19+01:00"
 };
-//#endregion
-//#region src/client/errors.ts
+// src/client/errors.ts
 /** Raising the budget, or noticing the simulator died mid-call. */
 const TIMEOUT_REMEDY = "Raise IOS_SIMULATOR_TIMEOUT_MS if this is a slow operation (a boot or a large `install` genuinely takes tens of seconds), or check the simulator is still booted.";
 const TOOLCHAIN_REMEDY = "Install Xcode and run `xcode-select --install`, or point IOS_SIMULATOR_XCRUN_PATH at a different xcrun.";
@@ -99,8 +98,7 @@ var WritesDisabledError = class extends IosError {
 };
 /** A shut-down simulator captures nothing, and that is the usual cause here. */
 const EMPTY_SCREENSHOT_REMEDY = "The simulator produced an empty capture. Check it is actually booted with ios_simulator_diagnostics, and that its runtime is installed.";
-//#endregion
-//#region src/client/display.ts
+// src/client/display.ts
 /**
 * Screen geometry for a simulator, which has no `devicectl device info displays`.
 *
@@ -191,10 +189,11 @@ const pngDimensions = (png) => {
 * screen, so mapping it would be a lie.
 */
 const toDisplayInfo = (profile, capture) => {
-	const scale = profile.mainScreenScale ?? 1;
+	const scale = profile.mainScreenScale;
 	const pixelWidth = capture?.width ?? profile.mainScreenWidth;
 	const pixelHeight = capture?.height ?? profile.mainScreenHeight;
 	if (!pixelWidth || !pixelHeight) throw new IosError$1("Could not determine the simulator's screen geometry.", { remedy: "The device type's profile.plist could not be read and no screenshot was available. Run ios_simulator_diagnostics — an unavailable runtime is the usual cause." });
+	if (!scale) throw new IosError$1("Could not determine the simulator's screen scale.", { remedy: "The device type's profile.plist could not be read, so points cannot be told from pixels. Run ios_simulator_diagnostics — an unavailable runtime is the usual cause." });
 	const landscape = profile.mainScreenWidth !== void 0 && profile.mainScreenHeight !== void 0 ? pixelWidth > pixelHeight && profile.mainScreenWidth < profile.mainScreenHeight : pixelWidth > pixelHeight;
 	return {
 		pixelWidth,
@@ -205,8 +204,7 @@ const toDisplayInfo = (profile, capture) => {
 		orientation: capture ? landscape ? "landscape" : "portrait" : "unknown"
 	};
 };
-//#endregion
-//#region src/client/logs.ts
+// src/client/logs.ts
 const defaultProcessAlive = (pid) => {
 	try {
 		process.kill(pid, 0);
@@ -251,8 +249,7 @@ var LaunchCaptures = class {
 };
 /** True when `path` exists on this Mac. */
 const exists = async (path) => stat(path).then(() => true, () => false);
-//#endregion
-//#region src/client/shape.ts
+// src/client/shape.ts
 /**
 * Flatten the runtime-keyed map `list devices` returns.
 *
@@ -307,8 +304,7 @@ const toListRow = (sim) => ({
 	...sim.available ? {} : { available: false },
 	...sim.unavailableReason ? { unavailableReason: sim.unavailableReason } : {}
 });
-//#endregion
-//#region src/client/simctl.ts
+// src/client/simctl.ts
 /**
 * Pull the human sentence out of a CoreSimulator error envelope.
 *
@@ -353,11 +349,23 @@ const remedyFor = (stderr) => {
 const assertNotBulkTarget = (udid) => {
 	if (udid === "all" || udid === "unavailable" || udid === "booted") throw new IosError$1(`Refusing to pass "${udid}" to simctl as a device.`, { remedy: "simctl reads these as *every* matching simulator, so `erase all` would wipe the machine. Resolve to one concrete UDID with ios_simulator_list first." });
 };
+/**
+* `io … screenshot` refusing to pick between a multi-display device's screens.
+* Matched on simctl's own words rather than exit 22 alone, which is just
+* EINVAL and covers any malformed argument.
+*/
+const isAmbiguousDisplay = (err) => err instanceof CommandError && /Cannot choose between \d+ displays/.test(`${String(err.details ?? "")}\n${err.message}`);
 var Simctl = class {
 	opts;
 	exec;
 	/** Device types change only when Xcode is updated; re-reading is pure cost. */
 	deviceTypes;
+	/**
+	* Read once, like device types: both change only when Xcode or a runtime is
+	* installed, and every tool call resolves a simulator. The cost is that a
+	* runtime added or deleted while this server runs is seen after a restart.
+	*/
+	runtimes;
 	constructor(opts) {
 		this.opts = opts;
 		this.exec = opts.exec ?? createExec({
@@ -367,9 +375,9 @@ var Simctl = class {
 		});
 	}
 	/** Raw stdout, for the subcommands that answer in prose. */
-	async run(args) {
+	async run(args, timeoutMs = this.opts.timeoutMs) {
 		this.opts.logger?.debug?.("simctl", ...args);
-		const { stdout } = await this.exec(this.opts.xcrunPath, ["simctl", ...args], this.opts.timeoutMs);
+		const { stdout } = await this.exec(this.opts.xcrunPath, ["simctl", ...args], timeoutMs);
 		return stdout;
 	}
 	/**
@@ -426,7 +434,8 @@ var Simctl = class {
 		return (await this.runJson(["list", "devices"])).devices ?? {};
 	}
 	async listRuntimes() {
-		return (await this.runJson(["list", "runtimes"])).runtimes ?? [];
+		this.runtimes ??= (await this.runJson(["list", "runtimes"])).runtimes ?? [];
+		return this.runtimes;
 	}
 	async listDeviceTypes() {
 		this.deviceTypes ??= (await this.runJson(["list", "devicetypes"])).devicetypes ?? [];
@@ -436,6 +445,16 @@ var Simctl = class {
 		assertNotBulkTarget(udid);
 		await this.run(["boot", udid]);
 	}
+	/**
+	* Wait until a booting simulator has finished, or `timeoutMs` passes (a
+	* `CommandTimeoutError`). Not the state in `list`: measured on an iOS 27.0
+	* runtime, that reads "Booted" 0.4s after `boot` returns, while this returns
+	* 17s later, once the system is up.
+	*/
+	async bootstatus(udid, timeoutMs) {
+		assertNotBulkTarget(udid);
+		await this.run(["bootstatus", udid], timeoutMs);
+	}
 	async shutdown(udid) {
 		assertNotBulkTarget(udid);
 		await this.run(["shutdown", udid]);
@@ -580,19 +599,42 @@ var Simctl = class {
 	*
 	* A successful capture also writes a `Note: No display specified…` line to
 	* stderr, so non-empty stderr is not a failure here.
+	*
+	* A device with two displays — the iPhone Duo, iOS 27.1 runtime — makes the
+	* bare call fail outright: exit 22, "Cannot choose between 2 displays.
+	* Specify one with --display". Only then is it retried on `--display=primary`,
+	* so a single-display simulator and Xcode 26 never see the flag. Primary
+	* rather than whichever is lit, because it is the display WebDriverAgent
+	* addresses when no `currentDisplayId` is set: a capture of the other one
+	* would put every tap read off it in the wrong coordinate space. On an open
+	* Duo that display is black (appium/appium-xcuitest-driver#3012); driving
+	* the inner one means selecting it in WDA too, which nothing here does yet.
+	* The `internal` alias the help text offers fails on the Duo with exit 22.
 	*/
 	async screenshotPng(udid) {
 		assertNotBulkTarget(udid);
 		const dir = await mkdtemp(join(tmpdir(), "simshot-"));
 		const path = join(dir, "shot.png");
 		try {
-			await this.run([
-				"io",
-				udid,
-				"screenshot",
-				"--type=png",
-				path
-			]);
+			try {
+				await this.run([
+					"io",
+					udid,
+					"screenshot",
+					"--type=png",
+					path
+				]);
+			} catch (err) {
+				if (!isAmbiguousDisplay(err)) throw err;
+				await this.run([
+					"io",
+					udid,
+					"screenshot",
+					"--type=png",
+					"--display=primary",
+					path
+				]);
+			}
 			return (await readFile(path)).toString("base64");
 		} finally {
 			await rm(dir, {
@@ -702,8 +744,7 @@ var Simctl = class {
 		}
 	}
 };
-//#endregion
-//#region src/client/simulator.ts
+// src/client/simulator.ts
 /**
 * What to say when WebDriverAgent fails, on a simulator.
 *
@@ -767,6 +808,13 @@ var SimulatorClient = class {
 		return simulators;
 	}
 	/**
+	* Drop the cached list. Called after a tool changes a simulator's state, so
+	* the next call within the cache window does not act on the state before it.
+	*/
+	forgetSimulators() {
+		this.cache = void 0;
+	}
+	/**
 	* Resolve a hint to exactly one simulator, or refuse.
 	*
 	* The device server's rule — never guess between two — transfers, but
@@ -835,7 +883,7 @@ var SimulatorClient = class {
 				exec: this.exec,
 				timeoutMs: this.execTimeoutMs
 			}) : {};
-			if (id) this.profiles.set(id, profile);
+			if (id && profile.mainScreenScale !== void 0) this.profiles.set(id, profile);
 		}
 		const capture = capturePng ? pngDimensions(Buffer.from(capturePng, "base64")) : void 0;
 		return toDisplayInfo(profile, capture);
@@ -894,6 +942,10 @@ var SimulatorClient = class {
 	wdaUrl() {
 		return this.opts.wdaUrl ?? `http://127.0.0.1:${this.opts.wdaPort}`;
 	}
+	/** The simulator `resolveTarget` falls back to when no hint is given. */
+	get defaultSimulatorId() {
+		return this.opts.defaultSimulatorId;
+	}
 	get wdaPort() {
 		return this.opts.wdaPort;
 	}
@@ -912,8 +964,7 @@ var SimulatorClient = class {
 		return client;
 	}
 };
-//#endregion
-//#region src/tools/util.ts
+// src/tools/util.ts
 /**
 * How the shared tools name themselves and each other in this server.
 *
@@ -944,8 +995,7 @@ const { bundleIdArg, confirmArg, detailArg, screenshotArg, settleArg, xArg, yArg
 * worse than either alone.
 */
 const deviceArg = args.targetArg;
-//#endregion
-//#region src/tools/apps.ts
+// src/tools/apps.ts
 /** `io.mgcrea.Canopy: 12345` is the whole of what `simctl launch` prints. */
 const parsePid = (output) => {
 	const pid = /:\s*(\d+)\s*$/.exec(output.trim())?.[1];
@@ -1130,8 +1180,7 @@ const registerAppTools = (server, client, launchArgs, outputDir) => {
 		return { opened: url };
 	}));
 };
-//#endregion
-//#region src/tools/diagnostics.ts
+// src/tools/diagnostics.ts
 /**
 * Which simulator owns the WebDriverAgent port.
 *
@@ -1219,7 +1268,7 @@ const diagnose = async (client, ctx, deviceHint) => {
 	try {
 		target = await client.resolveTarget(deviceHint);
 	} catch (err) {
-		if (booted.length > 0) {
+		if (booted.length > 0 || (deviceHint ?? client.defaultSimulatorId) !== void 0) {
 			problems.push(err instanceof Error ? err.message : String(err));
 			const remedy = err.remedy;
 			if (remedy) nextSteps.push(remedy);
@@ -1289,8 +1338,7 @@ const registerDiagnosticsTools = (server, client, ctx) => {
 		text: JSON.stringify(await diagnose(client, ctx))
 	}] }));
 };
-//#endregion
-//#region src/tools/environment.ts
+// src/tools/environment.ts
 /** simctl's own list, verbatim — a value it does not accept is not worth guessing at. */
 const PRIVACY_SERVICES = [
 	"all",
@@ -1366,6 +1414,26 @@ const registerEnvironmentTools = (server, client) => {
 		}
 	}, async ({ device, appearance, content_size, increase_contrast, status_bar, clear_status_bar, location, clear_location, permission }) => wrap(async () => {
 		const target = client.requireBooted(await client.resolveTarget(device));
+		const statusBarFlags = status_bar ? [
+			...status_bar.time ? ["--time", status_bar.time] : [],
+			...status_bar.wifi_bars !== void 0 ? [
+				"--wifiMode",
+				"active",
+				"--wifiBars",
+				String(status_bar.wifi_bars)
+			] : [],
+			...status_bar.cellular_bars !== void 0 ? [
+				"--cellularMode",
+				"active",
+				"--cellularBars",
+				String(status_bar.cellular_bars)
+			] : [],
+			...status_bar.operator_name !== void 0 ? ["--operatorName", status_bar.operator_name] : [],
+			...status_bar.battery_level !== void 0 ? ["--batteryLevel", String(status_bar.battery_level)] : [],
+			...status_bar.battery_state ? ["--batteryState", status_bar.battery_state] : []
+		] : [];
+		if (status_bar && statusBarFlags.length === 0) throw new IosError$1("`status_bar` was given with no fields to override.", { remedy: "Set at least one field, or use `clear_status_bar` to drop the overrides." });
+		if (permission && permission.action !== "reset" && !permission.bundle_id) throw new IosError$1(`\`${permission.action}\` needs a bundle_id.`, { remedy: "Pass the app's bundle id, or use `reset`, which does not need one." });
 		const applied = [];
 		if (appearance) {
 			await client.simctl.uiSet(target.id, "appearance", appearance);
@@ -1384,26 +1452,7 @@ const registerEnvironmentTools = (server, client) => {
 			applied.push("status_bar cleared");
 		}
 		if (status_bar) {
-			const flags = [
-				...status_bar.time ? ["--time", status_bar.time] : [],
-				...status_bar.wifi_bars !== void 0 ? [
-					"--wifiMode",
-					"active",
-					"--wifiBars",
-					String(status_bar.wifi_bars)
-				] : [],
-				...status_bar.cellular_bars !== void 0 ? [
-					"--cellularMode",
-					"active",
-					"--cellularBars",
-					String(status_bar.cellular_bars)
-				] : [],
-				...status_bar.operator_name !== void 0 ? ["--operatorName", status_bar.operator_name] : [],
-				...status_bar.battery_level !== void 0 ? ["--batteryLevel", String(status_bar.battery_level)] : [],
-				...status_bar.battery_state ? ["--batteryState", status_bar.battery_state] : []
-			];
-			if (flags.length === 0) throw new IosError$1("`status_bar` was given with no fields to override.", { remedy: "Set at least one field, or use `clear_status_bar` to drop the overrides." });
-			await client.simctl.statusBarOverride(target.id, flags);
+			await client.simctl.statusBarOverride(target.id, statusBarFlags);
 			applied.push("status_bar overridden");
 		}
 		if (clear_location) {
@@ -1415,17 +1464,21 @@ const registerEnvironmentTools = (server, client) => {
 			applied.push(`location=${location.latitude},${location.longitude}`);
 		}
 		if (permission) {
-			if (permission.action !== "reset" && !permission.bundle_id) throw new IosError$1(`\`${permission.action}\` needs a bundle_id.`, { remedy: "Pass the app's bundle id, or use `reset`, which does not need one." });
 			await client.simctl.privacy(target.id, permission.action, permission.service, permission.bundle_id);
 			applied.push(`permission ${permission.action} ${permission.service}`);
 		}
 		if (applied.length === 0) throw new IosError$1("Nothing to do — no field was given.", { remedy: "Set at least one of appearance, content_size, status_bar, location, permission." });
+		const [appearanceNow, contentSize, statusBar] = await Promise.all([
+			client.simctl.uiGet(target.id, "appearance"),
+			client.simctl.uiGet(target.id, "content_size"),
+			client.simctl.statusBarList(target.id)
+		]);
 		return {
 			applied,
 			state: {
-				appearance: await client.simctl.uiGet(target.id, "appearance"),
-				contentSize: await client.simctl.uiGet(target.id, "content_size"),
-				statusBar: await client.simctl.statusBarList(target.id)
+				appearance: appearanceNow,
+				contentSize,
+				statusBar
 			}
 		};
 	}));
@@ -1475,11 +1528,7 @@ const registerEnvironmentTools = (server, client) => {
 		};
 	}));
 };
-//#endregion
-//#region src/tools/lifecycle.ts
-/** Booting is slow and visible; this is how long `power` waits to see it land. */
-const BOOT_POLL_MS = 500;
-const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+// src/tools/lifecycle.ts
 const registerListTool = (server, client) => {
 	server.registerTool("ios_simulator_list", {
 		title: "iOS Simulator: List",
@@ -1524,13 +1573,14 @@ const registerLifecycleTools = (server, client) => {
 	}, async ({ device, state, open_window, wait_ms }) => wrap(async () => {
 		const target = await client.resolveTarget(device);
 		if (state === "shutdown") {
-			if (target.state !== "Booted") return {
+			if (target.state === "Shutdown") return {
 				udid: target.id,
 				name: target.name,
 				state: "Shutdown",
 				alreadyThere: true
 			};
 			await client.simctl.shutdown(target.id);
+			client.forgetSimulators();
 			return {
 				udid: target.id,
 				name: target.name,
@@ -1538,7 +1588,10 @@ const registerLifecycleTools = (server, client) => {
 			};
 		}
 		const already = target.state === "Booted";
-		if (!already) await client.simctl.boot(target.id);
+		if (!already) {
+			await client.simctl.boot(target.id);
+			client.forgetSimulators();
+		}
 		let windowWarning;
 		let windowNote;
 		if (open_window) await client.simctl.openApp(client.openPath).then((app) => {
@@ -1546,20 +1599,22 @@ const registerLifecycleTools = (server, client) => {
 		}).catch((err) => {
 			windowWarning = `Booted, but no window could be opened: ${err instanceof Error ? err.message : String(err)}`;
 		});
-		const deadline = Date.now() + wait_ms;
-		let observed = target.state;
-		while (Date.now() < deadline) {
-			observed = (await client.listSimulators({ fresh: true })).find((sim) => sim.id === target.id)?.state ?? observed;
-			if (observed === "Booted") break;
-			await sleep(BOOT_POLL_MS);
+		let ready = already;
+		let waitWarning = `Not waited for, since wait_ms is 0: it may still be starting up.`;
+		if (!already && wait_ms > 0) try {
+			await client.simctl.bootstatus(target.id, wait_ms);
+			ready = true;
+		} catch (err) {
+			waitWarning = err instanceof CommandTimeoutError ? `Not finished booting after ${wait_ms}ms. Raise wait_ms, or check Xcode.` : `Booted, but could not confirm it finished: ${err instanceof Error ? err.message : String(err)}`;
 		}
+		const observed = Object.values(await client.simctl.listDevices()).flat().find((sim) => sim.udid === target.id)?.state ?? target.state;
 		return {
 			udid: target.id,
 			name: target.name,
 			state: observed,
 			...already ? { alreadyThere: true } : {},
 			...windowNote ? { note: windowNote } : {},
-			...observed === "Booted" ? windowWarning ? { warning: windowWarning } : {} : { warning: `Still ${observed} after ${wait_ms}ms. Raise wait_ms, or check Xcode.` }
+			...ready ? windowWarning ? { warning: windowWarning } : {} : { warning: waitWarning }
 		};
 	}));
 	server.registerTool("ios_simulator_erase", {
@@ -1580,6 +1635,7 @@ const registerLifecycleTools = (server, client) => {
 		if (wasBooted) await client.simctl.shutdown(target.id);
 		await client.simctl.erase(target.id);
 		if (wasBooted) await client.simctl.boot(target.id);
+		client.forgetSimulators();
 		return {
 			udid: target.id,
 			name: target.name,
@@ -1588,8 +1644,7 @@ const registerLifecycleTools = (server, client) => {
 		};
 	}));
 };
-//#endregion
-//#region src/client/crash.ts
+// src/client/crash.ts
 /**
 * Simulator crash reports, out of this Mac's own DiagnosticReports.
 *
@@ -1660,6 +1715,13 @@ const listIps = async (dir) => {
 	return [...top.filter((name) => name.endsWith(".ips")), ...retired.filter((name) => name.endsWith(".ips")).map((name) => `Retired/${name}`)];
 };
 /**
+* What each report's head said, by path; `null` for one that is not from a
+* simulator. A written `.ips` never changes and its name carries a timestamp,
+* so after the first list only new reports cost a read. A Mac with Xcode
+* holds hundreds of them, and every list used to open each one.
+*/
+const scanned = /* @__PURE__ */ new Map();
+/**
 * Every simulator report in `dir`, newest first. Reads the first 8 KB of each
 * `.ips`, never the whole file, except to find the UDID in the rare report
 * whose `coalitionName` did not fit in that.
@@ -1670,12 +1732,18 @@ const listSimulatorCrashReports = async (dir) => {
 	for (let i = 0; i < names.length; i += CONCURRENCY) {
 		const batch = await Promise.all(names.slice(i, i + CONCURRENCY).map(async (name) => {
 			const path = join(dir, name);
+			const known = scanned.get(path);
+			if (known !== void 0) return known ?? void 0;
 			const head = await readHead(path).catch(() => "");
 			const header = parseHeader(head);
-			if (!header || !SIMULATOR_PLATFORMS.has(Number(header.platform))) return void 0;
+			if (!header) return void 0;
+			if (!SIMULATOR_PLATFORMS.has(Number(header.platform))) {
+				scanned.set(path, null);
+				return;
+			}
 			let udid = COALITION.exec(head)?.[1];
 			if (!udid) udid = COALITION.exec(await readFile(path, "utf8").catch(() => ""))?.[1];
-			return {
+			const row = {
 				name,
 				process: header.app_name || header.name || crashProcessName(name),
 				bundleId: header.bundleID,
@@ -1683,6 +1751,8 @@ const listSimulatorCrashReports = async (dir) => {
 				timestamp: header.timestamp,
 				udid: udid?.toUpperCase()
 			};
+			scanned.set(path, row);
+			return row;
 		}));
 		for (const row of batch) if (row) rows.push(row);
 	}
@@ -1707,8 +1777,7 @@ const isSimulatorReport = (text) => {
 };
 /** The simulator a full report came from, when its body says. */
 const reportUdid = (text) => COALITION.exec(text)?.[1]?.toUpperCase();
-//#endregion
-//#region src/tools/logs.ts
+// src/tools/logs.ts
 /** UDID → name, for labelling reports. Best effort: a Mac with no Xcode still has reports. */
 const simulatorNames = async (client) => {
 	try {
@@ -1738,8 +1807,8 @@ const registerCrashLogTools = (server, client, ctx) => {
 		const target = device ? await client.resolveTarget(device) : void 0;
 		const wanted = kinds ?? DEFAULT_CRASH_KINDS;
 		const needle = process?.toLowerCase();
-		const matching = (await listSimulatorCrashReports(dir)).filter((report) => (!target || report.udid === target.id.toUpperCase()) && (wanted.includes("all") || wanted.includes(report.kind)) && (!needle || report.process.toLowerCase().includes(needle) || (report.bundleId?.toLowerCase().includes(needle) ?? false)));
-		const names = target ? void 0 : await simulatorNames(client);
+		const [all, names] = await Promise.all([listSimulatorCrashReports(dir), target ? void 0 : simulatorNames(client)]);
+		const matching = all.filter((report) => (!target || report.udid === target.id.toUpperCase()) && (wanted.includes("all") || wanted.includes(report.kind)) && (!needle || report.process.toLowerCase().includes(needle) || (report.bundleId?.toLowerCase().includes(needle) ?? false)));
 		return {
 			...target ? {
 				simulator: target.name,
@@ -1829,8 +1898,7 @@ const registerLogReadTools = (server, client) => {
 		};
 	}));
 };
-//#endregion
-//#region src/tools/runner.ts
+// src/tools/runner.ts
 const defaultSpawnRunner = async (command, args, { env, logPath }) => {
 	await mkdir(dirname(logPath), { recursive: true });
 	const log = await open(logPath, "a");
@@ -1852,9 +1920,22 @@ const defaultSpawnRunner = async (command, args, { env, logPath }) => {
 };
 const scriptPath = () => {
 	const here = dirname(fileURLToPath(import.meta.url));
-	for (const candidate of [join(here, "..", "scripts", "wda.sh"), join(here, "..", "..", "scripts", "wda.sh")]) return candidate;
+	for (const candidate of [join(here, "..", "scripts", "wda.sh"), join(here, "..", "..", "scripts", "wda.sh")]) if (existsSync(candidate)) return candidate;
 	throw new IosError$1("Could not find `scripts/wda.sh` beside this module.");
 };
+/**
+* Whether `wda.sh run` has anything to run: the same directory and glob it
+* looks in. Without a build it exits with "no build found" into a log nobody
+* reads, while a detached spawn has already been reported as started.
+*/
+const runnerBuilt = async () => {
+	const wdaDir = process.env["WDA_DIR"] || join(homedir(), ".cache", "mcp-ios-simulator", "WebDriverAgent");
+	const products = join(wdaDir, ".build", "Build", "Products");
+	return {
+		built: (await readdir(products).catch(() => [])).some((name) => name.startsWith("WebDriverAgentRunner_iphonesimulator") && name.endsWith(".xctestrun")),
+		products
+	};
+};
 const registerRunnerTools = (server, client, outputDir, spawnRunner = defaultSpawnRunner) => {
 	server.registerTool("ios_simulator_restart_wda", {
 		title: "iOS Simulator: Restart WebDriverAgent",
@@ -1871,12 +1952,16 @@ const registerRunnerTools = (server, client, outputDir, spawnRunner = defaultSpa
 	}, async ({ device, port }) => wrap(async () => {
 		const target = client.requireBooted(await client.resolveTarget(device));
 		const usePort = port ?? client.wdaPort;
+		const { built, products } = await runnerBuilt();
+		if (!built) throw new IosError$1(`No WebDriverAgent build in ${products}, so there is nothing to start.`, { remedy: "Build it once with `scripts/wda.sh setup` (or `npx -p @mgcrea/mcp-ios-simulator ios-simulator-wda setup` from an npm install), then call ios_simulator_restart_wda again." });
 		const logPath = join(outputDir, "wda.log");
 		const pid = await spawnRunner("/bin/bash", [scriptPath(), "run"], {
 			env: {
 				IOS_SIMULATOR_ID: target.id,
 				IOS_SIMULATOR_WDA_PORT: String(usePort),
-				USE_PORT: String(usePort)
+				USE_PORT: String(usePort),
+				NODE: process.execPath,
+				PATH: `${dirname(process.execPath)}:${process.env["PATH"] ?? ""}`
 			},
 			logPath
 		});
@@ -1891,8 +1976,7 @@ const registerRunnerTools = (server, client, outputDir, spawnRunner = defaultSpa
 		};
 	}));
 };
-//#endregion
-//#region src/tools/index.ts
+// src/tools/index.ts
 /**
 * All capability decisions in one place, so "why can't I call that" is answered
 * by one file.
@@ -1943,8 +2027,7 @@ const registerTools = (server, client, ctx, spawnRunner) => {
 	registerEnvironmentTools(server, client);
 	registerRunnerTools(server, client, ctx.config.outputDir, spawnRunner);
 };
-//#endregion
-//#region src/server.ts
+// src/server.ts
 const SERVER_NAME = BUILD_INFO.name;
 const SERVER_VERSION = BUILD_INFO.version;
 /**
@@ -1985,8 +2068,7 @@ const createServer = (opts) => {
 		client
 	};
 };
-//#endregion
-//#region src/config.ts
+// src/config.ts
 /**
 * There are no credentials here, and unlike the device server there is barely
 * any setup either. Two lanes reach a simulator and both are local:
@@ -2112,7 +2194,6 @@ const loadConfig = (env = process.env, configPath = defaultConfigPath(env)) => {
 		openPath: pick(trimmed(env.IOS_SIMULATOR_OPEN_PATH), "openPath")
 	});
 };
-//#endregion
-export { WritesDisabledError as A, SimulatorNotBootedError as C, ToolchainError as D, TOOLCHAIN_REMEDY as E, wdaUnavailableRemedy as M, BUILD_INFO as N, WdaError as O, START_RUNNER_TOOL_REMEDY as S, TIMEOUT_REMEDY as T, CommandTimeoutError as _, createServer as a, RuntimeUnavailableError as b, assertNotBulkTarget as c, summarizeDevices as d, toListRow as f, CommandError as g, toDisplayInfo as h, SERVER_VERSION as i, startRunnerRemedy as j, WdaUnavailableError as k, parseSimctlError as l, readScreenProfile as m, loadConfig as n, SimulatorClient as o, pngDimensions as p, SERVER_NAME as r, Simctl as s, defaultConfigPath as t, summarizeApps as u, EMPTY_SCREENSHOT_REMEDY as v, SimulatorNotFoundError as w, START_RUNNER_SCRIPT_REMEDY as x, IosError$1 as y };
+export { WritesDisabledError as A, SimulatorNotBootedError as C, ToolchainError as D, TOOLCHAIN_REMEDY as E, wdaUnavailableRemedy as M, BUILD_INFO as N, WdaError as O, START_RUNNER_TOOL_REMEDY as S, TIMEOUT_REMEDY as T, CommandTimeoutError as _, createServer as a, RuntimeUnavailableError as b, assertNotBulkTarget as c, summarizeDevices as d, toListRow as f, CommandError$1 as g, toDisplayInfo as h, SERVER_VERSION as i, startRunnerRemedy as j, WdaUnavailableError as k, parseSimctlError as l, readScreenProfile as m, loadConfig as n, SimulatorClient as o, pngDimensions as p, SERVER_NAME as r, Simctl as s, defaultConfigPath as t, summarizeApps as u, EMPTY_SCREENSHOT_REMEDY as v, SimulatorNotFoundError as w, START_RUNNER_SCRIPT_REMEDY as x, IosError$1 as y };
 
-//# sourceMappingURL=config-D0JgmT_U.js.map
+//# sourceMappingURL=config-SdCcoXC3.js.map