@pnpm/exec.commands 1100.3.0 → 1100.3.2

package/lib/dlx.js

@@ -8,10 +8,11 @@ import { OUTPUT_OPTIONS } from '@pnpm/cli.common-cli-options-help';
 import { docsUrl, readProjectManifestOnly } from '@pnpm/cli.utils';
 import { types } from '@pnpm/config.reader';
 import { getPublishedByPolicy } from '@pnpm/config.version-policy';
-import { createHexHash } from '@pnpm/crypto.hash';
+import { createShortHash } from '@pnpm/crypto.hash';
 import { PnpmError } from '@pnpm/error';
 import { createResolver, makeResolutionStrict } from '@pnpm/installing.client';
 import { add } from '@pnpm/installing.commands';
+import { logger } from '@pnpm/logger';
 import { readPackageJsonFromDir } from '@pnpm/pkg-manifest.reader';
 import { parseWantedDependency } from '@pnpm/resolving.parse-wanted-dependency';
 import { lexCompare } from '@pnpm/util.lex-comparator';
@@ -186,8 +187,23 @@ export async function handler(opts, [command, ...args], commands) {
             }
             else {
                 // Drop the partially-populated cache so a subsequent dlx run starts
-                // clean instead of reusing a broken install.
-                await fs.promises.rm(cachedDir, { recursive: true, force: true });
+                // clean instead of reusing a broken install. This is best-effort: on
+                // Windows the just-run install scripts (or antivirus) can briefly hold
+                // handles on freshly written files, so retry with backoff. A cleanup
+                // failure must never mask the original install error, which is the one
+                // worth surfacing — log it and rethrow err. A leftover prepare dir is
+                // harmless: it has a unique name and findCache only trusts the `pkg`
+                // symlink.
+                try {
+                    await fs.promises.rm(cachedDir, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+                }
+                catch (cleanupErr) {
+                    logger.warn({
+                        error: cleanupErr,
+                        message: `Failed to clean up the dlx cache directory at "${cachedDir}"`,
+                        prefix: cachedDir,
+                    });
+                }
                 throw err;
             }
         }
@@ -353,7 +369,12 @@ export function createCacheKey(opts) {
         }
     }
     const hashStr = JSON.stringify(args);
-    return createHexHash(hashStr);
+    // A short (truncated) hash keeps the dlx cache path short. The full
+    // virtual-store path below it (`<key>/<prepare>/node_modules/.pnpm/<pkgId>/
+    // node_modules/<pkg>`) can otherwise blow past Windows' MAX_PATH (260) and
+    // make lifecycle scripts fail with a `spawn cmd.exe ENOENT` (the cwd no
+    // longer resolves). 128 bits is ample collision resistance for a cache key.
+    return createShortHash(hashStr);
 }
 function getValidCacheDir(cacheLink, dlxCacheMaxAge) {
     let stats;
@@ -379,7 +400,10 @@ function getValidCacheDir(cacheLink, dlxCacheMaxAge) {
     return isValid ? target : undefined;
 }
 function getPrepareDir(cachePath) {
-    const name = `${new Date().getTime().toString(16)}-${process.pid.toString(16)}`;
+    // base36 (vs hex) keeps this segment short — see createCacheKey for why dlx
+    // path length matters on Windows. time+pid stays unique across concurrent
+    // dlx processes and across a process's own retries of a failed install.
+    const name = `${Date.now().toString(36)}-${process.pid.toString(36)}`;
     return path.join(cachePath, name);
 }
 function resolveCatalogProtocol(catalogResolver, alias, bareSpecifier) {

package/lib/exec.d.ts

@@ -28,7 +28,7 @@ export type ExecOpts = Required<Pick<ConfigContext, 'selectedProjectsGraph'>> &
     resumeFrom?: string;
     reportSummary?: boolean;
     implicitlyFellbackFromRun?: boolean;
-} & Pick<Config, 'bin' | 'dir' | 'extraBinPaths' | 'extraEnv' | 'lockfileDir' | 'modulesDir' | 'nodeOptions' | 'nodeExperimentalPackageMap' | 'pnpmHomeDir' | 'recursive' | 'reporter' | 'reporterHidePrefix' | 'userAgent' | 'verifyDepsBeforeRun' | 'workspaceDir'> & Pick<ConfigContext, 'cliOptions'> & CheckDepsStatusOptions;
+} & Pick<Config, 'bin' | 'dir' | 'extraBinPaths' | 'extraEnv' | 'lockfileDir' | 'modulesDir' | 'nodeOptions' | 'nodeExperimentalPackageMap' | 'pnpmHomeDir' | 'recursive' | 'reporter' | 'reporterHidePrefix' | 'userAgent' | 'verifyDepsBeforeRun' | 'workspaceDir'> & Pick<ConfigContext, 'cliOptions' | 'allProjectsGraph' | 'prodAllProjectsGraph' | 'prodOnlySelectedProjectDirs'> & CheckDepsStatusOptions;
 export declare function handler(opts: ExecOpts, params: string[]): Promise<{
     exitCode: number;
 }>;

