@solana-mobile/dapp-store-cli 0.16.0 → 1.0.0

package/lib/CliSetup.js

@@ -27,6 +27,41 @@ function _async_to_generator(fn) {
         });
     };
 }
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _instanceof(left, right) {
+    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+        return !!right[Symbol.hasInstance](left);
+    } else {
+        return left instanceof right;
+    }
+}
+function _object_spread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _define_property(target, key, source[key]);
+        });
+    }
+    return target;
+}
 function _ts_generator(thisArg, body) {
     var f, y, t, _ = {
         label: 0,
@@ -118,101 +153,46 @@ function _ts_generator(thisArg, body) {
         };
     }
 }
-import { Command } from "commander";
-import { validateCommand } from "./commands/index.js";
-import { createAppCommand, createReleaseCommand } from "./commands/create/index.js";
-import { publishRemoveCommand, publishSubmitCommand, publishSupportCommand, publishUpdateCommand } from "./commands/publish/index.js";
-import { checkForSelfUpdate, checkSubmissionNetwork, Constants, alphaAppSubmissionMessage, dryRunSuccessMessage, generateNetworkSuffix, parseKeypair, showMessage, showNetworkWarningIfApplicable } from "./CliUtils.js";
-import * as dotenv from "dotenv";
-import { initScaffold } from "./commands/scaffolding/index.js";
-import { loadPublishDetails, loadPublishDetailsWithChecks } from "./config/PublishDetails.js";
+import { randomUUID } from 'node:crypto';
+import path from 'node:path';
+import * as dotenv from 'dotenv';
+import { Command, Option } from 'commander';
+import { Constants, createPortalAttestationClient, createPortalWorkflowClient, createPublicationSignerFromKeypair, parseKeypair, showMessage } from './CliUtils.js';
+import { DEFAULT_API_KEY_ENV, DEFAULT_PRODUCTION_PORTAL_URL, resolveApiKey, resolvePortalTargets, validateNewVersionArgs, validateResumeArgs } from './publication/cliValidation.js';
+import { createPublicationProgressReporter } from './publication/PublicationProgressReporter.js';
+import { extractPublicationSummaryLines } from './publication/publicationSummary.js';
+import { runPublicationWorkflow } from './publication/runPublicationWorkflow.js';
+import { ensurePublicationSignerBalance } from './publication/fundingPreflight.js';
 dotenv.config();
-var hasAddressInConfig = function(param) {
-    var address = param.address;
-    return !!address;
-};
 export var mainCli = new Command();
-function resolveBuildToolsPath(buildToolsPath) {
-    // If a path was specified on the command line, use that
-    if (buildToolsPath !== undefined) {
-        return buildToolsPath;
-    }
-    // If a path is specified in a .env file, use that
-    if (process.env.ANDROID_TOOLS_DIR !== undefined) {
-        return process.env.ANDROID_TOOLS_DIR;
-    }
-    // No path was specified
-    return;
-}
-/**
- * This method should be updated with each new release of the CLI, and just do nothing when there isn't anything to report
- */ function latestReleaseMessage() {
-    var messages = [
-        "- Banner Graphic image of size 1200x600px is now manadatory for publishing updates.",
-        "- Feature Graphic image of size 1200x1200px is required to be featured in Editor's choice carousel. (optional)",
-        "- Release metadata now publishes publisher.support_email when provided; otherwise we reuse publisher.email for end-user support."
-    ].join('\n\n');
-    showMessage("Publishing Tools Version ".concat(Constants.CLI_VERSION), messages, "warning");
-}
-function tryWithErrorMessage(block) {
+mainCli.name('dapp-store').version(Constants.CLI_VERSION).description('Portal-backed CLI for Solana Mobile dApp version publishing').showHelpAfterError();
+mainCli.option('--apk-file <path>', 'Path to the APK file to publish').option('--apk-url <url>', 'HTTPS URL for an externally hosted APK').option('--whats-new <text>', 'What changed in this version').option('--portal-url <url>', 'Publishing portal base URL').option('--api-key-env <name>', 'Environment variable that contains the portal API key', DEFAULT_API_KEY_ENV).option('--api-key-stdin', 'Read the portal API key from stdin instead of an env var').option('--keypair <path>', 'Path to the Solana signer keypair').addOption(new Option('--rpc-url <url>', 'Solana RPC URL').hideHelp()).option('--local-dev', 'Allow localhost portal endpoints and skip gating').option('--skip-self-update', 'Bypass the self-update check when working against a local portal').option('--idempotency-key <key>', 'Optional idempotency key for safe retries').option('--verbose', 'Print detailed publication identifiers as they are emitted').action(function() {
     return _async_to_generator(function() {
-        var e, _e_message, errorMsg;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    _state.trys.push([
-                        0,
-                        2,
-                        ,
-                        3
-                    ]);
                     return [
                         4,
-                        block()
+                        runRootAction()
                     ];
                 case 1:
                     _state.sent();
-                    return [
-                        3,
-                        3
-                    ];
-                case 2:
-                    e = _state.sent();
-                    errorMsg = (_e_message = e === null || e === void 0 ? void 0 : e.message) !== null && _e_message !== void 0 ? _e_message : "";
-                    showMessage("Error", errorMsg, "error");
-                    process.exit(-1);
-                    return [
-                        3,
-                        3
-                    ];
-                case 3:
                     return [
                         2
                     ];
             }
         });
     })();
