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

package/lib/constants.d.ts

@@ -82,17 +82,24 @@ export declare const FEATURES: {
     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";
 };
 export declare const LOCAL_DEV_UI_MESSAGE_SEND_TYPES: {
     UPLOAD_SUCCESS: string;
     UPLOAD_FAILURE: string;
+    DEPLOY_SUCCESS: string;
+    DEPLOY_FAILURE: string;
     UPDATE_PROJECT_NODES: string;
     UPDATE_APP_DATA: string;
     UPDATE_PROJECT_DATA: string;
     UPDATE_UPLOAD_WARNINGS: string;
+    CLI_METADATA: string;
 };
 export declare const LOCAL_DEV_UI_MESSAGE_RECEIVE_TYPES: {
     UPLOAD: string;
+    DEPLOY: string;
     VIEWED_WELCOME_SCREEN: string;
 };
 export declare const APP_INSTALLATION_STATES: {
@@ -118,3 +125,9 @@ export declare const CONFIG_LOCAL_STATE_FLAGS: {
 };
 export declare const EMPTY_PROJECT = "empty";
 export declare const PROJECT_WITH_APP = "app";
+export declare const LEGACY_SERVERLESS_FILE = "serverless.json";
+export declare const LEGACY_PUBLIC_APP_FILE = "public-app.json";
+export declare const LEGACY_PRIVATE_APP_FILE = "app.json";
+export declare const THEME_FILE = "theme.json";
+export declare const CMS_ASSETS_FILE = "cms-assets.json";
+export declare const LEGACY_CONFIG_FILES: string[];

package/lib/constants.js

@@ -74,17 +74,24 @@ export const FEATURES = {
     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',
 };
 export const LOCAL_DEV_UI_MESSAGE_SEND_TYPES = {
     UPLOAD_SUCCESS: 'server:uploadSuccess',
     UPLOAD_FAILURE: 'server:uploadFailure',
+    DEPLOY_SUCCESS: 'server:deploySuccess',
+    DEPLOY_FAILURE: 'server:deployFailure',
     UPDATE_PROJECT_NODES: 'server:updateProjectNodes',
     UPDATE_APP_DATA: 'server:updateAppData',
     UPDATE_PROJECT_DATA: 'server:updateProjectData',
     UPDATE_UPLOAD_WARNINGS: 'server:updateUploadWarnings',
+    CLI_METADATA: 'server:cliMetadata',
 };
 export const LOCAL_DEV_UI_MESSAGE_RECEIVE_TYPES = {
     UPLOAD: 'client:upload',
+    DEPLOY: 'client:deploy',
     VIEWED_WELCOME_SCREEN: 'client:viewedWelcomeScreen',
 };
 export const APP_INSTALLATION_STATES = {
@@ -110,3 +117,13 @@ export const CONFIG_LOCAL_STATE_FLAGS = {
 };
 export const EMPTY_PROJECT = 'empty';
 export const PROJECT_WITH_APP = 'app';
+export const LEGACY_SERVERLESS_FILE = 'serverless.json';
+export const LEGACY_PUBLIC_APP_FILE = 'public-app.json';
+export const LEGACY_PRIVATE_APP_FILE = 'app.json';
+export const THEME_FILE = 'theme.json';
+export const CMS_ASSETS_FILE = 'cms-assets.json';
+export const LEGACY_CONFIG_FILES = [
+    LEGACY_SERVERLESS_FILE,
+    LEGACY_PRIVATE_APP_FILE,
+    LEGACY_PUBLIC_APP_FILE,
+];

package/lib/dependencyManagement.js

@@ -4,16 +4,12 @@ import path from 'path';
 import { exec as execAsync } from 'node:child_process';
 import { walk } from '@hubspot/local-dev-lib/fs';
 import { getProjectConfig } from './projects/config.js';
-import { uiLink } from './ui/index.js';
-import { i18n } from './lang.js';
+import { commands } from '../lang/en.js';
 import SpinniesManager from './ui/SpinniesManager.js';
 import { isGloballyInstalled, executeInstall, DEFAULT_PACKAGE_MANAGER, } from './npm.js';
 class NoPackageJsonFilesError extends Error {
     constructor(projectName) {
-        super(i18n(`commands.project.subcommands.installDeps.noPackageJsonInProject`, {
-            projectName,
-            link: uiLink('Learn how to create a project from scratch.', 'https://developers.hubspot.com/beta-docs/guides/crm/intro/create-a-project'),
-        }));
+        super(commands.project.installDeps.noPackageJsonInProject(projectName));
     }
 }
 export async function installPackages({ packages, installLocations, }) {
@@ -28,31 +24,20 @@ async function installPackagesInDirectory(directory, packages) {
     SpinniesManager.init();
     SpinniesManager.add(spinner, {
         text: packages && packages.length
-            ? i18n(`commands.project.subcommands.installDeps.addingDependenciesToLocation`, {
-                dependencies: `[${packages.join(', ')}]`,
-                directory: relativeDir,
-            })
-            : i18n(`commands.project.subcommands.installDeps.installingDependencies`, {
-                directory: relativeDir,
-            }),
+            ? commands.project.installDeps.addingDependenciesToLocation(`[${packages.join(', ')}]`, relativeDir)
+            : commands.project.installDeps.installingDependencies(relativeDir),
     });
     try {
         await executeInstall(packages, null, { cwd: directory });
         SpinniesManager.succeed(spinner, {
-            text: i18n(`commands.project.subcommands.installDeps.installationSuccessful`, {
-                directory: relativeDir,
-            }),
+            text: commands.project.installDeps.installationSuccessful(relativeDir),
         });
     }
     catch (e) {
         SpinniesManager.fail(spinner, {
-            text: i18n(`commands.project.subcommands.installDeps.installingDependenciesFailed`, {
-                directory: relativeDir,
-            }),
+            text: commands.project.installDeps.installingDependenciesFailed(relativeDir),
         });
-        throw new Error(i18n(`commands.project.subcommands.installDeps.installingDependenciesFailed`, {
-            directory: relativeDir,
-        }), {
+        throw new Error(commands.project.installDeps.installingDependenciesFailed(relativeDir), {
             cause: e,
         });
     }
@@ -62,14 +47,11 @@ export async function getProjectPackageJsonLocations(dir) {
     if (!projectConfig ||
         !projectConfig.projectDir ||
         !projectConfig.projectConfig) {
-        throw new Error(i18n(`commands.project.subcommands.installDeps.noProjectConfig`));
+        throw new Error(commands.project.installDeps.noProjectConfig);
     }
     const { projectDir, projectConfig: { srcDir, name }, } = projectConfig;
     if (!(await isGloballyInstalled(DEFAULT_PACKAGE_MANAGER))) {
-        throw new Error(i18n(`commands.project.subcommands.installDeps.packageManagerNotInstalled`, {
-            packageManager: DEFAULT_PACKAGE_MANAGER,
-            link: uiLink(DEFAULT_PACKAGE_MANAGER, 'https://docs.npmjs.com/downloading-and-installing-node-js-and-npm'),
-        }));
+        throw new Error(commands.project.installDeps.packageManagerNotInstalled(DEFAULT_PACKAGE_MANAGER));
     }
     if (!fs.existsSync(projectConfig.projectDir) ||
         !fs.existsSync(path.join(projectDir, srcDir))) {

package/lib/developerTestAccounts.js

@@ -3,9 +3,9 @@ import { getAccountId, getConfigAccounts } from '@hubspot/local-dev-lib/config';
 import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
 import { fetchDeveloperTestAccounts } from '@hubspot/local-dev-lib/api/developerTestAccounts';
 import { isMissingScopeError, isSpecifiedError, } from '@hubspot/local-dev-lib/errors/index';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from './ui/logger.js';
 import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
-import { i18n } from './lang.js';
+import { lib } from '../lang/en.js';
 import { uiAccountDescription } from './ui/index.js';
 import { logError } from './errorHandlers/index.js';
 export function getHasDevTestAccounts(appDeveloperAccountConfig) {
@@ -39,42 +39,28 @@ export async function validateDevTestAccountUsageLimits(accountConfig) {
     if (count >= limit) {
         const hasDevTestAccounts = getHasDevTestAccounts(accountConfig);
         if (hasDevTestAccounts) {
-            throw new Error(i18n('lib.developerTestAccount.create.failure.alreadyInConfig', {
-                accountName: accountConfig.name || accountId,
-                limit,
-            }));
+            throw new Error(lib.developerTestAccount.create.failure.alreadyInConfig(accountConfig.name || accountId, limit));
         }
         else {
-            throw new Error(i18n('lib.developerTestAccount.create.failure.limit', {
-                accountName: accountConfig.name || accountId,
-                limit,
-            }));
+            throw new Error(lib.developerTestAccount.create.failure.limit(accountConfig.name || accountId, limit));
         }
     }
     return data;
 }
 export function handleDeveloperTestAccountCreateError(err, accountId, env, portalLimit) {
     if (isMissingScopeError(err)) {
-        logger.error(i18n('lib.developerTestAccount.create.failure.scopes.message', {
-            accountName: uiAccountDescription(accountId),
-        }));
+        uiLogger.error(lib.developerTestAccount.create.failure.scopes.message);
         const websiteOrigin = getHubSpotWebsiteOrigin(env);
         const url = `${websiteOrigin}/personal-access-key/${accountId}`;
-        logger.info(i18n('lib.developerTestAccount.create.failure.scopes.instructions', {
-            accountName: uiAccountDescription(accountId),
-            url,
-        }));
+        uiLogger.info(lib.developerTestAccount.create.failure.scopes.instructions(uiAccountDescription(accountId), url));
     }
     else if (isSpecifiedError(err, {
         statusCode: 400,
         errorType: 'TEST_PORTAL_LIMIT_REACHED',
     })) {
-        logger.log('');
-        logger.error(i18n('lib.developerTestAccount.create.failure.limit', {
-            accountName: uiAccountDescription(accountId),
-            limit: portalLimit,
-        }));
-        logger.log('');
+        uiLogger.log('');
+        uiLogger.error(lib.developerTestAccount.create.failure.limit(uiAccountDescription(accountId), portalLimit));
+        uiLogger.log('');
     }
     else {
         logError(err);

package/lib/doctor/Diagnosis.js

@@ -3,7 +3,7 @@ import chalk from 'chalk';
 import { helpers } from '../interpolation.js';
 import { uiAccountDescription } from '../ui/index.js';
 import { indent } from '../ui/index.js';
-import { i18n } from '../lang.js';
+import { lib } from '../../lang/en.js';
 export class Diagnosis {
     prefixes;
     diagnosis;
@@ -18,38 +18,30 @@ export class Diagnosis {
         };
         this.diagnosis = {
             cli: {
-                header: i18n(`lib.doctor.diagnosis.cli.header`),
+                header: lib.doctor.diagnosis.cli.header,
                 sections: [],
             },
             cliConfig: {
-                header: i18n(`lib.doctor.diagnosis.cliConfig.header`),
+                header: lib.doctor.diagnosis.cliConfig.header,
                 sections: [],
             },
             defaultAccountOverrideFile: {
-                header: i18n(`lib.doctor.diagnosis.defaultAccountOverrideFile.header`),
+                header: lib.doctor.diagnosis.defaultAccountOverrideFile.header,
                 sections: [],
             },
             project: {
-                header: i18n(`lib.doctor.diagnosis.projectConfig.header`),
+                header: lib.doctor.diagnosis.projectConfig.header,
                 subheaders: [
-                    i18n(`lib.doctor.diagnosis.projectConfig.projectDirSubHeader`, {
-                        projectDir: diagnosticInfo.project?.config?.projectDir,
-                    }),
-                    i18n(`lib.doctor.diagnosis.projectConfig.projectNameSubHeader`, {
-                        projectName: diagnosticInfo.project?.config?.projectConfig?.name,
-                    }),
+                    lib.doctor.diagnosis.projectConfig.projectDirSubHeader(diagnosticInfo.project?.config?.projectDir || ''),
+                    lib.doctor.diagnosis.projectConfig.projectNameSubHeader(diagnosticInfo.project?.config?.projectConfig?.name || ''),
                 ],
                 sections: [],
             },
         };
         if (diagnosticInfo.config) {
             this.diagnosis.cliConfig.subheaders = [
-                i18n(`lib.doctor.diagnosis.cliConfig.configFileSubHeader`, {
-                    filename: diagnosticInfo.config,
-                }),
-                i18n(`lib.doctor.diagnosis.cliConfig.defaultAccountSubHeader`, {
-                    accountDetails: uiAccountDescription(accountId),
-                }),
+                lib.doctor.diagnosis.cliConfig.configFileSubHeader(diagnosticInfo.config),
+                lib.doctor.diagnosis.cliConfig.defaultAccountSubHeader(uiAccountDescription(accountId)),
             ];
         }
     }
@@ -83,12 +75,8 @@ export class Diagnosis {
             return '';
         }
         output.push('');
-        output.push(i18n(`lib.doctor.diagnosis.counts.errors`, {
-            count: this.errorCount,
-        }));
-        output.push(i18n(`lib.doctor.diagnosis.counts.warnings`, {
-            count: this.warningCount,
-        }));
+        output.push(lib.doctor.diagnosis.counts.errors(this.errorCount));
+        output.push(lib.doctor.diagnosis.counts.warnings(this.warningCount));
         output.push('');
         return output.join('\n');
     }

package/lib/doctor/DiagnosticInfoBuilder.js

@@ -2,22 +2,23 @@ import { getProjectConfig } from '../projects/config.js';
 import { fetchProject } from '@hubspot/local-dev-lib/api/projects';
 import path from 'path';
 import pkg from '../../package.json' with { type: 'json' };
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../ui/logger.js';
 import { getAccountId, getDefaultAccountOverrideFilePath, isConfigFlagEnabled, } from '@hubspot/local-dev-lib/config';
 import { getAccountConfig, getConfigPath } from '@hubspot/local-dev-lib/config';
 import { getAccessToken } from '@hubspot/local-dev-lib/personalAccessKey';
 import { walk } from '@hubspot/local-dev-lib/fs';
 import util from 'util';
 import { exec as execAsync } from 'node:child_process';
+import { CMS_ASSETS_FILE, LEGACY_PRIVATE_APP_FILE, LEGACY_PUBLIC_APP_FILE, LEGACY_SERVERLESS_FILE, PROJECT_CONFIG_FILE, THEME_FILE, } from '../constants.js';
 // This needs to be hardcoded since we are using it in the TS type
 const hubspotCli = '@hubspot/cli';
 const configFiles = [
-    'serverless.json',
-    'hsproject.json',
-    'app.json',
-    'public-app.json',
-    'theme.json',
-    'cms-assets.json',
+    LEGACY_SERVERLESS_FILE,
+    PROJECT_CONFIG_FILE,
+    LEGACY_PRIVATE_APP_FILE,
+    LEGACY_PUBLIC_APP_FILE,
+    THEME_FILE,
+    CMS_ASSETS_FILE,
 ];
 export class DiagnosticInfoBuilder {
     accountId;
@@ -89,7 +90,7 @@ export class DiagnosticInfoBuilder {
             this.projectDetails = data;
         }
         catch (e) {
-            logger.debug(e);
+            uiLogger.debug(e);
         }
     }
     async fetchAccessToken() {
@@ -97,7 +98,7 @@ export class DiagnosticInfoBuilder {
             this.accessToken = await getAccessToken(this.personalAccessKey, this.env, this.accountId);
         }
         catch (e) {
-            logger.debug(e);
+            uiLogger.debug(e);
         }
         return this.accessToken;
     }
@@ -109,7 +110,7 @@ export class DiagnosticInfoBuilder {
                 .map(filename => path.relative(this._projectConfig.projectDir, filename));
         }
         catch (e) {
-            logger.debug(e);
+            uiLogger.debug(e);
         }
     }
     async getNpmVersion() {
@@ -119,7 +120,7 @@ export class DiagnosticInfoBuilder {
             return stdout.toString().trim();
         }
         catch (e) {
-            logger.debug(e);
+            uiLogger.debug(e);
             return null;
         }
     }

package/lib/doctor/Doctor.js

@@ -1,4 +1,4 @@
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../ui/logger.js';
 import { getAccountId, getCWDAccountOverride, } from '@hubspot/local-dev-lib/config';
 import SpinniesManager from '../ui/SpinniesManager.js';
 import { hasMissingPackages } from '../dependencyManagement.js';
@@ -13,9 +13,8 @@ import { PORT_MANAGER_SERVER_PORT } from '@hubspot/local-dev-lib/constants/ports
 import { accessTokenForPersonalAccessKey, authorizedScopesForPortalAndUser, scopesOnAccessToken, } from '@hubspot/local-dev-lib/personalAccessKey';
 import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
 import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
-import { uiCommandReference } from '../ui/index.js';
 import pkg from '../../package.json' with { type: 'json' };
-import { i18n } from '../lang.js';
+import { lib } from '../../lang/en.js';
 import { uiLink } from '../ui/index.js';
 const minMajorNodeVersion = 18;
 export class Doctor {
@@ -31,7 +30,7 @@ export class Doctor {
     }
     async diagnose() {
         SpinniesManager.add('runningDiagnostics', {
-            text: i18n(`lib.doctor.runningDiagnostics`),
+            text: lib.doctor.runningDiagnostics,
         });
         this.diagnosticInfo =
             await this.diagnosticInfoBuilder.generateDiagnosticInfo();
@@ -48,7 +47,7 @@ export class Doctor {
         this.performDefaultAccountOverrideFileChecks();
         this.performCliConfigSettingsChecks();
         SpinniesManager.succeed('runningDiagnostics', {
-            text: i18n(`lib.doctor.diagnosticsComplete`),
+            text: lib.doctor.diagnosticsComplete,
             succeedColor: 'white',
         });
         this.diagnosticInfo.diagnosis = this.diagnosis.toString();
@@ -74,10 +73,8 @@ export class Doctor {
         if (!this.diagnosticInfo?.config) {
             this.diagnosis?.addCLIConfigSection({
                 type: 'error',
-                message: i18n(`lib.doctor.diagnosis.cliConfig.noConfigFile`),
-                secondaryMessaging: i18n(`lib.doctor.diagnosis.cliConfig.noConfigFileSecondary`, {
-                    command: uiCommandReference('hs init'),
-                }),
+                message: lib.doctor.diagnosis.cliConfig.noConfigFile,
+                secondaryMessaging: lib.doctor.diagnosis.cliConfig.noConfigFileSecondary('hs init'),
             });
             return [];
         }
@@ -87,15 +84,11 @@ export class Doctor {
         if (this.diagnosticInfo?.defaultAccountOverrideFile) {
             this.diagnosis?.addDefaultAccountOverrideFileSection({
                 type: 'warning',
-                message: i18n(`lib.doctor.defaultAccountOverrideFileChecks.overrideActive`, {
-                    defaultAccountOverrideFile: this.diagnosticInfo.defaultAccountOverrideFile,
-                }),
+                message: lib.doctor.defaultAccountOverrideFileChecks.overrideActive(this.diagnosticInfo.defaultAccountOverrideFile),
             });
             this.diagnosis?.addDefaultAccountOverrideFileSection({
                 type: 'warning',
-                message: i18n(`lib.doctor.defaultAccountOverrideFileChecks.overrideAccountId`, {
-                    overrideAccountId: getCWDAccountOverride(),
-                }),
+                message: lib.doctor.defaultAccountOverrideFileChecks.overrideAccountId(getCWDAccountOverride()),
             });
         }
     }
@@ -103,8 +96,8 @@ export class Doctor {
         if (this.diagnosticInfo?.configSettings.httpUseLocalhost) {
             this.diagnosis?.addCLIConfigSection({
                 type: 'warning',
-                message: i18n(`lib.doctor.diagnosis.cliConfig.settings.httpUseLocalhost`),
-                secondaryMessaging: i18n(`lib.doctor.diagnosis.cliConfig.settings.httpUseLocalhostSecondary`),
+                message: lib.doctor.diagnosis.cliConfig.settings.httpUseLocalhost,
+                secondaryMessaging: lib.doctor.diagnosis.cliConfig.settings.httpUseLocalhostSecondary,
             });
         }
     }
@@ -115,25 +108,20 @@ export class Doctor {
             const missingScopes = (await authorizedScopesForPortalAndUser(this.accountId)).filter((data) => data.userAuthorized && !pakScopes.has(data.scopeGroup.name));
             this.diagnosis?.addCLIConfigSection({
                 type: 'success',
-                message: i18n(`lib.doctor.accountChecks.active`),
+                message: lib.doctor.accountChecks.active,
             });
-            const linkToPakUI = uiLink(i18n(`lib.doctor.accountChecks.pak.viewScopes`), `${getHubSpotWebsiteOrigin(this.diagnosticInfoBuilder?.env || 'PROD')}/personal-access-key/${this.diagnosticInfo?.account.accountId}`);
+            const linkToPakUI = uiLink(lib.doctor.accountChecks.pak.viewScopes, `${getHubSpotWebsiteOrigin(this.diagnosticInfoBuilder?.env || 'PROD')}/personal-access-key/${this.diagnosticInfo?.account.accountId}`);
             if (missingScopes.length > 0) {
                 this.diagnosis?.addCLIConfigSection({
                     type: 'warning',
-                    message: i18n(`lib.doctor.accountChecks.pak.incomplete`),
-                    secondaryMessaging: i18n(`lib.doctor.accountChecks.pak.incompleteSecondary`, {
-                        command: uiCommandReference(`hs auth`),
-                        link: linkToPakUI,
-                    }),
+                    message: lib.doctor.accountChecks.pak.incomplete,
+                    secondaryMessaging: lib.doctor.accountChecks.pak.incompleteSecondary('hs auth', linkToPakUI),
                 });
             }
             else {
                 this.diagnosis?.addCLIConfigSection({
                     type: 'success',
-                    message: i18n(`lib.doctor.accountChecks.pak.valid`, {
-                        link: linkToPakUI,
-                    }),
+                    message: lib.doctor.accountChecks.pak.valid(linkToPakUI),
                 });
             }
         }
@@ -151,10 +139,8 @@ export class Doctor {
             if (portalNotActive) {
                 this.diagnosis?.addCLIConfigSection({
                     type: 'error',
-                    message: i18n(`lib.doctor.accountChecks.inactive`),
-                    secondaryMessaging: i18n(`lib.doctor.accountChecks.inactiveSecondary`, {
-                        command: uiCommandReference(`hs accounts clean`),
-                    }),
+                    message: lib.doctor.accountChecks.inactive,
+                    secondaryMessaging: lib.doctor.accountChecks.inactiveSecondary('hs accounts clean'),
                 });
             }
             else if (isSpecifiedError(error, {
@@ -164,20 +150,18 @@ export class Doctor {
             })) {
                 this.diagnosis?.addCLIConfigSection({
                     type: 'success',
-                    message: i18n(`lib.doctor.accountChecks.active`),
+                    message: lib.doctor.accountChecks.active,
                 });
                 this.diagnosis?.addCLIConfigSection({
                     type: 'error',
-                    message: i18n(`lib.doctor.accountChecks.pak.invalid`),
-                    secondaryMessaging: i18n(`lib.doctor.accountChecks.pak.invalidSecondary`, {
-                        command: uiCommandReference(`hs auth`),
-                    }),
+                    message: lib.doctor.accountChecks.pak.invalid,
+                    secondaryMessaging: lib.doctor.accountChecks.pak.invalidSecondary('hs auth'),
                 });
             }
             else {
                 this.diagnosis?.addCLIConfigSection({
                     type: 'error',
-                    message: i18n(`lib.doctor.accountChecks.unableToDetermine`),
+                    message: lib.doctor.accountChecks.unableToDetermine,
                 });
             }
         }
@@ -186,7 +170,7 @@ export class Doctor {
         if (!this.diagnosticInfo?.versions.node) {
             return this.diagnosis?.addCliSection({
                 type: 'error',
-                message: i18n(`lib.doctor.nodeChecks.unableToDetermine`),
+                message: lib.doctor.nodeChecks.unableToDetermine,
             });
         }
         const nodeVersion = this.diagnosticInfo?.versions.node?.split('.');
@@ -194,16 +178,12 @@ export class Doctor {
         if (!currentNodeMajor || parseInt(currentNodeMajor) < minMajorNodeVersion) {
             return this.diagnosis?.addCliSection({
                 type: 'warning',
-                message: i18n(`lib.doctor.nodeChecks.minimumNotMet`, {
-                    nodeVersion: this.diagnosticInfo?.versions.node,
-                }),
+                message: lib.doctor.nodeChecks.minimumNotMet(this.diagnosticInfo?.versions.node),
             });
         }
         this.diagnosis?.addCliSection({
             type: 'success',
-            message: i18n(`lib.doctor.nodeChecks.success`, {
-                nodeVersion: this.diagnosticInfo?.versions.node,
-            }),
+            message: lib.doctor.nodeChecks.success(this.diagnosticInfo?.versions.node),
         });
     }
     async checkIfNpmIsInstalled() {
@@ -211,14 +191,12 @@ export class Doctor {
         if (!npmVersion) {
             return this.diagnosis?.addCliSection({
                 type: 'error',
-                message: i18n(`lib.doctor.npmChecks.notInstalled`),
+                message: lib.doctor.npmChecks.notInstalled,
             });
         }
         this.diagnosis?.addCliSection({
             type: 'success',
-            message: i18n(`lib.doctor.npmChecks.installed`, {
-                npmVersion,
-            }),
+            message: lib.doctor.npmChecks.installed(npmVersion),
         });
     }
     async checkCLIVersion() {
@@ -232,32 +210,22 @@ export class Doctor {
         catch (e) {
             return this.diagnosis?.addCliSection({
                 type: 'error',
-                message: i18n(`lib.doctor.hsChecks.unableToDetermine`),
-                secondaryMessaging: i18n(`lib.doctor.hsChecks.unableToDetermineSecondary`, {
-                    command: uiCommandReference(`hs --version`),
-                    link: uiLink(i18n(`lib.doctor.hsChecks.unableToDetermineSecondaryLink`), `https://www.npmjs.com/package/${pkg.name}?activeTab=versions`),
-                }),
+                message: lib.doctor.hsChecks.unableToDetermine,
+                secondaryMessaging: lib.doctor.hsChecks.unableToDetermineSecondary('hs --version', `https://www.npmjs.com/package/${pkg.name}?activeTab=versions`),
             });
         }
         if (latestCLIVersion !== pkg.version && nextCliVersion !== pkg.version) {
             const onNextTag = pkg.version.includes('beta');
             this.diagnosis?.addCliSection({
                 type: 'warning',
-                message: i18n(`lib.doctor.hsChecks.notLatest`, {
-                    hsVersion: pkg.version,
-                }),
-                secondaryMessaging: i18n(`lib.doctor.hsChecks.notLatestSecondary`, {
-                    hsVersion: onNextTag ? nextCliVersion : latestCLIVersion,
-                    command: uiCommandReference(`npm install -g ${pkg.name}`),
-                }),
+                message: lib.doctor.hsChecks.notLatest(pkg.version),
+                secondaryMessaging: lib.doctor.hsChecks.notLatestSecondary(`npm install -g ${pkg.name}`, onNextTag ? nextCliVersion : latestCLIVersion),
             });
         }
         else {
             this.diagnosis?.addCliSection({
                 type: 'success',
-                message: i18n(`lib.doctor.hsChecks.latest`, {
-                    hsVersion: pkg.version,
-                }),
+                message: lib.doctor.hsChecks.latest(pkg.version),
             });
         }
     }
@@ -271,12 +239,8 @@ export class Doctor {
                     foundError = true;
                     this.diagnosis?.addProjectSection({
                         type: 'warning',
-                        message: i18n(`lib.doctor.projectDependenciesChecks.missingDependencies`, {
-                            dir: packageDirName,
-                        }),
-                        secondaryMessaging: i18n(`lib.doctor.projectDependenciesChecks.missingDependenciesSecondary`, {
-                            command: uiCommandReference('hs project install-deps'),
-                        }),
+                        message: lib.doctor.projectDependenciesChecks.missingDependencies(packageDirName),
+                        secondaryMessaging: lib.doctor.projectDependenciesChecks.missingDependenciesSecondary('hs project install-deps'),
                     });
                 }
             }
@@ -285,26 +249,22 @@ export class Doctor {
                 if (!(await this.isValidJsonFile(packageFile))) {
                     this.diagnosis?.addProjectSection({
                         type: 'error',
-                        message: i18n(`lib.doctor.files.invalidJson`, {
-                            filename: packageFile,
-                        }),
+                        message: lib.doctor.files.invalidJson(packageFile),
                     });
                 }
                 else {
                     this.diagnosis?.addProjectSection({
                         type: 'error',
-                        message: i18n(`lib.doctor.projectDependenciesChecks.unableToDetermine`, {
-                            dir: packageDirName,
-                        }),
+                        message: lib.doctor.projectDependenciesChecks.unableToDetermine(packageDirName),
                     });
                 }
-                logger.debug(e);
+                uiLogger.debug(e instanceof Error ? e.message : String(e));
             }
         }
         if (!foundError) {
             this.diagnosis?.addProjectSection({
                 type: 'success',
-                message: i18n(`lib.doctor.projectDependenciesChecks.success`),
+                message: lib.doctor.projectDependenciesChecks.success,
             });
         }
     }
@@ -327,16 +287,14 @@ export class Doctor {
                 foundError = true;
                 this.diagnosis?.addProjectSection({
                     type: 'error',
-                    message: i18n(`lib.doctor.files.invalidJson`, {
-                        filename: jsonFile,
-                    }),
+                    message: lib.doctor.files.invalidJson(jsonFile),
                 });
             }
         }
         if (!foundError) {
             this.diagnosis?.addProjectSection({
                 type: 'success',
-                message: i18n(`lib.doctor.files.validJson`),
+                message: lib.doctor.files.validJson,
             });
         }
     }
@@ -344,20 +302,14 @@ export class Doctor {
         if (await isPortManagerPortAvailable()) {
             this.diagnosis?.addProjectSection({
                 type: 'success',
-                message: i18n(`lib.doctor.port.available`, {
-                    port: PORT_MANAGER_SERVER_PORT,
-                }),
+                message: lib.doctor.port.available(PORT_MANAGER_SERVER_PORT),
             });
             return;
         }
         this.diagnosis?.addProjectSection({
             type: 'warning',
-            message: i18n(`lib.doctor.port.inUse`, {
-                port: PORT_MANAGER_SERVER_PORT,
-            }),
-            secondaryMessaging: i18n(`lib.doctor.port.inUseSecondary`, {
-                command: uiCommandReference('hs project dev'),
-            }),
+            message: lib.doctor.port.inUse(PORT_MANAGER_SERVER_PORT),
+            secondaryMessaging: lib.doctor.port.inUseSecondary('hs project dev'),
         });
     }
 }