@hubspot/cli 7.8.0-experimental.0 → 7.8.0

package/commands/project/logs.js

@@ -1,13 +1,13 @@
 import { getEnv } from '@hubspot/local-dev-lib/config';
 import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
 import { ENVIRONMENTS } from '@hubspot/local-dev-lib/constants/environments';
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { getTableContents, getTableHeader } from '../../lib/ui/table.js';
 import { logError } from '../../lib/errorHandlers/index.js';
-import { uiBetaTag, uiLine, uiLink } from '../../lib/ui/index.js';
+import { uiLine } from '../../lib/ui/index.js';
 import { projectLogsPrompt } from '../../lib/prompts/projectsLogsPrompt.js';
-import { i18n } from '../../lib/lang.js';
+import { commands } from '../../lang/en.js';
+import { uiLogger } from '../../lib/ui/logger.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { ProjectLogsManager } from '../../lib/projects/ProjectLogsManager.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
@@ -16,34 +16,34 @@ function getPrivateAppsUrl(accountId) {
     return `${baseUrl}/private-apps/${accountId}`;
 }
 function logTable(tableHeader, logsInfo) {
-    logger.log(i18n(`commands.project.subcommands.logs.logs.showingLogs`));
-    logger.log(getTableContents([tableHeader, logsInfo], { border: { bodyLeft: '  ' } }));
+    uiLogger.log(commands.project.logs.logs.showingLogs);
+    uiLogger.log(getTableContents([tableHeader, logsInfo], { border: { bodyLeft: '  ' } }));
 }
 function logPreamble() {
     if (ProjectLogsManager.isPublicFunction) {
         logTable(getTableHeader([
-            i18n(`commands.project.subcommands.logs.table.accountHeader`),
-            i18n(`commands.project.subcommands.logs.table.functionHeader`),
-            i18n(`commands.project.subcommands.logs.table.endpointHeader`),
+            commands.project.logs.table.accountHeader,
+            commands.project.logs.table.functionHeader,
+            commands.project.logs.table.endpointHeader,
         ]), [
             ProjectLogsManager.accountId,
             ProjectLogsManager.functionName,
             ProjectLogsManager.endpointName,
         ]);
-        logger.log(uiLink(i18n(`commands.project.subcommands.logs.logs.hubspotLogsDirectLink`), `${getPrivateAppsUrl(ProjectLogsManager.accountId)}/${ProjectLogsManager.appId}/logs/serverlessGatewayExecution?path=${ProjectLogsManager.endpointName}`));
+        uiLogger.log(commands.project.logs.logs.hubspotLogsDirectLink(`${getPrivateAppsUrl(ProjectLogsManager.accountId)}/${ProjectLogsManager.appId}/logs/serverlessGatewayExecution?path=${ProjectLogsManager.endpointName}`));
     }
     else {
         logTable(getTableHeader([
-            i18n(`commands.project.subcommands.logs.table.accountHeader`),
-            i18n(`commands.project.subcommands.logs.table.functionHeader`),
+            commands.project.logs.table.accountHeader,
+            commands.project.logs.table.functionHeader,
         ]), [ProjectLogsManager.accountId, ProjectLogsManager.functionName]);
-        logger.log(uiLink(i18n(`commands.project.subcommands.logs.logs.hubspotLogsDirectLink`), `${getPrivateAppsUrl(ProjectLogsManager.accountId)}/${ProjectLogsManager.appId}/logs/crm?serverlessFunction=${ProjectLogsManager.functionName}`));
+        uiLogger.log(commands.project.logs.logs.hubspotLogsDirectLink(`${getPrivateAppsUrl(ProjectLogsManager.accountId)}/${ProjectLogsManager.appId}/logs/crm?serverlessFunction=${ProjectLogsManager.functionName}`));
     }
-    logger.log();
+    uiLogger.log('');
     uiLine();
 }
 const command = 'logs';
