@pnpm/global.commands 1100.0.31 → 1100.0.32

package/lib/globalAdd.d.ts

@@ -1,4 +1,5 @@
 import type { CommandHandlerMap } from '@pnpm/cli.command';
+import { type GlobalPackageInfo } from '@pnpm/global.packages';
 import type { CreateStoreControllerOptions } from '@pnpm/store.connection-manager';
 import { type ResolutionPolicyViolation } from './installGlobalPackages.js';
 export type GlobalAddOptions = CreateStoreControllerOptions & {
@@ -17,3 +18,5 @@ export type GlobalAddOptions = CreateStoreControllerOptions & {
     updateResolutionPolicyManifest?: (violations: readonly ResolutionPolicyViolation[], dir: string) => Promise<void>;
 };
 export declare function handleGlobalAdd(opts: GlobalAddOptions, params: string[], commands: CommandHandlerMap): Promise<void>;
+export declare function getReplacementAliases(aliases: string[]): string[];
+export declare function shouldReplaceExistingGlobalInstall(pkg: GlobalPackageInfo, aliases: string[], replacementAliases: string[]): boolean;

package/lib/globalAdd.js

@@ -88,6 +88,7 @@ async function installGroup(ctx, commands) {
     // Read resolved aliases from the installed package.json
     const pkgJson = readPackageJsonFromDirRawSync(installDir);
     const aliases = Object.keys(pkgJson.dependencies ?? {});
+    const replacementAliases = getReplacementAliases(aliases);
     // Check for bin name conflicts with other global packages
     // (must happen before removeExistingGlobalInstalls so we don't lose existing packages on failure)
     const pkgs = await readInstalledPackages(installDir);
@@ -97,7 +98,7 @@ async function installGroup(ctx, commands) {
             globalDir,
             globalBinDir,
             newPkgs: pkgs,
-            shouldSkip: (pkg) => aliases.some((alias) => alias in pkg.dependencies),
+            shouldSkip: (pkg) => shouldReplaceExistingGlobalInstall(pkg, aliases, replacementAliases),
         });
     }
     catch (err) {
@@ -105,7 +106,7 @@ async function installGroup(ctx, commands) {
         throw err;
     }
     // Remove any existing global installations of these aliases
-    await removeExistingGlobalInstalls(globalDir, globalBinDir, aliases);
+    await removeExistingGlobalInstalls({ globalDir, globalBinDir, aliases, replacementAliases });
     // Compute cache key and create hash symlink pointing to install dir
     const cacheHash = createGlobalCacheKey({
         aliases,
@@ -117,6 +118,21 @@ async function installGroup(ctx, commands) {
     await linkBinsOfPackages(pkgs, globalBinDir, { excludeBins: binsToSkip });
     await opts.updateResolutionPolicyManifest?.(resolutionPolicyViolations, globalDir);
 }
+const PNPM_CLI_PACKAGE_ALIASES = ['pnpm', '@pnpm/exe'];
+export function getReplacementAliases(aliases) {
+    if (!aliases.some((alias) => PNPM_CLI_PACKAGE_ALIASES.includes(alias)))
+        return aliases;
+    return [...new Set([...aliases, ...PNPM_CLI_PACKAGE_ALIASES])];
+}
+export function shouldReplaceExistingGlobalInstall(pkg, aliases, replacementAliases) {
+    if (aliases.some((alias) => alias in pkg.dependencies))
+        return true;
+    return isPnpmCliOnlyGroup(pkg) && replacementAliases.some((alias) => alias in pkg.dependencies);
+}
+function isPnpmCliOnlyGroup(pkg) {
+    const aliases = Object.keys(pkg.dependencies);
+    return aliases.length > 0 && aliases.every((alias) => PNPM_CLI_PACKAGE_ALIASES.includes(alias));
+}
 function splitCommaSeparated(param, baseDir) {
     if (!param.includes(','))
         return [param];
@@ -173,12 +189,15 @@ function resolveLocalParam(param, baseDir) {
     }
     return param;
 }
-async function removeExistingGlobalInstalls(globalDir, globalBinDir, aliases) {
+async function removeExistingGlobalInstalls(opts) {
+    const { globalDir, globalBinDir, aliases, replacementAliases } = opts;
     // Collect unique groups to remove (dedup by hash)
     const groupsToRemove = new Map();
-    for (const alias of aliases) {
+    for (const alias of replacementAliases) {
         const existing = findGlobalPackage(globalDir, alias);
-        if (existing && !groupsToRemove.has(existing.hash)) {
+        if (existing &&
+            shouldReplaceExistingGlobalInstall(existing, aliases, replacementAliases) &&
+            !groupsToRemove.has(existing.hash)) {
             groupsToRemove.set(existing.hash, getInstalledBinNames(existing));
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/global.commands",
-  "version": "1100.0.31",
+  "version": "1100.0.32",
   "description": "Global package command handlers for pnpm",
   "keywords": [
     "pnpm",
@@ -31,25 +31,25 @@
     "@pnpm/util.lex-comparator": "^4.0.1",
     "is-subdir": "^2.0.0",
     "symlink-dir": "^10.0.1",
-    "@pnpm/bins.remover": "1100.0.12",
     "@pnpm/bins.linker": "1100.0.16",
-    "@pnpm/bins.resolver": "1100.0.8",
+    "@pnpm/bins.remover": "1100.0.12",
     "@pnpm/cli.command": "1100.0.1",
-    "@pnpm/cli.utils": "1101.0.13",
-    "@pnpm/config.matcher": "1100.0.1",
-    "@pnpm/config.reader": "1101.11.0",
+    "@pnpm/config.reader": "1101.11.1",
     "@pnpm/core-loggers": "1100.2.1",
-    "@pnpm/error": "1100.0.1",
+    "@pnpm/deps.inspection.list": "1100.0.22",
+    "@pnpm/config.matcher": "1100.0.1",
     "@pnpm/global.packages": "1100.0.10",
-    "@pnpm/deps.inspection.list": "1100.0.21",
-    "@pnpm/installing.deps-installer": "1102.2.0",
-    "@pnpm/store.connection-manager": "1100.3.3",
+    "@pnpm/error": "1100.0.1",
     "@pnpm/pkg-manifest.reader": "1100.0.9",
-    "@pnpm/types": "1101.3.2"
+    "@pnpm/cli.utils": "1101.0.13",
+    "@pnpm/installing.deps-installer": "1102.2.1",
+    "@pnpm/types": "1101.3.2",
+    "@pnpm/store.connection-manager": "1100.3.4",
+    "@pnpm/bins.resolver": "1100.0.8"
   },
   "devDependencies": {
     "@jest/globals": "30.4.1",
-    "@pnpm/global.commands": "1100.0.31"
+    "@pnpm/global.commands": "1100.0.32"
   },
   "engines": {
     "node": ">=22.13"