mcp-ticketer 0.4.4__py3-none-any.whl → 0.4.8__py3-none-any.whl

mcp_ticketer/__init__.py

@@ -1,17 +1,8 @@
 """MCP Ticketer - Universal ticket management interface."""
 
-from .__version__ import (
-                          __author__,
-                          __author_email__,
-                          __copyright__,
-                          __description__,
-                          __license__,
-                          __title__,
-                          __version__,
-                          __version_info__,
-                          get_user_agent,
-                          get_version,
-)
+from .__version__ import (__author__, __author_email__, __copyright__,
+                          __description__, __license__, __title__, __version__,
+                          __version_info__, get_user_agent, get_version)
 
 __all__ = [
     "__version__",

mcp_ticketer/__version__.py

@@ -1,6 +1,6 @@
 """Version information for mcp-ticketer package."""
 
-__version__ = "0.4.4"
+__version__ = "0.4.8"
 __version_info__ = tuple(int(part) for part in __version__.split("."))
 
 # Package metadata

mcp_ticketer/adapters/aitrackdown.py

@@ -10,15 +10,8 @@ from typing import Any
 from ..core.adapter import BaseAdapter
 
 logger = logging.getLogger(__name__)
-from ..core.models import (
-    Attachment,
-    Comment,
-    Epic,
-    Priority,
-    SearchQuery,
-    Task,
-    TicketState,
-)
+from ..core.models import (Attachment, Comment, Epic, Priority, SearchQuery,
+                           Task, TicketState)
 from ..core.registry import AdapterRegistry
 
 # Import ai-trackdown-pytools when available

mcp_ticketer/adapters/github.py

@@ -9,7 +9,8 @@ import httpx
 
 from ..core.adapter import BaseAdapter
 from ..core.env_loader import load_adapter_config, validate_adapter_config
-from ..core.models import Comment, Epic, Priority, SearchQuery, Task, TicketState
+from ..core.models import (Comment, Epic, Priority, SearchQuery, Task,
+                           TicketState)
 from ..core.registry import AdapterRegistry
 
 

mcp_ticketer/adapters/jira.py

@@ -13,7 +13,8 @@ from httpx import AsyncClient, HTTPStatusError, TimeoutException
 
 from ..core.adapter import BaseAdapter
 from ..core.env_loader import load_adapter_config, validate_adapter_config
-from ..core.models import Comment, Epic, Priority, SearchQuery, Task, TicketState
+from ..core.models import (Comment, Epic, Priority, SearchQuery, Task,
+                           TicketState)
 from ..core.registry import AdapterRegistry
 
 logger = logging.getLogger(__name__)

mcp_ticketer/adapters/linear/adapter.py

@@ -20,27 +20,15 @@ from ...core.adapter import BaseAdapter
 from ...core.models import Comment, Epic, SearchQuery, Task, TicketState
 from ...core.registry import AdapterRegistry
 from .client import LinearGraphQLClient
-from .mappers import (
-    build_linear_issue_input,
-    build_linear_issue_update_input,
-    map_linear_comment_to_comment,
-    map_linear_issue_to_task,
-    map_linear_project_to_epic,
-)
-from .queries import (
-    ALL_FRAGMENTS,
-    CREATE_ISSUE_MUTATION,
-    LIST_ISSUES_QUERY,
-    SEARCH_ISSUES_QUERY,
-    UPDATE_ISSUE_MUTATION,
-    WORKFLOW_STATES_QUERY,
-)
-from .types import (
-    LinearStateMapping,
-    build_issue_filter,
-    get_linear_priority,
-    get_linear_state_type,
-)
+from .mappers import (build_linear_issue_input,
+                      build_linear_issue_update_input,
+                      map_linear_comment_to_comment, map_linear_issue_to_task,
+                      map_linear_project_to_epic)
+from .queries import (ALL_FRAGMENTS, CREATE_ISSUE_MUTATION, LIST_ISSUES_QUERY,
+                      SEARCH_ISSUES_QUERY, UPDATE_ISSUE_MUTATION,
+                      WORKFLOW_STATES_QUERY)
+from .types import (LinearStateMapping, build_issue_filter,
+                    get_linear_priority, get_linear_state_type)
 
 
 class LinearAdapter(BaseAdapter[Task]):
@@ -94,10 +82,25 @@ class LinearAdapter(BaseAdapter[Task]):
                 "Linear API key is required (api_key or LINEAR_API_KEY env var)"
             )
 
