@hubspot/cli 7.7.15-experimental.0 → 7.7.16-experimental.1

package/lib/commonOpts.js

@@ -10,6 +10,7 @@ exports.addOverwriteOptions = addOverwriteOptions;
 exports.addCmsPublishModeOptions = addCmsPublishModeOptions;
 exports.addTestingOptions = addTestingOptions;
 exports.addUseEnvironmentOptions = addUseEnvironmentOptions;
+exports.addJSONOutputOptions = addJSONOutputOptions;
 exports.addCustomHelpOutput = addCustomHelpOutput;
 exports.setLogLevel = setLogLevel;
 exports.getCommandName = getCommandName;
@@ -19,16 +20,16 @@ const yargs_parser_1 = __importDefault(require("yargs-parser"));
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const files_1 = require("@hubspot/local-dev-lib/constants/files");
 const config_1 = require("@hubspot/local-dev-lib/config");
-const lang_1 = require("./lang");
 const errorHandlers_1 = require("./errorHandlers");
 const exitCodes_1 = require("./enums/exitCodes");
 const ui_1 = require("./ui");
+const lang_1 = require("./lang");
 function addGlobalOptions(yargs) {
     yargs.version(false);
     yargs.option('debug', {
         alias: 'd',
         default: false,
-        describe: (0, lang_1.i18n)(`lib.commonOpts.options.debug.describe`),
+        describe: (0, lang_1.i18n)('lib.commonOpts.options.debug.describe'),
         type: 'boolean',
     });
     yargs.option('network-debug', {
@@ -41,21 +42,21 @@ function addGlobalOptions(yargs) {
 function addAccountOptions(yargs) {
     return yargs.option('account', {
         alias: 'a',
-        describe: (0, lang_1.i18n)(`lib.commonOpts.options.account.describe`),
+        describe: (0, lang_1.i18n)('lib.commonOpts.options.account.describe'),
         type: 'string',
     });
 }
 function addConfigOptions(yargs) {
     return yargs.option('config', {
         alias: 'c',
-        describe: (0, lang_1.i18n)(`lib.commonOpts.options.config.describe`),
+        describe: (0, lang_1.i18n)('lib.commonOpts.options.config.describe'),
         type: 'string',
     });
 }
 function addOverwriteOptions(yargs) {
     return yargs.option('overwrite', {
         alias: 'o',
-        describe: (0, lang_1.i18n)(`lib.commonOpts.options.overwrite.describe`),
+        describe: (0, lang_1.i18n)('lib.commonOpts.options.overwrite.describe'),
         type: 'boolean',
         default: false,
     });
@@ -70,7 +71,7 @@ function addCmsPublishModeOptions(yargs, { read, write }) {
 }
 function addTestingOptions(yargs) {
     return yargs.option('qa', {
-        describe: (0, lang_1.i18n)(`lib.commonOpts.options.qa.describe`),
+        describe: (0, lang_1.i18n)('lib.commonOpts.options.qa.describe'),
         type: 'boolean',
         default: false,
         hidden: true,
@@ -78,12 +79,20 @@ function addTestingOptions(yargs) {
 }
 function addUseEnvironmentOptions(yargs) {
     yargs.option('use-env', {
-        describe: (0, lang_1.i18n)(`lib.commonOpts.options.useEnv.describe`),
+        describe: (0, lang_1.i18n)('lib.commonOpts.options.useEnv.describe'),
         type: 'boolean',
     });
     yargs.conflicts('use-env', 'account');
     return yargs;
 }
+function addJSONOutputOptions(yargs) {
+    return yargs.option('json', {
+        alias: 'format-output-as-json',
+        describe: (0, lang_1.i18n)('lib.commonOpts.options.jsonOutput.describe'),
+        type: 'boolean',
+        hidden: true,
+    });
+}
 async function addCustomHelpOutput(yargs, command, describe) {
     try {
         const parsedArgv = (0, yargs_parser_1.default)(process.argv.slice(2));
@@ -125,8 +134,11 @@ async function addCustomHelpOutput(yargs, command, describe) {
     }
 }
 function setLogLevel(options) {
-    const { debug, networkDebug } = options;
-    if (debug) {
+    const { debug, networkDebug, json } = options;
+    if (json) {
+        (0, logger_1.setLogLevel)(logger_1.LOG_LEVEL.NONE);
+    }
+    else if (debug) {
         (0, logger_1.setLogLevel)(logger_1.LOG_LEVEL.DEBUG);
     }
     else {

package/lib/constants.d.ts

@@ -49,6 +49,7 @@ export declare const PROJECT_ERROR_TYPES: {
     readonly BUILD_NOT_IN_PROGRESS: "BuildPipelineErrorType.BUILD_NOT_IN_PROGRESS";
     readonly SUBBUILD_FAILED: "BuildPipelineErrorType.DEPENDENT_SUBBUILD_FAILED";
     readonly SUBDEPLOY_FAILED: "DeployPipelineErrorType.DEPENDENT_SUBDEPLOY_FAILED";
+    readonly DEPLOY_CONTAINS_REMOVALS: "DeployPipelineErrorType.WARNING_DEPLOY_CONTAINS_REMOVALS";
 };
 export declare const PROJECT_TASK_TYPES: {
     [key: string]: string;
@@ -98,6 +99,10 @@ export declare const oAuth = "oauth";
 export declare const privateDistribution = "private";
 export declare const marketplaceDistribution = "marketplace";
 export declare const appComponent = "app";
+export declare const GET_STARTED_OPTIONS: {
+    readonly APP: "APP";
+    readonly CMS: "CMS";
+};
 export declare const LOCAL_DEV_SERVER_MESSAGE_TYPES: {
     readonly INITIAL: "INITIAL";
     readonly WEBSOCKET_SERVER_CONNECTED: "WEBSOCKET_SERVER_CONNECTED";

package/lib/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LOCAL_DEV_SERVER_MESSAGE_TYPES = exports.appComponent = exports.marketplaceDistribution = exports.privateDistribution = exports.oAuth = exports.staticAuth = exports.APP_INSTALLATION_STATES = exports.LOCAL_DEV_UI_MESSAGE_RECEIVE_TYPES = exports.LOCAL_DEV_UI_MESSAGE_SEND_TYPES = exports.FEATURES = exports.APP_AUTH_TYPES = exports.APP_DISTRIBUTION_TYPES = exports.IR_COMPONENT_TYPES = exports.PLATFORM_VERSION_ERROR_TYPES = exports.PROJECT_COMPONENT_TYPES = exports.PROJECT_TASK_TYPES = exports.PROJECT_ERROR_TYPES = exports.PROJECT_DEPLOY_TEXT = exports.PROJECT_BUILD_TEXT = exports.PROJECT_DEPLOY_STATES = exports.PROJECT_BUILD_STATES = exports.PROJECT_CONFIG_FILE = exports.DEFAULT_POLLING_DELAY = exports.MARKETPLACE_FOLDER = exports.HUBSPOT_FOLDER = exports.FEEDBACK_INTERVAL = exports.DEFAULT_PROJECT_TEMPLATE_BRANCH = exports.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH = void 0;
+exports.LOCAL_DEV_SERVER_MESSAGE_TYPES = exports.GET_STARTED_OPTIONS = exports.appComponent = exports.marketplaceDistribution = exports.privateDistribution = exports.oAuth = exports.staticAuth = exports.APP_INSTALLATION_STATES = exports.LOCAL_DEV_UI_MESSAGE_RECEIVE_TYPES = exports.LOCAL_DEV_UI_MESSAGE_SEND_TYPES = exports.FEATURES = exports.APP_AUTH_TYPES = exports.APP_DISTRIBUTION_TYPES = exports.IR_COMPONENT_TYPES = exports.PLATFORM_VERSION_ERROR_TYPES = exports.PROJECT_COMPONENT_TYPES = exports.PROJECT_TASK_TYPES = exports.PROJECT_ERROR_TYPES = exports.PROJECT_DEPLOY_TEXT = exports.PROJECT_BUILD_TEXT = exports.PROJECT_DEPLOY_STATES = exports.PROJECT_BUILD_STATES = exports.PROJECT_CONFIG_FILE = exports.DEFAULT_POLLING_DELAY = exports.MARKETPLACE_FOLDER = exports.HUBSPOT_FOLDER = exports.FEEDBACK_INTERVAL = exports.DEFAULT_PROJECT_TEMPLATE_BRANCH = exports.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH = void 0;
 exports.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH = 'HubSpot/hubspot-project-components';
 exports.DEFAULT_PROJECT_TEMPLATE_BRANCH = 'main';
 exports.FEEDBACK_INTERVAL = 10;
@@ -41,6 +41,7 @@ exports.PROJECT_ERROR_TYPES = {
     BUILD_NOT_IN_PROGRESS: 'BuildPipelineErrorType.BUILD_NOT_IN_PROGRESS',
     SUBBUILD_FAILED: 'BuildPipelineErrorType.DEPENDENT_SUBBUILD_FAILED',
     SUBDEPLOY_FAILED: 'DeployPipelineErrorType.DEPENDENT_SUBDEPLOY_FAILED',
+    DEPLOY_CONTAINS_REMOVALS: 'DeployPipelineErrorType.WARNING_DEPLOY_CONTAINS_REMOVALS',
 };
 exports.PROJECT_TASK_TYPES = {
     PRIVATE_APP: 'private app',
@@ -93,6 +94,10 @@ exports.oAuth = 'oauth';
 exports.privateDistribution = 'private';
 exports.marketplaceDistribution = 'marketplace';
 exports.appComponent = 'app';
+exports.GET_STARTED_OPTIONS = {
+    APP: 'APP',
+    CMS: 'CMS',
+};
 exports.LOCAL_DEV_SERVER_MESSAGE_TYPES = {
     INITIAL: 'INITIAL',
     WEBSOCKET_SERVER_CONNECTED: 'WEBSOCKET_SERVER_CONNECTED',

package/lib/doctor/Doctor.js

@@ -262,7 +262,7 @@ class Doctor {
             this.diagnosis?.addCliSection({
                 type: 'success',
                 message: i18n(`lib.doctor.hsChecks.latest`, {
-                    hsVersion: latestCLIVersion,
+                    hsVersion: package_json_1.default.version,
                 }),
             });
         }

package/lib/errorHandlers/index.js

@@ -15,6 +15,10 @@ const util_1 = __importDefault(require("util"));
 const ui_1 = require("../ui");
 function logError(error, context) {
     debugError(error, context);
+    if (isProjectValidationError(error)) {
+        logger_1.logger.error(error.message);
+        return;
+    }
     if ((0, suppressError_1.shouldSuppressError)(error, context)) {
         return;
     }
@@ -89,6 +93,9 @@ class ApiErrorContext {
     }
 }
 exports.ApiErrorContext = ApiErrorContext;
+function isProjectValidationError(error) {
+    return error instanceof Error && error.name === 'ProjectValidationError';
+}
 function isErrorWithMessageOrReason(error) {
     return (typeof error === 'object' &&
         error !== null &&

package/lib/mcp/setup.d.ts

@@ -0,0 +1,21 @@
+export declare const supportedTools: ({
+    name: "Claude Code";
+    value: string;
+} | {
+    name: "Cursor";
+    value: string;
+} | {
+    name: "Windsurf";
+    value: string;
+})[];
+interface McpCommand {
+    command: string;
+    args: string[];
+}
+export declare function addMintlifyMcpServer(installTargets: string[]): Promise<void>;
+export declare function setupMintlify(derivedTargets?: string[]): Promise<boolean>;
+export declare function addMcpServerToConfig(targets: string[] | undefined): Promise<string[]>;
+export declare function setupClaudeCode(mcpCommand?: McpCommand): Promise<boolean>;
+export declare function setupCursor(mcpCommand?: McpCommand): boolean;
+export declare function setupWindsurf(mcpCommand?: McpCommand): boolean;
+export {};

package/lib/mcp/setup.js

@@ -0,0 +1,218 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.supportedTools = void 0;
+exports.addMintlifyMcpServer = addMintlifyMcpServer;
+exports.setupMintlify = setupMintlify;
+exports.addMcpServerToConfig = addMcpServerToConfig;
+exports.setupClaudeCode = setupClaudeCode;
+exports.setupCursor = setupCursor;
+exports.setupWindsurf = setupWindsurf;
+const logger_1 = require("../ui/logger");
+const en_1 = require("../../lang/en");
+const promptUtils_1 = require("../prompts/promptUtils");
+const SpinniesManager_1 = __importDefault(require("../ui/SpinniesManager"));
+const errorHandlers_1 = require("../errorHandlers");
+const command_1 = require("../../mcp-server/utils/command");
+const child_process_1 = require("child_process");
+const path_1 = __importDefault(require("path"));
+const os_1 = __importDefault(require("os"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const fs_1 = require("fs");
+const mcpServerName = 'hubspot-cli-mcp';
+const claudeCode = 'claude';
+const windsurf = 'windsurf';
+const cursor = 'cursor';
+const supportedMintlifyClients = [windsurf, cursor];
+exports.supportedTools = [
+    { name: en_1.commands.mcp.setup.claudeCode, value: claudeCode },
+    { name: en_1.commands.mcp.setup.cursor, value: cursor },
+    { name: en_1.commands.mcp.setup.windsurf, value: windsurf },
+];
+const defaultMcpCommand = {
+    command: 'hs',
+    args: ['mcp', 'start'],
+};
+async function addMintlifyMcpServer(installTargets) {
+    await runSetupFunction(() => setupMintlify(installTargets));
+}
+async function setupMintlify(derivedTargets = supportedMintlifyClients) {
+    logger_1.uiLogger.info(en_1.commands.mcp.setup.installingDocSearch);
+    logger_1.uiLogger.log('');
+    return new Promise(resolve => {
+        const subcommands = ['mint-mcp', 'add', 'hubspot-migration'];
+        const docsSearchClients = derivedTargets.filter(target => supportedMintlifyClients.includes(target));
+        const childProcess = (0, child_process_1.spawn)(`npx`, docsSearchClients && docsSearchClients.length
+            ? [...subcommands, '--client', ...docsSearchClients]
+            : subcommands, {
+            stdio: 'inherit',
+        });
+        childProcess.on('exit', code => {
+            if (code !== 0) {
+                resolve(false);
+            }
+            resolve(true);
+        });
+    });
+}
+async function addMcpServerToConfig(targets) {
+    try {
+        let derivedTargets = [];
+        if (!targets || targets.length === 0) {
+            const { selectedTargets } = await (0, promptUtils_1.promptUser)({
+                name: 'selectedTargets',
+                type: 'checkbox',
+                message: en_1.commands.mcp.setup.prompts.targets,
+                choices: exports.supportedTools,
+                validate: (choices) => {
+                    return choices.length === 0
+                        ? en_1.commands.mcp.setup.prompts.targetsRequired
+                        : true;
+                },
+            });
+            derivedTargets = selectedTargets;
+        }
+        else {
+            derivedTargets = targets;
+        }
+        SpinniesManager_1.default.init();
+        if (derivedTargets.includes(claudeCode)) {
+            await runSetupFunction(setupClaudeCode);
+        }
+        if (derivedTargets.includes(cursor)) {
+            await runSetupFunction(setupCursor);
+        }
+        if (derivedTargets.includes(windsurf)) {
+            await runSetupFunction(setupWindsurf);
+        }
+        logger_1.uiLogger.info(en_1.commands.mcp.setup.success(derivedTargets));
+        return derivedTargets;
+    }
+    catch (error) {
+        SpinniesManager_1.default.fail('mcpSetup', {
+            text: en_1.commands.mcp.setup.spinners.failedToConfigure,
+        });
+        throw error;
+    }
+}
+async function runSetupFunction(func) {
+    const result = await func();
+    if (!result) {
+        throw new Error();
+    }
+}
+function setupMcpConfigFile(config) {
+    try {
+        SpinniesManager_1.default.add('spinner', {
+            text: config.configuringMessage,
+        });
+        if (!(0, fs_1.existsSync)(config.configPath)) {
+            fs_extra_1.default.writeFileSync(config.configPath, JSON.stringify({}, null, 2));
+        }
+        let mcpConfig = {};
+        try {
+            const configContent = fs_extra_1.default.readFileSync(config.configPath, 'utf8');
+            mcpConfig = JSON.parse(configContent);
+        }
+        catch (error) {
+            SpinniesManager_1.default.fail('spinner', {
+                text: config.failedMessage,
+            });
+            (0, errorHandlers_1.logError)(error);
+            return false;
+        }
+        // Initialize mcpServers if it doesn't exist
+        if (!mcpConfig.mcpServers) {
+            mcpConfig.mcpServers = {};
+        }
+        // Add or update HubSpot CLI MCP server
+        mcpConfig.mcpServers[mcpServerName] = {
+            ...config.mcpCommand,
+        };
+        // Write the updated config
+        fs_extra_1.default.writeFileSync(config.configPath, JSON.stringify(mcpConfig, null, 2));
+        SpinniesManager_1.default.succeed('spinner', {
+            text: config.configuredMessage,
+        });
+        return true;
+    }
+    catch (error) {
+        SpinniesManager_1.default.fail('spinner', {
+            text: config.failedMessage,
+        });
+        (0, errorHandlers_1.logError)(error);
+        return false;
+    }
+}
+async function setupClaudeCode(mcpCommand = defaultMcpCommand) {
+    try {
+        SpinniesManager_1.default.add('claudeCode', {
+            text: en_1.commands.mcp.setup.spinners.configuringClaudeCode,
+        });
+        try {
+            // Check if claude command is available
+            await (0, command_1.execAsync)('claude --version');
+            // Run claude mcp add command
+            const mcpConfig = JSON.stringify({
+                type: 'stdio',
+                ...mcpCommand,
+            });
+            const { stdout } = await (0, command_1.execAsync)('claude mcp list');
+            if (stdout.includes(mcpServerName)) {
+                SpinniesManager_1.default.update('claudeCode', {
+                    text: en_1.commands.mcp.setup.spinners.alreadyInstalled,
+                });
+                await (0, command_1.execAsync)(`claude mcp remove "${mcpServerName}" --scope user`);
+            }
+            await (0, command_1.execAsync)(`claude mcp add-json "${mcpServerName}" '${mcpConfig}' --scope user`);
+            SpinniesManager_1.default.succeed('claudeCode', {
+                text: en_1.commands.mcp.setup.spinners.configuredClaudeCode,
+            });
+            return true;
+        }
+        catch (error) {
+            if (error instanceof Error &&
+                error.message.includes('claude: command not found')) {
+                SpinniesManager_1.default.fail('claudeCode', {
+                    text: en_1.commands.mcp.setup.spinners.claudeCodeNotFound,
+                });
+            }
+            else {
+                SpinniesManager_1.default.fail('claudeCode', {
+                    text: en_1.commands.mcp.setup.spinners.claudeCodeInstallFailed,
+                });
+                (0, errorHandlers_1.logError)(error);
+            }
+            return false;
+        }
+    }
+    catch (error) {
+        SpinniesManager_1.default.fail('claudeCode', {
+            text: en_1.commands.mcp.setup.spinners.claudeCodeInstallFailed,
+        });
+        (0, errorHandlers_1.logError)(error);
+        return false;
+    }
+}
+function setupCursor(mcpCommand = defaultMcpCommand) {
+    const cursorConfigPath = path_1.default.join(os_1.default.homedir(), '.cursor', 'mcp.json');
+    return setupMcpConfigFile({
+        configPath: cursorConfigPath,
+        configuringMessage: en_1.commands.mcp.setup.spinners.configuringCursor,
+        configuredMessage: en_1.commands.mcp.setup.spinners.configuredCursor,
+        failedMessage: en_1.commands.mcp.setup.spinners.failedToConfigureCursor,
+        mcpCommand,
+    });
+}
+function setupWindsurf(mcpCommand = defaultMcpCommand) {
+    const windsurfConfigPath = path_1.default.join(os_1.default.homedir(), '.codeium', 'windsurf', 'mcp_config.json');
+    return setupMcpConfigFile({
+        configPath: windsurfConfigPath,
+        configuringMessage: en_1.commands.mcp.setup.spinners.configuringWindsurf,
+        configuredMessage: en_1.commands.mcp.setup.spinners.configuredWindsurf,
+        failedMessage: en_1.commands.mcp.setup.spinners.failedToConfigureWindsurf,
+        mcpCommand,
+    });
+}

package/lib/projectProfiles.d.ts

@@ -4,3 +4,4 @@ export declare function logProfileHeader(profileName: string): void;
 export declare function logProfileFooter(profile: HsProfileFile, includeVariables?: boolean): void;
 export declare function loadProfile(projectConfig: ProjectConfig | null, projectDir: string | null, profileName: string): HsProfileFile | undefined;
 export declare function exitIfUsingProfiles(projectConfig: ProjectConfig | null, projectDir: string | null): Promise<void>;
+export declare function loadAndValidateProfile(projectConfig: ProjectConfig | null, projectDir: string | null, argsProfile: string | undefined): Promise<number | undefined>;

package/lib/projectProfiles.js

@@ -7,6 +7,7 @@ exports.logProfileHeader = logProfileHeader;
 exports.logProfileFooter = logProfileFooter;
 exports.loadProfile = loadProfile;
 exports.exitIfUsingProfiles = exitIfUsingProfiles;
+exports.loadAndValidateProfile = loadAndValidateProfile;
 const path_1 = __importDefault(require("path"));
 const project_parsing_lib_1 = require("@hubspot/project-parsing-lib");
 const en_1 = require("../lang/en");
@@ -63,3 +64,20 @@ async function exitIfUsingProfiles(projectConfig, projectDir) {
         }
     }
 }
+async function loadAndValidateProfile(projectConfig, projectDir, argsProfile) {
+    if (argsProfile) {
+        logProfileHeader(argsProfile);
+        const profile = loadProfile(projectConfig, projectDir, argsProfile);
+        if (!profile) {
+            (0, ui_1.uiLine)();
+            process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        }
+        logProfileFooter(profile, true);
+        return profile.accountId;
+    }
+    else {
+        // A profile must be specified if this project has profiles configured
+        await exitIfUsingProfiles(projectConfig, projectDir);
+    }
+    return undefined;
+}

package/lib/projects/buildAndDeploy.js

@@ -228,7 +228,7 @@ function makePollTaskStatusFunc({ statusFn, structureFn, statusText, statusStrin
 }
 function pollBuildAutodeployStatus(accountId, taskName, buildId) {
     return new Promise((resolve, reject) => {
-        let maxIntervals = (30 * 1000) / constants_1.DEFAULT_POLLING_DELAY; // Num of intervals in ~30s
+        let maxIntervals = (15 * 1000) / constants_1.DEFAULT_POLLING_DELAY; // Num of intervals in ~15s
         const pollInterval = setInterval(async () => {
             let build;
             try {

package/lib/projects/localDev/AppDevModeInterface.d.ts

@@ -14,9 +14,12 @@ declare class AppDevModeInterface {
     private get appNode();
     private get appData();
     private set appData(value);
+    private isAutomaticallyInstallable;
     private getAppInstallUrl;
     private fetchAppData;
     private checkMarketplaceAppInstalls;
+    private autoInstallStaticAuthApp;
+    private installAppOrOpenInstallUrl;
     private checkTestAccountAppInstallation;
     private setUpLocalDevServerMessageListeners;
     setup(args: any): Promise<void>;

package/lib/projects/localDev/AppDevModeInterface.js

@@ -4,6 +4,7 @@ const localDevAuth_1 = require("@hubspot/local-dev-lib/api/localDevAuth");
 const appsDev_1 = require("@hubspot/local-dev-lib/api/appsDev");
 const ui_extensions_dev_server_1 = require("@hubspot/ui-extensions-dev-server");
 const portManager_1 = require("@hubspot/local-dev-lib/portManager");
+const config_1 = require("@hubspot/local-dev-lib/config");
 const constants_1 = require("../../constants");
 const exitCodes_1 = require("../../enums/exitCodes");
 const structure_1 = require("../../projects/structure");
@@ -14,6 +15,7 @@ const promptUtils_1 = require("../../prompts/promptUtils");
 const en_1 = require("../../../lang/en");
 const logger_1 = require("../../ui/logger");
 const urls_1 = require("../../app/urls");
+const accountTypes_1 = require("../../accountTypes");
 class AppDevModeInterface {
     localDevState;
     localDevLogger;
@@ -22,15 +24,6 @@ class AppDevModeInterface {
     constructor(options) {
         this.localDevState = options.localDevState;
         this.localDevLogger = options.localDevLogger;
-        // Static auth apps are currently only installable in the portal that the project resides in
-        // This limitation will eventually be removed, but in the meantime we need this check or the install
-        // will always fail with a confusing message
-        if (this.appNode?.config.auth.type === constants_1.APP_AUTH_TYPES.STATIC &&
-            this.localDevState.targetTestingAccountId !==
-                this.localDevState.targetProjectAccountId) {
-            logger_1.uiLogger.error(en_1.lib.LocalDevManager.staticAuthAccountsMustMatch);
-            process.exit(exitCodes_1.EXIT_CODES.ERROR);
-        }
         if (!this.localDevState.targetProjectAccountId ||
             !this.localDevState.projectConfig ||
             !this.localDevState.projectDir) {
@@ -59,6 +52,19 @@ class AppDevModeInterface {
         }
         this.localDevState.setAppDataForUid(this.appNode.uid, appData);
     }
+    isAutomaticallyInstallable() {
+        const targetTestingAccount = (0, config_1.getAccountConfig)(this.localDevState.targetTestingAccountId);
+        if (!targetTestingAccount) {
+            return false;
+        }
+        const isTestAccount = (0, accountTypes_1.isDeveloperTestAccount)(targetTestingAccount) ||
+            (0, accountTypes_1.isSandbox)(targetTestingAccount);
+        const hasCorrectParent = targetTestingAccount.parentAccountId ===
+            this.localDevState.targetProjectAccountId;
+        return (isTestAccount &&
+            hasCorrectParent &&
+            this.appNode?.config.auth.type === constants_1.APP_AUTH_TYPES.STATIC);
+    }
     async getAppInstallUrl() {
         if (this.appNode?.config.auth.type === constants_1.APP_AUTH_TYPES.OAUTH) {
             return (0, urls_1.getOauthAppInstallUrl)({
@@ -72,7 +78,7 @@ class AppDevModeInterface {
         const { data: { results }, } = await (0, appsDev_1.fetchPublicAppsForPortal)(this.localDevState.targetProjectAccountId);
         const app = results.find(app => app.sourceId === this.appNode?.uid);
         if (!app) {
-            logger_1.uiLogger.error(en_1.lib.LocalDevManager.staticAuthAccountsMustMatch);
+            logger_1.uiLogger.error(en_1.lib.LocalDevManager.appNotFound(this.localDevState.targetProjectAccountId, this.appNode?.uid));
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
         return (0, urls_1.getStaticAuthAppInstallUrl)({
@@ -93,6 +99,7 @@ class AppDevModeInterface {
             clientId: appData.clientId,
             name: appData.name,
             installationState: constants_1.APP_INSTALLATION_STATES.NOT_INSTALLED,
+            scopeGroupIds: appData.scopeGroupIds,
         };
         this.marketplaceAppInstalls = uniquePortalInstallCount;
     }
@@ -110,9 +117,31 @@ class AppDevModeInterface {
         }
         this.localDevLogger.addUploadWarning(en_1.lib.AppDevModeInterface.defaultMarketplaceAppWarning(this.marketplaceAppInstalls));
     }
+    async autoInstallStaticAuthApp() {
+        const shouldInstall = await (0, installAppPrompt_1.installAppAutoPrompt)();
+        if (!shouldInstall) {
+            logger_1.uiLogger.log(en_1.lib.AppDevModeInterface.autoInstallDeclined);
+            process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+        }
+        await (0, appsDev_1.installStaticAuthAppOnTestAccount)(this.appData.id, this.localDevState.targetTestingAccountId, this.appData.scopeGroupIds);
+    }
+    async installAppOrOpenInstallUrl(isReinstall) {
+        if (this.isAutomaticallyInstallable()) {
+            try {
+                await this.autoInstallStaticAuthApp();
+                logger_1.uiLogger.success(en_1.lib.AppDevModeInterface.autoInstallSuccess(this.appData.name, this.localDevState.targetTestingAccountId));
+                return;
+            }
+            catch (e) {
+                logger_1.uiLogger.error(en_1.lib.AppDevModeInterface.autoInstallError(this.appData.name, this.localDevState.targetTestingAccountId));
+            }
+        }
+        const installUrl = await this.getAppInstallUrl();
+        await (0, installAppPrompt_1.installAppBrowserPrompt)(installUrl, isReinstall);
+    }
     async checkTestAccountAppInstallation() {
         if (!this.appNode || !this.appData) {
-            return;
+            return {};
         }
         const { data: { isInstalledWithScopeGroups, previouslyAuthorizedScopeGroups }, } = await (0, localDevAuth_1.fetchAppInstallationData)(this.localDevState.targetTestingAccountId, this.localDevState.projectId, this.appNode.uid, this.appNode.config.auth.requiredScopes, this.appNode.config.auth.optionalScopes);
         const isReinstall = previouslyAuthorizedScopeGroups.length > 0;
@@ -128,10 +157,7 @@ class AppDevModeInterface {
                 installationState: constants_1.APP_INSTALLATION_STATES.INSTALLED_WITH_OUTDATED_SCOPES,
             };
         }
-        if (!isInstalledWithScopeGroups) {
-            const installUrl = await this.getAppInstallUrl();
-            await (0, installAppPrompt_1.installAppPrompt)(installUrl, isReinstall);
-        }
+        return { needsInstall: !isInstalledWithScopeGroups, isReinstall };
     }
     setUpLocalDevServerMessageListeners() {
         this.localDevState.addListener('devServerMessage', message => {
@@ -151,7 +177,10 @@ class AppDevModeInterface {
             if (this.appNode.config.distribution === constants_1.APP_DISTRIBUTION_TYPES.MARKETPLACE) {
                 await this.checkMarketplaceAppInstalls();
             }
-            await this.checkTestAccountAppInstallation();
+            const { needsInstall, isReinstall } = await this.checkTestAccountAppInstallation();
+            if (needsInstall) {
+                await this.installAppOrOpenInstallUrl(isReinstall || false);
+            }
         }
         catch (e) {
             (0, index_1.logError)(e);

package/lib/projects/localDev/LocalDevManager.js

@@ -195,7 +195,7 @@ class LocalDevManager {
                 scopes: this.activeApp.config.auth.requiredScopes,
                 redirectUrls: this.activeApp.config.auth.redirectUrls,
             });
-            await (0, installAppPrompt_1.installAppPrompt)(installUrl, isReinstall);
+            await (0, installAppPrompt_1.installAppBrowserPrompt)(installUrl, isReinstall);
         }
     }
     updateKeypressListeners() {

package/lib/projects/upload.d.ts

@@ -18,4 +18,7 @@ type HandleProjectUploadArg<T> = {
     profile?: string;
 };
 export declare function handleProjectUpload<T>({ accountId, projectConfig, projectDir, callbackFunc, profile, uploadMessage, forceCreate, isUploadCommand, sendIR, skipValidation, }: HandleProjectUploadArg<T>): Promise<ProjectUploadResult<T>>;
+export declare function validateSourceDirectory(srcDir: string, projectConfig: ProjectConfig): void;
+export declare function validateNoHSMetaMismatch(srcDir: string, projectConfig: ProjectConfig): Promise<void>;
+export declare function handleTranslate(projectDir: string, projectConfig: ProjectConfig, accountId: number, skipValidation: boolean, profile: string | undefined): Promise<unknown>;
 export {};