@hubspot/cli 7.6.0-beta.9 → 7.6.0

package/commands/project/__tests__/add.test.js

@@ -1,7 +1,22 @@
 import yargs from 'yargs';
 import projectAddCommand from '../add.js';
 import { marketplaceDistribution, oAuth, privateDistribution, staticAuth, } from '../../../lib/constants.js';
+import { v3AddComponent } from '../../../lib/projects/add/v3AddComponent.js';
+import { legacyAddComponent } from '../../../lib/projects/add/legacyAddComponent.js';
+import { getProjectConfig } from '../../../lib/projects/config.js';
+import { useV3Api } from '../../../lib/projects/platformVersion.js';
+import { trackCommandUsage } from '../../../lib/usageTracking.js';
 vi.mock('../../../lib/commonOpts');
+vi.mock('../../../lib/projects/add/v3AddComponent');
+vi.mock('../../../lib/projects/add/legacyAddComponent');
+vi.mock('../../../lib/projects/config');
+vi.mock('../../../lib/projects/platformVersion');
+vi.mock('../../../lib/usageTracking');
+const mockedV3AddComponent = vi.mocked(v3AddComponent);
+const mockedLegacyAddComponent = vi.mocked(legacyAddComponent);
+const mockedGetProjectConfig = vi.mocked(getProjectConfig);
+const mockedUseV3Api = vi.mocked(useV3Api);
+const mockedTrackCommandUsage = vi.mocked(trackCommandUsage);
 describe('commands/project/add', () => {
     const yargsMock = yargs;
     describe('command', () => {
@@ -40,4 +55,53 @@ describe('commands/project/add', () => {
             });
         });
     });
+    describe('handler', () => {
+        const mockProjectConfig = {
+            name: 'test-project',
+            srcDir: 'src',
+            platformVersion: 'v3',
+        };
+        const mockProjectDir = '/path/to/project';
+        const mockArgs = {
+            derivedAccountId: 123,
+            name: 'test-component',
+            type: 'module',
+        };
+        beforeEach(() => {
+            mockedGetProjectConfig.mockResolvedValue({
+                projectConfig: mockProjectConfig,
+                projectDir: mockProjectDir,
+            });
+            mockedTrackCommandUsage.mockResolvedValue();
+            mockedV3AddComponent.mockResolvedValue();
+            mockedLegacyAddComponent.mockResolvedValue();
+            vi.spyOn(process, 'exit').mockImplementation(() => {
+                throw new Error('process.exit called');
+            });
+        });
+        it('should call v3AddComponent with accountId for v3 projects', async () => {
+            mockedUseV3Api.mockReturnValue(true);
+            await expect(projectAddCommand.handler(mockArgs)).rejects.toThrow('process.exit called');
+            expect(mockedV3AddComponent).toHaveBeenCalledWith(mockArgs, mockProjectDir, mockProjectConfig, 123);
+            expect(mockedLegacyAddComponent).not.toHaveBeenCalled();
+        });
+        it('should call legacyAddComponent for non-v3 projects', async () => {
+            mockedUseV3Api.mockReturnValue(false);
+            await expect(projectAddCommand.handler(mockArgs)).rejects.toThrow('process.exit called');
+            expect(mockedLegacyAddComponent).toHaveBeenCalledWith(mockArgs, mockProjectDir, mockProjectConfig, 123);
+            expect(mockedV3AddComponent).not.toHaveBeenCalled();
+        });
+        it('should exit with error when project config is not found', async () => {
+            mockedGetProjectConfig.mockResolvedValue({
+                projectConfig: null,
+                projectDir: null,
+            });
+            const mockExit = vi.spyOn(process, 'exit').mockImplementation(() => {
+                throw new Error('process.exit called');
+            });
+            await expect(projectAddCommand.handler(mockArgs)).rejects.toThrow('process.exit called');
+            expect(mockExit).toHaveBeenCalledWith(1);
+            mockExit.mockRestore();
+        });
+    });
 });

package/commands/project/__tests__/create.test.js

