@hubspot/cli 7.9.0-experimental.0 → 7.9.1-experimental.0

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

@@ -1,82 +1,85 @@
 import { mcpFeedbackRequest } from '../feedbackTracking.js';
 import { getStateValue, setStateValue, } from '@hubspot/local-dev-lib/config/state';
-import { getAccountIdFromCliConfig } from '../cliConfig.js';
+import { getConfigDefaultAccountIfExists } from '@hubspot/local-dev-lib/config';
 import { hasFeature } from '../../../lib/hasFeature.js';
 import { FEATURES } from '../../../lib/constants.js';
 vi.mock('@hubspot/local-dev-lib/config/state');
-vi.mock('../cliConfig');
+vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('../../../lib/hasFeature');
 vi.mock('../../../lib/errorHandlers/index');
 const mockGetStateValue = getStateValue;
 const mockSetStateValue = setStateValue;
-const mockGetAccountIdFromCliConfig = getAccountIdFromCliConfig;
+const mockGetConfigDefaultAccountIfExists = getConfigDefaultAccountIfExists;
 const mockHasFeature = hasFeature;
 describe('mcp-server/utils/feedbackTracking', () => {
-    const mockWorkingDirectory = '/test/working/directory';
     beforeEach(() => {
         vi.clearAllMocks();
     });
     describe('mcpFeedbackRequest', () => {
         it('should return empty string when not at a threshold', async () => {
             mockGetStateValue.mockReturnValue(10);
-            const result = await mcpFeedbackRequest(mockWorkingDirectory);
+            const result = await mcpFeedbackRequest();
             expect(mockSetStateValue).toHaveBeenCalledWith('mcpTotalToolCalls', 11);
             expect(result).toBe(undefined);
         });
         it('should return feedback message at threshold 50', async () => {
             mockGetStateValue.mockReturnValue(49);
-            mockGetAccountIdFromCliConfig.mockReturnValue(null);
-            const result = await mcpFeedbackRequest(mockWorkingDirectory);
+            mockGetConfigDefaultAccountIfExists.mockReturnValue(undefined);
+            const result = await mcpFeedbackRequest();
             expect(mockSetStateValue).toHaveBeenCalledWith('mcpTotalToolCalls', 50);
             expect(result).toContain('FEEDBACK REQUEST');
             expect(result).toContain('https://app.hubspot.com/l/product-updates/in-beta?rollout=239890');
         });
         it('should return feedback message at threshold 250', async () => {
             mockGetStateValue.mockReturnValue(249);
-            mockGetAccountIdFromCliConfig.mockReturnValue(null);
-            const result = await mcpFeedbackRequest(mockWorkingDirectory);
+            mockGetConfigDefaultAccountIfExists.mockReturnValue(undefined);
+            const result = await mcpFeedbackRequest();
             expect(mockSetStateValue).toHaveBeenCalledWith('mcpTotalToolCalls', 250);
             expect(result).toContain('FEEDBACK REQUEST');
         });
         it('should return feedback message at threshold 550', async () => {
             mockGetStateValue.mockReturnValue(549);
-            mockGetAccountIdFromCliConfig.mockReturnValue(null);
-            const result = await mcpFeedbackRequest(mockWorkingDirectory);
+            mockGetConfigDefaultAccountIfExists.mockReturnValue(undefined);
+            const result = await mcpFeedbackRequest();
             expect(mockSetStateValue).toHaveBeenCalledWith('mcpTotalToolCalls', 550);
             expect(result).toContain('FEEDBACK REQUEST');
         });
         it('should return feedback message at threshold 1050', async () => {
             mockGetStateValue.mockReturnValue(1049);
-            mockGetAccountIdFromCliConfig.mockReturnValue(null);
-            const result = await mcpFeedbackRequest(mockWorkingDirectory);
+            mockGetConfigDefaultAccountIfExists.mockReturnValue(undefined);
+            const result = await mcpFeedbackRequest();
             expect(mockSetStateValue).toHaveBeenCalledWith('mcpTotalToolCalls', 1050);
             expect(result).toContain('FEEDBACK REQUEST');
         });
         it('should use account-specific URL when account has MCP access', async () => {
             const accountId = 12345;
             mockGetStateValue.mockReturnValue(49);
-            mockGetAccountIdFromCliConfig.mockReturnValue(accountId);
+            mockGetConfigDefaultAccountIfExists.mockReturnValue({
+                accountId,
+            });
             mockHasFeature.mockResolvedValue(true);
-            const result = await mcpFeedbackRequest(mockWorkingDirectory);
-            expect(mockGetAccountIdFromCliConfig).toHaveBeenCalledWith(mockWorkingDirectory);
+            const result = await mcpFeedbackRequest();
+            expect(mockGetConfigDefaultAccountIfExists).toHaveBeenCalled();
             expect(mockHasFeature).toHaveBeenCalledWith(accountId, FEATURES.MCP_ACCESS);
             expect(result).toContain(`https://app.hubspot.com/product-updates/${accountId}/in-beta?rollout=239890`);
         });
         it('should use default URL when account does not have MCP access', async () => {
             const accountId = 12345;
             mockGetStateValue.mockReturnValue(49);
-            mockGetAccountIdFromCliConfig.mockReturnValue(accountId);
+            mockGetConfigDefaultAccountIfExists.mockReturnValue({
+                accountId,
+            });
             mockHasFeature.mockResolvedValue(false);
-            const result = await mcpFeedbackRequest(mockWorkingDirectory);
+            const result = await mcpFeedbackRequest();
             expect(mockHasFeature).toHaveBeenCalledWith(accountId, FEATURES.MCP_ACCESS);
             expect(result).toContain('https://app.hubspot.com/l/product-updates/in-beta?rollout=239890');
             expect(result).not.toContain(`/product-updates/${accountId}/`);
         });
         it('should use default URL when no account ID is found', async () => {
             mockGetStateValue.mockReturnValue(49);
-            mockGetAccountIdFromCliConfig.mockReturnValue(null);
-            const result = await mcpFeedbackRequest(mockWorkingDirectory);
-            expect(mockGetAccountIdFromCliConfig).toHaveBeenCalledWith(mockWorkingDirectory);
+            mockGetConfigDefaultAccountIfExists.mockReturnValue(undefined);
+            const result = await mcpFeedbackRequest();
+            expect(mockGetConfigDefaultAccountIfExists).toHaveBeenCalled();
             expect(mockHasFeature).not.toHaveBeenCalled();
             expect(result).toContain('https://app.hubspot.com/l/product-updates/in-beta?rollout=239890');
         });
@@ -84,35 +87,37 @@ describe('mcp-server/utils/feedbackTracking', () => {
             mockGetStateValue.mockImplementation(() => {
                 throw new Error('State error');
             });
-            const result = await mcpFeedbackRequest(mockWorkingDirectory);
+            const result = await mcpFeedbackRequest();
             expect(result).toBe(undefined);
         });
         it('should handle hasFeature errors and use default URL', async () => {
             const accountId = 12345;
             mockGetStateValue.mockReturnValue(49);
-            mockGetAccountIdFromCliConfig.mockReturnValue(accountId);
+            mockGetConfigDefaultAccountIfExists.mockReturnValue({
+                accountId,
+            });
             mockHasFeature.mockRejectedValue(new Error('Feature check failed'));
-            const result = await mcpFeedbackRequest(mockWorkingDirectory);
+            const result = await mcpFeedbackRequest();
             expect(result).toContain('https://app.hubspot.com/l/product-updates/in-beta?rollout=239890');
             expect(result).not.toContain(`/product-updates/${accountId}/`);
         });
         it('should not return feedback at threshold + 1', async () => {
             mockGetStateValue.mockReturnValue(50);
-            const result = await mcpFeedbackRequest(mockWorkingDirectory);
+            const result = await mcpFeedbackRequest();
             expect(mockSetStateValue).toHaveBeenCalledWith('mcpTotalToolCalls', 51);
             expect(result).toBe(undefined);
         });
         it('should increment tool calls counter on every invocation', async () => {
             const initialCount = 100;
             mockGetStateValue.mockReturnValue(initialCount);
-            await mcpFeedbackRequest(mockWorkingDirectory);
+            await mcpFeedbackRequest();
             expect(mockGetStateValue).toHaveBeenCalledWith('mcpTotalToolCalls');
             expect(mockSetStateValue).toHaveBeenCalledWith('mcpTotalToolCalls', initialCount + 1);
         });
         it('should include feedback request instructions in message', async () => {
             mockGetStateValue.mockReturnValue(49);
-            mockGetAccountIdFromCliConfig.mockReturnValue(null);
-            const result = await mcpFeedbackRequest(mockWorkingDirectory);
+            mockGetConfigDefaultAccountIfExists.mockReturnValue(undefined);
+            const result = await mcpFeedbackRequest();
             expect(result).toContain('IMPORTANT - FEEDBACK REQUEST');
             expect(result).toContain('This message appears only once');
             expect(result).toContain('Share feedback here');

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

@@ -1,3 +1,3 @@
 import { TextContent, TextContentResponse } from '../types.js';
-export declare function formatTextContents(absoluteCurrentWorkingDirectory: string, ...outputs: (string | undefined)[]): Promise<TextContentResponse>;
+export declare function formatTextContents(...outputs: (string | undefined)[]): Promise<TextContentResponse>;
 export declare function formatTextContent(text: string): TextContent;

package/mcp-server/utils/content.js

@@ -1,5 +1,5 @@
 import { mcpFeedbackRequest } from './feedbackTracking.js';
-export async function formatTextContents(absoluteCurrentWorkingDirectory, ...outputs) {
+export async function formatTextContents(...outputs) {
     const content = [];
     outputs.forEach(output => {
         if (output !== undefined) {
@@ -7,7 +7,7 @@ export async function formatTextContents(absoluteCurrentWorkingDirectory, ...out
         }
     });
     if (outputs.length > 0) {
-        const feedback = await mcpFeedbackRequest(absoluteCurrentWorkingDirectory);
+        const feedback = await mcpFeedbackRequest();
         if (feedback) {
             content.push(formatTextContent(feedback));
         }

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

@@ -1 +1 @@
-export declare function mcpFeedbackRequest(absoluteCurrentWorkingDirectory: string): Promise<string | undefined>;
+export declare function mcpFeedbackRequest(): Promise<string | undefined>;

package/mcp-server/utils/feedbackTracking.js

@@ -1,11 +1,11 @@
 import { getStateValue, setStateValue, } from '@hubspot/local-dev-lib/config/state';
-import { getAccountIdFromCliConfig } from './cliConfig.js';
+import { getConfigDefaultAccountIfExists } from '@hubspot/local-dev-lib/config';
 import { hasFeature } from '../../lib/hasFeature.js';
 import { FEATURES } from '../../lib/constants.js';
 import { logger } from '@hubspot/local-dev-lib/logger';
 import { MCP_TOTAL_TOOL_CALLS_STATE } from '@hubspot/local-dev-lib/constants/config';
 const FEEDBACK_THRESHOLDS = [50, 250, 550, 1050];
-export async function mcpFeedbackRequest(absoluteCurrentWorkingDirectory) {
+export async function mcpFeedbackRequest() {
     let feedbackUrl = 'https://app.hubspot.com/l/product-updates/in-beta?rollout=239890';
     try {
         const currentCount = getStateValue(MCP_TOTAL_TOOL_CALLS_STATE);
@@ -14,7 +14,7 @@ export async function mcpFeedbackRequest(absoluteCurrentWorkingDirectory) {
         if (!FEEDBACK_THRESHOLDS.includes(newCount)) {
             return;
         }
-        const accountId = getAccountIdFromCliConfig(absoluteCurrentWorkingDirectory);
+        const accountId = getConfigDefaultAccountIfExists()?.accountId;
         if (accountId) {
             try {
                 const hasMcpAccess = await hasFeature(accountId, FEATURES.MCP_ACCESS);

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.9.0-experimental.0",
+    "version": "7.9.1-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.0",
+        "@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/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);
-}