@hubspot/cli 8.0.11-experimental.0 → 8.0.11-experimental.1

package/lib/projects/workspaces.js

@@ -0,0 +1,350 @@
+import fs from 'fs-extra';
+import path from 'path';
+import crypto from 'crypto';
+import { shouldIgnoreFile } from '@hubspot/local-dev-lib/ignoreRules';
+import { getPackableFiles, } from '@hubspot/project-parsing-lib/workspaces';
+import { uiLogger } from '../ui/logger.js';
+import { lib } from '../../lang/en.js';
+/**
+ * Generates a short hash of the input string for use in workspace paths.
+ * Uses SHA256 truncated to 8 hex characters (4 billion possibilities).
+ */
+export function shortHash(input) {
+    return crypto.createHash('sha256').update(input).digest('hex').slice(0, 8);
+}
+/**
+ * Determines the archive path for an external workspace or file: dependency.
+ * Produces `_workspaces/<basename>-<hash>` with no subdirectory.
+ * The hash prevents collisions between different directories with the same basename.
+ */
+export function computeExternalArchivePath(absolutePath) {
+    const resolved = path.resolve(absolutePath);
+    const name = path.basename(resolved);
+    return path.join('_workspaces', `${name}-${shortHash(resolved)}`);
+}
+/**
+ * Returns true if dir is inside srcDir (i.e. it will already be included
+ * in the archive from the srcDir walk and must not be copied again).
+ */
+function isInsideSrcDir(dir, srcDir) {
+    const rel = path.relative(path.resolve(srcDir), path.resolve(dir));
+    return !rel.startsWith('..') && !path.isAbsolute(rel);
+}
+/**
+ * Creates a file filter function for workspace archiving.
+ * Filters files based on packable files list and ignore rules.
+ */
+function createWorkspaceFileFilter(packableFiles) {
+    return (file) => {
+        if (packableFiles.size > 0 && !packableFiles.has(file.name)) {
+            uiLogger.debug(lib.projectUpload.handleProjectUpload.fileFiltered(file.name));
+            return false;
+        }
+        const ignored = shouldIgnoreFile(file.name, true);
+        if (ignored) {
+            uiLogger.debug(lib.projectUpload.handleProjectUpload.fileFiltered(file.name));
+            return false;
+        }
+        return file;
+    };
+}
+/**
+ * Archives workspace directories and returns mapping information.
+ *
+ * Internal workspaces (inside srcDir) are not archived — they are already
+ * included via the srcDir walk. Their relative paths (from the package.json
+ * directory to the workspace directory) are stored directly in the entries.
+ *
+ * External workspaces (outside srcDir) are copied to `_workspaces/<name>-<hash>`
+ * and their relative archive paths (e.g. `../_workspaces/<name>-<hash>`) are stored.
+ */
+async function archiveWorkspaceDirectories(archive, srcDir, workspaceMappings) {
+    const externalArchivePaths = new Map(); // resolvedDir -> archivePath
+    const archivePathToDir = new Map(); // archivePath -> resolvedDir (collision detection)
+    const packageWorkspaceEntries = new Map();
+    const externalsToArchive = [];
+    for (const mapping of workspaceMappings) {
+        const { workspaceDir, sourcePackageJsonPath } = mapping;
+        if (!packageWorkspaceEntries.has(sourcePackageJsonPath)) {
+            packageWorkspaceEntries.set(sourcePackageJsonPath, []);
+        }
+        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));
+            packageWorkspaceEntries.get(sourcePackageJsonPath).push(relPath);
+        }
+        else {
+            // External: archive to _workspaces/<name>-<hash>.
+            const archivePath = computeExternalArchivePath(workspaceDir);
+            const resolvedDir = path.resolve(workspaceDir);
+            // Detect hash collisions (different dirs mapping to the same archive path)
+            const existing = archivePathToDir.get(archivePath);
+            if (existing && existing !== resolvedDir) {
+                throw new Error(lib.projectUpload.handleProjectUpload.workspaceCollision(archivePath, workspaceDir, existing));
+            }
+            if (!externalArchivePaths.has(resolvedDir)) {
+                externalArchivePaths.set(resolvedDir, archivePath);
+                archivePathToDir.set(archivePath, resolvedDir);
+                externalsToArchive.push({ dir: workspaceDir, archivePath });
+            }
+            const relPkgJsonDir = path.relative(srcDir, path.dirname(sourcePackageJsonPath));
+            const relativeEntry = path.relative(relPkgJsonDir, archivePath);
+            packageWorkspaceEntries.get(sourcePackageJsonPath).push(relativeEntry);
+        }
+    }
+    // Fetch packable files in parallel (I/O optimization)
+    const withPackableFiles = await Promise.all(externalsToArchive.map(async (item) => ({
+        ...item,
+        packableFiles: await getPackableFiles(item.dir),
+    })));
+    // Archive directories sequentially (archiver requires sequential operations)
+    for (const { dir, archivePath, packableFiles } of withPackableFiles) {
+        uiLogger.log(lib.projectUpload.handleProjectUpload.workspaceIncluded(dir, archivePath));
+        archive.directory(dir, archivePath, createWorkspaceFileFilter(packableFiles));
+    }
+    return { externalArchivePaths, packageWorkspaceEntries };
+}
+/**
+ * Archives file: dependencies and returns mapping information.
+ *
+ * Internal file: dependencies (inside srcDir) are skipped — their original
+ * `file:` references in package.json remain valid after upload.
+ *
+ * External file: dependencies are archived to `_workspaces/<name>-<hash>`
+ * and tracked in the returned map so package.json can be rewritten.
+ */
+async function archiveFileDependencies(archive, srcDir, fileDependencyMappings, externalArchivePaths) {
+    const packageFileDeps = new Map();
+    const toArchive = [];
+    for (const mapping of fileDependencyMappings) {
+        const { packageName, localPath, sourcePackageJsonPath } = mapping;
+        if (isInsideSrcDir(localPath, srcDir)) {
+            // Internal: original file: reference stays unchanged, nothing to do
+            continue;
+        }
+        // External: archive to _workspaces/<name>-<hash>
+        const archivePath = computeExternalArchivePath(localPath);
+        const resolvedPath = path.resolve(localPath);
+        if (!packageFileDeps.has(sourcePackageJsonPath)) {
+            packageFileDeps.set(sourcePackageJsonPath, new Map());
+        }
+        const relPkgJsonDir = path.relative(srcDir, path.dirname(sourcePackageJsonPath));
+        const relativeArchivePath = path.relative(relPkgJsonDir, archivePath);
+        packageFileDeps
+            .get(sourcePackageJsonPath)
+            .set(packageName, relativeArchivePath);
+        // Only archive each unique path once
+        if (!externalArchivePaths.has(resolvedPath)) {
+            externalArchivePaths.set(resolvedPath, archivePath);
+            toArchive.push({ localPath, archivePath, packageName });
+        }
+    }
+    // Fetch packable files in parallel (I/O optimization)
+    const withPackableFiles = await Promise.all(toArchive.map(async (item) => ({
+        ...item,
+        packableFiles: await getPackableFiles(item.localPath),
+    })));
+    // Archive directories sequentially (archiver requires sequential operations)
+    for (const { localPath, archivePath, packageName, packableFiles, } of withPackableFiles) {
+        uiLogger.log(lib.projectUpload.handleProjectUpload.fileDependencyIncluded(packageName, localPath, archivePath));
+        archive.directory(localPath, archivePath, createWorkspaceFileFilter(packableFiles));
+    }
+    return packageFileDeps;
+}
+/**
+ * Updates package.json files in the archive to reflect new workspace and file: dependency paths.
+ *
+ * Workspace entries in packageWorkspaces are already in final form:
+ * - Internal workspaces: relative paths (e.g. "../packages/utils")
+ * - External workspaces: relative paths (e.g. "../_workspaces/logger-abc")
+ *
+ * Only external file: dependencies appear in packageFileDeps; internal ones
+ * keep their original file: references and are left untouched.
+ */
+export async function updatePackageJsonInArchive(archive, srcDir, packageWorkspaces, packageFileDeps) {
+    // Collect all package.json paths that need updating
+    const allPackageJsonPaths = new Set([
+        ...packageWorkspaces.keys(),
+        ...packageFileDeps.keys(),
+    ]);
+    for (const packageJsonPath of allPackageJsonPaths) {
+        if (!fs.existsSync(packageJsonPath)) {
+            continue;
+        }
+        const relativePackageJsonPath = path.relative(srcDir, packageJsonPath);
+        let rawContent;
+        try {
+            rawContent = fs.readFileSync(packageJsonPath, 'utf8');
+        }
+        catch {
+            continue;
+        }
+        let packageJson;
+        try {
+            packageJson = JSON.parse(rawContent);
+        }
+        catch (e) {
+            uiLogger.warn(lib.projectUpload.handleProjectUpload.malformedPackageJson(packageJsonPath, e instanceof Error ? e.message : String(e)));
+            archive.append(rawContent, { name: relativePackageJsonPath });
+            continue;
+        }
+        let modified = false;
+        // Update workspaces field — entries are already in their final form
+        const workspaceEntries = packageWorkspaces.get(packageJsonPath);
+        if (workspaceEntries && packageJson.workspaces) {
+            packageJson.workspaces = workspaceEntries;
+            modified = true;
+            uiLogger.debug(lib.projectUpload.handleProjectUpload.updatingPackageJsonWorkspaces(relativePackageJsonPath));
+            uiLogger.debug(lib.projectUpload.handleProjectUpload.updatedWorkspaces(workspaceEntries.join(', ')));
+        }
+        // Update external file: dependencies; internal ones are left untouched
+        const fileDeps = packageFileDeps.get(packageJsonPath);
+        if (fileDeps && fileDeps.size > 0 && packageJson.dependencies) {
+            for (const [packageName, archivePath] of fileDeps.entries()) {
+                if (packageJson.dependencies[packageName]?.startsWith('file:')) {
+                    packageJson.dependencies[packageName] = `file:${archivePath}`;
+                    modified = true;
+                    uiLogger.debug(lib.projectUpload.handleProjectUpload.updatedFileDependency(packageName, archivePath));
+                }
+            }
+        }
+        archive.append(modified ? JSON.stringify(packageJson, null, 2) : rawContent, { name: relativePackageJsonPath });
+    }
+    // Ensure all append operations are queued before finalize is called
+    // Use setImmediate to yield control and let archiver process the queue
+    await new Promise(resolve => setImmediate(resolve));
+}
+export function rewriteLockfileForExternalDeps(lockfileContent, pathMappings) {
+    if (pathMappings.length === 0) {
+        return lockfileContent;
+    }
+    const packages = lockfileContent.packages;
+    if (!packages) {
+        return lockfileContent;
+    }
+    const newPackages = {};
+    for (const [key, value] of Object.entries(packages)) {
+        const mapping = pathMappings.find(m => m.oldPath === key);
+        newPackages[mapping ? mapping.newPath : key] = value;
+    }
+    for (const [key, value] of Object.entries(newPackages)) {
+        if (key.startsWith('node_modules/') &&
+            typeof value === 'object' &&
+            value !== null) {
+            const entry = value;
+            if (entry.link === true && typeof entry.resolved === 'string') {
+                const mapping = pathMappings.find(m => m.oldPath === entry.resolved);
+                if (mapping) {
+                    newPackages[key] = { ...entry, resolved: mapping.newPath };
+                }
+            }
+        }
+    }
+    const rootEntry = newPackages[''];
+    if (rootEntry && typeof rootEntry === 'object' && rootEntry !== null) {
+        const root = rootEntry;
+        if (Array.isArray(root.workspaces)) {
+            newPackages[''] = {
+                ...root,
+                workspaces: root.workspaces.map((ws) => {
+                    if (typeof ws !== 'string')
+                        return ws;
+                    const mapping = pathMappings.find(m => m.oldPath === ws);
+                    return mapping ? mapping.newPath : ws;
+                }),
+            };
+        }
+    }
+    return { ...lockfileContent, packages: newPackages };
+}
+export function getPackageJsonPathsToUpdate(srcDir, workspaceMappings, fileDependencyMappings) {
+    const paths = new Set();
+    for (const { sourcePackageJsonPath } of workspaceMappings) {
+        paths.add(path.relative(srcDir, sourcePackageJsonPath));
+    }
+    for (const { localPath, sourcePackageJsonPath } of fileDependencyMappings) {
+        if (!isInsideSrcDir(localPath, srcDir)) {
+            paths.add(path.relative(srcDir, sourcePackageJsonPath));
+        }
+    }
+    return paths;
+}
+function getDirsWithExternalDeps(srcDir, workspaceMappings, fileDependencyMappings) {
+    const dirs = new Set();
+    for (const { workspaceDir, sourcePackageJsonPath } of workspaceMappings) {
+        if (!isInsideSrcDir(workspaceDir, srcDir)) {
+            dirs.add(path.dirname(sourcePackageJsonPath));
+        }
+    }
+    for (const { localPath, sourcePackageJsonPath } of fileDependencyMappings) {
+        if (!isInsideSrcDir(localPath, srcDir)) {
+            dirs.add(path.dirname(sourcePackageJsonPath));
+        }
+    }
+    return dirs;
+}
+export function getLockfilePathsToUpdate(srcDir, workspaceMappings, fileDependencyMappings) {
+    const dirsWithExternalDeps = getDirsWithExternalDeps(srcDir, workspaceMappings, fileDependencyMappings);
+    const paths = new Set();
+    for (const dir of dirsWithExternalDeps) {
+        const lockfilePath = path.join(dir, 'package-lock.json');
+        if (fs.existsSync(lockfilePath)) {
+            paths.add(path.relative(srcDir, lockfilePath));
+        }
+    }
+    return paths;
+}
+async function rewriteLockfilesInArchive(archive, srcDir, externalArchivePaths, dirsWithExternalDeps) {
+    if (externalArchivePaths.size === 0)
+        return;
+    for (const dir of dirsWithExternalDeps) {
+        const lockfilePath = path.join(dir, 'package-lock.json');
+        if (!fs.existsSync(lockfilePath))
+            continue;
+        let rawContent;
+        try {
+            rawContent = fs.readFileSync(lockfilePath, 'utf8');
+        }
+        catch {
+            continue;
+        }
+        let lockfileContent;
+        try {
+            lockfileContent = JSON.parse(rawContent);
+        }
+        catch {
+            continue;
+        }
+        const pathMappings = [];
+        for (const [absoluteExternalPath, archivePath] of externalArchivePaths) {
+            pathMappings.push({
+                oldPath: path.relative(dir, absoluteExternalPath),
+                newPath: path.relative(dir, path.join(srcDir, archivePath)),
+            });
+        }
+        const rewritten = rewriteLockfileForExternalDeps(lockfileContent, pathMappings);
+        const relativeLockfilePath = path.relative(srcDir, lockfilePath);
+        uiLogger.debug(lib.projectUpload.handleProjectUpload.updatingLockfile(relativeLockfilePath));
+        archive.append(JSON.stringify(rewritten, null, 2), {
+            name: relativeLockfilePath,
+        });
+    }
+    await new Promise(resolve => setImmediate(resolve));
+}
+/**
+ * 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) {
+    // 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)
+    const packageFileDeps = await archiveFileDependencies(archive, srcDir, fileDependencyMappings, externalArchivePaths);
+    // Update package.json files with new paths
+    await updatePackageJsonInArchive(archive, srcDir, packageWorkspaceEntries, packageFileDeps);
+    // Rewrite lock files to point to archive paths for external deps
+    const dirsWithExternalDeps = getDirsWithExternalDeps(srcDir, workspaceMappings, fileDependencyMappings);
+    await rewriteLockfilesInArchive(archive, srcDir, externalArchivePaths, dirsWithExternalDeps);
+    return { packageWorkspaces: packageWorkspaceEntries, packageFileDeps };
+}

package/lib/prompts/createApiSamplePrompt.js

@@ -1,5 +1,6 @@
 import { promptUser } from './promptUtils.js';
 import { lib } from '../../lang/en.js';
+import { isPromptExitError } from '../errors/PromptExitError.js';
 function getSampleTypesPrompt(choices) {
     return {
         type: 'rawlist',
@@ -53,6 +54,9 @@ export async function createApiSamplePrompt(samplesConfig) {
         };
     }
     catch (e) {
+        if (isPromptExitError(e)) {
+            throw e;
+        }
         return {};
     }
 }

package/lib/prompts/projectProfilePrompt.d.ts

@@ -0,0 +1,2 @@
+import { ProjectConfig } from '../../types/Projects.js';
+export declare function projectProfilePrompt(projectDir: string, projectConfig: ProjectConfig, profileName?: string, exitIfMissing?: boolean): Promise<string | null>;

package/lib/prompts/projectProfilePrompt.js

@@ -0,0 +1,46 @@
+import path from 'path';
+import { getAllHsProfiles } from '@hubspot/project-parsing-lib/profiles';
+import { listPrompt } from './promptUtils.js';
+import { loadProfile } from '../projects/projectProfiles.js';
+import { lib } from '../../lang/en.js';
+function generateProfilePromptOption(projectDir, projectConfig, profileName) {
+    const choice = {
+        name: profileName,
+        value: profileName,
+    };
+    try {
+        const profile = loadProfile(projectConfig, projectDir, profileName);
+        choice.name = `${profileName} [${profile.accountId}]`;
+    }
+    catch (e) {
+        choice.name = `${profileName} [Invalid profile]`;
+        choice.disabled = true;
+    }
+    return choice;
+}
+export async function projectProfilePrompt(projectDir, projectConfig, profileName, exitIfMissing) {
+    if (profileName) {
+        return profileName;
+    }
+    const existingProfiles = await getAllHsProfiles(path.join(projectDir, projectConfig.srcDir));
+    if (existingProfiles.length !== 0) {
+        if (existingProfiles.length === 1) {
+            return existingProfiles[0];
+        }
+        // In automated workflows exit instead of prompting
+        if (exitIfMissing) {
+            throw new Error(lib.prompts.projectProfilePrompt.exitMessage);
+        }
+        const listOptions = existingProfiles.map(p => generateProfilePromptOption(projectDir, projectConfig, p));
+        const hasAnyValidProfiles = listOptions.some(option => typeof option === 'object' && 'name' in option && !option.disabled);
+        // Exit early if the user has no valid profiles for us to show in the prompt
+        if (!hasAnyValidProfiles) {
+            throw new Error(lib.prompts.projectProfilePrompt.noValidProfilesMessage);
+        }
+        const profileNameFromPrompt = await listPrompt(lib.prompts.projectProfilePrompt.message, {
+            choices: listOptions,
+        });
+        return profileNameFromPrompt;
+    }
+    return null;
+}

package/lib/prompts/promptUtils.js

@@ -3,6 +3,7 @@ import { EXIT_CODES } from '../enums/exitCodes.js';
 import chalk from 'chalk';
 import { lib } from '../../lang/en.js';
 import { uiLogger } from '../ui/logger.js';
+import { PromptExitError } from '../errors/PromptExitError.js';
 export const Separator = new _Separator();
 export const PROMPT_THEME = { prefix: { idle: chalk.green('?') } };
 export const CHECKBOX_PROMPT_THEME = {
@@ -19,14 +20,14 @@ function isNoSelectableChoicesError(error) {
 }
 function handlePromptError(config, error) {
     if (isUserCancellationError(error)) {
-        process.exit(EXIT_CODES.SUCCESS);
+        throw new PromptExitError(lib.prompts.promptUtils.errors.userCancelled, EXIT_CODES.SUCCESS);
     }
     if (isNoSelectableChoicesError(error)) {
         if (!Array.isArray(config)) {
             uiLogger.log(config.message);
         }
         uiLogger.error(lib.prompts.promptUtils.errors.noSelectableChoices);
-        process.exit(EXIT_CODES.ERROR);
+        throw new PromptExitError(lib.prompts.promptUtils.errors.noSelectableChoices, EXIT_CODES.ERROR);
     }
     throw error;
 }

package/lib/prompts/selectHubDBTablePrompt.js

@@ -5,7 +5,7 @@ import { debugError } from '../errorHandlers/index.js';
 import { uiLogger } from '../ui/logger.js';
 import { fetchTables } from '@hubspot/local-dev-lib/api/hubdb';
 import { isValidPath, untildify } from '@hubspot/local-dev-lib/path';
-import { PromptExitError } from '../errors/PromptExitError.js';
+import { isPromptExitError, PromptExitError, } from '../errors/PromptExitError.js';
 import { EXIT_CODES } from '../enums/exitCodes.js';
 async function fetchHubDBOptions(accountId) {
     try {
@@ -17,7 +17,7 @@ async function fetchHubDBOptions(accountId) {
         return tables;
     }
     catch (error) {
-        if (error instanceof PromptExitError) {
+        if (isPromptExitError(error)) {
             throw error;
         }
         debugError(error, { accountId });

package/lib/prompts/selectPublicAppForMigrationPrompt.js

@@ -4,7 +4,7 @@ import { uiLine } from '../ui/index.js';
 import { logError } from '../errorHandlers/index.js';
 import { uiLogger } from '../ui/logger.js';
 import { fetchPublicAppsForPortal } from '@hubspot/local-dev-lib/api/appsDev';
-import { PromptExitError } from '../errors/PromptExitError.js';
+import { isPromptExitError, PromptExitError, } from '../errors/PromptExitError.js';
 import { EXIT_CODES } from '../enums/exitCodes.js';
 async function fetchPublicAppOptions(accountId, accountName, isMigratingApp = false) {
     if (!accountId) {
@@ -32,7 +32,7 @@ async function fetchPublicAppOptions(accountId, accountName, isMigratingApp = fa
         return filteredPublicApps;
     }
     catch (error) {
-        if (error instanceof PromptExitError) {
+        if (isPromptExitError(error)) {
             throw error;
         }
         logError(error, accountId ? { accountId } : undefined);

package/lib/theme/cmsDevServerProcess.d.ts

@@ -1,4 +1,5 @@
 import { ChildProcess } from 'child_process';
+import { ExitFunction } from '../../types/Yargs.js';
 interface DevServerOptions {
     absoluteSrc: string;
     accountName?: string;
@@ -7,6 +8,7 @@ interface DevServerOptions {
     generateFieldsTypes?: boolean;
     resetSession?: boolean;
     dest: string;
+    exit: ExitFunction;
 }
 export declare function spawnDevServer(options: DevServerOptions): Promise<ChildProcess>;
 export {};

package/lib/theme/cmsDevServerProcess.js

@@ -6,6 +6,7 @@ import { fileURLToPath } from 'url';
 import { getConfigFilePath } from '@hubspot/local-dev-lib/config';
 import SpinniesManager from '../ui/SpinniesManager.js';
 import { lib } from '../../lang/en.js';
+import { EXIT_CODES } from '../enums/exitCodes.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 // cms-dev-server version to install to isolated cache
@@ -83,7 +84,7 @@ async function ensureCmsDevServerCache(targetVersion) {
     return cacheDir;
 }
 export async function spawnDevServer(options) {
-    const { absoluteSrc, accountName, noSsl, port, generateFieldsTypes, resetSession, dest, } = options;
+    const { absoluteSrc, accountName, noSsl, port, generateFieldsTypes, resetSession, dest, exit, } = options;
     // Ensure cms-dev-server is installed in isolated cache
     const cacheDir = await ensureCmsDevServerCache(TARGET_CMS_DEV_SERVER_VERSION);
     // Get config path to pass to createDevServer
@@ -123,18 +124,18 @@ export async function spawnDevServer(options) {
         cwd: cacheDir,
     });
     // Handle process events
-    devServer.on('error', error => {
+    devServer.on('error', async (error) => {
         console.error(lib.theme.cmsDevServerProcess.serverStartError(error));
-        process.exit(1);
+        await exit(EXIT_CODES.ERROR);
     });
-    devServer.on('exit', (code, signal) => {
+    devServer.on('exit', async (code, signal) => {
         if (code !== 0 && code !== null) {
             console.error(lib.theme.cmsDevServerProcess.serverExit(code));
-            process.exit(code);
+            await exit(code);
         }
         if (signal) {
             console.error(lib.theme.cmsDevServerProcess.serverKill(signal));
-            process.exit(1);
+            await exit(EXIT_CODES.ERROR);
         }
     });
     // Handle CLI termination

package/lib/ui/SpinniesManager.d.ts

@@ -12,6 +12,7 @@ declare class SpinniesManager {
     private lineCount;
     private currentFrameIndex;
     private spin;
+    private sigintHandler;
     constructor();
     init(options?: Partial<SpinnerState>): void;
     private resetState;

package/lib/ui/SpinniesManager.js

@@ -10,7 +10,8 @@ The above copyright notice and this permission notice shall be included in all c
 import readline from 'readline';
 import chalk from 'chalk';
 import cliCursor from 'cli-cursor';
-import { breakText, cleanStream, colorOptions, getLinesLength, prefixOptions, purgeSpinnerOptions, purgeSpinnersOptions, SPINNERS, terminalSupportsUnicode, writeStream, } from './spinniesUtils.js';
+import { breakText, cleanStream, colorOptions, getLinesLength, prefixOptions, purgeSpinnerOptions, purgeSpinnersOptions, SPINNERS, writeStream, } from './spinniesUtils.js';
+import { isUnicodeSupported } from '@hubspot/local-dev-lib/isUnicodeSupported';
 import { uiLogger } from './logger.js';
 function safeColor(text, color) {
     const chalkFn = chalk[color];
@@ -29,6 +30,7 @@ class SpinniesManager {
     lineCount = 0;
     currentFrameIndex = 0;
     spin;
+    sigintHandler = null;
     constructor() {
         this.resetState();
     }
@@ -37,7 +39,7 @@ class SpinniesManager {
             spinnerColor: 'greenBright',
             succeedColor: 'green',
             failColor: 'red',
-            spinner: terminalSupportsUnicode() ? SPINNERS.dots : SPINNERS.dashes,
+            spinner: isUnicodeSupported() ? SPINNERS.dots : SPINNERS.dashes,
             disableSpins: false,
             ...purgeSpinnersOptions(options),
         };
@@ -247,12 +249,24 @@ class SpinniesManager {
         }
     }
     bindSigint() {
-        process.removeAllListeners('SIGINT');
-        process.on('SIGINT', () => {
+        if (this.sigintHandler) {
+            process.removeListener('SIGINT', this.sigintHandler);
+        }
+        this.sigintHandler = () => {
             cliCursor.show();
             readline.moveCursor(process.stderr, 0, this.lineCount);
-            process.exit(0);
-        });
+            const remainingListeners = process
+                .listeners('SIGINT')
+                .filter(l => l !== this.sigintHandler);
+            if (remainingListeners.length === 0) {
+                // process.exit is intentionally used here rather than the command-level
+                // exit() function because this SIGINT handler runs outside of a command
+                // context and needs to force-terminate the process when no other SIGINT
+                // listeners remain to handle it.
+                process.exit(0);
+            }
+        };
+        process.on('SIGINT', this.sigintHandler);
     }
 }
 const toExport = new SpinniesManager();

package/lib/ui/spinniesUtils.d.ts

@@ -28,5 +28,4 @@ export declare function breakText(text: string, prefixLength: number): string;
 export declare function getLinesLength(text: string, prefixLength: number): number[];
 export declare function writeStream(stream: NodeJS.WriteStream, output: string, rawLines: number[]): void;
 export declare function cleanStream(stream: NodeJS.WriteStream, rawLines: number[]): void;
-export declare function terminalSupportsUnicode(): boolean;
 export {};

package/lib/ui/spinniesUtils.js

@@ -9,6 +9,8 @@ The above copyright notice and this permission notice shall be included in all c
 **/
 import readline from 'readline';
 import stripAnsi from 'strip-ansi';
