@hubspot/cli 8.1.0 → 8.1.1-experimental.0

package/lib/api/usageTracking.js

@@ -0,0 +1,28 @@
+import { http } from '@hubspot/local-dev-lib/http';
+import { http as unauthedHttp } from '@hubspot/local-dev-lib/http/unauthed';
+import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
+const USAGE_PATH = 'local/dev/tools/proxy/v1/usage';
+const USAGE_AUTHENTICATED_PATH = `${USAGE_PATH}/authenticated`;
+export async function sendUsageEvent(request) {
+    const { accountId } = request;
+    if (accountId) {
+        try {
+            const account = getConfigAccountById(accountId);
+            if (account?.authType === 'personalaccesskey') {
+                await http.post(accountId, {
+                    url: USAGE_AUTHENTICATED_PATH,
+                    data: request,
+                });
+                return;
+            }
+        }
+        catch (_e) { }
+    }
+    try {
+        await unauthedHttp.post({
+            url: USAGE_PATH,
+            data: request,
+        });
+    }
+    catch (_e) { }
+}

package/lib/app/migrate.js

@@ -5,6 +5,7 @@ import chalk from 'chalk';
 import { validateUid } from '@hubspot/project-parsing-lib/uid';
 import { UNMIGRATABLE_REASONS } from '@hubspot/local-dev-lib/constants/projects';
 import { mapToUserFacingType } from '@hubspot/project-parsing-lib/transform';
+import { AUTO_GENERATED_COMPONENT_TYPES } from '@hubspot/project-parsing-lib/constants';
 import { MIGRATION_STATUS } from '@hubspot/local-dev-lib/types/Migration';
 import { downloadProject, fetchProjectComponentsMetadata, } from '@hubspot/local-dev-lib/api/projects';
 import { Separator } from '@inquirer/prompts';
