@hubspot/cli 7.5.3-experimental.0 → 7.5.4-experimental.0

package/lang/en.lyaml

@@ -10,6 +10,9 @@ en:
         portalEnvVarDeprecated: "The HUBSPOT_PORTAL_ID environment variable is deprecated. Please use HUBSPOT_ACCOUNT_ID instead."
       loadConfigMiddleware:
         configFileExists: "A configuration file already exists at {{ configPath }}. To specify a new configuration file, delete the existing one and try again."
+      injectAccountIdMiddleware:
+        invalidAccountId: "In the default override file ({{ hsAccountFileName }}), the account ID must be a number. Please delete the current file and generate a new one using {{ overrideCommand }}."
+        accountNotFound: "The account in the default override file ({{ hsAccountFileName }}) wasn't found in your configured accounts. You can authorize this account using {{ authCommand }}."
     completion:
       describe: "Enable bash completion shortcuts for commands. Concat the generated script to your .bashrc, .bash_profile, or .zshrc file."
       examples:
@@ -17,11 +20,51 @@ en:
     account:
       describe: "Commands for managing configured accounts."
       subcommands:
+        auth:
+          describe: "Configure authentication for your HubSpot account."
+          options:
+            account:
+              describe: "HubSpot account to authenticate"
+          errors:
+            failedToUpdateConfig: "Failed to update the configuration file. Please try again."
+            bothConfigFilesNotAllowed: "Unable to create config file, because there is an existing \"{{ deprecatedConfig }}\" file. To create a new config file, delete the existing one and try again."
+          success:
+            configFileCreated: "Created config file \"{{ configPath }}\""
+            configFileUpdated: "Connected account \"{{ account }}\" and set it as the default account"
+        createOverride:
+          describe: "Create a new default account override file ({{ hsAccountFileName }}) in the current working directory."
+          success: "Default account override file created at {{ overrideFilePath }}"
+          accountOverride: "An account override file already exists at {{ overrideFilePath }} associated with account \"{{ accountOverride }}\"."
+          prompts:
+            replaceOverrideFile: "Replace existing account override file?"
+          errors:
+            accountNotFound: "The specified account could not be found in the config file {{ configPath }}"
+          options:
+            account:
+              describe: "Name or ID of the account to create an override file for."
+          examples:
+            default: "Create a new default account override file ({{ hsAccountFileName }}) in the current working directory"
+            idBased: "Create a new default account override file ({{ hsAccountFileName }}) in the current working directory, using the account with accountId \"1234567\""
+            nameBased: "Create a new default account override file ({{ hsAccountFileName }}) in the current working directory, using the account with name \"MyAccount\""
+        removeOverride:
+          describe: "Remove the default account override file ({{ overrideFile }}) from the current working directory."
+          accountOverride: "There is an account override file at {{ overrideFilePath }} associated with account \"{{ accountOverride }}\"."
+          prompts:
+            deleteOverrideFile: "Delete account override file?"
+          success: "Removed the default account override file."
+          noOverrideFile: "No default account override file found in the current working directory. No action required."
+          options:
+            force:
+              describe: "Skip confirmation prompt when removing the override file"
         list:
-          accounts: "{{#bold}}Accounts{{/bold}}:"
-          defaultAccount: "{{#bold}}Default account{{/bold}}: {{ account }}"
           describe: "List names of accounts defined in config."
-          configPath: "{{#bold}}Config path{{/bold}}: {{ configPath }}"
+          accounts: "{{#bold}}Accounts{{/bold}}:"
+          defaultAccountTitle: "{{#bold}}Default Account{{/bold}}"
+          defaultAccount: "Account: {{ account }}"
+          configPath: "Source: {{ configPath }}"
+          overrideFilePathTitle: "{{#bold}}Default Account Override{{/bold}}"
+          overrideFilePath: "Source: {{ overrideFilePath }}"
+          overrideAccount: "Account: {{ account }}"
           labels:
             accountId: "Account ID"
             authType: "Auth Type"
@@ -39,6 +82,8 @@ en:
           describe: "Set the Hubspot account to use as the default account. The default account can be overridden with the \"--account\" option."
           errors:
             accountNotFound: "The account \"{{ specifiedAccount }}\" could not be found in {{ configPath }}"
