evo-cli 0.8.0__tar.gz → 0.8.1__tar.gz

{evo_cli-0.8.0 → evo_cli-0.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: evo_cli
-Version: 0.8.0
+Version: 0.8.1
 Summary: Evolution CLI - a developer toolbox for setting up dev machines
 Author: maycuatroi
 Project-URL: Homepage, https://github.com/maycuatroi/evo-cli

evo_cli-0.8.1/evo_cli/VERSION

@@ -0,0 +1 @@
+0.8.1

{evo_cli-0.8.0 → evo_cli-0.8.1}/evo_cli/commands/opencode.py

@@ -112,15 +112,29 @@ def ensure_node_installed():
 
 
 def install_mcp_servers():
-    """Install MCP server npm packages globally via npx."""
+    """Pre-fetch MCP server npm packages into the npx cache.
+
+    MCP servers speak JSON-RPC over stdio, so most do not implement a real
+    ``--version`` flag - they simply start up and block reading stdin. Run with
+    stdin detached (DEVNULL) so a server that ignores ``--version`` sees EOF and
+    exits right away instead of hanging on the terminal, and cap each call with a
+    timeout as a safety net. ``check=False`` keeps a non-zero exit from aborting
+    the whole setup; the verify step confirms the servers actually work.
+    """
     step("Installing MCP servers")
     servers = [
         "@mcp-server/google-search-mcp@latest",
         "@playwright/mcp@latest",
     ]
     for server in servers:
-        info(f"Installing {server}")
-        run_command(["npx", "-y", server, "--version"], status=f"Fetching {server}")
+        info(f"Fetching {server}")
+        run_command(
+            ["npx", "-y", server, "--version"],
+            status=f"Fetching {server}",
+            stdin=subprocess.DEVNULL,
+            timeout=180,
+            check=False,
+        )
     success("MCP server packages ready")
 
 
@@ -131,6 +145,8 @@ def install_playwright_browsers():
         run_command(
             ["npx", "playwright", "install", "chromium"],
             status="Downloading Chromium for Playwright",
+            stdin=subprocess.DEVNULL,
+            timeout=600,
         )
         success("Playwright Chromium installed")
     except Exception as exc:

{evo_cli-0.8.0 → evo_cli-0.8.1}/evo_cli/console.py

@@ -52,17 +52,31 @@ def step(title):
     console.rule(f"[step]{title}[/step]", style="step", align="left")
 
 
-def run_command(cmd, capture=False, check=True, input_text=None, status=None):
+def run_command(cmd, capture=False, check=True, input_text=None, status=None, timeout=None, stdin=None):
     cmd = [str(part) for part in cmd]
     console.print(f"[cmd]$ {' '.join(cmd)}[/cmd]")
-    if status:
-        with console.status(f"[info]{status}[/info]", spinner="dots"):
-            result = subprocess.run(cmd, capture_output=True, text=True, input=input_text)
-        output = (result.stdout or "").strip()
-        if output:
-            console.print(output)
-    else:
-        result = subprocess.run(cmd, capture_output=capture, text=True, input=input_text)
+
+    run_kwargs = {"text": True, "input": input_text, "timeout": timeout}
+    # subprocess.run rejects passing both `input` and `stdin`. Only attach an
+    # explicit stdin (e.g. DEVNULL) when we are not feeding input, so callers can
+    # detach a child from the terminal and avoid it blocking on an inherited TTY.
+    if input_text is None and stdin is not None:
+        run_kwargs["stdin"] = stdin
+
+    try:
+        if status:
+            with console.status(f"[info]{status}[/info]", spinner="dots"):
+                result = subprocess.run(cmd, capture_output=True, **run_kwargs)
+            output = (result.stdout or "").strip()
+            if output:
+                console.print(output)
+        else:
+            result = subprocess.run(cmd, capture_output=capture, **run_kwargs)
+    except subprocess.TimeoutExpired as exc:
+        console.print(f"[error]command timed out after {timeout}s: {' '.join(cmd)}[/error]")
+        if check:
+            raise CommandError(f"command timed out after {timeout}s: {' '.join(cmd)}") from exc
+        return exc
 
     if result.returncode != 0:
         message = (result.stderr or "").strip()

{evo_cli-0.8.0 → evo_cli-0.8.1}/evo_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: evo_cli
-Version: 0.8.0
+Version: 0.8.1
 Summary: Evolution CLI - a developer toolbox for setting up dev machines
 Author: maycuatroi
 Project-URL: Homepage, https://github.com/maycuatroi/evo-cli

{evo_cli-0.8.0 → evo_cli-0.8.1}/evo_cli.egg-info/SOURCES.txt

@@ -31,6 +31,7 @@ evo_cli/commands/sysmon.py
 evo_cli/commands/wifi.py
 tests/__init__.py
 tests/test_cli.py
+tests/test_console.py
 tests/test_fix_claude.py
 tests/test_opencode.py
 tests/test_plantuml.py

evo_cli-0.8.1/tests/test_console.py

@@ -0,0 +1,32 @@
+import subprocess
+import sys
+
+import pytest
+
+from evo_cli.console import CommandError, run_command
+
+
+def test_run_command_raises_on_timeout():
+    # A command that outlives the timeout must not hang; it should raise.
+    with pytest.raises(CommandError, match="timed out"):
+        run_command([sys.executable, "-c", "import time; time.sleep(5)"], timeout=1)
+
+
+def test_run_command_timeout_without_check_returns_exception():
+    result = run_command(
+        [sys.executable, "-c", "import time; time.sleep(5)"],
+        timeout=1,
+        check=False,
+    )
+    assert isinstance(result, subprocess.TimeoutExpired)
+
+
+def test_run_command_detaches_stdin_when_requested():
+    # With stdin=DEVNULL a child that reads stdin sees EOF immediately instead
+    # of blocking on an inherited terminal.
+    result = run_command(
+        [sys.executable, "-c", "import sys; sys.exit(0 if sys.stdin.read() == '' else 1)"],
+        stdin=subprocess.DEVNULL,
+        timeout=10,
+    )
+    assert result.returncode == 0

{evo_cli-0.8.0 → evo_cli-0.8.1}/tests/test_opencode.py

@@ -1,4 +1,5 @@
 import json
+import subprocess
 
 import pytest
 from click.testing import CliRunner
@@ -8,6 +9,7 @@ from evo_cli.commands.opencode import (
     DEFAULT_MCP_SERVERS,
     configure_opencode_global,
     configure_opencode_project,
+    install_mcp_servers,
     load_jsonc,
     merge_mcp_config,
     save_jsonc,
@@ -73,6 +75,24 @@ def test_configure_opencode_project(tmp_path):
     assert set(data["mcp"].keys()) == {"google-search", "playwright"}
 
 
+def test_install_mcp_servers_detaches_stdin_and_sets_timeout(monkeypatch):
+    """Regression: MCP servers read stdin, so the fetch must not block on a TTY."""
+    calls = []
+
+    def fake_run_command(cmd, **kwargs):
+        calls.append((cmd, kwargs))
+
+    monkeypatch.setattr("evo_cli.commands.opencode.run_command", fake_run_command)
+    install_mcp_servers()
+
+    assert calls, "expected at least one MCP server fetch"
+    for cmd, kwargs in calls:
+        assert kwargs.get("stdin") is subprocess.DEVNULL
+        assert kwargs.get("timeout")
+        # A server that ignores --version must not abort the whole setup.
+        assert kwargs.get("check") is False
+
+
 def test_setup_opencode_writes_global_and_project(runner, tmp_path, monkeypatch):
     monkeypatch.setattr(
         "evo_cli.commands.opencode.get_global_config_path",

evo_cli-0.8.0/evo_cli/VERSION

@@ -1 +0,0 @@
-0.8.0