[rush] Changes prior to #5496 (#5532)

* Remove deprecated shell: true usage.

* Stop quoting args.

* TEMPORARY - run retest fromt he locally-built copy of Rush.

* Fix an issue where where the Windows CMD shell's arguments aren't passed as individual arguments.

* Don't escape individual args in RushX, as they're passed to cmd/sh.

* fixup! Remove deprecated shell: true usage.

* Remove an unused function.

* Use destructuring in a few places.

* Fix an issue with detecting if a package isn't published.

* Wrap some command invocations in a shell.

* Fix an issue with detection of non-published packages.

* fixup! Wrap some command invocations in a shell.

* fixup! Fix an issue with detection of non-published packages.

* Fix issues with install-run on Windows.

* TEMPORARY - ensure install-run works as expected.

* Fix an issue with commands and arguments containing spaces.

* fixup! Fix an issue with commands and arguments containing spaces.

* fixup! TEMPORARY - ensure install-run works as expected.

* fixup! TEMPORARY - ensure install-run works as expected.

* TEMPORARY - install-run debugging.

* fixup! TEMPORARY - install-run debugging.

* Fix issues with git calls in stageAndCommitGitChangesAsync

Co-authored-by: David Michon <dmichon@microsoft.com>

* Deduplicate instances of the Windows platform check.

* Include unit tests for convertCommandAndArgsToShell.

* Remove a redundant condition.

* Clean up an error message.

* Fix an issue with double-quoting in install-run.

* TEMPORARY - only build to rush-lib.

* fixup! Fix an issue with double-quoting in install-run.

* Don't run as a shell command on Windows.

* fixup! TEMPORARY - only build to rush-lib.

* Revert "Don't run as a shell command on Windows."

This reverts commit 1fa9d41.

* Pass 'process.env' to the 'npm view' command.

* Handle null status code too.

* fixup! Fix an issue with double-quoting in install-run.

* Set windowsVerbatimArguments to true in places where spawn is called with a shell wrapper.

* Fix an issue with quoting of arguments.

* fixup! Set windowsVerbatimArguments to true in places where spawn is called with a shell wrapper.

* fixup! Fix an issue with quoting of arguments.

* Revert "fixup! TEMPORARY - install-run debugging."

This reverts commit 10ff217.

* Revert "TEMPORARY - install-run debugging."

This reverts commit 2640932.

* Pull back shell: true changes.

* Rush change.

* fixup! Pull back shell: true changes.

* Put the CI config back.

* Include signals in install-run npm command logging.

* Minor cleanup.

* Remove an unused function.

* Move convertCommandAndArgsToShell into Utilities.

---------

Co-authored-by: David Michon <dmichon@microsoft.com>

Author: iclanton

apps/heft/src/utilities/GitUtilities.ts

@@ -9,7 +9,7 @@ import { default as ignore, type Ignore as IIgnoreMatcher } from 'ignore';
 
 import { Executable, FileSystem, InternalError, Path, Text } from '@rushstack/node-core-library';
 
-// Matches lines starting with "#" and whitepace lines
+// Matches lines starting with "#" and whitespace lines
 const GITIGNORE_IGNORABLE_LINE_REGEX: RegExp = /^(?:(?:#.*)|(?:\s+))$/;
 const UNINITIALIZED: 'UNINITIALIZED' = 'UNINITIALIZED';
 

common/changes/@microsoft/rush/pre-remove-rush-shell_2026-01-02-23-31.json

@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "",
+      "type": "none",
+      "packageName": "@microsoft/rush"
+    }
+  ],
+  "packageName": "@microsoft/rush",
+  "email": "iclanton@users.noreply.github.com"
+}

common/changes/@rushstack/heft/remove-rush-shell_2025-12-28-21-20.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@rushstack/heft",
+      "comment": "",
+      "type": "none"
+    }
+  ],
+  "packageName": "@rushstack/heft"
+}

libraries/rush-lib/src/api/EnvironmentConfiguration.ts

@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
-import * as os from 'node:os';
 import * as path from 'node:path';
 
 import { trueCasePathSync } from 'true-case-path';
 
 import type { IEnvironment } from '../utilities/Utilities';
