mcp-ticketer 0.1.39__py3-none-any.whl → 0.3.0__py3-none-any.whl

mcp_ticketer/mcp/server.py

@@ -1652,56 +1652,191 @@ async def main():
     # Load configuration
     import json
     import logging
+    import os
     from pathlib import Path
 
     logger = logging.getLogger(__name__)
 
-    # ONLY read from project-local config, never from user home
-    config_file = Path.cwd() / ".mcp-ticketer" / "config.json"
-    if config_file.exists():
-        # Validate config is within project
-        try:
-            if not config_file.resolve().is_relative_to(Path.cwd().resolve()):
-                logger.error(
-                    f"Security violation: Config file {config_file} "
-                    "is not within project directory"
-                )
-                raise ValueError(
-                    f"Security violation: Config file {config_file} "
-                    "is not within project directory"
-                )
-        except (ValueError, RuntimeError):
-            # is_relative_to may raise ValueError in some cases
-            pass
+    # Initialize defaults
+    adapter_type = "aitrackdown"
+    adapter_config = {"base_path": ".aitrackdown"}
+
+    # Priority 1: Check .env files (highest priority for MCP)
+    env_config = _load_env_configuration()
+    if env_config and env_config.get("adapter_type"):
+        adapter_type = env_config["adapter_type"]
+        adapter_config = env_config["adapter_config"]
+        logger.info(f"Using adapter from .env files: {adapter_type}")
+        logger.info(f"Built adapter config from .env: {list(adapter_config.keys())}")
+    else:
+        # Priority 2: Check project-local config file
+        config_file = Path.cwd() / ".mcp-ticketer" / "config.json"
+        if config_file.exists():
+            # Validate config is within project
+            try:
+                if not config_file.resolve().is_relative_to(Path.cwd().resolve()):
+                    logger.error(
+                        f"Security violation: Config file {config_file} "
+                        "is not within project directory"
+                    )
+                    raise ValueError(
+                        f"Security violation: Config file {config_file} "
+                        "is not within project directory"
+                    )
+            except (ValueError, RuntimeError):
+                # is_relative_to may raise ValueError in some cases
+                pass
 
-        try:
-            with open(config_file) as f:
-                config = json.load(f)
-                adapter_type = config.get("default_adapter", "aitrackdown")
-                # Get adapter-specific config
-                adapters_config = config.get("adapters", {})
-                adapter_config = adapters_config.get(adapter_type, {})
-                # Fallback to legacy config format
-                if not adapter_config and "config" in config:
-                    adapter_config = config["config"]
-                logger.info(
-                    f"Loaded MCP configuration from project-local: {config_file}"
-                )
-        except (OSError, json.JSONDecodeError) as e:
-            logger.warning(f"Could not load project config: {e}, using defaults")
+            try:
+                with open(config_file) as f:
+                    config = json.load(f)
+                    adapter_type = config.get("default_adapter", "aitrackdown")
+                    # Get adapter-specific config
+                    adapters_config = config.get("adapters", {})
+                    adapter_config = adapters_config.get(adapter_type, {})
+                    # Fallback to legacy config format
+                    if not adapter_config and "config" in config:
+                        adapter_config = config["config"]
+                    logger.info(
+                        f"Loaded MCP configuration from project-local: {config_file}"
+                    )
+            except (OSError, json.JSONDecodeError) as e:
+                logger.warning(f"Could not load project config: {e}, using defaults")
+                adapter_type = "aitrackdown"
+                adapter_config = {"base_path": ".aitrackdown"}
+        else:
+            # Priority 3: Default to aitrackdown
+            logger.info("No configuration found, defaulting to aitrackdown adapter")
             adapter_type = "aitrackdown"
             adapter_config = {"base_path": ".aitrackdown"}
-    else:
-        # Default to aitrackdown with local base path
-        logger.info("No project-local config found, defaulting to aitrackdown adapter")
-        adapter_type = "aitrackdown"
-        adapter_config = {"base_path": ".aitrackdown"}
+
+    # Log final configuration for debugging
+    logger.info(f"Starting MCP server with adapter: {adapter_type}")
+    logger.debug(f"Adapter config keys: {list(adapter_config.keys())}")
 
     # Create and run server
     server = MCPTicketServer(adapter_type, adapter_config)
     await server.run()
 
 
