fix(cli): set PYTHONNOUSERSITE=1 for onionshare-cli subprocess, robust cleanup (v0.2.19)

Root cause: user-local werkzeug 2.0.3 in ~/.local/lib/python3.11/
site-packages shadows the system werkzeug 2.2.2, breaking Flask's
LocalProxy.unbound_message for the system onionshare-cli.

The pip3 show-based cleanup was unreliable (shows system package,
skips user-local). Two-pronged fix:

1. Set PYTHONNOUSERSITE=1 in the env passed to onionshare-cli so it
   never loads packages from ~/.local — uses only system packages.
2. Install script now directly rm -rf's conflicting packages from
   ~/.local/lib/python3.*/site-packages/ instead of relying on pip3.

Co-Authored-By: Claude Opus 4.6 <[email protected]>

install.sh

@@ -96,6 +96,19 @@ else
   msg "onionshare-cli found (system package), skipping pipx install. Run 'pipx install --force ...' if you want the latest git version."
 fi
 
+# Clean up stale user-local packages from prior pip --user installs of voxvera.
+# These shadow system packages (e.g. Werkzeug) and break onionshare-cli.
+msg "Cleaning up stale user-local packages that may conflict with system onionshare-cli..."
+for pydir in "$HOME"/.local/lib/python3.*/site-packages; do
+  [ -d "$pydir" ] || continue
+  for pkg in werkzeug flask flask_socketio onionshare_cli voxvera; do
+    if [ -d "$pydir/$pkg" ]; then
+      warn "Removing stale $pkg from $pydir"
+      rm -rf "$pydir/$pkg" "$pydir/${pkg}-"*.dist-info 2>/dev/null || true
+    fi
+  done
+done
+
 download_binary() {
   local url=$1
   local dest=$2

pyproject.toml

@@ -14,7 +14,7 @@ voxvera = ["templates/**", "src/**", "resources/**", "locales/**", "resources/bi
 
 [project]
 name = "voxvera"
-version = "0.2.16"
+version = "0.2.19"
 description = "VoxVera CLI utilities"
 readme = "README.md"
 authors = [{name = "VoxVera"}]
@@ -28,10 +28,7 @@ dependencies = [
     "htmlmin2",
     "pypdf",
     "wcwidth",
-    "onionshare-cli",
     "setuptools",
-    "flask<2.3.0",
-    "werkzeug<3.0.0",
 ]
 [project.optional-dependencies]
 test = [

voxvera/__init__.py

@@ -1,7 +1,7 @@
 import sys
 from pathlib import Path
 
-__version__ = "0.2.16"
+__version__ = "0.2.19"
 
 # Add the vendor directory to sys.path ONLY for PyInstaller (frozen) builds.
 # For pip/pipx installs the system/venv packages are correct and the vendored

voxvera/cli.py

@@ -673,15 +673,18 @@ def _internal_onionshare():
 
     onionshare_args = sys.argv[2:]  # strip 'voxvera _internal_onionshare'
 
-    # For non-frozen installs (pip/pipx), prefer the system onionshare-cli
-    # binary to avoid dependency-isolation issues with pkg_resources etc.
-    if not getattr(sys, 'frozen', False):
-        onionshare_bin = shutil.which("onionshare-cli") or shutil.which("onionshare")
-        if onionshare_bin:
-            os.execvp(onionshare_bin, [onionshare_bin] + onionshare_args)
-            # execvp replaces the process; if we reach here something went wrong
-        # Fall through to Python import as last resort
+    # Always prefer the system onionshare-cli binary.  This avoids
+    # pkg_resources / setuptools isolation issues in both PyInstaller
+    # builds and pipx venvs.
+    # Prevent user-local pip packages from shadowing system packages
+    os.environ["PYTHONNOUSERSITE"] = "1"
 
+    onionshare_bin = shutil.which("onionshare-cli") or shutil.which("onionshare")
+    if onionshare_bin:
+        os.execvp(onionshare_bin, [onionshare_bin] + onionshare_args)
+        # execvp replaces the process; unreachable unless execvp itself fails
+
+    # Last resort: try to import onionshare_cli as a Python module
     try:
         from onionshare_cli import main
         sys.argv = ["onionshare-cli"] + onionshare_args
@@ -706,6 +709,10 @@ def serve(config_path: str) -> str | None:
     env = os.environ.copy()
     env["TOR_SOCKS_PORT"] = socks
     env["TOR_CONTROL_PORT"] = ctl
+    # Prevent user-local pip packages (~/.local) from shadowing system packages.
+    # onionshare-cli depends on specific Flask/Werkzeug versions from the system;
+    # stale user-local copies break it.
+    env["PYTHONNOUSERSITE"] = "1"
 
     onionshare_args = [
         "--website",
@@ -719,19 +726,16 @@ def serve(config_path: str) -> str | None:
         str(dir_path),
     ]
 
-    if getattr(sys, 'frozen', False):
-        # PyInstaller build: route through our hidden subcommand
-        cmd = [sys.argv[0], "_internal_onionshare"] + onionshare_args
+    # Always prefer the system onionshare-cli binary to avoid pkg_resources
+    # and dependency-isolation issues inside both PyInstaller and pipx.
+    onionshare_bin = shutil.which("onionshare-cli") or shutil.which("onionshare")
+    if onionshare_bin:
+        cmd = [onionshare_bin] + onionshare_args
     else:
-        # pip/pipx install: call the system onionshare-cli binary directly
-        onionshare_bin = shutil.which("onionshare-cli") or shutil.which("onionshare")
-        if onionshare_bin:
-            cmd = [onionshare_bin] + onionshare_args
-        else:
-            # Last resort: route through our subcommand (will try Python import)
-            cmd = [sys.argv[0], "_internal_onionshare"] + onionshare_args
-            if sys.argv[0].endswith('.py'):
-                cmd = [sys.executable] + cmd
+        # Fallback: route through our hidden subcommand
+        cmd = [sys.argv[0], "_internal_onionshare"] + onionshare_args
+        if not getattr(sys, 'frozen', False) and sys.argv[0].endswith('.py'):
+            cmd = [sys.executable] + cmd
 
     log_fh = open(logfile, "w")
     proc = subprocess.Popen(cmd, stdout=log_fh, stderr=subprocess.STDOUT, env=env)