Run tui on first invocation

Author: Drummersbrother

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "open-edison"
-version = "0.1.55"
+version = "0.1.56"
 description = "Open-source MCP security, aggregation, and monitoring. Single-user, self-hosted MCP proxy."
 readme = "README.md"
 authors = [

src/cli.py

@@ -7,15 +7,14 @@
 import argparse
 import asyncio
 import os
-import subprocess as _subprocess
-from contextlib import suppress
 from pathlib import Path
 from typing import Any, NoReturn
 
 from loguru import logger as _log  # type: ignore[reportMissingImports]
 
 from src.config import Config, get_config_dir, get_config_json_path
 from src.mcp_importer.cli import run_cli
+from src.setup_tui.main import run_import_tui
 from src.server import OpenEdisonProxy
 
 log: Any = _log
@@ -37,6 +36,17 @@ def _parse_args(argv: list[str] | None = None) -> argparse.Namespace:
     parser.add_argument(
         "--port", type=int, help="Server port override (FastMCP on port, FastAPI on port+1)"
     )
+    # For the setup wizard
+    parser.add_argument(
+        "--wizard-dry-run",
+        action="store_true",
+        help="(For the setup wizard) Show changes without writing to config.json",
+    )
+    parser.add_argument(
+        "--wizard-skip-oauth",
+        action="store_true",
+        help="(For the setup wizard) Skip OAuth for remote servers (they will be omitted from import)",
+    )
     # Website runs from packaged assets by default; no extra website flags
 
     # Subcommands (extensible)
@@ -88,89 +98,7 @@ def _parse_args(argv: list[str] | None = None) -> argparse.Namespace:
     return parser.parse_args(argv)
 
 
-def _spawn_frontend_dev(  # noqa: C901 - pragmatic complexity for env probing
-    port: int,
-    override_dir: Path | None = None,
-    config_dir: Path | None = None,
-) -> tuple[int, _subprocess.Popen[bytes] | None]:
-    """Try to start the frontend dev server by running `npm run dev`.
-
-    Search order for working directory:
-    1) Packaged project path: <pkg_root>/frontend
-    2) Current working directory (if it contains a package.json)
-    """
-    candidates: list[Path] = []
-    # Prefer packaged static assets; if present, the backend serves /dashboard
-    static_candidates = [
-        Path(__file__).parent / "frontend_dist",  # inside package dir
-        Path(__file__).parent.parent / "frontend_dist",  # site-packages root
-    ]
-    static_dir = next((p for p in static_candidates if p.exists() and p.is_dir()), None)
-    if static_dir is not None:
-        log.info(
-            f"Packaged dashboard detected at {static_dir}. It will be served at /dashboard by the API server."
-        )
-        # No separate website process needed. Return sentinel port (-1) so caller knows not to warn.
-        return (-1, None)
-
-    if static_dir is None:
-        raise RuntimeError(
-            "No packaged dashboard detected. The website will be served from the frontend directory."
-        )
-
-    pkg_frontend_candidates = [
-        Path(__file__).parent / "frontend",  # inside package dir
-        Path(__file__).parent.parent / "frontend",  # site-packages root
-    ]
-    if override_dir is not None:
-        candidates.append(override_dir)
-    for pf in pkg_frontend_candidates:
-        if pf.exists():
-            candidates.append(pf)
-    if config_dir is not None and (config_dir / "package.json").exists():
-        candidates.append(config_dir)
-    cwd_pkg = Path.cwd()
-    if (cwd_pkg / "package.json").exists():
-        candidates.append(cwd_pkg)
-
-    if not candidates:
-        log.warning(
-            "No frontend directory found (no packaged frontend and no package.json in CWD). Skipping website."
-        )
-        return (port, None)
-
-    for candidate in candidates:
-        try:
-            # If no package.json but directory exists, try a basic npm i per user request
-            if not (candidate / "package.json").exists():
-                log.info(f"No package.json in {candidate}. Running 'npm i' as best effort...")
-                _ = _subprocess.call(["npm", "i"], cwd=str(candidate))
-
-            # Install deps if needed
-            if (
-                not (candidate / "node_modules").exists()
-                and (candidate / "package-lock.json").exists()
-            ):
-                log.info(f"Installing frontend dependencies with npm ci in {candidate}...")
-                r_install = _subprocess.call(["npm", "ci"], cwd=str(candidate))
-                if r_install != 0:
-                    log.error("Failed to install frontend dependencies")
-                    continue
-
-            log.info(f"Starting frontend dev server in {candidate} on port {port}...")
-            cmd_default = ["npm", "run", "dev", "--", "--port", str(port)]
-            proc = _subprocess.Popen(cmd_default, cwd=str(candidate))
-            return (port, proc)
-        except FileNotFoundError:
-            log.error("npm not found. Please install Node.js to run the website dev server.")
-            return (port, None)
-
-    # If all candidates failed
-    return (port, None)
-
-
 async def _run_server(args: Any) -> None:
-    # TODO check this works as we want it to
     # Resolve config dir and expose via env for the rest of the app
     config_dir_arg = getattr(args, "config_dir", None)
     if config_dir_arg is not None:
@@ -186,44 +114,26 @@ async def _run_server(args: Any) -> None:
     log.info(f"Using config directory: {config_dir}")
     proxy = OpenEdisonProxy(host=host, port=port)
 
-    # Website served from packaged assets by default; still detect and log
-    frontend_proc = None
-    used_port, frontend_proc = _spawn_frontend_dev(5173, None, config_dir)
-    if frontend_proc is None and used_port == -1:
-        log.info("Frontend is being served from packaged assets at /dashboard")
-
     try:
         await proxy.start()
         _ = await asyncio.Event().wait()
     except KeyboardInterrupt:
         log.info("Received shutdown signal")
-    finally:
-        if frontend_proc is not None:
-            with suppress(Exception):
-                frontend_proc.terminate()
-                _ = frontend_proc.wait(timeout=5)
-            with suppress(Exception):
-                frontend_proc.kill()
-
-
-def _run_website(port: int, website_dir: Path | None = None) -> int:
-    # Use the same spawning logic, then return 0 if started or 1 if failed
-    _, proc = _spawn_frontend_dev(port, website_dir)
-    return 0 if proc is not None else 1
 
 
 def main(argv: list[str] | None = None) -> NoReturn:  # noqa: C901
     args = _parse_args(argv)
 
-    if getattr(args, "command", None) == "website":
-        exit_code = _run_website(port=args.port, website_dir=getattr(args, "dir", None))
-        raise SystemExit(exit_code)
+    if args.command is None:
+        args.command = "run"
 
-    if getattr(args, "command", None) == "import-mcp":
+    if args.command == "import-mcp":
         result_code = run_cli(argv)
         raise SystemExit(result_code)
 
-    # default: run server (top-level flags)
+    # Run import tui if necessary
+    run_import_tui(args)
+
     try:
         asyncio.run(_run_server(args))
         raise SystemExit(0)

src/mcp_importer/api.py

@@ -237,7 +237,9 @@ async def _list_tools_only() -> Any:
                         return True
                     # NOT_REQUIRED: quick unauthenticated ping
                     # TODO: In debug mode, do not suppress child process output.
-                    questionary.print(f"Testing connection to '{server.name}'...", style="bold fg:ansigreen")
+                    questionary.print(
+                        f"Testing connection to '{server.name}'...", style="bold fg:ansigreen"
+                    )
                     log.debug(f"Establishing contact with remote server '{server.name}'")
                     async with asyncio.timeout(connection_timeout):
                         async with FastMCPClient(

src/mcp_importer/parsers.py

@@ -159,14 +159,28 @@ def _collect_nested(data: dict[str, Any], default_enabled: bool) -> list[Any]:
     return results
 
 
-def parse_mcp_like_json(data: dict[str, Any], default_enabled: bool = True) -> list[Any]:
+def deduplicate_by_name(servers: list[MCPServerConfig]) -> list[MCPServerConfig]:
+    result: list[MCPServerConfig] = []
+    names = set()
+    for server in servers:
+        if server.name not in names:
+            names.add(server.name)
+            result.append(server)
+    return result
+
+
+def parse_mcp_like_json(
+    data: dict[str, Any], default_enabled: bool = True
+) -> list[MCPServerConfig]:
     # First, try top-level keys
     top_level = _collect_top_level(data, default_enabled)
+    res: list[MCPServerConfig] = []
     if top_level:
-        return top_level
-
-    # Then, try nested structures heuristically
-    nested = _collect_nested(data, default_enabled)
-    if not nested:
-        log.debug("No MCP-like entries detected in provided data")
-    return nested
+        res = top_level
+    else:
+        # Then, try nested structures heuristically
+        nested = _collect_nested(data, default_enabled)
+        if not nested:
+            log.debug("No MCP-like entries detected in provided data")
+        res = nested
+    return deduplicate_by_name(res)

src/setup_tui/main.py

@@ -1,12 +1,14 @@
 import argparse
 import asyncio
+import contextlib
 import sys
+from collections.abc import Generator
 
 import questionary
 from loguru import logger as log
 
 import src.oauth_manager as oauth_mod
-from src.config import MCPServerConfig
+from src.config import MCPServerConfig, get_config_dir
 from src.mcp_importer.api import (
     CLIENT,
     authorize_server_oauth,
@@ -100,7 +102,7 @@ def handle_mcp_source(  # noqa: C901
             verified_configs.append(config)
         else:
             print(
-                f"The configuration for {config.name} is not valid. Please check the configuration and try again."
+                f"Verification failed for the configuration of {config.name}. Please check the configuration and try again."
             )
 
     return verified_configs
@@ -171,13 +173,18 @@ def show_manual_setup_screen() -> None:
     print(after_text)
 
 
-def run(*, dry_run: bool = False, skip_oauth: bool = False) -> None:  # noqa: C901
-    """Run the complete setup process."""
-    # Suppress loguru output for a cleaner TUI experience
-    import contextlib
-
+@contextlib.contextmanager
+def suppress_loguru_output() -> Generator[None, None, None]:
+    """Suppress loguru output."""
     with contextlib.suppress(Exception):
         log.remove()
+    yield
+    log.add(sys.stdout, level="INFO")
+
+
+@suppress_loguru_output()
+def run(*, dry_run: bool = False, skip_oauth: bool = False) -> None:  # noqa: C901
+    """Run the complete setup process."""
 
     # Route oauth_manager's log calls to questionary for TUI output
     class _TuiLogger:
@@ -234,6 +241,18 @@ def error(self, msg: object, *args: object, **kwargs: object) -> None:
     log.add(sys.stdout, level="INFO")
 
 
+# Triggered from cli.py
+def run_import_tui(args: argparse.Namespace) -> None:
+    """Run the import TUI, if necessary."""
+    # Find config dir, check if ".setup_tui_run" exists
+    config_dir = get_config_dir()
+    setup_tui_run_file = config_dir / ".setup_tui_run"
+    if not setup_tui_run_file.exists():
+        run(dry_run=args.wizard_dry_run, skip_oauth=args.wizard_skip_oauth)
+
+    setup_tui_run_file.touch()
+
+
 def main(argv: list[str] | None = None) -> int:
     parser = argparse.ArgumentParser(description="Open Edison Setup TUI")
     parser.add_argument("--dry-run", action="store_true", help="Preview actions without writing")

src/tools/io.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import os
 from collections.abc import Iterator
 from contextlib import contextmanager
@@ -35,5 +33,3 @@ def suppress_fds(*, suppress_stdout: bool = False, suppress_stderr: bool = True)
                 os.dup2(backup, fd)
             finally:
                 os.close(backup)
-
-