@hubspot/cli 8.8.0 → 8.9.0-beta.1

package/lib/ui/appLogs.js

@@ -0,0 +1,175 @@
+import moment from 'moment';
+import chalk from 'chalk';
+import { Styles } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from './logger.js';
+import { indent, uiLine } from './index.js';
+import { commands } from '../../lang/en.js';
+import { SYSTEM_TYPE_DISPLAY_NAMES, toTypeChoice } from '../app/logs.js';
+import { getAppLogDetailsUrl, getAppLogsUrl } from '../app/urls.js';
+import { renderTable } from '../../ui/render.js';
+const SEPARATOR = ' - ';
+function formatJsonBody(body) {
+    try {
+        return JSON.stringify(JSON.parse(body), null, 2);
+    }
+    catch {
+        return body;
+    }
+}
+const LOG_STATUS_COLORS = {
+    SUCCESS: Styles.success,
+    ERROR: Styles.error,
+};
+function formatLogHeader(log, options) {
+    const color = LOG_STATUS_COLORS[log.status] || ((s) => s);
+    const timestamp = chalk.whiteBright(moment(log.createdAt).toISOString());
+    const status = color(log.status);
+    if (options.compact) {
+        const parts = [timestamp, status];
+        if (log.executionTimeMillis != null) {
+            parts.push(`${log.executionTimeMillis}ms`);
+        }
+        parts.push(log.id);
+        return parts.join(SEPARATOR);
+    }
+    return `${timestamp}${SEPARATOR}${status}`;
+}
+function formatLogDetails(log, options) {
+    if (options.compact) {
+        return '';
+    }
+    const lines = [];
+    lines.push(`${indent(1)}${commands.app.subcommands.logs.outputMessages.logDetails.id}: ${log.id}`);
+    if (log.executionTimeMillis != null) {
+        lines.push(`${indent(1)}${commands.app.subcommands.logs.outputMessages.logDetails.duration}: ${log.executionTimeMillis}ms`);
+    }
+    if (log.portalId != null) {
+        lines.push(`${indent(1)}${commands.app.subcommands.logs.outputMessages.logDetails.portal}: ${log.portalId}`);
+    }
+    if (log.traceId != null && log.traceId !== '') {
+        lines.push(`${indent(1)}${commands.app.subcommands.logs.outputMessages.logDetails.trace}: ${log.traceId}`);
+    }
+    if (log.status === 'ERROR' && log.errorType) {
+        lines.push(`${indent(1)}${commands.app.subcommands.logs.outputMessages.logDetails.error}: ${log.errorType}`);
+        if (log.errorMessage) {
+            lines.push(`${indent(2)}${log.errorMessage}`);
+        }
+    }
+    const detailUrl = getAppLogDetailsUrl(options.accountId, options.appId, options.systemType, log.id);
+    lines.push(`${indent(1)}${commands.app.subcommands.logs.outputMessages.logDetails.viewDetails(log.id, options.appId, toTypeChoice(options.systemType))}`);
+    lines.push(`${indent(1)}${commands.app.subcommands.logs.outputMessages.logDetails.viewInUI(detailUrl)}`);
+    return lines.join(`\n${indent(1)}`);
+}
+function formatLog(log, options) {
+    const header = formatLogHeader(log, options);
+    const details = formatLogDetails(log, options);
+    return details ? `${header}\n${details}` : header;
+}
+export async function outputAppLogs(response, options) {
+    const { results, total } = response;
+    if (results.length === 0) {
+        uiLogger.log(commands.app.subcommands.logs.errors.noLogs);
+        return;
+    }
+    results.forEach(log => {
+        uiLogger.log(formatLog(log, options));
+        if (!options.compact) {
+            uiLogger.log('');
+        }
+    });
+    if (!options.compact && !options.tail) {
+        uiLine();
+        uiLogger.log('');
+        const tableHeaders = [
+            commands.app.subcommands.logs.outputMessages.tableHeaders.appId,
+            commands.app.subcommands.logs.outputMessages.tableHeaders.type,
+            commands.app.subcommands.logs.outputMessages.tableHeaders.logsFound,
+        ];
+        const tableData = [
+            [options.appId.toString(), options.typeName, total.toString()],
+        ];
+        await renderTable(tableHeaders, tableData, true);
+        uiLogger.log('');
+        const listUrl = getAppLogsUrl(options.accountId, options.appId, options.systemType);
+        uiLogger.log(commands.app.subcommands.logs.outputMessages.viewInHubSpot(listUrl));
+    }
+}
+export function outputAppLogDetails(details, options) {
+    const status = details.errorType ? 'ERROR' : 'SUCCESS';
+    const color = LOG_STATUS_COLORS[status] || ((s) => s);
+    uiLogger.log(chalk.bold(commands.app.subcommands.logDetails.outputMessages.logDetailsHeader));
+    uiLogger.log('');
+    uiLogger.log(`${commands.app.subcommands.logDetails.outputMessages.basicInfo.id}: ${details.id}`);
+    uiLogger.log(`${commands.app.subcommands.logDetails.outputMessages.basicInfo.timestamp}: ${chalk.whiteBright(moment(details.requestExecutionTimestamp).toISOString())}`);
+    uiLogger.log(`${commands.app.subcommands.logDetails.outputMessages.basicInfo.status}: ${color(status)}`);
+    if (details.duration != null) {
+        uiLogger.log(`${commands.app.subcommands.logDetails.outputMessages.basicInfo.duration}: ${details.duration}ms`);
+    }
+    if (details.loggingSystemType) {
+        const typeName = SYSTEM_TYPE_DISPLAY_NAMES[details.loggingSystemType] ||
+            details.loggingSystemType;
+        uiLogger.log(`${commands.app.subcommands.logDetails.outputMessages.basicInfo.systemType}: ${typeName}`);
+    }
+    const hasContextInfo = details.portalId ||
+        details.traceId ||
+        details.serverlessFunction ||
+        details.location ||
+        details.cardName;
+    if (hasContextInfo) {
+        uiLogger.log('');
+        uiLogger.log(chalk.bold(commands.app.subcommands.logDetails.outputMessages.contextInfo.header));
+        if (details.portalId) {
+            uiLogger.log(`${indent(1)}${commands.app.subcommands.logDetails.outputMessages.contextInfo.portalId}: ${details.portalId}`);
+        }
+        if (details.traceId) {
+            uiLogger.log(`${indent(1)}${commands.app.subcommands.logDetails.outputMessages.contextInfo.traceId}: ${details.traceId}`);
+        }
+        if (details.serverlessFunction) {
+            uiLogger.log(`${indent(1)}${commands.app.subcommands.logDetails.outputMessages.contextInfo.function}: ${details.serverlessFunction}`);
+        }
+        if (details.location) {
+            uiLogger.log(`${indent(1)}${commands.app.subcommands.logDetails.outputMessages.contextInfo.location}: ${details.location}`);
+        }
+        if (details.cardName) {
+            uiLogger.log(`${indent(1)}${commands.app.subcommands.logDetails.outputMessages.contextInfo.card}: ${details.cardName}`);
+        }
+        if (details.userId) {
+            uiLogger.log(`${indent(1)}${commands.app.subcommands.logDetails.outputMessages.contextInfo.userId}: ${details.userId}`);
+        }
+    }
+    if (details.requestBody || details.responseBody) {
+        uiLogger.log('');
+        uiLogger.log(chalk.bold(commands.app.subcommands.logDetails.outputMessages.requestResponse
+            .header));
+        if (details.requestBody) {
+            uiLogger.log(`${indent(1)}${commands.app.subcommands.logDetails.outputMessages.requestResponse.requestBody}:`);
+            uiLogger.log(chalk.gray(formatJsonBody(details.requestBody)));
+        }
+        if (details.responseBody) {
+            uiLogger.log(`${indent(1)}${commands.app.subcommands.logDetails.outputMessages.requestResponse.responseBody}:`);
+            uiLogger.log(chalk.gray(formatJsonBody(details.responseBody)));
+        }
+    }
+    if (details.errorType || details.errorMessage) {
+        uiLogger.log('');
+        uiLogger.log(chalk.bold(commands.app.subcommands.logDetails.outputMessages.errorInfo.header));
+        if (details.errorType) {
+            uiLogger.log(`${indent(1)}${commands.app.subcommands.logDetails.outputMessages.errorInfo.errorType}: ${Styles.error(details.errorType)}`);
+        }
+        if (details.errorMessage) {
+            uiLogger.log(`${indent(1)}${commands.app.subcommands.logDetails.outputMessages.errorInfo.errorMessage}: ${details.errorMessage}`);
+        }
+    }
+    if (details.extraInfo && Object.keys(details.extraInfo).length > 0) {
+        uiLogger.log('');
+        uiLogger.log(chalk.bold(commands.app.subcommands.logDetails.outputMessages.additionalInfo.header));
+        Object.entries(details.extraInfo).forEach(([key, value]) => {
+            uiLogger.log(`${indent(1)}${key}: ${value}`);
+        });
+    }
+    uiLogger.log('');
+    uiLine();
+    uiLogger.log('');
+    const detailUrl = getAppLogDetailsUrl(options.accountId, options.appId, details.loggingSystemType, details.id);
+    uiLogger.log(commands.app.subcommands.logDetails.outputMessages.viewInHubSpot(detailUrl));
+}

