@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
@@ -21,11 +21,12 @@
         .option('-l, --license [license]', cli_shared_1.Text.install.optionLicense)
         .option('--license-modes [licenseModes...]', cli_shared_1.Text.install.optionLicenseModes)
         .option('--users-with-access [user...]', cli_shared_1.Text.install.optionUsersWithAccess)
         .option('--major-version <majorVersion>', cli_shared_1.Text.install.optionMajorVersion)
-        .nonInteractiveOption(['--site', '--demo-site'], '--product', '--environment')
+        .option('--unitId <unitId>', cli_shared_1.Text.install.global.optionUnit)
+        .nonInteractiveOption(['--site', '--demo-site', '--unitId'], ['--product', '--unitId'], '--environment')
         .description(cli_shared_1.Text.install.cmd.description)
-        .action(async ({ environment, site, product, upgrade, confirmScopes, license, licenseModes, usersWithAccess, nonInteractive, majorVersion, demoSite, appIdOverride }) => {
+        .action(async ({ environment, site, product, upgrade, confirmScopes, license, licenseModes, usersWithAccess, nonInteractive, majorVersion, demoSite, appIdOverride, unitId }) => {
         let installSite = site;
         if (demoSite) {
             if (site) {
                 throw new cli_shared_1.UserError(cli_shared_1.Text.install.error.demoSiteWithSite);
@@ -46,9 +47,10 @@
             licenseModes,
             usersWithAccess,
             nonInteractive,
             majorVersion,
-            appIdOverride
+            appIdOverride,
+            unitId
         });
     });
 };
 const LIST_COMMAND_NAME = 'list';
@@ -162,9 +164,9 @@
                 ui.info(cli_shared_1.Text.uninstall.info);
                 ui.info(cli_shared_1.Text.ctrlC);
                 ui.emptyLine();
                 const context = installation.installedInUnit
-                    ? (0, installation_helper_1.buildInstallationContextFromId)(installation.id)
+                    ? installation.context
                     : (0, uninstall_command_helpers_1.getInstallationContext)(installation, product);
                 await (0, uninstall_command_helpers_1.performSingleUninstall)(installation.id, context, deps, appIdOverride);
                 return;
             }