open-edison 0.1.38__tar.gz → 0.1.40__tar.gz

{open_edison-0.1.38 → open_edison-0.1.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: open-edison
-Version: 0.1.38
+Version: 0.1.40
 Summary: Open-source MCP security, aggregation, and monitoring. Single-user, self-hosted MCP proxy.
 Author-email: Hugo Berg <hugo@edison.watch>
 License-File: LICENSE
@@ -76,7 +76,7 @@ Optionally, import your existing MCP configs from Cursor, VS Code, or Claude Cod
 
 ```bash
 # From source (no install) — quick one-liner (add --dry-run to preview)
-uv run python -m mcp_importer.quick_cli --yes
+uv run python -m src.mcp_importer.quick_cli --yes
 ```
 
 <details>
@@ -139,29 +139,29 @@ OPEN_EDISON_CONFIG_DIR=~/edison-config open-edison run
 
     ```bash
     # From source (no install)
-    uv run python -m mcp_importer.quick_cli --yes
+    uv run python -m src.mcp_importer.quick_cli --yes
     ```
 
   - Preview what will be imported (no writes):
 
     ```bash
-    uv run python -m mcp_importer --source cursor --dry-run
+    uv run python -m src.mcp_importer --source cursor --dry-run
     ```
 
   - Import servers into Open Edison `config.json` (merge policy defaults to `skip`):
 
     ```bash
-    uv run python -m mcp_importer --source cursor
-    uv run python -m mcp_importer --source vscode
-    uv run python -m mcp_importer --source claude-code
+    uv run python -m src.mcp_importer --source cursor
+    uv run python -m src.mcp_importer --source vscode
+    uv run python -m src.mcp_importer --source claude-code
     ```
 
   - Point your editor to Open Edison (backup original config and replace with a single Open Edison server):
 
     ```bash
-    uv run python -m mcp_importer export --target cursor --yes
-    uv run python -m mcp_importer export --target vscode --yes
-    uv run python -m mcp_importer export --target claude-code --yes
+    uv run python -m src.mcp_importer export --target cursor --yes
+    uv run python -m src.mcp_importer export --target vscode --yes
+    uv run python -m src.mcp_importer export --target claude-code --yes
     ```
 
 </details>

{open_edison-0.1.38 → open_edison-0.1.40}/README.md

@@ -52,7 +52,7 @@ Optionally, import your existing MCP configs from Cursor, VS Code, or Claude Cod
 
 ```bash
 # From source (no install) — quick one-liner (add --dry-run to preview)
-uv run python -m mcp_importer.quick_cli --yes
+uv run python -m src.mcp_importer.quick_cli --yes
 ```
 
 <details>
@@ -115,29 +115,29 @@ OPEN_EDISON_CONFIG_DIR=~/edison-config open-edison run
 
     ```bash
     # From source (no install)
-    uv run python -m mcp_importer.quick_cli --yes
+    uv run python -m src.mcp_importer.quick_cli --yes
     ```
 
   - Preview what will be imported (no writes):
 
     ```bash
-    uv run python -m mcp_importer --source cursor --dry-run
+    uv run python -m src.mcp_importer --source cursor --dry-run
     ```
 
   - Import servers into Open Edison `config.json` (merge policy defaults to `skip`):
 
     ```bash
-    uv run python -m mcp_importer --source cursor
-    uv run python -m mcp_importer --source vscode
-    uv run python -m mcp_importer --source claude-code
+    uv run python -m src.mcp_importer --source cursor
+    uv run python -m src.mcp_importer --source vscode
+    uv run python -m src.mcp_importer --source claude-code
     ```
 
   - Point your editor to Open Edison (backup original config and replace with a single Open Edison server):
 
     ```bash
-    uv run python -m mcp_importer export --target cursor --yes
-    uv run python -m mcp_importer export --target vscode --yes
-    uv run python -m mcp_importer export --target claude-code --yes
+    uv run python -m src.mcp_importer export --target cursor --yes
+    uv run python -m src.mcp_importer export --target vscode --yes
+    uv run python -m src.mcp_importer export --target claude-code --yes
     ```
 
 </details>

{open_edison-0.1.38 → open_edison-0.1.40}/config.json

@@ -38,10 +38,10 @@
             "command": "npx",
             "args": [
                 "-y",
-                "@modelcontextprotocol/server-github"
+                "@github/mcp-server-github"
             ],
             "env": {
-                "GITHUB_PERSONAL_ACCESS_TOKEN": "your-github-token-here"
+                "GITHUB_TOKEN": "your-github-token-here"
             },
             "enabled": false
         },
