open-edison 0.1.34__tar.gz → 0.1.37__tar.gz

{open_edison-0.1.34 → open_edison-0.1.37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: open-edison
-Version: 0.1.34
+Version: 0.1.37
 Summary: Open-source MCP security, aggregation, and monitoring. Single-user, self-hosted MCP proxy.
 Author-email: Hugo Berg <hugo@edison.watch>
 License-File: LICENSE
@@ -20,17 +20,13 @@ Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: sqlalchemy>=2.0.41
 Requires-Dist: starlette>=0.47.1
 Requires-Dist: uvicorn>=0.35.0
-Provides-Extra: dev
-Requires-Dist: pytest-asyncio>=1.0.0; extra == 'dev'
-Requires-Dist: pytest>=8.3.3; extra == 'dev'
-Requires-Dist: ruff>=0.12.3; extra == 'dev'
 Description-Content-Type: text/markdown
 
 # OpenEdison 🔒⚡️
 
 > The Secure MCP Control Panel
 
-Connect AI to your data/software securely without risk of data exfiltration. Gain visibility, block threats, and get alerts on the data your agent is reading/writing. 
+Connect AI to your data/software securely without risk of data exfiltration. Gain visibility, block threats, and get alerts on the data your agent is reading/writing.
 
 OpenEdison solves the [lethal trifecta problem](https://simonwillison.net/2025/Jun/16/the-lethal-trifecta/), which can cause agent hijacking & data exfiltration by malicious actors.
 
@@ -76,6 +72,13 @@ curl -fsSL https://raw.githubusercontent.com/Edison-Watch/open-edison/main/curl_
 
 Run locally with uvx: `uvx open-edison`
 
+Optionally, import your existing MCP configs from Cursor, VS Code, or Claude Code with:
+
+```bash
+# From source (no install) — quick one-liner (add --dry-run to preview)
+uv run python -m mcp_importer.quick_cli --yes
+```
+
 <details>
 <summary>⬇️ Install Node.js/npm (optional for MCP tools)</summary>
 
@@ -125,6 +128,45 @@ OPEN_EDISON_CONFIG_DIR=~/edison-config open-edison run
 
 </details>
 
+<details>
+<summary>🔄 Import from Cursor/VS Code/Claude Code</summary>
+
+### Import from Cursor/VS Code/Claude Code
+
+- **CLI**
+
+  - Import & configure to use edison as your MCP server:
+
+    ```bash
+    # From source (no install)
+    uv run python -m mcp_importer.quick_cli --yes
+    # After install: mcp-importer-quick --yes
+    ```
+
+  - Preview what will be imported (no writes):
+
+    ```bash
+    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 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 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>
+
 <details>
 <summary><img src="https://img.shields.io/badge/Docker-2CA5E0?style=for-the-badge&logo=docker&logoColor=white" alt="Docker"> Run with Docker</summary>
 

{open_edison-0.1.34 → open_edison-0.1.37}/README.md

@@ -2,7 +2,7 @@
 
 > The Secure MCP Control Panel
 
-Connect AI to your data/software securely without risk of data exfiltration. Gain visibility, block threats, and get alerts on the data your agent is reading/writing. 
+Connect AI to your data/software securely without risk of data exfiltration. Gain visibility, block threats, and get alerts on the data your agent is reading/writing.
 
 OpenEdison solves the [lethal trifecta problem](https://simonwillison.net/2025/Jun/16/the-lethal-trifecta/), which can cause agent hijacking & data exfiltration by malicious actors.
 
@@ -48,6 +48,13 @@ curl -fsSL https://raw.githubusercontent.com/Edison-Watch/open-edison/main/curl_
 
 Run locally with uvx: `uvx open-edison`
 
+Optionally, import your existing MCP configs from Cursor, VS Code, or Claude Code with:
+
+```bash
+# From source (no install) — quick one-liner (add --dry-run to preview)
+uv run python -m mcp_importer.quick_cli --yes
+```
+
 <details>
 <summary>⬇️ Install Node.js/npm (optional for MCP tools)</summary>
 
@@ -97,6 +104,45 @@ OPEN_EDISON_CONFIG_DIR=~/edison-config open-edison run
 
 </details>
 
+<details>
+<summary>🔄 Import from Cursor/VS Code/Claude Code</summary>
+
+### Import from Cursor/VS Code/Claude Code
+
+- **CLI**
+
+  - Import & configure to use edison as your MCP server:
+
+    ```bash
+    # From source (no install)
+    uv run python -m mcp_importer.quick_cli --yes
+    # After install: mcp-importer-quick --yes
+    ```
+
+  - Preview what will be imported (no writes):
+
+    ```bash
+    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 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 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>
+
 <details>
 <summary><img src="https://img.shields.io/badge/Docker-2CA5E0?style=for-the-badge&logo=docker&logoColor=white" alt="Docker"> Run with Docker</summary>
 

{open_edison-0.1.34 → open_edison-0.1.37}/config.json

@@ -59,26 +59,14 @@
         },
         {
             "name": "supabase",
-            "command": "",
-            "args": [],
-            "env": {
-                "SUPABASE_URL": "https://your-supabase-url.supabase.co",
-                "SUPABASE_API_KEY": "your-supabase-api-key",
-                "SUPABASE_DATABASE": "your-database-name"
-            },
-            "enabled": false
-        },
-        {
-            "name": "google_drive",
             "command": "npx",
             "args": [
                 "-y",
-                "@modelcontextprotocol/server-gdrive"
+                "@supabase/mcp-server"
             ],
             "env": {
-                "GOOGLE_CLIENT_ID": "your-client-id",
-                "GOOGLE_CLIENT_SECRET": "your-client-secret",
-                "GOOGLE_REFRESH_TOKEN": "your-refresh-token"
+                "SUPABASE_URL": "https://YOUR_PROJECT.supabase.co",
+                "SUPABASE_ANON_KEY": "your-supabase-anon-key"
             },
             "enabled": false
         },
@@ -93,17 +81,32 @@
             "env": {},
             "enabled": false
         },
