@hubspot/cli 8.1.1-experimental.0 → 8.1.2-experimental.1

package/commands/sandbox/delete.js

@@ -11,7 +11,7 @@ import { selectAccountFromConfig } from '../../lib/prompts/accountsPrompt.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { uiAuthCommandReference, uiBetaTag } from '../../lib/ui/index.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'delete';
 const describe = uiBetaTag(commands.sandbox.subcommands.delete.describe, false);
@@ -182,7 +182,7 @@ const builder = makeYargsBuilder(sandboxDeleteBuilder, command, describe, {
 const sandboxDeleteCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('sandbox-delete', handler),
+    handler: makeWrappedYargsHandler('sandbox-delete', handler),
     builder,
 };
 export default sandboxDeleteCommand;

package/commands/secret/addSecret.js

@@ -4,7 +4,7 @@ import { secretValuePrompt, secretNamePrompt, } from '../../lib/prompts/secretPr
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'add [name]';
 const describe = commands.secret.subcommands.add.describe;
@@ -51,7 +51,7 @@ const builder = makeYargsBuilder(addSecretBuilder, command, describe, {
 const addSecretCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('secrets-add', handler),
+    handler: makeWrappedYargsHandler('secrets-add', handler),
     builder,
 };
 export default addSecretCommand;

package/commands/secret/deleteSecret.js

@@ -5,7 +5,7 @@ import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { ApiErrorContext, logError } from '../../lib/errorHandlers/index.js';
 import { commands } from './../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'delete [name]';
 const describe = commands.secret.subcommands.delete.describe;
@@ -64,7 +64,7 @@ const builder = makeYargsBuilder(deleteSecretBuilder, command, describe, {
 const deleteSecretCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('secrets-delete', handler),
+    handler: makeWrappedYargsHandler('secrets-delete', handler),
     builder,
 };
 export default deleteSecretCommand;

package/commands/secret/listSecret.js

@@ -3,7 +3,7 @@ import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
 import { uiAccountDescription } from '../../lib/ui/index.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'list';
 const describe = commands.secret.subcommands.list.describe;
@@ -36,7 +36,7 @@ const builder = makeYargsBuilder(listSecretBuilder, command, describe, {
 const listSecretCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('secrets-list', handler),
+    handler: makeWrappedYargsHandler('secrets-list', handler),
     builder,
 };
 export default listSecretCommand;

package/commands/secret/updateSecret.js

@@ -4,7 +4,7 @@ import { ApiErrorContext, logError } from '../../lib/errorHandlers/index.js';
 import { secretValuePrompt, secretListPrompt, } from '../../lib/prompts/secretPrompt.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'update [name]';
 const describe = commands.secret.subcommands.update.describe;
@@ -50,7 +50,7 @@ const builder = makeYargsBuilder(updateSecretBuilder, command, describe, {
 const updateSecretCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('secrets-update', handler),
+    handler: makeWrappedYargsHandler('secrets-update', handler),
     builder,
 };
 export default updateSecretCommand;

package/commands/testAccount/create.js

@@ -3,7 +3,7 @@ import path from 'path';
 import { getValidEnv } from '@hubspot/local-dev-lib/environment';
 import { getConfigAccountEnvironment } from '@hubspot/local-dev-lib/config';
 import { getCwd } from '@hubspot/local-dev-lib/path';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { promptUser, listPrompt } from '../../lib/prompts/promptUtils.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
@@ -230,7 +230,7 @@ const builder = makeYargsBuilder(createTestAccountBuilder, command, describe, {
 const createTestAccountCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('test-account-create', handler),
+    handler: makeWrappedYargsHandler('test-account-create', handler),
     builder,
 };
 export default createTestAccountCommand;

package/commands/testAccount/createConfig.js

@@ -1,7 +1,7 @@
 import fs from 'fs-extra';
 import path from 'path';
 import { getCwd } from '@hubspot/local-dev-lib/path';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
@@ -85,7 +85,7 @@ const builder = makeYargsBuilder(createTestAccountConfigBuilder, command, descri
 const createTestAccountConfigCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('test-account-create-config', handler),
+    handler: makeWrappedYargsHandler('test-account-create-config', handler),
     builder,
 };
 export default createTestAccountConfigCommand;

package/commands/testAccount/delete.js

@@ -1,5 +1,5 @@
 import { fetchDeveloperTestAccounts, deleteDeveloperTestAccount, } from '@hubspot/local-dev-lib/api/developerTestAccounts';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { uiLogger } from '../../lib/ui/logger.js';
@@ -191,7 +191,7 @@ const builder = makeYargsBuilder(deleteTestAccountBuilder, command, describe, {
 const deleteTestAccountCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('test-account-delete', handler),
+    handler: makeWrappedYargsHandler('test-account-delete', handler),
     builder,
 };
 export default deleteTestAccountCommand;

package/commands/testAccount/importData.js

@@ -1,6 +1,6 @@
 import { getImportDataRequest } from '@hubspot/local-dev-lib/crm';
 import { logError } from '../../lib/errorHandlers/index.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { importDataFilePathPrompt } from '../../lib/prompts/importDataFilePathPrompt.js';
@@ -55,6 +55,6 @@ const crmImportDataCommand = {
     command,
     describe,
     builder,
-    handler: makeYargsHandlerWithUsageTracking('crm-import-data', handler),
+    handler: makeWrappedYargsHandler('crm-import-data', handler),
 };
 export default crmImportDataCommand;

package/commands/upgrade.js

@@ -1,7 +1,7 @@
 import { isConfigFlagEnabled } from '@hubspot/local-dev-lib/config';
 import { CONFIG_FLAGS } from '@hubspot/local-dev-lib/constants/config';
 import { EXIT_CODES } from '../lib/enums/exitCodes.js';
-import { makeYargsHandlerWithUsageTracking } from '../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 import { uiLogger } from '../lib/ui/logger.js';
 import { commands } from '../lang/en.js';
@@ -112,7 +112,7 @@ const builder = makeYargsBuilder(upgradeBuilder, command, describe, {
 const upgradeCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('upgrade', handler),
+    handler: makeWrappedYargsHandler('upgrade', handler),
     builder,
 };
 export default upgradeCommand;

package/lang/en.d.ts

@@ -1805,6 +1805,7 @@ export declare const commands: {
             examples: {
                 default: string;
                 withProfile: string;
+                withPreview: string;
             };
             logs: {
                 buildSucceeded: (buildId: number) => string;
@@ -1815,6 +1816,8 @@ export declare const commands: {
             errors: {
                 noProjectConfig: string;
                 projectLockedError: string;
+                previewRequiresTarget: string;
+                targetRequiresPreview: string;
             };
             options: {
                 forceCreate: {
@@ -1829,6 +1832,12 @@ export declare const commands: {
                 skipNpmAudit: {
                     describe: string;
                 };
+                preview: {
+                    describe: string;
+                };
+                target: {
+                    describe: string;
+                };
             };
         };
         watch: {
@@ -3403,6 +3412,15 @@ export declare const lib: {
             npmAuditNonZeroExit: (packageRoot: string, exitCode: number) => string;
         };
     };
+    projectPreview: {
+        triggeringPreview: (buildId: number, targetPortalId: number) => string;
+        pollingStatus: (releaseTag: string, targetPortalId: number) => string;
+        succeeded: (releaseTag: string, targetPortalId: number) => string;
+        triggerFailed: string;
+        pollFailed: string;
+        warning: string;
+        missingProjectId: string;
+    };
     importData: {
         errors: {
             incorrectAccountType: (derivedAccountId: number) => string;

package/lang/en.js

@@ -1822,6 +1822,7 @@ export const commands = {
             examples: {
                 default: 'Upload a project into your HubSpot account',
                 withProfile: 'Upload a project into your HubSpot account when using profiles',
+                withPreview: 'Upload and preview the build on a target portal',
             },
             logs: {
                 buildSucceeded: (buildId) => `Build #${buildId} succeeded\n`,
@@ -1832,6 +1833,8 @@ export const commands = {
             errors: {
                 noProjectConfig: 'No project detected. Run this command from a project directory.',
                 projectLockedError: `Your project is locked. This may mean that another user is running the ${uiCommandReference('hs project dev')} command for this project. If this is you, unlock the project in Projects UI.`,
+                previewRequiresTarget: `${uiCommandReference('--preview')} requires ${uiCommandReference('--target=<portalId>')} to specify the portal to preview on.`,
+                targetRequiresPreview: `${uiCommandReference('--target')} can only be used with ${uiCommandReference('--preview')}.`,
             },
             options: {
                 forceCreate: {
@@ -1846,6 +1849,12 @@ export const commands = {
                 skipNpmAudit: {
                     describe: 'Skip the npm audit security check before uploading',
                 },
+                preview: {
+                    describe: 'Preview the build on a target portal after a successful upload',
+                },
+                target: {
+                    describe: 'Portal ID to preview the build on',
+                },
             },
         },
         watch: {
@@ -3429,6 +3438,15 @@ export const lib = {
             npmAuditNonZeroExit: (packageRoot, exitCode) => `npm audit: ${chalk.bold(packageRoot)} exited with code ${exitCode}`,
         },
     },
+    projectPreview: {
+        triggeringPreview: (buildId, targetPortalId) => `Previewing build #${buildId} on ${uiAccountDescription(targetPortalId)}`,
+        pollingStatus: (releaseTag, targetPortalId) => `Previewing ${chalk.bold(releaseTag)} on ${uiAccountDescription(targetPortalId)}`,
+        succeeded: (releaseTag, targetPortalId) => `Previewed ${chalk.bold(releaseTag)} on ${uiAccountDescription(targetPortalId)}`,
+        triggerFailed: 'Failed to trigger preview',
+        pollFailed: 'Failed to poll preview status',
+        warning: 'The build succeeded but the preview failed. You can manually preview this build from the project UI.',
+        missingProjectId: 'Unable to preview: could not resolve the project ID.',
+    },
     importData: {
         errors: {
             incorrectAccountType: (derivedAccountId) => `The account ${uiAccountDescription(derivedAccountId)} is not a standard account, developer test account, or app developer account.`,

package/lib/constants.d.ts

@@ -4,6 +4,7 @@ export declare const FEEDBACK_INTERVAL: 10;
 export declare const HUBSPOT_FOLDER: "@hubspot";
 export declare const MARKETPLACE_FOLDER: "@marketplace";
 export declare const DEFAULT_POLLING_DELAY = 2000;
+export declare const PREVIEW_POLL_TIMEOUT: number;
 export declare const PROJECT_CONFIG_FILE: "hsproject.json";
 export declare const PROJECT_BUILD_STATES: {
     readonly BUILDING: "BUILDING";

package/lib/constants.js

@@ -4,6 +4,7 @@ export const FEEDBACK_INTERVAL = 10;
 export const HUBSPOT_FOLDER = '@hubspot';
 export const MARKETPLACE_FOLDER = '@marketplace';
 export const DEFAULT_POLLING_DELAY = 2000;
+export const PREVIEW_POLL_TIMEOUT = 5 * 60 * 1000;
 export const PROJECT_CONFIG_FILE = 'hsproject.json';
 export const PROJECT_BUILD_STATES = {
     BUILDING: 'BUILDING',

package/lib/projects/localDev/helpers/project.js

@@ -70,7 +70,7 @@ function projectUploadCallback(accountId, projectConfig, tempFile, exit, buildId
         uiLogger.error(lib.localDevHelpers.project.createInitialBuildForNewProject.genericError);
         return exit(EXIT_CODES.ERROR);
     }
-    return pollProjectBuildAndDeploy(accountId, projectConfig, tempFile, buildId, true);
+    return pollProjectBuildAndDeploy(accountId, projectConfig, tempFile, buildId, { silenceLogs: true });
 }
 // Create an initial build if the project was newly created in the account
 // Return the newly deployed build

package/lib/projects/pollProjectBuildAndDeploy.d.ts

@@ -6,5 +6,9 @@ type PollTaskStatusFunction<T extends ProjectTask> = (accountId: number, taskNam
 export declare const pollBuildStatus: PollTaskStatusFunction<Build>;
 export declare const pollDeployStatus: PollTaskStatusFunction<Deploy>;
 export declare function displayWarnLogs(accountId: number, projectName: string, taskId: number, isDeploy?: boolean): Promise<void>;
-export declare function pollProjectBuildAndDeploy(accountId: number, projectConfig: ProjectConfig, tempFile: FileResult, buildId: number, silenceLogs?: boolean): Promise<ProjectPollResult>;
+type PollOptions = {
+    silenceLogs?: boolean;
+    skipDeploy?: boolean;
+};
+export declare function pollProjectBuildAndDeploy(accountId: number, projectConfig: ProjectConfig, tempFile: FileResult, buildId: number, options?: PollOptions): Promise<ProjectPollResult>;
 export {};

package/lib/projects/pollProjectBuildAndDeploy.js

@@ -291,7 +291,8 @@ export async function displayWarnLogs(accountId, projectName, taskId, isDeploy =
         });
     }
 }
-export async function pollProjectBuildAndDeploy(accountId, projectConfig, tempFile, buildId, silenceLogs = false) {
+export async function pollProjectBuildAndDeploy(accountId, projectConfig, tempFile, buildId, options = {}) {
+    const { silenceLogs = false, skipDeploy = false } = options;
     let buildStatus = await pollBuildStatus(accountId, projectConfig.name, buildId, null, silenceLogs);
     if (!silenceLogs) {
         uiLine();
@@ -306,7 +307,7 @@ export async function pollProjectBuildAndDeploy(accountId, projectConfig, tempFi
         result.succeeded = false;
         return result;
     }
-    else if (buildStatus.isAutoDeployEnabled) {
+    else if (buildStatus.isAutoDeployEnabled && !skipDeploy) {
         if (!silenceLogs) {
             uiLogger.log(lib.projectBuildAndDeploy.pollProjectBuildAndDeploy.buildSucceededAutomaticallyDeploying(buildId, uiAccountDescription(accountId)));
             await displayWarnLogs(accountId, projectConfig.name, buildId);

package/lib/projects/preview.d.ts

@@ -0,0 +1,7 @@
+type PreviewResult = {
+    succeeded: boolean;
+    releaseTag?: string;
+    appId?: number;
+};
+export declare function triggerAndPollPreview(accountId: number, projectId: number, buildId: number, targetPortalId: number): Promise<PreviewResult>;
+export {};

package/lib/projects/preview.js

@@ -0,0 +1,48 @@
+import { triggerAutoRelease, getAutoReleaseStatus, } from '../../api/releases.js';
+import { PREVIEW_POLL_TIMEOUT } from '../constants.js';
+import { poll } from '../polling.js';
+import SpinniesManager from '../ui/SpinniesManager.js';
+import { logError, ApiErrorContext } from '../errorHandlers/index.js';
+import { lib } from '../../lang/en.js';
+export async function triggerAndPollPreview(accountId, projectId, buildId, targetPortalId) {
+    let triggerResponse;
+    SpinniesManager.add('preview', {
+        text: lib.projectPreview.triggeringPreview(buildId, targetPortalId),
+        succeedColor: 'white',
+    });
+    try {
+        const { data } = await triggerAutoRelease(accountId, projectId, buildId, targetPortalId);
+        triggerResponse = data;
+    }
+    catch (e) {
+        SpinniesManager.fail('preview', {
+            text: lib.projectPreview.triggerFailed,
+        });
+        logError(e, new ApiErrorContext({
+            accountId,
+            request: 'preview trigger',
+        }));
+        return { succeeded: false };
+    }
+    const { releaseTag, appId } = triggerResponse;
+    SpinniesManager.update('preview', {
+        text: lib.projectPreview.pollingStatus(releaseTag, targetPortalId),
+    });
+    try {
+        await poll(() => getAutoReleaseStatus(accountId, projectId, targetPortalId, releaseTag, appId), { successStates: ['COMPLETE'], errorStates: [] }, PREVIEW_POLL_TIMEOUT);
+    }
+    catch (e) {
+        SpinniesManager.fail('preview', {
+            text: lib.projectPreview.pollFailed,
+        });
+        logError(e, new ApiErrorContext({
+            accountId,
+            request: 'preview status',
+        }));
+        return { succeeded: false, releaseTag, appId };
+    }
+    SpinniesManager.succeed('preview', {
+        text: lib.projectPreview.succeeded(releaseTag, targetPortalId),
+    });
+    return { succeeded: true, releaseTag, appId };
+}

package/lib/projects/upload.d.ts

@@ -5,6 +5,7 @@ type ProjectUploadResult<T> = {
     result?: T;
     uploadError?: unknown;
     projectNotFound?: boolean;
+    projectId?: number;
 };
 type HandleProjectUploadArg<T> = {
     accountId: number;

package/lib/projects/upload.js

@@ -89,7 +89,7 @@ export async function handleProjectUpload({ accountId, projectConfig, projectDir
                     return resolve({ uploadError: e });
                 }
             }
-            const { projectExists } = await ensureProjectExists(accountId, projectConfig.name, {
+            const { projectExists, project } = await ensureProjectExists(accountId, projectConfig.name, {
                 forceCreate,
                 uploadCommand: isUploadCommand,
                 noLogs: true,
@@ -98,13 +98,14 @@ export async function handleProjectUpload({ accountId, projectConfig, projectDir
                 uiLogger.log(lib.projectUpload.handleProjectUpload.projectDoesNotExist(accountId));
                 return resolve({ projectNotFound: true });
             }
+            const projectId = project?.id;
             const { buildId, error } = await uploadProjectFiles(accountId, projectConfig.name, tempFile.name, uploadMessage, projectConfig.platformVersion, intermediateRepresentation);
             if (error) {
-                resolve({ uploadError: error });
+                resolve({ uploadError: error, projectId });
             }
             else if (callbackFunc) {
                 const uploadResult = await callbackFunc(accountId, projectConfig, tempFile, buildId);
-                resolve({ result: uploadResult });
+                resolve({ result: uploadResult, projectId });
             }
         }
         catch (e) {
@@ -133,7 +134,7 @@ export async function handleProjectUpload({ accountId, projectConfig, projectDir
         return ignored ? false : file;
     });
     // Archive workspaces and file: dependencies
-    await archiveWorkspacesAndDependencies(archive, srcDir, projectDir, workspaceMappings, fileDependencyMappings);
+    await archiveWorkspacesAndDependencies(archive, srcDir, workspaceMappings, fileDependencyMappings);
     archive.finalize();
     return result;
 }

package/lib/projects/workspaces.d.ts

@@ -12,6 +12,16 @@ export type WorkspaceArchiveResult = {
  * Uses SHA256 truncated to 8 hex characters (4 billion possibilities).
  */
 export declare function shortHash(input: string): string;
+/**
+ * Converts native path separators to POSIX forward slashes.
+ *
+ * Zip entry names and npm workspace globs are POSIX-only. On Windows,
+ * `path.relative` returns backslash-separated paths; archiver normalizes
+ * its appended entry names to forward slashes but its filter callback
+ * receives forward-slashed names too. Without this normalization, lookups
+ * in our exclusion Sets miss on Windows and a file gets archived twice.
+ */
+export declare function toPosixPath(p: string): string;
 /**
  * Determines the archive path for an external workspace or file: dependency.
  * Produces `_workspaces/<basename>-<hash>` with no subdirectory.
@@ -39,4 +49,4 @@ export declare function getLockfilePathsToUpdate(srcDir: string, workspaceMappin
  * Main orchestration function that handles archiving of workspaces and file dependencies.
  * This is the clean integration point for upload.ts.
  */
-export declare function archiveWorkspacesAndDependencies(archive: archiver.Archiver, srcDir: string, projectDir: string, workspaceMappings: WorkspaceMapping[], fileDependencyMappings: FileDependencyMapping[]): Promise<WorkspaceArchiveResult>;
+export declare function archiveWorkspacesAndDependencies(archive: archiver.Archiver, srcDir: string, workspaceMappings: WorkspaceMapping[], fileDependencyMappings: FileDependencyMapping[]): Promise<WorkspaceArchiveResult>;

package/lib/projects/workspaces.js

@@ -12,6 +12,21 @@ import { lib } from '../../lang/en.js';
 export function shortHash(input) {
     return crypto.createHash('sha256').update(input).digest('hex').slice(0, 8);
 }
+/**
+ * Converts native path separators to POSIX forward slashes.
+ *
+ * Zip entry names and npm workspace globs are POSIX-only. On Windows,
+ * `path.relative` returns backslash-separated paths; archiver normalizes
+ * its appended entry names to forward slashes but its filter callback
+ * receives forward-slashed names too. Without this normalization, lookups
+ * in our exclusion Sets miss on Windows and a file gets archived twice.
+ */
+export function toPosixPath(p) {
+    if (path.sep === path.posix.sep) {
+        return p;
+    }
+    return p.replaceAll(path.sep, path.posix.sep);
+}
 /**
  * Determines the archive path for an external workspace or file: dependency.
  * Produces `_workspaces/<basename>-<hash>` with no subdirectory.
@@ -20,7 +35,7 @@ export function shortHash(input) {
 export function computeExternalArchivePath(absolutePath) {
     const resolved = path.resolve(absolutePath);
     const name = path.basename(resolved);
-    return path.join('_workspaces', `${name}-${shortHash(resolved)}`);
+    return path.posix.join('_workspaces', `${name}-${shortHash(resolved)}`);
 }
 /**
  * Returns true if dir is inside srcDir (i.e. it will already be included
@@ -71,7 +86,7 @@ async function archiveWorkspaceDirectories(archive, srcDir, workspaceMappings) {
         if (isInsideSrcDir(workspaceDir, srcDir)) {
             // Internal: already in archive from srcDir walk.
             // Store the relative path from the package.json directory so npm can resolve it.
-            const relPath = path.relative(path.dirname(sourcePackageJsonPath), path.resolve(workspaceDir));
+            const relPath = toPosixPath(path.relative(path.dirname(sourcePackageJsonPath), path.resolve(workspaceDir)));
             packageWorkspaceEntries.get(sourcePackageJsonPath).push(relPath);
         }
         else {
@@ -89,7 +104,7 @@ async function archiveWorkspaceDirectories(archive, srcDir, workspaceMappings) {
                 externalsToArchive.push({ dir: workspaceDir, archivePath });
             }
             const relPkgJsonDir = path.relative(srcDir, path.dirname(sourcePackageJsonPath));
-            const relativeEntry = path.relative(relPkgJsonDir, archivePath);
+            const relativeEntry = toPosixPath(path.relative(relPkgJsonDir, archivePath));
             packageWorkspaceEntries.get(sourcePackageJsonPath).push(relativeEntry);
         }
     }
@@ -130,7 +145,7 @@ async function archiveFileDependencies(archive, srcDir, fileDependencyMappings,
             packageFileDeps.set(sourcePackageJsonPath, new Map());
         }
         const relPkgJsonDir = path.relative(srcDir, path.dirname(sourcePackageJsonPath));
-        const relativeArchivePath = path.relative(relPkgJsonDir, archivePath);
+        const relativeArchivePath = toPosixPath(path.relative(relPkgJsonDir, archivePath));
         packageFileDeps
             .get(sourcePackageJsonPath)
             .set(packageName, relativeArchivePath);
@@ -172,7 +187,7 @@ export async function updatePackageJsonInArchive(archive, srcDir, packageWorkspa
         if (!fs.existsSync(packageJsonPath)) {
             continue;
         }
-        const relativePackageJsonPath = path.relative(srcDir, packageJsonPath);
+        const relativePackageJsonPath = toPosixPath(path.relative(srcDir, packageJsonPath));
         let rawContent;
         try {
             rawContent = fs.readFileSync(packageJsonPath, 'utf8');
@@ -261,11 +276,11 @@ export function rewriteLockfileForExternalDeps(lockfileContent, pathMappings) {
 export function getPackageJsonPathsToUpdate(srcDir, workspaceMappings, fileDependencyMappings) {
     const paths = new Set();
     for (const { sourcePackageJsonPath } of workspaceMappings) {
-        paths.add(path.relative(srcDir, sourcePackageJsonPath));
+        paths.add(toPosixPath(path.relative(srcDir, sourcePackageJsonPath)));
     }
     for (const { localPath, sourcePackageJsonPath } of fileDependencyMappings) {
         if (!isInsideSrcDir(localPath, srcDir)) {
-            paths.add(path.relative(srcDir, sourcePackageJsonPath));
+            paths.add(toPosixPath(path.relative(srcDir, sourcePackageJsonPath)));
         }
     }
     return paths;
@@ -290,7 +305,7 @@ export function getLockfilePathsToUpdate(srcDir, workspaceMappings, fileDependen
     for (const dir of dirsWithExternalDeps) {
         const lockfilePath = path.join(dir, 'package-lock.json');
         if (fs.existsSync(lockfilePath)) {
-            paths.add(path.relative(srcDir, lockfilePath));
+            paths.add(toPosixPath(path.relative(srcDir, lockfilePath)));
         }
     }
     return paths;
@@ -319,12 +334,12 @@ async function rewriteLockfilesInArchive(archive, srcDir, externalArchivePaths,
         const pathMappings = [];
         for (const [absoluteExternalPath, archivePath] of externalArchivePaths) {
             pathMappings.push({
-                oldPath: path.relative(dir, absoluteExternalPath),
-                newPath: path.relative(dir, path.join(srcDir, archivePath)),
+                oldPath: toPosixPath(path.relative(dir, absoluteExternalPath)),
+                newPath: toPosixPath(path.relative(dir, path.join(srcDir, archivePath))),
             });
         }
         const rewritten = rewriteLockfileForExternalDeps(lockfileContent, pathMappings);
-        const relativeLockfilePath = path.relative(srcDir, lockfilePath);
+        const relativeLockfilePath = toPosixPath(path.relative(srcDir, lockfilePath));
         uiLogger.debug(lib.projectUpload.handleProjectUpload.updatingLockfile(relativeLockfilePath));
         archive.append(JSON.stringify(rewritten, null, 2), {
             name: relativeLockfilePath,
@@ -336,7 +351,7 @@ async function rewriteLockfilesInArchive(archive, srcDir, externalArchivePaths,
  * Main orchestration function that handles archiving of workspaces and file dependencies.
  * This is the clean integration point for upload.ts.
  */
-export async function archiveWorkspacesAndDependencies(archive, srcDir, projectDir, workspaceMappings, fileDependencyMappings) {
+export async function archiveWorkspacesAndDependencies(archive, srcDir, workspaceMappings, fileDependencyMappings) {
     // Archive workspace directories (internal ones are skipped, externals are copied)
     const { externalArchivePaths, packageWorkspaceEntries } = await archiveWorkspaceDirectories(archive, srcDir, workspaceMappings);
     // Archive external file: dependencies (internals are skipped)

package/lib/yargs/makeWrappedYargsHandler.d.ts

@@ -0,0 +1,3 @@
+import { ArgumentsCamelCase } from 'yargs';
+import { CommonArgs } from '../../types/Yargs.js';
+export declare function makeWrappedYargsHandler<T extends CommonArgs>(trackingName: string, handler: (args: ArgumentsCamelCase<T>) => Promise<void>): (args: ArgumentsCamelCase<T>) => Promise<void>;

package/lib/yargs/{makeYargsHandlerWithUsageTracking.js → makeWrappedYargsHandler.js}

@@ -32,7 +32,7 @@ function logUsageTrackingMessage(isJsonOutput) {
         return;
     }
 }
-export function makeYargsHandlerWithUsageTracking(trackingName, handler) {
+export function makeWrappedYargsHandler(trackingName, handler) {
     return async (args) => {
         const startTime = Date.now();
         const meta = {};

package/mcp-server/tools/cms/HsCreateFunctionTool.js

@@ -59,7 +59,7 @@ export class HsCreateFunctionTool extends Tool {
             };
         }
         // Build the command
-        let command = 'hs create function';
+        let command = 'hs cms function create';
         if (dest) {
             command += ` "${dest}"`;
         }
@@ -94,7 +94,7 @@ export class HsCreateFunctionTool extends Tool {
     register() {
         return this.mcpServer.registerTool(toolName, {
             title: 'Create HubSpot CMS Serverless Function',
-            description: `Creates a new HubSpot CMS serverless function using the hs create function command. Functions can be created non-interactively by specifying functionsFolder, filename, and endpointPath. Supports all HTTP methods (${HTTP_METHODS.join(', ')}).`,
+            description: `Creates a new HubSpot CMS serverless function using the hs cms function create command. Functions can be created non-interactively by specifying functionsFolder, filename, and endpointPath. Supports all HTTP methods (${HTTP_METHODS.join(', ')}).`,
             inputSchema,
             annotations: {
                 readOnlyHint: false,