@hubspot/cli 7.8.1-experimental.0 → 7.8.3-experimental.0

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

@@ -1,7 +1,10 @@
 import path from 'path';
 import { translateForLocalDev } from '@hubspot/project-parsing-lib';
 import { handleProjectUpload } from '../upload.js';
+import { handleProjectDeploy } from '../deploy.js';
 import { getProjectConfig } from '../config.js';
+import { fetchProject } from '@hubspot/local-dev-lib/api/projects';
+import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
 import LocalDevProcess from '../localDev/LocalDevProcess.js';
 import LocalDevLogger from '../localDev/LocalDevLogger.js';
 import DevServerManagerV2 from '../localDev/DevServerManagerV2.js';
@@ -19,7 +22,10 @@ vi.mock('@hubspot/ui-extensions-dev-server', () => ({
 vi.mock('open');
 vi.mock('@hubspot/project-parsing-lib');
 vi.mock('../upload');
+vi.mock('../deploy');
 vi.mock('../config');
+vi.mock('@hubspot/local-dev-lib/api/projects');
+vi.mock('@hubspot/local-dev-lib/errors/index');
 vi.mock('../localDev/LocalDevLogger');
 vi.mock('../localDev/DevServerManagerV2');
 // Tests for LocalDevProcess and LocalDevState
@@ -37,11 +43,35 @@ describe('LocalDevProcess', () => {
         projectConfig: mockProjectConfig,
         targetProjectAccountId: 123,
         targetTestingAccountId: 456,
-        projectId: 789,
+        projectData: {
+            id: 789,
+            name: 'test-project',
+            portalId: 123,
+            createdAt: 0,
+            deletedAt: 0,
+            isLocked: false,
+            updatedAt: 0,
+            latestBuild: {
+                activitySource: { type: 'HUBSPOT_USER', userId: 456 },
+                buildId: 123,
+                createdAt: '2023-01-01T00:00:00Z',
+                deployableState: 'DEPLOYABLE',
+                deployStatusTaskLocator: { id: 'task-123', links: [] },
+                enqueuedAt: '2023-01-01T00:00:00Z',
+                finishedAt: '2023-01-01T00:05:00Z',
+                isAutoDeployEnabled: false,
+                portalId: 123,
+                projectName: 'test-project',
+                startedAt: '2023-01-01T00:01:00Z',
+                status: 'SUCCESS',
+                subbuildStatuses: [],
+                uploadMessage: 'Build completed',
+                autoDeployId: 0,
+            },
+        },
         initialProjectNodes: {},
         initialProjectProfileData: {},
         env: ENVIRONMENTS.PROD,
-        projectName: 'test-project',
     };
     beforeEach(() => {
         vi.clearAllMocks();
@@ -62,6 +92,9 @@ describe('LocalDevProcess', () => {
             uploadSuccess: vi.fn(),
             fileChangeError: vi.fn(),
             uploadWarning: vi.fn(),
+            deployInitiated: vi.fn(),
+            deployError: vi.fn(),
+            deploySuccess: vi.fn(),
         };
         mockDevServerManager = {
             setup: vi.fn().mockResolvedValue(undefined),
@@ -72,6 +105,8 @@ describe('LocalDevProcess', () => {
         // Mock constructors
         LocalDevLogger.mockImplementation(() => mockLocalDevLogger);
         DevServerManagerV2.mockImplementation(() => mockDevServerManager);
+        // Mock external functions
+        isHubSpotHttpError.mockReturnValue(false);
         // Create process instance
         process = new LocalDevProcess(mockOptions);
         // Mock process.exit
@@ -141,9 +176,14 @@ describe('LocalDevProcess', () => {
             handleProjectUpload.mockResolvedValue({
                 uploadError: new Error('Upload failed'),
             });
-            const success = await process.uploadProject();
+            const result = await process.uploadProject();
             expect(mockLocalDevLogger.uploadError).toHaveBeenCalledWith(new Error('Upload failed'));
-            expect(success).toBe(false);
+            expect(result).toEqual({
+                uploadSuccess: false,
+                buildSuccess: false,
+                deploySuccess: false,
+                deployId: undefined,
+            });
         });
         it('should handle successful upload', async () => {
             await process.handleConfigFileChange();
@@ -152,38 +192,120 @@ describe('LocalDevProcess', () => {
             });
             handleProjectUpload.mockResolvedValue({
                 uploadError: null,
+                result: {
+                    deployResult: {
+                        id: 'deploy-123',
+                        deployId: 123,
+                        status: 'SUCCESS',
+                    },
+                },
+            });
+            fetchProject.mockResolvedValue({
+                data: {
+                    id: 789,
+                    name: 'test-project',
+                    portalId: 123,
+                    createdAt: 0,
+                    deletedAt: 0,
+                    isLocked: false,
+                    updatedAt: 0,
+                    latestBuild: { id: 'build-1', status: 'SUCCESS' },
+                    deployedBuild: { id: 'build-1', status: 'SUCCESS' },
+                },
             });
-            const success = await process.uploadProject();
+            const result = await process.uploadProject();
+            expect(fetchProject).toHaveBeenCalledWith(mockOptions.targetProjectAccountId, mockOptions.projectConfig.name);
             expect(mockLocalDevLogger.uploadSuccess).toHaveBeenCalled();
             // @ts-expect-error accessing private property for testing
             expect(process.state.uploadWarnings.size).toBe(0);
-            expect(success).toBe(true);
+            expect(result).toEqual({
+                uploadSuccess: true,
+                buildSuccess: true,
+                deploySuccess: true,
+                deployId: 123,
+            });
         });
-        it('should reset projectNodesAtLastUpload', async () => {
-            const mockNodes = { node1: { uid: 'node1' } };
-            const initialProjectNodes = { existingNode: { uid: 'existingNode' } };
+        it('should reset projectNodesAtLastUpload if deploy is successful', async () => {
+            const mockInitialNodes = {
+                node1: {
+                    uid: 'node1',
+                    componentType: 'APP',
+                    localDev: {
+                        componentRoot: '/test/path',
+                        componentConfigPath: '/test/path/config.json',
+                        configUpdatedSinceLastUpload: false,
+                    },
+                    componentDeps: {},
+                    metaFilePath: '/test/path',
+                    config: { name: 'Node 1' },
+                    files: [],
+                },
+            };
+            const mockNewNodes = {
+                node1: {
+                    uid: 'node2',
+                    componentType: 'APP',
+                    localDev: {
+                        componentRoot: '/test/path',
+                        componentConfigPath: '/test/path/config.json',
+                        configUpdatedSinceLastUpload: false,
+                    },
+                    componentDeps: {},
+                    metaFilePath: '/test/path',
+                    config: { name: 'Node 2' },
+                    files: [],
+                },
+            };
             // @ts-expect-error accessing private property for testing
-            process.state._projectNodesAtLastUpload = initialProjectNodes;
+            process.state.projectNodesAtLastDeploy = mockInitialNodes;
             getProjectConfig.mockResolvedValue({
                 projectConfig: mockOptions.projectConfig,
             });
             handleProjectUpload.mockResolvedValue({
                 uploadError: null,
+                result: {
+                    deployResult: {
+                        id: 'deploy-123',
+                        deployId: 456,
+                        status: 'SUCCESS',
+                    },
+                },
             });
             translateForLocalDev.mockResolvedValue({
-                intermediateNodesIndexedByUid: mockNodes,
+                intermediateNodesIndexedByUid: mockNewNodes,
             });
-            const success = await process.uploadProject();
-            // Verify translateForLocalDev was called without projectNodesAtLastUpload option
+            fetchProject.mockResolvedValue({
+                data: {
+                    id: 789,
+                    name: 'test-project',
+                    portalId: 123,
+                    createdAt: 0,
+                    deletedAt: 0,
+                    isLocked: false,
+                    updatedAt: 0,
+                    latestBuild: { id: 'build-1', status: 'SUCCESS' },
+                    deployedBuild: { id: 'build-1', status: 'SUCCESS' },
+                },
+            });
+            const result = await process.uploadProject();
+            // Verify translateForLocalDev was called during updateProjectNodesAfterDeploy
             expect(translateForLocalDev).toHaveBeenCalledWith({
                 projectSourceDir: path.join(mockOptions.projectDir, mockOptions.projectConfig.srcDir),
                 platformVersion: mockOptions.projectConfig.platformVersion,
                 accountId: mockOptions.targetProjectAccountId,
-            }, { projectNodesAtLastUpload: undefined });
+            }, {
+                profile: undefined,
+                projectNodesAtLastUpload: undefined,
+            });
             // Verify projectNodesAtLastUpload was reset to the new nodes
             // @ts-expect-error accessing private property for testing
-            expect(process.state.projectNodesAtLastUpload).toEqual(mockNodes);
-            expect(success).toBe(true);
+            expect(process.state.projectNodesAtLastDeploy).toEqual(mockNewNodes);
+            expect(result).toEqual({
+                uploadSuccess: true,
+                buildSuccess: true,
+                deploySuccess: true,
+                deployId: 456,
+            });
         });
     });
     describe('handleFileChange()', () => {
@@ -252,4 +374,93 @@ describe('LocalDevProcess', () => {
             expect(listener).toHaveBeenCalledTimes(1);
         });
     });
+    describe('deployLatestBuild()', () => {
+        beforeEach(() => {
+            vi.clearAllMocks();
+        });
+        it('should successfully deploy latest build', async () => {
+            const mockDeploy = {
+                deployId: 456,
+                buildId: 123,
+                status: 'SUCCESS',
+                enqueuedAt: '2023-01-01T00:00:00Z',
+                startedAt: '2023-01-01T00:01:00Z',
+                finishedAt: '2023-01-01T00:05:00Z',
+                portalId: 123,
+                projectName: 'test-project',
+                userId: 789,
+                source: 'HUBSPOT_USER',
+                subdeployStatuses: [],
+            };
+            handleProjectDeploy.mockResolvedValue(mockDeploy);
+            const result = await process.deployLatestBuild();
+            expect(mockLocalDevLogger.deployInitiated).toHaveBeenCalled();
+            expect(handleProjectDeploy).toHaveBeenCalledWith(123, // targetProjectAccountId
+            'test-project', // projectName
+            123, // buildId
+            true, // useV3Api
+            false // force
+            );
+            expect(mockLocalDevLogger.deploySuccess).toHaveBeenCalled();
+            expect(result).toEqual({
+                success: true,
+                deployId: 456,
+            });
+        });
+        it('should deploy with force parameter', async () => {
+            const mockDeploy = {
+                deployId: 456,
+                buildId: 123,
+                status: 'SUCCESS',
+                enqueuedAt: '2023-01-01T00:00:00Z',
+                startedAt: '2023-01-01T00:01:00Z',
+                finishedAt: '2023-01-01T00:05:00Z',
+                portalId: 123,
+                projectName: 'test-project',
+                userId: 789,
+                source: 'HUBSPOT_USER',
+                subdeployStatuses: [],
+            };
+            handleProjectDeploy.mockResolvedValue(mockDeploy);
+            const result = await process.deployLatestBuild(true);
+            expect(handleProjectDeploy).toHaveBeenCalledWith(123, // targetProjectAccountId
+            'test-project', // projectName
+            123, // buildId
+            true, // useV3Api
+            true // force
+            );
+            expect(result).toEqual({
+                success: true,
+                deployId: 456,
+            });
+        });
+        it('should return error when no build exists', async () => {
+            // Create a process without latestBuild
+            const optionsWithoutBuild = {
+                ...mockOptions,
+                projectData: {
+                    ...mockOptions.projectData,
+                    latestBuild: undefined,
+                },
+            };
+            const processWithoutBuild = new LocalDevProcess(optionsWithoutBuild);
+            const result = await processWithoutBuild.deployLatestBuild();
+            expect(mockLocalDevLogger.deployInitiated).toHaveBeenCalled();
+            expect(mockLocalDevLogger.deployError).toHaveBeenCalledWith('Error deploying project. No build was found to deploy.');
+            expect(result).toEqual({
+                success: false,
+            });
+            expect(handleProjectDeploy).not.toHaveBeenCalled();
+        });
+        it('should handle deploy failure when no deploy object returned', async () => {
+            handleProjectDeploy.mockResolvedValue(undefined);
+            const result = await process.deployLatestBuild();
+            expect(mockLocalDevLogger.deployInitiated).toHaveBeenCalled();
+            expect(handleProjectDeploy).toHaveBeenCalled();
+            expect(result).toEqual({
+                success: false,
+            });
+            expect(mockLocalDevLogger.deploySuccess).not.toHaveBeenCalled();
+        });
+    });
 });

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

@@ -30,8 +30,16 @@ describe('LocalDevWebsocketServer', () => {
         mockLocalDevProcess = {
             addStateListener: vi.fn(),
             removeStateListener: vi.fn(),
-            uploadProject: vi.fn(),
+            uploadProject: vi.fn().mockResolvedValue({}),
             sendDevServerMessage: vi.fn(),
+            projectData: {
+                name: 'test-project',
+                id: 123,
+                latestBuild: { id: 'build-1', status: 'SUCCESS' },
+                deployedBuild: { id: 'build-1', status: 'SUCCESS' },
+            },
+            targetProjectAccountId: 456,
+            targetTestingAccountId: 789,
         };
         // Mock WebSocketServer constructor
         WebSocketServer.mockImplementation(() => mockWebSocketServer);
@@ -225,23 +233,6 @@ describe('LocalDevWebsocketServer', () => {
             expect(mockWebSocket3.close).not.toHaveBeenCalled();
         });
         it('should send project data to each connection independently', () => {
-            // Setup mock project data properties as getters
-            Object.defineProperty(mockLocalDevProcess, 'projectName', {
-                get: () => 'test-project',
-                configurable: true,
-            });
-            Object.defineProperty(mockLocalDevProcess, 'projectId', {
-                get: () => 123,
-                configurable: true,
-            });
-            Object.defineProperty(mockLocalDevProcess, 'targetProjectAccountId', {
-                get: () => 456,
-                configurable: true,
-            });
-            Object.defineProperty(mockLocalDevProcess, 'targetTestingAccountId', {
-                get: () => 789,
-                configurable: true,
-            });
             // Establish multiple connections
             connectionCallback(mockWebSocket1, {
                 headers: { origin: 'https://app.hubspot.com' },
@@ -255,6 +246,8 @@ describe('LocalDevWebsocketServer', () => {
                 data: {
                     projectName: 'test-project',
                     projectId: 123,
+                    latestBuild: { id: 'build-1', status: 'SUCCESS' },
+                    deployedBuild: { id: 'build-1', status: 'SUCCESS' },
                     targetProjectAccountId: 456,
                     targetTestingAccountId: 789,
                 },
@@ -264,6 +257,8 @@ describe('LocalDevWebsocketServer', () => {
                 data: {
                     projectName: 'test-project',
                     projectId: 123,
+                    latestBuild: { id: 'build-1', status: 'SUCCESS' },
+                    deployedBuild: { id: 'build-1', status: 'SUCCESS' },
                     targetProjectAccountId: 456,
                     targetTestingAccountId: 789,
                 },
@@ -284,11 +279,11 @@ describe('LocalDevWebsocketServer', () => {
             const closeCallbacks2 = mockWebSocket2.on.mock.calls
                 .filter(call => call[0] === 'close')
                 .map(call => call[1]);
-            expect(closeCallbacks1).toHaveLength(3); // projectNodes and appData listeners
-            expect(closeCallbacks2).toHaveLength(3); // projectNodes and appData listeners
+            expect(closeCallbacks1).toHaveLength(3); // projectNodes, appData, and uploadWarnings listeners
+            expect(closeCallbacks2).toHaveLength(3); // projectNodes, appData, and uploadWarnings listeners
             // Simulate first connection closing (call all close callbacks)
             closeCallbacks1.forEach(callback => callback());
-            // Should have removed listeners for first connection (2 listeners: projectNodes and appData)
+            // Should have removed listeners for first connection (3 listeners: projectNodes, appData, and uploadWarnings)
             expect(mockLocalDevProcess.removeStateListener).toHaveBeenCalledTimes(3);
             // Simulate second connection closing
             closeCallbacks2.forEach(callback => callback());

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

@@ -99,7 +99,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 +112,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/create/__tests__/v3.test.js

@@ -1,8 +1,17 @@
 import { calculateComponentTemplateChoices } from '../v3.js';
+import { hasFeature } from '../../../hasFeature.js';
 vi.mock('@hubspot/local-dev-lib/logger');
 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();
+        });
     });
 });