+        {
+            "name": "google_drive",
+            "command": "npx",
+            "args": [
+                "-y",
+                "@modelcontextprotocol/server-gdrive"
+            ],
+            "env": {
+                "GOOGLE_CLIENT_ID": "your-client-id",
+                "GOOGLE_CLIENT_SECRET": "your-client-secret",
+                "GOOGLE_REFRESH_TOKEN": "your-refresh-token"
+            },
+            "enabled": false
+        },
         {
             "name": "zapier",
             "command": "npx",
             "args": [
                 "-y",
                 "mcp-remote",
-                "https://mcp.zapier.com/api/mcp/s/{access_token}/mcp"
+                "https://mcp.zapier.com/api/mcp/s/REPLACE_WITH_ACCESS_TOKEN/mcp",
+                "--header",
+                "Accept: application/json, text/event-stream"
             ],
             "env": {},
-            "enabled": false,
-            "roots": []
+            "enabled": false
         }
     ]
 }

{open_edison-0.1.34 → open_edison-0.1.37}/desktop_ext/README.md

@@ -45,23 +45,21 @@ Access to all tools from MCP servers you've configured in Open Edison, such as:
 3. **Go to Settings** → Extensions
 4. **Click "Install Extension"** or drag the `.dxt` file into the window
 5. **Configure your connection**:
-   - **Server URL**: Your Open Edison server MCP API endpoint (e.g., `http://localhost:3001/mcp/call`)
-   - **API Key**: Your Open Edison API key
+   - **Server URL**: Your Open Edison server MCP endpoint (e.g., `http://localhost:3000/mcp/`)
+   - **API Key**: Your Open Edison API key (default for local dev: `dev-api-key-change-me`)
 6. **Click "Install"** when prompted
 7. **Done!** All your Open Edison tools are now available in Claude Desktop
 
-### Server URL Examples
+### Server URL
 
-- **Local development**: `http://localhost:3001/mcp/call`
-- **Remote server**: `https://your-server.com:3001/mcp/call`
-- **Docker deployment**: `http://your-docker-host:3001/mcp/call`
+- `http://localhost:3000/mcp/`
 
 ## Configuration
 
 ### Required Settings
 
-- **Server URL**: The full URL to your Open Edison MCP API endpoint (port 3001 by default)
-- **API Key**: Your authentication key for the Open Edison server (configured in `config.json`)
+- **Server URL**: The full URL to your Open Edison MCP endpoint (`http://localhost:3000/mcp/`)
+- **API Key**: Your authentication key for the Open Edison server (configured in `config.json`; local default `dev-api-key-change-me`)
 
 ### Open Edison Server Setup
 
@@ -71,7 +69,7 @@ Make sure your Open Edison server is running and accessible:
 2. **Configure MCP servers**: Edit `config.json` to add your MCP servers
 3. **Set API key**: Ensure `server.api_key` is set in your `config.json`
 
-Your server should be accessible at `http://localhost:3001` (or your configured host/port).
+Your server should be accessible at `http://localhost:3000`.
 
 ## How It Works
 
@@ -129,10 +127,10 @@ This extension operates securely:
 
 ### Debug Steps
 
-1. **Check server accessibility**: Try accessing `http://localhost:3001/health` in a browser
+1. **Check server accessibility**: Try accessing `http://localhost:3001/health` (management API) in a browser
 2. **Verify API key**: Check the `server.api_key` value in your Open Edison `config.json`
 3. **Check logs**: Look at Claude Desktop logs for connection errors