-        # Clean API key - remove Bearer prefix if accidentally included in config
-        # (The client will add it back when making requests)
-        if self.api_key.startswith("Bearer "):
-            self.api_key = self.api_key.replace("Bearer ", "")
+        # Clean API key - remove common prefixes if accidentally included in config
+        # (The client will add Bearer back when making requests)
+        if isinstance(self.api_key, str):
+            # Remove Bearer prefix
+            if self.api_key.startswith("Bearer "):
+                self.api_key = self.api_key.replace("Bearer ", "")
+            # Remove environment variable name prefix (e.g., "LINEAR_API_KEY=")
+            if "=" in self.api_key:
+                parts = self.api_key.split("=", 1)
+                if len(parts) == 2 and parts[0].upper() in ("LINEAR_API_KEY", "API_KEY"):
+                    self.api_key = parts[1]
+
+            # Validate API key format (Linear keys start with "lin_api_")
+            if not self.api_key.startswith("lin_api_"):
+                raise ValueError(
+                    f"Invalid Linear API key format. Expected key starting with 'lin_api_', "
+                    f"got: {self.api_key[:15]}... "
+                    f"Please check your configuration and ensure the API key is correct."
+                )
 
         self.workspace = config.get("workspace", "")
         self.team_key = config.get("team_key")

mcp_ticketer/adapters/linear/client.py

@@ -16,7 +16,8 @@ except ImportError:
     HTTPXAsyncTransport = None
     TransportError = Exception
 
-from ...core.exceptions import AdapterError, AuthenticationError, RateLimitError
+from ...core.exceptions import (AdapterError, AuthenticationError,
+                                RateLimitError)
 
 
 class LinearGraphQLClient:

mcp_ticketer/adapters/linear/mappers.py

@@ -6,7 +6,8 @@ from datetime import datetime
 from typing import Any
 
 from ...core.models import Comment, Epic, Priority, Task, TicketState
-from .types import extract_linear_metadata, get_universal_priority, get_universal_state
+from .types import (extract_linear_metadata, get_universal_priority,
+                    get_universal_state)
 
 
 def map_linear_issue_to_task(issue_data: dict[str, Any]) -> Task:

mcp_ticketer/cli/adapter_diagnostics.py

@@ -197,7 +197,8 @@ def _test_adapter_instantiation(console: Console) -> None:
                 if primary:
                     adapter_type = primary.adapter_type
                     # Build config from discovery
-                    from ..mcp.server import _build_adapter_config_from_env_vars
+                    from ..mcp.server import \
+                        _build_adapter_config_from_env_vars
 
                     config = _build_adapter_config_from_env_vars(adapter_type, {})
                 else:
@@ -384,7 +385,8 @@ def get_adapter_status() -> dict[str, Any]:
                     adapter_type = primary.adapter_type
                     status["configuration_source"] = primary.found_in
                     # Build basic config
-                    from ..mcp.server import _build_adapter_config_from_env_vars
+                    from ..mcp.server import \
+                        _build_adapter_config_from_env_vars
 
                     config = _build_adapter_config_from_env_vars(adapter_type, {})
                 else:

mcp_ticketer/cli/auggie_configure.py

@@ -10,7 +10,8 @@ from typing import Any
 
 from rich.console import Console
 
-from .mcp_configure import find_mcp_ticketer_binary, load_project_config
+from .mcp_configure import load_project_config
+from .python_detection import get_mcp_ticketer_python
 
 console = Console()
 
