@coana-tech/cli 14.12.27 → 14.12.29

package/cli.mjs

@@ -11905,15 +11905,15 @@ var require_file = __commonJS({
       _incFile(callback) {
         debug("_incFile", this.filename);
         const ext2 = path2.extname(this._basename);
-        const basename10 = path2.basename(this._basename, ext2);
+        const basename11 = path2.basename(this._basename, ext2);
         const tasks = [];
         if (this.zippedArchive) {
           tasks.push(
             function(cb) {
               const num = this._created > 0 && !this.tailable ? this._created : "";
               this._compressFile(
-                path2.join(this.dirname, `${basename10}${num}${ext2}`),
-                path2.join(this.dirname, `${basename10}${num}${ext2}.gz`),
+                path2.join(this.dirname, `${basename11}${num}${ext2}`),
+                path2.join(this.dirname, `${basename11}${num}${ext2}.gz`),
                 cb
               );
             }.bind(this)
@@ -11923,9 +11923,9 @@ var require_file = __commonJS({
           function(cb) {
             if (!this.tailable) {
               this._created += 1;
-              this._checkMaxFilesIncrementing(ext2, basename10, cb);
+              this._checkMaxFilesIncrementing(ext2, basename11, cb);
             } else {
-              this._checkMaxFilesTailable(ext2, basename10, cb);
+              this._checkMaxFilesTailable(ext2, basename11, cb);
             }
           }.bind(this)
         );
@@ -11939,9 +11939,9 @@ var require_file = __commonJS({
        */
       _getFile() {
         const ext2 = path2.extname(this._basename);
-        const basename10 = path2.basename(this._basename, ext2);
+        const basename11 = path2.basename(this._basename, ext2);
         const isRotation = this.rotationFormat ? this.rotationFormat() : this._created;
-        return !this.tailable && this._created ? `${basename10}${isRotation}${ext2}` : `${basename10}${ext2}`;
+        return !this.tailable && this._created ? `${basename11}${isRotation}${ext2}` : `${basename11}${ext2}`;
       }
       /**
        * Increment the number of files created or checked by this instance.
@@ -11951,14 +11951,14 @@ var require_file = __commonJS({
        * @returns {undefined}
        * @private
        */
-      _checkMaxFilesIncrementing(ext2, basename10, callback) {
+      _checkMaxFilesIncrementing(ext2, basename11, callback) {
         if (!this.maxFiles || this._created < this.maxFiles) {
           return setImmediate(callback);
         }
         const oldest = this._created - this.maxFiles;
         const isOldest = oldest !== 0 ? oldest : "";
         const isZipped = this.zippedArchive ? ".gz" : "";
-        const filePath = `${basename10}${isOldest}${ext2}${isZipped}`;
+        const filePath = `${basename11}${isOldest}${ext2}${isZipped}`;
         const target = path2.join(this.dirname, filePath);
         fs.unlink(target, callback);
       }
@@ -11973,7 +11973,7 @@ var require_file = __commonJS({
        * @returns {undefined}
        * @private
        */
-      _checkMaxFilesTailable(ext2, basename10, callback) {
+      _checkMaxFilesTailable(ext2, basename11, callback) {
         const tasks = [];
         if (!this.maxFiles) {
           return;
@@ -11981,21 +11981,21 @@ var require_file = __commonJS({
         const isZipped = this.zippedArchive ? ".gz" : "";
         for (let x2 = this.maxFiles - 1; x2 > 1; x2--) {
           tasks.push(function(i6, cb) {
-            let fileName3 = `${basename10}${i6 - 1}${ext2}${isZipped}`;
+            let fileName3 = `${basename11}${i6 - 1}${ext2}${isZipped}`;
             const tmppath = path2.join(this.dirname, fileName3);
             fs.exists(tmppath, (exists2) => {
               if (!exists2) {
                 return cb(null);
               }
-              fileName3 = `${basename10}${i6}${ext2}${isZipped}`;
+              fileName3 = `${basename11}${i6}${ext2}${isZipped}`;
               fs.rename(tmppath, path2.join(this.dirname, fileName3), cb);
             });
           }.bind(this, x2));
         }
         asyncSeries(tasks, () => {
           fs.rename(
-            path2.join(this.dirname, `${basename10}${ext2}${isZipped}`),
-            path2.join(this.dirname, `${basename10}1${ext2}${isZipped}`),
+            path2.join(this.dirname, `${basename11}${ext2}${isZipped}`),
+            path2.join(this.dirname, `${basename11}1${ext2}${isZipped}`),
             callback
           );
         });
@@ -45334,7 +45334,7 @@ var require_mime_types = __commonJS({
   "../../node_modules/.pnpm/mime-types@2.1.35/node_modules/mime-types/index.js"(exports2) {
     "use strict";
     var db = require_mime_db();
-    var extname = __require("path").extname;
+    var extname2 = __require("path").extname;
     var EXTRACT_TYPE_REGEXP = /^\s*([^;\s]*)(?:;|\s|$)/;
     var TEXT_TYPE_REGEXP = /^text\//i;
     exports2.charset = charset;
@@ -45388,7 +45388,7 @@ var require_mime_types = __commonJS({
       if (!path2 || typeof path2 !== "string") {
         return false;
       }
-      var extension2 = extname("x." + path2).toLowerCase().substr(1);
+      var extension2 = extname2("x." + path2).toLowerCase().substr(1);
       if (!extension2) {
         return false;
       }
@@ -96473,7 +96473,7 @@ var require_parseParams = __commonJS({
 var require_basename = __commonJS({
   "../../node_modules/.pnpm/@fastify+busboy@2.1.1/node_modules/@fastify/busboy/lib/utils/basename.js"(exports2, module2) {
     "use strict";
-    module2.exports = function basename10(path2) {
+    module2.exports = function basename11(path2) {
       if (typeof path2 !== "string") {
         return "";
       }
@@ -96500,7 +96500,7 @@ var require_multipart = __commonJS({
     var Dicer = require_Dicer();
     var parseParams = require_parseParams();
     var decodeText = require_decodeText();
-    var basename10 = require_basename();
+    var basename11 = require_basename();
     var getLimit2 = require_getLimit();
     var RE_BOUNDARY = /^boundary$/i;
     var RE_FIELD = /^form-data$/i;
@@ -96617,7 +96617,7 @@ var require_multipart = __commonJS({
               } else if (RE_FILENAME.test(parsed[i6][0])) {
                 filename = parsed[i6][1];
                 if (!preservePath) {
-                  filename = basename10(filename);
+                  filename = basename11(filename);
                 }
               }
             }
@@ -115453,8 +115453,8 @@ var require_tmp = __commonJS({
       if (option === "name") {
         if (path2.isAbsolute(name))
           throw new Error(`${option} option must not contain an absolute path, found "${name}".`);
-        let basename10 = path2.basename(name);
-        if (basename10 === ".." || basename10 === "." || basename10 !== name)
+        let basename11 = path2.basename(name);
+        if (basename11 === ".." || basename11 === "." || basename11 !== name)
           throw new Error(`${option} option must not contain a path, found "${name}".`);
       } else {
         if (path2.isAbsolute(name) && !name.startsWith(tmpDir)) {
@@ -194030,11 +194030,10 @@ async function loadPom(rootDir, pomFile, validateFile, visited = /* @__PURE__ */
     xml: xml2,
     indentation,
     sourceText,
-    profiles: /* @__PURE__ */ new Map(),
-    visited
+    profiles: /* @__PURE__ */ new Map()
   };
   const parentPomPath = getParentPomPath(pom);
-  const parentPom = parentPomPath ? await loadPom(rootDir, parentPomPath, validateFile) : void 0;
+  const parentPom = parentPomPath ? await loadPom(rootDir, parentPomPath, validateFile, visited) : void 0;
   pom.profiles = extractProfilesFromPom(pom, parentPom?.profiles);
   return pom;
 }
@@ -194240,7 +194239,7 @@ function evaluate(expression, pom, profileId) {
       if (property) {
         return evaluateWithContext(property.text, depth + 1);
       } else {
-        logger.warn(`Unknown property ${propertyName} for pom ${relative2(pom.rootDir, pom.validatedPomFile)}`);
+        logger.debug(`Unknown property ${propertyName} for pom ${relative2(pom.rootDir, pom.validatedPomFile)}`);
         return match2;
       }
     });
@@ -198810,12 +198809,18 @@ var MavenSocketUpgradeManager = class {
     const patches = [];
     for (const upgrade of upgrades) {
       const artifact = artifacts[upgrade.idx];
-      const directManifestFiles = i(artifact.manifestFiles?.map((ref) => ref.file) ?? []);
-      for (const manifestFile of directManifestFiles) {
+      const manifestFilesForArtifact = i(
+        (artifact.manifestFiles?.map((ref) => ref.file) ?? []).concat(
+          artifact.toplevelAncestors?.flatMap(
+            (ancestorId) => artifacts.find((a5) => a5.id === ancestorId)?.manifestFiles?.map((m3) => m3.file) ?? []
+          ) ?? []
+        )
+      );
+      for (const manifestFile of manifestFilesForArtifact) {
         if (this.pomMatcher(basename(manifestFile))) {
           const project = await loadPom(this.rootDir, manifestFile, validateFile);
           if (project) {
-            for (const patch of await this.handlePom(project, upgrade, artifact, rangeStyle, "DIRECT")) {
+            for (const patch of await this.handlePom(project, upgrade, artifact, rangeStyle)) {
               patches.push(patch);
             }
           } else {
@@ -198828,43 +198833,7 @@ var MavenSocketUpgradeManager = class {
         } else if (this.gradleLockfileMatcher(basename(manifestFile))) {
           const lockFileContent = await loadLockFile(this.rootDir, manifestFile, validateFile);
           if (lockFileContent) {
-            for (const patch of await this.handleGradleLockfile(lockFileContent, upgrade, artifact, "DIRECT")) {
-              patches.push(patch);
-            }
-          } else {
-            patches.push({
-              success: false,
-              upgrades: [upgrade],
-              reason: `Manifest file not valid for updates: ${manifestFile}`
-            });
-          }
-        } else {
-          logger.warn(`File does not match supported patterns for upgrading dependencies: ${manifestFile}`);
-        }
-      }
-      const ancestorManifestFiles = i(
-        artifact.toplevelAncestors?.flatMap(
-          (ancestorId) => artifacts.find((a5) => a5.id === ancestorId)?.manifestFiles?.map((ref) => ref.file) ?? []
-        ) ?? []
-      );
-      for (const manifestFile of ancestorManifestFiles) {
-        if (this.pomMatcher(basename(manifestFile))) {
-          const project = await loadPom(this.rootDir, manifestFile, validateFile);
-          if (project) {
-            for (const patch of await this.handlePom(project, upgrade, artifact, rangeStyle, "ANCESTOR")) {
-              patches.push(patch);
-            }
-          } else {
-            patches.push({
-              success: false,
-              upgrades: [upgrade],
-              reason: `Manifest file not valid for updates: ${manifestFile}`
-            });
-          }
-        } else if (this.gradleLockfileMatcher(basename(manifestFile))) {
-          const lockFile = await loadLockFile(this.rootDir, manifestFile, validateFile);
-          if (lockFile) {
-            for (const patch of await this.handleGradleLockfile(lockFile, upgrade, artifact, "ANCESTOR")) {
+            for (const patch of await this.handleGradleLockfile(lockFileContent, upgrade, artifact)) {
               patches.push(patch);
             }
           } else {
@@ -198884,7 +198853,7 @@ var MavenSocketUpgradeManager = class {
   /**
    * Handle POM files for updating existing dependencies/managed dependencies
    */
-  async handlePom(pom, upgrade, artifact, rangeStyle, kind) {
+  async handlePom(pom, upgrade, artifact, rangeStyle) {
     const patches = [];
     assert3(artifact.namespace);
     assert3(artifact.name);
@@ -198899,78 +198868,36 @@ var MavenSocketUpgradeManager = class {
       new Restriction(upgradeMavenVersion, true, upgradeMavenVersion, true)
     ]);
     const upgradeMavenRange = existingMavenVersion.compareTo(upgradeMavenVersion) <= 0 ? new VersionRange(null, [new Restriction(upgradeMavenVersion, true, null, false)]) : new VersionRange(null, [new Restriction(null, false, upgradeMavenVersion, true)]);
-    if (kind === "DIRECT") {
-      for (const [profileId, profile] of pom.profiles) {
-        const foundDep = profile.dependencies.reverse().find((dep) => {
-          return groupId === evaluate(dep.groupId.text, pom, profileId) && artifactId === evaluate(dep.artifactId.text, pom, profileId) && (type ?? "jar") === evaluate(dep.type?.text ?? "jar", pom, profileId) && classifier === (dep.classifier && evaluate(dep.classifier.text, pom, profileId));
-        });
-        if (foundDep) {
-          if (foundDep.version) {
-            const existingVersionRange = VersionRange.createFromVersionSpec(evaluate(foundDep.version.text, pom));
-            const patchLocation = findPatchLocation(foundDep.pom.validatedPomFile, foundDep.version, pom, profileId);
-            if (patchLocation?.offset !== void 0) {
-              patches.push({
-                success: true,
-                upgrades: [upgrade],
-                patch: {
-                  file: patchLocation.file,
-                  offset: patchLocation.offset,
-                  oldText: patchLocation.text,
-                  newText: (
-                    // Use pinned version if rangeStyle is set or if we break existing spec!
-                    rangeStyle === "pin" || !existingVersionRange.containsVersion(upgradeMavenVersion) ? upgradeMavenRangePinned.toString() : existingVersionRange.hasRestrictions() ? upgradeMavenRange.restrict(existingVersionRange).toString() : upgradeMavenVersion.toString()
-                  )
-                }
-              });
-            } else {
-              patches.push({
-                success: false,
-                upgrades: [upgrade],
-                reason: "Failed to create patch for direct dependency"
-              });
-            }
-          } else {
-            const foundManagedDep = profile.managedDependencies.reverse().concat(pom.profiles.get(void 0)?.managedDependencies.reverse() ?? []).find((dep) => {
-              return groupId === evaluate(dep.groupId.text, pom, profileId) && artifactId === evaluate(dep.artifactId.text, pom, profileId) && (type ?? "jar") === evaluate(dep.type?.text ?? "jar", pom, profileId) && classifier === (dep.classifier && evaluate(dep.classifier.text, pom, profileId));
-            });
-            if (foundManagedDep) {
-              const existingVersionRange = VersionRange.createFromVersionSpec(
-                evaluate(foundManagedDep.version.text, pom)
-              );
-              const patchLocation = findPatchLocation(
-                foundManagedDep.pom.validatedPomFile,
-                foundManagedDep.version,
-                pom,
-                profileId
-              );
-              if (patchLocation?.offset !== void 0) {
-                patches.push({
-                  success: true,
-                  upgrades: [upgrade],
-                  patch: {
-                    file: patchLocation.file,
-                    offset: patchLocation.offset,
-                    oldText: patchLocation.text,
-                    newText: (
-                      // Use pinned version if rangeStyle is set or if we break existing spec!
-                      rangeStyle === "pin" || !existingVersionRange.containsVersion(upgradeMavenVersion) ? upgradeMavenRangePinned.toString() : existingVersionRange.hasRestrictions() ? upgradeMavenRange.restrict(existingVersionRange).toString() : upgradeMavenVersion.toString()
-                    )
-                  }
-                });
-              } else {
-                patches.push({
-                  success: false,
-                  upgrades: [upgrade],
-                  reason: "Failed to create patch for direct managed dependency"
-                });
-              }
+    for (const [profileId, profile] of pom.profiles) {
+      const foundDep = profile.dependencies.reverse().find((dep) => {
+        return groupId === evaluate(dep.groupId.text, pom, profileId) && artifactId === evaluate(dep.artifactId.text, pom, profileId) && (type ?? "jar") === evaluate(dep.type?.text ?? "jar", pom, profileId) && classifier === (dep.classifier && evaluate(dep.classifier.text, pom, profileId));
+      });
+      if (foundDep?.version) {
+        const existingVersionRange = VersionRange.createFromVersionSpec(evaluate(foundDep.version.text, pom));
+        const patchLocation = findPatchLocation(foundDep.pom.validatedPomFile, foundDep.version, pom, profileId);
+        if (patchLocation?.offset !== void 0) {
+          patches.push({
+            success: true,
+            upgrades: [upgrade],
+            patch: {
+              file: patchLocation.file,
+              offset: patchLocation.offset,
+              oldText: patchLocation.text,
+              newText: (
+                // Use pinned version if rangeStyle is set or if we break existing spec!
+                rangeStyle === "pin" || !existingVersionRange.containsVersion(upgradeMavenVersion) ? upgradeMavenRangePinned.toString() : existingVersionRange.hasRestrictions() ? upgradeMavenRange.restrict(existingVersionRange).toString() : upgradeMavenVersion.toString()
+              )
             }
-          }
+          });
+        } else {
+          patches.push({
+            success: false,
+            upgrades: [upgrade],
+            reason: "Failed to create patch for direct dependency"
+          });
         }
-      }
-    } else {
-      for (const [profileId, profile] of pom.profiles) {
-        const foundManagedDep = profile.managedDependencies.reverse().find((dep) => {
+      } else {
+        const foundManagedDep = profile.managedDependencies.reverse().concat(pom.profiles.get(void 0)?.managedDependencies.reverse() ?? []).find((dep) => {
           return groupId === evaluate(dep.groupId.text, pom, profileId) && artifactId === evaluate(dep.artifactId.text, pom, profileId) && (type ?? "jar") === evaluate(dep.type?.text ?? "jar", pom, profileId) && classifier === (dep.classifier && evaluate(dep.classifier.text, pom, profileId));
         });
         if (foundManagedDep) {
@@ -198999,7 +198926,7 @@ var MavenSocketUpgradeManager = class {
             patches.push({
               success: false,
               upgrades: [upgrade],
-              reason: "Failed to create patch for transitive managed dependency"
+              reason: "Failed to create patch for direct managed dependency"
             });
           }
         }
@@ -199010,7 +198937,7 @@ var MavenSocketUpgradeManager = class {
   /**
    * Handle gradle.lockfile manifest files
    */
-  async handleGradleLockfile(lockFile, upgrade, artifact, _kind) {
+  async handleGradleLockfile(lockFile, upgrade, artifact) {
     assert3(artifact.namespace);
     assert3(artifact.name);
     assert3(artifact.version);
@@ -199042,56 +198969,26 @@ var MavenSocketUpgradeManager = class {
    */
   async collectFallbackPatches(upgrades, artifacts, rangeStyle, validateFile) {
     const patches = [];
-    const directUpgradesByManifestFile = {};
-    const ancestorUpgradesByManifestFile = {};
+    const upgradesByManifestFile = {};
     for (const upgrade of upgrades) {
       const artifact = artifacts[upgrade.idx];
-      const directManifestFiles = i(artifact.manifestFiles?.map((ref) => ref.file) ?? []);
-      for (const manifestFile of directManifestFiles) {
-        (directUpgradesByManifestFile[manifestFile] ??= []).push({ upgrade, artifact });
-      }
-      const ancestorManifestFiles = i(
-        artifact.toplevelAncestors?.flatMap(
-          (ancestorId) => artifacts.find((a5) => a5.id === ancestorId)?.manifestFiles?.map((ref) => ref.file) ?? []
-        ) ?? []
+      const manifestFilesForArtifact = i(
+        (artifact.manifestFiles?.map((ref) => ref.file) ?? []).concat(
+          artifact.toplevelAncestors?.flatMap(
+            (ancestorId) => artifacts.find((a5) => a5.id === ancestorId)?.manifestFiles?.map((m3) => m3.file) ?? []
+          ) ?? []
+        )
       );
-      for (const manifestFile of ancestorManifestFiles) {
-        (ancestorUpgradesByManifestFile[manifestFile] ??= []).push({ upgrade, artifact });
-      }
-    }
-    for (const [manifestFile, upgradeArtifactPairs] of Object.entries(directUpgradesByManifestFile)) {
-      const fileName3 = basename(manifestFile);
-      if (this.pomMatcher(fileName3)) {
-        const project = await loadPom(this.rootDir, manifestFile, validateFile);
-        if (project) {
-          patches.push(...await this.handlePomFallback(project, upgradeArtifactPairs, rangeStyle, "DIRECT"));
-        } else {
-          patches.push({
-            success: false,
-            upgrades: upgradeArtifactPairs.map(({ upgrade }) => upgrade),
-            reason: `Manifest file not valid for updates: ${manifestFile}`
-          });
-        }
-      } else if (this.gradleLockfileMatcher(fileName3)) {
-        patches.push({
-          success: false,
-          upgrades: upgradeArtifactPairs.map(({ upgrade }) => upgrade),
-          reason: `Should have upgraded dependencies in grade lockfiles during first pass: ${manifestFile}`
-        });
-      } else {
-        patches.push({
-          success: false,
-          upgrades: upgradeArtifactPairs.map(({ upgrade }) => upgrade),
-          reason: `File does not match supported patterns: ${manifestFile}`
-        });
+      for (const manifestFile of manifestFilesForArtifact) {
+        (upgradesByManifestFile[manifestFile] ??= []).push({ upgrade, artifact });
       }
     }
-    for (const [manifestFile, upgradeArtifactPairs] of Object.entries(ancestorUpgradesByManifestFile)) {
+    for (const [manifestFile, upgradeArtifactPairs] of Object.entries(upgradesByManifestFile)) {
       const fileName3 = basename(manifestFile);
       if (this.pomMatcher(fileName3)) {
         const project = await loadPom(this.rootDir, manifestFile, validateFile);
         if (project) {
-          patches.push(...await this.handlePomFallback(project, upgradeArtifactPairs, rangeStyle, "ANCESTOR"));
+          patches.push(...await this.handlePomFallback(project, upgradeArtifactPairs, rangeStyle));
         } else {
           patches.push({
             success: false,
@@ -199118,7 +199015,7 @@ var MavenSocketUpgradeManager = class {
   /**
    * Handle POM files for adding new managed dependencies
    */
-  async handlePomFallback(pom, upgradeArtifactPairs, rangeStyle, kind) {
+  async handlePomFallback(pom, upgradeArtifactPairs, rangeStyle) {
     const patches = [];
     const dependencies = upgradeArtifactPairs.map(({ upgrade, artifact }) => {
       assert3(artifact.namespace);
@@ -199136,36 +199033,19 @@ var MavenSocketUpgradeManager = class {
         classifier: artifact.qualifiers?.classifier
       };
     });
-    if (kind === "DIRECT") {
-      const patch = createDependenciesPatch(pom, dependencies);
-      if (patch) {
-        patches.push({
-          success: true,
-          upgrades: upgradeArtifactPairs.map(({ upgrade }) => upgrade),
-          patch
-        });
-      } else {
-        patches.push({
-          success: false,
-          upgrades: upgradeArtifactPairs.map(({ upgrade }) => upgrade),
-          reason: `Could not create dependency batch patch in ${relative4(pom.rootDir, pom.validatedPomFile)}`
-        });
-      }
+    const patch = createDependenciesPatch(pom, dependencies);
+    if (patch) {
+      patches.push({
+        success: true,
+        upgrades: upgradeArtifactPairs.map(({ upgrade }) => upgrade),
+        patch
+      });
     } else {
-      const patch = createManagedDependenciesPatch(pom, dependencies);
-      if (patch) {
-        patches.push({
-          success: true,
-          upgrades: upgradeArtifactPairs.map(({ upgrade }) => upgrade),
-          patch
-        });
-      } else {
-        patches.push({
-          success: false,
-          upgrades: upgradeArtifactPairs.map(({ upgrade }) => upgrade),
-          reason: `Could not create managed dependency batch patch in ${relative4(pom.rootDir, pom.validatedPomFile)}`
-        });
-      }
+      patches.push({
+        success: false,
+        upgrades: upgradeArtifactPairs.map(({ upgrade }) => upgrade),
+        reason: `Could not create dependency batch patch in ${relative4(pom.rootDir, pom.validatedPomFile)}`
+      });
     }
     return patches;
   }
@@ -207283,17 +207163,26 @@ var CargoFixingManager = class {
 
 // ../fixing-management/src/fixing-management/nuget/nuget-socket-upgrade-manager.ts
 var import_picomatch2 = __toESM(require_picomatch2(), 1);
-import { basename as basename4, relative as relative10, resolve as resolve18 } from "node:path";
+import { basename as basename5, relative as relative10, resolve as resolve18 } from "node:path";
 
 // ../fixing-management/src/fixing-management/nuget/nuget-project-utils.ts
 var import_parse_xml3 = __toESM(require_dist(), 1);
 import { readFile as readFile17 } from "node:fs/promises";
-import { dirname as dirname8, join as join12, relative as relative9, resolve as resolve17 } from "node:path";
+import { dirname as dirname8, join as join12, relative as relative9, resolve as resolve17, basename as basename4, extname } from "node:path";
 import { existsSync as existsSync11 } from "node:fs";
 function normalizeMSBuildPath(path2) {
   return path2.replace(/\\/g, "/");
 }
-async function loadNuGetProject(rootDir, projectFile, validateFile, visited = new TransformMap((f5) => f5.toLocaleLowerCase())) {
+async function loadNuGetProject(rootDir, projectFile, validateFile) {
+  return loadNuGetProjectOrTarget(
+    rootDir,
+    projectFile,
+    void 0,
+    new TransformMap((p3) => p3.toLocaleLowerCase()),
+    validateFile
+  );
+}
+async function loadNuGetProjectOrTarget(rootDir, projectFile, mainProject, visited, validateFile) {
   const validatedProjectPath = validateFile(resolve17(rootDir, projectFile));
   if (!validatedProjectPath || !existsSync11(validatedProjectPath)) return void 0;
   if (visited.has(validatedProjectPath)) return void 0;
@@ -207301,7 +207190,7 @@ async function loadNuGetProject(rootDir, projectFile, validateFile, visited = ne
   const sourceText = await readFile17(validatedProjectPath, "utf-8");
   const xml2 = (0, import_parse_xml3.parseXml)(sourceText, { includeOffsets: true });
   const indentation = inferIndentationFromParsedXml2(xml2, sourceText);
-  const project = {
+  const currentProject = {
     rootDir,
     validatedProjectPath,
     xml: xml2,
@@ -207309,34 +207198,44 @@ async function loadNuGetProject(rootDir, projectFile, validateFile, visited = ne
     sourceText,
     packageReferences: [],
     packageVersions: [],
-    properties: new TransformMap((p3) => p3.toLocaleLowerCase()),
-    visited
+    properties: new TransformMap((p3) => p3.toLocaleLowerCase())
   };
-  for (const directoryBuildPropsProject of await findDirectoryBuildPropsProjects(project, validateFile)) {
+  mainProject ??= currentProject;
+  for (const directoryBuildPropsProject of await findDirectoryBuildPropsProjects(
+    currentProject,
+    mainProject,
+    visited,
+    validateFile
+  )) {
     for (const pkgRef of directoryBuildPropsProject.packageReferences) {
-      project.packageReferences.push(pkgRef);
+      currentProject.packageReferences.push(pkgRef);
     }
     for (const pkgVer of directoryBuildPropsProject.packageVersions) {
-      project.packageVersions.push(pkgVer);
+      currentProject.packageVersions.push(pkgVer);
     }
     for (const [name, property] of directoryBuildPropsProject.properties) {
-      project.properties.set(name, property);
+      currentProject.properties.set(name, property);
     }
   }
-  const directoryPackagesPropsProject = await findDirectoryPackagesPropsProjects(project, validateFile);
+  const directoryPackagesPropsProject = await findDirectoryPackagesPropsProject(
+    currentProject,
+    mainProject,
+    visited,
+    validateFile
+  );
   if (directoryPackagesPropsProject) {
     for (const pkgRef of directoryPackagesPropsProject.packageReferences) {
-      project.packageReferences.push(pkgRef);
+      currentProject.packageReferences.push(pkgRef);
     }
     for (const pkgVer of directoryPackagesPropsProject.packageVersions) {
-      project.packageVersions.push(pkgVer);
+      currentProject.packageVersions.push(pkgVer);
     }
     for (const [name, property] of directoryPackagesPropsProject.properties) {
-      project.properties.set(name, property);
+      currentProject.properties.set(name, property);
     }
   }
-  await extractProjectElements(project, validateFile);
-  return project;
+  await extractProjectElements(currentProject, mainProject, visited, validateFile);
+  return currentProject;
 }
 async function loadPackagesConfig(rootDir, file, validateFile) {
   const validatedConfigPath = validateFile(resolve17(rootDir, file));
@@ -207378,18 +207277,19 @@ function extractPackagesFromXml(xmlDoc, fileContent) {
   }
   return packages;
 }
-async function findDirectoryBuildPropsProjects(project, validateFile) {
+async function findDirectoryBuildPropsProjects(currentProject, mainProject, visited, validateFile) {
   const projectsReverse = [];
-  let currentDir = dirname8(project.validatedProjectPath);
-  while (currentDir.startsWith(project.rootDir) && currentDir !== dirname8(currentDir)) {
+  let currentDir = dirname8(currentProject.validatedProjectPath);
+  while (currentDir.startsWith(currentProject.rootDir) && currentDir !== dirname8(currentDir)) {
     const unvalidatedPath = join12(currentDir, "Directory.Build.props");
     const validatedPath = validateFile(unvalidatedPath);
-    if (validatedPath && validatedPath !== project.validatedProjectPath) {
-      const directoryBuildPropsProject = await loadNuGetProject(
-        project.rootDir,
+    if (validatedPath && validatedPath !== currentProject.validatedProjectPath) {
+      const directoryBuildPropsProject = await loadNuGetProjectOrTarget(
+        currentProject.rootDir,
         unvalidatedPath,
-        validateFile,
-        project.visited
+        mainProject,
+        visited,
+        validateFile
       );
       if (directoryBuildPropsProject) {
         projectsReverse.push(directoryBuildPropsProject);
@@ -207399,53 +207299,93 @@ async function findDirectoryBuildPropsProjects(project, validateFile) {
   }
   return projectsReverse.reverse();
 }
-async function findDirectoryPackagesPropsProjects(project, validateFile) {
-  let currentDir = dirname8(project.validatedProjectPath);
-  while (currentDir.startsWith(project.rootDir) && currentDir !== dirname8(currentDir)) {
+async function findDirectoryPackagesPropsProject(currentProject, mainProject, visited, validateFile) {
+  let currentDir = dirname8(currentProject.validatedProjectPath);
+  while (currentDir.startsWith(currentProject.rootDir) && currentDir !== dirname8(currentDir)) {
     const unvalidatedPath = join12(currentDir, "Directory.Packages.props");
     const validatedPath = validateFile(unvalidatedPath);
     if (validatedPath) {
-      return validatedPath !== project.validatedProjectPath ? await loadNuGetProject(project.rootDir, unvalidatedPath, validateFile, project.visited) : void 0;
+      return validatedPath !== currentProject.validatedProjectPath ? await loadNuGetProjectOrTarget(currentProject.rootDir, unvalidatedPath, mainProject, visited, validateFile) : void 0;
     }
     currentDir = dirname8(currentDir);
   }
   return void 0;
 }
-async function extractProjectElements(project, validateFile) {
-  const projectElement = project.xml.children.filter((child) => child instanceof import_parse_xml3.XmlElement).find((child) => child.name === "Project");
+function addReservedMSBuildProperties(currentProject, mainProject) {
+  const reservedProperties = [
+    // MSBuildProject* properties - always reference the main project file
+    ["MSBuildProjectDirectory", normalizeMSBuildPath(dirname8(mainProject.validatedProjectPath))],
+    [
+      "MSBuildProjectDirectoryNoRoot",
+      normalizeMSBuildPath(dirname8(mainProject.validatedProjectPath)).replace(/^[A-Za-z]:/, "")
+    ],
+    ["MSBuildProjectExtension", extname(mainProject.validatedProjectPath)],
+    ["MSBuildProjectFile", basename4(mainProject.validatedProjectPath)],
+    ["MSBuildProjectFullPath", normalizeMSBuildPath(mainProject.validatedProjectPath)],
+    ["MSBuildProjectName", basename4(mainProject.validatedProjectPath, extname(mainProject.validatedProjectPath))],
+    // MSBuildThisFile* properties - reference the current project being processed
+    ["MSBuildThisFile", basename4(currentProject.validatedProjectPath)],
+    ["MSBuildThisFileDirectory", normalizeMSBuildPath(dirname8(currentProject.validatedProjectPath)) + "/"],
+    [
+      "MSBuildThisFileDirectoryNoRoot",
+      (normalizeMSBuildPath(dirname8(currentProject.validatedProjectPath)) + "/").replace(/^[A-Za-z]:/, "")
+    ],
+    ["MSBuildThisFileExtension", extname(currentProject.validatedProjectPath)],
+    ["MSBuildThisFileFullPath", normalizeMSBuildPath(currentProject.validatedProjectPath)],
+    [
+      "MSBuildThisFileName",
+      basename4(currentProject.validatedProjectPath, extname(currentProject.validatedProjectPath))
+    ]
+  ];
+  for (const [propertyName, propertyValue] of reservedProperties) {
+    currentProject.properties.set(propertyName, {
+      project: currentProject,
+      text: propertyValue
+    });
+  }
+}
+async function extractProjectElements(currentProject, mainProject, visited, validateFile) {
+  const projectElement = currentProject.xml.children.filter((child) => child instanceof import_parse_xml3.XmlElement).find((child) => child.name === "Project");
   if (!projectElement) return;
+  addReservedMSBuildProperties(currentProject, mainProject);
   for (const element of projectElement.children.filter((child) => child instanceof import_parse_xml3.XmlElement)) {
     switch (element.name) {
       case "Import":
-        await handleImportElement(project, element, validateFile);
+        await handleImportElement(currentProject, element, mainProject, visited, validateFile);
         break;
       case "ItemGroup":
-        handleItemGroupElement(project, element);
+        handleItemGroupElement(currentProject, element);
         break;
       case "PropertyGroup":
-        handlePropertyGroupElement(project, element);
+        handlePropertyGroupElement(currentProject, element);
         break;
     }
   }
 }
-async function handleImportElement(project, importElement, validateFile) {
-  const projectValue = extractTextAndOffsetFromElementOrAttribute(project.sourceText, importElement, "Project");
+async function handleImportElement(currentProject, importElement, mainProject, visited, validateFile) {
+  const projectValue = extractTextAndOffsetFromElementOrAttribute(currentProject.sourceText, importElement, "Project");
   if (!projectValue) return;
-  const importPath = evaluate2(projectValue.text, project);
+  const importPath = evaluate2(projectValue.text, currentProject);
   if (!importPath) return;
-  const resolvedPath = resolve17(dirname8(project.validatedProjectPath), normalizeMSBuildPath(importPath));
+  const resolvedPath = resolve17(dirname8(currentProject.validatedProjectPath), normalizeMSBuildPath(importPath));
   const validatedPath = validateFile(resolvedPath);
   if (!validatedPath || !existsSync11(validatedPath)) return;
-  const importedProject = await loadNuGetProject(project.rootDir, resolvedPath, validateFile, project.visited);
+  const importedProject = await loadNuGetProjectOrTarget(
+    currentProject.rootDir,
+    resolvedPath,
+    mainProject,
+    visited,
+    validateFile
+  );
   if (!importedProject) return;
   for (const pkgRef of importedProject.packageReferences) {
-    project.packageReferences.push(pkgRef);
+    currentProject.packageReferences.push(pkgRef);
   }
   for (const pkgVer of importedProject.packageVersions) {
-    project.packageVersions.push(pkgVer);
+    currentProject.packageVersions.push(pkgVer);
   }
   for (const [name, property] of importedProject.properties) {
-    project.properties.set(name, property);
+    currentProject.properties.set(name, property);
   }
 }
 function handleItemGroupElement(project, parent2) {
@@ -207504,14 +207444,11 @@ function handlePropertyGroupElement(project, propertyGroup) {
     const propertyName = propertyElement.name;
     const propertyValue = propertyElement.text;
     if (propertyValue) {
-      const openTagEnd = project.sourceText.indexOf(">", propertyElement.start) + 1;
-      const closeTagStart = project.sourceText.lastIndexOf("<", propertyElement.end);
-      const textRange = [openTagEnd, closeTagStart];
       project.properties.set(propertyName, {
         project,
         parent: propertyGroup,
         text: propertyValue,
-        offset: textRange?.[0]
+        offset: propertyElement.start + 2 + propertyName.length
       });
     }
   }
@@ -207548,34 +207485,18 @@ function findPatchLocation2(file, textAndOffset, project) {
   }
   return chase(file, textAndOffset.text, textAndOffset.offset, 0);
 }
-function findAncestorPackageReferenceContexts(project, ancestors) {
-  const contexts = [];
-  for (const ancestor of ancestors) {
-    const ancestorPackageReferences = project.packageReferences.filter(
+function findAncestorPackageReferenceDeclarations(project, ancestors) {
+  return ancestors.flatMap(
+    (ancestor) => project.packageReferences.filter(
       (pkg) => evaluate2(pkg.name.text, project).toLowerCase() === ancestor.name.toLowerCase() && ancestor.version !== void 0 && (pkg.version === void 0 || versionSatisfiesSpecifier("NUGET", ancestor.version, evaluate2(pkg.version.text, project)))
-    );
-    for (const ancestorPackageReference of ancestorPackageReferences) {
-      contexts.push(i3(ancestorPackageReference, ["project", "parent", "condition"]));
-    }
-  }
-  return m(
-    contexts,
-    (a5, b) => a5.project.validatedProjectPath.toLocaleLowerCase() === b.project.validatedProjectPath.toLocaleLowerCase() && a5.parent === b.parent && a5.condition?.toLocaleLowerCase() === b.condition?.toLocaleLowerCase()
+    )
   );
 }
-function findAncestorPackageVersionContexts(project, ancestors) {
-  const contexts = [];
-  for (const ancestor of ancestors) {
-    const ancestorPackageVersions = project.packageVersions.filter(
+function findAncestorPackageVersionDeclarations(project, ancestors) {
+  return ancestors.flatMap(
+    (ancestor) => project.packageVersions.filter(
       (pkg) => ancestor.version !== void 0 && evaluate2(pkg.name.text, project).toLowerCase() === ancestor.name.toLowerCase() && versionSatisfiesSpecifier("NUGET", ancestor.version, evaluate2(pkg.version.text, project))
-    );
-    for (const ancestorPackageVersion of ancestorPackageVersions) {
-      contexts.push(i3(ancestorPackageVersion, ["project", "parent", "condition"]));
-    }
-  }
-  return m(
-    contexts,
-    (a5, b) => a5.project.validatedProjectPath.toLocaleLowerCase() === b.project.validatedProjectPath.toLocaleLowerCase() && a5.parent === b.parent && a5.condition?.toLocaleLowerCase() === b.condition?.toLocaleLowerCase()
+    )
   );
 }
 function evaluate2(expression, project) {
@@ -207593,7 +207514,7 @@ function evaluate2(expression, project) {
       if (property) {
         return evaluateWithContext(property.text, depth + 1);
       } else {
-        logger.warn(
+        logger.debug(
           `Unknown property ${propertyName} for project ${relative9(project.rootDir, project.validatedProjectPath)}`
         );
         return match2;
@@ -207663,7 +207584,7 @@ var NuGetSocketUpgradeManager = class {
   lockFileMatcher = (0, import_picomatch2.default)("packages.lock.json");
   truthyValues = ["true", "yes", "on"];
   async applySocketArtifactUpgrades(manifestFiles, upgrades, artifacts, rangeStyle) {
-    if (manifestFiles.find((f5) => this.lockFileMatcher(basename4(f5)))) {
+    if (manifestFiles.find((f5) => this.lockFileMatcher(basename5(f5)))) {
       throw Error(`Upgrading dependencies currently not supporte for NuGet projets with lockfiles`);
     }
     const caseInsensitiveManifestFileMap = new TransformMap((key) => key.toLowerCase());
@@ -207699,7 +207620,7 @@ var NuGetSocketUpgradeManager = class {
   async collectPreparePatches(manifestFiles, validateFile) {
     const patches = [];
     for (const manifestFile of manifestFiles) {
-      if (this.projectMatcher(basename4(manifestFile))) {
+      if (this.projectMatcher(basename5(manifestFile))) {
         const project = await loadNuGetProject(this.rootDir, manifestFile, validateFile);
         if (project) {
           for (const patch of await this.handleProjectPrepare(project)) {
@@ -207712,7 +207633,7 @@ var NuGetSocketUpgradeManager = class {
             reason: `Manifest file not valid for updates: ${manifestFile}`
           });
         }
-      } else if (this.packagesConfigMatcher(basename4(manifestFile))) {
+      } else if (this.packagesConfigMatcher(basename5(manifestFile))) {
         const packagesConfig = await loadPackagesConfig(this.rootDir, manifestFile, validateFile);
         if (packagesConfig) {
           for (const patch of await this.handlePackagesConfigPrepare(packagesConfig)) {
@@ -207767,12 +207688,12 @@ var NuGetSocketUpgradeManager = class {
         }
       }
     } else {
-      const patch = createPropertyPatch(
+      const patch = centralPackageManagementProperty.parent ? createPropertyPatch(
         centralPackageManagementProperty.project,
         centralPackageManagementProperty.parent,
         "CentralPackageTransitivePinningEnabled",
         "true"
-      );
+      ) : void 0;
       if (patch) {
         patches.push({
           success: true,
@@ -207793,61 +207714,22 @@ var NuGetSocketUpgradeManager = class {
     const patches = [];
     return patches;
   }
-  /**
-   * Collect patches for direct dependencies and Directory.Packages.props central management
-   * This prioritizes updating existing dependencies and using central package management
-   * Handles both direct dependencies (update existing) and transitive dependencies (add to Directory.Packages.props)
-   */
   async collectUpdatePatches(upgrades, artifacts, rangeStyle, validateFile) {
     const patches = [];
     for (const upgrade of upgrades) {
       const artifact = artifacts[upgrade.idx];
-      const directManifestFiles = i(artifact.manifestFiles?.map((ref) => ref.file) ?? []);
-      for (const manifestFile of directManifestFiles) {
-        if (this.projectMatcher(basename4(manifestFile))) {
-          const project = await loadNuGetProject(this.rootDir, manifestFile, validateFile);
-          if (project) {
-            for (const patch of await this.handleProject(project, upgrade, artifact, rangeStyle, "DIRECT")) {
-              patches.push(patch);
-            }
-          } else {
-            patches.push({
-              success: false,
-              upgrades: [upgrade],
-              reason: `Manifest file not valid for updates: ${manifestFile}`
-            });
-          }
-        } else if (this.packagesConfigMatcher(basename4(manifestFile))) {
-          const packagesConfig = await loadPackagesConfig(this.rootDir, manifestFile, validateFile);
-          if (packagesConfig) {
-            for (const patch of await this.handlePackagesConfig(packagesConfig, upgrade, artifact, "DIRECT")) {
-              patches.push(patch);
-            }
-          } else {
-            patches.push({
-              success: false,
-              upgrades: [upgrade],
-              reason: `Manifest file not valid for updates: ${manifestFile}`
-            });
-          }
-        } else {
-          patches.push({
-            success: false,
-            upgrades: [upgrade],
-            reason: `File does not match supported patterns: ${manifestFile}`
-          });
-        }
-      }
-      const ancestorManifestFiles = i(
-        artifact.toplevelAncestors?.flatMap(
-          (ancestorId) => artifacts.find((a5) => a5.id === ancestorId)?.manifestFiles?.map((m3) => m3.file) ?? []
-        ) ?? []
+      const manifestFilesForArtifact = i(
+        (artifact.manifestFiles?.map((ref) => ref.file) ?? []).concat(
+          artifact.toplevelAncestors?.flatMap(
+            (ancestorId) => artifacts.find((a5) => a5.id === ancestorId)?.manifestFiles?.map((m3) => m3.file) ?? []
+          ) ?? []
+        )
       );
-      for (const manifestFile of ancestorManifestFiles) {
-        if (this.projectMatcher(basename4(manifestFile))) {
+      for (const manifestFile of manifestFilesForArtifact) {
+        if (this.projectMatcher(basename5(manifestFile))) {
           const project = await loadNuGetProject(this.rootDir, manifestFile, validateFile);
           if (project) {
-            for (const patch of await this.handleProject(project, upgrade, artifact, rangeStyle, "ANCESTOR")) {
+            for (const patch of await this.handleProject(project, upgrade, artifact, rangeStyle)) {
               patches.push(patch);
             }
           } else {
@@ -207857,10 +207739,10 @@ var NuGetSocketUpgradeManager = class {
               reason: `Manifest file not valid for updates: ${manifestFile}`
             });
           }
-        } else if (this.packagesConfigMatcher(basename4(manifestFile))) {
+        } else if (this.packagesConfigMatcher(basename5(manifestFile))) {
           const packagesConfig = await loadPackagesConfig(this.rootDir, manifestFile, validateFile);
           if (packagesConfig) {
-            for (const patch of await this.handlePackagesConfig(packagesConfig, upgrade, artifact, "ANCESTOR")) {
+            for (const patch of await this.handlePackagesConfig(packagesConfig, upgrade, artifact)) {
               patches.push(patch);
             }
           } else {
@@ -207881,7 +207763,7 @@ var NuGetSocketUpgradeManager = class {
     }
     return patches;
   }
-  async handleProject(project, upgrade, artifact, rangeStyle, kind) {
+  async handleProject(project, upgrade, artifact, rangeStyle) {
     const patches = [];
     assert5(artifact.name);
     assert5(artifact.version);
@@ -207978,18 +207860,10 @@ var NuGetSocketUpgradeManager = class {
         }
       });
     }
-    if (kind === "DIRECT" && patches.length === 0) {
-      patches.push({
-        success: false,
-        upgrades: [upgrade],
-        reason: "Could not find patchable version location for direct dependency"
-      });
-    }
     return patches;
   }
-  async handlePackagesConfig(packagesConfig, upgrade, artifact, kind) {
+  async handlePackagesConfig(packagesConfig, upgrade, artifact) {
     const patches = [];
-    if (kind === "ANCESTOR") return patches;
     assert5(artifact.name);
     assert5(artifact.version);
     const packageName = artifact.name;
@@ -208016,22 +207890,8 @@ var NuGetSocketUpgradeManager = class {
         });
       }
     });
-    if (patches.length === 0) {
-      patches.push({
-        success: false,
-        upgrades: [upgrade],
-        reason: `Could not find patchable version location for packages.config file ${relative10(packagesConfig.rootDir, packagesConfig.validatedConfigPath)}`
-      });
-    }
     return patches;
   }
-  /**
-   * Collect fallback patches for remaining upgrades
-   * This handles:
-   * 1. Creating new PackageVersion entries in Directory.Packages.props for transitive dependencies
-   * 2. Promoting remaining transitive dependencies to direct dependencies as a last resort
-   * Groups multiple upgrades per manifest file for efficiency
-   */
   async collectFallbackPatches(upgrades, artifacts, rangeStyle, validateFile) {
     const patches = [];
     for (const upgrade of upgrades) {
@@ -208039,7 +207899,7 @@ var NuGetSocketUpgradeManager = class {
       const ancestors = (artifact.toplevelAncestors ?? []).map((ancestorId) => artifacts.find((a5) => a5.id === ancestorId)).filter((a5) => a5 !== void 0);
       const ancestorManifestFiles = i(ancestors.flatMap((a5) => a5.manifestFiles?.map((m3) => m3.file) ?? []) ?? []);
       for (const manifestFile of ancestorManifestFiles) {
-        if (this.projectMatcher(basename4(manifestFile))) {
+        if (this.projectMatcher(basename5(manifestFile))) {
           const project = await loadNuGetProject(this.rootDir, manifestFile, validateFile);
           if (project) {
             for (const patch of await this.handleProjectFallback(project, upgrade, artifact, ancestors, rangeStyle)) {
@@ -208052,7 +207912,7 @@ var NuGetSocketUpgradeManager = class {
               reason: `Manifest file not valid for updates: ${manifestFile}`
             });
           }
-        } else if (this.packagesConfigMatcher(basename4(manifestFile))) {
+        } else if (this.packagesConfigMatcher(basename5(manifestFile))) {
           const packagesConfig = await loadPackagesConfig(this.rootDir, manifestFile, validateFile);
           if (packagesConfig) {
             for (const patch of await this.handlePackagesConfigFallback(packagesConfig, upgrade, artifact)) {
@@ -208080,16 +207940,19 @@ var NuGetSocketUpgradeManager = class {
     const patches = [];
     const centralPackageManagementProperty = project.properties.get("ManagePackageVersionsCentrally");
     const centralPackageManagementEnabled = centralPackageManagementProperty && this.truthyValues.includes(evaluate2(centralPackageManagementProperty.text, project).toLowerCase());
-    const [findAncestorContexts, createPatch] = centralPackageManagementEnabled ? [findAncestorPackageVersionContexts, createPackageVersionPatch] : [findAncestorPackageReferenceContexts, createPackageReferencePatch];
+    const [findAncestorDeclarations, createPatch] = centralPackageManagementEnabled ? [findAncestorPackageVersionDeclarations, createPackageVersionPatch] : [findAncestorPackageReferenceDeclarations, createPackageReferencePatch];
     assert5(artifact.name);
     assert5(artifact.version);
     const nuGetVersion = NuGetVersion.parse(upgrade.upgradeVersion);
     const nuGetRangePinned = new NuGetRange(nuGetVersion, true, nuGetVersion, true);
     const versionSpec = rangeStyle === "pin" ? nuGetRangePinned.toString() : nuGetVersion.toString();
-    const ancestorContexts = findAncestorContexts(project, ancestors);
-    if (ancestorContexts.length > 0) {
-      for (const context2 of ancestorContexts) {
-        const patch = createPatch(context2.project, context2.parent, artifact.name, versionSpec, context2.condition);
+    const ancestorDeclarations = m(
+      findAncestorDeclarations(project, ancestors),
+      (a5, b) => a5.project.validatedProjectPath.toLocaleLowerCase() === b.project.validatedProjectPath.toLocaleLowerCase() && a5.parent === b.parent && a5.condition?.toLocaleLowerCase() === b.condition?.toLocaleLowerCase()
+    );
+    if (ancestorDeclarations.length > 0) {
+      for (const decl of ancestorDeclarations) {
+        const patch = createPatch(decl.project, decl.parent, artifact.name, versionSpec, decl.condition);
         if (patch) {
           patches.push({
             success: true,
@@ -208108,7 +207971,7 @@ var NuGetSocketUpgradeManager = class {
       patches.push({
         success: false,
         upgrades: [upgrade],
-        reason: `Could not find direct dependencies for transitive dependency in ${relative10(project.rootDir, project.validatedProjectPath)}`
+        reason: `Could not find declaration for top-level ancestor of transitive dependency in ${relative10(project.rootDir, project.validatedProjectPath)}`
       });
     }
     return patches;
@@ -208142,28 +208005,33 @@ var NuGetSocketUpgradeManager = class {
 };
 
 // ../fixing-management/src/fixing-management/rust/cargo-socket-upgrade-manager.ts
-import { basename as basename5, dirname as dirname9, join as join13, resolve as resolve19 } from "node:path";
+import { basename as basename6, dirname as dirname9, join as join13, resolve as resolve19 } from "node:path";
 var import_toml_eslint_parser2 = __toESM(require_lib10(), 1);
 var import_picomatch3 = __toESM(require_picomatch2(), 1);
 var import_semver3 = __toESM(require_semver2(), 1);
 import assert6 from "node:assert";
 import { readFile as readFile18 } from "node:fs/promises";
+import { existsSync as existsSync12 } from "node:fs";
 var CargoSocketUpgradeManager = class {
   constructor(rootDir) {
     this.rootDir = rootDir;
   }
   cargoTomlMatcher = (0, import_picomatch3.default)("Cargo.toml");
+  cargoLockMatcher = (0, import_picomatch3.default)("Cargo.lock");
   async applySocketArtifactUpgrades(_manifestFiles, upgrades, artifacts, rangeStyle) {
     const tomlPatches = await this.collectCargoTomlPatches(upgrades, artifacts, rangeStyle);
     const lockPatches = await this.collectCargoLockPatches(upgrades, artifacts);
     const successfulPatches = extractSuccessfulPatches(tomlPatches.concat(lockPatches));
     await applySocketPatchResults("RUST", this.rootDir, successfulPatches);
-    await asyncForEach(i(successfulPatches.map((p3) => dirname9(p3.patch.file))), async (dir) => {
-      const success = await execAndLogOnFailure(cmdt`cargo fetch`, resolve19(this.rootDir, dir));
-      if (!success) {
-        throw Error(`Could not update checksums with cargo fetch in directory ${dir || "."}`);
+    await asyncForEach(
+      i(successfulPatches.map((p3) => p3.patch.file)).filter((file) => this.cargoLockMatcher(basename6(file))),
+      async (lockFile) => {
+        const success = await execAndLogOnFailure(cmdt`cargo fetch`, dirname9(resolve19(this.rootDir, lockFile)));
+        if (!success) {
+          throw Error(`Could not update checksums in ${lockFile}`);
+        }
       }
-    });
+    );
   }
   /**
    * Collect patches for Cargo.toml files (direct dependencies only)
@@ -208174,10 +208042,8 @@ var CargoSocketUpgradeManager = class {
       assert6(artifact.name);
       assert6(artifact.version);
       const directManifestFiles = i(artifact.manifestFiles?.map((ref) => ref.file) ?? []);
-      return asyncFlatMap(
-        directManifestFiles.filter((manifestFile) => {
-          return this.cargoTomlMatcher(basename5(manifestFile));
-        }),
+      return await asyncFlatMap(
+        directManifestFiles.filter((manifestFile) => this.cargoTomlMatcher(basename6(manifestFile))),
         async (manifestFile) => this.handleCargoToml(manifestFile, upgrade, artifact, rangeStyle)
       );
     });
@@ -208198,10 +208064,8 @@ var CargoSocketUpgradeManager = class {
         )
       );
       return asyncFlatMap(
-        ancestorManifestFiles.filter((manifestFile) => {
-          return this.cargoTomlMatcher(basename5(manifestFile));
-        }),
-        async (tomlFile) => this.handleCargoLock(join13(dirname9(tomlFile), "Cargo.lock"), upgrade, artifact)
+        ancestorManifestFiles.filter((manifestFile) => this.cargoTomlMatcher(basename6(manifestFile))).map((tomlFile) => join13(dirname9(tomlFile), "Cargo.lock")).filter((lockFile) => existsSync12(resolve19(this.rootDir, lockFile))),
+        async (lockFile) => this.handleCargoLock(lockFile, upgrade, artifact)
       );
     });
   }
@@ -208343,7 +208207,7 @@ var CargoSocketUpgradeManager = class {
    */
   createNewVersionString(currentVersion, newVersion, rangeStyle) {
     if (rangeStyle === "pin") {
-      return newVersion;
+      return `=${newVersion}`;
     } else {
       const specifierMatch = currentVersion.match(/^([^\d]*)/);
       const specifier = specifierMatch ? specifierMatch[1] : "^";
@@ -208465,7 +208329,7 @@ async function applySocketUpgrades(ecosystem, rootDir, manifestFiles, upgrades,
 
 // dist/cli-apply-fix.js
 var import_lodash12 = __toESM(require_lodash(), 1);
-import { existsSync as existsSync16 } from "fs";
+import { existsSync as existsSync17 } from "fs";
 
 // ../other-modules-communicator/src/other-modules-communicator.ts
 import { execFileSync } from "child_process";
@@ -208482,9 +208346,9 @@ import { fileURLToPath as fileURLToPath3 } from "node:url";
 // ../utils/dist/file-utils.js
 var import_lodash5 = __toESM(require_lodash(), 1);
 var import_micromatch = __toESM(require_micromatch(), 1);
-import { existsSync as existsSync12 } from "fs";
+import { existsSync as existsSync13 } from "fs";
 import { access as access2, cp, readdir as readdir3, stat as stat2 } from "fs/promises";
-import { basename as basename6, join as join14, relative as relative11, resolve as resolve20 } from "path";
+import { basename as basename7, join as join14, relative as relative11, resolve as resolve20 } from "path";
 var { uniq } = import_lodash5.default;
 var { isMatch } = import_micromatch.default;
 function* parents(dir) {
@@ -208497,7 +208361,7 @@ function* parents(dir) {
 }
 function findParent(dir, predicate, wholePath) {
   for (const parent2 of parents(dir))
-    if (predicate(wholePath ? parent2 : basename6(parent2)))
+    if (predicate(wholePath ? parent2 : basename7(parent2)))
       return parent2;
 }
 
@@ -209227,7 +209091,7 @@ async function detectVariantMaven(projectDir) {
 }
 
 // ../docker-management/src/maven/gradle-version-detector.ts
-import { existsSync as existsSync13 } from "fs";
+import { existsSync as existsSync14 } from "fs";
 import { join as join17 } from "path";
 import { readFile as readFile20 } from "fs/promises";
 async function detectVariantGradle(projectDir) {
@@ -209235,7 +209099,7 @@ async function detectVariantGradle(projectDir) {
 }
 async function detect(projectDir) {
   const gradleWrapperPropertiesPath = join17(projectDir, "gradle", "wrapper", "gradle-wrapper.properties");
-  const gradleWrapperProperties = existsSync13(gradleWrapperPropertiesPath) ? (await readFile20(gradleWrapperPropertiesPath, "utf-8")).split("\n").map((line) => line.trim()).filter((line) => !line.startsWith("#")).filter((line) => line) : void 0;
+  const gradleWrapperProperties = existsSync14(gradleWrapperPropertiesPath) ? (await readFile20(gradleWrapperPropertiesPath, "utf-8")).split("\n").map((line) => line.trim()).filter((line) => !line.startsWith("#")).filter((line) => line) : void 0;
   if (!gradleWrapperProperties) return void 0;
   const distributionUrlRegex = /.*gradle-(\d+(\.\d+(\.\d+)?)?)/;
   for (const prop2 of gradleWrapperProperties) {
@@ -209249,7 +209113,7 @@ async function detect(projectDir) {
 }
 
 // ../docker-management/src/maven/sbt-version-detector.ts
-import { existsSync as existsSync14 } from "fs";
+import { existsSync as existsSync15 } from "fs";
 import { join as join18 } from "path";
 import { readFile as readFile21 } from "fs/promises";
 async function detectVariantSbt(projectDir) {
@@ -209257,7 +209121,7 @@ async function detectVariantSbt(projectDir) {
 }
 async function detect2(projectDir) {
   const sbtBuildPropertiesPath = join18(projectDir, "project", "build.properties");
-  const sbtBuildProperties = existsSync14(sbtBuildPropertiesPath) ? (await readFile21(sbtBuildPropertiesPath, "utf-8")).split("\n").map((line) => line.trim()).filter((line) => !line.startsWith("#")).filter((line) => line) : void 0;
+  const sbtBuildProperties = existsSync15(sbtBuildPropertiesPath) ? (await readFile21(sbtBuildPropertiesPath, "utf-8")).split("\n").map((line) => line.trim()).filter((line) => !line.startsWith("#")).filter((line) => line) : void 0;
   if (!sbtBuildProperties) return void 0;
   for (const prop2 of sbtBuildProperties) {
     const [key, value] = prop2.split("=");
@@ -209378,9 +209242,9 @@ import { join as join21, posix as posix2, relative as relative13, sep as sep3 }
 // ../utils/src/file-utils.ts
 var import_lodash8 = __toESM(require_lodash(), 1);
 var import_micromatch2 = __toESM(require_micromatch(), 1);
-import { existsSync as existsSync15 } from "fs";
+import { existsSync as existsSync16 } from "fs";
 import { access as access3, cp as cp2, readdir as readdir4, stat as stat3 } from "fs/promises";
-import { basename as basename7, join as join19, relative as relative12, resolve as resolve22 } from "path";
+import { basename as basename8, join as join19, relative as relative12, resolve as resolve22 } from "path";
 var { uniq: uniq2 } = import_lodash8.default;
 var { isMatch: isMatch2 } = import_micromatch2.default;
 function* parents2(dir) {
@@ -209393,7 +209257,7 @@ function* parents2(dir) {
 }
 function findParent2(dir, predicate, wholePath) {
   for (const parent2 of parents2(dir))
-    if (predicate(wholePath ? parent2 : basename7(parent2))) return parent2;
+    if (predicate(wholePath ? parent2 : basename8(parent2))) return parent2;
 }
 async function getFilesRelative(dir, excludeDirs) {
   async function helper(subDir, arrayOfFiles) {
@@ -210520,7 +210384,7 @@ async function verifyFixes(fixes, otherModulesCommunicator, rootPath) {
   if (pathsForEachFixIdData.length !== new Set(pathsForEachFixIdData).size) {
     throw new Error("Multiple fix IDs found for the same subproject, workspace and ecosystem");
   }
-  const subprojectsNotFound = uniq3(fixes.filter(({ vulnerabilityInstance: v }) => !existsSync16(resolve24(rootPath, v.subprojectPath))).map(({ vulnerabilityInstance: v }) => `${v.subprojectPath}:${v.ecosystem}`));
+  const subprojectsNotFound = uniq3(fixes.filter(({ vulnerabilityInstance: v }) => !existsSync17(resolve24(rootPath, v.subprojectPath))).map(({ vulnerabilityInstance: v }) => `${v.subprojectPath}:${v.ecosystem}`));
   if (subprojectsNotFound.length > 0) {
     throw new Error(`Cannot find the following subprojects: ${subprojectsNotFound.join(", ")}`);
   }
@@ -211326,12 +211190,12 @@ import { readdir as readdir6 } from "fs/promises";
 import { join as join24, relative as relative14, resolve as resolve27 } from "path";
 
 // ../project-management/src/project-management/ecosystem-management/ecosystem-specs.ts
-import { existsSync as existsSync18 } from "fs";
+import { existsSync as existsSync19 } from "fs";
 import { readdir as readdir5, readFile as readFile25 } from "fs/promises";
 import { join as join23, sep as sep4 } from "path";
 
 // ../utils/src/pip-utils.ts
-import { existsSync as existsSync17 } from "fs";
+import { existsSync as existsSync18 } from "fs";
 import { readFile as readFile24 } from "fs/promises";
 import { resolve as resolve26 } from "path";
 import util4 from "util";
@@ -211429,7 +211293,7 @@ function getEcosystemSpecs(ecosystems) {
 }
 function packageManagerIfPackageJSONExistsAndValid(packageManager) {
   return async (projectDir) => {
-    if (!existsSync18(join23(projectDir, "package.json"))) return void 0;
+    if (!existsSync19(join23(projectDir, "package.json"))) return void 0;
     const packageJSONPath = join23(projectDir, "package.json");
     try {
       JSON.parse(await readFile25(packageJSONPath, "utf-8"));
@@ -212117,16 +211981,16 @@ function isVulnChainWithParentsMap(v) {
 var DEFAULT_REPORT_FILENAME_BASE = "coana-report";
 
 // dist/internal/exclude-dirs-from-configuration-files.js
-import { existsSync as existsSync19 } from "fs";
+import { existsSync as existsSync20 } from "fs";
 import { readFile as readFile26 } from "fs/promises";
-import { basename as basename8, resolve as resolve29 } from "path";
+import { basename as basename9, resolve as resolve29 } from "path";
 var import_yaml2 = __toESM(require_dist11(), 1);
 async function inferExcludeDirsFromConfigurationFiles(rootWorkingDir) {
   const socketYmlConfigFile = resolve29(rootWorkingDir, "socket.yml");
-  if (existsSync19(socketYmlConfigFile))
+  if (existsSync20(socketYmlConfigFile))
     return inferExcludeDirsFromSocketConfig(socketYmlConfigFile);
   const socketYamlConfigFile = resolve29(rootWorkingDir, "socket.yaml");
-  if (existsSync19(socketYamlConfigFile))
+  if (existsSync20(socketYamlConfigFile))
     return inferExcludeDirsFromSocketConfig(socketYamlConfigFile);
   return void 0;
 }
@@ -212139,7 +212003,7 @@ async function inferExcludeDirsFromSocketConfig(socketConfigFile) {
       return void 0;
     if (ignorePaths.some((ignorePath) => ignorePath.includes("!")))
       return void 0;
-    logger.info(`Inferring paths to exclude based on Socket config file: ${basename8(socketConfigFile)}`);
+    logger.info(`Inferring paths to exclude based on Socket config file: ${basename9(socketConfigFile)}`);
     return config3.projectIgnorePaths;
   } catch (e) {
     return void 0;
@@ -212248,12 +212112,12 @@ function transformToVulnChainNode(dependencyTree) {
 // dist/internal/socket-mode-helpers-socket-dependency-trees.js
 var import_packageurl_js = __toESM(require_packageurl_js(), 1);
 var import_picomatch4 = __toESM(require_picomatch2(), 1);
-import { basename as basename9, dirname as dirname12, join as join25, sep as sep5 } from "path";
+import { basename as basename10, dirname as dirname12, join as join25, sep as sep5 } from "path";
 var REQUIREMENTS_FILES_SEARCH_DEPTH2 = 3;
 function inferWorkspaceFromManifestPath(ecosystem, manifestPath, properPythonProjects) {
   switch (ecosystem) {
     case "NPM": {
-      const base = basename9(manifestPath);
+      const base = basename10(manifestPath);
       const dir = dirname12(manifestPath);
       return base === "package.json" ? dir || "." : void 0;
     }
@@ -212261,7 +212125,7 @@ function inferWorkspaceFromManifestPath(ecosystem, manifestPath, properPythonPro
       return ".";
     }
     case "PIP": {
-      const base = basename9(manifestPath);
+      const base = basename10(manifestPath);
       const dir = dirname12(manifestPath);
       const workspaceDir = dir === "" ? "." : dir;
       if (properPythonProjects.includes(workspaceDir)) {
@@ -212287,7 +212151,7 @@ function inferWorkspaceFromManifestPath(ecosystem, manifestPath, properPythonPro
       return dirname12(manifestPath) || ".";
     }
     case "GO": {
-      const base = basename9(manifestPath);
+      const base = basename10(manifestPath);
       const dir = dirname12(manifestPath);
       return base === "go.mod" ? dir || "." : void 0;
     }
@@ -212299,7 +212163,7 @@ function inferWorkspaceFromManifestPath(ecosystem, manifestPath, properPythonPro
 function inferProjectFromManifestPath(ecosystem, manifestPath) {
   switch (ecosystem) {
     case "NPM": {
-      const filename = basename9(manifestPath);
+      const filename = basename10(manifestPath);
       if (["package-lock.json", "pnpm-lock.yaml", "pnpm-lock.yml", "yarn.lock"].includes(filename)) {
         return dirname12(manifestPath) || ".";
       }
@@ -212365,7 +212229,7 @@ async function fetchArtifactsFromSocket(rootWorkingDirectory, manifestsTarHash,
     ];
     const allFiles = await getFilesRelative(rootWorkingDirectory, venvExcludes);
     for (const file of allFiles) {
-      const base = basename9(file);
+      const base = basename10(file);
       const workspaceDir = dirname12(file) || ".";
       if (base === "pyproject.toml" || base === "setup.py" && await isSetupPySetuptools(join25(rootWorkingDirectory, file))) {
         if (!properPythonProjects.includes(workspaceDir)) {
@@ -212389,11 +212253,11 @@ async function fetchArtifactsFromSocket(rootWorkingDirectory, manifestsTarHash,
       const manifestFiles = [];
       switch (ecosystem) {
         case "MAVEN": {
-          manifestFiles.push(...(await getFilesRelative(rootWorkingDirectory)).filter((file) => (0, import_picomatch4.default)("{{*-*.,}pom{.xml,},gradle.lockfile}")(basename9(file))));
+          manifestFiles.push(...(await getFilesRelative(rootWorkingDirectory)).filter((file) => (0, import_picomatch4.default)("{{*-*.,}pom{.xml,},gradle.lockfile}")(basename10(file))));
           break;
         }
         case "NUGET": {
-          manifestFiles.push(...(await getFilesRelative(rootWorkingDirectory)).filter((file) => (0, import_picomatch4.default)("{*.csproj,packages.lock.json}")(basename9(file))));
+          manifestFiles.push(...(await getFilesRelative(rootWorkingDirectory)).filter((file) => (0, import_picomatch4.default)("{*.csproj,packages.lock.json}")(basename10(file))));
           break;
         }
         case "PIP": {
@@ -226222,7 +226086,7 @@ var { root: root2 } = static_exports;
 
 // ../utils/src/maven-utils.ts
 var import_lodash14 = __toESM(require_lodash(), 1);
-import { existsSync as existsSync20, readdirSync as readdirSync4, statSync as statSync3 } from "fs";
+import { existsSync as existsSync21, readdirSync as readdirSync4, statSync as statSync3 } from "fs";
 import { join as join26 } from "path";
 var { memoize: memoize3 } = import_lodash14.default;
 var memoizedParseShellArgs = memoize3(parseShellArgs);
@@ -227594,7 +227458,7 @@ async function onlineScan(dependencyTree, apiKey, timeout) {
 }
 
 // dist/version.js
-var version2 = "14.12.27";
+var version2 = "14.12.29";
 
 // dist/cli-core.js
 var { mapValues, omit, partition, pick } = import_lodash15.default;