-4. **Test MCP endpoint**: Use curl to test the `/mcp/call` endpoint
+4. **Test MCP endpoint**: Use curl to test the `/mcp/` endpoint
 
 ### Log Locations
 

{open_edison-0.1.34 → open_edison-0.1.37}/docs/development/contributing.md

@@ -111,7 +111,8 @@ make test
 
 **Standards**:
 
-- **Ruff** for formatting and linting
+- **uv** for formatting (`make format`)
+- **Ruff** for linting (`make lint`)
 - **Type hints** for all function signatures
 - **Docstrings** for public functions and classes
 

{open_edison-0.1.34 → open_edison-0.1.37}/docs/development/development_guide.md

@@ -413,7 +413,7 @@ from src.proxy import MCPProxy
 
 ### Code Style
 
-- Use Ruff for formatting and linting (`make format` and `make lint`)
+- Use uv for formatting (`make format`) and Ruff for linting (`make lint`)
 - Type hints for all function signatures
 - Docstrings for all public functions/classes
 

{open_edison-0.1.34 → open_edison-0.1.37}/hatch_build.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import os
 import shutil
 from pathlib import Path

open_edison-0.1.37/installation_test/README.md

@@ -0,0 +1,18 @@
+# Installation Test (Ubuntu)
+
+This directory contains a Dockerfile that validates the README curl | bash installer on a clean Ubuntu environment.
+
+How it works:
+
+- Uses `ubuntu:24.04`
+- Installs minimal prerequisites (`curl`, `ca-certificates`, etc.)
+- Runs the documented installer: `curl -fsSL https://raw.githubusercontent.com/Edison-Watch/open-edison/main/curl_pipe_bash.sh | bash -s -- -h`
+  - The `-h` flag is forwarded to `open-edison`, so the installer prints help and exits 0, making the Docker build fast and non-interactive.
+
+Build locally:
+
+```bash
+make install_curl_test
+```
+
+If the build completes successfully, the installer path is healthy. If it fails, the build will error and show logs with the failing step (e.g., uv install, Python 3.12, or `uvx open-edison`).