+import { IS_WINDOWS } from '../utilities/executionUtilities';
 
 /**
  * @beta
@@ -482,8 +482,7 @@ export class EnvironmentConfiguration {
       if (process.env.hasOwnProperty(envVarName) && envVarName.match(/^RUSH_/i)) {
         const value: string | undefined = process.env[envVarName];
         // Environment variables are only case-insensitive on Windows
-        const normalizedEnvVarName: string =
-          os.platform() === 'win32' ? envVarName.toUpperCase() : envVarName;
+        const normalizedEnvVarName: string = IS_WINDOWS ? envVarName.toUpperCase() : envVarName;
         switch (normalizedEnvVarName) {
           case EnvironmentVariableNames.RUSH_TEMP_FOLDER: {
             EnvironmentConfiguration._rushTempFolderOverride =

libraries/rush-lib/src/cli/RushXCommandLine.ts

@@ -28,6 +28,7 @@ import { EnvironmentVariableNames } from '../api/EnvironmentConfiguration';
 import { RushConstants } from '../logic/RushConstants';
 import { PnpmSyncUtilities } from '../utilities/PnpmSyncUtilities';
 import { initializeDotEnv } from '../logic/dotenv';
+import { escapeArgumentIfNeeded } from '../utilities/executionUtilities';
 
 interface IRushXCommandLineArguments {
   /**
@@ -143,7 +144,9 @@ export class RushXCommandLine {
     rushConfiguration: RushConfiguration | undefined,
     options: ILaunchOptions
   ): Promise<void> {
-    if (!rushxArguments.quiet) {
+    const { quiet, help, commandName, commandArgs } = rushxArguments;
+
+    if (!quiet) {
       RushStartupBanner.logStreamlinedBanner(Rush.version, options.isManaged);
     }
     // Are we in a Rush repo?
@@ -182,15 +185,15 @@ export class RushXCommandLine {
 
     const projectCommandSet: ProjectCommandSet = new ProjectCommandSet(packageJson);
 
-    if (rushxArguments.help) {
+    if (help) {
       RushXCommandLine._showUsage(packageJson, projectCommandSet);
       return;
     }
 
-    const scriptBody: string | undefined = projectCommandSet.tryGetScriptBody(rushxArguments.commandName);
+    const scriptBody: string | undefined = projectCommandSet.tryGetScriptBody(commandName);
 
     if (scriptBody === undefined) {
-      let errorMessage: string = `The command "${rushxArguments.commandName}" is not defined in the package.json file for this project.`;
+      let errorMessage: string = `The command "${commandName}" is not defined in the package.json file for this project.`;
 
       if (projectCommandSet.commandNames.length > 0) {
         errorMessage +=
@@ -203,20 +206,15 @@ export class RushXCommandLine {
 
     let commandWithArgs: string = scriptBody;
     let commandWithArgsForDisplay: string = scriptBody;
-    if (rushxArguments.commandArgs.length > 0) {
-      // This approach is based on what NPM 7 now does:
-      // https://github.com/npm/run-script/blob/47a4d539fb07220e7215cc0e482683b76407ef9b/lib/run-script-pkg.js#L34
-      const escapedRemainingArgs: string[] = rushxArguments.commandArgs.map((x) =>
-        Utilities.escapeShellParameter(x)
-      );
-
+    if (commandArgs.length > 0) {
+      const escapedRemainingArgs: string[] = commandArgs.map((x) => escapeArgumentIfNeeded(x));
       commandWithArgs += ' ' + escapedRemainingArgs.join(' ');
 
       // Display it nicely without the extra quotes
-      commandWithArgsForDisplay += ' ' + rushxArguments.commandArgs.join(' ');
+      commandWithArgsForDisplay += ' ' + commandArgs.join(' ');
     }
 
-    if (!rushxArguments.quiet) {
+    if (!quiet) {
       // eslint-disable-next-line no-console
       console.log(`> ${JSON.stringify(commandWithArgsForDisplay)}\n`);
     }
@@ -258,10 +256,7 @@ export class RushXCommandLine {
     }
 
     if (exitCode > 0) {
-      throw new ProcessError(
-        `Failed calling ${commandWithArgsForDisplay}.  Exit code: ${exitCode}`,
-        exitCode
-      );
+      throw new ProcessError(`Failed calling ${commandWithArgs}.  Exit code: ${exitCode}`, exitCode);
     }
   }
 

libraries/rush-lib/src/cli/actions/ChangeAction.ts

@@ -30,7 +30,6 @@ import {
 import { ProjectChangeAnalyzer } from '../../logic/ProjectChangeAnalyzer';
 import { Git } from '../../logic/Git';
 import { RushConstants } from '../../logic/RushConstants';
-import { Utilities } from '../../utilities/Utilities';
 
 const BULK_LONG_NAME: string = '--bulk';
 const BULK_MESSAGE_LONG_NAME: string = '--message';
@@ -310,11 +309,12 @@ export class ChangeAction extends BaseRushAction {
     }
     if (this._commitChangesFlagParameter.value || this._commitChangesMessageStringParameter.value) {
       if (changefiles && changefiles.length !== 0) {
-        await this._stageAndCommitGitChangesAsync(
+        await this._git.stageAndCommitGitChangesAsync(
           changefiles,
           this._commitChangesMessageStringParameter.value ||
             this.rushConfiguration.gitChangefilesCommitMessage ||
-            'Rush change'
+            'Rush change',
+          this.terminal
         );
       } else {
         this.terminal.writeWarningLine('Warning: No change files generated, nothing to commit.');
@@ -748,21 +748,4 @@ export class ChangeAction extends BaseRushAction {
     // eslint-disable-next-line no-console
     console.log('No changes were detected to relevant packages on this branch. Nothing to do.');
   }
-
-  private async _stageAndCommitGitChangesAsync(pattern: string[], message: string): Promise<void> {
-    try {
-      await Utilities.executeCommandAsync({
-        command: 'git',
-        args: ['add', ...pattern],
-        workingDirectory: this.rushConfiguration.changesFolder
-      });
-      await Utilities.executeCommandAsync({
-        command: 'git',
-        args: ['commit', ...pattern, '-m', message],
-        workingDirectory: this.rushConfiguration.changesFolder
-      });
-    } catch (error) {
-      this.terminal.writeErrorLine(`ERROR: Cannot stage and commit git changes ${(error as Error).message}`);
-    }
-  }
 }

libraries/rush-lib/src/cli/actions/PublishAction.ts

@@ -29,6 +29,7 @@ import { DEFAULT_PACKAGE_UPDATE_MESSAGE } from './VersionAction';
 import { Utilities } from '../../utilities/Utilities';
 import { Git } from '../../logic/Git';
 import { RushConstants } from '../../logic/RushConstants';
+import { IS_WINDOWS } from '../../utilities/executionUtilities';
 
 export class PublishAction extends BaseRushAction {
   private readonly _addCommitDetails: CommandLineFlagParameter;
@@ -473,14 +474,14 @@ export class PublishAction extends BaseRushAction {
       // If the auth token was specified via the command line, avoid printing it on the console
       const secretSubstring: string | undefined = this._npmAuthToken.value;
 
-      await PublishUtilities.execCommandAsync(
-        !!this._publish.value,
-        packageManagerToolFilename,
+      await PublishUtilities.execCommandAsync({
+        shouldExecute: this._publish.value,
+        command: packageManagerToolFilename,
         args,
-        packagePath,
-        env,
+        workingDirectory: packagePath,
+        environment: env,
         secretSubstring
-      );
+      });
     }
   }
 
@@ -522,13 +523,13 @@ export class PublishAction extends BaseRushAction {
     const args: string[] = ['pack'];
     const env: { [key: string]: string | undefined } = PublishUtilities.getEnvArgs();
 
-    await PublishUtilities.execCommandAsync(
-      !!this._publish.value,
-      this.rushConfiguration.packageManagerToolFilename,
+    await PublishUtilities.execCommandAsync({
+      shouldExecute: this._publish.value,
+      command: this.rushConfiguration.packageManagerToolFilename,
       args,
-      project.publishFolder,
-      env
-    );
+      workingDirectory: project.publishFolder,
+      environment: env
+    });
 
     if (this._publish.value) {
       // Copy the tarball the release folder
@@ -597,7 +598,7 @@ export class PublishAction extends BaseRushAction {
   }
 
   private _addSharedNpmConfig(env: { [key: string]: string | undefined }, args: string[]): void {
-    const userHomeEnvVariable: string = process.platform === 'win32' ? 'USERPROFILE' : 'HOME';
+    const userHomeEnvVariable: string = IS_WINDOWS ? 'USERPROFILE' : 'HOME';
     let registry: string = '//registry.npmjs.org/';
 
     // Check if .npmrc file exists in "common\temp\publish-home"

libraries/rush-lib/src/cli/parsing/ParseParallelism.ts

@@ -3,6 +3,8 @@
 
 import * as os from 'node:os';
 
+import { IS_WINDOWS } from '../../utilities/executionUtilities';
+
 /**
  * Parses a command line specification for desired parallelism.
  * Factored out to enable unit tests
@@ -39,7 +41,7 @@ export function parseParallelism(
   } else {
     // If an explicit parallelism number wasn't provided, then choose a sensible
     // default.
-    if (os.platform() === 'win32') {
+    if (IS_WINDOWS) {
       // On desktop Windows, some people have complained that their system becomes
       // sluggish if Rush is using all the CPU cores.  Leave one thread for
       // other operations. For CI environments, you can use the "max" argument to use all available cores.

libraries/rush-lib/src/cli/test/Cli.test.ts

@@ -28,11 +28,11 @@ describe('CLI', () => {
     const startPath: string = path.resolve(__dirname, '../../../lib-commonjs/startx.js');
 
     // Run "rushx show-args 1 2 -x" in the "repo/rushx-project" folder
-    const output: string = await Utilities.executeCommandAndCaptureOutputAsync(
-      'node',
-      [startPath, 'show-args', '1', '2', '-x'],
-      `${__dirname}/repo/rushx-project`
-    );
+    const output: string = await Utilities.executeCommandAndCaptureOutputAsync({
+      command: 'node',
+      args: [startPath, 'show-args', '1', '2', '-x'],
+      workingDirectory: `${__dirname}/repo/rushx-project`
+    });
     const lastLine: string =
       output
         .split(/\s*\n\s*/)
