@hubspot/cli 8.1.3-experimental.0 → 8.1.4-experimental.0

package/lib/projects/workspaces.d.ts

@@ -1,15 +1,11 @@
 import archiver from 'archiver';
-import { WorkspaceMapping, FileDependencyMapping, FileDependencyKind, LocalDependencyProtocol } from '@hubspot/project-parsing-lib/workspaces';
-export type FileDepArchiveEntry = {
-    archivePath: string;
-    protocol: LocalDependencyProtocol;
-};
+import { WorkspaceMapping, FileDependencyMapping } from '@hubspot/project-parsing-lib/workspaces';
 /**
  * Result of archiving workspaces and file dependencies
  */
 export type WorkspaceArchiveResult = {
     packageWorkspaces: Map<string, string[]>;
-    packageFileDeps: Map<string, Map<string, FileDepArchiveEntry>>;
+    packageFileDeps: Map<string, Map<string, string>>;
 };
 /**
  * Generates a short hash of the input string for use in workspace paths.
@@ -28,14 +24,10 @@ export declare function shortHash(input: string): string;
 export declare function toPosixPath(p: string): string;
 /**
  * Determines the archive path for an external workspace or file: dependency.
- *
- * For directories, produces `_workspaces/<basename>-<hash>`.
- * For tarballs, produces `_workspaces/<basename-no-ext>-<hash>/<original-basename>`,
- * so the rewritten package.json reference still ends in the original filename.
- *
- * The hash prevents collisions between different paths with the same basename.
+ * Produces `_workspaces/<basename>-<hash>` with no subdirectory.
+ * The hash prevents collisions between different directories with the same basename.
  */
-export declare function computeExternalArchivePath(absolutePath: string, kind?: FileDependencyKind): string;
+export declare function computeExternalArchivePath(absolutePath: string): string;
 /**
  * Updates package.json files in the archive to reflect new workspace and file: dependency paths.
  *
@@ -46,7 +38,7 @@ export declare function computeExternalArchivePath(absolutePath: string, kind?:
  * Only external file: dependencies appear in packageFileDeps; internal ones
  * keep their original file: references and are left untouched.
  */