@@ -27,14 +27,71 @@ describe('commands/project/create', () => {
         it('should define project creation options', () => {
             const optionsSpy = vi.spyOn(yargsMock, 'options');
             const exampleSpy = vi.spyOn(yargsMock, 'example');
+            const conflictsSpy = vi.spyOn(yargsMock, 'conflicts');
             projectCreateCommand.builder(yargsMock);
             expect(optionsSpy).toHaveBeenCalledWith(expect.objectContaining({
                 name: expect.any(Object),
                 dest: expect.any(Object),
                 template: expect.any(Object),
                 'template-source': expect.any(Object),
+                'platform-version': expect.any(Object),
+                'project-base': expect.any(Object),
+                distribution: expect.any(Object),
+                auth: expect.any(Object),
+                features: expect.any(Object),
             }));
+            expect(conflictsSpy).toHaveBeenCalledWith('template', 'features');
             expect(exampleSpy).toHaveBeenCalled();
         });
+        it('should define platform version option with correct choices', () => {
+            const optionsSpy = vi.spyOn(yargsMock, 'options');
+            projectCreateCommand.builder(yargsMock);
+            const optionsCall = optionsSpy.mock.calls[0][0];
+            expect(optionsCall['platform-version']).toEqual(expect.objectContaining({
+                describe: 'The target platform version for the new project.',
+                type: 'string',
+                choices: ['2023.2', '2025.1', '2025.2'],
+                default: '2025.2',
+            }));
+        });
+        it('should define project base option with correct choices', () => {
+            const optionsSpy = vi.spyOn(yargsMock, 'options');
+            projectCreateCommand.builder(yargsMock);
+            const optionsCall = optionsSpy.mock.calls[0][0];
+            expect(optionsCall['project-base']).toEqual(expect.objectContaining({
+                describe: 'The top level component to include in the project.',
+                type: 'string',
+                choices: ['empty', 'app'],
+            }));
+        });
+        it('should define distribution option with correct choices', () => {
+            const optionsSpy = vi.spyOn(yargsMock, 'options');
+            projectCreateCommand.builder(yargsMock);
+            const optionsCall = optionsSpy.mock.calls[0][0];
+            expect(optionsCall.distribution).toEqual(expect.objectContaining({
+                describe: 'How the app will be distributed.',
+                type: 'string',
+                choices: ['private', 'marketplace'],
+            }));
+        });
+        it('should define auth option with correct choices', () => {
+            const optionsSpy = vi.spyOn(yargsMock, 'options');
+            projectCreateCommand.builder(yargsMock);
+            const optionsCall = optionsSpy.mock.calls[0][0];
+            expect(optionsCall.auth).toEqual(expect.objectContaining({
+                describe: 'Authentication model for the application.',
+                type: 'string',
+                choices: ['oauth', 'static'],
+            }));
+        });
+        it('should define features option as array', () => {
+            const optionsSpy = vi.spyOn(yargsMock, 'options');
+            projectCreateCommand.builder(yargsMock);
+            const optionsCall = optionsSpy.mock.calls[0][0];
+            expect(optionsCall.features).toEqual(expect.objectContaining({
+                describe: 'Features to include in the project. Only valid if project-base is app',
+                type: 'array',
+            }));
+        });
     });
 });

package/commands/project/__tests__/deploy.test.js

@@ -8,7 +8,7 @@ import * as ui from '../../../lib/ui/index.js';
 import { addAccountOptions, addConfigOptions, addJSONOutputOptions, addUseEnvironmentOptions, } from '../../../lib/commonOpts.js';
 import * as projectUtils from '../../../lib/projects/config.js';
 import * as projectUrlUtils from '../../../lib/projects/urls.js';
-import { pollDeployStatus } from '../../../lib/projects/buildAndDeploy.js';
+import { pollDeployStatus } from '../../../lib/projects/pollProjectBuildAndDeploy.js';
 import * as projectNamePrompt from '../../../lib/prompts/projectNamePrompt.js';
 import * as promptUtils from '../../../lib/prompts/promptUtils.js';
 import { trackCommandUsage } from '../../../lib/usageTracking.js';
@@ -23,7 +23,8 @@ vi.mock('../../../lib/commonOpts');
 vi.mock('../../../lib/validation');
 vi.mock('../../../lib/projects/config');
 vi.mock('../../../lib/projects/urls');
