pnpm 11.1.0 → 11.1.2

package/dist/pnpm.mjs

@@ -1800,7 +1800,7 @@ var init_lib5 = __esm({
     "use strict";
     defaultManifest = {
       name: true ? "pnpm" : "pnpm",
-      version: true ? "11.1.0" : "0.0.0"
+      version: true ? "11.1.2" : "0.0.0"
     };
     pkgJson = defaultManifest;
     packageManager = {
@@ -2159,8 +2159,13 @@ function convertEnginesRuntimeToDependencies(manifest, enginesFieldName, depende
     if ("webcontainer" in process.versions) {
       globalWarn(`Installation of ${runtimeName} versions is not supported in WebContainer`);
     } else {
-      manifest[dependenciesFieldName] ??= {};
-      manifest[dependenciesFieldName][runtimeName] = `runtime:${runtime.version}`;
+      const deps = manifest[dependenciesFieldName] ??= {};
+      Object.defineProperty(deps, runtimeName, {
+        value: `runtime:${runtime.version}`,
+        enumerable: true,
+        writable: true,
+        configurable: true
+      });
     }
   }
 }
@@ -4244,22 +4249,22 @@ async function updateProjectManifestObject(prefix, packageManifest, packageSpecs
       const spec = packageSpec.bareSpecifier ?? findSpec(packageSpec.alias, packageManifest);
       if (spec) {
         packageManifest[packageSpec.saveType] = packageManifest[packageSpec.saveType] ?? {};
-        packageManifest[packageSpec.saveType][packageSpec.alias] = spec;
+        defineDepEntry(packageManifest[packageSpec.saveType], packageSpec.alias, spec);
         for (const deptype of DEPENDENCIES_FIELDS) {
           if (deptype !== packageSpec.saveType) {
-            delete packageManifest[deptype]?.[packageSpec.alias];
+            deleteDepEntry(packageManifest[deptype], packageSpec.alias);
           }
         }
         if (packageSpec.peer === true) {
           packageManifest.peerDependencies = packageManifest.peerDependencies ?? {};
-          packageManifest.peerDependencies[packageSpec.alias] = getPeerSpecifier(spec, packageSpec.resolvedVersion, packageSpec.pinnedVersion);
+          defineDepEntry(packageManifest.peerDependencies, packageSpec.alias, getPeerSpecifier(spec, packageSpec.resolvedVersion, packageSpec.pinnedVersion));
         }
       }
     } else if (packageSpec.bareSpecifier) {
       const usedDepType = guessDependencyType(packageSpec.alias, packageManifest) ?? "dependencies";
       if (usedDepType !== "peerDependencies") {
         packageManifest[usedDepType] = packageManifest[usedDepType] ?? {};
-        packageManifest[usedDepType][packageSpec.alias] = packageSpec.bareSpecifier;
+        defineDepEntry(packageManifest[usedDepType], packageSpec.alias, packageSpec.bareSpecifier);
       }
     }
   }
@@ -4271,10 +4276,31 @@ async function updateProjectManifestObject(prefix, packageManifest, packageSpecs
 }
 function findSpec(alias, manifest) {
   const foundDepType = guessDependencyType(alias, manifest);
-  return foundDepType && manifest[foundDepType][alias];
+  if (foundDepType == null)
+    return void 0;
+  const deps = manifest[foundDepType];
+  return Object.hasOwn(deps, alias) ? deps[alias] : void 0;
 }
 function guessDependencyType(alias, manifest) {
-  return DEPENDENCIES_OR_PEER_FIELDS.find((depField) => manifest[depField]?.[alias] === "" || Boolean(manifest[depField]?.[alias]));
+  return DEPENDENCIES_OR_PEER_FIELDS.find((depField) => {
+    const deps = manifest[depField];
+    if (deps == null || !Object.hasOwn(deps, alias))
+      return false;
+    return deps[alias] === "" || Boolean(deps[alias]);
+  });
+}
+function defineDepEntry(target2, alias, value) {
+  Object.defineProperty(target2, alias, {
+    value,
+    enumerable: true,
+    writable: true,
+    configurable: true
+  });
+}
+function deleteDepEntry(target2, alias) {
+  if (target2 != null && Object.hasOwn(target2, alias)) {
+    delete target2[alias];
+  }
 }
 var import_semver2;
 var init_updateProjectManifestObject = __esm({
@@ -12180,7 +12206,7 @@ var require_npa = __commonJS({
     module2.exports.resolve = resolve3;
     module2.exports.Result = Result;
     var HostedGit3;
-    var semver53;
+    var semver54;
     var path210;
     var validatePackageName2;
     var os15;
@@ -12435,9 +12461,9 @@ var require_npa = __commonJS({
       const spec = res.rawSpec === "" ? "latest" : res.rawSpec;
       res.saveSpec = null;
       res.fetchSpec = spec;
-      if (!semver53) semver53 = require_semver2();
-      const version2 = semver53.valid(spec, true);
-      const range = semver53.validRange(spec, true);
+      if (!semver54) semver54 = require_semver2();
+      const version2 = semver54.valid(spec, true);
+      const range = semver54.validRange(spec, true);
       if (version2) {
         res.type = "version";
       } else if (range) {
@@ -22837,7 +22863,7 @@ var require_lib6 = __commonJS({
 var require_version_selector_type = __commonJS({
   "../../../../setup-pnpm/node_modules/.bin/store/v11/links/@/version-selector-type/3.0.0/bb5374a17b8844b39694ff4483fb613e6fef31ded46a26ae6d88676a1b27fe57/node_modules/version-selector-type/index.js"(exports2, module2) {
     "use strict";
-    var semver53 = require_semver2();
+    var semver54 = require_semver2();
     module2.exports = (selector) => versionSelectorType3(true, selector);
     module2.exports.strict = (selector) => versionSelectorType3(false, selector);
     function versionSelectorType3(loose, selector) {
@@ -22845,13 +22871,13 @@ var require_version_selector_type = __commonJS({
         throw new TypeError("`selector` should be a string");
       }
       let normalizedSelector;
-      if (normalizedSelector = semver53.valid(selector, loose)) {
+      if (normalizedSelector = semver54.valid(selector, loose)) {
         return {
           normalized: normalizedSelector,
           type: "version"
         };
       }
-      if (normalizedSelector = semver53.validRange(selector, loose)) {
+      if (normalizedSelector = semver54.validRange(selector, loose)) {
         return {
           normalized: normalizedSelector,
           type: "range"
@@ -22995,6 +23021,42 @@ var require_retry = __commonJS({
 
 // ../resolving/npm-resolver/lib/fetch.js
 import url from "node:url";
+function stripTrailingSemverSuffix(pkgName) {
+  const atIdx = pkgName.lastIndexOf("@");
+  if (atIdx > 0 && import_semver4.default.valid(pkgName.slice(atIdx + 1)) != null) {
+    return pkgName.slice(0, atIdx);
+  }
+  let i2 = pkgName.length;
+  i2 = consumeTrailingDigits(pkgName, i2);
+  if (i2 === pkgName.length || i2 === 0 || pkgName.charCodeAt(i2 - 1) !== 46)
+    return void 0;
+  i2--;
+  const beforePatch = i2;
+  i2 = consumeTrailingDigits(pkgName, i2);
+  if (i2 === beforePatch || i2 === 0 || pkgName.charCodeAt(i2 - 1) !== 46)
+    return void 0;
+  i2--;
+  const beforeMinor = i2;
+  i2 = consumeTrailingDigits(pkgName, i2);
+  if (i2 === beforeMinor || i2 === 0)
+    return void 0;
+  if (import_semver4.default.valid(pkgName.slice(i2)) == null)
+    return void 0;
+  let prefix = pkgName.slice(0, i2);
+  if (prefix.endsWith("@"))
+    prefix = prefix.slice(0, -1);
+  return prefix.length > 0 ? prefix : void 0;
+}
+function consumeTrailingDigits(s, end) {
+  let i2 = end;
+  while (i2 > 0) {
+    const c3 = s.charCodeAt(i2 - 1);
+    if (c3 < 48 || c3 > 57)
+      break;
+    i2--;
+  }
+  return i2;
+}
 async function fetchMetadataFromFromRegistry(fetchOpts, pkgName, { authHeaderValue, etag: cachedEtag, fullMetadata, modified: cachedModified, registry }) {
   const uri = toUri(pkgName, registry);
   const op = retry.operation(fetchOpts.retry);
@@ -23073,7 +23135,7 @@ function toUri(pkgName, registry) {
   }
   return new url.URL(encodedName, registry.endsWith("/") ? registry : `${registry}/`).toString();
 }
-var retry, semverRegex, RegistryResponseError;
+var retry, import_semver4, RegistryResponseError;
 var init_fetch = __esm({
   "../resolving/npm-resolver/lib/fetch.js"() {
     "use strict";
@@ -23081,16 +23143,16 @@ var init_fetch = __esm({
     init_lib2();
     init_lib3();
     retry = __toESM(require_retry(), 1);
-    semverRegex = /(.*)(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/;
+    import_semver4 = __toESM(require_semver2(), 1);
     RegistryResponseError = class extends FetchError {
       pkgName;
       constructor(request, response, pkgName) {
         let hint;
         if (response.status === 404) {
           hint = `${pkgName} is not in the npm registry, or you have no permission to fetch it.`;
-          const matched = pkgName.match(semverRegex);
-          if (matched != null) {
-            hint += ` Did you mean ${matched[1]}?`;
+          const nameWithoutVersion = stripTrailingSemverSuffix(pkgName);
+          if (nameWithoutVersion != null) {
+            hint += ` Did you mean ${nameWithoutVersion}?`;
           }
         }
         super(request, response, hint);
@@ -23192,14 +23254,14 @@ function parsePath(path210) {
   const pathWithNoExtension = parts[1].replace(/\.tgz$/, "");
   const scopelessNameLength = name.length - (name.indexOf("/") + 1);
   const version2 = pathWithNoExtension.slice(scopelessNameLength + 1);
-  if (!import_semver4.default.valid(version2, true))
+  if (!import_semver5.default.valid(version2, true))
     return null;
   return { name, version: version2 };
 }
-var import_semver4;
+var import_semver5;
 var init_lib19 = __esm({
   "../../../../setup-pnpm/node_modules/.bin/store/v11/links/@/parse-npm-tarball-url/5.0.0/b340656de76aa8bf3255f0606633fb5e0f39b44bbfa80baaf635b2557024d31a/node_modules/parse-npm-tarball-url/lib/index.js"() {
-    import_semver4 = __toESM(require_semver2(), 1);
+    import_semver5 = __toESM(require_semver2(), 1);
   }
 });
 
@@ -23208,7 +23270,7 @@ function parseBareSpecifier(bareSpecifier, alias, defaultTag, registry) {
   let name = alias;
   if (bareSpecifier.startsWith("npm:")) {
     bareSpecifier = bareSpecifier.slice(4);
-    if (alias && import_semver5.default.validRange(bareSpecifier) != null) {
+    if (alias && import_semver6.default.validRange(bareSpecifier) != null) {
       name = alias;
     } else {
       const index = bareSpecifier.lastIndexOf("@");
@@ -23268,7 +23330,7 @@ function parseNamedRegistrySpecifierToRegistryPackageSpec(rawSpecifier, knownReg
   const body = rawSpecifier.substring(colon + 1);
   let pkgName;
   let versionSelector;
-  if (import_semver5.default.validRange(body) != null) {
+  if (import_semver6.default.validRange(body) != null) {
     if (!packageAlias)
       return null;
     pkgName = packageAlias;
@@ -23308,14 +23370,14 @@ function parseNamedRegistrySpecifierToRegistryPackageSpec(rawSpecifier, knownReg
     registryName
   };
 }
-var import_semver5, import_version_selector_type, BUILTIN_NAMED_REGISTRIES;
+var import_semver6, import_version_selector_type, BUILTIN_NAMED_REGISTRIES;
 var init_parseBareSpecifier = __esm({
   "../resolving/npm-resolver/lib/parseBareSpecifier.js"() {
     "use strict";
     init_lib2();
     init_lib18();
     init_lib19();
-    import_semver5 = __toESM(require_semver2(), 1);
+    import_semver6 = __toESM(require_semver2(), 1);
     import_version_selector_type = __toESM(require_version_selector_type(), 1);
     BUILTIN_NAMED_REGISTRIES = Object.freeze({
       gh: "https://npm.pkg.github.com/"
@@ -25396,7 +25458,7 @@ function filterPkgMetadataByPublishDate(pkgDoc, publishedBy, trustedVersions) {
     let parsedSemver = parsedSemverCache.get(semverStr);
     if (!parsedSemver) {
       try {
-        parsedSemver = new import_semver6.default.SemVer(semverStr, true);
+        parsedSemver = new import_semver7.default.SemVer(semverStr, true);
       } catch {
         return null;
       }
@@ -25429,7 +25491,7 @@ function filterPkgMetadataByPublishDate(pkgDoc, publishedBy, trustedVersions) {
         try {
           const candidateIsDeprecated = pkgDoc.versions[candidate].deprecated != null;
           const bestVersionIsDeprecated = pkgDoc.versions[bestVersion].deprecated != null;
-          if (import_semver6.default.gt(candidate, bestVersion, true) && bestVersionIsDeprecated === candidateIsDeprecated || bestVersionIsDeprecated && !candidateIsDeprecated) {
+          if (import_semver7.default.gt(candidate, bestVersion, true) && bestVersionIsDeprecated === candidateIsDeprecated || bestVersionIsDeprecated && !candidateIsDeprecated) {
             bestVersion = candidate;
           }
         } catch (_err) {
@@ -25447,12 +25509,12 @@ function filterPkgMetadataByPublishDate(pkgDoc, publishedBy, trustedVersions) {
     "dist-tags": distTagsWithinDate
   };
 }
-var import_semver6;
+var import_semver7;
 var init_lib21 = __esm({
   "../resolving/registry/pkg-metadata-filter/lib/index.js"() {
     "use strict";
     init_lib3();
-    import_semver6 = __toESM(require_semver2(), 1);
+    import_semver7 = __toESM(require_semver2(), 1);
   }
 });
 
@@ -25529,7 +25591,7 @@ function semverSatisfiesLoose(version2, range) {
   let semverRange = semverRangeCache.get(range);
   if (semverRange === void 0) {
     try {
-      semverRange = new import_semver7.default.Range(range, true);
+      semverRange = new import_semver8.default.Range(range, true);
     } catch {
       semverRange = null;
     }
@@ -25537,7 +25599,7 @@ function semverSatisfiesLoose(version2, range) {
   }
   if (semverRange) {
     try {
-      return semverRange.test(new import_semver7.default.SemVer(version2, true));
+      return semverRange.test(new import_semver8.default.SemVer(version2, true));
     } catch {
       return false;
     }
@@ -25548,16 +25610,16 @@ function pickLowestVersionByVersionRange({ meta, versionRange, preferredVersionS
   if (preferredVersionSelectors != null && Object.keys(preferredVersionSelectors).length > 0) {
     const prioritizedPreferredVersions = prioritizePreferredVersions(meta, versionRange, preferredVersionSelectors);
     for (const preferredVersions of prioritizedPreferredVersions) {
-      const preferredVersion = import_semver7.default.minSatisfying(preferredVersions, versionRange, true);
+      const preferredVersion = import_semver8.default.minSatisfying(preferredVersions, versionRange, true);
       if (preferredVersion) {
         return preferredVersion;
       }
     }
   }
   if (versionRange === "*") {
-    return Object.keys(meta.versions).sort(import_semver7.default.compare)[0];
+    return Object.keys(meta.versions).sort(import_semver8.default.compare)[0];
   }
-  return import_semver7.default.minSatisfying(Object.keys(meta.versions), versionRange, true);
+  return import_semver8.default.minSatisfying(Object.keys(meta.versions), versionRange, true);
 }
 function pickVersionByVersionRange({ meta, versionRange, preferredVersionSelectors }) {
   const latest = meta["dist-tags"].latest;
@@ -25567,7 +25629,7 @@ function pickVersionByVersionRange({ meta, versionRange, preferredVersionSelecto
       if (preferredVersions.includes(latest) && semverSatisfiesLoose(latest, versionRange)) {
         return latest;
       }
-      const preferredVersion = import_semver7.default.maxSatisfying(preferredVersions, versionRange, true);
+      const preferredVersion = import_semver8.default.maxSatisfying(preferredVersions, versionRange, true);
       if (preferredVersion) {
         return preferredVersion;
       }
@@ -25577,10 +25639,10 @@ function pickVersionByVersionRange({ meta, versionRange, preferredVersionSelecto
   if (latest && (versionRange === "*" || semverSatisfiesLoose(latest, versionRange))) {
     return latest;
   }
-  const maxVersion = import_semver7.default.maxSatisfying(versions, versionRange, true);
+  const maxVersion = import_semver8.default.maxSatisfying(versions, versionRange, true);
   if (maxVersion && meta.versions[maxVersion].deprecated && versions.length > 1) {
     const nonDeprecatedVersions = versions.map((version2) => meta.versions[version2]).filter((versionMeta) => !versionMeta.deprecated).map((versionMeta) => versionMeta.version);
-    const maxNonDeprecatedVersion = import_semver7.default.maxSatisfying(nonDeprecatedVersions, versionRange, true);
+    const maxNonDeprecatedVersion = import_semver8.default.maxSatisfying(nonDeprecatedVersions, versionRange, true);
     if (maxNonDeprecatedVersion)
       return maxNonDeprecatedVersion;
   }
@@ -25622,13 +25684,13 @@ function prioritizePreferredVersions(meta, versionRange, preferredVerSelectors)
   }
   return versionsPrioritizer.versionsByPriority();
 }
-var import_semver7, semverRangeCache, PreferredVersionsPrioritizer;
+var import_semver8, semverRangeCache, PreferredVersionsPrioritizer;
 var init_pickPackageFromMeta = __esm({
   "../resolving/npm-resolver/lib/pickPackageFromMeta.js"() {
     "use strict";
     init_lib2();
     init_lib21();
-    import_semver7 = __toESM(require_semver2(), 1);
+    import_semver8 = __toESM(require_semver2(), 1);
     semverRangeCache = /* @__PURE__ */ new Map();
     PreferredVersionsPrioritizer = class {
       preferredVersions = {};
@@ -25689,7 +25751,7 @@ function pickMax(a2, b) {
     return b;
   if (!b)
     return a2;
-  return import_semver8.default.lt(a2.version, b.version) ? b : a2;
+  return import_semver9.default.lt(a2.version, b.version) ? b : a2;
 }
 function pickRespectingMinReleaseAge(pickerOpts, spec, meta) {
   return runPicker(pickerOpts, spec, (targetSpec) => {
@@ -25738,15 +25800,21 @@ async function pickPackage(ctx, spec, opts2) {
   const fullMetadata = opts2.optional === true || ctx.fullMetadata === true;
   const metaDir = fullMetadata ? ctx.filterMetadata ? FULL_FILTERED_META_DIR : FULL_META_DIR : ABBREVIATED_META_DIR;
   const cacheKey = fullMetadata ? `${spec.name}:full` : spec.name;
+  const registryName = (0, import_encode_registry.default)(opts2.registry);
+  const pkgMirror = path10.join(ctx.cacheDir, metaDir, registryName, `${encodePkgName(spec.name)}.jsonl`);
   const cachedMeta = ctx.metaCache.get(cacheKey);
   if (cachedMeta != null) {
+    const upgrade = await maybeUpgradeAbbreviatedMetaForReleaseAge(ctx, spec, opts2, cachedMeta);
+    let metaForCache = upgrade.meta;
+    if (upgrade.upgradedFrom != null) {
+      metaForCache = opts2.dryRun ? upgrade.meta : persistUpgradedMeta(ctx, pkgMirror, upgrade.upgradedFrom);
+      ctx.metaCache.set(cacheKey, metaForCache);
+    }
     return {
-      meta: cachedMeta,
-      pickedPackage: pickMatchingVersionFinal(pickerOpts, spec, cachedMeta)
+      meta: metaForCache,
+      pickedPackage: pickMatchingVersionFinal(pickerOpts, spec, metaForCache)
     };
   }
-  const registryName = (0, import_encode_registry.default)(opts2.registry);
-  const pkgMirror = path10.join(ctx.cacheDir, metaDir, registryName, `${encodePkgName(spec.name)}.jsonl`);
   return runLimited(pkgMirror, async (limit) => {
     let metaCachedInStore;
     if (ctx.offline === true || ctx.preferOffline === true || opts2.pickLowestVersion) {
@@ -25760,6 +25828,14 @@ async function pickPackage(ctx, spec, opts2) {
         throw new PnpmError("NO_OFFLINE_META", `Failed to resolve ${toRaw(spec)} in package mirror ${pkgMirror}`);
       }
       if (metaCachedInStore != null) {
+        const upgrade = await maybeUpgradeAbbreviatedMetaForReleaseAge(ctx, spec, opts2, metaCachedInStore);
+        metaCachedInStore = upgrade.meta;
+        if (upgrade.upgradedFrom != null) {
+          if (!opts2.dryRun) {
+            metaCachedInStore = persistUpgradedMeta(ctx, pkgMirror, upgrade.upgradedFrom);
+          }
+          ctx.metaCache.set(cacheKey, metaCachedInStore);
+        }
         const pickedPackage = pickMatchingVersionFinal(pickerOpts, spec, metaCachedInStore);
         if (pickedPackage) {
           return {
@@ -25781,7 +25857,7 @@ async function pickPackage(ctx, spec, opts2) {
             };
           }
         } catch (err) {
-          if (ctx.strictPublishedByCheck) {
+          if (shouldRethrowFromFastPathCache(err, ctx.strictPublishedByCheck)) {
             throw err;
           }
         }
@@ -25801,7 +25877,7 @@ async function pickPackage(ctx, spec, opts2) {
               };
             }
           } catch (err) {
-            if (ctx.strictPublishedByCheck && !isMissingTimeError(err)) {
+            if (shouldRethrowFromFastPathCache(err, ctx.strictPublishedByCheck)) {
               throw err;
             }
           }
@@ -25820,6 +25896,11 @@ async function pickPackage(ctx, spec, opts2) {
       if (fetchResult.notModified) {
         metaCachedInStore = metaCachedInStore ?? await limit(async () => loadMeta(pkgMirror));
         if (metaCachedInStore != null) {
+          const upgrade = await maybeUpgradeAbbreviatedMetaForReleaseAge(ctx, spec, opts2, metaCachedInStore);
+          metaCachedInStore = upgrade.meta;
+          if (upgrade.upgradedFrom != null && !opts2.dryRun) {
+            metaCachedInStore = persistUpgradedMeta(ctx, pkgMirror, upgrade.upgradedFrom);
+          }
           ctx.metaCache.set(cacheKey, metaCachedInStore);
           return {
             meta: metaCachedInStore,
@@ -25886,6 +25967,41 @@ async function pickPackage(ctx, spec, opts2) {
     }
   });
 }
+async function maybeUpgradeAbbreviatedMetaForReleaseAge(ctx, spec, opts2, meta) {
+  if (ctx.offline === true || !opts2.publishedBy || meta.time != null || opts2.publishedByExclude?.(spec.name) === true) {
+    return { meta };
+  }
+  const modifiedDate = meta.modified ? new Date(meta.modified) : null;
+  const isModifiedValid = modifiedDate != null && !Number.isNaN(modifiedDate.getTime());
+  if (isModifiedValid && modifiedDate < opts2.publishedBy) {
+    return { meta };
+  }
+  const fullFetchResult = await ctx.fetch(spec.name, {
+    authHeaderValue: opts2.authHeaderValue,
+    fullMetadata: true,
+    etag: meta.etag,
+    modified: meta.modified,
+    registry: opts2.registry
+  });
+  if (fullFetchResult.notModified) {
+    return { meta };
+  }
+  return { meta: fullFetchResult.meta, upgradedFrom: fullFetchResult };
+}
+function shouldRethrowFromFastPathCache(err, strictPublishedByCheck) {
+  return strictPublishedByCheck === true && !isMissingTimeError(err);
+}
+function persistUpgradedMeta(ctx, pkgMirror, upgradedFrom) {
+  const metaForCache = ctx.filterMetadata ? clearMeta(upgradedFrom.meta) : upgradedFrom.meta;
+  const jsonForDisk = ctx.filterMetadata ? prepareJsonForDisk(metaForCache, upgradedFrom.etag) : prepareJsonForDisk(upgradedFrom.meta, upgradedFrom.etag, upgradedFrom.jsonText);
+  runLimited(pkgMirror, (l) => l(async () => {
+    try {
+      await saveMeta(pkgMirror, jsonForDisk);
+    } catch (err) {
+    }
+  }));
+  return metaForCache;
+}
 function clearMeta(pkg) {
   const versions = {};
   for (const [version2, info] of Object.entries(pkg.versions)) {
@@ -26002,7 +26118,7 @@ function validatePackageName(pkgName) {
     throw new PnpmError("INVALID_PACKAGE_NAME", `Package name ${pkgName} is invalid, it should have a @scope`);
   }
 }
-var import_encode_registry, import_semver8, metafileOperationLimits, pickHighest, pickLowest, MAX_WARNED_MISSING_TIME, warnedMissingTimeFor, createdDirs;
+var import_encode_registry, import_semver9, metafileOperationLimits, pickHighest, pickLowest, MAX_WARNED_MISSING_TIME, warnedMissingTimeFor, createdDirs;
 var init_pickPackage = __esm({
   "../resolving/npm-resolver/lib/pickPackage.js"() {
     "use strict";
@@ -26016,7 +26132,7 @@ var init_pickPackage = __esm({
     init_path_temp();
     init_es();
     init_rename_overwrite();
-    import_semver8 = __toESM(require_semver2(), 1);
+    import_semver9 = __toESM(require_semver2(), 1);
     init_pickPackageFromMeta();
     init_toRaw();
     metafileOperationLimits = {};
@@ -26057,7 +26173,7 @@ function failIfTrustDowngraded(meta, version2, opts2) {
     throw new PnpmError("TRUST_CHECK_FAIL", `Missing version object for version ${version2} of ${meta.name} in metadata`);
   }
   const strongestEvidencePriorToRequestedVersion = detectStrongestTrustEvidenceBeforeDate(meta, versionDate, {
-    excludePrerelease: !import_semver9.default.prerelease(version2, true)
+    excludePrerelease: !import_semver10.default.prerelease(version2, true)
   });
   if (strongestEvidencePriorToRequestedVersion == null) {
     return;
@@ -26082,7 +26198,7 @@ function prettyPrintTrustEvidence(trustEvidence) {
 function detectStrongestTrustEvidenceBeforeDate(meta, beforeDate, options) {
   let best;
   for (const [version2, manifest] of Object.entries(meta.versions)) {
-    if (options.excludePrerelease && import_semver9.default.prerelease(version2, true))
+    if (options.excludePrerelease && import_semver10.default.prerelease(version2, true))
       continue;
     const ts = meta.time[version2];
     if (!ts)
@@ -26109,12 +26225,12 @@ function getTrustEvidence(manifest) {
   }
   return void 0;
 }
-var import_semver9, TRUST_RANK;
+var import_semver10, TRUST_RANK;
 var init_trustChecks = __esm({
   "../resolving/npm-resolver/lib/trustChecks.js"() {
     "use strict";
     init_lib2();
-    import_semver9 = __toESM(require_semver2(), 1);
+    import_semver10 = __toESM(require_semver2(), 1);
     init_pickPackageFromMeta();
     TRUST_RANK = {
       trustedPublisher: 2,
@@ -26436,7 +26552,7 @@ async function resolveNpm(ctx, wantedDependency, opts2) {
   const spec = wantedDependency.bareSpecifier ? parseBareSpecifier(wantedDependency.bareSpecifier, wantedDependency.alias, defaultTag, registry) : defaultTagForAlias(wantedDependency.alias, defaultTag);
   if (spec == null)
     return null;
-  if (ctx.peekManifestFromStore && opts2.currentPkg?.resolution && !opts2.update) {
+  if (ctx.peekManifestFromStore && opts2.currentPkg?.resolution && !opts2.update && (opts2.publishedBy == null || opts2.currentPkg.publishedAt != null)) {
     const currentResolution = opts2.currentPkg.resolution;
     if ("tarball" in currentResolution && currentResolution.integrity) {
       const manifest = await ctx.peekManifestFromStore({
@@ -26453,8 +26569,7 @@ async function resolveNpm(ctx, wantedDependency, opts2) {
             manifest,
             resolution: currentResolution,
             resolvedVia: "npm-registry",
-            publishedAt: void 0
-            // Don't have this without metadata
+            publishedAt: opts2.currentPkg.publishedAt
           };
         }
       }
@@ -26548,7 +26663,7 @@ async function resolveNpm(ctx, wantedDependency, opts2) {
       };
     }
     const localVersion = pickMatchingLocalVersionOrNull(workspacePkgsMatchingName, spec);
-    if (localVersion && (import_semver10.default.gt(localVersion, pickedPackage.version) || opts2.preferWorkspacePackages)) {
+    if (localVersion && (import_semver11.default.gt(localVersion, pickedPackage.version) || opts2.preferWorkspacePackages)) {
       return {
         ...resolveFromLocalPackage(workspacePkgsMatchingName.get(localVersion), spec, {
           wantedDependency,
@@ -26684,7 +26799,7 @@ function calcSpecifier({ wantedDependency, spec, version: version2, defaultPinne
   return `npm:${spec.name}@${range}`;
 }
 function calcRange(version2, wantedDependency, defaultPinnedVersion) {
-  if (import_semver10.default.parse(version2)?.prerelease.length) {
+  if (import_semver11.default.parse(version2)?.prerelease.length) {
     return version2;
   }
   const pinnedVersion = (wantedDependency.prevSpecifier ? whichVersionIsPinned(wantedDependency.prevSpecifier) : void 0) ?? (wantedDependency.bareSpecifier ? whichVersionIsPinned(wantedDependency.bareSpecifier) : void 0) ?? defaultPinnedVersion;
@@ -26724,7 +26839,7 @@ function tryResolveFromWorkspacePackages(workspacePackages, spec, opts2) {
   }
   const localVersion = pickMatchingLocalVersionOrNull(workspacePkgsMatchingName, opts2.update ? { name: spec.name, fetchSpec: "*", type: "range" } : spec);
   if (!localVersion) {
-    const availableVersions = Array.from(workspacePkgsMatchingName.keys()).sort((a2, b) => import_semver10.default.rcompare(a2, b));
+    const availableVersions = Array.from(workspacePkgsMatchingName.keys()).sort((a2, b) => import_semver11.default.rcompare(a2, b));
     throw new PnpmError("NO_MATCHING_VERSION_INSIDE_WORKSPACE", `In ${path11.relative(process.cwd(), opts2.projectDir)}: No matching version found for ${opts2.wantedDependency.alias ?? ""}@${opts2.wantedDependency.bareSpecifier ?? ""} inside the workspace` + (availableVersions.length ? `. Available versions: ${availableVersions.join(", ")}` : ""), availableVersions.length ? {
       hint: `Available workspace versions for "${spec.name}": ${availableVersions.join(", ")}`
     } : void 0);
@@ -26734,7 +26849,7 @@ function tryResolveFromWorkspacePackages(workspacePackages, spec, opts2) {
 function pickMatchingLocalVersionOrNull(versions, spec) {
   switch (spec.type) {
     case "tag":
-      return import_semver10.default.maxSatisfying(Array.from(versions.keys()), "*", {
+      return import_semver11.default.maxSatisfying(Array.from(versions.keys()), "*", {
         includePrerelease: true
       });
     case "version":
@@ -26800,7 +26915,7 @@ function calcSpecifierForWorkspaceDep({ wantedDependency, spec, saveWorkspacePro
     }
     return `${prefix}^`;
   }
-  if (import_semver10.default.parse(version2)?.prerelease.length) {
+  if (import_semver11.default.parse(version2)?.prerelease.length) {
     return `${prefix}${version2}`;
   }
   const pinnedVersion = (wantedDependency.prevSpecifier ? whichVersionIsPinned(wantedDependency.prevSpecifier) : void 0) ?? defaultPinnedVersion;
@@ -26845,7 +26960,7 @@ function createVersionSpec(version2, pinnedVersion) {
       throw new PnpmError("BAD_PINNED_VERSION", `Cannot pin '${pinnedVersion ?? "undefined"}'`);
   }
 }
-var import_normalize_path, import_semver10, import_ssri2, import_version_selector_type2, NoMatchingVersionError;
+var import_normalize_path, import_semver11, import_ssri2, import_version_selector_type2, NoMatchingVersionError;
 var init_lib23 = __esm({
   "../resolving/npm-resolver/lib/index.js"() {
     "use strict";
@@ -26858,7 +26973,7 @@ var init_lib23 = __esm({
     import_normalize_path = __toESM(require_normalize_path(), 1);
     init_dist();
     init_es();
-    import_semver10 = __toESM(require_semver2(), 1);
+    import_semver11 = __toESM(require_semver2(), 1);
     import_ssri2 = __toESM(require_lib6(), 1);
     import_version_selector_type2 = __toESM(require_version_selector_type(), 1);
     init_fetch();
@@ -35506,13 +35621,13 @@ function checkEngine(packageId, wantedEngine, currentEngine) {
   if (!wantedEngine)
     return null;
   const unsatisfiedWanted = {};
-  if (wantedEngine.node && !import_semver11.default.satisfies(currentEngine.node, wantedEngine.node, { includePrerelease: true })) {
-    if (!import_semver11.default.valid(currentEngine.node)) {
+  if (wantedEngine.node && !import_semver12.default.satisfies(currentEngine.node, wantedEngine.node, { includePrerelease: true })) {
+    if (!import_semver12.default.valid(currentEngine.node)) {
       throw new PnpmError("INVALID_NODE_VERSION", `The nodeVersion setting is "${currentEngine.node}", which is not exact semver version`);
     }
     unsatisfiedWanted.node = wantedEngine.node;
   }
-  if (currentEngine.pnpm && wantedEngine.pnpm && !import_semver11.default.satisfies(currentEngine.pnpm, wantedEngine.pnpm, { includePrerelease: true })) {
+  if (currentEngine.pnpm && wantedEngine.pnpm && !import_semver12.default.satisfies(currentEngine.pnpm, wantedEngine.pnpm, { includePrerelease: true })) {
     unsatisfiedWanted.pnpm = wantedEngine.pnpm;
   }
   if (Object.keys(unsatisfiedWanted).length > 0) {
@@ -35520,12 +35635,12 @@ function checkEngine(packageId, wantedEngine, currentEngine) {
   }
   return null;
 }
-var import_semver11, UnsupportedEngineError;
+var import_semver12, UnsupportedEngineError;
 var init_checkEngine = __esm({
   "../config/package-is-installable/lib/checkEngine.js"() {
     "use strict";
     init_lib2();
-    import_semver11 = __toESM(require_semver2(), 1);
+    import_semver12 = __toESM(require_semver2(), 1);
     UnsupportedEngineError = class extends PnpmError {
       wanted;
       current;
@@ -43439,7 +43554,7 @@ async function resolveNodeVersion(fetch2, versionSpec, nodeMirrorBaseUrl) {
     return allVersions[0].version;
   }
   const { versions, versionRange } = filterVersions(allVersions, versionSpec);
-  return import_semver12.default.maxSatisfying(versions, versionRange, SEMVER_OPTS) ?? null;
+  return import_semver13.default.maxSatisfying(versions, versionRange, SEMVER_OPTS) ?? null;
 }
 async function resolveNodeVersions(fetch2, versionSpec, nodeMirrorBaseUrl) {
   const allVersions = await fetchAllVersions(fetch2, nodeMirrorBaseUrl);
@@ -43450,7 +43565,7 @@ async function resolveNodeVersions(fetch2, versionSpec, nodeMirrorBaseUrl) {
     return [allVersions[0].version];
   }
   const { versions, versionRange } = filterVersions(allVersions, versionSpec);
-  return versions.filter((version2) => import_semver12.default.satisfies(version2, versionRange, SEMVER_OPTS));
+  return versions.filter((version2) => import_semver13.default.satisfies(version2, versionRange, SEMVER_OPTS));
 }
 async function fetchAllVersions(fetch2, nodeMirrorBaseUrl) {
   const response = await fetch2(`${nodeMirrorBaseUrl ?? "https://nodejs.org/download/release/"}index.json`);
@@ -43485,13 +43600,13 @@ function filterVersions(versions, versionSelector) {
     versionRange: versionSelector
   };
 }
-var import_semver12, import_version_selector_type3, DEFAULT_NODE_MIRROR_BASE_URL, UNOFFICIAL_NODE_MIRROR_BASE_URL, NODE_EXTRAS_IGNORE_PATTERN, SEMVER_OPTS;
+var import_semver13, import_version_selector_type3, DEFAULT_NODE_MIRROR_BASE_URL, UNOFFICIAL_NODE_MIRROR_BASE_URL, NODE_EXTRAS_IGNORE_PATTERN, SEMVER_OPTS;
 var init_lib33 = __esm({
   "../engine/runtime/node-resolver/lib/index.js"() {
     "use strict";
     init_lib32();
     init_lib2();
-    import_semver12 = __toESM(require_semver2(), 1);
+    import_semver13 = __toESM(require_semver2(), 1);
     import_version_selector_type3 = __toESM(require_version_selector_type(), 1);
     init_getNodeArtifactAddress();
     init_getNodeMirror();
@@ -75870,7 +75985,7 @@ var require_cmd_extension = __commonJS({
   }
 });
 
-// ../../../../setup-pnpm/node_modules/.bin/store/v11/links/@zkochan/cmd-shim/9.0.2/9e2c968b8452a8350acdaf97db4fbf518679eaed96222485ad040f94604636b1/node_modules/@zkochan/cmd-shim/index.js
+// ../../../../setup-pnpm/node_modules/.bin/store/v11/links/@zkochan/cmd-shim/9.0.3/70fc3fd01bcfda164fa391eb193bc220f3627f040e6e3517b5891192ea2f6ed5/node_modules/@zkochan/cmd-shim/index.js
 import path36 from "node:path";
 import { promisify as promisify6 } from "node:util";
 function ingestOptions(opts2) {
@@ -75952,6 +76067,9 @@ function getExeExtension() {
   }
   return cmdExtension2 || ".exe";
 }
+function escapeMsysCmdSwitches(args) {
+  return args.replace(/(^|\s)\/([CcKk])(\s|$)/g, "$1//$2$3");
+}
 async function writeShim(src2, to, srcRuntimeInfo, generateShimScript, opts2) {
   const defaultArgs = opts2.preserveSymlinks ? "--preserve-symlinks" : "";
   const args = [srcRuntimeInfo.additionalArgs, defaultArgs].filter((arg) => arg).join(" ");
@@ -76018,6 +76136,9 @@ function generateShShim(src2, to, opts2) {
   shTarget = shTarget.split("\\").join("/");
   const quotedPathToTarget = path36.isAbsolute(shTarget) ? `"${shTarget}"` : `"$basedir/${shTarget}"`;
   let args = opts2.args || "";
+  if (opts2.prog === "cmd" || opts2.prog === "cmd.exe") {
+    args = escapeMsysCmdSwitches(args);
+  }
   const shNodePath = normalizePathEnvVar(opts2.nodePath).posix;
   if (!shProg) {
     shProg = quotedPathToTarget;
@@ -76063,7 +76184,7 @@ else
 fi
 `;
   } else {
-    sh += `${shProg} ${args} ${shTarget} ${progArgs}"$@"
+    sh += `exec ${shProg} ${args} ${shTarget} ${progArgs}"$@"
 exit $?
 `;
   }
@@ -76191,7 +76312,7 @@ function shimTarget(src2) {
 }
 var import_graceful_fs3, import_cmd_extension, gfsPromises, isWindows5, isCygwin, shebangExpr, DEFAULT_OPTIONS2, extensionToProgramMap;
 var init_cmd_shim = __esm({
-  "../../../../setup-pnpm/node_modules/.bin/store/v11/links/@zkochan/cmd-shim/9.0.2/9e2c968b8452a8350acdaf97db4fbf518679eaed96222485ad040f94604636b1/node_modules/@zkochan/cmd-shim/index.js"() {
+  "../../../../setup-pnpm/node_modules/.bin/store/v11/links/@zkochan/cmd-shim/9.0.3/70fc3fd01bcfda164fa391eb193bc220f3627f040e6e3517b5891192ea2f6ed5/node_modules/@zkochan/cmd-shim/index.js"() {
     import_graceful_fs3 = __toESM(require_graceful_fs(), 1);
     import_cmd_extension = __toESM(require_cmd_extension(), 1);
     gfsPromises = {
@@ -76526,7 +76647,7 @@ function compareCommandsInConflict(a2, b) {
     return -1;
   if (a2.pkgName !== b.pkgName)
     return a2.pkgName.localeCompare(b.pkgName);
-  return import_semver13.default.compare(a2.pkgVersion, b.pkgVersion);
+  return import_semver14.default.compare(a2.pkgVersion, b.pkgVersion);
 }
 function logCommandConflict(chosen, skipped, binsDir) {
   binsConflictLogger.debug({
@@ -76679,7 +76800,7 @@ async function safeReadPkgJson(pkgDir) {
     throw err;
   }
 }
-var import_fix_bin, import_is_windows5, import_normalize_path2, import_semver13, binsConflictLogger, IS_WINDOWS2, EXECUTABLE_SHEBANG_SUPPORTED, POWER_SHELL_IS_SUPPORTED, CMD_SHIM_MAX_SIZE;
+var import_fix_bin, import_is_windows5, import_normalize_path2, import_semver14, binsConflictLogger, IS_WINDOWS2, EXECUTABLE_SHEBANG_SUPPORTED, POWER_SHELL_IS_SUPPORTED, CMD_SHIM_MAX_SIZE;
 var init_lib41 = __esm({
   "../bins/linker/lib/index.js"() {
     "use strict";
@@ -76697,7 +76818,7 @@ var init_lib41 = __esm({
     import_is_windows5 = __toESM(require_is_windows(), 1);
     import_normalize_path2 = __toESM(require_normalize_path(), 1);
     init_es();
-    import_semver13 = __toESM(require_semver2(), 1);
+    import_semver14 = __toESM(require_semver2(), 1);
     init_dist4();
     init_getBinNodePaths();
     binsConflictLogger = logger("bins-conflict");
@@ -107697,6 +107818,31 @@ ${captureLines}` : capture.stack;
 // ../network/fetch/lib/dispatcher.js
 import tls from "node:tls";
 import { URL as URL3 } from "node:url";
+function stripSecFetchHeaders(dispatch) {
+  return (opts2, handler73) => {
+    if (opts2.headers) {
+      if (Array.isArray(opts2.headers)) {
+        const filtered = [];
+        for (let i2 = 0; i2 < opts2.headers.length; i2 += 2) {
+          if (!opts2.headers[i2].toLowerCase().startsWith("sec-fetch-")) {
+            filtered.push(opts2.headers[i2], opts2.headers[i2 + 1]);
+          }
+        }
+        opts2 = { ...opts2, headers: filtered };
+      } else if (typeof opts2.headers === "object") {
+        const entries = Symbol.iterator in opts2.headers ? opts2.headers : Object.entries(opts2.headers);
+        const headers = {};
+        for (const [key, value] of entries) {
+          if (!key.toLowerCase().startsWith("sec-fetch-")) {
+            headers[key] = value;
+          }
+        }
+        opts2 = { ...opts2, headers };
+      }
+    }
+    return dispatch(opts2, handler73);
+  };
+}
 function getDispatcher(uri, opts2) {
   if (!needsCustomDispatcher(opts2)) {
     return void 0;
@@ -107771,6 +107917,7 @@ function getProxyDispatcher(parsedUri, opts2) {
   } else {
     dispatcher = createHttpProxyDispatcher(proxyUrl, isHttps, opts2, { ca, cert, key: certKey });
   }
+  dispatcher = dispatcher.compose(stripSecFetchHeaders);
   DISPATCHER_CACHE.set(key, dispatcher);
   return dispatcher;
 }
@@ -107878,8 +108025,9 @@ function getNonProxyDispatcher(parsedUri, opts2) {
       localAddress: opts2.localAddress
     }
   });
-  DISPATCHER_CACHE.set(key, agent);
-  return agent;
+  const dispatcher = agent.compose(stripSecFetchHeaders);
+  DISPATCHER_CACHE.set(key, dispatcher);
+  return dispatcher;
 }
 function checkNoProxy(parsedUri, opts2) {
   const host = parsedUri.hostname.split(".").filter((x) => x).reverse();
@@ -107955,7 +108103,7 @@ var init_dispatcher = __esm({
       connect: {
         autoSelectFamily: true
       }
-    }));
+    }).compose(stripSecFetchHeaders));
     DISPATCHER_CACHE = new M({
       max: 50,
       dispose: (dispatcher) => {
@@ -109334,7 +109482,7 @@ function createGitResolver(opts2) {
   };
 }
 function resolveVTags(vTags, range) {
-  return import_semver14.default.maxSatisfying(vTags, range, true);
+  return import_semver15.default.maxSatisfying(vTags, range, true);
 }
 async function getRepoRefs(repo, ref) {
   const gitArgs = [repo];
@@ -109378,7 +109526,7 @@ function resolveRefFromRefs(refs, repo, ref, committish, range) {
   } else {
     const vTags = [...new Set(Object.keys(refs).filter((key) => /^refs\/tags\/v?\d+\.\d+\.\d+(?:[-+].+)?(?:\^\{\})?$/.test(key)).map((key) => {
       return key.replace(/^refs\/tags\//, "").replace(/\^\{\}$/, "");
-    }).filter((key) => import_semver14.default.valid(key, true)))];
+    }).filter((key) => import_semver15.default.valid(key, true)))];
     const refVTag = resolveVTags(vTags, range);
     const commitId = refVTag && (refs[`refs/tags/${refVTag}^{}`] || // prefer annotated tags
     refs[`refs/tags/${refVTag}`]);
@@ -109391,13 +109539,13 @@ function resolveRefFromRefs(refs, repo, ref, committish, range) {
 function isSsh(gitSpec) {
   return gitSpec.slice(0, 10) === "git+ssh://" || gitSpec.slice(0, 4) === "git@";
 }
-var import_semver14;
+var import_semver15;
 var init_lib52 = __esm({
   "../resolving/git-resolver/lib/index.js"() {
     "use strict";
     init_lib2();
     init_graceful_git();
-    import_semver14 = __toESM(require_semver2(), 1);
+    import_semver15 = __toESM(require_semver2(), 1);
     init_createGitHostedPkgId();
     init_parseBareSpecifier2();
   }
@@ -109406,11 +109554,11 @@ var init_lib52 = __esm({
 // ../resolving/local-resolver/lib/parseBareSpecifier.js
 import os3 from "node:os";
 import path46 from "node:path";
-function parseBareSpecifier3(wd, projectDir, lockfileDir, opts2) {
+function parseLocalScheme(wd, projectDir, lockfileDir, opts2) {
   if (wd.bareSpecifier.startsWith("link:") || wd.bareSpecifier.startsWith("workspace:")) {
     return fromLocal(wd, projectDir, lockfileDir, "directory", opts2);
   }
-  if (wd.bareSpecifier.endsWith(".tgz") || wd.bareSpecifier.endsWith(".tar.gz") || wd.bareSpecifier.endsWith(".tar") || wd.bareSpecifier.includes(path46.sep) || wd.bareSpecifier.startsWith("file:") || isFilespec.test(wd.bareSpecifier)) {
+  if (wd.bareSpecifier.startsWith("file:")) {
     const type4 = isFilename.test(wd.bareSpecifier) ? "file" : "directory";
     return fromLocal(wd, projectDir, lockfileDir, type4, opts2);
   }
@@ -109419,6 +109567,13 @@ function parseBareSpecifier3(wd, projectDir, lockfileDir, opts2) {
   }
   return null;
 }
+function parseLocalPath(wd, projectDir, lockfileDir, opts2) {
+  if (wd.bareSpecifier.endsWith(".tgz") || wd.bareSpecifier.endsWith(".tar.gz") || wd.bareSpecifier.endsWith(".tar") || wd.bareSpecifier.includes(path46.sep) || isFilespec.test(wd.bareSpecifier)) {
+    const type4 = isFilename.test(wd.bareSpecifier) ? "file" : "directory";
+    return fromLocal(wd, projectDir, lockfileDir, type4, opts2);
+  }
+  return null;
+}
 function fromLocal({ bareSpecifier, injected }, projectDir, lockfileDir, type4, opts2) {
   const spec = bareSpecifier.replace(/\\/g, "/").replace(/^(?:file|link|workspace):\/*([A-Z]:)/i, "$1").replace(/^(?:file|link|workspace):(?:\/*([~./]))?/, "$1");
   let protocol;
@@ -109499,9 +109654,19 @@ var init_parseBareSpecifier3 = __esm({
 // ../resolving/local-resolver/lib/index.js
 import { existsSync as existsSync3 } from "node:fs";
 import path47 from "node:path";
-async function resolveFromLocal(ctx, wantedDependency, opts2) {
-  const preserveAbsolutePaths = ctx.preserveAbsolutePaths ?? false;
-  const spec = parseBareSpecifier3(wantedDependency, opts2.projectDir, opts2.lockfileDir ?? opts2.projectDir, { preserveAbsolutePaths });
+async function resolveFromLocalScheme(ctx, wantedDependency, opts2) {
+  const spec = parseLocalScheme(wantedDependency, opts2.projectDir, opts2.lockfileDir ?? opts2.projectDir, {
+    preserveAbsolutePaths: ctx.preserveAbsolutePaths ?? false
+  });
+  return resolveSpec(spec, opts2);
+}
+async function resolveFromLocalPath(ctx, wantedDependency, opts2) {
+  const spec = parseLocalPath(wantedDependency, opts2.projectDir, opts2.lockfileDir ?? opts2.projectDir, {
+    preserveAbsolutePaths: ctx.preserveAbsolutePaths ?? false
+  });
+  return resolveSpec(spec, opts2);
+}
+async function resolveSpec(spec, opts2) {
   if (spec == null)
     return null;
   if (spec.type === "file") {
@@ -109635,20 +109800,20 @@ async function resolveFromCustomResolvers(customResolvers, wantedDependency, opt
 function createResolver(fetchFromRegistry, getAuthHeader, pnpmOpts) {
   const { resolveFromNpm, resolveFromJsr, resolveFromNamedRegistry: resolveFromNamedRegistry2, clearCache } = createNpmResolver(fetchFromRegistry, getAuthHeader, pnpmOpts);
   const resolveFromGit = createGitResolver(pnpmOpts);
-  const _resolveFromLocal = resolveFromLocal.bind(null, {
-    preserveAbsolutePaths: pnpmOpts.preserveAbsolutePaths
-  });
+  const localCtx = { preserveAbsolutePaths: pnpmOpts.preserveAbsolutePaths };
+  const _resolveFromLocalScheme = resolveFromLocalScheme.bind(null, localCtx);
+  const _resolveFromLocalPath = resolveFromLocalPath.bind(null, localCtx);
   const _resolveNodeRuntime = resolveNodeRuntime.bind(null, { fetchFromRegistry, offline: pnpmOpts.offline, nodeDownloadMirrors: pnpmOpts.nodeDownloadMirrors });
   const _resolveDenoRuntime = resolveDenoRuntime.bind(null, { fetchFromRegistry, offline: pnpmOpts.offline, resolveFromNpm });
   const _resolveBunRuntime = resolveBunRuntime.bind(null, { fetchFromRegistry, offline: pnpmOpts.offline, resolveFromNpm });
   const _resolveFromCustomResolvers = pnpmOpts.customResolvers ? resolveFromCustomResolvers.bind(null, pnpmOpts.customResolvers) : null;
   return {
     resolve: async (wantedDependency, opts2) => {
-      const resolution = await _resolveFromCustomResolvers?.(wantedDependency, opts2) ?? await resolveFromNpm(wantedDependency, opts2) ?? await resolveFromJsr(wantedDependency, opts2) ?? (wantedDependency.bareSpecifier && (await resolveFromGit(wantedDependency, opts2) ?? await resolveFromTarball(fetchFromRegistry, wantedDependency) ?? await _resolveFromLocal(wantedDependency, opts2))) ?? await _resolveNodeRuntime(wantedDependency, opts2) ?? await _resolveDenoRuntime(wantedDependency, opts2) ?? await _resolveBunRuntime(wantedDependency, opts2) ?? // Named-registry resolution runs last so that built-in schemes
-      // (`npm:`, `jsr:`, `git:`/`github:`/`gitlab:`/…, `file:`, `link:`,
-      // tarball URLs, etc.) are always claimed by their dedicated resolver
-      // before a user-configured alias gets a chance to shadow them.
-      await resolveFromNamedRegistry2(wantedDependency, opts2);
+      const resolution = await _resolveFromCustomResolvers?.(wantedDependency, opts2) ?? await resolveFromNpm(wantedDependency, opts2) ?? await resolveFromJsr(wantedDependency, opts2) ?? (wantedDependency.bareSpecifier && (await resolveFromGit(wantedDependency, opts2) ?? await resolveFromTarball(fetchFromRegistry, wantedDependency) ?? await _resolveFromLocalScheme(wantedDependency, opts2))) ?? await _resolveNodeRuntime(wantedDependency, opts2) ?? await _resolveDenoRuntime(wantedDependency, opts2) ?? await _resolveBunRuntime(wantedDependency, opts2) ?? // Named-registry runs between the explicit local schemes above and the
+      // path-shape match below, so `<alias>:@scope/pkg` reaches the configured
+      // registry while a colliding `file:`/`link:`/`workspace:` alias cannot
+      // hijack the built-in protocols.
+      await resolveFromNamedRegistry2(wantedDependency, opts2) ?? (wantedDependency.bareSpecifier ? await _resolveFromLocalPath(wantedDependency, opts2) : null);
       if (!resolution) {
         let specifier = `${wantedDependency.alias ? wantedDependency.alias + "@" : ""}${wantedDependency.bareSpecifier ?? ""}`;
         if (specifier !== "") {
@@ -113618,7 +113783,7 @@ function getWantedPackageManager(manifest) {
   const warnings = [];
   const pmFromDevEngines = parseDevEnginesPackageManager(manifest.devEngines);
   if (pmFromDevEngines) {
-    if (pmFromDevEngines.version != null && !import_semver15.default.validRange(pmFromDevEngines.version)) {
+    if (pmFromDevEngines.version != null && !import_semver16.default.validRange(pmFromDevEngines.version)) {
       warnings.push(`Cannot use devEngines.packageManager version "${pmFromDevEngines.version}": not a valid version or range`);
       pmFromDevEngines.version = void 0;
     }
@@ -113633,7 +113798,7 @@ function getWantedPackageManager(manifest) {
   if (manifest.packageManager) {
     const pm2 = parsePackageManager(manifest.packageManager);
     if (pm2.version != null) {
-      const cleanVersion = import_semver15.default.valid(pm2.version);
+      const cleanVersion = import_semver16.default.valid(pm2.version);
       if (!cleanVersion) {
         warnings.push(`Cannot use packageManager "${manifest.packageManager}": "${pm2.version}" is not a valid exact version`);
         pm2.version = void 0;
@@ -113697,7 +113862,7 @@ function getNodeVersionFromEnginesRuntime(manifest) {
     const nodeRuntime = runtimes.find((r) => r.name === "node");
     if (nodeRuntime?.version == null)
       continue;
-    const minVersion = import_semver15.default.minVersion(nodeRuntime.version);
+    const minVersion = import_semver16.default.minVersion(nodeRuntime.version);
     if (minVersion != null) {
       return minVersion.version;
     }
@@ -113717,7 +113882,7 @@ function addSettingsFromWorkspaceManifestToConfig(pnpmConfig, { configFromCliOpt
   }
   pnpmConfig.catalogs = getCatalogsFromWorkspaceManifest(workspaceManifest);
 }
-var import_ci_info, import_is_windows6, import_lodash3, import_normalize_registry_url2, import_semver15;
+var import_ci_info, import_is_windows6, import_lodash3, import_normalize_registry_url2, import_semver16;
 var init_lib60 = __esm({
   "../config/reader/lib/index.js"() {
     "use strict";
@@ -113739,7 +113904,7 @@ var init_lib60 = __esm({
     init_path_absolute();
     init_es();
     init_realpath_missing();
-    import_semver15 = __toESM(require_semver2(), 1);
+    import_semver16 = __toESM(require_semver2(), 1);
     init_checkGlobalBinDir();
     init_concurrency();
     init_configFileKey();
@@ -124935,7 +125100,7 @@ function parseVersionPolicyRule(pattern) {
 function parseExactVersionsUnion(versionsStr) {
   const versions = [];
   for (const versionRaw of versionsStr.split("||")) {
-    const version2 = import_semver16.default.valid(versionRaw);
+    const version2 = import_semver17.default.valid(versionRaw);
     if (version2 == null) {
       return null;
     }
@@ -124943,13 +125108,13 @@ function parseExactVersionsUnion(versionsStr) {
   }
   return versions;
 }
-var import_semver16;
+var import_semver17;
 var init_lib64 = __esm({
   "../config/version-policy/lib/index.js"() {
     "use strict";
     init_lib14();
     init_lib2();
-    import_semver16 = __toESM(require_semver2(), 1);
+    import_semver17 = __toESM(require_semver2(), 1);
   }
 });
 
@@ -125073,7 +125238,7 @@ function parse6(dependencyPath) {
         version2 = version2.substring(0, patchHashIndex);
       }
     }
-    if (import_semver17.default.valid(version2)) {
+    if (import_semver18.default.valid(version2)) {
       return {
         name,
         peerDepGraphHash,
@@ -125130,12 +125295,12 @@ function createPeerDepGraphHash(peerIds, maxLength = 1e3) {
 function isRuntimeDepPath(depPath) {
   return RUNTIME_DEP_PATH_RE.test(depPath);
 }
-var import_semver17, RUNTIME_DEP_PATH_RE;
+var import_semver18, RUNTIME_DEP_PATH_RE;
 var init_lib65 = __esm({
   "../deps/path/lib/index.js"() {
     "use strict";
     init_lib20();
-    import_semver17 = __toESM(require_semver2(), 1);
+    import_semver18 = __toESM(require_semver2(), 1);
     RUNTIME_DEP_PATH_RE = /^(?:node|bun|deno)@runtime:/;
   }
 });
@@ -126941,7 +127106,7 @@ var init_comver_to_semver = __esm({
 function mergeLockfileChanges(ours, theirs) {
   const newLockfile = {
     importers: {},
-    lockfileVersion: import_semver18.default.gt(comverToSemver(theirs.lockfileVersion.toString()), comverToSemver(ours.lockfileVersion.toString())) ? theirs.lockfileVersion : ours.lockfileVersion
+    lockfileVersion: import_semver19.default.gt(comverToSemver(theirs.lockfileVersion.toString()), comverToSemver(ours.lockfileVersion.toString())) ? theirs.lockfileVersion : ours.lockfileVersion
   };
   const pnpmfileChecksum = ours.pnpmfileChecksum ?? theirs.pnpmfileChecksum;
   if (pnpmfileChecksum) {
@@ -127007,19 +127172,19 @@ function mergeVersions(ourValue, theirValue) {
     return theirValue;
   const [ourVersion] = ourValue.split("(");
   const [theirVersion] = theirValue.split("(");
-  const validOurVersion = import_semver18.default.valid(ourVersion);
-  const validTheirVersion = import_semver18.default.valid(theirVersion);
+  const validOurVersion = import_semver19.default.valid(ourVersion);
+  const validTheirVersion = import_semver19.default.valid(theirVersion);
   if (validOurVersion && validTheirVersion) {
-    return import_semver18.default.gt(ourVersion, theirVersion) ? ourValue : theirValue;
+    return import_semver19.default.gt(ourVersion, theirVersion) ? ourValue : theirValue;
   }
   return theirValue;
 }
-var import_semver18;
+var import_semver19;
 var init_lib77 = __esm({
   "../lockfile/merger/lib/index.js"() {
     "use strict";
     init_comver_to_semver();
-    import_semver18 = __toESM(require_semver2(), 1);
+    import_semver19 = __toESM(require_semver2(), 1);
   }
 });
 
@@ -127100,7 +127265,7 @@ var init_gitMergeFile = __esm({
 });
 
 // ../lockfile/fs/lib/read.js
-import { promises as fs39 } from "node:fs";
+import fs39, { promises as fsp } from "node:fs";
 import path69 from "node:path";
 import util19 from "node:util";
 async function readCurrentLockfile(pnpmInternalDir, opts2) {
@@ -127116,10 +127281,21 @@ async function readWantedLockfileAndAutofixConflicts(pkgPath, opts2) {
 async function readWantedLockfile(pkgPath, opts2) {
   return (await _readWantedLockfile(pkgPath, opts2)).lockfile;
 }
+function wantedLockfileHasMergeConflictsSync(pkgPath) {
+  try {
+    const lockfileRawContent = stripBom(fs39.readFileSync(path69.join(pkgPath, WANTED_LOCKFILE), "utf8"));
+    return isDiff(extractMainDocument(lockfileRawContent));
+  } catch (err) {
+    if (util19.types.isNativeError(err) && "code" in err && err.code === "ENOENT") {
+      return false;
+    }
+    throw err;
+  }
+}
 async function _read(lockfilePath, prefix, opts2) {
   let lockfileRawContent;
   try {
-    lockfileRawContent = stripBom(await fs39.readFile(lockfilePath, "utf8"));
+    lockfileRawContent = stripBom(await fsp.readFile(lockfilePath, "utf8"));
   } catch (err) {
     if (!(util19.types.isNativeError(err) && "code" in err && err.code === "ENOENT")) {
       throw err;
@@ -127155,9 +127331,9 @@ async function _read(lockfilePath, prefix, opts2) {
   if (lockfile) {
     const lockfileSemver = comverToSemver((lockfile.lockfileVersion ?? 0).toString());
     if (!opts2.wantedVersions || opts2.wantedVersions.length === 0 || opts2.wantedVersions.some((wantedVersion) => {
-      if (import_semver19.default.major(lockfileSemver) !== import_semver19.default.major(comverToSemver(wantedVersion)))
+      if (import_semver20.default.major(lockfileSemver) !== import_semver20.default.major(comverToSemver(wantedVersion)))
         return false;
-      if (lockfile.lockfileVersion !== "6.1" && import_semver19.default.gt(lockfileSemver, comverToSemver(wantedVersion))) {
+      if (lockfile.lockfileVersion !== "6.1" && import_semver20.default.gt(lockfileSemver, comverToSemver(wantedVersion))) {
         lockfileLogger.warn({
           message: `Your ${WANTED_LOCKFILE} was generated by a newer version of pnpm. It is a compatible version but it might get downgraded to version ${wantedVersion}`,
           prefix
@@ -127233,7 +127409,7 @@ async function _readGitBranchLockfiles(lockfileDir, prefix, opts2) {
   const files = await getGitBranchLockfileNames(lockfileDir);
   return Promise.all(files.map((file) => _read(path69.join(lockfileDir, file), prefix, opts2)));
 }
-var import_semver19;
+var import_semver20;
 var init_read = __esm({
   "../lockfile/fs/lib/read.js"() {
     "use strict";
@@ -127242,7 +127418,7 @@ var init_read = __esm({
     init_lib77();
     init_comver_to_semver();
     init_js_yaml();
-    import_semver19 = __toESM(require_semver2(), 1);
+    import_semver20 = __toESM(require_semver2(), 1);
     init_strip_bom();
     init_errors();
     init_gitBranchLockfile();
@@ -127848,16 +128024,16 @@ function normalizeBundledManifest(manifest) {
   if (!result2 && !scripts)
     return void 0;
   return {
-    version: import_semver20.default.clean(manifest.version ?? "0.0.0", { loose: true }) ?? manifest.version,
+    version: import_semver21.default.clean(manifest.version ?? "0.0.0", { loose: true }) ?? manifest.version,
     ...result2,
     ...scripts ? { scripts } : {}
   };
 }
-var import_semver20, BUNDLED_MANIFEST_FIELDS, LIFECYCLE_SCRIPTS;
+var import_semver21, BUNDLED_MANIFEST_FIELDS, LIFECYCLE_SCRIPTS;
 var init_normalizeBundledManifest = __esm({
   "../store/cafs/lib/normalizeBundledManifest.js"() {
     "use strict";
-    import_semver20 = __toESM(require_semver2(), 1);
+    import_semver21 = __toESM(require_semver2(), 1);
     BUNDLED_MANIFEST_FIELDS = [
       "bin",
       "bundledDependencies",
@@ -129213,7 +129389,8 @@ async function resolveAndFetch(ctx, wantedDependency, options) {
       id: options.currentPkg.id,
       name: options.currentPkg.name,
       version: options.currentPkg.version,
-      resolution: options.currentPkg.resolution
+      resolution: options.currentPkg.resolution,
+      publishedAt: options.currentPkg.publishedAt
     } : void 0
   }), { priority: options.downloadPriority });
   let { manifest } = resolveResult;
@@ -133177,7 +133354,7 @@ function matches(searched, manifest) {
     if (typeof searchedPkg === "string") {
       return manifest.name === searchedPkg;
     }
-    return searchedPkg.name === manifest.name && !!manifest.version && import_semver21.default.satisfies(manifest.version, searchedPkg.range);
+    return searchedPkg.name === manifest.name && !!manifest.version && import_semver22.default.satisfies(manifest.version, searchedPkg.range);
   });
 }
 async function buildSelectedPkgs(projects, pkgSpecs, maybeOpts) {
@@ -133496,7 +133673,7 @@ function mergeIgnoredBuilds(existing, newIgnored, rebuiltPkgs) {
   }
   return merged.size ? merged : void 0;
 }
-var import_logger52, import_npm_package_arg2, import_semver21, limitLinking;
+var import_logger52, import_npm_package_arg2, import_semver22, limitLinking;
 var init_lib91 = __esm({
   "../building/after-install/lib/index.js"() {
     "use strict";
@@ -133522,7 +133699,7 @@ var init_lib91 = __esm({
     init_lib4();
     init_p_limit();
     init_lib42();
-    import_semver21 = __toESM(require_semver2(), 1);
+    import_semver22 = __toESM(require_semver2(), 1);
     init_extendBuildOptions();
     limitLinking = pLimit(16);
   }
@@ -143332,7 +143509,7 @@ function extendPkgHook(extensionsByPkgName, manifest) {
 }
 function extendPkg(manifest, extensions2) {
   for (const { range, packageExtension } of extensions2) {
-    if (range != null && !import_semver22.default.satisfies(manifest.version, range))
+    if (range != null && !import_semver23.default.satisfies(manifest.version, range))
       continue;
     for (const field of ["dependencies", "optionalDependencies", "peerDependencies", "peerDependenciesMeta"]) {
       if (!packageExtension[field])
@@ -143344,24 +143521,24 @@ function extendPkg(manifest, extensions2) {
     }
   }
 }
-var import_semver22;
+var import_semver23;
 var init_createPackageExtender = __esm({
   "../hooks/read-package-hook/lib/createPackageExtender.js"() {
     "use strict";
     init_lib96();
-    import_semver22 = __toESM(require_semver2(), 1);
+    import_semver23 = __toESM(require_semver2(), 1);
   }
 });
 
 // ../hooks/read-package-hook/lib/isIntersectingRange.js
 function isIntersectingRange(range1, range2) {
-  return !range1 || range2 === range1 || import_semver23.default.validRange(range2) != null && import_semver23.default.validRange(range1) != null && import_semver23.default.intersects(range2, range1);
+  return !range1 || range2 === range1 || import_semver24.default.validRange(range2) != null && import_semver24.default.validRange(range1) != null && import_semver24.default.intersects(range2, range1);
 }
-var import_semver23;
+var import_semver24;
 var init_isIntersectingRange = __esm({
   "../hooks/read-package-hook/lib/isIntersectingRange.js"() {
     "use strict";
-    import_semver23 = __toESM(require_semver2(), 1);
+    import_semver24 = __toESM(require_semver2(), 1);
   }
 });
 
@@ -143374,7 +143551,7 @@ function createVersionsOverrider(overrides, rootDir) {
   })));
   return ((manifest, dir) => {
     const versionOverridesWithParent = versionOverrides.filter(({ parentPkg }) => {
-      return parentPkg.name === manifest.name && (!parentPkg.bareSpecifier || import_semver24.default.satisfies(manifest.version, parentPkg.bareSpecifier));
+      return parentPkg.name === manifest.name && (!parentPkg.bareSpecifier || import_semver25.default.satisfies(manifest.version, parentPkg.bareSpecifier));
     });
     overrideDepsOfPkg({ manifest, dir }, versionOverridesWithParent, genericVersionOverrides);
     return manifest;
@@ -143435,14 +143612,14 @@ function resolveLocalOverride({ specifiedViaRelativePath, absolutePath }, pkgDir
 function pickMostSpecificVersionOverride(versionOverrides) {
   return versionOverrides.sort((a2, b) => isIntersectingRange(b.targetPkg.bareSpecifier ?? "", a2.targetPkg.bareSpecifier ?? "") ? -1 : 1)[0];
 }
-var import_normalize_path5, import_semver24;
+var import_normalize_path5, import_semver25;
 var init_createVersionsOverrider = __esm({
   "../hooks/read-package-hook/lib/createVersionsOverrider.js"() {
     "use strict";
     init_lib7();
     import_normalize_path5 = __toESM(require_normalize_path(), 1);
     init_es();
-    import_semver24 = __toESM(require_semver2(), 1);
+    import_semver25 = __toESM(require_semver2(), 1);
     init_isIntersectingRange();
   }
 });
@@ -143500,7 +143677,7 @@ function getPatchInfo(patchFileGroups, pkgName, pkgVersion) {
   const exactVersion = patchFileGroups[pkgName].exact[pkgVersion];
   if (exactVersion)
     return exactVersion;
-  const satisfied = patchFileGroups[pkgName].range.filter((item) => (0, import_semver25.satisfies)(pkgVersion, item.version));
+  const satisfied = patchFileGroups[pkgName].range.filter((item) => (0, import_semver26.satisfies)(pkgVersion, item.version));
   if (satisfied.length > 1) {
     throw new PatchKeyConflictError(pkgName, pkgVersion, satisfied);
   }
@@ -143509,12 +143686,12 @@ function getPatchInfo(patchFileGroups, pkgName, pkgVersion) {
   }
   return patchFileGroups[pkgName].all;
 }
-var import_semver25, PatchKeyConflictError;
+var import_semver26, PatchKeyConflictError;
 var init_getPatchInfo = __esm({
   "../patching/config/lib/getPatchInfo.js"() {
     "use strict";
     init_lib2();
-    import_semver25 = __toESM(require_semver2(), 1);
+    import_semver26 = __toESM(require_semver2(), 1);
     PatchKeyConflictError = class extends PnpmError {
       constructor(pkgName, pkgVersion, satisfied) {
         const pkgId = `${pkgName}@${pkgVersion}`;
@@ -143552,7 +143729,7 @@ function groupPatchedDependencies(patchedDependencies) {
       continue;
     }
     if (name && nonSemverVersion) {
-      if (!(0, import_semver26.validRange)(nonSemverVersion)) {
+      if (!(0, import_semver27.validRange)(nonSemverVersion)) {
         throw new PnpmError("PATCH_NON_SEMVER_RANGE", `${nonSemverVersion} is not a valid semantic version range.`);
       }
       if (nonSemverVersion.trim() === "*") {
@@ -143569,13 +143746,13 @@ function groupPatchedDependencies(patchedDependencies) {
   }
   return result2;
 }
-var import_semver26;
+var import_semver27;
 var init_groupPatchedDependencies = __esm({
   "../patching/config/lib/groupPatchedDependencies.js"() {
     "use strict";
     init_lib65();
     init_lib2();
-    import_semver26 = __toESM(require_semver2(), 1);
+    import_semver27 = __toESM(require_semver2(), 1);
   }
 });
 
@@ -143904,14 +144081,14 @@ function hoistPeers(opts2, missingRequiredPeers) {
           nonVersions.push(spec);
         }
       }
-      const isExactVersion = import_semver27.default.valid(range) != null;
-      const satisfyingVersion = isExactVersion ? import_semver27.default.maxSatisfying(versions, range, { includePrerelease: true }) : null;
+      const isExactVersion = import_semver28.default.valid(range) != null;
+      const satisfyingVersion = isExactVersion ? import_semver28.default.maxSatisfying(versions, range, { includePrerelease: true }) : null;
       if (satisfyingVersion) {
         dependencies[peerName] = [satisfyingVersion, ...nonVersions].join(" || ");
       } else if (isExactVersion && opts2.autoInstallPeers) {
         dependencies[peerName] = range;
       } else {
-        dependencies[peerName] = [import_semver27.default.maxSatisfying(versions, "*", { includePrerelease: true }), ...nonVersions].filter((spec) => spec != null).join(" || ");
+        dependencies[peerName] = [import_semver28.default.maxSatisfying(versions, "*", { includePrerelease: true }), ...nonVersions].filter((spec) => spec != null).join(" || ");
       }
     } else if (opts2.autoInstallPeers) {
       dependencies[peerName] = range;
@@ -143926,7 +144103,7 @@ function getHoistableOptionalPeers(allMissingOptionalPeers, allPreferredVersions
       continue;
     let maxSatisfyingVersion;
     for (const [version2, specType] of Object.entries(allPreferredVersions[missingOptionalPeerName])) {
-      if (specType === "version" && ranges.every((range) => import_semver27.default.satisfies(version2, range)) && (!maxSatisfyingVersion || import_semver27.default.gt(version2, maxSatisfyingVersion))) {
+      if (specType === "version" && ranges.every((range) => import_semver28.default.satisfies(version2, range)) && (!maxSatisfyingVersion || import_semver28.default.gt(version2, maxSatisfyingVersion))) {
         maxSatisfyingVersion = version2;
       }
     }
@@ -143936,12 +144113,12 @@ function getHoistableOptionalPeers(allMissingOptionalPeers, allPreferredVersions
   }
   return optionalDependencies;
 }
-var import_util10, import_semver27;
+var import_util10, import_semver28;
 var init_hoistPeers = __esm({
   "../installing/deps-resolver/lib/hoistPeers.js"() {
     "use strict";
     import_util10 = __toESM(require_dist3(), 1);
-    import_semver27 = __toESM(require_semver2(), 1);
+    import_semver28 = __toESM(require_semver2(), 1);
   }
 });
 
@@ -144491,7 +144668,7 @@ var init_parentIdsContainSequence = __esm({
 
 // ../installing/deps-resolver/lib/replaceVersionInBareSpecifier.js
 function replaceVersionInBareSpecifier(bareSpecifier, version2, namedRegistryPrefixes = []) {
-  if (import_semver28.default.validRange(bareSpecifier)) {
+  if (import_semver29.default.validRange(bareSpecifier)) {
     return version2;
   }
   let prefix;
@@ -144508,7 +144685,7 @@ function replaceVersionInBareSpecifier(bareSpecifier, version2, namedRegistryPre
   if (prefix == null) {
     return bareSpecifier;
   }
-  if (import_semver28.default.validRange(bareSpecifier.slice(prefix.length))) {
+  if (import_semver29.default.validRange(bareSpecifier.slice(prefix.length))) {
     return `${prefix}${version2}`;
   }
   const versionDelimiter = bareSpecifier.lastIndexOf("@");
@@ -144517,11 +144694,11 @@ function replaceVersionInBareSpecifier(bareSpecifier, version2, namedRegistryPre
   }
   return `${bareSpecifier.substring(0, versionDelimiter + 1)}${version2}`;
 }
-var import_semver28;
+var import_semver29;
 var init_replaceVersionInBareSpecifier = __esm({
   "../installing/deps-resolver/lib/replaceVersionInBareSpecifier.js"() {
     "use strict";
-    import_semver28 = __toESM(require_semver2(), 1);
+    import_semver29 = __toESM(require_semver2(), 1);
   }
 });
 
@@ -144536,21 +144713,21 @@ function pickMatchingLocalVersionOrNull2(versions, spec) {
   const localVersions = Array.from(versions.keys());
   switch (spec.type) {
     case "tag":
-      return import_semver29.default.maxSatisfying(localVersions, "*");
+      return import_semver30.default.maxSatisfying(localVersions, "*");
     case "version":
       return versions.has(spec.fetchSpec) ? spec.fetchSpec : null;
     case "range":
-      return import_semver29.default.maxSatisfying(localVersions, spec.fetchSpec, true);
+      return import_semver30.default.maxSatisfying(localVersions, spec.fetchSpec, true);
     default:
       return null;
   }
 }
-var import_semver29;
+var import_semver30;
 var init_wantedDepIsLocallyAvailable = __esm({
   "../installing/deps-resolver/lib/wantedDepIsLocallyAvailable.js"() {
     "use strict";
     init_lib23();
-    import_semver29 = __toESM(require_semver2(), 1);
+    import_semver30 = __toESM(require_semver2(), 1);
   }
 });
 
@@ -145092,7 +145269,7 @@ function getDepsToResolve(wantedDependencies, wantedLockfile, options) {
         // So for example, if foo@1.0.0 had bar@1.0.0 as a dependency
         // and foo was updated to 1.1.0 which depends on bar ^1.0.0
         // then bar@1.0.0 can be reused for foo@1.1.0
-        import_semver30.default.validRange(wantedDependency.bareSpecifier) !== null && preferredDependencies[wantedDependency.alias] && satisfiesWanted(preferredDependencies[wantedDependency.alias])
+        import_semver31.default.validRange(wantedDependency.bareSpecifier) !== null && preferredDependencies[wantedDependency.alias] && satisfiesWanted(preferredDependencies[wantedDependency.alias])
       ) {
         proceed = true;
         reference = preferredDependencies[wantedDependency.alias];
@@ -145129,10 +145306,10 @@ function referenceSatisfiesWantedSpec(opts2, wantedDep, preferredRef) {
     return false;
   }
   const { version: version2 } = nameVerFromPkgSnapshot(depPath, pkgSnapshot);
-  if (!import_semver30.default.validRange(wantedDep.bareSpecifier) && Object.values(opts2.lockfile.importers).filter((importer) => importer.specifiers[wantedDep.alias] === wantedDep.bareSpecifier).length) {
+  if (!import_semver31.default.validRange(wantedDep.bareSpecifier) && Object.values(opts2.lockfile.importers).filter((importer) => importer.specifiers[wantedDep.alias] === wantedDep.bareSpecifier).length) {
     return true;
   }
-  return import_semver30.default.satisfies(version2, wantedDep.bareSpecifier, true);
+  return import_semver31.default.satisfies(version2, wantedDep.bareSpecifier, true);
 }
 function getInfoFromLockfile(lockfile, registries, reference, alias) {
   if (!reference || !alias) {
@@ -145205,7 +145382,8 @@ async function resolveDependency2(wantedDependency, ctx, options) {
         id: currentPkg.pkgId,
         name: currentPkg.name,
         resolution: currentPkg.resolution,
-        version: currentPkg.version
+        version: currentPkg.version,
+        publishedAt: currentPkg.pkgId ? ctx.wantedLockfile.time?.[currentPkg.pkgId] : void 0
       } : void 0,
       expectedPkg: currentPkg,
       defaultTag: ctx.defaultTag,
@@ -145370,7 +145548,7 @@ async function resolveDependency2(wantedDependency, ctx, options) {
   const parentImporterId = options.parentIds[0];
   const currentIsOptional = wantedDependency.optional || options.parentPkg.optional;
   if (isNew) {
-    if (pkg.deprecated && (!ctx.allowedDeprecatedVersions[pkg.name] || !import_semver30.default.satisfies(pkg.version, ctx.allowedDeprecatedVersions[pkg.name]))) {
+    if (pkg.deprecated && (!ctx.allowedDeprecatedVersions[pkg.name] || !import_semver31.default.satisfies(pkg.version, ctx.allowedDeprecatedVersions[pkg.name]))) {
       deprecationLogger.debug({
         deprecated: pkg.deprecated,
         depth: options.currentDepth,
@@ -145561,7 +145739,7 @@ function getCatalogExistingVersionFromSnapshot(catalogLookup, wantedLockfile, wa
 function isExoticDep(resolvedVia) {
   return !NON_EXOTIC_RESOLVED_VIA.has(resolvedVia);
 }
-var import_normalize_path6, import_semver30, dependencyResolvedLogger, omitDepsFields, NON_EXOTIC_RESOLVED_VIA;
+var import_normalize_path6, import_semver31, dependencyResolvedLogger, omitDepsFields, NON_EXOTIC_RESOLVED_VIA;
 var init_resolveDependencies = __esm({
   "../installing/deps-resolver/lib/resolveDependencies.js"() {
     "use strict";
@@ -145580,7 +145758,7 @@ var init_resolveDependencies = __esm({
     init_path_exists();
     init_promise_share();
     init_es();
-    import_semver30 = __toESM(require_semver2(), 1);
+    import_semver31 = __toESM(require_semver2(), 1);
     init_getExactSinglePreferredVersions();
     init_getNonDevWantedDependencies();
     init_hoistPeers();
@@ -147608,12 +147786,12 @@ function updateParentRefs(parentRefs, newAlias, pkg) {
     if (!existingHasAlias)
       return;
     const newHasAlias = pkg.alias != null && pkg.alias !== newAlias;
-    if (newHasAlias && import_semver31.default.gte(existing.version, pkg.version))
+    if (newHasAlias && import_semver32.default.gte(existing.version, pkg.version))
       return;
   }
   parentRefs[newAlias] = pkg;
 }
-var semverUtils, import_semver31;
+var semverUtils, import_semver32;
 var init_resolvePeers = __esm({
   "../installing/deps-resolver/lib/resolvePeers.js"() {
     "use strict";
@@ -147622,7 +147800,7 @@ var init_resolvePeers = __esm({
     init_dist9();
     init_p_defer();
     init_es();
-    import_semver31 = __toESM(require_semver2(), 1);
+    import_semver32 = __toESM(require_semver2(), 1);
     init_dedupeInjectedDeps();
     init_linkPathToPeerVersion();
     init_mergePeers();
@@ -157001,7 +157179,7 @@ async function linkedPackagesAreUpToDate({ linkWorkspacePackages, manifestsByDir
       }
       const linkedPkg = manifestsByDir[linkedDir] ?? await safeReadPackageJsonFromDir(linkedDir);
       const availableRange = getVersionRange(currentSpec);
-      const localPackageSatisfiesRange = availableRange === "*" || availableRange === "^" || availableRange === "~" || linkedPkg && import_semver32.default.satisfies(linkedPkg.version, availableRange, { loose: true });
+      const localPackageSatisfiesRange = availableRange === "*" || availableRange === "^" || availableRange === "~" || linkedPkg && import_semver33.default.satisfies(linkedPkg.version, availableRange, { loose: true });
       if (isLinked !== localPackageSatisfiesRange)
         return false;
       return true;
@@ -157030,7 +157208,7 @@ async function isLocalFileDepUpdated(lockfileDir, pkgSnapshot) {
       const currentSpec = manifestDeps[depName];
       if (currentSpec.startsWith("file:") || currentSpec.startsWith("link:") || currentSpec.startsWith("workspace:"))
         continue;
-      if (import_semver32.default.satisfies(lockfileDeps[depName], getVersionRange(currentSpec), { loose: true })) {
+      if (import_semver33.default.satisfies(lockfileDeps[depName], getVersionRange(currentSpec), { loose: true })) {
         continue;
       } else {
         return false;
@@ -157051,7 +157229,7 @@ function getVersionRange(spec) {
   }
   return spec;
 }
-var import_p_every, import_semver32, import_version_selector_type6;
+var import_p_every, import_semver33, import_version_selector_type6;
 var init_linkedPackagesAreUpToDate = __esm({
   "../lockfile/verification/lib/linkedPackagesAreUpToDate.js"() {
     "use strict";
@@ -157060,7 +157238,7 @@ var init_linkedPackagesAreUpToDate = __esm({
     init_lib38();
     init_lib8();
     import_p_every = __toESM(require_p_every(), 1);
-    import_semver32 = __toESM(require_semver2(), 1);
+    import_semver33 = __toESM(require_semver2(), 1);
     import_version_selector_type6 = __toESM(require_version_selector_type(), 1);
   }
 });
@@ -157228,10 +157406,10 @@ ${displaySpecDiff(specsDiff)}`
           detailedReason: `importer ${depField}.${depName} specifier ${importer.specifiers[depName]} don't match package manifest specifier (${pkgDeps[depName]})`
         };
       }
-      if (importer?.specifiers[depName] == null || !import_semver33.default.validRange(importer?.specifiers[depName]))
+      if (importer?.specifiers[depName] == null || !import_semver34.default.validRange(importer?.specifiers[depName]))
         continue;
       const version2 = removeSuffix(importerDeps[depName]);
-      if (import_semver33.default.valid(version2) && !import_semver33.default.satisfies(version2, importer.specifiers[depName])) {
+      if (import_semver34.default.valid(version2) && !import_semver34.default.satisfies(version2, importer.specifiers[depName])) {
         return {
           satisfies: false,
           detailedReason: `The importer resolution is broken at dependency "${depName}": version "${version2}" doesn't satisfy range "${importer.specifiers[depName]}"`
@@ -157266,14 +157444,14 @@ function displaySpecDiff({ added, removed, modified }) {
   }
   return result2;
 }
-var import_semver33;
+var import_semver34;
 var init_satisfiesPackageManifest = __esm({
   "../lockfile/verification/lib/satisfiesPackageManifest.js"() {
     "use strict";
     init_lib65();
     init_lib8();
     init_es();
-    import_semver33 = __toESM(require_semver2(), 1);
+    import_semver34 = __toESM(require_semver2(), 1);
     init_diffFlatRecords();
   }
 });
@@ -157452,28 +157630,34 @@ var init_parseWantedDependencies = __esm({
 // ../installing/deps-installer/lib/uninstall/removeDeps.js
 async function removeDeps(packageManifest, removedPackages, opts2) {
   if (opts2.saveType) {
-    if (packageManifest[opts2.saveType] == null)
+    if (!Object.hasOwn(packageManifest, opts2.saveType))
+      return packageManifest;
+    const targetDeps = packageManifest[opts2.saveType];
+    if (targetDeps == null)
       return packageManifest;
     for (const dependency of removedPackages) {
-      delete packageManifest[opts2.saveType][dependency];
+      removeOwnEntry(targetDeps, dependency);
     }
   } else {
     for (const depField of DEPENDENCIES_FIELDS) {
-      if (!packageManifest[depField])
+      const fieldDeps = packageManifest[depField];
+      if (!fieldDeps)
         continue;
       for (const dependency of removedPackages) {
-        delete packageManifest[depField][dependency];
+        removeOwnEntry(fieldDeps, dependency);
       }
     }
   }
   if (packageManifest.peerDependencies != null) {
+    const peerDeps = packageManifest.peerDependencies;
     for (const removedDependency of removedPackages) {
-      delete packageManifest.peerDependencies[removedDependency];
+      removeOwnEntry(peerDeps, removedDependency);
     }
   }
   if (packageManifest.dependenciesMeta != null) {
+    const depsMeta = packageManifest.dependenciesMeta;
     for (const removedDependency of removedPackages) {
-      delete packageManifest.dependenciesMeta[removedDependency];
+      removeOwnEntry(depsMeta, removedDependency);
     }
   }
   packageManifestLogger.debug({
@@ -157482,6 +157666,11 @@ async function removeDeps(packageManifest, removedPackages, opts2) {
   });
   return packageManifest;
 }
+function removeOwnEntry(target2, key) {
+  if (Object.hasOwn(target2, key)) {
+    delete target2[key];
+  }
+}
 var init_removeDeps = __esm({
   "../installing/deps-installer/lib/uninstall/removeDeps.js"() {
     "use strict";
@@ -158128,17 +158317,17 @@ function filterPeerDependencyIssues(peerDependencyIssuesByProjects, rules) {
         continue;
       const filteredIssues = [];
       for (const issue of issues) {
-        if (allowedVersionsMatchAll[peerName]?.some((range) => import_semver34.default.satisfies(issue.foundVersion, range)))
+        if (allowedVersionsMatchAll[peerName]?.some((range) => import_semver35.default.satisfies(issue.foundVersion, range)))
           continue;
         const currentParentPkg = issue.parents.at(-1);
         if (currentParentPkg && allowedVersionsByParentPkgName[peerName]?.[currentParentPkg.name]) {
           const allowedVersionsByParent = {};
           for (const { targetPkg, parentPkg, ranges } of allowedVersionsByParentPkgName[peerName][currentParentPkg.name]) {
-            if (!parentPkg.bareSpecifier || currentParentPkg.version && (isSubRange(parentPkg.bareSpecifier, currentParentPkg.version) || import_semver34.default.satisfies(currentParentPkg.version, parentPkg.bareSpecifier))) {
+            if (!parentPkg.bareSpecifier || currentParentPkg.version && (isSubRange(parentPkg.bareSpecifier, currentParentPkg.version) || import_semver35.default.satisfies(currentParentPkg.version, parentPkg.bareSpecifier))) {
               allowedVersionsByParent[targetPkg.name] = ranges;
             }
           }
-          if (allowedVersionsByParent[peerName]?.some((range) => import_semver34.default.satisfies(issue.foundVersion, range)))
+          if (allowedVersionsByParent[peerName]?.some((range) => import_semver35.default.satisfies(issue.foundVersion, range)))
             continue;
         }
         filteredIssues.push(issue);
@@ -158151,7 +158340,7 @@ function filterPeerDependencyIssues(peerDependencyIssuesByProjects, rules) {
   return newPeerDependencyIssuesByProjects;
 }
 function isSubRange(superRange, subRange) {
-  return !superRange || subRange === superRange || import_semver34.default.validRange(subRange) != null && import_semver34.default.validRange(superRange) != null && import_semver34.default.subset(subRange, superRange);
+  return !superRange || subRange === superRange || import_semver35.default.validRange(subRange) != null && import_semver35.default.validRange(superRange) != null && import_semver35.default.subset(subRange, superRange);
 }
 function tryParseAllowedVersions(allowedVersions) {
   try {
@@ -158190,7 +158379,7 @@ function parseAllowedVersions(allowedVersions) {
 function parseVersions(versions) {
   return versions.split("||").map((v) => v.trim());
 }
-var import_semver34, PeerDependencyIssuesError;
+var import_semver35, PeerDependencyIssuesError;
 var init_reportPeerDependencyIssues = __esm({
   "../installing/deps-installer/lib/install/reportPeerDependencyIssues.js"() {
     "use strict";
@@ -158199,7 +158388,7 @@ var init_reportPeerDependencyIssues = __esm({
     init_lib6();
     init_lib2();
     init_es();
-    import_semver34 = __toESM(require_semver2(), 1);
+    import_semver35 = __toESM(require_semver2(), 1);
     PeerDependencyIssuesError = class extends PnpmError {
       issuesByProjects;
       constructor(issues) {
@@ -158954,7 +159143,7 @@ async function mutateModules(projects, maybeOpts) {
             const catalogResult = resolveFromCatalog(opts2.catalogs, { alias: dep.alias, bareSpecifier: specifier });
             specifier = matchCatalogResolveResult(catalogResult, pickCatalogSpecifier);
           }
-          const validVersion = import_semver35.default.valid(specifier);
+          const validVersion = import_semver36.default.valid(specifier);
           if (!validVersion)
             continue;
           if (opts2.packageVulnerabilityAudit.isVulnerable(dep.alias, validVersion)) {
@@ -159013,12 +159202,13 @@ async function mutateModules(projects, maybeOpts) {
         defaultCatalog: opts2.catalogs?.default
       });
       if (opts2.catalogMode !== "manual") {
-        const catalogBareSpecifier = `catalog:${opts2.saveCatalogName == null || opts2.saveCatalogName === "default" ? "" : opts2.saveCatalogName}`;
         for (const wantedDep of wantedDeps) {
+          const perDepCatalogName = getPerDepCatalogName(wantedDep, opts2.saveCatalogName);
+          const catalogBareSpecifier = `catalog:${perDepCatalogName === "default" ? "" : perDepCatalogName}`;
           const catalog = resolveFromCatalog(opts2.catalogs, { ...wantedDep, bareSpecifier: catalogBareSpecifier });
           const catalogDepSpecifier = matchCatalogResolveResult(catalog, pickCatalogSpecifier);
-          if (!catalogDepSpecifier || wantedDep.bareSpecifier === catalogBareSpecifier || import_semver35.default.validRange(wantedDep.bareSpecifier) && import_semver35.default.validRange(catalogDepSpecifier) && import_semver35.default.eq(wantedDep.bareSpecifier, catalogDepSpecifier)) {
-            wantedDep.saveCatalogName = opts2.saveCatalogName ?? "default";
+          if (!catalogDepSpecifier || wantedDep.bareSpecifier === catalogBareSpecifier || import_semver36.default.validRange(wantedDep.bareSpecifier) && import_semver36.default.validRange(catalogDepSpecifier) && import_semver36.default.eq(wantedDep.bareSpecifier, catalogDepSpecifier)) {
+            wantedDep.saveCatalogName = perDepCatalogName;
             continue;
           }
           switch (opts2.catalogMode) {
@@ -159254,6 +159444,15 @@ function isWantedDepBareSpecifierSame(prevCatalogs, catalogsConfig, alias, prevB
   const nextCatalogEntrySpec = catalogsConfig?.[catalogName]?.[alias];
   return prevCatalogEntrySpec === nextCatalogEntrySpec;
 }
+function getPerDepCatalogName(wantedDep, globalSaveCatalogName) {
+  if (wantedDep.prevSpecifier) {
+    const catalogFromPrev = parseCatalogProtocol(wantedDep.prevSpecifier);
+    if (catalogFromPrev != null) {
+      return catalogFromPrev;
+    }
+  }
+  return globalSaveCatalogName ?? "default";
+}
 async function addDependenciesToPackage(manifest, dependencySelectors, opts2) {
   const rootDir = opts2.dir ?? process.cwd();
   const { updatedCatalogs, updatedProjects: projects, ignoredBuilds } = await mutateModules([
@@ -159558,7 +159757,7 @@ async function installFromPnpmRegistry(manifest, rootDir, opts2, allInstallProje
     restoreImportConcurrency();
   }
 }
-var import_util13, import_semver35, LockfileConfigMismatchError, BROKEN_LOCKFILE_INTEGRITY_ERRORS, DEV_PREINSTALL, pickCatalogSpecifier, _installInContext, installInContext, limitLinking5, IgnoredBuildsError;
+var import_util13, import_semver36, LockfileConfigMismatchError, BROKEN_LOCKFILE_INTEGRITY_ERRORS, DEV_PREINSTALL, pickCatalogSpecifier, _installInContext, installInContext, limitLinking5, IgnoredBuildsError;
 var init_install = __esm({
   "../installing/deps-installer/lib/install/index.js"() {
     "use strict";
@@ -159592,7 +159791,7 @@ var init_install = __esm({
     init_is_subdir();
     init_p_limit();
     init_es();
-    import_semver35 = __toESM(require_semver2(), 1);
+    import_semver36 = __toESM(require_semver2(), 1);
     init_parseWantedDependencies();
     init_removeDeps();
     init_CatalogVersionMismatchError();
@@ -161291,16 +161490,16 @@ function parseSearchQuery(query) {
   }
   return {
     matchName: createMatcher(parsed.name),
-    matchVersion: (version2) => import_semver36.default.satisfies(version2, parsed.fetchSpec)
+    matchVersion: (version2) => import_semver37.default.satisfies(version2, parsed.fetchSpec)
   };
 }
-var import_npm_package_arg3, import_semver36;
+var import_npm_package_arg3, import_semver37;
 var init_createPackagesSearcher = __esm({
   "../deps/inspection/tree-builder/lib/createPackagesSearcher.js"() {
     "use strict";
     init_lib14();
     import_npm_package_arg3 = __toESM(require_npa(), 1);
-    import_semver36 = __toESM(require_semver2(), 1);
+    import_semver37 = __toESM(require_semver2(), 1);
   }
 });
 
@@ -161408,7 +161607,7 @@ async function buildDependentsTree(packages, projectPaths, opts2) {
     const nameCmp = (0, import_util15.lexCompare)(a2.name, b.name);
     if (nameCmp !== 0)
       return nameCmp;
-    const versionCmp = import_semver37.default.valid(a2.version) && import_semver37.default.valid(b.version) ? import_semver37.default.compare(a2.version, b.version) : (0, import_util15.lexCompare)(a2.version, b.version);
+    const versionCmp = import_semver38.default.valid(a2.version) && import_semver38.default.valid(b.version) ? import_semver38.default.compare(a2.version, b.version) : (0, import_util15.lexCompare)(a2.version, b.version);
     if (versionCmp !== 0)
       return versionCmp;
     return (0, import_util15.lexCompare)(a2.peersSuffixHash ?? "", b.peersSuffixHash ?? "");
@@ -161574,7 +161773,7 @@ function getDepFieldForAlias(alias, importerSnapshot) {
     return "dependencies";
   return void 0;
 }
-var import_util15, import_semver37;
+var import_util15, import_semver38;
 var init_buildDependentsTree = __esm({
   "../deps/inspection/tree-builder/lib/buildDependentsTree.js"() {
     "use strict";
@@ -161585,7 +161784,7 @@ var init_buildDependentsTree = __esm({
     init_lib16();
     import_util15 = __toESM(require_dist3(), 1);
     init_realpath_missing();
-    import_semver37 = __toESM(require_semver2(), 1);
+    import_semver38 = __toESM(require_semver2(), 1);
     init_buildDependencyGraph();
     init_createPackagesSearcher();
     init_getPkgInfo();
@@ -161818,7 +162017,7 @@ async function renderDependentsTree(trees, opts2) {
     }
     const childNodes = dependentsToTreeNodes(result2.dependents, multiPeerPkgs, 0, opts2.depth);
     const tree = { label: rootLabel, nodes: childNodes };
-    return renderTree(tree, { treeChars: source_default.dim }).replace(/\n+$/, "");
+    return trimTrailingNewlines(renderTree(tree, { treeChars: source_default.dim }));
   }))).join("\n\n");
   const summary = whySummary(trees);
   return summary ? `${output}
@@ -161941,6 +162140,12 @@ function truncateDependents(dependents, currentDepth, maxDepth) {
 function plainNameAtVersion(name, version2) {
   return version2 ? `${name}@${version2}` : name;
 }
+function trimTrailingNewlines(s) {
+  let end = s.length;
+  while (end > 0 && s.charCodeAt(end - 1) === 10)
+    end--;
+  return end === s.length ? s : s.slice(0, end);
+}
 var init_renderDependentsTree = __esm({
   "../deps/inspection/list/lib/renderDependentsTree.js"() {
     "use strict";
@@ -163274,7 +163479,7 @@ async function checkDepsStatus(opts2) {
   }
 }
 async function _checkDepsStatus(opts2, workspaceState) {
-  const { allProjects, autoInstallPeers, injectWorkspacePackages, catalogs, excludeLinksFromLockfile, linkWorkspacePackages, nodeLinker, patchedDependencies, rootProjectManifest, rootProjectManifestDir, sharedWorkspaceLockfile, workspaceDir } = opts2;
+  const { allProjects, autoInstallPeers, injectWorkspacePackages, catalogs, excludeLinksFromLockfile, linkWorkspacePackages, lockfileDir, nodeLinker, patchedDependencies, rootProjectManifest, rootProjectManifestDir, sharedWorkspaceLockfile, workspaceDir } = opts2;
   if (nodeLinker === "pnp") {
     (0, import_logger74.globalWarn)("verify-deps-before-run does not work with node-linker=pnp");
     return { upToDate: true, workspaceState: void 0 };
@@ -163312,6 +163517,20 @@ async function _checkDepsStatus(opts2, workspaceState) {
       workspaceState
     };
   }
+  const conflictedLockfileDir = findConflictedLockfileDir(getWantedLockfileDirs({
+    allProjects,
+    lockfileDir,
+    rootProjectManifestDir,
+    sharedWorkspaceLockfile,
+    workspaceDir
+  }), workspaceState.lastValidatedTimestamp);
+  if (conflictedLockfileDir != null) {
+    return {
+      upToDate: false,
+      issue: `The lockfile in ${conflictedLockfileDir} has merge conflicts`,
+      workspaceState
+    };
+  }
   if (allProjects && workspaceDir) {
     if (!equals_default(filter_default((value) => value != null, workspaceState.settings.catalogs ?? {}), filter_default((value) => value != null, catalogs ?? {}))) {
       return {
@@ -163369,11 +163588,6 @@ async function _checkDepsStatus(opts2, workspaceState) {
         };
       }
     }
-    const modifiedProjects = allManifestStats.filter(({ manifestStats }) => manifestStats.mtime.valueOf() > workspaceState.lastValidatedTimestamp);
-    if (modifiedProjects.length === 0) {
-      import_logger74.logger.debug({ msg: "No manifest files were modified since the last validation. Exiting check." });
-      return { upToDate: true, workspaceState };
-    }
     const issue = await patchesOrHooksAreModified({
       patchedDependencies,
       rootDir: rootProjectManifestDir,
@@ -163384,6 +163598,11 @@ async function _checkDepsStatus(opts2, workspaceState) {
     if (issue) {
       return { upToDate: false, issue, workspaceState };
     }
+    const modifiedProjects = allManifestStats.filter(({ manifestStats }) => manifestStats.mtime.valueOf() > workspaceState.lastValidatedTimestamp);
+    if (modifiedProjects.length === 0) {
+      import_logger74.logger.debug({ msg: "No manifest files were modified since the last validation. Exiting check." });
+      return { upToDate: true, workspaceState };
+    }
     import_logger74.logger.debug({ msg: "Some manifest files were modified since the last validation. Continuing check." });
     let readWantedLockfileAndDir;
     if (sharedWorkspaceLockfile) {
@@ -163468,9 +163687,8 @@ async function _checkDepsStatus(opts2, workspaceState) {
     const workspaceRoot = workspaceDir ?? rootProjectManifestDir;
     const workspaceManifest = await readWorkspaceManifest(workspaceRoot);
     if (workspaceManifest ?? workspaceDir) {
-      const allProjects2 = await findWorkspaceProjects(rootProjectManifestDir, {
-        patterns: workspaceManifest?.packages,
-        sharedWorkspaceLockfile
+      const allProjects2 = await findWorkspaceProjectsNoCheck(rootProjectManifestDir, {
+        patterns: workspaceManifest?.packages
       });
       return checkDepsStatus({
         ...opts2,
@@ -163603,6 +163821,29 @@ function throwLockfileNotFound(wantedLockfileDir) {
     hint: "Run `pnpm install` to create the lockfile"
   });
 }
+function getWantedLockfileDirs(opts2) {
+  if (opts2.allProjects && opts2.workspaceDir && opts2.sharedWorkspaceLockfile === false) {
+    return [...new Set(opts2.allProjects.map(({ rootDir }) => rootDir))];
+  }
+  return [opts2.lockfileDir ?? opts2.workspaceDir ?? opts2.rootProjectManifestDir];
+}
+function findConflictedLockfileDir(lockfileDirs, lastValidatedTimestamp) {
+  for (const lockfileDir of lockfileDirs) {
+    let mtime;
+    try {
+      mtime = fs79.statSync(path144.join(lockfileDir, WANTED_LOCKFILE)).mtime.valueOf();
+    } catch (err) {
+      if (util37.types.isNativeError(err) && "code" in err && err.code === "ENOENT")
+        continue;
+      throw err;
+    }
+    if (mtime <= lastValidatedTimestamp)
+      continue;
+    if (wantedLockfileHasMergeConflictsSync(lockfileDir))
+      return lockfileDir;
+  }
+  return void 0;
+}
 async function patchesOrHooksAreModified(opts2) {
   if (opts2.patchedDependencies) {
     const allPatchStats = await Promise.all(Object.values(opts2.patchedDependencies).map((patchFile) => {
@@ -164944,6 +165185,10 @@ function help4() {
           OPTIONS.ignoreScripts,
           OPTIONS.offline,
           OPTIONS.preferOffline,
+          {
+            description: "The registry to use for the installation",
+            name: "--registry <url>"
+          },
           OPTIONS.storeDir,
           OPTIONS.virtualStoreDir,
           OPTIONS.globalDir,
@@ -187779,7 +188024,7 @@ async function outdated(opts2) {
         });
         return;
       }
-      if (current !== wanted || import_semver38.default.lt(current, latestManifest.version) || latestManifest.deprecated) {
+      if (current !== wanted || import_semver39.default.lt(current, latestManifest.version) || latestManifest.deprecated) {
         outdated2.push({
           alias,
           belongsTo: depType,
@@ -187809,7 +188054,7 @@ function replaceCatalogProtocolIfNecessary(catalogs, wantedDependency) {
     }
   });
 }
-var import_semver38;
+var import_semver39;
 var init_outdated = __esm({
   "../deps/inspection/outdated/lib/outdated.js"() {
     "use strict";
@@ -187826,7 +188071,7 @@ var init_outdated = __esm({
     init_lib9();
     init_lib23();
     init_lib8();
-    import_semver38 = __toESM(require_semver2(), 1);
+    import_semver39 = __toESM(require_semver2(), 1);
     init_createManifestGetter();
   }
 });
@@ -198008,7 +198253,7 @@ function isBulkResponseShape(body) {
 }
 function satisfiesSafe(version2, range) {
   try {
-    return import_semver39.default.satisfies(version2, range, { includePrerelease: true, loose: true });
+    return import_semver40.default.satisfies(version2, range, { includePrerelease: true, loose: true });
   } catch {
     return false;
   }
@@ -198035,7 +198280,7 @@ function inferPatchedVersions(vulnerableRange) {
     return `>=${ltMatch[1]}`;
   const lteMatch = trimmed.match(/(?:^|\s)<=\s*(\d+\.\d+\.\d[\w\-.+]*)\s*$/);
   if (lteMatch) {
-    const next2 = import_semver39.default.inc(lteMatch[1], "patch");
+    const next2 = import_semver40.default.inc(lteMatch[1], "patch");
     if (next2)
       return `>=${next2}`;
   }
@@ -198061,14 +198306,14 @@ function getAuthHeaders(authHeaderValue) {
   }
   return headers;
 }
-var import_semver39, KNOWN_SEVERITIES, AuditEndpointNotExistsError;
+var import_semver40, KNOWN_SEVERITIES, AuditEndpointNotExistsError;
 var init_lib146 = __esm({
   "../deps/compliance/audit/lib/index.js"() {
     "use strict";
     init_lib2();
     init_lib125();
     init_lib48();
-    import_semver39 = __toESM(require_semver2(), 1);
+    import_semver40 = __toESM(require_semver2(), 1);
     init_lockfileToAuditIndex();
     init_lockfileToAuditIndex();
     init_types5();
@@ -198166,7 +198411,7 @@ function createOverrides(advisories) {
   return sortDirectKeys(Object.fromEntries(entries));
 }
 function caretRangeForPatched(patchedRange) {
-  const min = import_semver40.default.minVersion(patchedRange);
+  const min = import_semver41.default.minVersion(patchedRange);
   return min ? `^${min.version}` : patchedRange;
 }
 function createMinimumReleaseAgeExcludes(advisories) {
@@ -198175,21 +198420,21 @@ function createMinimumReleaseAgeExcludes(advisories) {
     const patchedVersions = advisory.patched_versions;
     if (!patchedVersions)
       continue;
-    const minVersion = import_semver40.default.minVersion(patchedVersions);
+    const minVersion = import_semver41.default.minVersion(patchedVersions);
     if (minVersion) {
       excludes.add(`${advisory.module_name}@${minVersion.version}`);
     }
   }
   return Array.from(excludes);
 }
-var import_semver40;
+var import_semver41;
 var init_fix = __esm({
   "../deps/compliance/commands/lib/audit/fix.js"() {
     "use strict";
     init_lib100();
     init_lib146();
     init_lib76();
-    import_semver40 = __toESM(require_semver2(), 1);
+    import_semver41 = __toESM(require_semver2(), 1);
   }
 });
 
@@ -198259,10 +198504,10 @@ async function fixWithUpdate(auditReport, opts2) {
       for (const vulnerabilityWithRange of vulnerabilities) {
         let { semverRange } = vulnerabilityWithRange;
         if (!semverRange) {
-          semverRange = new import_semver41.default.Range(vulnerabilityWithRange.vulnerability.versionRange);
+          semverRange = new import_semver42.default.Range(vulnerabilityWithRange.vulnerability.versionRange);
           vulnerabilityWithRange.semverRange = semverRange;
         }
-        if (import_semver41.default.satisfies(version2, semverRange)) {
+        if (import_semver42.default.satisfies(version2, semverRange)) {
           return true;
         }
       }
@@ -198311,10 +198556,10 @@ async function fixWithUpdate(auditReport, opts2) {
       for (const updatedVersion of updatedVersions) {
         let { semverRange } = vulnerability;
         if (!semverRange) {
-          semverRange = new import_semver41.default.Range(vulnerability.vulnerability.versionRange);
+          semverRange = new import_semver42.default.Range(vulnerability.vulnerability.versionRange);
           vulnerability.semverRange = semverRange;
         }
-        if (import_semver41.default.satisfies(updatedVersion, semverRange)) {
+        if (import_semver42.default.satisfies(updatedVersion, semverRange)) {
           wasFixed = false;
           break;
         }
@@ -198335,7 +198580,7 @@ async function fixWithUpdate(auditReport, opts2) {
   }
   return { fixed, remaining, addedAgeExcludes };
 }
-var import_semver41;
+var import_semver42;
 var init_fixWithUpdate = __esm({
   "../deps/compliance/commands/lib/audit/fixWithUpdate.js"() {
     "use strict";
@@ -198344,7 +198589,7 @@ var init_fixWithUpdate = __esm({
     init_lib2();
     init_lib138();
     init_lib78();
-    import_semver41 = __toESM(require_semver2(), 1);
+    import_semver42 = __toESM(require_semver2(), 1);
     init_fix();
     init_lockfileToPackages();
   }
@@ -199697,15 +199942,15 @@ async function findDependencyLicenses(opts2) {
     }
   }
   const projectDependencies = Array.from(licensePackages.values());
-  return Array.from(projectDependencies).sort((pkg1, pkg2) => pkg1.name.localeCompare(pkg2.name) || import_semver42.default.compare(pkg1.version, pkg2.version));
+  return Array.from(projectDependencies).sort((pkg1, pkg2) => pkg1.name.localeCompare(pkg2.name) || import_semver43.default.compare(pkg1.version, pkg2.version));
 }
-var import_semver42;
+var import_semver43;
 var init_licenses = __esm({
   "../deps/compliance/license-scanner/lib/licenses.js"() {
     "use strict";
     init_lib2();
     init_lib125();
-    import_semver42 = __toESM(require_semver2(), 1);
+    import_semver43 = __toESM(require_semver2(), 1);
     init_lockfileToLicenseNodeTree();
   }
 });
@@ -199767,7 +200012,7 @@ function renderLicensesJson(licensePackages) {
     for (const inputList of Object.values(groupedByName)) {
       if (inputList == null)
         continue;
-      inputList.sort((a2, b) => import_semver43.default.compare(a2.version, b.version));
+      inputList.sort((a2, b) => import_semver44.default.compare(a2.version, b.version));
       const versions = inputList.map((item) => item.version);
       const paths3 = inputList.map((item) => item.path ?? null);
       const lastInputItem = inputList.at(-1);
@@ -199841,7 +200086,7 @@ function deduplicateLicensesPackages(licensePackages) {
   }
   return result2;
 }
-var import_table6, import_semver43;
+var import_table6, import_semver44;
 var init_outputRenderer = __esm({
   "../deps/compliance/commands/lib/licenses/outputRenderer.js"() {
     "use strict";
@@ -199849,7 +200094,7 @@ var init_outputRenderer = __esm({
     import_table6 = __toESM(require_src2(), 1);
     init_source2();
     init_es();
-    import_semver43 = __toESM(require_semver2(), 1);
+    import_semver44 = __toESM(require_semver2(), 1);
   }
 });
 
@@ -203694,7 +203939,7 @@ function extractVersion(ref, alias, packages) {
 function satisfies2(version2, range) {
   if (range === "*")
     return true;
-  return import_semver44.default.satisfies(version2, range, { includePrerelease: true });
+  return import_semver45.default.satisfies(version2, range, { includePrerelease: true });
 }
 function filterPeerDependencyIssues2(peerDependencyIssuesByProjects, rules) {
   const ignoreMissingMatcher = createMatcher([...new Set(rules.ignoreMissing ?? [])]);
@@ -203717,10 +203962,10 @@ function filterPeerDependencyIssues2(peerDependencyIssuesByProjects, rules) {
       if (allowAnyMatcher(peerName))
         continue;
       const remaining = issues.filter((issue) => {
-        if (allowedVersionsMatchAll[peerName]?.some((range) => import_semver44.default.satisfies(issue.foundVersion, range)))
+        if (allowedVersionsMatchAll[peerName]?.some((range) => import_semver45.default.satisfies(issue.foundVersion, range)))
           return false;
         const declaringParent = issue.parents.at(-1);
-        if (declaringParent && allowedVersionsByParent[declaringParent.name]?.[peerName]?.some((range) => import_semver44.default.satisfies(issue.foundVersion, range)))
+        if (declaringParent && allowedVersionsByParent[declaringParent.name]?.[peerName]?.some((range) => import_semver45.default.satisfies(issue.foundVersion, range)))
           return false;
         return true;
       });
@@ -203789,7 +204034,7 @@ function safeIntersect2(ranges) {
     return null;
   }
 }
-var import_semver44, import_semver_range_intersect2;
+var import_semver45, import_semver_range_intersect2;
 var init_checkPeerDependencies = __esm({
   "../deps/inspection/peers-checker/lib/checkPeerDependencies.js"() {
     "use strict";
@@ -203799,7 +204044,7 @@ var init_checkPeerDependencies = __esm({
     init_lib2();
     init_lib78();
     init_lib88();
-    import_semver44 = __toESM(require_semver2(), 1);
+    import_semver45 = __toESM(require_semver2(), 1);
     import_semver_range_intersect2 = __toESM(require_dist7(), 1);
   }
 });
@@ -204586,8 +204831,8 @@ async function handler32(opts2, params) {
   } else if (packageManager.version !== targetVersion) {
     previousVersion = packageManager.version;
   }
-  const previousMajor = previousVersion != null ? import_semver45.default.coerce(previousVersion)?.major : void 0;
-  const targetMajor = import_semver45.default.major(targetVersion);
+  const previousMajor = previousVersion != null ? import_semver46.default.coerce(previousVersion)?.major : void 0;
+  const targetMajor = import_semver46.default.major(targetVersion);
   if (previousMajor != null && targetMajor > previousMajor) {
     const hint = MAJOR_UPGRADE_HINTS[targetMajor];
     if (hint)
@@ -204597,7 +204842,7 @@ async function handler32(opts2, params) {
     if (opts2.wantedPackageManager?.version !== resolution.manifest.version) {
       if (isImplicitLatest) {
         const projectCurrentVersion = await readProjectPinnedPnpmVersion(opts2.rootProjectManifestDir, opts2.wantedPackageManager?.version);
-        if (projectCurrentVersion != null && import_semver45.default.lt(resolution.manifest.version, projectCurrentVersion)) {
+        if (projectCurrentVersion != null && import_semver46.default.lt(resolution.manifest.version, projectCurrentVersion)) {
           return `The current project is set to use pnpm v${projectCurrentVersion}, which is newer than the "latest" version on the registry (v${resolution.manifest.version}). No update performed. Run "pnpm self-update latest" to downgrade.`;
         }
       }
@@ -204643,7 +204888,7 @@ async function handler32(opts2, params) {
   if (resolution.manifest.version === packageManager.version) {
     return `The currently active ${packageManager.name} v${packageManager.version} is already "${bareSpecifier}" and doesn't need an update`;
   }
-  if (isImplicitLatest && import_semver45.default.lt(resolution.manifest.version, packageManager.version)) {
+  if (isImplicitLatest && import_semver46.default.lt(resolution.manifest.version, packageManager.version)) {
     return `The currently active ${packageManager.name} v${packageManager.version} is newer than the "latest" version on the registry (v${resolution.manifest.version}). No update performed. Run "pnpm self-update latest" to downgrade.`;
   }
   globalInfo(`Switching pnpm from v${packageManager.version} to v${resolution.manifest.version}...`);
@@ -204680,7 +204925,7 @@ function hasLegacyHomeDirShim(pnpmHomeDir) {
 function updateVersionConstraint(current, newVersion) {
   if (current == null)
     return newVersion;
-  if (import_semver45.default.satisfies(newVersion, current, { includePrerelease: true }))
+  if (import_semver46.default.satisfies(newVersion, current, { includePrerelease: true }))
     return current;
   const pinnedVersion = whichVersionIsPinned(current);
   if (pinnedVersion == null) {
@@ -204709,16 +204954,16 @@ async function readProjectPinnedPnpmVersion(rootProjectManifestDir, spec) {
   let specMin;
   if (spec != null) {
     try {
-      specMin = import_semver45.default.minVersion(spec)?.version;
+      specMin = import_semver46.default.minVersion(spec)?.version;
     } catch {
     }
   }
   if (lockfilePinned != null && specMin != null) {
-    return import_semver45.default.gt(lockfilePinned, specMin) ? lockfilePinned : specMin;
+    return import_semver46.default.gt(lockfilePinned, specMin) ? lockfilePinned : specMin;
   }
   return lockfilePinned ?? specMin;
 }
-var import_semver45, commandNames32, MAJOR_UPGRADE_HINTS, skipPackageManagerCheck2;
+var import_semver46, commandNames32, MAJOR_UPGRADE_HINTS, skipPackageManagerCheck2;
 var init_selfUpdate = __esm({
   "../engine/pm/commands/lib/self-updater/selfUpdate.js"() {
     "use strict";
@@ -204736,7 +204981,7 @@ var init_selfUpdate = __esm({
     init_lib13();
     init_es();
     init_lib62();
-    import_semver45 = __toESM(require_semver2(), 1);
+    import_semver46 = __toESM(require_semver2(), 1);
     init_installPnpm();
     commandNames32 = ["self-update"];
     MAJOR_UPGRADE_HINTS = {
@@ -214823,13 +215068,13 @@ async function getVersionsFromLockfile(dep, opts2) {
       ...nameVerFromPkgSnapshot(depPath, pkgSnapshot),
       gitTarballUrl: isGitHostedPkgUrl(tarball) || isPkgPrNewUrl(tarball) ? tarball : void 0
     };
-  }).filter(({ name }) => name === pkgName).sort((v1, v2) => import_semver46.default.compare(v1.version, v2.version));
+  }).filter(({ name }) => name === pkgName).sort((v1, v2) => import_semver47.default.compare(v1.version, v2.version));
   return {
     versions,
-    preferredVersions: versions.filter(({ version: version2 }) => dep.alias && dep.bareSpecifier ? import_semver46.default.satisfies(version2, dep.bareSpecifier) : true)
+    preferredVersions: versions.filter(({ version: version2 }) => dep.alias && dep.bareSpecifier ? import_semver47.default.satisfies(version2, dep.bareSpecifier) : true)
   };
 }
-var import_enquirer7, import_semver46;
+var import_enquirer7, import_semver47;
 var init_getPatchedDependency = __esm({
   "../patching/commands/lib/getPatchedDependency.js"() {
     "use strict";
@@ -214840,7 +215085,7 @@ var init_getPatchedDependency = __esm({
     init_lib96();
     import_enquirer7 = __toESM(require_enquirer(), 1);
     init_realpath_missing();
-    import_semver46 = __toESM(require_semver2(), 1);
+    import_semver47 = __toESM(require_semver2(), 1);
   }
 });
 
@@ -215490,9 +215735,9 @@ async function updateDeprecation(opts2, { deprecated, packageName, versionRange
   return `Successfully ${deprecated != null ? "deprecated" : "un-deprecated"} ${versionsToUpdate.length} version(s) of ${packageName}`;
 }
 function getVersionsMatchingRange(versions, range) {
-  return Object.keys(versions).filter((v) => import_semver47.default.satisfies(v, range));
+  return Object.keys(versions).filter((v) => import_semver48.default.satisfies(v, range));
 }
-var import_npm_package_arg6, import_semver47;
+var import_npm_package_arg6, import_semver48;
 var init_common3 = __esm({
   "../registry-access/commands/lib/deprecation/common.js"() {
     "use strict";
@@ -215501,7 +215746,7 @@ var init_common3 = __esm({
     init_lib47();
     init_lib48();
     import_npm_package_arg6 = __toESM(require_npa(), 1);
-    import_semver47 = __toESM(require_semver2(), 1);
+    import_semver48 = __toESM(require_semver2(), 1);
     init_common2();
   }
 });
@@ -215712,7 +215957,7 @@ async function distTagAdd(opts2, params) {
   if (!version2) {
     throw new PnpmError("DIST_TAG_ADD_VERSION_REQUIRED", "Version is required (e.g., pnpm dist-tag add pkg@1.0.0 latest)");
   }
-  if (!import_semver48.default.valid(version2)) {
+  if (!import_semver49.default.valid(version2)) {
     throw new PnpmError("DIST_TAG_ADD_INVALID_VERSION", `Version must be an exact semver version, got "${version2}"`);
   }
   const tag = params[1] ?? "latest";
@@ -215797,7 +216042,7 @@ async function throwRegistryError(response, action) {
   }
   throw new PnpmError("REGISTRY_ERROR", `Failed to ${action} package: ${response.status} ${response.statusText}. ${errorBody}`);
 }
-var import_npm_package_arg7, import_semver48, commandNames47;
+var import_npm_package_arg7, import_semver49, commandNames47;
 var init_distTag = __esm({
   "../registry-access/commands/lib/distTag.js"() {
     "use strict";
@@ -215808,7 +216053,7 @@ var init_distTag = __esm({
     init_lib48();
     import_npm_package_arg7 = __toESM(require_npa(), 1);
     init_lib62();
-    import_semver48 = __toESM(require_semver2(), 1);
+    import_semver49 = __toESM(require_semver2(), 1);
     init_common2();
     commandNames47 = ["dist-tag", "dist-tags"];
   }
@@ -216608,7 +216853,7 @@ async function unpublishVersions(packageUrl, registryUrl, pkg, versions, fetchFr
     }
   }
   if (latestVer && removedSet.has(latestVer)) {
-    const remaining = Object.keys(pkg.versions).sort(import_semver49.default.compareLoose);
+    const remaining = Object.keys(pkg.versions).sort(import_semver50.default.compareLoose);
     if (remaining.length > 0) {
       pkg["dist-tags"].latest = remaining[remaining.length - 1];
     }
@@ -216688,9 +216933,9 @@ function getTarballPathname(tarballUrl, registryUrl) {
   return tarballPath;
 }
 function getVersionsMatchingRange2(versions, range) {
-  return Object.keys(versions).filter((v) => import_semver49.default.satisfies(v, range));
+  return Object.keys(versions).filter((v) => import_semver50.default.satisfies(v, range));
 }
-var import_npm_package_arg8, import_semver49, commandNames55;
+var import_npm_package_arg8, import_semver50, commandNames55;
 var init_unpublish = __esm({
   "../registry-access/commands/lib/unpublish.js"() {
     "use strict";
@@ -216701,7 +216946,7 @@ var init_unpublish = __esm({
     init_lib48();
     import_npm_package_arg8 = __toESM(require_npa(), 1);
     init_lib62();
-    import_semver49 = __toESM(require_semver2(), 1);
+    import_semver50 = __toESM(require_semver2(), 1);
     init_common2();
     commandNames55 = ["unpublish"];
   }
@@ -226526,7 +226771,7 @@ var require_npa2 = __commonJS({
     var path210 = isWindows15 ? __require("node:path/win32") : __require("node:path");
     var { homedir } = __require("node:os");
     var HostedGit3 = require_lib11();
-    var semver53 = require_semver2();
+    var semver54 = require_semver2();
     var validatePackageName2 = require_lib22();
     var { log: log3 } = require_lib9();
     var hasSlashes = isWindows15 ? /\\|[/]/ : /[/]/;
@@ -226891,8 +227136,8 @@ var require_npa2 = __commonJS({
       const spec = res.rawSpec.trim();
       res.saveSpec = null;
       res.fetchSpec = spec;
-      const version2 = semver53.valid(spec, true);
-      const range = semver53.validRange(spec, true);
+      const version2 = semver54.valid(spec, true);
+      const range = semver54.validRange(spec, true);
       if (version2) {
         res.type = "version";
       } else if (range) {
@@ -229170,9 +229415,9 @@ var require_get_options = __commonJS({
 // ../../../../setup-pnpm/node_modules/.bin/store/v11/links/@npmcli/fs/5.0.0/4cafda806c7bf4ef531e7305fbcb8288c728be229f52fd03536e072af5fe3626/node_modules/@npmcli/fs/lib/common/node.js
 var require_node2 = __commonJS({
   "../../../../setup-pnpm/node_modules/.bin/store/v11/links/@npmcli/fs/5.0.0/4cafda806c7bf4ef531e7305fbcb8288c728be229f52fd03536e072af5fe3626/node_modules/@npmcli/fs/lib/common/node.js"(exports2, module2) {
-    var semver53 = require_semver2();
+    var semver54 = require_semver2();
     var satisfies3 = (range) => {
-      return semver53.satisfies(process.version, range, { includePrerelease: true });
+      return semver54.satisfies(process.version, range, { includePrerelease: true });
     };
     module2.exports = {
       satisfies: satisfies3
@@ -238898,7 +239143,7 @@ var require_spawn = __commonJS({
 // ../../../../setup-pnpm/node_modules/.bin/store/v11/links/@npmcli/git/7.0.2/01870b3758aec4f6dc73fe3f36d3dff0095939bd846cf18122f1292a2e17524f/node_modules/@npmcli/git/lib/lines-to-revs.js
 var require_lines_to_revs = __commonJS({
   "../../../../setup-pnpm/node_modules/.bin/store/v11/links/@npmcli/git/7.0.2/01870b3758aec4f6dc73fe3f36d3dff0095939bd846cf18122f1292a2e17524f/node_modules/@npmcli/git/lib/lines-to-revs.js"(exports2, module2) {
-    var semver53 = require_semver2();
+    var semver54 = require_semver2();
     module2.exports = (lines) => finish(lines.reduce(linesToRevsReducer, {
       versions: {},
       "dist-tags": {},
@@ -238995,8 +239240,8 @@ var require_lines_to_revs = __commonJS({
       revs.refs[doc.rawRef] = doc;
       if (doc.type === "tag") {
         const match = !doc.ref.endsWith("^{}") && doc.ref.match(/v?(\d+\.\d+\.\d+(?:[-+].+)?)$/);
-        if (match && semver53.valid(match[1], true)) {
-          revs.versions[semver53.clean(match[1], true)] = doc;
+        if (match && semver54.valid(match[1], true)) {
+          revs.versions[semver54.clean(match[1], true)] = doc;
         }
       }
       return revs;
@@ -239254,7 +239499,7 @@ var require_dev_engines = __commonJS({
 // ../../../../setup-pnpm/node_modules/.bin/store/v11/links/@/npm-install-checks/8.0.0/8ae449895bd2a6446a641a7633b6e675f92cb82df40fe4e25fb59f55325ac30c/node_modules/npm-install-checks/lib/index.js
 var require_lib41 = __commonJS({
   "../../../../setup-pnpm/node_modules/.bin/store/v11/links/@/npm-install-checks/8.0.0/8ae449895bd2a6446a641a7633b6e675f92cb82df40fe4e25fb59f55325ac30c/node_modules/npm-install-checks/lib/index.js"(exports2, module2) {
-    var semver53 = require_semver2();
+    var semver54 = require_semver2();
     var currentEnv = require_current_env();
     var { checkDevEngines } = require_dev_engines();
     var checkEngine2 = (target2, npmVer, nodeVer, force = false) => {
@@ -239264,8 +239509,8 @@ var require_lib41 = __commonJS({
       if (!eng) {
         return;
       }
-      const nodeFail = nodev && eng.node && !semver53.satisfies(nodev, eng.node, opt);
-      const npmFail = npmVer && eng.npm && !semver53.satisfies(npmVer, eng.npm, opt);
+      const nodeFail = nodev && eng.node && !semver54.satisfies(nodev, eng.node, opt);
+      const npmFail = npmVer && eng.npm && !semver54.satisfies(npmVer, eng.npm, opt);
       if (nodeFail || npmFail) {
         throw Object.assign(new Error("Unsupported engine"), {
           pkgid: target2._id,
@@ -239392,7 +239637,7 @@ var require_lib43 = __commonJS({
   "../../../../setup-pnpm/node_modules/.bin/store/v11/links/@/npm-pick-manifest/11.0.3/c15f6f366bdc648c2c29fed824b00fcd152d67bbcef42d8ddb6fe23c511175c9/node_modules/npm-pick-manifest/lib/index.js"(exports2, module2) {
     "use strict";
     var npa11 = require_npa2();
-    var semver53 = require_semver2();
+    var semver54 = require_semver2();
     var { checkEngine: checkEngine2 } = require_lib41();
     var normalizeBin = require_lib42();
     var engineOk = (manifest, npmVersion, nodeVersion) => {
@@ -239405,7 +239650,7 @@ var require_lib43 = __commonJS({
     };
     var isBefore = (verTimes, ver, time) => !verTimes || !verTimes[ver] || Date.parse(verTimes[ver]) <= time;
     var avoidSemverOpt = { includePrerelease: true, loose: true };
-    var shouldAvoid = (ver, avoid) => avoid && semver53.satisfies(ver, avoid, avoidSemverOpt);
+    var shouldAvoid = (ver, avoid) => avoid && semver54.satisfies(ver, avoid, avoidSemverOpt);
     var decorateAvoid = (result2, avoid) => result2 && shouldAvoid(result2.version, avoid) ? { ...result2, _shouldAvoid: true } : result2;
     var pickManifest = (packument, wanted, opts2) => {
       const {
@@ -239471,13 +239716,13 @@ var require_lib43 = __commonJS({
         }
       }
       if (wanted && type4 === "version") {
-        const ver = semver53.clean(wanted, { loose: true });
+        const ver = semver54.clean(wanted, { loose: true });
         const mani = versions[ver] || staged[ver] || restricted[ver];
         return isBefore(verTimes, ver, time) ? decorateAvoid(mani, avoid) : null;
       }
       const range = type4 === "range" ? wanted : "*";
       const defaultVer = distTags[defaultTag];
-      if (defaultVer && (range === "*" || semver53.satisfies(defaultVer, range, { loose: true })) && !restricted[defaultVer] && !shouldAvoid(defaultVer, avoid)) {
+      if (defaultVer && (range === "*" || semver54.satisfies(defaultVer, range, { loose: true })) && !restricted[defaultVer] && !shouldAvoid(defaultVer, avoid)) {
         const mani = versions[defaultVer];
         const ok = mani && isBefore(verTimes, defaultVer, time) && engineOk(mani, npmVersion, nodeVersion) && !mani.deprecated && !staged[defaultVer];
         if (ok) {
@@ -239496,7 +239741,7 @@ var require_lib43 = __commonJS({
         });
       }
       const sortSemverOpt = { loose: true };
-      const entries = allEntries.filter(([ver]) => semver53.satisfies(ver, range, { loose: true })).sort((a2, b) => {
+      const entries = allEntries.filter(([ver]) => semver54.satisfies(ver, range, { loose: true })).sort((a2, b) => {
         const [vera, mania] = a2;
         const [verb, manib] = b;
         const notavoida = !shouldAvoid(vera, avoid);
@@ -239509,7 +239754,7 @@ var require_lib43 = __commonJS({
         const notdeprb = !manib.deprecated;
         const enginea = engineOk(mania, npmVersion, nodeVersion);
         const engineb = engineOk(manib, npmVersion, nodeVersion);
-        return notavoidb - notavoida || notrestrb - notrestra || notstageb - notstagea || (notdeprb && engineb) - (notdepra && enginea) || engineb - enginea || notdeprb - notdepra || semver53.rcompare(vera, verb, sortSemverOpt);
+        return notavoidb - notavoida || notrestrb - notrestra || notstageb - notstagea || (notdeprb && engineb) - (notdepra && enginea) || engineb - enginea || notdeprb - notdepra || semver54.rcompare(vera, verb, sortSemverOpt);
       });
       return decorateAvoid(entries[0] && entries[0][1], avoid);
     };
@@ -250079,7 +250324,7 @@ var require_publish = __commonJS({
     var npa11 = require_npa2();
     var PackageJson = require_lib45();
     var { log: log3 } = require_lib9();
-    var semver53 = require_semver2();
+    var semver54 = require_semver2();
     var { URL: URL7 } = __require("node:url");
     var ssri6 = require_lib6();
     var ciInfo2 = require_ci_info();
@@ -250135,7 +250380,7 @@ Remove the 'private' field from the package.json to publish it.`),
         manifestInput._npmVersion = npmVersion;
       }
       const manifest = await new PackageJson().fromContent(manifestInput).normalize({ steps }).then((p) => p.content);
-      const version2 = semver53.clean(manifest.version);
+      const version2 = semver54.clean(manifest.version);
       if (!version2) {
         throw Object.assign(
           new Error("invalid semver: " + manifest.version),
@@ -250262,7 +250507,7 @@ var require_unpublish = __commonJS({
     var { URL: URL7 } = __require("node:url");
     var npa11 = require_npa2();
     var npmFetch = require_lib37();
-    var semver53 = require_semver2();
+    var semver54 = require_semver2();
     var getPathname = (tarball, registry) => {
       const registryUrl = new URL7(registry).pathname.slice(1);
       let tarballUrl = new URL7(tarball).pathname.slice(1);
@@ -250312,7 +250557,7 @@ var require_unpublish = __commonJS({
           if (latestVer === version2) {
             pkg["dist-tags"].latest = Object.keys(
               allVersions
-            ).sort(semver53.compareLoose).pop();
+            ).sort(semver54.compareLoose).pop();
           }
           delete pkg._revisions;
           delete pkg._attachments;
@@ -251722,7 +251967,7 @@ async function handler60(opts2, params) {
   if (!rawBump) {
     throw new PnpmError("INVALID_VERSION_BUMP", "A version argument is required. Must be a valid semver version (e.g. 1.2.3) or one of: major, minor, patch, premajor, preminor, prepatch, prerelease");
   }
-  const explicitVersion = (0, import_semver50.valid)(rawBump);
+  const explicitVersion = (0, import_semver51.valid)(rawBump);
   if (!explicitVersion && !isBumpType(rawBump)) {
     throw new PnpmError("INVALID_VERSION_BUMP", `Invalid version argument: ${rawBump}. Must be a valid semver version (e.g. 1.2.3) or one of: major, minor, patch, premajor, preminor, prepatch, prerelease`);
   }
@@ -251784,7 +252029,7 @@ async function bumpPackageVersion(pkgDir, rawBump, explicitVersion, opts2) {
     return null;
   }
   const currentVersion = manifest.version;
-  if (!(0, import_semver50.valid)(currentVersion)) {
+  if (!(0, import_semver51.valid)(currentVersion)) {
     throw new PnpmError("INVALID_VERSION", `Invalid version in ${pkgDir}: ${currentVersion}`);
   }
   const preVersionChange = {
@@ -251795,7 +252040,7 @@ async function bumpPackageVersion(pkgDir, rawBump, explicitVersion, opts2) {
     manifestPath: path194.join(pkgDir, fileName)
   };
   await runVersionLifecycleHook("preversion", preVersionChange, opts2);
-  const newVersion = explicitVersion ?? (0, import_semver50.inc)(currentVersion, rawBump, false, opts2.preid);
+  const newVersion = explicitVersion ?? (0, import_semver51.inc)(currentVersion, rawBump, false, opts2.preid);
   if (!newVersion) {
     throw new PnpmError("VERSION_BUMP_FAILED", `Failed to bump version from ${currentVersion} using ${rawBump}`);
   }
@@ -251866,7 +252111,7 @@ async function commitAndTag(changes, opts2) {
   tagArgs.push(tagName, "-m", message);
   await safeExeca("git", tagArgs, execOpts);
 }
-var import_semver50, commandNames60, BUMP_TYPES, version;
+var import_semver51, commandNames60, BUMP_TYPES, version;
 var init_version = __esm({
   "../releasing/commands/lib/version/index.js"() {
     "use strict";
@@ -251879,7 +252124,7 @@ var init_version = __esm({
     init_lib25();
     init_es();
     init_lib62();
-    import_semver50 = __toESM(require_semver2(), 1);
+    import_semver51 = __toESM(require_semver2(), 1);
     commandNames60 = ["version"];
     BUMP_TYPES = ["major", "minor", "patch", "premajor", "preminor", "prepatch", "prerelease"];
     version = {
@@ -271222,7 +271467,7 @@ function printDiffs(opts2, pkgsDiff, depType) {
     }
     if (pkg.version) {
       result2 += ` ${source_default.grey(pkg.version)}`;
-      if (pkg.latest && import_semver51.default.lt(pkg.version, pkg.latest)) {
+      if (pkg.latest && import_semver52.default.lt(pkg.version, pkg.latest)) {
         result2 += ` ${source_default.grey(`(${pkg.latest} is available)`)}`;
       }
     }
@@ -271239,14 +271484,14 @@ function printDiffs(opts2, pkgsDiff, depType) {
   }).join(EOL);
   return msg;
 }
-var Rx18, import_operators19, import_semver51, CONFIG_BY_DEP_TYPE;
+var Rx18, import_operators19, import_semver52, CONFIG_BY_DEP_TYPE;
 var init_reportSummary = __esm({
   "../cli/default-reporter/lib/reporterForClient/reportSummary.js"() {
     "use strict";
     init_source2();
     Rx18 = __toESM(require_cjs2(), 1);
     import_operators19 = __toESM(require_operators(), 1);
-    import_semver51 = __toESM(require_semver2(), 1);
+    import_semver52 = __toESM(require_semver2(), 1);
     init_constants();
     init_outputConstants();
     init_pkgsDiff();
@@ -271260,7 +271505,7 @@ var init_reportSummary = __esm({
 
 // ../cli/default-reporter/lib/reporterForClient/reportUpdateCheck.js
 function reportUpdateCheck(log$, opts2) {
-  return log$.pipe((0, import_operators20.take)(1), (0, import_operators20.filter)((log3) => import_semver52.default.gt(log3.latestVersion, log3.currentVersion)), (0, import_operators20.map)((log3) => {
+  return log$.pipe((0, import_operators20.take)(1), (0, import_operators20.filter)((log3) => import_semver53.default.gt(log3.latestVersion, log3.currentVersion)), (0, import_operators20.map)((log3) => {
     const updateMessage = renderUpdateMessage({
       currentPkgIsExecutable: detectIfCurrentPkgIsExecutable(opts2.process),
       latestVersion: log3.latestVersion,
@@ -271293,7 +271538,7 @@ function renderUpdateCommand(opts2) {
   const pkgName = opts2.currentPkgIsExecutable ? "@pnpm/exe" : "pnpm";
   return `pnpm add -g ${pkgName}`;
 }
-var import_boxen2, Rx19, import_operators20, import_semver52;
+var import_boxen2, Rx19, import_operators20, import_semver53;
 var init_reportUpdateCheck = __esm({
   "../cli/default-reporter/lib/reporterForClient/reportUpdateCheck.js"() {
     "use strict";
@@ -271302,7 +271547,7 @@ var init_reportUpdateCheck = __esm({
     init_source2();
     Rx19 = __toESM(require_cjs2(), 1);
     import_operators20 = __toESM(require_operators(), 1);
-    import_semver52 = __toESM(require_semver2(), 1);
+    import_semver53 = __toESM(require_semver2(), 1);
   }
 });
 
@@ -271845,15 +272090,15 @@ var init_reporter = __esm({
 function shouldPersistLockfile(pm2) {
   if (pm2.fromDevEngines === true)
     return true;
-  if (pm2.version == null || import_semver53.default.valid(pm2.version) == null)
+  if (pm2.version == null || import_semver54.default.valid(pm2.version) == null)
     return false;
-  return import_semver53.default.major(pm2.version) >= 12;
+  return import_semver54.default.major(pm2.version) >= 12;
 }
-var import_semver53;
+var import_semver54;
 var init_shouldPersistLockfile = __esm({
   "lib/shouldPersistLockfile.js"() {
     "use strict";
-    import_semver53 = __toESM(require_semver2(), 1);
+    import_semver54 = __toESM(require_semver2(), 1);
   }
 });
 
@@ -271869,7 +272114,7 @@ async function switchCliVersion(config, context) {
   let envLockfile = persistLockfile ? await readEnvLockfile(context.rootProjectManifestDir) ?? void 0 : void 0;
   let storeToUse;
   let pmVersion = envLockfile?.importers["."].packageManagerDependencies?.["pnpm"]?.version;
-  if (!pmVersion || !import_semver54.default.satisfies(pmVersion, pm2.version, { includePrerelease: true })) {
+  if (!pmVersion || !import_semver55.default.satisfies(pmVersion, pm2.version, { includePrerelease: true })) {
     storeToUse = await createStoreController({ ...config, ...context });
     envLockfile = await resolvePackageManagerIntegrities(pm2.version, {
       envLockfile,
@@ -271943,7 +272188,7 @@ async function switchCliVersion(config, context) {
   }
   process.exit(status ?? 0);
 }
-var import_cross_spawn3, import_semver54, VersionSwitchFail;
+var import_cross_spawn3, import_semver55, VersionSwitchFail;
 var init_switchCliVersion = __esm({
   "lib/switchCliVersion.js"() {
     "use strict";
@@ -271956,7 +272201,7 @@ var init_switchCliVersion = __esm({
     init_lib156();
     init_lib90();
     import_cross_spawn3 = __toESM(require_cross_spawn(), 1);
-    import_semver54 = __toESM(require_semver2(), 1);
+    import_semver55 = __toESM(require_semver2(), 1);
     init_shouldPersistLockfile();
     VersionSwitchFail = class extends PnpmError {
       constructor(version2, wantedPnpmBinDir, cause) {
@@ -271976,7 +272221,7 @@ async function syncEnvLockfile(config, context) {
     return;
   if (!shouldPersistLockfile(pm2))
     return;
-  if (!import_semver55.default.satisfies(packageManager.version, pm2.version, { includePrerelease: true }))
+  if (!import_semver56.default.satisfies(packageManager.version, pm2.version, { includePrerelease: true }))
     return;
   const envLockfile = await readEnvLockfile(context.rootProjectManifestDir);
   if (envLockfile == null)
@@ -271984,7 +272229,7 @@ async function syncEnvLockfile(config, context) {
   const lockedVersion = envLockfile.importers["."].packageManagerDependencies?.["pnpm"]?.version;
   if (lockedVersion == null)
     return;
-  if (import_semver55.default.satisfies(lockedVersion, pm2.version, { includePrerelease: true }))
+  if (import_semver56.default.satisfies(lockedVersion, pm2.version, { includePrerelease: true }))
     return;
   const store = await createStoreController({ ...config, ...context });
   try {
@@ -272000,7 +272245,7 @@ async function syncEnvLockfile(config, context) {
     await store.ctrl.close();
   }
 }
-var import_semver55;
+var import_semver56;
 var init_syncEnvLockfile = __esm({
   "lib/syncEnvLockfile.js"() {
     "use strict";
@@ -272008,7 +272253,7 @@ var init_syncEnvLockfile = __esm({
     init_lib130();
     init_lib78();
     init_lib90();
-    import_semver55 = __toESM(require_semver2(), 1);
+    import_semver56 = __toESM(require_semver2(), 1);
     init_shouldPersistLockfile();
   }
 });
@@ -272296,7 +272541,7 @@ function checkPackageManager(pm2, opts2) {
     globalWarn(msg);
   } else if (pm2.version) {
     const currentPnpmVersion = packageManager.name === "pnpm" ? packageManager.version : void 0;
-    if (currentPnpmVersion && !import_semver56.default.satisfies(currentPnpmVersion, pm2.version, { includePrerelease: true })) {
+    if (currentPnpmVersion && !import_semver57.default.satisfies(currentPnpmVersion, pm2.version, { includePrerelease: true })) {
       let msg = `This project is configured to use ${pm2.version} of pnpm. Your current pnpm is v${currentPnpmVersion}`;
       if (opts2.underCorepack) {
         msg += "\nCorepack invoked pnpm with this version, and pnpm does not switch versions when running under corepack.";
@@ -272312,7 +272557,7 @@ ${baseHint}` : baseHint;
     }
   }
 }
-var import_loud_rejection, import_semver56, REPORTER_INITIALIZED;
+var import_loud_rejection, import_semver57, REPORTER_INITIALIZED;
 var init_main2 = __esm({
   "lib/main.js"() {
     "use strict";
@@ -272326,7 +272571,7 @@ var init_main2 = __esm({
     init_source2();
     import_loud_rejection = __toESM(require_loud_rejection(), 1);
     init_es();
-    import_semver56 = __toESM(require_semver2(), 1);
+    import_semver57 = __toESM(require_semver2(), 1);
     init_checkForUpdates();
     init_cmd();
     init_formatError();