@hubspot/cli 8.1.1-experimental.0 → 8.1.2-experimental.0

package/commands/hubdb/list.js

@@ -1,5 +1,5 @@
 import { fetchTables } from '@hubspot/local-dev-lib/api/hubdb';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { logError } from '../../lib/errorHandlers/index.js';
@@ -75,7 +75,7 @@ const builder = makeYargsBuilder(hubdbListBuilder, command, describe, {
 const hubdbListCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('hubdb-list', handler),
+    handler: makeWrappedYargsHandler('hubdb-list', handler),
     builder,
 };
 export default hubdbListCommand;

package/commands/init.js

@@ -20,7 +20,7 @@ import { cliAccountNamePrompt } from '../lib/prompts/accountNamePrompt.js';
 import { authenticateWithOauth } from '../lib/oauth.js';
 import { EXIT_CODES } from '../lib/enums/exitCodes.js';
 import { uiCommandReference, uiFeatureHighlight } from '../lib/ui/index.js';
-import { makeYargsHandlerWithUsageTracking } from '../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../lib/yargs/makeWrappedYargsHandler.js';
 import { uiLogger } from '../lib/ui/logger.js';
 import { commands } from '../lang/en.js';
 import { parseStringToNumber } from '../lib/parsing.js';
@@ -191,7 +191,7 @@ const builder = makeYargsBuilder(initBuilder, command, commands.init.verboseDesc
 const initCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('init', handler),
+    handler: makeWrappedYargsHandler('init', handler),
     builder,
 };
 export default initCommand;

package/commands/mcp/setup.js

@@ -1,7 +1,7 @@
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { commands } from '../../lang/en.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { addMcpServerToConfig, supportedTools } from '../../lib/mcp/setup.js';
 const command = ['setup'];
 const describe = commands.mcp.setup.describe;
@@ -29,7 +29,7 @@ const builder = makeYargsBuilder(setupBuilder, command, describe, {
 const mcpSetupCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('mcp-setup', handler),
+    handler: makeWrappedYargsHandler('mcp-setup', handler),
     builder,
 };
 export default mcpSetupCommand;

package/commands/mcp/start.js

@@ -7,7 +7,7 @@ import { uiLogger } from '../../lib/ui/logger.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { commands } from '../../lang/en.js';
 import { handleExit } from '../../lib/process.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { fileURLToPath } from 'url';
 const command = 'start';
 const describe = undefined; // Leave hidden for now
@@ -65,7 +65,7 @@ const builder = makeYargsBuilder(startBuilder, command, describe, {
 const mcpStartCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('mcp-start', handler),
+    handler: makeWrappedYargsHandler('mcp-start', handler),
     builder,
 };
 export default mcpStartCommand;

package/commands/open.js

@@ -2,7 +2,7 @@ import { logSiteLinks, getSiteLinksAsArray, openLink } from '../lib/links.js';
 import { promptUser } from '../lib/prompts/promptUtils.js';
 import { commands } from '../lang/en.js';
 import { EXIT_CODES } from '../lib/enums/exitCodes.js';
-import { makeYargsHandlerWithUsageTracking } from '../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 const separator = ' => ';
 async function createListPrompt(accountId) {
@@ -63,7 +63,7 @@ const builder = makeYargsBuilder(openBuilder, command, describe, {
 const openCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('open', handler),
+    handler: makeWrappedYargsHandler('open', handler),
     builder,
 };
 export default openCommand;

package/commands/project/add.js

@@ -2,7 +2,7 @@ import { logError } from '../../lib/errorHandlers/index.js';
 import { getProjectConfig } from '../../lib/projects/config.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { isPromptExitError } from '../../lib/errors/PromptExitError.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { commands } from '../../lang/en.js';
 import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
@@ -78,7 +78,7 @@ const builder = makeYargsBuilder(projectAddBuilder, command, describe, {
 const projectAddCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('project-add', handler),
+    handler: makeWrappedYargsHandler('project-add', handler),
     builder,
 };
 export default projectAddCommand;

package/commands/project/appInstallStatus.js

@@ -4,7 +4,7 @@ import { fetchProject } from '@hubspot/local-dev-lib/api/projects';
 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 { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { ApiErrorContext, debugError, logError, } from '../../lib/errorHandlers/index.js';
@@ -126,7 +126,7 @@ const builder = makeYargsBuilder(projectInstallStatusBuilder, command, describe,
 const projectInstallStatusCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('project-app-install-status', handler),
+    handler: makeWrappedYargsHandler('project-app-install-status', handler),
     builder,
 };
 export default projectInstallStatusCommand;

package/commands/project/create.js

@@ -10,7 +10,7 @@ import { generateComponentPaths } from '../../lib/projects/create/v2.js';
 import { debugError, logError } from '../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { PROJECT_CONFIG_FILE, HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, marketplaceDistribution, privateDistribution, oAuth, staticAuth, DEFAULT_PROJECT_TEMPLATE_BRANCH, PROJECT_WITH_APP, EMPTY_PROJECT, } from '../../lib/constants.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
@@ -180,7 +180,7 @@ const builder = makeYargsBuilder(projectCreateBuilder, command, describe, {
 const projectCreateCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('project-create', handler),
+    handler: makeWrappedYargsHandler('project-create', handler),
     builder,
 };
 export default projectCreateCommand;

package/commands/project/delete.js

@@ -1,5 +1,5 @@
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { renderInline } from '../../ui/render.js';
@@ -68,7 +68,7 @@ const builder = makeYargsBuilder(projectDeleteBuilder, command, verboseDescribe,
 const projectDeleteCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('project-delete', handler),
+    handler: makeWrappedYargsHandler('project-delete', handler),
     builder,
 };
 export default projectDeleteCommand;

package/commands/project/deploy.js

@@ -9,7 +9,7 @@ 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 { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { loadProfile } from '../../lib/projects/projectProfiles.js';
 import { PROJECT_DEPLOY_TEXT } from '../../lib/constants.js';
@@ -194,6 +194,6 @@ const projectDeployCommand = {
     command,
     describe,
     builder,
-    handler: makeYargsHandlerWithUsageTracking('project-deploy', handler),
+    handler: makeWrappedYargsHandler('project-deploy', handler),
 };
 export default projectDeployCommand;

package/commands/project/dev/index.js

@@ -2,7 +2,7 @@ import { getConfigAccountIfExists } from '@hubspot/local-dev-lib/config';
 import { getProjectConfig, validateProjectConfig, } from '../../../lib/projects/config.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { uiLine } from '../../../lib/ui/index.js';
-import { makeYargsHandlerWithUsageTracking } from '../../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../../lib/yargs/makeWrappedYargsHandler.js';
 import { deprecatedProjectDevFlow } from './deprecatedFlow.js';
 import { unifiedProjectDevFlow } from './unifiedFlow.js';
 import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
@@ -169,7 +169,7 @@ export const builder = makeYargsBuilder(projectDevBuilder, command, describe, {
 const projectDevCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('project-dev', handler),
+    handler: makeWrappedYargsHandler('project-dev', handler),
     builder,
 };
 export default projectDevCommand;

package/commands/project/download.js

@@ -9,7 +9,7 @@ import { downloadProjectPrompt } from '../../lib/prompts/downloadProjectPrompt.j
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'download';
 const describe = commands.project.download.describe;
@@ -88,7 +88,7 @@ const builder = makeYargsBuilder(projectDownloadBuilder, command, describe, {
 const projectDownloadCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('project-download', handler),
+    handler: makeWrappedYargsHandler('project-download', handler),
     builder,
 };
 export default projectDownloadCommand;

package/commands/project/info.js

@@ -1,4 +1,4 @@
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { fetchProject } from '@hubspot/local-dev-lib/api/projects';
 import { debugError } from '../../lib/errorHandlers/index.js';
@@ -61,7 +61,7 @@ const builder = makeYargsBuilder(projectInfoBuilder, command, verboseDescribe, {
 const projectInfoCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('project-info', handler),
+    handler: makeWrappedYargsHandler('project-info', handler),
     builder,
 };
 export default projectInfoCommand;

package/commands/project/installDeps.js

@@ -6,7 +6,7 @@ import { promptUser } from '../../lib/prompts/promptUtils.js';
 import path from 'path';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'install-deps [packages..]';
@@ -77,7 +77,7 @@ const builder = makeYargsBuilder(projectInstallDepsBuilder, command, describe, {
 const projectInstallDepsCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('project-install-deps', handler),
+    handler: makeWrappedYargsHandler('project-install-deps', handler),
     builder,
 };
 export default projectInstallDepsCommand;

package/commands/project/lint.js

@@ -5,12 +5,13 @@ import { isPromptExitError } from '../../lib/errors/PromptExitError.js';
 import { getProjectConfig } from '../../lib/projects/config.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import SpinniesManager from '../../lib/ui/SpinniesManager.js';
 import { areAllLintPackagesInstalled, getMissingLintPackages, getMissingLintScripts, addLintScriptsToPackageJson, lintPackages, displayLintResults, hasEslintConfig, hasDeprecatedEslintConfig, getDeprecatedEslintConfigFiles, createEslintConfig, REQUIRED_PACKAGES_AND_MIN_VERSIONS, } from '../../lib/projects/uieLinting.js';
+import { clearPackageJsonCache } from '../../lib/npm/packageJson.js';
 const command = 'lint';
 const describe = commands.project.lint.help.describe;
 async function handler(args) {
@@ -69,6 +70,7 @@ async function handler(args) {
                     installLocations: locationsArray,
                     dev: true,
                 });
+                clearPackageJsonCache();
                 // Re-check which locations are now ready
                 for (const location of locationsArray) {
                     if (areAllLintPackagesInstalled(location)) {
@@ -193,7 +195,7 @@ const builder = makeYargsBuilder(projectLintBuilder, command, describe, {
 const projectLintCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('project-lint', handler),
+    handler: makeWrappedYargsHandler('project-lint', handler),
     builder,
 };
 export default projectLintCommand;

package/commands/project/list.js

@@ -1,4 +1,4 @@
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { fetchProjects } from '@hubspot/local-dev-lib/api/projects';
 import { logError } from '../../lib/errorHandlers/index.js';
@@ -57,7 +57,7 @@ const builder = makeYargsBuilder(projectListBuilder, command, describe, {
 const projectListCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('projects-list', handler),
+    handler: makeWrappedYargsHandler('projects-list', handler),
     builder,
 };
 export default projectListCommand;

package/commands/project/listBuilds.js

@@ -7,7 +7,7 @@ import moment from 'moment';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { commands } from '../../lang/en.js';
@@ -116,7 +116,7 @@ const builder = makeYargsBuilder(projectListBuildsBuilder, command, describe, {
 const projectListBuildsCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('project-list-builds', handler),
+    handler: makeWrappedYargsHandler('project-list-builds', handler),
     builder,
 };
 export default projectListBuildsCommand;

package/commands/project/logs.js

@@ -7,7 +7,7 @@ import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { ProjectLogsManager } from '../../lib/projects/ProjectLogsManager.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { renderTable } from '../../ui/render.js';
 function getPrivateAppsUrl(accountId) {
@@ -112,7 +112,7 @@ const builder = makeYargsBuilder(projectLogsBuilder, command, describe, { useGlo
 const projectLogsCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('project-logs', handler),
+    handler: makeWrappedYargsHandler('project-logs', handler),
     builder,
 };
 export default projectLogsCommand;

package/commands/project/migrate.js

@@ -1,4 +1,4 @@
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { migrateApp } from '../../lib/app/migrate.js';
 import { getProjectConfig } from '../../lib/projects/config.js';
 import { PLATFORM_VERSIONS } from '@hubspot/project-parsing-lib/constants';
@@ -85,7 +85,7 @@ const builder = makeYargsBuilder(projectMigrateBuilder, command, commands.projec
 const migrateCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('project-migrate', handler),
+    handler: makeWrappedYargsHandler('project-migrate', handler),
     builder,
 };
 export default migrateCommand;

package/commands/project/open.js

@@ -6,7 +6,7 @@ import { ensureProjectExists } from '../../lib/projects/ensureProjectExists.js';
 import { getProjectDetailUrl } from '../../lib/projects/urls.js';
 import { projectNamePrompt } from '../../lib/prompts/projectNamePrompt.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'open';
 const describe = commands.project.open.describe;
@@ -54,7 +54,7 @@ const builder = makeYargsBuilder(projectOpenBuilder, command, describe, {
 const projectOpenCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('project-open', handler),
+    handler: makeWrappedYargsHandler('project-open', handler),
     builder,
 };
 export default projectOpenCommand;

package/commands/project/profile/add.js

@@ -7,7 +7,7 @@ import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
 import { uiAccountDescription } from '../../../lib/ui/index.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
-import { makeYargsHandlerWithUsageTracking } from '../../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { commands } from '../../../lang/en.js';
 import { promptUser, listPrompt, confirmPrompt, } from '../../../lib/prompts/promptUtils.js';
@@ -201,7 +201,7 @@ const builder = makeYargsBuilder(projectProfileAddBuilder, command, verboseDescr
 const projectProfileAddCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('project-profile-add', handler),
+    handler: makeWrappedYargsHandler('project-profile-add', handler),
     builder,
 };
 export default projectProfileAddCommand;

package/commands/project/profile/delete.js

@@ -7,7 +7,7 @@ import { getProjectConfig } from '../../../lib/projects/config.js';
 import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
 import { uiLogger } from '../../../lib/ui/logger.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
-import { makeYargsHandlerWithUsageTracking } from '../../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { commands } from '../../../lang/en.js';
 import { confirmPrompt, listPrompt } from '../../../lib/prompts/promptUtils.js';
@@ -127,7 +127,7 @@ const builder = makeYargsBuilder(projectProfileDeleteBuilder, command, describe,
 const projectProfileDeleteCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('project-profile-delete', handler),
+    handler: makeWrappedYargsHandler('project-profile-delete', handler),
     builder,
 };
 export default projectProfileDeleteCommand;

package/commands/project/updateDeps.js

@@ -6,7 +6,7 @@ import { promptUser } from '../../lib/prompts/promptUtils.js';
 import path from 'path';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'update-deps [packages..]';
@@ -77,7 +77,7 @@ const builder = makeYargsBuilder(projectUpdateDepsBuilder, command, describe, {
 const projectUpdateDepsCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('project-update-deps', handler),
+    handler: makeWrappedYargsHandler('project-update-deps', handler),
     builder,
 };
 export default projectUpdateDepsCommand;

package/commands/project/upload.d.ts

@@ -6,6 +6,8 @@ export type ProjectUploadArgs = CommonArgs & JSONOutputArgs & {
     skipValidation: boolean;
     skipNpmAudit: boolean;
     profile?: string;
+    preview: boolean;
+    target?: number;
 };
 declare const projectUploadCommand: YargsCommandModule<unknown, ProjectUploadArgs>;
 export default projectUploadCommand;

package/commands/project/upload.js

@@ -8,17 +8,32 @@ import { logFeedbackMessage } from '../../lib/projects/ui.js';
 import { handleProjectUpload } from '../../lib/projects/upload.js';
 import { loadAndValidateProfile } from '../../lib/projects/projectProfiles.js';
 import { displayWarnLogs, pollProjectBuildAndDeploy, } from '../../lib/projects/pollProjectBuildAndDeploy.js';
-import { commands } from '../../lang/en.js';
+import { triggerAndPollPreview } from '../../lib/projects/preview.js';
+import { commands, lib } from '../../lang/en.js';
 import { PROJECT_ERROR_TYPES } from '../../lib/constants.js';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { projectProfilePrompt } from '../../lib/prompts/projectProfilePrompt.js';
 const command = 'upload';
 const describe = commands.project.upload.describe;
+async function handlePreview(accountId, projectId, buildId, targetPortalId) {
+    if (!projectId) {
+        uiLogger.warn(lib.projectPreview.missingProjectId);
+        return;
+    }
+    const previewResult = await triggerAndPollPreview(accountId, projectId, buildId, targetPortalId);
+    if (!previewResult.succeeded) {
+        uiLogger.warn(lib.projectPreview.warning);
+    }
+    return {
+        releaseTag: previewResult.releaseTag,
+        succeeded: previewResult.succeeded,
+    };
+}
 async function handler(args) {
-    const { forceCreate, message, derivedAccountId, skipValidation, skipNpmAudit, formatOutputAsJson, profile: profileOption, useEnv: useEnvOption, exit, addUsageMetadata, } = args;
+    const { forceCreate, message, derivedAccountId, skipValidation, skipNpmAudit, formatOutputAsJson, profile: profileOption, useEnv: useEnvOption, preview, target: targetPortalId, exit, addUsageMetadata, } = args;
     const jsonOutput = {};
     const { projectConfig, projectDir } = await getProjectConfig();
     try {
@@ -56,11 +71,13 @@ async function handler(args) {
         assetType: projectConfig.platformVersion,
     });
     try {
-        const { result, uploadError } = await handleProjectUpload({
+        const { result, uploadError, projectId } = await handleProjectUpload({
             accountId: targetAccountId,
             projectConfig,
             projectDir,
-            callbackFunc: pollProjectBuildAndDeploy,
+            callbackFunc: preview
+                ? (...args) => pollProjectBuildAndDeploy(...args, { skipDeploy: true })
+                : pollProjectBuildAndDeploy,
             uploadMessage: message,
             forceCreate,
             isUploadCommand: true,
@@ -85,12 +102,22 @@ async function handler(args) {
             }
             return exit(EXIT_CODES.ERROR);
         }
-        if (result && result.succeeded && !result.buildResult.isAutoDeployEnabled) {
+        if (result &&
+            result.succeeded &&
+            (!result.buildResult.isAutoDeployEnabled || preview)) {
             uiLogger.log(chalk.bold(commands.project.upload.logs.buildSucceeded(result.buildId)));
-            uiLogger.log(commands.project.upload.logs.autoDeployDisabled(`hs project deploy --build=${result.buildId}`));
-            logFeedbackMessage(result.buildId);
+            if (!preview) {
+                uiLogger.log(commands.project.upload.logs.autoDeployDisabled(`hs project deploy --build=${result.buildId}`));
+                logFeedbackMessage(result.buildId);
+            }
             await displayWarnLogs(targetAccountId, projectConfig.name, result.buildId);
         }
+        if (result && result.succeeded && preview && targetPortalId) {
+            const previewJson = await handlePreview(targetAccountId, projectId, result.buildId, targetPortalId);
+            if (previewJson && formatOutputAsJson) {
+                jsonOutput.preview = previewJson;
+            }
+        }
         if (result && result.succeeded && formatOutputAsJson) {
             jsonOutput.buildId = result.buildId;
             if (result.deployResult) {
@@ -138,6 +165,27 @@ function projectUploadBuilder(yargs) {
             alias: 'p',
             describe: commands.project.upload.options.profile.describe,
         },
+        preview: {
+            describe: commands.project.upload.options.preview.describe,
+            type: 'boolean',
+            default: false,
+            hidden: true,
+        },
+        target: {
+            describe: commands.project.upload.options.target.describe,
+            type: 'number',
+            requiresArg: true,
+            hidden: true,
+        },
+    });
+    yargs.check(argv => {
+        if (argv.preview && argv.target == null) {
+            throw new Error(commands.project.upload.errors.previewRequiresTarget);
+        }
+        if (argv.target != null && !argv.preview) {
+            throw new Error(commands.project.upload.errors.targetRequiresPreview);
+        }
+        return true;
     });
     yargs.conflicts('profile', 'account');
     yargs.example([
@@ -146,6 +194,11 @@ function projectUploadBuilder(yargs) {
             '$0 project upload --profile=profileName',
             commands.project.upload.examples.withProfile,
         ],
+        // TODO: Unhide when 2026.09 ships
+        // [
+        //   '$0 project upload --preview --target=12345',
+        //   commands.project.upload.examples.withPreview,
+        // ],
     ]);
     return yargs;
 }
@@ -159,7 +212,7 @@ const builder = makeYargsBuilder(projectUploadBuilder, command, describe, {
 const projectUploadCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('project-upload', handler),
+    handler: makeWrappedYargsHandler('project-upload', handler),
     builder,
 };
 export default projectUploadCommand;

package/commands/project/validate.js

@@ -4,7 +4,7 @@ import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { getProjectConfig, validateProjectConfig, } from '../../lib/projects/config.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { validateSourceDirectory, handleTranslate, } from '../../lib/projects/upload.js';
 import { commands } from '../../lang/en.js';
@@ -150,7 +150,7 @@ const builder = makeYargsBuilder(projectValidateBuilder, command, describe, {
 const projectValidateCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('project-validate', handler),
+    handler: makeWrappedYargsHandler('project-validate', handler),
     builder,
 };
 export default projectValidateCommand;

package/commands/project/watch.js

@@ -12,7 +12,7 @@ import { handleProjectUpload } from '../../lib/projects/upload.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 { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { uiDeprecatedTag } from '../../lib/ui/index.js';
 const command = 'watch';
@@ -146,7 +146,7 @@ const builder = makeYargsBuilder(projectWatchBuilder, command, describe, {
 const projectWatchCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('project-watch', handler),
+    handler: makeWrappedYargsHandler('project-watch', handler),
     builder,
 };
 export default projectWatchCommand;

package/commands/sandbox/create.js

@@ -12,7 +12,7 @@ import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { buildV2Sandbox } from '../../lib/buildAccount.js';
 import { hubspotAccountNamePrompt } from '../../lib/prompts/accountNamePrompt.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'create';
 const describe = uiBetaTag(commands.sandbox.subcommands.create.describe, false);
@@ -150,7 +150,7 @@ const builder = makeYargsBuilder(sandboxCreateBuilder, command, describe, {
 const sandboxCreateCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('sandbox-create', handler),
+    handler: makeWrappedYargsHandler('sandbox-create', handler),
     builder,
 };
 export default sandboxCreateCommand;