@hubspot/cli 8.9.1 → 8.10.0-beta.0

package/lib/projects/localDev/LocalDevProcess.js

@@ -95,8 +95,8 @@ class LocalDevProcess {
         });
         return true;
     }
-    getIntermediateRepresentation(projectNodesAtLastDeploy) {
-        return translateForLocalDev({
+    async getIntermediateRepresentation(projectNodesAtLastDeploy) {
+        const { intermediateRepresentation } = await translateForLocalDev({
             projectSourceDir: path.join(this.state.projectDir, this.state.projectConfig.srcDir),
             platformVersion: this.state.projectConfig.platformVersion,
             accountId: this.state.targetProjectAccountId,
@@ -104,6 +104,7 @@ class LocalDevProcess {
             projectNodesAtLastUpload: projectNodesAtLastDeploy,
             profile: this.state.profile,
         });
+        return intermediateRepresentation;
     }
     async updateProjectNodes() {
         const intermediateRepresentation = await this.getIntermediateRepresentation(this.state.projectNodesAtLastDeploy);
@@ -197,6 +198,7 @@ class LocalDevProcess {
             projectDir: this.state.projectDir,
             callbackFunc: pollProjectBuildAndDeploy,
             sendIR: true,
+            force: true,
         });
         const deploy = result?.deployResult;
         if (uploadError) {

package/lib/projects/localDev/helpers/project.js

@@ -85,6 +85,7 @@ export async function createInitialBuildForNewProject(projectConfig, projectDir,
         skipValidation: true,
         sendIR,
         profile,
+        force: true,
     });
     if (uploadError) {
         if (isSpecifiedError(uploadError, {
@@ -173,12 +174,12 @@ export async function getDeployedProjectNodes(projectConfig, accountId, deployed
             }
         }
         const deployedProjectSourceDir = path.join(tempDir, deployedSrcDir);
-        const { intermediateNodesIndexedByUid } = await translate({
+        const { intermediateRepresentation } = await translate({
             projectSourceDir: deployedProjectSourceDir,
             platformVersion: projectConfig.platformVersion,
             accountId: accountId,
         }, { profile });
-        return intermediateNodesIndexedByUid;
+        return intermediateRepresentation.intermediateNodesIndexedByUid;
     }
     finally {
         if (tempDir && (await fs.pathExists(tempDir))) {

package/lib/projects/ui.d.ts

@@ -1 +1,2 @@
 export declare function logFeedbackMessage(buildId: number): void;
+export declare function warnAboutSkippedHsMetaFiles(skippedHsMetaFiles: string[], force: boolean, isUpload?: boolean): Promise<boolean>;

package/lib/projects/ui.js

@@ -2,6 +2,7 @@ import { uiLogger } from '../ui/logger.js';
 import { FEEDBACK_INTERVAL } from '../constants.js';
 import { uiLine } from '../ui/index.js';
 import { lib } from '../../lang/en.js';
+import { confirmPrompt } from '../prompts/promptUtils.js';
 export function logFeedbackMessage(buildId) {
     if (buildId > 0 && buildId % FEEDBACK_INTERVAL === 0) {
         uiLine();
@@ -10,3 +11,16 @@ export function logFeedbackMessage(buildId) {
         uiLogger.log(lib.projects.logFeedbackMessage.feedbackMessage);
     }
 }
+export async function warnAboutSkippedHsMetaFiles(skippedHsMetaFiles, force, isUpload = true) {
+    if (skippedHsMetaFiles.length === 0)
+        return true;
+    const message = isUpload
+        ? lib.projects.skippedHsMetaFiles.uploadWarning(skippedHsMetaFiles)
+        : lib.projects.skippedHsMetaFiles.warning(skippedHsMetaFiles);
+    uiLogger.warn(message);
+    if (force)
+        return true;
+    return confirmPrompt(lib.projects.skippedHsMetaFiles.prompt, {
+        defaultAnswer: false,
+    });
+}

package/lib/projects/upload.d.ts

@@ -1,4 +1,5 @@
 import { FileResult } from 'tmp';
+import { type IntermediateRepresentation } from '@hubspot/project-parsing-lib/translate';
 import { ProjectConfig } from '../../types/Projects.js';
 type ProjectUploadCallbackFunction<T> = (accountId: number, projectConfig: ProjectConfig, tempFile: FileResult, buildId: number) => Promise<T>;
 type ProjectUploadResult<T> = {
@@ -6,6 +7,7 @@ type ProjectUploadResult<T> = {
     uploadError?: unknown;
     projectNotFound?: boolean;
     projectId?: number;
+    userDeclined?: boolean;
 };
 type HandleProjectUploadArg<T> = {
     accountId: number;
@@ -18,9 +20,11 @@ type HandleProjectUploadArg<T> = {
     sendIR?: boolean;
     skipValidation?: boolean;
     skipNpmAudit?: boolean;
+    skipAutoDeploy?: boolean;
     profile?: string;
+    force?: boolean;
 };
-export declare function handleProjectUpload<T>({ accountId, projectConfig, projectDir, callbackFunc, profile, uploadMessage, forceCreate, isUploadCommand, sendIR, skipValidation, skipNpmAudit, }: HandleProjectUploadArg<T>): Promise<ProjectUploadResult<T>>;
+export declare function handleProjectUpload<T>({ accountId, projectConfig, projectDir, callbackFunc, profile, uploadMessage, forceCreate, isUploadCommand, sendIR, skipValidation, skipNpmAudit, skipAutoDeploy: _skipAutoDeploy, force, }: HandleProjectUploadArg<T>): Promise<ProjectUploadResult<T>>;
 export declare function validateSourceDirectory(srcDir: string, projectConfig: ProjectConfig, projectDir: string): Promise<void>;
 export declare function validateNoHSMetaMismatch(srcDir: string, projectConfig: ProjectConfig): Promise<void>;
 type HandleTranslateArg = {
@@ -31,5 +35,9 @@ type HandleTranslateArg = {
     profile?: string;
     includeTranslationErrorMessage?: boolean;
 };
-export declare function handleTranslate({ projectDir, projectConfig, accountId, skipValidation, profile, includeTranslationErrorMessage, }: HandleTranslateArg): Promise<unknown>;
+export type HandleTranslateResult = {
+    intermediateRepresentation: IntermediateRepresentation;
+    skippedHsMetaFiles: string[];
+};
+export declare function handleTranslate({ projectDir, projectConfig, accountId, skipValidation, profile, includeTranslationErrorMessage, }: HandleTranslateArg): Promise<HandleTranslateResult>;
 export {};

package/lib/projects/upload.js

@@ -9,6 +9,7 @@ import { projectContainsHsMetaFiles } from '@hubspot/project-parsing-lib/project
 import { findAndParsePackageJsonFiles, collectWorkspaceDirectories, collectFileDependencies, } from '@hubspot/project-parsing-lib/workspaces';
 import SpinniesManager from '../ui/SpinniesManager.js';
 import { uiAccountDescription } from '../ui/index.js';
+import { warnAboutSkippedHsMetaFiles } from './ui.js';
 import util from 'node:util';
 import { lib } from '../../lang/en.js';
 import { ensureProjectExists } from './ensureProjectExists.js';
@@ -29,6 +30,7 @@ async function uploadProjectFiles(accountId, projectName, filePath, uploadMessag
     let buildId;
     let error;
     try {
+        // TODO(skip-auto-deploy): Pass skipAutoDeploy once local-dev-lib is bumped
         const { data: upload } = await uploadProject(accountId, projectName, filePath, uploadMessage, platformVersion, intermediateRepresentation);
         buildId = upload.buildId;
         SpinniesManager.succeed('upload', {
@@ -46,7 +48,10 @@ async function uploadProjectFiles(accountId, projectName, filePath, uploadMessag
     }
     return { buildId, error };
 }
-export async function handleProjectUpload({ accountId, projectConfig, projectDir, callbackFunc, profile, uploadMessage = '', forceCreate = false, isUploadCommand = false, sendIR = false, skipValidation = false, skipNpmAudit = false, }) {
+// TODO(skip-auto-deploy): Use skipAutoDeploy once local-dev-lib is bumped to support it
+export async function handleProjectUpload({ accountId, projectConfig, projectDir, callbackFunc, profile, uploadMessage = '', forceCreate = false, isUploadCommand = false, sendIR = false, skipValidation = false, skipNpmAudit = false, 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+skipAutoDeploy: _skipAutoDeploy = false, force = false, }) {
     const srcDir = path.resolve(projectDir, projectConfig.srcDir);
     await validateSourceDirectory(srcDir, projectConfig, projectDir);
     await validateNoHSMetaMismatch(srcDir, projectConfig);
@@ -86,13 +91,19 @@ export async function handleProjectUpload({ accountId, projectConfig, projectDir
             let intermediateRepresentation;
             if (sendIR) {
                 try {
-                    intermediateRepresentation = await handleTranslate({
+                    const translateResult = await handleTranslate({
                         projectDir,
                         projectConfig,
                         accountId,
                         skipValidation,
                         profile,
                     });
+                    intermediateRepresentation =
+                        translateResult.intermediateRepresentation;
+                    const shouldContinue = await warnAboutSkippedHsMetaFiles(translateResult.skippedHsMetaFiles, force);
+                    if (!shouldContinue) {
+                        return resolve({ userDeclined: true });
+                    }
                 }
                 catch (e) {
                     return resolve({ uploadError: e });
@@ -169,13 +180,13 @@ export async function validateNoHSMetaMismatch(srcDir, projectConfig) {
 }
 export async function handleTranslate({ projectDir, projectConfig, accountId, skipValidation, profile, includeTranslationErrorMessage = true, }) {
     try {
-        const intermediateRepresentation = await translate({
+        const { intermediateRepresentation, skippedHsMetaFiles } = await translate({
             projectSourceDir: path.join(projectDir, projectConfig.srcDir),
             platformVersion: projectConfig.platformVersion,
             accountId,
         }, { skipValidation, profile });
         uiLogger.debug(util.inspect(intermediateRepresentation, false, null, true));
-        return intermediateRepresentation;
+        return { intermediateRepresentation, skippedHsMetaFiles };
     }
     catch (e) {
         if (isTranslationError(e)) {

package/lib/prompts/projectDevTargetAccountPrompt.js

@@ -1,5 +1,5 @@
 import { getSandboxUsageLimits } from '@hubspot/local-dev-lib/api/sandboxHubs';
-import { HUBSPOT_ACCOUNT_TYPES, HUBSPOT_ACCOUNT_TYPE_STRINGS, } from '@hubspot/local-dev-lib/constants/config';
+import { HUBSPOT_ACCOUNT_TYPE_STRINGS, HUBSPOT_ACCOUNT_TYPES, } from '@hubspot/local-dev-lib/constants/config';
 import { fetchDeveloperTestAccounts } from '@hubspot/local-dev-lib/api/developerTestAccounts';
 import { promptUser } from './promptUtils.js';
 import { lib } from '../../lang/en.js';
@@ -92,7 +92,8 @@ export async function selectDeveloperTestTargetAccountPrompt(accounts, defaultAc
         devTestAccountsResponse = data;
     }
     catch (err) {
-        uiLogger.debug('Unable to fetch developer test account usage limits: ', err);
+        uiLogger.error(lib.prompts.projectDevTargetAccountPrompt.fetchDeveloperTestAccountsError);
+        throw new PromptExitError(lib.prompts.projectDevTargetAccountPrompt.fetchDeveloperTestAccountsError, EXIT_CODES.ERROR);
     }
     let disabledMessage = false;
     if (devTestAccountsResponse &&

package/lib/theme/cmsDevServerProcess.js

@@ -10,7 +10,7 @@ import { EXIT_CODES } from '../enums/exitCodes.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 // cms-dev-server version to install to isolated cache
-const TARGET_CMS_DEV_SERVER_VERSION = '1.2.26';
+const TARGET_CMS_DEV_SERVER_VERSION = '1.2.44';
 /**
  * Ensures cms-dev-server is installed in an isolated cache directory.
  * This prevents React version conflicts with the CLI.

package/lib/usageTracking.d.ts

@@ -19,3 +19,4 @@ export declare function trackHelpUsage(command: string): Promise<void>;
 export declare function trackConvertFieldsUsage(command: string): Promise<void>;
 export declare function trackAuthAction(command: string, authType: string, step: string, accountId?: number): Promise<void>;
 export declare function trackCommandMetadataUsage(command: string, meta?: UsageTrackingMeta, accountId?: number): Promise<void>;
+export declare function trackMcpPromotionShown(command?: string): Promise<void>;

package/lib/usageTracking.js

@@ -171,6 +171,15 @@ export async function trackCommandMetadataUsage(command, meta = {}, accountId) {
         meta,
     });
 }
+export async function trackMcpPromotionShown(command) {
+    return trackCliInteraction({
+        action: 'cli-mcp-promotion',
+        command: command ?? 'mcp-promotion',
+        meta: {
+            step: 'shown',
+        },
+    });
+}
 async function trackCliInteraction({ action, accountId, command, authType, meta = {}, }) {
     try {
         const config = getConfig();

package/mcp-server/tools/project/CreateTestAccountTool.js

@@ -61,7 +61,7 @@ const inputSchema = {
     commerceLevel: z
         .enum(ACCOUNT_LEVEL_CHOICES_WITHOUT_STARTER)
         .optional()
-        .describe(`Commerce Hub tier level. Options: ${ACCOUNT_LEVEL_CHOICES_WITHOUT_STARTER.join(', ')}. Defaults to ENTERPRISE if not specified.`),
+        .describe(`Revenue Hub tier level. Options: ${ACCOUNT_LEVEL_CHOICES_WITHOUT_STARTER.join(', ')}. Defaults to ENTERPRISE if not specified.`),
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const createTestAccountInputSchema = z.object({ ...inputSchema });

package/mcp-server/tools/project/UploadProjectTools.js

@@ -29,7 +29,7 @@ export class UploadProjectTools extends Tool {
     }
     async handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, profile, uploadMessage, }) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
-        let command = addFlag('hs project upload', 'force-create', true);
+        let command = addFlag('hs project upload', 'force', true);
         const content = [];
         if (uploadMessage) {
             command = addFlag(command, 'message', uploadMessage);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/cli",
-    "version": "8.9.1",
+    "version": "8.10.0-beta.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
@@ -10,10 +10,10 @@
         "!**/__tests__/**"
     ],
     "dependencies": {
-        "@hubspot/local-dev-lib": "5.8.1",
-        "@hubspot/project-parsing-lib": "0.17.0",
+        "@hubspot/local-dev-lib": "5.9.0",
+        "@hubspot/project-parsing-lib": "0.19.1",
         "@hubspot/serverless-dev-runtime": "7.0.7",
-        "@hubspot/ui-extensions-dev-server": "2.0.9",
+        "@hubspot/ui-extensions-dev-server": "2.0.10",
         "@inquirer/prompts": "7.1.0",
         "@modelcontextprotocol/sdk": "1.29.0",
         "archiver": "7.0.1",
@@ -33,6 +33,7 @@
         "open": "7.4.2",
         "p-queue": "8.1.0",
         "react": "19.2.3",
+        "semver": "7.6.3",
         "strip-ansi": "7.1.0",
         "table": "6.9.0",
         "tmp": "0.2.4",
@@ -67,7 +68,6 @@
         "madge": "^8.0.0",
         "mock-stdin": "^1.0.0",
         "prettier": "^3.4.2",
-        "semver": "^7.6.3",
         "ts-node": "^10.9.2",
         "tsx": "^4.20.3",
         "typescript": "^5.6.2",

package/types/AccountTargets.d.ts

@@ -0,0 +1,37 @@
+import { AccountType, Environment } from '@hubspot/local-dev-lib/types/Accounts';
+import { ValueOf } from '@hubspot/local-dev-lib/types/Utils';
+import { ProjectConfig } from './Projects.js';
+export declare const ACCOUNT_TARGET_SELECTION_SOURCES: {
+    readonly EXPLICIT_ACCOUNT: "explicit-account";
+    readonly ENV_CONFIG: "env-config";
+    readonly PROFILE: "profile";
+    readonly LINKED_DIRECTORY: "linked-directory";
+    readonly GLOBAL_DEFAULT: "global-default";
+};
+export type AccountTargetSelectionSource = ValueOf<typeof ACCOUNT_TARGET_SELECTION_SOURCES>;
+export declare const ACCOUNT_TARGET_CATEGORIES: {
+    readonly RECOMMENDED_TESTING: "recommended-testing";
+    readonly PRODUCTION_WITH_CARE: "production-with-care";
+    readonly UNKNOWN: "unknown";
+};
+export type AccountTargetCategory = ValueOf<typeof ACCOUNT_TARGET_CATEGORIES>;
+export type AccountTargetCandidate = {
+    accountId: number;
+    accountName?: string;
+    accountType?: AccountType;
+    environment?: Environment;
+    source: AccountTargetSelectionSource;
+    category: AccountTargetCategory;
+    profileName?: string;
+};
+export type DiscoverAccountTargetsOptions = {
+    explicitAccount?: string | number;
+    useEnv?: boolean;
+    profileName?: string;
+    projectDir?: string | null;
+    projectConfig?: ProjectConfig | null;
+};
+export type DiscoverAccountTargetsResult = {
+    candidates: AccountTargetCandidate[];
+    recommended?: AccountTargetCandidate;
+};

package/types/AccountTargets.js

@@ -0,0 +1,12 @@
+export const ACCOUNT_TARGET_SELECTION_SOURCES = {
+    EXPLICIT_ACCOUNT: 'explicit-account',
+    ENV_CONFIG: 'env-config',
+    PROFILE: 'profile',
+    LINKED_DIRECTORY: 'linked-directory',
+    GLOBAL_DEFAULT: 'global-default',
+};
+export const ACCOUNT_TARGET_CATEGORIES = {
+    RECOMMENDED_TESTING: 'recommended-testing',
+    PRODUCTION_WITH_CARE: 'production-with-care',
+    UNKNOWN: 'unknown',
+};

package/types/LocalDev.d.ts

@@ -5,8 +5,9 @@ import { ValueOf } from '@hubspot/local-dev-lib/types/Utils';
 import { Project } from '@hubspot/local-dev-lib/types/Project';
 import { ProjectConfig } from './Projects.js';
 import LocalDevState from '../lib/projects/localDev/LocalDevState.js';
-import { APP_INSTALLATION_STATES, LOCAL_DEV_UI_MESSAGE_RECEIVE_TYPES, LOCAL_DEV_SERVER_MESSAGE_TYPES } from '../lib/constants.js';
+import { LOCAL_DEV_UI_MESSAGE_RECEIVE_TYPES, LOCAL_DEV_SERVER_MESSAGE_TYPES } from '../lib/constants.js';
 import { ExitFunction } from './Yargs.js';
+import type { AppInstallationState } from './ProjectComponents.js';
 export type LocalDevActions = {
     exit: ExitFunction;
 };
@@ -36,7 +37,7 @@ export type AppLocalDevData = {
     id: number;
     clientId: string;
     name: string;
-    installationState: ValueOf<typeof APP_INSTALLATION_STATES>;
+    installationState: AppInstallationState;
     scopeGroupIds: number[];
 };
 export type LocalDevServerMessage = ValueOf<typeof LOCAL_DEV_SERVER_MESSAGE_TYPES>;

package/types/ProjectComponents.d.ts

@@ -1,8 +1,9 @@
 import type { IntermediateRepresentationNodeLocalDev } from '@hubspot/project-parsing-lib/translate';
-import { IR_COMPONENT_TYPES, APP_DISTRIBUTION_TYPES, APP_AUTH_TYPES } from '../lib/constants.js';
+import { IR_COMPONENT_TYPES, APP_DISTRIBUTION_TYPES, APP_AUTH_TYPES, APP_INSTALLATION_STATES } from '../lib/constants.js';
 import { ValueOf } from '@hubspot/local-dev-lib/types/Utils';
 type AppDistributionType = ValueOf<typeof APP_DISTRIBUTION_TYPES>;
 type AppAuthType = ValueOf<typeof APP_AUTH_TYPES>;
+export type AppInstallationState = ValueOf<typeof APP_INSTALLATION_STATES>;
 type AppConfig = {
     description: string;
     name: string;