@hubspot/cli 7.4.9-experimental.0 → 7.5.1-experimental.0

package/api/migrate.d.ts

@@ -50,10 +50,11 @@ export interface MigrationSuccess extends MigrationBaseStatus {
 }
 export interface MigrationFailed extends MigrationBaseStatus {
     status: typeof MIGRATION_STATUS.FAILURE;
-    projectErrorsDetail?: string;
+    projectErrorDetail: string;
     componentErrorDetails: Record<string, string>;
 }
 export type MigrationStatus = MigrationInProgress | MigrationInputRequired | MigrationSuccess | MigrationFailed;
+export declare function isMigrationStatus(error: unknown): error is MigrationStatus;
 export declare function listAppsForMigration(accountId: number): HubSpotPromise<ListAppsResponse>;
 export declare function initializeMigration(accountId: number, applicationId: number, platformVersion: string): HubSpotPromise<InitializeMigrationResponse>;
 export declare function continueMigration(portalId: number, migrationId: number, componentUids: Record<string, string>, projectName: string): HubSpotPromise<ContinueMigrationResponse>;

package/api/migrate.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isMigrationStatus = isMigrationStatus;
 exports.listAppsForMigration = listAppsForMigration;
 exports.initializeMigration = initializeMigration;
 exports.continueMigration = continueMigration;
@@ -7,6 +8,12 @@ exports.checkMigrationStatusV2 = checkMigrationStatusV2;
 const projects_1 = require("@hubspot/local-dev-lib/constants/projects");
 const http_1 = require("@hubspot/local-dev-lib/http");
 const MIGRATIONS_API_PATH_V2 = 'dfs/migrations/v2';
