From e235df6d2a850eccb164b8a50b7d1f0759ea54b7 Mon Sep 17 00:00:00 2001
From: Daniel Han <23090290+danielhanchen@users.noreply.github.com>
Date: Wed, 18 Mar 2026 05:13:30 +0000
Subject: [PATCH] Fix review issues: no module-level execv, Linux-only, use
 sys.orig_argv

Addresses all reviewer feedback:

1. Moved os.execv out of module-level code into a helper function
   _maybe_reexec_for_cuda_ld_path() that is called explicitly from
   run_server() and __main__. Importing run.py no longer replaces the
   host process -- safe for CLI, notebooks, tests, and embedders.

2. Changed platform guard from "not win32" to "linux only", since
   LD_LIBRARY_PATH is a Linux-specific linker mechanism.

3. Use sys.orig_argv (Python 3.10+) when available to preserve the
   original interpreter invocation (python -m, -c, -X flags, etc.).
   Falls back to [sys.executable] + sys.argv for older Python.
---
 studio/backend/run.py | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/studio/backend/run.py b/studio/backend/run.py
index 38d7196475..4875b0a84e 100644
--- a/studio/backend/run.py
+++ b/studio/backend/run.py
@@ -26,8 +26,8 @@ def _fix_torch_cuda_ld_path():
     Fix: detect torch's lib dirs (without importing torch) and prepend them
     so they take priority.  Returns True if LD_LIBRARY_PATH was changed.
     """
-    if sys.platform == "win32":
-        return False  # Windows uses PATH, not LD_LIBRARY_PATH
+    if sys.platform != "linux":
+        return False
     ld_path = os.environ.get("LD_LIBRARY_PATH", "")
     if not ld_path:
         return False
@@ -67,12 +67,24 @@ def _fix_torch_cuda_ld_path():
         return False
 
 
-# Fix LD_LIBRARY_PATH before any torch/CUDA libs get loaded.
-# If we changed it, re-exec so the dynamic linker sees the new value.
 _LD_FIXED_SENTINEL = "_UNSLOTH_STUDIO_LD_FIXED"
-if _LD_FIXED_SENTINEL not in os.environ and _fix_torch_cuda_ld_path():
+
+
+def _maybe_reexec_for_cuda_ld_path():
+    """Re-exec once so the dynamic linker sees corrected LD_LIBRARY_PATH.
+
+    Must only be called from a true entry point (``if __name__ == "__main__"``
+    or an explicit startup function), never at module import time, because
+    os.execv replaces the entire process.
+    """
+    if _LD_FIXED_SENTINEL in os.environ:
+        return
+    if not _fix_torch_cuda_ld_path():
+        return
     os.environ[_LD_FIXED_SENTINEL] = "1"
-    os.execv(sys.executable, [sys.executable] + sys.argv)
+    argv = getattr(sys, "orig_argv", None) or [sys.executable] + sys.argv
+    os.execv(sys.executable, argv)
+
 
 from pathlib import Path
 
@@ -237,6 +249,8 @@ def run_server(
     """
     global _server, _shutdown_event
 
+    _maybe_reexec_for_cuda_ld_path()
+
     import nest_asyncio
 
     nest_asyncio.apply()
@@ -300,6 +314,8 @@ def run_server(
 
 # For direct execution (also invoked by CLI via os.execvp / subprocess)
 if __name__ == "__main__":
+    _maybe_reexec_for_cuda_ld_path()
+
     import argparse
     import signal