@alwaysmeticulous/cli 2.259.0 → 2.260.1

package/dist/commands/{run-all-tests-in-cloud/run-all-tests-in-cloud.command.js → ci/run.command.js}

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runAllTestsInCloudCommand = void 0;
+exports.ciRunCommand = void 0;
 const api_1 = require("@alwaysmeticulous/api");
 const client_1 = require("@alwaysmeticulous/client");
 const common_1 = require("@alwaysmeticulous/common");
@@ -35,11 +35,11 @@ const Sentry = __importStar(require("@sentry/node"));
 const chalk_1 = __importDefault(require("chalk"));
 const cli_progress_1 = __importDefault(require("cli-progress"));
 const ora_1 = __importDefault(require("ora"));
-const command_builder_1 = require("../../command-utils/command-builder");
 const common_options_1 = require("../../command-utils/common-options");
+const sentry_utils_1 = require("../../command-utils/sentry.utils");
 const environment_utils_1 = require("../../utils/environment.utils");
 const out_of_date_client_error_1 = require("../../utils/out-of-date-client-error");
-const prepare_for_meticulous_tests_command_1 = require("../prepare-for-meticulous-tests/prepare-for-meticulous-tests.command");
+const prepare_command_1 = require("./prepare.command");
 const POLL_FOR_BASE_TEST_RUN_INTERVAL_MS = 10000;
 const POLL_FOR_BASE_TEST_RUN_MAX_TIMEOUT_MS = 30 * 60 * 1000; // 30 minutes
 const environmentToString = (environment) => {
@@ -48,7 +48,7 @@ const environmentToString = (environment) => {
     }
     return "cli-local";
 };