@@ -71,13 +72,14 @@ def save_auggie_config(config_path: Path, config: dict[str, Any]) -> None:
 
 
 def create_auggie_server_config(
-    binary_path: str, project_config: dict[str, Any]
+    python_path: str, project_config: dict[str, Any], project_path: str | None = None
 ) -> dict[str, Any]:
     """Create Auggie MCP server configuration for mcp-ticketer.
 
     Args:
-        binary_path: Path to mcp-ticketer binary
+        python_path: Path to Python executable in mcp-ticketer venv
         project_config: Project configuration from .mcp-ticketer/config.json
+        project_path: Project directory path (optional)
 
     Returns:
         Auggie MCP server configuration dict
@@ -91,6 +93,10 @@ def create_auggie_server_config(
     # Build environment variables
     env_vars = {}
 
+    # Add PYTHONPATH for project context
+    if project_path:
+        env_vars["PYTHONPATH"] = project_path
+
     # Add adapter type
     env_vars["MCP_TICKETER_ADAPTER"] = adapter
 
@@ -128,10 +134,15 @@ def create_auggie_server_config(
         if "project_key" in adapter_config:
             env_vars["JIRA_PROJECT_KEY"] = adapter_config["project_key"]
 
+    # Use module invocation pattern: python -m mcp_ticketer.mcp.server
+    args = ["-m", "mcp_ticketer.mcp.server"]
+    if project_path:
+        args.append(project_path)
+
     # Create server configuration (simpler than Gemini - no timeout/trust)
     config = {
-        "command": binary_path,
-        "args": ["serve"],
+        "command": python_path,
+        "args": args,
         "env": env_vars,
     }
 
@@ -214,18 +225,22 @@ def configure_auggie_mcp(force: bool = False) -> None:
         force: Overwrite existing configuration
 
     Raises:
-        FileNotFoundError: If binary or project config not found
+        FileNotFoundError: If Python executable or project config not found
         ValueError: If configuration is invalid
 
     """
-    # Step 1: Find mcp-ticketer binary
-    console.print("[cyan]🔍 Finding mcp-ticketer binary...[/cyan]")
+    # Step 1: Find Python executable
+    console.print("[cyan]🔍 Finding mcp-ticketer Python executable...[/cyan]")
     try:
-        binary_path = find_mcp_ticketer_binary()
-        console.print(f"[green]✓[/green] Found: {binary_path}")
-    except FileNotFoundError as e:
-        console.print(f"[red]✗[/red] {e}")
-        raise
+        python_path = get_mcp_ticketer_python()
+        console.print(f"[green]✓[/green] Found: {python_path}")
+    except Exception as e:
+        console.print(f"[red]✗[/red] Could not find Python executable: {e}")
+        raise FileNotFoundError(
+            "Could not find mcp-ticketer Python executable. "
+            "Please ensure mcp-ticketer is installed.\n"
+            "Install with: pip install mcp-ticketer or pipx install mcp-ticketer"
+        )
 
     # Step 2: Load project configuration
     console.print("\n[cyan]📖 Reading project configuration...[/cyan]")
@@ -259,8 +274,11 @@ def configure_auggie_mcp(force: bool = False) -> None:
             console.print("[yellow]⚠ Overwriting existing configuration[/yellow]")
 
     # Step 6: Create mcp-ticketer server config
+    project_path = str(Path.cwd())
     server_config = create_auggie_server_config(
-        binary_path=binary_path, project_config=project_config
+        python_path=python_path,
+        project_config=project_config,
+        project_path=project_path,
     )
 
     # Step 7: Update Auggie configuration
@@ -279,8 +297,10 @@ def configure_auggie_mcp(force: bool = False) -> None:
         console.print("\n[bold]Configuration Details:[/bold]")
         console.print("  Server name: mcp-ticketer")
         console.print(f"  Adapter: {adapter}")
-        console.print(f"  Binary: {binary_path}")
+        console.print(f"  Python: {python_path}")
+        console.print("  Command: python -m mcp_ticketer.mcp.server")
         console.print("  Scope: Global (affects all projects)")
