@hubspot/cli 8.2.0-experimental.1 → 8.2.0-experimental.2

package/commands/account/auth.js

@@ -11,6 +11,7 @@ import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { authenticateNewAccount } from '../../lib/accountAuth.js';
+import { showMcpPromotionNudge } from '../../lib/mcp/promotion.js';
 const TRACKING_STATUS = {
     STARTED: 'started',
     ERROR: 'error',
@@ -56,6 +57,7 @@ async function handler(args) {
         'accountAuthCommand',
         'accountsListCommand',
     ]);
+    await showMcpPromotionNudge(args._.join(' '));
     if (!disableTracking) {
         await trackAuthAction('account-auth', authType, TRACKING_STATUS.COMPLETE, accountId);
     }

package/commands/app/logs.js

@@ -6,6 +6,7 @@ import { selectAppPrompt } from '../../lib/prompts/selectAppPrompt.js';
 import { listPrompt } from '../../lib/prompts/promptUtils.js';
 import { getTypeChoices, handleLogsRequest, SYSTEM_TYPE_CHOICES, tailAppLogs, toSystemType, } from '../../lib/app/logs.js';
 import { logError } from '../../lib/errorHandlers/index.js';
+import { showMcpPromotionNudge } from '../../lib/mcp/promotion.js';
 const command = 'logs';
 const describe = commands.app.subcommands.logs.describe;
 const handler = async (options) => {
@@ -37,6 +38,9 @@ const handler = async (options) => {
         }
         else {
             await handleLogsRequest(derivedAccountId, appId, systemType, options);
+            if (!options.json) {
+                await showMcpPromotionNudge(options._.join(' '));
+            }
         }
         return exit(EXIT_CODES.SUCCESS);
     }

package/commands/getStarted.js

@@ -24,6 +24,7 @@ import ProjectValidationError from '../lib/errors/ProjectValidationError.js';
 import { openLink } from '../lib/links.js';
 import { runGetStartedV2 } from '../lib/getStarted/getStartedV2.js';
 import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
+import { showMcpPromotionNudge } from '../lib/mcp/promotion.js';
 const command = 'get-started';
 const describe = commands.getStarted.describe;
 async function handler(args) {
@@ -275,6 +276,7 @@ async function handler(args) {
             return exit(EXIT_CODES.SUCCESS);
         }
     }
