@hubspot/cli 7.6.0-beta.12 → 7.6.0-beta.14

package/mcp-server/tools/project/GetConfigValuesTool.d.ts

@@ -2,19 +2,22 @@ import { TextContentResponse, Tool } from '../../types.js';
 import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { z } from 'zod';
 declare const inputSchemaZodObject: z.ZodObject<{
+    absoluteCurrentWorkingDirectory: z.ZodString;
     platformVersion: z.ZodString;
     featureType: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     platformVersion: string;
+    absoluteCurrentWorkingDirectory: string;
     featureType: string;
 }, {
     platformVersion: string;
+    absoluteCurrentWorkingDirectory: string;
     featureType: string;
 }>;
 type InputSchemaType = z.infer<typeof inputSchemaZodObject>;
 export declare class GetConfigValuesTool extends Tool<InputSchemaType> {
     constructor(mcpServer: McpServer);
-    handler({ platformVersion, featureType, }: InputSchemaType): Promise<TextContentResponse>;
+    handler({ absoluteCurrentWorkingDirectory, platformVersion, featureType, }: InputSchemaType): Promise<TextContentResponse>;
     register(): RegisteredTool;
 }
 export {};

package/mcp-server/tools/project/GetConfigValuesTool.js

@@ -1,10 +1,12 @@
 import { Tool } from '../../types.js';
 import { z } from 'zod';
 import { formatTextContents } from '../../utils/content.js';
+import { absoluteCurrentWorkingDirectory } from './constants.js';
 import { getIntermediateRepresentationSchema, mapToInternalType, } from '@hubspot/project-parsing-lib';
-import { getAccountId, getConfigPath, loadConfig, } from '@hubspot/local-dev-lib/config';
 import { useV3Api } from '../../../lib/projects/platformVersion.js';
+import { getAccountIdFromCliConfig } from '../../utils/cliConfig.js';
 const inputSchema = {
+    absoluteCurrentWorkingDirectory,
     platformVersion: z
         .string()
         .describe('The platform version for the project. Located in the hsproject.json file.'),
@@ -21,16 +23,20 @@ export class GetConfigValuesTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);
     }
