Merge pull request #1204 from salesforcecli/t/packaging-distribution/bundle-enhancement

@W-22308874@ Bundle enhancement

Author: btrn11

messages/bundle_install.md

@@ -6,7 +6,7 @@ Install a specific version of a package bundle in the target org.
 
 During developer preview, package bundles can be installed only in scratch orgs. To install a package bundle in a scratch org, add the PackageBundles feature to the scratch org definition file.
 
-# examples 
+# examples
 
 - Install a package bundle version in a scratch org and wait 10 minutes for the installation to complete:
 
@@ -22,11 +22,11 @@ Username or alias of the org in which to install the package bundle version. Not
 
 # flags.dev-hub-org.summary
 
-Org ID of the Dev Hub org where the bundle was created.
+Username, alias, or ID of the Dev Hub org where the bundle was created.
 
 # flags.dev-hub-org.description
 
-Enter the Dev Hub org ID, such as 00Dxx0000000000.
+Enter the username, alias, or ID of the Dev Hub org, such as "admin@example.com", "myDevHub", or "00Dxx0000000000".
 
 # flags.wait.summary
 

messages/bundle_installed_list.md

@@ -4,15 +4,15 @@ List all installed package bundles in the target org.
 
 # description
 
-Displays information about all package bundles currently installed in the target org, including the bundle details and the associated packages with their expected and actual versions.
+Displays information about all package bundles installed in the target org, including the bundle details and the associated packages with their expected and actual versions.
 
 # examples
 
 - List all installed package bundles in your default org:
 
   <%= config.bin %> <%= command.id %>
 
-- List all installed package bundles in a specific org:
+- List all installed package bundles in the example org myorg@example.com:
 
   <%= config.bin %> <%= command.id %> --target-org myorg@example.com
 

messages/bundle_uninstall.md

@@ -4,17 +4,17 @@ Uninstall a package bundle version from a target org.
 
 # description
 
-Provide the package bundle version ID or alias and the target org to start an uninstall request. Optionally wait for the uninstall to complete.
+To start an uninstall request, provide the package bundle version ID or alias and the target org. Optionally enter the number of minutes to wait for the uninstall to complete. If the time to uninstall exceeds the number of minutes, the request times out.
 
 # examples
 
-- Uninstall a bundle version by ID from a specified org:
+- Uninstall a bundle version by ID from the example org myorg@example.com:
 
-  <%= config.bin %> <%= command.id %> --bundle 1Q8... --target-org me@example.com
+  <%= config.bin %> <%= command.id %> --bundle 1Q8... --target-org myorg@example.com
 
-- Uninstall a bundle version by alias from your default org and wait up to 10 minutes for completion:
+- Uninstall a bundle version by alias from your default org and wait up to 10 minutes to complete:
 
-  <%= config.bin %> <%= command.id %> --bundle MyBundle@1.2 -w 10
+  <%= config.bin %> <%= command.id %> --bundle MyBundle@1.2 --wait 10
 
 # flags.bundle.summary
 
@@ -26,11 +26,11 @@ Number of minutes to wait for the uninstall request to complete.
 
 # flags.verbose.summary
 
-Show additional progress while waiting for uninstall to finish.
+Show additional progress information while waiting for the uninstall to finish.
 
 # bundleUninstallWaitingStatus
 
-Waiting %s more minutes for bundle uninstall. Current status: %s
+Waiting %s more minutes for the bundle to uninstall. Current status: %s
 
 # bundleUninstallError
 

package.json

@@ -10,7 +10,7 @@
     "@oclif/core": "^4",
     "@salesforce/core": "^8.29.0",
     "@salesforce/kit": "^3.2.6",
-    "@salesforce/packaging": "^4.22.12",
+    "@salesforce/packaging": "^4.23.0",
     "@salesforce/sf-plugins-core": "^12.2.14",
     "chalk": "^5.6.2"
   },

src/commands/package/bundle/install.ts

@@ -22,7 +22,7 @@ import {
   SfCommand,
 } from '@salesforce/sf-plugins-core';
 import { BundleSObjects, BundleInstallOptions, PackageBundleInstall } from '@salesforce/packaging';
-import { Messages, Lifecycle } from '@salesforce/core';
+import { Messages, Lifecycle, Org } from '@salesforce/core';
 import { camelCaseToTitleCase, Duration } from '@salesforce/kit';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
@@ -45,12 +45,10 @@ export class PackageBundlesInstall extends SfCommand<BundleSObjects.PkgBundleVer
     }),
     'target-org': requiredOrgFlagWithDeprecations,
     'api-version': orgApiVersionFlagWithDeprecations,
-    'dev-hub-org': Flags.salesforceId({
-      length: 'both',
+    'dev-hub-org': Flags.string({
       char: 'd',
       summary: messages.getMessage('flags.dev-hub-org.summary'),
       description: messages.getMessage('flags.dev-hub-org.description'),
-      startsWith: '00D',
       required: true,
     }),
     wait: Flags.integer({
@@ -70,11 +68,22 @@ export class PackageBundlesInstall extends SfCommand<BundleSObjects.PkgBundleVer
     const targetOrg = flags['target-org'];
     const connection = targetOrg.getConnection(flags['api-version']);
 
+    const devHubInput = flags['dev-hub-org'];
+    let devHubOrgId: string;
+    // If the input already looks like a 15/18-char org ID starting with 00D, use it directly.
+    // Otherwise resolve the alias or username through the auth store.
+    if (/^00D[a-zA-Z0-9]{12}([a-zA-Z0-9]{3})?$/.test(devHubInput)) {
+      devHubOrgId = devHubInput;
+    } else {
+      const devHubOrg = await Org.create({ aliasOrUsername: devHubInput });
+      devHubOrgId = devHubOrg.getOrgId();
+    }
+
     const options: BundleInstallOptions = {
       connection,
       project: this.project!,
       PackageBundleVersion: flags.bundle,
-      DevelopmentOrganization: flags['dev-hub-org'],
+      DevelopmentOrganization: devHubOrgId,
     };
 
     // Set up lifecycle events for progress tracking