@@ -123,12 +124,21 @@ export async function selectAppToMigrate(allApps, derivedAccountId, appId) {
     const selectedApp = allApps.find(app => app.appId === appIdToMigrate);
     const migratableComponents = new Set();
     const unmigratableComponents = new Set();
+    let hasLegacyCrmCards = false;
     selectedApp?.migrationComponents.forEach(component => {
-        if (component.isSupported) {
-            migratableComponents.add(mapToUserFacingType(component.componentType));
+        const userFacingComponentType = mapToUserFacingType(component.componentType);
+        if (component.componentType === 'LEGACY_CRM_CARD' &&
+            !component.isSupported) {
+            hasLegacyCrmCards = true;
         }
-        else {
-            unmigratableComponents.add(mapToUserFacingType(component.componentType));
+        const shouldDisplayComponent = !AUTO_GENERATED_COMPONENT_TYPES.includes(userFacingComponentType);
+        if (shouldDisplayComponent) {
+            if (component.isSupported) {
+                migratableComponents.add(userFacingComponentType);
+            }
+            else {
+                unmigratableComponents.add(userFacingComponentType);
+            }
         }
     });
     if (migratableComponents.size !== 0) {
@@ -137,6 +147,9 @@ export async function selectAppToMigrate(allApps, derivedAccountId, appId) {
     if (unmigratableComponents.size !== 0) {
         uiLogger.log(lib.migrate.componentsThatWillNotBeMigrated(`\n - ${[...unmigratableComponents].join('\n - ')}`));
     }
+    if (hasLegacyCrmCards) {
+        uiLogger.info(lib.migrate.legacyCrmCardMigrationDocs());
+    }
     uiLogger.log('');
     const proceed = await confirmPrompt(lib.migrate.prompt.proceed, {
         defaultAnswer: false,
@@ -255,7 +268,7 @@ export async function pollMigrationStatus(derivedAccountId, migrationId, success
     return poll(() => checkMigrationStatusV2(derivedAccountId, migrationId), {
         successStates: [...successStates],
         errorStates: [...DEFAULT_POLLING_STATUS_LOOKUP.errorStates],
-    });
+    }, 300_000);
 }
 export async function finalizeAppMigration(derivedAccountId, migrationId, uidMap, projectName) {
     let pollResponse;

package/lib/buildAccount.d.ts

@@ -1,7 +1,7 @@
 import { DeveloperTestAccountConfig } from '@hubspot/local-dev-lib/types/developerTestAccounts';
 import { Environment } from '@hubspot/local-dev-lib/types/Accounts';
 import { HubSpotConfigAccount } from '@hubspot/local-dev-lib/types/Accounts';
-import { SandboxResponse, V2Sandbox } from '@hubspot/local-dev-lib/types/Sandbox';
+import { V2Sandbox } from '@hubspot/local-dev-lib/types/Sandbox';
 import { SandboxAccountType } from '../types/Sandboxes.js';
 export declare function saveAccountToConfig(accountId: number | undefined, accountName: string, env: Environment, personalAccessKey?: string, force?: boolean): Promise<string>;
 export declare function createDeveloperTestAccountV2(parentAccountId: number, testAccountConfig: DeveloperTestAccountConfig): Promise<{
@@ -10,11 +10,6 @@ export declare function createDeveloperTestAccountV2(parentAccountId: number, te
     personalAccessKey?: string;
 }>;
 export declare function buildDeveloperTestAccount(testAccountName: string, parentAccountConfig: HubSpotConfigAccount, env: Environment, portalLimit: number, useV2?: boolean): Promise<number>;
-type SandboxAccount = SandboxResponse & {
-    name: string;
-};
-export declare function buildSandbox(sandboxName: string, parentAccountConfig: HubSpotConfigAccount, sandboxType: SandboxAccountType, env: Environment, force?: boolean): Promise<SandboxAccount>;
 export declare function buildV2Sandbox(sandboxName: string, parentAccountConfig: HubSpotConfigAccount, sandboxType: SandboxAccountType, syncObjectRecords: boolean, env: Environment, force?: boolean): Promise<{
     sandbox: V2Sandbox;
 }>;
-export {};

package/lib/buildAccount.js

@@ -3,13 +3,14 @@ import { getConfigAccountIfExists, updateConfigAccount, } from '@hubspot/local-d
 import { uiLogger } from './ui/logger.js';
 import { createDeveloperTestAccount, fetchDeveloperTestAccountGateSyncStatus, generateDeveloperTestAccountPersonalAccessKey, } from '@hubspot/local-dev-lib/api/developerTestAccounts';
 import { HUBSPOT_ACCOUNT_TYPES } from '@hubspot/local-dev-lib/constants/config';
-import { createSandbox, createV2Sandbox, getSandboxPersonalAccessKey, } from '@hubspot/local-dev-lib/api/sandboxHubs';
+import { createV2Sandbox, getSandboxPersonalAccessKey, } from '@hubspot/local-dev-lib/api/sandboxHubs';
+import { isPromptExitError } from './errors/PromptExitError.js';
 import { personalAccessKeyPrompt } from './prompts/personalAccessKeyPrompt.js';
 import { createDeveloperTestAccountConfigPrompt } from './prompts/createDeveloperTestAccountConfigPrompt.js';
 import { cliAccountNamePrompt } from './prompts/accountNamePrompt.js';
 import SpinniesManager from './ui/SpinniesManager.js';
 import { debugError, logError } from './errorHandlers/index.js';
-import { SANDBOX_API_TYPE_MAP, SANDBOX_TYPE_MAP_V2, handleSandboxCreateError, } from './sandboxes.js';
+import { SANDBOX_TYPE_MAP_V2, handleSandboxCreateError } from './sandboxes.js';
 import { handleDeveloperTestAccountCreateError } from './developerTestAccounts.js';
 import { lib } from '../lang/en.js';
 import { poll } from './polling.js';
@@ -127,51 +128,14 @@ export async function buildDeveloperTestAccount(testAccountName, parentAccountCo
         await saveAccountToConfig(developerTestAccountId, testAccountName, env, developerTestAccountPersonalAccessKey);
     }
     catch (err) {
+        if (isPromptExitError(err)) {
+            throw err;
+        }
         logError(err);
         throw err;
     }
     return developerTestAccountId;
 }
-export async function buildSandbox(sandboxName, parentAccountConfig, sandboxType, env, force = false) {
-    const sandboxTypeKey = sandboxType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX
-        ? 'standard'
-        : 'developer';
-    const parentAccountId = parentAccountConfig.accountId;
-    if (!parentAccountId) {
-        throw new Error(lib.sandbox.create[sandboxTypeKey].loading.fail(''));
-    }
-    SpinniesManager.init({
-        succeedColor: 'white',
-    });
-    uiLogger.log('');
-    SpinniesManager.add('buildSandbox', {
-        text: lib.sandbox.create[sandboxTypeKey].loading.add(sandboxName),
-    });
-    let sandbox;
-    try {
-        const sandboxApiType = SANDBOX_API_TYPE_MAP[sandboxType];
-        const { data } = await createSandbox(parentAccountId, sandboxName, sandboxApiType);
-        sandbox = { name: sandboxName, ...data };
-        SpinniesManager.succeed('buildSandbox', {
-            text: lib.sandbox.create[sandboxTypeKey].loading.succeed(sandboxName, sandbox.sandbox.sandboxHubId.toString()),
-        });
-    }
-    catch (e) {
-        debugError(e);
-        SpinniesManager.fail('buildSandbox', {
-            text: lib.sandbox.create[sandboxTypeKey].loading.fail(sandboxName),
-        });
-        handleSandboxCreateError(e, env, sandboxName, parentAccountId);
-    }
-    try {
-        await saveAccountToConfig(sandbox.sandbox.sandboxHubId, sandboxName, env, sandbox.personalAccessKey, force);
-    }
-    catch (err) {
-        logError(err);
-        throw err;
-    }
-    return sandbox;
-}
 export async function buildV2Sandbox(sandboxName, parentAccountConfig, sandboxType, syncObjectRecords, env, force = false) {
     const sandboxTypeKey = sandboxType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX
         ? 'standard'
@@ -210,6 +174,9 @@ export async function buildV2Sandbox(sandboxName, parentAccountConfig, sandboxTy
         await saveAccountToConfig(sandbox.sandboxHubId, sandboxName, env, pak, force);
     }
     catch (err) {
+        if (isPromptExitError(err)) {
+            throw err;
+        }
         logError(err);
         throw err;
     }

package/lib/commandSuggestion.js

@@ -18,12 +18,6 @@ export const commandSuggestionMappings = {
     'theme generate-selectors': 'hs cms theme generate-selectors',
     'theme marketplace-validate': 'hs cms theme marketplace-validate',
     'theme preview': 'hs cms theme preview',
-    'custom-object schema create': 'hs custom-object create-schema',
-    'custom-object schema delete': 'hs custom-object delete-schema',
-    'custom-object schema fetch-all': 'hs custom-object fetch-all-schemas',
-    'custom-object schema fetch': 'hs custom-object fetch-schema',
-    'custom-object schema list': 'hs custom-object list-schemas',
-    'custom-object schema update': 'hs custom-object update-schema',
 };
 function createCommandSuggestionHandler(newCommand) {
     return () => {
@@ -35,7 +29,7 @@ function createCommandSuggestion(oldCommand, newCommand) {
     return {
         command: oldCommand,
         builder: async (yargs) => {
-            return yargs.strict(false);
+            return yargs.strict(false).help(false).version(false);
         },
         handler: createCommandSuggestionHandler(newCommand),
     };

package/lib/constants.d.ts

@@ -77,11 +77,7 @@ export declare const APP_AUTH_TYPES: {
 };
 export declare const FEATURES: {
     readonly UNIFIED_APPS: "Developers:UnifiedApps:PrivateBeta";
-    readonly SANDBOXES_V2: "sandboxes:v2:enabled";
-    readonly SANDBOXES_V2_CLI: "sandboxes:v2:cliEnabled";
     readonly APP_EVENTS: "Developers:UnifiedApps:AppEventsAccess";
-    readonly APPS_HOME: "UIE:AppHome";
-    readonly MCP_ACCESS: "Developers:CLIMCPAccess";
     readonly THEME_MIGRATION_2025_2: "Developers:ProjectThemeMigrations:2025.2";
     readonly AGENT_TOOLS: "ThirdPartyAgentTools";
 };
@@ -145,3 +141,5 @@ export declare const ACCOUNT_LEVELS: {
     readonly ENTERPRISE: "ENTERPRISE";
 };
 export declare const ACCOUNT_LEVEL_CHOICES: readonly ["FREE", "STARTER", "PROFESSIONAL", "ENTERPRISE"];
+export declare const FEEDBACK_URL = "https://developers.hubspot.com/feedback";
+export declare const LOCAL_DEV_DEFAULT_PORT = 4828;

package/lib/constants.js

@@ -69,11 +69,7 @@ export const APP_AUTH_TYPES = {
 };
 export const FEATURES = {
     UNIFIED_APPS: 'Developers:UnifiedApps:PrivateBeta',
-    SANDBOXES_V2: 'sandboxes:v2:enabled',
-    SANDBOXES_V2_CLI: 'sandboxes:v2:cliEnabled',
     APP_EVENTS: 'Developers:UnifiedApps:AppEventsAccess',
-    APPS_HOME: 'UIE:AppHome',
-    MCP_ACCESS: 'Developers:CLIMCPAccess',
     THEME_MIGRATION_2025_2: 'Developers:ProjectThemeMigrations:2025.2',
     AGENT_TOOLS: 'ThirdPartyAgentTools',
 };
@@ -146,3 +142,7 @@ export const ACCOUNT_LEVEL_CHOICES = [
     ACCOUNT_LEVELS.PROFESSIONAL,
     ACCOUNT_LEVELS.ENTERPRISE,
 ];
+export const FEEDBACK_URL = 'https://developers.hubspot.com/feedback';
+// TODO: remove this constant and use PORT_MANAGER_SERVER_PORT from
+// @hubspot/local-dev-lib once LDL changes its default to 4828.
+export const LOCAL_DEV_DEFAULT_PORT = 4828;

package/lib/doctor/Diagnosis.js

@@ -1,4 +1,4 @@
-import { prefixOptions } from '../ui/spinniesUtils.js';
+import { getLabels } from '@hubspot/local-dev-lib/logger';
 import chalk from 'chalk';
 import { helpers } from '../interpolation.js';
 import { uiAccountDescription } from '../ui/index.js';
@@ -10,11 +10,11 @@ export class Diagnosis {
     errorCount = 0;
     warningCount = 0;
     constructor({ diagnosticInfo, accountId }) {
-        const { succeedPrefix, failPrefix } = prefixOptions({});
+        const labels = getLabels();
         this.prefixes = {
-            success: chalk.green(succeedPrefix),
-            error: chalk.red(failPrefix),
-            warning: helpers.orange('!'),
+            success: chalk.green(labels.success),
+            error: chalk.red(labels.error),
+            warning: helpers.orange(labels.warning),
         };
         this.diagnosis = {
             cli: {

package/lib/doctor/Doctor.js

@@ -10,8 +10,8 @@ import fs from 'fs';
 import path from 'path';
 import { Diagnosis } from './Diagnosis.js';
 import { DiagnosticInfoBuilder, } from './DiagnosticInfoBuilder.js';
-import { isPortManagerPortAvailable } from '@hubspot/local-dev-lib/portManager';
-import { PORT_MANAGER_SERVER_PORT } from '@hubspot/local-dev-lib/constants/ports';
+import { isPortAvailable } from '@hubspot/local-dev-lib/portManager';
+import { LOCAL_DEV_DEFAULT_PORT } from '../constants.js';
 import { accessTokenForPersonalAccessKey,
 // scopesOnAccessToken,
  } from '@hubspot/local-dev-lib/personalAccessKey';
@@ -26,7 +26,7 @@ import { isServerRunningAtUrl } from '../http.js';
 import { WEBHOOKS_KEY, APP_KEY } from '@hubspot/project-parsing-lib/constants';
 import { validateProjectConfig } from '../projects/config.js';
 import { validateSourceDirectory, handleTranslate, } from '../projects/upload.js';
-import { isV2Project } from '../projects/platformVersion.js';
+import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
 import { validateProjectForProfile } from '../projects/projectProfiles.js';
 import { getAllHsProfiles } from '@hubspot/project-parsing-lib/profiles';
 const minMajorNodeVersion = 20;
@@ -322,16 +322,16 @@ export class Doctor {
         }
     }
     async checkIfPortsAreAvailable() {
-        if (await isPortManagerPortAvailable()) {
+        if (await isPortAvailable(LOCAL_DEV_DEFAULT_PORT)) {
             this.diagnosis?.addProjectSection({
                 type: 'success',
-                message: lib.doctor.port.available(PORT_MANAGER_SERVER_PORT),
+                message: lib.doctor.port.available(LOCAL_DEV_DEFAULT_PORT),
             });
             return;
         }
         this.diagnosis?.addProjectSection({
             type: 'warning',
-            message: lib.doctor.port.inUse(PORT_MANAGER_SERVER_PORT),
+            message: lib.doctor.port.inUse(LOCAL_DEV_DEFAULT_PORT),
             secondaryMessaging: lib.doctor.port.inUseSecondary,
         });
     }
@@ -534,7 +534,7 @@ export class Doctor {
             if (!this.validateProjectConfigWrapper(projectConfig, projectDir)) {
                 return;
             }
-            if (!isV2Project(projectConfig.platformVersion)) {
+            if (isLegacyProject(projectConfig.platformVersion)) {
                 this.diagnosis?.addProjectSection({
                     type: 'success',
                     message: lib.doctor.projectValidation.valid,

package/lib/errorHandlers/index.js

@@ -7,11 +7,12 @@ import util from 'util';
 import { isProjectValidationError } from '../errors/ProjectValidationError.js';
 export function logError(error, context) {
     debugError(error, context);
-    if (isProjectValidationError(error)) {
-        uiLogger.error(error.message);
+    // This should be right after debugError.  Add anything else below it
+    if (shouldSuppressError(error, context)) {
         return;
     }
-    if (shouldSuppressError(error, context)) {
+    if (isProjectValidationError(error)) {
+        uiLogger.error(error.message);
         return;
     }
     if (isHubSpotHttpError(error)) {

package/lib/errorHandlers/suppressError.js

@@ -3,6 +3,7 @@ import { uiLogger } from '../ui/logger.js';
 import { PLATFORM_VERSION_ERROR_TYPES } from '../constants.js';
 import { lib } from '../../lang/en.js';
 import { uiAccountDescription, uiLine, uiLink } from '../ui/index.js';
+import { isPromptExitError } from '../errors/PromptExitError.js';
 function createPlatformVersionError(err, subCategory) {
     let translationKey = 'unspecifiedPlatformVersion';
     let platformVersion = 'unspecified platformVersion';
@@ -27,6 +28,9 @@ function createPlatformVersionError(err, subCategory) {
     uiLine();
 }
 export function shouldSuppressError(err, context) {
+    if (isPromptExitError(err)) {
+        return true;
+    }
     if (isMissingScopeError(err)) {
         uiLogger.error(lib.errorHandlers.suppressErrors.missingScopeError(context?.request || 'request', context?.accountId ? uiAccountDescription(context.accountId) : ''));
         return true;

package/lib/errors/PromptExitError.d.ts

@@ -0,0 +1,6 @@
+import { ExitCode } from '../../types/Yargs.js';
+export declare class PromptExitError extends Error {
+    exitCode: ExitCode;
+    constructor(message: string, exitCode: ExitCode);
+}
+export declare function isPromptExitError(e: unknown): e is PromptExitError;

package/lib/errors/PromptExitError.js

@@ -0,0 +1,11 @@
+export class PromptExitError extends Error {
+    exitCode;
+    constructor(message, exitCode) {
+        super(message);
+        this.name = 'PromptExitError';
+        this.exitCode = exitCode;
+    }
+}
+export function isPromptExitError(e) {
+    return e instanceof PromptExitError;
+}

package/lib/generateSelectors.js

@@ -1,5 +1,4 @@
 import fs from 'fs';
-import { EXIT_CODES } from './enums/exitCodes.js';
 import { commands } from '../lang/en.js';
 import { uiLogger } from './ui/logger.js';
 const CSS_COMMENTS_REGEX = new RegExp(/\/\*.*\*\//, 'g');
@@ -12,7 +11,7 @@ export function findFieldsJsonPath(basePath) {
     const _path = basePath.endsWith('/') ? basePath.slice(0, -1) : basePath;
     if (!fs.existsSync(_path)) {
         uiLogger.error(commands.cms.subcommands.theme.subcommands.generateSelectors.errors.invalidPath(basePath));
-        process.exit(EXIT_CODES.ERROR);
+        return null;
     }
     const files = fs.readdirSync(_path);
     if (files.includes('fields.json')) {

package/lib/getStartedV2Actions.d.ts

@@ -35,3 +35,16 @@ export declare function uploadAndDeployAction({ accountId, projectDest, }: {
     projectDest: string;
 }): Promise<UploadAndDeployResult>;
 export declare function trackGetStartedUsage(params: Record<string, unknown>, accountId: number): Promise<void>;
+export type PollAppInstallationOptions = {
+    accountId: number;
+    projectId: number;
+    appUid: string;
+    requiredScopes?: string[];
+    optionalScopes?: string[];
+    timeoutMs?: number;
+    intervalMs?: number;
+    onTimeout?: () => void;
+};
+export declare function pollAppInstallation({ accountId, projectId, appUid, requiredScopes, optionalScopes, timeoutMs, // 2 minutes
+intervalMs, // 2 seconds
+onTimeout, }: PollAppInstallationOptions): Promise<void>;

package/lib/getStartedV2Actions.js

@@ -1,6 +1,7 @@
 import fs from 'fs-extra';
 import path from 'path';
 import { fetchPublicAppsForPortal } from '@hubspot/local-dev-lib/api/appsDev';
+import { fetchAppInstallationData } from '@hubspot/local-dev-lib/api/localDevAuth';
 import { fetchProject } from '@hubspot/local-dev-lib/api/projects';
 import { getConfigAccountEnvironment } from '@hubspot/local-dev-lib/config';
 import { cloneGithubRepo } from '@hubspot/local-dev-lib/github';
@@ -12,7 +13,7 @@ import { getStaticAuthAppInstallUrl } from '../lib/app/urls.js';
 import { HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, PROJECT_CONFIG_FILE, } from '../lib/constants.js';
 import { ProjectNestingError, ProjectConfigNotFoundError, ProjectValidationError, ProjectUploadError, ProjectBuildDeployError, } from './errors/ProjectErrors.js';
 import { getProjectConfig, validateProjectConfig, writeProjectConfig, } from '../lib/projects/config.js';
-import { isV2Project } from '../lib/projects/platformVersion.js';
+import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
 import { pollProjectBuildAndDeploy } from '../lib/projects/pollProjectBuildAndDeploy.js';
 import { handleProjectUpload } from '../lib/projects/upload.js';
 import { validateProjectDirectory } from '../lib/prompts/projectNameAndDestPrompt.js';
@@ -36,7 +37,7 @@ export async function createProjectAction({ projectName, projectDest, }) {
     }
     try {
         await cloneGithubRepo(HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, projectDestAbsolute, {
-            sourceDir: '2025.2/private-app-get-started-template',
+            sourceDir: '2026.03/private-app-get-started-template',
             hideLogs: true,
         });
         const projectConfigPath = path.join(projectDestAbsolute, PROJECT_CONFIG_FILE);
@@ -108,7 +109,7 @@ export async function uploadAndDeployAction({ accountId, projectDest, }) {
             uploadMessage: commands.getStarted.logs.initialUploadMessage,
             forceCreate: true,
             isUploadCommand: false,
-            sendIR: isV2Project(projectConfig.platformVersion),
+            sendIR: !isLegacyProject(projectConfig.platformVersion),
             skipValidation: false,
         });
         if (uploadError) {
@@ -144,3 +145,55 @@ export async function uploadAndDeployAction({ accountId, projectDest, }) {
 export function trackGetStartedUsage(params, accountId) {
     return trackCommandMetadataUsage('get-started', params, accountId);
 }
+export async function pollAppInstallation({ accountId, projectId, appUid, requiredScopes = [], optionalScopes = [], timeoutMs = 2 * 60 * 1000, // 2 minutes
+intervalMs = 2000, // 2 seconds
+onTimeout, }) {
+    return new Promise((resolve, reject) => {
+        let consecutiveErrors = 0;
+        const MAX_CONSECUTIVE_ERRORS = 5;
+        let pollInterval = null;
+        let pollTimeout = null;
+        const cleanup = () => {
+            if (pollInterval) {
+                clearTimeout(pollInterval);
+                pollInterval = null;
+            }
+            if (pollTimeout) {
+                clearTimeout(pollTimeout);
+                pollTimeout = null;
+            }
+        };
+        pollTimeout = setTimeout(() => {
+            cleanup();
+            if (onTimeout) {
+                onTimeout();
+            }
+            resolve(); // Resolve instead of reject to allow continuing with timeout state
+        }, timeoutMs);
+        const poll = async () => {
+            try {
+                const { data } = await fetchAppInstallationData(accountId, projectId, appUid, requiredScopes, optionalScopes);
+                // Reset error counter on successful fetch
+                consecutiveErrors = 0;
+                if (data.isInstalledWithScopeGroups) {
+                    cleanup();
+                    resolve();
+                }
+                else if (pollInterval) {
+                    pollInterval = setTimeout(poll, intervalMs);
+                }
+            }
+            catch (error) {
+                consecutiveErrors++;
+                if (consecutiveErrors >= MAX_CONSECUTIVE_ERRORS) {
+                    cleanup();
+                    reject(new Error(`Failed to check app installation status after ${MAX_CONSECUTIVE_ERRORS} consecutive errors`, { cause: error }));
+                }
+                else if (pollInterval !== null) {
+                    pollInterval = setTimeout(poll, intervalMs);
+                }
+            }
+        };
+        pollInterval = setTimeout(poll, 0);
+    });
+}

package/lib/hasFeature.js

@@ -1,7 +1,6 @@
 import { http } from '@hubspot/local-dev-lib/http';
 import { fetchEnabledFeatures } from '@hubspot/local-dev-lib/api/localDevAuth';
-import { FEATURES } from './constants.js';
-const FEATURES_THAT_DEFAULT_ON = [FEATURES.APPS_HOME];
+const FEATURES_THAT_DEFAULT_ON = [];
 export async function hasFeature(accountId, feature) {
     const { data: { enabledFeatures }, } = await fetchEnabledFeatures(accountId);
     if (enabledFeatures[feature] === undefined &&

package/lib/link/accountTableUtils.d.ts

@@ -0,0 +1,10 @@
+export interface AccountRow {
+    name: string;
+    accountId: string;
+}
+export declare function buildAccountRow(accountId: number, isDefault: boolean): AccountRow;
+export declare function buildAccountHeader(nameColumnWidth: number): string;
+export declare function getNameColumnWidth(rows: AccountRow[]): number;
+export declare function sortDefaultFirst<T extends number | {
+    accountId: number;
+}>(items: T[], defaultAccount: number | undefined): T[];

package/lib/link/accountTableUtils.js

@@ -0,0 +1,39 @@
+import { HUBSPOT_ACCOUNT_TYPE_STRINGS } from '@hubspot/local-dev-lib/constants/config';
+import { getConfigAccountIfExists } from '@hubspot/local-dev-lib/config';
+import chalk from 'chalk';
+import { commands } from '../../lang/en.js';
+import { indent } from '../ui/index.js';
+import { INK_COLORS } from '../../ui/styles.js';
+export function buildAccountRow(accountId, isDefault) {
+    const account = getConfigAccountIfExists(accountId);
+    let name = String(accountId);
+    if (account && account.accountType) {
+        const typeStr = HUBSPOT_ACCOUNT_TYPE_STRINGS[account.accountType];
+        name = `${account.name} [${typeStr}]`;
+    }
+    if (isDefault) {
+        name = `${name} (default)`;
+    }
+    return { name, accountId: String(accountId) };
+}
+export function buildAccountHeader(nameColumnWidth) {
+    const labels = commands.account.subcommands.list.labels;
+    const paddedName = chalk.bold(chalk.hex(INK_COLORS.INFO_BLUE)(labels.name.padEnd(nameColumnWidth)));
+    const accountId = chalk.bold(chalk.hex(INK_COLORS.INFO_BLUE)(labels.accountId));
+    return `${indent(1)}${paddedName}  ${accountId}`;
+}
+export function getNameColumnWidth(rows) {
+    const labels = commands.account.subcommands.list.labels;
+    return Math.max(labels.name.length, ...rows.map(r => r.name.length));
+}
+export function sortDefaultFirst(items, defaultAccount) {
+    return [...items].sort((a, b) => {
+        const aId = typeof a === 'number' ? a : a.accountId;
+        const bId = typeof b === 'number' ? b : b.accountId;
+        if (aId === defaultAccount)
+            return -1;
+        if (bId === defaultAccount)
+            return 1;
+        return 0;
+    });
+}

package/lib/link/index.d.ts

@@ -0,0 +1,18 @@
+import { HsSettingsFile } from '@hubspot/local-dev-lib/types/HsSettings';
+import { ActionHandlerParams, ActionResult, LinkArgs } from '../../types/Link.js';
+import { ArgumentsCamelCase } from 'yargs';
+export declare class ActionHandlers {
+    static link({ state, context, }: ActionHandlerParams): Promise<ActionResult>;
+    static unlink({ state }: ActionHandlerParams): Promise<ActionResult>;
+    static authenticate({ state, context, args, }: ActionHandlerParams): Promise<ActionResult>;
+    static cancel(): Promise<ActionResult>;
+}
+export declare function handleLinkFlow({ settings, accountOverrideId, args, }: {
+    settings: HsSettingsFile;
+    accountOverrideId: number | null;
+    args: ArgumentsCamelCase<LinkArgs>;
+}): Promise<ActionResult>;
+export declare function handleLinkedUseAction({ state, targetAccountId, }: {
+    state: HsSettingsFile;
+    targetAccountId?: number;
+}): Promise<ActionResult>;