+          accountOverride: "This project currently has an account override set: \"{{ accountOverride }}\". Account \"{{accountOverride}}\" will continue to act as the default account for this project."
+          accountOverrideCommands: "Use {{ createOverrideCommand }} to change override accounts, or {{ removeOverrideCommand }} to remove the override and use your default account."
           examples:
             default: "Select a HubSpot account to use as the default account"
             idBased: "Set the default account to the account in the config with accountId equal to \"1234567\""
@@ -54,6 +99,7 @@ en:
           logs:
             replaceDefaultAccount: "The removed account was the default account."
           prompts:
+            deleteOverrideFile: "Delete the override file ({{ overrideFilePath }}) associated with {{ accountName }}?"
             selectAccountToRemove: "Select an account to remove from the config"
           errors:
             accountNotFound: "The account \"{{ specifiedAccount }}\" could not be found in {{ configPath }}"
@@ -69,6 +115,12 @@ en:
         info:
           accountId: "{{#bold}}Account ID{{/bold}}: {{ accountId }}"
           describe: "Print information about the default account, or about the account specified with the \"account\" option."
+          defaultAccountTitle: "{{#bold}}Default Account{{/bold}}"
+          defaultAccount: "Account: {{ account }}"
+          configPath: "Source: {{ configPath }}"
+          overrideFilePathTitle: "{{#bold}}Default Account Override{{/bold}}"
+          overrideFilePath: "Source: {{ overrideFilePath }}"
+          overrideAccount: "Account: {{ account }}"
           errors:
             notUsingPersonalAccessKey: "This command currently only supports fetching scopes for the personal access key auth type."
           options:
@@ -91,13 +143,15 @@ en:
           confirm:
             one: "Remove 1 inactive account from the CLI config?"
             other: "Remove {{ count }} inactive accounts from the CLI config?"
+          defaultAccountOverride: "\n(This will also delete the default account override file at {{ overrideFilePath }})"
+          replaceDefaultAccount: "The default account was removed."
           removeSuccess: "Removed {{ accountName }} from the CLI config."
     auth:
       describe: "Configure authentication for your HubSpot account."
       verboseDescribe: "Configure authentication for a HubSpot account. This will update the {{ configName }} file that stores your account information.\n\nThe recommended authentication method is {{#bold}}{{ authMethod }}{{/bold}}, which uses an access token tied to a specific user account."
       errors:
-        noConfigFileFound: "No config file was found. To create a new config file, use the \"hs init\" command."
         unsupportedAuthType: "Unsupported auth type: {{ type }}. The only supported authentication protocols are {{ supportedProtocols }}."
+        globalConfigFileExists: "A global config file exists at {{ configPath }}. To authorize an account, please use {{ authCommand }}."
       options:
         authType:
           describe: "Authentication method"
@@ -108,6 +162,16 @@ en:
     config:
       describe: "Commands for managing the CLI config file."
       subcommands:
+        migrate:
+          describe: "Migrate from the deprecated {{ deprecatedConfigPath }} file to the new global config file at {{ globalConfigPath }}."
+          migrationAlreadyCompleted: "No {{ deprecatedConfigPath }} deprecated configuration file found. No migration necessary."
+          errors:
+            configNotFound: "A configuration file at {{ configPath }} could not be found. Please try again with a valid file path."
+          options:
+            force: "When merging a deprecated configuration file with an existing global configuration file, overwrite any conflicting values in the global config with the deprecated config values."
+          examples:
+            default: "Migrate from the deprecated {{ deprecatedConfigPath }} file to the new global config file at {{ globalConfigPath }}"
+            configFlag: "Migrate a specific config file (specified with the config flag) to the new global config file at {{ globalConfigPath }}"
         set:
           describe: "Set various configuration options within the hubspot.config.yml file."
           promptMessage: "Select a config option to update"
@@ -455,8 +519,6 @@ en:
           describe: "Authentication method"
         account:
           describe: "HubSpot account to authenticate"
-        useHiddenConfig:
-          describe: "Use the new HubSpot configuration file located in a hidden file in the user's home directory"
       success:
         configFileCreated: "Created config file \"{{ configPath }}\""
         configFileUpdated: "Connected account \"{{ account }}\" using \"{{ authType }}\" and set it as the default account"
@@ -464,7 +526,7 @@ en:
         updateConfig: "To update an existing config file, use the \"hs auth\" command."
       errors:
         configFileExists: "The config file {{ configPath }} already exists."
