@hubspot/cli 8.2.0-experimental.2 → 8.2.1-experimental.0

package/commands/account/clean.js

@@ -120,7 +120,7 @@ const builder = makeYargsBuilder(accountCleanBuilder, command, describe, {
 const accountCleanCommand = {
     command,
     describe,
-    handler: makeWrappedYargsHandler('accounts-clean', handler),
+    handler: makeWrappedYargsHandler('account-clean', handler),
     builder,
 };
 export default accountCleanCommand;

package/commands/account/list.js

@@ -57,7 +57,7 @@ const builder = makeYargsBuilder(accountListBuilder, command, describe, {
 const accountListCommand = {
     command,
     describe,
-    handler: makeWrappedYargsHandler('accounts-list', handler),
+    handler: makeWrappedYargsHandler('account-list', handler),
     builder,
 };
 export default accountListCommand;

package/commands/account/remove.js

@@ -82,7 +82,7 @@ const builder = makeYargsBuilder(accountRemoveBuilder, command, describe, {
 const accountRemoveCommand = {
     command,
     describe,
-    handler: makeWrappedYargsHandler('accounts-remove', handler),
+    handler: makeWrappedYargsHandler('account-remove', handler),
     builder,
 };
 export default accountRemoveCommand;

package/commands/account/rename.js

@@ -44,7 +44,7 @@ const builder = makeYargsBuilder(accountRenameBuilder, command, describe, {
 const accountRenameCommand = {
     command,
     describe,
-    handler: makeWrappedYargsHandler('accounts-rename', handler),
+    handler: makeWrappedYargsHandler('account-rename', handler),
     builder,
 };
 export default accountRenameCommand;

package/commands/account/use.js

@@ -146,7 +146,7 @@ const builder = makeYargsBuilder(accountUseBuilder, command, describe, {
 const accountUseCommand = {
     command,
     describe,
-    handler: makeWrappedYargsHandler('accounts-use', handler),
+    handler: makeWrappedYargsHandler('account-use', handler),
     builder,
 };
 export default accountUseCommand;

package/commands/api.d.ts

@@ -1,7 +1,10 @@
 import { CommonArgs, ConfigArgs, EnvironmentArgs, AccountArgs, JSONOutputArgs, YargsCommandModule } from '../types/Yargs.js';
 declare const HTTP_METHODS: readonly ["GET", "POST", "PUT", "PATCH", "DELETE"];
 type HttpMethod = (typeof HTTP_METHODS)[number];
-export type ApiArgs = CommonArgs & ConfigArgs & EnvironmentArgs & AccountArgs & JSONOutputArgs & {
+type JSONValue = string | number | boolean | null | {
+    [key: string]: JSONValue;
+} | Array<JSONValue>;
+export type ApiArgs = CommonArgs & ConfigArgs & EnvironmentArgs & AccountArgs & JSONOutputArgs<Record<string, JSONValue>> & {
     endpoint: string;
     method?: HttpMethod;
     data?: string;

package/commands/api.js

@@ -29,7 +29,7 @@ function normalizeEndpoint(endpoint) {
     return endpoint.startsWith('/') ? endpoint.slice(1) : endpoint;
 }
 async function handler(args) {
-    const { endpoint, data, derivedAccountId, json: formatOutputAsJson, exit, addUsageMetadata, } = args;
+    const { endpoint, data, derivedAccountId, json: formatOutputAsJson, exit, addUsageMetadata, addJsonOutput, } = args;
     const method = resolveMethod(args);
     addUsageMetadata({ action: method });
     let parsedData;
@@ -79,10 +79,8 @@ async function handler(args) {
         }
         if (response !== undefined) {
             const responseData = response.data;
-            if (formatOutputAsJson) {
-                uiLogger.json(responseData);
-            }
-            else {
+            addJsonOutput(responseData);
+            if (!formatOutputAsJson) {
                 uiLogger.log(commands.api.responseLog);
                 uiLogger.log(JSON.stringify(responseData, null, 2));
             }
@@ -99,20 +97,19 @@ async function handler(args) {
         }
         debugError(error, errorContext);
         const errorData = error.data;
-        if (formatOutputAsJson && errorData) {
-            uiLogger.json(errorData);
+        if (errorData) {
+            addJsonOutput(errorData);
         }
-        else if (errorData) {
+        if (!formatOutputAsJson) {
             if (error.status && error.statusText) {
                 uiLogger.error(commands.api.errors.statusLine(error.status, error.statusText));
             }
-            uiLogger.log(JSON.stringify(errorData, null, 2));
-        }
-        else {
-            if (error.status && error.statusText) {
-                uiLogger.error(commands.api.errors.statusLine(error.status, error.statusText));
+            if (errorData) {
+                uiLogger.log(JSON.stringify(errorData, null, 2));
+            }
+            else {
+                uiLogger.error(error.message);
             }
-            uiLogger.error(error.message);
         }
         return exit(EXIT_CODES.ERROR);
     }

package/commands/config/set.js

@@ -2,6 +2,7 @@ import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { setDefaultCmsPublishMode, setHttpTimeout, setAllowUsageTracking, setAllowAutoUpdates, setAutoOpenBrowser, } from '../../lib/configOptions.js';
 import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
+import { trackCommandMetadataUsage } from '../../lib/usageTracking.js';
 import { commands } from '../../lang/en.js';
 import { makeYargsBuilder, strictEnforceBoolean, } from '../../lib/yargsUtils.js';
 import { logError } from '../../lib/errorHandlers/index.js';
@@ -30,21 +31,39 @@ async function selectOptions() {
 }
 async function handleConfigUpdate(accountId, args) {
     const { allowAutoUpdates, allowUsageTracking, defaultCmsPublishMode, httpTimeout, autoOpenBrowser, } = args;
+    // Emit one metadata event per setting so each field:value pair surfaces as its
+    // own entry in Amplitude instead of a combined string that fragments the charts.
+    const trackingRequests = [];
+    const trackAction = (action) => {
+        trackingRequests.push(trackCommandMetadataUsage('config-set', { action }, accountId));
+    };
     if (allowAutoUpdates !== undefined) {
-        await setAllowAutoUpdates({ allowAutoUpdates, accountId });
+        const value = await setAllowAutoUpdates({ allowAutoUpdates, accountId });
+        trackAction(`allowAutoUpdates:${value}`);
     }
     if (allowUsageTracking !== undefined) {
-        await setAllowUsageTracking({ allowUsageTracking, accountId });
+        const value = await setAllowUsageTracking({
+            allowUsageTracking,
+            accountId,
+        });
+        trackAction(`allowUsageTracking:${value}`);
     }
     if (autoOpenBrowser !== undefined) {
-        await setAutoOpenBrowser({ autoOpenBrowser, accountId });
+        const value = await setAutoOpenBrowser({ autoOpenBrowser, accountId });
+        trackAction(`autoOpenBrowser:${value}`);
     }
     if (defaultCmsPublishMode !== undefined) {
-        await setDefaultCmsPublishMode({ defaultCmsPublishMode, accountId });
+        const value = await setDefaultCmsPublishMode({
+            defaultCmsPublishMode,
+            accountId,
+        });
+        trackAction(`defaultCmsPublishMode:${value}`);
     }
     if (httpTimeout !== undefined) {
-        await setHttpTimeout({ httpTimeout, accountId });
+        const value = await setHttpTimeout({ httpTimeout, accountId });
+        trackAction(`httpTimeout:${value}`);
     }
+    await Promise.all(trackingRequests);
 }
 async function handler(args) {
     const { derivedAccountId, allowAutoUpdates, allowUsageTracking, defaultCmsPublishMode, httpTimeout, autoOpenBrowser, exit, } = args;

package/commands/customObject/createSchema.js

@@ -1,8 +1,7 @@
 import { uiLogger } from '../../lib/ui/logger.js';
-import { getConfigAccountEnvironment } from '@hubspot/local-dev-lib/config';
 import { getAbsoluteFilePath } from '@hubspot/local-dev-lib/path';
 import { createObjectSchema } from '@hubspot/local-dev-lib/api/customObjects';
-import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
+import { getHubSpotWebsiteOriginByAccountId } from '@hubspot/local-dev-lib/urls';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { checkAndConvertToJson } from '../../lib/validation.js';
 import { commands } from '../../lang/en.js';
@@ -22,7 +21,7 @@ async function handler(args) {
     }
     try {
         const { data } = await createObjectSchema(derivedAccountId, schemaJson);
-        uiLogger.success(commands.customObject.subcommands.createSchema.success.schemaViewable(`${getHubSpotWebsiteOrigin(getConfigAccountEnvironment(derivedAccountId))}/contacts/${derivedAccountId}/objects/${data.objectTypeId}`));
+        uiLogger.success(commands.customObject.subcommands.createSchema.success.schemaViewable(`${getHubSpotWebsiteOriginByAccountId(derivedAccountId)}/contacts/${derivedAccountId}/objects/${data.objectTypeId}`));
     }
     catch (e) {
         logError(e, { accountId: derivedAccountId });

package/commands/customObject/updateSchema.js

@@ -1,8 +1,7 @@
 import { fetchObjectSchemas, updateObjectSchema, } from '@hubspot/local-dev-lib/api/customObjects';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { getAbsoluteFilePath } from '@hubspot/local-dev-lib/path';
-import { getConfigAccountEnvironment } from '@hubspot/local-dev-lib/config';
-import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
+import { getHubSpotWebsiteOriginByAccountId } from '@hubspot/local-dev-lib/urls';
 import { listPrompt } from '../../lib/prompts/promptUtils.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { checkAndConvertToJson } from '../../lib/validation.js';
@@ -32,7 +31,7 @@ async function handler(args) {
                     choices: schemaNames,
                 });
         const { data } = await updateObjectSchema(derivedAccountId, name, schemaJson);
-        uiLogger.success(commands.customObject.subcommands.updateSchema.success.viewAtUrl(`${getHubSpotWebsiteOrigin(getConfigAccountEnvironment(derivedAccountId))}/contacts/${derivedAccountId}/objects/${data.objectTypeId}`));
+        uiLogger.success(commands.customObject.subcommands.updateSchema.success.viewAtUrl(`${getHubSpotWebsiteOriginByAccountId(derivedAccountId)}/contacts/${derivedAccountId}/objects/${data.objectTypeId}`));
     }
     catch (e) {
         logError(e, { accountId: derivedAccountId });

package/commands/getStarted.js

@@ -207,6 +207,7 @@ async function handler(args) {
                     isUploadCommand: false,
                     sendIR: !isLegacyProject(newProjectConfig.platformVersion),
                     skipValidation: false,
+                    force: true,
                 });
                 if (uploadError) {
                     // Track upload failure

package/commands/hubdb/list.d.ts

@@ -1,4 +1,4 @@
 import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs.js';
-type HubdbListArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs;
+export type HubdbListArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs;
 declare const hubdbListCommand: YargsCommandModule<unknown, HubdbListArgs>;
 export default hubdbListCommand;

package/commands/hubdb/list.js

@@ -2,11 +2,12 @@ import { fetchTables } from '@hubspot/local-dev-lib/api/hubdb';
 import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { uiLogger } from '../../lib/ui/logger.js';
+import { uiLine } from '../../lib/ui/index.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { commands } from '../../lang/en.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { renderTable } from '../../ui/render.js';
-import { getBaseHubSpotUrlForAccount } from '../../lib/projects/urls.js';
+import { getHubSpotWebsiteOriginByAccountId } from '@hubspot/local-dev-lib/urls';
 const command = ['list', 'ls'];
 const describe = commands.hubdb.subcommands.list.describe;
 async function getTableData(accountId) {
@@ -44,22 +45,20 @@ async function handler(args) {
         commands.hubdb.subcommands.list.labels.rows,
     ];
     uiLogger.success(commands.hubdb.subcommands.list.success(derivedAccountId));
-    uiLogger.log(' ');
-    // link devs to the hubdb page in hubspot for easy access
-    const baseUrl = getBaseHubSpotUrlForAccount(derivedAccountId);
-    uiLogger.log(commands.hubdb.subcommands.list.viewTablesLink(baseUrl, derivedAccountId));
     // don't bother showing an empty list of tables
     if (tables.length > 0) {
+        uiLogger.log(commands.hubdb.subcommands.list.tables);
+        renderTable(tableHeader, tableUIData);
         // if truncated is 0, it will be interpreted as falsy
         const truncated = total - tables.length;
+        uiLine();
         uiLogger.log(commands.hubdb.subcommands.list.tablesDisplayed(tables.length, total, truncated));
-        uiLogger.log('--------------------------------');
-        uiLogger.log(commands.hubdb.subcommands.list.tables);
-        renderTable(tableHeader, tableUIData);
     }
     else {
         uiLogger.log(commands.hubdb.subcommands.list.noTables(derivedAccountId));
     }
+    // link devs to the hubdb page in hubspot for easy access
+    uiLogger.log(commands.hubdb.subcommands.list.viewTablesLink(getHubSpotWebsiteOriginByAccountId(derivedAccountId), derivedAccountId));
     return exit(EXIT_CODES.SUCCESS);
 }
 function hubdbListBuilder(yargs) {

package/commands/mcp/setup.d.ts

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

package/commands/mcp/setup.js

@@ -8,7 +8,11 @@ const describe = commands.mcp.setup.describe;
 async function handler(args) {
     const { exit } = args;
     try {
-        await configureMcpServer(args.client);
+        await configureMcpServer({
+            targets: args.client,
+            standalone: args.standalone,
+            cliVersion: args.cliVersion,
+        });
     }
     catch (e) {
         return exit(EXIT_CODES.ERROR);
@@ -21,6 +25,30 @@ function setupBuilder(yargs) {
         type: 'array',
         choices: [...supportedTools.map(tool => tool.value)],
     });
+    yargs.option('standalone', {
+        describe: commands.mcp.setup.args.standalone,
+        type: 'boolean',
+    });
+    yargs.option('cli-version', {
+        describe: commands.mcp.setup.args.cliVersion,
+        type: 'string',
+    });
+    yargs.check(argv => {
+        if (argv.cliVersion !== undefined && argv.standalone !== true) {
+            throw new Error(commands.mcp.setup.errors.cliVersionRequiresStandalone);
+        }
+        return true;
+    });
+    yargs.example([
+        [
+            '$0 mcp setup --client claude --no-standalone',
+            commands.mcp.setup.examples.nonInteractive,
+        ],
+        [
+            '$0 mcp setup --client cursor --standalone --cli-version 8.0.1',
+            commands.mcp.setup.examples.standalone,
+        ],
+    ]);
     return yargs;
 }
 const builder = makeYargsBuilder(setupBuilder, command, describe, {

package/commands/project/appInstallStatus.d.ts

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

package/commands/project/appInstallStatus.js

@@ -5,6 +5,7 @@ import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
 import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
 import { translateForLocalDev } from '@hubspot/project-parsing-lib/translate';
 import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
+import { InstallStatusSchema, } from '../../lib/jsonOutput.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { ApiErrorContext, debugError, logError, } from '../../lib/errorHandlers/index.js';
@@ -16,7 +17,7 @@ import { APP_AUTH_TYPES } from '../../lib/constants.js';
 const command = 'app-install-status';
 const describe = commands.project.installStatus.describe;
 async function handler(args) {
-    const { derivedAccountId, formatOutputAsJson, exit } = args;
+    const { derivedAccountId, formatOutputAsJson, exit, addJsonOutput } = args;
     const { projectConfig, projectDir } = await getProjectConfig();
     if (!projectConfig || !projectDir) {
         uiLogger.error(commands.project.installStatus.errors.noProjectConfig);
@@ -28,12 +29,12 @@ async function handler(args) {
     }
     let appNode;
     try {
-        const { intermediateNodesIndexedByUid } = await translateForLocalDev({
+        const { intermediateRepresentation } = await translateForLocalDev({
             projectSourceDir: path.join(projectDir, projectConfig.srcDir),
             platformVersion: projectConfig.platformVersion,
             accountId: derivedAccountId,
         }, { skipValidation: true });
-        appNode = Object.values(intermediateNodesIndexedByUid).find(isAppIRNode);
+        appNode = Object.values(intermediateRepresentation.intermediateNodesIndexedByUid).find(isAppIRNode);
     }
     catch (error) {
         debugError(error);
@@ -80,25 +81,24 @@ async function handler(args) {
         }
     }
     const isInstalled = isInstalledWithScopeGroups || previouslyAuthorizedScopeGroups.length > 0;
+    addJsonOutput({
+        appId,
+        appUid: appNode.uid,
+        accountId: derivedAccountId,
+        projectId,
+        isInstalled,
+        isInstalledWithCurrentScopes: isInstalledWithScopeGroups,
+        previouslyAuthorizedScopeGroups,
+    });
     if (formatOutputAsJson) {
-        uiLogger.json({
-            appId,
-            appUid: appNode.uid,
-            accountId: derivedAccountId,
-            projectId,
-            isInstalled,
-            isInstalledWithCurrentScopes: isInstalledWithScopeGroups,
-            previouslyAuthorizedScopeGroups,
-        });
         return exit(isInstalled ? EXIT_CODES.SUCCESS : EXIT_CODES.WARNING);
     }
+    if (isInstalledWithScopeGroups) {
+        uiLogger.success(commands.project.installStatus.success.installed(appNode.config.name, derivedAccountId));
+        return exit(EXIT_CODES.SUCCESS);
+    }
     if (isInstalled) {
-        if (isInstalledWithScopeGroups) {
-            uiLogger.success(commands.project.installStatus.success.installed(appNode.config.name, derivedAccountId));
-        }
-        else {
-            uiLogger.success(commands.project.installStatus.success.installedWithOutdatedScopes(appNode.config.name, derivedAccountId));
-        }
+        uiLogger.success(commands.project.installStatus.success.installedWithOutdatedScopes(appNode.config.name, derivedAccountId));
         return exit(EXIT_CODES.SUCCESS);
     }
     uiLogger.log(commands.project.installStatus.notInstalled(appNode.config.name, derivedAccountId));
@@ -127,7 +127,9 @@ const builder = makeYargsBuilder(projectInstallStatusBuilder, command, describe,
 const projectInstallStatusCommand = {
     command,
     describe,
-    handler: makeWrappedYargsHandler('project-app-install-status', handler),
+    handler: makeWrappedYargsHandler('project-app-install-status', handler, {
+        jsonOutputSchema: InstallStatusSchema,
+    }),
     builder,
 };
 export default projectInstallStatusCommand;

package/commands/project/create.js

@@ -133,7 +133,6 @@ function projectCreateBuilder(yargs) {
             describe: commands.project.create.options.platformVersion.describe,
             type: 'string',
             choices: [
-                PLATFORM_VERSIONS.v2025_1,
                 PLATFORM_VERSIONS.v2025_2,
                 PLATFORM_VERSIONS.v2026_03_BETA,
                 PLATFORM_VERSIONS.v2026_03,

package/commands/project/deploy.d.ts

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

package/commands/project/deploy.js

@@ -1,6 +1,6 @@
 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 { 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, validateProjectConfig, } from '../../lib/projects/config.js';
@@ -10,19 +10,21 @@ 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 } 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, profile: profileOption, useEnv: useEnvOption, exit, addUsageMetadata, } = 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();
     let isInProjectDirectory = false;
     // Validate project config, but it's valid to run this command from outside a project dir
@@ -79,16 +81,21 @@ async function handler(args) {
             }
         }
         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;
@@ -98,22 +105,33 @@ async function handler(args) {
             uiLogger.error(commands.project.deploy.errors.noBuildId);
             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);
+            }
+        }
+        catch {
+            return exit(EXIT_CODES.ERROR);
+        }
         const deployResult = await handleProjectDeploy(targetAccountId, projectName, buildIdToDeploy, isLegacyProject(projectConfig?.platformVersion), forceOption);
         if (!deployResult) {
             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);
             }
@@ -129,9 +147,6 @@ async function handler(args) {
         }
         return exit(EXIT_CODES.ERROR);
     }
-    if (formatOutputAsJson) {
-        uiLogger.json(jsonOutput);
-    }
     if (deploySuccess) {
         return exit(EXIT_CODES.SUCCESS);
     }
@@ -194,6 +209,8 @@ const projectDeployCommand = {
     command,
     describe,
     builder,
-    handler: makeWrappedYargsHandler('project-deploy', handler),
+    handler: makeWrappedYargsHandler('project-deploy', handler, {
+        jsonOutputSchema: DeploySchema,
+    }),
 };
 export default projectDeployCommand;