Sync main → development (auto-merge conflict fixes)

Author: github-actions[bot]

licenses/cryptography-wasm.txt

@@ -88,11 +88,10 @@ dependencies = [
     "aiohttp>=3.10.11,<3.11.0; python_version == '3.8'", # Last Py3.8 version (9 known CVEs)
     "aiohttp>=3.13.5; python_version >= '3.9'",          # Latest with all patches
 
-    # cryptography - version split by Python
     "cryptography>=46.0.7 ; python_version >= '3.8' and platform_system != 'Emscripten'",
     "cryptography>=45.0.7,<46.0 ; python_version == '3.7' and platform_system != 'Emscripten'",
-    "cryptography-wasm>=42.0.2 ; platform_system == 'Emscripten'",
-
+    "cryptography ; platform_system == 'Emscripten'",
+    
     # Security scanning
     "pip-audit>=2.0.0",
 

pyproject.toml

@@ -818,7 +818,8 @@ def safe_input(prompt: str, default: str = "", auto_value: str = None) -> str:
             if msg.get("type") == "stdin_line":
                 return msg.get("data", default).strip()
         except Exception:
-            pass  # relay failed — fall through to non-interactive default
+            # relay failed — fall through BUT warn so we know why
+            safe_print(f"[safe_input] relay failed: {e}", file=sys.stderr)
         result = auto_value if auto_value is not None else default
         safe_print(_("🤖 Auto-selecting: {}").format(result))
         return result

src/omnipkg/common_utils.py

@@ -9852,7 +9852,6 @@ def heal(self, dry_run: bool = False, force: bool = False) -> int:
         for pkg in sorted(reconciled_plan):
             safe_print(_('  - 🎯 {}').format(pkg))
         safe_print("─" * 60)
-
         if dry_run:
             safe_print("\n🔬 Dry run complete. No changes were made.")
             return 0
@@ -9969,6 +9968,7 @@ def get_installed_packages(self, live: bool = False) -> Dict[str, str]:
                 return live_packages
             except Exception as e:
                 safe_print(_("    ⚠️  Could not perform live package scan: {}").format(e))
+                # relay failed — fall through BUT warn so we know why
                 return self._installed_packages_cache or {}
         if self._installed_packages_cache is None:
             if not self.cache_client:

src/omnipkg/core.py

@@ -2191,6 +2191,7 @@ int main(int argc, char **argv) {
          * that contain the word python (e.g. "info python-dotenv"). */
         int info_python = (is_info && argc >= 3 &&
                            strcmp(argv[2], "python") == 0);
+        int is_heal = (strcmp(argv[1], "heal") == 0);
         int is_logs_follow = 0;
         if (argc >= 3 && strcmp(argv[1], "daemon") == 0 && strcmp(argv[2], "logs") == 0) {
             for (int _i = 3; _i < argc; _i++) {
@@ -2200,6 +2201,9 @@ int main(int argc, char **argv) {
                 }
             }
         }
+        int is_stress_test = (strcmp(argv[1], "stress-test") == 0);
+        int is_demo        = (strcmp(argv[1], "demo")        == 0);
+        int is_monitor     = (strcmp(argv[1], "monitor")     == 0);
         /* "uninstall <pkg>" with no version spec needs interactive version picker */
         int is_uninstall_interactive = 0;
         if (argc >= 3 && strcmp(argv[1], "uninstall") == 0) {
@@ -2211,7 +2215,7 @@ int main(int argc, char **argv) {
                 }
             }
         }
-        is_interactive_command = ((is_info && !info_python) || is_config || is_logs_follow || is_uninstall_interactive);
+        is_interactive_command = ((is_info && !info_python) || is_config || is_logs_follow || is_heal || is_stress_test || is_demo || is_monitor || is_uninstall_interactive);
     }
     if (!is_swap_python && !is_interactive_command) {
         try_daemon_cli(target_python, argc, argv, version_injected, forced_version);

src/omnipkg/dispatcher.c

@@ -237,11 +237,17 @@ def main():
         and argv_commands[1] == "logs"
         and "-f" in sys.argv
     )
-    is_interactive_command = is_info_command or is_config_command or is_logs_follow
+    # uninstall without version spec needs interactive picker
+    is_uninstall_interactive = (
+        len(argv_commands) >= 2
+        and argv_commands[0] == "uninstall"
+        and not any(c in arg for arg in argv_commands[1:] for c in ("=", ">", "<"))
+    )
+    is_interactive_command = is_info_command or is_config_command or is_logs_follow or is_uninstall_interactive
 
     # Commands that need a real TTY (streaming output, interactive, long-running).
     # Bypass the daemon entirely and run directly as a subprocess.
-    _DIRECT_COMMANDS = {"stress-test", "demo", "monitor", "logs"}
+    _DIRECT_COMMANDS = {"stress-test", "demo", "monitor", "heal", "logs"}
     is_direct_command = bool(argv_commands) and argv_commands[0] in _DIRECT_COMMANDS
 
     if is_direct_command:

src/omnipkg/dispatcher.py

@@ -3,9 +3,12 @@
 import sys
 from typing import List, Optional
 
-import typer
+try:
+    import typer
+except ImportError:
+    typer = None  # type: ignore[assignment]
 
-app = typer.Typer()
+app = typer.Typer() if typer is not None else None
 
 from omnipkg.common_utils import safe_print
 

src/omnipkg/integration/ci_integration.py

@@ -2570,7 +2570,10 @@ def execute_with_activity_monitoring(
         Returns:
             Response dict from worker
         """
-        import psutil
+        try:
+            import psutil
+        except ImportError:
+            psutil = None  # type: ignore[assignment]
 
         try:
             ps_process = psutil.Process(worker_process.pid)