-}
-mainCli.name("dapp-store").version(Constants.CLI_VERSION).description("CLI to assist with publishing to the Saga Dapp Store");
-export var initCliCmd = mainCli.command("init").description("First-time initialization of tooling configuration").action(function() {
+});
+var resumeCommand = mainCli.command('resume');
+resumeCommand.description('Resume a partially completed publication session').option('--release-id <id>', 'Publication release identifier').option('--resume-release <id>', 'Alias for --release-id').option('--session-id <id>', 'Publication session identifier').option('--resume-session <id>', 'Alias for --session-id').option('--portal-url <url>', 'Publishing portal base URL').option('--api-key-env <name>', 'Environment variable that contains the portal API key', DEFAULT_API_KEY_ENV).option('--api-key-stdin', 'Read the portal API key from stdin instead of an env var').option('--keypair <path>', 'Path to the Solana signer keypair').addOption(new Option('--rpc-url <url>', 'Solana RPC URL').hideHelp()).option('--local-dev', 'Allow localhost portal endpoints and skip gating').option('--skip-self-update', 'Bypass the self-update check when working against a local portal').option('--verbose', 'Print detailed publication identifiers as they are emitted').action(function(options) {
     return _async_to_generator(function() {
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
                     return [
                         4,
-                        tryWithErrorMessage(function() {
-                            return _async_to_generator(function() {
-                                var msg;
-                                return _ts_generator(this, function(_state) {
-                                    msg = initScaffold();
-                                    showMessage("Initialized", msg);
-                                    return [
-                                        2
-                                    ];
-                                });
-                            })();
-                        })
+                        runResumeAction(options)
                     ];
                 case 1:
                     _state.sent();
@@ -223,200 +203,114 @@ export var initCliCmd = mainCli.command("init").description("First-time initiali
         });
     })();
 });