package/lib/exec.js

@@ -8,7 +8,7 @@ import { makeNodePackageMapOption, makeNodeRequireOption } from '@pnpm/exec.life
 import { logger } from '@pnpm/logger';
 import { prependDirsToPath } from '@pnpm/shell.path';
 import { tryReadProjectManifest } from '@pnpm/workspace.project-manifest-reader';
-import { sortProjects } from '@pnpm/workspace.projects-sorter';
+import { sortFilteredProjects } from '@pnpm/workspace.projects-sorter';
 import { safeExeca as execa } from 'execa';
 import pLimit from 'p-limit';
 import { pick } from 'ramda';
@@ -123,7 +123,7 @@ export async function handler(opts, params) {
     let chunks;
     if (opts.recursive) {
         chunks = opts.sort
-            ? sortProjects(opts.selectedProjectsGraph)
+            ? sortFilteredProjects(opts)
             : [Object.keys(opts.selectedProjectsGraph).sort()];
         if (opts.reverse) {
             chunks = chunks.reverse();

package/lib/runRecursive.d.ts

@@ -1,6 +1,6 @@
 import { type Config, type ConfigContext } from '@pnpm/config.reader';
 import type { PackageScripts } from '@pnpm/types';
-export type RecursiveRunOpts = Pick<Config, 'bin' | 'enablePrePostScripts' | 'unsafePerm' | 'pnpmHomeDir' | 'requiredScripts' | 'userAgent' | 'scriptsPrependNodePath' | 'scriptShell' | 'shellEmulator' | 'stream' | 'syncInjectedDepsAfterScripts' | 'workspaceDir' | 'nodeExperimentalPackageMap' | 'modulesDir'> & Pick<ConfigContext, 'rootProjectManifest'> & Required<Pick<ConfigContext, 'allProjects' | 'selectedProjectsGraph'> & Pick<Config, 'workspaceDir' | 'dir'>> & Partial<Pick<Config, 'extraBinPaths' | 'extraEnv' | 'bail' | 'reporter' | 'reverse' | 'sort' | 'workspaceConcurrency'>> & {
+export type RecursiveRunOpts = Pick<Config, 'bin' | 'enablePrePostScripts' | 'unsafePerm' | 'pnpmHomeDir' | 'requiredScripts' | 'userAgent' | 'scriptsPrependNodePath' | 'scriptShell' | 'shellEmulator' | 'stream' | 'syncInjectedDepsAfterScripts' | 'workspaceDir' | 'nodeExperimentalPackageMap' | 'modulesDir'> & Pick<ConfigContext, 'rootProjectManifest' | 'allProjectsGraph' | 'prodAllProjectsGraph' | 'prodOnlySelectedProjectDirs'> & Required<Pick<ConfigContext, 'allProjects' | 'selectedProjectsGraph'> & Pick<Config, 'workspaceDir' | 'dir'>> & Partial<Pick<Config, 'extraBinPaths' | 'extraEnv' | 'bail' | 'reporter' | 'reverse' | 'sort' | 'workspaceConcurrency'>> & {
     ifPresent?: boolean;
     resumeFrom?: string;
     reportSummary?: boolean;

package/lib/runRecursive.js

@@ -6,7 +6,7 @@ import { getWorkspaceConcurrency } from '@pnpm/config.reader';
 import { PnpmError } from '@pnpm/error';
 import { makeNodePackageMapOption, makeNodeRequireOption, } from '@pnpm/exec.lifecycle';
 import { groupStart } from '@pnpm/log.group';
-import { sortProjects } from '@pnpm/workspace.projects-sorter';
+import { sortFilteredProjects } from '@pnpm/workspace.projects-sorter';
 import pLimit from 'p-limit';
 import { realpathMissing } from 'realpath-missing';
 import { createEmptyRecursiveSummary, getExecutionDuration, getResumedPackageChunks, writeRecursiveSummary } from './exec.js';
@@ -21,7 +21,7 @@ export async function runRecursive(params, opts) {
     }
     let hasCommand = 0;
     const sortedPackageChunks = opts.sort
-        ? sortProjects(opts.selectedProjectsGraph)
+        ? sortFilteredProjects(opts)
         : [Object.keys(opts.selectedProjectsGraph).sort()];
     let packageChunks = opts.reverse ? sortedPackageChunks.reverse() : sortedPackageChunks;
     if (opts.resumeFrom) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/exec.commands",
-  "version": "1100.3.0",
+  "version": "1100.3.2",
   "description": "Commands for running scripts",
   "keywords": [
     "pnpm",
@@ -11,9 +11,9 @@
   "funding": "https://opencollective.com/pnpm",
   "repository": {
     "type": "git",
-    "url": "https://github.com/pnpm/pnpm/tree/main/exec/commands"
+    "url": "https://github.com/pnpm/pnpm/tree/main/pnpm11/exec/commands"
   },
-  "homepage": "https://github.com/pnpm/pnpm/tree/main/exec/commands#readme",
+  "homepage": "https://github.com/pnpm/pnpm/tree/main/pnpm11/exec/commands#readme",
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
   },
@@ -41,31 +41,31 @@
     "symlink-dir": "^10.0.1",
     "which": "npm:@pnpm/which@^3.0.1",
     "write-json-file": "^7.0.0",
-    "@pnpm/building.commands": "1100.1.6",
-    "@pnpm/catalogs.resolver": "1100.0.0",
     "@pnpm/bins.resolver": "1100.0.8",
+    "@pnpm/building.commands": "1100.1.8",
+    "@pnpm/catalogs.resolver": "1100.0.0",
     "@pnpm/cli.command": "1100.0.1",
     "@pnpm/cli.common-cli-options-help": "1100.0.2",
-    "@pnpm/config.version-policy": "1100.1.5",
-    "@pnpm/cli.utils": "1101.0.12",
-    "@pnpm/config.reader": "1101.10.0",
+    "@pnpm/cli.utils": "1101.0.13",
+    "@pnpm/config.reader": "1101.11.0",
+    "@pnpm/config.version-policy": "1100.1.6",
     "@pnpm/core-loggers": "1100.2.1",
-    "@pnpm/error": "1100.0.0",
     "@pnpm/crypto.hash": "1100.0.1",
+    "@pnpm/deps.status": "1100.1.4",
+    "@pnpm/engine.runtime.commands": "1100.1.8",
+    "@pnpm/error": "1100.0.1",
+    "@pnpm/exec.lifecycle": "1100.1.2",
     "@pnpm/exec.pnpm-cli-runner": "1100.0.1",
-    "@pnpm/installing.client": "1100.2.9",
-    "@pnpm/exec.lifecycle": "1100.1.0",
-    "@pnpm/installing.commands": "1100.10.0",
-    "@pnpm/pkg-manifest.reader": "1100.0.8",
-    "@pnpm/shell.path": "1100.0.1",
+    "@pnpm/installing.client": "1100.2.11",
+    "@pnpm/installing.commands": "1100.10.2",
+    "@pnpm/pkg-manifest.reader": "1100.0.9",
     "@pnpm/resolving.parse-wanted-dependency": "1100.0.1",
-    "@pnpm/workspace.injected-deps-syncer": "1100.0.20",
+    "@pnpm/shell.path": "1100.0.1",
+    "@pnpm/store.path": "1100.0.2",
     "@pnpm/types": "1101.3.2",
-    "@pnpm/store.path": "1100.0.1",
-    "@pnpm/deps.status": "1100.1.2",
-    "@pnpm/workspace.project-manifest-reader": "1100.0.13",
-    "@pnpm/workspace.projects-sorter": "1100.0.7",
-    "@pnpm/engine.runtime.commands": "1100.1.6"
+    "@pnpm/workspace.injected-deps-syncer": "1100.0.22",
+    "@pnpm/workspace.project-manifest-reader": "1100.0.14",
+    "@pnpm/workspace.projects-sorter": "1100.0.8"
   },
   "peerDependencies": {
     "@pnpm/logger": "^1100.0.0"
@@ -77,13 +77,13 @@
     "@types/which": "^3.0.4",
     "is-windows": "^1.0.2",
     "write-yaml-file": "^6.0.0",
-    "@pnpm/exec.commands": "1100.3.0",
-    "@pnpm/logger": "1100.0.0",
-    "@pnpm/prepare": "1100.0.16",
     "@pnpm/engine.runtime.system-version": "1100.0.3",
-    "@pnpm/workspace.projects-filter": "1100.0.22",
+    "@pnpm/exec.commands": "1100.3.2",
+    "@pnpm/logger": "1100.0.0",
+    "@pnpm/prepare": "1100.0.18",
     "@pnpm/test-ipc-server": "1100.0.0",
-    "@pnpm/testing.command-defaults": "1100.0.6"
+    "@pnpm/testing.command-defaults": "1100.0.8",
+    "@pnpm/workspace.projects-filter": "1100.0.24"
   },
   "engines": {
     "node": ">=22.13"