+function isMigrationStatus(error) {
+    return (typeof error === 'object' &&
+        error !== null &&
+        'id' in error &&
+        'status' in error);
+}
 async function listAppsForMigration(accountId) {
     return http_1.http.get(accountId, {
         url: `${MIGRATIONS_API_PATH_V2}/list-apps`,

package/bin/cli.js

@@ -1,21 +1,16 @@
 #!/usr/bin/env node
 "use strict";
 const yargs = require('yargs');
-const updateNotifier = require('update-notifier');
-const chalk = require('chalk');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { addUserAgentHeader } = require('@hubspot/local-dev-lib/http');
-const { loadConfig, getAccountId, configFileExists, getConfigPath, validateConfig, } = require('@hubspot/local-dev-lib/config');
 const { logError } = require('../lib/errorHandlers/index');
 const { setLogLevel, getCommandName } = require('../lib/commonOpts');
-const { validateAccount } = require('../lib/validation');
 const { trackHelpUsage, trackConvertFieldsUsage, } = require('../lib/usageTracking');
-const { getIsInProject } = require('../lib/projects');
-const pkg = require('../package.json');
-const { i18n } = require('../lib/lang');
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
-const { UI_COLORS, uiCommandReference, uiDeprecatedTag } = require('../lib/ui');
-const { checkAndWarnGitInclusion } = require('../lib/ui/git');
+const { loadConfigMiddleware, injectAccountIdMiddleware, validateAccountOptions, handleDeprecatedEnvVariables, } = require('../lib/middleware/configMiddleware');
+const { notifyAboutUpdates, } = require('../lib/middleware/notificationsMiddleware');
+const { checkAndWarnGitInclusionMiddleware, } = require('../lib/middleware/gitMiddleware');
+const { performChecks } = require('../lib/middleware/yargsChecksMiddleware');
+const { setRequestHeaders } = require('../lib/middleware/requestMiddleware');
 const removeCommand = require('../commands/remove');
 const initCommand = require('../commands/init');
 const logsCommand = require('../commands/logs');
@@ -44,33 +39,7 @@ const feedbackCommand = require('../commands/feedback');
 const doctorCommand = require('../commands/doctor');
 const completionCommand = require('../commands/completion');
 const appCommand = require('../commands/app');
-const notifier = updateNotifier({
-    pkg: { ...pkg, name: '@hubspot/cli' },
-    distTag: 'latest',
-    shouldNotifyInNpmScript: true,
-});
-const CMS_CLI_PACKAGE_NAME = '@hubspot/cms-cli';
-notifier.notify({
-    message: pkg.name === CMS_CLI_PACKAGE_NAME
-        ? i18n(`commands.generalErrors.updateNotify.cmsUpdateNotification`, {
-            packageName: CMS_CLI_PACKAGE_NAME,
-            updateCommand: uiCommandReference('{updateCommand}'),
-        })
-        : i18n(`commands.generalErrors.updateNotify.cliUpdateNotification`, {
-            updateCommand: uiCommandReference('{updateCommand}'),
-        }),
-    defer: false,
-    boxenOptions: {
-        borderColor: UI_COLORS.MARIGOLD_DARK,
-        margin: 1,
-        padding: 1,
-        textAlignment: 'center',
-        borderStyle: 'round',
-        title: pkg.name === CMS_CLI_PACKAGE_NAME
-            ? null
-            : chalk.bold(i18n(`commands.generalErrors.updateNotify.notifyTitle`)),
-    },
-});
+notifyAboutUpdates();
 const getTerminalWidth = () => {
     const width = yargs.terminalWidth();
     if (width >= 100)
@@ -92,152 +61,6 @@ const handleFailure = (msg, err, yargs) => {
         process.exit(EXIT_CODES.ERROR);
     }
 };
-const performChecks = argv => {
-    // "hs config set default-account" has moved to "hs accounts use"
-    if (argv._[0] === 'config' &&
-        argv._[1] === 'set' &&
-        argv._[2] === 'default-account') {
-        logger.error(i18n(`commands.generalErrors.setDefaultAccountMoved`));
-        process.exit(EXIT_CODES.ERROR);
-    }
-    // Require "project" command when running upload/watch inside of a project
-    if (argv._.length === 1 && ['upload', 'watch'].includes(argv._[0])) {
-        if (getIsInProject(argv.src)) {
-            logger.error(i18n(`commands.generalErrors.srcIsProject`, {
-                src: argv.src || './',
-                command: argv._.join(' '),
-            }));
-            process.exit(EXIT_CODES.ERROR);
-        }
-        else {
-            return true;
-        }
-    }
-    else {
-        return true;
-    }
-};
-const setRequestHeaders = () => {
-    addUserAgentHeader('HubSpot CLI', pkg.version);
-};
-const isTargetedCommand = (options, commandMap) => {
-    const checkCommand = (options, commandMap) => {
-        const currentCommand = options._[0];
-        if (!commandMap[currentCommand]) {
-            return false;
-        }
-        if (commandMap[currentCommand].target) {
-            return true;
-        }
-        const subCommands = commandMap[currentCommand].subCommands || {};
-        if (options._.length > 1) {
-            return checkCommand({ _: options._.slice(1) }, subCommands);
-        }
-        return false;
-    };
-    return checkCommand(options, commandMap);
-};
-const SKIP_CONFIG_VALIDATION = {
-    init: { target: true },
-    auth: { target: true },
-};
-const handleDeprecatedEnvVariables = options => {
-    // HUBSPOT_PORTAL_ID is deprecated, but we'll still support it for now
-    // The HubSpot GH Deploy Action still uses HUBSPOT_PORTAL_ID
-    if (options.useEnv &&
-        process.env.HUBSPOT_PORTAL_ID &&
-        !process.env.HUBSPOT_ACCOUNT_ID) {
-        uiDeprecatedTag(i18n(`commands.generalErrors.handleDeprecatedEnvVariables.portalEnvVarDeprecated`, {
-            configPath: getConfigPath(),
-        }));
-        process.env.HUBSPOT_ACCOUNT_ID = process.env.HUBSPOT_PORTAL_ID;
-    }
-};
-/**
- * Auto-injects the derivedAccountId flag into all commands
- */
-const injectAccountIdMiddleware = async (options) => {
-    const { account } = options;
-    // Preserves the original --account flag for certain commands.
-    options.providedAccountId = account;
-    if (options.useEnv && process.env.HUBSPOT_ACCOUNT_ID) {
-        options.derivedAccountId = parseInt(process.env.HUBSPOT_ACCOUNT_ID, 10);
-    }
-    else {
-        options.derivedAccountId = getAccountId(account);
-    }
-};
-const loadConfigMiddleware = async (options) => {
-    // Skip this when no command is provided
-    if (!options._.length) {
-        return;
-    }
-    const maybeValidateConfig = () => {
-        if (!isTargetedCommand(options, SKIP_CONFIG_VALIDATION) &&
-            !validateConfig()) {
-            process.exit(EXIT_CODES.ERROR);
-        }
-    };
-    if (configFileExists(true) && options.config) {
-        logger.error(i18n(`commands.generalErrors.loadConfigMiddleware.configFileExists`, {
-            configPath: getConfigPath(),
-        }));
-        process.exit(EXIT_CODES.ERROR);
-    }
-    else if (!isTargetedCommand(options, { init: { target: true } })) {
-        const { config: configPath } = options;
-        const config = loadConfig(configPath, options);
-        // We don't run validateConfig() for auth because users should be able to run it when
-        // no accounts are configured, but we still want to exit if the config file is not found
-        if (isTargetedCommand(options, { auth: { target: true } }) && !config) {
-            process.exit(EXIT_CODES.ERROR);
-        }
-    }
-    maybeValidateConfig();
-};
-const checkAndWarnGitInclusionMiddleware = options => {
-    // Skip this when no command is provided
-    if (!options._.length) {
-        return;
-    }
-    checkAndWarnGitInclusion(getConfigPath());
-};
-const accountsSubCommands = {
-    target: false,
-    subCommands: {
-        clean: { target: true },
-        list: { target: true },
-        ls: { target: true },
-        remove: { target: true },
-    },
-};
-const sandboxesSubCommands = {
-    target: false,
-    subCommands: {
-        delete: { target: true },
-    },
-};
-const SKIP_ACCOUNT_VALIDATION = {
-    init: { target: true },
-    auth: { target: true },
-    account: accountsSubCommands,
-    accounts: accountsSubCommands,
-    sandbox: sandboxesSubCommands,
-    sandboxes: sandboxesSubCommands,
-};
-const validateAccountOptions = async (options) => {
-    // Skip this when no command is provided
-    if (!options._.length) {
-        return;
-    }
-    let validAccount = true;
-    if (!isTargetedCommand(options, SKIP_ACCOUNT_VALIDATION)) {
-        validAccount = await validateAccount(options);
-    }
-    if (!validAccount) {
-        process.exit(EXIT_CODES.ERROR);
-    }
-};
 const argv = yargs
     .usage('The command line interface to interact with HubSpot.')
     // loadConfigMiddleware loads the new hidden config for all commands

package/commands/project/migrate.d.ts

@@ -0,0 +1,8 @@
+import { ArgumentsCamelCase, Argv, CommandModule } from 'yargs';
+import { ProjectMigrateOptions } from '../../types/Yargs';
+export declare const command = "migrate";
+export declare const describe: undefined;
+export declare function handler(options: ArgumentsCamelCase<ProjectMigrateOptions>): Promise<undefined>;
+export declare function builder(yargs: Argv): Argv<ProjectMigrateOptions>;
+declare const migrateAppCommand: CommandModule<unknown, ProjectMigrateOptions>;
+export default migrateAppCommand;

package/commands/project/migrate.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.describe = exports.command = void 0;
+exports.handler = handler;
+exports.builder = builder;
+const lang_1 = require("../../lib/lang");
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const commonOpts_1 = require("../../lib/commonOpts");
+const migrate_1 = require("../../lib/app/migrate");
+const projects_1 = require("../../lib/projects");
+const projects_2 = require("@hubspot/local-dev-lib/constants/projects");
+const errorHandlers_1 = require("../../lib/errorHandlers");
+const exitCodes_1 = require("../../lib/enums/exitCodes");
+exports.command = 'migrate';
+exports.describe = undefined; // i18n('commands.project.subcommands.migrate.noProjectConfig')
+async function handler(options) {
+    const projectConfig = await (0, projects_1.getProjectConfig)();
+    if (!projectConfig) {
+        logger_1.logger.error((0, lang_1.i18n)('commands.project.subcommands.migrate.errors.noProjectConfig'));
+        return;
+    }
+    const { derivedAccountId } = options;
+    try {
+        await (0, migrate_1.migrateApp2025_2)(derivedAccountId, {
+            ...options,
+            name: projectConfig?.projectConfig?.name,
+            platformVersion: projects_2.PLATFORM_VERSIONS.unstable,
+        }, projectConfig);
+    }
+    catch (error) {
+        (0, errorHandlers_1.logError)(error);
+        return process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    return process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+}
+function builder(yargs) {
+    (0, commonOpts_1.addConfigOptions)(yargs);
+    (0, commonOpts_1.addAccountOptions)(yargs);
+    (0, commonOpts_1.addGlobalOptions)(yargs);
+    return yargs;
+}
+const migrateAppCommand = {
+    command: exports.command,
+    describe: exports.describe,
+    handler,
+    builder,
+};
+exports.default = migrateAppCommand;

package/commands/project.js

@@ -15,6 +15,7 @@ const open = require('./project/open');
 const dev = require('./project/dev');
 const add = require('./project/add');
 const migrateApp = require('./project/migrateApp');
+const migrate = require('./project/migrate');
 const cloneApp = require('./project/cloneApp');
 const installDeps = require('./project/installDeps');
 const i18nKey = 'commands.project';
@@ -34,6 +35,7 @@ exports.builder = yargs => {
         .command(download)
         .command(open)
         .command(migrateApp)
+        .command(migrate)
         .command(cloneApp)
         .command(installDeps)
         .demandCommand(1, '');

package/lang/en.js

@@ -11,8 +11,6 @@ export const commands = {
     },
     srcIsProject: (src, command) =>
       `"${src}" is in a project folder. Did you mean "hs project ${command}"?`,
-    setDefaultAccountMoved:
-      'This command has moved. Try `hs accounts use` instead',
     handleDeprecatedEnvVariables: {
       portalEnvVarDeprecated:
         'The HUBSPOT_PORTAL_ID environment variable is deprecated. Please use HUBSPOT_ACCOUNT_ID instead.',

package/lang/en.lyaml

@@ -6,7 +6,6 @@ en:
         cmsUpdateNotification: "{{#bold}}The CMS CLI is now the HubSpot CLI{{/bold}}\n\nTo upgrade, uninstall {{#bold}}{{ packageName }}{{/bold}}\nand then run {{ updateCommand }}"
         cliUpdateNotification: "HubSpot CLI version {{#cyan}}{{#bold}}{currentVersion}{{/bold}}{{/cyan}} is outdated.\nRun {{ updateCommand }} to upgrade to version {{#cyan}}{{#bold}}{latestVersion}{{/bold}}{{/cyan}}"
       srcIsProject: "\"{{ src }}\" is in a project folder. Did you mean \"hs project {{command}}\"?"
-      setDefaultAccountMoved: "This command has moved. Try `hs accounts use` instead"
       handleDeprecatedEnvVariables:
         portalEnvVarDeprecated: "The HUBSPOT_PORTAL_ID environment variable is deprecated. Please use HUBSPOT_ACCOUNT_ID instead."
       loadConfigMiddleware:
@@ -589,6 +588,7 @@ 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,6 +656,12 @@ 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?"

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 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 migrateApp2025_2(derivedAccountId: number, options: ArgumentsCamelCase<MigrateAppOptions>, projectConfig?: LoadedProjectConfig): Promise<void>;
 export declare function logInvalidAccountError(i18nKey: string): void;

package/lib/app/migrate.js

@@ -3,7 +3,6 @@ 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");
@@ -23,6 +22,7 @@ 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,16 +37,32 @@ function getUnmigratableReason(reasonCode) {
             });
     }
 }
-async function handleMigrationSetup(derivedAccountId, options) {
+function filterAppsByProjectName(projectConfig) {
+    return (app) => {
+        if (projectConfig) {
+            return app.projectName === projectConfig?.projectConfig?.name;
+        }
+        return !app.projectName;
+    };
+}
+async function handleMigrationSetup(derivedAccountId, options, projectConfig) {
     const { name, dest, appId } = options;
-    const { data } = await (0, migrate_1.listAppsForMigration)(derivedAccountId);
-    const { migratableApps, unmigratableApps } = data;
-    const allApps = [...migratableApps, ...unmigratableApps].filter(app => !app.projectName);
+    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 = unmigratableApps.map(app => `${chalk_1.default.bold(app.appName)}: ${getUnmigratableReason(app.unmigratableReason)}`);
+        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');
+        }
         throw new Error(`${(0, lang_1.i18n)(`commands.project.subcommands.migrateApp.errors.noAppsEligible`, {
-            accountId: derivedAccountId,
-        })} \n  - ${reasons.join('\n  - ')}`);
+            accountId: (0, ui_1.uiAccountDescription)(derivedAccountId),
+        })}${reasons.length ? `\n  - ${reasons.join('\n  - ')}` : ''}`);
     }
     if (appId &&
         !allApps.some(app => {
@@ -98,6 +114,16 @@ async function handleMigrationSetup(derivedAccountId, options) {
     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 = 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 });
@@ -133,8 +159,8 @@ 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
-                    ? `${componentHint} [${componentType}]`
-                    : componentType,
+                    ? `${(0, transform_1.mapToUserFacingType)(componentType)} '${componentHint}'`
+                    : (0, transform_1.mapToUserFacingType)(componentType),
             }), {
                 validate: (uid) => {
                     const result = (0, project_parsing_lib_1.validateUid)(uid);
@@ -169,37 +195,46 @@ async function finalizeMigration(derivedAccountId, migrationId, uidMap, projectN
         SpinniesManager_1.default.fail('finishingMigration', {
             text: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.spinners.migrationFailed`),
         });
