@hubspot/cli 7.7.35-experimental.0 → 7.8.0-beta.0

package/lib/projects/__tests__/deploy.test.js

@@ -126,9 +126,9 @@ describe('lib/projects/deploy', () => {
                 data: mockDeployResponseData,
             });
             mockPollDeployStatus.mockResolvedValue(mockDeployResult);
-            const result = await handleProjectDeploy(targetAccountId, projectName, buildId, useV3Api, force);
+            const deploy = await handleProjectDeploy(targetAccountId, projectName, buildId, useV3Api, force);
             expect(mockDeployProject).toHaveBeenCalledWith(targetAccountId, projectName, buildId, useV3Api, force);
-            expect(result).toEqual(mockDeployResult);
+            expect(deploy).toEqual(mockDeployResult);
         });
         it('handles blocked deploy with warnings', async () => {
             const mockBlockedResponse = {
@@ -150,15 +150,80 @@ describe('lib/projects/deploy', () => {
             mockDeployProject.mockResolvedValue({
                 data: mockBlockedResponse,
             });
-            const result = await handleProjectDeploy(targetAccountId, projectName, buildId, useV3Api, force);
+            await handleProjectDeploy(targetAccountId, projectName, buildId, useV3Api, force);
             expect(mockUiLogger.warn).toHaveBeenCalledWith(commands.project.deploy.errors.deployWarningsHeader);
-            expect(result).toBeUndefined();
+        });
+        it('handles blocked deploy with errors (cannot be forced)', async () => {
+            const mockBlockedResponse = {
+                buildResultType: 'DEPLOY_BLOCKED',
+                issues: [
+                    {
+                        uid: 'component-1',
+                        componentTypeName: 'module',
+                        errorMessages: [],
+                        blockingMessages: [
+                            {
+                                message: 'This is an error',
+                                isWarning: false,
+                            },
+                        ],
+                    },
+                ],
+            };
+            mockDeployProject.mockResolvedValue({
+                data: mockBlockedResponse,
+            });
+            await handleProjectDeploy(targetAccountId, projectName, buildId, useV3Api, force);
+            expect(mockUiLogger.error).toHaveBeenCalledWith(commands.project.deploy.errors.deployBlockedHeader);
+            expect(mockUiLogger.log).toHaveBeenCalledWith(commands.project.deploy.errors.deployIssueComponentWarning('component-1', 'module', 'This is an error'));
+        });
+        it('handles blocked deploy with no blocking messages', async () => {
+            const mockBlockedResponse = {
+                buildResultType: 'DEPLOY_BLOCKED',
+                issues: [
+                    {
+                        uid: 'component-1',
+                        componentTypeName: 'module',
+                        errorMessages: [],
+                        blockingMessages: [],
+                    },
+                ],
+            };
+            mockDeployProject.mockResolvedValue({
+                data: mockBlockedResponse,
+            });
+            await handleProjectDeploy(targetAccountId, projectName, buildId, useV3Api, force);
+            expect(mockUiLogger.warn).toHaveBeenCalledWith(commands.project.deploy.errors.deployWarningsHeader);
+            expect(mockUiLogger.log).toHaveBeenCalledWith(commands.project.deploy.errors.deployIssueComponentGeneric('component-1', 'module'));
         });
         it('handles general deploy failure', async () => {
             mockDeployProject.mockResolvedValue({ data: null });
-            const result = await handleProjectDeploy(targetAccountId, projectName, buildId, useV3Api, force);
+            const deploy = await handleProjectDeploy(targetAccountId, projectName, buildId, useV3Api, force);
+            expect(mockUiLogger.error).toHaveBeenCalledWith(commands.project.deploy.errors.deploy);
+            expect(deploy).toBeUndefined();
+        });
+        it('handles undefined deploy response', async () => {
+            mockDeployProject.mockResolvedValue({ data: undefined });
+            const deploy = await handleProjectDeploy(targetAccountId, projectName, buildId, useV3Api, force);
             expect(mockUiLogger.error).toHaveBeenCalledWith(commands.project.deploy.errors.deploy);
-            expect(result).toBeUndefined();
+            expect(deploy).toBeUndefined();
+        });
+        it('passes correct parameters to deployProject', async () => {
+            const mockDeployResponseData = {
+                id: 'deploy-123',
+                buildResultType: 'DEPLOY_QUEUED',
+                links: {
+                    status: 'http://status-url',
+                },
+            };
+            mockDeployProject.mockResolvedValue({
+                data: mockDeployResponseData,
+            });
+            mockPollDeployStatus.mockResolvedValue({});
+            await handleProjectDeploy(targetAccountId, projectName, buildId, false, true);
+            expect(mockDeployProject).toHaveBeenCalledWith(targetAccountId, projectName, buildId, false, // useV3Api
+            true // force
+            );
         });
     });
 });

