@hubspot/cli 7.10.0-beta.2 → 7.10.0-experimental.0

package/mcp-server/utils/toolUsageTracking.js

@@ -1,9 +1,10 @@
 import { trackUsage } from '@hubspot/local-dev-lib/trackUsage';
 import { EventClass, getNodeVersionData, getPlatform, } from '../../lib/usageTracking.js';
-import { getAccountId, isTrackingAllowed } from '@hubspot/local-dev-lib/config';
+import { getConfig, getConfigDefaultAccountIfExists, } from '@hubspot/local-dev-lib/config';
 import { uiLogger } from '../../lib/ui/logger.js';
 export async function trackToolUsage(toolName, meta) {
-    if (!isTrackingAllowed()) {
+    const config = getConfig();
+    if (config?.allowUsageTracking === false) {
         return;
     }
     const usageTrackingEvent = {
@@ -14,7 +15,7 @@ export async function trackToolUsage(toolName, meta) {
         type: process.env.HUBSPOT_MCP_AI_AGENT,
         ...meta,
     };
-    const accountId = getAccountId() || undefined;
+    const accountId = getConfigDefaultAccountIfExists()?.accountId || undefined;
     try {
         uiLogger.info('Tracking tool usage');
         await trackUsage('cli-interaction', EventClass.INTERACTION, usageTrackingEvent, accountId);

package/package.json

@@ -1,16 +1,16 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.10.0-beta.2",
+    "version": "7.10.0-experimental.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
     "type": "module",
     "dependencies": {
-        "@hubspot/local-dev-lib": "3.21.2",
-        "@hubspot/project-parsing-lib": "0.10.1",
-        "@hubspot/serverless-dev-runtime": "7.0.6",
-        "@hubspot/theme-preview-dev-server": "0.0.10",
-        "@hubspot/ui-extensions-dev-server": "0.10.2",
+        "@hubspot/local-dev-lib": "4.0.1",
+        "@hubspot/project-parsing-lib": "0.10.2",
+        "@hubspot/serverless-dev-runtime": "7.0.7",
+        "@hubspot/theme-preview-dev-server": "0.0.12",
+        "@hubspot/ui-extensions-dev-server": "1.0.0",
         "archiver": "7.0.1",
         "boxen": "8.0.1",
         "chalk": "5.4.1",
@@ -68,7 +68,7 @@
         "vitest": "^2.1.9"
     },
     "optionalDependencies": {
-        "@hubspot/cms-dev-server": "^1.0.9",
+        "@hubspot/cms-dev-server": "^1.2.1",
         "@modelcontextprotocol/sdk": "1.13.3"
     },
     "scripts": {
@@ -92,6 +92,7 @@
         "test-cli-debug": "yarn build && yarn --cwd 'acceptance-tests' test-debug",
         "test-cli-latest": "yarn build && yarn build-docker && docker container run -it --rm --name=hs-cli-container hs-cli-image yarn --cwd 'acceptance-tests' test-latest",
         "test-cli-qa": "yarn build && yarn --cwd 'acceptance-tests' test-qa",
+        "test-cli-qa-debug": "yarn build && yarn --cwd 'acceptance-tests' test-qa-debug",
         "update-ldl": "yarn add --exact @hubspot/local-dev-lib@latest",
         "view-unreleased-changes": "node ./scripts/unreleasedChanges.js"
     },

package/types/LocalDev.d.ts

@@ -18,6 +18,7 @@ export type LocalDevStateConstructorOptions = {
     };
     initialProjectProfileData: HSProfileVariables;
     env: Environment;
+    devSessionId?: number;
 };
 export type LocalDevWebsocketMessage = {
     type: string;

package/lib/middleware/__test__/notificationsMiddleware.test.js

@@ -1,8 +0,0 @@
-import { notifyAboutUpdates } from '../notificationsMiddleware.js';
-describe('lib/middleware/notificationsMiddleware', () => {
-    describe('notifyAboutUpdates()', () => {
-        it('should safely execute without throwing an error', () => {
-            expect(() => notifyAboutUpdates()).not.toThrow();
-        });
-    });
-});

package/lib/middleware/notificationsMiddleware.d.ts

@@ -1 +0,0 @@
-export declare function notifyAboutUpdates(): void;

package/lib/middleware/notificationsMiddleware.js

@@ -1,28 +0,0 @@
-import updateNotifier from 'update-notifier';
-import { pkg } from '../jsonLoader.js';
-import { UI_COLORS } from '../ui/index.js';
-import { lib } from '../../lang/en.js';
-const notifier = updateNotifier({
-    pkg: { ...pkg, name: '@hubspot/cli' },
-    distTag: 'latest',
-    shouldNotifyInNpmScript: true,
-});
-const CMS_CLI_PACKAGE_NAME = '@hubspot/cms-cli';
-export function notifyAboutUpdates() {
-    notifier.notify({
-        message: pkg.name === CMS_CLI_PACKAGE_NAME
-            ? lib.middleware.updateNotification.cmsUpdateNotification(CMS_CLI_PACKAGE_NAME)
-            : lib.middleware.updateNotification.cliUpdateNotification,
-        defer: false,
-        boxenOptions: {
-            borderColor: UI_COLORS.MARIGOLD_DARK,
-            margin: 1,
-            padding: 1,
-            textAlignment: 'center',
-            borderStyle: 'round',
-            title: pkg.name === CMS_CLI_PACKAGE_NAME
-                ? undefined
-                : lib.middleware.updateNotification.notifyTitle,
-        },
-    });
-}

package/mcp-server/utils/__tests__/cliConfig.test.js

@@ -1,110 +0,0 @@
-import { getAccountIdFromCliConfig } from '../cliConfig.js';
-import { configFileExists, findConfig, getAccountId, loadConfig, } from '@hubspot/local-dev-lib/config';
-vi.mock('@hubspot/local-dev-lib/config');
-const mockConfigFileExists = configFileExists;
-const mockFindConfig = findConfig;
-const mockGetAccountId = getAccountId;
-const mockLoadConfig = loadConfig;
-describe('mcp-server/utils/cliConfig', () => {
-    const mockWorkingDirectory = '/test/working/directory';
-    beforeEach(() => {
-        vi.clearAllMocks();
-    });
-    describe('getAccountIdFromCliConfig', () => {
-        it('should load global config when it exists and return account ID', () => {
-            const expectedAccountId = 12345;
-            mockConfigFileExists.mockReturnValue(true);
-            mockGetAccountId.mockReturnValue(expectedAccountId);
-            const result = getAccountIdFromCliConfig(mockWorkingDirectory);
-            expect(mockConfigFileExists).toHaveBeenCalledWith(true);
-            expect(mockLoadConfig).toHaveBeenCalledWith('');
-            expect(mockFindConfig).not.toHaveBeenCalled();
-            expect(mockGetAccountId).toHaveBeenCalledWith(undefined);
-            expect(result).toBe(expectedAccountId);
-        });
-        it('should load local config when global config does not exist and return account ID', () => {
-            const expectedAccountId = 67890;
-            const localConfigPath = '/path/to/local/config';
-            mockConfigFileExists.mockReturnValue(false);
-            mockFindConfig.mockReturnValue(localConfigPath);
-            mockGetAccountId.mockReturnValue(expectedAccountId);
-            const result = getAccountIdFromCliConfig(mockWorkingDirectory);
-            expect(mockConfigFileExists).toHaveBeenCalledWith(true);
-            expect(mockFindConfig).toHaveBeenCalledWith(mockWorkingDirectory);
-            expect(mockLoadConfig).toHaveBeenCalledWith(localConfigPath);
-            expect(mockGetAccountId).toHaveBeenCalledWith(undefined);
-            expect(result).toBe(expectedAccountId);
-        });
-        it('should pass accountNameOrId parameter to getAccountId when provided as string', () => {
-            const expectedAccountId = 11111;
-            const accountName = 'test-account';
-            mockConfigFileExists.mockReturnValue(true);
-            mockGetAccountId.mockReturnValue(expectedAccountId);
-            const result = getAccountIdFromCliConfig(mockWorkingDirectory, accountName);
-            expect(mockConfigFileExists).toHaveBeenCalledWith(true);
-            expect(mockLoadConfig).toHaveBeenCalledWith('');
-            expect(mockGetAccountId).toHaveBeenCalledWith(accountName);
-            expect(result).toBe(expectedAccountId);
-        });
-        it('should pass accountNameOrId parameter to getAccountId when provided as number', () => {
-            const expectedAccountId = 22222;
-            const accountId = 22222;
-            mockConfigFileExists.mockReturnValue(true);
-            mockGetAccountId.mockReturnValue(expectedAccountId);
-            const result = getAccountIdFromCliConfig(mockWorkingDirectory, accountId);
-            expect(mockConfigFileExists).toHaveBeenCalledWith(true);
-            expect(mockLoadConfig).toHaveBeenCalledWith('');
-            expect(mockGetAccountId).toHaveBeenCalledWith(accountId);
-            expect(result).toBe(expectedAccountId);
-        });
-        it('should return null when getAccountId returns null', () => {
-            mockConfigFileExists.mockReturnValue(true);
-            mockGetAccountId.mockReturnValue(null);
-            const result = getAccountIdFromCliConfig(mockWorkingDirectory);
-            expect(mockConfigFileExists).toHaveBeenCalledWith(true);
-            expect(mockLoadConfig).toHaveBeenCalledWith('');
-            expect(mockGetAccountId).toHaveBeenCalledWith(undefined);
-            expect(result).toBeNull();
-        });
-        it('should handle findConfig returning null by passing null to loadConfig', () => {
-            const expectedAccountId = 33333;
-            mockConfigFileExists.mockReturnValue(false);
-            mockFindConfig.mockReturnValue(null);
-            mockGetAccountId.mockReturnValue(expectedAccountId);
-            const result = getAccountIdFromCliConfig(mockWorkingDirectory);
-            expect(mockConfigFileExists).toHaveBeenCalledWith(true);
-            expect(mockFindConfig).toHaveBeenCalledWith(mockWorkingDirectory);
-            expect(mockLoadConfig).toHaveBeenCalledWith(null);
-            expect(mockGetAccountId).toHaveBeenCalledWith(undefined);
-            expect(result).toBe(expectedAccountId);
-        });
-        it('should work with local config when provided with account name parameter', () => {
-            const expectedAccountId = 44444;
-            const accountName = 'local-test-account';
-            const localConfigPath = '/path/to/local/config';
-            mockConfigFileExists.mockReturnValue(false);
-            mockFindConfig.mockReturnValue(localConfigPath);
-            mockGetAccountId.mockReturnValue(expectedAccountId);
-            const result = getAccountIdFromCliConfig(mockWorkingDirectory, accountName);
-            expect(mockConfigFileExists).toHaveBeenCalledWith(true);
-            expect(mockFindConfig).toHaveBeenCalledWith(mockWorkingDirectory);
-            expect(mockLoadConfig).toHaveBeenCalledWith(localConfigPath);
-            expect(mockGetAccountId).toHaveBeenCalledWith(accountName);
-            expect(result).toBe(expectedAccountId);
-        });
-        it('should work with local config when provided with account ID parameter', () => {
-            const expectedAccountId = 55555;
-            const accountId = 55555;
-            const localConfigPath = '/path/to/local/config';
-            mockConfigFileExists.mockReturnValue(false);
-            mockFindConfig.mockReturnValue(localConfigPath);
-            mockGetAccountId.mockReturnValue(expectedAccountId);
-            const result = getAccountIdFromCliConfig(mockWorkingDirectory, accountId);
-            expect(mockConfigFileExists).toHaveBeenCalledWith(true);
-            expect(mockFindConfig).toHaveBeenCalledWith(mockWorkingDirectory);
-            expect(mockLoadConfig).toHaveBeenCalledWith(localConfigPath);
-            expect(mockGetAccountId).toHaveBeenCalledWith(accountId);
-            expect(result).toBe(expectedAccountId);
-        });
-    });
-});

package/mcp-server/utils/cliConfig.d.ts

@@ -1 +0,0 @@
-export declare function getAccountIdFromCliConfig(absolutePathToWorkingDirectory: string, accountNameOrId?: string | number): number | null;

package/mcp-server/utils/cliConfig.js

@@ -1,12 +0,0 @@
-import { configFileExists, findConfig, getAccountId, loadConfig, } from '@hubspot/local-dev-lib/config';
-export function getAccountIdFromCliConfig(absolutePathToWorkingDirectory, accountNameOrId) {
-    const globalConfigExists = configFileExists(true);
-    if (globalConfigExists) {
-        loadConfig('');
-    }
-    else {
-        const configPath = findConfig(absolutePathToWorkingDirectory);
-        loadConfig(configPath);
-    }
-    return getAccountId(accountNameOrId);
-}