@hubspot/cli 8.2.0 → 8.2.1-experimental.1

package/lib/commonOpts.js

@@ -72,12 +72,16 @@ export function addUseEnvironmentOptions(yargs) {
     return yargs;
 }
 export function addJSONOutputOptions(yargs) {
-    return yargs.option('json', {
+    yargs.option('json', {
         alias: 'format-output-as-json',
         describe: lib.commonOpts.options.jsonOutput,
         type: 'boolean',
-        hidden: true,
     });
+    yargs.option('json-schema', {
+        describe: lib.commonOpts.options.jsonSchema,
+        type: 'boolean',
+    });
+    return yargs;
 }
 // Remove this once we've upgraded to yargs 18.0.0
 function uiBetaTagWithColor(message) {

package/lib/configOptions.d.ts

@@ -1,21 +1,21 @@
 import { CmsPublishMode } from '@hubspot/local-dev-lib/types/Files';
-export declare function setAllowUsageTracking({ accountId, allowUsageTracking, }: {
+export declare function setAllowUsageTracking({ allowUsageTracking, }: {
     accountId: number;
     allowUsageTracking?: boolean;
-}): Promise<void>;
-export declare function setAllowAutoUpdates({ accountId, allowAutoUpdates, }: {
+}): Promise<boolean>;
+export declare function setAllowAutoUpdates({ allowAutoUpdates, }: {
     accountId: number;
     allowAutoUpdates?: boolean;
-}): Promise<void>;
-export declare function setDefaultCmsPublishMode({ accountId, defaultCmsPublishMode, }: {
+}): Promise<boolean>;
+export declare function setDefaultCmsPublishMode({ defaultCmsPublishMode, }: {
     accountId: number;
     defaultCmsPublishMode?: CmsPublishMode;
-}): Promise<void>;
-export declare function setHttpTimeout({ accountId, httpTimeout, }: {
+}): Promise<CmsPublishMode>;
+export declare function setHttpTimeout({ httpTimeout, }: {
     accountId: number;
     httpTimeout?: string;
-}): Promise<void>;
-export declare function setAutoOpenBrowser({ accountId, autoOpenBrowser, }: {
+}): Promise<string>;
+export declare function setAutoOpenBrowser({ autoOpenBrowser, }: {
     accountId: number;
     autoOpenBrowser: boolean;
-}): Promise<void>;
+}): Promise<boolean>;

package/lib/configOptions.js

@@ -1,7 +1,6 @@
 import { updateAllowUsageTracking, updateAllowAutoUpdates, updateDefaultCmsPublishMode, updateHttpTimeout, updateAutoOpenBrowser, } from '@hubspot/local-dev-lib/config';
 import { CMS_PUBLISH_MODE } from '@hubspot/local-dev-lib/constants/files';
 import { commaSeparatedValues } from '@hubspot/local-dev-lib/text';
-import { trackCommandUsage } from './usageTracking.js';
 import { promptUser, listPrompt } from './prompts/promptUtils.js';
 import { lib } from '../lang/en.js';
 import { uiLogger } from './ui/logger.js';
@@ -23,8 +22,7 @@ async function enableOrDisableBooleanFieldPrompt(fieldName) {
     });
     return isEnabled;
 }
-export async function setAllowUsageTracking({ accountId, allowUsageTracking, }) {
-    trackCommandUsage('config-set-allow-usage-tracking', undefined, accountId);
+export async function setAllowUsageTracking({ allowUsageTracking, }) {
     let isEnabled;
     if (typeof allowUsageTracking === 'boolean') {
         isEnabled = allowUsageTracking;
@@ -34,9 +32,9 @@ export async function setAllowUsageTracking({ accountId, allowUsageTracking, })
     }
     updateAllowUsageTracking(isEnabled);
     uiLogger.success(lib.configOptions.setAllowUsageTracking.success(isEnabled.toString()));
+    return isEnabled;
 }
-export async function setAllowAutoUpdates({ accountId, allowAutoUpdates, }) {
-    trackCommandUsage('config-set-allow-auto-updates', undefined, accountId);
+export async function setAllowAutoUpdates({ allowAutoUpdates, }) {
     let isEnabled;
     if (typeof allowAutoUpdates === 'boolean') {
         isEnabled = allowAutoUpdates;
@@ -46,6 +44,7 @@ export async function setAllowAutoUpdates({ accountId, allowAutoUpdates, }) {
     }
     updateAllowAutoUpdates(isEnabled);
     uiLogger.success(lib.configOptions.setAllowAutoUpdates.success(isEnabled.toString()));
+    return isEnabled;
 }
 const ALL_CMS_PUBLISH_MODES = Object.values(CMS_PUBLISH_MODE);
 async function selectCmsPublishMode() {
@@ -55,8 +54,7 @@ async function selectCmsPublishMode() {
     });
     return cmsPublishMode;
 }
-export async function setDefaultCmsPublishMode({ accountId, defaultCmsPublishMode, }) {
-    trackCommandUsage('config-set-default-mode', undefined, accountId);
+export async function setDefaultCmsPublishMode({ defaultCmsPublishMode, }) {
     let newDefault;
     if (!defaultCmsPublishMode) {
         newDefault = await selectCmsPublishMode();
@@ -71,6 +69,7 @@ export async function setDefaultCmsPublishMode({ accountId, defaultCmsPublishMod
     }
     updateDefaultCmsPublishMode(newDefault);
     uiLogger.success(lib.configOptions.setDefaultCmsPublishMode.success(newDefault));
+    return newDefault;
 }
 async function enterTimeout() {
     const { timeout } = await promptUser([
@@ -90,8 +89,7 @@ async function enterTimeout() {
     ]);
     return timeout;
 }
-export async function setHttpTimeout({ accountId, httpTimeout, }) {
-    trackCommandUsage('config-set-http-timeout', undefined, accountId);
+export async function setHttpTimeout({ httpTimeout, }) {
     let newHttpTimeout;
     if (!httpTimeout) {
         newHttpTimeout = await enterTimeout();
@@ -101,11 +99,12 @@ export async function setHttpTimeout({ accountId, httpTimeout, }) {
     }
     updateHttpTimeout(newHttpTimeout);
     uiLogger.success(lib.configOptions.setHttpTimeout.success(newHttpTimeout));
+    return newHttpTimeout;
 }
-export async function setAutoOpenBrowser({ accountId, autoOpenBrowser, }) {
-    trackCommandUsage('config-set-auto-open-browser', undefined, accountId);
+export async function setAutoOpenBrowser({ autoOpenBrowser, }) {
     updateAutoOpenBrowser(autoOpenBrowser);
     uiLogger.success(autoOpenBrowser
         ? lib.configOptions.setAutoOpenBrowser.enabled
         : lib.configOptions.setAutoOpenBrowser.disabled);
+    return autoOpenBrowser;
 }

package/lib/constants.d.ts

@@ -1,9 +1,11 @@
 export declare const HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH: "HubSpot/hubspot-project-components";
+export declare const MAX_LOG_FILES = 10;
 export declare const DEFAULT_PROJECT_TEMPLATE_BRANCH: "main";
 export declare const FEEDBACK_INTERVAL: 10;
 export declare const HUBSPOT_FOLDER: "@hubspot";
 export declare const MARKETPLACE_FOLDER: "@marketplace";
 export declare const DEFAULT_POLLING_DELAY = 2000;
+export declare const PREVIEW_POLL_TIMEOUT: number;
 export declare const PROJECT_CONFIG_FILE: "hsproject.json";
 export declare const PROJECT_BUILD_STATES: {
     readonly BUILDING: "BUILDING";
@@ -77,12 +79,10 @@ export declare const APP_AUTH_TYPES: {
 };
 export declare const FEATURES: {
     readonly UNIFIED_APPS: "Developers:UnifiedApps:PrivateBeta";
-    readonly SANDBOXES_V2: "sandboxes:v2:enabled";
-    readonly SANDBOXES_V2_CLI: "sandboxes:v2:cliEnabled";
     readonly APP_EVENTS: "Developers:UnifiedApps:AppEventsAccess";
-    readonly APPS_HOME: "UIE:AppHome";
     readonly THEME_MIGRATION_2025_2: "Developers:ProjectThemeMigrations:2025.2";
     readonly AGENT_TOOLS: "ThirdPartyAgentTools";
+    readonly APP_ACTIONS: "Developers:AppActions";
 };
 export declare const LOCAL_DEV_UI_MESSAGE_SEND_TYPES: {
     UPLOAD_SUCCESS: string;
@@ -94,6 +94,7 @@ export declare const LOCAL_DEV_UI_MESSAGE_SEND_TYPES: {
     UPDATE_PROJECT_DATA: string;
     UPDATE_UPLOAD_WARNINGS: string;
     DEV_SERVERS_STARTED: string;
+    UPLOAD_IN_PROGRESS: string;
 };
 export declare const LOCAL_DEV_UI_MESSAGE_RECEIVE_TYPES: {
     UPLOAD: string;
@@ -102,6 +103,7 @@ export declare const LOCAL_DEV_UI_MESSAGE_RECEIVE_TYPES: {
     APP_INSTALL_SUCCESS: string;
     APP_INSTALL_INITIATED: string;
     APP_INSTALL_FAILURE: string;
+    SET_AUTO_UPLOAD: string;
 };
 export declare const APP_INSTALLATION_STATES: {
     readonly NOT_INSTALLED: "NOT_INSTALLED";
@@ -126,6 +128,14 @@ export declare const LOCAL_DEV_SERVER_MESSAGE_TYPES: {
     readonly OAUTH_APP_INSTALL_INITIATED: "APP_INSTALL_INITIATED";
 };
 export declare const LOCAL_DEV_WEBSOCKET_SERVER_INSTANCE_ID = "local-dev-ui-websocket-server";
+export declare const ACCOUNT_AUTH_UI_MESSAGE_SEND_TYPES: {
+    readonly AUTH_RECEIVED: "server:authReceived";
+    readonly AUTH_FAILED: "server:authFailed";
+};
+export declare const ACCOUNT_AUTH_UI_MESSAGE_RECEIVE_TYPES: {
+    readonly PERSONAL_ACCESS_KEY: "client:personalAccessKey";
+};
+export declare const ACCOUNT_AUTH_WEBSOCKET_SERVER_VERSION = 1;
 export declare const CONFIG_LOCAL_STATE_FLAGS: {
     readonly LOCAL_DEV_UI_WELCOME: "LOCAL_DEV_UI_WELCOME";
 };
@@ -145,3 +155,4 @@ export declare const ACCOUNT_LEVELS: {
 };
 export declare const ACCOUNT_LEVEL_CHOICES: readonly ["FREE", "STARTER", "PROFESSIONAL", "ENTERPRISE"];
 export declare const FEEDBACK_URL = "https://developers.hubspot.com/feedback";
+export declare const LOCAL_DEV_DEFAULT_PORT = 4828;

package/lib/constants.js

@@ -1,9 +1,11 @@
 export const HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH = 'HubSpot/hubspot-project-components';
+export const MAX_LOG_FILES = 10;
 export const DEFAULT_PROJECT_TEMPLATE_BRANCH = 'main';
 export const FEEDBACK_INTERVAL = 10;
 export const HUBSPOT_FOLDER = '@hubspot';
 export const MARKETPLACE_FOLDER = '@marketplace';
 export const DEFAULT_POLLING_DELAY = 2000;
+export const PREVIEW_POLL_TIMEOUT = 5 * 60 * 1000;
 export const PROJECT_CONFIG_FILE = 'hsproject.json';
 export const PROJECT_BUILD_STATES = {
     BUILDING: 'BUILDING',
@@ -69,12 +71,10 @@ export const APP_AUTH_TYPES = {
 };
 export const FEATURES = {
     UNIFIED_APPS: 'Developers:UnifiedApps:PrivateBeta',
-    SANDBOXES_V2: 'sandboxes:v2:enabled',
-    SANDBOXES_V2_CLI: 'sandboxes:v2:cliEnabled',
     APP_EVENTS: 'Developers:UnifiedApps:AppEventsAccess',
-    APPS_HOME: 'UIE:AppHome',
     THEME_MIGRATION_2025_2: 'Developers:ProjectThemeMigrations:2025.2',
     AGENT_TOOLS: 'ThirdPartyAgentTools',
+    APP_ACTIONS: 'Developers:AppActions',
 };
 export const LOCAL_DEV_UI_MESSAGE_SEND_TYPES = {
     UPLOAD_SUCCESS: 'server:uploadSuccess',
@@ -86,6 +86,7 @@ export const LOCAL_DEV_UI_MESSAGE_SEND_TYPES = {
     UPDATE_PROJECT_DATA: 'server:updateProjectData',
     UPDATE_UPLOAD_WARNINGS: 'server:updateUploadWarnings',
     DEV_SERVERS_STARTED: 'server:devServersStarted',
+    UPLOAD_IN_PROGRESS: 'server:uploadInProgress',
 };
 export const LOCAL_DEV_UI_MESSAGE_RECEIVE_TYPES = {
     UPLOAD: 'client:upload',
@@ -94,6 +95,7 @@ export const LOCAL_DEV_UI_MESSAGE_RECEIVE_TYPES = {
     APP_INSTALL_SUCCESS: 'client:installSuccess',
     APP_INSTALL_INITIATED: 'client:installInitiated',
     APP_INSTALL_FAILURE: 'client:installFailure',
+    SET_AUTO_UPLOAD: 'client:setAutoUpload',
 };
 export const APP_INSTALLATION_STATES = {
     NOT_INSTALLED: 'NOT_INSTALLED',
@@ -118,6 +120,14 @@ export const LOCAL_DEV_SERVER_MESSAGE_TYPES = {
     OAUTH_APP_INSTALL_INITIATED: 'APP_INSTALL_INITIATED',
 };
 export const LOCAL_DEV_WEBSOCKET_SERVER_INSTANCE_ID = 'local-dev-ui-websocket-server';
+export const ACCOUNT_AUTH_UI_MESSAGE_SEND_TYPES = {
+    AUTH_RECEIVED: 'server:authReceived',
+    AUTH_FAILED: 'server:authFailed',
+};
+export const ACCOUNT_AUTH_UI_MESSAGE_RECEIVE_TYPES = {
+    PERSONAL_ACCESS_KEY: 'client:personalAccessKey',
+};
+export const ACCOUNT_AUTH_WEBSOCKET_SERVER_VERSION = 1;
 export const CONFIG_LOCAL_STATE_FLAGS = {
     LOCAL_DEV_UI_WELCOME: 'LOCAL_DEV_UI_WELCOME',
 };
@@ -146,3 +156,6 @@ export const ACCOUNT_LEVEL_CHOICES = [
     ACCOUNT_LEVELS.ENTERPRISE,
 ];
 export const FEEDBACK_URL = 'https://developers.hubspot.com/feedback';
+// TODO: remove this constant and use PORT_MANAGER_SERVER_PORT from
+// @hubspot/local-dev-lib once LDL changes its default to 4828.
+export const LOCAL_DEV_DEFAULT_PORT = 4828;

package/lib/dependencyManagement.js

@@ -5,7 +5,7 @@ import { exec as execAsync } from 'node:child_process';
 import { getProjectConfig } from './projects/config.js';
 import { commands } from '../lang/en.js';
 import SpinniesManager from './ui/SpinniesManager.js';
-import { isGloballyInstalled, executeInstall, executeUpdate, DEFAULT_PACKAGE_MANAGER, } from './npm/npmCli.js';
+import { isGloballyInstalled, executeInstall, executeUpdate, getNpmExecErrorOutput, DEFAULT_PACKAGE_MANAGER, } from './npm/npmCli.js';
 import { findAllPackageJsonFilesInProjectCached, safeGetPackageJsonCached, } from './npm/packageJson.js';
 import { getNpmWorkspaceDirectoryForPackageAtLocationCached } from './npm/workspaces.js';
 class NoPackageJsonFilesError extends Error {
@@ -106,9 +106,9 @@ async function installPackagesInDirectory({ directory, packages, dev = false, np
         SpinniesManager.fail(spinner, {
             text: commands.project.installDeps.installingDependenciesFailed(relativeDir),
         });
-        throw new Error(commands.project.installDeps.installingDependenciesFailed(relativeDir), {
-            cause: e,
-        });
+        const npmErrorOutput = getNpmExecErrorOutput(e);
+        throw new Error(npmErrorOutput ||
+            commands.project.installDeps.installingDependenciesFailed(relativeDir), npmErrorOutput ? undefined : { cause: e });
     }
 }
 export async function updatePackages({ packages, installLocations, }) {
@@ -176,27 +176,20 @@ async function updatePackagesInDirectory({ directory, packages, npmWorkspaceDire
         SpinniesManager.fail(spinner, {
             text: commands.project.updateDeps.updatingDependenciesFailed(relativeDir),
         });
-        throw new Error(commands.project.updateDeps.updatingDependenciesFailed(relativeDir), {
-            cause: e,
-        });
+        const npmErrorOutput = getNpmExecErrorOutput(e);
+        throw new Error(npmErrorOutput ||
+            commands.project.updateDeps.updatingDependenciesFailed(relativeDir), npmErrorOutput ? undefined : { cause: e });
     }
 }
 export async function getProjectPackageJsonLocations(dir, isUpdate = false) {
-    const projectConfig = await getProjectConfig(dir);
-    if (!projectConfig ||
-        !projectConfig.projectDir ||
-        !projectConfig.projectConfig) {
-        throw new Error(isUpdate
-            ? commands.project.updateDeps.noProjectConfig
-            : commands.project.installDeps.noProjectConfig);
-    }
-    const { projectDir, projectConfig: { srcDir, name }, } = projectConfig;
+    const { projectConfig, projectDir } = getProjectConfig(dir);
+    const { srcDir, name } = projectConfig;
     if (!(await isGloballyInstalled(DEFAULT_PACKAGE_MANAGER))) {
         throw new Error(isUpdate
             ? commands.project.updateDeps.packageManagerNotInstalled(DEFAULT_PACKAGE_MANAGER)
             : commands.project.installDeps.packageManagerNotInstalled(DEFAULT_PACKAGE_MANAGER));
     }
-    if (!fs.existsSync(projectConfig.projectDir) ||
+    if (!fs.existsSync(projectDir) ||
         !fs.existsSync(path.join(projectDir, srcDir))) {
         throw new NoPackageJsonFilesError(name, isUpdate);
     }

package/lib/doctor/Diagnosis.js

@@ -1,4 +1,4 @@
-import { prefixOptions } from '../ui/spinniesUtils.js';
+import { getLabels } from '@hubspot/local-dev-lib/logger';
 import chalk from 'chalk';
 import { helpers } from '../interpolation.js';
 import { uiAccountDescription } from '../ui/index.js';
@@ -10,11 +10,11 @@ export class Diagnosis {
     errorCount = 0;
     warningCount = 0;
     constructor({ diagnosticInfo, accountId }) {
-        const { succeedPrefix, failPrefix } = prefixOptions({});
+        const labels = getLabels();
         this.prefixes = {
-            success: chalk.green(succeedPrefix),
-            error: chalk.red(failPrefix),
-            warning: helpers.orange('!'),
+            success: chalk.green(labels.success),
+            error: chalk.red(labels.error),
+            warning: helpers.orange(labels.warning),
         };
         this.diagnosis = {
             cli: {

package/lib/doctor/DiagnosticInfoBuilder.d.ts

@@ -1,9 +1,9 @@
-import { getProjectConfig } from '../projects/config.js';
 import { Environment } from '@hubspot/local-dev-lib/types/Accounts';
 import { AccessToken, AccountType, AuthType } from '@hubspot/local-dev-lib/types/Accounts';
 import { Project } from '@hubspot/local-dev-lib/types/Project';
 import process from 'process';
-export type ProjectConfig = Awaited<ReturnType<typeof getProjectConfig>>;
+import type { LoadedProjectConfig } from '../projects/config.js';
+export type ProjectConfig = LoadedProjectConfig | undefined;
 declare const hubspotCli = "@hubspot/cli";
 interface FilesInfo {
     files: string[];

package/lib/doctor/DiagnosticInfoBuilder.js

@@ -50,12 +50,15 @@ export class DiagnosticInfoBuilder {
         this.processInfo = processInfo;
     }
     async generateDiagnosticInfo() {
-        this._projectConfig = await getProjectConfig();
-        if (this._projectConfig?.projectConfig) {
+        try {
+            this._projectConfig = getProjectConfig();
+        }
+        catch {
+            this._projectConfig = undefined;
+        }
+        if (this._projectConfig) {
             await this.fetchProjectDetails();
             await this.fetchAccessToken();
-        }
-        if (this._projectConfig?.projectDir) {
             await this.fetchProjectFilenames();
         }
         const { platform, arch, versions: { node }, mainModule, } = this.processInfo;
@@ -89,9 +92,7 @@ export class DiagnosticInfoBuilder {
     }
     async fetchProjectDetails() {
         try {
-            const { data } = await fetchProject(this.accountId, 
-            // We check that config exists before running this function
-            this._projectConfig.projectConfig.name);
+            const { data } = await fetchProject(this.accountId, this._projectConfig.projectConfig.name);
             this.projectDetails = data;
         }
         catch (e) {
@@ -109,7 +110,6 @@ export class DiagnosticInfoBuilder {
     }
     async fetchProjectFilenames() {
         try {
-            // We check that projectDir exists before running this function
             this.files = (await walk(this._projectConfig.projectDir, ['node_modules'])).map(filename => path.relative(this._projectConfig.projectDir, filename));
         }
         catch (e) {

package/lib/doctor/Doctor.d.ts

@@ -17,6 +17,7 @@ export declare class Doctor {
     private checkIfNodeIsInstalled;
     private checkIfNpmIsInstalled;
     private checkCLIVersion;
+    private checkMcpReadiness;
     private checkIfNpmInstallRequired;
     private isValidJsonFile;
     private checkProjectConfigJsonFiles;

package/lib/doctor/Doctor.js

@@ -10,8 +10,8 @@ import fs from 'fs';
 import path from 'path';
 import { Diagnosis } from './Diagnosis.js';
 import { DiagnosticInfoBuilder, } from './DiagnosticInfoBuilder.js';
-import { isPortManagerPortAvailable } from '@hubspot/local-dev-lib/portManager';
-import { PORT_MANAGER_SERVER_PORT } from '@hubspot/local-dev-lib/constants/ports';
+import { isPortAvailable } from '@hubspot/local-dev-lib/portManager';
+import { LOCAL_DEV_DEFAULT_PORT } from '../constants.js';
 import { accessTokenForPersonalAccessKey,
 // scopesOnAccessToken,
  } from '@hubspot/local-dev-lib/personalAccessKey';
@@ -23,10 +23,12 @@ import { pkg } from '../jsonLoader.js';
 import { lib } from '../../lang/en.js';
 import { uiLink } from '../ui/index.js';
 import { isServerRunningAtUrl } from '../http.js';
+import { detectConfiguredMcpClients } from '../mcp/promotion.js';
+import { MCP_CLIENTS } from '../mcp/clients.js';
 import { WEBHOOKS_KEY, APP_KEY } from '@hubspot/project-parsing-lib/constants';
-import { validateProjectConfig } from '../projects/config.js';
+import { validateProjectConfig } from '@hubspot/project-parsing-lib/projects';
 import { validateSourceDirectory, handleTranslate, } from '../projects/upload.js';
-import { isV2Project } from '../projects/platformVersion.js';
+import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
 import { validateProjectForProfile } from '../projects/projectProfiles.js';
 import { getAllHsProfiles } from '@hubspot/project-parsing-lib/profiles';
 const minMajorNodeVersion = 20;
@@ -55,7 +57,7 @@ export class Doctor {
             ...this.performCliChecks(),
             ...this.performCliConfigChecks(),
             ...this.performNetworkingChecks(),
-            ...(this.projectConfig?.projectConfig ? this.performProjectChecks() : []),
+            ...(this.projectConfig ? this.performProjectChecks() : []),
         ]);
         this.performDefaultAccountOverrideFileChecks();
         this.performCliConfigSettingsChecks();
@@ -73,6 +75,7 @@ export class Doctor {
             this.checkIfNodeIsInstalled(),
             this.checkIfNpmIsInstalled(),
             this.checkCLIVersion(),
+            this.checkMcpReadiness(),
         ];
     }
     performNetworkingChecks() {
@@ -252,12 +255,35 @@ export class Doctor {
             });
         }
     }
+    async checkMcpReadiness() {
+        try {
+            const configuredClients = detectConfiguredMcpClients();
+            const allClientIds = MCP_CLIENTS.map(c => c.id);
+            const unconfiguredClients = allClientIds.filter(id => !configuredClients.includes(id));
+            if (configuredClients.length > 0) {
+                this.diagnosis?.addCliSection({
+                    type: 'success',
+                    message: lib.doctor.mcpChecks.configured(configuredClients),
+                });
+            }
+            if (unconfiguredClients.length > 0) {
+                this.diagnosis?.addCliSection({
+                    type: 'warning',
+                    message: lib.doctor.mcpChecks.notConfigured(unconfiguredClients),
+                    secondaryMessaging: lib.doctor.mcpChecks.notConfiguredSecondary,
+                });
+            }
+        }
+        catch (e) {
+            uiLogger.debug(getErrorMessage(e));
+        }
+    }
     async checkIfNpmInstallRequired() {
         let foundError = false;
         for (const packageFile of this.diagnosticInfo?.packageFiles || []) {
             const packageDirName = path.dirname(packageFile);
             try {
-                const needsInstall = await hasMissingPackages(path.join(this.projectConfig?.projectDir || '', packageDirName));
+                const needsInstall = await hasMissingPackages(path.join(this.projectConfig?.projectDir ?? '', packageDirName));
                 if (needsInstall) {
                     foundError = true;
                     this.diagnosis?.addProjectSection({
@@ -305,7 +331,7 @@ export class Doctor {
     async checkProjectConfigJsonFiles() {
         let foundError = false;
         for (const jsonFile of this.diagnosticInfo?.jsonFiles || []) {
-            const fileToCheck = path.join(this.projectConfig?.projectDir || '', jsonFile);
+            const fileToCheck = path.join(this.projectConfig?.projectDir ?? '', jsonFile);
             if (!(await this.isValidJsonFile(fileToCheck))) {
                 foundError = true;
                 this.diagnosis?.addProjectSection({
@@ -322,16 +348,16 @@ export class Doctor {
         }
     }
     async checkIfPortsAreAvailable() {
-        if (await isPortManagerPortAvailable()) {
+        if (await isPortAvailable(LOCAL_DEV_DEFAULT_PORT)) {
             this.diagnosis?.addProjectSection({
                 type: 'success',
-                message: lib.doctor.port.available(PORT_MANAGER_SERVER_PORT),
+                message: lib.doctor.port.available(LOCAL_DEV_DEFAULT_PORT),
             });
             return;
         }
         this.diagnosis?.addProjectSection({
             type: 'warning',
-            message: lib.doctor.port.inUse(PORT_MANAGER_SERVER_PORT),
+            message: lib.doctor.port.inUse(LOCAL_DEV_DEFAULT_PORT),
             secondaryMessaging: lib.doctor.port.inUseSecondary,
         });
     }
@@ -406,7 +432,7 @@ export class Doctor {
             const hsMetaFiles = this.diagnosticInfo?.hsMetaFiles || [];
             for (const metaFiles of hsMetaFiles) {
                 try {
-                    const content = await fs.promises.readFile(path.join(this.projectConfig?.projectDir || '', metaFiles), 'utf8');
+                    const content = await fs.promises.readFile(path.join(this.projectConfig?.projectDir ?? '', metaFiles), 'utf8');
                     const contents = JSON.parse(content);
                     if (contents.type === WEBHOOKS_KEY &&
                         contents.config?.settings?.targetUrl) {
@@ -435,7 +461,7 @@ export class Doctor {
             const hsMetaFiles = this.diagnosticInfo?.hsMetaFiles || [];
             for (const metaFile of hsMetaFiles) {
                 try {
-                    const content = await fs.promises.readFile(path.join(this.projectConfig?.projectDir || '', metaFile), 'utf8');
+                    const content = await fs.promises.readFile(path.join(this.projectConfig?.projectDir ?? '', metaFile), 'utf8');
                     const contents = JSON.parse(content);
                     if (contents.type === APP_KEY &&
                         Array.isArray(contents.config?.auth?.redirectUrls)) {
@@ -524,9 +550,7 @@ export class Doctor {
         }
     }
     async checkProjectValidation() {
-        if (!this.projectConfig?.projectConfig ||
-            !this.projectConfig?.projectDir ||
-            !this.accountId) {
+        if (!this.projectConfig || !this.accountId) {
             return;
         }
         const { projectConfig, projectDir } = this.projectConfig;
@@ -534,7 +558,7 @@ export class Doctor {
             if (!this.validateProjectConfigWrapper(projectConfig, projectDir)) {
                 return;
             }
-            if (!isV2Project(projectConfig.platformVersion)) {
+            if (isLegacyProject(projectConfig.platformVersion)) {
                 this.diagnosis?.addProjectSection({
                     type: 'success',
                     message: lib.doctor.projectValidation.valid,

package/lib/errorHandlers/index.js

@@ -7,11 +7,12 @@ import util from 'util';
 import { isProjectValidationError } from '../errors/ProjectValidationError.js';
 export function logError(error, context) {
     debugError(error, context);
-    if (isProjectValidationError(error)) {
-        uiLogger.error(error.message);
+    // This should be right after debugError.  Add anything else below it
+    if (shouldSuppressError(error, context)) {
         return;
     }
-    if (shouldSuppressError(error, context)) {
+    if (isProjectValidationError(error)) {
+        uiLogger.error(error.message);
         return;
     }
     if (isHubSpotHttpError(error)) {

package/lib/errorHandlers/suppressError.js

@@ -3,6 +3,7 @@ import { uiLogger } from '../ui/logger.js';
 import { PLATFORM_VERSION_ERROR_TYPES } from '../constants.js';
 import { lib } from '../../lang/en.js';
 import { uiAccountDescription, uiLine, uiLink } from '../ui/index.js';
+import { isPromptExitError } from '../errors/PromptExitError.js';
 function createPlatformVersionError(err, subCategory) {
     let translationKey = 'unspecifiedPlatformVersion';
     let platformVersion = 'unspecified platformVersion';
@@ -27,6 +28,9 @@ function createPlatformVersionError(err, subCategory) {
     uiLine();
 }
 export function shouldSuppressError(err, context) {
+    if (isPromptExitError(err)) {
+        return true;
+    }
     if (isMissingScopeError(err)) {
         uiLogger.error(lib.errorHandlers.suppressErrors.missingScopeError(context?.request || 'request', context?.accountId ? uiAccountDescription(context.accountId) : ''));
         return true;

package/lib/errors/ProjectErrors.d.ts

@@ -1,12 +1,6 @@
 export declare class ProjectNestingError extends Error {
     constructor(message: string);
 }
-export declare class ProjectConfigNotFoundError extends Error {
-    constructor(message: string);
-}
-export declare class ProjectValidationError extends Error {
-    constructor(message: string);
-}
 export declare class ProjectUploadError extends Error {
     constructor(message: string, cause?: unknown);
 }

package/lib/errors/ProjectErrors.js

@@ -4,18 +4,6 @@ export class ProjectNestingError extends Error {
         this.name = 'ProjectNestingError';
     }
 }
-export class ProjectConfigNotFoundError extends Error {
-    constructor(message) {
-        super(message);
-        this.name = 'ProjectConfigNotFoundError';
-    }
-}
-export class ProjectValidationError extends Error {
-    constructor(message) {
-        super(message);
-        this.name = 'ProjectValidationError';
-    }
-}
 export class ProjectUploadError extends Error {
     constructor(message, cause) {
         super(message, { cause });

package/lib/errors/ProjectValidationError.d.ts

@@ -1,4 +1,5 @@
+import { ProjectConfigValidationError } from '@hubspot/project-parsing-lib/projects';
 export default class ProjectValidationError extends Error {
     constructor(message: string, options?: ErrorOptions);
 }
-export declare function isProjectValidationError(err: unknown): err is ProjectValidationError;
+export declare function isProjectValidationError(err: unknown): err is ProjectValidationError | ProjectConfigValidationError;

package/lib/errors/ProjectValidationError.js

@@ -1,3 +1,4 @@
+import { ProjectConfigValidationError } from '@hubspot/project-parsing-lib/projects';
 export default class ProjectValidationError extends Error {
     constructor(message, options) {
         super(message, options);
@@ -5,5 +6,6 @@ export default class ProjectValidationError extends Error {
     }
 }
 export function isProjectValidationError(err) {
-    return err instanceof ProjectValidationError;
+    return (err instanceof ProjectValidationError ||
+        err instanceof ProjectConfigValidationError);
 }

package/lib/errors/PromptExitError.d.ts

@@ -0,0 +1,6 @@
+import { ExitCode } from '../../types/Yargs.js';
+export declare class PromptExitError extends Error {
+    exitCode: ExitCode;
+    constructor(message: string, exitCode: ExitCode);
+}
+export declare function isPromptExitError(e: unknown): e is PromptExitError;

package/lib/errors/PromptExitError.js

@@ -0,0 +1,11 @@
+export class PromptExitError extends Error {
+    exitCode;
+    constructor(message, exitCode) {
+        super(message);
+        this.name = 'PromptExitError';
+        this.exitCode = exitCode;
+    }
+}
+export function isPromptExitError(e) {
+    return e instanceof PromptExitError;
+}