+def _load_env_configuration() -> Optional[dict[str, Any]]:
+    """Load adapter configuration from .env files.
+
+    Checks .env.local first (highest priority), then .env.
+
+    Returns:
+        Dictionary with 'adapter_type' and 'adapter_config' keys, or None if no config found
+    """
+    from pathlib import Path
+
+    # Check for .env files in order of preference
+    env_files = [".env.local", ".env"]
+    env_vars = {}
+
+    for env_file in env_files:
+        env_path = Path.cwd() / env_file
+        if env_path.exists():
+            try:
+                # Parse .env file manually to avoid external dependencies
+                with open(env_path, 'r') as f:
+                    for line in f:
+                        line = line.strip()
+                        if line and not line.startswith('#') and '=' in line:
+                            key, value = line.split('=', 1)
+                            key = key.strip()
+                            value = value.strip().strip('"').strip("'")
+                            if value:  # Only add non-empty values
+                                env_vars[key] = value
+            except Exception:
+                continue
+
+    if not env_vars:
+        return None
+
+    # Determine adapter type and build config
+    adapter_type = env_vars.get("MCP_TICKETER_ADAPTER")
+    if not adapter_type:
+        # Auto-detect based on available keys
+        if any(key.startswith("LINEAR_") for key in env_vars):
+            adapter_type = "linear"
+        elif any(key.startswith("GITHUB_") for key in env_vars):
+            adapter_type = "github"
+        elif any(key.startswith("JIRA_") for key in env_vars):
+            adapter_type = "jira"
+        else:
+            return None
+
+    # Build adapter-specific configuration
+    adapter_config = _build_adapter_config_from_env_vars(adapter_type, env_vars)
+
+    if not adapter_config:
+        return None
+
+    return {
+        "adapter_type": adapter_type,
+        "adapter_config": adapter_config
+    }
+
+
+def _build_adapter_config_from_env_vars(adapter_type: str, env_vars: dict[str, str]) -> dict[str, Any]:
+    """Build adapter configuration from parsed environment variables.
+
+    Args:
+        adapter_type: Type of adapter to configure
+        env_vars: Dictionary of environment variables from .env files
+
+    Returns:
+        Dictionary of adapter configuration
+    """
+    config = {}
+
+    if adapter_type == "linear":
+        # Linear adapter configuration
+        if env_vars.get("LINEAR_API_KEY"):
+            config["api_key"] = env_vars["LINEAR_API_KEY"]
+        if env_vars.get("LINEAR_TEAM_ID"):
+            config["team_id"] = env_vars["LINEAR_TEAM_ID"]
+        if env_vars.get("LINEAR_TEAM_KEY"):
+            config["team_key"] = env_vars["LINEAR_TEAM_KEY"]
+        if env_vars.get("LINEAR_API_URL"):
+            config["api_url"] = env_vars["LINEAR_API_URL"]
+
+    elif adapter_type == "github":
+        # GitHub adapter configuration
+        if env_vars.get("GITHUB_TOKEN"):
+            config["token"] = env_vars["GITHUB_TOKEN"]
+        if env_vars.get("GITHUB_OWNER"):
+            config["owner"] = env_vars["GITHUB_OWNER"]
+        if env_vars.get("GITHUB_REPO"):
+            config["repo"] = env_vars["GITHUB_REPO"]
+
+    elif adapter_type == "jira":
+        # JIRA adapter configuration
+        if env_vars.get("JIRA_SERVER"):
+            config["server"] = env_vars["JIRA_SERVER"]
+        if env_vars.get("JIRA_EMAIL"):
+            config["email"] = env_vars["JIRA_EMAIL"]
+        if env_vars.get("JIRA_API_TOKEN"):
+            config["api_token"] = env_vars["JIRA_API_TOKEN"]
+        if env_vars.get("JIRA_PROJECT_KEY"):
+            config["project_key"] = env_vars["JIRA_PROJECT_KEY"]
+
+    elif adapter_type == "aitrackdown":
+        # AITrackdown adapter configuration
+        base_path = env_vars.get("MCP_TICKETER_BASE_PATH", ".aitrackdown")
+        config["base_path"] = base_path
+        config["auto_create_dirs"] = True
+
+    # Add any generic overrides
+    if env_vars.get("MCP_TICKETER_API_KEY"):
+        config["api_key"] = env_vars["MCP_TICKETER_API_KEY"]
+
+    return config
+
+
+
+
+
 # Add diagnostic handler methods to MCPTicketServer class
 async def _handle_system_health(self, arguments: dict[str, Any]) -> dict[str, Any]:
     """Handle system health check."""

