@devicecloud.dev/dcd 4.4.9 → 5.0.0-beta.1

package/dist/commands/cloud.js

@@ -1,30 +1,43 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable complexity */
-const core_1 = require("@oclif/core");
-const errors_1 = require("@oclif/core/lib/errors");
-const path = require("node:path");
-const constants_1 = require("../constants");
-const api_gateway_1 = require("../gateways/api-gateway");
-const methods_1 = require("../methods");
-const device_validation_service_1 = require("../services/device-validation.service");
-const execution_plan_service_1 = require("../services/execution-plan.service");
-const moropo_service_1 = require("../services/moropo.service");
-const report_download_service_1 = require("../services/report-download.service");
-const results_polling_service_1 = require("../services/results-polling.service");
-const test_submission_service_1 = require("../services/test-submission.service");
-const version_service_1 = require("../services/version.service");
-const compatibility_1 = require("../utils/compatibility");
-const expo_1 = require("../utils/expo");
-const styling_1 = require("../utils/styling");
-// Suppress punycode deprecation warning (caused by whatwg, supabase dependancy)
+import { defineCommand } from 'citty';
+import * as path from 'node:path';
+import { flags as allFlags } from '../constants.js';
+import { ApiError, ApiGateway } from '../gateways/api-gateway.js';
+import { uploadBinary, uploadFlowZip, verifyAppZip, writeJSONFile, } from '../methods.js';
+import { DeviceValidationService } from '../services/device-validation.service.js';
+import { plan } from '../services/execution-plan.service.js';
+import { buildTestMetadataMap, computeCommonRoot, } from '../services/flow-paths.js';
+import { MoropoService } from '../services/moropo.service.js';
+import { ReportDownloadService } from '../services/report-download.service.js';
+import { ResultsPollingService, RunFailedError, } from '../services/results-polling.service.js';
+import { telemetry } from '../services/telemetry.service.js';
+import { TestSubmissionService } from '../services/test-submission.service.js';
+import { VersionService } from '../services/version.service.js';
+import { EAndroidApiLevels, EAndroidDevices, EiOSDevices, EiOSVersions, } from '../types/domain/device.types.js';
+import { resolveAuth } from '../utils/auth.js';
+import { isCI } from '../utils/ci.js';
+import { CliError, coerceArray, getCliVersion, getUpgradeCommand, logger, parseIntFlag, validateEnum, } from '../utils/cli.js';
+import { fetchCompatibilityData, } from '../utils/compatibility.js';
+import { resolveApiUrl } from '../utils/config-store.js';
+import { downloadExpoUrl, extractTarGz, findAppBundle, isUrl } from '../utils/expo.js';
+import { colors, formatId, formatUrl, getConsoleUrl, } from '../utils/styling.js';
+import { ui } from '../utils/ui.js';
+// Suppress punycode deprecation warning (caused by whatwg, supabase dependency).
+// Every other warning must still reach the user — removeAllListeners drops
+// Node's default printer, so re-emit manually.
 process.removeAllListeners('warning');
 process.on('warning', (warning) => {
     if (warning.name === 'DeprecationWarning' &&
         warning.message.includes('punycode')) {
-        // Ignore punycode deprecation warnings
+        return;
     }
+    // eslint-disable-next-line no-console
+    console.warn(warning.stack ?? `${warning.name}: ${warning.message}`);
 });
+const DOWNLOAD_OPTIONS = ['ALL', 'FAILED'];
+const REPORT_OPTIONS = ['allure', 'html', 'html-detailed', 'junit'];
+const ORIENTATION_OPTIONS = ['0', '90'];
+const RUNNER_TYPE_OPTIONS = ['default', 'm4', 'm1', 'gpu1', 'cpu1'];
 /**
  * Primary CLI command for executing tests on DeviceCloud.
  * Orchestrates the complete test workflow:
@@ -37,80 +50,135 @@ process.on('warning', (warning) => {
  *
  * Replaces `maestro cloud` with DeviceCloud-specific functionality.
  */