-const describe = uiBetaTag(i18n(`commands.project.subcommands.logs.describe`), false);
+const describe = commands.project.logs.describe;
 async function handler(args) {
     const { derivedAccountId } = args;
     trackCommandUsage('project-logs', undefined, derivedAccountId);
@@ -70,38 +70,35 @@ function projectLogsBuilder(yargs) {
     yargs.options({
         function: {
             alias: 'function',
-            describe: i18n(`commands.project.subcommands.logs.options.function.describe`),
+            describe: commands.project.logs.options.function.describe,
             requiresArg: true,
             type: 'string',
         },
         latest: {
             alias: 'l',
-            describe: i18n(`commands.project.subcommands.logs.options.latest.describe`),
+            describe: commands.project.logs.options.latest.describe,
             type: 'boolean',
         },
         compact: {
-            describe: i18n(`commands.project.subcommands.logs.options.compact.describe`),
+            describe: commands.project.logs.options.compact.describe,
             type: 'boolean',
         },
         tail: {
             alias: ['t', 'follow'],
-            describe: i18n(`commands.project.subcommands.logs.options.tail.describe`),
+            describe: commands.project.logs.options.tail.describe,
             type: 'boolean',
         },
         limit: {
-            describe: i18n(`commands.project.subcommands.logs.options.limit.describe`),
+            describe: commands.project.logs.options.limit.describe,
             type: 'number',
         },
     });
     yargs.conflicts('tail', 'limit');
     yargs.example([
-        [
-            '$0 project logs',
-            i18n(`commands.project.subcommands.logs.examples.default`),
-        ],
+        ['$0 project logs', commands.project.logs.examples.default],
         [
             '$0 project logs --function=my-function',
-            i18n(`commands.project.subcommands.logs.examples.withOptions`),
+            commands.project.logs.examples.withOptions,
         ],
     ]);
     return yargs;

package/commands/project/migrate.js

@@ -10,18 +10,23 @@ import { uiLogger } from '../../lib/ui/logger.js';
 import { logInBox } from '../../lib/ui/boxen.js';
 import { renderInline } from '../../ui/index.js';
 import { getWarningBox } from '../../ui/components/StatusMessageBoxes.js';
+import { getHasMigratableThemes, migrateThemes2025_2, } from '../../lib/theme/migrate.js';
+import { hasFeature } from '../../lib/hasFeature.js';
+import { FEATURES } from '../../lib/constants.js';
+import { trackCommandMetadataUsage, trackCommandUsage, } from '../../lib/usageTracking.js';
 const { v2025_2 } = PLATFORM_VERSIONS;
 const command = 'migrate';
-const describe = undefined; // commands.project.migrate.describe
+const describe = commands.project.migrate.describe;
 async function handler(args) {
-    const { platformVersion, unstable } = args;
+    const { platformVersion, unstable, derivedAccountId } = args;
+    await trackCommandUsage('project-migrate', {}, derivedAccountId);
     const projectConfig = await getProjectConfig();
     if (!projectConfig.projectConfig) {
         uiLogger.error(commands.project.migrate.errors.noProjectConfig(uiCommandReference('hs app migrate')));
         return process.exit(EXIT_CODES.ERROR);
     }
     if (projectConfig?.projectConfig) {
-        if (!process.env.ENABLE_INK) {
+        if (!process.env.HUBSPOT_ENABLE_INK) {
             await logInBox({
                 contents: lib.migrate.projectMigrationWarning,
                 options: { title: lib.migrate.projectMigrationWarningTitle },
@@ -34,20 +39,37 @@ async function handler(args) {
             }));
         }
     }
-    const { derivedAccountId } = args;
     try {
-        await migrateApp2025_2(derivedAccountId, {
-            ...args,
-            name: projectConfig?.projectConfig?.name,
-            platformVersion: unstable
-                ? PLATFORM_VERSIONS.unstable
-                : platformVersion,
-        }, projectConfig);
+        const { hasMigratableThemes, migratableThemesCount } = await getHasMigratableThemes(projectConfig);
+        if (hasMigratableThemes) {
+            const hasThemeMigrationAccess = await hasFeature(derivedAccountId, FEATURES.THEME_MIGRATION_2025_2);
+            if (!hasThemeMigrationAccess) {
+                uiLogger.error(commands.project.migrate.errors.noThemeMigrationAccess(derivedAccountId));
+                return process.exit(EXIT_CODES.ERROR);
+            }
+            await migrateThemes2025_2(derivedAccountId, {
+                ...args,
+                platformVersion: unstable
+                    ? PLATFORM_VERSIONS.unstable
+                    : platformVersion,
+            }, migratableThemesCount, projectConfig);
+        }
+        else {
+            await migrateApp2025_2(derivedAccountId, {
+                ...args,
+                name: projectConfig?.projectConfig?.name,
+                platformVersion: unstable
+                    ? PLATFORM_VERSIONS.unstable
+                    : platformVersion,
+            }, projectConfig);
+        }
     }
     catch (error) {
+        await trackCommandMetadataUsage('project-migrate', { successful: false }, derivedAccountId);
         logError(error);
         return process.exit(EXIT_CODES.ERROR);
     }
+    await trackCommandMetadataUsage('project-migrate', { successful: true }, derivedAccountId);
     return process.exit(EXIT_CODES.SUCCESS);
 }
 function projectMigrateBuilder(yargs) {
@@ -56,7 +78,6 @@ function projectMigrateBuilder(yargs) {
         type: 'string',
         choices: [v2025_2],
         default: v2025_2,
-        hidden: true,
     })
         .option('unstable', {
         type: 'boolean',

package/commands/project/migrateApp.js

@@ -1,48 +1,41 @@
-import { logger } from '@hubspot/local-dev-lib/logger';
-import { i18n } from '../../lib/lang.js';
-import { uiCommandReference, uiDeprecatedTag } from '../../lib/ui/index.js';
+import { uiLogger } from '../../lib/ui/logger.js';
+import { commands } from '../../lang/en.js';
+import { uiDeprecatedTag } from '../../lib/ui/index.js';
 import { handlerGenerator } from '../app/migrate.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { PLATFORM_VERSIONS } from '@hubspot/local-dev-lib/constants/projects';
 const { v2023_2, v2025_2 } = PLATFORM_VERSIONS;
 const command = 'migrate-app';
 // TODO: Leave this as deprecated and remove in the next major release
-const describe = uiDeprecatedTag(i18n(`commands.project.subcommands.migrateApp.describe`), false);
+const describe = uiDeprecatedTag(commands.project.migrateApp.describe, false);
 const deprecated = true;
 async function handler(args) {
-    logger.warn(i18n(`commands.project.subcommands.migrateApp.deprecationWarning`, {
-        oldCommand: uiCommandReference('hs project migrate-app'),
-        newCommand: uiCommandReference(`hs app migrate --platform-version=${args.platformVersion}`),
-    }));
+    uiLogger.warn(commands.project.migrateApp.deprecationWarning(args.platformVersion));
     const localHandler = handlerGenerator('migrate-app');
     await localHandler(args);
 }
 function projectMigrateAppBuilder(yargs) {
     yargs.options({
         name: {
-            describe: i18n(`commands.project.subcommands.migrateApp.options.name.describe`),
+            describe: commands.project.migrateApp.options.name.describe,
             type: 'string',
         },
         dest: {
-            describe: i18n(`commands.project.subcommands.migrateApp.options.dest.describe`),
+            describe: commands.project.migrateApp.options.dest.describe,
             type: 'string',
         },
         'app-id': {
-            describe: i18n(`commands.project.subcommands.migrateApp.options.appId.describe`),
+            describe: commands.project.migrateApp.options.appId.describe,
             type: 'number',
         },
         'platform-version': {
             type: 'string',
             choices: [v2023_2, v2025_2],
-            hidden: true,
-            default: v2023_2,
+            default: v2025_2,
         },
     });
     yargs.example([
-        [
-            `$0 project migrate-app`,
-            i18n(`commands.project.subcommands.migrateApp.examples.default`),
-        ],
+        [`$0 project migrate-app`, commands.project.migrateApp.examples.default],
     ]);
     return yargs;
 }

package/commands/project/open.js

@@ -1,16 +1,15 @@
 import open from 'open';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
-import { i18n } from '../../lib/lang.js';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { commands } from '../../lang/en.js';
+import { uiLogger } from '../../lib/ui/logger.js';
 import { getProjectConfig } from '../../lib/projects/config.js';
 import { ensureProjectExists } from '../../lib/projects/ensureProjectExists.js';
 import { getProjectDetailUrl } from '../../lib/projects/urls.js';
 import { projectNamePrompt } from '../../lib/prompts/projectNamePrompt.js';
-import { uiBetaTag } from '../../lib/ui/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'open';
-const describe = uiBetaTag(i18n(`commands.project.subcommands.open.describe`), false);
+const describe = commands.project.open.describe;
 async function handler(args) {
     const { project, derivedAccountId } = args;
     trackCommandUsage('project-open', undefined, derivedAccountId);
@@ -33,24 +32,17 @@ async function handler(args) {
     }
     const url = getProjectDetailUrl(projectName, derivedAccountId);
     open(url, { url: true });
-    logger.success(i18n(`commands.project.subcommands.open.success`, {
-        projectName: projectName,
-    }));
+    uiLogger.success(commands.project.open.success(projectName));
     process.exit(EXIT_CODES.SUCCESS);
 }
 function projectOpenBuilder(yargs) {
     yargs.options({
         project: {
-            describe: i18n(`commands.project.subcommands.open.options.project.describe`),
+            describe: commands.project.open.options.project.describe,
             type: 'string',
         },
     });
-    yargs.example([
-        [
-            '$0 project open',
-            i18n(`commands.project.subcommands.open.examples.default`),
-        ],
-    ]);
+    yargs.example([['$0 project open', commands.project.open.examples.default]]);
     return yargs;
 }
 const builder = makeYargsBuilder(projectOpenBuilder, command, describe, {

package/commands/project/profile/add.js

@@ -5,7 +5,7 @@ import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountId
 import { getAllHsProfiles, getHsProfileFilename, loadHsProfileFile, } from '@hubspot/project-parsing-lib';
 import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { getProjectConfig } from '../../../lib/projects/config.js';
-import { uiBetaTag, uiAccountDescription } from '../../../lib/ui/index.js';
+import { uiAccountDescription } from '../../../lib/ui/index.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
@@ -14,8 +14,8 @@ import { promptUser, listPrompt, confirmPrompt, } from '../../../lib/prompts/pro
 import { fileExists } from '../../../lib/validation.js';
 import { debugError } from '../../../lib/errorHandlers/index.js';
 const command = 'add [name]';
-const describe = uiBetaTag(commands.project.profile.add.describe, false);
-const verboseDescribe = uiBetaTag(commands.project.profile.add.verboseDescribe, false);
+const describe = commands.project.profile.add.describe;
+const verboseDescribe = commands.project.profile.add.verboseDescribe;
 async function selectProfileToCopyVariablesFrom(existingProfiles) {
     let profileToCopyVariablesFrom;
     if (existingProfiles.length == 1) {

package/commands/project/profile/delete.js

@@ -5,7 +5,6 @@ import { fetchProject, deleteProject, } from '@hubspot/local-dev-lib/api/project
 import { getAccountConfig } from '@hubspot/local-dev-lib/config';
 import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { getProjectConfig } from '../../../lib/projects/config.js';
-import { uiBetaTag } from '../../../lib/ui/index.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
@@ -15,7 +14,7 @@ import { fileExists } from '../../../lib/validation.js';
 import { debugError } from '../../../lib/errorHandlers/index.js';
 import { isDeveloperTestAccount, isSandbox, } from '../../../lib/accountTypes.js';
 const command = 'delete [name]';
-const describe = uiBetaTag(commands.project.profile.delete.describe, false);
+const describe = commands.project.profile.delete.describe;
 async function handler(args) {
     const { derivedAccountId } = args;
     trackCommandUsage('project-profile-delete', undefined, derivedAccountId);

package/commands/project/profile.js

@@ -1,11 +1,10 @@
-import { uiBetaTag } from '../../lib/ui/index.js';
 import add from './profile/add.js';
 import deleteProfile from './profile/delete.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { commands } from '../../lang/en.js';
 const command = ['profile', 'profiles'];
-const describe = undefined; // uiBetaTag(commands.project.profile.describe, false);
-const verboseDescribe = uiBetaTag(commands.project.profile.verboseDescribe, false);
+const describe = commands.project.profile.describe;
+const verboseDescribe = commands.project.profile.verboseDescribe;
 function projectProfileBuilder(yargs) {
     yargs.command(add).command(deleteProfile).demandCommand(1, '');
     return yargs;

package/commands/project/upload.js

@@ -1,36 +1,34 @@
 import chalk from 'chalk';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../../lib/ui/logger.js';
 import { getAccountConfig } from '@hubspot/local-dev-lib/config';
 import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
-import { useV3Api } from '../../lib/projects/platformVersion.js';
-import { uiBetaTag, uiCommandReference } from '../../lib/ui/index.js';
+import { isV2Project } from '../../lib/projects/platformVersion.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { getProjectConfig, validateProjectConfig, } from '../../lib/projects/config.js';
 import { logFeedbackMessage } from '../../lib/projects/ui.js';
 import { handleProjectUpload } from '../../lib/projects/upload.js';
 import { loadAndValidateProfile } from '../../lib/projectProfiles.js';
 import { displayWarnLogs, pollProjectBuildAndDeploy, } from '../../lib/projects/pollProjectBuildAndDeploy.js';
-import { i18n } from '../../lib/lang.js';
+import { commands } from '../../lang/en.js';
 import { PROJECT_ERROR_TYPES } from '../../lib/constants.js';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
-import { uiLogger } from '../../lib/ui/logger.js';
 const command = 'upload';
-const describe = uiBetaTag(i18n(`commands.project.subcommands.upload.describe`), false);
+const describe = commands.project.upload.describe;
 async function handler(args) {
     const { forceCreate, message, derivedAccountId, skipValidation, formatOutputAsJson, profile, } = args;
     const jsonOutput = {};
     const { projectConfig, projectDir } = await getProjectConfig();
     validateProjectConfig(projectConfig, projectDir);
     let targetAccountId;
-    if (useV3Api(projectConfig.platformVersion)) {
+    if (isV2Project(projectConfig.platformVersion)) {
         targetAccountId = await loadAndValidateProfile(projectConfig, projectDir, profile);
     }
     targetAccountId = targetAccountId || derivedAccountId;
     const accountConfig = getAccountConfig(targetAccountId);
     const accountType = accountConfig && accountConfig.accountType;
-    trackCommandUsage('project-upload', { type: accountType }, targetAccountId);
+    trackCommandUsage('project-upload', { type: accountType, assetType: projectConfig.platformVersion }, targetAccountId);
     try {
         const { result, uploadError } = await handleProjectUpload({
             accountId: targetAccountId,
@@ -40,7 +38,7 @@ async function handler(args) {
             uploadMessage: message,
             forceCreate,
             isUploadCommand: true,
-            sendIR: useV3Api(projectConfig.platformVersion),
+            sendIR: isV2Project(projectConfig.platformVersion),
             skipValidation,
             profile: args.profile,
         });
@@ -48,9 +46,9 @@ async function handler(args) {
             if (isSpecifiedError(uploadError, {
                 subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED,
             })) {
-                logger.log();
-                logger.error(i18n(`commands.project.subcommands.upload.errors.projectLockedError`));
-                logger.log();
+                uiLogger.log('');
+                uiLogger.error(commands.project.upload.errors.projectLockedError);
+                uiLogger.log('');
             }
             else {
                 logError(uploadError, new ApiErrorContext({
@@ -61,12 +59,8 @@ async function handler(args) {
             process.exit(EXIT_CODES.ERROR);
         }
         if (result && result.succeeded && !result.buildResult.isAutoDeployEnabled) {
-            logger.log(chalk.bold(i18n(`commands.project.subcommands.upload.logs.buildSucceeded`, {
-                buildId: result.buildId,
-            })));
-            logger.log(i18n(`commands.project.subcommands.upload.logs.autoDeployDisabled`, {
-                deployCommand: uiCommandReference(`hs project deploy --build=${result.buildId}`),
-            }));
+            uiLogger.log(chalk.bold(commands.project.upload.logs.buildSucceeded(result.buildId)));
+            uiLogger.log(commands.project.upload.logs.autoDeployDisabled(`hs project deploy --build=${result.buildId}`));
             logFeedbackMessage(result.buildId);
             await displayWarnLogs(targetAccountId, projectConfig.name, result.buildId);
         }
@@ -92,13 +86,13 @@ async function handler(args) {
 function projectUploadBuilder(yargs) {
     yargs.options({
         'force-create': {
-            describe: i18n(`commands.project.subcommands.upload.options.forceCreate.describe`),
+            describe: commands.project.upload.options.forceCreate.describe,
             type: 'boolean',
             default: false,
         },
         message: {
             alias: 'm',
-            describe: i18n(`commands.project.subcommands.upload.options.message.describe`),
+            describe: commands.project.upload.options.message.describe,
             type: 'string',
             default: '',
         },
@@ -110,16 +104,13 @@ function projectUploadBuilder(yargs) {
         profile: {
             type: 'string',
             alias: 'p',
-            describe: i18n(`commands.project.subcommands.upload.options.profile.describe`),
+            describe: commands.project.upload.options.profile.describe,
             hidden: true,
         },
     });
     yargs.conflicts('profile', 'account');
     yargs.example([
-        [
-            '$0 project upload',
-            i18n(`commands.project.subcommands.upload.examples.default`),
-        ],
+        ['$0 project upload', commands.project.upload.examples.default],
     ]);
     return yargs;
 }

package/commands/project/validate.js

@@ -1,25 +1,25 @@
 import path from 'path';
 import { getAccountConfig } from '@hubspot/local-dev-lib/config';
-import { useV3Api } from '../../lib/projects/platformVersion.js';
+import { isV2Project } from '../../lib/projects/platformVersion.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { uiLogger } from '../../lib/ui/logger.js';
-import { getProjectConfig, validateProjectConfig as validateProjectConfig, } from '../../lib/projects/config.js';
+import { getProjectConfig, validateProjectConfig, } from '../../lib/projects/config.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
-import { validateSourceDirectory as validateSourceDirectory, handleTranslate, } from '../../lib/projects/upload.js';
+import { validateSourceDirectory, handleTranslate, } from '../../lib/projects/upload.js';
 import { commands } from '../../lang/en.js';
 import { loadAndValidateProfile } from '../../lib/projectProfiles.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 const command = 'validate';
-const describe = undefined;
+const describe = commands.project.validate.describe;
 async function handler(args) {
     const { derivedAccountId, profile } = args;
     const { projectConfig, projectDir } = await getProjectConfig();
-    if (!projectConfig) {
+    if (!projectConfig || !projectDir) {
         uiLogger.error(commands.project.validate.mustBeRanWithinAProject);
         process.exit(EXIT_CODES.ERROR);
     }
-    if (!useV3Api(projectConfig?.platformVersion)) {
+    if (!isV2Project(projectConfig?.platformVersion)) {
         uiLogger.error(commands.project.validate.badVersion);
         process.exit(EXIT_CODES.ERROR);
     }
@@ -31,7 +31,7 @@ async function handler(args) {
     trackCommandUsage('project-validate', { type: accountType }, targetAccountId);
     const srcDir = path.resolve(projectDir, projectConfig.srcDir);
     try {
-        validateSourceDirectory(srcDir, projectConfig);
+        await validateSourceDirectory(srcDir, projectConfig, projectDir);
     }
     catch (e) {
         logError(e);

package/commands/project/watch.js

@@ -1,11 +1,10 @@
 import { cancelStagedBuild, fetchProjectBuilds, } from '@hubspot/local-dev-lib/api/projects';
 import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
-import { useV3Api } from '../../lib/projects/platformVersion.js';
-import { uiCommandReference, uiLink, uiBetaTag } from '../../lib/ui/index.js';
-import { i18n } from '../../lib/lang.js';
+import { isV2Project } from '../../lib/projects/platformVersion.js';
+import { commands } from '../../lang/en.js';
 import { createWatcher } from '../../lib/projects/watch.js';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../../lib/ui/logger.js';
 import { PROJECT_ERROR_TYPES } from '../../lib/constants.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { getProjectConfig, validateProjectConfig, } from '../../lib/projects/config.js';
@@ -16,7 +15,7 @@ import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { handleKeypress, handleExit } from '../../lib/process.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'watch';
-const describe = uiBetaTag(i18n(`commands.project.subcommands.watch.describe`), false);
+const describe = commands.project.watch.describe;
 async function handleBuildStatus(accountId, projectName, buildId) {
     const { isAutoDeployEnabled, deployStatusTaskLocator } = await pollBuildStatus(accountId, projectName, buildId, null);
     if (isAutoDeployEnabled && deployStatusTaskLocator) {
@@ -26,7 +25,7 @@ async function handleBuildStatus(accountId, projectName, buildId) {
 }
 function handleUserInput(accountId, projectName, currentBuildId) {
     const onTerminate = async () => {
-        logger.log(i18n(`commands.project.subcommands.watch.logs.processExited`));
+        uiLogger.log(commands.project.watch.logs.processExited);
         if (currentBuildId) {
             try {
                 await cancelStagedBuild(accountId, projectName);
@@ -61,16 +60,11 @@ async function handler(args) {
     const { projectConfig, projectDir } = await getProjectConfig();
     validateProjectConfig(projectConfig, projectDir);
     if (!projectConfig || !projectDir) {
-        logger.error(i18n(`commands.project.subcommands.watch.errors.projectConfigNotFound`));
+        uiLogger.error(commands.project.watch.errors.projectConfigNotFound);
         return process.exit(EXIT_CODES.ERROR);
     }
-    if (useV3Api(projectConfig.platformVersion)) {
-        logger.error(i18n(`commands.project.subcommands.watch.errors.v3ApiError`, {
-            command: uiCommandReference('hs project watch'),
-            newCommand: uiCommandReference('hs project dev'),
-            platformVersion: projectConfig.platformVersion,
-            linkToDocs: uiLink('How to develop locally.', 'https://developers.hubspot.com/docs/guides/crm/ui-extensions/local-development'),
-        }));
+    if (isV2Project(projectConfig.platformVersion)) {
+        uiLogger.error(projectConfig.platformVersion);
         return process.exit(EXIT_CODES.ERROR);
     }
     validateProjectConfig(projectConfig, projectDir);
@@ -93,9 +87,9 @@ async function handler(args) {
                 if (isSpecifiedError(uploadError, {
                     subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED,
                 })) {
-                    logger.log();
-                    logger.error(i18n(`commands.project.subcommands.watch.errors.projectLockedError`));
-                    logger.log();
+                    uiLogger.log('');
+                    uiLogger.error(commands.project.watch.errors.projectLockedError);
+                    uiLogger.log('');
                 }
                 else {
                     logError(uploadError, new ApiErrorContext({
@@ -117,14 +111,11 @@ async function handler(args) {
 function projectWatchBuilder(yargs) {
     yargs.option('initial-upload', {
         alias: 'i',
-        describe: i18n(`commands.project.subcommands.watch.options.initialUpload.describe`),
+        describe: commands.project.watch.options.initialUpload.describe,
         type: 'boolean',
     });
     yargs.example([
-        [
-            '$0 project watch',
-            i18n(`commands.project.subcommands.watch.examples.default`),
-        ],
+        ['$0 project watch', commands.project.watch.examples.default],
     ]);
     return yargs;
 }

package/commands/project.js

@@ -1,5 +1,4 @@
-import { i18n } from '../lib/lang.js';
-import { uiBetaTag } from '../lib/ui/index.js';
+import { commands } from '../lang/en.js';
 import deploy from './project/deploy.js';
 import create from './project/create.js';
 import upload from './project/upload.js';
@@ -16,14 +15,16 @@ import cloneApp from './project/cloneApp.js';
 import installDeps from './project/installDeps.js';
 import profile from './project/profile.js';
 import projectValidate from './project/validate.js';
+import list from './project/list.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 const command = ['project', 'projects'];
-const describe = uiBetaTag(i18n(`commands.project.describe`), false);
+const describe = commands.project.describe;
 function projectBuilder(yargs) {
     yargs
         .command(create)
         .command(add)
         .command(watch)
+        .command(list)
         .command(dev)
         .command(upload)
         .command(deploy)