dsh-mobilecode 0.4.0 → 0.6.0

package/README.md

@@ -87,6 +87,11 @@ drawer:
 - `device_apps` / `device_launch_app` — list installed packages (third-party by
   default) so a package name is never guessed / launch one by package or a
   unique substring, with `relaunch` for a cold start.
+- `device_intent` — open anything by Android intent: an `action` (e.g.
+  `android.settings.WIFI_SETTINGS`), a deep-link `uri` (`geo:`, `https://`,
+  `file://`), or an explicit `component` (`pkg/.Activity`). Reaches screens no
+  tap can address. Values are single-quoted for the device shell (apostrophes
+  escaped, control characters refused), so metacharacters stay inert.
 - `device_stream` — drive the live screen stream the panel shows: `start` an
   online device (returns a signed `streamUrl`), `status`, or `stop`. Agents that
   just need to see the screen should prefer `device_screen` / `device_ui_tree`.
@@ -133,6 +138,34 @@ the plain JSON summary (path + UI tree + OCR) with no new error.
   emulator binary, and what the plugin currently runs (preview servers, Metro,
   builds per directory).
 
+**Device-ultimate port (v0.6.0)** — tools ported from
+[dsh-adb-ultimate](https://github.com/newborne/dsh-adb-ultimate), rebuilt on the
+classified adb boundary (argv-based, quoted, replay-safe):
+
+- `device_scroll_to` — scroll until an element (`resource_id` or `text`/
+  content-desc, exact then substring) comes into view, then report it with its
+  center tap point. Completes the control loop for long lists: `device_wait_for`
+  waits without scrolling, this brings the element on-screen so a follow-up
+  `device_tap_element` can hit it. Defaults to 8 swipes, swipe direction
+  `up`/`left`.
+- `device_connect` — attach a Wi-Fi device: `adb connect <host>:<port>`
+  (default port 5555); pass `pairing_code` + `pairing_port` (default 37000) for
+  the first-time Android 11+ "Pair device" flow. Reattaching a known device
+  needs no code.
+- `device_pair_qr` — the full pairing journey in one call: generates a
+  `WIFI:T:ADB;S:...;P:...;;` QR string (render it with any QR generator and scan
+  with Settings → Connected devices → Pair by QR), polls `adb mdns services`
+  (adb ≥ 31) for `_adb-tls-pairing._tcp`, then auto-pairs and connects.
+- `device_perf` — one-shot RAM / battery / CPU snapshot (meminfo +
+  `dumpsys battery` + cpuinfo → used %, level/temp/status/health, cores).
+- `device_app_info` — per-app detail from `dumpsys package`: versionName/
+  versionCode, minSdk/targetSdk, requested permissions, exported activities.
+- `device_install` / `device_uninstall` — sideload a local APK
+  (`-r -g`: replace + grant runtime permissions) / remove an app (optionally
+  `-k` keep data). Uninstall is destructive.
+- `device_reboot` — reboot into `normal` / `recovery` / `bootloader`
+  (the device drops offline and comes back in a minute or two).
+
 **First-run experience & settings**
 
 - On first start after installation, a **welcome window** explains how to use the
@@ -148,6 +181,13 @@ the plain JSON summary (path + UI tree + OCR) with no new error.
     Fix button for auto-fixable checks (PaddleOCR install).
   - **PaddleOCR** — install status, progress log, and the install button.
   - **AI Prompt** — the copyable agent prompt.
+  - **Connection** — the resolved adb binary path and every device `adb` sees
+    (serial, state dot, model, USB / Wi-Fi badge), straight from
+    `GET /connection`. A **connect form** (device IP + port, optional pairing
+    code + pair port → `POST /connect`) and a **Pair by QR** button
+    (`POST /pair-qr`, one blocking call that generates the `WIFI:T:ADB` QR,
+    waits for the mDNS scan and auto-pairs + connects) plus an in-line refresh.
+    Explains the Wi-Fi reconnect policy.
 - The same settings appear as a **`MobileCode` page in the DSH Settings**
   (registered as a `settings.section` slot, like the other installed plugins),
   so they are reachable from Settings even when the Devices pane is closed.
@@ -159,7 +199,23 @@ the plain JSON summary (path + UI tree + OCR) with no new error.
 `directory` + `platform` body, mirroring mobilecode's `server.devicePreview`
 group — plus setup endpoints: `GET /welcome`, `POST /welcome/dismiss`,
 `GET /doctor`, `POST /doctor/fix {id}`, `GET /ocr`, `POST /ocr/install`,
-`GET/POST /settings`.
+`GET/POST /settings`, `GET /connection` — plus the Wi-Fi actions
+`POST /connect` (host/port/pairing code) and `POST /pair-qr` (mDNS QR flow).
+
+**One classified adb boundary** — every serial-targeted adb command runs through
+`adbRun()` in `lib/device-build.js`:
+
+- A transport failure (`device not found` / `offline` / `unauthorized` /
+  `closed` / `no devices`) on a **Wi-Fi serial** (`ip:port`) gets exactly ONE
+  `adb connect` retry. Read-only commands (the `replaySafeAdb` allowlist:
+  `exec-out`/`screencap`/`uiautomator`/`dumpsys`/`getprop`/`logcat`/`cat`/…)
+  then replay automatically; **side-effectful ones never do** — a replayed tap
+  could double-tap — they raise "reconnected — call again" instead.
+- USB serials and non-transport failures (a real `am start` error, a
+  `SecurityException`) surface as classified, actionable errors — the old
+  silent `capture()` → `""` swallowing is gone on agent-facing paths.
+- Tolerant internal callers (boot polling, IME checks) opt back into
+  best-effort with an explicit `.catch(() => "")`.
 
 ## How it works
 

package/lib/android-stream.js

@@ -247,7 +247,7 @@ export class AndroidStreamHost {
 
   async getRotation(serial) {
     try {
-      const value = Number((await DeviceBuild.capture(DeviceBuild.adb(), ['-s', serial, 'shell', 'settings', 'get', 'system', 'user_rotation'])).trim())
+      const value = Number((await DeviceBuild.adbRun(serial, ['shell', 'settings', 'get', 'system', 'user_rotation'])).trim())
       return ROTATION_CYCLE.includes(value) ? value : 0
     } catch {
       return 0
@@ -263,8 +263,7 @@ export class AndroidStreamHost {
   }
 
   async #shell(serial, shell) {
-    const code = await DeviceBuild.exec(DeviceBuild.adb(), ['-s', serial, 'shell', ...shell], { timeoutMs: CONTROL_TIMEOUT_MS }).exit
-    if (code !== 0) throw new Error(`adb shell ${shell.join(' ')} failed (exit ${code})`)
+    await DeviceBuild.adbRun(serial, ['shell', ...shell], { timeoutMs: CONTROL_TIMEOUT_MS })
   }
 
   async #keepAliveTick() {
@@ -371,7 +370,7 @@ export class AndroidStreamHost {
 
 /** Override-aware physical screen size for the non-streaming control fallback. */
 async function screenSize(serial) {
-  const output = await DeviceBuild.capture(DeviceBuild.adb(), ['-s', serial, 'shell', 'wm', 'size'])
+  const output = await DeviceBuild.adbRun(serial, ['shell', 'wm', 'size'])
   const match = /Override size:\s*(\d+)x(\d+)/.exec(output) ?? /Physical size:\s*(\d+)x(\d+)/.exec(output)
   if (!match) throw new Error(`cannot read the screen size of ${serial}`)
   return { width: Number(match[1]), height: Number(match[2]) }