{open_edison-0.1.34 → open_edison-0.1.37}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "open-edison"
-version = "0.1.34"
+version = "0.1.37"
 description = "Open-source MCP security, aggregation, and monitoring. Single-user, self-hosted MCP proxy."
 readme = "README.md"
 authors = [
@@ -28,6 +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"
 
 [build-system]
 requires = ["hatchling"]
@@ -42,14 +44,11 @@ dev-dependencies = [
     "pytest-asyncio>=1.0.0",
     "vulture>=2.11",
     "twine>=5.1.1",
+    "ty>=0.0.1a19",
 ]
 
-[project.optional-dependencies]
-dev = [
-  "ruff>=0.12.3",
-  "pytest>=8.3.3",
-  "pytest-asyncio>=1.0.0",
-]
+ 
+
 
 [tool.hatch.metadata]
 allow-direct-references = true
@@ -119,5 +118,12 @@ reportUnusedFunction = false  # Disable unused function warnings since we have m
 venvPath = ".venv"
 extraPaths = ["src"]
 
+[tool.ty.rules]
+possibly-unresolved-reference = "error"
+index-out-of-bounds = "error"
+
+[tool.ty.src]
+exclude = ["tests/**"]
+
 [tool.vulture]
 exclude = ["tests", "src/frontend_dist"]

open_edison-0.1.37/src/__init__.py

@@ -0,0 +1,8 @@
+"""
+Open Edison Source Package.
+
+Note: Avoid importing heavy submodules at package import time to keep
+packaging/import of light utilities (e.g., mcp_importer) side‑effect free.
+"""
+
+__all__: list[str] = []

{open_edison-0.1.34 → open_edison-0.1.37}/src/cli.py

@@ -4,8 +4,6 @@ CLI entrypoint for Open Edison.
 Provides `open-edison` executable when installed via pip/uvx/pipx.
 """
 
-from __future__ import annotations
-
 import argparse
 import asyncio
 import os
@@ -69,11 +67,6 @@ def _parse_args(argv: list[str] | None = None) -> argparse.Namespace:
         default="interactive",
         help="Source application to import from",
     )
-    sp_import.add_argument(
-        "--project-dir",
-        type=Path,
-        help="When --source=cursor, path to the project containing .cursor/mcp.json",
-    )
     sp_import.add_argument(
         "--config-dir",
         type=Path,
@@ -250,11 +243,6 @@ def main(argv: list[str] | None = None) -> NoReturn:  # noqa: C901
         importer_argv: list[str] = []
         if args.source:
             importer_argv += ["--source", str(args.source)]
-        if getattr(args, "project_dir", None):
-            importer_argv += [
-                "--project-dir",
-                str(Path(args.project_dir).expanduser().resolve()),
-            ]
         if getattr(args, "config_dir", None):
             importer_argv += [
                 "--config-dir",
@@ -262,8 +250,6 @@ def main(argv: list[str] | None = None) -> NoReturn:  # noqa: C901
             ]
         if args.merge:
             importer_argv += ["--merge", str(args.merge)]
-        if bool(getattr(args, "enable_imported", False)):
-            importer_argv += ["--enable-imported"]
         if bool(getattr(args, "dry_run", False)):
             importer_argv += ["--dry-run"]
 

{open_edison-0.1.34 → open_edison-0.1.37}/src/config.py

@@ -142,11 +142,16 @@ class TelemetryConfig:
 def load_json_file(path: Path) -> dict[str, Any]:
     """Load a JSON file from the given path.
     Kept as a separate function because we want to manually clear cache sometimes (update in config)"""
-    log.info(f"Loading configuration from {path}")
+    log.trace(f"Loading configuration from {path}")
     with open(path) as f:
         return json.load(f)
 
 
+def clear_json_file_cache() -> None:
+    """Clear the cache for the given JSON file path"""
+    load_json_file.cache_clear()
+
+
 @dataclass
 class Config:
     """Main configuration class"""

open_edison-0.1.37/src/config.pyi

@@ -0,0 +1,80 @@
+from pathlib import Path
+from typing import Any, overload
+
+# Module constants
+DEFAULT_OTLP_METRICS_ENDPOINT: str
+root_dir: Path
+
+def get_config_dir() -> Path: ...
+def get_config_json_path() -> Path: ...
+
+class ServerConfig:
+    host: str
+    port: int
+    api_key: str
+
+class LoggingConfig:
+    level: str
+    database_path: str
+
+class MCPServerConfig:
+    name: str
+    command: str
+    args: list[str]
+    env: dict[str, str] | None
+    enabled: bool
+    roots: list[str] | None
+    oauth_scopes: list[str] | None
+    oauth_client_name: str | None
+
+    def __init__(
+        self,
+        *,
+        name: str,
+        command: str,
+        args: list[str],
+        env: dict[str, str] | None = None,
+        enabled: bool = True,
+        roots: list[str] | None = None,
+        oauth_scopes: list[str] | None = None,
+        oauth_client_name: str | None = None,
+    ) -> None: ...
+    def is_remote_server(self) -> bool: ...
+    def get_remote_url(self) -> str | None: ...
+
+class TelemetryConfig:
+    enabled: bool
+    otlp_endpoint: str | None
+    headers: dict[str, str] | None
+    export_interval_ms: int
+    def __init__(
+        self,
+        *,
+        enabled: bool = True,
+        otlp_endpoint: str | None = None,
+        headers: dict[str, str] | None = None,
+        export_interval_ms: int = 60000,
+    ) -> None: ...
+
+def load_json_file(path: Path) -> dict[str, Any]: ...
+def clear_json_file_cache() -> None: ...
+
+class Config:
+    @property
+    def version(self) -> str: ...
+    server: ServerConfig
+    logging: LoggingConfig
+    mcp_servers: list[MCPServerConfig]
+    telemetry: TelemetryConfig | None
+    @overload
+    def __init__(self, config_path: Path | None = None) -> None: ...
+    @overload
+    def __init__(
+        self,
+        server: ServerConfig,
+        logging: LoggingConfig,
+        mcp_servers: list[MCPServerConfig],
+        telemetry: TelemetryConfig | None = None,
+    ) -> None: ...
+    def save(self, config_path: Path | None = None) -> None: ...
+    def create_default(self) -> None: ...

{open_edison-0.1.34 → open_edison-0.1.37}/src/events.py

@@ -5,8 +5,6 @@ Provides a simple publisher/subscriber model to stream JSON events to
 connected dashboard clients over Server-Sent Events (SSE).
 """
 
-from __future__ import annotations
-
 import asyncio
 import json
 from collections.abc import AsyncIterator, Callable

open_edison-0.1.37/src/mcp_importer/__init__.py

@@ -0,0 +1,15 @@
+"""MCP importer package for Open Edison scripts.
+
+Import submodules explicitly as needed, e.g. `from mcp_importer import cli`.
+"""
+
+# pyright: reportUnsupportedDunderAll=false
+
+__all__ = [
+    "paths",
+    "parsers",
+    "importers",
+    "merge",
+    "cli",
+    "api",
+]

open_edison-0.1.37/src/mcp_importer/__main__.py

@@ -0,0 +1,19 @@
+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
+
+
+def main() -> int:
+    # Usage:
+    #   python -m mcp_importer            -> import CLI
+    #   python -m mcp_importer export ... -> export CLI
+    if len(sys.argv) > 1 and sys.argv[1] == "export":
+        return export_run_cli(sys.argv[2:])
+    return import_run_cli(sys.argv[1:])
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())

open_edison-0.1.37/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
+
+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,
+            )