Orca is the place for working with a fleet of agents (e.g. Grok Bot, Claude Code). Run any coding agent with your own subscription. Available on desktop, mobile and remote runtime.
TypeScript adeagent-ideai-agentsautomationbotclaude-codecodexghosttygrok-bothermes-agentmobile-appmuseopenclawopencodeorchestrationpiruntimeterminalworktreesyc-backed
fix(emulator): run Android commands through the process host (#35599)
OrcaWin2d6ee2ab9bcf
diff --git a/config/process-host-direct-import-baseline.txt b/config/process-host-direct-import-baseline.txtindex f179b6bc8db..9c277c2eb8a 100644--- a/config/process-host-direct-import-baseline.txt+++ b/config/process-host-direct-import-baseline.txt@@ -33,7 +33,6 @@ src/main/daemon/daemon-process-identity-query.tssrc/main/daemon/daemon-process-inspection.tssrc/main/daemon/daemon-process-start-time.tssrc/main/emulator/android/android-avd-boot.ts-src/main/emulator/android/android-command-runner.tssrc/main/emulator/android/scrcpy-stream-session.tssrc/main/emulator/serve-sim-helper-processes.tssrc/main/emulator/serve-sim-runtime-materializer.tsdiff --git a/src/main/emulator/android/android-command-runner-native.test.ts b/src/main/emulator/android/android-command-runner-native.test.tsnew file mode 100644index 00000000000..0567cf49820--- /dev/null+++ b/src/main/emulator/android/android-command-runner-native.test.ts@@ -0,0 +1,21 @@+import { expect, it } from 'vitest'+import { execFileAndroidCommandRunner } from './android-command-runner'++it('preserves argument bytes and returns both output streams and nonzero exits as data', async () => {+ const args = ['space text', 'quote\'"', '$() & | ;', '漢🙂']+ const result = await execFileAndroidCommandRunner(process.execPath, [+ '-e',+ 'process.stdout.write(JSON.stringify(process.argv.slice(1))); process.stderr.write("stderr"); process.exitCode=7',+ ...args+ ])+ expect(result).toEqual({ stdout: JSON.stringify(args), stderr: 'stderr', code: 7 })+})++it('fails a command that exceeds its deadline', async () => {+ const result = await execFileAndroidCommandRunner(+ process.execPath,+ ['-e', 'setInterval(()=>{},1000)'],+ { timeoutMs: 500 }+ )+ expect(result).toEqual({ stdout: '', stderr: '', code: 1 })+})diff --git a/src/main/emulator/android/android-command-runner.ts b/src/main/emulator/android/android-command-runner.tsindex f4071edd66a..4bc7db8cca4 100644--- a/src/main/emulator/android/android-command-runner.ts+++ b/src/main/emulator/android/android-command-runner.ts@@ -1,4 +1,4 @@-import { execFile } from 'node:child_process'+import { runProcess } from '@orca/process-host'import { basename } from 'node:path'import { emulatorProbe, emulatorProbeError } from '../emulator-probe'@@ -14,35 +14,36 @@ export type AndroidCommandRunner = (const DEFAULT_TIMEOUT_MS = 60_000const MAX_BUFFER_BYTES = 16 * 1024 * 1024-export const execFileAndroidCommandRunner: AndroidCommandRunner = (binary, args, options) =>- new Promise((resolve) => {- execFile(- binary,- [...args],- { timeout: options?.timeoutMs ?? DEFAULT_TIMEOUT_MS, maxBuffer: MAX_BUFFER_BYTES },- (error, stdout, stderr) => {- const exitCode =- error && typeof (error as { code?: unknown }).code === 'number'- ? (error as { code: number }).code- : error- ? 1- : 0- const result = {- stdout: stdout?.toString() ?? '',- stderr: stderr?.toString() ?? '',- code: exitCode- }- if (exitCode === 0) {- emulatorProbe('cmd', { bin: basename(binary), args })- } else {- emulatorProbeError('cmd.fail', error ?? new Error(result.stderr || 'nonzero exit'), {- bin: basename(binary),- args,- code: exitCode,- stderr: result.stderr.slice(0, 400)- })- }- resolve(result)- }- )- })+export const execFileAndroidCommandRunner: AndroidCommandRunner = async (binary, args, options) => {+ const timeoutMs = options?.timeoutMs ?? DEFAULT_TIMEOUT_MS+ let result: AndroidCommandResult+ let failure: unknown+ try {+ const output = await runProcess({+ program: binary,+ args,+ timeoutMs: timeoutMs === 0 ? null : timeoutMs,+ maxOutputBytes: MAX_BUFFER_BYTES,+ killOnOutputLimit: true+ })+ result = {+ stdout: output.stdout,+ stderr: output.stderr,+ code: output.timedOut || output.outputTruncated ? 1 : (output.code ?? 1)+ }+ } catch (error) {+ failure = error+ result = { stdout: '', stderr: '', code: 1 }+ }+ if (result.code === 0) {+ emulatorProbe('cmd', { bin: basename(binary), args })+ } else {+ emulatorProbeError('cmd.fail', failure ?? new Error(result.stderr || 'nonzero exit'), {+ bin: basename(binary),+ args,+ code: result.code,+ stderr: result.stderr.slice(0, 400)+ })+ }+ return result+}