@forge/cli

Index: package/out/command-line/register-installation-commands.js
===================================================================
--- package/out/command-line/register-installation-commands.js
+++ package/out/command-line/register-installation-commands.js
@@ -10,10 +10,10 @@
 const installation_helper_1 = require("../installations/installation-helper");
 const COMMAND_NAME = 'install';
 const registerInstallAppCommand = ({ cmd, controllers: { installController } }) => {
     cmd
-        .requireAppId()
-        .environmentOption()
+        .requireAppId(true)
+        .environmentOption(true)
         .contextOption()
         .option('--upgrade [target]', cli_shared_1.Text.install.optionUpgrade)
         .option('--confirm-scopes', cli_shared_1.Text.install.optionConfirmScopes, false)
         .option('-l, --license [license]', cli_shared_1.Text.install.optionLicense)
@@ -21,9 +21,9 @@
         .option('--users-with-access [user...]', cli_shared_1.Text.install.optionUsersWithAccess)
         .option('--major-version <majorVersion>', cli_shared_1.Text.install.optionMajorVersion)
         .nonInteractiveOption('--site', '--product', '--environment')
         .description(cli_shared_1.Text.install.cmd.description)
-        .action(async ({ environment, site, product, upgrade, confirmScopes, license, licenseModes, usersWithAccess, nonInteractive, majorVersion }) => {
+        .action(async ({ environment, site, product, upgrade, confirmScopes, license, licenseModes, usersWithAccess, nonInteractive, majorVersion, appIdOverride }) => {
         await installController.run({
             environment,
             site,
             products: product ? [product] : [],
@@ -32,21 +32,22 @@
             license,
             licenseModes,
             usersWithAccess,
             nonInteractive,
-            majorVersion
+            majorVersion,
+            appIdOverride
         });
     });
 };
 const LIST_COMMAND_NAME = 'list';
 const registerListInstallationsCommand = ({ cmd, ui, services: { installationsService } }) => {
     cmd
         .command(LIST_COMMAND_NAME)
-        .requireAppId()
+        .requireAppId(true)
         .jsonOption()
         .description(cli_shared_1.Text.installList.cmd)
-        .action(async ({ json }) => {
-        const { installations } = await installationsService.listAppInstallations();
+        .action(async ({ json, appIdOverride }) => {
+        const { installations } = await installationsService.listAppInstallations(undefined, appIdOverride);
         const getStatus = (permissionVersionIsLatest, appVersion, computeVersion) => {
             if (permissionVersionIsLatest) {
                 return cli_shared_1.Text.installList.status.upToDate;
             }
@@ -92,35 +93,35 @@
         .contextOption()
         .environmentOption()
         .batchUninstallOption()
         .installationIdOption()
-        .requireAppId()
+        .requireAppId(true)
         .description(cli_shared_1.Text.uninstall.cmd.desc)
-        .action(async ({ site, environment, product, batch, installationId }) => {
+        .action(async ({ site, environment, product, batch, installationId, appIdOverride }) => {
         if (site && product && !batch) {
             const installation = await installationsService.findOnlyMatchingInstallation({
                 site,
                 product,
                 environment,
                 installationId
-            });
+            }, appIdOverride);
             ui.info(cli_shared_1.Text.uninstall.info);
             ui.info(cli_shared_1.Text.ctrlC);
             ui.emptyLine();
             const context = (0, uninstall_command_helpers_1.getInstallationContext)(installation, product);
-            await (0, uninstall_command_helpers_1.performSingleUninstall)(installation.id, context, deps);
+            await (0, uninstall_command_helpers_1.performSingleUninstall)(installation.id, context, deps, appIdOverride);
         }
         else if (installationId) {
             const validatedId = (0, installation_helper_1.validateInstallationId)(installationId);
             const context = (0, installation_helper_1.buildInstallationContextFromId)(validatedId);
-            await (0, uninstall_command_helpers_1.performSingleUninstall)(validatedId, context, deps);
+            await (0, uninstall_command_helpers_1.performSingleUninstall)(validatedId, context, deps, appIdOverride);
         }
         else {
             if (batch && environment === 'production') {
                 ui.info(cli_shared_1.Text.uninstall.uninstallBatchProductionError);
                 return;
             }
-            const { installations } = await installationsService.listAppInstallations({ site, product, environment });
+            const { installations } = await installationsService.listAppInstallations({ site, product, environment }, appIdOverride);
             if (!installations.length) {
                 ui.info(cli_shared_1.Text.installList.noInstallations);
                 return;
             }
@@ -150,12 +151,12 @@
                 .filter((_, index) => !selectedSitesIndexes.includes(index))
                 .map(({ extra }) => filteredInstallations[extra.installationIdx]);
             firstUninstall.push(...(0, shared_1.getHangingIdentityInstallationsFromSite)(installations, remainingApps, selectedSites));
             if (firstUninstall.length > 1 || secondUninstall.length > 0) {
-                await (0, uninstall_command_helpers_1.performMultipleUninstalls)(firstUninstall, secondUninstall, deps, completionMessage);
+                await (0, uninstall_command_helpers_1.performMultipleUninstalls)(firstUninstall, secondUninstall, deps, completionMessage, appIdOverride);
             }
             else if (firstUninstall.length === 1) {
-                await (0, uninstall_command_helpers_1.performSingleUninstall)(firstUninstall[0].id, firstUninstall[0].context, deps);
+                await (0, uninstall_command_helpers_1.performSingleUninstall)(firstUninstall[0].id, firstUninstall[0].context, deps, appIdOverride);
             }
         }
     });
 };