-        throw error;
+        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'));
     }
     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) {
+async function downloadProjectFiles(derivedAccountId, projectName, buildId, projectDest, projectConfig) {
     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);
-        const absoluteDestPath = projectDest
-            ? path_1.default.resolve((0, path_2.getCwd)(), projectDest)
-            : (0, path_2.getCwd)();
+        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)();
+        }
         await (0, archive_1.extractZipArchive)(zippedProject, (0, path_2.sanitizeFileName)(projectName), absoluteDestPath, {
             includesRootDir: true,
-            hideLogs: false,
+            hideLogs: true,
         });
         SpinniesManager_1.default.succeed('fetchingMigratedProject', {
             text: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.spinners.downloadingProjectContentsComplete`),
@@ -213,9 +248,14 @@ async function downloadProjectFiles(derivedAccountId, projectName, buildId, proj
         throw error;
     }
 }
-async function migrateApp2025_2(derivedAccountId, options) {
+async function migrateApp2025_2(derivedAccountId, options, projectConfig) {
     SpinniesManager_1.default.init();
-    const { appIdToMigrate, projectName, projectDest } = await handleMigrationSetup(derivedAccountId, options);
+    if (projectConfig &&
+        (!projectConfig?.projectConfig || !projectConfig?.projectDir)) {
+        // TODO: i18n
+        throw new Error('Invalid project config');
+    }
+    const { appIdToMigrate, projectName, projectDest } = await handleMigrationSetup(derivedAccountId, options, projectConfig);
     if (!appIdToMigrate || !projectName || !projectDest) {
         return;
     }
@@ -224,8 +264,8 @@ async function migrateApp2025_2(derivedAccountId, options) {
         return;
     }
     const { migrationId, uidMap } = migrationInProgress;
-    const buildId = await finalizeMigration(derivedAccountId, migrationId, uidMap, projectName);
-    await downloadProjectFiles(derivedAccountId, projectName, buildId, projectDest);
+    const buildId = await finalizeMigration(derivedAccountId, migrationId, uidMap, projectConfig?.projectConfig?.name || projectName);
+    await downloadProjectFiles(derivedAccountId, projectName, buildId, projectDest, projectConfig);
 }
 function logInvalidAccountError(i18nKey) {
     (0, ui_1.uiLine)();

package/lib/app/migrate_legacy.js

@@ -31,13 +31,15 @@ async function migrateApp2023_2(derivedAccountId, options, accountConfig) {
         (0, migrate_1.logInvalidAccountError)('commands.project.subcommands.migrateApp');
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
-    const { appId } = 'appId' in options
-        ? options
-        : await (0, selectPublicAppPrompt_1.selectPublicAppPrompt)({
+    let appId = options.appId;
+    if (!appId) {
+        const { appId: selectAppId } = 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/middleware/__test__/configMiddleware.test.d.ts

@@ -0,0 +1 @@
+export {};