@hubspot/cli 8.2.0 → 8.2.1-experimental.0

package/commands/project/deploy.js

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

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

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

package/commands/project/dev/index.js

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

package/commands/project/dev/unifiedFlow.js

@@ -3,13 +3,14 @@ import util from 'util';
 import { HUBSPOT_ACCOUNT_TYPES } from '@hubspot/local-dev-lib/constants/config';
 import { startPortManagerServer, stopPortManagerServer, } from '@hubspot/local-dev-lib/portManager';
 import { isTranslationError, translateForLocalDev, } from '@hubspot/project-parsing-lib/translate';
-import { getConfigAccountEnvironment, getAllConfigAccounts, getConfigAccountById, } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountEnvironment, getLinkedOrAllConfigAccounts, getConfigAccountById, getConfigAccountIfExists, } from '@hubspot/local-dev-lib/config';
 import { logError } from '../../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
+import { warnAboutSkippedHsMetaFiles } from '../../../lib/projects/ui.js';
 import { ensureProjectExists } from '../../../lib/projects/ensureProjectExists.js';
 import { createInitialBuildForNewProject, createNewProjectForLocalDev, compareLocalProjectToDeployed, checkAndInstallDependencies, } from '../../../lib/projects/localDev/helpers/project.js';
 import { useExistingDevTestAccount, createDeveloperTestAccountForLocalDev, selectAccountTypePrompt, createSandboxForLocalDev, } from '../../../lib/projects/localDev/helpers/account.js';
-import { selectDeveloperTestTargetAccountPrompt, selectSandboxTargetAccountPrompt, } from '../../../lib/prompts/projectDevTargetAccountPrompt.js';
+import { selectDeveloperTestTargetAccountPrompt, selectSandboxTargetAccountPrompt, confirmLinkExistingDeveloperTestAccountPrompt, } from '../../../lib/prompts/projectDevTargetAccountPrompt.js';
 import LocalDevProcess from '../../../lib/projects/localDev/LocalDevProcess.js';
 import LocalDevWatcher from '../../../lib/projects/localDev/LocalDevWatcher.js';
 import { handleExit, handleKeypress } from '../../../lib/process.js';
@@ -17,15 +18,21 @@ import { isTestAccountOrSandbox, isUnifiedAccount, } from '../../../lib/accountT
 import { uiLogger } from '../../../lib/ui/logger.js';
 import { commands } from '../../../lang/en.js';
 import LocalDevWebsocketServer from '../../../lib/projects/localDev/LocalDevWebsocketServer.js';
