open-edison 0.1.41__tar.gz → 0.1.42__tar.gz

{open_edison-0.1.41 → open_edison-0.1.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: open-edison
-Version: 0.1.41
+Version: 0.1.42
 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 src.mcp_importer.quick_cli --yes
+uv run python -m 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 src.mcp_importer.quick_cli --yes
+    uv run python -m mcp_importer.quick_cli --yes
     ```
 
   - Preview what will be imported (no writes):
 
     ```bash
-    uv run python -m src.mcp_importer --source cursor --dry-run
+    uv run python -m mcp_importer --source cursor --dry-run
     ```
 
   - Import servers into Open Edison `config.json` (merge policy defaults to `skip`):
 
     ```bash
-    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
+    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
     ```
 
   - Point your editor to Open Edison (backup original config and replace with a single Open Edison server):
 
     ```bash
-    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
+    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
     ```
 
 </details>

{open_edison-0.1.41 → open_edison-0.1.42}/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 src.mcp_importer.quick_cli --yes
+uv run python -m 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 src.mcp_importer.quick_cli --yes
+    uv run python -m mcp_importer.quick_cli --yes
     ```
 
   - Preview what will be imported (no writes):
 
     ```bash
-    uv run python -m src.mcp_importer --source cursor --dry-run
+    uv run python -m mcp_importer --source cursor --dry-run
     ```
 
   - Import servers into Open Edison `config.json` (merge policy defaults to `skip`):
 
     ```bash
-    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
+    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
     ```
 
   - Point your editor to Open Edison (backup original config and replace with a single Open Edison server):
 
     ```bash
-    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
+    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
     ```
 
 </details>

{open_edison-0.1.41 → open_edison-0.1.42}/config.json

@@ -38,10 +38,10 @@
             "command": "npx",
             "args": [
                 "-y",
-                "@github/mcp-server-github"
+                "@modelcontextprotocol/server-github"
             ],
             "env": {
-                "GITHUB_TOKEN": "your-github-token-here"
+                "GITHUB_PERSONAL_ACCESS_TOKEN": "your-github-token-here"
             },
             "enabled": false
         },
@@ -62,10 +62,11 @@
             "command": "npx",
             "args": [
                 "-y",
-                "@supabase/mcp-server-supabase@latest"
+                "@supabase/mcp-server"
             ],
             "env": {
-                "SUPABASE_ACCESS_TOKEN": "your-supabase-access-token"
+                "SUPABASE_URL": "https://YOUR_PROJECT.supabase.co",
+                "SUPABASE_ANON_KEY": "your-supabase-anon-key"
             },
             "enabled": false
         },
@@ -80,40 +81,6 @@
             "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.41 → open_edison-0.1.42}/hatch_build.py

@@ -1,4 +1,3 @@
-import os
 import shutil
 from pathlib import Path
 
@@ -21,14 +20,7 @@ class BuildHook(BuildHookInterface):  # type: ignore
         src_frontend_dist = project_root / "src" / "frontend_dist"
         repo_frontend_dist = project_root / "frontend" / "dist"
 
-        # Opt-in enforcement: only enforce when OPEN_EDISON_REQUIRE_FRONTEND=1/true/yes
-        enforce = os.environ.get("OPEN_EDISON_REQUIRE_FRONTEND", "").lower() in {"1", "true", "yes"}
-        if not enforce:
-            self.app.display_info(
-                "Skipping frontend_dist enforcement (set OPEN_EDISON_REQUIRE_FRONTEND=1 to enforce)"
-            )
-            return
-
+        # Always ensure frontend assets are available for packaging
         # Fast path: already present in src/
         if (src_frontend_dist / "index.html").exists():
             self.app.display_info("frontend_dist already present; skipping build/copy")
@@ -42,8 +34,21 @@ class BuildHook(BuildHookInterface):  # type: ignore
             self.app.display_info("Copied frontend/dist -> src/frontend_dist for packaging")
             return
 