+        console.print(f"  Project path: {project_path}")
         if "env" in server_config:
             console.print(
                 f"  Environment variables: {list(server_config['env'].keys())}"

mcp_ticketer/cli/codex_configure.py

@@ -4,19 +4,15 @@ Codex CLI only supports global configuration at ~/.codex/config.toml.
 Unlike Claude Code and Gemini CLI, there is no project-level configuration support.
 """
 
-import sys
+import tomllib
 from pathlib import Path
 from typing import Any
 
-if sys.version_info >= (3, 11):
-    import tomllib
-else:
-    import tomli as tomllib
-
 import tomli_w
 from rich.console import Console
 
-from .mcp_configure import find_mcp_ticketer_binary, load_project_config
+from .mcp_configure import load_project_config
+from .python_detection import get_mcp_ticketer_python
 
 console = Console()
 
@@ -78,14 +74,14 @@ def save_codex_config(config_path: Path, config: dict[str, Any]) -> None:
 
 
 def create_codex_server_config(
-    binary_path: str, project_config: dict, cwd: str | None = None
+    python_path: str, project_config: dict, project_path: str | None = None
 ) -> dict[str, Any]:
     """Create Codex MCP server configuration for mcp-ticketer.
 
     Args:
-        binary_path: Path to mcp-ticketer binary
+        python_path: Path to Python executable in mcp-ticketer venv
         project_config: Project configuration from .mcp-ticketer/config.json
-        cwd: Working directory for server (optional, not used for global config)
+        project_path: Project directory path (optional, not used for global config)
 
     Returns:
         Codex MCP server configuration dict
@@ -99,9 +95,9 @@ def create_codex_server_config(
     # Build environment variables
     env_vars: dict[str, str] = {}
 
-    # Add PYTHONPATH if running from development environment
-    if cwd:
-        env_vars["PYTHONPATH"] = str(Path(cwd) / "src")
+    # Add PYTHONPATH for project context
+    if project_path:
+        env_vars["PYTHONPATH"] = project_path
 
     # Add adapter type
     env_vars["MCP_TICKETER_ADAPTER"] = adapter
@@ -110,9 +106,9 @@ def create_codex_server_config(
     if adapter == "aitrackdown":
         # Set base path for local adapter
         base_path = adapter_config.get("base_path", ".aitrackdown")
-        if cwd:
-            # Use absolute path if cwd is provided
-            env_vars["MCP_TICKETER_BASE_PATH"] = str(Path(cwd) / base_path)
+        if project_path:
+            # Use absolute path if project_path is provided
+            env_vars["MCP_TICKETER_BASE_PATH"] = str(Path(project_path) / base_path)
         else:
             env_vars["MCP_TICKETER_BASE_PATH"] = base_path
 
@@ -140,11 +136,15 @@ def create_codex_server_config(
         if "project_key" in adapter_config:
             env_vars["JIRA_PROJECT_KEY"] = adapter_config["project_key"]
 
+    # Use module invocation pattern: python -m mcp_ticketer.mcp.server
+    args = ["-m", "mcp_ticketer.mcp.server"]
+    if project_path:
+        args.append(project_path)
+
     # Create server configuration with Codex-specific structure
-    # NOTE: Codex uses nested dict structure for env vars
     config: dict[str, Any] = {
-        "command": binary_path,
-        "args": ["serve"],
+        "command": python_path,
+        "args": args,
         "env": env_vars,
     }
 
@@ -231,18 +231,22 @@ def configure_codex_mcp(force: bool = False) -> None:
         force: Overwrite existing configuration
 
     Raises:
-        FileNotFoundError: If binary or project config not found
+        FileNotFoundError: If Python executable or project config not found
         ValueError: If configuration is invalid
 
     """
-    # Step 1: Find mcp-ticketer binary
-    console.print("[cyan]🔍 Finding mcp-ticketer binary...[/cyan]")
+    # Step 1: Find Python executable
+    console.print("[cyan]🔍 Finding mcp-ticketer Python executable...[/cyan]")
     try:
-        binary_path = find_mcp_ticketer_binary()
-        console.print(f"[green]✓[/green] Found: {binary_path}")
-    except FileNotFoundError as e:
-        console.print(f"[red]✗[/red] {e}")
-        raise
+        python_path = get_mcp_ticketer_python()
+        console.print(f"[green]✓[/green] Found: {python_path}")
+    except Exception as e:
+        console.print(f"[red]✗[/red] Could not find Python executable: {e}")
+        raise FileNotFoundError(
+            "Could not find mcp-ticketer Python executable. "
+            "Please ensure mcp-ticketer is installed.\n"
+            "Install with: pip install mcp-ticketer or pipx install mcp-ticketer"
+        )
 
     # Step 2: Load project configuration
     console.print("\n[cyan]📖 Reading project configuration...[/cyan]")
@@ -279,9 +283,11 @@ def configure_codex_mcp(force: bool = False) -> None:
 
     # Step 6: Create mcp-ticketer server config
     # For global config, include current working directory for context
-    cwd = str(Path.cwd())
+    project_path = str(Path.cwd())
     server_config = create_codex_server_config(
-        binary_path=binary_path, project_config=project_config, cwd=cwd
+        python_path=python_path,
+        project_config=project_config,
+        project_path=project_path,
     )
 
     # Step 7: Update Codex configuration
@@ -300,9 +306,10 @@ def configure_codex_mcp(force: bool = False) -> None:
         console.print("\n[bold]Configuration Details:[/bold]")
         console.print("  Server name: mcp-ticketer")
         console.print(f"  Adapter: {adapter}")
-        console.print(f"  Binary: {binary_path}")
+        console.print(f"  Python: {python_path}")
+        console.print("  Command: python -m mcp_ticketer.mcp.server")
         console.print("  Scope: global (Codex only supports global config)")
-        console.print(f"  Working directory: {cwd}")
+        console.print(f"  Project path: {project_path}")
         if "env" in server_config:
             console.print(
                 f"  Environment variables: {list(server_config['env'].keys())}"

mcp_ticketer/cli/configure.py

@@ -8,15 +8,9 @@ from rich.panel import Panel
 from rich.prompt import Confirm, Prompt
 from rich.table import Table
 
-from ..core.project_config import (
-    AdapterConfig,
-    AdapterType,
-    ConfigResolver,
-    ConfigValidator,
-    HybridConfig,
-    SyncStrategy,
-    TicketerConfig,
-)
+from ..core.project_config import (AdapterConfig, AdapterType, ConfigResolver,
+                                   ConfigValidator, HybridConfig, SyncStrategy,
+                                   TicketerConfig)
 
 console = Console()
 

mcp_ticketer/cli/discover.py

@@ -6,12 +6,8 @@ import typer
 from rich.console import Console
 
 from ..core.env_discovery import DiscoveredAdapter, EnvDiscovery
-from ..core.project_config import (
-    AdapterConfig,
-    ConfigResolver,
-    ConfigValidator,
-    TicketerConfig,
-)
+from ..core.project_config import (AdapterConfig, ConfigResolver,
+                                   ConfigValidator, TicketerConfig)
 
 console = Console()
 app = typer.Typer(help="Auto-discover configuration from .env files")

mcp_ticketer/cli/gemini_configure.py

@@ -6,7 +6,8 @@ from typing import Literal
 
 from rich.console import Console
 
-from .mcp_configure import find_mcp_ticketer_binary, load_project_config
+from .mcp_configure import load_project_config
+from .python_detection import get_mcp_ticketer_python
 
 console = Console()
 
@@ -73,14 +74,14 @@ def save_gemini_config(config_path: Path, config: dict) -> None:
 
 
 def create_gemini_server_config(
-    binary_path: str, project_config: dict, cwd: str | None = None
+    python_path: str, project_config: dict, project_path: str | None = None
 ) -> dict:
     """Create Gemini MCP server configuration for mcp-ticketer.
 
     Args:
-        binary_path: Path to mcp-ticketer binary
+        python_path: Path to Python executable in mcp-ticketer venv
         project_config: Project configuration from .mcp-ticketer/config.json
-        cwd: Working directory for server (optional)
+        project_path: Project directory path (optional)
 
     Returns:
         Gemini MCP server configuration dict
@@ -94,9 +95,9 @@ def create_gemini_server_config(
     # Build environment variables
     env_vars = {}
 
-    # Add PYTHONPATH if running from development environment
-    if cwd:
-        env_vars["PYTHONPATH"] = str(Path(cwd) / "src")
+    # Add PYTHONPATH for project context
+    if project_path:
+        env_vars["PYTHONPATH"] = project_path
 
     # Add adapter type
     env_vars["MCP_TICKETER_ADAPTER"] = adapter
@@ -105,9 +106,9 @@ def create_gemini_server_config(
     if adapter == "aitrackdown":
         # Set base path for local adapter
         base_path = adapter_config.get("base_path", ".aitrackdown")
-        if cwd:
-            # Use absolute path if cwd is provided
-            env_vars["MCP_TICKETER_BASE_PATH"] = str(Path(cwd) / base_path)
+        if project_path:
+            # Use absolute path if project_path is provided
+            env_vars["MCP_TICKETER_BASE_PATH"] = str(Path(project_path) / base_path)
         else:
             env_vars["MCP_TICKETER_BASE_PATH"] = base_path
 
@@ -135,10 +136,15 @@ def create_gemini_server_config(
         if "project_key" in adapter_config:
             env_vars["JIRA_PROJECT_KEY"] = adapter_config["project_key"]
 
+    # Use module invocation pattern: python -m mcp_ticketer.mcp.server
+    args = ["-m", "mcp_ticketer.mcp.server"]
+    if project_path:
+        args.append(project_path)
+
     # Create server configuration with Gemini-specific options
     config = {
-        "command": binary_path,
-        "args": ["serve"],
+        "command": python_path,
+        "args": args,
         "env": env_vars,
         "timeout": 15000,  # 15 seconds timeout
         "trust": False,  # Don't trust by default (security)
@@ -223,18 +229,22 @@ def configure_gemini_mcp(
         force: Overwrite existing configuration
 
     Raises:
-        FileNotFoundError: If binary or project config not found
+        FileNotFoundError: If Python executable or project config not found
         ValueError: If configuration is invalid
 
     """
-    # Step 1: Find mcp-ticketer binary
-    console.print("[cyan]🔍 Finding mcp-ticketer binary...[/cyan]")
+    # Step 1: Find Python executable
+    console.print("[cyan]🔍 Finding mcp-ticketer Python executable...[/cyan]")
     try:
-        binary_path = find_mcp_ticketer_binary()
-        console.print(f"[green]✓[/green] Found: {binary_path}")
-    except FileNotFoundError as e:
-        console.print(f"[red]✗[/red] {e}")
-        raise
+        python_path = get_mcp_ticketer_python()
+        console.print(f"[green]✓[/green] Found: {python_path}")
+    except Exception as e:
+        console.print(f"[red]✗[/red] Could not find Python executable: {e}")
+        raise FileNotFoundError(
+            "Could not find mcp-ticketer Python executable. "
+            "Please ensure mcp-ticketer is installed.\n"
+            "Install with: pip install mcp-ticketer or pipx install mcp-ticketer"
+        )
 
     # Step 2: Load project configuration
     console.print("\n[cyan]📖 Reading project configuration...[/cyan]")
@@ -266,9 +276,11 @@ def configure_gemini_mcp(
             console.print("[yellow]⚠ Overwriting existing configuration[/yellow]")
 
     # Step 6: Create mcp-ticketer server config
-    cwd = str(Path.cwd()) if scope == "project" else None
+    project_path = str(Path.cwd()) if scope == "project" else None
     server_config = create_gemini_server_config(
-        binary_path=binary_path, project_config=project_config, cwd=cwd
+        python_path=python_path,
+        project_config=project_config,
+        project_path=project_path,
     )
 
     # Step 7: Update Gemini configuration
@@ -287,11 +299,12 @@ def configure_gemini_mcp(
         console.print("\n[bold]Configuration Details:[/bold]")
         console.print("  Server name: mcp-ticketer")
         console.print(f"  Adapter: {adapter}")
-        console.print(f"  Binary: {binary_path}")
+        console.print(f"  Python: {python_path}")
+        console.print("  Command: python -m mcp_ticketer.mcp.server")
         console.print(f"  Timeout: {server_config['timeout']}ms")
         console.print(f"  Trust: {server_config['trust']}")
-        if cwd:
-            console.print(f"  Working directory: {cwd}")
+        if project_path:
+            console.print(f"  Project path: {project_path}")
         if "env" in server_config:
             console.print(
                 f"  Environment variables: {list(server_config['env'].keys())}"

mcp_ticketer/cli/main.py

@@ -20,7 +20,8 @@ from ..core.models import Comment, SearchQuery
 from ..queue import Queue, QueueStatus, WorkerManager
 from ..queue.health_monitor import HealthStatus, QueueHealthMonitor
 from ..queue.ticket_registry import TicketRegistry
-from .configure import configure_wizard, set_adapter_config, show_current_config
+from .configure import (configure_wizard, set_adapter_config,
+                        show_current_config)
 from .diagnostics import run_diagnostics
 from .discover import app as discover_app
 from .migrate_config import migrate_config_command
@@ -575,7 +576,7 @@ def init(
         )
 
         # First try our improved .env configuration loader
-        from ..mcp.server import _load_env_configuration
+        from ..mcp.server.main import _load_env_configuration
 
         env_config = _load_env_configuration()
 
@@ -2225,7 +2226,7 @@ def mcp_serve(
         adapter_config = adapters_config.get(adapter_type, {})
     else:
         # Priority 2: .env files
-        from ..mcp.server import _load_env_configuration
+        from ..mcp.server.main import _load_env_configuration
 
         env_config = _load_env_configuration()
         if env_config: