Refactor Gradio node cleanup and enhance OAuth integration. Updated _cleanup_stale_gradio_nodes to handle multiple patterns for orphaned processes. Improved demo assignment in _launch_with_oauth for better hot reload compatibility with Gradio Spaces.

app.py

@@ -2,6 +2,7 @@
 import os
 import signal
 import subprocess
+import sys
 import time
 import warnings
 from pathlib import Path
@@ -28,6 +29,7 @@ from ui import server_api
 ASSETS_DIR = Path(__file__).resolve().parent / "assets"
 
 app = Server(title="Borderless - Immigration Research Agent")
+# Replaced with the OAuth Blocks instance in _launch_with_oauth (Gradio hot reload).
 demo = app
 
 
@@ -126,22 +128,29 @@ app.mount("/assets", StaticFiles(directory=str(ASSETS_DIR)), name="assets")
 
 def _cleanup_stale_gradio_nodes() -> None:
     """Terminate orphaned Gradio Node SSR workers from prior restarts."""
-    try:
-        result = subprocess.run(
-            ["pgrep", "-f", "gradio/templates/node/build"],
-            capture_output=True,
-            text=True,
-            check=False,
-        )
-    except FileNotFoundError:
-        return
-
-    for pid_str in result.stdout.split():
-        pid = int(pid_str)
+    patterns = (
+        "gradio/templates/node/build",
+        "gradio/templates/node/build/server/entry.js",
+    )
+    for pattern in patterns:
         try:
-            os.kill(pid, signal.SIGTERM)
-        except ProcessLookupError:
-            pass
+            result = subprocess.run(
+                ["pgrep", "-f", pattern],
+                capture_output=True,
+                text=True,
+                check=False,
+            )
+        except FileNotFoundError:
+            return
+
+        for pid_str in result.stdout.split():
+            if not pid_str.strip():
+                continue
+            pid = int(pid_str)
+            try:
+                os.kill(pid, signal.SIGTERM)
+            except ProcessLookupError:
+                pass
 
 
 def _launch_with_oauth(**kwargs: Any):
@@ -151,8 +160,13 @@ def _launch_with_oauth(**kwargs: Any):
         for fn, api_kwargs in app._deferred_apis:
             gr_api(fn=fn, **api_kwargs)
 
-    os.environ["GRADIO_SERVER_MODE_ENABLED"] = "1"
-    return blocks.launch(_app=app, **kwargs)
+        os.environ["GRADIO_SERVER_MODE_ENABLED"] = "1"
+        # Gradio Spaces hot reload matches __main__.demo to the launched Blocks.
+        main = sys.modules.get("__main__")
+        if main is not None:
+            main.demo = blocks
+        globals()["demo"] = blocks
+        return blocks.launch(_app=app, **kwargs)
 
 
 app.launch = _launch_with_oauth  # type: ignore[method-assign]