@git.zone/cli 2.23.0 → 2.25.0

package/ts/mod_tools/classes.packagemanager.ts

@@ -35,6 +35,11 @@ export interface ILegacyCleanupResult {
   globalDir: string;
   deleted: boolean;
   reason?: string;
+  /**
+   * Managed packages removed from a legacy root that itself had to be kept.
+   * Each entry is `name@version` of an inert copy that nothing resolves to.
+   */
+  stalePackagesRemoved?: string[];
 }
 
 export interface IShimSyncResult {
@@ -179,9 +184,18 @@ export class PackageManagerUtil {
       }
 
       if (!legacyRoot.safeToDelete) {
+        // The root must stay, but the managed copies inside it are inert: the
+        // current global root already provides those packages and no shim
+        // resolves here. Leaving them behind makes the directory look like the
+        // installed version, which misleads anyone inspecting it.
+        const stalePackagesRemoved = await this.removeStaleManagedPackages(
+          legacyRoot,
+          currentPackageNames,
+        );
         cleanupResults.push({
           globalDir: legacyRoot.globalDir,
           deleted: false,
+          stalePackagesRemoved,
           reason:
             legacyRoot.unmanagedPackageNames.length > 0
               ? `kept because it also contains ${legacyRoot.unmanagedPackageNames.join(", ")}`
@@ -231,6 +245,46 @@ export class PackageManagerUtil {
     return cleanupResults;
   }
 
+  /**
+   * Remove managed package copies from a legacy global root that has to be kept.
+   *
+   * Only removes a package when the active global root already provides it and
+   * no command shim points into this legacy root, so nothing that currently
+   * resolves can be affected. Fails closed: any doubt leaves the copy in place.
+   */
+  private async removeStaleManagedPackages(
+    legacyRootArg: ILegacyGlobalRootInfo,
+    currentPackageNamesArg: Set<string>,
+  ): Promise<string[]> {
+    const shimReferences = await this.getShimReferences(legacyRootArg.globalDir);
+    if (shimReferences === null || shimReferences.length > 0) {
+      // PNPM_HOME unknown, or something still resolves here.
+      return [];
+    }
+
+    const removed: string[] = [];
+    for (const packageInfo of legacyRootArg.packages) {
+      if (!packageInfo.packagePath) {
+        continue;
+      }
+      if (!currentPackageNamesArg.has(packageInfo.name)) {
+        // Not provided by the active root — removing it would lose the package.
+        continue;
+      }
+      try {
+        await plugins.fs.rm(packageInfo.packagePath, {
+          recursive: true,
+          force: true,
+        });
+        removed.push(`${packageInfo.name}@${packageInfo.version}`);
+      } catch {
+        // Leave it rather than half-removing it.
+      }
+    }
+
+    return removed;
+  }
+
   public async syncCurrentGlobalShims(): Promise<IShimSyncResult[]> {
     const pnpmShimDirs = await this.getPnpmShimDirs();
     if (!pnpmShimDirs) {

package/ts/mod_tools/index.ts

@@ -485,6 +485,11 @@ async function cleanupLegacyInstalls(
       console.log(
         `  ${cleanupResult.globalDir} kept (${cleanupResult.reason || "unknown reason"})`,
       );
+      for (const stalePackage of cleanupResult.stalePackagesRemoved || []) {
+        console.log(
+          `    removed stale inert copy ${stalePackage} (the active global root provides it)`,
+        );
+      }
     }
   }
   console.log("");