dsh-mobilecode 0.11.3 → 0.11.4

package/README.md

@@ -156,8 +156,9 @@ card is **Device 1**; co-op docks a second, **Device 2**. It is produced
   independently. Each pane grants its own HMAC capability; closing one pane
   never stalls or disturbs the other stream. A presence watcher polls device
   liveness while streaming: if a device is powered off (⏻ off, crash, unplug)
-  its pane drops the frozen frame and the Live badge within ~5 s, and the card
-  stays idle instead of silently grabbing another device (0.11.3). Both stream
+  its pane drops the frozen frame and the Live badge within ~5 s, and stays
+  idle instead of silently grabbing another device — both panes guard against
+  the re-grab (0.11.3–4). Both stream
   captions carry the running client version (`· v0.11.x`) so a page refresh is
   visibly proven.
 - **Security**: every stream route sits behind a loopback + trusted-browser

package/lib/client.js

@@ -190,7 +190,7 @@ window.__ModuleLoader__.load({
 		// Shown on both stream captions so a refresh visibly proves which client
 		// bundle the browser is actually running. Kept in lockstep with
 		// package.json by test/client.mjs.
-		const MC_VERSION = "0.11.3";
+		const MC_VERSION = "0.11.4";
 		// The panel shows cards for platforms the host can actually drive; the
 		// server reports its OS in info.os (iOS tooling is darwin-only).
 		const fallbackPlatforms = (os) => (os === "darwin" ? ["ios", "android"] : ["android"]);
@@ -676,7 +676,12 @@ window.__ModuleLoader__.load({
 					const r = await streamPost("/stream/devices", {});
 					setDevices(r.devices);
 					setAvds(r.avds ?? []);
-					const first = r.devices.find((d) => d.streaming)?.serial ?? r.devices[0]?.serial ?? "";
+					// Prefer emulators for the welcome auto-pick: a physical
+					// serial sorts first in adb order but has no ⏻ off control.
+					// (Serial prefix, not the avd field — avdName() can fail.)
+					const isEmu = (d) => d.serial.startsWith("emulator-");
+					const first = r.devices.find((d) => d.streaming && isEmu(d))?.serial ?? r.devices.find(isEmu)?.serial
+						?? r.devices.find((d) => d.streaming)?.serial ?? r.devices[0]?.serial ?? "";
 					const cur = serialRef.current;
 					if (cur === "") {
 						// Auto-stream once per page load (the welcome flow). After
@@ -870,22 +875,35 @@ window.__ModuleLoader__.load({
 			const [error, setError] = useState("");
 			const live = useLiveStream({ serial, onError: setError });
 			const grant = (device) => live.grant(device).then((ok) => { if (ok) setError(""); });
-			// Serial mirror for the interval (avoids stale-closure on setInterval).
+			// Serial mirror for the 5s poller + one-shot auto-pick guard: this
+			// pane may steal a partner while nothing is picked, but it must NOT
+			// silently switch to a third device after its own goes offline.
 			const serialRef = useRef(serial);
 			serialRef.current = serial;
+			const autoPicked = useRef(false);
 
 			const refresh = async () => {
 				try {
 					const r = await streamPost("/stream/devices", {});
 					setDevices(r.devices);
-					const others = r.devices.filter((d) => d.serial !== excludeSerial);
-					const next = (others.find((d) => d.streaming) ?? others[0])?.serial ?? "";
+					// Partner candidates: emulators only (serial prefix, not the
+					// flaky avd field) — the co-op partner must be killable from
+					// the picker, and never Device 1's own serial.
+					const others = r.devices.filter((d) => d.serial !== excludeSerial && d.serial.startsWith("emulator-"));
 					const cur = serialRef.current;
-					// If the current device is still valid (online and not excluded), keep it.
-					if (cur !== "" && cur !== excludeSerial && others.some((d) => d.serial === cur)) return;
-					// On any change (death, exclusion, or manual), drop the stream so we
-					// don't show a frozen frame under the new serial.
-					if (next !== cur) { setSerial(next); live.reset(); }
+					if (cur !== "") {
+						// Keep any valid pick — including a manually chosen physical
+						// device; only emulators are eligible for auto-pick. A dead
+						// or stolen pick clears to the placeholder (never re-grabs).
+						if (cur !== excludeSerial && r.devices.some((d) => d.serial === cur)) return;
+						autoPicked.current = true;
+						setSerial(""); live.reset();
+						return;
+					}
+					if (!autoPicked.current) {
+						const next = (others.find((d) => d.streaming) ?? others[0])?.serial ?? "";
+						if (next !== "") { autoPicked.current = true; setSerial(next); }
+					}
 				} catch {
 					/* the header keeps the last device list */
 				}
@@ -905,7 +923,10 @@ window.__ModuleLoader__.load({
 					live.streamUrl !== "" && h("span", { className: "mc-live-badge" }, h("span", { className: "mc-dot on" }), "Live"),
 					h("span", { className: "sp" }),
 					h("select", { className: "mc-input mc-coop-select", value: serial, onChange: (e) => { setSerial(e.target.value); live.reset(); } },
-						devices.length === 0 && h("option", { value: "" }, "no device"),
+						// An honest empty option: a select with no matching option
+						// silently DISPLAYS devices[0] while state is still "" —
+						// that made the probe read a phantom pick (0.11.4).
+						!devices.some((d) => d.serial === serial) && h("option", { value: "" }, devices.length === 0 ? "no device" : "— pick device —"),
 						devices.map((d) => h("option", { key: d.serial, value: d.serial }, d.serial + (d.serial === excludeSerial ? " (Device 1)" : d.streaming ? " ●" : ""))),
 					),
 				),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-mobilecode",
   "description": "MobileCode for the dsh web GUI: detect iOS/Android projects, run preview servers, and drive the simulator/emulator from the session — 37 agent tools (device_run, device_screen, device_ui_tree, device_ui_rows, device_tap_row, device_tap_element, device_wait_for, device_scroll_to, device_input, device_batch, device_intent, device_connect, device_pair_qr, device_perf, device_meminfo, device_backtrace, device_display, device_avd_create, device_pair_capture, device_app_info, device_install, device_uninstall, device_reboot, device_log, live screen stream, multimodal screenshots) plus a host-mediated co-op mesh hub (random callsigns, JSON pub/sub, tunable latency/jitter/drop/dup/throttle) so two virtual devices — and the AI watching them — can talk in real time. One classified adb boundary and a Wi-Fi connect/pair QR flow in the Connection settings tab. Hot-pluggable — mounted via the profile bundle list + cordis.patch.yml, no dsh source changes.",
-  "version": "0.11.3",
+  "version": "0.11.4",
   "type": "module",
   "packageManager": "pnpm@11.22.0",
   "engines": {