@hubspot/cli 7.8.0-experimental.0 → 7.8.0

package/lib/__tests__/yargsUtils.test.js

@@ -1,6 +1,19 @@
-import { hasFlag, makeYargsBuilder, getExclusiveConflicts, } from '../yargsUtils.js';
+import { hasFlag, makeYargsBuilder, strictEnforceBoolean, } from '../yargsUtils.js';
 import * as commonOpts from '../commonOpts.js';
 vi.mock('../commonOpts');
+vi.mock('../../lang/en.js', () => ({
+    commands: {
+        config: {
+            subcommands: {
+                set: {
+                    errors: {
+                        invalidBoolean: (option, value) => `Invalid boolean value "${value}" for --${option}. Valid values are: true, false`,
+                    },
+                },
+            },
+        },
+    },
+}));
 const argvWithFlag = ['hs', 'command', '--test'];
 const argvWithoutFlag = ['hs', 'command'];
 describe('lib/yargsUtils', () => {
@@ -36,15 +49,76 @@ describe('lib/yargsUtils', () => {
             expect(commonOpts.addCustomHelpOutput).toHaveBeenCalled();
         });
     });
-    describe('getExclusiveConflicts()', () => {
-        it('should return an object where each option conflicts with all others', () => {
-            const options = ['option1', 'option2', 'option3'];
-            const result = getExclusiveConflicts(options);
-            expect(result).toEqual({
-                option1: ['option2', 'option3'],
-                option2: ['option1', 'option3'],
-                option3: ['option1', 'option2'],
+    describe('strictEnforceBoolean()', () => {
+        it('should validate valid boolean values (true/false, case-insensitive)', () => {
+            const validArgs = [
+                ['hs', 'config', 'set', '--allow-usage-tracking=true'],
+                ['hs', 'config', 'set', '--allow-usage-tracking=false'],
+                ['hs', 'config', 'set', '--allow-usage-tracking=TRUE'],
+                ['hs', 'config', 'set', '--allow-usage-tracking=False'],
+            ];
+            validArgs.forEach(args => {
+                expect(() => strictEnforceBoolean(args, ['allow-usage-tracking'])).not.toThrow();
+                expect(strictEnforceBoolean(args, ['allow-usage-tracking'])).toBe(true);
             });
         });
+        it('should reject invalid boolean values with descriptive error messages', () => {
+            const invalidCases = [
+                {
+                    args: ['hs', 'config', 'set', '--allow-usage-tracking=yes'],
+                    value: 'yes',
+                },
+                {
+                    args: ['hs', 'config', 'set', '--allow-usage-tracking=1'],
+                    value: '1',
+                },
+                {
+                    args: ['hs', 'config', 'set', '--auto-open-browser=maybe'],
+                    value: 'maybe',
+                },
+            ];
+            invalidCases.forEach(({ args, value }) => {
+                const option = args[3].split('=')[0].replace('--', '');
+                expect(() => strictEnforceBoolean(args, [option])).toThrow(`Invalid boolean value "${value}" for --${option}. Valid values are: true, false`);
+            });
+        });
+        it('should support multiple config values in a single command', () => {
+            const args = [
+                'hs',
+                'config',
+                'set',
+                '--allow-usage-tracking=true',
+                '--auto-open-browser=false',
+                '--allow-auto-updates=true',
+                '--http-timeout=5000',
+                '--default-cms-publish-mode=draft',
+            ];
+            const booleanOptions = [
+                'allow-usage-tracking',
+                'auto-open-browser',
+                'allow-auto-updates',
+            ];
+            expect(() => strictEnforceBoolean(args, booleanOptions)).not.toThrow();
+            expect(strictEnforceBoolean(args, booleanOptions)).toBe(true);
+        });
+        it('should error when one of multiple values is invalid', () => {
+            const args = [
+                'hs',
+                'config',
+                'set',
+                '--allow-usage-tracking=true',
+                '--auto-open-browser=invalid',
+                '--http-timeout=5000',
+            ];
+            const booleanOptions = ['allow-usage-tracking', 'auto-open-browser'];
+            expect(() => strictEnforceBoolean(args, booleanOptions)).toThrow('Invalid boolean value "invalid" for --auto-open-browser. Valid values are: true, false');
+        });
+        it('should maintain backwards compatability', () => {
+            expect(() => strictEnforceBoolean(['hs', 'config', 'set', '--allow-usage-tracking=true'], ['allow-usage-tracking'])).not.toThrow();
+            // No values provided (interactive mode)
+            expect(() => strictEnforceBoolean(['hs', 'config', 'set'], ['allow-usage-tracking'])).not.toThrow();
+            // Flag without equals sign (succeed with true)
+            expect(() => strictEnforceBoolean(['hs', 'config', 'set', '--allow-usage-tracking'], ['allow-usage-tracking'])).not.toThrow();
+        });
     });
 });

package/lib/app/__tests__/migrate.test.js

@@ -1,7 +1,7 @@
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../../ui/logger.js';
 import { getCwd, sanitizeFileName } from '@hubspot/local-dev-lib/path';
 import { extractZipArchive } from '@hubspot/local-dev-lib/archive';
-import { validateUid, getProjectThemeDetails, } from '@hubspot/project-parsing-lib';
+import { validateUid } from '@hubspot/project-parsing-lib';
 import { UNMIGRATABLE_REASONS } from '@hubspot/local-dev-lib/constants/projects';
 import { MIGRATION_STATUS } from '@hubspot/local-dev-lib/types/Migration';
 import { downloadProject } from '@hubspot/local-dev-lib/api/projects';
@@ -12,8 +12,8 @@ import { poll } from '../../polling.js';
 import { CLI_UNMIGRATABLE_REASONS, continueAppMigration, initializeAppMigration, listAppsForMigration, } from '../../../api/migrate.js';
 import { lib } from '../../../lang/en.js';
 import { hasUnfiedAppsAccess } from '../../hasFeature.js';
-import { getUnmigratableReason, generateFilterAppsByProjectNameFunction, buildErrorMessageFromMigrationStatus, fetchMigrationApps, promptForAppToMigrate, selectAppToMigrate, handleMigrationSetup, getHasMigratableThemes, beginAppMigration, pollMigrationStatus, finalizeAppMigration, downloadProjectFiles, migrateApp2025_2, logInvalidAccountError, validateMigrationAppsAndThemes, } from '../migrate.js';
-vi.mock('@hubspot/local-dev-lib/logger');
+import { getUnmigratableReason, generateFilterAppsByProjectNameFunction, buildErrorMessageFromMigrationStatus, fetchMigrationApps, promptForAppToMigrate, selectAppToMigrate, handleMigrationSetup, beginAppMigration, pollMigrationStatus, finalizeAppMigration, downloadProjectFiles, migrateApp2025_2, logInvalidAccountError, validateMigrationApps, } from '../migrate.js';
+vi.mock('../../ui/logger.js');
 vi.mock('@hubspot/local-dev-lib/path');
 vi.mock('@hubspot/local-dev-lib/archive');
 vi.mock('@hubspot/project-parsing-lib');
@@ -28,7 +28,7 @@ vi.mock('../../../api/migrate');
 vi.mock('../../hasFeature');
 vi.mock('../../projects/urls');
 vi.mock('fs');
-const mockedLogger = logger;
+const mockedUiLogger = uiLogger;
 const mockedGetCwd = getCwd;
 const mockedSanitizeFileName = sanitizeFileName;
 const mockedExtractZipArchive = extractZipArchive;
@@ -40,7 +40,6 @@ const mockedListPrompt = listPrompt;
 const mockedEnsureProjectExists = ensureProjectExists;
 const mockedPoll = poll;
 const mockedListAppsForMigration = listAppsForMigration;
-const mockedGetProjectThemeDetails = getProjectThemeDetails;
 const mockedInitializeAppMigration = initializeAppMigration;
 const mockedContinueAppMigration = continueAppMigration;
 const mockedHasUnfiedAppsAccess = hasUnfiedAppsAccess;
@@ -205,58 +204,31 @@ describe('lib/app/migrate', () => {
             expect(result.migratableApps[0].projectName).toBe(PROJECT_NAME);
         });
     });
-    describe('getHasMigratableThemes', () => {
-        it('should return false when no projectConfig is provided', async () => {
-            const result = await getHasMigratableThemes();
-            expect(result).toEqual({
-                hasMigratableThemes: false,
-                migratableThemesCount: 0,
-            });
-        });
-        it('should return true when there are migratable themes', async () => {
-            mockedGetProjectThemeDetails.mockResolvedValue({
-                legacyThemeDetails: [
-                    {
-                        configFilepath: 'src/theme.json',
-                        themePath: 'src/theme',
-                        themeConfig: {
-                            secret_names: ['my-secret'],
-                        },
-                    },
-                ],
-                legacyReactThemeDetails: [],
-            });
-            const projectConfig = createLoadedProjectConfig(PROJECT_NAME);
-            const result = await getHasMigratableThemes(projectConfig);
-            expect(result).toEqual({
-                hasMigratableThemes: true,
-                migratableThemesCount: 1,
-            });
-        });
-    });
-    describe('validateMigrationAppsAndThemes', () => {
+    describe('validateMigrationApps', () => {
         const mockMigratableApp1 = createMockMigratableApp(1, 'App 1', PROJECT_NAME);
         const mockMigratableApp2 = createMockMigratableApp(2, 'App 2', PROJECT_NAME);
         it('should throw an error when multiple apps are found for a project', async () => {
             const projectConfig = createLoadedProjectConfig(PROJECT_NAME);
-            await expect(validateMigrationAppsAndThemes(APP_ID, ACCOUNT_ID, {
+            await expect(validateMigrationApps(APP_ID, ACCOUNT_ID, {
                 migratableApps: [mockMigratableApp1, mockMigratableApp2],
                 unmigratableApps: [],
-            }, false, projectConfig)).rejects.toThrow(lib.migrate.errors.project.multipleApps);
-        });
-        it('should throw an error when cms themes are found for a project', async () => {
-            const projectConfig = createLoadedProjectConfig(PROJECT_NAME);
-            await expect(validateMigrationAppsAndThemes(APP_ID, ACCOUNT_ID, { migratableApps: [mockMigratableApp1], unmigratableApps: [] }, true, projectConfig)).rejects.toThrow(lib.migrate.errors.project.themesAndAppsNotAllowed);
+            }, projectConfig)).rejects.toThrow(lib.migrate.errors.project.multipleApps);
         });
         it('should throw an error when no apps are found for a project', async () => {
             const projectConfig = createLoadedProjectConfig(PROJECT_NAME);
-            await expect(validateMigrationAppsAndThemes(APP_ID, ACCOUNT_ID, { migratableApps: [], unmigratableApps: [] }, false, projectConfig)).rejects.toThrow(lib.migrate.errors.noAppsForProject(PROJECT_NAME));
+            await expect(validateMigrationApps(APP_ID, ACCOUNT_ID, { migratableApps: [], unmigratableApps: [] }, projectConfig)).rejects.toThrow(lib.migrate.errors.noAppsForProject(PROJECT_NAME));
         });
         it('should throw an error when no migratable apps are found', async () => {
-            await expect(validateMigrationAppsAndThemes(APP_ID, ACCOUNT_ID, { migratableApps: [], unmigratableApps: mockUnmigratableApps }, false)).rejects.toThrow(/No apps in account/);
+            await expect(validateMigrationApps(APP_ID, ACCOUNT_ID, {
+                migratableApps: [],
+                unmigratableApps: mockUnmigratableApps,
+            })).rejects.toThrow(/No apps in account/);
         });
         it('should throw an error when appId is provided but not found', async () => {
-            await expect(validateMigrationAppsAndThemes(APP_ID, ACCOUNT_ID, { migratableApps: [], unmigratableApps: [] }, false)).rejects.toThrow(/No apps in account/);
+            await expect(validateMigrationApps(APP_ID, ACCOUNT_ID, {
+                migratableApps: [],
+                unmigratableApps: [],
+            })).rejects.toThrow(/No apps in account/);
         });
     });
     describe('promptForAppToMigrate', () => {
@@ -330,10 +302,6 @@ describe('lib/app/migrate', () => {
                     unmigratableApps: [],
                 },
             });
-            mockedGetProjectThemeDetails.mockResolvedValue({
-                legacyThemeDetails: [],
-                legacyReactThemeDetails: [],
-            });
             mockedListPrompt.mockResolvedValue({ appId: 1 });
             mockedConfirmPrompt.mockResolvedValue(true);
             mockedEnsureProjectExists.mockResolvedValue({ projectExists: false });
@@ -352,16 +320,11 @@ describe('lib/app/migrate', () => {
                     unmigratableApps: [],
                 },
             });
-            mockedGetProjectThemeDetails.mockResolvedValueOnce({
-                legacyThemeDetails: [],
-                legacyReactThemeDetails: [],
-            });
             const result = await handleMigrationSetup(ACCOUNT_ID, defaultOptions, projectConfig);
             expect(result).toEqual({
                 appIdToMigrate: 1,
                 projectName: PROJECT_NAME,
                 projectDest: MOCK_PROJECT_DIR,
-                isThemesMigration: false,
             });
         });
         it('should prompt for project name when not provided', async () => {
@@ -528,8 +491,8 @@ describe('lib/app/migrate', () => {
     describe('logInvalidAccountError', () => {
         it('should log the invalid account error message', () => {
             logInvalidAccountError();
-            expect(mockedLogger.error).toHaveBeenCalledWith(lib.migrate.errors.invalidAccountTypeTitle);
-            expect(mockedLogger.log).toHaveBeenCalledWith(expect.stringContaining('Only public apps created in a developer account can be converted to a project component'));
+            expect(mockedUiLogger.error).toHaveBeenCalledWith(lib.migrate.errors.invalidAccountTypeTitle);
+            expect(mockedUiLogger.log).toHaveBeenCalledWith(expect.stringContaining('Only public apps created in a developer account can be converted to a project component'));
         });
     });
 });

package/lib/app/__tests__/migrate_legacy.test.js

@@ -11,7 +11,7 @@ import { poll as _poll } from '../../polling.js';
 import { migrateApp2023_2 } from '../migrate_legacy.js';
 // Mock all external dependencies
 vi.mock('@hubspot/local-dev-lib/api/appsDev');
-vi.mock('@hubspot/local-dev-lib/logger');
+vi.mock('../../ui/logger.js');
 vi.mock('@hubspot/local-dev-lib/api/projects');
 vi.mock('@hubspot/local-dev-lib/path');
 vi.mock('@hubspot/local-dev-lib/urls');

package/lib/app/migrate.d.ts

@@ -12,18 +12,14 @@ export type MigrateAppArgs = CommonArgs & AccountArgs & EnvironmentArgs & Config
 export declare function getUnmigratableReason(reasonCode: string, projectName: string | undefined, accountId: number): string;
 export declare function generateFilterAppsByProjectNameFunction(projectConfig?: LoadedProjectConfig): (app: MigrationApp) => boolean;
 export declare function buildErrorMessageFromMigrationStatus(error: MigrationFailed): string;
-export declare function getHasMigratableThemes(projectConfig?: LoadedProjectConfig): Promise<{
-    hasMigratableThemes: boolean;
-    migratableThemesCount: number;
-}>;
 export declare function fetchMigrationApps(derivedAccountId: number, platformVersion: string, projectConfig?: LoadedProjectConfig): Promise<{
     migratableApps: MigratableApp[];
     unmigratableApps: UnmigratableApp[];
 }>;
-export declare function validateMigrationAppsAndThemes(appId: MigrateAppArgs['appId'], derivedAccountId: number, { migratableApps, unmigratableApps, }: {
+export declare function validateMigrationApps(appId: MigrateAppArgs['appId'], derivedAccountId: number, { migratableApps, unmigratableApps, }: {
     migratableApps: MigratableApp[];
     unmigratableApps: UnmigratableApp[];
-}, hasMigratableThemes: boolean, projectConfig?: LoadedProjectConfig): Promise<void>;
+}, projectConfig?: LoadedProjectConfig): Promise<void>;
 export declare function promptForAppToMigrate(allApps: MigrationApp[], derivedAccountId: number): Promise<number>;
 export declare function selectAppToMigrate(allApps: MigrationApp[], derivedAccountId: number, appId?: number): Promise<{
     proceed: boolean;
@@ -33,9 +29,7 @@ export declare function handleMigrationSetup(derivedAccountId: number, options:
     appIdToMigrate?: number | undefined;
     projectName?: string;
     projectDest?: string;
-    isThemesMigration?: boolean;
 }>;
-export declare function handleThemesMigration(projectConfig: LoadedProjectConfig, platformVersion: string): Promise<void>;
 export declare function beginAppMigration(derivedAccountId: number, appId: number, platformVersion: string): Promise<{
     migrationId: number;
     uidMap: Record<string, string>;

package/lib/app/migrate.js

@@ -2,7 +2,7 @@ import path from 'path';
 import { getCwd, sanitizeFileName } from '@hubspot/local-dev-lib/path';
 import { extractZipArchive } from '@hubspot/local-dev-lib/archive';
 import chalk from 'chalk';
-import { validateUid, migrateThemes, getProjectThemeDetails, } from '@hubspot/project-parsing-lib';
+import { validateUid } from '@hubspot/project-parsing-lib';
 import { UNMIGRATABLE_REASONS } from '@hubspot/local-dev-lib/constants/projects';
 import { mapToUserFacingType } from '@hubspot/project-parsing-lib/src/lib/transform.js';
 import { MIGRATION_STATUS } from '@hubspot/local-dev-lib/types/Migration';
@@ -10,19 +10,15 @@ import { downloadProject } from '@hubspot/local-dev-lib/api/projects';
 import { Separator } from '@inquirer/prompts';
 import { confirmPrompt, inputPrompt, listPrompt, } from '../prompts/promptUtils.js';
 import { uiAccountDescription, uiCommandReference, uiLine, uiLink, } from '../ui/index.js';
-import { writeProjectConfig } from '../projects/config.js';
 import { ensureProjectExists } from '../projects/ensureProjectExists.js';
 import SpinniesManager from '../ui/SpinniesManager.js';
 import { DEFAULT_POLLING_STATUS_LOOKUP, poll } from '../polling.js';
 import { checkMigrationStatusV2, CLI_UNMIGRATABLE_REASONS, continueAppMigration, initializeAppMigration, isMigrationStatus, listAppsForMigration, } from '../../api/migrate.js';
 import fs from 'fs';
 import { lib } from '../../lang/en.js';
-import { PROJECT_CONFIG_FILE } from '../constants.js';
 import { hasUnfiedAppsAccess } from '../hasFeature.js';
 import { getProjectBuildDetailUrl, getProjectDetailUrl, } from '../projects/urls.js';
 import { uiLogger } from '../ui/logger.js';
-import { debugError } from '../errorHandlers/index.js';
-import { useV3Api } from '../projects/platformVersion.js';
 export function getUnmigratableReason(reasonCode, projectName, accountId) {
     switch (reasonCode) {
         case UNMIGRATABLE_REASONS.UP_TO_DATE:
@@ -59,17 +55,6 @@ export function buildErrorMessageFromMigrationStatus(error) {
     })
         .join('\n\t- ')}`;
 }
-export async function getHasMigratableThemes(projectConfig) {
-    if (!projectConfig?.projectConfig?.name || !projectConfig?.projectDir) {
-        return { hasMigratableThemes: false, migratableThemesCount: 0 };
-    }
-    const projectSrcDir = path.resolve(projectConfig.projectDir, projectConfig.projectConfig.srcDir);
-    const { legacyThemeDetails, legacyReactThemeDetails } = await getProjectThemeDetails(projectSrcDir);
-    return {
-        hasMigratableThemes: legacyThemeDetails.length > 0 || legacyReactThemeDetails.length > 0,
-        migratableThemesCount: legacyThemeDetails.length + legacyReactThemeDetails.length,
-    };
-}
 export async function fetchMigrationApps(derivedAccountId, platformVersion, projectConfig) {
     const { data: { migratableApps, unmigratableApps }, } = await listAppsForMigration(derivedAccountId, platformVersion);
     const filteredMigratableApps = migratableApps.filter(generateFilterAppsByProjectNameFunction(projectConfig));
@@ -79,23 +64,11 @@ export async function fetchMigrationApps(derivedAccountId, platformVersion, proj
         unmigratableApps: filteredUnmigratableApps,
     };
 }
-export async function validateMigrationAppsAndThemes(appId, derivedAccountId, { migratableApps, unmigratableApps, }, hasMigratableThemes, projectConfig) {
+export async function validateMigrationApps(appId, derivedAccountId, { migratableApps, unmigratableApps, }, projectConfig) {
     const allApps = [...migratableApps, ...unmigratableApps];
     if (allApps.length > 1 && projectConfig) {
         throw new Error(lib.migrate.errors.project.multipleApps);
     }
-    if (hasMigratableThemes) {
-        if (useV3Api(projectConfig?.projectConfig?.platformVersion)) {
-            throw new Error(lib.migrate.errors.project.themesAlreadyMigrated);
-        }
-        if (allApps.length > 0 && projectConfig) {
-            throw new Error(lib.migrate.errors.project.themesAndAppsNotAllowed);
-        }
-        if (!projectConfig) {
-            throw new Error(lib.migrate.errors.project.noProjectForThemesMigration);
-        }
-        return;
-    }
     if (!projectConfig?.projectConfig) {
         allApps.forEach(app => {
             if (app.projectName) {
@@ -178,35 +151,20 @@ export async function handleMigrationSetup(derivedAccountId, options, projectCon
         text: lib.migrate.spinners.checkingForMigratableComponents,
     });
     const { name, dest, appId } = options;
-    const { hasMigratableThemes, migratableThemesCount } = await getHasMigratableThemes(projectConfig);
     const { migratableApps, unmigratableApps } = await fetchMigrationApps(derivedAccountId, options.platformVersion, projectConfig);
     SpinniesManager.remove('checkingForMigratableComponents');
-    await validateMigrationAppsAndThemes(appId, derivedAccountId, { migratableApps, unmigratableApps }, hasMigratableThemes, projectConfig);
+    await validateMigrationApps(appId, derivedAccountId, { migratableApps, unmigratableApps }, projectConfig);
     const allApps = [...migratableApps, ...unmigratableApps];
-    let proceed = false;
-    let appIdToMigrate;
-    if (hasMigratableThemes) {
-        uiLogger.log(lib.migrate.prompt.themesMigration(migratableThemesCount));
-        proceed = await confirmPrompt(lib.migrate.prompt.proceed, {
-            defaultAnswer: false,
-        });
-    }
-    else {
-        const appSelectionPrompt = await selectAppToMigrate(allApps, derivedAccountId, appId);
-        appIdToMigrate = appSelectionPrompt.appIdToMigrate;
-        proceed = appSelectionPrompt.proceed;
-    }
+    const { proceed, appIdToMigrate } = await selectAppToMigrate(allApps, derivedAccountId, appId);
     if (!proceed) {
         return {};
     }
     // If it's a project we don't want to prompt for dest and name, so just return early
-    // Theme migrations can only be initiated from the project directory
     if (projectConfig &&
         projectConfig?.projectConfig &&
         projectConfig?.projectDir) {
         return {
             appIdToMigrate,
-            isThemesMigration: hasMigratableThemes,
             projectName: projectConfig.projectConfig.name,
             projectDest: projectConfig.projectDir,
         };
@@ -231,35 +189,6 @@ export async function handleMigrationSetup(derivedAccountId, options, projectCon
         }));
     return { appIdToMigrate, projectName, projectDest };
 }
-export async function handleThemesMigration(projectConfig, platformVersion) {
-    if (!projectConfig?.projectDir || !projectConfig?.projectConfig?.srcDir) {
-        throw new Error(lib.migrate.errors.project.invalidConfig);
-    }
-    const projectSrcDir = path.resolve(projectConfig.projectDir, projectConfig.projectConfig.srcDir);
-    let migrated = false;
-    let failureReason;
-    try {
-        const migrationResult = await migrateThemes(projectConfig.projectDir, projectSrcDir);
-        migrated = migrationResult.migrated;
-        failureReason = migrationResult.failureReason;
-    }
-    catch (error) {
-        debugError(error);
-        throw new Error(lib.migrate.errors.project.failedToMigrateThemes);
-    }
-    if (!migrated) {
-        throw new Error(failureReason || lib.migrate.errors.project.failedToMigrateThemes);
-    }
-    const newProjectConfig = { ...projectConfig.projectConfig };
-    newProjectConfig.platformVersion = platformVersion;
-    const projectConfigPath = path.join(projectConfig.projectDir, PROJECT_CONFIG_FILE);
-    const success = writeProjectConfig(projectConfigPath, newProjectConfig);
-    if (!success) {
-        throw new Error(lib.migrate.errors.project.failedToUpdateProjectConfig);
-    }
-    uiLogger.log('');
-    uiLogger.log(lib.migrate.success.themesMigrationSuccess(platformVersion));
-}
 export async function beginAppMigration(derivedAccountId, appId, platformVersion) {
     SpinniesManager.add('beginningMigration', {
         text: lib.migrate.spinners.beginningMigration,
@@ -412,11 +341,7 @@ export async function migrateApp2025_2(derivedAccountId, options, projectConfig)
             throw new Error(lib.migrate.errors.project.doesNotExist(derivedAccountId));
         }
     }
-    const { appIdToMigrate, projectName, projectDest, isThemesMigration } = await handleMigrationSetup(derivedAccountId, options, projectConfig);
-    if (isThemesMigration) {
-        await handleThemesMigration(projectConfig, options.platformVersion);
-        return;
-    }
+    const { appIdToMigrate, projectName, projectDest } = await handleMigrationSetup(derivedAccountId, options, projectConfig);
     if (!appIdToMigrate || !projectName || !projectDest) {
         return;
     }
@@ -433,6 +358,6 @@ export async function migrateApp2025_2(derivedAccountId, options, projectConfig)
 export function logInvalidAccountError() {
     uiLine();
     uiLogger.error(lib.migrate.errors.invalidAccountTypeTitle);
-    uiLogger.log(lib.migrate.errors.invalidAccountTypeDescription(uiCommandReference('hs account use'), uiCommandReference('hs auth')));
+    uiLogger.log(lib.migrate.errors.invalidAccountTypeDescription(uiCommandReference('hs account use')));
     uiLine();
 }

package/lib/app/migrate_legacy.js

@@ -1,5 +1,5 @@
 import { fetchPublicAppMetadata } from '@hubspot/local-dev-lib/api/appsDev';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../ui/logger.js';
 import { checkMigrationStatus, downloadProject, migrateApp as migrateNonProjectApp_v2023_2, } from '@hubspot/local-dev-lib/api/projects';
 import path from 'path';
 import { getCwd, sanitizeFileName } from '@hubspot/local-dev-lib/path';
@@ -9,7 +9,7 @@ import { promptUser } from '../prompts/promptUtils.js';
 import { ApiErrorContext, logError } from '../errorHandlers/index.js';
 import { EXIT_CODES } from '../enums/exitCodes.js';
 import { uiAccountDescription, uiLine, uiLink } from '../ui/index.js';
-import { i18n } from '../lang.js';
+import { commands } from '../../lang/en.js';
 import { isAppDeveloperAccount, isUnifiedAccount } from '../accountTypes.js';
 import { selectPublicAppForMigrationPrompt } from '../prompts/selectPublicAppForMigrationPrompt.js';
 import { projectNameAndDestPrompt } from '../prompts/projectNameAndDestPrompt.js';
@@ -42,9 +42,7 @@ export async function migrateApp2023_2(derivedAccountId, options, accountConfig)
         const preventProjectMigrations = selectedApp.preventProjectMigrations;
         const listingInfo = selectedApp.listingInfo;
         if (preventProjectMigrations && listingInfo) {
-            logger.error(i18n(`commands.project.subcommands.migrateApp.errors.invalidApp`, {
-                appId,
-            }));
+            uiLogger.error(commands.project.migrateApp.errors.invalidApp(appId));
             return process.exit(EXIT_CODES.ERROR);
         }
     }
@@ -58,24 +56,22 @@ export async function migrateApp2023_2(derivedAccountId, options, accountConfig)
         noLogs: true,
     });
     if (projectExists) {
-        throw new Error(i18n(`commands.project.subcommands.migrateApp.errors.projectAlreadyExists`, {
-            projectName,
-        }));
+        throw new Error(commands.project.migrateApp.errors.projectAlreadyExists(projectName));
     }
     await trackCommandMetadataUsage('migrate-app', { step: 'STARTED' }, derivedAccountId);
-    logger.log('');
+    uiLogger.log('');
     uiLine();
-    logger.warn(`${i18n(`commands.project.subcommands.migrateApp.warning.title`)}\n`);
-    logger.log(i18n(`commands.project.subcommands.migrateApp.warning.projectConversion`));
-    logger.log(`${i18n(`commands.project.subcommands.migrateApp.warning.appConfig`)}\n`);
-    logger.log(`${i18n(`commands.project.subcommands.migrateApp.warning.buildAndDeploy`)}\n`);
-    logger.log(`${i18n(`commands.project.subcommands.migrateApp.warning.existingApps`)}\n`);
-    logger.log(i18n(`commands.project.subcommands.migrateApp.warning.copyApp`));
+    uiLogger.warn(commands.project.migrateApp.warning.title);
+    uiLogger.log(commands.project.migrateApp.warning.projectConversion);
+    uiLogger.log(commands.project.migrateApp.warning.appConfig);
+    uiLogger.log(commands.project.migrateApp.warning.buildAndDeploy);
+    uiLogger.log(commands.project.migrateApp.warning.existingApps);
+    uiLogger.log(commands.project.migrateApp.warning.copyApp);
     uiLine();
     const { shouldCreateApp } = await promptUser({
         name: 'shouldCreateApp',
         type: 'confirm',
-        message: i18n(`commands.project.subcommands.migrateApp.createAppPrompt`),
+        message: commands.project.migrateApp.createAppPrompt,
     });
     process.stdin.resume();
     if (!shouldCreateApp) {
@@ -84,12 +80,12 @@ export async function migrateApp2023_2(derivedAccountId, options, accountConfig)
     try {
         SpinniesManager.init();
         SpinniesManager.add('migrateApp', {
-            text: i18n(`commands.project.subcommands.migrateApp.migrationStatus.inProgress`),
+            text: commands.project.migrateApp.migrationStatus.inProgress(),
         });
         handleKeypress(async (key) => {
             if ((key.ctrl && key.name === 'c') || key.name === 'q') {
                 SpinniesManager.remove('migrateApp');
-                logger.log(i18n(`commands.project.subcommands.migrateApp.migrationInterrupted`));
+                uiLogger.log(commands.project.migrateApp.migrationInterrupted);
                 return process.exit(EXIT_CODES.SUCCESS);
             }
         });
@@ -104,20 +100,20 @@ export async function migrateApp2023_2(derivedAccountId, options, accountConfig)
             const { data: zippedProject } = await downloadProject(derivedAccountId, projectName, 1);
             await extractZipArchive(zippedProject, sanitizeFileName(projectName), path.resolve(absoluteDestPath), { includesRootDir: true, hideLogs: true });
             SpinniesManager.succeed('migrateApp', {
-                text: i18n(`commands.project.subcommands.migrateApp.migrationStatus.done`),
+                text: commands.project.migrateApp.migrationStatus.done(),
                 succeedColor: 'white',
             });
-            logger.log('');
+            uiLogger.log('');
             uiLine();
-            logger.success(i18n(`commands.project.subcommands.migrateApp.migrationStatus.success`));
-            logger.log('');
-            logger.log(uiLink(i18n(`commands.project.subcommands.migrateApp.projectDetailsLink`), `${baseUrl}/developer-projects/${derivedAccountId}/project/${encodeURIComponent(project.name)}`));
+            uiLogger.success(commands.project.migrateApp.migrationStatus.success());
+            uiLogger.log('');
+            uiLogger.log(uiLink(commands.project.migrateApp.projectDetailsLink, `${baseUrl}/developer-projects/${derivedAccountId}/project/${encodeURIComponent(project.name)}`));
             process.exit(EXIT_CODES.SUCCESS);
         }
     }
     catch (error) {
         SpinniesManager.fail('migrateApp', {
-            text: i18n(`commands.project.subcommands.migrateApp.migrationStatus.failure`),
+            text: commands.project.migrateApp.migrationStatus.failure(),
             failColor: 'white',
         });
         throw error;

package/lib/buildAccount.d.ts

@@ -4,12 +4,12 @@ import { CLIAccount } from '@hubspot/local-dev-lib/types/Accounts';
 import { SandboxResponse, V2Sandbox } from '@hubspot/local-dev-lib/types/Sandbox';
 import { SandboxAccountType } from '../types/Sandboxes.js';
 export declare function saveAccountToConfig(accountId: number | undefined, accountName: string, env: Environment, personalAccessKey?: string, force?: boolean): Promise<string>;
-export declare function createDeveloperTestAccountV3(parentAccountId: number, testAccountConfig: DeveloperTestAccountConfig): Promise<{
+export declare function createDeveloperTestAccountV2(parentAccountId: number, testAccountConfig: DeveloperTestAccountConfig): Promise<{
     accountName: string;
     accountId?: number;
     personalAccessKey?: string;
 }>;
-export declare function buildDeveloperTestAccount(testAccountName: string, parentAccountConfig: CLIAccount, env: Environment, portalLimit: number, useV3?: boolean): Promise<number>;
+export declare function buildDeveloperTestAccount(testAccountName: string, parentAccountConfig: CLIAccount, env: Environment, portalLimit: number, useV2?: boolean): Promise<number>;
 type SandboxAccount = SandboxResponse & {
     name: string;
 };