-    async handler({ platformVersion, featureType, }) {
+    async handler({ absoluteCurrentWorkingDirectory, platformVersion, featureType, }) {
         try {
             if (!useV3Api(platformVersion)) {
                 return formatTextContents(`Can only be used on projects with a minimum platformVersion of 2025.2`);
             }
-            loadConfig(getConfigPath());
+            const accountId = getAccountIdFromCliConfig(absoluteCurrentWorkingDirectory);
+            if (!accountId) {
+                const authErrorMessage = `No account ID found. Please run \`hs account auth\` to configure an account, or set a default account with \`hs account use <account>\``;
+                return formatTextContents(authErrorMessage);
+            }
             const schema = await getIntermediateRepresentationSchema({
                 platformVersion,
                 projectSourceDir: '',
-                accountId: getAccountId(),
+                accountId,
             });
             const internalComponentType = mapToInternalType(featureType);
             if (schema[internalComponentType]) {

package/mcp-server/tools/project/__tests__/DocsSearchTool.test.js

@@ -1,14 +1,14 @@
 import { DocsSearchTool } from '../DocsSearchTool.js';
 import { http } from '@hubspot/local-dev-lib/http';
-import { getAccountId } from '@hubspot/local-dev-lib/config';
 import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
+import { getAccountIdFromCliConfig } from '../../../utils/cliConfig.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('@hubspot/local-dev-lib/http');
-vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('@hubspot/local-dev-lib/errors/index');
 vi.mock('../../../utils/toolUsageTracking');
+vi.mock('../../../utils/cliConfig.js');
 const mockHttp = http;
-const mockGetAccountId = getAccountId;
+const mockGetAccountIdFromCliConfig = getAccountIdFromCliConfig;
 const mockIsHubSpotHttpError = vi.mocked(isHubSpotHttpError);
 describe('mcp-server/tools/project/DocsSearchTool', () => {
     let mockMcpServer;
@@ -38,9 +38,10 @@ describe('mcp-server/tools/project/DocsSearchTool', () => {
     describe('handler', () => {
         const mockInput = {
             docsSearchQuery: 'test query',
+            absoluteCurrentWorkingDirectory: '/foo',
         };
         it('should return auth error message when no account ID is found', async () => {
-            mockGetAccountId.mockReturnValue(null);
+            mockGetAccountIdFromCliConfig.mockReturnValue(null);
             const result = await tool.handler(mockInput);
             expect(result).toEqual({
                 content: [
@@ -52,7 +53,7 @@ describe('mcp-server/tools/project/DocsSearchTool', () => {
             });
         });
         it('should return successful results when docs are found', async () => {
-            mockGetAccountId.mockReturnValue(12345);
+            mockGetAccountIdFromCliConfig.mockReturnValue(12345);
             const mockResponse = {
                 results: [
                     {
@@ -76,6 +77,7 @@ describe('mcp-server/tools/project/DocsSearchTool', () => {
                 data: mockResponse,
             });
             const result = await tool.handler(mockInput);
+            expect(mockGetAccountIdFromCliConfig).toHaveBeenCalledWith('/foo');
             expect(mockHttp.post).toHaveBeenCalledWith(12345, {
                 url: 'dev/docs/llms/v1/docs-search',
                 data: {
@@ -103,7 +105,7 @@ describe('mcp-server/tools/project/DocsSearchTool', () => {
             expect(resultText).toContain('Test content 2');
         });
         it('should return no results message when no documentation is found', async () => {
-            mockGetAccountId.mockReturnValue(12345);
+            mockGetAccountIdFromCliConfig.mockReturnValue(12345);
             const mockResponse = {
                 results: [],
             };
@@ -122,7 +124,7 @@ describe('mcp-server/tools/project/DocsSearchTool', () => {
             });
         });
         it('should return no results message when results is null', async () => {
-            mockGetAccountId.mockReturnValue(12345);
+            mockGetAccountIdFromCliConfig.mockReturnValue(12345);
             const mockResponse = {
                 results: null,
             };
@@ -141,7 +143,7 @@ describe('mcp-server/tools/project/DocsSearchTool', () => {
             });
         });
         it('should handle HubSpot HTTP errors', async () => {
-            mockGetAccountId.mockReturnValue(12345);
+            mockGetAccountIdFromCliConfig.mockReturnValue(12345);
             const mockError = {
                 toString: () => 'HubSpot API Error: 404 Not Found',
             };
@@ -158,7 +160,7 @@ describe('mcp-server/tools/project/DocsSearchTool', () => {
             });
         });
         it('should handle generic errors', async () => {
-            mockGetAccountId.mockReturnValue(12345);
+            mockGetAccountIdFromCliConfig.mockReturnValue(12345);
             const mockError = new Error('Network error');
             mockHttp.post.mockRejectedValue(mockError);
             mockIsHubSpotHttpError.mockReturnValue(false);
@@ -173,7 +175,7 @@ describe('mcp-server/tools/project/DocsSearchTool', () => {
             });
         });
         it('should handle non-Error rejections', async () => {
-            mockGetAccountId.mockReturnValue(12345);
+            mockGetAccountIdFromCliConfig.mockReturnValue(12345);
             mockHttp.post.mockRejectedValue('String error');
             mockIsHubSpotHttpError.mockReturnValue(false);
             const result = await tool.handler(mockInput);

package/mcp-server/tools/project/__tests__/GetConfigValuesTool.test.js

@@ -1,13 +1,13 @@
 import { GetConfigValuesTool } from '../GetConfigValuesTool.js';
 import { getIntermediateRepresentationSchema, mapToInternalType, } from '@hubspot/project-parsing-lib';
-import { getAccountId } from '@hubspot/local-dev-lib/config';
+import { getAccountIdFromCliConfig } from '../../../utils/cliConfig.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('@hubspot/project-parsing-lib');
-vi.mock('@hubspot/local-dev-lib/config');
+vi.mock('../../../utils/cliConfig.js');
 vi.mock('../../../utils/toolUsageTracking');
 const mockGetIntermediateRepresentationSchema = getIntermediateRepresentationSchema;
 const mockMapToInternalType = mapToInternalType;
-const mockGetAccountId = getAccountId;
+const mockGetAccountIdFromCliConfig = getAccountIdFromCliConfig;
 describe('mcp-server/tools/project/GetConfigValuesTool', () => {
     let mockMcpServer;
     let tool;
@@ -44,9 +44,10 @@ describe('mcp-server/tools/project/GetConfigValuesTool', () => {
         const input = {
             platformVersion: '2025.2',
             featureType: 'card',
+            absoluteCurrentWorkingDirectory: '/foo',
         };
         beforeEach(() => {
-            mockGetAccountId.mockReturnValue(123456789);
+            mockGetAccountIdFromCliConfig.mockReturnValue(123456789);
         });
         it('should return config schema when component type exists', async () => {
             const mockSchema = {
@@ -61,6 +62,7 @@ describe('mcp-server/tools/project/GetConfigValuesTool', () => {
             mockGetIntermediateRepresentationSchema.mockResolvedValue(mockSchema);
             mockMapToInternalType.mockReturnValue('internal-card-type');
             const result = await tool.handler(input);
+            expect(mockGetAccountIdFromCliConfig).toHaveBeenCalledWith('/foo');
             expect(mockGetIntermediateRepresentationSchema).toHaveBeenCalledWith({
                 platformVersion: '2025.2',
                 projectSourceDir: '',
@@ -133,14 +135,13 @@ describe('mcp-server/tools/project/GetConfigValuesTool', () => {
             });
         });
         it('should handle null account id', async () => {
-            mockGetAccountId.mockReturnValue(null);
-            mockGetIntermediateRepresentationSchema.mockRejectedValue(new Error('No account ID'));
+            mockGetAccountIdFromCliConfig.mockReturnValue(null);
             const result = await tool.handler(input);
             expect(result).toEqual({
                 content: [
                     {
                         type: 'text',
-                        text: 'Unable to locate JSON schema for type card',
+                        text: 'No account ID found. Please run `hs account auth` to configure an account, or set a default account with `hs account use <account>`',
                     },
                 ],
             });

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

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,110 @@
+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

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

package/mcp-server/utils/cliConfig.js

@@ -0,0 +1,12 @@
+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);
+}

package/package.json

@@ -1,16 +1,16 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.6.0-beta.12",
+    "version": "7.6.0-beta.14",
     "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.18.0",
-        "@hubspot/project-parsing-lib": "0.8.3",
+        "@hubspot/local-dev-lib": "3.19.0",
+        "@hubspot/project-parsing-lib": "0.8.5",
         "@hubspot/serverless-dev-runtime": "7.0.6",
         "@hubspot/theme-preview-dev-server": "0.0.10",
-        "@hubspot/ui-extensions-dev-server": "0.9.8",
+        "@hubspot/ui-extensions-dev-server": "0.10.0",
         "archiver": "7.0.1",
         "boxen": "8.0.1",
         "chalk": "5.4.1",

package/types/LocalDev.d.ts

@@ -1,17 +1,17 @@
 import { HSProfileVariables, IntermediateRepresentationNodeLocalDev } from '@hubspot/project-parsing-lib/src/lib/types.js';
 import { Environment } from '@hubspot/local-dev-lib/types/Config';
 import { ValueOf } from '@hubspot/local-dev-lib/types/Utils';
+import { Project } from '@hubspot/local-dev-lib/types/Project';
 import { ProjectConfig } from './Projects.js';
 import LocalDevState from '../lib/projects/localDev/LocalDevState.js';
-import { APP_INSTALLATION_STATES, LOCAL_DEV_SERVER_MESSAGE_TYPES } from '../lib/constants.js';
+import { APP_INSTALLATION_STATES, LOCAL_DEV_UI_MESSAGE_RECEIVE_TYPES, LOCAL_DEV_SERVER_MESSAGE_TYPES } from '../lib/constants.js';
 export type LocalDevStateConstructorOptions = {
     targetProjectAccountId: number;
     targetTestingAccountId: number;
     profile?: string;
     projectConfig: ProjectConfig;
     projectDir: string;
-    projectId: number;
-    projectName: string;
+    projectData: Project;
     debug?: boolean;
     initialProjectNodes: {
         [key: string]: IntermediateRepresentationNodeLocalDev;
@@ -23,6 +23,12 @@ export type LocalDevWebsocketMessage = {
     type: string;
     data?: unknown;
 };
+export type LocalDevDeployWebsocketMessage = {
+    type: typeof LOCAL_DEV_UI_MESSAGE_RECEIVE_TYPES.DEPLOY;
+    data: {
+        force: boolean;
+    };
+};
 export type LocalDevStateListener<K extends keyof LocalDevState> = (value: LocalDevState[K]) => void;
 export type AppLocalDevData = {
     id: number;
@@ -32,3 +38,13 @@ export type AppLocalDevData = {
     scopeGroupIds: number[];
 };
 export type LocalDevServerMessage = ValueOf<typeof LOCAL_DEV_SERVER_MESSAGE_TYPES>;
+export type LocalDevProjectUploadResult = {
+    uploadSuccess: boolean;
+    buildSuccess: boolean;
+    deploySuccess?: boolean;
+    deployId?: number;
+};
+export type LocalDevProjectDeployResult = {
+    success: boolean;
+    deployId?: number;
+};

package/ui/index.js

@@ -1,5 +1,5 @@
 import { render } from 'ink';
-// Ink components will be enabled by setting the ENABLE_INK environment variable
+// Ink components will be enabled by setting the HUBSPOT_ENABLE_INK environment variable
 export async function renderInline(component) {
     const { unmount } = render(component, { patchConsole: false });
     unmount();