-vi.mock('../../../lib/projects/buildAndDeploy');
+vi.mock('../../../lib/projects/pollProjectBuildAndDeploy');
+vi.mock('../../../lib/projects/platformVersion');
 vi.mock('../../../lib/prompts/projectNamePrompt');
 vi.mock('../../../lib/prompts/promptUtils');
 vi.mock('../../../lib/usageTracking');
@@ -61,9 +62,6 @@ describe('commands/project/deploy', () => {
         });
     });
     describe('describe', () => {
-        it('should contain the beta tag', () => {
-            expect(projectDeployCommand.describe).toContain('[BETA]');
-        });
         it('should provide a description', () => {
             expect(projectDeployCommand.describe).toBeDefined();
         });

package/commands/project/__tests__/devUnifiedFlow.test.js

@@ -5,7 +5,8 @@ import { getConfigAccounts, getAccountConfig, } from '@hubspot/local-dev-lib/con
 import { getValidEnv } from '@hubspot/local-dev-lib/environment';
 import { logError } from '../../../lib/errorHandlers/index.js';
 import { ensureProjectExists } from '../../../lib/projects/ensureProjectExists.js';
-import { createInitialBuildForNewProject, createNewProjectForLocalDev, useExistingDevTestAccount, createDeveloperTestAccountForLocalDev, selectAccountTypePrompt, } from '../../../lib/projects/localDev/helpers.js';
+import { createInitialBuildForNewProject, createNewProjectForLocalDev, } from '../../../lib/projects/localDev/helpers/project.js';
+import { useExistingDevTestAccount, createDeveloperTestAccountForLocalDev, selectAccountTypePrompt, } from '../../../lib/projects/localDev/helpers/account.js';
 import { selectDeveloperTestTargetAccountPrompt, selectSandboxTargetAccountPrompt, } from '../../../lib/prompts/projectDevTargetAccountPrompt.js';
 import SpinniesManager from '../../../lib/ui/SpinniesManager.js';
 import LocalDevProcess from '../../../lib/projects/localDev/LocalDevProcess.js';
@@ -34,7 +35,8 @@ vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('@hubspot/local-dev-lib/environment');
 vi.mock('../../../lib/errorHandlers');
 vi.mock('../../../lib/projects/ensureProjectExists');
-vi.mock('../../../lib/projects/localDev/helpers');
+vi.mock('../../../lib/projects/localDev/helpers/project');
+vi.mock('../../../lib/projects/localDev/helpers/account');
 vi.mock('../../../lib/prompts/projectDevTargetAccountPrompt');
 vi.mock('../../../lib/ui/SpinniesManager');
 vi.mock('../../../lib/projects/localDev/LocalDevProcess');
@@ -322,8 +324,7 @@ describe('unifiedProjectDevFlow', () => {
             });
             expect(createNewProjectForLocalDev).not.toHaveBeenCalled();
             expect(LocalDevProcess).toHaveBeenCalledWith(expect.objectContaining({
-                projectId: mockProject.id,
-                projectName: mockProject.name,
+                projectData: mockProject,
             }));
         });
     });
@@ -344,8 +345,7 @@ describe('unifiedProjectDevFlow', () => {
                 targetTestingAccountId: mockProvidedTargetTestingAccountId,
                 projectConfig: mockProjectConfig,
                 projectDir: mockProjectDir,
-                projectName: mockProject.name,
-                projectId: mockProject.id,
+                projectData: mockProject,
                 env: ENVIRONMENTS.PROD,
             });
         });
