@agimon-ai/po-ios 0.0.1-alpha.0 → 0.0.1-alpha.1

package/README.md

@@ -11,7 +11,7 @@ This package is a composable [Po](https://www.npmjs.com/package/@agimon-ai/po) s
 
 ## Install
 
-The layer is opt-in: select the `ios` layer in your Po modes. The package declares poServer metadata for native server discovery.
+The package is opt-in and intentionally absent from init templates. Define an `ios` layer with `packages: ['@agimon-ai/po-ios']` in your modes file, then select that layer in a major mode. The package declares poServer metadata for native server discovery.
 
 ## Use
 
@@ -41,9 +41,11 @@ ios:
 
 Release uninstalls the apps a session installed and keeps the device warm. Devices of a dead server are erased before reuse.
 
-Accessibility and touch (`observe`, `tap`, `type`, `swipe`, `pressButton`, `waitFor`, `settle`) go through a resident Swift helper in `native/sim-helper`. The server builds it on first use with the person's Xcode (`xcrun swift build`) into `<po home>/ios/native/<hash>/`; set `ios.helperPath` to use a prebuilt one instead. Its private framework calls are not recorded yet (see `native/sim-helper/PRIVATE_APIS.md`), so until then those calls return `IOS_HELPER_UNAVAILABLE`.
+Accessibility and touch (`observe`, `tap`, `type`, `swipe`, `pressButton`, `waitFor`, `settle`) go through a resident Swift helper in `native/sim-helper`. The server builds it on first use with the person's Xcode (`xcrun swift build`) into `<po home>/ios/native/<hash>/`; set `ios.helperPath` to use a prebuilt one instead. On Xcode 27.1 (27A9275) and iOS 26.5, direct native-protocol trials verified observation, taps, timed swipes, US-layout ASCII typing (including shifted punctuation and return), home and lock. Arbitrary Unicode text and Siri/volume buttons explicitly return `IOS_HELPER_UNAVAILABLE`, with no clipboard or AX-value fallback. Unsupported text is rejected before any keys are emitted. Missing or changed private API shapes also fail explicitly. See `native/sim-helper/PRIVATE_APIS.md` for evidence and limits.
 
-Physical devices: `ios.devices()` lists what CoreDevice sees (`xcrun devicectl list devices`), and `ios.acquireDevice({ udid })` leases a paired, connected phone after the person approves it. A phone lease shares the `ios_lease` table (`kind = 'device'`) so two sessions never hold one phone, but it has no `ios_device` row: the pool never boots, erases or counts it against `maxBooted`. On a phone only `install` (a device-signed `.app`), `uninstall`, `launch` and `release` work; release only drops the lease. Accessibility, screenshots and logs on phones need the XCUITest runner, which is not built yet.
+This is a documented partial implementation, not completed acceptance of the full iOS plan. Rotation, two-device isolation and built-layer smoke remain unverified. Input acknowledgment does not mean the UI transition has finished; a lock transition took about three seconds to appear in AX observations.
+
+Physical devices: `ios.devices()` lists what CoreDevice sees (`xcrun devicectl list devices`), and `ios.acquireDevice({ udid })` leases a paired, reachable phone after the person approves it. An idle disconnected tunnel is checked with a bounded device-info request rather than rejected solely by its listed state. A phone lease shares the `ios_lease` table (`kind = 'device'`) so two sessions never hold one phone, but it has no `ios_device` row: the pool never boots, erases or counts it against `maxBooted`. On a phone only `install` (a device-signed `.app`), `uninstall`, `launch` and `release` work; release only drops the lease. Phone console capture and the XCUITest runner are not implemented. Other phone calls explicitly return `IOS_UNSUPPORTED_HOST`. Live signed-app and runner acceptance is still pending.
 
 ## Help
 

package/dist/extensions/server.cjs

@@ -53,14 +53,12 @@ var IosError = class extends Error {
 };
 //#endregion
 //#region src/services/devicectl/index.ts
+const CONNECTION_TIMEOUT_MS = 2e4;
 function record(value) {
 	return value !== null && typeof value === "object" && !Array.isArray(value) ? value : {};
 }
 const text$1 = (value) => typeof value === "string" ? value : "";
-/**
-* Reads `devicectl list devices --json-output`. The shape is hand-written from Apple's documented output and is
-* not yet checked against a real run; unknown fields read as empty rather than failing the whole list.
-*/
+/** Reads physical devices from Xcode 27.1 output, with legacy-field fallback for older Xcode versions. */
 function parsePhysicalDevices(output) {
 	let parsed;
 	try {
@@ -69,21 +67,30 @@ function parsePhysicalDevices(output) {
 		throw new IosError("IOS_COMMAND_FAILED", "devicectl returned unreadable device JSON.");
 	}
 	const devices = record(record(parsed).result).devices;
-	return (Array.isArray(devices) ? devices : []).map((entry) => {
+	return (Array.isArray(devices) ? devices : []).flatMap((entry) => {
 		const device = record(entry);
-		const properties = record(device.deviceProperties);
-		const hardware = record(device.hardwareProperties);
-		const connection = record(device.connectionProperties);
-		return {
-			udid: text$1(hardware.udid),
+		const properties = record(device.properties);
+		const hardware = record(properties.hardware);
+		const state = record(properties.state);
+		const software = record(properties.software);
+		const connection = record(properties.connection);
+		const legacyHardware = record(device.hardwareProperties);
+		const legacyProperties = record(device.deviceProperties);
+		const legacyConnection = record(device.connectionProperties);
+		const realities = [hardware.reality, legacyHardware.reality].filter((value) => value !== void 0);
+		if (realities.length === 0 || realities.some((value) => value !== "physical") || state.visibilityClass === "simulators" || device.visibilityClass === "simulators") return [];
+		const udid = text$1(hardware.udid ?? legacyHardware.udid);
+		if (udid === "") return [];
+		return [{
+			udid,
 			identifier: text$1(device.identifier),
-			name: text$1(properties.name),
-			model: text$1(hardware.marketingName),
-			osVersion: text$1(properties.osVersionNumber),
-			platform: text$1(hardware.platform),
-			paired: connection.pairingState === "paired",
-			connected: connection.tunnelState === "connected"
-		};
+			name: text$1(state.name ?? legacyProperties.name),
+			model: text$1(hardware.marketingName ?? legacyHardware.marketingName),
+			osVersion: text$1(record(software.osVersionNumber).stringValue ?? legacyProperties.osVersionNumber),
+			platform: text$1(hardware.platform ?? legacyHardware.platform),
+			paired: (connection.pairingState ?? legacyConnection.pairingState) === "paired",
+			connected: (connection.state ?? legacyConnection.tunnelState) === "connected"
+		}];
 	});
 }
 const firstLine$1 = (output) => output.split("\n").map((line) => line.trim()).find((line) => line !== "") ?? "";
@@ -116,6 +123,17 @@ function createDeviceCtl(options) {
 				await options.remove(file);
 			}
 		},
+		async ensureReachable(identifier, signal) {
+			await step([
+				"device",
+				"info",
+				"details",
+				"--device",
+				identifier,
+				"--timeout",
+				String(CONNECTION_TIMEOUT_MS / 1e3)
+			], signal, 25e3);
+		},
 		async install(identifier, appPath, signal) {
 			await step([
 				"device",
@@ -144,6 +162,7 @@ function createDeviceCtl(options) {
 				"--device",
 				identifier,
 				bundleId,
+				"--",
 				...args
 			], signal);
 		}
@@ -484,7 +503,7 @@ function compareVersions(left, right) {
 }
 /**
 * The runtime and device type new pool devices use. `runtime` may be `latest`, an identifier, a version or a
-* name; `deviceType` an identifier or a name. Unset means the newest available iOS runtime and its newest iPhone.
+* name; `deviceType` an identifier or a name. Unset means the newest available iOS runtime and its first listed iPhone.
 */
 function resolveDeviceSpec(runtimes, wanted) {
 	const ios = runtimes.filter((runtime) => runtime.isAvailable && (runtime.platform === "iOS" || runtime.name.startsWith("iOS"))).sort((left, right) => compareVersions(right.version, left.version));
@@ -499,7 +518,7 @@ function resolveDeviceSpec(runtimes, wanted) {
 		throw new IosError("IOS_NO_RUNTIME", `No available iOS simulator runtime matches "${query ?? "latest"}" (available: ${available}). Install one in Xcode settings, Components.`);
 	}
 	const types = runtime.supportedDeviceTypes;
-	const deviceType = wanted.deviceType === void 0 ? types.filter((type) => type.productFamily === "iPhone").at(-1) : types.find((type) => type.identifier === wanted.deviceType || type.name === wanted.deviceType);
+	const deviceType = wanted.deviceType === void 0 ? types.find((type) => type.productFamily === "iPhone") : types.find((type) => type.identifier === wanted.deviceType || type.name === wanted.deviceType);
 	if (deviceType === void 0) throw new IosError("IOS_NO_RUNTIME", `${runtime.name} supports no device type matching "${wanted.deviceType ?? "iPhone"}".`);
 	return {
 		runtime: runtime.identifier,
@@ -701,6 +720,7 @@ function createDevicePool(options) {
 	const supported = probe.platform === "darwin";
 	const wakers = /* @__PURE__ */ new Set();
 	const orphans = /* @__PURE__ */ new Map();
+	const queues = /* @__PURE__ */ new Map();
 	let spec;
 	let timer;
 	let ticking;
@@ -922,18 +942,31 @@ function createDevicePool(options) {
 		if (leases.length > 1) throw new IosError("IOS_INVALID_ARGUMENT", `This session holds ${String(leases.length)} leases; pass leaseId (${leases.map((lease) => lease.lease_id).join(", ")}).`);
 		return leases[0];
 	};
-	const release = async (owner, leaseId, reset = "apps") => {
+	/** Calls and release share one queue, including session teardown outside the namespace. */
+	const queueLease = async (owner, leaseId, work) => {
 		const lease = await resolveLease(owner, leaseId);
+		const next = (queues.get(lease.lease_id) ?? Promise.resolve()).catch(() => void 0).then(async () => {
+			if (stopped) throw new IosError("IOS_LEASE_LOST", "The iOS pool is stopping.");
+			return work(await resolveLease(owner, lease.lease_id));
+		});
+		queues.set(lease.lease_id, next);
+		try {
+			return await next;
+		} finally {
+			if (queues.get(lease.lease_id) === next) queues.delete(lease.lease_id);
+		}
+	};
+	const release = (owner, leaseId, reset = "apps") => queueLease(owner, leaseId, async (lease) => {
 		const result = await view(lease);
+		if (lease.kind === "simulator") await options.helper?.forget(lease.udid);
 		const udid = await store.release(lease.lease_id, reset === "erase", now());
 		if (udid !== void 0 && lease.kind === "simulator") {
-			options.helper?.forget(udid);
 			const device = await store.claimDirty(serverId, udid);
 			if (device !== void 0) await clean(device);
 		}
 		wake();
 		return result;
-	};
+	});
 	const reconcile = async () => {
 		const rows = await store.listDevices();
 		const listed = await simctl.listDevices();
@@ -1090,11 +1123,16 @@ function createDevicePool(options) {
 				};
 			});
 		},
-		async acquireDevice(owner, udid, label) {
+		async acquireDevice(owner, udid, label, signal) {
 			requireSupported();
-			const device = (await requireDevicectl().listDevices()).find((candidate) => candidate.udid === udid);
+			if (stopped) throw new IosError("IOS_POOL_BUSY", "The iOS pool is stopping.");
+			signal?.throwIfAborted();
+			const devicectl = requireDevicectl();
+			const device = (await devicectl.listDevices(signal)).find((candidate) => candidate.udid === udid);
 			if (device === void 0) throw new IosError("IOS_INVALID_ARGUMENT", `No physical device ${udid} is visible. Call ios.devices() to list them.`);
-			if (!device.paired || !device.connected) throw new IosError("IOS_INVALID_ARGUMENT", `${device.name || udid} is not ready: pair it with this Mac, unlock it, and enable Developer Mode.`);
+			if (!device.paired) throw new IosError("IOS_INVALID_ARGUMENT", `${device.name || udid} is not ready: pair it with this Mac, unlock it, and enable Developer Mode.`);
+			if (!device.connected) await devicectl.ensureReachable(udid, signal);
+			signal?.throwIfAborted();
 			const lease = await store.leasePhone(udid, {
 				leaseId: crypto.randomUUID(),
 				owner,
@@ -1102,6 +1140,10 @@ function createDevicePool(options) {
 				label: label ?? null,
 				now: now()
 			});
+			if (signal?.aborted) {
+				if (lease !== void 0) await store.release(lease.lease_id, false, now());
+				signal.throwIfAborted();
+			}
 			if (lease !== void 0) return view(lease);
 			const held = (await store.allLeases()).find((candidate) => candidate.udid === udid);
 			if (held !== void 0 && held.owner_root === owner) return view(held);
@@ -1112,6 +1154,10 @@ function createDevicePool(options) {
 			await store.touchLease(lease.lease_id, now());
 			return view(lease);
 		},
+		withLease: (owner, leaseId, work) => queueLease(owner, leaseId, async (lease) => {
+			await store.touchLease(lease.lease_id, now());
+			return work(await view(lease));
+		}),
 		async leases(owner) {
 			return Promise.all((await store.leasesOf(owner)).map(view));
 		},
@@ -1126,7 +1172,8 @@ function createDevicePool(options) {
 			if (stopped) return;
 			stopped = true;
 			if (timer !== void 0) clearInterval(timer);
-			options.helper?.dispose();
+			await Promise.allSettled(queues.values());
+			await options.helper?.dispose();
 			wake();
 			await ticking;
 			if (!supported) return;
@@ -1261,9 +1308,18 @@ function spawnLineProcess(binary, env) {
 	const exitListeners = [];
 	let buffer = "";
 	let exited = false;
+	let resolveExit;
+	const closed = new Promise((resolve) => {
+		resolveExit = resolve;
+	});
+	const kill = () => {
+		if (!exited) child.kill("SIGKILL");
+		return closed;
+	};
 	const exit = (code) => {
 		if (exited) return;
 		exited = true;
+		resolveExit();
 		for (const listener of exitListeners) listener(code);
 	};
 	child.stdout.setEncoding("utf8");
@@ -1272,9 +1328,13 @@ function spawnLineProcess(binary, env) {
 		for (let index = buffer.indexOf("\n"); index >= 0; index = buffer.indexOf("\n")) {
 			const line = buffer.slice(0, index);
 			buffer = buffer.slice(index + 1);
+			if (line.length > 8388608) {
+				kill();
+				return;
+			}
 			if (line.trim() !== "") for (const listener of lineListeners) listener(line);
 		}
-		if (buffer.length > 8388608) child.kill();
+		if (buffer.length > 8388608) kill();
 	});
 	child.stderr.resume();
 	child.stdin.on("error", () => void 0);
@@ -1286,9 +1346,7 @@ function spawnLineProcess(binary, env) {
 		},
 		onLine: (listener) => lineListeners.push(listener),
 		onExit: (listener) => exitListeners.push(listener),
-		kill: () => {
-			child.kill();
-		}
+		kill
 	};
 }
 //#endregion
@@ -1300,8 +1358,8 @@ function replyError(error) {
 	return require_contracts.IOS_ERROR_CODES.includes(code) ? new IosError(code, message) : unavailable(`${code ? `${code}: ` : ""}${message}`);
 }
 /**
-* Client for the resident Swift helper. One request per line, matched by id; a timeout kills the process and the
-* next call starts a fresh one, at most three times in five minutes. A protocol mismatch triggers one rebuild.
+* Client for the resident Swift helper. Requests dispatch in order, matched by id. A timeout stops the process;
+* restart waits for its observed exit, at most three starts in five minutes. A protocol mismatch rebuilds once.
 */
 function createSimHelper(options) {
 	const now = options.now ?? Date.now;
@@ -1310,90 +1368,113 @@ function createSimHelper(options) {
 	const starts = [];
 	let current;
 	let starting;
+	let stopping = Promise.resolve();
+	let dispatch = Promise.resolve();
 	let nextId = 1;
 	let disposed = false;
-	const failAll = (error) => {
-		for (const [id, entry] of pending) {
-			clearTimeout(entry.timer);
-			entry.reject(error);
+	const take = (id) => {
+		const entry = pending.get(id);
+		if (entry !== void 0) {
 			pending.delete(id);
+			entry.cleanup();
 		}
+		return entry;
+	};
+	const failAll = (error, target) => {
+		for (const [id, entry] of pending) if (target === void 0 || entry.target === target) take(id)?.reject(error);
 	};
-	const stop = (target) => {
-		if (current === target) current = void 0;
-		starting = void 0;
-		target.kill();
+	const stop = (target, error = unavailable("The iOS helper stopped; it restarts on the next call.")) => {
+		if (current === target) {
+			current = void 0;
+			dispatch = Promise.resolve();
+		}
+		stopping = Promise.all([stopping, target.kill()]).then(() => void 0);
+		failAll(error, target);
+		return stopping;
 	};
 	const send = (target, op, udid, params, signal) => new Promise((resolve, reject) => {
+		if (disposed || current !== target) {
+			reject(unavailable("The iOS helper is not running."));
+			return;
+		}
 		if (signal?.aborted) {
 			reject(signal.reason);
 			return;
 		}
 		const id = nextId++;
+		const aborted = () => take(id)?.reject(signal?.reason);
 		const timer = setTimeout(() => {
-			pending.delete(id);
-			reject(unavailable(`The iOS helper did not answer ${op} within ${String(timeoutMs / 1e3)}s; it restarts on the next call.`));
-			stop(target);
+			if (current === target) starting = void 0;
+			stop(target, unavailable(`The iOS helper did not answer ${op} within ${String(timeoutMs)} ms. It restarts on the next call.`));
 		}, timeoutMs);
 		pending.set(id, {
+			target,
 			resolve,
 			reject,
-			timer
-		});
-		signal?.addEventListener("abort", () => {
-			const entry = pending.get(id);
-			if (entry === void 0) return;
-			clearTimeout(entry.timer);
-			pending.delete(id);
-			reject(signal.reason);
-		}, { once: true });
-		options.developerDir().then((developerDir) => target.write(JSON.stringify({
-			v: 1,
-			id,
-			op,
-			...udid === void 0 ? {} : { udid },
-			deviceSet: options.deviceSet,
-			developerDir,
-			params
-		}))).catch((error) => {
-			const entry = pending.get(id);
-			if (entry === void 0) return;
-			clearTimeout(entry.timer);
-			pending.delete(id);
-			reject(error);
+			cleanup: () => {
+				clearTimeout(timer);
+				signal?.removeEventListener("abort", aborted);
+			}
 		});
+		signal?.addEventListener("abort", aborted, { once: true });
+		dispatch = dispatch.then(async () => {
+			if (!pending.has(id)) return;
+			const developerDir = await options.developerDir();
+			if (!pending.has(id)) return;
+			target.write(JSON.stringify({
+				v: 1,
+				id,
+				op,
+				...udid === void 0 ? {} : { udid },
+				deviceSet: options.deviceSet,
+				developerDir,
+				params
+			}));
+		}).catch((error) => take(id)?.reject(error));
 	});
 	const launch = async (rebuild) => {
 		const recent = starts.filter((started) => now() - started < require_contracts.HELPER_RESTART_WINDOW_MS);
 		starts.splice(0, starts.length, ...recent);
 		if (starts.length >= 3) throw unavailable("The iOS helper keeps failing; it restarted three times in five minutes. Try again later.");
 		starts.push(now());
-		const spawned = options.spawn(await options.binary(rebuild));
+		const binary = await options.binary(rebuild);
+		if (disposed) throw unavailable("The iOS helper is shut down.");
+		const spawned = options.spawn(binary);
 		current = spawned;
 		spawned.onLine((line) => {
 			let reply;
 			try {
-				reply = JSON.parse(line);
+				const parsed = JSON.parse(line);
+				if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) return;
+				reply = parsed;
 			} catch {
 				return;
 			}
-			const entry = typeof reply.id === "number" ? pending.get(reply.id) : void 0;
-			if (entry === void 0) return;
-			clearTimeout(entry.timer);
-			pending.delete(reply.id);
-			if (reply.ok === true) entry.resolve(reply.result);
-			else entry.reject(replyError(reply.error));
+			const id = typeof reply.id === "number" ? reply.id : void 0;
+			if (id === void 0 || pending.get(id)?.target !== spawned) return;
+			const entry = take(id);
+			if (reply.ok === true) entry?.resolve(reply.result);
+			else entry?.reject(replyError(reply.error));
 		});
 		spawned.onExit((code) => {
 			if (current === spawned) {
 				current = void 0;
 				starting = void 0;
+				dispatch = Promise.resolve();
 			}
-			failAll(unavailable(`The iOS helper exited (code ${String(code)}); it restarts on the next call.`));
+			failAll(unavailable(`The iOS helper exited (code ${String(code)}); it restarts on the next call.`), spawned);
 		});
-		const probe = await send(spawned, "probe", void 0, {});
+		let probe;
+		try {
+			const result = await send(spawned, "probe", void 0, {});
+			if (result === null || typeof result !== "object" || !("protocolVersion" in result) || !Number.isInteger(result.protocolVersion) || !("missing" in result) || !Array.isArray(result.missing) || !result.missing.every((capability) => typeof capability === "string")) throw unavailable("The iOS helper returned an invalid probe.");
+			probe = result;
+		} catch (error) {
+			await stop(spawned);
+			throw error;
+		}
 		if (probe.protocolVersion !== 1) {
-			stop(spawned);
+			await stop(spawned);
 			if (rebuild) throw unavailable(`The iOS helper speaks protocol ${String(probe.protocolVersion)}, not ${String(1)}, even after a rebuild.`);
 			return launch(true);
 		}
@@ -1402,12 +1483,16 @@ function createSimHelper(options) {
 			probe
 		};
 	};
-	const ready = () => {
-		if (disposed) return Promise.reject(unavailable("The iOS helper is shut down."));
-		starting ??= launch(false).catch((error) => {
-			starting = void 0;
-			throw error;
-		});
+	const ready = async () => {
+		await stopping;
+		if (disposed) throw unavailable("The iOS helper is shut down.");
+		if (starting === void 0) {
+			const attempt = launch(false).catch((error) => {
+				if (starting === attempt) starting = void 0;
+				throw error;
+			});
+			starting = attempt;
+		}
 		return starting;
 	};
 	return {
@@ -1422,22 +1507,15 @@ function createSimHelper(options) {
 			const { child: target } = await ready();
 			await send(target, "act", udid, action, signal);
 		},
-		forget(udid) {
-			if (current === void 0) return;
-			send(current, "forget", udid, {}).catch((error) => options.onNotice?.(`iOS helper: forget ${udid} failed: ${error instanceof Error ? error.message : String(error)}`));
+		async forget(udid) {
+			await stopping;
+			if (starting !== void 0) await starting;
+			if (current !== void 0) await send(current, "forget", udid, {});
 		},
-		dispose() {
+		async dispose() {
 			disposed = true;
-			const target = current;
-			failAll(unavailable("The iOS helper is shut down."));
-			if (target === void 0) return;
-			target.write(JSON.stringify({
-				v: 1,
-				id: 0,
-				op: "shutdown",
-				params: {}
-			}));
-			stop(target);
+			if (current !== void 0) await stop(current, unavailable("The iOS helper is shut down."));
+			else await stopping;
 		}
 	};
 }
@@ -1970,7 +2048,7 @@ declare const ios: {
 
   /** Physical devices this Mac sees over CoreDevice, and whether a session holds them. */
   devices(): Promise<{ udid: string; name: string; model: string; osVersion: string; paired: boolean; connected: boolean; leased: boolean; leaseId?: string }[]>;
-  /** Leases a connected physical device by UDID. Asks the person first, every time. */
+  /** Leases a paired, reachable physical device by UDID, reconnecting an idle tunnel. Asks the person first. */
   acquireDevice(options: { udid: string; label?: string }): Promise<IosLease>;
 };`;
 /** A physical device is the person's own hardware, so leasing one always asks them first. */
@@ -2003,8 +2081,6 @@ function base64(bytes) {
 }
 /** The `ios` code-mode namespace: lease a pool simulator, then install, launch, look and read logs on it. */
 function createIosNamespace(options) {
-	/** Calls on one lease run one at a time, so two scripts never interleave on one device. */
-	const queues = /* @__PURE__ */ new Map();
 	return {
 		name: "ios",
 		summary: "Leased iOS simulators from a machine-wide pool shared by every Po session: ios.acquire() a device, install and launch an app, observe the accessibility tree, tap, type and swipe, take screenshots and read logs, then ios.release().",
@@ -2025,17 +2101,11 @@ function createIosNamespace(options) {
 			};
 			const onLease = async (leaseId, work) => {
 				const live = pool();
-				const lease = await live.resolveLease(options.owner, leaseId);
-				const next = (queues.get(lease.leaseId) ?? Promise.resolve()).catch(() => void 0).then(() => {
+				return live.withLease(options.owner, leaseId, (lease) => {
 					run.signal.throwIfAborted();
+					if (disposed) throw new Error("iOS namespace run is disposed.");
 					return work(lease, live);
 				});
-				queues.set(lease.leaseId, next);
-				try {
-					return await next;
-				} finally {
-					if (queues.get(lease.leaseId) === next) queues.delete(lease.leaseId);
-				}
 			};
 			/** As onLease, refusing physical devices for calls only simulators support so far. */
 			const onSimulator = (leaseId, call, work) => onLease(leaseId, (lease, live) => {
@@ -2308,7 +2378,7 @@ function createIosNamespace(options) {
 			members.devices = async () => pool().devices(options.owner);
 			members.acquireDevice = async (input) => {
 				const params = parse(AcquireDeviceSchema, input, "acquireDevice");
-				return pool().acquireDevice(options.owner, params.udid, params.label);
+				return pool().acquireDevice(options.owner, params.udid, params.label, run.signal);
 			};
 			return members;
 		}