-        bothConfigFilesNotAllowed: "Unable to create config file, because there is an existing one at \"{{ path }}\". To create a new config file, delete the existing one and try again."
+        globalConfigFileExists: "A global config file already exists at {{ configPath }}. To specify a new local config file, delete the existing one and try again."
     lint:
       issuesFound: "{{ count }} issues found."
       groupName: "Linting {{ path }}"
@@ -588,7 +650,6 @@ en:
           componentsToBeMigrated: "The following component types will be migrated: {{ components }}"
           componentsThatWillNotBeMigrated: "[NOTE] These component types are not yet supported for migration but will be available later: {{ components }}"
           errors:
-            noAppsForProject: "No apps associated with project {{ projectName }}"
             noAppsEligible: "No apps in account {{ accountId }} are currently migratable"
             noAccountConfig: "There is no account associated with {{ accountId }} in the config file. Please choose another account and try again, or authenticate {{ accountId }} using {{ authCommand }}."
             invalidAccountTypeTitle: "{{#bold}}Developer account not targeted{{/bold}}"
@@ -656,12 +717,6 @@ en:
           examples:
             default: "Create a component within your project"
             withFlags: "Use --name and --type flags to bypass the prompt."
-        migrate:
-            describe: "Migrate a project to the projects framework."
-            errors:
-                noProjectConfig: "No project detected. Please run this command again from a project directory."
-            examples:
-                default: "Migrate a project to the projects framework"
         deploy:
           describe: "Deploy a project build."
           deployBuildIdPrompt: "[--build] Deploy which build?"
@@ -1201,6 +1256,9 @@ en:
         compressed: "Project files compressed: {{ byteCount }} bytes"
         compressing: "Compressing build files to \"{{ path }}\""
         fileFiltered: "Ignore rule triggered for \"{{ filename }}\""
+    middleware:
+      fireAlarm:
+        failedToLoadBoxen: "Failed to load boxen util."
     ui:
       betaTag: "{{#bold}}[BETA]{{/bold}}"
       betaWarning:
@@ -1221,11 +1279,14 @@ en:
             command: "--account"
             message: "Use the {{ command }} option with any command to override the default account"
           accountsListCommand:
-            command: hs accounts list
+            command: "hs account list"
             message: "Run {{ command }} to see a list of configured HubSpot accounts"
           accountsUseCommand:
-            command: "hs accounts use"
+            command: "hs account use"
             message: "Run {{ command }} to set the Hubspot account that the CLI will target by default"
+          accountAuthCommand:
+            command: "hs account auth"
+            message: "Run {{ command }} to connect the CLI to additional HubSpot accounts"
           authCommand:
             command: "hs auth"
             message: "Run {{ command }} to connect the CLI to additional HubSpot accounts"
@@ -1290,6 +1351,13 @@ en:
           describe: "Use environment variable config"
         debug:
           describe: "Set log level to debug"
+    configMigrate:
+      migrateConfigPrompt: "Migrate config?\n From deprecated config file: {{ deprecatedConfigPath }}\n To new global config file: {{ globalConfigPath }}\n (This action will delete the deprecated config file).\n"
+      mergeConfigConflictPrompt: "Change the {{ property }} property in the global config from {{ newValue }} to {{ oldValue }}?"
+      mergeConfigsPrompt: "Two config files detected. Merge them?\n Deprecated config file: {{ deprecatedConfigPath }}\n Global config: {{ globalConfigPath }}\n (This action will delete the deprecated config file).\n"
+      migrationSuccess: "The deprecated config file has been migrated to the new global config file at {{ globalConfigPath }}."
+      mergeSuccess: "The deprecated config file has been merged with the global config file at {{ globalConfigPath }}."
+      skippedExistingAccounts: "\nThe following accounts were not merged, because they already exist in the global config: {{ skippedAccountIds }}.\n"
     prompts:
       projectDevTargetAccountPrompt:
         createNewSandboxOption: "<Test on a new development sandbox>"
@@ -1576,6 +1644,9 @@ en:
     doctor:
       runningDiagnostics: "Running diagnostics..."
       diagnosticsComplete: "Diagnostics complete"
+      defaultAccountOverrideFileChecks:
+        overrideActive: "Default account override file active: {{ defaultAccountOverrideFile }}"
+        overrideAccountId: "Active account ID: {{ overrideAccountId }}"
       accountChecks:
         active: "Default account active"
         inactive: "Default account isn't active"
