@hubspot/cli 7.7.32-experimental.0 → 7.7.34-experimental.0

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

@@ -0,0 +1,47 @@
+import yargs from 'yargs';
+import { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, addGlobalOptions, addJSONOutputOptions, } from '../../../lib/commonOpts.js';
+import installCommand from '../install.js';
+vi.mock('../../../lib/commonOpts');
+describe('commands/app/install', () => {
+    const yargsMock = yargs;
+    describe('command', () => {
+        it('should have the correct command structure', () => {
+            expect(installCommand.command).toEqual('install <test-account-id>');
+        });
+    });
+    describe('describe', () => {
+        it('should provide a description', () => {
+            expect(installCommand.describe).not.toBeDefined();
+        });
+    });
+    describe('builder', () => {
+        it('should support the correct options', () => {
+            installCommand.builder(yargsMock);
+            expect(addGlobalOptions).toHaveBeenCalledTimes(1);
+            expect(addGlobalOptions).toHaveBeenCalledWith(yargsMock);
+            expect(addAccountOptions).toHaveBeenCalledTimes(1);
+            expect(addAccountOptions).toHaveBeenCalledWith(yargsMock);
+            expect(addConfigOptions).toHaveBeenCalledTimes(1);
+            expect(addConfigOptions).toHaveBeenCalledWith(yargsMock);
+            expect(addUseEnvironmentOptions).toHaveBeenCalledTimes(1);
+            expect(addUseEnvironmentOptions).toHaveBeenCalledWith(yargsMock);
+            expect(addJSONOutputOptions).toHaveBeenCalledTimes(1);
+            expect(addJSONOutputOptions).toHaveBeenCalledWith(yargsMock);
+            expect(yargsMock.positional).toHaveBeenCalledTimes(1);
+            expect(yargsMock.positional).toHaveBeenCalledWith('test-account-id', expect.objectContaining({
+                type: 'number',
+                required: true,
+                describe: expect.any(String),
+            }));
+            expect(yargsMock.option).toHaveBeenCalledTimes(2);
+            expect(yargsMock.option).toHaveBeenCalledWith('app-uid', expect.objectContaining({
+                type: 'string',
+                describe: expect.any(String),
+            }));
+            expect(yargsMock.option).toHaveBeenCalledWith('project-name', expect.objectContaining({
+                type: 'string',
+                describe: expect.any(String),
+            }));
+        });
+    });
+});

package/commands/app/install.d.ts

@@ -0,0 +1,8 @@
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule, JSONOutputArgs } from '../../types/Yargs.js';
+type InstallAppArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & JSONOutputArgs & {
+    appUid?: string;
+    projectName?: string;
+    testAccountId: number;
+};
+declare const installAppCommand: YargsCommandModule<unknown, InstallAppArgs>;
+export default installAppCommand;

package/commands/app/install.js