@@ -378,17 +378,26 @@ describe('unifiedProjectDevFlow', () => {
         beforeEach(() => {
             isTestAccountOrSandbox.mockReturnValue(false);
         });
-        it('should display account type information when prompting', async () => {
-            selectAccountTypePrompt.mockResolvedValue(HUBSPOT_ACCOUNT_TYPES.STANDARD);
+        it('should log info message when default account is a sandbox or test account', async () => {
+            isTestAccountOrSandbox.mockReturnValue(true);
+            await unifiedProjectDevFlow({
+                args: mockArgs,
+                targetProjectAccountId: mockTargetProjectAccountId,
+                projectConfig: mockProjectConfig,
+                projectDir: mockProjectDir,
+            });
+            expect(uiLogger.log).toHaveBeenCalledWith(commands.project.dev.logs.defaultSandboxOrDevTestTestingAccountExplanation(mockTargetProjectAccountId));
+        });
+        it('should log info message when testingAccount flag is provided', async () => {
+            const providedTestingAccountId = 999;
             await unifiedProjectDevFlow({
                 args: mockArgs,
                 targetProjectAccountId: mockTargetProjectAccountId,
+                providedTargetTestingAccountId: providedTestingAccountId,
                 projectConfig: mockProjectConfig,
                 projectDir: mockProjectDir,
             });
-            expect(uiLine).toHaveBeenCalled();
-            expect(uiLogger.log).toHaveBeenCalledWith(commands.project.dev.logs.accountTypeInformation);
-            expect(uiLogger.log).toHaveBeenCalledWith(commands.project.dev.logs.learnMoreMessage);
+            expect(uiLogger.log).toHaveBeenCalledWith(commands.project.dev.logs.testingAccountFlagExplanation(providedTestingAccountId));
         });
     });
 });

package/commands/project/__tests__/logs.test.js

