From 41126bfa5b82e65f4ffc0d514764e597ea67c42a Mon Sep 17 00:00:00 2001
From: boykopovar <boykopovar@gmail.com>
Date: Sat, 10 Oct 2026 13:59:11 +0300
Subject: [PATCH] fix(relinker): restrict guest module discovery to adjacent
 directories

---
 .../relinker/src/guest/GuestModuleBuilder.cpp | 54 +------------------
 1 file changed, 1 insertion(+), 53 deletions(-)

diff --git a/core/relinker/relinker/src/guest/GuestModuleBuilder.cpp b/core/relinker/relinker/src/guest/GuestModuleBuilder.cpp
index 7746bdf9b..9079396f9 100644
--- a/core/relinker/relinker/src/guest/GuestModuleBuilder.cpp
+++ b/core/relinker/relinker/src/guest/GuestModuleBuilder.cpp
@@ -99,40 +99,6 @@ std::vector<GuestArtifact> GuestModuleBuilder::Build(const std::filesystem::path
         if (alias != paths.end()) neededAliases.emplace(name, *alias);
         else missingNeeded.insert(name);
     }
-    if (!missingNeeded.empty() || !unmatchedExclusions.empty()) {
-        std::map<std::string, std::filesystem::path> found;
-        std::map<std::string, std::filesystem::path> foundByStem;
-        const auto record = [](std::map<std::string, std::filesystem::path>& matches, const std::string& name, const std::filesystem::path& path) {
-            if (!matches.emplace(name, path).second) throw Domain::RelinkerException("Ambiguous needed module: " + matches.at(name).string() + " and " + path.string());
-        };
-        for (auto it = std::filesystem::recursive_directory_iterator(root); it != std::filesystem::recursive_directory_iterator(); ++it) {
-            if (!it->is_regular_file()) continue;
-            const auto name = it->path().filename().string();
-            if (name.ends_with(GuestModuleSuffix)) continue;
-            if (excludedModules.contains(name)) {
-                for (auto parent = it->path().parent_path(); parent != root && !parent.empty(); parent = parent.parent_path()) {
-                    if (std::any_of(directories.begin(), directories.end(), [&](const auto& directory) { return std::filesystem::equivalent(parent, directory); })) unmatchedExclusions.erase(name);
-                }
-                continue;
-            }
-            const auto stem = ModuleStem(name, windows);
-            std::vector<std::string> stemMatches;
-            if (!stem.empty()) {
-                for (const auto& needed : missingNeeded) if (needed != name && ModuleStem(needed, windows) == stem) stemMatches.push_back(needed);
-            }
-            if ((!missingNeeded.contains(name) && stemMatches.empty()) || !isElf(it->path())) continue;
-            if (missingNeeded.contains(name)) record(found, name, it->path());
-            for (const auto& needed : stemMatches) record(foundByStem, needed, it->path());
-        }
-        for (const auto& name : missingNeeded) {
-            const auto exact = found.find(name);
-            const auto byStem = foundByStem.find(name);
-            if (exact == found.end() && byStem == foundByStem.end()) continue;
-            const auto& path = exact != found.end() ? exact->second : byStem->second;
-            if (exact == found.end()) neededAliases.emplace(name, path);
-            if (std::find(paths.begin(), paths.end(), path) == paths.end()) paths.push_back(path);
-        }
-    }
     Io::FileReader reader;
     std::map<std::filesystem::path, GuestImage> discovered;
     const auto matchesIdentity = [](const std::string& name, const std::vector<std::string>& identities) {
@@ -153,25 +119,7 @@ std::vector<GuestArtifact> GuestModuleBuilder::Build(const std::filesystem::path
                 (windows && foldFilename(path.filename().string()) == foldFilename(name)) || matchesIdentity(name, image.ModuleNames);
         })) unresolved.insert(name);
     }
-    if (!unresolved.empty()) {
-        std::map<std::string, std::filesystem::path> identities;
-        for (auto it = std::filesystem::recursive_directory_iterator(root); it != std::filesystem::recursive_directory_iterator(); ++it) {
-            const auto& path = it->path();
-            const auto extension = path.extension().string();
-            if (!it->is_regular_file() || (extension != ".prx" && extension != ".sprx" && extension != ".suprx") ||
-                path.filename().string().ends_with(GuestModuleSuffix) || excludedModules.contains(path.filename().string()) || discovered.contains(path) || !isElf(path)) continue;
-            const auto names = GuestImageReader().ReadModuleNames(reader.Read(path.string()));
-            for (const auto& name : unresolved) {
-                if (!matchesIdentity(name, names)) continue;
-                if (!identities.emplace(name, path).second) throw Domain::RelinkerException("Ambiguous needed module identity: " + name);
-            }
-        }
-        for (const auto& [name, path] : identities) {
-            if (discovered.contains(path)) continue;
-            discovered.emplace(path, GuestImageReader().Read(path, reader.Read(path.string())));
-            paths.push_back(path);
-        }
-    }
+    if (!unresolved.empty()) throw Domain::RelinkerException("sce_module folder not found for required dependency: " + *unresolved.begin() + ". Expected the module directly in sce_module/sce_modules/prx beside " + inputPath.string() + ". Use --skip-sce-module to disable guest module processing.");
     if (!unmatchedExclusions.empty()) throw Domain::RelinkerException("Excluded guest module file not found: " + *unmatchedExclusions.begin());
     std::sort(paths.begin(), paths.end());
     paths.erase(std::unique(paths.begin(), paths.end()), paths.end());