@hubspot/cli 7.7.21-experimental.0 → 7.7.22-experimental.0

package/lang/en.js

@@ -44,7 +44,6 @@ export const 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.bold('Next steps:'),
@@ -54,7 +53,6 @@ export const 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 ${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 ${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',
@@ -840,6 +838,7 @@ export const commands = {
             success: (derivedTargets) => `You can now use the HubSpot CLI MCP Server in ${derivedTargets.join(', ')}.  ${chalk.bold('You may need to restart these tools to apply the changes')}.`,
             errors: {
                 needsNode20: `This feature requires node >=20`,
+                errorParsingJsonFIle: (filename, errorMessage) => `Unable to update ${chalk.bold(filename)} due to invalid JSON: ${errorMessage}`,
             },
             spinners: {
                 failedToConfigure: 'Failed to configure the HubSpot mcp server.',
@@ -1134,19 +1133,19 @@ export const commands = {
                     describe: 'Which features to include with the application.',
                 },
             },
-            creatingComponent: (projectName) => `\nAdding a new component to ${chalk.bold(projectName)}\n`,
+            creatingComponent: (projectName) => `\nAdding a new app feature to ${chalk.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.',
             },
         },
@@ -1157,25 +1156,24 @@ export const 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.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.bold(projectName)}. ${linkToProject}`,
-                buildAlreadyDeployed: (buildId, linkToProject) => `Build ${buildId} is already deployed. ${linkToProject}`,
-                viewProjectsBuilds: 'View project builds in HubSpot',
+                projectNotFound: (accountId, projectName) => `The project ${chalk.bold(projectName)} does not exist in account ${uiAccountDescription(accountId)}. Run ${uiCommandReference('hs project upload')} to upload your project files to HubSpot.`,
+                buildIdDoesNotExist: (accountId, buildId, projectName) => `Build ${buildId} does not exist for project ${chalk.bold(projectName)}. ${uiLink('View project builds in HubSpot', getProjectDetailUrl(projectName, accountId))}`,
+                buildAlreadyDeployed: (accountId, buildId, projectName) => `Build ${buildId} is already deployed. ${uiLink('View project builds in HubSpot', getProjectDetailUrl(projectName, accountId))}`,
+                deployContainsRemovals: (componentName) => `- This deploy would remove the ${chalk.bold(componentName)} component. To proceed, run the deploy command with the ${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: {
@@ -1803,7 +1801,7 @@ export const commands = {
                 start: (testAccountName) => `Creating test account "${chalk.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.bold(testAccountName)}" successfully created with id: ${chalk.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',
@@ -1812,7 +1810,7 @@ export const 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',
@@ -1825,7 +1823,6 @@ export const 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}"`,
@@ -2752,6 +2749,12 @@ export const 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}`,
@@ -2834,11 +2837,25 @@ export const 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: {
@@ -2961,7 +2978,7 @@ export const 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

@@ -1,6 +1,6 @@
 import { getAccessToken, updateConfigWithAccessToken, } from '@hubspot/local-dev-lib/personalAccessKey';
 import { accountNameExistsInConfig, updateAccountConfig, writeConfig, getAccountId, } from '@hubspot/local-dev-lib/config';
-import { createDeveloperTestAccount } from '@hubspot/local-dev-lib/api/developerTestAccounts';
+import { createDeveloperTestAccount, fetchDeveloperTestAccountGateSyncStatus, generateDeveloperTestAccountPersonalAccessKey, } from '@hubspot/local-dev-lib/api/developerTestAccounts';
 import { createSandbox } from '@hubspot/local-dev-lib/api/sandboxHubs';
 import { HUBSPOT_ACCOUNT_TYPES } from '@hubspot/local-dev-lib/constants/config';
 import { personalAccessKeyPrompt } from '../prompts/personalAccessKeyPrompt.js';
@@ -30,6 +30,8 @@ const mockedWriteConfig = writeConfig;
 const mockedCliAccountNamePrompt = cliAccountNamePrompt;
 const mockedGetAccountId = getAccountId;
 const mockedCreateDeveloperTestAccount = createDeveloperTestAccount;
+const mockedFetchDeveloperTestAccountGateSyncStatus = fetchDeveloperTestAccountGateSyncStatus;
+const mockedGenerateDeveloperTestAccountPersonalAccessKey = generateDeveloperTestAccountPersonalAccessKey;
 const mockedCreateSandbox = createSandbox;
 describe('lib/buildAccount', () => {
     describe('saveAccountToConfig()', () => {
@@ -97,11 +99,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: HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST,
+            accountType: HUBSPOT_ACCOUNT_TYPES.APP_DEVELOPER,
             env: 'prod',
         };
         const mockDeveloperTestAccount = {

package/lib/__tests__/usageTracking.test.js

@@ -30,8 +30,6 @@ describe('lib/usageTracking', () => {
         });
         it('should track command usage with default auth type', async () => {
             await 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,
@@ -45,18 +43,16 @@ describe('lib/usageTracking', () => {
         it('should track command usage with custom auth type', async () => {
             mockedGetAccountConfig.mockReturnValue({ authType: 'oauth2' });
             await 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 trackCommandUsage(mockCommand);
-            // Allow setImmediate to execute
-            await new Promise(resolve => setImmediate(resolve));
             expect(mockedLogger.debug).toHaveBeenCalledWith(expect.stringContaining(error.message));
         });
     });
@@ -76,7 +72,7 @@ describe('lib/usageTracking', () => {
                 nodeVersion: mockNodeVersion,
                 nodeMajorVersion: 'v16',
                 version,
-            }));
+            }), undefined);
         });
         it('should track main help usage without command', async () => {
             await trackHelpUsage('');
@@ -99,7 +95,7 @@ describe('lib/usageTracking', () => {
                 nodeVersion: mockNodeVersion,
                 nodeMajorVersion: 'v16',
                 version,
-            }));
+            }), undefined);
         });
     });
     describe('trackAuthAction()', () => {
@@ -137,8 +133,6 @@ describe('lib/usageTracking', () => {
         });
         it('should track command metadata usage', async () => {
             await 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,
@@ -154,17 +148,17 @@ describe('lib/usageTracking', () => {
         it('should return "macos" for darwin platform', async () => {
             Object.defineProperty(process, 'platform', { value: 'darwin' });
             await 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 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 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.js';
+import { SandboxAccountType } from '../types/Sandboxes.js';
 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

@@ -2,16 +2,19 @@ import { getAccessToken, updateConfigWithAccessToken, } from '@hubspot/local-dev
 import { accountNameExistsInConfig, updateAccountConfig, writeConfig, getAccountId, } from '@hubspot/local-dev-lib/config';
 import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
 import { logger } from '@hubspot/local-dev-lib/logger';
-import { createDeveloperTestAccount } from '@hubspot/local-dev-lib/api/developerTestAccounts';
+import { createDeveloperTestAccount, fetchDeveloperTestAccountGateSyncStatus, generateDeveloperTestAccountPersonalAccessKey, } from '@hubspot/local-dev-lib/api/developerTestAccounts';
 import { HUBSPOT_ACCOUNT_TYPES } from '@hubspot/local-dev-lib/constants/config';
 import { createSandbox } from '@hubspot/local-dev-lib/api/sandboxHubs';
 import { personalAccessKeyPrompt } from './prompts/personalAccessKeyPrompt.js';
+import { createDeveloperTestAccountConfigPrompt } from './prompts/createDeveloperTestAccountConfigPrompt.js';
 import { i18n } from './lang.js';
 import { cliAccountNamePrompt } from './prompts/accountNamePrompt.js';
 import SpinniesManager from './ui/SpinniesManager.js';
 import { debugError, logError } from './errorHandlers/index.js';
 import { SANDBOX_API_TYPE_MAP, handleSandboxCreateError } from './sandboxes.js';
 import { handleDeveloperTestAccountCreateError } from './developerTestAccounts.js';
+import { lib } from '../lang/en.js';
+import { poll } from './polling.js';
 export async function saveAccountToConfig(accountId, accountName, env, personalAccessKey, force = false) {
     if (!personalAccessKey) {
         const configData = await personalAccessKeyPrompt({
@@ -52,12 +55,51 @@ export async function saveAccountToConfig(accountId, accountName, env, personalA
     logger.log('');
     return validName;
 }
-export async function buildDeveloperTestAccount(testAccountName, parentAccountConfig, env, portalLimit) {
+export async function createDeveloperTestAccountV3(parentAccountId, testAccountConfig) {
+    const result = {
+        accountName: testAccountConfig.accountName,
+    };
+    const { data } = await createDeveloperTestAccount(parentAccountId, testAccountConfig);
+    result.accountId = data.id;
+    try {
+        await poll(() => fetchDeveloperTestAccountGateSyncStatus(parentAccountId, result.accountId), {
+            successStates: ['SUCCESS'],
+            errorStates: [],
+        });
+    }
+    catch (err) {
+        debugError(err);
+        throw new Error(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 generateDeveloperTestAccountPersonalAccessKey(parentAccountId, result.accountId);
+        result.personalAccessKey = data.personalAccessKey;
+    }
+    catch (err) {
+        debugError(err);
+        throw new Error(lib.buildAccount.createDeveloperTestAccountV3.pakFailure);
+    }
+    return result;
+}
+export async function buildDeveloperTestAccount(testAccountName, parentAccountConfig, env, portalLimit, useV3 = false) {
     const id = getAccountIdentifier(parentAccountConfig);
     const parentAccountId = getAccountId(id);
+    let testAccountConfig = {
+        accountName: testAccountName,
+    };
     if (!parentAccountId) {
         throw new Error(i18n(`lib.developerTestAccount.create.loading.fail`));
     }
+    if (useV3) {
+        testAccountConfig = await createDeveloperTestAccountConfigPrompt({
+            name: testAccountConfig.accountName,
+            description: 'Test Account created by the HubSpot CLI',
+        }, false);
+    }
     SpinniesManager.init({
         succeedColor: 'white',
     });
@@ -70,9 +112,16 @@ export async function buildDeveloperTestAccount(testAccountName, parentAccountCo
     let developerTestAccountId;
     let developerTestAccountPersonalAccessKey;
     try {
-        const { data } = await 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 createDeveloperTestAccount(parentAccountId, testAccountName);
+            developerTestAccountId = data.id;
+            developerTestAccountPersonalAccessKey = data.personalAccessKey;
+        }
         SpinniesManager.succeed('buildDeveloperTestAccount', {
             text: i18n(`lib.developerTestAccount.create.loading.succeed`, {
                 accountName: testAccountName,

package/lib/mcp/setup.js

@@ -100,9 +100,9 @@ function setupMcpConfigFile(config) {
             fs.writeFileSync(config.configPath, JSON.stringify({}, null, 2));
         }
         let mcpConfig = {};
+        let configContent;
         try {
-            const configContent = fs.readFileSync(config.configPath, 'utf8');
-            mcpConfig = JSON.parse(configContent);
+            configContent = fs.readFileSync(config.configPath, 'utf8');
         }
         catch (error) {
             SpinniesManager.fail('spinner', {
@@ -111,6 +111,22 @@ function setupMcpConfigFile(config) {
             logError(error);
             return false;
         }
+        try {
+            // In the event the file exists, but is empty, initialize it to and empty object
+            if (configContent.trim() === '') {
+                mcpConfig = {};
+            }
+            else {
+                mcpConfig = JSON.parse(configContent);
+            }
+        }
+        catch (error) {
+            SpinniesManager.fail('spinner', {
+                text: config.failedMessage,
+            });
+            uiLogger.error(commands.mcp.setup.errors.errorParsingJsonFIle(config.configPath, error instanceof Error ? error.message : `${error}`));
+            return false;
+        }
         // Initialize mcpServers if it doesn't exist
         if (!mcpConfig.mcpServers) {
             mcpConfig.mcpServers = {};
@@ -145,7 +161,7 @@ export async function setupClaudeCode(mcpCommand = defaultMcpCommand) {
             // Run claude mcp add command
             const mcpConfig = JSON.stringify({
                 type: 'stdio',
-                ...mcpCommand,
+                ...buildCommandWithAgentString(mcpCommand, claudeCode),
             });
             const { stdout } = await execAsync('claude mcp list');
             if (stdout.includes(mcpServerName)) {
@@ -191,7 +207,7 @@ export function setupCursor(mcpCommand = defaultMcpCommand) {
         configuringMessage: commands.mcp.setup.spinners.configuringCursor,
         configuredMessage: commands.mcp.setup.spinners.configuredCursor,
         failedMessage: commands.mcp.setup.spinners.failedToConfigureCursor,
-        mcpCommand,
+        mcpCommand: buildCommandWithAgentString(mcpCommand, cursor),
     });
 }
 export function setupWindsurf(mcpCommand = defaultMcpCommand) {
@@ -201,6 +217,11 @@ export function setupWindsurf(mcpCommand = defaultMcpCommand) {
         configuringMessage: commands.mcp.setup.spinners.configuringWindsurf,
         configuredMessage: commands.mcp.setup.spinners.configuredWindsurf,
         failedMessage: 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

@@ -5,7 +5,7 @@ import { commands } from '../../../lang/en.js';
 import { getProjectComponentListFromRepo } from '../create/legacy.js';
 import { projectAddPrompt } from '../../prompts/projectAddPrompt.js';
 import path from 'path';
-import { HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH } from '../../constants.js';
+import { HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, DEFAULT_PROJECT_TEMPLATE_BRANCH } from '../../constants.js';
 import { cloneGithubRepo } from '@hubspot/local-dev-lib/github';
 import { uiLogger } from '../../ui/logger.js';
 export async function legacyAddComponent(args, projectDir, projectConfig) {
@@ -31,7 +31,7 @@ export async function legacyAddComponent(args, projectDir, projectConfig) {
         const componentPath = path.join(projectDir, projectConfig.srcDir, projectAddPromptResponse.name);
         await cloneGithubRepo(HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, componentPath, {
             sourceDir: projectAddPromptResponse.componentTemplate.path,
-            branch: 'main',
+            branch: DEFAULT_PROJECT_TEMPLATE_BRANCH,
             hideLogs: true,
         });
         uiLogger.success(commands.project.add.success(projectAddPromptResponse.name));

package/lib/projects/add/v3AddComponent.js

@@ -4,7 +4,7 @@ import { calculateComponentTemplateChoices, createV3App, PROJECT_WITH_APP, } fro
 import path from 'path';
 import fs from 'fs';
 import { projectAddPromptV3 } from '../../prompts/projectAddPrompt.js';
-import { HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH } from '../../constants.js';
+import { HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, DEFAULT_PROJECT_TEMPLATE_BRANCH } from '../../constants.js';
 import { handleComponentCollision } from '../components.js';
 import { getProjectMetadata, } from '@hubspot/project-parsing-lib/src/lib/project.js';
 import { AppKey } from '@hubspot/project-parsing-lib/src/lib/constants.js';
@@ -67,7 +67,7 @@ export async function v3AddComponent(args, projectDir, projectConfig) {
         await cloneGithubRepo(HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, projectDir, {
             sourceDir: components,
             hideLogs: true,
-            branch: 'main',
+            branch: DEFAULT_PROJECT_TEMPLATE_BRANCH,
             handleCollision: handleComponentCollision,
         });
         uiLogger.success(commands.project.add.success(projectAddPromptResponse.componentTemplate

package/lib/projects/localDev/DevServerManager.js

@@ -1,5 +1,4 @@
 import { logger } from '@hubspot/local-dev-lib/logger';
-import { promptUser } from '../../prompts/promptUtils.js';
 import { DevModeInterface as UIEDevModeInterface } from '@hubspot/ui-extensions-dev-server';
 import { startPortManagerServer, stopPortManagerServer, requestPorts, } from '@hubspot/local-dev-lib/portManager';
 import { getHubSpotApiOrigin, getHubSpotWebsiteOrigin, } from '@hubspot/local-dev-lib/urls';
@@ -69,7 +68,6 @@ class DevServerManager {
                 await serverInterface.setup({
                     components: compatibleComponents,
                     onUploadRequired,
-                    promptUser,
                     logger,
                     urls: {
                         api: getHubSpotApiOrigin(env),

package/lib/projects/localDev/DevServerManagerV2.js

@@ -1,5 +1,4 @@
 import { logger } from '@hubspot/local-dev-lib/logger';
-import { promptUser } from '../../prompts/promptUtils.js';
 import { startPortManagerServer, stopPortManagerServer, } from '@hubspot/local-dev-lib/portManager';
 import { getHubSpotApiOrigin, getHubSpotWebsiteOrigin, } from '@hubspot/local-dev-lib/urls';
 import { getAccountConfig } from '@hubspot/local-dev-lib/config';
@@ -35,7 +34,6 @@ class DevServerManagerV2 {
                 // @TODO: In the future, update UIE Dev Server to use LocalDevState
                 await serverInterface.setup({
                     components: this.localDevState.projectNodes,
-                    promptUser,
                     logger,
                     urls: {
                         api: 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

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

package/lib/projects/upload.js

@@ -16,7 +16,7 @@ import { useV3Api } from './buildAndDeploy.js';
 import { EXIT_CODES } from '../enums/exitCodes.js';
 async function uploadProjectFiles(accountId, projectName, filePath, uploadMessage, platformVersion, intermediateRepresentation) {
     SpinniesManager.init({});
-    const accountIdentifier = uiAccountDescription(accountId);
+    const accountIdentifier = uiAccountDescription(accountId) || `${accountId}`;
     SpinniesManager.add('upload', {
         text: lib.projectUpload.uploadProjectFiles.add(projectName, accountIdentifier),
         succeedColor: 'white',

package/lib/prompts/createApiSamplePrompt.d.ts

@@ -1,4 +1,4 @@
-import { ApiSampleConfig } from '../../types/cms.js';
+import { ApiSampleConfig } from '../../types/Cms.js';
 type SampleTypePromptResponse = {
     sampleType?: string;
 };