{mcp_ticketer-0.1.39.dist-info → mcp_ticketer-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-ticketer
-Version: 0.1.39
+Version: 0.3.0
 Summary: Universal ticket management interface for AI agents with MCP support
 Author-email: MCP Ticketer Team <support@mcp-ticketer.io>
 Maintainer-email: MCP Ticketer Team <support@mcp-ticketer.io>

{mcp_ticketer-0.1.39.dist-info → mcp_ticketer-0.3.0.dist-info}/RECORD

@@ -1,15 +1,22 @@
 mcp_ticketer/__init__.py,sha256=Xx4WaprO5PXhVPbYi1L6tBmwmJMkYS-lMyG4ieN6QP0,717
-mcp_ticketer/__version__.py,sha256=RcgpUO8aLxkc0dVDN1OI3liNLe1LdvT5ar10c-XmM8E,1118
+mcp_ticketer/__version__.py,sha256=GoFXSWeevjribCSU_VeE2nxxgWFRp71QCl67iMs_z50,1117
 mcp_ticketer/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_ticketer/adapters/__init__.py,sha256=B5DFllWn23hkhmrLykNO5uMMSdcFuuPHXyLw_jyFzuE,358
 mcp_ticketer/adapters/aitrackdown.py,sha256=stlbge8K6w-EyQkw_vEQNSXQgCOWN5tOlQUgGWZQNMQ,17936
 mcp_ticketer/adapters/github.py,sha256=rhf8yaK9vOGMstvFwddguWnokVIfpasoYMBlyjNg_vY,47335
 mcp_ticketer/adapters/hybrid.py,sha256=UADYZLc_UNw0xHPSbgguBNzvUCnuYn12Qi9ea-zdlMk,19086
 mcp_ticketer/adapters/jira.py,sha256=IoyMaznYE7NliaNGv-I_q2UodUS6JhOllLP1gUEXThs,35375
-mcp_ticketer/adapters/linear.py,sha256=Ze_DqmFoKvHFIjHYiAMX7LViumQu0wyKgThWWOfV3Do,75906
+mcp_ticketer/adapters/linear.py,sha256=fcQ9s_V7IgP4z2K12lbWXYHUVs1avu1uzUzDCK2eEg4,552
+mcp_ticketer/adapters/linear/__init__.py,sha256=dOPx6caymloIsdyjxS33E09gfPQS6kprisDWwOT2-bE,735
+mcp_ticketer/adapters/linear/adapter.py,sha256=emvjHU-NSFVdxS7lxRjcTv6QNxn26-8RbZNg-x-z5xE,26641
+mcp_ticketer/adapters/linear/client.py,sha256=6IKgYRNy0GF6MhXwxaEBeBE2FM-d1WfhOQ43Mhj0-3s,8871
+mcp_ticketer/adapters/linear/mappers.py,sha256=96euA9TuOTEWEPDKvixjYHb82Ha1zD6gxuo9VsLT2wA,9636
+mcp_ticketer/adapters/linear/queries.py,sha256=chcHCHqvyQbKHPp9wWHGo3HdUGV_6RHNdRadP2pZkVQ,7112
+mcp_ticketer/adapters/linear/types.py,sha256=VuGPu1Z5jGHtbI2zkCyL5YFnwQNukGW-UV72k6zF0p4,8097
 mcp_ticketer/cache/__init__.py,sha256=Xcd-cKnt-Cx7jBzvfzUUUPaGkmyXFi5XUFWw3Z4b7d4,138
 mcp_ticketer/cache/memory.py,sha256=2yBqGi9i0SanlUhJoOC7nijWjoMa3_ntPe-V-AV-LfU,5042
 mcp_ticketer/cli/__init__.py,sha256=l9Q8iKmfGkTu0cssHBVqNZTsL4eAtFzOB25AED_0G6g,89
+mcp_ticketer/cli/adapter_diagnostics.py,sha256=t7RyesBRSyJBoVvft2scdNRcugJDIWvqYS9NszPV5ok,14820
 mcp_ticketer/cli/auggie_configure.py,sha256=MXKzLtqe3K_UTQ2GacHAWbvf_B0779KL325smiAKE0Q,8212
 mcp_ticketer/cli/codex_configure.py,sha256=xDppHouT6_-cYXswyAggoPX5bSlRXMvCoM_x9PQ-42A,9086
 mcp_ticketer/cli/configure.py,sha256=BsA_pSHQMQS0t1bJO_wMM8LWsd5sWJDASjEPRHvwC18,16198
@@ -17,7 +24,7 @@ mcp_ticketer/cli/diagnostics.py,sha256=AC7cMQHVWdHfrYH2Y1tkhmRezM2-mID5E_Dhfil7F
 mcp_ticketer/cli/discover.py,sha256=AF_qlQc1Oo0UkWayoF5pmRChS5J3fJjH6f2YZzd_k8w,13188
 mcp_ticketer/cli/gemini_configure.py,sha256=ZNSA1lBW-itVToza-JxW95Po7daVXKiZAh7lp6pmXMU,9343
 mcp_ticketer/cli/linear_commands.py,sha256=b5v4c9uBNPwj_vdy314JkLZbyC1fXU6IcY2VoG0z7gI,17193
-mcp_ticketer/cli/main.py,sha256=9e83BCxds9AESIYueK1VjeJ96H7AvRbvPiMYwd4EeKs,62258
+mcp_ticketer/cli/main.py,sha256=EK2MgphV1Anw_vAtkTl5iC-vzPWIOyu3SV7zOTAY_Vw,72131
 mcp_ticketer/cli/mcp_configure.py,sha256=RzV50UjXgOmvMp-9S0zS39psuvjffVByaMrqrUaAGAM,9594
 mcp_ticketer/cli/migrate_config.py,sha256=MYsr_C5ZxsGg0P13etWTWNrJ_lc6ElRCkzfQADYr3DM,5956
 mcp_ticketer/cli/queue_commands.py,sha256=mm-3H6jmkUGJDyU_E46o9iRpek8tvFCm77F19OtHiZI,7884
@@ -28,13 +35,14 @@ mcp_ticketer/core/adapter.py,sha256=q64LxOInIno7EIbmuxItf8KEsd-g9grCs__Z4uwZHto,
 mcp_ticketer/core/config.py,sha256=hvn8RoN2BSmYzESKqCvcpKleX0PrGiHVQ5v35nX12Mc,19241
 mcp_ticketer/core/env_discovery.py,sha256=It62C97UBt96CgVbZCql5NQtONmCHMkX3c8W2kEl-Qk,18716
 mcp_ticketer/core/env_loader.py,sha256=fX8EpHcAJxxhPJ-XY5BD8HlLs-Y9jdlQ24Qtt5ylBNo,12032
+mcp_ticketer/core/exceptions.py,sha256=78tzV3Muc7E_UhEIByF0NtsPe1I0lFVrbpdDNX56kQg,3737
 mcp_ticketer/core/http_client.py,sha256=s5ikMiwEJ8TJjNn73wu3gv3OdAtyBEpAqPnSroRMW2k,13971
 mcp_ticketer/core/mappers.py,sha256=1aG1jFsHTCwmGRVgOlXW-VOSTGzc86gv7qjDfiR1ups,17462
 mcp_ticketer/core/models.py,sha256=a_2AbL3NlN0pfdZad-hXus_zb4bSi9zISHcsNYl0sng,12486
 mcp_ticketer/core/project_config.py,sha256=yYxlgxjcEPeOwx-b-SXFpe0k9pW9xzBRAK72PsItG-o,23346
 mcp_ticketer/core/registry.py,sha256=ShYLDPE62KFJpB0kj_zFyQzRxSH3LkQEEuo1jaakb1k,3483
 mcp_ticketer/mcp/__init__.py,sha256=Y05eTzsPk0wH8yKNIM-ekpGjgSDO0bQr0EME-vOP4GE,123
-mcp_ticketer/mcp/server.py,sha256=vs0WR9_KhDaYyhrkbTuTsEThT0bMj6gwuFmAxmzCxwU,76377
+mcp_ticketer/mcp/server.py,sha256=PCNerYqLMq5et3ZYAIdd_q_-4LGLBhDuvPAYTuWxDiQ,81351
 mcp_ticketer/queue/__init__.py,sha256=1YIaCpZpFqPcqvDEQXiEvDLiw94DXRdCJkBaVIFQrms,231
 mcp_ticketer/queue/__main__.py,sha256=gc_tE9NUdK07OJfTZuD4t6KeBD_vxFQIhknGTQUG_jk,109
 mcp_ticketer/queue/health_monitor.py,sha256=aQrlBzfbLWu8-fV2b5CuHs4oqyTqGGcntKIHM3r-dDI,11844
@@ -43,9 +51,9 @@ mcp_ticketer/queue/queue.py,sha256=jSAkYNEIbNH1cbYuF8s6eFuZmXqn8WHXx3mbfMU2Ud8,1
 mcp_ticketer/queue/run_worker.py,sha256=F7anuhdkgZF9lXZntHuJ7rEzuEkAfAZO1qvGh3R57bw,1033
 mcp_ticketer/queue/ticket_registry.py,sha256=k8FYg2cFYsI4POb94-o-fTrIVr-ttfi60r0O5YhJYck,15321
 mcp_ticketer/queue/worker.py,sha256=zXJpyhRJ99be0VLaez3YPtC9OU17vVNu5qhr1dCGaLg,19992
-mcp_ticketer-0.1.39.dist-info/licenses/LICENSE,sha256=KOVrunjtILSzY-2N8Lqa3-Q8dMaZIG4LrlLTr9UqL08,1073
-mcp_ticketer-0.1.39.dist-info/METADATA,sha256=K3lSazYkpXThzS7r5FdBZpyqN6Ey_ruWst8_FG6MxtU,13220
-mcp_ticketer-0.1.39.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcp_ticketer-0.1.39.dist-info/entry_points.txt,sha256=o1IxVhnHnBNG7FZzbFq-Whcs1Djbofs0qMjiUYBLx2s,60
-mcp_ticketer-0.1.39.dist-info/top_level.txt,sha256=WnAG4SOT1Vm9tIwl70AbGG_nA217YyV3aWFhxLH2rxw,13
-mcp_ticketer-0.1.39.dist-info/RECORD,,
+mcp_ticketer-0.3.0.dist-info/licenses/LICENSE,sha256=KOVrunjtILSzY-2N8Lqa3-Q8dMaZIG4LrlLTr9UqL08,1073
+mcp_ticketer-0.3.0.dist-info/METADATA,sha256=qUgh1KFBMCfrmkev4QBVmCEpbCAbutnjGDv5pTrfyJ8,13219
+mcp_ticketer-0.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcp_ticketer-0.3.0.dist-info/entry_points.txt,sha256=o1IxVhnHnBNG7FZzbFq-Whcs1Djbofs0qMjiUYBLx2s,60
+mcp_ticketer-0.3.0.dist-info/top_level.txt,sha256=WnAG4SOT1Vm9tIwl70AbGG_nA217YyV3aWFhxLH2rxw,13
+mcp_ticketer-0.3.0.dist-info/RECORD,,