mcp-ticketer 0.12.0__py3-none-any.whl → 2.0.1__py3-none-any.whl

mcp_ticketer/mcp/server/main.py

@@ -58,6 +58,7 @@ class MCPTicketServer:
         """Initialize MCP server.
 
         Args:
+        ----
             adapter_type: Type of adapter to use
             config: Adapter configuration
 
@@ -71,9 +72,11 @@ class MCPTicketServer:
         """Handle JSON-RPC request.
 
         Args:
+        ----
             request: JSON-RPC request
 
         Returns:
+        -------
             JSON-RPC response
 
         """
@@ -158,11 +161,13 @@ class MCPTicketServer:
         """Create error response.
 
         Args:
+        ----
             request_id: Request ID
             code: Error code
             message: Error message
 
         Returns:
+        -------
             Error response
 
         """
@@ -178,7 +183,7 @@ class MCPTicketServer:
         request = CreateTicketRequest(**params)
 
         # Build task from validated DTO
-        task = Task(
+        task = Task(  # type: ignore[call-arg]
             title=request.title,
             description=request.description,
             priority=Priority(request.priority),
@@ -256,7 +261,7 @@ class MCPTicketServer:
 
     async def _handle_search(self, params: dict[str, Any]) -> dict[str, Any]:
         """Handle ticket search - SYNCHRONOUS."""
-        query = SearchQuery(
+        query = SearchQuery(  # type: ignore[call-arg]
             query=params.get("query"),
             state=TicketState(params["state"]) if params.get("state") else None,
             priority=Priority(params["priority"]) if params.get("priority") else None,
@@ -292,7 +297,7 @@ class MCPTicketServer:
         operation = params.get("operation", "add")
 
         if operation == "add":
-            comment = Comment(
+            comment = Comment(  # type: ignore[call-arg]
                 ticket_id=params["ticket_id"],
                 content=params["content"],
                 author=params.get("author"),
@@ -326,12 +331,17 @@ class MCPTicketServer:
         request = CreateEpicRequest(**params)
 
         # Build epic from validated DTO
-        epic = Epic(
+        metadata: dict[str, Any] = {}
+        if request.target_date:
+            metadata["target_date"] = request.target_date
+        if request.lead_id:
+            metadata["lead_id"] = request.lead_id
+
+        epic = Epic(  # type: ignore[call-arg]
             title=request.title,
             description=request.description,
             child_issues=request.child_issues,
-            target_date=request.target_date,
-            lead_id=request.lead_id,
+            metadata=metadata,
         )
 
         # Create directly
@@ -372,7 +382,7 @@ class MCPTicketServer:
         request = CreateIssueRequest(**params)
 
         # Build task (issue) from validated DTO
-        task = Task(
+        task = Task(  # type: ignore[call-arg]
             title=request.title,
             description=request.description,
             parent_epic=request.epic_id,  # Issues are tasks under epics
@@ -405,7 +415,7 @@ class MCPTicketServer:
         request = CreateTaskRequest(**params)
 
         # Build task from validated DTO
-        task = Task(
+        task = Task(  # type: ignore[call-arg]
             title=request.title,
             parent_issue=request.parent_id,
             description=request.description,
@@ -437,16 +447,19 @@ class MCPTicketServer:
                 )
 
             # Build tree structure
-            tree = {"epic": epic.model_dump(), "issues": []}
+            tree: dict[str, Any] = {"epic": epic.model_dump(), "issues": []}
 
             # Get issues in epic if depth allows (depth 1 = epic only, depth 2+ = issues)
             if max_depth > 1:
                 issues = await self.adapter.list_issues_by_epic(epic_id)
                 for issue in issues:
-                    issue_node = {"issue": issue.model_dump(), "tasks": []}
+                    issue_node: dict[str, Any] = {
+                        "issue": issue.model_dump(),
+                        "tasks": [],
+                    }
 
                     # Get tasks in issue if depth allows (depth 3+ = tasks)
-                    if max_depth > 2:
+                    if max_depth > 2 and issue.id:
                         tasks = await self.adapter.list_tasks_by_issue(issue.id)
                         issue_node["tasks"] = [task.model_dump() for task in tasks]
 
@@ -544,7 +557,7 @@ class MCPTicketServer:
         include_parents = params.get("include_parents", True)
 
         # Perform basic search
-        search_query = SearchQuery(
+        search_query = SearchQuery(  # type: ignore[call-arg]
             query=query,
             state=TicketState(params["state"]) if params.get("state") else None,
             priority=Priority(params["priority"]) if params.get("priority") else None,
@@ -649,6 +662,12 @@ class MCPTicketServer:
                         "error": str(e),
                         "ticket_id": ticket_id,
                     }
+            # Fallback if not GitHub adapter instance
+            return {
+                "success": False,
+                "error": "GitHub adapter not properly initialized",
+                "ticket_id": ticket_id,
+            }
         elif "linear" in adapter_name:
             # Linear adapter needs GitHub config for PR creation
             from ..adapters.linear import LinearAdapter
@@ -693,6 +712,12 @@ class MCPTicketServer:
                         "error": str(e),
                         "ticket_id": ticket_id,
                     }
+            # Fallback if not Linear adapter instance
+            return {
+                "success": False,
+                "error": "Linear adapter not properly initialized",
+                "ticket_id": ticket_id,
+            }
         else:
             return {
                 "success": False,
@@ -717,9 +742,11 @@ class MCPTicketServer:
 
             if isinstance(self.adapter, GitHubAdapter):
                 try:
-                    result = await self.adapter.link_existing_pull_request(
-                        ticket_id=ticket_id,
-                        pr_url=pr_url,
+                    result: dict[str, Any] = (
+                        await self.adapter.link_existing_pull_request(
+                            ticket_id=ticket_id,
+                            pr_url=pr_url,
+                        )
                     )
                     return result
                 except Exception as e:
@@ -729,16 +756,25 @@ class MCPTicketServer:
                         "ticket_id": ticket_id,
                         "pr_url": pr_url,
                     }
+            # Fallback if not GitHub adapter instance
+            return {
+                "success": False,
+                "error": "GitHub adapter not properly initialized",
+                "ticket_id": ticket_id,
+                "pr_url": pr_url,
+            }
         elif "linear" in adapter_name:
             from ..adapters.linear import LinearAdapter
 
             if isinstance(self.adapter, LinearAdapter):
                 try:
-                    result = await self.adapter.link_to_pull_request(
-                        ticket_id=ticket_id,
-                        pr_url=pr_url,
+                    link_result: dict[str, Any] = (
+                        await self.adapter.link_to_pull_request(
+                            ticket_id=ticket_id,
+                            pr_url=pr_url,
+                        )
                     )
-                    return result
+                    return link_result
                 except Exception as e:
                     return {
                         "success": False,
@@ -746,6 +782,13 @@ class MCPTicketServer:
                         "ticket_id": ticket_id,
                         "pr_url": pr_url,
                     }
+            # Fallback if not Linear adapter instance
+            return {
+                "success": False,
+                "error": "Linear adapter not properly initialized",
+                "ticket_id": ticket_id,
+                "pr_url": pr_url,
+            }
         else:
             return {
                 "success": False,
@@ -758,9 +801,11 @@ class MCPTicketServer:
         """Handle initialize request from MCP client.
 
         Args:
