@hubspot/cli 7.6.0-beta.9 → 7.6.0

package/api/__tests__/migrate.test.js

@@ -1,6 +1,6 @@
 import { http } from '@hubspot/local-dev-lib/http';
 import { MIGRATION_STATUS } from '@hubspot/local-dev-lib/types/Migration';
-import { listAppsForMigration, initializeMigration, continueMigration, checkMigrationStatusV2, isMigrationStatus, } from '../migrate.js';
+import { listAppsForMigration, initializeAppMigration, continueAppMigration, checkMigrationStatusV2, isMigrationStatus, } from '../migrate.js';
 vi.mock('@hubspot/local-dev-lib/http');
 const httpMock = http;
 describe('api/migrate', () => {
@@ -49,12 +49,12 @@ describe('api/migrate', () => {
             expect(result).toEqual(mockResponse);
         });
     });
-    describe('initializeMigration', () => {
+    describe('initializeAppMigration', () => {
         it('should call http.post with correct parameters', async () => {
             const mockResponse = { migrationId: mockMigrationId };
             // @ts-expect-error Mock
             httpMock.post.mockResolvedValue(mockResponse);
-            const result = await initializeMigration(mockAccountId, mockAppId, mockPlatformVersion);
+            const result = await initializeAppMigration(mockAccountId, mockAppId, mockPlatformVersion);
             expect(http.post).toHaveBeenCalledWith(mockAccountId, {
                 url: 'dfs/migrations/v2/migrations',
                 data: {
@@ -65,12 +65,12 @@ describe('api/migrate', () => {
             expect(result).toEqual(mockResponse);
         });
     });
-    describe('continueMigration', () => {
+    describe('continueAppMigration', () => {
         it('should call http.post with correct parameters', async () => {
             const mockResponse = { migrationId: mockMigrationId };
             // @ts-expect-error Mock
             httpMock.post.mockResolvedValue(mockResponse);
-            const result = await continueMigration(mockPortalId, mockMigrationId, mockComponentUids, mockProjectName);
+            const result = await continueAppMigration(mockPortalId, mockMigrationId, mockComponentUids, mockProjectName);
             expect(http.post).toHaveBeenCalledWith(mockPortalId, {
                 url: 'dfs/migrations/v2/migrations/continue',
                 data: {

package/api/migrate.d.ts

@@ -30,7 +30,7 @@ export interface ListThemesResponse {
         REACT_THEME: string[];
     };
 }
-export interface InitializeMigrationResponse {
+export interface InitializeAppMigrationResponse {
     migrationId: number;
 }
 export interface ListAppsMigrationComponent {
@@ -38,7 +38,7 @@ export interface ListAppsMigrationComponent {
     componentType: string;
     isSupported: boolean;
 }
-export type ContinueMigrationResponse = {
+export type ContinueAppMigrationResponse = {
     migrationId: number;
 };
 export interface MigrationBaseStatus {
@@ -71,8 +71,7 @@ export interface MigrationFailed extends MigrationBaseStatus {
 export type MigrationStatus = MigrationInProgress | MigrationInputRequired | MigrationSuccess | MigrationFailed;
 export declare function isMigrationStatus(error: unknown): error is MigrationStatus;
 export declare function listAppsForMigration(accountId: number, platformVersion: string): HubSpotPromise<ListAppsResponse>;
-export declare function listThemesForMigration(accountId: number, projectName: string): HubSpotPromise<ListThemesResponse>;
-export declare function initializeMigration(accountId: number, applicationId: number, platformVersion: string): HubSpotPromise<InitializeMigrationResponse>;
-export declare function continueMigration(portalId: number, migrationId: number, componentUids: Record<string, string>, projectName: string): HubSpotPromise<ContinueMigrationResponse>;
+export declare function initializeAppMigration(accountId: number, applicationId: number, platformVersion: string): HubSpotPromise<InitializeAppMigrationResponse>;
+export declare function continueAppMigration(portalId: number, migrationId: number, componentUids: Record<string, string>, projectName: string): HubSpotPromise<ContinueAppMigrationResponse>;
 export declare function checkMigrationStatusV2(accountId: number, id: number): HubSpotPromise<MigrationStatus>;
 export {};

package/api/migrate.js

@@ -18,21 +18,13 @@ export async function listAppsForMigration(accountId, platformVersion) {
         },
     });
 }
-export async function listThemesForMigration(accountId, projectName) {
-    return http.get(accountId, {
-        url: `${MIGRATIONS_API_PATH_V2}/list-themes`,
-        params: {
-            projectName,
-        },
-    });
-}
 function mapPlatformVersionToEnum(platformVersion) {
     if (platformVersion === PLATFORM_VERSIONS.unstable) {
         return PLATFORM_VERSIONS.unstable.toUpperCase();
     }
     return `V${platformVersion.replace('.', '_')}`;
 }
-export async function initializeMigration(accountId, applicationId, platformVersion) {
+export async function initializeAppMigration(accountId, applicationId, platformVersion) {
     return http.post(accountId, {
         url: `${MIGRATIONS_API_PATH_V2}/migrations`,
         data: {
@@ -41,7 +33,7 @@ export async function initializeMigration(accountId, applicationId, platformVers
         },
     });
 }
-export async function continueMigration(portalId, migrationId, componentUids, projectName) {
+export async function continueAppMigration(portalId, migrationId, componentUids, projectName) {
     return http.post(portalId, {
         url: `${MIGRATIONS_API_PATH_V2}/migrations/continue`,
         data: {

package/commands/__tests__/getStarted.test.js

@@ -34,8 +34,8 @@ describe('commands/get-started', () => {
         });
     });
     describe('describe', () => {
-        it('should have undefined describe property', () => {
-            expect(getStartedCommand.describe).toBeUndefined();
+        it('should have a defined describe property', () => {
+            expect(getStartedCommand.describe).toBeDefined();
         });
     });
     describe('command structure', () => {

package/commands/__tests__/mcp.test.js

@@ -19,7 +19,7 @@ describe('commands/mcp', () => {
     });
     describe('describe', () => {
         it('should provide a description', () => {
-            expect(mcpCommand.describe).toBeUndefined();
+            expect(mcpCommand.describe).toBeDefined();
         });
     });
     describe('builder', () => {

package/commands/__tests__/project.test.js

@@ -51,9 +51,6 @@ describe('commands/project', () => {
         });
     });
     describe('describe', () => {
-        it('should contain the beta tag', () => {
-            expect(projectCommand.describe).toContain('[BETA]');
-        });
         it('should provide a description', () => {
             expect(projectCommand.describe).toBeDefined();
         });

package/commands/app/__tests__/migrate.test.js

@@ -10,6 +10,7 @@ vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('@hubspot/local-dev-lib/logger');
 vi.mock('../../../lib/app/migrate');
 vi.mock('../../../lib/app/migrate_legacy');
+vi.mock('../../../lib/projects/config.js');
 const mockYargs = yargs;
 const mockedGetAccountConfig = getAccountConfig;
 const mockedMigrateApp2023_2 = migrateApp2023_2;
@@ -102,7 +103,6 @@ describe('commands/app/migrate', () => {
                 'platform-version': expect.objectContaining({
                     type: 'string',
                     default: '2025.2',
-                    hidden: true,
                 }),
             }));
         });

package/commands/app/migrate.js

@@ -6,13 +6,13 @@ import { i18n } from '../../lib/lang.js';
 import { ApiErrorContext, logError } from '../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { migrateApp2025_2 } from '../../lib/app/migrate.js';
-import { uiBetaTag, uiCommandReference, uiLink } from '../../lib/ui/index.js';
+import { uiCommandReference, uiLink } from '../../lib/ui/index.js';
 import { migrateApp2023_2 } from '../../lib/app/migrate_legacy.js';
 import { getIsInProject } from '../../lib/projects/config.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const { v2023_2, v2025_2 } = PLATFORM_VERSIONS;
 const command = 'migrate';
-const describe = undefined; // uiBetaTag(i18n(`commands.project.subcommands.migrateApp.header.text.describe`), false);
+const describe = i18n(`commands.project.subcommands.migrateApp.describe`);
 export function handlerGenerator(commandTrackingName) {
     return async function handler(args) {
         const { derivedAccountId, platformVersion, unstable } = args;
@@ -23,7 +23,7 @@ export function handlerGenerator(commandTrackingName) {
             return process.exit(EXIT_CODES.ERROR);
         }
         logger.log('');
-        logger.log(uiBetaTag(i18n(`commands.project.subcommands.migrateApp.header.text`), false));
+        logger.log(i18n(`commands.project.subcommands.migrateApp.header.text`));
         logger.log(uiLink(i18n(`commands.project.subcommands.migrateApp.header.link`), 'https://developers.hubspot.com/docs/platform/migrate-a-public-app-to-projects'));
         logger.log('');
         try {
@@ -76,7 +76,6 @@ function appMigrateBuilder(yargs) {
         'platform-version': {
             type: 'string',
             choices: [v2023_2, v2025_2],
-            hidden: true,
             default: v2025_2,
         },
         unstable: {
@@ -93,7 +92,7 @@ function appMigrateBuilder(yargs) {
     ]);
     return yargs;
 }
-const builder = makeYargsBuilder(appMigrateBuilder, command, uiBetaTag(i18n(`commands.project.subcommands.migrateApp.describe`), false), {
+const builder = makeYargsBuilder(appMigrateBuilder, command, i18n(`commands.project.subcommands.migrateApp.describe`), {
     useGlobalOptions: true,
     useConfigOptions: true,
     useAccountOptions: true,

package/commands/app/secret/add.js

@@ -7,8 +7,9 @@ import { commands } from '../../../lang/en.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
+import { uiBetaTag } from '../../../lib/ui/index.js';
 const command = 'add [name]';
-const describe = commands.app.subcommands.secret.subcommands.add.describe;
+const describe = uiBetaTag(commands.app.subcommands.secret.subcommands.add.describe, false);
 async function handler(args) {
     const { derivedAccountId } = args;
     trackCommandUsage('app-secret-add', {}, derivedAccountId);

package/commands/app/secret/delete.js

@@ -7,8 +7,9 @@ import { commands } from '../../../lang/en.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
+import { uiBetaTag } from '../../../lib/ui/index.js';
 const command = 'delete [name]';
-const describe = commands.app.subcommands.secret.subcommands.delete.describe;
+const describe = uiBetaTag(commands.app.subcommands.secret.subcommands.delete.describe, false);
 async function handler(args) {
     const { derivedAccountId, force } = args;
     trackCommandUsage('app-secret-delete', {}, derivedAccountId);

package/commands/app/secret/list.js

@@ -6,8 +6,9 @@ import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { selectAppPrompt } from '../../../lib/prompts/selectAppPrompt.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
+import { uiBetaTag } from '../../../lib/ui/index.js';
 const command = 'list';
-const describe = commands.app.subcommands.secret.subcommands.list.describe;
+const describe = uiBetaTag(commands.app.subcommands.secret.subcommands.list.describe, false);
 async function handler(args) {
     const { derivedAccountId } = args;
     trackCommandUsage('app-secret-list', {}, derivedAccountId);

package/commands/app/secret/update.js

@@ -8,8 +8,9 @@ import { commands } from '../../../lang/en.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
+import { uiBetaTag } from '../../../lib/ui/index.js';
 const command = 'update [name]';
-const describe = commands.app.subcommands.secret.subcommands.update.describe;
+const describe = uiBetaTag(commands.app.subcommands.secret.subcommands.update.describe, false);
 async function handler(args) {
     const { derivedAccountId } = args;
     trackCommandUsage('app-secret-update', {}, derivedAccountId);

package/commands/app/secret.js

@@ -4,8 +4,9 @@ import addAppSecretCommand from './secret/add.js';
 import deleteAppSecretCommand from './secret/delete.js';
 import listAppSecretsCommand from './secret/list.js';
 import updateAppSecretCommand from './secret/update.js';
+import { uiBetaTag } from '../../lib/ui/index.js';
 const command = ['secret', 'secrets'];
-const describe = undefined; // commands.app.subcommands.secret.describe;
+const describe = uiBetaTag(commands.app.subcommands.secret.describe, false);
 function appSecretBuilder(yargs) {
     yargs
         .command(addAppSecretCommand)

package/commands/app.js

@@ -1,9 +1,9 @@
 import migrateCommand from './app/migrate.js';
 import appSecretCommand from './app/secret.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
+import { commands } from '../lang/en.js';
 const command = ['app', 'apps'];
-// Keep the command hidden for now
-const describe = undefined;
+const describe = commands.app.describe;
 function appBuilder(yargs) {
     yargs.command(migrateCommand).command(appSecretCommand).demandCommand(1, '');
     return yargs;

package/commands/config/set.js

@@ -84,7 +84,6 @@ function configSetBuilder(yargs) {
         'auto-open-browser': {
             describe: commands.config.subcommands.set.options.autoOpenBrowser.describe,
             type: 'boolean',
-            hidden: true,
         },
     })
         .conflicts(getExclusiveConflicts([

package/commands/getStarted.d.ts

@@ -1,6 +1,4 @@
 import { AccountArgs, YargsCommandModule, CommonArgs, ConfigArgs, EnvironmentArgs } from '../types/Yargs.js';
-export declare const command = "get-started";
-export declare const describe: undefined;
 type GetStartedArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
     name?: string;
     dest?: string;

package/commands/getStarted.js

@@ -4,7 +4,7 @@ import open from 'open';
 import { getCwd } from '@hubspot/local-dev-lib/path';
 import { cloneGithubRepo } from '@hubspot/local-dev-lib/github';
 import { commands } from '../lang/en.js';
-import { trackCommandUsage } from '../lib/usageTracking.js';
+import { trackCommandMetadataUsage, trackCommandUsage, } from '../lib/usageTracking.js';
 import { EXIT_CODES } from '../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 import { promptUser } from '../lib/prompts/promptUtils.js';
@@ -16,22 +16,23 @@ import { handleProjectUpload } from '../lib/projects/upload.js';
 import { PROJECT_CONFIG_FILE, GET_STARTED_OPTIONS, HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, } from '../lib/constants.js';
 import { writeProjectConfig, getProjectConfig, validateProjectConfig, } from '../lib/projects/config.js';
 import { getProjectPackageJsonLocations, installPackages, } from '../lib/dependencyManagement.js';
-import { pollProjectBuildAndDeploy, useV3Api, } from '../lib/projects/buildAndDeploy.js';
+import { pollProjectBuildAndDeploy } from '../lib/projects/pollProjectBuildAndDeploy.js';
+import { useV3Api } from '../lib/projects/platformVersion.js';
 import { openLink } from '../lib/links.js';
 import { getStaticAuthAppInstallUrl } from '../lib/app/urls.js';
 import { getEnv } from '@hubspot/local-dev-lib/config';
 import { ENVIRONMENTS } from '@hubspot/local-dev-lib/constants/environments';
 import { fetchPublicAppsForPortal } from '@hubspot/local-dev-lib/api/appsDev';
-export const command = 'get-started';
-export const describe = undefined;
+const command = 'get-started';
+const describe = commands.getStarted.describe;
 async function handler(args) {
     const { derivedAccountId } = args;
     const env = getEnv(derivedAccountId) === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD;
-    // TODO: Put this in constants.ts once we have a defined place for the template before INBOUND
-    const templateSource = 'robrown-hubspot/hubspot-project-components-ua-app-objects-beta';
-    trackCommandUsage('get-started', {}, derivedAccountId);
+    await trackCommandUsage('get-started', {}, derivedAccountId);
+    const accountName = uiAccountDescription(derivedAccountId);
     uiInfoSection(commands.getStarted.startTitle, () => {
         uiLogger.log(commands.getStarted.startDescription);
+        uiLogger.log(commands.getStarted.guideOverview(accountName));
     });
     const { default: selectedOption } = await promptUser([
         {
@@ -51,6 +52,8 @@ async function handler(args) {
             default: GET_STARTED_OPTIONS.APP,
         },
     ]);
+    // Track user's initial choice
+    await trackCommandMetadataUsage('get-started', { step: 'select-option', type: selectedOption }, derivedAccountId);
     if (selectedOption === GET_STARTED_OPTIONS.CMS) {
         uiLogger.log(' ');
         uiLogger.log(commands.getStarted.designManager);
@@ -63,6 +66,11 @@ async function handler(args) {
                     message: commands.getStarted.openDesignManagerPrompt,
                 },
             ]);
+            // Track Design Manager browser action
+            await trackCommandMetadataUsage('get-started', {
+                step: 'open-design-manager',
+                type: shouldOpen ? 'opened' : 'declined',
+            }, derivedAccountId);
             if (shouldOpen) {
                 uiLogger.log('');
                 openLink(derivedAccountId, 'design-manager');
@@ -73,36 +81,37 @@ async function handler(args) {
     else {
         uiLogger.log(' ');
         uiLogger.log(commands.getStarted.logs.appSelected);
-        // 1. Fetch project templates
-        let latestRepoReleaseTag;
         const { dest, name } = await projectNameAndDestPrompt(args);
-        // Specific template for get-started command
-        const projectTemplate = {
-            name: 'private-app-get-started-template',
-            label: 'CRM getting started project with private apps',
-            path: 'projects/private-app-get-started-template',
-        };
-        // 3. Create the project files
         const projectDest = path.resolve(getCwd(), dest);
         const { projectConfig: existingProjectConfig, projectDir: existingProjectDir, } = await getProjectConfig(projectDest);
         if (existingProjectConfig &&
             existingProjectDir &&
             projectDest.startsWith(existingProjectDir)) {
+            // Track nested project error
+            await trackCommandMetadataUsage('get-started', {
+                successful: false,
+                step: 'project-creation',
+            }, derivedAccountId);
             uiLogger.log(' ');
             uiLogger.error(commands.project.create.errors.cannotNestProjects(existingProjectDir));
             process.exit(EXIT_CODES.ERROR);
         }
-        const repo = templateSource || HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH;
         // 4. Clone the project template from GitHub
-        // This is temporary until we have the UA template in the main repo
         try {
-            await cloneGithubRepo(repo, projectDest, {
-                sourceDir: projectTemplate.path,
-                tag: latestRepoReleaseTag,
+            await cloneGithubRepo(HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, projectDest, {
+                sourceDir: '2025.2/private-app-get-started-template',
                 hideLogs: true,
             });
+            await trackCommandMetadataUsage('get-started', {
+                successful: true,
+                step: 'github-clone',
+            }, derivedAccountId);
         }
         catch (err) {
+            await trackCommandMetadataUsage('get-started', {
+                successful: false,
+                step: 'github-clone',
+            }, derivedAccountId);
             debugError(err);
             uiLogger.log(' ');
             uiLogger.error(commands.project.create.errors.failedToDownloadProject);
@@ -121,6 +130,11 @@ async function handler(args) {
         uiLogger.log(' ');
         uiLogger.log(commands.getStarted.prompts.projectCreated.description);
         uiLogger.log(' ');
+        // Track successful project creation
+        await trackCommandMetadataUsage('get-started', {
+            successful: true,
+            step: 'project-creation',
+        }, derivedAccountId);
         // 5. Install dependencies
         const installLocations = await getProjectPackageJsonLocations(projectDest);
         try {
@@ -138,7 +152,6 @@ async function handler(args) {
             uiLogger.log(' ');
         }
         // 6. Ask user if they want to upload the project
-        const accountName = uiAccountDescription(derivedAccountId);
         const { shouldUpload } = await promptUser([
             {
                 type: 'confirm',
@@ -147,22 +160,31 @@ async function handler(args) {
                 default: true,
             },
         ]);
+        // Track upload decision
+        await trackCommandMetadataUsage('get-started', {
+            step: 'upload-decision',
+            type: shouldUpload ? 'upload' : 'skip',
+        }, derivedAccountId);
         if (shouldUpload) {
             try {
                 // Get the project config for the newly created project
                 const { projectConfig: newProjectConfig, projectDir: newProjectDir } = await getProjectConfig(projectDest);
                 if (!newProjectConfig || !newProjectDir) {
+                    // Track config file not found error
+                    await trackCommandMetadataUsage('get-started', {
+                        successful: false,
+                        step: 'config-file-not-found',
+                    }, derivedAccountId);
                     uiLogger.log(' ');
                     uiLogger.error(commands.getStarted.errors.configFileNotFound);
                     process.exit(EXIT_CODES.ERROR);
                 }
                 validateProjectConfig(newProjectConfig, newProjectDir);
-                const targetAccountId = derivedAccountId;
                 uiLogger.log(' ');
                 uiLogger.log(commands.getStarted.logs.uploadingProject);
                 uiLogger.log(' ');
                 const { result, uploadError } = await handleProjectUpload({
-                    accountId: targetAccountId,
+                    accountId: derivedAccountId,
                     projectConfig: newProjectConfig,
                     projectDir: newProjectDir,
                     callbackFunc: pollProjectBuildAndDeploy,
@@ -173,11 +195,22 @@ async function handler(args) {
                     skipValidation: false,
                 });
                 if (uploadError) {
+                    // Track upload failure
+                    await trackCommandMetadataUsage('get-started', {
+                        successful: false,
+                        step: 'upload',
+                    }, derivedAccountId);
                     uiLogger.log(' ');
                     uiLogger.error(commands.getStarted.errors.uploadFailed);
                     debugError(uploadError);
                 }
                 else if (result) {
+                    // Track successful upload completion
+                    await trackCommandMetadataUsage('get-started', {
+                        successful: true,
+                        step: 'upload',
+                    }, derivedAccountId);
+                    uiLogger.log(' ');
                     uiLogger.success(commands.getStarted.logs.uploadSuccess);
                     const { data: { results }, } = await fetchPublicAppsForPortal(derivedAccountId);
                     const lastCreatedApp = results.sort((a, b) => b.createdAt - a.createdAt)[0];
@@ -192,6 +225,11 @@ async function handler(args) {
                                 message: commands.getStarted.openInstallUrl,
                             },
                         ]);
+                        // Track Developer Overview browser action
+                        await trackCommandMetadataUsage('get-started', {
+                            step: 'open-distribution-page',
+                            type: shouldOpenOverview ? 'opened' : 'declined',
+                        }, derivedAccountId);
                         if (shouldOpenOverview) {
                             open(getStaticAuthAppInstallUrl({
                                 targetAccountId: derivedAccountId,
@@ -207,6 +245,11 @@ async function handler(args) {
                 }
             }
             catch (err) {
+                // Track upload exception
+                await trackCommandMetadataUsage('get-started', {
+                    successful: false,
+                    step: 'upload',
+                }, derivedAccountId);
                 uiLogger.log(' ');
                 uiLogger.error(commands.getStarted.errors.uploadFailed);
                 debugError(err);
@@ -214,6 +257,11 @@ async function handler(args) {
             }
         }
     }
+    // Track successful completion of get-started command
+    await trackCommandMetadataUsage('get-started', {
+        successful: true,
+        step: 'command-completed',
+    }, derivedAccountId);
     process.exit(EXIT_CODES.SUCCESS);
 }
 function getStartedBuilder(yargs) {

package/commands/mcp/__tests__/setup.test.js

@@ -3,12 +3,12 @@ vi.mock('../../../lib/commonOpts');
 describe('commands/mcp/setup', () => {
     describe('command', () => {
         it('should have the correct command structure', () => {
-            expect(setupCommand.command).toEqual(['setup', 'update']);
+            expect(setupCommand.command).toEqual(['setup']);
         });
     });
     describe('describe', () => {
         it('should be undefined to keep the command hidden', () => {
-            expect(setupCommand.describe).toBeUndefined();
+            expect(setupCommand.describe).toBeDefined();
         });
     });
     describe('builder', () => {

package/commands/mcp/setup.d.ts

@@ -1,7 +1,6 @@
 import { CommonArgs, YargsCommandModule } from '../../types/Yargs.js';
 interface MCPSetupArgs extends CommonArgs {
     client?: string[];
-    addDocsSearch?: boolean;
 }
 declare const mcpSetupCommand: YargsCommandModule<unknown, MCPSetupArgs>;
 export default mcpSetupCommand;

package/commands/mcp/setup.js

@@ -2,11 +2,20 @@ import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
-import { addMcpServerToConfig, addMintlifyMcpServer, supportedTools, } from '../../lib/mcp/setup.js';
+import { addMcpServerToConfig, supportedTools } from '../../lib/mcp/setup.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
-const command = ['setup', 'update'];
-const describe = undefined; // Leave hidden for now
+import { hasFeature } from '../../lib/hasFeature.js';
+import { FEATURES } from '../../lib/constants.js';
+import { uiBetaTag } from '../../lib/ui/index.js';
+const command = ['setup'];
+const describe = uiBetaTag(commands.mcp.setup.describe, false);
 async function handler(args) {
+    const { derivedAccountId } = args;
+    const hasMcpAccess = await hasFeature(derivedAccountId, FEATURES.MCP_ACCESS);
+    if (!hasMcpAccess) {
+        uiLogger.error(commands.mcp.setup.errors.needsMcpAccess(derivedAccountId));
+        process.exit(EXIT_CODES.ERROR);
+    }
     try {
         await import('@modelcontextprotocol/sdk/server/mcp.js');
     }
@@ -16,10 +25,7 @@ async function handler(args) {
     }
     trackCommandUsage('mcp-setup', {}, args.derivedAccountId);
     try {
-        const derivedTargets = await addMcpServerToConfig(args.client);
-        if (args.addDocsSearch) {
-            await addMintlifyMcpServer(derivedTargets);
-        }
+        await addMcpServerToConfig(args.client);
     }
     catch (e) {
         process.exit(EXIT_CODES.ERROR);
@@ -27,15 +33,10 @@ async function handler(args) {
     process.exit(EXIT_CODES.SUCCESS);
 }
 function setupBuilder(yargs) {
-    yargs
-        .option('client', {
+    yargs.option('client', {
         describe: commands.mcp.setup.args.client,
         type: 'array',
         choices: [...supportedTools.map(tool => tool.value)],
-    })
-        .option('add-docs-search', {
-        type: 'boolean',
-        hidden: true,
     });
     return yargs;
 }

package/commands/mcp.js

@@ -2,14 +2,14 @@ import startCommand from './mcp/start.js';
 import setupCommand from './mcp/setup.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 import { commands } from '../lang/en.js';
+import { uiBetaTag } from '../lib/ui/index.js';
 const command = 'mcp';
-// Leave this as undefined to hide the command
-const describe = undefined;
+const describe = uiBetaTag(commands.mcp.describe, false);
 function mcpBuilder(yargs) {
     yargs.command(startCommand).command(setupCommand).demandCommand(1, '');
     return yargs;
 }
-const builder = makeYargsBuilder(mcpBuilder, command, commands.mcp.describe, {
+const builder = makeYargsBuilder(mcpBuilder, command, describe, {
     useGlobalOptions: true,
 });
 const mcpCommand = {