@devries-cameron20 / t3code Mirror · read-only / commits / c3ece584f9
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 21, 07:15 UTC

fix(server): adb-attached Android devices stay listed when avdmanager fails (#38954)

Julius Marminge committed Nov 18, 2026 at 21:53 UTC c3ece584f9e061c58985e95c4d36220d0dd77d5f
2 files changed +114
apps/server/src/device/DeviceHubOperations.ts
+57
@@ -20,6 +20,9 @@ const LIST_TIMEOUT_SECONDS = 40;
20 const SIMULATOR_LIST_FAILED =
21 /^\[apple-utils\] (?:Failed to (?:run `xcrun simctl list devices|parse JSON output:|list devices:)|`xcrun simctl list devices --json` did not respond within )/;
22 // The hub passes numeric display IDs that Xcode 26 rejects; iOS 27 needs them for multiple displays.
23 +// expo-device-hub 0.22.1 returns no Android devices when avdmanager fails, before it runs adb.
24 +const AVDMANAGER_LIST_FAILED = "[android-utils] Failed to run `avdmanager list avd`";
25 +const GETPROP_LINE = /^\[([^\]]+)\]: \[(.*)\]$/;
26 const runsOnXcode26Runtime = (version: string) => Number(/^iOS (\d+)/.exec(version)?.[1]) <= 26;
27 const DEFAULT_DISPLAY_SCREENSHOT = `f=$(mktemp -t t3-screenshot) || exit 1
28 trap 'rm -f "$f"' 0
@@ -121,6 +124,51 @@ export const makeDeviceHubOperations = (options: {
124 Effect.flatMap((request) => hubJson(request, HubActionResult, "attach stream", BOOT_TIMEOUT)),
125 );
126
127 + // Mirrors the hub's own adb discovery for when it skips it.
128 + const listAdbDevices = Effect.gen(function* () {
129 + const listed = yield* run("adb", ["devices", "-l"]);
130 + if (listed.code !== 0) return undefined;
131 + const serials = listed.stdout
132 + .split(/\r?\n/)
133 + .map((line) => line.trim().split(/\s+/))
134 + .flatMap(([serial, state]) => (serial && state === "device" ? [serial] : []));
135 + return yield* Effect.forEach(serials, (serial) =>
136 + Effect.gen(function* () {
137 + const getprop = yield* run("adb", ["-s", serial, "shell", "getprop"]);
138 + const props = new Map(
139 + getprop.stdout.split(/\r?\n/).flatMap((line) => {
140 + const match = GETPROP_LINE.exec(line.trim());
141 + return match ? [[match[1]!, match[2]!] as const] : [];
142 + }),
143 + );
144 + const emulator = props.get("ro.kernel.qemu") === "1" || props.get("ro.boot.qemu") === "1";
145 + const avdName = emulator
146 + ? (yield* run("adb", ["-s", serial, "emu", "avd", "name"])).stdout
147 + .split(/\r?\n/)
148 + .map((line) => line.trim())
149 + .find((line) => line && line !== "OK" && !line.startsWith("KO"))
150 + : undefined;
151 + const model = props.get("ro.product.model");
152 + const manufacturer = props.get("ro.product.manufacturer");
153 + const release = props.get("ro.build.version.release");
154 + return {
155 + id: serial,
156 + name: emulator
157 + ? (avdName ?? serial)
158 + : model
159 + ? [manufacturer, model].filter(Boolean).join(" ")
160 + : serial,
161 + platform: "android",
162 + version: release
163 + ? `Android ${/^\d+$/.test(release) ? `${release}.0` : release}`
164 + : "Android",
165 + booted: true,
166 + physical: !emulator,
167 + } satisfies HostDevice;
168 + }),
169 + );
170 + });
171 +
172 const list: DeviceOperations["list"] = Effect.gen(function* () {
173 const listed = yield* fetchJson(
174 HttpClientRequest.get(`${origin}/api/devices`),
@@ -161,6 +209,15 @@ export const makeDeviceHubOperations = (options: {
209 }) ?? [];
210 let androidDiscoveryIncomplete = false;
211 if (androidAvailable) {
212 + if (hubList.errors?.some((error) => error.message.startsWith(AVDMANAGER_LIST_FAILED))) {
213 + const adbDevices = yield* listAdbDevices;
214 + if (adbDevices === undefined) {
215 + androidDiscoveryIncomplete = true;
216 + details.push("Could not list Android devices (adb devices -l).");
217 + } else {
218 + devices.push(...adbDevices);
219 + }
220 + }
221 const avds = yield* run("emulator", ["-list-avds"]);
222 // Discovered devices stay listed; the AVDs that could not be listed are a warning.
223 if (avds.code !== 0) {
apps/server/src/device/DeviceService.test.ts
+57
@@ -103,6 +103,63 @@ it.effect.each([400, 500])(
103 }),
104 );
105
106 +it.effect("lists adb-attached physical devices when the hub cannot run avdmanager", () =>
107 + Effect.gen(function* () {
108 + // expo-device-hub returns no Android devices at all once `avdmanager list avd` fails.
109 + const operations = makeDeviceHubOperations({
110 + hostId: LOCAL_DEVICE_HOST_ID,
111 + origin: "http://device.test",
112 + http: HttpClient.make((request) =>
113 + Effect.succeed(
114 + HttpClientResponse.fromWeb(
115 + request,
116 + Response.json({
117 + simulators: [],
118 + emulators: [],
119 + errors: [
120 + {
121 + id: "avd",
122 + message: "[android-utils] Failed to run `avdmanager list avd`:",
123 + error:
124 + "Error: Command failed: avdmanager list avd\nThe operation couldn’t be completed. Unable to locate a Java Runtime.",
125 + },
126 + ],
127 + }),
128 + ),
129 + ),
130 + ),
131 + run: (command, args) =>
132 + Effect.succeed(
133 + command === "adb" && args.includes("devices")
134 + ? {
135 + code: 0,
136 + stdout:
137 + "List of devices attached\nR52T10ABCDE device usb:1-1 product:gts9wifi model:SM_X710 device:gts9wifi transport_id:1\n\n",
138 + stderr: "",
139 + }
140 + : command === "adb" && args.includes("getprop")
141 + ? {
142 + code: 0,
143 + stdout:
144 + "[ro.product.manufacturer]: [samsung]\n[ro.product.model]: [SM-X710]\n[ro.build.version.release]: [15]\n",
145 + stderr: "",
146 + }
147 + : { code: 0, stdout: "", stderr: "" },
148 + ),
149 + platformAvailable: (platform) => Effect.succeed(platform === "android"),
150 + });
151 + const listed = yield* operations.list;
152 + expect(listed.devices).toContainEqual(
153 + expect.objectContaining({
154 + id: "R52T10ABCDE",
155 + platform: "android",
156 + booted: true,
157 + physical: true,
158 + }),
159 + );
160 + }),
161 +);
162 +
163 const fixture = Effect.fn("fixture")(function* (
164 onBoot: Effect.Effect<void> = Effect.void,
165 bootError?: string | { error?: string; errors?: Array<{ message: string; error?: string }> },