+        ----
             params: Initialize parameters
 
         Returns:
+        -------
             Server capabilities
 
         """
@@ -889,9 +934,11 @@ class MCPTicketServer:
         """Handle tool invocation from MCP client.
 
         Args:
+        ----
             params: Contains 'name' and 'arguments' fields
 
         Returns:
+        -------
             MCP formatted response with content array
 
         """
@@ -1145,18 +1192,48 @@ async def main() -> None:
 
 
 def _load_env_configuration() -> dict[str, Any] | None:
-    """Load adapter configuration from .env files.
+    """Load adapter configuration from environment variables and .env files.
 
-    Checks .env.local first (highest priority), then .env.
+    Priority order (highest to lowest):
+    1. os.environ (set by MCP clients like Claude Desktop)
+    2. .env.local file (local overrides)
+    3. .env file (default configuration)
 
     Returns:
+    -------
         Dictionary with 'adapter_type' and 'adapter_config' keys, or None if no config found
 
     """
-    # Check for .env files in order of preference
-    env_files = [".env.local", ".env"]
+    import os
+
     env_vars = {}
 
+    # Priority 1: Check process environment variables (set by MCP client)
+    # This allows Claude Desktop and other MCP clients to configure the adapter
+    relevant_env_keys = [
+        "MCP_TICKETER_ADAPTER",
+        "LINEAR_API_KEY",
+        "LINEAR_TEAM_ID",
+        "LINEAR_TEAM_KEY",
+        "LINEAR_API_URL",
+        "JIRA_SERVER",
+        "JIRA_EMAIL",
+        "JIRA_API_TOKEN",
+        "JIRA_PROJECT_KEY",
+        "GITHUB_TOKEN",
+        "GITHUB_OWNER",
+        "GITHUB_REPO",
+        "MCP_TICKETER_BASE_PATH",
+    ]
+
+    for key in relevant_env_keys:
+        if os.environ.get(key):
+            env_vars[key] = os.environ[key]
+
+    # Priority 2: Check .env files (only for keys not already set)
+    # This allows .env files to provide fallback values
+    env_files = [".env.local", ".env"]
+
     for env_file in env_files:
         env_path = Path.cwd() / env_file
         if env_path.exists():
@@ -1169,7 +1246,9 @@ def _load_env_configuration() -> dict[str, Any] | None:
                             key, value = line.split("=", 1)
                             key = key.strip()
                             value = value.strip().strip('"').strip("'")
-                            if value:  # Only add non-empty values
+
+                            # Only set if not already in env_vars (os.environ takes priority)
+                            if key not in env_vars and value:
                                 env_vars[key] = value
             except Exception:
                 continue
@@ -1205,14 +1284,16 @@ def _build_adapter_config_from_env_vars(
     """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 = {}
+    config: dict[str, Any] = {}
 
     if adapter_type == "linear":
         # Linear adapter configuration