@@ -0,0 +1,122 @@
+import { fetchDeveloperTestAccountOauthAppInstallStatus, installOauthAppIntoDeveloperTestAccount, } from '@hubspot/local-dev-lib/api/developerTestAccounts';
+import { trackCommandUsage } from '../../lib/usageTracking.js';
+import { commands } from '../../lang/en.js';
+import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { APP_AUTH_TYPES } from '../../lib/constants.js';
+import { uiLogger } from '../../lib/ui/logger.js';
+import SpinniesManager from '../../lib/ui/SpinniesManager.js';
+import { poll } from '../../lib/polling.js';
+import { getProjectConfig, validateProjectConfig, } from '../../lib/projects/config.js';
+import { handleTranslate } from '../../lib/projects/upload.js';
+import { isAppIRNode } from '../../lib/projects/structure.js';
+import { logError } from '../../lib/errorHandlers/index.js';
+const command = 'install <test-account-id>';
+const describe = undefined; // commands.app.subcommands.install.describe;
+async function handler(args) {
+    const { derivedAccountId, appUid, projectName, testAccountId, formatOutputAsJson, } = args;
+    trackCommandUsage('app-install', {}, derivedAccountId);
+    const jsonOutput = {};
+    let targetProjectName = projectName;
+    let targetAppUid = appUid;
+    const { projectConfig, projectDir } = await getProjectConfig();
+    if (!targetProjectName) {
+        validateProjectConfig(projectConfig, projectDir);
+        targetProjectName = projectConfig?.name;
+    }
+    if (!targetProjectName) {
+        uiLogger.error(commands.app.subcommands.install.errors.mustSpecifyProjectName);
+        process.exit(EXIT_CODES.ERROR);
+    }
+    let isAppOauth = true;
+    if (!targetAppUid) {
+        const intermediateRepresentation = await handleTranslate(projectDir, projectConfig, derivedAccountId, true, undefined);
+        if (intermediateRepresentation) {
+            Object.values(intermediateRepresentation.intermediateNodesIndexedByUid).forEach(node => {
+                if (isAppIRNode(node)) {
+                    targetAppUid = node.uid;
+                    isAppOauth = node.config.auth.type === APP_AUTH_TYPES.OAUTH;
+                }
+            });
+        }
+    }
+    if (!targetAppUid) {
+        uiLogger.error(commands.app.subcommands.install.errors.noAppUidFound);
+        process.exit(EXIT_CODES.ERROR);
+    }
+    if (!isAppOauth) {
+        uiLogger.error(commands.app.subcommands.install.errors.appMustBeOauth);
+        process.exit(EXIT_CODES.ERROR);
+    }
+    try {
+        const { data } = await installOauthAppIntoDeveloperTestAccount(derivedAccountId, testAccountId, targetProjectName, targetAppUid);
+        if (data?.authCodes.length > 0) {
+            jsonOutput.authCode = data.authCodes[0].authCode;
+        }
+    }
+    catch (err) {
+        logError(err);
+        process.exit(EXIT_CODES.ERROR);
+    }
+    SpinniesManager.init({
+        succeedColor: 'white',
+    });
+    SpinniesManager.add('installApp', {
+        text: commands.app.subcommands.install.polling.start,
+    });
+    let appInstallSucceeded = false;
+    try {
+        await poll(() => fetchDeveloperTestAccountOauthAppInstallStatus(derivedAccountId, targetProjectName, targetAppUid), {
+            successStates: ['SUCCESS'],
+            errorStates: [],
+        });
+        appInstallSucceeded = true;
+    }
+    catch (err) {
+        SpinniesManager.fail('installApp');
+        logError(err);
+        process.exit(EXIT_CODES.ERROR);
+    }
+    if (!appInstallSucceeded) {
+        SpinniesManager.fail('installApp');
+        process.exit(EXIT_CODES.ERROR);
+    }
+    SpinniesManager.succeed('installApp', {
+        text: commands.app.subcommands.install.polling.success,
+    });
+    if (formatOutputAsJson) {
+        uiLogger.json(jsonOutput);
+    }
+    process.exit(EXIT_CODES.SUCCESS);
+}
+function installAppBuilder(yargs) {
+    yargs.positional('test-account-id', {
+        describe: commands.app.subcommands.install.positionals.testAccountId,
+        required: true,
+        type: 'number',
+    });
+    yargs.option('app-uid', {
+        describe: commands.app.subcommands.install.options.appUid,
+        type: 'string',
+    });
+    yargs.option('project-name', {
+        describe: commands.app.subcommands.install.options.projectName,
+        type: 'string',
+    });
+    yargs.example('install 1234567890 --app-uid=my-app-uid --project-name=my-project', commands.app.subcommands.install.example);
+    return yargs;
+}
+const builder = makeYargsBuilder(installAppBuilder, command, commands.app.subcommands.install.describe, {
+    useGlobalOptions: true,
+    useAccountOptions: true,
+    useConfigOptions: true,
+    useEnvironmentOptions: true,
+    useJSONOutputOptions: true,
+});
+const installAppCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+export default installAppCommand;

