@pnpm/exec.commands 1100.3.4 → 1100.3.5

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @pnpm/plugin-commands-script-runners
 
+## 1100.3.5
+
+### Patch Changes
+
+- Fixed orphaned child processes on Windows when pnpm exits on an error while commands spawned by `pnpm exec` or `pnpm dlx` are still running (for example, when one project's command fails during `pnpm --recursive exec`). The PIDs of these commands are now recorded when they are spawned and their whole process trees are terminated with `taskkill` on an error exit. Previously the cleanup relied on enumerating the system process list, which is so slow on Windows that the enumeration hit its timeout and the cleanup was silently skipped [#12406](https://github.com/pnpm/pnpm/issues/12406).
+
+- Updated dependencies:
+  - @pnpm/bins.resolver@1100.0.9
+  - @pnpm/building.commands@1100.1.11
+  - @pnpm/cli.utils@1101.0.14
+  - @pnpm/config.reader@1101.12.0
+  - @pnpm/config.version-policy@1100.1.7
+  - @pnpm/core-loggers@1100.2.2
+  - @pnpm/deps.status@1100.1.7
+  - @pnpm/engine.runtime.commands@1100.1.11
+  - @pnpm/exec.lifecycle@1100.1.3
+  - @pnpm/installing.client@1100.2.14
+  - @pnpm/installing.commands@1100.10.5
+  - @pnpm/pkg-manifest.reader@1100.0.10
+  - @pnpm/types@1101.4.0
+  - @pnpm/workspace.injected-deps-syncer@1100.0.23
+  - @pnpm/workspace.project-manifest-reader@1100.0.15
+  - @pnpm/workspace.projects-sorter@1100.0.9
+
 ## 1100.3.4
 
 ### Patch Changes

package/lib/dlx.js

@@ -16,11 +16,11 @@ 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';
-import { safeExeca as execa } from 'execa';
 import { pick } from 'ramda';
 import { renderHelp } from 'render-help';
 import { symlinkDir } from 'symlink-dir';
 import { makeEnv } from './makeEnv.js';
+import { trackedExeca } from './trackedExeca.js';
 export const skipPackageManagerCheck = true;
 export const commandNames = ['dlx'];
 /**
@@ -217,12 +217,13 @@ export async function handler(opts, [command, ...args], commands) {
         ? command
         : await getBinName(cachedDir, opts);
     try {
-        await execa(binName, args, {
+        const child = trackedExeca(binName, args, {
             cwd: process.cwd(),
             env,
             stdio: 'inherit',
             shell: opts.shellMode ?? false,
         });
+        await child;
     }
     catch (err) {
         if (util.types.isNativeError(err) && 'exitCode' in err && err.exitCode != null) {

package/lib/exec.js

@@ -9,7 +9,6 @@ import { logger } from '@pnpm/logger';
 import { prependDirsToPath } from '@pnpm/shell.path';
 import { tryReadProjectManifest } from '@pnpm/workspace.project-manifest-reader';
 import { sortFilteredProjects } from '@pnpm/workspace.projects-sorter';
-import { safeExeca as execa } from 'execa';
 import pLimit from 'p-limit';
 import { pick } from 'ramda';
 import { renderHelp } from 'render-help';
@@ -20,6 +19,7 @@ import { existsInDir } from './existsInDir.js';
 import { makeEnv } from './makeEnv.js';
 import { PARALLEL_OPTION_HELP, REPORT_SUMMARY_OPTION_HELP, RESUME_FROM_OPTION_HELP, shorthands as runShorthands, } from './run.js';
 import { runDepsStatusCheck } from './runDepsStatusCheck.js';
+import { trackedExeca } from './trackedExeca.js';
 export const shorthands = {
     parallel: runShorthands.parallel,
     c: '--shell-mode',
@@ -195,7 +195,7 @@ export async function handler(opts, params) {
                 const [cmd, ...args] = params;
                 if (reporterShowPrefix) {
                     const manifest = await readProjectManifestOnly(prefix);
-                    const child = execa(cmd, args, {
+                    const child = trackedExeca(cmd, args, {
                         cwd: prefix,
                         env,
                         stdio: 'pipe',
@@ -230,12 +230,13 @@ export async function handler(opts, params) {
                     await child;
                 }
                 else {
-                    await execa(cmd, args, {
+                    const child = trackedExeca(cmd, args, {
                         cwd: prefix,
                         env,
                         stdio: 'inherit',
                         shell: opts.shellMode ?? false,
                     });
+                    await child;
                 }
                 result[prefix].status = 'passed';
                 result[prefix].duration = getExecutionDuration(startTime);

package/lib/trackedExeca.d.ts

@@ -0,0 +1,7 @@
+import { safeExeca } from 'execa';
+/**
+ * `safeExeca`, but the spawned subprocess is registered with the child-process
+ * tracker so its process tree can be terminated if pnpm exits on an error while
+ * the command is still running. See `trackChildProcess`.
+ */
+export declare const trackedExeca: typeof safeExeca;

package/lib/trackedExeca.js

@@ -0,0 +1,13 @@
+import { trackChildProcess } from '@pnpm/exec.lifecycle';
+import { safeExeca } from 'execa';
+/**
+ * `safeExeca`, but the spawned subprocess is registered with the child-process
+ * tracker so its process tree can be terminated if pnpm exits on an error while
+ * the command is still running. See `trackChildProcess`.
+ */
+export const trackedExeca = ((...args) => {
+    const child = safeExeca(...args);
+    trackChildProcess(child);
+    return child;
+});
+//# sourceMappingURL=trackedExeca.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/exec.commands",
-  "version": "1100.3.4",
+  "version": "1100.3.5",
   "description": "Commands for running scripts",
   "keywords": [
     "pnpm",
@@ -29,33 +29,33 @@
   ],
   "dependencies": {
     "@inquirer/prompts": "^8.4.3",
-    "@pnpm/bins.resolver": "1100.0.8",
-    "@pnpm/building.commands": "1100.1.10",
+    "@pnpm/bins.resolver": "1100.0.9",
+    "@pnpm/building.commands": "1100.1.11",
     "@pnpm/catalogs.resolver": "1100.0.0",
     "@pnpm/cli.command": "1100.0.1",
     "@pnpm/cli.common-cli-options-help": "1100.0.2",
-    "@pnpm/cli.utils": "1101.0.13",
-    "@pnpm/config.reader": "1101.11.2",
-    "@pnpm/config.version-policy": "1100.1.6",
-    "@pnpm/core-loggers": "1100.2.1",
+    "@pnpm/cli.utils": "1101.0.14",
+    "@pnpm/config.reader": "1101.12.0",
+    "@pnpm/config.version-policy": "1100.1.7",
+    "@pnpm/core-loggers": "1100.2.2",
     "@pnpm/crypto.hash": "1100.0.1",
-    "@pnpm/deps.status": "1100.1.6",
-    "@pnpm/engine.runtime.commands": "1100.1.10",
+    "@pnpm/deps.status": "1100.1.7",
+    "@pnpm/engine.runtime.commands": "1100.1.11",
     "@pnpm/error": "1100.0.1",
-    "@pnpm/exec.lifecycle": "1100.1.2",
+    "@pnpm/exec.lifecycle": "1100.1.3",
     "@pnpm/exec.pnpm-cli-runner": "1100.0.1",
-    "@pnpm/installing.client": "1100.2.13",
-    "@pnpm/installing.commands": "1100.10.4",
+    "@pnpm/installing.client": "1100.2.14",
+    "@pnpm/installing.commands": "1100.10.5",
     "@pnpm/log.group": "4.0.1",
-    "@pnpm/pkg-manifest.reader": "1100.0.9",
+    "@pnpm/pkg-manifest.reader": "1100.0.10",
     "@pnpm/resolving.parse-wanted-dependency": "1100.0.1",
     "@pnpm/shell.path": "1100.0.1",
     "@pnpm/store.path": "1100.0.2",
-    "@pnpm/types": "1101.3.2",
+    "@pnpm/types": "1101.4.0",
     "@pnpm/util.lex-comparator": "^4.0.1",
-    "@pnpm/workspace.injected-deps-syncer": "1100.0.22",
-    "@pnpm/workspace.project-manifest-reader": "1100.0.14",
-    "@pnpm/workspace.projects-sorter": "1100.0.8",
+    "@pnpm/workspace.injected-deps-syncer": "1100.0.23",
+    "@pnpm/workspace.project-manifest-reader": "1100.0.15",
+    "@pnpm/workspace.projects-sorter": "1100.0.9",
     "@zkochan/rimraf": "^4.0.0",
     "didyoumean2": "^7.0.4",
     "execa": "npm:safe-execa@0.3.0",
@@ -72,13 +72,13 @@
   },
   "devDependencies": {
     "@jest/globals": "30.4.1",
-    "@pnpm/engine.runtime.system-version": "1100.0.3",
-    "@pnpm/exec.commands": "1100.3.4",
+    "@pnpm/engine.runtime.system-version": "1100.0.4",
+    "@pnpm/exec.commands": "1100.3.5",
     "@pnpm/logger": "1100.0.0",
-    "@pnpm/prepare": "1100.0.18",
+    "@pnpm/prepare": "1100.0.19",
     "@pnpm/test-ipc-server": "1100.0.0",
-    "@pnpm/testing.command-defaults": "1100.0.8",
-    "@pnpm/workspace.projects-filter": "1100.0.26",
+    "@pnpm/testing.command-defaults": "1100.0.9",
+    "@pnpm/workspace.projects-filter": "1100.0.27",
     "@types/is-windows": "^1.0.2",
     "@types/ramda": "0.31.1",
     "@types/which": "^3.0.4",