@@ -45,9 +45,6 @@ describe('commands/project/logs', () => {
         });
     });
     describe('describe', () => {
-        it('should contain the beta tag', () => {
-            expect(projectLogsCommand.describe).toContain('[BETA]');
-        });
         it('should provide a description', () => {
             expect(projectLogsCommand.describe).toBeDefined();
         });

package/commands/project/__tests__/migrate.test.js

@@ -44,7 +44,7 @@ describe('commands/project/migrate', () => {
     });
     describe('describe', () => {
         it('should provide a description', () => {
-            expect(migrateCommand.describe).toBe(undefined);
+            expect(migrateCommand.describe).toBeDefined();
         });
     });
     describe('builder', () => {
@@ -54,7 +54,6 @@ describe('commands/project/migrate', () => {
                 type: 'string',
                 choices: [v2025_2],
                 default: v2025_2,
-                hidden: true,
             });
             expect(optionsSpy).toHaveBeenCalledWith('unstable', {
                 type: 'boolean',

package/commands/project/__tests__/migrateApp.test.js

@@ -57,8 +57,7 @@ describe('commands/project/migrateApp', () => {
                 'platform-version': expect.objectContaining({
                     type: 'string',
                     choices: [v2023_2, v2025_2],
-                    hidden: true,
-                    default: v2023_2,
+                    default: v2025_2,
                 }),
             });
             expect(exampleSpy).toHaveBeenCalled();

package/commands/project/__tests__/profile.test.js

@@ -19,7 +19,7 @@ describe('commands/project', () => {
     });
     describe('describe', () => {
         it('should not provide a description', () => {
-            expect(profileCommand.describe).not.toBeDefined();
+            expect(profileCommand.describe).toBeDefined();
         });
     });
     describe('builder', () => {

package/commands/project/add.d.ts

@@ -1,5 +1,5 @@
 import { YargsCommandModule, CommonArgs } from '../../types/Yargs.js';
-type ProjectAddArgs = CommonArgs & {
+export type ProjectAddArgs = CommonArgs & {
     type?: string;
     name?: string;
     features?: string[];

package/commands/project/add.js

@@ -1,21 +1,18 @@
 import { logError } from '../../lib/errorHandlers/index.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { getProjectConfig } from '../../lib/projects/config.js';
-import { uiBetaTag } from '../../lib/ui/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { commands } from '../../lang/en.js';
-import { useV3Api } from '../../lib/projects/buildAndDeploy.js';
+import { useV3Api } from '../../lib/projects/platformVersion.js';
 import { legacyAddComponent } from '../../lib/projects/add/legacyAddComponent.js';
 import { v3AddComponent } from '../../lib/projects/add/v3AddComponent.js';
 import { marketplaceDistribution, oAuth, privateDistribution, staticAuth, } from '../../lib/constants.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 const command = 'add';
-const describe = uiBetaTag(commands.project.add.describe, false);
+const describe = commands.project.add.describe;
 async function handler(args) {
     try {
         const { derivedAccountId } = args;
-        trackCommandUsage('project-add', undefined, derivedAccountId);
         const { projectConfig, projectDir } = await getProjectConfig();
         if (!projectDir || !projectConfig) {
             uiLogger.error(commands.project.add.error.locationInProject);
@@ -23,10 +20,10 @@ async function handler(args) {
         }
         const isV3ProjectCreate = useV3Api(projectConfig.platformVersion);
         if (isV3ProjectCreate) {
-            await v3AddComponent(args, projectDir, projectConfig);
+            await v3AddComponent(args, projectDir, projectConfig, derivedAccountId);
         }
         else {
-            await legacyAddComponent(args, projectDir, projectConfig);
+            await legacyAddComponent(args, projectDir, projectConfig, derivedAccountId);
         }
     }
     catch (e) {
@@ -47,19 +44,16 @@ function projectAddBuilder(yargs) {
         },
         distribution: {
             describe: commands.project.add.options.distribution.describe,
-            hidden: true,
             type: 'string',
             choices: [privateDistribution, marketplaceDistribution],
         },
         auth: {
             describe: commands.project.add.options.auth.describe,
-            hidden: true,
             type: 'string',
             choices: [oAuth, staticAuth],
         },
         features: {
             describe: commands.project.add.options.features.describe,
-            hidden: true,
             type: 'array',
         },
     });

package/commands/project/create.js

@@ -7,7 +7,7 @@ import { writeProjectConfig, getProjectConfig, } from '../../lib/projects/config
 import { EMPTY_PROJECT_TEMPLATE_NAME } from '../../lib/projects/create/legacy.js';
 import { generateComponentPaths } from '../../lib/projects/create/v3.js';
 import { PROJECT_WITH_APP, EMPTY_PROJECT } from '../../lib/constants.js';
-import { uiBetaTag, uiFeatureHighlight } from '../../lib/ui/index.js';
+import { uiFeatureHighlight } from '../../lib/ui/index.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';
@@ -16,8 +16,10 @@ 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/src/lib/project.js';
+import { updateHsMetaFilesWithAutoGeneratedFields } from '../../lib/projects/components.js';
 const command = ['create', 'init'];
-const describe = uiBetaTag(commands.project.create.describe, false);
+const describe = commands.project.create.describe;
 const { v2023_2, v2025_1, v2025_2 } = PLATFORM_VERSIONS;
 async function handler(args) {
     const { derivedAccountId, platformVersion, templateSource } = args;
@@ -39,7 +41,7 @@ async function handler(args) {
         type: selectProjectTemplatePromptResponse.projectTemplate?.name ||
             (selectProjectTemplatePromptResponse.componentTemplates || [])
                 // @ts-expect-error
-                .map((item) => item.label)
+                .map((item) => item.type)
                 .join(','),
     }, derivedAccountId);
     const projectDest = path.resolve(getCwd(), projectNameAndDestPromptResponse.dest);
@@ -73,10 +75,13 @@ async function handler(args) {
     }
     const projectConfigPath = path.join(projectDest, PROJECT_CONFIG_FILE);
     const parsedConfigFile = JSON.parse(fs.readFileSync(projectConfigPath).toString());
+    const projectName = projectNameAndDestPromptResponse.name;
     writeProjectConfig(projectConfigPath, {
         ...parsedConfigFile,
-        name: projectNameAndDestPromptResponse.name,
+        name: projectName,
     });
+    const projectMetadata = await getProjectMetadata(path.join(projectDest, parsedConfigFile.srcDir));
+    updateHsMetaFilesWithAutoGeneratedFields(projectName, projectMetadata.hsMetaFiles);
     // If the template is 'no-template', we need to manually create a src directory
     if (selectProjectTemplatePromptResponse.projectTemplate?.name ===
         EMPTY_PROJECT_TEMPLATE_NAME ||
@@ -107,7 +112,6 @@ function projectCreateBuilder(yargs) {
             type: 'string',
         },
         template: {
-            // TODO: When we release 2025.2 scaffolding, we need to point out this is only valid for 2025.1 prior
             describe: commands.project.create.options.template.describe,
             type: 'string',
         },
@@ -117,32 +121,27 @@ function projectCreateBuilder(yargs) {
         },
         'platform-version': {
             describe: commands.project.create.options.platformVersion.describe,
-            hidden: true,
             type: 'string',
             choices: [v2023_2, v2025_1, v2025_2],
-            default: v2023_2,
+            default: v2025_2,
         },
         'project-base': {
             describe: commands.project.create.options.projectBase.describe,
-            hidden: true,
             type: 'string',
             choices: [EMPTY_PROJECT, PROJECT_WITH_APP],
         },
         distribution: {
             describe: commands.project.create.options.distribution.describe,
-            hidden: true,
             type: 'string',
             choices: [privateDistribution, marketplaceDistribution],
         },
         auth: {
             describe: commands.project.create.options.auth.describe,
-            hidden: true,
             type: 'string',
             choices: [oAuth, staticAuth],
         },
         features: {
             describe: commands.project.create.options.features.describe,
-            hidden: true,
             type: 'array',
         },
     });

package/commands/project/deploy.js

@@ -1,66 +1,22 @@
-import { deployProject, fetchProject, } from '@hubspot/local-dev-lib/api/projects';
+import { fetchProject } from '@hubspot/local-dev-lib/api/projects';
 import { getAccountConfig } from '@hubspot/local-dev-lib/config';
 import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
-import { useV3Api } from '../../lib/projects/buildAndDeploy.js';
+import { useV3Api } from '../../lib/projects/platformVersion.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
 import { getProjectConfig } from '../../lib/projects/config.js';
-import { pollDeployStatus } from '../../lib/projects/buildAndDeploy.js';
 import { projectNamePrompt } from '../../lib/prompts/projectNamePrompt.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
-import { uiBetaTag, uiLine } from '../../lib/ui/index.js';
+import { uiLine } from '../../lib/ui/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { loadProfile, logProfileFooter, logProfileHeader, exitIfUsingProfiles, } from '../../lib/projectProfiles.js';
-import { PROJECT_ERROR_TYPES, PROJECT_DEPLOY_TEXT, } from '../../lib/constants.js';
+import { PROJECT_DEPLOY_TEXT } from '../../lib/constants.js';
 import { commands } from '../../lang/en.js';
+import { handleProjectDeploy, validateBuildIdForDeploy, logDeployErrors, } from '../../lib/projects/deploy.js';
 const command = 'deploy';
-const describe = uiBetaTag(commands.project.deploy.describe, false);
-function validateBuildId(buildId, deployedBuildId, latestBuildId, projectName, accountId) {
-    if (Number(buildId) > latestBuildId) {
-        return commands.project.deploy.errors.buildIdDoesNotExist(accountId, buildId, projectName);
-    }
-    if (Number(buildId) === deployedBuildId) {
-        return commands.project.deploy.errors.buildAlreadyDeployed(accountId, buildId, projectName);
-    }
-    return true;
-}
-function logDeployErrors(errorData) {
-    uiLogger.error(errorData.message);
-    errorData.errors.forEach(err => {
-        // This is how the pre-deploy check manifests itself in < 2025.2 projects
-        if (err.subCategory === PROJECT_ERROR_TYPES.DEPLOY_CONTAINS_REMOVALS) {
-            uiLogger.log(commands.project.deploy.errors.deployContainsRemovals(err.context.COMPONENT_NAME));
-        }
-        else {
-            uiLogger.log(err.message);
-        }
-    });
-}
-function handleBlockedDeploy(deployResp) {
-    const deployCanBeForced = deployResp.issues.every(issue => issue.blockingMessages.every(message => message.isWarning));
-    uiLogger.log('');
-    if (deployCanBeForced) {
-        uiLogger.warn(commands.project.deploy.errors.deployWarningsHeader);
-        uiLogger.log('');
-    }
-    else {
-        uiLogger.error(commands.project.deploy.errors.deployBlockedHeader);
-        uiLogger.log('');
-    }
-    deployResp.issues.forEach(issue => {
-        if (issue.blockingMessages.length > 0) {
-            issue.blockingMessages.forEach(message => {
-                uiLogger.log(commands.project.deploy.errors.deployIssueComponentWarning(issue.uid, issue.componentTypeName, message.message));
-            });
-        }
-        else {
-            uiLogger.log(commands.project.deploy.errors.deployIssueComponentGeneric(issue.uid, issue.componentTypeName));
-        }
-        uiLogger.log('');
-    });
-}
+const describe = commands.project.deploy.describe;
 async function handler(args) {
     const { derivedAccountId, project: projectOption, buildId: buildIdOption, force: forceOption, deployLatestBuild: deployLatestBuildOption, json: formatOutputAsJson, } = args;
     const accountConfig = getAccountConfig(derivedAccountId);
@@ -105,7 +61,7 @@ async function handler(args) {
             return process.exit(EXIT_CODES.ERROR);
         }
         if (buildIdToDeploy) {
-            const validationResult = validateBuildId(buildIdToDeploy, deployedBuildId, latestBuild.buildId, projectName, targetAccountId);
+            const validationResult = validateBuildIdForDeploy(buildIdToDeploy, deployedBuildId, latestBuild.buildId, projectName, targetAccountId);
             if (validationResult !== true) {
                 uiLogger.error(validationResult.toString());
                 return process.exit(EXIT_CODES.ERROR);
@@ -122,7 +78,7 @@ async function handler(args) {
                     default: latestBuild.buildId === deployedBuildId
                         ? undefined
                         : latestBuild.buildId,
-                    validate: buildId => validateBuildId(buildId, deployedBuildId, latestBuild.buildId, projectName, targetAccountId),
+                    validate: buildId => validateBuildIdForDeploy(buildId, deployedBuildId, latestBuild.buildId, projectName, targetAccountId),
                 });
                 buildIdToDeploy = deployBuildIdPromptResponse.buildId;
             }
@@ -131,21 +87,13 @@ async function handler(args) {
             uiLogger.error(commands.project.deploy.errors.noBuildId);
             return process.exit(EXIT_CODES.ERROR);
         }
-        const { data: deployResp } = await deployProject(targetAccountId, projectName, buildIdToDeploy, useV3Api(projectConfig?.platformVersion), forceOption);
-        if (!deployResp || deployResp.buildResultType !== 'DEPLOY_QUEUED') {
-            if (deployResp?.buildResultType === 'DEPLOY_BLOCKED') {
-                handleBlockedDeploy(deployResp);
-                process.exit(EXIT_CODES.ERROR);
-            }
-            else {
-                uiLogger.error(commands.project.deploy.errors.deploy);
-            }
+        const deployResult = await handleProjectDeploy(targetAccountId, projectName, buildIdToDeploy, useV3Api(projectConfig?.platformVersion), forceOption);
+        if (!deployResult) {
             return process.exit(EXIT_CODES.ERROR);
         }
         else if (formatOutputAsJson) {
-            jsonOutput.deployId = Number(deployResp.id);
+            jsonOutput.deployId = deployResult.deployId;
         }
-        const deployResult = await pollDeployStatus(targetAccountId, projectName, Number(deployResp.id), buildIdToDeploy);
         if (deployResult.status === PROJECT_DEPLOY_TEXT.STATES.SUCCESS) {
             deploySuccess = true;
         }

package/commands/project/dev/deprecatedFlow.js

@@ -8,7 +8,8 @@ import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { uiCommandReference } from '../../../lib/ui/index.js';
 import SpinniesManager from '../../../lib/ui/SpinniesManager.js';
 import LocalDevManager from '../../../lib/projects/localDev/LocalDevManager.js';
-import { confirmDefaultAccountIsTarget, suggestRecommendedNestedAccount, checkIfAccountFlagIsSupported, checkIfDefaultAccountIsSupported, createSandboxForLocalDev, createDeveloperTestAccountForLocalDev, createNewProjectForLocalDev, createInitialBuildForNewProject, useExistingDevTestAccount, checkIfParentAccountIsAuthed, hasSandboxes, } from '../../../lib/projects/localDev/helpers.js';
+import { confirmDefaultAccountIsTarget, suggestRecommendedNestedAccount, checkIfAccountFlagIsSupported, checkIfDefaultAccountIsSupported, createSandboxForLocalDev, createDeveloperTestAccountForLocalDev, useExistingDevTestAccount, checkIfParentAccountIsAuthed, hasSandboxes, } from '../../../lib/projects/localDev/helpers/account.js';
+import { createInitialBuildForNewProject, createNewProjectForLocalDev, } from '../../../lib/projects/localDev/helpers/project.js';
 import { handleExit } from '../../../lib/process.js';
 import { isSandbox, isDeveloperTestAccount, } from '../../../lib/accountTypes.js';
 import { ensureProjectExists } from '../../../lib/projects/ensureProjectExists.js';