-const handler = async ({ apiToken, commitSha: commitSha_, appUrl, secureTunnelHost, keepTunnelOpenSec, allowInvalidCert, proxyAllUrls, rewriteHostnameToAppUrl, enableDnsCache, http2Connections, silenceTunnelWorker, companionAssetsFolder, companionAssetsZip, companionAssetsRegex, hadPreparedForTests, triggerScript, postComment, redactPassword, }) => {
+const handler = async ({ apiToken, commitSha: commitSha_, appUrl, secureTunnelHost, keepTunnelOpenSec, allowInvalidCert, proxyAllUrls, rewriteHostnameToAppUrl, http2Connections, silenceTunnelWorker, companionAssetsFolder, companionAssetsZip, companionAssetsRegex, hadPreparedForTests, triggerScript, postComment, redactPassword, }) => {
     const logger = (0, common_1.initLogger)();
     const commitSha = await (0, common_1.getCommitSha)(commitSha_);
     if (!!companionAssetsFolder && !!companionAssetsZip) {
@@ -69,14 +69,14 @@ const handler = async ({ apiToken, commitSha: commitSha_, appUrl, secureTunnelHo
         logger.error("You must provide an API token by using the --apiToken parameter");
         process.exit(1);
     }
+    // If we have a script to trigger a run, this signals that the user is not sure whether the base test run is available.
+    // In this case, we trigger the preparation for meticulous tests.
+    // Do this only if we did not prepare for the tests.
+    // Skip if METICULOUS_DISABLE_RECURSIVE_TRIGGER is set to prevent infinite recursion.
     if (!hadPreparedForTests &&
         triggerScript &&
         !process.env.METICULOUS_DISABLE_RECURSIVE_TRIGGER) {
-        // If we have a script to trigger a run, this signals that the user is not sure whether the base test run is available.
-        // In this case, we trigger the preparation for meticulous tests.
-        // Do this only if we did not prepare for the tests.
-        // Skip if METICULOUS_DISABLE_RECURSIVE_TRIGGER is set to prevent infinite recursion.
-        await (0, prepare_for_meticulous_tests_command_1.prepareForMeticulousTests)({
+        await (0, prepare_command_1.prepareForMeticulousTests)({
             apiToken: apiToken_,
             headCommit: commitSha,
             triggerScript,
@@ -92,10 +92,10 @@ const handler = async ({ apiToken, commitSha: commitSha_, appUrl, secureTunnelHo
     let scheduledTestRunSpinner = (0, ora_1.default)("Starting test run execution").start();
     const progressBar = new cli_progress_1.default.SingleBar({
         format: `Test Run execution progress |${chalk_1.default.cyan("{bar}")}| {percentage}% || {value}/{total} tests executed`,
-        // We want to still output progress even if not connected to a interactive tty since some CI runners
+        // We want to still output progress even if not connected to an interactive tty since some CI runners
         // such as CircleCI will timeout the process early if it hasn't outputted anything for a while.
         // You can test this by running:
-        //  `pnpm cli:dev run-all-tests-in-cloud --appUrl <your app URL> --commitSha <a valid commit SHA> 2>&1 | cat`
+        //  `pnpm cli:dev ci run-with-tunnel --appUrl <your app URL> --commitSha <a valid commit SHA> 2>&1 | cat`
         noTTYOutput: true,
         notTTYSchedule: 30000,
     }, cli_progress_1.default.Presets.shades_classic);
@@ -104,13 +104,12 @@ const handler = async ({ apiToken, commitSha: commitSha_, appUrl, secureTunnelHo
         progressBar.stop();
     };
     const keepTunnelOpenPromise = keepTunnelOpenSec > 0 ? (0, common_1.defer)() : null;
-    // Tunnel data set after within the onTunnelCreated callback below.
+    // Tunnel data set within the onTunnelCreated callback below.
     let lastPrintedStillSchedulingMessage = Date.now();
     let tunnelData = null;
     try {
         const environment = (0, environment_utils_1.getEnvironment)();
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const { testRun } = await (0, remote_replay_launcher_1.executeRemoteTestRun)({
+        await (0, remote_replay_launcher_1.executeRemoteTestRun)({
             apiToken: apiToken_,
             commitSha,
             appUrl,
@@ -175,7 +174,7 @@ const handler = async ({ apiToken, commitSha: commitSha_, appUrl, secureTunnelHo
             allowInvalidCert,
             proxyAllUrls,
             rewriteHostnameToAppUrl,
-            enableDnsCache,
+            enableDnsCache: true,
             http2Connections,
             silenceTunnelWorker,
             ...(postComment ? { postComment } : {}),
@@ -204,8 +203,8 @@ const handler = async ({ apiToken, commitSha: commitSha_, appUrl, secureTunnelHo
 };
 /**
  * Waits for base run to be available, polling until found or timeout.
- * Timeout is set to 30 minutes, and after that we just proceed without a base.
- * Projects that are not hosted on Github are not currently supported.
+ * Timeout is set to 30 minutes; after that we proceed without a base.
+ * Non-GitHub-hosted projects are not currently supported.
  */
 const waitForBase = async ({ apiToken, commitSha, logger, }) => {
     const client = (0, client_1.createClient)({ apiToken });
@@ -223,10 +222,7 @@ const waitForBase = async ({ apiToken, commitSha, logger, }) => {
             const timeoutError = new Error(`Timed out after ${POLL_FOR_BASE_TEST_RUN_MAX_TIMEOUT_MS / 1000} seconds waiting for base test run`);
             logger.error(timeoutError.message);
             Sentry.captureException(timeoutError, {
-                tags: {
-                    command: "run-all-tests-in-cloud",
-                    failureType: "base-test-run-timeout",
-                },
+                tags: { command: "ci run-with-tunnel", failureType: "base-test-run-timeout" },
                 extra: {
                     commitSha,
                     timeoutMs: POLL_FOR_BASE_TEST_RUN_MAX_TIMEOUT_MS,
@@ -236,7 +232,7 @@ const waitForBase = async ({ apiToken, commitSha, logger, }) => {
             // We proceed without base
             break;
         }
-        if (lastTimeElapsed == 0 || timeElapsed - lastTimeElapsed >= 30000) {
+        if (lastTimeElapsed === 0 || timeElapsed - lastTimeElapsed >= 30000) {
             // Log at most once every 30 seconds
             logger.info(`Waiting for base test run to be created. Time elapsed: ${timeElapsed}ms`);
             lastTimeElapsed = timeElapsed;
@@ -252,10 +248,7 @@ const waitForBase = async ({ apiToken, commitSha, logger, }) => {
             Sentry.captureEvent({
                 message: "Base test run found after waiting for it",
                 level: "info",
-                tags: {
-                    command: "run-all-tests-in-cloud",
-                    eventType: "base-test-run-found",
-                },
+                tags: { command: "ci run-with-tunnel", eventType: "base-test-run-found" },
                 extra: {
                     commitSha,
                     baseCommitSha: cloudReplayBaseTestRun.baseCommitSha,
@@ -266,89 +259,82 @@ const waitForBase = async ({ apiToken, commitSha, logger, }) => {
         }
     }
 };
-exports.runAllTestsInCloudCommand = (0, command_builder_1.buildCommand)("run-all-tests-in-cloud")
-    .details({ describe: "Run all replay test cases remotely" })
-    .options({
-    apiToken: common_options_1.OPTIONS.apiToken,
-    commitSha: common_options_1.OPTIONS.commitSha,
-    appUrl: {
-        demandOption: true,
-        string: true,
-        description: "The URL to execute the tests against. This parameter is required.",
-    },
-    keepTunnelOpenSec: {
-        number: true,
-        description: "Keep the tunnel open after test completion for the specified number of seconds. This is useful for debugging",
-        default: 0,
-    },
-    secureTunnelHost: {
-        string: true,
-        description: "The host to use for the secure tunnel server.",
-    },
-    allowInvalidCert: {
-        boolean: true,
-        description: "Allow the tunnel to accept invalid certificates.",
-        default: false,
-    },
-    proxyAllUrls: {
-        boolean: true,
-        description: "Allow all URLs to be proxied to rather than just the app URL.",
-        default: false,
-    },
-    rewriteHostnameToAppUrl: {
-        boolean: true,
-        description: "Rewrite the hostname of any requests sent through the tunnel to the app URL.",
-        default: false,
-    },
-    enableDnsCache: {
-        boolean: true,
-        description: "Enable DNS caching, this is recommended if the tunnel will be making requests to a non-localhost domain",
-        default: false,
-    },
-    http2Connections: {
-        number: true,
-        description: "Number of HTTP2 connections to establish for multiplexing (defaults to number of CPU cores)",
+exports.ciRunCommand = {
+    command: "run-with-tunnel",
+    describe: "Run all replay test cases in the cloud",
+    builder: {
+        apiToken: common_options_1.OPTIONS.apiToken,
+        commitSha: common_options_1.OPTIONS.commitSha,
+        appUrl: {
+            demandOption: true,
+            string: true,
+            description: "The URL to execute the tests against. This parameter is required.",
+        },
+        keepTunnelOpenSec: {
+            number: true,
+            description: "Keep the tunnel open after test completion for the specified number of seconds. Useful for debugging.",
+            default: 0,
+        },
+        secureTunnelHost: {
+            string: true,
+            description: "The host to use for the secure tunnel server.",
+        },
+        allowInvalidCert: {
+            boolean: true,
+            description: "Allow the tunnel to accept invalid certificates.",
+            default: false,
+        },
+        proxyAllUrls: {
+            boolean: true,
+            description: "Allow all URLs to be proxied rather than just the app URL.",
+            default: false,
+        },
+        rewriteHostnameToAppUrl: {
+            boolean: true,
+            description: "Rewrite the hostname of any requests sent through the tunnel to the app URL.",
+            default: false,
+        },
+        http2Connections: {
+            number: true,
+            description: "Number of HTTP2 connections to establish for multiplexing (defaults to number of CPU cores).",
+        },
+        silenceTunnelWorker: {
+            boolean: true,
+            description: "Suppress logs from tunnel worker processes.",
+            default: false,
+        },
+        companionAssetsFolder: {
+            string: true,
+            description: "The folder to serve the companion assets from.",
+        },
+        companionAssetsZip: {
+            string: true,
+            description: "The zip file to serve the companion assets from.",
+        },
+        companionAssetsRegex: {
+            string: true,
+            description: "The regex to match the companion assets.",
+        },
+        hadPreparedForTests: {
+            boolean: true,
+            description: "Enable if you called `meticulous ci prepare` before running this command.",
+            default: false,
+        },
+        triggerScript: {
+            string: true,
+            description: "Path to script that triggers the generation of a Meticulous test run on a specific commit in case base test run is not available. The script will be called with the commit SHA as an argument.",
+        },
+        postComment: {
+            boolean: true,
+            description: "Post comments on the pull request, even if comments are still disabled for the project.",
+            default: false,
+        },
+        redactPassword: {
+            boolean: true,
+            description: "Redact the tunnel password from log output.",
+            default: false,
+        },
     },
-    silenceTunnelWorker: {
-        boolean: true,
-        description: "Suppress logs from tunnel worker processes",
-        default: false,
-    },
-    companionAssetsFolder: {
-        string: true,
-        description: "The folder to serve the companion assets from.",
-        default: undefined,
-    },
-    companionAssetsZip: {
-        string: true,
-        description: "The zip file to serve the companion assets from.",
-        default: undefined,
-    },
-    companionAssetsRegex: {
-        string: true,
-        description: "The regex to match the companion assets.",
-        default: undefined,
-    },
-    hadPreparedForTests: {
-        boolean: true,
-        description: "Enable in case you called `prepare-for-meticulous-tests` before running this command.",
-        default: false,
-    },
-    triggerScript: {
-        string: true,
-        description: "Path to script that triggers the generation of a Meticulous test run on a specific commit in case base test run is not available. The script will be called with the commit SHA as an argument.",
-        default: undefined,
-    },
-    postComment: {
-        boolean: true,
-        description: "Post comments on the pull request, even if comments are still disabled for the project.",
-        default: false,
-    },
-    redactPassword: {
-        boolean: true,
-        description: "Redact the tunnel password from log output.",
-        default: false,
-    },
-})
-    .handler(handler);
-//# sourceMappingURL=run-all-tests-in-cloud.command.js.map
+    handler: (0, sentry_utils_1.wrapHandler)(handler),
+};
+//# sourceMappingURL=run.command.js.map

package/dist/commands/ci/run.command.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"run.command.js","sourceRoot":"","sources":["../../../src/commands/ci/run.command.ts"],"names":[],"mappings":"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"}

package/dist/commands/ci/start-tunnel.command.d.ts

@@ -0,0 +1,21 @@
+import { CommandModule } from "yargs";
+interface Options {
+    apiToken: string | undefined;
+    port: number;
+    host: string | undefined;
+    subdomain: string | undefined;
+    localHost: string;
+    localHttps: boolean;
+    localCert: string | undefined;
+    localKey: string | undefined;
+    localCa: string | undefined;
+    allowInvalidCert: boolean;
+    proxyAllUrls: boolean;
+    rewriteHostnameToAppUrl: boolean;
+    enableDnsCache: boolean;
+    silenceTunnelWorker: boolean;
+    printRequests: boolean;
+    http2Connections: number | undefined;
+}
+export declare const ciStartTunnelCommand: CommandModule<unknown, Options>;
+export {};

package/dist/commands/ci/start-tunnel.command.js

@@ -0,0 +1,142 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ciStartTunnelCommand = void 0;
+const client_1 = require("@alwaysmeticulous/client");
+const common_1 = require("@alwaysmeticulous/common");
+const tunnels_client_1 = require("@alwaysmeticulous/tunnels-client");
+const sentry_utils_1 = require("../../command-utils/sentry.utils");
+const handler = async (argv) => {
+    const logger = (0, common_1.initLogger)();
+    const apiToken = (0, client_1.getApiToken)(argv.apiToken);
+    if (!apiToken) {
+        logger.error("You must provide an API token by using the --apiToken parameter");
+        process.exit(1);
+    }
+    const tunnelClosedCallback = (0, common_1.defer)();
+    const tunnel = await (0, tunnels_client_1.localtunnel)({
+        logger,
+        apiToken,
+        port: argv.port,
+        ...(argv.host ? { host: argv.host } : {}),
+        ...(argv.subdomain ? { subdomain: argv.subdomain } : {}),
+        localHost: argv.localHost,
+        localHttps: argv.localHttps,
+        localCert: argv.localCert,
+        localKey: argv.localKey,
+        localCa: argv.localCa,
+        allowInvalidCert: argv.allowInvalidCert,
+        proxyAllUrls: argv.proxyAllUrls,
+        rewriteHostnameToAppUrl: argv.rewriteHostnameToAppUrl,
+        enableDnsCache: argv.enableDnsCache,
+        http2Connections: argv.http2Connections,
+        silenceTunnelWorker: argv.silenceTunnelWorker,
+    }).catch((err) => {
+        throw err;
+    });
+    tunnel.on("error", (err) => {
+        tunnel.close();
+        logger.error(err);
+        throw err;
+    });
+    tunnel.on("close", async () => {
+        tunnelClosedCallback.resolve(null);
+    });
+    logger.info(`Your url is: ${tunnel.url} \nuser: ${tunnel.basicAuthUser}, password: ${tunnel.basicAuthPassword}`);
+    if (argv.printRequests) {
+        tunnel.on("request", (info) => {
+            logger.info(new Date().toString(), info.method, info.path);
+        });
+    }
+    process.on("SIGINT", () => {
+        logger.info("\nClosing tunnel...");
+        tunnel.close();
+    });
+    await tunnelClosedCallback.promise;
+};
+exports.ciStartTunnelCommand = {
+    command: "start-tunnel",
+    describe: common_1.IS_METICULOUS_SUPER_USER
+        ? "Expose a local service via Meticulous' secure tunnels service"
+        : false,
+    builder: {
+        apiToken: {
+            string: true,
+            description: "Meticulous API token",
+        },
+        port: {
+            alias: "p",
+            describe: "Internal HTTP server port",
+            demandOption: true,
+            number: true,
+        },
+        host: {
+            alias: "h",
+            describe: "Upstream server providing forwarding",
+            string: true,
+        },
+        subdomain: {
+            alias: "s",
+            describe: "Request this subdomain",
+            string: true,
+        },
+        localHost: {
+            alias: "l",
+            describe: "Tunnel traffic to this host instead of localhost, override Host header to this host",
+            default: "localhost",
+            string: true,
+        },
+        localHttps: {
+            describe: "Tunnel traffic to a local HTTPS server",
+            boolean: true,
+            default: false,
+        },
+        localCert: {
+            describe: "Path to certificate PEM file for local HTTPS server",
+            string: true,
+        },
+        localKey: {
+            describe: "Path to certificate key file for local HTTPS server",
+            string: true,
+        },
+        localCa: {
+            describe: "Path to certificate authority file for self-signed certificates",
+            string: true,
+        },
+        allowInvalidCert: {
+            describe: "Disable certificate checks for your local HTTPS server (ignore cert/key/ca options)",
+            boolean: true,
+            default: false,
+        },
+        proxyAllUrls: {
+            describe: "Allow any URL to be proxied rather than just the local host",
+            boolean: true,
+            default: false,
+        },
+        rewriteHostnameToAppUrl: {
+            boolean: true,
+            description: "Rewrite the hostname of any requests sent through the tunnel to the app URL.",
+            default: false,
+        },
+        enableDnsCache: {
+            describe: "Enable DNS caching, this is recommended if the tunnel will be making requests to a non-localhost domain",
+            boolean: true,
+            default: false,
+        },
+        printRequests: {
+            describe: "Print basic request info",
+            boolean: true,
+            default: false,
+        },
+        http2Connections: {
+            describe: "Number of HTTP2 connections to establish for multiplexing (defaults to number of CPU cores)",
+            number: true,
+        },
+        silenceTunnelWorker: {
+            describe: "Suppress logs from tunnel worker processes",
+            boolean: true,
+            default: false,
+        },
+    },
+    handler: (0, sentry_utils_1.wrapHandler)(handler),
+};
+//# sourceMappingURL=start-tunnel.command.js.map

package/dist/commands/ci/start-tunnel.command.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"start-tunnel.command.js","sourceRoot":"","sources":["../../../src/commands/ci/start-tunnel.command.ts"],"names":[],"mappings":"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"}

package/dist/commands/ci/upload-assets.command.d.ts

@@ -0,0 +1,14 @@
+import { CommandModule } from "yargs";
+interface Options {
+    apiToken?: string | undefined;
+    commitSha?: string | undefined;
+    baseSha?: string | undefined;
+    repoDirectory?: string | undefined;
+    appDirectory?: string | undefined;
+    appZip?: string | undefined;
+    rewrites?: string;
+    waitForBase: boolean;
+    waitForTestRunToComplete: boolean;
+}
+export declare const ciUploadAssetsCommand: CommandModule<unknown, Options>;
+export {};

package/dist/commands/{upload-assets-and-execute-test-run-in-cloud/upload-assets-and-execute-test-run-in-cloud.command.js → ci/upload-assets.command.js}

@@ -23,13 +23,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uploadAssetsAndExecuteTestRunInCloudCommand = void 0;
+exports.ciUploadAssetsCommand = void 0;
 const client_1 = require("@alwaysmeticulous/client");
 const common_1 = require("@alwaysmeticulous/common");
 const remote_replay_launcher_1 = require("@alwaysmeticulous/remote-replay-launcher");
 const Sentry = __importStar(require("@sentry/node"));
-const command_builder_1 = require("../../command-utils/command-builder");
 const common_options_1 = require("../../command-utils/common-options");
+const sentry_utils_1 = require("../../command-utils/sentry.utils");
 const out_of_date_client_error_1 = require("../../utils/out-of-date-client-error");
 const POLL_INTERVAL_MS = 10000;
 const handler = async ({ apiToken, commitSha: commitSha_, baseSha: baseSha_, repoDirectory, appDirectory, appZip, rewrites, waitForBase, waitForTestRunToComplete, }) => {
@@ -45,9 +45,9 @@ const handler = async ({ apiToken, commitSha: commitSha_, baseSha: baseSha_, rep
         logger.error("No commit sha found, you must be in a git repository or provide one with --commitSha");
         process.exit(1);
     }
-    const baseSha = baseSha_ || (repoDirectory
-        ? await (0, common_1.getLocalBaseSha)(gitOpts)
-        : undefined) || undefined;
+    const baseSha = baseSha_ ||
+        (repoDirectory ? await (0, common_1.getLocalBaseSha)(gitOpts) : undefined) ||
+        undefined;
     if (baseSha && baseSha === commitSha) {
         logger.info("Base SHA equals head SHA — nothing to test.");
         return;
@@ -58,9 +58,7 @@ const handler = async ({ apiToken, commitSha: commitSha_, baseSha: baseSha_, rep
     }
     Sentry.captureMessage("Received upload assets request", {
         level: "debug",
-        extra: {
-            commitSha,
-        },
+        extra: { commitSha },
     });
     let testRunId = null;
     try {
@@ -129,51 +127,45 @@ const parseRewrites = (rewritesString) => {
     }
     return parsedRewrites;
 };
-exports.uploadAssetsAndExecuteTestRunInCloudCommand = (0, command_builder_1.buildCommand)("upload-assets-and-execute-test-run-in-cloud")
-    .details({
+exports.ciUploadAssetsCommand = {
+    command: "upload-assets",
     describe: "Upload build artifacts to Meticulous, potentially triggering a test run",
-})
-    .options({
-    apiToken: common_options_1.OPTIONS.apiToken,
-    commitSha: common_options_1.OPTIONS.commitSha,
-    baseSha: {
-        demandOption: false,
-        string: true,
-        description: "The base commit SHA to compare against. If not provided, inferred from --repoDirectory via merge-base with origin/main.",
-    },
-    repoDirectory: {
-        demandOption: false,
-        string: true,
-        description: "The path to the git repository to use for auto-detecting --commitSha and the base SHA.",
-    },
-    appDirectory: {
-        demandOption: false,
-        string: true,
-        description: "The directory containing the application's static assets. Either this or --appZip must be provided.",
-    },
-    appZip: {
-        demandOption: false,
-        string: true,
-        description: "The zip file containing the application's static assets. Either this or --appDirectory must be provided.",
-    },
-    rewrites: {
-        string: true,
-        default: "[]",
-        description: "URL rewrite rules. This string should be a valid JSON array in the format described at https://github.com/vercel/serve-handler?tab=readme-ov-file#rewrites-array." +
-            ' Note: if no rules are passed, or an empty list is passed, we default to the rewrite rule \'{ source: "**", destination: "/index.html" }\'.',
-    },
-    waitForBase: {
-        demandOption: false,
-        boolean: true,
-        default: true,
-        description: "If true, the launcher will try to wait for a base test run to be created before triggering a test run. If that is not found, it will trigger a test run without waiting for a base test run.",
-    },
-    waitForTestRunToComplete: {
-        demandOption: false,
-        boolean: true,
-        default: false,
-        description: "If true, block and wait until the triggered test run is complete, then report results. Implies --waitForBase.",
+    builder: {
+        apiToken: common_options_1.OPTIONS.apiToken,
+        commitSha: common_options_1.OPTIONS.commitSha,
+        baseSha: {
+            string: true,
+            description: "The base commit SHA to compare against. If not provided, inferred from --repoDirectory via merge-base with origin/main.",
+        },
+        repoDirectory: {
+            string: true,
+            description: "The path to the git repository to use for auto-detecting --commitSha and the base SHA.",
+        },
+        appDirectory: {
+            string: true,
+            description: "The directory containing the application's static assets. Either this or --appZip must be provided.",
+        },
+        appZip: {
+            string: true,
+            description: "The zip file containing the application's static assets. Either this or --appDirectory must be provided.",
+        },
+        rewrites: {
+            string: true,
+            default: "[]",
+            description: "URL rewrite rules. This string should be a valid JSON array in the format described at https://github.com/vercel/serve-handler?tab=readme-ov-file#rewrites-array." +
+                " Note: if no rules are passed, or an empty list is passed, we default to the rewrite rule '{ source: \"**\", destination: \"/index.html\" }'.",
+        },
+        waitForBase: {
+            boolean: true,
+            default: true,
+            description: "If true, the launcher will try to wait for a base test run to be created before triggering a test run.",
+        },
+        waitForTestRunToComplete: {
+            boolean: true,
+            default: false,
+            description: "If true, block and wait until the triggered test run is complete, then report results. Implies --waitForBase.",
+        },
     },
-})
-    .handler(handler);
-//# sourceMappingURL=upload-assets-and-execute-test-run-in-cloud.command.js.map
+    handler: (0, sentry_utils_1.wrapHandler)(handler),
+};
+//# sourceMappingURL=upload-assets.command.js.map