+    await showMcpPromotionNudge(args._.join(' '));
     // Track successful completion of get-started command
     await trackCommandMetadataUsage('get-started', {
         successful: true,

package/commands/init.js

@@ -24,6 +24,7 @@ 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';
+import { showMcpPromotionNudge } from '../lib/mcp/promotion.js';
 const TRACKING_STATUS = {
     STARTED: 'started',
     ERROR: 'error',
@@ -142,6 +143,7 @@ async function handler(args) {
             'authCommand',
             'accountsListCommand',
         ]);
+        await showMcpPromotionNudge(args._.join(' '));
         if (!disableTracking) {
             await trackAuthAction('init', authType, TRACKING_STATUS.COMPLETE, accountId);
         }

package/commands/mcp/setup.js

@@ -2,13 +2,13 @@ import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { commands } from '../../lang/en.js';
 import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
-import { addMcpServerToConfig, supportedTools } from '../../lib/mcp/setup.js';
+import { configureMcpServer, supportedTools } from '../../lib/mcp/setup.js';
 const command = ['setup'];
 const describe = commands.mcp.setup.describe;
 async function handler(args) {
     const { exit } = args;
     try {
-        await addMcpServerToConfig(args.client);
+        await configureMcpServer(args.client);
     }
     catch (e) {
         return exit(EXIT_CODES.ERROR);

package/commands/project/create.js

@@ -17,6 +17,7 @@ import { uiLogger } from '../../lib/ui/logger.js';
 import { handleProjectCreationFlow, } from '../../lib/projects/create/index.js';
 import { updateHsMetaFilesWithAutoGeneratedFields } from '../../lib/projects/components.js';
 import SpinniesManager from '../../lib/ui/SpinniesManager.js';
+import { showMcpPromotionNudge } from '../../lib/mcp/promotion.js';
 const command = ['create', 'init'];
 const describe = commands.project.create.describe;
 const BETA_VERSIONS = [
@@ -107,6 +108,7 @@ async function handler(args) {
     if (isProjectEmpty) {
         fs.ensureDirSync(path.join(projectDest, 'src'));
     }
+    await showMcpPromotionNudge(args._.join(' '));
     return exit(EXIT_CODES.SUCCESS);
 }
 function projectCreateBuilder(yargs) {

package/commands/project/installApp.d.ts

@@ -0,0 +1,7 @@
+import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, JSONOutputArgs, YargsCommandModule } from '../../types/Yargs.js';
+type ProjectInstallAppArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & JSONOutputArgs & {
+    force: boolean;
+    profile?: string;
+};
+declare const projectInstallAppCommand: YargsCommandModule<unknown, ProjectInstallAppArgs>;
+export default projectInstallAppCommand;

package/commands/project/installApp.js

@@ -0,0 +1,181 @@
+import { getConfigAccountIfExists } from '@hubspot/local-dev-lib/config';
+import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
+import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { uiLogger } from '../../lib/ui/logger.js';
+import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { commands } from '../../lang/en.js';
+import { getProjectConfig } from '../../lib/projects/config.js';
+import { APP_INSTALLATION_STATES } from '../../lib/constants.js';
+import { getAppInstallationState } from '../../lib/app/install.js';
+import { confirmInstallAppAction, fetchProjectAppInstallationData, installStaticAuthAppForAccount, loadInstallableAppNode, resolveAppMetadata, resolveProjectId, resolveProjectAccountId, resolveValidInstallAccount, } from '../../lib/projects/installApp.js';
+const command = 'install-app';
+const describe = commands.project.installApp.describe;
+const verboseDescribe = commands.project.installApp.verboseDescribe;
+async function handler(args) {
+    const { derivedAccountId, formatOutputAsJson, force, profile: profileOption, useEnv: useEnvOption, exit, } = args;
+    const { projectConfig, projectDir } = await getProjectConfig();
+    if (!projectConfig || !projectDir) {
+        uiLogger.error(commands.project.installApp.errors.noProjectConfig);
+        return exit(EXIT_CODES.ERROR);
+    }
+    if (isLegacyProject(projectConfig.platformVersion)) {
+        uiLogger.error(commands.project.installApp.errors.unsupportedPlatformVersion(projectConfig.platformVersion));
+        return exit(EXIT_CODES.ERROR);
+    }
+    const resolvedProjectAccount = await resolveProjectAccountId(derivedAccountId, projectConfig, projectDir, profileOption, !!useEnvOption);
+    if (resolvedProjectAccount === null) {
+        return exit(EXIT_CODES.ERROR);
+    }
+    const appNode = await loadInstallableAppNode(projectConfig, projectDir, resolvedProjectAccount.accountId);
+    if (!appNode) {
+        return exit(EXIT_CODES.ERROR);
+    }
+    const installAccountId = await resolveValidInstallAccount(resolvedProjectAccount.accountId, force, Boolean(formatOutputAsJson));
+    if (installAccountId === null) {
+        return exit(EXIT_CODES.ERROR);
+    }
+    const targetAccountConfig = getConfigAccountIfExists(installAccountId);
+    // A profile only applies if we didn't switch away from its account.
+    const uploadProfile = installAccountId === resolvedProjectAccount.accountId
+        ? resolvedProjectAccount.profileName
+        : undefined;
+    const projectId = await resolveProjectId({
+        accountId: installAccountId,
+        projectConfig,
+        projectDir,
+        profile: uploadProfile,
+        force,
+        formatOutputAsJson: Boolean(formatOutputAsJson),
+    });
+    if (projectId === null) {
+        return exit(EXIT_CODES.ERROR);
+    }
+    const installationData = await fetchProjectAppInstallationData(installAccountId, projectId, appNode, projectConfig);
+    if (installationData === null) {
+        return exit(EXIT_CODES.ERROR);
+    }
+    let appId = installationData.appId;
+    const { isInstalledWithScopeGroups, previouslyAuthorizedScopeGroups } = installationData;
+    const needsReinstall = !isInstalledWithScopeGroups && previouslyAuthorizedScopeGroups.length > 0;
+    const installationState = getAppInstallationState(isInstalledWithScopeGroups, previouslyAuthorizedScopeGroups);
+    if (isInstalledWithScopeGroups) {
+        if (formatOutputAsJson) {
+            uiLogger.json({
+                appId,
+                appUid: appNode.uid,
+                accountId: installAccountId,
+                projectId,
+                installationState,
+                installed: true,
+                reinstalled: false,
+            });
+        }
+        else {
+            uiLogger.success(commands.project.installApp.alreadyInstalled(appNode.config.name, installAccountId));
+        }
+        return exit(EXIT_CODES.SUCCESS);
+    }
+    const shouldInstall = await confirmInstallAppAction({
+        appName: appNode.config.name,
+        targetAccountId: installAccountId,
+        force,
+        needsReinstall,
+    });
+    if (!shouldInstall) {
+        return exit(EXIT_CODES.SUCCESS);
+    }
+    const metadata = await resolveAppMetadata({
+        appId,
+        projectId,
+        appUid: appNode.uid,
+        appName: appNode.config.name,
+        accountId: installAccountId,
+        projectConfig,
+        projectDir,
+        profile: uploadProfile,
+        force,
+        formatOutputAsJson: Boolean(formatOutputAsJson),
+    });
+    if (metadata === null) {
+        return exit(EXIT_CODES.ERROR);
+    }
+    appId = metadata.appId;
+    const installed = await installStaticAuthAppForAccount({
+        appId,
+        appNode,
+        appName: appNode.config.name,
+        targetAccountId: installAccountId,
+        targetAccountConfig,
+        projectId,
+        projectName: projectConfig.name,
+        scopeGroupIds: metadata.scopeGroupIds,
+        ownerPortalId: metadata.ownerPortalId,
+        installationState,
+        formatOutputAsJson: Boolean(formatOutputAsJson),
+    });
+    if (!installed) {
+        return exit(EXIT_CODES.ERROR);
+    }
+    if (formatOutputAsJson) {
+        uiLogger.json({
+            appId,
+            appUid: appNode.uid,
+            accountId: installAccountId,
+            projectId,
+            installationState: APP_INSTALLATION_STATES.INSTALLED,
+            installed: true,
+            reinstalled: needsReinstall,
+        });
+    }
+    else {
+        uiLogger.success(commands.project.installApp.success(appNode.config.name, installAccountId));
+    }
+    return exit(EXIT_CODES.SUCCESS);
+}
+function projectInstallAppBuilder(yargs) {
+    yargs.options({
+        force: {
+            alias: ['f'],
+            describe: commands.project.installApp.options.force,
+            default: false,
+            type: 'boolean',
+        },
+        profile: {
+            alias: 'p',
+            describe: commands.project.installApp.options.profile,
+            type: 'string',
+        },
+    });
+    yargs.conflicts('profile', 'account');
+    yargs.example([
+        ['$0 project install-app', commands.project.installApp.examples.default],
+        [
+            '$0 project install-app --account=12345678',
+            commands.project.installApp.examples.withAccount,
+        ],
+        [
+            '$0 project install-app --profile=qa',
+            commands.project.installApp.examples.withProfile,
+        ],
+        [
+            '$0 project install-app --json',
+            commands.project.installApp.examples.json,
+        ],
+    ]);
+    return yargs;
+}
+const builder = makeYargsBuilder(projectInstallAppBuilder, command, verboseDescribe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+    useJSONOutputOptions: true,
+});
+const projectInstallAppCommand = {
+    command,
+    describe,
+    handler: makeWrappedYargsHandler('project-install-app', handler),
+    builder,
+};
+export default projectInstallAppCommand;

package/commands/project/installDeps.js

@@ -9,6 +9,7 @@ import { uiLogger } from '../../lib/ui/logger.js';
 import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { showMcpPromotionNudge } from '../../lib/mcp/promotion.js';
 const command = 'install-deps [packages..]';
 const describe = commands.project.installDeps.help.describe;
 async function handler(args) {
@@ -48,6 +49,7 @@ async function handler(args) {
             packages,
             installLocations,
         });
+        await showMcpPromotionNudge(args._.join(' '));
     }
     catch (e) {
         if (isPromptExitError(e)) {

package/commands/project/upload.js

@@ -16,6 +16,7 @@ import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { projectProfilePrompt } from '../../lib/prompts/projectProfilePrompt.js';
+import { showMcpPromotionNudge } from '../../lib/mcp/promotion.js';
 const command = 'upload';
 const describe = commands.project.upload.describe;
 async function handlePreview(accountId, projectId, buildId, targetPortalId) {
@@ -144,6 +145,9 @@ async function handler(args) {
     if (formatOutputAsJson) {
         uiLogger.json(jsonOutput);
     }
+    else {
+        await showMcpPromotionNudge(args._.join(' '));
+    }
     return exit(EXIT_CODES.SUCCESS);
 }
 function projectUploadBuilder(yargs) {

package/commands/project.js

@@ -21,6 +21,7 @@ import list from './project/list.js';
 import info from './project/info.js';
 import deleteProject from './project/delete.js';
 import appInstallStatus from './project/appInstallStatus.js';
+import installApp from './project/installApp.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 import { getProjectConfig } from '../lib/projects/config.js';
 import { isSupportedPlatformVersion, LATEST_SUPPORTED_PLATFORM_VERSION, } from '@hubspot/project-parsing-lib/projects';
@@ -70,6 +71,7 @@ function projectBuilder(yargs) {
         .command(release)
         .command(projectValidate)
         .command(appInstallStatus)
+        .command(installApp)
         .demandCommand(1, '');
     return yargs;
 }

package/commands/upgrade.js

@@ -11,6 +11,7 @@ import { getLatestCliVersion } from '../lib/cliUpgradeUtils.js';
 import { pkg } from '../lib/jsonLoader.js';
 import SpinniesManager from '../lib/ui/SpinniesManager.js';
 import { debugError } from '../lib/errorHandlers/index.js';
+import { showMcpPromotionNudge } from '../lib/mcp/promotion.js';
 const command = ['upgrade [version]', 'update [version]'];
 const describe = commands.upgrade.describe;
 const handler = async (args) => {
@@ -84,6 +85,7 @@ const handler = async (args) => {
         uiLogger.log('');
         uiLogger.log(commands.upgrade.autoUpgradeMessage);
     }
+    await showMcpPromotionNudge(args._.join(' '));
     return exit(EXIT_CODES.SUCCESS);
 };
 function upgradeBuilder(yargs) {

package/lang/en.d.ts

@@ -1,4 +1,5 @@
 import { HubSpotConfigAccount } from '@hubspot/local-dev-lib/types/Accounts';
+import { LocallyChangedComponents } from '../types/Projects.js';
 export declare const commands: {
     generalErrors: {
         srcIsProject: (src: string, command: string) => string;
@@ -1315,6 +1316,9 @@ export declare const commands: {
     };
     mcp: {
         describe: string;
+        promotion: {
+            activeNudge: string;
+        };
         setup: {
             describe: string;
             installingDocSearch: string;
@@ -2167,6 +2171,47 @@ export declare const commands: {
                 force: string;
             };
         };
+        installApp: {
+            describe: string;
+            verboseDescribe: string;
+            examples: {
+                default: string;
+                withAccount: string;
+                withProfile: string;
+                json: string;
+            };
+            options: {
+                force: string;
+                profile: string;
+            };
+            errors: {
+                noProjectConfig: string;
+                unsupportedPlatformVersion: (platformVersion: string) => string;
+                failedToParseProject: string;
+                noAppInProject: string;
+                unsupportedAuthType: (authType: string) => string;
+                unsupportedDistribution: (distribution: string) => string;
+                invalidAppDeveloperAccount: (accountId: number) => string;
+                projectNotFound: (accountId: number, projectName: string) => string;
+                appNotDeployed: (appName: string, accountId: number) => string;
+                automaticInstallUnavailable: (appName: string, accountId: number) => string;
+                installFailed: (appName: string, accountId: number) => string;
+            };
+            jsonErrors: {
+                automaticInstallUnavailable: string;
+                installFailed: (appName: string, accountId: number) => string;
+            };
+            profileMessage: (profileName: string, accountId: number) => string;
+            appDeveloperAccountNotice: (accountId: number) => string;
+            selectInstallAccountPrompt: string;
+            uploadAndDeployPrompt: (accountId: number) => string;
+            alreadyInstalled: (appName: string, accountId: number) => string;
+            outdatedScopes: (appName: string, accountId: number) => string;
+            reinstallPrompt: string;
+            installPrompt: (appName: string, accountId: number) => string;
+            installFromBrowser: (installUrl: string) => string;
+            success: (appName: string, accountId: number) => string;
+        };
         installStatus: {
             describe: string;
             examples: {
@@ -3268,6 +3313,11 @@ export declare const lib: {
     configMiddleWare: {
         invalidAccountIdEnvironmentVariable: string;
     };
+    accountTargetDiscovery: {
+        errors: {
+            explicitAccountNotFound: (account: string | number) => string;
+        };
+    };
     process: {
         exitDebug: (signal: string) => string;
     };
@@ -3394,7 +3444,9 @@ export declare const lib: {
                 checking: string;
                 upToDate: string;
                 notUpToDate: string;
+                changedFiles: (changed: LocallyChangedComponents) => string;
                 notUpToDateExplanation: (profile?: string) => string;
+                unableToCompare: string;
             };
             createNewProjectForLocalDev: {
                 projectMustExistExplanation: (projectName: string, accountId: number) => string;
@@ -3834,6 +3886,7 @@ export declare const lib: {
             confirmUseExistingDeveloperTestAccount: (accountName: string) => string;
             confirmLinkExistingDeveloperTestAccount: (accountName: string) => string;
             noAccountId: string;
+            fetchDeveloperTestAccountsError: string;
         };
         projectLogsPrompt: {
             functionName: (projectName: string) => string;
@@ -4238,6 +4291,11 @@ export declare const lib: {
             installed: (npmVersion: string) => string;
             unableToDetermine: string;
         };
+        mcpChecks: {
+            configured: (clients: string[]) => string;
+            notConfigured: (clients: string[]) => string;
+            notConfiguredSecondary: string;
+        };
         hsChecks: {
             notLatest: (hsVersion: string) => string;
             notLatestSecondary: (command: string, hsVersion: string) => string;

package/lang/en.js

@@ -1325,8 +1325,11 @@ export const commands = {
     },
     mcp: {
         describe: 'Commands for managing HubSpot MCP servers.',
+        promotion: {
+            activeNudge: `${chalk.bold('Tip:')} Work faster with AI coding tools. Run ${uiCommandReference('hs mcp setup')} to connect HubSpot developer context to supported clients.`,
+        },
         setup: {
-            describe: 'Setup the HubSpot development MCP servers.',
+            describe: `Run ${uiCommandReference('hs mcp setup')} to connect the HubSpot Dev MCP and work faster with your AI coding tools.`,
             installingDocSearch: 'Adding the docs-search mcp server',
             codex: 'Codex CLI',
             claudeCode: 'Claude Code',
@@ -2192,6 +2195,47 @@ export const commands = {
                 force: 'skip confirmation prompt',
             },
         },
+        installApp: {
+            describe: 'Install a static auth app from the current project into the target account',
+            verboseDescribe: `Install a static auth app from the current project into the target account.\n\nRun this command from within the project directory. The project must contain a privately distributed static auth app and must already be uploaded to the target account.`,
+            examples: {
+                default: 'Install the static auth app from the current project',
+                withAccount: 'Install the app into a specific account',
+                withProfile: 'Install the app into the account targeted by a profile',
+                json: 'Output install result as JSON',
+            },
+            options: {
+                force: 'Skip confirmation prompts',
+                profile: 'The profile to target with this install',
+            },
+            errors: {
+                noProjectConfig: `No project config found. Run this command from within a HubSpot project directory, or use ${uiCommandReference('hs project create')} to create a new one.`,
+                unsupportedPlatformVersion: (platformVersion) => `This command is only supported for projects on platform version 2025.2 or later (detected: ${platformVersion}).`,
+                failedToParseProject: 'Failed to parse the project. Check your project configuration is valid and try again.',
+                noAppInProject: 'No app was found in the local project. This command requires a project that contains an app.',
+                unsupportedAuthType: (authType) => `This command only supports static auth apps. Detected auth type: ${authType}.`,
+                unsupportedDistribution: (distribution) => `This command only supports privately distributed apps. Detected distribution: ${distribution}.`,
+                invalidAppDeveloperAccount: (accountId) => `Static auth apps can't be installed into the app developer account ${uiAccountDescription(accountId)}. Switch to a standard, sandbox, or developer test account with ${uiCommandReference('hs account use')}, or pass ${uiCommandReference('--account')}.`,
+                projectNotFound: (accountId, projectName) => `The project ${chalk.bold(projectName)} does not exist in ${uiAccountDescription(accountId)}. Run ${uiCommandReference('hs project upload')} to upload your project files to HubSpot.`,
+                appNotDeployed: (appName, accountId) => `The app ${chalk.bold(appName)} has not been deployed to ${uiAccountDescription(accountId)}. Upload the project with ${uiCommandReference('hs project upload')} and ensure the build succeeds, then try again.`,
+                automaticInstallUnavailable: (appName, accountId) => `${chalk.bold(appName)} could not be installed automatically in ${uiAccountDescription(accountId)}.`,
+                installFailed: (appName, accountId) => `Failed to install ${chalk.bold(appName)} in ${uiAccountDescription(accountId)}.`,
+            },
+            jsonErrors: {
+                automaticInstallUnavailable: 'Automatic install is unavailable for this account.',
+                installFailed: (appName, accountId) => `Failed to install ${appName} in account ${accountId}.`,
+            },
+            profileMessage: (profileName, accountId) => `Installing with ${chalk.bold(profileName)} profile: ${uiAccountDescription(accountId)}`,
+            appDeveloperAccountNotice: (accountId) => `${uiAccountDescription(accountId)} is an app developer account, which can't have apps installed into it.`,
+            selectInstallAccountPrompt: 'Select an account to install the app into',
+            uploadAndDeployPrompt: (accountId) => `The app isn't deployed to ${uiAccountDescription(accountId)} yet. Upload and deploy the project now?`,
+            alreadyInstalled: (appName, accountId) => `${chalk.bold(appName)} is already installed in ${uiAccountDescription(accountId)}.`,
+            outdatedScopes: (appName, accountId) => `${chalk.bold(appName)} is installed in ${uiAccountDescription(accountId)} with outdated scopes.`,
+            reinstallPrompt: 'Reinstall the app to grant the latest scopes?',
+            installPrompt: (appName, accountId) => `Install ${chalk.bold(appName)} in ${uiAccountDescription(accountId)}?`,
+            installFromBrowser: (installUrl) => `Install the app in HubSpot: ${uiLink('Open install page', installUrl)}`,
+            success: (appName, accountId) => `${chalk.bold(appName)} installed in ${uiAccountDescription(accountId)}.`,
+        },
         installStatus: {
             describe: 'Check whether a static auth app in the current project is installed in the target account. This command must be run from within a HubSpot project directory.',
             examples: {
@@ -2632,7 +2676,7 @@ export const commands = {
                 serviceLevel: 'Service Hub tier. Options: FREE, STARTER, PROFESSIONAL, ENTERPRISE',
                 salesLevel: 'Sales Hub tier. Options: FREE, STARTER, PROFESSIONAL, ENTERPRISE',
                 contentLevel: 'Content Hub tier. Options: FREE, STARTER, PROFESSIONAL, ENTERPRISE',
-                commerceLevel: 'Commerce Hub tier. Options: FREE, PROFESSIONAL, ENTERPRISE',
+                commerceLevel: 'Revenue Hub tier. Options: FREE, PROFESSIONAL, ENTERPRISE',
             },
             example: (configPath) => `Create a test account from the config file at ${configPath}`,
             examples: {
@@ -3293,6 +3337,11 @@ export const lib = {
     configMiddleWare: {
         invalidAccountIdEnvironmentVariable: 'Unable to parse `HUBSPOT_ACCOUNT_ID` environment variable into a number',
     },
+    accountTargetDiscovery: {
+        errors: {
+            explicitAccountNotFound: (account) => `Account ${chalk.bold(String(account))} was not found in your config. Run ${uiCommandReference('hs account list')} to see available accounts.`,
+        },
+    },
     process: {
         exitDebug: (signal) => `Attempting to gracefully exit. Triggered by ${signal}`,
     },
@@ -3419,7 +3468,21 @@ export const lib = {
                 checking: 'Checking if your deployed build is up to date...',
                 upToDate: 'Deployed build is up to date.',
                 notUpToDate: `Your project contains undeployed local changes.`,
+                changedFiles: (changed) => {
+                    const sections = [];
+                    if (changed.added.length > 0) {
+                        sections.push(`${chalk.bold('Features Added:')}\n${changed.added.map(f => `  - ${f}`).join('\n')}`);
+                    }
+                    if (changed.updated.length > 0) {
+                        sections.push(`${chalk.bold('Features Modified:')}\n${changed.updated.map(f => `  - ${f}`).join('\n')}`);
+                    }
+                    if (changed.removed.length > 0) {
+                        sections.push(`${chalk.bold('Features Removed:')}\n${changed.removed.map(f => `  - ${f}`).join('\n')}`);
+                    }
+                    return sections.join('\n\n');
+                },
                 notUpToDateExplanation: (profile) => `Run ${uiCommandReference(`hs project upload${profile ? ` --profile ${profile}` : ''}`)} to upload these changes to HubSpot, then re-run ${uiCommandReference(`hs project dev${profile ? ` --profile ${profile}` : ''}`)} to continue local development.`,
+                unableToCompare: `Unable to check if local *-hsmeta.json files match the deployed build. Run ${uiCommandReference('hs project upload')} to upload any local changes before continuing.`,
             },
             createNewProjectForLocalDev: {
                 projectMustExistExplanation: (projectName, accountId) => `The project ${projectName} does not exist in the target account ${uiAccountDescription(accountId)}. This command requires the project to exist in the target account.`,
@@ -3859,6 +3922,7 @@ export const lib = {
             confirmUseExistingDeveloperTestAccount: (accountName) => `Continue with ${accountName}? This account isn't currently connected to the HubSpot CLI. By continuing, you'll be prompted to generate a personal access key and connect it.`,
             confirmLinkExistingDeveloperTestAccount: (accountName) => `${accountName} is not linked to this directory. Would you like to link it?`,
             noAccountId: 'No account ID found for the selected account. Please try again.',
+            fetchDeveloperTestAccountsError: 'Unable to fetch developer test accounts. Please try again.',
         },
         projectLogsPrompt: {
             functionName: (projectName) => `[--function] Select function in ${chalk.bold(projectName)} project`,
@@ -4263,6 +4327,11 @@ export const lib = {
             installed: (npmVersion) => `npm v${npmVersion} is installed`,
             unableToDetermine: 'Unable to determine if npm is installed',
         },
+        mcpChecks: {
+            configured: (clients) => `HubSpot MCP server configured in ${clients.join(', ')}`,
+            notConfigured: (clients) => `HubSpot MCP server not configured in ${clients.join(', ')}`,
+            notConfiguredSecondary: `Run ${uiCommandReference('hs mcp setup')} to connect AI coding tools to HubSpot developer context`,
+        },
         hsChecks: {
             notLatest: (hsVersion) => `Version ${hsVersion} outdated`,
             notLatestSecondary: (command, hsVersion) => `Run ${uiCommandReference(command)} to upgrade to the latest version ${hsVersion}`,

package/lib/accountTargetDiscovery.d.ts

@@ -0,0 +1,15 @@
+import { DiscoverAccountTargetsOptions, DiscoverAccountTargetsResult } from '../types/AccountTargets.js';
+/**
+ * Discovers the candidate target accounts for a command, plus the recommended
+ * one to use when a single account is the obvious choice.
+ *
+ * Profiles take precedence: when the project defines profiles, the candidates
+ * are the profile accounts only. Otherwise they are ranked explicit account,
+ * then env config, then linked directory, then global default.
+ *
+ * Takes plain options (not yargs argv) and never prompts or exits, so both the
+ * CLI and MCP can call it. `recommended` is omitted when no account is the
+ * obvious choice (for example, several profiles). Throws when an explicit
+ * account is provided but not found in the config.
+ */
+export declare function discoverAccountTargets(options?: DiscoverAccountTargetsOptions): Promise<DiscoverAccountTargetsResult>;