@@ -45,11 +45,11 @@ describe('CLI', () => {
     // Invoke "rushx"
     const startPath: string = path.resolve(__dirname, '../../../lib-commonjs/startx.js');
 
-    const output: string = await Utilities.executeCommandAndCaptureOutputAsync(
-      'node',
-      [startPath, 'show-args', '1', '2', '-x'],
-      `${__dirname}/repo/rushx-not-in-rush-project`
-    );
+    const output: string = await Utilities.executeCommandAndCaptureOutputAsync({
+      command: 'node',
+      args: [startPath, 'show-args', '1', '2', '-x'],
+      workingDirectory: `${__dirname}/repo/rushx-not-in-rush-project`
+    });
 
     expect(output).toEqual(
       expect.stringMatching(

libraries/rush-lib/src/logic/Git.ts

@@ -523,6 +523,28 @@ export class Git {
     return result;
   }
 
+  public async stageAndCommitGitChangesAsync(
+    pattern: string[],
+    message: string,
+    terminal: ITerminal
+  ): Promise<void> {
+    try {
+      const gitPath: string = this.getGitPathOrThrow();
+      await this._executeGitCommandAndCaptureOutputAsync(
+        gitPath,
+        ['add', '--', ...pattern],
+        this._rushConfiguration.changesFolder
+      );
+      await this._executeGitCommandAndCaptureOutputAsync(
+        gitPath,
+        ['commit', '-m', message, '--', ...pattern],
+        this._rushConfiguration.changesFolder
+      );
+    } catch (error) {
+      terminal.writeErrorLine(`ERROR: Cannot stage and commit git changes ${(error as Error).message}`);
+    }
+  }
+
   /**
    * Returns an object containing either the result of the `git config user.email`
    * command or an error.
@@ -604,10 +626,14 @@ export class Git {
   public async _executeGitCommandAndCaptureOutputAsync(
     gitPath: string,
     args: string[],
-    repositoryRoot: string = this._rushConfiguration.rushJsonFolder
+    workingDirectory: string = this._rushConfiguration.rushJsonFolder
   ): Promise<string> {
     try {
-      return await Utilities.executeCommandAndCaptureOutputAsync(gitPath, args, repositoryRoot);
+      return await Utilities.executeCommandAndCaptureOutputAsync({
+        command: gitPath,
+        args,
+        workingDirectory
+      });
     } catch (e) {
       ensureGitMinimumVersion(gitPath);
       throw e;