@@ -1627,6 +1698,8 @@ en:
           settings:
             httpUseLocalhost: "The setting {{#bold}}httpUseLocalhost{{/bold}} is enabled"
             httpUseLocalhostSecondary: "This setting causes all CLI requests to route to localhost"
+        defaultAccountOverrideFile:
+          header: "Default account override file path:"
         projectConfig:
           header: "Project configuration"
           projectDirSubHeader: "Project dir: {{#bold}}{{ projectDir }}{{/bold}}"

package/lib/app/migrate.d.ts

@@ -1,5 +1,5 @@
 import { ArgumentsCamelCase } from 'yargs';
-import { LoadedProjectConfig } from '../projects';
 import { MigrateAppOptions } from '../../types/Yargs';
-export declare function migrateApp2025_2(derivedAccountId: number, options: ArgumentsCamelCase<MigrateAppOptions>, projectConfig?: LoadedProjectConfig): Promise<void>;
+export declare function downloadProjectFiles(derivedAccountId: number, projectName: string, buildId: number, projectDest: string): Promise<void>;
+export declare function migrateApp2025_2(derivedAccountId: number, options: ArgumentsCamelCase<MigrateAppOptions>): Promise<void>;
 export declare function logInvalidAccountError(i18nKey: string): void;

package/lib/app/migrate.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.downloadProjectFiles = downloadProjectFiles;
 exports.migrateApp2025_2 = migrateApp2025_2;
 exports.logInvalidAccountError = logInvalidAccountError;
 const logger_1 = require("@hubspot/local-dev-lib/logger");
@@ -22,7 +23,6 @@ const projects_3 = require("../projects");
 const SpinniesManager_1 = __importDefault(require("../ui/SpinniesManager"));
 const polling_1 = require("../polling");
 const migrate_1 = require("../../api/migrate");
-const fs_1 = __importDefault(require("fs"));
 function getUnmigratableReason(reasonCode) {
     switch (reasonCode) {
         case projects_1.UNMIGRATABLE_REASONS.UP_TO_DATE:
@@ -37,42 +37,30 @@ function getUnmigratableReason(reasonCode) {
             });
     }
 }
