@houwert/conductor 0.13.0 → 0.14.0

package/dist/commands/install-app.js

@@ -4,6 +4,7 @@ exports.HELP = void 0;
 exports.installApp = installApp;
 exports.HELP = `  install-app <path>                   Install .app / .ipa / .apk onto device`;
 const runner_js_1 = require("../runner.js");
+const sdk_js_1 = require("../android/sdk.js");
 const session_js_1 = require("../session.js");
 const output_js_1 = require("../output.js");
 const bootstrap_js_1 = require("../drivers/bootstrap.js");
@@ -36,15 +37,7 @@ async function installApp(appPath, opts = {}, sessionName = 'default') {
         }
     }
     else {
-        const result = await (0, runner_js_1.spawnCommand)('adb', [
-            '-s',
-            deviceId,
-            'install',
-            '-r',
-            '-t',
-            '-g',
-            appPath,
-        ]);
+        const result = await (0, runner_js_1.spawnCommand)((0, sdk_js_1.resolveAndroidTool)('adb'), ['-s', deviceId, 'install', '-r', '-t', '-g', appPath], { env: (0, sdk_js_1.androidSpawnEnv)() });
         if (!result.success) {
             (0, output_js_1.printError)(`install-app failed: ${result.stderr}`, opts);
             return 1;

package/dist/commands/list-apps.js

@@ -4,6 +4,7 @@ exports.HELP = void 0;
 exports.listApps = listApps;
 exports.HELP = `  list-apps                           List installed app IDs / package names`;
 const runner_js_1 = require("../runner.js");
+const sdk_js_1 = require("../android/sdk.js");
 const session_js_1 = require("../session.js");
 const output_js_1 = require("../output.js");
 const bootstrap_js_1 = require("../drivers/bootstrap.js");
@@ -44,7 +45,7 @@ async function listApps(opts = {}, sessionName = 'default') {
         }
     }
     else {
-        const result = await (0, runner_js_1.spawnCommand)('adb', ['-s', deviceId, 'shell', 'pm', 'list', 'packages']);
+        const result = await (0, runner_js_1.spawnCommand)((0, sdk_js_1.resolveAndroidTool)('adb'), ['-s', deviceId, 'shell', 'pm', 'list', 'packages'], { env: (0, sdk_js_1.androidSpawnEnv)() });
         if (!result.success) {
             (0, output_js_1.printError)(`list-apps failed: ${result.stderr}`, opts);
             return 1;

package/dist/commands/list-devices.js

@@ -10,14 +10,21 @@ exports.listDevices = listDevices;
 exports.HELP = `  list-devices                        List booted and available devices/simulators`;
 const fs_1 = __importDefault(require("fs"));
 const runner_js_1 = require("../runner.js");
+const sdk_js_1 = require("../android/sdk.js");
 const output_js_1 = require("../output.js");
 const bootstrap_js_1 = require("../drivers/bootstrap.js");
 const client_js_1 = require("../daemon/client.js");
 const protocol_js_1 = require("../daemon/protocol.js");
+// Captured during discoverAvailableDevices so listDevices() can report it.
+// Module-scoped because the discover function returns Device[]; bolting an
+// extra return field onto the public type would ripple beyond this fix.
+let listAvdsError;
 async function discoverBootedDevices() {
     const devices = [];
     // Try adb devices (Android)
-    const adb = await (0, runner_js_1.spawnCommand)('adb', ['devices', '-l']);
+    const adb = await (0, runner_js_1.spawnCommand)((0, sdk_js_1.resolveAndroidTool)('adb'), ['devices', '-l'], {
+        env: (0, sdk_js_1.androidSpawnEnv)(),
+    });
     if (adb.success || adb.stdout.includes('List of devices')) {
         const lines = adb.stdout.split('\n').slice(1); // skip header
         for (const line of lines) {
@@ -85,6 +92,7 @@ async function discoverBootedDevices() {
 }
 async function discoverAvailableDevices() {
     const devices = [];
+    listAvdsError = undefined;
     // iOS: all available simulators that are not booted
     const xcrun = await (0, runner_js_1.spawnCommand)('xcrun', ['simctl', 'list', 'devices', '--json']);
     if (xcrun.success) {
@@ -108,7 +116,9 @@ async function discoverAvailableDevices() {
         }
     }
     // Android: list available AVDs
-    const emu = await (0, runner_js_1.spawnCommand)('emulator', ['-list-avds']);
+    const emu = await (0, runner_js_1.spawnCommand)((0, sdk_js_1.resolveAndroidTool)('emulator'), ['-list-avds'], {
+        env: (0, sdk_js_1.androidSpawnEnv)(),
+    });
     if (emu.success) {
         for (const line of emu.stdout.split('\n')) {
             const name = line.trim();
@@ -117,6 +127,11 @@ async function discoverAvailableDevices() {
             }
         }
     }
+    else {
+        // Surface the failure so users know why no AVDs showed up. Stash the
+        // message on the function for listDevices() to log/include.
+        listAvdsError = (emu.stderr || emu.stdout || 'unknown error').trim();
+    }
     // Web: installed Playwright browsers that aren't currently running
     const runningSessions = (0, client_js_1.listDaemonSessions)();
     const runningBrowsers = new Set(runningSessions.filter((s) => s === 'web' || s.startsWith('web:')).map((s) => (0, bootstrap_js_1.webBrowserName)(s)));
@@ -138,13 +153,22 @@ async function listDevices(opts) {
         discoverAvailableDevices(),
     ]);
     if (devices.length === 0 && availableDevices.length === 0) {
+        if (listAvdsError && !opts.json) {
+            console.error(`warning: emulator -list-avds failed: ${listAvdsError}`);
+        }
         (0, output_js_1.printError)('No devices found. Start an emulator or simulator first.', opts);
         return 1;
     }
     if (opts.json) {
-        (0, output_js_1.printData)({ status: 'ok', devices, availableDevices }, opts);
+        const payload = { status: 'ok', devices, availableDevices };
+        if (listAvdsError)
+            payload['warnings'] = [`emulator -list-avds failed: ${listAvdsError}`];
+        (0, output_js_1.printData)(payload, opts);
     }
     else {
+        if (listAvdsError) {
+            console.error(`warning: emulator -list-avds failed: ${listAvdsError}`);
+        }
         if (devices.length > 0) {
             console.log('Booted devices:');
             for (const d of devices) {