-export var createCliCmd = mainCli.command("create").description("Create a `app`, or `release`");
-createCliCmd.addHelpText("after", [
-    "",
-    "Release metadata notes:",
-    "  We include publisher.support_email when provided; if omitted we fall back to publisher.email."
-].join("\n"));
-export var createAppCliCmd = createCliCmd.command("app").description("Create a app").requiredOption("-k, --keypair <path-to-keypair-file>", "Path to keypair file").option("-u, --url <url>", "RPC URL", Constants.DEFAULT_RPC_DEVNET).option("-d, --dry-run", "Flag for dry run. Doesn't mint an NFT").option("-s, --storage-config <storage-config>", "Provide alternative storage configuration details").option("-p, --priority-fee-lamports <priority-fee-lamports>", "Priority Fee lamports").action(function(param) {
-    var keypair = param.keypair, url = param.url, dryRun = param.dryRun, storageConfig = param.storageConfig, priorityFeeLamports = param.priorityFeeLamports;
+mainCli.addHelpText('after', [
+    '',
+    'Usage:',
+    '  dapp-store --apk-file ./app.apk --whats-new "Bug fixes"',
+    '  dapp-store --apk-url https://example.com/app.apk --whats-new "Bug fixes"',
+    '  dapp-store resume --release-id <release-id> [--session-id <session-id>]',
+    '',
+    'Portal:',
+    '  Set DAPP_STORE_PORTAL_URL to the portal origin (for example https://staging.publish.solanamobile.com).',
+    '  The CLI derives the /api endpoint from that URL for the active publication workflow.',
+    "  If unset, it defaults to ".concat(DEFAULT_PRODUCTION_PORTAL_URL, "."),
+    '  The target app must already exist in the portal and already have its App NFT.',
+    '  The portal decides whether the submission is the first release for an existing app or a later update.',
+    '',
+    'Secrets:',
+    "  Portal API key defaults to ".concat(DEFAULT_API_KEY_ENV, " or the name passed via --api-key-env."),
+    '  Use --api-key-stdin to read the portal API key from stdin.',
+    '',
+    'Local development:',
+    '  Pass --local-dev to allow localhost portal endpoints and to skip self-update gating.',
+    '  Local-dev mode rejects non-local portal URLs.'
+].join('\n'));
+function runRootAction() {
     return _async_to_generator(function() {
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
                     return [
                         4,
-                        tryWithErrorMessage(function() {
+                        runWithUserFacingErrors(function() {
                             return _async_to_generator(function() {
-                                var signer, result, displayUrl, transactionUrl, resultText;
+                                var options, targets, apiKey, signerKeypair, balanceWarning, signer, clients, progress, result, error;
                                 return _ts_generator(this, function(_state) {
                                     switch(_state.label){
                                         case 0:
-                                            showNetworkWarningIfApplicable(url);
-                                            latestReleaseMessage();
+                                            options = mainCli.opts();
+                                            if (!hasPublicationInputs(options)) {
+                                                mainCli.outputHelp();
+                                                return [
+                                                    2
+                                                ];
+                                            }
+                                            validateNewVersionArgs(options);
+                                            enforceSelfUpdatePolicy(options);
+                                            targets = resolvePortalTargets(options);
                                             return [
                                                 4,
-                                                checkForSelfUpdate()
+                                                resolveApiKey(options)
                                             ];
                                         case 1:
-                                            _state.sent();
-                                            signer = parseKeypair(keypair);
-                                            if (!signer) return [
-                                                3,
-                                                3
-                                            ];
+                                            apiKey = _state.sent();
+                                            signerKeypair = loadSignerKeypair(options.keypair);
                                             return [
                                                 4,
-                                                createAppCommand({
-                                                    signer: signer,
-                                                    url: url,
-                                                    dryRun: dryRun,
-                                                    storageParams: storageConfig,
-                                                    priorityFeeLamports: priorityFeeLamports
+                                                ensurePublicationSignerBalance({
+                                                    publicKey: signerKeypair.publicKey.toBase58(),
+                                                    rpcUrl: options.rpcUrl,
+                                                    localDev: options.localDev
                                                 })
                                             ];
                                         case 2:
-                                            result = _state.sent();
-                                            if (dryRun) {
-                                                dryRunSuccessMessage();
-                                            } else {
-                                                displayUrl = "https://explorer.solana.com/address/".concat(result.appAddress).concat(generateNetworkSuffix(url));
-                                                transactionUrl = "https://explorer.solana.com/tx/".concat(result.transactionSignature).concat(generateNetworkSuffix(url));
-                                                resultText = "App NFT successfully minted:\n".concat(displayUrl, "\n").concat(transactionUrl);
-                                                showMessage("Success", resultText);
+                                            balanceWarning = _state.sent();
+                                            if (balanceWarning) {
+                                                showMessage('Warning', balanceWarning, 'warning');
                                             }
+                                            signer = createPublicationSignerFromKeypair(signerKeypair);
+                                            clients = createPortalClients(targets, apiKey);
+                                            progress = createPublicationProgressReporter({
+                                                title: 'Publishing version',
+                                                mode: 'new-version',
+                                                verbose: options.verbose
+                                            });
+                                            progress.start({
+                                                message: 'Connecting to publishing portal',
+                                                metadata: buildNewVersionProgressMetadata(options)
+                                            });
                                             _state.label = 3;
                                         case 3:
-                                            return [
-                                                2
-                                            ];
-                                    }
-                                });
-                            })();
-                        })
-                    ];
-                case 1:
-                    _state.sent();
-                    return [
-                        2
-                    ];
-            }
-        });
-    })();
-});
-export var createReleaseCliCmd = createCliCmd.command("release").description("Create a release").requiredOption("-k, --keypair <path-to-keypair-file>", "Path to keypair file").option("-a, --app-mint-address <app-mint-address>", "The mint address of the app NFT").option("-u, --url <url>", "RPC URL", Constants.DEFAULT_RPC_DEVNET).option("-d, --dry-run", "Flag for dry run. Doesn't mint an NFT").option("-b, --build-tools-path <build-tools-path>", "Path to Android build tools which contains AAPT2").option("-s, --storage-config <storage-config>", "Provide alternative storage configuration details").option("-p, --priority-fee-lamports <priority-fee-lamports>", "Priority Fee lamports").action(function(param) {
-    var appMintAddress = param.appMintAddress, keypair = param.keypair, url = param.url, dryRun = param.dryRun, buildToolsPath = param.buildToolsPath, storageConfig = param.storageConfig, priorityFeeLamports = param.priorityFeeLamports;
-    return _async_to_generator(function() {
-        return _ts_generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    return [
-                        4,
-                        tryWithErrorMessage(function() {
-                            return _async_to_generator(function() {
-                                var resolvedBuildToolsPath, config, signer, result, displayUrl, transactionUrl, resultText;
-                                return _ts_generator(this, function(_state) {
-                                    switch(_state.label){
-                                        case 0:
-                                            showNetworkWarningIfApplicable(url);
-                                            latestReleaseMessage();
-                                            return [
-                                                4,
-                                                checkForSelfUpdate()
-                                            ];
-                                        case 1:
-                                            _state.sent();
-                                            resolvedBuildToolsPath = resolveBuildToolsPath(buildToolsPath);
-                                            if (resolvedBuildToolsPath === undefined) {
-                                                throw new Error("Please specify an Android build tools directory in the .env file or via the command line argument.");
-                                            }
-                                            return [
-                                                4,
-                                                loadPublishDetailsWithChecks()
-                                            ];
-                                        case 2:
-                                            config = _state.sent();
-                                            if (!hasAddressInConfig(config.app) && !appMintAddress) {
-                                                throw new Error("Either specify an app mint address in the config file or specify as a CLI argument to this command");
-                                            }
-                                            signer = parseKeypair(keypair);
-                                            if (!signer) return [
+                                            _state.trys.push([
                                                 3,
-                                                4
-                                            ];
+                                                5,
+                                                ,
+                                                6
+                                            ]);
                                             return [
                                                 4,
-                                                createReleaseCommand({
-                                                    appMintAddress: appMintAddress,
-                                                    buildToolsPath: resolvedBuildToolsPath,
-                                                    signer: signer,
-                                                    url: url,
-                                                    dryRun: dryRun,
-                                                    storageParams: storageConfig,
-                                                    priorityFeeLamports: priorityFeeLamports
+                                                runPublicationWorkflow({
+                                                    mode: 'new-version',
+                                                    client: clients.workflowClient,
+                                                    input: buildNewVersionWorkflowInput(options, signer, clients.attestationClient),
+                                                    options: {
+                                                        logger: progress.logger
+                                                    }
                                                 })
                                             ];
-                                        case 3:
-                                            result = _state.sent();
-                                            if (dryRun) {
-                                                dryRunSuccessMessage();
-                                            } else {
-                                                displayUrl = "https://explorer.solana.com/address/".concat(result === null || result === void 0 ? void 0 : result.releaseAddress).concat(generateNetworkSuffix(url));
-                                                transactionUrl = "https://explorer.solana.com/tx/".concat(result.transactionSignature).concat(generateNetworkSuffix(url));
-                                                resultText = "Release NFT successfully minted:\n".concat(displayUrl, "\n").concat(transactionUrl);
-                                                showMessage("Success", resultText);
-                                            }
-                                            _state.label = 4;
                                         case 4:
+                                            result = _state.sent();
+                                            progress.complete(result);
+                                            showPublicationSummary('Version publication completed', result);
                                             return [
-                                                2
-                                            ];
-                                    }
-                                });
-                            })();
-                        })
-                    ];
-                case 1:
-                    _state.sent();
-                    return [
-                        2
-                    ];
-            }
-        });
-    })();
-});
-mainCli.command("validate").description("Validates details prior to publishing").requiredOption("-k, --keypair <path-to-keypair-file>", "Path to keypair file").option("-b, --build-tools-path <build-tools-path>", "Path to Android build tools which contains AAPT2").action(function(param) {
-    var keypair = param.keypair, buildToolsPath = param.buildToolsPath;
-    return _async_to_generator(function() {
-        return _ts_generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    return [
-                        4,
-                        tryWithErrorMessage(function() {
-                            return _async_to_generator(function() {
-                                var resolvedBuildToolsPath, signer;
-                                return _ts_generator(this, function(_state) {
-                                    switch(_state.label){
-                                        case 0:
-                                            latestReleaseMessage();
-                                            return [
-                                                4,
-                                                checkForSelfUpdate()
-                                            ];
-                                        case 1:
-                                            _state.sent();
-                                            resolvedBuildToolsPath = resolveBuildToolsPath(buildToolsPath);
-                                            if (resolvedBuildToolsPath === undefined) {
-                                                throw new Error("Please specify an Android build tools directory in the .env file or via the command line argument.");
-                                            }
-                                            signer = parseKeypair(keypair);
-                                            if (!signer) return [
                                                 3,
-                                                3
-                                            ];
-                                            return [
-                                                4,
-                                                validateCommand({
-                                                    signer: signer,
-                                                    buildToolsPath: resolvedBuildToolsPath
-                                                })
+                                                6
                                             ];
-                                        case 2:
-                                            _state.sent();
-                                            _state.label = 3;
-                                        case 3:
+                                        case 5:
+                                            error = _state.sent();
+                                            progress.fail(error);
+                                            throw error;
+                                        case 6:
                                             return [
                                                 2
                                             ];
@@ -433,173 +327,72 @@ mainCli.command("validate").description("Validates details prior to publishing")
             }
         });
     })();
-});
-var publishCommand = mainCli.command("publish").description("Submit a publishing request (`submit`, `update`, `remove`, or `support`) to the Solana Mobile dApp publisher portal");
-publishCommand.command("submit").description("Submit a new app to the Solana Mobile dApp publisher portal").requiredOption("-k, --keypair <path-to-keypair-file>", "Path to keypair file").requiredOption("--complies-with-solana-dapp-store-policies", "An attestation that the app complies with the Solana dApp Store policies").requiredOption("--requestor-is-authorized", "An attestation that the party making this Solana dApp publisher portal request is authorized to do so").option("-a, --app-mint-address <app-mint-address>", "The mint address of the app NFT. If not specified, the value from your config file will be used.").option("-r, --release-mint-address <release-mint-address>", "The mint address of the release NFT. If not specified, the value from your config file will be used.").option("-u, --url <url>", "RPC URL", Constants.DEFAULT_RPC_DEVNET).option("-d, --dry-run", "Flag for dry run. Doesn't submit the request to the publisher portal.").option("-l, --alpha", "Flag to mark the submission as alpha test.").action(function(param) {
-    var appMintAddress = param.appMintAddress, releaseMintAddress = param.releaseMintAddress, keypair = param.keypair, url = param.url, compliesWithSolanaDappStorePolicies = param.compliesWithSolanaDappStorePolicies, requestorIsAuthorized = param.requestorIsAuthorized, dryRun = param.dryRun, alpha = param.alpha;
+}
+function runResumeAction(options) {
     return _async_to_generator(function() {
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
                     return [
                         4,
-                        tryWithErrorMessage(function() {
+                        runWithUserFacingErrors(function() {
                             return _async_to_generator(function() {
-                                var config, signer;
+                                var targets, apiKey, signer, clients, progress, result, error;
                                 return _ts_generator(this, function(_state) {
                                     switch(_state.label){
                                         case 0:
+                                            validateResumeArgs(options);
+                                            enforceSelfUpdatePolicy(options);
+                                            targets = resolvePortalTargets(options);
                                             return [
                                                 4,
-                                                checkForSelfUpdate()
+                                                resolveApiKey(options)
                                             ];
                                         case 1:
-                                            _state.sent();
-                                            checkSubmissionNetwork(url);
-                                            return [
-                                                4,
-                                                loadPublishDetails(Constants.getConfigFilePath())
-                                            ];
+                                            apiKey = _state.sent();
+                                            signer = createPublicationSignerFromKeypair(loadSignerKeypair(options.keypair));
+                                            clients = createPortalClients(targets, apiKey);
+                                            progress = createPublicationProgressReporter({
+                                                title: 'Resuming publication',
+                                                mode: 'resume',
+                                                verbose: options.verbose
+                                            });
+                                            progress.start({
+                                                message: 'Connecting to publishing portal',
+                                                metadata: buildResumeProgressMetadata(options)
+                                            });
+                                            _state.label = 2;
                                         case 2:
-                                            config = _state.sent();
-                                            if (!hasAddressInConfig(config.release) && !releaseMintAddress) {
-                                                throw new Error("Either specify a release mint address in the config file or specify as a CLI argument to this command.");
-                                            }
-                                            if (alpha) {
-                                                alphaAppSubmissionMessage();
-                                            }
-                                            signer = parseKeypair(keypair);
-                                            if (!signer) return [
-                                                3,
-                                                7
-                                            ];
-                                            if (!(config.lastUpdatedVersionOnStore != null && config.lastSubmittedVersionOnChain.address != null)) return [
-                                                3,
-                                                4
-                                            ];
+                                            _state.trys.push([
+                                                2,
+                                                4,
+                                                ,
+                                                5
+                                            ]);
                                             return [
                                                 4,
-                                                publishUpdateCommand({
-                                                    appMintAddress: appMintAddress,
-                                                    releaseMintAddress: releaseMintAddress,
-                                                    signer: signer,
-                                                    url: url,
-                                                    dryRun: dryRun,
-                                                    compliesWithSolanaDappStorePolicies: compliesWithSolanaDappStorePolicies,
-                                                    requestorIsAuthorized: requestorIsAuthorized,
-                                                    critical: false,
-                                                    alphaTest: alpha
+                                                runPublicationWorkflow({
+                                                    mode: 'resume',
+                                                    client: clients.workflowClient,
+                                                    input: buildResumeWorkflowInput(options, signer, clients.attestationClient),
+                                                    options: {
+                                                        logger: progress.logger
+                                                    }
                                                 })
                                             ];
                                         case 3:
-                                            _state.sent();
+                                            result = _state.sent();
+                                            progress.complete(result);
+                                            showPublicationSummary('Publication resume completed', result);
                                             return [
                                                 3,
-                                                6
+                                                5
                                             ];
                                         case 4:
-                                            return [
-                                                4,
-                                                publishSubmitCommand({
-                                                    appMintAddress: appMintAddress,
-                                                    releaseMintAddress: releaseMintAddress,
-                                                    signer: signer,
-                                                    url: url,
-                                                    dryRun: dryRun,
-                                                    compliesWithSolanaDappStorePolicies: compliesWithSolanaDappStorePolicies,
-                                                    requestorIsAuthorized: requestorIsAuthorized,
-                                                    alphaTest: alpha
-                                                })
-                                            ];
+                                            error = _state.sent();
+                                            progress.fail(error);
+                                            throw error;
                                         case 5:
-                                            _state.sent();
-                                            _state.label = 6;
-                                        case 6:
-                                            if (dryRun) {
-                                                dryRunSuccessMessage();
-                                            } else {
-                                                showMessage("Success", "Successfully submitted to the Solana Mobile dApp publisher portal");
-                                            }
-                                            _state.label = 7;
-                                        case 7:
-                                            return [
-                                                2
-                                            ];
-                                    }
-                                });
-                            })();
-                        })
-                    ];
-                case 1:
-                    _state.sent();
-                    return [
-                        2
-                    ];
-            }
-        });
-    })();
-});
-publishCommand.command("update").description("Update an existing app on the Solana Mobile dApp publisher portal").requiredOption("-k, --keypair <path-to-keypair-file>", "Path to keypair file").requiredOption("--complies-with-solana-dapp-store-policies", "An attestation that the app complies with the Solana dApp Store policies").requiredOption("--requestor-is-authorized", "An attestation that the party making this Solana dApp publisher portal request is authorized to do so").option("-a, --app-mint-address <app-mint-address>", "The mint address of the app NFT. If not specified, the value from your config file will be used.").option("-r, --release-mint-address <release-mint-address>", "The mint address of the release NFT. If not specified, the value from your config file will be used.").option("-c, --critical", "Flag for a critical app update request").option("-u, --url <url>", "RPC URL", Constants.DEFAULT_RPC_DEVNET).option("-d, --dry-run", "Flag for dry run. Doesn't submit the request to the publisher portal.").option("-l, --alpha", "Flag to mark the submission as alpha test.").action(function(param) {
-    var appMintAddress = param.appMintAddress, releaseMintAddress = param.releaseMintAddress, keypair = param.keypair, url = param.url, compliesWithSolanaDappStorePolicies = param.compliesWithSolanaDappStorePolicies, requestorIsAuthorized = param.requestorIsAuthorized, critical = param.critical, dryRun = param.dryRun, alpha = param.alpha;
-    return _async_to_generator(function() {
-        return _ts_generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    return [
-                        4,
-                        tryWithErrorMessage(function() {
-                            return _async_to_generator(function() {
-                                var config, signer;
-                                return _ts_generator(this, function(_state) {
-                                    switch(_state.label){
-                                        case 0:
-                                            return [
-                                                4,
-                                                checkForSelfUpdate()
-                                            ];
-                                        case 1:
-                                            _state.sent();
-                                            checkSubmissionNetwork(url);
-                                            return [
-                                                4,
-                                                loadPublishDetails(Constants.getConfigFilePath())
-                                            ];
-                                        case 2:
-                                            config = _state.sent();
-                                            if (!hasAddressInConfig(config.release) && !releaseMintAddress) {
-                                                throw new Error("Either specify a release mint address in the config file or specify as a CLI argument to this command.");
-                                            }
-                                            if (alpha) {
-                                                alphaAppSubmissionMessage();
-                                            }
-                                            signer = parseKeypair(keypair);
-                                            if (!signer) return [
-                                                3,
-                                                4
-                                            ];
-                                            return [
-                                                4,
-                                                publishUpdateCommand({
-                                                    appMintAddress: appMintAddress,
-                                                    releaseMintAddress: releaseMintAddress,
-                                                    signer: signer,
-                                                    url: url,
-                                                    dryRun: dryRun,
-                                                    compliesWithSolanaDappStorePolicies: compliesWithSolanaDappStorePolicies,
-                                                    requestorIsAuthorized: requestorIsAuthorized,
-                                                    critical: critical,
-                                                    alphaTest: alpha
-                                                })
-                                            ];
-                                        case 3:
-                                            _state.sent();
-                                            if (dryRun) {
-                                                dryRunSuccessMessage();
-                                            } else {
-                                                showMessage("Success", "dApp successfully updated on the publisher portal");
-                                            }
-                                            _state.label = 4;
-                                        case 4:
                                             return [
                                                 2
                                             ];
@@ -616,150 +409,156 @@ publishCommand.command("update").description("Update an existing app on the Sola
             }
         });
     })();
-});
-publishCommand.command("remove").description("Remove an existing app from the Solana Mobile dApp publisher portal").requiredOption("-k, --keypair <path-to-keypair-file>", "Path to keypair file").requiredOption("--requestor-is-authorized", "An attestation that the party making this Solana dApp publisher portal request is authorized to do so").option("-a, --app-mint-address <app-mint-address>", "The mint address of the app NFT. If not specified, the value from your config file will be used.").option("-r, --release-mint-address <release-mint-address>", "The mint address of the release NFT. If not specified, the value from your config file will be used.").option("-c, --critical", "Flag for a critical app removal request").option("-u, --url <url>", "RPC URL", Constants.DEFAULT_RPC_DEVNET).option("-d, --dry-run", "Flag for dry run. Doesn't submit the request to the publisher portal.").action(function(param) {
-    var appMintAddress = param.appMintAddress, releaseMintAddress = param.releaseMintAddress, keypair = param.keypair, url = param.url, requestorIsAuthorized = param.requestorIsAuthorized, critical = param.critical, dryRun = param.dryRun;
+}
+function createPortalClients(targets, apiKey) {
+    return {
+        workflowClient: createPortalWorkflowClient({
+            apiBaseUrl: targets.apiBaseUrl,
+            apiKey: apiKey
+        }),
+        attestationClient: createPortalAttestationClient({
+            apiBaseUrl: targets.apiBaseUrl,
+            apiKey: apiKey
+        })
+    };
+}
+function buildNewVersionWorkflowInput(options, signer, attestationClient) {
+    var _options_whatsNew, _options_idempotencyKey;
+    return {
+        source: buildPublicationSource(options),
+        whatsNew: (_options_whatsNew = options.whatsNew) !== null && _options_whatsNew !== void 0 ? _options_whatsNew : '',
+        idempotencyKey: (_options_idempotencyKey = options.idempotencyKey) !== null && _options_idempotencyKey !== void 0 ? _options_idempotencyKey : randomUUID(),
+        signer: signer,
+        attestationClient: attestationClient
+    };
+}
+function buildResumeWorkflowInput(options, signer, attestationClient) {
+    return {
+        publicationSessionId: resolveResumeSessionId(options),
+        releaseId: resolveResumeReleaseId(options),
+        signer: signer,
+        attestationClient: attestationClient
+    };
+}
+function buildPublicationSource(options) {
+    if (options.apkFile) {
+        return {
+            kind: 'apk-file',
+            filePath: options.apkFile,
+            fileName: path.basename(options.apkFile)
+        };
+    }
+    if (!options.apkUrl) {
+        throw new Error('`--apk-file` or `--apk-url` is required.');
+    }
+    return {
+        kind: 'apk-url',
+        url: options.apkUrl,
+        fileName: inferFileNameFromUrl(options.apkUrl)
+    };
+}
+function buildNewVersionProgressMetadata(options) {
+    if (options.apkFile) {
+        return {
+            sourceKind: 'apk-file',
+            fileName: path.basename(options.apkFile)
+        };
+    }
+    if (options.apkUrl) {
+        var fileName = inferFileNameFromUrl(options.apkUrl);
+        return _object_spread({
+            sourceKind: 'apk-url',
+            apkUrl: options.apkUrl
+        }, fileName ? {
+            fileName: fileName
+        } : {});
+    }
+    return {};
+}
+function buildResumeProgressMetadata(options) {
+    var publicationSessionId = resolveResumeSessionId(options);
+    var releaseId = resolveResumeReleaseId(options);
+    return _object_spread({}, publicationSessionId ? {
+        publicationSessionId: publicationSessionId
+    } : {}, releaseId ? {
+        releaseId: releaseId
+    } : {});
+}
+function inferFileNameFromUrl(url) {
+    try {
+        var pathname = new URL(url).pathname;
+        var fileName = pathname.split('/').filter(Boolean).pop();
+        return fileName || undefined;
+    } catch (e) {
+        return undefined;
+    }
+}
+function enforceSelfUpdatePolicy(options) {
+    if (options.skipSelfUpdate && !options.localDev) {
+        throw new Error('`--skip-self-update` is only allowed together with `--local-dev`.');
+    }
+}
+function resolveResumeReleaseId(options) {
+    var _options_releaseId;
+    return (_options_releaseId = options.releaseId) !== null && _options_releaseId !== void 0 ? _options_releaseId : options.resumeRelease;
+}
+function resolveResumeSessionId(options) {
+    var _options_sessionId;
+    return (_options_sessionId = options.sessionId) !== null && _options_sessionId !== void 0 ? _options_sessionId : options.resumeSession;
+}
+function loadSignerKeypair(keypairPath) {
+    if (!keypairPath) {
+        throw new Error('`--keypair` is required.');
+    }
+    var keypair = parseKeypair(keypairPath);
+    if (!keypair) {
+        throw new Error('Failed to load the signer keypair.');
+    }
+    return keypair;
+}
+function hasPublicationInputs(options) {
+    return Boolean(options.apkFile || options.apkUrl || options.whatsNew || options.portalUrl || options.keypair || options.rpcUrl || options.idempotencyKey || options.dappId || options.verbose);
+}
+function showPublicationSummary(title, result) {
+    var summaryLines = extractPublicationSummaryLines(result);
+    showMessage(title, summaryLines.join('\n'), 'standard');
+}
+function runWithUserFacingErrors(block) {
     return _async_to_generator(function() {
+        var error, message;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
+                    _state.trys.push([
+                        0,
+                        2,
+                        ,
+                        3
+                    ]);
                     return [
                         4,
-                        tryWithErrorMessage(function() {
-                            return _async_to_generator(function() {
-                                var config, signer;
-                                return _ts_generator(this, function(_state) {
-                                    switch(_state.label){
-                                        case 0:
-                                            return [
-                                                4,
-                                                checkForSelfUpdate()
-                                            ];
-                                        case 1:
-                                            _state.sent();
-                                            checkSubmissionNetwork(url);
-                                            return [
-                                                4,
-                                                loadPublishDetails(Constants.getConfigFilePath())
-                                            ];
-                                        case 2:
-                                            config = _state.sent();
-                                            if (!hasAddressInConfig(config.release) && !releaseMintAddress) {
-                                                throw new Error("Either specify a release mint address in the config file or specify as a CLI argument to this command.");
-                                            }
-                                            signer = parseKeypair(keypair);
-                                            if (!signer) return [
-                                                3,
-                                                4
-                                            ];
-                                            return [
-                                                4,
-                                                publishRemoveCommand({
-                                                    appMintAddress: appMintAddress,
-                                                    releaseMintAddress: releaseMintAddress,
-                                                    signer: signer,
-                                                    url: url,
-                                                    dryRun: dryRun,
-                                                    requestorIsAuthorized: requestorIsAuthorized,
-                                                    critical: critical
-                                                })
-                                            ];
-                                        case 3:
-                                            _state.sent();
-                                            if (dryRun) {
-                                                dryRunSuccessMessage();
-                                            } else {
-                                                showMessage("Success", "dApp successfully removed from the publisher portal");
-                                            }
-                                            _state.label = 4;
-                                        case 4:
-                                            return [
-                                                2
-                                            ];
-                                    }
-                                });
-                            })();
-                        })
+                        block()
                     ];
                 case 1:
                     _state.sent();
                     return [
-                        2
+                        3,
+                        3
                     ];
-            }
-        });
-    })();
-});
-publishCommand.command("support <request_details>").description("Submit a support request for an existing app on the Solana Mobile dApp publisher portal").requiredOption("-k, --keypair <path-to-keypair-file>", "Path to keypair file").requiredOption("--requestor-is-authorized", "An attestation that the party making this Solana dApp publisher portal request is authorized to do so").option("-a, --app-mint-address <app-mint-address>", "The mint address of the app NFT. If not specified, the value from your config file will be used.").option("-r, --release-mint-address <release-mint-address>", "The mint address of the release NFT. If not specified, the value from your config file will be used.").option("-u, --url <url>", "RPC URL", Constants.DEFAULT_RPC_DEVNET).option("-d, --dry-run", "Flag for dry run. Doesn't submit the request to the publisher portal.").action(function(requestDetails, param) {
-    var appMintAddress = param.appMintAddress, releaseMintAddress = param.releaseMintAddress, keypair = param.keypair, url = param.url, requestorIsAuthorized = param.requestorIsAuthorized, dryRun = param.dryRun;
-    return _async_to_generator(function() {
-        return _ts_generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
+                case 2:
+                    error = _state.sent();
+                    message = _instanceof(error, Error) ? error.message : 'An unexpected error occurred';
+                    showMessage('Error', message, 'error');
+                    process.exitCode = 1;
                     return [
-                        4,
-                        tryWithErrorMessage(function() {
-                            return _async_to_generator(function() {
-                                var config, signer;
-                                return _ts_generator(this, function(_state) {
-                                    switch(_state.label){
-                                        case 0:
-                                            return [
-                                                4,
-                                                checkForSelfUpdate()
-                                            ];
-                                        case 1:
-                                            _state.sent();
-                                            checkSubmissionNetwork(url);
-                                            return [
-                                                4,
-                                                loadPublishDetails(Constants.getConfigFilePath())
-                                            ];
-                                        case 2:
-                                            config = _state.sent();
-                                            if (!hasAddressInConfig(config.release) && !releaseMintAddress) {
-                                                throw new Error("Either specify a release mint address in the config file or specify as a CLI argument to this command.");
-                                            }
-                                            signer = parseKeypair(keypair);
-                                            if (!signer) return [
-                                                3,
-                                                4
-                                            ];
-                                            return [
-                                                4,
-                                                publishSupportCommand({
-                                                    appMintAddress: appMintAddress,
-                                                    releaseMintAddress: releaseMintAddress,
-                                                    signer: signer,
-                                                    url: url,
-                                                    dryRun: dryRun,
-                                                    requestorIsAuthorized: requestorIsAuthorized,
-                                                    requestDetails: requestDetails
-                                                })
-                                            ];
-                                        case 3:
-                                            _state.sent();
-                                            if (dryRun) {
-                                                dryRunSuccessMessage();
-                                            } else {
-                                                showMessage("Success", "Support request sent successfully");
-                                            }
-                                            _state.label = 4;
-                                        case 4:
-                                            return [
-                                                2
-                                            ];
-                                    }
-                                });
-                            })();
-                        })
+                        3,
+                        3
                     ];
-                case 1:
-                    _state.sent();
+                case 3:
                     return [
                         2
                     ];
             }
         });
     })();
-});
+}