@hubspot/cli 8.2.0 → 8.2.1-experimental.1

package/commands/project/create.js

@@ -2,30 +2,36 @@ import path from 'path';
 import fs from 'fs-extra';
 import { cloneGithubRepo } from '@hubspot/local-dev-lib/github';
 import { getCwd } from '@hubspot/local-dev-lib/path';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
+import { getProjectMetadata, } from '@hubspot/project-parsing-lib/projects';
+import { PLATFORM_VERSIONS } from '@hubspot/project-parsing-lib/constants';
 import { writeProjectConfig, getProjectConfig, } from '../../lib/projects/config.js';
 import { EMPTY_PROJECT_TEMPLATE_NAME } from '../../lib/projects/create/legacy.js';
 import { generateComponentPaths } from '../../lib/projects/create/v2.js';
-import { PROJECT_WITH_APP, EMPTY_PROJECT } from '../../lib/constants.js';
 import { debugError, logError } from '../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
-import { PROJECT_CONFIG_FILE, HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, marketplaceDistribution, privateDistribution, oAuth, staticAuth, DEFAULT_PROJECT_TEMPLATE_BRANCH, } from '../../lib/constants.js';
+import { PROJECT_CONFIG_FILE, HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, marketplaceDistribution, privateDistribution, oAuth, staticAuth, DEFAULT_PROJECT_TEMPLATE_BRANCH, PROJECT_WITH_APP, EMPTY_PROJECT, } from '../../lib/constants.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
-import { PLATFORM_VERSIONS } from '@hubspot/local-dev-lib/constants/projects';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { handleProjectCreationFlow, } from '../../lib/projects/create/index.js';
-import { getProjectMetadata, } from '@hubspot/project-parsing-lib/projects';
 import { updateHsMetaFilesWithAutoGeneratedFields } from '../../lib/projects/components.js';
 import SpinniesManager from '../../lib/ui/SpinniesManager.js';
+import { showMcpPromotionNudge } from '../../lib/mcp/promotion.js';
 const command = ['create', 'init'];
 const describe = commands.project.create.describe;
