@hubspot/cli 7.6.0-beta.11 → 7.6.0-beta.13

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

@@ -10,6 +10,7 @@ vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('@hubspot/local-dev-lib/logger');
 vi.mock('../../../lib/app/migrate');
 vi.mock('../../../lib/app/migrate_legacy');
+vi.mock('../../../lib/projects/config.js');
 const mockYargs = yargs;
 const mockedGetAccountConfig = getAccountConfig;
 const mockedMigrateApp2023_2 = migrateApp2023_2;

package/commands/getStarted.js

@@ -16,7 +16,8 @@ import { handleProjectUpload } from '../lib/projects/upload.js';
 import { PROJECT_CONFIG_FILE, GET_STARTED_OPTIONS, HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, } from '../lib/constants.js';
 import { writeProjectConfig, getProjectConfig, validateProjectConfig, } from '../lib/projects/config.js';
 import { getProjectPackageJsonLocations, installPackages, } from '../lib/dependencyManagement.js';
-import { pollProjectBuildAndDeploy, useV3Api, } from '../lib/projects/buildAndDeploy.js';
+import { pollProjectBuildAndDeploy } from '../lib/projects/pollProjectBuildAndDeploy.js';
+import { useV3Api } from '../lib/projects/platformVersion.js';
 import { openLink } from '../lib/links.js';
 import { getStaticAuthAppInstallUrl } from '../lib/app/urls.js';
 import { getEnv } from '@hubspot/local-dev-lib/config';