-function filterAppsByProjectName(projectConfig) {
-    return (app) => {
-        if (projectConfig) {
-            return app.projectName === projectConfig?.projectConfig?.name;
-        }
-        return !app.projectName;
-    };
-}
-async function handleMigrationSetup(derivedAccountId, options, projectConfig) {
+async function handleMigrationSetup(derivedAccountId, options) {
     const { name, dest, appId } = options;
     const { data: { migratableApps, unmigratableApps }, } = await (0, migrate_1.listAppsForMigration)(derivedAccountId);
-    const filteredMigratableApps = migratableApps.filter(filterAppsByProjectName(projectConfig));
-    const filteredUnmigratableApps = unmigratableApps.filter(filterAppsByProjectName(projectConfig));
-    const allApps = [...filteredMigratableApps, ...filteredUnmigratableApps];
-    if (allApps.length > 1 && projectConfig) {
-        throw new Error('Multiple apps found in project, this is not allowed in the new system');
-    }
-    if (allApps.length === 0) {
-        const reasons = filteredUnmigratableApps.map(app => `${chalk_1.default.bold(app.appName)}: ${getUnmigratableReason(app.unmigratableReason)}`);
-        if (projectConfig) {
-            // TODO: i18n, get copy from UX
-            throw new Error('No migratable apps in project');
-        }
+    const migratableAppsWithoutProject = migratableApps.filter((app) => !app.projectName);
+    const unmigratableAppsWithoutProject = unmigratableApps.filter((app) => !app.projectName);
+    const allAppsWithoutProject = [
+        ...migratableAppsWithoutProject,
+        ...unmigratableAppsWithoutProject,
+    ];
+    if (allAppsWithoutProject.length === 0) {
+        const reasons = unmigratableAppsWithoutProject.map(app => `${chalk_1.default.bold(app.appName)}: ${getUnmigratableReason(app.unmigratableReason)}`);
         throw new Error(`${(0, lang_1.i18n)(`commands.project.subcommands.migrateApp.errors.noAppsEligible`, {
             accountId: (0, ui_1.uiAccountDescription)(derivedAccountId),
         })}${reasons.length ? `\n  - ${reasons.join('\n  - ')}` : ''}`);
     }
     if (appId &&
-        !allApps.some(app => {
+        !allAppsWithoutProject.some(app => {
             return app.appId === appId;
         })) {
         throw new Error((0, lang_1.i18n)('commands.project.subcommands.migrateApp.prompt.chooseApp', {
             appId,
         }));
     }
-    const appChoices = allApps.map(app => ({
+    const appChoices = allAppsWithoutProject.map(app => ({
         name: app.isMigratable
             ? app.appName
             : `[${chalk_1.default.yellow('DISABLED')}] ${app.appName} `,
@@ -88,7 +76,7 @@ async function handleMigrationSetup(derivedAccountId, options, projectConfig) {
         });
         appIdToMigrate = selectedAppId;
     }
-    const selectedApp = allApps.find(app => app.appId === appIdToMigrate);
+    const selectedApp = allAppsWithoutProject.find(app => app.appId === appIdToMigrate);
     const migratableComponents = [];
     const unmigratableComponents = [];
     selectedApp?.migrationComponents.forEach(component => {
@@ -114,18 +102,7 @@ async function handleMigrationSetup(derivedAccountId, options, projectConfig) {
     if (!proceed) {
         return {};
     }
-    // If it's a project we don't want to prompt for dest and name, so just return early
-    if (projectConfig &&
-        projectConfig?.projectConfig &&
-        projectConfig?.projectDir) {
-        return {
-            appIdToMigrate,
-            projectName: projectConfig.projectConfig.name,
-            projectDest: projectConfig.projectDir,
-        };
-    }
-    const projectName = projectConfig?.projectConfig?.name ||
-        name ||
+    const projectName = name ||
         (await (0, promptUtils_1.inputPrompt)((0, lang_1.i18n)('commands.project.subcommands.migrateApp.prompt.inputName')));
     const { projectExists } = await (0, projects_3.ensureProjectExists)(derivedAccountId, projectName, { allowCreate: false, noLogs: true });
     if (projectExists) {
@@ -160,7 +137,7 @@ async function beginMigration(derivedAccountId, appId, platformVersion) {
             const { componentHint, componentType } = component;
             uidMap[componentId] = await (0, promptUtils_1.inputPrompt)((0, lang_1.i18n)('commands.project.subcommands.migrateApp.prompt.uidForComponent', {
                 componentName: componentHint
-                    ? `${(0, transform_1.mapToUserFacingType)(componentType)} '${componentHint}'`
+                    ? `${componentHint} [${(0, transform_1.mapToUserFacingType)(componentType)}]`
                     : (0, transform_1.mapToUserFacingType)(componentType),
             }), {
                 validate: (uid) => {
@@ -196,43 +173,34 @@ async function finalizeMigration(derivedAccountId, migrationId, uidMap, projectN
         SpinniesManager_1.default.fail('finishingMigration', {
             text: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.spinners.migrationFailed`),
         });
-        if ((0, migrate_1.isMigrationStatus)(error) && error.status === Migration_1.MIGRATION_STATUS.FAILURE) {
-            throw new Error(error.projectErrorDetail);
-        }
-        throw new Error((0, lang_1.i18n)('commands.project.subcommands.migrateApp.errors.migrationFailed'), {
-            cause: error,
-        });
-    }
-    if (pollResponse.status !== Migration_1.MIGRATION_STATUS.SUCCESS) {
-        throw new Error((0, lang_1.i18n)('commands.project.subcommands.migrateApp.errors.migrationFailed'));
+        throw error;
     }
     if (pollResponse.status === Migration_1.MIGRATION_STATUS.SUCCESS) {
         SpinniesManager_1.default.succeed('finishingMigration', {
             text: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.spinners.migrationComplete`),
         });
+        return pollResponse.buildId;
+    }
+    else {
+        SpinniesManager_1.default.fail('finishingMigration', {
+            text: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.spinners.migrationFailed`),
+        });
+        if (pollResponse.status === Migration_1.MIGRATION_STATUS.FAILURE) {
+            logger_1.logger.error(pollResponse.componentErrorDetails);
+            throw new Error(pollResponse.projectErrorsDetail);
+        }
+        throw new Error((0, lang_1.i18n)('commands.project.subcommands.migrateApp.errors.migrationFailed'));
     }
-    return pollResponse.buildId;
 }
-async function downloadProjectFiles(derivedAccountId, projectName, buildId, projectDest, projectConfig) {
+async function downloadProjectFiles(derivedAccountId, projectName, buildId, projectDest) {
     try {
         SpinniesManager_1.default.add('fetchingMigratedProject', {
             text: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.spinners.downloadingProjectContents`),
         });
         const { data: zippedProject } = await (0, projects_2.downloadProject)(derivedAccountId, projectName, buildId);
-        let absoluteDestPath;
-        if (projectConfig?.projectConfig && projectConfig?.projectDir) {
-            const { projectDir } = projectConfig;
-            absoluteDestPath = projectDir;
-            const { srcDir } = projectConfig.projectConfig;
-            const archiveDest = path_1.default.join(projectDir, 'archive');
-            // Move the existing source directory to archive
-            fs_1.default.renameSync(path_1.default.join(projectDir, srcDir), archiveDest);
-        }
-        else {
-            absoluteDestPath = projectDest
-                ? path_1.default.resolve((0, path_2.getCwd)(), projectDest)
-                : (0, path_2.getCwd)();
-        }
+        const absoluteDestPath = projectDest
+            ? path_1.default.resolve((0, path_2.getCwd)(), projectDest)
+            : (0, path_2.getCwd)();
         await (0, archive_1.extractZipArchive)(zippedProject, (0, path_2.sanitizeFileName)(projectName), absoluteDestPath, {
             includesRootDir: true,
             hideLogs: true,
@@ -249,19 +217,9 @@ async function downloadProjectFiles(derivedAccountId, projectName, buildId, proj
         throw error;
     }
 }
-async function migrateApp2025_2(derivedAccountId, options, projectConfig) {
+async function migrateApp2025_2(derivedAccountId, options) {
     SpinniesManager_1.default.init();
-    if (projectConfig) {
-        if (!projectConfig?.projectConfig || !projectConfig?.projectDir) {
-            throw new Error('Invalid project config');
-        }
-        // TODO: i18n
-        const { projectExists } = await (0, projects_3.ensureProjectExists)(derivedAccountId, projectConfig.projectConfig.name, { allowCreate: false, noLogs: true });
-        if (!projectExists) {
-            throw new Error('Project does not exist, unable to migrate');
-        }
-    }
-    const { appIdToMigrate, projectName, projectDest } = await handleMigrationSetup(derivedAccountId, options, projectConfig);
+    const { appIdToMigrate, projectName, projectDest } = await handleMigrationSetup(derivedAccountId, options);
     if (!appIdToMigrate || !projectName || !projectDest) {
         return;
     }
@@ -270,8 +228,8 @@ async function migrateApp2025_2(derivedAccountId, options, projectConfig) {
         return;
     }
     const { migrationId, uidMap } = migrationInProgress;
-    const buildId = await finalizeMigration(derivedAccountId, migrationId, uidMap, projectConfig?.projectConfig?.name || projectName);
-    await downloadProjectFiles(derivedAccountId, projectName, buildId, projectDest, projectConfig);
+    const buildId = await finalizeMigration(derivedAccountId, migrationId, uidMap, projectName);
+    await downloadProjectFiles(derivedAccountId, projectName, buildId, projectDest);
 }
 function logInvalidAccountError(i18nKey) {
     (0, ui_1.uiLine)();

package/lib/app/migrate_legacy.js

@@ -31,15 +31,13 @@ async function migrateApp2023_2(derivedAccountId, options, accountConfig) {
         (0, migrate_1.logInvalidAccountError)('commands.project.subcommands.migrateApp');
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
-    let appId = options.appId;
-    if (!appId) {
-        const { appId: selectAppId } = await (0, selectPublicAppPrompt_1.selectPublicAppPrompt)({
+    const { appId } = 'appId' in options
+        ? options
+        : await (0, selectPublicAppPrompt_1.selectPublicAppPrompt)({
             accountId: derivedAccountId,
             accountName,
             isMigratingApp: true,
         });
-        appId = selectAppId;
-    }
     try {
         const { data: selectedApp } = await (0, appsDev_1.fetchPublicAppMetadata)(appId, derivedAccountId);
         // preventProjectMigrations returns true if we have not added app to allowlist config.

package/lib/configMigrate.d.ts

@@ -0,0 +1,2 @@
+export declare function handleMigration(accountId: number | undefined, configPath?: string): Promise<void>;
+export declare function handleMerge(accountId: number | undefined, configPath?: string, force?: boolean): Promise<void>;

package/lib/configMigrate.js

@@ -0,0 +1,104 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleMigration = handleMigration;
+exports.handleMerge = handleMerge;
+const migrate_1 = require("@hubspot/local-dev-lib/config/migrate");
+const config_1 = require("@hubspot/local-dev-lib/constants/config");
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const promptUtils_1 = require("./prompts/promptUtils");
+const lang_1 = require("./lang");
+const usageTracking_1 = require("./usageTracking");
+async function handleMigration(accountId, configPath) {
+    const { shouldMigrateConfig } = await (0, promptUtils_1.promptUser)({
+        name: 'shouldMigrateConfig',
+        type: 'confirm',
+        message: (0, lang_1.i18n)('lib.configMigrate.migrateConfigPrompt', {
+            deprecatedConfigPath: (0, migrate_1.getConfigPath)(configPath, false) ||
+                config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
+            globalConfigPath: config_1.GLOBAL_CONFIG_PATH,
+        }),
+    });
+    if (!shouldMigrateConfig) {
+        (0, usageTracking_1.trackCommandMetadataUsage)('config-migrate', {
+            command: 'hs config migrate',
+            type: 'migration',
+            step: 'Reject migration via prompt',
+        }, accountId);
+        return;
+    }
+    const deprecatedConfig = (0, migrate_1.getDeprecatedConfig)(configPath);
+    (0, migrate_1.migrateConfig)(deprecatedConfig);
+    (0, usageTracking_1.trackCommandMetadataUsage)('config-migrate', {
+        command: 'hs config migrate',
+        type: 'migration',
+        step: 'Confirm migration via prompt',
+        successful: true,
+    }, accountId);
+    logger_1.logger.success((0, lang_1.i18n)('lib.configMigrate.migrationSuccess', {
+        globalConfigPath: config_1.GLOBAL_CONFIG_PATH,
+    }));
+    return;
+}
+async function mergeConfigProperties(globalConfig, deprecatedConfig, force) {
+    const { initialConfig, conflicts, } = (0, migrate_1.mergeConfigProperties)(globalConfig, deprecatedConfig, force);
+    if (conflicts.length > 0) {
+        for (const conflict of conflicts) {
+            const { property, newValue, oldValue } = conflict;
+            const { shouldOverwrite } = await (0, promptUtils_1.promptUser)({
+                name: 'shouldOverwrite',
+                type: 'confirm',
+                message: (0, lang_1.i18n)('lib.configMigrate.mergeConfigConflictPrompt', {
+                    property,
+                    oldValue: `${oldValue}`,
+                    newValue: `${newValue}`,
+                }),
+            });
+            if (shouldOverwrite) {
+                // @ts-expect-error Cannot reconcile CLIConfig_NEW and CLIConfig_DEPRECATED
+                initialConfig[property] = oldValue;
+            }
+        }
+    }
+    return initialConfig;
+}
+async function handleMerge(accountId, configPath, force) {
+    const { shouldMergeConfigs } = await (0, promptUtils_1.promptUser)({
+        name: 'shouldMergeConfigs',
+        type: 'confirm',
+        message: (0, lang_1.i18n)('lib.configMigrate.mergeConfigsPrompt', {
+            deprecatedConfigPath: (0, migrate_1.getConfigPath)(configPath, false) ||
+                config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
+            globalConfigPath: config_1.GLOBAL_CONFIG_PATH,
+        }),
+    });
+    if (!shouldMergeConfigs) {
+        (0, usageTracking_1.trackCommandMetadataUsage)('config-migrate', {
+            command: 'hs config migrate',
+            type: 'merge',
+            step: 'Reject merge via prompt',
+        }, accountId);
+        return;
+    }
+    const deprecatedConfig = (0, migrate_1.getDeprecatedConfig)(configPath);
+    const globalConfig = (0, migrate_1.getGlobalConfig)();
+    if (!deprecatedConfig || !globalConfig) {
+        return;
+    }
+    const mergedConfig = await mergeConfigProperties(globalConfig, deprecatedConfig, force);
+    const { skippedAccountIds } = (0, migrate_1.mergeExistingConfigs)(mergedConfig, deprecatedConfig);
+    if (skippedAccountIds.length > 0) {
+        logger_1.logger.log((0, lang_1.i18n)('lib.configMigrate.skippedExistingAccounts', {
+            skippedAccountIds: skippedAccountIds.join(', '),
+        }));
+    }
+    logger_1.logger.success((0, lang_1.i18n)('lib.configMigrate.mergeSuccess', {
+        globalConfigPath: config_1.GLOBAL_CONFIG_PATH,
+    }));
+    (0, usageTracking_1.trackCommandMetadataUsage)('config-migrate', {
+        command: 'hs config migrate',
+        type: 'merge',
+        step: 'Confirm merge via prompt',
+        successful: true,
+    }, accountId);
+    return;
+}

package/lib/doctor/Diagnosis.d.ts

@@ -11,16 +11,15 @@ interface Section {
 export declare class Diagnosis {
     private readonly prefixes;
     private readonly diagnosis;
-    private readonly indentation;
     private errorCount;
     private warningCount;
     constructor({ diagnosticInfo, accountId }: DiagnosisOptions);
-    private indent;
     getErrorCount(): number;
     getWarningCount(): number;
     addCliSection(section: Section): void;
     addProjectSection(section: Section): void;
     addCLIConfigSection(section: Section): void;
+    addDefaultAccountOverrideFileSection(section: Section): void;
     toString(): string;
     private generateSections;
 }

package/lib/doctor/Diagnosis.js

@@ -5,12 +5,12 @@ const spinniesUtils_1 = require("../ui/spinniesUtils");
 const chalk_1 = require("chalk");
 const interpolation_1 = require("../interpolation");
 const ui_1 = require("../ui");
+const index_1 = require("../ui/index");
 const { i18n } = require('../lang');
 const i18nKey = `lib.doctor.diagnosis`;
 class Diagnosis {
     prefixes;
     diagnosis;
-    indentation = '  ';
     errorCount = 0;
     warningCount = 0;
     constructor({ diagnosticInfo, accountId }) {
@@ -29,6 +29,10 @@ class Diagnosis {
                 header: i18n(`${i18nKey}.cliConfig.header`),
                 sections: [],
             },
+            defaultAccountOverrideFile: {
+                header: i18n(`${i18nKey}.defaultAccountOverrideFile.header`),
+                sections: [],
+            },
             project: {
                 header: i18n(`${i18nKey}.projectConfig.header`),
                 subheaders: [
@@ -53,9 +57,6 @@ class Diagnosis {
             ];
         }
     }
-    indent(level) {
-        return this.indentation.repeat(level);
-    }
     getErrorCount() {
         return this.errorCount;
     }
@@ -71,6 +72,9 @@ class Diagnosis {
     addCLIConfigSection(section) {
         this.diagnosis.cliConfig.sections.push(section);
     }
+    addDefaultAccountOverrideFileSection(section) {
+        this.diagnosis.defaultAccountOverrideFile.sections.push(section);
+    }
     toString() {
         const output = [];
         for (const value of Object.values(this.diagnosis)) {
@@ -108,9 +112,9 @@ class Diagnosis {
             else if (section.type === 'warning') {
                 this.warningCount++;
             }
-            output.push(`${this.indent(1)}${this.prefixes[section.type]} ${section.message}`);
+            output.push(`${(0, index_1.indent)(1)}${this.prefixes[section.type]} ${section.message}`);
             if (section.secondaryMessaging) {
-                output.push(`${this.indent(2)}- ${section.secondaryMessaging}`);
+                output.push(`${(0, index_1.indent)(2)}- ${section.secondaryMessaging}`);
             }
         });
         return output.join('\n');

package/lib/doctor/DiagnosticInfoBuilder.d.ts

@@ -21,6 +21,7 @@ export interface DiagnosticInfo extends FilesInfo {
         npm: string | null;
     };
     config: string | null;
+    defaultAccountOverrideFile: string | null | undefined;
     configSettings: {
         [key: string]: unknown;
     };

package/lib/doctor/DiagnosticInfoBuilder.js

@@ -64,6 +64,7 @@ class DiagnosticInfoBuilder {
             arch,
             path: mainModule?.path,
             config: (0, config_2.getConfigPath)(),
+            defaultAccountOverrideFile: (0, config_1.getDefaultAccountOverrideFilePath)(),
             configSettings: this.configSettings,
             versions: {
                 [hubspotCli]: package_json_1.default.version,