package/lib/projects/__tests__/localDevProjectHelpers.test.js

@@ -30,6 +30,8 @@ describe('isDeployedProjectUpToDateWithLocal', () => {
             componentRoot: '/local/path',
             componentConfigPath: '/local/path/config.json',
             configUpdatedSinceLastUpload: false,
+            removed: false,
+            parsingErrors: [],
         },
         componentDeps: {},
         metaFilePath: '/local/path',
@@ -99,7 +101,8 @@ describe('isDeployedProjectUpToDateWithLocal', () => {
         it('should clean up temp directory even when errors occur', async () => {
             // Mock downloadProject to throw an error after temp dir is created
             downloadProject.mockRejectedValue(new Error('Download Error'));
-            await expect(isDeployedProjectUpToDateWithLocal(mockProjectConfig, mockAccountId, mockBuildId, mockLocalProjectNodes)).rejects.toThrow('Download Error');
+            const result = await isDeployedProjectUpToDateWithLocal(mockProjectConfig, mockAccountId, mockBuildId, mockLocalProjectNodes);
+            expect(result).toBe(false);
             expect(fs.remove).toHaveBeenCalledWith(mockTempDir);
         });
         it('should handle translateForLocalDev errors', async () => {
@@ -111,7 +114,8 @@ describe('isDeployedProjectUpToDateWithLocal', () => {
             extractZipArchive.mockResolvedValue(undefined);
             // Mock translate to throw an error
             translate.mockRejectedValue(new Error('Translation Error'));
-            await expect(isDeployedProjectUpToDateWithLocal(mockProjectConfig, mockAccountId, mockBuildId, mockLocalProjectNodes)).rejects.toThrow('Translation Error');
+            const result = await isDeployedProjectUpToDateWithLocal(mockProjectConfig, mockAccountId, mockBuildId, mockLocalProjectNodes);
+            expect(result).toBe(false);
             expect(fs.remove).toHaveBeenCalledWith(mockTempDir);
         });
     });

package/lib/projects/__tests__/platformVersion.test.js

@@ -1,23 +1,23 @@
-import { useV3Api } from '../platformVersion.js';
+import { isV2Project } from '../platformVersion.js';
 describe('platformVersion', () => {
-    describe('useV3Api', () => {
+    describe('isV2Project', () => {
         it('returns true if platform version is UNSTABLE', () => {
-            expect(useV3Api('UNSTABLE')).toBe(true);
+            expect(isV2Project('UNSTABLE')).toBe(true);
         });
         it('returns true if platform version is equal to the minimum', () => {
-            expect(useV3Api('2025.2')).toBe(true);
+            expect(isV2Project('2025.2')).toBe(true);
         });
         it('returns true if platform version is greater than the minimum', () => {
-            expect(useV3Api('2026.2')).toBe(true);
+            expect(isV2Project('2026.2')).toBe(true);
         });
         it('returns false if platform version is less than the minimum', () => {
-            expect(useV3Api('2025.0')).toBe(false);
+            expect(isV2Project('2025.0')).toBe(false);
         });
         it('returns false if platform version is invalid', () => {
-            expect(useV3Api(null)).toBe(false);
+            expect(isV2Project(null)).toBe(false);
         });
         it('returns false for an invalid platform version', () => {
-            expect(useV3Api('notplaformversion')).toBe(false);
+            expect(isV2Project('notplaformversion')).toBe(false);
         });
     });
 });

package/lib/projects/__tests__/projects.test.js

@@ -3,8 +3,8 @@ import os from 'os';
 import path from 'path';
 import { EXIT_CODES } from '../../enums/exitCodes.js';
 import { validateProjectConfig } from '../../projects/config.js';
-import { logger } from '@hubspot/local-dev-lib/logger';
-vi.mock('@hubspot/local-dev-lib/logger');
+import { uiLogger } from '../../ui/logger.js';
+vi.mock('../../ui/logger.js');
 describe('lib/projects', () => {
     describe('validateProjectConfig()', () => {
         let projectDir;
@@ -26,58 +26,58 @@ describe('lib/projects', () => {
             // @ts-ignore Testing invalid input
             validateProjectConfig(null, projectDir);
             expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
-            expect(logger.error).toHaveBeenCalledWith(expect.stringMatching(/.*Unable to locate a project configuration file. Try running again from a project directory, or run*/));
+            expect(uiLogger.error).toHaveBeenCalledWith(expect.stringMatching(/.*Unable to locate a project configuration file. Try running again from a project directory, or run*/));
         });
         it('rejects configuration with missing name', () => {
             // @ts-ignore Testing invalid input
             validateProjectConfig({ srcDir: '.' }, projectDir);
             expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
-            expect(logger.error).toHaveBeenCalledWith(expect.stringMatching(/.*missing required fields*/));
+            expect(uiLogger.error).toHaveBeenCalledWith(expect.stringMatching(/.*missing required fields*/));
         });
         it('rejects configuration with missing srcDir', () => {
             // @ts-ignore Testing invalid input
             validateProjectConfig({ name: 'hello' }, projectDir);
             expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
-            expect(logger.error).toHaveBeenCalledWith(expect.stringMatching(/.*missing required fields.*/));
+            expect(uiLogger.error).toHaveBeenCalledWith(expect.stringMatching(/.*missing required fields.*/));
         });
         describe('rejects configuration with srcDir outside project directory', () => {
             it('for parent directory', () => {
                 validateProjectConfig({ name: 'hello', srcDir: '..', platformVersion: '' }, projectDir);
                 expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
-                expect(logger.error).toHaveBeenCalledWith(expect.stringContaining('srcDir: ".."'));
+                expect(uiLogger.error).toHaveBeenCalledWith(expect.stringContaining('srcDir: ".."'));
             });
             it('for root directory', () => {
                 validateProjectConfig({ name: 'hello', srcDir: '/', platformVersion: '' }, projectDir);
                 expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
-                expect(logger.error).toHaveBeenCalledWith(expect.stringContaining('srcDir: "/"'));
+                expect(uiLogger.error).toHaveBeenCalledWith(expect.stringContaining('srcDir: "/"'));
             });
             it('for complicated directory', () => {
                 const srcDir = './src/././../src/../../src';
                 validateProjectConfig({ name: 'hello', srcDir, platformVersion: '' }, projectDir);
                 expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
-                expect(logger.error).toHaveBeenCalledWith(expect.stringContaining(`srcDir: "${srcDir}"`));
+                expect(uiLogger.error).toHaveBeenCalledWith(expect.stringContaining(`srcDir: "${srcDir}"`));
             });
         });
         it('rejects configuration with srcDir that does not exist', () => {
             validateProjectConfig({ name: 'hello', srcDir: 'foo', platformVersion: '' }, projectDir);
             expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
-            expect(logger.error).toHaveBeenCalledWith(expect.stringMatching(/.*could not be found in.*/));
+            expect(uiLogger.error).toHaveBeenCalledWith(expect.stringMatching(/.*could not be found in.*/));
         });
         describe('accepts configuration with valid srcDir', () => {
             it('for current directory', () => {
                 validateProjectConfig({ name: 'hello', srcDir: '.', platformVersion: '' }, projectDir);
                 expect(exitMock).not.toHaveBeenCalled();
-                expect(logger.error).not.toHaveBeenCalled();
+                expect(uiLogger.error).not.toHaveBeenCalled();
             });
             it('for relative directory', () => {
                 validateProjectConfig({ name: 'hello', srcDir: './src', platformVersion: '' }, projectDir);
                 expect(exitMock).not.toHaveBeenCalled();
-                expect(logger.error).not.toHaveBeenCalled();
+                expect(uiLogger.error).not.toHaveBeenCalled();
             });
             it('for implied relative directory', () => {
                 validateProjectConfig({ name: 'hello', srcDir: 'src', platformVersion: '' }, projectDir);
                 expect(exitMock).not.toHaveBeenCalled();
-                expect(logger.error).not.toHaveBeenCalled();
+                expect(uiLogger.error).not.toHaveBeenCalled();
             });
         });
     });

package/lib/projects/__tests__/structure.test.js

@@ -1,11 +1,11 @@
 import fs from 'fs';
 import * as HSfs from '@hubspot/local-dev-lib/fs';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../../ui/logger.js';
 import { getComponentTypeFromConfigFile, loadConfigFile, getAppCardConfigs, getIsLegacyApp, componentIsApp, findProjectComponents, getProjectComponentTypes, getComponentUid, componentIsPublicApp, } from '../structure.js';
 import { ComponentTypes } from '../../../types/Projects.js';
 vi.mock('fs');
 vi.mock('@hubspot/local-dev-lib/fs');
-vi.mock('@hubspot/local-dev-lib/logger');
+vi.mock('../../ui/logger.js');
 const mockedReadFileSync = fs.readFileSync;
 const mockedWalk = HSfs.walk;
 const getMockPrivateAppConfig = (cards = []) => ({
@@ -46,7 +46,7 @@ describe('lib/projects/structure', () => {
                 throw new Error('File not found');
             });
             expect(loadConfigFile('nonexistent/path/app.json')).toBeNull();
-            expect(logger.debug).toHaveBeenCalled();
+            expect(uiLogger.debug).toHaveBeenCalled();
         });
     });
     describe('getAppCardConfigs()', () => {

package/lib/projects/__tests__/upload.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/projects/__tests__/upload.test.js

@@ -0,0 +1,82 @@
+import fs from 'fs-extra';
+import os from 'os';
+import path from 'path';
+import { vi } from 'vitest';
+import { validateSourceDirectory } from '../upload.js';
+import { uiLogger } from '../../ui/logger.js';
+import { lib } from '../../../lang/en.js';
+import { isV2Project } from '../platformVersion.js';
+import ProjectValidationError from '../../errors/ProjectValidationError.js';
+import { walk } from '@hubspot/local-dev-lib/fs';
+// Mock dependencies
+vi.mock('../../ui/logger.js');
+vi.mock('../platformVersion.js');
+vi.mock('@hubspot/local-dev-lib/fs');
+describe('lib/projects/upload', () => {
+    describe('validateSourceDirectory', () => {
+        let tempDir;
+        let srcDir;
+        let projectConfig;
+        beforeEach(() => {
+            tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'upload-test-'));
+            srcDir = path.join(tempDir, 'src');
+            fs.mkdirSync(srcDir, { recursive: true });
+            projectConfig = {
+                name: 'test-project',
+                srcDir: 'src',
+                platformVersion: '2025.2',
+            };
+            vi.clearAllMocks();
+        });
+        afterEach(() => {
+            fs.removeSync(tempDir);
+        });
+        it('should throw ProjectValidationError when source directory is empty', async () => {
+            vi.mocked(walk).mockResolvedValue([]);
+            await expect(validateSourceDirectory(srcDir, projectConfig, tempDir)).rejects.toThrow(ProjectValidationError);
+            expect(walk).toHaveBeenCalledWith(srcDir, ['node_modules']);
+        });
+        it('should warn about legacy files in V3 projects', async () => {
+            vi.mocked(isV2Project).mockReturnValue(true);
+            const legacyFilePath = path.join(srcDir, 'app', 'serverless.json');
+            vi.mocked(walk).mockResolvedValue([legacyFilePath]);
+            await validateSourceDirectory(srcDir, projectConfig, tempDir);
+            expect(uiLogger.warn).toHaveBeenCalledWith(lib.projectUpload.handleProjectUpload.legacyFileDetected('src/app/serverless.json', '2025.2'));
+        });
+        it('should warn about multiple legacy files', async () => {
+            vi.mocked(isV2Project).mockReturnValue(true);
+            const filePaths = [
+                path.join(srcDir, 'app1', 'serverless.json'),
+                path.join(srcDir, 'app2', 'app.json'),
+                path.join(srcDir, 'app3', 'public-app.json'),
+            ];
+            vi.mocked(walk).mockResolvedValue(filePaths);
+            await validateSourceDirectory(srcDir, projectConfig, tempDir);
+            expect(uiLogger.warn).toHaveBeenCalledTimes(3);
+            expect(uiLogger.warn).toHaveBeenCalledWith(lib.projectUpload.handleProjectUpload.legacyFileDetected('src/app1/serverless.json', '2025.2'));
+            expect(uiLogger.warn).toHaveBeenCalledWith(lib.projectUpload.handleProjectUpload.legacyFileDetected('src/app2/app.json', '2025.2'));
+            expect(uiLogger.warn).toHaveBeenCalledWith(lib.projectUpload.handleProjectUpload.legacyFileDetected('src/app3/public-app.json', '2025.2'));
+        });
+        it('should not warn about non-legacy files', async () => {
+            vi.mocked(isV2Project).mockReturnValue(true);
+            const filePaths = [
+                path.join(srcDir, 'component.js'),
+                path.join(srcDir, 'config.json'),
+            ];
+            vi.mocked(walk).mockResolvedValue(filePaths);
+            await validateSourceDirectory(srcDir, projectConfig, tempDir);
+            expect(uiLogger.warn).not.toHaveBeenCalled();
+        });
+        it('should not warn about legacy files in non-V3 projects', async () => {
+            vi.mocked(isV2Project).mockReturnValue(false);
+            projectConfig.platformVersion = '2025.1';
+            const filePaths = [
+                path.join(srcDir, 'app', 'serverless.json'),
+                path.join(srcDir, 'app', 'app.json'),
+            ];
+            vi.mocked(walk).mockResolvedValue(filePaths);
+            await validateSourceDirectory(srcDir, projectConfig, tempDir);
+            expect(uiLogger.warn).not.toHaveBeenCalled();
+        });
+    });
+});

package/lib/projects/add/__tests__/legacyAddComponent.test.js

@@ -2,7 +2,7 @@ import { legacyAddComponent } from '../legacyAddComponent.js';
 import { findProjectComponents } from '../../structure.js';
 import { getProjectComponentListFromRepo } from '../../create/legacy.js';
 import { projectAddPrompt } from '../../../prompts/projectAddPrompt.js';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../../../ui/logger.js';
 import { cloneGithubRepo } from '@hubspot/local-dev-lib/github';
 import { trackCommandUsage } from '../../../usageTracking.js';
 import { ComponentTypes, } from '../../../../types/Projects.js';
@@ -10,13 +10,13 @@ import { commands } from '../../../../lang/en.js';
 vi.mock('../../structure');
 vi.mock('../../create/legacy');
 vi.mock('../../../prompts/projectAddPrompt');
-vi.mock('@hubspot/local-dev-lib/logger');
+vi.mock('../../../ui/logger.js');
 vi.mock('@hubspot/local-dev-lib/github');
 vi.mock('../../../usageTracking.js');
 const mockedFindProjectComponents = vi.mocked(findProjectComponents);
 const mockedGetProjectComponentListFromRepo = vi.mocked(getProjectComponentListFromRepo);
 const mockedProjectAddPrompt = vi.mocked(projectAddPrompt);
-const mockedLogger = vi.mocked(logger);
+const mockedUiLogger = vi.mocked(uiLogger);
 const mockedCloneGithubRepo = vi.mocked(cloneGithubRepo);
 const mockedTrackCommandUsage = vi.mocked(trackCommandUsage);
 describe('lib/projects/add/legacyAddComponent', () => {
@@ -75,8 +75,8 @@ describe('lib/projects/add/legacyAddComponent', () => {
             expect(mockedTrackCommandUsage).toHaveBeenCalledWith('project-add', {
                 type: 'module',
             }, accountId);
-            expect(mockedLogger.log).toHaveBeenCalledWith(commands.project.add.creatingComponent('test-project'));
-            expect(mockedLogger.success).toHaveBeenCalledWith(commands.project.add.success('new-component'));
+            expect(mockedUiLogger.log).toHaveBeenCalledWith(commands.project.add.creatingComponent('test-project'));
+            expect(mockedUiLogger.success).toHaveBeenCalledWith(commands.project.add.success('new-component'));
         });
         it('throws an error when project contains a public app', async () => {
             const mockComponents = [
@@ -206,7 +206,7 @@ describe('lib/projects/add/legacyAddComponent', () => {
             mockedCloneGithubRepo.mockRejectedValue(new Error('Clone failed'));
             await expect(legacyAddComponent(mockArgs, projectDir, mockProjectConfig, accountId)).rejects.toThrow(commands.project.add.error.failedToDownloadComponent);
             expect(mockedCloneGithubRepo).toHaveBeenCalled();
-            expect(mockedLogger.success).not.toHaveBeenCalled();
+            expect(mockedUiLogger.success).not.toHaveBeenCalled();
         });
         it('calls trackCommandUsage with correct component type', async () => {
             const mockComponents = [

package/lib/projects/add/__tests__/v3AddComponent.test.js

@@ -5,7 +5,7 @@ import { createV3App } from '../../create/v3.js';
 import { confirmPrompt } from '../../../prompts/promptUtils.js';
 import { projectAddPromptV3 } from '../../../prompts/projectAddPrompt.js';
 import { cloneGithubRepo } from '@hubspot/local-dev-lib/github';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../../../ui/logger.js';
 import { getProjectMetadata } from '@hubspot/project-parsing-lib/src/lib/project.js';
 import { trackCommandUsage } from '../../../usageTracking.js';
 import { commands } from '../../../../lang/en.js';
@@ -15,7 +15,7 @@ vi.mock('../../create/legacy');
 vi.mock('../../create/v3');
 vi.mock('../../../prompts/projectAddPrompt');
 vi.mock('@hubspot/local-dev-lib/github');
-vi.mock('@hubspot/local-dev-lib/logger');
+vi.mock('../../../ui/logger.js');
 vi.mock('@hubspot/project-parsing-lib/src/lib/project');
 vi.mock('../../../usageTracking');
 const mockedFs = vi.mocked(fs);
@@ -24,7 +24,7 @@ const mockedConfirmPrompt = vi.mocked(confirmPrompt);
 const mockedCreateV3App = vi.mocked(createV3App);
 const mockedProjectAddPromptV3 = vi.mocked(projectAddPromptV3);
 const mockedCloneGithubRepo = vi.mocked(cloneGithubRepo);
-const mockedLogger = vi.mocked(logger);
+const mockedUiLogger = vi.mocked(uiLogger);
 const mockedGetProjectMetadata = vi.mocked(getProjectMetadata);
 const mockedTrackCommandUsage = vi.mocked(trackCommandUsage);
 describe('lib/projects/add/v3AddComponent', () => {
@@ -100,7 +100,7 @@ describe('lib/projects/add/v3AddComponent', () => {
                 hideLogs: true,
                 branch: 'main',
             }));
-            expect(mockedLogger.success).toHaveBeenCalled();
+            expect(mockedUiLogger.success).toHaveBeenCalled();
         });
         it('creates an app when no app exists and user confirms', async () => {
             const mockProjectMetadataNoApps = {

package/lib/projects/create/__tests__/legacy.test.js

@@ -1,9 +1,9 @@
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../../../ui/logger.js';
 import * as github from '@hubspot/local-dev-lib/api/github';
 import { EXIT_CODES } from '../../../enums/exitCodes.js';
 import { getProjectComponentListFromRepo, getProjectTemplateListFromRepo, } from '../legacy.js';
 import { PROJECT_COMPONENT_TYPES, HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, } from '../../../constants.js';
-vi.mock('@hubspot/local-dev-lib/logger');
+vi.mock('../../../ui/logger.js');
 vi.mock('@hubspot/local-dev-lib/api/github');
 const mockedFetchRepoFile = vi.mocked(github.fetchRepoFile);
 const repoConfig = {
@@ -60,14 +60,14 @@ describe('lib/projects/create/legacy', () => {
         it('Logs an error and exits the process if the request for the template list fails', async () => {
             mockedFetchRepoFile.mockRejectedValue(new Error('Not found'));
             await getProjectTemplateListFromRepo(HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, 'gh-ref');
-            expect(logger.error).toHaveBeenCalledWith(expect.stringMatching(/Failed to fetch the config.json file from the target repository/));
+            expect(uiLogger.error).toHaveBeenCalledWith(expect.stringMatching(/Failed to fetch the config.json file from the target repository/));
             expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
         });
         it('Logs an error and exits the process if there are no projects listed in the repo config', async () => {
             // @ts-expect-error - Mocking AxiosResponse
             mockedFetchRepoFile.mockResolvedValue({});
             await getProjectTemplateListFromRepo(HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, 'gh-ref');
-            expect(logger.error).toHaveBeenCalledWith(expect.stringMatching(/Unable to find any projects in the target repository's config.json file/));
+            expect(uiLogger.error).toHaveBeenCalledWith(expect.stringMatching(/Unable to find any projects in the target repository's config.json file/));
             expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
         });
         it('Logs an error and exits the process if any of the projects in the repo config are missing required properties', async () => {
@@ -84,7 +84,7 @@ describe('lib/projects/create/legacy', () => {
                 },
             });
             await getProjectTemplateListFromRepo(HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, 'gh-ref');
-            expect(logger.error).toHaveBeenCalledWith(expect.stringMatching(/Found misconfigured projects in the target repository's config.json file/));
+            expect(uiLogger.error).toHaveBeenCalledWith(expect.stringMatching(/Found misconfigured projects in the target repository's config.json file/));
             expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
         });
     });

package/lib/projects/create/__tests__/v3.test.js

@@ -1,8 +1,17 @@
 import { calculateComponentTemplateChoices } from '../v3.js';
-vi.mock('@hubspot/local-dev-lib/logger');
+import { hasFeature } from '../../../hasFeature.js';
+vi.mock('../../ui/logger.js');
 vi.mock('@hubspot/local-dev-lib/api/github');
+vi.mock('../../../hasFeature.js');
+const mockHasFeature = vi.mocked(hasFeature);
 describe('lib/projects/create/v3', () => {
+    beforeEach(() => {
+        mockHasFeature.mockResolvedValue(true);
+    });
     describe('calculateComponentTemplateChoices()', () => {
+        beforeEach(() => {
+            mockHasFeature.mockClear();
+        });
         const mockComponents = [
             {
                 label: 'Module Component',
@@ -30,7 +39,7 @@ describe('lib/projects/create/v3', () => {
             const choices = await calculateComponentTemplateChoices(mockComponents, 'oauth', 'private', 123, mockProjectMetadataForChoices);
             expect(choices).toHaveLength(4); // includes separator
             expect(choices[0]).toEqual({
-                name: 'Module Component',
+                name: 'Module Component [module]',
                 value: mockComponents[0],
             });
             expect(choices[2]).toEqual({
@@ -70,7 +79,7 @@ describe('lib/projects/create/v3', () => {
                 components: { module: { count: 0, maxCount: 5, hsMetaFiles: [] } },
             });
             expect(choices[0]).toEqual({
-                name: 'Unrestricted Component',
+                name: 'Unrestricted Component [module]',
                 value: componentsWithoutRestrictions[0],
             });
         });
@@ -94,7 +103,7 @@ describe('lib/projects/create/v3', () => {
             const choices = await calculateComponentTemplateChoices(componentWithCliSelector, 'oauth', 'private', 213, projectMetadataWithWorkflowAction);
             expect(choices).toHaveLength(1); // no disabled components
             expect(choices[0]).toEqual({
-                name: 'Workflow Action Tool',
+                name: 'Workflow Action Tool [workflow-action-tool]',
                 value: componentWithCliSelector[0],
             });
         });
@@ -137,7 +146,7 @@ describe('lib/projects/create/v3', () => {
             const choices = await calculateComponentTemplateChoices(componentWithCliSelector, 'oauth', 'private', 123, undefined);
             expect(choices).toHaveLength(1); // no disabled components
             expect(choices[0]).toEqual({
-                name: 'Workflow Action Tool',
+                name: 'Workflow Action Tool [workflow-action-tool]',
                 value: componentWithCliSelector[0],
             });
         });
@@ -162,5 +171,71 @@ describe('lib/projects/create/v3', () => {
             // @ts-expect-error breaking stuff on purpose
             projectMetadataWithoutComponents)).rejects.toThrow();
         });
+        it('disables gated components when hasFeature returns false', async () => {
+            mockHasFeature.mockResolvedValue(false);
+            const gatedComponent = [
+                {
+                    label: 'Workflow Action Tool',
+                    path: 'workflow-action-tool',
+                    type: 'workflow-action',
+                    cliSelector: 'workflow-action-tool',
+                    supportedAuthTypes: ['oauth'],
+                    supportedDistributions: ['private'],
+                },
+            ];
+            const choices = await calculateComponentTemplateChoices(gatedComponent, 'oauth', 'private', 123, mockProjectMetadataForChoices);
+            expect(choices).toHaveLength(3); // includes separators
+            expect(choices[1]).toEqual({
+                name: expect.stringContaining('Workflow Action Tool'),
+                value: gatedComponent[0],
+                disabled: expect.stringContaining('does not have access to this feature'),
+            });
+            expect(mockHasFeature).toHaveBeenCalledWith(123, expect.any(String));
+        });
+        it('enables gated components when hasFeature returns true', async () => {
+            mockHasFeature.mockResolvedValue(true);
+            const gatedComponent = [
+                {
+                    label: 'Workflow Action Tool',
+                    path: 'workflow-action-tool',
+                    type: 'workflow-action',
+                    cliSelector: 'workflow-action-tool',
+                    supportedAuthTypes: ['oauth'],
+                    supportedDistributions: ['private'],
+                },
+            ];
+            const projectMetadataWithWorkflowAction = {
+                hsMetaFiles: [],
+                components: {
+                    'workflow-action': { count: 0, maxCount: 3, hsMetaFiles: [] },
+                },
+            };
+            const choices = await calculateComponentTemplateChoices(gatedComponent, 'oauth', 'private', 123, projectMetadataWithWorkflowAction);
+            expect(choices).toHaveLength(1); // no disabled components
+            expect(choices[0]).toEqual({
+                name: 'Workflow Action Tool [workflow-action-tool]',
+                value: gatedComponent[0],
+            });
+            expect(mockHasFeature).toHaveBeenCalledWith(123, expect.any(String));
+        });
+        it('handles non-gated components without calling hasFeature', async () => {
+            const nonGatedComponent = [
+                {
+                    label: 'Regular Component',
+                    path: 'regular',
+                    type: 'module',
+                    supportedAuthTypes: ['oauth'],
+                    supportedDistributions: ['private'],
+                },
+            ];
+            const choices = await calculateComponentTemplateChoices(nonGatedComponent, 'oauth', 'private', 123, mockProjectMetadataForChoices);
+            expect(choices).toHaveLength(1);
+            expect(choices[0]).toEqual({
+                name: 'Regular Component [module]',
+                value: nonGatedComponent[0],
+            });
+            // hasFeature should not be called for non-gated components
+            expect(mockHasFeature).not.toHaveBeenCalled();
+        });
     });
 });

package/lib/projects/create/index.js

@@ -1,7 +1,7 @@
 import { selectProjectTemplatePrompt, } from '../../prompts/selectProjectTemplatePrompt.js';
 import { projectNameAndDestPrompt } from '../../prompts/projectNameAndDestPrompt.js';
 import { DEFAULT_PROJECT_TEMPLATE_BRANCH, HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, EMPTY_PROJECT, } from '../../constants.js';
-import { useV3Api } from '../platformVersion.js';
+import { isV2Project } from '../platformVersion.js';
 import { v3ComponentFlow } from './v3.js';
 import { getProjectTemplateListFromRepo } from './legacy.js';
 import { uiLogger } from '../../ui/logger.js';
@@ -11,7 +11,7 @@ export async function handleProjectCreationFlow(args) {
     const { platformVersion, templateSource, projectBase, auth: providedAuth, distribution: providedDistribution, } = args;
     const repo = templateSource || HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH;
     const projectNameAndDestPromptResponse = await projectNameAndDestPrompt(args);
-    if (useV3Api(platformVersion)) {
+    if (isV2Project(platformVersion)) {
         const { componentTemplateChoices, authType, distribution, repoConfig, projectContents, } = await v3ComponentFlow(platformVersion, projectBase, providedAuth, providedDistribution, args.derivedAccountId);
         const selectProjectTemplatePromptResponse = await selectProjectTemplatePrompt(args, undefined, projectContents !== EMPTY_PROJECT ? componentTemplateChoices : undefined);
         return {

package/lib/projects/create/legacy.js

@@ -3,13 +3,13 @@ import { DEFAULT_PROJECT_TEMPLATE_BRANCH, HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH
 import { EXIT_CODES } from '../../enums/exitCodes.js';
 import { debugError } from '../../errorHandlers/index.js';
 import { uiLogger } from '../../ui/logger.js';
-import { useV3Api } from '../platformVersion.js';
+import { isV2Project } from '../platformVersion.js';
 import { lib } from '../../../lang/en.js';
 const PROJECT_TEMPLATE_PROPERTIES = ['name', 'label', 'path'];
 export const EMPTY_PROJECT_TEMPLATE_NAME = 'no-template';
 export async function getConfigForPlatformVersion(platformVersion) {
     let path = '';
-    if (useV3Api(platformVersion)) {
+    if (isV2Project(platformVersion)) {
         path = `${platformVersion}/`;
     }
     const { data } = await fetchRepoFile(HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, `${path}config.json`, DEFAULT_PROJECT_TEMPLATE_BRANCH);