package/lib/usageTracking.js

@@ -1,5 +1,6 @@
 import { getConfig, getConfigAccountById, getConfigFilePath, getGlobalConfigFilePath, } from '@hubspot/local-dev-lib/config';
-import { API_KEY_AUTH_METHOD } from '@hubspot/local-dev-lib/constants/auth';
+import { API_KEY_AUTH_METHOD, PERSONAL_ACCESS_KEY_AUTH_METHOD, } from '@hubspot/local-dev-lib/constants/auth';
+import { getAccessToken } from '@hubspot/local-dev-lib/personalAccessKey';
 import { uiLogger } from './ui/logger.js';
 import { pkg } from './jsonLoader.js';
 import { debugError } from './errorHandlers/index.js';
@@ -57,6 +58,24 @@ export function getExecutionEnvironmentMeta() {
         executionSource: getExecutionSource(),
     };
 }
+async function getUsageTrackingUserId(accountId) {
+    if (!accountId) {
+        return undefined;
+    }
+    try {
+        const accountConfig = getConfigAccountById(accountId);
+        if (accountConfig.authType !== PERSONAL_ACCESS_KEY_AUTH_METHOD.value) {
+            return undefined;
+        }
+        const accessToken = await getAccessToken(accountConfig.personalAccessKey, accountConfig.env, accountConfig.accountId);
+        return typeof accessToken.userId === 'number'
+            ? accessToken.userId
+            : undefined;
+    }
+    catch (_e) {
+        return undefined;
+    }
+}
 export async function trackCommandUsage(command, meta = {}, accountId) {
     if (isUsageTrackingDisableFlagSet()) {
         uiLogger.debug(usageTrackingDiabled);
@@ -170,13 +189,18 @@ async function trackCliInteraction({ action, accountId, command, authType, meta
             ...meta,
         };
         try {
-            uiLogger.debug('Sent usage tracking command event:', usageTrackingEvent);
-            await sendUsageEvent({
+            const userId = await getUsageTrackingUserId(accountId);
+            const request = {
                 eventName: 'cli-interaction',
                 eventClass: EventClass.INTERACTION,
                 meta: usageTrackingEvent,
                 accountId,
-            });
+            };
+            if (userId !== undefined) {
+                request.userId = userId;
+            }
+            uiLogger.debug('Sent usage tracking command event:', usageTrackingEvent);
+            await sendUsageEvent(request);
         }
         catch (error) {
             debugError(error);

package/mcp-server/utils/command.js

@@ -24,10 +24,12 @@ export async function runCommandInDir(directory, command) {
         }
         finalCommand = addFlag(finalCommand, 'disable-usage-tracking', true);
     }
+    const resolvedDir = path.resolve(directory);
     return execAsync(finalCommand, {
-        cwd: path.resolve(directory),
+        cwd: resolvedDir,
         env: {
             ...process.env,
+            INIT_CWD: resolvedDir,
         },
     });
 }

package/mcp-server/utils/config.js

@@ -3,6 +3,7 @@ export function setupHubSpotConfig(absoluteCurrentWorkingDirectory) {
     if (!absoluteCurrentWorkingDirectory) {
         return;
     }
+    process.env.INIT_CWD = absoluteCurrentWorkingDirectory;
     const configPath = getLocalConfigFilePathIfExists(absoluteCurrentWorkingDirectory);
     if (configPath) {
         process.env.HUBSPOT_CONFIG_PATH = configPath;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/cli",
-    "version": "8.8.0",
+    "version": "8.9.0-beta.1",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
@@ -10,10 +10,10 @@
         "!**/__tests__/**"
     ],
     "dependencies": {
-        "@hubspot/local-dev-lib": "5.7.1",
-        "@hubspot/project-parsing-lib": "0.16.0",
+        "@hubspot/local-dev-lib": "5.8.0",
+        "@hubspot/project-parsing-lib": "0.17.0",
         "@hubspot/serverless-dev-runtime": "7.0.7",
-        "@hubspot/ui-extensions-dev-server": "2.0.7",
+        "@hubspot/ui-extensions-dev-server": "2.0.8",
         "@inquirer/prompts": "7.1.0",
         "@modelcontextprotocol/sdk": "1.29.0",
         "archiver": "7.0.1",

package/ui/components/ActionSection.d.ts

@@ -7,6 +7,6 @@ export type ActionSectionProps = {
     errorMessage?: string;
     children?: React.ReactNode;
 };
-export declare function ActionSection({ status, statusText, errorMessage, children, }: ActionSectionProps): import("react/jsx-runtime").JSX.Element | null;
+export declare function ActionSection({ status, statusText, errorMessage, children, }: ActionSectionProps): import("react").JSX.Element | null;
 export declare function getActionSection(props: ActionSectionProps): React.ReactNode;
 export {};

package/ui/components/InputField.d.ts

@@ -6,5 +6,5 @@ export type InputFieldProps = {
     onChange: (value: string) => void;
     onSubmit: () => void;
 };
-export declare function InputField({ flag, prompt, value, isEditing, onChange, onSubmit, }: InputFieldProps): import("react/jsx-runtime").JSX.Element;
+export declare function InputField({ flag, prompt, value, isEditing, onChange, onSubmit, }: InputFieldProps): import("react").JSX.Element;
 export declare function getInputField(props: InputFieldProps): React.ReactNode;

package/ui/components/SelectInput.d.ts

@@ -7,5 +7,5 @@ export type SelectInputProps = {
     items: SelectInputItem[];
     onSelect: (item: SelectInputItem) => void;
 };
-export declare function SelectInput({ items, onSelect }: SelectInputProps): import("react/jsx-runtime").JSX.Element;
+export declare function SelectInput({ items, onSelect }: SelectInputProps): import("react").JSX.Element;
 export declare function getSelectInput(props: SelectInputProps): React.ReactNode;

package/ui/components/StatusIcon.d.ts

@@ -4,6 +4,6 @@ type ActionStatus = ValueOf<typeof ACTION_STATUSES>;
 export type StatusIconProps = {
     status: ActionStatus;
 };
-export declare function StatusIcon({ status }: StatusIconProps): import("react/jsx-runtime").JSX.Element;
+export declare function StatusIcon({ status }: StatusIconProps): import("react").JSX.Element;
 export declare function getStatusIcon(props: StatusIconProps): React.ReactNode;
 export {};

package/ui/components/Table.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 export type Scalar = string | number | boolean | null | undefined;
-export declare function getTable<T extends ScalarDict>(props: Pick<TableProps<T>, 'data'> & Partial<TableProps<T>>): import("react/jsx-runtime").JSX.Element;
+export declare function getTable<T extends ScalarDict>(props: Pick<TableProps<T>, 'data'> & Partial<TableProps<T>>): React.JSX.Element;
 export type ScalarDict = {
     [key: string]: Scalar;
 };
@@ -62,7 +62,7 @@ export default class Table<T extends ScalarDict> extends React.Component<Pick<Ta
     getSeparatorRow(): (props: RowProps<T>) => JSX.Element;
     getDataRow(): (props: RowProps<T>) => JSX.Element;
     getFooterRow(): (props: RowProps<T>) => JSX.Element;
-    render(): import("react/jsx-runtime").JSX.Element;
+    render(): React.JSX.Element;
 }
 type RowProps<T extends ScalarDict> = {
     key: string;
@@ -77,13 +77,13 @@ type Column<T> = {
 /**
  * Renders the header of a table.
  */
-export declare function Header(props: React.PropsWithChildren<object>): import("react/jsx-runtime").JSX.Element;
+export declare function Header(props: React.PropsWithChildren<object>): React.JSX.Element;
 /**
  * Renders a cell in the table.
  */
-export declare function Cell(props: CellProps): import("react/jsx-runtime").JSX.Element;
+export declare function Cell(props: CellProps): React.JSX.Element;
 /**
  * Redners the scaffold of the table.
  */
-export declare function Skeleton(props: React.PropsWithChildren<object>): import("react/jsx-runtime").JSX.Element;
+export declare function Skeleton(props: React.PropsWithChildren<object>): React.JSX.Element;
 export {};

package/ui/components/getStarted/GetStartedFlow.d.ts

@@ -5,4 +5,4 @@ export type GetStartedFlowProps = {
     initialDest?: string;
 };
 export declare function getGetStartedFlow(props: GetStartedFlowProps): React.ReactNode;
-export declare function GetStartedFlow({ derivedAccountId, initialName, initialDest, }: GetStartedFlowProps): import("react/jsx-runtime").JSX.Element;
+export declare function GetStartedFlow({ derivedAccountId, initialName, initialDest, }: GetStartedFlowProps): import("react").JSX.Element;

package/ui/components/getStarted/screens/InstallationScreen.d.ts

@@ -3,5 +3,5 @@ type InstallationScreenProps = {
     state: FlowState;
     accountName: string;
 };
-export declare function InstallationScreen({ state, accountName, }: InstallationScreenProps): import("react/jsx-runtime").JSX.Element;
+export declare function InstallationScreen({ state, accountName, }: InstallationScreenProps): import("react").JSX.Element;
 export {};

package/ui/components/getStarted/screens/ProjectSetupScreen.d.ts

@@ -12,5 +12,5 @@ type ProjectSetupScreenProps = {
     onDestChange: (value: string) => void;
     onDestSubmit: () => void;
 };
-export declare function ProjectSetupScreen({ state, onSelectOption, onNameChange, onNameSubmit, onDestChange, onDestSubmit, }: ProjectSetupScreenProps): import("react/jsx-runtime").JSX.Element;
+export declare function ProjectSetupScreen({ state, onSelectOption, onNameChange, onNameSubmit, onDestChange, onDestSubmit, }: ProjectSetupScreenProps): import("react").JSX.Element;
 export {};

package/ui/components/getStarted/screens/UploadScreen.d.ts

@@ -3,5 +3,5 @@ type UploadScreenProps = {
     state: FlowState;
     accountName: string;
 };
-export declare function UploadScreen({ state, accountName }: UploadScreenProps): import("react/jsx-runtime").JSX.Element;
+export declare function UploadScreen({ state, accountName }: UploadScreenProps): import("react").JSX.Element;
 export {};