package/commands/app.js

@@ -1,11 +1,16 @@
 import migrateCommand from './app/migrate.js';
 import appSecretCommand from './app/secret.js';
+import installAppCommand from './app/install.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 const command = ['app', 'apps'];
 // Keep the command hidden for now
 const describe = undefined;
 function appBuilder(yargs) {
-    yargs.command(migrateCommand).command(appSecretCommand).demandCommand(1, '');
+    yargs
+        .command(migrateCommand)
+        .command(appSecretCommand)
+        .command(installAppCommand)
+        .demandCommand(1, '');
     return yargs;
 }
 const builder = makeYargsBuilder(appBuilder, command, describe);

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/project/__tests__/add.test.js

@@ -4,13 +4,13 @@ import { marketplaceDistribution, oAuth, privateDistribution, staticAuth, } from
 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/buildAndDeploy.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/buildAndDeploy');
+vi.mock('../../../lib/projects/platformVersion');
 vi.mock('../../../lib/usageTracking');
 const mockedV3AddComponent = vi.mocked(v3AddComponent);
 const mockedLegacyAddComponent = vi.mocked(legacyAddComponent);
@@ -82,15 +82,13 @@ describe('commands/project/add', () => {
         it('should call v3AddComponent with accountId for v3 projects', async () => {
             mockedUseV3Api.mockReturnValue(true);
             await expect(projectAddCommand.handler(mockArgs)).rejects.toThrow('process.exit called');
-            expect(mockedTrackCommandUsage).toHaveBeenCalledWith('project-add', undefined, 123);
             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(mockedTrackCommandUsage).toHaveBeenCalledWith('project-add', undefined, 123);
-            expect(mockedLegacyAddComponent).toHaveBeenCalledWith(mockArgs, mockProjectDir, mockProjectConfig);
+            expect(mockedLegacyAddComponent).toHaveBeenCalledWith(mockArgs, mockProjectDir, mockProjectConfig, 123);
             expect(mockedV3AddComponent).not.toHaveBeenCalled();
         });
         it('should exit with error when project config is not found', async () => {

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.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);
@@ -26,7 +24,7 @@ async function handler(args) {
             await v3AddComponent(args, projectDir, projectConfig, derivedAccountId);
         }
         else {
-            await legacyAddComponent(args, projectDir, projectConfig);
+            await legacyAddComponent(args, projectDir, projectConfig, derivedAccountId);
         }
     }
     catch (e) {

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/upload.d.ts

@@ -1,5 +1,5 @@
-import { CommonArgs, JSONOutputArgs, YargsCommandModule } from '../../types/Yargs.js';
-type ProjectUploadArgs = CommonArgs & JSONOutputArgs & {
+import { CommonArgs, EnvironmentArgs, JSONOutputArgs, YargsCommandModule } from '../../types/Yargs.js';
+type ProjectUploadArgs = CommonArgs & JSONOutputArgs & EnvironmentArgs & {
     forceCreate: boolean;
     message: string;
     m: string;

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';
@@ -25,7 +25,7 @@ async function handler(args) {
     validateProjectConfig(projectConfig, projectDir);
     let targetAccountId;
     if (useV3Api(projectConfig.platformVersion)) {
-        targetAccountId = await loadAndValidateProfile(projectConfig, projectDir, profile);
+        targetAccountId = await loadAndValidateProfile(projectConfig, projectDir, profile, args.useEnv);
     }
     targetAccountId = targetAccountId || derivedAccountId;
     const accountConfig = getAccountConfig(targetAccountId);

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';

package/commands/testAccount/create.js

@@ -75,6 +75,9 @@ async function handler(args) {
         resultJson.personalAccessKey = createResult.personalAccessKey;
     }
     catch (err) {
+        SpinniesManager.fail('createTestAccount', {
+            text: commands.testAccount.create.polling.createFailure,
+        });
         logError(err);
         SpinniesManager.fail('createTestAccount', {
             text: commands.testAccount.create.polling.createFailure,