dsh-mobilecode 0.9.1 → 0.10.0

package/README.md

@@ -6,9 +6,11 @@ with embedded iOS Simulator / Android Emulator support) into
 [DeepSeek Harness](https://github.com/deepseek-ai/DeepSeek-Harness).
 
 It detects the mobile project in a directory (iOS / Android, Expo / React
-Native / native), starts the `serve-sim` / `serve-avd` preview servers, builds,
-installs and launches the app on the booted simulator or emulator — and exposes
-the same to the agent through tools.
+Native / native), builds, installs and launches the app on the booted
+simulator or emulator — and exposes the same to the agent through tools. The
+device screen has exactly **one** home in the panel: the **Live device**
+stream. (0.10.0 merged the old Android "Start server" preview into it —
+`serve-avd` is retired for the panel; `serve-sim` remains the iOS-only view.)
 
 ## Installation
 
@@ -30,10 +32,12 @@ If you find this useful, you can support development at [ko-fi.com/spix18](https
 drawer:
 
 - project directory input (persisted in localStorage) + Detect
-- platform pills (iOS / Android) with live server status
-- per platform: **Start/Stop server**, **Run app / Stop app**, an embedded
-  iframe of the serve-sim / serve-avd stream, build status/step/error and an
-  expandable log tail
+- platform pills — Android: attached-device status (its view is the Live
+  device card); iOS: preview-server status
+- per platform: **Run app / Stop app**, build status/step/error and an
+  expandable log tail. iOS additionally **Start/Stop server** with the
+  embedded serve-sim iframe — Android's duplicated serve-avd preview was
+  merged into the Live device card in 0.10.0
 - a Metro (bundler) status card
 - polls `GET /api/dsh-mobilecode` every 2 s while open
 
@@ -125,8 +129,11 @@ The Devices pane shows a real-time mirror of the attached device. It is produced
   stage, and a ☰ **device menu** adds notifications / quick settings / collapse /
   lock / wake / assistant.
 - The header **device picker** groups online devices (🖥 emulator / 📱 physical,
-  streaming badge) and lists configured AVDs as boot hints (`device_boot` starts
-  one — the picker never does); a **Live** badge shows the streamed serial. Quick
+  streaming badge) and lists configured AVDs with a one-click **⏻ boot** button
+  (`POST /boot`, the merged device-start action from the retired Start-server
+  flow: validate → spawn detached → adopt if already running → wait boot
+  complete → the card streams it immediately); a **Live** badge shows the
+  streamed serial. Quick
   sizes (Fit / 100% / S·240 / M·320 presets + a select) and frame styles
   (none / bezel / device) reshape the stage.
 - **Screenshot** captures a still via `POST /stream/still` (a real `screencap`,
@@ -318,6 +325,8 @@ group — plus setup endpoints: `GET /welcome`, `POST /welcome/dismiss`,
 plus the live-stream routes `GET /stream/status`, `POST /stream/grant`,
 `POST /stream/control` (tap / swipe / key / long-press, coalesced),
 `POST /stream/devices` (online devices **and** configured AVDs),
+`POST /boot {avd}` (the panel's merged one-click AVD boot — validated name,
+adopt-if-running, detached spawn, resolves once boot-completed),
 `POST /stream/still` (one `screencap` as a data URL up to 4 MB),
 `POST /stream/device-action` (the `device_action` verbs over the panel fence)
 and `GET /stream/{token}` (the multipart frame body) — plus the co-op mesh

package/lib/client.js

@@ -5,8 +5,10 @@
  * device-preview UI:
  *   - sidebar entry row toggling the pane (DOM-level injection, self-healing),
  *   - directory input (remembers the last one) + platform pills from detect,
- *   - per platform: start/stop the preview server, run/stop the app,
- *   - embedded iframe of the serve-sim / serve-avd stream,
+ *   - per platform: run/stop the app + build status (iOS only: start/stop
+ *     the serve-sim preview server with its embedded iframe),
+ *   - Live device card: the in-process stream — 0.10.0 merged the Android
+ *     "Start server" into it (serve-avd retired; picker ⏻ boot → POST /boot),
  *   - build status, error and expandable log tail,
  *   - polls GET /api/dsh-mobilecode every ~2s while open.
  *
@@ -158,6 +160,8 @@ window.__ModuleLoader__.load({
 .mc-picker-row:hover { background: light-dark(rgba(0,0,0,.06), rgba(255,255,255,.1)); }
 .mc-picker-row.on { background: light-dark(rgba(66,133,244,.12), rgba(66,133,244,.22)); }
 .mc-picker-hint { font-size: 11px; color: light-dark(#6b7078, #9aa0a8); padding: 4px 8px; }
+.mc-picker-row .sp { flex: 1; }
+.mc-picker-row .mc-btn { padding: 2px 8px; font-size: 11px; }
 .mc-menu-pop { position: absolute; top: calc(100% + 4px); right: 0; z-index: 50; min-width: 180px; background: light-dark(#fff, #20242b); color: inherit; border: 1px solid light-dark(rgba(0,0,0,.16), rgba(255,255,255,.2)); border-radius: 10px; box-shadow: 0 8px 30px rgba(0,0,0,.35); padding: 4px; display: flex; flex-direction: column; }
 .mc-menu-pop button { display: flex; align-items: center; gap: 8px; padding: 7px 10px; border: 0; border-radius: 7px; background: transparent; color: inherit; font: inherit; font-size: 12px; cursor: pointer; text-align: left; }
 .mc-menu-pop button:hover { background: light-dark(rgba(0,0,0,.06), rgba(255,255,255,.1)); }
@@ -333,8 +337,13 @@ window.__ModuleLoader__.load({
 					error !== "" && h("div", { className: "mc-error" }, error),
 					h("div", { className: "mc-pills" },
 						platforms.map((platform) => {
-							const running = server(platform)?.status === "running";
-							return h("span", { key: platform, className: "mc-pill", "data-on": running ? "true" : undefined },
+							// 0.10.0: Android's "server" IS the Live device stream — the pill
+							// tracks attached devices, not a serve-avd process.
+							const running = platform === "android"
+								? (info?.deviceCount ?? 0) > 0
+								: server(platform)?.status === "running";
+							return h("span", { key: platform, className: "mc-pill", "data-on": running ? "true" : undefined,
+								title: platform === "android" ? (running ? "Android device attached — mirrored in Live device" : "No Android device attached") : "Preview server running" },
 								h("span", { className: "mc-dot " + (running ? "on" : "off") }),
 								label(platform),
 							);
@@ -344,17 +353,21 @@ window.__ModuleLoader__.load({
 					platforms.map((platform) => {
 						const srv = server(platform);
 						const bld = build(platform);
-						const busyHere = busy !== "" && busy.startsWith(platform);
+						// 0.10.0 merge: "Start server" (serve-avd iframe) and "Live device" were
+						// two views of the same screen. The in-process stream won; the Android
+						// card keeps project controls only. iOS keeps serve-sim (its only view).
+						const preview = platform === "ios";
 						return h("div", { key: platform, className: "mc-card" },
 							h("div", { className: "mc-card-head" },
 								h("span", null, label(platform)),
 								h("span", { className: "sp" }),
-								srv
+								preview && (srv
 									? h("button", { className: "mc-btn", disabled: busy !== "", onClick: () => act(platform + "-stop-server", "/stop", { platform }) },
 										srv.status === "running" ? "Stop server" : "Server " + srv.status)
-									: h("button", { className: "mc-btn primary", disabled: busy !== "", onClick: () => act(platform + "-start-server", "/start", { platform }) }, "Start server"),
+									: h("button", { className: "mc-btn primary", disabled: busy !== "", onClick: () => act(platform + "-start-server", "/start", { platform }) }, "Start server")),
+								!preview && h("span", { className: "mc-live-cap" }, "screen: Live device ↑"),
 							),
-							srv?.url
+							preview && (srv?.url
 								? h("iframe", {
 									key: frameKey,
 									className: "mc-frame",
@@ -364,7 +377,7 @@ window.__ModuleLoader__.load({
 								})
 								: srv?.status === "starting"
 									? h("div", { className: "mc-status" }, h("span", null, h("span", { className: "mc-dot warn" }), " Starting preview server…"))
-									: null,
+									: null),
 							h("div", { className: "mc-row" },
 								h("button", {
 									className: "mc-btn primary",
@@ -404,8 +417,8 @@ window.__ModuleLoader__.load({
 									openLogs["bundler"] ? "Hide log" : "Show log (" + info.bundler.log.length + ")"),
 							openLogs["bundler"] && h("pre", { className: "mc-log" }, info.bundler.log.join("\n")),
 						),
-					info?.servers?.length === 0 && info?.builds?.length === 0 &&
-						h("div", { className: "mc-empty" }, "No preview server running. Pick a project directory and press Run app."),
+					info?.servers?.length === 0 && info?.builds?.length === 0 && (info?.deviceCount ?? 0) === 0 &&
+						h("div", { className: "mc-empty" }, "Nothing running yet — pick a project directory and press Run app, or boot an AVD in Live device above."),
 				),
 				h("div", { className: "mc-footer" },
 					h("span", null, "dsh-mobilecode · polls every 2s"),
@@ -574,6 +587,7 @@ window.__ModuleLoader__.load({
 			const [view, setView] = useState("live"); // 'live' | 'still'
 			const [sizeMode, setSizeMode] = useState({ mode: "fit" }); // {mode:'fit'|'pct'|'px', value?}
 			const [frame, setFrame] = useState("none"); // 'none' | 'bezel' | 'device'
+			const [booting, setBooting] = useState(""); // AVD name while POST /boot is in flight
 			const live = useLiveStream({ serial, onError: setError });
 			const grant = (device) => live.grant(device).then((ok) => { if (ok) setError(""); });
 			const control = live.control;
@@ -624,6 +638,21 @@ window.__ModuleLoader__.load({
 			};
 
 			const pick = (device) => { setSerial(device); live.reset(); setStill(null); setView("live"); setError(""); setPickerOpen(false); };
+			// 0.10.0 merged "Start server": boot a configured AVD from the picker.
+			// The route waits for boot completion; then we re-list and stream it.
+			const boot = async (avd) => {
+				setBooting(avd); setError("");
+				try {
+					const r = await streamPost("/boot", { avd });
+					await refreshDevices();
+					if (r.serial) pick(r.serial);
+				} catch (err) {
+					setError(err instanceof Error ? err.message : String(err));
+					await refreshDevices();
+				} finally {
+					setBooting("");
+				}
+			};
 			const showLive = () => { setView("live"); if (serial !== "" && live.streamUrl === "") grant(serial); };
 
 			const sizeStyle = sizeMode.mode === "pct"
@@ -675,8 +704,16 @@ window.__ModuleLoader__.load({
 								)
 								: h("div", { className: "mc-picker-hint" }, "No device attached"),
 							avds.length > 0 && h("div", { className: "mc-picker-group" },
-								h("div", { className: "mc-picker-label" }, "AVDs — start with device_boot"),
-								avds.map((avd) => h("div", { key: avd, className: "mc-picker-hint" }, "▫ " + avd)),
+								h("div", { className: "mc-picker-label" }, "AVDs"),
+								avds.map((avd) => h("div", { key: avd, className: "mc-picker-row" },
+									h("span", null, "▫ " + avd),
+									h("span", { className: "sp" }),
+									h("button", {
+										className: "mc-btn", disabled: booting !== "",
+										title: "Boot this AVD (runs detached; it appears online when ready)",
+										onClick: () => boot(avd),
+									}, booting === avd ? "booting…" : "⏻ boot"),
+								)),
 							),
 						),
 					),
@@ -690,6 +727,8 @@ window.__ModuleLoader__.load({
 					devices.length >= 2 && h("button", { className: "mc-btn", "data-on": coopOn || undefined, title: "Co-op: watch two devices side by side", onClick: onToggleCoop }, "⧉"),
 				),
 				error !== "" && h("div", { className: "mc-error" }, error),
+				booting !== "" && h("div", { className: "mc-status" },
+					h("span", null, h("span", { className: "mc-dot warn" }), " Booting " + booting + " — it appears here once online (about a minute).")),
 				h("div", { className: "mc-toolbar" },
 					toolbar.map((item) => h("button", { key: item.title, title: item.title, disabled: serial === "", onClick: item.run },
 						h("svg", { width: 16, height: 16, viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: 2, strokeLinecap: "round", strokeLinejoin: "round" },
@@ -703,7 +742,7 @@ window.__ModuleLoader__.load({
 						: live.streamUrl !== ""
 							? h("img", { ...live.imgProps, src: live.streamUrl, alt: "device screen", style: sizeStyle, onError: () => grant(serial) })
 							: h("div", { className: "mc-live-off" }, devices.length === 0
-								? "No device attached. Boot one with device_boot, or press Run app."
+								? "No device attached — boot an AVD from the ▾ picker, or press Run app."
 								: "Connecting to " + serial + "..."),
 				),
 				view === "still"

package/lib/index.js

@@ -137,7 +137,11 @@ function makeRoutes(engine, config, stream) {
         const url = new URL(req.url ?? '/', 'http://localhost')
         const directory = url.searchParams.get('directory') ?? resolveDirectory({}, config)
         try {
-          writeJson(res, 200, await engine.info({ directory }))
+          const info = await engine.info({ directory })
+          // 0.10.0: Android's device view is the Live device stream, not serve-avd.
+          // The panel's pill shows attached-device count instead of a server state.
+          try { info.deviceCount = (await DeviceBuild.devices()).length } catch { /* no adb: pill stays off */ }
+          writeJson(res, 200, info)
         } catch (error) {
           writeJson(res, 500, { error: error instanceof Error ? error.message : String(error) })
         }
@@ -513,6 +517,47 @@ function makeRoutes(engine, config, stream) {
         }
       },
     },
+    // POST /api/dsh-mobilecode/boot {avd} — the one-click device boot the
+    // merged Live-device section uses (0.10.0). The emulator is a detached
+    // daemon (same as device_boot); the response returns once it is online
+    // and boot-completed, so the panel can stream it immediately. An already
+    // running AVD is adopted without waiting.
+    {
+      kind: 'exact',
+      path: API_BASE + '/boot',
+      handler: async (req, res) => {
+        if (!fence(req, res, true) || !isPost(req, res)) return
+        const body = await readBody(req, res)
+        if (body === undefined) return
+        const avd = String(body.avd ?? '').trim()
+        if (avd === '' || !/^[\w.-]+$/.test(avd)) { writeJson(res, 400, { error: 'avd must be a configured AVD name' }); return }
+        try {
+          const known = await DeviceBuild.androidAvds()
+          if (!known.includes(avd)) { writeJson(res, 400, { error: `no such AVD "${avd}" (have: ${known.join(', ') || 'none'})` }); return }
+          // Already running: adopt it instead of starting a duplicate.
+          const rows = await DeviceBuild.devices()
+          for (const row of rows.filter((item) => item.state === 'device' && item.serial.startsWith('emulator-'))) {
+            const name = await DeviceBuild.avdName(row.serial).catch(() => undefined)
+            if (name === avd) { writeJson(res, 200, { ok: true, alreadyRunning: true, serial: row.serial, avd }); return }
+          }
+          if (!DeviceBuild.bootEmulator(avd)) { writeJson(res, 500, { error: `could not launch the emulator for "${avd}"` }); return }
+          const deadline = Date.now() + 60_000
+          const before = new Set(rows.map((item) => item.serial))
+          let serial
+          while (Date.now() < deadline) {
+            const now = await DeviceBuild.devices()
+            const fresh = now.find((item) => item.serial.startsWith('emulator-') && !before.has(item.serial))
+            if (fresh) { serial = fresh.serial; break }
+            await new Promise((resolve) => setTimeout(resolve, 1000))
+          }
+          if (!serial) { writeJson(res, 504, { error: `emulator for "${avd}" did not come online within 60s` }); return }
+          const booted = await DeviceBuild.waitForBoot(serial, 240_000)
+          writeJson(res, booted ? 200 : 504, { ok: booted, serial, avd, booted })
+        } catch (error) {
+          writeJson(res, 500, { error: error instanceof Error ? error.message : String(error) })
+        }
+      },
+    },
     // POST /api/dsh-mobilecode/stream/still {device?} — capture ONE fresh
     // screencap PNG and serve it; returns {path, width, height, dataUrl}. The
     // panel's Screenshot button uses this (a still is the current pixels, unlike

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.9.1",
+  "version": "0.10.0",
   "type": "module",
   "packageManager": "pnpm@11.22.0",
   "engines": {