@@ -28,10 +29,10 @@ async function handler(args) {
     const { derivedAccountId } = args;
     const env = getEnv(derivedAccountId) === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD;
     await trackCommandUsage('get-started', {}, derivedAccountId);
-    // TODO: Put this in constants.ts once we have a defined place for the template before INBOUND
-    const templateSource = 'robrown-hubspot/hubspot-project-components-ua-app-objects-beta';
+    const accountName = uiAccountDescription(derivedAccountId);
     uiInfoSection(commands.getStarted.startTitle, () => {
         uiLogger.log(commands.getStarted.startDescription);
+        uiLogger.log(commands.getStarted.guideOverview(accountName));
     });
     const { default: selectedOption } = await promptUser([
         {
@@ -80,16 +81,7 @@ async function handler(args) {
     else {
         uiLogger.log(' ');
         uiLogger.log(commands.getStarted.logs.appSelected);
-        // 1. Fetch project templates
-        let latestRepoReleaseTag;
         const { dest, name } = await projectNameAndDestPrompt(args);
-        // Specific template for get-started command
-        const projectTemplate = {
-            name: 'private-app-get-started-template',
-            label: 'CRM getting started project with private apps',
-            path: 'projects/private-app-get-started-template',
-        };
-        // 3. Create the project files
         const projectDest = path.resolve(getCwd(), dest);
         const { projectConfig: existingProjectConfig, projectDir: existingProjectDir, } = await getProjectConfig(projectDest);
         if (existingProjectConfig &&
@@ -104,13 +96,10 @@ async function handler(args) {
             uiLogger.error(commands.project.create.errors.cannotNestProjects(existingProjectDir));
             process.exit(EXIT_CODES.ERROR);
         }
-        const repo = templateSource || HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH;
         // 4. Clone the project template from GitHub
-        // This is temporary until we have the UA template in the main repo
         try {
-            await cloneGithubRepo(repo, projectDest, {
-                sourceDir: projectTemplate.path,
-                tag: latestRepoReleaseTag,
+            await cloneGithubRepo(HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, projectDest, {
+                sourceDir: '2025.2/private-app-get-started-template',
                 hideLogs: true,
             });
             await trackCommandMetadataUsage('get-started', {
@@ -163,7 +152,6 @@ async function handler(args) {
             uiLogger.log(' ');
         }
         // 6. Ask user if they want to upload the project
-        const accountName = uiAccountDescription(derivedAccountId);
         const { shouldUpload } = await promptUser([
             {
                 type: 'confirm',
@@ -192,12 +180,11 @@ async function handler(args) {
                     process.exit(EXIT_CODES.ERROR);
                 }
                 validateProjectConfig(newProjectConfig, newProjectDir);
-                const targetAccountId = derivedAccountId;
                 uiLogger.log(' ');
                 uiLogger.log(commands.getStarted.logs.uploadingProject);
                 uiLogger.log(' ');
                 const { result, uploadError } = await handleProjectUpload({
-                    accountId: targetAccountId,
+                    accountId: derivedAccountId,
                     projectConfig: newProjectConfig,
                     projectDir: newProjectDir,
                     callbackFunc: pollProjectBuildAndDeploy,

package/commands/mcp/setup.d.ts

@@ -1,7 +1,6 @@
 import { CommonArgs, YargsCommandModule } from '../../types/Yargs.js';
 interface MCPSetupArgs extends CommonArgs {
     client?: string[];
-    addDocsSearch?: boolean;
 }
 declare const mcpSetupCommand: YargsCommandModule<unknown, MCPSetupArgs>;
 export default mcpSetupCommand;

package/commands/mcp/setup.js

@@ -2,11 +2,19 @@ import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
-import { addMcpServerToConfig, addMintlifyMcpServer, supportedTools, } from '../../lib/mcp/setup.js';
+import { addMcpServerToConfig, supportedTools } from '../../lib/mcp/setup.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
+import { hasFeature } from '../../lib/hasFeature.js';
+import { FEATURES } from '../../lib/constants.js';
 const command = ['setup', 'update'];
 const describe = undefined; // Leave hidden for now
 async function handler(args) {
+    const { derivedAccountId } = args;
+    const hasMcpAccess = await hasFeature(derivedAccountId, FEATURES.MCP_ACCESS);
+    if (!hasMcpAccess) {
+        uiLogger.error(commands.mcp.setup.errors.needsMcpAccess(derivedAccountId));
+        process.exit(EXIT_CODES.ERROR);
+    }
     try {
         await import('@modelcontextprotocol/sdk/server/mcp.js');
     }
@@ -16,10 +24,7 @@ async function handler(args) {
     }
     trackCommandUsage('mcp-setup', {}, args.derivedAccountId);
     try {
-        const derivedTargets = await addMcpServerToConfig(args.client);
-        if (args.addDocsSearch) {
-            await addMintlifyMcpServer(derivedTargets);
-        }
+        await addMcpServerToConfig(args.client);
     }
     catch (e) {
         process.exit(EXIT_CODES.ERROR);
@@ -27,15 +32,10 @@ async function handler(args) {
     process.exit(EXIT_CODES.SUCCESS);
 }
 function setupBuilder(yargs) {
-    yargs
-        .option('client', {
+    yargs.option('client', {
         describe: commands.mcp.setup.args.client,
         type: 'array',
         choices: [...supportedTools.map(tool => tool.value)],
-    })
-        .option('add-docs-search', {
-        type: 'boolean',
-        hidden: true,
     });
     return yargs;
 }

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({
+                hidden: true,
+                type: 'string',
+                choices: ['2023.2', '2025.1', '2025.2'],
+                default: '2023.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({
+                hidden: true,
+                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({
+                hidden: true,
+                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({
+                hidden: true,
+                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({
+                hidden: true,
+                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');

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,11 +1,10 @@
 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';
@@ -15,7 +14,6 @@ const describe = uiBetaTag(commands.project.add.describe, false);
 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 +21,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) {

package/commands/project/create.js

@@ -16,6 +16,8 @@ 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 { v2023_2, v2025_1, v2025_2 } = PLATFORM_VERSIONS;
@@ -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 ||

package/commands/project/deploy.js

@@ -1,11 +1,10 @@
-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';
@@ -13,54 +12,11 @@ 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('');
-    });
-}
 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/index.js

@@ -5,7 +5,7 @@ import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { uiBetaTag, uiLine } from '../../../lib/ui/index.js';
 import { deprecatedProjectDevFlow } from './deprecatedFlow.js';
 import { unifiedProjectDevFlow } from './unifiedFlow.js';
-import { useV3Api } from '../../../lib/projects/buildAndDeploy.js';
+import { useV3Api } from '../../../lib/projects/platformVersion.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { loadProfile, exitIfUsingProfiles, } from '../../../lib/projectProfiles.js';
 import { commands } from '../../../lang/en.js';

package/commands/project/dev/unifiedFlow.js

@@ -22,6 +22,7 @@ import LocalDevWebsocketServer from '../../../lib/projects/localDev/LocalDevWebs
 export async function unifiedProjectDevFlow({ args, targetProjectAccountId, providedTargetTestingAccountId, projectConfig, projectDir, }) {
     const env = getValidEnv(getEnv(targetProjectAccountId));
     let projectNodes;
+    let projectProfileData;
     // Get IR
     try {
         const intermediateRepresentation = await translateForLocalDev({
@@ -30,6 +31,7 @@ export async function unifiedProjectDevFlow({ args, targetProjectAccountId, prov
             accountId: targetProjectAccountId,
         }, { profile: args.profile });
         projectNodes = intermediateRepresentation.intermediateNodesIndexedByUid;
+        projectProfileData = intermediateRepresentation.profileData;
         uiLogger.debug(util.inspect(projectNodes, false, null, true));
     }
     catch (e) {
@@ -107,7 +109,7 @@ export async function unifiedProjectDevFlow({ args, targetProjectAccountId, prov
     let project = uploadedProject;
     SpinniesManager.init();
     if (projectExists && project) {
-        await compareLocalProjectToDeployed(projectConfig, targetProjectAccountId, project.deployedBuild?.buildId, projectNodes);
+        await compareLocalProjectToDeployed(projectConfig, targetProjectAccountId, project.deployedBuild?.buildId, projectNodes, args.profile);
     }
     else {
         project = await createNewProjectForLocalDev(projectConfig, targetProjectAccountId, false, false);
@@ -116,6 +118,7 @@ export async function unifiedProjectDevFlow({ args, targetProjectAccountId, prov
     // End setup, start local dev process
     const localDevProcess = new LocalDevProcess({
         initialProjectNodes: projectNodes,
+        initialProjectProfileData: projectProfileData,
         debug: args.debug,
         profile: args.profile,
         targetProjectAccountId,

package/commands/project/migrate.js

@@ -8,6 +8,9 @@ import { uiCommandReference } from '../../lib/ui/index.js';
 import { commands, lib } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { logInBox } from '../../lib/ui/boxen.js';
+import { getHasMigratableThemes, migrateThemes2025_2, } from '../../lib/theme/migrate.js';
+import { hasFeature } from '../../lib/hasFeature.js';
+import { FEATURES } from '../../lib/constants.js';
 const { v2025_2 } = PLATFORM_VERSIONS;
 const command = 'migrate';
 const describe = undefined; // commands.project.migrate.describe
@@ -26,13 +29,29 @@ 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) {
         logError(error);

package/commands/project/upload.js

@@ -2,14 +2,14 @@ import chalk from 'chalk';
 import { logger } from '@hubspot/local-dev-lib/logger';
 import { getAccountConfig } from '@hubspot/local-dev-lib/config';
 import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
-import { useV3Api } from '../../lib/projects/buildAndDeploy.js';
+import { useV3Api } from '../../lib/projects/platformVersion.js';
 import { uiBetaTag, uiCommandReference } from '../../lib/ui/index.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/buildAndDeploy.js';
+import { displayWarnLogs, pollProjectBuildAndDeploy, } from '../../lib/projects/pollProjectBuildAndDeploy.js';
 import { i18n } from '../../lib/lang.js';
 import { PROJECT_ERROR_TYPES } from '../../lib/constants.js';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';

package/commands/project/validate.js

@@ -1,6 +1,6 @@
 import path from 'path';
 import { getAccountConfig } from '@hubspot/local-dev-lib/config';
-import { useV3Api } from '../../lib/projects/buildAndDeploy.js';
+import { useV3Api } 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';

package/commands/project/watch.js

@@ -1,6 +1,6 @@
 import { cancelStagedBuild, fetchProjectBuilds, } from '@hubspot/local-dev-lib/api/projects';
 import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
-import { useV3Api } from '../../lib/projects/buildAndDeploy.js';
+import { useV3Api } from '../../lib/projects/platformVersion.js';
 import { uiCommandReference, uiLink, uiBetaTag } from '../../lib/ui/index.js';
 import { i18n } from '../../lib/lang.js';
 import { createWatcher } from '../../lib/projects/watch.js';
@@ -11,7 +11,7 @@ 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 { pollBuildStatus, pollDeployStatus, } from '../../lib/projects/buildAndDeploy.js';
+import { pollBuildStatus, pollDeployStatus, } from '../../lib/projects/pollProjectBuildAndDeploy.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { handleKeypress, handleExit } from '../../lib/process.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';