-        # No assets available; fail fast with guidance
-        raise RuntimeError(
-            "Packaged dashboard (src/frontend_dist) missing and frontend/dist not found. "
-            "Run 'make build_package' to generate assets before packaging/uvx."
-        )
+        # If no frontend assets are available, create a minimal placeholder
+        # This prevents build failures while still allowing the package to be built
+        if not src_frontend_dist.exists():
+            src_frontend_dist.mkdir(parents=True, exist_ok=True)
+            # Create a minimal index.html placeholder
+            placeholder_html = """<!DOCTYPE html>
+<html>
+<head>
+    <title>Open Edison Dashboard</title>
+    <meta charset="utf-8">
+</head>
+<body>
+    <h1>Open Edison Dashboard</h1>
+    <p>Frontend assets not available. Run 'make build_package' to build the full dashboard.</p>
+</body>
+</html>"""
+            (src_frontend_dist / "index.html").write_text(placeholder_html)
+            self.app.display_info("Created minimal frontend placeholder for packaging")

{open_edison-0.1.41 → open_edison-0.1.42}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "open-edison"
-version = "0.1.41"
+version = "0.1.42"
 description = "Open-source MCP security, aggregation, and monitoring. Single-user, self-hosted MCP proxy."
 readme = "README.md"
 authors = [
@@ -82,7 +82,7 @@ include = [
   "src/frontend_dist/**",
   "docs/**",
 ]
-force-include = { "src/frontend_dist" = "src/frontend_dist" }
+
 
 [tool.hatch.build.targets.sdist.hooks.custom]
 path = "hatch_build.py"

{open_edison-0.1.41 → open_edison-0.1.42}/src/cli.py

@@ -45,7 +45,7 @@ def _parse_args(argv: list[str] | None = None) -> argparse.Namespace:
     # import-mcp: import MCP servers from other tools into config.json
     sp_import = subparsers.add_parser(
         "import-mcp",
-        help="Import MCP servers from other tools (Cursor, VS Code, Claude Code)",
+        help="Import MCP servers from other tools (Cursor, Windsurf, Cline, Claude Desktop, etc.)",
         description=(
             "Import MCP server configurations from other tools into Open Edison config.json.\n"
             "Use --source to choose the tool and optional flags to control merging."
@@ -55,10 +55,16 @@ def _parse_args(argv: list[str] | None = None) -> argparse.Namespace:
         "--source",
         choices=[
             "cursor",
+            "windsurf",
+            "cline",
+            "claude-desktop",
             "vscode",
             "claude-code",
+            "gemini-cli",
+            "codex",
+            "interactive",
         ],
-        default="cursor",
+        default="interactive",
         help="Source application to import from",
     )
     sp_import.add_argument(

open_edison-0.1.42/src/mcp_importer/api.py

@@ -0,0 +1,106 @@
+# pyright: reportMissingImports=false, reportUnknownVariableType=false, reportUnknownMemberType=false, reportUnknownArgumentType=false, reportUnknownParameterType=false
+from enum import Enum
+from pathlib import Path
+from typing import Any
+
+from src.config import Config, MCPServerConfig, get_config_json_path
+from src.mcp_importer import paths as _paths
+from src.mcp_importer.exporters import export_to_claude_code, export_to_cursor, export_to_vscode
+from src.mcp_importer.importers import (
+    import_from_claude_code as _import_from_claude_code,
+)
+from src.mcp_importer.importers import (
+    import_from_cursor as _import_from_cursor,
+)
+from src.mcp_importer.importers import (
+    import_from_vscode as _import_from_vscode,
+)
+from src.mcp_importer.merge import MergePolicy, merge_servers
+
+
+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,
+            )

{open_edison-0.1.41 → open_edison-0.1.42}/src/mcp_importer/quick_cli.py

@@ -26,19 +26,10 @@ 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()
-    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}")
+    client = _pick_first(detected)
     if client is None:
         print("No supported clients detected.")
         return 2
@@ -48,8 +39,20 @@ def run_cli(argv: list[str] | None = None) -> int:
         print(f"No servers found to import from '{client.value}'.")
         return 0
 
-    save_imported_servers(servers, dry_run=args.dry_run)
-    export_edison_to(client, dry_run=args.dry_run, force=True, create_if_missing=True)
+    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)
     print(f"Completed quick import/export for {client.value}.")
     return 0
 

{open_edison-0.1.41 → open_edison-0.1.42}/src/oauth_manager.py

@@ -7,7 +7,6 @@ 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
 
@@ -138,6 +137,7 @@ 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()