From 41195e2607372f69c8341919b8b411a8fb6c072e Mon Sep 17 00:00:00 2001
From: Karthik Nadig <kanadig@microsoft.com>
Date: Mon, 6 Apr 2026 19:06:39 -0700
Subject: [PATCH] fix: resolve symlinked /bin/python3 as LinuxGlobal (Fixes
 #405)

---
 crates/pet-linux-global-python/src/lib.rs | 45 ++++++++++++++++++++---
 1 file changed, 39 insertions(+), 6 deletions(-)

diff --git a/crates/pet-linux-global-python/src/lib.rs b/crates/pet-linux-global-python/src/lib.rs
index 67f23759..bbaa313b 100644
--- a/crates/pet-linux-global-python/src/lib.rs
+++ b/crates/pet-linux-global-python/src/lib.rs
@@ -87,15 +87,48 @@ impl Locator for LinuxGlobalPython {
 
         self.find_cached(None);
 
-        // We only support python environments in /bin, /usr/bin, /usr/local/bin
-        if !executable.starts_with("/bin")
-            && !executable.starts_with("/usr/bin")
-            && !executable.starts_with("/usr/local/bin")
-        {
+        // Resolve the canonical path once — used for both the path guard and cache fallback.
+        let canonical = fs::canonicalize(&executable).ok();
+
+        // We only support python environments in /bin, /usr/bin, /usr/local/bin.
+        // Check both the original and canonical paths so that symlinks from other
+        // locations (e.g. /bin → /usr/bin) are still accepted.
+        let dominated = |p: &Path| {
+            p.starts_with("/bin") || p.starts_with("/usr/bin") || p.starts_with("/usr/local/bin")
+        };
+        if !dominated(&executable) && !canonical.as_ref().is_some_and(|c| dominated(c)) {
             return None;
         }
 
-        self.reported_executables.get(&executable)
+        // Try direct cache lookup first.
+        if let Some(env) = self.reported_executables.get(&executable) {
+            return Some(env);
+        }
+
+        // If the executable wasn't found directly, resolve symlinks and try the canonical path.
+        // This handles cases like /bin/python3 → /usr/bin/python3 on systems where /bin
+        // is a symlink to /usr/bin. The cache is populated using canonicalized bin directories,
+        // so /bin/python3 won't be in the cache but /usr/bin/python3 will be.
+        if let Some(canonical) = canonical {
+            if canonical != executable {
+                if let Some(mut env) = self.reported_executables.get(&canonical) {
+                    // Add the original path as a symlink so it's visible to consumers.
+                    let mut symlinks = env.symlinks.clone().unwrap_or_default();
+                    if !symlinks.contains(&executable) {
+                        symlinks.push(executable.clone());
+                        symlinks.sort();
+                        symlinks.dedup();
+                        env.symlinks = Some(symlinks);
+                    }
+                    // Update both the canonical and original entries for consistency.
+                    self.reported_executables.insert(canonical, env.clone());
+                    self.reported_executables.insert(executable, env.clone());
+                    return Some(env);
+                }
+            }
+        }
+
+        None
     }
 
     fn find(&self, reporter: &dyn Reporter) {