-import { confirmLocalDevIsNotRunning } from '../../../lib/projects/localDev/helpers/process.js';
+import { isLocalDevRunning } from '../../../lib/projects/localDev/helpers/process.js';
+import { getHsSettingsFileIfExists, getHsSettingsFilePath, } from '@hubspot/local-dev-lib/config/hsSettings';
+import { isDirectoryLinked, addAccountToLinkedSettings, } from '../../../lib/link/linkUtils.js';
 export async function unifiedProjectDevFlow({ args, targetProjectAccountId, providedTargetTestingAccountId, projectConfig, projectDir, }) {
-    await confirmLocalDevIsNotRunning();
+    const { exit } = args;
+    if (await isLocalDevRunning()) {
+        uiLogger.error(commands.project.dev.errors.localDevAlreadyRunning);
+        return exit(EXIT_CODES.ERROR);
+    }
     const env = getConfigAccountEnvironment(targetProjectAccountId);
     let projectNodes;
     let projectProfileData;
     // Get IR
     try {
-        const intermediateRepresentation = await translateForLocalDev({
+        const { intermediateRepresentation, skippedHsMetaFiles } = await translateForLocalDev({
             projectSourceDir: path.join(projectDir, projectConfig.srcDir),
             platformVersion: projectConfig.platformVersion,
             accountId: targetProjectAccountId,
@@ -33,6 +40,7 @@ export async function unifiedProjectDevFlow({ args, targetProjectAccountId, prov
         projectNodes = intermediateRepresentation.intermediateNodesIndexedByUid;
         projectProfileData = intermediateRepresentation.profileData;
         uiLogger.debug(util.inspect(projectNodes, false, null, true));
+        await warnAboutSkippedHsMetaFiles(skippedHsMetaFiles, true, false);
     }
     catch (e) {
         if (isTranslationError(e)) {
@@ -41,23 +49,29 @@ export async function unifiedProjectDevFlow({ args, targetProjectAccountId, prov
         else {
             logError(e);
         }
-        return process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     if (!Object.keys(projectNodes).length) {
         uiLogger.error(commands.project.dev.errors.noRunnableComponents);
-        process.exit(EXIT_CODES.SUCCESS);
+        return exit(EXIT_CODES.SUCCESS);
     }
     const targetProjectAccountConfig = getConfigAccountById(targetProjectAccountId);
     if (!targetProjectAccountConfig) {
         uiLogger.error(commands.project.dev.errors.noAccount(targetProjectAccountId));
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
-    const accounts = getAllConfigAccounts();
+    const hsSettings = getHsSettingsFileIfExists();
+    const directoryIsLinked = isDirectoryLinked(hsSettings);
+    const accounts = getLinkedOrAllConfigAccounts();
     const accountIsCombined = await isUnifiedAccount(targetProjectAccountConfig);
     const targetProjectAccountIsTestAccountOrSandbox = isTestAccountOrSandbox(targetProjectAccountConfig);
     if (!accountIsCombined) {
         uiLogger.error(commands.project.dev.errors.accountNotCombined);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
+    }
+    if (directoryIsLinked && !providedTargetTestingAccountId) {
+        uiLogger.log('');
+        uiLogger.info(commands.account.subcommands.link.shared.usingLinkedAccounts(getHsSettingsFilePath()));
     }
     let targetTestingAccountId = providedTargetTestingAccountId;
     // Temporarily removing logic to use profile account as testing account
@@ -77,16 +91,39 @@ export async function unifiedProjectDevFlow({ args, targetProjectAccountId, prov
         const accountType = await selectAccountTypePrompt(targetProjectAccountConfig);
         if (accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST) {
             const devAccountPromptResponse = await selectDeveloperTestTargetAccountPrompt(accounts, targetProjectAccountConfig);
+            const { notInConfigAccount } = devAccountPromptResponse;
             targetTestingAccountId =
                 devAccountPromptResponse.targetAccountId || undefined;
-            if (!!devAccountPromptResponse.notInConfigAccount) {
-                // When the developer test account isn't configured in the CLI config yet
-                // Walk the user through adding the account's PAK to the config
-                await useExistingDevTestAccount(env, devAccountPromptResponse.notInConfigAccount);
+            if (notInConfigAccount) {
+                const existingGlobalConfig = getConfigAccountIfExists(notInConfigAccount.id);
+                if (directoryIsLinked && existingGlobalConfig) {
+                    const shouldLink = await confirmLinkExistingDeveloperTestAccountPrompt(notInConfigAccount.accountName);
+                    if (!shouldLink) {
+                        return exit(EXIT_CODES.SUCCESS);
+                    }
+                    addAccountToLinkedSettings(notInConfigAccount.id);
+                }
+                else {
+                    const accountAdded = await useExistingDevTestAccount(env, notInConfigAccount);
+                    if (!accountAdded) {
+                        return exit(EXIT_CODES.SUCCESS);
+                    }
+                    if (directoryIsLinked) {
+                        addAccountToLinkedSettings(notInConfigAccount.id);
+                    }
+                }
             }
             else if (devAccountPromptResponse.createNestedAccount) {
                 // Create a new developer test account and automatically add it to the CLI config
-                targetTestingAccountId = await createDeveloperTestAccountForLocalDev(targetProjectAccountId, targetProjectAccountConfig, env, true);
+                try {
+                    targetTestingAccountId = await createDeveloperTestAccountForLocalDev(targetProjectAccountId, targetProjectAccountConfig, env, true);
+                }
+                catch {
+                    return exit(EXIT_CODES.ERROR);
+                }
+                if (directoryIsLinked) {
+                    addAccountToLinkedSettings(targetTestingAccountId);
+                }
             }
         }
         else if (accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX) {
@@ -94,7 +131,15 @@ export async function unifiedProjectDevFlow({ args, targetProjectAccountId, prov
             targetTestingAccountId =
                 sandboxAccountPromptResponse.targetAccountId || undefined;
             if (sandboxAccountPromptResponse.createNestedAccount) {
-                targetTestingAccountId = await createSandboxForLocalDev(targetProjectAccountId, targetProjectAccountConfig, env);
+                try {
+                    targetTestingAccountId = await createSandboxForLocalDev(targetProjectAccountId, targetProjectAccountConfig, env);
+                }
+                catch {
+                    return exit(EXIT_CODES.ERROR);
+                }
+                if (directoryIsLinked) {
+                    addAccountToLinkedSettings(targetTestingAccountId);
+                }
             }
         }
         else {
@@ -111,21 +156,26 @@ export async function unifiedProjectDevFlow({ args, targetProjectAccountId, prov
     });
     let project = uploadedProject;
     if (projectExists && project) {
-        await compareLocalProjectToDeployed(projectConfig, targetProjectAccountId, project.deployedBuild?.buildId, projectNodes, args.profile);
+        await compareLocalProjectToDeployed(projectConfig, targetProjectAccountId, project.deployedBuild?.buildId, projectNodes, exit, args.profile);
     }
     else {
-        project = await createNewProjectForLocalDev(projectConfig, targetProjectAccountId, false, false);
-        await createInitialBuildForNewProject(projectConfig, projectDir, targetProjectAccountId, true, args.profile);
+        project = await createNewProjectForLocalDev(projectConfig, targetProjectAccountId, false, false, exit);
+        await createInitialBuildForNewProject(projectConfig, projectDir, targetProjectAccountId, exit, true, args.profile);
     }
     // Check for missing/outdated dependencies
-    await checkAndInstallDependencies();
+    try {
+        await checkAndInstallDependencies();
+    }
+    catch {
+        return exit(EXIT_CODES.ERROR);
+    }
     // End setup, start local dev process
     try {
-        await startPortManagerServer();
+        await startPortManagerServer(args.port);
     }
     catch (e) {
         logError(e);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     const localDevProcess = new LocalDevProcess({
         initialProjectNodes: projectNodes,
@@ -138,6 +188,7 @@ export async function unifiedProjectDevFlow({ args, targetProjectAccountId, prov
         projectDir,
         projectData: project,
         env,
+        actions: { exit },
     });
     const websocketServer = new LocalDevWebsocketServer(localDevProcess, args.debug);
     const watcher = new LocalDevWatcher(localDevProcess);

package/commands/project/download.js

@@ -3,26 +3,26 @@ import { getCwd, sanitizeFileName } from '@hubspot/local-dev-lib/path';
 import { extractZipArchive } from '@hubspot/local-dev-lib/archive';
 import { downloadProject, fetchProjectBuilds, } from '@hubspot/local-dev-lib/api/projects';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
+import { isPromptExitError } from '../../lib/errors/PromptExitError.js';
 import { getProjectConfig } from '../../lib/projects/config.js';
 import { downloadProjectPrompt } from '../../lib/prompts/downloadProjectPrompt.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'download';
 const describe = commands.project.download.describe;
 async function handler(args) {
+    const { dest, build, derivedAccountId, exit } = args;
     const { projectConfig } = await getProjectConfig();
     if (projectConfig) {
         uiLogger.error(commands.project.download.warnings.cannotDownloadWithinProject);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
-    const { dest, build, derivedAccountId } = args;
-    const { project: projectName } = await downloadProjectPrompt(args);
     let buildNumberToDownload = build;
-    trackCommandUsage('project-download', undefined, derivedAccountId);
     try {
+        const { project: projectName } = await downloadProjectPrompt(args);
         if (!buildNumberToDownload) {
             const { data: projectBuildsResult } = await fetchProjectBuilds(derivedAccountId, projectName);
             const { results: projectBuilds } = projectBuildsResult;
@@ -33,7 +33,7 @@ async function handler(args) {
         }
         if (!buildNumberToDownload) {
             uiLogger.error(commands.project.download.errors.noBuildIdToDownload);
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         const sanitizedProjectName = sanitizeFileName(projectName);
         const absoluteDestPath = dest
@@ -42,14 +42,17 @@ async function handler(args) {
         const { data: zippedProject } = await downloadProject(derivedAccountId, projectName, buildNumberToDownload);
         await extractZipArchive(zippedProject, sanitizeFileName(projectName), path.resolve(absoluteDestPath));
         uiLogger.log(commands.project.download.logs.downloadSucceeded(buildNumberToDownload, projectName));
-        process.exit(EXIT_CODES.SUCCESS);
+        return exit(EXIT_CODES.SUCCESS);
     }
     catch (e) {
+        if (isPromptExitError(e)) {
+            throw e;
+        }
         logError(e, new ApiErrorContext({
             accountId: derivedAccountId,
             request: 'project download',
         }));
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
 }
 function projectDownloadBuilder(yargs) {
@@ -85,7 +88,7 @@ const builder = makeYargsBuilder(projectDownloadBuilder, command, describe, {
 const projectDownloadCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('project-download', handler),
     builder,
 };
 export default projectDownloadCommand;

package/commands/project/info.d.ts

@@ -0,0 +1,5 @@
+import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, JSONOutputArgs, YargsCommandModule } from '../../types/Yargs.js';
+import { ProjectInfoJsonOutput } from '../../lib/jsonOutput.js';
+export type ProjectInfoArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & JSONOutputArgs<ProjectInfoJsonOutput>;
+declare const projectInfoCommand: YargsCommandModule<unknown, ProjectInfoArgs>;
+export default projectInfoCommand;