@hubspot/cli 7.5.3-beta.0 → 7.5.3-beta.2

package/lib/app/migrate.js

@@ -236,9 +236,21 @@ async function beginMigration(derivedAccountId, appId, platformVersion) {
     if (Object.values(componentsRequiringUids).length !== 0) {
         for (const [componentId, component] of Object.entries(componentsRequiringUids)) {
             const { componentHint, componentType } = component;
-            uidMap[componentId] = await (0, promptUtils_1.inputPrompt)(en_1.lib.migrate.prompt.uidForComponent(componentHint
-                ? `${(0, transform_1.mapToUserFacingType)(componentType)} '${componentHint}'`
-                : (0, transform_1.mapToUserFacingType)(componentType)), {
+            // Extract the internal ID from the base64-encoded ComponentExternalId
+            let internalId;
+            try {
+                const decoded = Buffer.from(componentId, 'base64').toString('utf8');
+                const parts = decoded.split('$$');
+                internalId = parts[1] || componentId;
+            }
+            catch {
+                // If decoding fails, use the componentId as the internalId
+                internalId = componentId;
+            }
+            const promptText = componentHint
+                ? `${(0, transform_1.mapToUserFacingType)(componentType)} '${componentHint}' (ID: ${internalId})`
+                : `${(0, transform_1.mapToUserFacingType)(componentType)} (ID: ${internalId})`;
+            uidMap[componentId] = await (0, promptUtils_1.inputPrompt)(en_1.lib.migrate.prompt.uidForComponent(promptText), {
                 validate: (uid) => {
                     const result = (0, project_parsing_lib_1.validateUid)(uid);
                     return result === undefined ? true : result;

package/lib/projects/localDev/AppDevModeInterface.js

@@ -141,7 +141,7 @@ class AppDevModeInterface {
     }
     async checkTestAccountAppInstallation() {
         if (!this.appNode || !this.appData) {
-            return;
+            return {};
         }
         const { data: { isInstalledWithScopeGroups, previouslyAuthorizedScopeGroups }, } = await (0, localDevAuth_1.fetchAppInstallationData)(this.localDevState.targetTestingAccountId, this.localDevState.projectId, this.appNode.uid, this.appNode.config.auth.requiredScopes, this.appNode.config.auth.optionalScopes);
         const isReinstall = previouslyAuthorizedScopeGroups.length > 0;
@@ -157,9 +157,7 @@ class AppDevModeInterface {
                 installationState: constants_1.APP_INSTALLATION_STATES.INSTALLED_WITH_OUTDATED_SCOPES,
             };
         }
-        if (!isInstalledWithScopeGroups) {
-            await this.installAppOrOpenInstallUrl(isReinstall);
-        }
+        return { needsInstall: !isInstalledWithScopeGroups, isReinstall };
     }
     setUpLocalDevServerMessageListeners() {
         this.localDevState.addListener('devServerMessage', message => {
@@ -179,7 +177,10 @@ class AppDevModeInterface {
             if (this.appNode.config.distribution === constants_1.APP_DISTRIBUTION_TYPES.MARKETPLACE) {
                 await this.checkMarketplaceAppInstalls();
             }
-            await this.checkTestAccountAppInstallation();
+            const { needsInstall, isReinstall } = await this.checkTestAccountAppInstallation();
+            if (needsInstall) {
+                await this.installAppOrOpenInstallUrl(isReinstall || false);
+            }
         }
         catch (e) {
             (0, index_1.logError)(e);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.5.3-beta.0",
+    "version": "7.5.3-beta.2",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",