@@ -62,11 +62,10 @@
             "command": "npx",
             "args": [
                 "-y",
-                "@supabase/mcp-server"
+                "@supabase/mcp-server-supabase@latest"
             ],
             "env": {
-                "SUPABASE_URL": "https://YOUR_PROJECT.supabase.co",
-                "SUPABASE_ANON_KEY": "your-supabase-anon-key"
+                "SUPABASE_ACCESS_TOKEN": "your-supabase-access-token"
             },
             "enabled": false
         },
@@ -81,6 +80,40 @@
             "env": {},
             "enabled": false
         },
+        {
+            "name": "figma",
+            "command": "npx",
+            "args": [
+                "-y",
+                "figma-developer-mcp",
+                "--stdio"
+            ],
+            "env": {
+                "FIGMA_API_KEY": "your-figma-api-key"
+            },
+            "enabled": false
+        },
+        {
+            "name": "figma_dev_mode",
+            "command": "npx",
+            "args": [
+                "-y",
+                "mcp-remote",
+                "http://127.0.0.1:3845/sse"
+            ],
+            "env": {},
+            "enabled": false
+        },
+        {
+            "name": "playwright",
+            "command": "npx",
+            "args": [
+                "-y",
+                "@automatalabs/mcp-server-playwright"
+            ],
+            "env": {},
+            "enabled": false
+        },
         {
             "name": "google_drive",
             "command": "npx",

{open_edison-0.1.38 → open_edison-0.1.40}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "open-edison"
-version = "0.1.38"
+version = "0.1.40"
 description = "Open-source MCP security, aggregation, and monitoring. Single-user, self-hosted MCP proxy."
 readme = "README.md"
 authors = [
@@ -28,8 +28,8 @@ requires-python = ">= 3.12"
 [project.scripts]
 open-edison = "src.cli:main"
 open_edison = "src.cli:main"
-mcp-importer = "mcp_importer.__main__:main"
-mcp-importer-quick = "mcp_importer.quick_cli:main"
+mcp-importer = "src.mcp_importer.__main__:main"
+mcp-importer-quick = "src.mcp_importer.quick_cli:main"
 
 [build-system]
 requires = ["hatchling"]
@@ -54,10 +54,7 @@ dev-dependencies = [
 allow-direct-references = true
 
 [tool.hatch.build.targets.wheel]
-packages = ["src", "src/mcp_importer"]
-exclude = [
-  "src/mcp_importer/**",
-]
+packages = ["src"]
 include = [
   "README.md",
   "LICENSE",
@@ -66,8 +63,8 @@ include = [
   "resource_permissions.json",
   "prompt_permissions.json",
   "docs/**",
-  "src/frontend_dist/**",
 ]
+force-include = { "src/frontend_dist" = "frontend_dist" }
 
 [tool.hatch.build.targets.wheel.hooks.custom]
 path = "hatch_build.py"

{open_edison-0.1.38 → open_edison-0.1.40}/src/mcp_importer/__init__.py

@@ -1,6 +1,6 @@
 """MCP importer package for Open Edison scripts.
 
-Import submodules explicitly as needed, e.g. `from mcp_importer import cli`.
+Import submodules explicitly as needed, e.g. `from src.mcp_importer import cli`.
 """
 
 # pyright: reportUnsupportedDunderAll=false

{open_edison-0.1.38 → open_edison-0.1.40}/src/mcp_importer/__main__.py

@@ -2,8 +2,8 @@ from __future__ import annotations
 
 import sys
 
-from mcp_importer.cli import run_cli as import_run_cli
-from mcp_importer.export_cli import run_cli as export_run_cli
+from src.mcp_importer.cli import run_cli as import_run_cli
+from src.mcp_importer.export_cli import run_cli as export_run_cli
 
 
 def main() -> int:

open_edison-0.1.40/src/mcp_importer/api.py

@@ -0,0 +1,196 @@
+# pyright: reportMissingImports=false, reportUnknownVariableType=false, reportUnknownMemberType=false, reportUnknownArgumentType=false, reportUnknownParameterType=false
+import asyncio
+from collections.abc import Awaitable
+from enum import Enum
+from pathlib import Path
+from typing import Any, Protocol, cast, runtime_checkable
+
+from fastmcp import FastMCP
+
+from src.config import Config, MCPServerConfig, get_config_json_path
+from src.mcp_importer import paths as _paths
+from src.mcp_importer.exporters import (
+    ExportResult,
+    export_to_claude_code,
+    export_to_cursor,
+    export_to_vscode,
+)
+from src.mcp_importer.importers import (
+    import_from_claude_code,
+    import_from_cursor,
+    import_from_vscode,
+)
+from src.mcp_importer.merge import MergePolicy, merge_servers
+from src.oauth_manager import OAuthStatus, get_oauth_manager
+
+
+@runtime_checkable
+class _MCPClientLike(Protocol):
+    async def list_tools(self) -> Any: ...
+    async def list_resources(self) -> Any: ...
+    async def list_prompts(self) -> Any: ...
+    def shutdown(self) -> Awaitable[Any] | Any: ...
+
+
+class CLIENT(str, Enum):
+    CURSOR = "cursor"
+    VSCODE = "vscode"
+    CLAUDE_CODE = "claude-code"
+
+    def __str__(self) -> str:
+        return self.value.capitalize()
+
+    def __repr__(self) -> str:
+        return str(self)
+
+
+def detect_clients() -> set[CLIENT]:
+    detected: set[CLIENT] = set()
+    if _paths.detect_cursor_config_path() is not None:
+        detected.add(CLIENT.CURSOR)
+    if _paths.detect_vscode_config_path() is not None:
+        detected.add(CLIENT.VSCODE)
+    if _paths.detect_claude_code_config_path() is not None:
+        detected.add(CLIENT.CLAUDE_CODE)
+    return detected
+
+
+def import_from(client: CLIENT) -> list[MCPServerConfig]:
+    if client == CLIENT.CURSOR:
+        return import_from_cursor()
+    if client == CLIENT.VSCODE:
+        return import_from_vscode()
+    if client == CLIENT.CLAUDE_CODE:
+        return import_from_claude_code()
+    raise ValueError(f"Unsupported client: {client}")
+
+
+def save_imported_servers(
+    servers: list[MCPServerConfig],
+    *,
+    dry_run: bool = False,
+    merge_policy: str = MergePolicy.SKIP,
+    config_dir: Path | None = None,
+) -> Path | None:
+    target_path: Path = (
+        get_config_json_path() if config_dir is None else (Path(config_dir) / "config.json")
+    )
+    if dry_run:
+        print(
+            f"[dry-run] Would import {len(servers)} server(s) and save to config.json (at {target_path})"
+        )
+        return None
+    cfg: Config = Config(target_path)
+    merged = merge_servers(existing=cfg.mcp_servers, imported=servers, policy=merge_policy)
+    cfg.mcp_servers = merged
+    cfg.save(target_path)
+    return target_path
+
+
+def export_edison_to(
+    client: CLIENT,
+    *,
+    url: str = "http://localhost:3000/mcp/",
+    api_key: str = "dev-api-key-change-me",
+    server_name: str = "open-edison",
+    dry_run: bool = False,
+    force: bool = False,
+    create_if_missing: bool = False,
+) -> ExportResult:
+    if dry_run:
+        print(
+            f"[dry-run] Would export Open Edison to '{client}' (backup and replace editor MCP config)"
+        )
+        return ExportResult(
+            target_path=Path(""),
+            backup_path=None,
+            wrote_changes=False,
+            dry_run=True,
+        )
+    match client:
+        case CLIENT.CURSOR:
+            return export_to_cursor(
+                url=url,
+                api_key=api_key,
+                server_name=server_name,
+                dry_run=dry_run,
+                force=force,
+                create_if_missing=create_if_missing,
+            )
+        case CLIENT.VSCODE:
+            return export_to_vscode(
+                url=url,
+                api_key=api_key,
+                server_name=server_name,
+                dry_run=dry_run,
+                force=force,
+                create_if_missing=create_if_missing,
+            )
+        case CLIENT.CLAUDE_CODE:
+            return export_to_claude_code(
+                url=url,
+                api_key=api_key,
+                server_name=server_name,
+                dry_run=dry_run,
+                force=force,
+                create_if_missing=create_if_missing,
+            )
+
+
+def verify_mcp_server(server: MCPServerConfig) -> bool:  # noqa
+    """Minimal validation: try listing tools/resources/prompts via FastMCP within a timeout."""
+
+    async def _verify_async() -> bool:
+        if not server.command.strip():
+            return False
+
+        backend_cfg: dict[str, Any] = {
+            "mcpServers": {
+                server.name: {
+                    "command": server.command,
+                    "args": server.args,
+                    "env": server.env or {},
+                    **({"roots": server.roots} if server.roots else {}),
+                }
+            }
+        }
+
+        proxy: FastMCP[Any] | None = None
+        try:
+            proxy = FastMCP.as_proxy(backend=backend_cfg, name=f"open-edison-verify-{server.name}")
+            s: _MCPClientLike = cast(_MCPClientLike, proxy)
+            await asyncio.wait_for(
+                asyncio.gather(
+                    s.list_tools(),
+                    s.list_resources(),
+                    s.list_prompts(),
+                ),
+                timeout=15.0,
+            )
+            return True
+        except Exception:
+            return False
+        finally:
+            try:
+                if isinstance(proxy, FastMCP):
+                    result = proxy.shutdown()  # type: ignore[attr-defined]
+                    if isinstance(result, Awaitable):
+                        await result  # type: ignore[func-returns-value]
+            except Exception:
+                pass
+
+    return asyncio.run(_verify_async())
+
+
+def server_needs_oauth(server: MCPServerConfig) -> bool:  # noqa
+    """Return True if the remote server currently needs OAuth; False otherwise."""
+
+    async def _needs_oauth_async() -> bool:
+        if not server.is_remote_server():
+            return False
+        info = await get_oauth_manager().check_oauth_requirement(
+            server.name, server.get_remote_url()
+        )
+        return info.status == OAuthStatus.NEEDS_AUTH
+
+    return asyncio.run(_needs_oauth_async())

{open_edison-0.1.38 → open_edison-0.1.40}/src/mcp_importer/quick_cli.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import argparse
 from collections.abc import Iterable
 
-from mcp_importer.api import (
+from src.mcp_importer.api import (
     CLIENT,
     detect_clients,
     export_edison_to,
@@ -26,10 +26,19 @@ def run_cli(argv: list[str] | None = None) -> int:
     )
     parser.add_argument("--dry-run", action="store_true", help="Preview actions without writing")
     parser.add_argument("--yes", action="store_true", help="Skip confirmations (no effect here)")
+    parser.add_argument(
+        "--source-client", type=CLIENT, help="Client to import from", required=False, default=None
+    )
     args = parser.parse_args(argv)
 
     detected = detect_clients()
-    client = _pick_first(detected)
+    print(f"Detected clients: {detected}")
+    if args.source_client:
+        client = args.source_client
+        assert client in detected, f"Client {client} not detected"
+    else:
+        client = _pick_first(detected)
+    print(f"Going to import from client: {client}")
     if client is None:
         print("No supported clients detected.")
         return 2
@@ -39,20 +48,8 @@ def run_cli(argv: list[str] | None = None) -> int:
         print(f"No servers found to import from '{client.value}'.")
         return 0
 
-    if args.dry_run:
-        print(
-            f"[dry-run] Would import {len(servers)} server(s) from '{client.value}' and save to config.json"
-        )
-        # Exercise export path safely (no writes)
-        export_edison_to(client, dry_run=True, force=True, create_if_missing=True)
-        print(
-            f"[dry-run] Would export Open Edison to '{client.value}' (backup and replace editor MCP config)"
-        )
-        print("Dry-run complete.")
-        return 0
-
-    save_imported_servers(servers)
-    export_edison_to(client, dry_run=False, force=True, create_if_missing=True)
+    save_imported_servers(servers, dry_run=args.dry_run)
+    export_edison_to(client, dry_run=args.dry_run, force=True, create_if_missing=True)
     print(f"Completed quick import/export for {client.value}.")
     return 0
 

{open_edison-0.1.38 → open_edison-0.1.40}/src/oauth_manager.py

@@ -7,6 +7,7 @@ Provides detection, token management, and authentication flow coordination.
 
 import asyncio
 from dataclasses import dataclass
+from datetime import datetime, timedelta
 from enum import Enum
 from pathlib import Path
 
@@ -137,7 +138,6 @@ class OAuthManager:
                             expires_in = getattr(existing_tokens, "expires_in", None)
                             if expires_in:
                                 # If expires_in is available, we can calculate expiration
-                                from datetime import datetime, timedelta
 
                                 expiry = datetime.now() + timedelta(seconds=expires_in)
                                 token_expires_at = expiry.isoformat()

open_edison-0.1.38/src/mcp_importer/api.py

@@ -1,106 +0,0 @@
-# pyright: reportMissingImports=false, reportUnknownVariableType=false, reportUnknownMemberType=false, reportUnknownArgumentType=false, reportUnknownParameterType=false
-from enum import Enum
-from pathlib import Path
-from typing import Any
-
-import mcp_importer.paths as _paths
-from mcp_importer.exporters import export_to_claude_code, export_to_cursor, export_to_vscode
-from mcp_importer.importers import (
-    import_from_claude_code as _import_from_claude_code,
-)
-from mcp_importer.importers import (
-    import_from_cursor as _import_from_cursor,
-)
-from mcp_importer.importers import (
-    import_from_vscode as _import_from_vscode,
-)
-from mcp_importer.merge import MergePolicy, merge_servers
-from src.config import Config, MCPServerConfig, get_config_json_path
-
-
-class CLIENT(str, Enum):
-    CURSOR = "cursor"
-    VSCODE = "vscode"
-    CLAUDE_CODE = "claude-code"
-
-
-def detect_clients() -> set[CLIENT]:
-    detected: set[CLIENT] = set()
-    if _paths.detect_cursor_config_path() is not None:
-        detected.add(CLIENT.CURSOR)
-    if _paths.detect_vscode_config_path() is not None:
-        detected.add(CLIENT.VSCODE)
-    if _paths.detect_claude_code_config_path() is not None:
-        detected.add(CLIENT.CLAUDE_CODE)
-    return detected
-
-
-import_cursor = _import_from_cursor
-import_vscode = _import_from_vscode
-import_claude_code = _import_from_claude_code
-
-
-def import_from(client: CLIENT) -> list[MCPServerConfig]:
-    if client == CLIENT.CURSOR:
-        return import_cursor()
-    if client == CLIENT.VSCODE:
-        return import_vscode()
-    if client == CLIENT.CLAUDE_CODE:
-        return import_claude_code()
-    raise ValueError(f"Unsupported client: {client}")
-
-
-def save_imported_servers(
-    servers: list[MCPServerConfig],
-    *,
-    merge_policy: str = MergePolicy.SKIP,
-    config_dir: Path | None = None,
-) -> Path:
-    target_path: Path = (
-        get_config_json_path() if config_dir is None else (Path(config_dir) / "config.json")
-    )
-    cfg: Config = Config(target_path)
-    merged = merge_servers(existing=cfg.mcp_servers, imported=servers, policy=merge_policy)
-    cfg.mcp_servers = merged
-    cfg.save(target_path)
-    return target_path
-
-
-def export_edison_to(
-    client: CLIENT,
-    *,
-    url: str = "http://localhost:3000/mcp/",
-    api_key: str = "dev-api-key-change-me",
-    server_name: str = "open-edison",
-    dry_run: bool = False,
-    force: bool = False,
-    create_if_missing: bool = False,
-) -> Any:
-    match client:
-        case CLIENT.CURSOR:
-            return export_to_cursor(
-                url=url,
-                api_key=api_key,
-                server_name=server_name,
-                dry_run=dry_run,
-                force=force,
-                create_if_missing=create_if_missing,
-            )
-        case CLIENT.VSCODE:
-            return export_to_vscode(
-                url=url,
-                api_key=api_key,
-                server_name=server_name,
-                dry_run=dry_run,
-                force=force,
-                create_if_missing=create_if_missing,
-            )
-        case CLIENT.CLAUDE_CODE:
-            return export_to_claude_code(
-                url=url,
-                api_key=api_key,
-                server_name=server_name,
-                dry_run=dry_run,
-                force=force,
-                create_if_missing=create_if_missing,
-            )