-const { v2025_1, v2025_2, v2026_03_beta } = PLATFORM_VERSIONS;
+const BETA_VERSIONS = [
+    PLATFORM_VERSIONS.v2026_09_BETA,
+    PLATFORM_VERSIONS.v2026_03_BETA,
+];
 async function handler(args) {
-    const { derivedAccountId, platformVersion, templateSource } = args;
+    const { platformVersion, templateSource, exit, addUsageMetadata } = args;
+    if (BETA_VERSIONS.includes(platformVersion)) {
+        uiLogger.warn(commands.project.create.warnings.betaPlatformVersion(platformVersion));
+    }
     if (templateSource && !templateSource.includes('/')) {
         uiLogger.error(commands.project.create.errors.invalidTemplateSource);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     const repo = templateSource || HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH;
     let handleResult;
@@ -34,24 +40,27 @@ async function handler(args) {
     }
     catch (error) {
         logError(error);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     const { authType, distribution, repoConfig, projectContents, selectProjectTemplatePromptResponse, projectNameAndDestPromptResponse, } = handleResult;
-    trackCommandUsage('project-create', {
+    addUsageMetadata({
         type: selectProjectTemplatePromptResponse.projectTemplate?.name ||
             (selectProjectTemplatePromptResponse.componentTemplates || [])
                 // @ts-expect-error
                 .map((item) => item.type)
                 .join(','),
-    }, derivedAccountId);
+    });
     const projectDest = path.resolve(getCwd(), projectNameAndDestPromptResponse.dest);
-    const { projectConfig: existingProjectConfig, projectDir: existingProjectDir, } = await getProjectConfig(projectDest);
     // Exit if the target destination is within an existing project
-    if (existingProjectConfig &&
-        existingProjectDir &&
-        projectDest.startsWith(existingProjectDir)) {
-        uiLogger.error(commands.project.create.errors.cannotNestProjects(existingProjectDir));
-        process.exit(EXIT_CODES.ERROR);
+    try {
+        const { projectDir: existingProjectDir } = getProjectConfig(projectDest);
+        if (projectDest.startsWith(existingProjectDir)) {
+            uiLogger.error(commands.project.create.errors.cannotNestProjects(existingProjectDir));
+            return exit(EXIT_CODES.ERROR);
+        }
+    }
+    catch {
+        // Not in a project directory, which is the expected case for create
     }
     const components = generateComponentPaths({
         selectProjectTemplatePromptResponse,
@@ -79,7 +88,7 @@ async function handler(args) {
         });
         debugError(err);
         uiLogger.error(commands.project.create.errors.failedToDownloadProject);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     const projectConfigPath = path.join(projectDest, PROJECT_CONFIG_FILE);
     const parsedConfigFile = JSON.parse(fs.readFileSync(projectConfigPath).toString());
@@ -102,7 +111,8 @@ async function handler(args) {
     if (isProjectEmpty) {
         fs.ensureDirSync(path.join(projectDest, 'src'));
     }
-    process.exit(EXIT_CODES.SUCCESS);
+    await showMcpPromotionNudge(args._.join(' '));
+    return exit(EXIT_CODES.SUCCESS);
 }
 function projectCreateBuilder(yargs) {
     yargs.options({
@@ -125,8 +135,13 @@ function projectCreateBuilder(yargs) {
         'platform-version': {
             describe: commands.project.create.options.platformVersion.describe,
             type: 'string',
-            choices: [v2025_1, v2025_2, v2026_03_beta],
-            default: v2025_2,
+            choices: [
+                PLATFORM_VERSIONS.v2025_2,
+                PLATFORM_VERSIONS.v2026_03_BETA,
+                PLATFORM_VERSIONS.v2026_03,
+                PLATFORM_VERSIONS.v2026_09_BETA,
+            ],
+            default: PLATFORM_VERSIONS.v2026_03,
         },
         'project-base': {
             describe: commands.project.create.options.projectBase.describe,
@@ -169,7 +184,7 @@ const builder = makeYargsBuilder(projectCreateBuilder, command, describe, {
 const projectCreateCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('project-create', handler),
     builder,
 };
 export default projectCreateCommand;

package/commands/project/delete.d.ts

@@ -0,0 +1,7 @@
+import { AccountArgs, CommonArgs, ConfigArgs, YargsCommandModule } from '../../types/Yargs.js';
+export type ProjectDeleteArgs = CommonArgs & ConfigArgs & AccountArgs & {
+    projectName?: string;
+    force: boolean;
+};
+declare const projectDeleteCommand: YargsCommandModule<unknown, ProjectDeleteArgs>;
+export default projectDeleteCommand;

package/commands/project/delete.js

@@ -0,0 +1,74 @@
+import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
+import { logError } from '../../lib/errorHandlers/index.js';
+import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { renderInline } from '../../ui/render.js';
+import { getWarningBox } from '../../ui/components/StatusMessageBoxes.js';
+import { commands } from '../../lang/en.js';
+import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
+import { isPromptExitError } from '../../lib/errors/PromptExitError.js';
+import { resolveProjectName, checkDeployedComponents, deleteDeployedComponents, confirmDeletion, handleProjectDeletion, } from '../../lib/projects/delete.js';
+const command = 'delete';
+const describe = commands.project.delete.describe;
+const verboseDescribe = commands.project.delete.verboseDescribe;
+async function handler(args) {
+    const { derivedAccountId, projectName: projectNameArg, force, exit } = args;
+    await renderInline(getWarningBox({
+        title: commands.project.delete.warnings.irreversibleTitle,
+        message: commands.project.delete.warnings.irreversible,
+    }));
+    try {
+        const projectName = await resolveProjectName(derivedAccountId, projectNameArg);
+        const { platformVersion, hasUnifiedComponents, projectId } = await checkDeployedComponents(derivedAccountId, projectName);
+        if (!force) {
+            await confirmDeletion(projectName, derivedAccountId, projectId);
+        }
+        if (!isLegacyProject(platformVersion) && hasUnifiedComponents) {
+            await deleteDeployedComponents(derivedAccountId, projectName);
+        }
+        await handleProjectDeletion(derivedAccountId, projectName);
+    }
+    catch (e) {
+        if (isPromptExitError(e)) {
+            throw e;
+        }
+        logError(e);
+        return exit(EXIT_CODES.ERROR);
+    }
+    return exit(EXIT_CODES.SUCCESS);
+}
+function projectDeleteBuilder(yargs) {
+    yargs.option('project-name', {
+        describe: commands.project.delete.options.project,
+        type: 'string',
+    });
+    yargs.option('force', {
+        describe: commands.project.delete.options.force,
+        type: 'boolean',
+        default: false,
+    });
+    yargs.example([
+        [
+            '$0 project delete --project-name=my-project',
+            'Delete a project in the current account named "my-project"',
+        ],
+        [
+            '$0 project delete --project-name=my-project --force',
+            'Delete and skip confirmation prompt',
+        ],
+    ]);
+    return yargs;
+}
+const builder = makeYargsBuilder(projectDeleteBuilder, command, verboseDescribe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const projectDeleteCommand = {
+    command,
+    describe,
+    handler: makeWrappedYargsHandler('project-delete', handler),
+    builder,
+};
+export default projectDeleteCommand;

package/commands/project/deploy.d.ts

@@ -1,5 +1,6 @@
 import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, JSONOutputArgs, YargsCommandModule } from '../../types/Yargs.js';
-export type ProjectDeployArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & JSONOutputArgs & {
+import { DeployJsonOutput } from '../../lib/jsonOutput.js';
+export type ProjectDeployArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & JSONOutputArgs<DeployJsonOutput> & {
     project?: string;
     build?: number;
     buildId?: number;

package/commands/project/deploy.js

@@ -1,60 +1,67 @@
 import { fetchProject } from '@hubspot/local-dev-lib/api/projects';
 import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
-import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
-import { isV2Project } from '../../lib/projects/platformVersion.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
+import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
+import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
 import { getProjectConfig } from '../../lib/projects/config.js';
 import { projectNamePrompt } from '../../lib/prompts/projectNamePrompt.js';
+import { projectProfilePrompt } from '../../lib/prompts/projectProfilePrompt.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { uiLogger } from '../../lib/ui/logger.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
+import { DeploySchema } from '../../lib/jsonOutput.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
-import { loadProfile, logProfileFooter, logProfileHeader, enforceProfileUsage, } from '../../lib/projects/projectProfiles.js';
+import { loadProfile } from '../../lib/projects/projectProfiles.js';
 import { PROJECT_DEPLOY_TEXT } from '../../lib/constants.js';
 import { commands } from '../../lang/en.js';
 import { handleProjectDeploy, validateBuildIdForDeploy, logDeployErrors, } from '../../lib/projects/deploy.js';
+import { validateBuildForRelease } from '../../lib/projects/release.js';
+import { getLastSuccessfulBuild } from '../../lib/projects/builds.js';
 const command = 'deploy';
 const describe = commands.project.deploy.describe;
 async function handler(args) {
-    const { derivedAccountId, project: projectOption, buildId: buildIdOption, force: forceOption, deployLatestBuild: deployLatestBuildOption, json: formatOutputAsJson, } = args;
+    const { derivedAccountId, project: projectOption, buildId: buildIdOption, force: forceOption, deployLatestBuild: deployLatestBuildOption, profile: profileOption, useEnv: useEnvOption, exit, addUsageMetadata, addJsonOutput, } = args;
     const accountConfig = getConfigAccountById(derivedAccountId);
     const accountType = accountConfig && accountConfig.accountType;
     let targetAccountId;
-    const jsonOutput = {};
-    const { projectConfig, projectDir } = await getProjectConfig();
-    if (isV2Project(projectConfig?.platformVersion)) {
-        if (args.profile) {
-            logProfileHeader(args.profile);
-            let profile;
-            try {
-                profile = loadProfile(projectConfig, projectDir, args.profile);
-            }
-            catch (error) {
-                logError(error);
-                process.exit(EXIT_CODES.ERROR);
+    let loadedConfig;
+    let isInProjectDirectory = false;
+    try {
+        loadedConfig = getProjectConfig();
+        isInProjectDirectory = true;
+    }
+    catch (e) {
+        // Do nothing, it's valid to run this command from outside a project dir
+    }
+    if (isInProjectDirectory &&
+        loadedConfig &&
+        !isLegacyProject(loadedConfig.projectConfig.platformVersion)) {
+        try {
+            const profileName = await projectProfilePrompt(loadedConfig.projectDir, loadedConfig.projectConfig, profileOption, !!useEnvOption);
+            if (profileName) {
+                // Use loadProfile instead of loadAndValidateProfile because the local
+                // profile does not need to be valid to successfully deploy
+                const profile = loadProfile(loadedConfig.projectConfig, loadedConfig.projectDir, profileName);
+                targetAccountId = profile.accountId;
+                uiLogger.log(commands.project.deploy.profileMessage(profileName, targetAccountId));
+                uiLogger.log('');
             }
-            targetAccountId = profile.accountId;
-            logProfileFooter(profile);
         }
-        else {
-            // A profile must be specified if this project has profiles configured
-            try {
-                await enforceProfileUsage(projectConfig, projectDir);
-            }
-            catch (error) {
-                logError(error);
-                process.exit(EXIT_CODES.ERROR);
-            }
+        catch (error) {
+            logError(error);
+            return exit(EXIT_CODES.ERROR);
         }
     }
     if (!targetAccountId) {
         targetAccountId = derivedAccountId;
     }
-    trackCommandUsage('project-deploy', accountType ? { type: accountType } : undefined, targetAccountId);
+    if (accountType) {
+        addUsageMetadata({ type: accountType });
+    }
     let projectName = projectOption;
-    if (!projectOption && projectConfig) {
-        projectName = projectConfig.name;
+    if (!projectOption && loadedConfig) {
+        projectName = loadedConfig.projectConfig.name;
     }
     const namePromptResponse = await projectNamePrompt(targetAccountId, {
         project: projectName,
@@ -66,26 +73,31 @@ async function handler(args) {
         const { data: { latestBuild, deployedBuildId }, } = await fetchProject(targetAccountId, projectName);
         if (!latestBuild || !latestBuild.buildId) {
             uiLogger.error(commands.project.deploy.errors.noBuilds);
-            return process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         if (buildIdToDeploy) {
             const validationResult = validateBuildIdForDeploy(buildIdToDeploy, deployedBuildId, latestBuild.buildId, projectName, targetAccountId);
             if (validationResult !== true) {
                 uiLogger.error(validationResult.toString());
-                return process.exit(EXIT_CODES.ERROR);
+                return exit(EXIT_CODES.ERROR);
             }
         }
         else {
+            const lastSuccessfulBuild = await getLastSuccessfulBuild(targetAccountId, projectName, latestBuild);
+            if (!lastSuccessfulBuild) {
+                uiLogger.error(commands.project.deploy.errors.noSuccessfulBuilds);
+                return exit(EXIT_CODES.ERROR);
+            }
             if (deployLatestBuildOption) {
-                buildIdToDeploy = latestBuild.buildId;
+                buildIdToDeploy = lastSuccessfulBuild.buildId;
             }
             else {
                 const deployBuildIdPromptResponse = await promptUser({
                     name: 'buildId',
                     message: commands.project.deploy.deployBuildIdPrompt,
-                    default: latestBuild.buildId === deployedBuildId
+                    default: lastSuccessfulBuild.buildId === deployedBuildId
                         ? undefined
-                        : latestBuild.buildId,
+                        : lastSuccessfulBuild.buildId,
                     validate: buildId => validateBuildIdForDeploy(buildId, deployedBuildId, latestBuild.buildId, projectName, targetAccountId),
                 });
                 buildIdToDeploy = deployBuildIdPromptResponse.buildId;
@@ -93,24 +105,35 @@ async function handler(args) {
         }
         if (!buildIdToDeploy) {
             uiLogger.error(commands.project.deploy.errors.noBuildId);
-            return process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
+        }
+        try {
+            const supportsReleases = await validateBuildForRelease(targetAccountId, projectName, buildIdToDeploy);
+            // The deploy verb is not compatible with builds that leverage releases. Use release create instead.
+            if (supportsReleases) {
+                uiLogger.error(commands.project.deploy.errors.notSupportedForBuildVersion);
+                return exit(EXIT_CODES.ERROR);
+            }
         }
-        const deployResult = await handleProjectDeploy(targetAccountId, projectName, buildIdToDeploy, isV2Project(projectConfig?.platformVersion), forceOption);
+        catch {
+            return exit(EXIT_CODES.ERROR);
+        }
+        const deployResult = await handleProjectDeploy(targetAccountId, projectName, buildIdToDeploy, isLegacyProject(loadedConfig?.projectConfig.platformVersion), forceOption);
         if (!deployResult) {
-            return process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
-        else if (formatOutputAsJson) {
-            jsonOutput.deployId = deployResult.deployId;
+        else {
+            addJsonOutput({ deployId: deployResult.deployId });
         }
         if (deployResult.status === PROJECT_DEPLOY_TEXT.STATES.SUCCESS) {
             deploySuccess = true;
         }
     }
     catch (e) {
-        if (isHubSpotHttpError(e) && e.status === 404) {
+        if (isSpecifiedError(e, { statusCode: 404 })) {
             uiLogger.error(commands.project.deploy.errors.projectNotFound(targetAccountId, projectName));
         }
-        else if (isHubSpotHttpError(e) && e.status === 400) {
+        else if (isSpecifiedError(e, { statusCode: 400 })) {
             if (e.data?.message && e.data?.errors) {
                 logDeployErrors(e.data);
             }
@@ -124,16 +147,13 @@ async function handler(args) {
                 request: 'project deploy',
             }));
         }
-        return process.exit(EXIT_CODES.ERROR);
-    }
-    if (formatOutputAsJson) {
-        uiLogger.json(jsonOutput);
+        return exit(EXIT_CODES.ERROR);
     }
     if (deploySuccess) {
-        process.exit(EXIT_CODES.SUCCESS);
+        return exit(EXIT_CODES.SUCCESS);
     }
     else {
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
 }
 function projectDeployBuilder(yargs) {
@@ -191,6 +211,8 @@ const projectDeployCommand = {
     command,
     describe,
     builder,
-    handler,
+    handler: makeWrappedYargsHandler('project-deploy', handler, {
+        jsonOutputSchema: DeploySchema,
+    }),
 };
 export default projectDeployCommand;

package/commands/project/dev/index.d.ts

@@ -1,5 +1,5 @@
-import { Argv, CommandModule } from 'yargs';
-import { ProjectDevArgs } from '../../../types/Yargs.js';
+import { Argv } from 'yargs';
+import { ProjectDevArgs, YargsCommandModule } from '../../../types/Yargs.js';
 export declare const builder: (yargs: Argv) => Promise<Argv<ProjectDevArgs>>;
-declare const projectDevCommand: CommandModule<unknown, ProjectDevArgs>;
+declare const projectDevCommand: YargsCommandModule<unknown, ProjectDevArgs>;
 export default projectDevCommand;

package/commands/project/dev/index.js

@@ -1,58 +1,39 @@
-import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { getConfigAccountIfExists } from '@hubspot/local-dev-lib/config';
-import { getAllHsProfiles, } from '@hubspot/project-parsing-lib/profiles';
-import { getProjectConfig, validateProjectConfig, } from '../../../lib/projects/config.js';
+import { getProjectConfig } from '../../../lib/projects/config.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { uiLine } from '../../../lib/ui/index.js';
-import { deprecatedProjectDevFlow } from './deprecatedFlow.js';
+import { makeWrappedYargsHandler } from '../../../lib/yargs/makeWrappedYargsHandler.js';
 import { unifiedProjectDevFlow } from './unifiedFlow.js';
-import { isV2Project } from '../../../lib/projects/platformVersion.js';
+import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
-import { loadProfile } from '../../../lib/projects/projectProfiles.js';
+import { loadAndValidateProfile } from '../../../lib/projects/projectProfiles.js';
 import { commands } from '../../../lang/en.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
 import { logError } from '../../../lib/errorHandlers/index.js';
-import path from 'path';
-import { listPrompt } from '../../../lib/prompts/promptUtils.js';
+import { projectProfilePrompt } from '../../../lib/prompts/projectProfilePrompt.js';
+import { isPromptExitError } from '../../../lib/errors/PromptExitError.js';
+import { LOCAL_DEV_DEFAULT_PORT } from '../../../lib/constants.js';
 const command = 'dev';
 const describe = commands.project.dev.describe;
-function validateAccountFlags(testingAccount, projectAccount, userProvidedAccount, useV2) {
-    // Legacy projects do not support targetTestingAccount and targetProjectAccount
-    if (testingAccount && projectAccount && !useV2) {
-        uiLogger.error(commands.project.dev.errors.unsupportedAccountFlagLegacy);
-        process.exit(EXIT_CODES.ERROR);
-    }
-    if (userProvidedAccount && useV2) {
-        uiLogger.error(commands.project.dev.errors.unsupportedAccountFlagV2);
-        process.exit(EXIT_CODES.ERROR);
-    }
-}
 async function handler(args) {
-    const { derivedAccountId, userProvidedAccount, testingAccount, projectAccount, } = args;
-    const { projectConfig, projectDir } = await getProjectConfig();
+    const { derivedAccountId, testingAccount, projectAccount, profile: profileOption, exit, addUsageMetadata, } = args;
+    let projectConfig;
+    let projectDir;
     try {
-        validateProjectConfig(projectConfig, projectDir);
+        ({ projectConfig, projectDir } = getProjectConfig());
     }
     catch (error) {
         logError(error);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
-    const useV2Projects = isV2Project(projectConfig.platformVersion);
-    if (!projectDir) {
-        uiLogger.error(commands.project.dev.errors.noProjectConfig);
-        process.exit(EXIT_CODES.ERROR);
+    if (isLegacyProject(projectConfig.platformVersion)) {
+        uiLogger.error(commands.project.dev.errors.unsupportedPlatformVersion(projectConfig.platformVersion));
+        return exit(EXIT_CODES.ERROR);
     }
-    validateAccountFlags(testingAccount, projectAccount, userProvidedAccount, useV2Projects);
     uiLogger.log(commands.project.dev.logs.header);
-    if (useV2Projects) {
-        uiLogger.log(commands.project.dev.logs.learnMoreMessageV2);
-    }
-    else {
-        uiLogger.log(commands.project.dev.logs.learnMoreMessageLegacy);
-    }
+    uiLogger.log(commands.project.dev.logs.learnMoreMessageV2);
     let targetProjectAccountId;
     let profile;
-    // Using the new --projectAccount flag
     if (projectAccount) {
         targetProjectAccountId =
             getConfigAccountIfExists(projectAccount)?.accountId;
@@ -60,25 +41,12 @@ async function handler(args) {
             uiLogger.log('');
             uiLogger.log(commands.project.dev.logs.projectAccountFlagExplanation(targetProjectAccountId));
         }
-        // Using the legacy --account flag
     }
-    else if (userProvidedAccount && derivedAccountId) {
-        targetProjectAccountId = derivedAccountId;
-    }
-    // Determine profile name: from flag or prompt
-    if (!targetProjectAccountId && isV2Project(projectConfig.platformVersion)) {
-        let profileName = args.profile;
-        if (!profileName) {
-            const existingProfiles = await getAllHsProfiles(path.join(projectDir, projectConfig.srcDir));
-            if (existingProfiles.length !== 0) {
-                profileName = await listPrompt(commands.project.dev.prompts.selectProfile, {
-                    choices: existingProfiles,
-                });
-            }
-        }
+    if (!targetProjectAccountId) {
+        const profileName = await projectProfilePrompt(projectDir, projectConfig, profileOption);
         if (profileName) {
             try {
-                profile = loadProfile(projectConfig, projectDir, profileName);
+                profile = await loadAndValidateProfile(projectConfig, projectDir, profileName);
                 targetProjectAccountId = profile.accountId;
                 uiLogger.log('');
                 uiLogger.log(commands.project.dev.logs.profileProjectAccountExplanation(targetProjectAccountId, profileName));
@@ -86,20 +54,17 @@ async function handler(args) {
             catch (error) {
                 logError(error);
                 uiLine();
-                process.exit(EXIT_CODES.ERROR);
+                return exit(EXIT_CODES.ERROR);
             }
         }
     }
     if (!targetProjectAccountId) {
-        // The user is not using profile or account flags, so we can use the derived accountId
         targetProjectAccountId = derivedAccountId;
-        if (useV2Projects) {
-            uiLogger.log('');
-            uiLogger.log(commands.project.dev.logs.defaultProjectAccountExplanation(targetProjectAccountId));
-        }
+        uiLogger.log('');
+        uiLogger.log(commands.project.dev.logs.defaultProjectAccountExplanation(targetProjectAccountId));
     }
-    trackCommandUsage('project-dev', {}, targetProjectAccountId);
-    if (isV2Project(projectConfig.platformVersion)) {
+    addUsageMetadata({ accountId: targetProjectAccountId ?? undefined });
+    try {
         const targetTestingAccountId = testingAccount
             ? getConfigAccountIfExists(testingAccount)?.accountId
             : undefined;
@@ -112,13 +77,12 @@ async function handler(args) {
             profileConfig: profile,
         });
     }
-    else {
-        await deprecatedProjectDevFlow({
-            args,
-            accountId: targetProjectAccountId,
-            projectConfig,
-            projectDir,
-        });
+    catch (e) {
+        if (isPromptExitError(e)) {
+            throw e;
+        }
+        logError(e);
+        return exit(EXIT_CODES.ERROR);
     }
 }
 function projectDevBuilder(yargs) {
@@ -138,14 +102,17 @@ function projectDevBuilder(yargs) {
         description: commands.project.dev.options.projectAccount,
         implies: ['testingAccount'],
     });
-    yargs.option('account', {
-        alias: 'a',
-        describe: '',
-        type: 'string',
-        description: commands.project.dev.options.account,
+    yargs.option('port', {
+        type: 'number',
+        description: commands.project.dev.options.port,
+        default: LOCAL_DEV_DEFAULT_PORT,
+    });
+    yargs.option('auto-upload', {
+        type: 'boolean',
+        description: commands.project.dev.options.autoUpload,
+        default: false,
     });
     yargs.example([['$0 project dev', commands.project.dev.examples.default]]);
-    yargs.conflicts('profile', 'account');
     yargs.conflicts('profile', 'testing-account');
     yargs.conflicts('profile', 'project-account');
     return yargs;
@@ -158,7 +125,7 @@ export const builder = makeYargsBuilder(projectDevBuilder, command, describe, {
 const projectDevCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('project-dev', handler),
     builder,
 };
 export default projectDevCommand;