@devicecloud.dev/dcd 5.0.0-beta.0 → 5.0.0-beta.2

package/dist/commands/cloud.js

@@ -1,28 +1,28 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.cloudCommand = void 0;
 /* eslint-disable complexity */
-const citty_1 = require("citty");
-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 telemetry_service_1 = require("../services/telemetry.service");
-const test_submission_service_1 = require("../services/test-submission.service");
-const version_service_1 = require("../services/version.service");
-const device_types_1 = require("../types/domain/device.types");
-const auth_1 = require("../utils/auth");
-const cli_1 = require("../utils/cli");
-const compatibility_1 = require("../utils/compatibility");
-const config_store_1 = require("../utils/config-store");
-const expo_1 = require("../utils/expo");
-const paths_1 = require("../utils/paths");
-const styling_1 = require("../utils/styling");
+import { defineCommand } from 'citty';
+import { existsSync } from 'node:fs';
+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, collectRepeatedFlag, 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.
@@ -51,13 +51,13 @@ const RUNNER_TYPE_OPTIONS = ['default', 'm4', 'm1', 'gpu1', 'cpu1'];
  *
  * Replaces `maestro cloud` with DeviceCloud-specific functionality.
  */
-exports.cloudCommand = (0, citty_1.defineCommand)({
+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: {
-        ...constants_1.flags,
+        ...allFlags,
         firstFile: {
             type: 'positional',
             required: false,
@@ -70,24 +70,24 @@ exports.cloudCommand = (0, citty_1.defineCommand)({
         },
     },
     // eslint-disable-next-line complexity
-    async run({ args }) {
-        const cliVersion = (0, cli_1.getCliVersion)();
-        const deviceValidationService = new device_validation_service_1.DeviceValidationService();
-        const moropoService = new moropo_service_1.MoropoService();
-        const reportDownloadService = new report_download_service_1.ReportDownloadService();
-        const resultsPollingService = new results_polling_service_1.ResultsPollingService();
-        const testSubmissionService = new test_submission_service_1.TestSubmissionService();
-        const versionService = new version_service_1.VersionService();
+    async run({ args, rawArgs }) {
+        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)) {
-                const body = `${styling_1.symbols.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((0, cli_1.getUpgradeCommand)());
-                out(`\n${(0, styling_1.box)(body)}\n`);
+            const result = await versionService.checkLatestCliVersion(cliVersion);
+            if (result.ok &&
+                result.version &&
+                versionService.isOutdated(cliVersion, result.version)) {
+                out(ui.warn(colors.bold('Update available')));
+                out(ui.branch([
+                    `A new version of the DeviceCloud CLI is available: ${colors.highlight(result.version)}`,
+                    `${colors.dim('Run:')} ${colors.info(getUpgradeCommand())}`,
+                ]));
             }
         };
         let output = null;
@@ -100,15 +100,15 @@ exports.cloudCommand = (0, citty_1.defineCommand)({
         // Chatty progress logs are suppressed when --json is active so stdout stays parseable.
         const out = (m) => {
             if (!jsonFlag)
-                cli_1.logger.log(m);
+                logger.log(m);
         };
         const warnOut = (m) => {
             if (!jsonFlag)
-                cli_1.logger.warn(m);
+                logger.warn(m);
         };
         try {
             const apiKeyFlag = args['api-key'];
-            const apiUrl = (0, config_store_1.resolveApiUrl)(args['api-url']);
+            const apiUrl = resolveApiUrl(args['api-url']);
             const appBinaryId = args['app-binary-id'];
             const appFile = args['app-file'];
             const appUrl = args['app-url'];
@@ -120,34 +120,36 @@ exports.cloudCommand = (0, citty_1.defineCommand)({
             const configFile = args.config;
             const debug = Boolean(args.debug);
             const deviceLocale = args['device-locale'];
-            const downloadArtifacts = (0, cli_1.validateEnum)(args['download-artifacts'], DOWNLOAD_OPTIONS, 'download-artifacts');
+            const downloadArtifacts = validateEnum(args['download-artifacts'], DOWNLOAD_OPTIONS, 'download-artifacts');
             const dryRun = Boolean(args['dry-run']);
-            const env = (0, cli_1.coerceArray)(args.env, false);
-            const excludeFlows = (0, cli_1.coerceArray)(args['exclude-flows']);
-            const excludeTags = (0, cli_1.coerceArray)(args['exclude-tags']);
+            // Repeatable flags are collected from rawArgs: citty/parseArgs only keeps
+            // the last occurrence, so reading args.* directly drops earlier values.
+            const env = coerceArray(collectRepeatedFlag(rawArgs, ['--env', '-e']), false);
+            const excludeFlows = coerceArray(collectRepeatedFlag(rawArgs, ['--exclude-flows']));
+            const excludeTags = coerceArray(collectRepeatedFlag(rawArgs, ['--exclude-tags']));
             let flows = args.flows;
             const googlePlay = Boolean(args['google-play']);
             const ignoreShaCheck = Boolean(args['ignore-sha-check']);
-            const includeTags = (0, cli_1.coerceArray)(args['include-tags']);
-            const iOSDevice = (0, cli_1.validateEnum)(args['ios-device'], Object.values(device_types_1.EiOSDevices), 'ios-device');
-            const iOSVersion = (0, cli_1.validateEnum)(args['ios-version'], Object.values(device_types_1.EiOSVersions), 'ios-version');
-            const androidApiLevel = (0, cli_1.validateEnum)(args['android-api-level'], Object.values(device_types_1.EAndroidApiLevels), 'android-api-level');
-            const androidDevice = (0, cli_1.validateEnum)(args['android-device'], Object.values(device_types_1.EAndroidDevices), 'android-device');
+            const includeTags = coerceArray(collectRepeatedFlag(rawArgs, ['--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 = (0, cli_1.coerceArray)(args.metadata, false);
+            const metadata = coerceArray(collectRepeatedFlag(rawArgs, ['--metadata', '-m']), false);
             const mitmHost = args.mitmHost;
             const mitmPath = args.mitmPath;
             const moropoApiKey = args['moropo-v1-api-key'];
             const name = args.name;
-            const orientation = (0, cli_1.validateEnum)(args.orientation, ORIENTATION_OPTIONS, 'orientation');
+            const orientation = validateEnum(args.orientation, ORIENTATION_OPTIONS, 'orientation');
             let quiet = Boolean(args.quiet);
-            const report = (0, cli_1.validateEnum)(args.report, REPORT_OPTIONS, 'report');
-            let retry = (0, cli_1.parseIntFlag)(args.retry, 'retry');
-            const runnerType = (0, cli_1.validateEnum)(args['runner-type'], RUNNER_TYPE_OPTIONS, 'runner-type') ?? 'default';
+            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']);
@@ -158,7 +160,7 @@ exports.cloudCommand = (0, citty_1.defineCommand)({
             const ghPrUrl = args['pr-url'];
             debugFlag = debug;
             jsonFile = jsonFileFlag;
-            out(styling_1.colors.dim(`dcd v${cliVersion}`));
+            out(colors.dim(`dcd v${cliVersion}`));
             if (debug) {
                 out('[DEBUG] Starting command execution with debug logging enabled');
                 out(`[DEBUG] Node version: ${process.versions.node}`);
@@ -169,19 +171,19 @@ exports.cloudCommand = (0, citty_1.defineCommand)({
                 out('--json-file is true: JSON output will be written to file, forcing --quiet flag for better CI output');
             }
             if (mitmPath && !mitmHost) {
-                throw new cli_1.CliError('--mitmPath requires --mitmHost to be set');
+                throw new CliError('--mitmPath requires --mitmHost to be set');
             }
             if (jsonFileName && !jsonFileFlag) {
-                throw new cli_1.CliError('--json-file-name requires --json-file');
+                throw new CliError('--json-file-name requires --json-file');
             }
             if (artifactsPath && !downloadArtifacts) {
-                throw new cli_1.CliError('--artifacts-path requires --download-artifacts');
+                throw new CliError('--artifacts-path requires --download-artifacts');
             }
             if ((junitPath || allurePath || htmlPath) && !report) {
-                throw new cli_1.CliError('Report path flags (--junit-path/--allure-path/--html-path) require --report');
+                throw new CliError('Report path flags (--junit-path/--allure-path/--html-path) require --report');
             }
             if (appFile && appUrl) {
-                throw new cli_1.CliError('--app-file and --app-url are mutually exclusive');
+                throw new CliError('--app-file and --app-url are mutually exclusive');
             }
             if (json) {
                 const originalStdoutWrite = process.stdout.write;
@@ -197,7 +199,7 @@ exports.cloudCommand = (0, citty_1.defineCommand)({
             if (major < 20) {
                 warnOut(`WARNING: You are using node version ${major}. DeviceCloud requires node version 20 or later`);
                 if (major < 18) {
-                    throw new cli_1.CliError('Invalid node version');
+                    throw new CliError('Invalid node version');
                 }
             }
             await versionCheck();
@@ -212,10 +214,15 @@ exports.cloudCommand = (0, citty_1.defineCommand)({
                 });
                 tempFiles.push(flows);
             }
-            const auth = await (0, auth_1.resolveAuth)({ apiKeyFlag });
+            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.'));
+            }
             let compatibilityData;
             try {
-                compatibilityData = await (0, compatibility_1.fetchCompatibilityData)(apiUrl, auth);
+                compatibilityData = await fetchCompatibilityData(apiUrl, auth);
                 if (debug) {
                     out('[DEBUG] Successfully fetched compatibility data from API');
                 }
@@ -225,7 +232,7 @@ exports.cloudCommand = (0, citty_1.defineCommand)({
                 if (debug) {
                     out(`[DEBUG] Failed to fetch compatibility data from API: ${errorMessage}`);
                 }
-                throw new cli_1.CliError(`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) {
                 out(`[DEBUG] API URL: ${apiUrl}`);
@@ -234,27 +241,29 @@ exports.cloudCommand = (0, citty_1.defineCommand)({
                 debug,
                 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)) {
-                throw new cli_1.CliError(`Maestro version ${resolvedMaestroVersion} is no longer supported. ` +
-                    `Please upgrade to a newer version. See: https://docs.devicecloud.dev/configuration/maestro-versions`);
+            // Soft deprecation notice for Maestro versions slated for removal on
+            // 26 June 2026. Non-fatal — these still run during the grace period.
+            const DEPRECATED_MAESTRO_VERSIONS = ['1.39.5', '1.41.0'];
+            if (DEPRECATED_MAESTRO_VERSIONS.includes(resolvedMaestroVersion)) {
+                warnOut(ui.warn(colors.bold(`Maestro ${resolvedMaestroVersion} is deprecated`)));
+                warnOut(ui.branch([
+                    `Maestro ${resolvedMaestroVersion} will be removed on 26 June 2026; after that, tests pinned to it will fail.`,
+                    'Upgrade to Maestro 2.6.0 or above.',
+                    `${colors.dim('See:')} ${colors.url('https://docs.devicecloud.dev/configuration/maestro-versions')}`,
+                ]));
             }
             if (retry !== undefined && retry > 2) {
-                out(`${styling_1.symbols.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.'));
+                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') {
-                out(`${styling_1.symbols.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') {
-                out(`${styling_1.symbols.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') {
-                out(`${styling_1.symbols.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 = args.firstFile;
             const secondFile = args.secondFile;
@@ -262,21 +271,28 @@ exports.cloudCommand = (0, citty_1.defineCommand)({
             let finalAppFile = appFile ?? (appUrl ?? firstFile);
             let flowFile = flows ?? secondFile;
             if (finalAppFile && !appBinaryId) {
-                if ((0, expo_1.isUrl)(finalAppFile)) {
-                    out(`   ${styling_1.colors.dim('→ Downloading Expo build from URL...')}`);
-                    const tarPath = await (0, expo_1.downloadExpoUrl)(finalAppFile, debug);
+                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')) {
-                    out(`   ${styling_1.colors.dim('→ Extracting Expo archive...')}`);
-                    const extractDir = await (0, expo_1.extractTarGz)(finalAppFile, debug);
+                    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) {
                         out(`[DEBUG] Found .app bundle at: ${finalAppFile}`);
                     }
                 }
+                // Validate the resolved local app file early — dry-run otherwise skips
+                // the upload that would surface a missing file, so a typo'd path would
+                // pass a dry-run and only fail on the real run. (URL/.tar.gz inputs are
+                // already resolved to existing temp paths by this point.)
+                if (!existsSync(finalAppFile)) {
+                    throw new CliError(`App file does not exist: ${finalAppFile}`);
+                }
             }
             if (debug) {
                 out(`[DEBUG] First file argument: ${firstFile || 'not provided'}`);
@@ -287,7 +303,7 @@ exports.cloudCommand = (0, citty_1.defineCommand)({
             }
             if (appBinaryId) {
                 if (secondFile) {
-                    throw new cli_1.CliError('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;
             }
@@ -297,12 +313,24 @@ exports.cloudCommand = (0, citty_1.defineCommand)({
                 flowFile = firstFile;
             }
             if (!flowFile) {
-                throw new cli_1.CliError('You must provide a flow file');
+                throw new CliError('You must provide a flow file');
             }
             deviceValidationService.validateiOSDevice(iOSVersion, iOSDevice, compatibilityData, {
                 debug,
                 logger: (m) => out(m),
             });
+            // iOS 16 deprecation notice (soft warning during the grace period;
+            // removed on 23 August 2026). Only fires on an explicit --ios-version 16 —
+            // when omitted the API defaults to iOS 17, so no false warning.
+            const DEPRECATED_IOS_VERSIONS = ['16'];
+            if (iOSVersion && DEPRECATED_IOS_VERSIONS.includes(iOSVersion)) {
+                warnOut(ui.warn(colors.bold('iOS 16 is deprecated')));
+                warnOut(ui.branch([
+                    'iOS 16 will be removed on 23 August 2026; after that, tests targeting it will fail.',
+                    'Switch to iOS 17 or newer — iPhone 14 also supports 17 and 18.',
+                    `${colors.dim('See:')} ${colors.url('https://docs.devicecloud.dev/getting-started/devices-configuration')}`,
+                ]));
+            }
             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.');
@@ -321,7 +349,7 @@ exports.cloudCommand = (0, citty_1.defineCommand)({
                 if (debug) {
                     out('[DEBUG] Generating execution plan...');
                 }
-                executionPlan = await (0, execution_plan_service_1.plan)({
+                executionPlan = await plan({
                     input: flowFile,
                     includeTags,
                     excludeTags,
@@ -349,42 +377,11 @@ exports.cloudCommand = (0, citty_1.defineCommand)({
                 out(`[DEBUG] All exclude tags: ${allExcludeTags?.join(', ') || 'none'}`);
                 out(`[DEBUG] Test file names: ${testFileNames.join(', ')}`);
             }
-            const pathsShortestToLongest = [
-                ...testFileNames,
-                ...referencedFiles,
-            ].sort((a, b) => a.split(path.sep).length - b.split(path.sep).length);
-            // Longest whole-segment directory prefix shared by every path. Segment
-            // comparison (not startsWith) so sibling dirs like `flows`/`flows-extra`
-            // can't merge, and the file segment itself is never consumed. '' when
-            // the paths share no root at all.
-            const splitPaths = pathsShortestToLongest.map((p) => p.split(path.sep));
-            const shortestSegments = splitPaths[0];
-            let matchedSegments = 0;
-            for (let i = 0; i < shortestSegments.length - 1; i++) {
-                if (splitPaths.every((segments) => segments[i] === shortestSegments[i])) {
-                    matchedSegments = i + 1;
-                }
-                else {
-                    break;
-                }
-            }
-            const commonRoot = shortestSegments.slice(0, matchedSegments).join(path.sep);
+            const commonRoot = computeCommonRoot(testFileNames, referencedFiles);
             if (debug) {
                 out(`[DEBUG] Common root directory: ${commonRoot}`);
             }
-            const testMetadataMap = {};
-            for (const [absolutePath, meta] of Object.entries(flowMetadata)) {
-                const normalizedPath = (0, paths_1.toPortableRelativePath)(absolutePath, commonRoot);
-                const metadataRecord = meta;
-                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 };
-            }
+            const testMetadataMap = buildTestMetadataMap(flowMetadata, commonRoot);
             if (debug) {
                 out(`[DEBUG] Built testMetadataMap for ${Object.keys(testMetadataMap).length} flows`);
             }
@@ -395,16 +392,16 @@ exports.cloudCommand = (0, citty_1.defineCommand)({
             }
             if (!appBinaryId) {
                 if (!(flowFile && finalAppFile)) {
-                    throw new cli_1.CliError('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 cli_1.CliError('App file must be a .apk for Android, .app/.zip for iOS, or .tar.gz (Expo iOS build)');
+                    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) {
                         out(`[DEBUG] Verifying iOS app zip file: ${finalAppFile}`);
                     }
-                    await (0, methods_1.verifyAppZip)(finalAppFile);
+                    await verifyAppZip(finalAppFile);
                 }
             }
             const flagLogs = [];
@@ -417,10 +414,21 @@ exports.cloudCommand = (0, citty_1.defineCommand)({
                 'appUrl',
             ]);
             // Only log canonical flag keys (skip citty-populated alias duplicates like apiURL/apiUrl).
-            const canonicalFlagKeys = new Set(Object.keys(constants_1.flags));
+            const canonicalFlagKeys = new Set(Object.keys(allFlags));
+            // Repeatable flags are recovered from rawArgs (args.* only holds the last
+            // occurrence), so echo the fully-collected values rather than args.*.
+            const repeatableDisplay = {
+                env,
+                metadata,
+                'include-tags': includeTags,
+                'exclude-tags': excludeTags,
+                'exclude-flows': excludeFlows,
+            };
             for (const [k, v] of Object.entries(args)) {
                 if (!canonicalFlagKeys.has(k))
                     continue;
+                if (k in repeatableDisplay)
+                    continue;
                 if (v === undefined || v === null || v === false)
                     continue;
                 const asString = String(v);
@@ -428,61 +436,53 @@ exports.cloudCommand = (0, citty_1.defineCommand)({
                     flagLogs.push(`${k}: ${asString}`);
                 }
             }
+            for (const [k, values] of Object.entries(repeatableDisplay)) {
+                if (values.length > 0)
+                    flagLogs.push(`${k}: ${values.join(', ')}`);
+            }
             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(String(value))}`;
-                        }
-                    }
-                }
-            }
-            out((0, styling_1.sectionHeader)('Submitting new job'));
-            out(`   ${styling_1.colors.dim('→ Flow(s):')} ${styling_1.colors.highlight(flowFile)}`);
-            out(`   ${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) {
-                out(`\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(': ');
-                    out(`   ${styling_1.colors.dim('→ ' + key + ':')} ${styling_1.colors.highlight(value)}`);
-                }
+                    return [key, colors.highlight(valueParts.join(': '))];
+                })));
             }
             if (hasOverrides) {
-                out(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))])));
+                }
             }
-            out('');
+            out(ui.section('Submitting new job'));
+            out(ui.branch(submitRows));
             if (dryRun) {
-                out(`\n${styling_1.symbols.warning} ${styling_1.colors.bold('Dry run mode')} ${styling_1.colors.dim('- no tests were actually triggered')}\n`);
-                out(styling_1.colors.bold('The following tests would have been run:'));
-                out(styling_1.dividers.light);
-                for (const test of testFileNames) {
-                    out((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) {
-                    out(`\n${styling_1.colors.bold('Sequential flows:')}`);
-                    out(styling_1.dividers.short);
-                    for (const flow of sequentialFlows) {
-                        out((0, styling_1.listItem)(flow));
-                    }
+                    out(ui.section('Sequential flows'));
+                    out(ui.branch(sequentialFlows));
                 }
-                out('\n');
                 return;
             }
             if (!finalBinaryId) {
                 if (!finalAppFile) {
-                    throw new cli_1.CliError('You must provide either an app binary id or an app file');
+                    throw new CliError('You must provide either an app binary id or an app file');
                 }
                 if (debug) {
                     out(`[DEBUG] Uploading binary file: ${finalAppFile}`);
                 }
-                const binaryId = await (0, methods_1.uploadBinary)({
+                const binaryId = await uploadBinary({
                     auth,
                     apiUrl,
                     debug,
@@ -496,7 +496,7 @@ exports.cloudCommand = (0, citty_1.defineCommand)({
                 }
             }
             if (!finalBinaryId) {
-                throw new cli_1.CliError('Internal error: finalBinaryId should be defined after validation');
+                throw new CliError('Internal error: finalBinaryId should be defined after validation');
             }
             const ghMetadataOverrides = [];
             if (ghBranch)
@@ -510,7 +510,7 @@ exports.cloudCommand = (0, citty_1.defineCommand)({
             if (ghPrUrl)
                 ghMetadataOverrides.push(`gh_pr_url=${ghPrUrl}`);
             const mergedMetadata = [...ghMetadataOverrides, ...metadata];
-            const testFormData = await testSubmissionService.buildTestFormData({
+            const { buffer, fields } = await testSubmissionService.buildTestPayload({
                 androidApiLevel,
                 androidDevice,
                 androidNoSnapshot,
@@ -541,31 +541,63 @@ exports.cloudCommand = (0, citty_1.defineCommand)({
                 maestroChromeOnboarding,
                 disableAnimations,
             });
-            if (debug) {
-                out(`[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, auth, testFormData);
+            const { message, results } = response;
             if (debug) {
-                out(`[DEBUG] Flow upload response received`);
+                out(`[DEBUG] Flow submission response received`);
                 out(`[DEBUG] Message: ${message}`);
                 out(`[DEBUG] Results count: ${results?.length || 0}`);
             }
             if (!results?.length) {
-                throw new cli_1.CliError('No tests created: ' + message);
+                throw new CliError('No tests created: ' + message);
             }
-            out(`${styling_1.symbols.success} ${styling_1.colors.bold('Submitted')} ${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(', '));
-            out(`\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);
-            out(styling_1.colors.bold('Run triggered') + styling_1.colors.dim(', you can access the results at:'));
-            out((0, styling_1.formatUrl)(url));
-            out('');
-            out(styling_1.colors.dim('Your upload ID is: ') + (0, styling_1.formatId)(results[0].test_upload_id));
-            out(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) {
                     out(`[DEBUG] Async flag is set, not waiting for results`);
@@ -585,7 +617,7 @@ exports.cloudCommand = (0, citty_1.defineCommand)({
                 };
                 if (jsonFileFlag) {
                     const jsonFilePath = jsonFileName || `${results[0].test_upload_id}_dcd.json`;
-                    (0, methods_1.writeJSONFile)(jsonFilePath, jsonOutput, {
+                    writeJSONFile(jsonFilePath, jsonOutput, {
                         log: (m) => out(m),
                         warn: (m) => warnOut(m),
                     });
@@ -595,7 +627,7 @@ exports.cloudCommand = (0, citty_1.defineCommand)({
                     console.log(JSON.stringify(jsonOutput, null, 2));
                     return;
                 }
-                out(`\n${styling_1.symbols.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;
             }
             const pollingResult = await resultsPollingService
@@ -610,11 +642,11 @@ exports.cloudCommand = (0, citty_1.defineCommand)({
                 uploadId: results[0].test_upload_id,
             }, testMetadataMap)
                 .catch(async (error) => {
-                if (error instanceof results_polling_service_1.RunFailedError) {
+                if (error instanceof RunFailedError) {
                     const jsonOutput = error.result;
                     if (jsonFileFlag) {
                         const jsonFilePath = jsonFileName || `${results[0].test_upload_id}_dcd.json`;
-                        (0, methods_1.writeJSONFile)(jsonFilePath, jsonOutput, {
+                        writeJSONFile(jsonFilePath, jsonOutput, {
                             log: (m) => out(m),
                             warn: (m) => warnOut(m),
                         });
@@ -690,7 +722,7 @@ exports.cloudCommand = (0, citty_1.defineCommand)({
             const jsonOutput = pollingResult;
             if (jsonFileFlag) {
                 const jsonFilePath = jsonFileName || `${results[0].test_upload_id}_dcd.json`;
-                (0, methods_1.writeJSONFile)(jsonFilePath, jsonOutput, {
+                writeJSONFile(jsonFilePath, jsonOutput, {
                     log: (m) => out(m),
                     warn: (m) => warnOut(m),
                 });
@@ -709,7 +741,7 @@ exports.cloudCommand = (0, citty_1.defineCommand)({
             caughtError = error;
         }
         finally {
-            const fsp = await Promise.resolve().then(() => require('node:fs/promises'));
+            const fsp = await import('node:fs/promises');
             for (const p of tempFiles) {
                 await fsp.rm(p, { recursive: true, force: true }).catch(() => { });
             }
@@ -723,12 +755,12 @@ exports.cloudCommand = (0, citty_1.defineCommand)({
                 // --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_service_1.telemetry.recordCommandFailure({ error: 'RUN_FAILED', exitCode });
-                telemetry_service_1.telemetry.flushSync();
+                telemetry.recordCommandFailure({ error: 'RUN_FAILED', exitCode });
+                telemetry.flushSync();
                 process.exit(exitCode);
             }
-            cli_1.logger.error(caughtError, { exit: 1, json: jsonFlag });
+            logger.error(caughtError, { exit: 1, json: jsonFlag });
         }
     },
 });
-exports.default = exports.cloudCommand;
+export default cloudCommand;