evo-cli 0.10.1__tar.gz → 0.10.3__tar.gz

{evo_cli-0.10.1 → evo_cli-0.10.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: evo_cli
-Version: 0.10.1
+Version: 0.10.3
 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.10.3/evo_cli/VERSION

@@ -0,0 +1 @@
+0.10.3

{evo_cli-0.10.1 → evo_cli-0.10.3}/evo_cli/commands/opencode.py

@@ -1,6 +1,7 @@
 """Install and configure OpenCode with common MCP servers."""
 
 import json
+import os
 import platform
 import shutil
 import subprocess
@@ -22,7 +23,13 @@ EPILOG = Text.from_markup(
 
 # Servers bootstrapped by `evo setup opencode`, pulled from the shared library
 # (evo_cli/mcp_registry.py). Add more servers anytime with `evo mcp add <name>`.
-DEFAULT_MCP_SERVERS = opencode_servers("google-search", "playwright")
+# Web search is handled by OpenCode's native Exa-backed `websearch` tool (enabled
+# via OPENCODE_ENABLE_EXA, no API key), not a scraping MCP server.
+DEFAULT_MCP_SERVERS = opencode_servers("playwright")
+
+# OpenCode's built-in `websearch` tool only activates for the OpenCode provider or
+# when this env var is truthy, so custom providers need it set explicitly.
+EXA_ENV_VAR = "OPENCODE_ENABLE_EXA"
 
 
 def _local_mcp_commands():
@@ -52,7 +59,14 @@ def ensure_node_installed():
     npx_cmd = shutil.which("npx")
 
     if node_cmd and npm_cmd and npx_cmd:
-        result = subprocess.run(resolve_executable(["node", "--version"]), capture_output=True, text=True, check=True)
+        result = subprocess.run(
+            resolve_executable(["node", "--version"]),
+            capture_output=True,
+            text=True,
+            encoding="utf-8",
+            errors="replace",
+            check=True,
+        )
         info(f"Node.js found: {result.stdout.strip()}")
         return node_cmd, npm_cmd, npx_cmd
 
@@ -153,7 +167,12 @@ def opencode_version():
         return None
     try:
         result = subprocess.run(
-            resolve_executable(["opencode", "--version"]), capture_output=True, text=True, timeout=30
+            resolve_executable(["opencode", "--version"]),
+            capture_output=True,
+            text=True,
+            encoding="utf-8",
+            errors="replace",
+            timeout=30,
         )
         return result.stdout.strip() or "unknown"
     except Exception:
@@ -299,6 +318,8 @@ def verify_mcp_servers():
                 input=init_message,
                 capture_output=True,
                 text=True,
+                encoding="utf-8",
+                errors="replace",
                 timeout=30,
             )
             if result.returncode == 0 and '"jsonrpc":"2.0"' in result.stdout:
@@ -309,6 +330,51 @@ def verify_mcp_servers():
             warning(f"Could not verify MCP server [accent]{name}[/accent]: {exc}")
 
 
+def get_shell_rc_path():
+    """Return the shell rc file to wire env vars into, based on the active shell."""
+    shell = os.environ.get("SHELL", "")
+    home = Path.home()
+    if shell.endswith("zsh"):
+        return home / ".zshrc"
+    if shell.endswith("bash"):
+        # macOS login shells read .bash_profile; Linux reads .bashrc.
+        return home / (".bash_profile" if platform.system() == "Darwin" else ".bashrc")
+    if shell.endswith("fish"):
+        return home / ".config" / "fish" / "config.fish"
+    return home / ".profile"
+
+
+def enable_exa_websearch():
+    """Enable OpenCode's built-in Exa web search via the OPENCODE_ENABLE_EXA env var.
+
+    OpenCode ships a native ``websearch`` tool backed by Exa's hosted MCP service
+    (no API key needed), but it is only active when using the OpenCode provider or
+    when ``OPENCODE_ENABLE_EXA`` is truthy. Custom providers therefore need the env
+    var, so wire it into the shell rc idempotently.
+    """
+    step("Enabling Exa web search")
+    if is_windows():
+        info(f"Set the {EXA_ENV_VAR}=1 environment variable to enable web search.")
+        info("PowerShell: [accent]setx OPENCODE_ENABLE_EXA 1[/accent]")
+        return
+
+    rc_path = get_shell_rc_path()
+    if rc_path.exists() and EXA_ENV_VAR in rc_path.read_text(encoding="utf-8"):
+        info(f"{EXA_ENV_VAR} already set in [accent]{rc_path}[/accent]; skipping")
+        success("Exa web search already enabled")
+        return
+
+    rc_path.parent.mkdir(parents=True, exist_ok=True)
+    block = (
+        "\n# opencode web search (Exa native, no API key) - added by evo setup opencode\n"
+        f"export {EXA_ENV_VAR}=1\n"
+    )
+    with rc_path.open("a", encoding="utf-8") as fh:
+        fh.write(block)
+    success(f"Enabled Exa web search in [accent]{rc_path}[/accent]")
+    info(f"Run [accent]source {rc_path}[/accent] or open a new terminal to apply.")
+
+
 def run_setup_opencode(global_only, project, skip_install=False):
     step("evo setup opencode")
 
@@ -320,6 +386,7 @@ def run_setup_opencode(global_only, project, skip_install=False):
 
     if not skip_install:
         install_opencode(npm_cmd)
+    enable_exa_websearch()
     install_mcp_servers()
     install_playwright_browsers()
 
@@ -343,8 +410,9 @@ def run_setup_opencode(global_only, project, skip_install=False):
     )
     console.print(
         Panel(
-            f"OpenCode configured with google-search and playwright MCP servers.\n\n{paths_text}\n\n"
-            f"{opencode_note} Restart OpenCode to load the new MCP tools.",
+            "OpenCode web search enabled via Exa (native, no API key); "
+            f"playwright MCP server configured for browser automation.\n\n{paths_text}\n\n"
+            f"{opencode_note} Open a new terminal (or `source` your shell rc), then restart OpenCode.",
             title="setup opencode complete",
             border_style="success",
             expand=False,
@@ -373,9 +441,11 @@ def setup_opencode(global_only, skip_install, project):
 
     This command bootstraps a fresh machine with the same OpenCode + MCP setup
     used across devices. It installs the OpenCode CLI (via npm, unless
-    --skip-install) and the google-search and playwright MCP servers, downloads
-    the Playwright Chromium browser, and writes both global
-    (~/.config/opencode/opencode.jsonc) and project-level (opencode.json) configs.
+    --skip-install), enables OpenCode's native Exa-backed web search (via the
+    OPENCODE_ENABLE_EXA env var, no API key required), installs the playwright MCP
+    server for browser automation, downloads the Playwright Chromium browser, and
+    writes both global (~/.config/opencode/opencode.jsonc) and project-level
+    (opencode.json) configs.
 
     No credentials are bundled; only public MCP server references are added.
     """

{evo_cli-0.10.1 → evo_cli-0.10.3}/evo_cli/console.py

@@ -1,5 +1,6 @@
 import shutil
 import subprocess
+import sys
 import urllib.request
 
 from rich.console import Console
@@ -13,6 +14,14 @@ from rich.progress import (
 )
 from rich.theme import Theme
 
+for _stream in (sys.stdout, sys.stderr):
+    _reconfigure = getattr(_stream, "reconfigure", None)
+    if _reconfigure is not None:
+        try:
+            _reconfigure(encoding="utf-8", errors="replace")
+        except (ValueError, OSError):
+            pass
+
 EVO_THEME = Theme(
     {
         "info": "cyan",
@@ -67,7 +76,13 @@ def run_command(cmd, capture=False, check=True, input_text=None, status=None, ti
     console.print(f"[cmd]$ {' '.join(cmd)}[/cmd]")
     exec_cmd = resolve_executable(cmd)
 
-    run_kwargs = {"text": True, "input": input_text, "timeout": timeout}
+    run_kwargs = {
+        "text": True,
+        "encoding": "utf-8",
+        "errors": "replace",
+        "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.

{evo_cli-0.10.1 → evo_cli-0.10.3}/evo_cli/mcp_registry.py

@@ -22,12 +22,12 @@ MCP_REGISTRY = {
         "homepage": "https://github.com/microsoft/playwright-mcp",
         "description": "Playwright (Microsoft) - drive a real browser: navigate, click, snapshot.",
     },
-    "google-search": {
-        "transport": "stdio",
-        "command": ["npx", "-y", "@mcp-server/google-search-mcp@latest"],
+    "exa": {
+        "transport": "http",
+        "url": "https://mcp.exa.ai/mcp",
         "category": "search",
-        "homepage": "https://www.npmjs.com/package/@mcp-server/google-search-mcp",
-        "description": "Google Search - run web searches and fetch result pages.",
+        "homepage": "https://exa.ai/docs/reference/exa-mcp",
+        "description": "Exa - AI web search (hosted MCP, free tier, no API key).",
     },
     "sequential-thinking": {
         "transport": "stdio",

{evo_cli-0.10.1 → evo_cli-0.10.3}/evo_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: evo_cli
-Version: 0.10.1
+Version: 0.10.3
 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.10.1 → evo_cli-0.10.3}/tests/test_opencode.py

@@ -7,8 +7,10 @@ from click.testing import CliRunner
 from evo_cli.cli import cli
 from evo_cli.commands.opencode import (
     DEFAULT_MCP_SERVERS,
+    EXA_ENV_VAR,
     configure_opencode_global,
     configure_opencode_project,
+    enable_exa_websearch,
     install_mcp_servers,
     install_opencode,
     load_jsonc,
@@ -55,7 +57,6 @@ def test_merge_mcp_config_preserves_existing():
     existing = {"mcp": {"playwright": {"enabled": False}}}
     merged = merge_mcp_config(existing, DEFAULT_MCP_SERVERS)
     assert merged["mcp"]["playwright"]["enabled"] is False
-    assert merged["mcp"]["google-search"]["enabled"] is True
 
 
 def test_configure_opencode_global(tmp_path, monkeypatch):
@@ -66,14 +67,33 @@ def test_configure_opencode_global(tmp_path, monkeypatch):
     path = configure_opencode_global()
     data = load_jsonc(path)
     assert "mcp" in data
-    assert set(data["mcp"].keys()) == {"google-search", "playwright"}
+    assert set(data["mcp"].keys()) == {"playwright"}
 
 
 def test_configure_opencode_project(tmp_path):
     path = configure_opencode_project(tmp_path)
     data = load_jsonc(path)
     assert "mcp" in data
-    assert set(data["mcp"].keys()) == {"google-search", "playwright"}
+    assert set(data["mcp"].keys()) == {"playwright"}
+
+
+def test_enable_exa_websearch_writes_export(tmp_path, monkeypatch):
+    rc = tmp_path / ".zshrc"
+    monkeypatch.setattr("evo_cli.commands.opencode.is_windows", lambda: False)
+    monkeypatch.setattr("evo_cli.commands.opencode.get_shell_rc_path", lambda: rc)
+
+    enable_exa_websearch()
+    assert f"export {EXA_ENV_VAR}=1" in rc.read_text()
+
+
+def test_enable_exa_websearch_is_idempotent(tmp_path, monkeypatch):
+    rc = tmp_path / ".zshrc"
+    monkeypatch.setattr("evo_cli.commands.opencode.is_windows", lambda: False)
+    monkeypatch.setattr("evo_cli.commands.opencode.get_shell_rc_path", lambda: rc)
+
+    enable_exa_websearch()
+    enable_exa_websearch()
+    assert rc.read_text().count(f"export {EXA_ENV_VAR}=1") == 1
 
 
 def test_install_mcp_servers_detaches_stdin_and_sets_timeout(monkeypatch):
@@ -141,6 +161,7 @@ def test_setup_opencode_skip_install(runner, tmp_path, monkeypatch):
     monkeypatch.setattr("evo_cli.commands.opencode.install_mcp_servers", lambda: None)
     monkeypatch.setattr("evo_cli.commands.opencode.install_playwright_browsers", lambda: None)
     monkeypatch.setattr("evo_cli.commands.opencode.verify_mcp_servers", lambda: None)
+    monkeypatch.setattr("evo_cli.commands.opencode.enable_exa_websearch", lambda: None)
 
     result = runner.invoke(cli, ["setup", "opencode", "--global-only", "--skip-install"])
     assert result.exit_code == 0
@@ -159,6 +180,7 @@ def test_setup_opencode_writes_global_and_project(runner, tmp_path, monkeypatch)
     monkeypatch.setattr("evo_cli.commands.opencode.install_mcp_servers", lambda: None)
     monkeypatch.setattr("evo_cli.commands.opencode.install_playwright_browsers", lambda: None)
     monkeypatch.setattr("evo_cli.commands.opencode.verify_mcp_servers", lambda: None)
+    monkeypatch.setattr("evo_cli.commands.opencode.enable_exa_websearch", lambda: None)
 
     result = runner.invoke(cli, ["setup", "opencode", "--project", str(tmp_path)])
     assert result.exit_code == 0
@@ -180,6 +202,7 @@ def test_setup_opencode_global_only(runner, tmp_path, monkeypatch):
     monkeypatch.setattr("evo_cli.commands.opencode.install_mcp_servers", lambda: None)
     monkeypatch.setattr("evo_cli.commands.opencode.install_playwright_browsers", lambda: None)
     monkeypatch.setattr("evo_cli.commands.opencode.verify_mcp_servers", lambda: None)
+    monkeypatch.setattr("evo_cli.commands.opencode.enable_exa_websearch", lambda: None)
 
     project = tmp_path / "project"
     project.mkdir()

evo_cli-0.10.1/evo_cli/VERSION

@@ -1 +0,0 @@
-0.10.1