-class Cloud extends core_1.Command {
-    static args = {
-        firstFile: core_1.Args.string({
+export const cloudCommand = defineCommand({
+    meta: {
+        name: 'cloud',
+        description: 'Test a Flow or set of Flows on devicecloud.dev (https://devicecloud.dev). Provide your application file and a folder with Maestro flows to run them in parallel on multiple devices. The command will block until all analyses have completed.',
+    },
+    args: {
+        ...allFlags,
+        firstFile: {
+            type: 'positional',
+            required: false,
             description: 'The binary file of the app to run your flow against, e.g. test.apk for android or test.app/.zip for ios',
-            hidden: true,
-            name: 'App file',
-        }),
-        secondFile: core_1.Args.string({
+        },
+        secondFile: {
+            type: 'positional',
+            required: false,
             description: 'The flow file to run against the app, e.g. test.yaml',
-            hidden: true,
-            name: 'Flow file',
-        }),
-    };
-    static description = `Test a Flow or set of Flows on devicecloud.dev (https://devicecloud.dev)\nProvide your application file and a folder with Maestro flows to run them in parallel on multiple devices in devicecloud.dev\nThe command will block until all analyses have completed`;
-    static enableJsonFlag = true;
-    static examples = ['<%= config.bin %> <%= command.id %>'];
-    static flags = constants_1.flags;
-    /** Service for device/OS compatibility validation */
-    deviceValidationService = new device_validation_service_1.DeviceValidationService();
-    /** Service for Moropo test framework integration */
-    moropoService = new moropo_service_1.MoropoService();
-    /** Service for downloading test reports and artifacts */
-    reportDownloadService = new report_download_service_1.ReportDownloadService();
-    /** Service for polling test results with 10-second intervals */
-    resultsPollingService = new results_polling_service_1.ResultsPollingService();
-    /** Service for submitting tests to the API */
-    testSubmissionService = new test_submission_service_1.TestSubmissionService();
-    /**
-     * Check for CLI updates and notify user if outdated
-     * Compares current version with latest npm release
-     * @returns Promise that resolves when version check is complete
-     */
-    versionCheck = async () => {
-        const latestVersion = await this.versionService.checkLatestCliVersion();
-        if (latestVersion &&
-            this.versionService.isOutdated(this.config.version, latestVersion)) {
-            this.log(`\n${styling_1.dividers.light}\n` +
-                `${styling_1.colors.warning('⚠')}  ${styling_1.colors.bold('Update Available')}\n` +
-                styling_1.colors.dim(`   A new version of the DeviceCloud CLI is available: `) + styling_1.colors.highlight(latestVersion) + `\n` +
-                styling_1.colors.dim(`   Run: `) + styling_1.colors.info(`npm install -g @devicecloud.dev/dcd@latest`) + `\n` +
-                `${styling_1.dividers.light}\n`);
-        }
-    };
-    /** Service for CLI version checking */
-    versionService = new version_service_1.VersionService();
-    /**
-     * Main command execution entry point
-     * Orchestrates the complete test submission and monitoring workflow
-     * @returns Promise that resolves when command execution is complete
-     * @throws RunFailedError if tests fail
-     * @throws Error for infrastructure or configuration errors
-     */
-    async run() {
+        },
+    },
+    // eslint-disable-next-line complexity
+    async run({ args }) {
+        const cliVersion = getCliVersion();
+        const deviceValidationService = new DeviceValidationService();
+        const moropoService = new MoropoService();
+        const reportDownloadService = new ReportDownloadService();
+        const resultsPollingService = new ResultsPollingService();
+        const testSubmissionService = new TestSubmissionService();
+        const versionService = new VersionService();
+        const versionCheck = async () => {
+            const latestVersion = await versionService.checkLatestCliVersion();
+            if (latestVersion && versionService.isOutdated(cliVersion, latestVersion)) {
+                out(ui.warn(colors.bold('Update available')));
+                out(ui.branch([
+                    `A new version of the DeviceCloud CLI is available: ${colors.highlight(latestVersion)}`,
+                    `${colors.dim('Run:')} ${colors.info(getUpgradeCommand())}`,
+                ]));
+            }
+        };
         let output = null;
-        // Store debug flag outside try/catch to access it in catch block
         let debugFlag = false;
         let jsonFile = false;
-        // Temp files created during Expo URL download / .tar.gz extraction — cleaned up in finally
+        let caughtError = null;
         const tempFiles = [];
+        // json is captured early so the progress-suppressor works if we fail before destructuring.
+        const jsonFlag = Boolean(args.json);
+        // Chatty progress logs are suppressed when --json is active so stdout stays parseable.
+        const out = (m) => {
+            if (!jsonFlag)
+                logger.log(m);
+        };
+        const warnOut = (m) => {
+            if (!jsonFlag)
+                logger.warn(m);
+        };
         try {
-            const { args, flags, raw } = await this.parse(Cloud);
-            let { 'android-api-level': androidApiLevel, 'android-device': androidDevice, apiKey: apiKeyFlag, apiUrl, 'app-binary-id': appBinaryId, 'app-file': appFile, 'app-url': appUrl, 'artifacts-path': artifactsPath, 'junit-path': junitPath, 'allure-path': allurePath, 'html-path': htmlPath, async, config: configFile, debug, 'device-locale': deviceLocale, 'download-artifacts': downloadArtifacts, 'dry-run': dryRun, env, 'exclude-flows': excludeFlows, 'exclude-tags': excludeTags, flows, 'google-play': googlePlay, 'ignore-sha-check': ignoreShaCheck, 'include-tags': includeTags, 'ios-device': iOSDevice, 'ios-version': iOSVersion, json, 'json-file-name': jsonFileName, 'maestro-version': maestroVersion, metadata, mitmHost, mitmPath, 'moropo-v1-api-key': moropoApiKey, name, orientation, quiet, report, retry, 'runner-type': runnerType, 'android-no-snapshot': androidNoSnapshot, branch: ghBranch, 'commit-sha': ghCommitSha, 'repo-name': ghRepoName, 'pr-number': ghPrNumber, 'pr-url': ghPrUrl, } = flags;
-            // Store debug flag for use in catch block
-            debugFlag = debug === true;
-            jsonFile = flags['json-file'] === true;
-            this.log(`CLI Version: ${this.config.version}`);
+            const apiKeyFlag = args['api-key'];
+            const apiUrl = resolveApiUrl(args['api-url']);
+            const appBinaryId = args['app-binary-id'];
+            const appFile = args['app-file'];
+            const appUrl = args['app-url'];
+            const artifactsPath = args['artifacts-path'];
+            const junitPath = args['junit-path'];
+            const allurePath = args['allure-path'];
+            const htmlPath = args['html-path'];
+            const async = Boolean(args.async);
+            const configFile = args.config;
+            const debug = Boolean(args.debug);
+            const deviceLocale = args['device-locale'];
+            const downloadArtifacts = validateEnum(args['download-artifacts'], DOWNLOAD_OPTIONS, 'download-artifacts');
+            const dryRun = Boolean(args['dry-run']);
+            const env = coerceArray(args.env, false);
+            const excludeFlows = coerceArray(args['exclude-flows']);
+            const excludeTags = coerceArray(args['exclude-tags']);
+            let flows = args.flows;
+            const googlePlay = Boolean(args['google-play']);
+            const ignoreShaCheck = Boolean(args['ignore-sha-check']);
+            const includeTags = coerceArray(args['include-tags']);
+            const iOSDevice = validateEnum(args['ios-device'], Object.values(EiOSDevices), 'ios-device');
+            const iOSVersion = validateEnum(args['ios-version'], Object.values(EiOSVersions), 'ios-version');
+            const androidApiLevel = validateEnum(args['android-api-level'], Object.values(EAndroidApiLevels), 'android-api-level');
+            const androidDevice = validateEnum(args['android-device'], Object.values(EAndroidDevices), 'android-device');
+            const androidNoSnapshot = Boolean(args['android-no-snapshot']);
+            const json = Boolean(args.json);
+            const jsonFileFlag = Boolean(args['json-file']);
+            const jsonFileName = args['json-file-name'];
+            const maestroVersion = args['maestro-version'];
+            const metadata = coerceArray(args.metadata, false);
+            const mitmHost = args.mitmHost;
+            const mitmPath = args.mitmPath;
+            const moropoApiKey = args['moropo-v1-api-key'];
+            const name = args.name;
+            const orientation = validateEnum(args.orientation, ORIENTATION_OPTIONS, 'orientation');
+            let quiet = Boolean(args.quiet);
+            const report = validateEnum(args.report, REPORT_OPTIONS, 'report');
+            let retry = parseIntFlag(args.retry, 'retry');
+            const runnerType = validateEnum(args['runner-type'], RUNNER_TYPE_OPTIONS, 'runner-type') ?? 'default';
+            const showCrosshairs = Boolean(args['show-crosshairs']);
+            const maestroChromeOnboarding = Boolean(args['maestro-chrome-onboarding']);
+            const disableAnimations = Boolean(args['disable-animations']);
+            const ghBranch = args.branch;
+            const ghCommitSha = args['commit-sha'];
+            const ghRepoName = args['repo-name'];
+            const ghPrNumber = args['pr-number'];
+            const ghPrUrl = args['pr-url'];
+            debugFlag = debug;
+            jsonFile = jsonFileFlag;
+            out(colors.dim(`dcd v${cliVersion}`));
             if (debug) {
-                this.log('[DEBUG] Starting command execution with debug logging enabled');
-                this.log(`[DEBUG] Node version: ${process.versions.node}`);
-                this.log(`[DEBUG] OS: ${process.platform} ${process.arch}`);
+                out('[DEBUG] Starting command execution with debug logging enabled');
+                out(`[DEBUG] Node version: ${process.versions.node}`);
+                out(`[DEBUG] OS: ${process.platform} ${process.arch}`);
             }
-            if (flags['json-file']) {
+            if (jsonFileFlag) {
                 quiet = true;
-                this.log('--json-file is true: JSON output will be written to file, forcing --quiet flag for better CI output');
+                out('--json-file is true: JSON output will be written to file, forcing --quiet flag for better CI output');
+            }
+            if (mitmPath && !mitmHost) {
+                throw new CliError('--mitmPath requires --mitmHost to be set');
+            }
+            if (jsonFileName && !jsonFileFlag) {
+                throw new CliError('--json-file-name requires --json-file');
+            }
+            if (artifactsPath && !downloadArtifacts) {
+                throw new CliError('--artifacts-path requires --download-artifacts');
+            }
+            if ((junitPath || allurePath || htmlPath) && !report) {
+                throw new CliError('Report path flags (--junit-path/--allure-path/--html-path) require --report');
+            }
+            if (appFile && appUrl) {
+                throw new CliError('--app-file and --app-url are mutually exclusive');
             }
             if (json) {
                 const originalStdoutWrite = process.stdout.write;
@@ -124,119 +192,118 @@ class Cloud extends core_1.Command {
             }
             const [major] = process.versions.node.split('.').map(Number);
             if (major < 20) {
-                this.warn(`WARNING: You are using node version ${major}. DeviceCloud requires node version 20 or later`);
+                warnOut(`WARNING: You are using node version ${major}. DeviceCloud requires node version 20 or later`);
                 if (major < 18) {
-                    throw new Error('Invalid node version');
+                    throw new CliError('Invalid node version');
                 }
             }
-            await this.versionCheck();
-            // Download and expand Moropo zip if API key is present
+            await versionCheck();
             if (moropoApiKey) {
-                flows = await this.moropoService.downloadAndExtract({
+                flows = await moropoService.downloadAndExtract({
                     apiKey: moropoApiKey,
                     branchName: 'main',
                     debug,
                     json,
-                    logger: this.log.bind(this),
+                    logger: (m) => out(m),
                     quiet,
                 });
+                tempFiles.push(flows);
+            }
+            const auth = await resolveAuth({ apiKeyFlag });
+            // Nudge interactive api-key users toward `dcd login`, which unlocks live
+            // (realtime) status updates. Suppressed in CI and non-interactive output.
+            if (auth.mode === 'apiKey' && !json && !quiet && !isCI()) {
+                out(colors.dim('Tip: run `dcd login` for live test updates and a smoother experience than passing --api-key.'));
             }
-            const apiKey = apiKeyFlag || process.env.DEVICE_CLOUD_API_KEY;
-            if (!apiKey)
-                throw new Error('You must provide an API key via --api-key flag or DEVICE_CLOUD_API_KEY environment variable');
-            // Fetch compatibility data from API
             let compatibilityData;
             try {
-                compatibilityData = await (0, compatibility_1.fetchCompatibilityData)(apiUrl, apiKey);
+                compatibilityData = await fetchCompatibilityData(apiUrl, auth);
                 if (debug) {
-                    this.log('[DEBUG] Successfully fetched compatibility data from API');
+                    out('[DEBUG] Successfully fetched compatibility data from API');
                 }
             }
             catch (error) {
                 const errorMessage = error instanceof Error ? error.message : String(error);
                 if (debug) {
-                    this.log(`[DEBUG] Failed to fetch compatibility data from API: ${errorMessage}`);
+                    out(`[DEBUG] Failed to fetch compatibility data from API: ${errorMessage}`);
                 }
-                throw new Error(`Failed to fetch device compatibility data: ${errorMessage}. Please check your API key and connection.`);
+                throw new CliError(`Failed to fetch device compatibility data: ${errorMessage}. Please check your API key and connection.`);
             }
             if (debug) {
-                this.log(`[DEBUG] API URL: ${apiUrl}`);
+                out(`[DEBUG] API URL: ${apiUrl}`);
             }
-            // Resolve and validate Maestro version using API data
-            const resolvedMaestroVersion = this.versionService.resolveMaestroVersion(maestroVersion, compatibilityData, {
+            const resolvedMaestroVersion = versionService.resolveMaestroVersion(maestroVersion, compatibilityData, {
                 debug,
-                logger: this.log.bind(this),
+                logger: (m) => out(m),
             });
             const REMOVED_MAESTRO_VERSIONS = ['1.39.1', '1.39.2', '1.39.7', '2.0.3', '2.4.0'];
             if (REMOVED_MAESTRO_VERSIONS.includes(resolvedMaestroVersion)) {
-                this.error(`Maestro version ${resolvedMaestroVersion} is no longer supported. ` +
+                throw new CliError(`Maestro version ${resolvedMaestroVersion} is no longer supported. ` +
                     `Please upgrade to a newer version. See: https://docs.devicecloud.dev/configuration/maestro-versions`);
             }
-            const DEPRECATED_MAESTRO_VERSIONS = ['1.39.5', '1.41.0'];
-            if (DEPRECATED_MAESTRO_VERSIONS.includes(resolvedMaestroVersion)) {
-                this.log(styling_1.colors.warning('⚠') + '  ' + styling_1.colors.dim(`Maestro version ${resolvedMaestroVersion} will be deprecated on 26th June 2026 and will ` +
-                    `no longer be available. We recommend upgrading to 2.6.0. ` +
-                    `See: https://docs.devicecloud.dev/configuration/maestro-versions`));
-            }
-            if (retry && retry > 2) {
-                this.log(styling_1.colors.warning('⚠') + '  ' + styling_1.colors.dim("Retries are now free of charge but limited to 2. If your test is still failing after 2 retries, please ask for help on Discord."));
-                flags.retry = 2;
+            if (retry !== undefined && retry > 2) {
+                out(ui.warn('Retries are now free of charge but limited to 2. If your test is still failing after 2 retries, please ask for help on Discord.'));
                 retry = 2;
             }
             if (runnerType === 'm4') {
-                this.log(styling_1.colors.info('ℹ') + '  ' + styling_1.colors.dim('Note: runnerType m4 is experimental and currently supports iOS only, Android will revert to default.'));
+                out(ui.info('runnerType m4 is experimental and currently supports iOS only, Android will revert to default.'));
             }
             if (runnerType === 'm1') {
-                this.log(styling_1.colors.info('ℹ') + '  ' + styling_1.colors.dim('Note: runnerType m1 is experimental and currently supports Android (Pixel 7, API Level 34) only.'));
+                out(ui.info('runnerType m1 is experimental and currently supports Android (Pixel 7, API Level 34) only.'));
             }
             if (runnerType === 'gpu1') {
-                this.log(styling_1.colors.info('ℹ') + '  ' + styling_1.colors.dim('Note: runnerType gpu1 is Android-only (all devices, API Level 34 or 35), available to all users.'));
+                out(ui.info('runnerType gpu1 is Android-only (all devices, API Level 34 or 35), available to all users.'));
             }
-            const { firstFile, secondFile } = args;
+            const firstFile = args.firstFile;
+            const secondFile = args.secondFile;
             let finalBinaryId = appBinaryId;
             let finalAppFile = appFile ?? (appUrl ?? firstFile);
             let flowFile = flows ?? secondFile;
-            // Resolve --app-url or a local .tar.gz to a .app path before validation
             if (finalAppFile && !appBinaryId) {
-                if ((0, expo_1.isUrl)(finalAppFile)) {
-                    this.log(`   ${styling_1.colors.dim('→ Downloading Expo build from URL...')}`);
-                    const tarPath = await (0, expo_1.downloadExpoUrl)(finalAppFile, debug ?? false);
+                if (isUrl(finalAppFile)) {
+                    out(`   ${colors.dim('→ Downloading Expo build from URL...')}`);
+                    const tarPath = await downloadExpoUrl(finalAppFile, debug);
                     tempFiles.push(tarPath);
                     finalAppFile = tarPath;
                 }
                 if (finalAppFile.endsWith('.tar.gz')) {
-                    this.log(`   ${styling_1.colors.dim('→ Extracting Expo archive...')}`);
-                    const extractDir = await (0, expo_1.extractTarGz)(finalAppFile, debug ?? false);
+                    out(`   ${colors.dim('→ Extracting Expo archive...')}`);
+                    const extractDir = await extractTarGz(finalAppFile, debug);
                     tempFiles.push(extractDir);
-                    finalAppFile = await (0, expo_1.findAppBundle)(extractDir);
+                    finalAppFile = await findAppBundle(extractDir);
                     if (debug) {
-                        this.log(`[DEBUG] Found .app bundle at: ${finalAppFile}`);
+                        out(`[DEBUG] Found .app bundle at: ${finalAppFile}`);
                     }
                 }
             }
             if (debug) {
-                this.log(`[DEBUG] First file argument: ${firstFile || 'not provided'}`);
-                this.log(`[DEBUG] Second file argument: ${secondFile || 'not provided'}`);
-                this.log(`[DEBUG] App binary ID: ${appBinaryId || 'not provided'}`);
-                this.log(`[DEBUG] App file: ${finalAppFile || 'not provided'}`);
-                this.log(`[DEBUG] Flow file: ${flowFile || 'not provided'}`);
+                out(`[DEBUG] First file argument: ${firstFile || 'not provided'}`);
+                out(`[DEBUG] Second file argument: ${secondFile || 'not provided'}`);
+                out(`[DEBUG] App binary ID: ${appBinaryId || 'not provided'}`);
+                out(`[DEBUG] App file: ${finalAppFile || 'not provided'}`);
+                out(`[DEBUG] Flow file: ${flowFile || 'not provided'}`);
             }
             if (appBinaryId) {
                 if (secondFile) {
-                    throw new Error('You cannot provide both an appBinaryId and a binary file');
+                    throw new CliError('You cannot provide both an appBinaryId and a binary file');
                 }
                 flowFile = flows ?? firstFile;
             }
+            else if ((appFile || appUrl) && !flowFile) {
+                // The app came from a flag, so the first positional (if any) is the
+                // flow file — previously it was silently dropped.
+                flowFile = firstFile;
+            }
             if (!flowFile) {
-                throw new Error('You must provide a flow file');
+                throw new CliError('You must provide a flow file');
             }
-            // Validate iOS device configuration
-            this.deviceValidationService.validateiOSDevice(iOSVersion, iOSDevice, compatibilityData, { debug, logger: this.log.bind(this) });
-            // Validate Android device configuration
-            this.deviceValidationService.validateAndroidDevice(androidApiLevel, androidDevice, googlePlay, compatibilityData, { debug, logger: this.log.bind(this) });
-            // Warn if maestro-chrome-onboarding flag is used without Android devices
-            if (flags['maestro-chrome-onboarding'] && !androidApiLevel && !androidDevice) {
-                this.warn('The --maestro-chrome-onboarding flag only applies to Android tests and will be ignored for iOS tests.');
+            deviceValidationService.validateiOSDevice(iOSVersion, iOSDevice, compatibilityData, {
+                debug,
+                logger: (m) => out(m),
+            });
+            deviceValidationService.validateAndroidDevice(androidApiLevel, androidDevice, googlePlay, compatibilityData, { debug, logger: (m) => out(m) });
+            if (maestroChromeOnboarding && !androidApiLevel && !androidDevice) {
+                warnOut('The --maestro-chrome-onboarding flag only applies to Android tests and will be ignored for iOS tests.');
             }
             flowFile = path.resolve(flowFile);
             if (!flowFile?.endsWith('.yaml') &&
@@ -245,153 +312,133 @@ class Cloud extends core_1.Command {
                 flowFile += '/';
             }
             if (debug) {
-                this.log(`[DEBUG] Resolved flow file path: ${flowFile}`);
+                out(`[DEBUG] Resolved flow file path: ${flowFile}`);
             }
             let executionPlan;
             try {
                 if (debug) {
-                    this.log('[DEBUG] Generating execution plan...');
+                    out('[DEBUG] Generating execution plan...');
                 }
-                executionPlan = await (0, execution_plan_service_1.plan)({
+                executionPlan = await plan({
                     input: flowFile,
-                    includeTags: includeTags.flat(),
-                    excludeTags: excludeTags.flat(),
-                    excludeFlows: excludeFlows.flat(),
+                    includeTags,
+                    excludeTags,
+                    excludeFlows,
                     configFile,
                     debug,
                 });
                 if (debug) {
-                    this.log(`[DEBUG] Execution plan generated`);
-                    this.log(`[DEBUG] Total flow files: ${executionPlan.totalFlowFiles}`);
-                    this.log(`[DEBUG] Flows to run: ${executionPlan.flowsToRun.length}`);
-                    this.log(`[DEBUG] Referenced files: ${executionPlan.referencedFiles.length}`);
-                    this.log(`[DEBUG] Sequential flows: ${executionPlan.sequence?.flows.length || 0}`);
+                    out(`[DEBUG] Execution plan generated`);
+                    out(`[DEBUG] Total flow files: ${executionPlan.totalFlowFiles}`);
+                    out(`[DEBUG] Flows to run: ${executionPlan.flowsToRun.length}`);
+                    out(`[DEBUG] Referenced files: ${executionPlan.referencedFiles.length}`);
+                    out(`[DEBUG] Sequential flows: ${executionPlan.sequence?.flows.length || 0}`);
                 }
             }
             catch (error) {
                 if (debug) {
-                    this.log(`[DEBUG] Error generating execution plan: ${error}`);
+                    out(`[DEBUG] Error generating execution plan: ${error}`);
                 }
                 throw error;
             }
             const { allExcludeTags, allIncludeTags, flowMetadata, flowOverrides, flowsToRun: testFileNames, referencedFiles, sequence, } = executionPlan;
             if (debug) {
-                this.log(`[DEBUG] All include tags: ${allIncludeTags?.join(', ') || 'none'}`);
-                this.log(`[DEBUG] All exclude tags: ${allExcludeTags?.join(', ') || 'none'}`);
-                this.log(`[DEBUG] Test file names: ${testFileNames.join(', ')}`);
-            }
-            const pathsShortestToLongest = [
-                ...testFileNames,
-                ...referencedFiles,
-            ].sort((a, b) => a.split(path.sep).length - b.split(path.sep).length);
-            let commonRoot = path.parse(process.cwd()).root;
-            const folders = pathsShortestToLongest[0].split(path.sep);
-            for (const [index] of folders.entries()) {
-                const folderPath = folders.slice(0, index).join(path.sep);
-                const isRoot = pathsShortestToLongest.every((file) => file.startsWith(folderPath));
-                if (isRoot)
-                    commonRoot = folderPath;
+                out(`[DEBUG] All include tags: ${allIncludeTags?.join(', ') || 'none'}`);
+                out(`[DEBUG] All exclude tags: ${allExcludeTags?.join(', ') || 'none'}`);
+                out(`[DEBUG] Test file names: ${testFileNames.join(', ')}`);
             }
+            const commonRoot = computeCommonRoot(testFileNames, referencedFiles);
             if (debug) {
-                this.log(`[DEBUG] Common root directory: ${commonRoot}`);
-            }
-            // Build testMetadataMap from flowMetadata (keyed by normalized test file name)
-            // This map provides flowName and tags for each test for JSON output
-            const testMetadataMap = {};
-            for (const [absolutePath, metadata] of Object.entries(flowMetadata)) {
-                // Normalize the path to match the format used in results (e.g., "./flows/test.yaml")
-                const normalizedPath = absolutePath.replaceAll(commonRoot, '.').split(path.sep).join('/');
-                const metadataRecord = metadata;
-                const flowName = metadataRecord?.name || path.parse(absolutePath).name;
-                const rawTags = metadataRecord?.tags;
-                const tags = Array.isArray(rawTags) ? rawTags.map(String) : (rawTags ? [String(rawTags)] : []);
-                testMetadataMap[normalizedPath] = { flowName, tags };
+                out(`[DEBUG] Common root directory: ${commonRoot}`);
             }
+            const testMetadataMap = buildTestMetadataMap(flowMetadata, commonRoot);
             if (debug) {
-                this.log(`[DEBUG] Built testMetadataMap for ${Object.keys(testMetadataMap).length} flows`);
+                out(`[DEBUG] Built testMetadataMap for ${Object.keys(testMetadataMap).length} flows`);
             }
             const { continueOnFailure = true, flows: sequentialFlows = [] } = sequence ?? {};
             if (debug && sequentialFlows.length > 0) {
-                this.log(`[DEBUG] Sequential flows: ${sequentialFlows.join(', ')}`);
-                this.log(`[DEBUG] Continue on failure: ${continueOnFailure}`);
+                out(`[DEBUG] Sequential flows: ${sequentialFlows.join(', ')}`);
+                out(`[DEBUG] Continue on failure: ${continueOnFailure}`);
             }
             if (!appBinaryId) {
                 if (!(flowFile && finalAppFile)) {
-                    throw new Error('You must provide a flow file and an app binary id');
+                    throw new CliError('You must provide a flow file and an app binary id');
                 }
-                if (!['apk', '.app', '.zip', '.tar.gz'].some((ext) => finalAppFile.endsWith(ext))) {
-                    throw new Error('App file must be a .apk for Android, .app/.zip for iOS, or .tar.gz (Expo iOS build)');
+                if (!['.apk', '.app', '.zip', '.tar.gz'].some((ext) => finalAppFile.endsWith(ext))) {
+                    throw new CliError('App file must be a .apk for Android, .app/.zip for iOS, or .tar.gz (Expo iOS build)');
                 }
                 if (finalAppFile.endsWith('.zip')) {
                     if (debug) {
-                        this.log(`[DEBUG] Verifying iOS app zip file: ${finalAppFile}`);
+                        out(`[DEBUG] Verifying iOS app zip file: ${finalAppFile}`);
                     }
-                    await (0, methods_1.verifyAppZip)(finalAppFile);
+                    await verifyAppZip(finalAppFile);
                 }
             }
             const flagLogs = [];
-            const sensitiveFlags = new Set(['api-key', 'apiKey', 'moropo-v1-api-key']);
-            for (const [k, v] of Object.entries(flags)) {
-                if (v && v.toString().length > 0 && !sensitiveFlags.has(k)) {
-                    flagLogs.push(`${k}: ${v}`);
+            // app-url carries a signed (bearer-style) download URL — treat as secret.
+            const sensitiveFlags = new Set([
+                'api-key',
+                'apiKey',
+                'moropo-v1-api-key',
+                'app-url',
+                'appUrl',
+            ]);
+            // Only log canonical flag keys (skip citty-populated alias duplicates like apiURL/apiUrl).
+            const canonicalFlagKeys = new Set(Object.keys(allFlags));
+            for (const [k, v] of Object.entries(args)) {
+                if (!canonicalFlagKeys.has(k))
+                    continue;
+                if (v === undefined || v === null || v === false)
+                    continue;
+                const asString = String(v);
+                if (asString.length > 0 && !sensitiveFlags.has(k)) {
+                    flagLogs.push(`${k}: ${asString}`);
                 }
             }
-            // Format overrides information
             const overridesEntries = Object.entries(flowOverrides);
             const hasOverrides = overridesEntries.some(([, overrides]) => Object.keys(overrides).length > 0);
-            let overridesLog = '';
-            if (hasOverrides) {
-                overridesLog = '\n\n   ' + styling_1.colors.bold('With overrides');
-                for (const [flowPath, overrides] of overridesEntries) {
-                    if (Object.keys(overrides).length > 0) {
-                        const relativePath = flowPath.replace(process.cwd(), '.');
-                        overridesLog += `\n   ${styling_1.colors.dim('→')} ${relativePath}:`;
-                        for (const [key, value] of Object.entries(overrides)) {
-                            overridesLog += `\n     ${styling_1.colors.dim(key + ':')} ${styling_1.colors.highlight(value)}`;
-                        }
-                    }
-                }
-            }
-            this.log(`\n${(0, styling_1.sectionHeader)('Submitting new job')}`);
-            this.log(`   ${styling_1.colors.dim('→ Flow(s):')} ${styling_1.colors.highlight(flowFile)}`);
-            this.log(`   ${styling_1.colors.dim('→ App:')} ${styling_1.colors.highlight(appBinaryId || finalAppFile)}`);
+            const submitRows = ui.fields([
+                ['flow(s)', colors.highlight(flowFile)],
+                ['app', colors.highlight(appBinaryId || finalAppFile || '')],
+            ]);
             if (flagLogs.length > 0) {
-                this.log(`\n   ${styling_1.colors.bold('With options')}`);
-                for (const flagLog of flagLogs) {
+                submitRows.push('', colors.bold('Options'));
+                submitRows.push(...ui.fields(flagLogs.map((flagLog) => {
                     const [key, ...valueParts] = flagLog.split(': ');
-                    const value = valueParts.join(': ');
-                    this.log(`   ${styling_1.colors.dim('→ ' + key + ':')} ${styling_1.colors.highlight(value)}`);
-                }
+                    return [key, colors.highlight(valueParts.join(': '))];
+                })));
             }
             if (hasOverrides) {
-                this.log(overridesLog);
+                submitRows.push('', colors.bold('Overrides'));
+                for (const [flowPath, overrides] of overridesEntries) {
+                    if (Object.keys(overrides).length === 0) {
+                        continue;
+                    }
+                    submitRows.push(colors.dim(`${flowPath.replace(process.cwd(), '.')}:`));
+                    submitRows.push(...ui.fields(Object.entries(overrides).map(([key, value]) => [key, colors.highlight(String(value))])));
+                }
             }
-            this.log('');
+            out(ui.section('Submitting new job'));
+            out(ui.branch(submitRows));
             if (dryRun) {
-                this.log(`\n${styling_1.colors.warning('⚠')}  ${styling_1.colors.bold('Dry run mode')} ${styling_1.colors.dim('- no tests were actually triggered')}\n`);
-                this.log(styling_1.colors.bold('The following tests would have been run:'));
-                this.log(styling_1.dividers.light);
-                for (const test of testFileNames) {
-                    this.log((0, styling_1.listItem)(test));
-                }
+                out(ui.warn(`${colors.bold('Dry run mode')} ${colors.dim('— no tests were actually triggered')}`));
+                out(ui.section('The following tests would have been run'));
+                out(ui.branch(testFileNames));
                 if (sequentialFlows.length > 0) {
-                    this.log(`\n${styling_1.colors.bold('Sequential flows:')}`);
-                    this.log(styling_1.dividers.short);
-                    for (const flow of sequentialFlows) {
-                        this.log((0, styling_1.listItem)(flow));
-                    }
+                    out(ui.section('Sequential flows'));
+                    out(ui.branch(sequentialFlows));
                 }
-                this.log('\n');
                 return;
             }
             if (!finalBinaryId) {
-                if (!finalAppFile)
-                    throw new Error('You must provide either an app binary id or an app file');
+                if (!finalAppFile) {
+                    throw new CliError('You must provide either an app binary id or an app file');
+                }
                 if (debug) {
-                    this.log(`[DEBUG] Uploading binary file: ${finalAppFile}`);
+                    out(`[DEBUG] Uploading binary file: ${finalAppFile}`);
                 }
-                const binaryId = await (0, methods_1.uploadBinary)({
-                    apiKey,
+                const binaryId = await uploadBinary({
+                    auth,
                     apiUrl,
                     debug,
                     filePath: finalAppFile,
@@ -400,12 +447,11 @@ class Cloud extends core_1.Command {
                 });
                 finalBinaryId = binaryId;
                 if (debug) {
-                    this.log(`[DEBUG] Binary uploaded with ID: ${binaryId}`);
+                    out(`[DEBUG] Binary uploaded with ID: ${binaryId}`);
                 }
             }
-            // finalBinaryId should always be defined after validation - fail fast if not
             if (!finalBinaryId) {
-                throw new Error('Internal error: finalBinaryId should be defined after validation');
+                throw new CliError('Internal error: finalBinaryId should be defined after validation');
             }
             const ghMetadataOverrides = [];
             if (ghBranch)
@@ -418,14 +464,13 @@ class Cloud extends core_1.Command {
                 ghMetadataOverrides.push(`gh_pr_number=${ghPrNumber}`);
             if (ghPrUrl)
                 ghMetadataOverrides.push(`gh_pr_url=${ghPrUrl}`);
-            // Explicit --metadata values take precedence (last-write-wins in parseKeyValuePairs)
-            const mergedMetadata = [...ghMetadataOverrides, ...(metadata ?? [])];
-            const testFormData = await this.testSubmissionService.buildTestFormData({
+            const mergedMetadata = [...ghMetadataOverrides, ...metadata];
+            const { buffer, fields } = await testSubmissionService.buildTestPayload({
                 androidApiLevel,
                 androidDevice,
                 androidNoSnapshot,
                 appBinaryId: finalBinaryId,
-                cliVersion: this.config.version,
+                cliVersion,
                 commonRoot,
                 continueOnFailure,
                 debug,
@@ -436,156 +481,206 @@ class Cloud extends core_1.Command {
                 googlePlay,
                 iOSDevice,
                 iOSVersion,
-                logger: this.log.bind(this),
+                logger: (m) => out(m),
                 maestroVersion: resolvedMaestroVersion,
                 metadata: mergedMetadata,
                 mitmHost,
                 mitmPath,
                 name,
                 orientation,
-                raw,
+                raw: [],
                 report,
                 retry,
                 runnerType,
-                showCrosshairs: flags['show-crosshairs'],
-                maestroChromeOnboarding: flags['maestro-chrome-onboarding'],
-                disableAnimations: flags['disable-animations'],
+                showCrosshairs,
+                maestroChromeOnboarding,
+                disableAnimations,
             });
-            if (debug) {
-                this.log(`[DEBUG] Submitting flow upload request to ${apiUrl}/uploads/flow`);
+            // New path: upload the zip directly to storage, then submit a JSON test
+            // referencing it. Older API deployments lack these endpoints — a real API
+            // 404s (route undefined), some proxies 405 (path/method not allowed); in
+            // either case fall back to the legacy multipart POST /uploads/flow, which
+            // is byte-identical bar the storage reference.
+            let response;
+            try {
+                const storageRef = await uploadFlowZip({ apiUrl, auth, buffer, debug });
+                if (debug) {
+                    out(`[DEBUG] Flow zip uploaded (id=${storageRef.id}, supabase=${storageRef.supabaseSuccess}, backblaze=${storageRef.backblazeSuccess})`);
+                    out(`[DEBUG] Submitting flow test to ${apiUrl}/uploads/submitFlowTest`);
+                }
+                response = await ApiGateway.submitFlowTest(apiUrl, auth, {
+                    ...fields,
+                    ...storageRef,
+                });
+            }
+            catch (error) {
+                if (error instanceof ApiError &&
+                    (error.status === 404 || error.status === 405)) {
+                    if (debug) {
+                        out(`[DEBUG] Client-direct flow upload unavailable (HTTP ${error.status}); falling back to multipart ${apiUrl}/uploads/flow`);
+                    }
+                    const testFormData = testSubmissionService.buildFormData(fields, buffer);
+                    response = await ApiGateway.uploadFlow(apiUrl, auth, testFormData);
+                }
+                else {
+                    throw error;
+                }
             }
-            const { message, results } = await api_gateway_1.ApiGateway.uploadFlow(apiUrl, apiKey, testFormData);
+            const { message, results } = response;
             if (debug) {
-                this.log(`[DEBUG] Flow upload response received`);
-                this.log(`[DEBUG] Message: ${message}`);
-                this.log(`[DEBUG] Results count: ${results?.length || 0}`);
+                out(`[DEBUG] Flow submission response received`);
+                out(`[DEBUG] Message: ${message}`);
+                out(`[DEBUG] Results count: ${results?.length || 0}`);
+            }
+            if (!results?.length) {
+                throw new CliError('No tests created: ' + message);
             }
-            if (!results?.length)
-                (0, errors_1.error)('No tests created: ' + message);
-            this.log(styling_1.colors.success('✓') + '  ' + styling_1.colors.dim(message));
+            out(`${ui.success('Submitted')} ${colors.dim(message)}`);
             const testNames = results
                 .map((r) => r.test_file_name)
                 .sort((a, b) => a.localeCompare(b))
-                .join(styling_1.colors.dim(', '));
-            this.log(`\n${styling_1.colors.bold(`Created ${results.length} test${results.length === 1 ? '' : 's'}:`)} ${testNames}\n`);
-            const url = (0, styling_1.getConsoleUrl)(apiUrl, results[0].test_upload_id, results[0].id);
-            this.log(styling_1.colors.bold('Run triggered') + styling_1.colors.dim(', you can access the results at:'));
-            this.log((0, styling_1.formatUrl)(url));
-            this.log(``);
-            this.log(styling_1.colors.dim('Your upload ID is: ') + (0, styling_1.formatId)(results[0].test_upload_id));
-            this.log(styling_1.colors.dim('Poll upload status using: ') + styling_1.colors.info(`dcd status --api-key ... --upload-id ${results[0].test_upload_id}`));
+                .join(colors.dim(', '));
+            const url = getConsoleUrl(apiUrl, results[0].test_upload_id, results[0].id);
+            out(ui.section(`Created ${results.length} test${results.length === 1 ? '' : 's'}`));
+            out(ui.branch([
+                testNames,
+                ...ui.fields([
+                    ['results', formatUrl(url)],
+                    ['upload id', formatId(results[0].test_upload_id)],
+                    [
+                        'poll status',
+                        colors.info(`dcd status --upload-id ${results[0].test_upload_id}`),
+                    ],
+                ]),
+            ]));
             if (async) {
                 if (debug) {
-                    this.log(`[DEBUG] Async flag is set, not waiting for results`);
+                    out(`[DEBUG] Async flag is set, not waiting for results`);
                 }
                 const jsonOutput = {
                     consoleUrl: url,
                     status: 'PENDING',
                     tests: results.map((r) => ({
                         fileName: r.test_file_name,
-                        flowName: testMetadataMap[r.test_file_name]?.flowName || path.parse(r.test_file_name).name,
+                        flowName: testMetadataMap[r.test_file_name]?.flowName ||
+                            path.parse(r.test_file_name).name,
                         name: r.test_file_name,
                         status: r.status,
                         tags: testMetadataMap[r.test_file_name]?.tags || [],
                     })),
                     uploadId: results[0].test_upload_id,
                 };
-                if (flags['json-file']) {
+                if (jsonFileFlag) {
                     const jsonFilePath = jsonFileName || `${results[0].test_upload_id}_dcd.json`;
-                    (0, methods_1.writeJSONFile)(jsonFilePath, jsonOutput, this);
+                    writeJSONFile(jsonFilePath, jsonOutput, {
+                        log: (m) => out(m),
+                        warn: (m) => warnOut(m),
+                    });
                 }
                 if (json) {
-                    return jsonOutput;
+                    // eslint-disable-next-line no-console
+                    console.log(JSON.stringify(jsonOutput, null, 2));
+                    return;
                 }
-                this.log(`\n${styling_1.colors.info('ℹ')}  ${styling_1.colors.dim('Not waiting for results as async flag is set to true')}\n`);
+                out(ui.info('Not waiting for results as async flag is set to true'));
                 return;
             }
-            // Poll for results until completion
-            const pollingResult = await this.resultsPollingService
-                .pollUntilComplete(results, {
-                apiKey,
+            const pollingResult = await resultsPollingService
+                .pollUntilComplete({
+                auth,
                 apiUrl,
                 consoleUrl: url,
                 debug,
                 json,
-                logger: this.log.bind(this),
+                logger: (m) => out(m),
                 quiet,
                 uploadId: results[0].test_upload_id,
             }, testMetadataMap)
                 .catch(async (error) => {
-                if (error instanceof results_polling_service_1.RunFailedError) {
-                    // Handle failed test run
+                if (error instanceof RunFailedError) {
                     const jsonOutput = error.result;
-                    if (flags['json-file']) {
+                    if (jsonFileFlag) {
                         const jsonFilePath = jsonFileName || `${results[0].test_upload_id}_dcd.json`;
-                        (0, methods_1.writeJSONFile)(jsonFilePath, jsonOutput, this);
+                        writeJSONFile(jsonFilePath, jsonOutput, {
+                            log: (m) => out(m),
+                            warn: (m) => warnOut(m),
+                        });
                     }
                     if (json) {
                         output = jsonOutput;
                     }
-                    // Download artifacts and reports even when tests fail
-                    if (downloadArtifacts) {
-                        await this.reportDownloadService.downloadArtifacts({
-                            apiKey,
-                            apiUrl,
-                            artifactsPath,
-                            debug,
-                            downloadType: downloadArtifacts,
-                            logger: this.log.bind(this),
-                            uploadId: results[0].test_upload_id,
-                            warnLogger: this.warn.bind(this),
-                        });
+                    // A download failure must not mask the run-failed signal (it
+                    // would flip exit code 2 → 1 and drop the JSON output).
+                    try {
+                        if (downloadArtifacts) {
+                            await reportDownloadService.downloadArtifacts({
+                                auth,
+                                apiUrl,
+                                artifactsPath,
+                                debug,
+                                downloadType: downloadArtifacts,
+                                logger: (m) => out(m),
+                                uploadId: results[0].test_upload_id,
+                                warnLogger: (m) => warnOut(m),
+                            });
+                        }
+                        if (report) {
+                            await reportDownloadService.downloadReports({
+                                allurePath,
+                                auth,
+                                apiUrl,
+                                debug,
+                                htmlPath,
+                                junitPath,
+                                logger: (m) => out(m),
+                                reportType: report,
+                                uploadId: results[0].test_upload_id,
+                                warnLogger: (m) => warnOut(m),
+                            });
+                        }
                     }
-                    if (report && ['allure', 'html', 'html-detailed', 'junit'].includes(report)) {
-                        await this.reportDownloadService.downloadReports({
-                            allurePath,
-                            apiKey,
-                            apiUrl,
-                            debug,
-                            htmlPath,
-                            junitPath,
-                            logger: this.log.bind(this),
-                            reportType: report,
-                            uploadId: results[0].test_upload_id,
-                            warnLogger: this.warn.bind(this),
-                        });
+                    catch (downloadError) {
+                        warnOut(`Failed to download artifacts/reports for the failed run: ${downloadError instanceof Error
+                            ? downloadError.message
+                            : String(downloadError)}`);
                     }
                     throw new Error('RUN_FAILED');
                 }
                 throw error;
             });
-            // Handle successful completion - download artifacts and reports
             if (downloadArtifacts) {
-                await this.reportDownloadService.downloadArtifacts({
-                    apiKey,
+                await reportDownloadService.downloadArtifacts({
+                    auth,
                     apiUrl,
                     artifactsPath,
                     debug,
                     downloadType: downloadArtifacts,
-                    logger: this.log.bind(this),
+                    logger: (m) => out(m),
                     uploadId: results[0].test_upload_id,
-                    warnLogger: this.warn.bind(this),
+                    warnLogger: (m) => warnOut(m),
                 });
             }
-            // Handle report downloads based on --report flag
-            if (report && ['allure', 'html', 'html-detailed', 'junit'].includes(report)) {
-                await this.reportDownloadService.downloadReports({
+            if (report) {
+                await reportDownloadService.downloadReports({
                     allurePath,
-                    apiKey,
+                    auth,
                     apiUrl,
                     debug,
                     htmlPath,
                     junitPath,
-                    logger: this.log.bind(this),
+                    logger: (m) => out(m),
                     reportType: report,
                     uploadId: results[0].test_upload_id,
-                    warnLogger: this.warn.bind(this),
+                    warnLogger: (m) => warnOut(m),
                 });
             }
             const jsonOutput = pollingResult;
-            if (flags['json-file']) {
+            if (jsonFileFlag) {
                 const jsonFilePath = jsonFileName || `${results[0].test_upload_id}_dcd.json`;
-                (0, methods_1.writeJSONFile)(jsonFilePath, jsonOutput, this);
+                writeJSONFile(jsonFilePath, jsonOutput, {
+                    log: (m) => out(m),
+                    warn: (m) => warnOut(m),
+                });
             }
             if (json) {
                 output = jsonOutput;
@@ -593,41 +688,34 @@ class Cloud extends core_1.Command {
         }
         catch (error) {
             if (debugFlag && error instanceof Error) {
-                this.log(`[DEBUG] Error in command execution: ${error.message}`);
-                this.log(`[DEBUG] Error stack: ${error.stack}`);
-            }
-            if (error instanceof Error && error.message === 'RUN_FAILED') {
-                if (jsonFile) {
-                    // mimic oclif's json functionality
-                    this.exit(0);
-                }
-                this.exit(2);
-            }
-            else {
-                this.error(error, { exit: 1 });
+                out(`[DEBUG] Error in command execution: ${error.message}`);
+                out(`[DEBUG] Error stack: ${error.stack}`);
             }
+            // Defer exiting until after the finally block — process.exit here would
+            // skip it, dropping the --json output and leaking temp files.
+            caughtError = error;
         }
         finally {
-            // Clean up any temp files created during Expo URL download / .tar.gz extraction
+            const fsp = await import('node:fs/promises');
             for (const p of tempFiles) {
-                await Promise.resolve().then(() => require('node:fs/promises')).then((fsp) => fsp.rm(p, { recursive: true, force: true }).catch(() => { }));
+                await fsp.rm(p, { recursive: true, force: true }).catch(() => { });
             }
             if (output) {
-                // eslint-disable-next-line no-unsafe-finally
-                return output;
+                // eslint-disable-next-line no-console
+                console.log(JSON.stringify(output, null, 2));
             }
         }
-    }
-    toErrorJson(err) {
-        if (err instanceof Error) {
-            return {
-                error: {
-                    message: err.message,
-                    ...(err.code ? { code: err.code } : {}),
-                },
-            };
+        if (caughtError) {
+            if (caughtError instanceof Error && caughtError.message === 'RUN_FAILED') {
+                // --json-file keeps exit 0 on a failed run (documented contract);
+                // otherwise 2 distinguishes test failure from infra errors (1).
+                const exitCode = jsonFile ? 0 : 2;
+                telemetry.recordCommandFailure({ error: 'RUN_FAILED', exitCode });
+                telemetry.flushSync();
+                process.exit(exitCode);
+            }
+            logger.error(caughtError, { exit: 1, json: jsonFlag });
         }
-        return { error: { message: String(err) } };
-    }
-}
-exports.default = Cloud;
+    },
+});
+export default cloudCommand;