@hubspot/cli 7.7.20-experimental.0 → 7.7.21-experimental.1

package/lang/en.js

@@ -50,7 +50,6 @@ exports.commands = {
                 app: 'App',
                 cms: 'CMS',
             },
-            installDependencies: 'Would you like to install dependencies now?',
             uploadProject: 'Would you like to upload your project to HubSpot now?',
             projectCreated: {
                 title: chalk_1.default.bold('Next steps:'),
@@ -60,7 +59,6 @@ exports.commands = {
         logs: {
             appSelected: `We'll create a new project with a sample app for you.\nProjects are what you can use to create apps, themes, and more at HubSpot.\nUsually you'll use the ${(0, ui_1.uiCommandReference)('hs project create')} command, but we'll go ahead and make one now.`,
             dependenciesInstalled: 'Dependencies installed successfully.',
-            dependenciesNotInstalled: `Dependencies not installed. Remember to do this later with the command ${(0, ui_1.uiCommandReference)('hs project install-deps')} from the project directory.`,
             uploadingProject: 'Uploading your project to HubSpot...',
             uploadSuccess: 'Project uploaded successfully!',
             developerOverviewLink: 'Open this link to navigate to your HubSpot developer portal',
@@ -1141,19 +1139,19 @@ exports.commands = {
                     describe: 'Which features to include with the application.',
                 },
             },
-            creatingComponent: (projectName) => `\nAdding a new component to ${chalk_1.default.bold(projectName)}\n`,
+            creatingComponent: (projectName) => `\nAdding a new app feature to ${chalk_1.default.bold(projectName)}\n`,
             success: (componentName, multiple = false) => `${componentName || 'An app'} ${multiple ? 'were' : 'was'} successfully added to your ${componentName ? 'app' : 'project'}.`,
             error: {
-                failedToDownloadComponent: 'Failed to download project component. Please try again later.',
+                failedToDownloadComponent: 'Failed to download project. Please try again later.',
                 maxExceeded: (maxCount) => `This project has the maximum allowed(${maxCount})`,
                 authTypeNotAllowed: (authType) => `Auth type '${authType}' not allowed.`,
                 distributionNotAllowed: (dist) => `Distribution '${dist}' not allowed.`,
                 locationInProject: 'This command must be run from within a project directory.',
-                failedToFetchComponentList: 'Failed to fetch the list of available components. Please try again later.',
+                failedToFetchComponentList: 'Failed to fetch the list of available features. Please try again later.',
                 projectContainsPublicApp: 'This project contains a public app. This command is currently only compatible with projects that contain private apps.',
             },
             examples: {
-                default: 'Create a component within your project',
+                default: 'Create an app feature within your project',
                 withFlags: 'Use --name and --type flags to bypass the prompt.',
             },
         },
@@ -1164,25 +1162,24 @@ exports.commands = {
                 deploying: (path) => `Deploying project at path: ${path}`,
             },
             errors: {
-                deploy: (details) => `Deploy error: ${details}`,
+                deploy: 'Deploy error: an unknown error occurred.',
                 noBuilds: 'Deploy error: no builds for this project were found.',
                 noBuildId: 'You must specify a build to deploy',
-                projectNotFound: (projectName, accountIdentifier, command) => `The project ${chalk_1.default.bold(projectName)} does not exist in account ${accountIdentifier}. Run ${command} to upload your project files to HubSpot.`,
-                buildIdDoesNotExist: (buildId, projectName, linkToProject) => `Build ${buildId} does not exist for project ${chalk_1.default.bold(projectName)}. ${linkToProject}`,
-                buildAlreadyDeployed: (buildId, linkToProject) => `Build ${buildId} is already deployed. ${linkToProject}`,
-                viewProjectsBuilds: 'View project builds in HubSpot',
+                projectNotFound: (accountId, projectName) => `The project ${chalk_1.default.bold(projectName)} does not exist in account ${(0, ui_1.uiAccountDescription)(accountId)}. Run ${(0, ui_1.uiCommandReference)('hs project upload')} to upload your project files to HubSpot.`,
+                buildIdDoesNotExist: (accountId, buildId, projectName) => `Build ${buildId} does not exist for project ${chalk_1.default.bold(projectName)}. ${(0, ui_1.uiLink)('View project builds in HubSpot', (0, urls_1.getProjectDetailUrl)(projectName, accountId))}`,
+                buildAlreadyDeployed: (accountId, buildId, projectName) => `Build ${buildId} is already deployed. ${(0, ui_1.uiLink)('View project builds in HubSpot', (0, urls_1.getProjectDetailUrl)(projectName, accountId))}`,
+                deployContainsRemovals: (componentName) => `- This deploy would remove the ${chalk_1.default.bold(componentName)} component. To proceed, run the deploy command with the ${(0, ui_1.uiCommandReference)('--force')} flag`,
             },
             examples: {
                 default: 'Deploy the latest build of the current project',
                 withOptions: 'Deploy build 5 of the project my-project',
             },
             options: {
-                build: {
-                    describe: 'Project build ID to be deployed',
-                },
-                project: {
-                    describe: 'Project name',
-                },
+                build: 'Project build ID to be deployed',
+                project: 'Project name',
+                profile: 'The profile to target with this deploy',
+                force: 'Skip warnings and force deploy. Use this carefully as it will bypass warnings for destructive actions.',
+                deployLatestBuild: 'Deploy the latest build of the current project',
             },
         },
         listBuilds: {
@@ -1501,6 +1498,28 @@ exports.commands = {
     app: {
         describe: 'Commands for managing apps.',
         subcommands: {
+            install: {
+                describe: 'Install an OAuth app into a test account.',
+                options: {
+                    appUid: 'The uid of the app to install',
+                    projectName: 'The name of the project that contains the app',
+                },
+                positionals: {
+                    testAccountId: 'The id of the test account to install the app into',
+                },
+                errors: {
+                    mustSpecifyProjectName: `You must specify a project name. Use the ${(0, ui_1.uiCommandReference)('--project-name')} flag to specify the project name or run this command from within a project directory.`,
+                    noAppUidFound: `No app uid found. Please specify the app uid with the ${(0, ui_1.uiCommandReference)('--app-uid')} flag or run this command from within a project that contains an app.`,
+                    appMustBeOauth: 'This command only supports installing oauth apps. Please specify an app with oauth auth type.',
+                },
+                polling: {
+                    start: 'Installing app...',
+                    success: 'App installed successfully',
+                    failure: 'App installation failed',
+                    error: 'Error installing app',
+                },
+                example: 'Install the app with uid my-app-uid from the project named "my-project" into the target account with id 1234567890',
+            },
             secret: {
                 describe: 'Commands for managing secrets.',
                 subcommands: {
@@ -1810,7 +1829,7 @@ exports.commands = {
                 start: (testAccountName) => `Creating test account "${chalk_1.default.bold(testAccountName)}"...`,
                 syncing: 'Test account created! Syncing account data... (may take a few minutes - you can exit and the sync will continue)',
                 success: (testAccountName, testAccountId) => `Test account "${chalk_1.default.bold(testAccountName)}" successfully created with id: ${chalk_1.default.bold(testAccountId)}`,
-                failure: 'Failed to sync data into test account. The account may not be ready to use.',
+                createFailure: 'Failed to create test account.',
             },
             options: {
                 configPath: 'The path to the test account config',
@@ -1819,7 +1838,7 @@ exports.commands = {
         },
         createConfig: {
             describe: 'Create a test account config file.',
-            pathPrompt: '[--path] What is the path to the test account config?',
+            pathPrompt: '[--path] Enter the name of the Test Account config file: ',
             errors: {
                 pathError: 'Path is required',
                 pathFormatError: 'Path must end with .json',
@@ -1832,7 +1851,6 @@ exports.commands = {
             options: {
                 name: 'The name of the test account',
                 description: 'The description of the test account',
-                tiers: 'The tiers of the test account',
                 path: 'The path to the test account config',
             },
             example: (name) => `Create a test account config file with the name "${name}"`,
@@ -2759,6 +2777,12 @@ exports.lib = {
             noLogsFound: 'No logs found.',
         },
     },
+    buildAccount: {
+        createDeveloperTestAccountV3: {
+            syncFailure: 'Failed to sync developer test account',
+            pakFailure: 'Failed to generate personal access key for developer test account',
+        },
+    },
     configOptions: {
         enableOrDisableBooleanFieldPrompt: {
             message: (fieldName) => `Choose to enable or disable ${fieldName}`,
@@ -2841,11 +2865,25 @@ exports.lib = {
             keepingCurrentDefault: (accountName) => `Account "${accountName}" will continue to be the default account`,
         },
         createDeveloperTestAccountConfigPrompt: {
-            namePrompt: '[--name] What is the name of the test account?',
-            descriptionPrompt: '[--description] What is the description of the test account?',
-            tiersPrompt: '[--tiers] Which product tiers should the test account have?',
+            namePrompt: (withFlag = true) => `${withFlag ? '[--name] ' : ''}Enter the name of the Test Account:`,
+            descriptionPrompt: (withFlag = true) => `${withFlag ? '[--description] ' : ''}Enter the description of the Test Account:`,
+            useDefaultAccountLevelsPrompt: {
+                message: 'Would you like to create a default Test Account, or customize your own?',
+                default: 'Default (All Hubs, ENTERPRISE)',
+                manual: 'Customize my own',
+            },
+            tiersPrompt: 'Select an option per hub to customize tiers. If left blank, default is ENTERPRISE',
+            hubTypes: {
+                marketing: 'Marketing',
+                ops: 'Ops',
+                service: 'Service',
+                sales: 'Sales',
+                content: 'Content',
+            },
             errors: {
+                allHubsRequired: 'Select a tier for each hub',
                 tiersError: 'Cannot have more than one tier per hub',
+                nameRequired: 'The name may not be blank. Please add a name for the Test Account.',
             },
         },
         accountNamePrompt: {
@@ -2968,7 +3006,7 @@ exports.lib = {
             },
         },
         projectAddPrompt: {
-            selectType: '[--type] Select a component to add: ',
+            selectType: '[--type] Select an app feature to add: ',
             enterName: '[--name] Give your component a name: ',
             errors: {
                 nameRequired: 'A component name is required',

package/lang/en.lyaml

@@ -681,32 +681,6 @@ en:
           examples:
             default: "Create a component within your project"
             withFlags: "Use --name and --type flags to bypass the prompt."
-        deploy:
-          describe: "Deploy a project build."
-          deployBuildIdPrompt: "[--build] Deploy which build?"
-          debug:
-            deploying: "Deploying project at path: {{ path }}"
-          errors:
-            deploy: "Deploy error: an unknown error occurred."
-            noBuilds: "Deploy error: no builds for this project were found."
-            noBuildId: "You must specify a build to deploy"
-            projectNotFound: "The project {{ projectName }} does not exist in account {{ accountIdentifier }}. Run {{ command }} to upload your project files to HubSpot."
-            buildIdDoesNotExist: "Build {{ buildId }} does not exist for project {{ projectName }}. {{ linkToProject }}"
-            buildAlreadyDeployed: "Build {{ buildId }} is already deployed. {{ linkToProject}}"
-            viewProjectsBuilds: 'View project builds in HubSpot'
-            deployContainsRemovals: "- This deploy would remove the {{#bold}}{{ componentName }}{{/bold}} component. To proceed, run the deploy command with the {{ forceFlag }} flag"
-          examples:
-            default: "Deploy the latest build of the current project"
-            withOptions: "Deploy build 5 of the project my-project"
-          options:
-            build:
-              describe: "Project build ID to be deployed"
-            project:
-              describe: "Project name"
-            profile:
-              describe: "The profile to target with this deploy"
-            force:
-              describe: "Skip warnings and force deploy. Use this carefully as it will bypass warnings for destructive actions."
         listBuilds:
           describe: "List the project's builds."
           continueOrExitPrompt: "Press <enter> to load more, or ctrl+c to exit"

package/lib/__tests__/buildAccount.test.js

@@ -65,6 +65,8 @@ const mockedWriteConfig = config_1.writeConfig;
 const mockedCliAccountNamePrompt = accountNamePrompt_1.cliAccountNamePrompt;
 const mockedGetAccountId = config_1.getAccountId;
 const mockedCreateDeveloperTestAccount = developerTestAccounts_1.createDeveloperTestAccount;
+const mockedFetchDeveloperTestAccountGateSyncStatus = developerTestAccounts_1.fetchDeveloperTestAccountGateSyncStatus;
+const mockedGenerateDeveloperTestAccountPersonalAccessKey = developerTestAccounts_1.generateDeveloperTestAccountPersonalAccessKey;
 const mockedCreateSandbox = sandboxHubs_1.createSandbox;
 describe('lib/buildAccount', () => {
     describe('saveAccountToConfig()', () => {
@@ -132,11 +134,37 @@ describe('lib/buildAccount', () => {
             expect(result).toBe('test-account-with-new-name');
         });
     });
+    describe('createDeveloperTestAccountV3()', () => {
+        const parentAccountId = 123456;
+        const mockDeveoperTestAccountConfig = {
+            accountName: 'Developer Test Account',
+            description: 'Test Account created by the HubSpot CLI',
+        };
+        beforeEach(() => {
+            mockedCreateDeveloperTestAccount.mockResolvedValue({
+                data: { id: 123456 },
+            });
+            mockedFetchDeveloperTestAccountGateSyncStatus.mockResolvedValue({
+                data: { status: 'SUCCESS' },
+            });
+            mockedGenerateDeveloperTestAccountPersonalAccessKey.mockResolvedValue({
+                data: { personalAccessKey: 'test-key' },
+            });
+        });
+        it('should create a developer test account successfully', async () => {
+            const result = await buildAccount.createDeveloperTestAccountV3(parentAccountId, mockDeveoperTestAccountConfig);
+            expect(result).toEqual({
+                accountName: mockDeveoperTestAccountConfig.accountName,
+                accountId: 123456,
+                personalAccessKey: 'test-key',
+            });
+        }, 10000);
+    });
     describe('buildDeveloperTestAccount()', () => {
         const mockParentAccountConfig = {
-            name: 'Developer Test Account',
+            name: 'Developer Account',
             accountId: 123456,
-            accountType: config_2.HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST,
+            accountType: config_2.HUBSPOT_ACCOUNT_TYPES.APP_DEVELOPER,
             env: 'prod',
         };
         const mockDeveloperTestAccount = {

package/lib/__tests__/usageTracking.test.js

@@ -31,8 +31,6 @@ describe('lib/usageTracking', () => {
         });
         it('should track command usage with default auth type', async () => {
             await (0, usageTracking_1.trackCommandUsage)(mockCommand, {}, mockAccountId);
-            // Allow setImmediate to execute
-            await new Promise(resolve => setImmediate(resolve));
             expect(mockedTrackUsage).toHaveBeenCalledWith('cli-interaction', 'INTERACTION', expect.objectContaining({
                 action: 'cli-command',
                 command: mockCommand,
@@ -46,18 +44,16 @@ describe('lib/usageTracking', () => {
         it('should track command usage with custom auth type', async () => {
             mockedGetAccountConfig.mockReturnValue({ authType: 'oauth2' });
             await (0, usageTracking_1.trackCommandUsage)(mockCommand, {}, mockAccountId);
-            // Allow setImmediate to execute
-            await new Promise(resolve => setImmediate(resolve));
             expect(mockedTrackUsage).toHaveBeenCalledWith('cli-interaction', 'INTERACTION', expect.objectContaining({
                 authType: 'oauth2',
             }), mockAccountId);
         });
         it('should handle tracking errors gracefully', async () => {
             const error = new Error('Tracking failed');
-            mockedTrackUsage.mockRejectedValue(error);
+            mockedTrackUsage.mockImplementationOnce(() => {
+                throw error;
+            });
             await (0, usageTracking_1.trackCommandUsage)(mockCommand);
-            // Allow setImmediate to execute
-            await new Promise(resolve => setImmediate(resolve));
             expect(mockedLogger.debug).toHaveBeenCalledWith(expect.stringContaining(error.message));
         });
     });
@@ -77,7 +73,7 @@ describe('lib/usageTracking', () => {
                 nodeVersion: mockNodeVersion,
                 nodeMajorVersion: 'v16',
                 version: package_json_1.version,
-            }));
+            }), undefined);
         });
         it('should track main help usage without command', async () => {
             await (0, usageTracking_1.trackHelpUsage)('');
@@ -100,7 +96,7 @@ describe('lib/usageTracking', () => {
                 nodeVersion: mockNodeVersion,
                 nodeMajorVersion: 'v16',
                 version: package_json_1.version,
-            }));
+            }), undefined);
         });
     });
     describe('trackAuthAction()', () => {
@@ -138,8 +134,6 @@ describe('lib/usageTracking', () => {
         });
         it('should track command metadata usage', async () => {
             await (0, usageTracking_1.trackCommandMetadataUsage)(mockCommand, mockMeta, mockAccountId);
-            // Allow setImmediate to execute
-            await new Promise(resolve => setImmediate(resolve));
             expect(mockedTrackUsage).toHaveBeenCalledWith('cli-interaction', 'INTERACTION', expect.objectContaining({
                 action: 'cli-command-metadata',
                 command: mockCommand,
@@ -155,17 +149,17 @@ describe('lib/usageTracking', () => {
         it('should return "macos" for darwin platform', async () => {
             Object.defineProperty(process, 'platform', { value: 'darwin' });
             await (0, usageTracking_1.trackHelpUsage)('test');
-            expect(mockedTrackUsage).toHaveBeenCalledWith(expect.anything(), expect.anything(), expect.objectContaining({ os: 'macos' }));
+            expect(mockedTrackUsage).toHaveBeenCalledWith(expect.anything(), expect.anything(), expect.objectContaining({ os: 'macos' }), undefined);
         });
         it('should return "windows" for win32 platform', async () => {
             Object.defineProperty(process, 'platform', { value: 'win32' });
             await (0, usageTracking_1.trackHelpUsage)('test');
-            expect(mockedTrackUsage).toHaveBeenCalledWith(expect.anything(), expect.anything(), expect.objectContaining({ os: 'windows' }));
+            expect(mockedTrackUsage).toHaveBeenCalledWith(expect.anything(), expect.anything(), expect.objectContaining({ os: 'windows' }), undefined);
         });
         it('should return platform name for other platforms', async () => {
             Object.defineProperty(process, 'platform', { value: 'linux' });
             await (0, usageTracking_1.trackHelpUsage)('test');
-            expect(mockedTrackUsage).toHaveBeenCalledWith(expect.anything(), expect.anything(), expect.objectContaining({ os: 'linux' }));
+            expect(mockedTrackUsage).toHaveBeenCalledWith(expect.anything(), expect.anything(), expect.objectContaining({ os: 'linux' }), undefined);
         });
     });
 });

package/lib/buildAccount.d.ts

@@ -1,9 +1,15 @@
+import { DeveloperTestAccountConfig } from '@hubspot/local-dev-lib/types/developerTestAccounts';
 import { Environment } from '@hubspot/local-dev-lib/types/Config';
 import { CLIAccount } from '@hubspot/local-dev-lib/types/Accounts';
 import { SandboxResponse } from '@hubspot/local-dev-lib/types/Sandbox';
 import { SandboxAccountType } from '../types/Sandboxes';
 export declare function saveAccountToConfig(accountId: number | undefined, accountName: string, env: Environment, personalAccessKey?: string, force?: boolean): Promise<string>;
-export declare function buildDeveloperTestAccount(testAccountName: string, parentAccountConfig: CLIAccount, env: Environment, portalLimit: number): Promise<number>;
+export declare function createDeveloperTestAccountV3(parentAccountId: number, testAccountConfig: DeveloperTestAccountConfig): Promise<{
+    accountName: string;
+    accountId?: number;
+    personalAccessKey?: string;
+}>;
+export declare function buildDeveloperTestAccount(testAccountName: string, parentAccountConfig: CLIAccount, env: Environment, portalLimit: number, useV3?: boolean): Promise<number>;
 type SandboxAccount = SandboxResponse & {
     name: string;
 };

package/lib/buildAccount.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.saveAccountToConfig = saveAccountToConfig;
+exports.createDeveloperTestAccountV3 = createDeveloperTestAccountV3;
 exports.buildDeveloperTestAccount = buildDeveloperTestAccount;
 exports.buildSandbox = buildSandbox;
 const personalAccessKey_1 = require("@hubspot/local-dev-lib/personalAccessKey");
@@ -14,12 +15,15 @@ const developerTestAccounts_1 = require("@hubspot/local-dev-lib/api/developerTes
 const config_2 = require("@hubspot/local-dev-lib/constants/config");
 const sandboxHubs_1 = require("@hubspot/local-dev-lib/api/sandboxHubs");
 const personalAccessKeyPrompt_1 = require("./prompts/personalAccessKeyPrompt");
+const createDeveloperTestAccountConfigPrompt_1 = require("./prompts/createDeveloperTestAccountConfigPrompt");
 const lang_1 = require("./lang");
 const accountNamePrompt_1 = require("./prompts/accountNamePrompt");
 const SpinniesManager_1 = __importDefault(require("./ui/SpinniesManager"));
 const index_1 = require("./errorHandlers/index");
 const sandboxes_1 = require("./sandboxes");
 const developerTestAccounts_2 = require("./developerTestAccounts");
+const en_1 = require("../lang/en");
+const polling_1 = require("./polling");
 async function saveAccountToConfig(accountId, accountName, env, personalAccessKey, force = false) {
     if (!personalAccessKey) {
         const configData = await (0, personalAccessKeyPrompt_1.personalAccessKeyPrompt)({
@@ -60,12 +64,51 @@ async function saveAccountToConfig(accountId, accountName, env, personalAccessKe
     logger_1.logger.log('');
     return validName;
 }
-async function buildDeveloperTestAccount(testAccountName, parentAccountConfig, env, portalLimit) {
+async function createDeveloperTestAccountV3(parentAccountId, testAccountConfig) {
+    const result = {
+        accountName: testAccountConfig.accountName,
+    };
+    const { data } = await (0, developerTestAccounts_1.createDeveloperTestAccount)(parentAccountId, testAccountConfig);
+    result.accountId = data.id;
+    try {
+        await (0, polling_1.poll)(() => (0, developerTestAccounts_1.fetchDeveloperTestAccountGateSyncStatus)(parentAccountId, result.accountId), {
+            successStates: ['SUCCESS'],
+            errorStates: [],
+        });
+    }
+    catch (err) {
+        (0, index_1.debugError)(err);
+        throw new Error(en_1.lib.buildAccount.createDeveloperTestAccountV3.syncFailure);
+    }
+    // HACK: The status endpoint sometimes returns an early success status.
+    // Sleep for an extra 5 seconds to make sure the sync is actually complete.
+    await new Promise(resolve => setTimeout(resolve, 5000));
+    try {
+        // Attempt to generate a new personal access key for the test account now that gate sync is complete.
+        const { data } = await (0, developerTestAccounts_1.generateDeveloperTestAccountPersonalAccessKey)(parentAccountId, result.accountId);
+        result.personalAccessKey = data.personalAccessKey;
+    }
+    catch (err) {
+        (0, index_1.debugError)(err);
+        throw new Error(en_1.lib.buildAccount.createDeveloperTestAccountV3.pakFailure);
+    }
+    return result;
+}
+async function buildDeveloperTestAccount(testAccountName, parentAccountConfig, env, portalLimit, useV3 = false) {
     const id = (0, getAccountIdentifier_1.getAccountIdentifier)(parentAccountConfig);
     const parentAccountId = (0, config_1.getAccountId)(id);
+    let testAccountConfig = {
+        accountName: testAccountName,
+    };
     if (!parentAccountId) {
         throw new Error((0, lang_1.i18n)(`lib.developerTestAccount.create.loading.fail`));
     }
+    if (useV3) {
+        testAccountConfig = await (0, createDeveloperTestAccountConfigPrompt_1.createDeveloperTestAccountConfigPrompt)({
+            name: testAccountConfig.accountName,
+            description: 'Test Account created by the HubSpot CLI',
+        }, false);
+    }
     SpinniesManager_1.default.init({
         succeedColor: 'white',
     });
@@ -78,9 +121,16 @@ async function buildDeveloperTestAccount(testAccountName, parentAccountConfig, e
     let developerTestAccountId;
     let developerTestAccountPersonalAccessKey;
     try {
-        const { data } = await (0, developerTestAccounts_1.createDeveloperTestAccount)(parentAccountId, testAccountName);
-        developerTestAccountId = data.id;
-        developerTestAccountPersonalAccessKey = data.personalAccessKey;
+        if (useV3) {
+            const result = await createDeveloperTestAccountV3(parentAccountId, testAccountConfig);
+            developerTestAccountId = result.accountId;
+            developerTestAccountPersonalAccessKey = result.personalAccessKey;
+        }
+        else {
+            const { data } = await (0, developerTestAccounts_1.createDeveloperTestAccount)(parentAccountId, testAccountName);
+            developerTestAccountId = data.id;
+            developerTestAccountPersonalAccessKey = data.personalAccessKey;
+        }
         SpinniesManager_1.default.succeed('buildDeveloperTestAccount', {
             text: (0, lang_1.i18n)(`lib.developerTestAccount.create.loading.succeed`, {
                 accountName: testAccountName,

package/lib/mcp/setup.js

@@ -173,7 +173,7 @@ async function setupClaudeCode(mcpCommand = defaultMcpCommand) {
             // Run claude mcp add command
             const mcpConfig = JSON.stringify({
                 type: 'stdio',
-                ...mcpCommand,
+                ...buildCommandWithAgentString(mcpCommand, claudeCode),
             });
             const { stdout } = await (0, command_1.execAsync)('claude mcp list');
             if (stdout.includes(mcpServerName)) {
@@ -219,7 +219,7 @@ function setupCursor(mcpCommand = defaultMcpCommand) {
         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,
+        mcpCommand: buildCommandWithAgentString(mcpCommand, cursor),
     });
 }
 function setupWindsurf(mcpCommand = defaultMcpCommand) {
@@ -229,6 +229,11 @@ function setupWindsurf(mcpCommand = defaultMcpCommand) {
         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,
+        mcpCommand: buildCommandWithAgentString(mcpCommand, windsurf),
     });
 }
+function buildCommandWithAgentString(mcpCommand, agent) {
+    const mcpCommandCopy = structuredClone(mcpCommand);
+    mcpCommandCopy.args.push('--ai-agent', agent);
+    return mcpCommandCopy;
+}

package/lib/projects/add/legacyAddComponent.js

@@ -37,7 +37,7 @@ async function legacyAddComponent(args, projectDir, projectConfig) {
         const componentPath = path_1.default.join(projectDir, projectConfig.srcDir, projectAddPromptResponse.name);
         await (0, github_1.cloneGithubRepo)(constants_1.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, componentPath, {
             sourceDir: projectAddPromptResponse.componentTemplate.path,
-            branch: 'main',
+            branch: constants_1.DEFAULT_PROJECT_TEMPLATE_BRANCH,
             hideLogs: true,
         });
         logger_1.uiLogger.success(en_1.commands.project.add.success(projectAddPromptResponse.name));

package/lib/projects/add/v3AddComponent.js

@@ -73,7 +73,7 @@ async function v3AddComponent(args, projectDir, projectConfig) {
         await (0, github_1.cloneGithubRepo)(constants_1.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, projectDir, {
             sourceDir: components,
             hideLogs: true,
-            branch: 'main',
+            branch: constants_1.DEFAULT_PROJECT_TEMPLATE_BRANCH,
             handleCollision: components_1.handleComponentCollision,
         });
         logger_1.uiLogger.success(en_1.commands.project.add.success(projectAddPromptResponse.componentTemplate

package/lib/projects/localDev/DevServerManager.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const logger_1 = require("@hubspot/local-dev-lib/logger");
-const promptUtils_1 = require("../../prompts/promptUtils");
 const ui_extensions_dev_server_1 = require("@hubspot/ui-extensions-dev-server");
 const portManager_1 = require("@hubspot/local-dev-lib/portManager");
 const urls_1 = require("@hubspot/local-dev-lib/urls");
@@ -71,7 +70,6 @@ class DevServerManager {
                 await serverInterface.setup({
                     components: compatibleComponents,
                     onUploadRequired,
-                    promptUser: promptUtils_1.promptUser,
                     logger: logger_1.logger,
                     urls: {
                         api: (0, urls_1.getHubSpotApiOrigin)(env),

package/lib/projects/localDev/DevServerManagerV2.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const logger_1 = require("@hubspot/local-dev-lib/logger");
-const promptUtils_1 = require("../../prompts/promptUtils");
 const portManager_1 = require("@hubspot/local-dev-lib/portManager");
 const urls_1 = require("@hubspot/local-dev-lib/urls");
 const config_1 = require("@hubspot/local-dev-lib/config");
@@ -40,7 +39,6 @@ class DevServerManagerV2 {
                 // @TODO: In the future, update UIE Dev Server to use LocalDevState
                 await serverInterface.setup({
                     components: this.localDevState.projectNodes,
-                    promptUser: promptUtils_1.promptUser,
                     logger: logger_1.logger,
                     urls: {
                         api: (0, urls_1.getHubSpotApiOrigin)(env),

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

@@ -11,7 +11,7 @@ export declare function checkIfParentAccountIsAuthed(accountConfig: CLIAccount):
 export declare function checkIfAccountFlagIsSupported(accountConfig: CLIAccount, hasPublicApps: boolean): void;
 export declare function suggestRecommendedNestedAccount(accounts: CLIAccount[], accountConfig: CLIAccount, hasPublicApps: boolean): Promise<ProjectDevTargetAccountPromptResponse>;
 export declare function createSandboxForLocalDev(accountId: number, accountConfig: CLIAccount, env: Environment): Promise<number>;
-export declare function createDeveloperTestAccountForLocalDev(accountId: number, accountConfig: CLIAccount, env: Environment): Promise<number>;
+export declare function createDeveloperTestAccountForLocalDev(accountId: number, accountConfig: CLIAccount, env: Environment, useV3?: boolean): Promise<number>;
 export declare function useExistingDevTestAccount(env: Environment, account: DeveloperTestAccount): Promise<void>;
 export declare function createNewProjectForLocalDev(projectConfig: ProjectConfig, targetAccountId: number, shouldCreateWithoutConfirmation: boolean, hasPublicApps: boolean): Promise<Project>;
 export declare function createInitialBuildForNewProject(projectConfig: ProjectConfig, projectDir: string, targetAccountId: number, sendIR?: boolean, profile?: string): Promise<Build>;

package/lib/projects/localDev/helpers.js

@@ -152,7 +152,7 @@ async function createSandboxForLocalDev(accountId, accountConfig, env) {
     }
 }
 // Create a developer test account and return its accountId
-async function createDeveloperTestAccountForLocalDev(accountId, accountConfig, env) {
+async function createDeveloperTestAccountForLocalDev(accountId, accountConfig, env, useV3 = false) {
     let currentPortalCount = 0;
     let maxTestPortals = 10;
     try {
@@ -182,7 +182,7 @@ async function createDeveloperTestAccountForLocalDev(accountId, accountConfig, e
             accountType: config_1.HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST,
         });
         (0, usageTracking_1.trackCommandMetadataUsage)('developer-test-account-create', { step: 'project-dev' }, accountId);
-        const result = await (0, buildAccount_1.buildDeveloperTestAccount)(name, accountConfig, env, maxTestPortals);
+        const result = await (0, buildAccount_1.buildDeveloperTestAccount)(name, accountConfig, env, maxTestPortals, useV3);
         return result;
     }
     catch (err) {

package/lib/projects/structure.d.ts

@@ -1,5 +1,5 @@
 import { ComponentTypes, Component, GenericComponentConfig, PublicAppComponentConfig, PrivateAppComponentConfig, AppCardComponentConfig } from '../../types/Projects';
-import { IntermediateRepresentationNodeLocalDev } from '@hubspot/project-parsing-lib/src/lib/types';
+import { IntermediateRepresentationNode, IntermediateRepresentationNodeLocalDev } from '@hubspot/project-parsing-lib/src/lib/types';
 import { AppIRNode } from '../../types/ProjectComponents';
 export declare const CONFIG_FILES: {
     [k in ComponentTypes]: string;
@@ -15,4 +15,4 @@ export declare function getProjectComponentTypes(components: Array<Component>):
 export declare function getComponentUid(component?: Component | null): string | null;
 export declare function componentIsApp(component?: Component | null): component is Component<PublicAppComponentConfig | PrivateAppComponentConfig>;
 export declare function componentIsPublicApp(component?: Component | null): component is Component<PublicAppComponentConfig>;
-export declare function isAppIRNode(component: IntermediateRepresentationNodeLocalDev): component is AppIRNode;
+export declare function isAppIRNode(component: IntermediateRepresentationNodeLocalDev | IntermediateRepresentationNode): component is AppIRNode;

package/lib/projects/upload.d.ts

@@ -1,4 +1,5 @@
 import { FileResult } from 'tmp';
+import { IntermediateRepresentation } from '@hubspot/project-parsing-lib';
 import { ProjectConfig } from '../../types/Projects';
 type ProjectUploadCallbackFunction<T> = (accountId: number, projectConfig: ProjectConfig, tempFile: FileResult, buildId: number) => Promise<T>;
 type ProjectUploadResult<T> = {
@@ -20,5 +21,5 @@ type HandleProjectUploadArg<T> = {
 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 declare function handleTranslate(projectDir: string, projectConfig: ProjectConfig, accountId: number, skipValidation: boolean, profile: string | undefined): Promise<IntermediateRepresentation | undefined>;
 export {};

package/lib/projects/upload.js

@@ -25,7 +25,7 @@ const buildAndDeploy_1 = require("./buildAndDeploy");
 const exitCodes_1 = require("../enums/exitCodes");
 async function uploadProjectFiles(accountId, projectName, filePath, uploadMessage, platformVersion, intermediateRepresentation) {
     SpinniesManager_1.default.init({});
-    const accountIdentifier = (0, ui_1.uiAccountDescription)(accountId);
+    const accountIdentifier = (0, ui_1.uiAccountDescription)(accountId) || `${accountId}`;
     SpinniesManager_1.default.add('upload', {
         text: en_1.lib.projectUpload.uploadProjectFiles.add(projectName, accountIdentifier),
         succeedColor: 'white',
@@ -149,4 +149,5 @@ async function handleTranslate(projectDir, projectConfig, accountId, skipValidat
             (0, errorHandlers_1.logError)(e);
         }
     }
+    return undefined;
 }