+import { isUnicodeSupported } from '@hubspot/local-dev-lib/isUnicodeSupported';
+import { getSymbols } from '@hubspot/local-dev-lib/logger';
 export const VALID_STATUSES = [
     'succeed',
     'fail',
@@ -64,7 +66,7 @@ export function purgeSpinnersOptions({ spinner, disableSpins, ...others }) {
     return { ...colors, ...prefixes, ...disableSpinsOption, spinner };
 }
 function turnToValidSpinner(spinner = {}) {
-    const platformSpinner = terminalSupportsUnicode()
+    const platformSpinner = isUnicodeSupported()
         ? SPINNERS.dots
         : SPINNERS.dashes;
     if (typeof spinner !== 'object') {
@@ -101,14 +103,9 @@ export function colorOptions({ color, succeedColor, failColor, spinnerColor, })
     return colors;
 }
 export function prefixOptions({ succeedPrefix, failPrefix, }) {
-    if (terminalSupportsUnicode()) {
-        succeedPrefix = succeedPrefix || '✓';
-        failPrefix = failPrefix || '✖';
-    }
-    else {
-        succeedPrefix = succeedPrefix || '√';
-        failPrefix = failPrefix || '×';
-    }
+    const symbols = getSymbols();
+    succeedPrefix = succeedPrefix || symbols.success;
+    failPrefix = failPrefix || symbols.error;
     return { succeedPrefix, failPrefix };
 }
 export function breakText(text, prefixLength) {
@@ -142,10 +139,3 @@ export function cleanStream(stream, rawLines) {
     readline.clearScreenDown(stream);
     readline.moveCursor(stream, 0, -rawLines.length);
 }
-export function terminalSupportsUnicode() {
-    // The default command prompt and powershell in Windows do not support Unicode characters.
-    // However, the VSCode integrated terminal and the Windows Terminal both do.
-    return (process.platform !== 'win32' ||
-        process.env.TERM_PROGRAM === 'vscode' ||
-        !!process.env.WT_SESSION);
-}