-export declare function updatePackageJsonInArchive(archive: archiver.Archiver, srcDir: string, packageWorkspaces: Map<string, string[]>, packageFileDeps: Map<string, Map<string, FileDepArchiveEntry>>): Promise<void>;
+export declare function updatePackageJsonInArchive(archive: archiver.Archiver, srcDir: string, packageWorkspaces: Map<string, string[]>, packageFileDeps: Map<string, Map<string, string>>): Promise<void>;
 export declare function rewriteLockfileForExternalDeps(lockfileContent: Record<string, unknown>, pathMappings: Array<{
     oldPath: string;
     newPath: string;

package/lib/projects/workspaces.js

@@ -27,35 +27,14 @@ export function toPosixPath(p) {
     }
     return p.replaceAll(path.sep, path.posix.sep);
 }
-/**
- * Strips the longest matching tarball extension (.tar.gz, .tgz, .tar)
- * from a file basename. Returns the input unchanged if no extension matches.
- */
-function stripTarballExtension(basename) {
-    const lower = basename.toLowerCase();
-    for (const ext of ['.tar.gz', '.tgz', '.tar']) {
-        if (lower.endsWith(ext)) {
-            return basename.slice(0, basename.length - ext.length);
-        }
-    }
-    return basename;
-}
 /**
  * Determines the archive path for an external workspace or file: dependency.
- *
- * For directories, produces `_workspaces/<basename>-<hash>`.
- * For tarballs, produces `_workspaces/<basename-no-ext>-<hash>/<original-basename>`,
- * so the rewritten package.json reference still ends in the original filename.
- *
- * The hash prevents collisions between different paths with the same basename.
+ * Produces `_workspaces/<basename>-<hash>` with no subdirectory.
+ * The hash prevents collisions between different directories with the same basename.
  */
-export function computeExternalArchivePath(absolutePath, kind = 'directory') {
+export function computeExternalArchivePath(absolutePath) {
     const resolved = path.resolve(absolutePath);
     const name = path.basename(resolved);
-    if (kind === 'tarball') {
-        const nameNoExt = stripTarballExtension(name);
-        return path.posix.join('_workspaces', `${nameNoExt}-${shortHash(resolved)}`, name);
-    }
     return path.posix.join('_workspaces', `${name}-${shortHash(resolved)}`);
 }
 /**
@@ -142,25 +121,25 @@ async function archiveWorkspaceDirectories(archive, srcDir, workspaceMappings) {
     return { externalArchivePaths, packageWorkspaceEntries };
 }
 /**
- * Archives file: and link: dependencies and returns mapping information.
+ * Archives file: dependencies and returns mapping information.
  *
- * Internal dependencies (inside srcDir) are skipped — their original
- * references in package.json remain valid after upload.
+ * Internal file: dependencies (inside srcDir) are skipped — their original
+ * `file:` references in package.json remain valid after upload.
  *
- * External directory dependencies are archived to `_workspaces/<name>-<hash>`.
- * External tarball dependencies are archived to
- * `_workspaces/<name-no-ext>-<hash>/<original-basename>` so the rewritten
- * reference still ends in the original filename.
+ * 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, kind, protocol } = mapping;
+        const { packageName, localPath, sourcePackageJsonPath } = mapping;
         if (isInsideSrcDir(localPath, srcDir)) {
+            // Internal: original file: reference stays unchanged, nothing to do
             continue;
         }
-        const archivePath = computeExternalArchivePath(localPath, kind);
+        // External: archive to _workspaces/<name>-<hash>
+        const archivePath = computeExternalArchivePath(localPath);
         const resolvedPath = path.resolve(localPath);
         if (!packageFileDeps.has(sourcePackageJsonPath)) {
             packageFileDeps.set(sourcePackageJsonPath, new Map());
@@ -169,27 +148,23 @@ async function archiveFileDependencies(archive, srcDir, fileDependencyMappings,
         const relativeArchivePath = toPosixPath(path.relative(relPkgJsonDir, archivePath));
         packageFileDeps
             .get(sourcePackageJsonPath)
-            .set(packageName, { archivePath: relativeArchivePath, protocol });
+            .set(packageName, relativeArchivePath);
+        // Only archive each unique path once
         if (!externalArchivePaths.has(resolvedPath)) {
             externalArchivePaths.set(resolvedPath, archivePath);
-            toArchive.push({ localPath, archivePath, packageName, kind });
+            toArchive.push({ localPath, archivePath, packageName });
         }
     }
-    const directoryItems = toArchive.filter(item => item.kind === 'directory');
-    const tarballItems = toArchive.filter(item => item.kind === 'tarball');
-    // getPackableFiles only applies to directory deps; tarballs are a single file.
-    const directoriesWithPackableFiles = await Promise.all(directoryItems.map(async (item) => ({
+    // Fetch packable files in parallel (I/O optimization)
+    const withPackableFiles = await Promise.all(toArchive.map(async (item) => ({
         ...item,
         packableFiles: await getPackableFiles(item.localPath),
     })));
-    for (const { localPath, archivePath, packageName, packableFiles, } of directoriesWithPackableFiles) {
+    // 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));
     }
-    for (const { localPath, archivePath, packageName } of tarballItems) {
-        uiLogger.log(lib.projectUpload.handleProjectUpload.fileDependencyIncluded(packageName, localPath, archivePath));
-        archive.file(localPath, { name: archivePath });
-    }
     return packageFileDeps;
 }
 /**
@@ -238,18 +213,14 @@ export async function updatePackageJsonInArchive(archive, srcDir, packageWorkspa
             uiLogger.debug(lib.projectUpload.handleProjectUpload.updatingPackageJsonWorkspaces(relativePackageJsonPath));
             uiLogger.debug(lib.projectUpload.handleProjectUpload.updatedWorkspaces(workspaceEntries.join(', ')));
         }
-        // Update external file: and link: dependencies; internal ones are left untouched.
-        // The protocol prefix (file: vs link:) is preserved from the original spec.
+        // 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, protocol },] of fileDeps.entries()) {
-                const current = packageJson.dependencies[packageName];
-                if (typeof current === 'string' &&
-                    (current.startsWith('file:') || current.startsWith('link:'))) {
-                    const newValue = `${protocol}:${archivePath}`;
-                    packageJson.dependencies[packageName] = newValue;
+            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, newValue));
+                    uiLogger.debug(lib.projectUpload.handleProjectUpload.updatedFileDependency(packageName, archivePath));
                 }
             }
         }
@@ -277,24 +248,11 @@ export function rewriteLockfileForExternalDeps(lockfileContent, pathMappings) {
             typeof value === 'object' &&
             value !== null) {
             const entry = value;
-            if (typeof entry.resolved !== 'string')
-                continue;
-            // Symlink entries (directory deps with link:true) store resolved as a
-            // bare relative path. Tarball entries store resolved as a "file:" URL.
-            const resolved = entry.resolved;
-            const filePrefix = 'file:';
-            const isFileUrl = resolved.startsWith(filePrefix);
-            const resolvedPath = isFileUrl
-                ? resolved.slice(filePrefix.length)
-                : resolved;
-            const mapping = pathMappings.find(m => m.oldPath === resolvedPath);
-            if (mapping) {
-                newPackages[key] = {
-                    ...entry,
-                    resolved: isFileUrl
-                        ? `${filePrefix}${mapping.newPath}`
-                        : mapping.newPath,
-                };
+            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 };
+                }
             }
         }
     }

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.1.3-experimental.0",
+    "version": "8.1.4-experimental.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
@@ -11,7 +11,7 @@
     ],
     "dependencies": {
         "@hubspot/local-dev-lib": "5.7.1",
-        "@hubspot/project-parsing-lib": "0.2.2-experimental.0",
+        "@hubspot/project-parsing-lib": "0.16.0",
         "@hubspot/serverless-dev-runtime": "7.0.7",
         "@hubspot/ui-extensions-dev-server": "2.0.7",
         "@inquirer/prompts": "7.1.0",