mcp-ticketer 0.4.1__py3-none-any.whl → 0.4.3__py3-none-any.whl

mcp_ticketer/core/project_config.py

@@ -47,29 +47,29 @@ class AdapterConfig:
     enabled: bool = True
 
     # Common fields (not all adapters use all fields)
-    api_key: Optional[str] = None
-    token: Optional[str] = None
+    api_key: str | None = None
+    token: str | None = None
 
     # Linear-specific
-    team_id: Optional[str] = None
-    team_key: Optional[str] = None
-    workspace: Optional[str] = None
+    team_id: str | None = None
+    team_key: str | None = None
+    workspace: str | None = None
 
     # JIRA-specific
-    server: Optional[str] = None
-    email: Optional[str] = None
-    api_token: Optional[str] = None
-    project_key: Optional[str] = None
+    server: str | None = None
+    email: str | None = None
+    api_token: str | None = None
+    project_key: str | None = None
 
     # GitHub-specific
-    owner: Optional[str] = None
-    repo: Optional[str] = None
+    owner: str | None = None
+    repo: str | None = None
 
     # AITrackdown-specific
-    base_path: Optional[str] = None
+    base_path: str | None = None
 
     # Project ID (can be used by any adapter for scoping)
-    project_id: Optional[str] = None
+    project_id: str | None = None
 
     # Additional adapter-specific configuration
     additional_config: dict[str, Any] = field(default_factory=dict)
@@ -126,9 +126,9 @@ class ProjectConfig:
     """Configuration for a specific project."""
 
     adapter: str
-    api_key: Optional[str] = None
-    project_id: Optional[str] = None
-    team_id: Optional[str] = None
+    api_key: str | None = None
+    project_id: str | None = None
+    team_id: str | None = None
     additional_config: dict[str, Any] = field(default_factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
@@ -147,7 +147,7 @@ class HybridConfig:
 
     enabled: bool = False
     adapters: list[str] = field(default_factory=list)
-    primary_adapter: Optional[str] = None
+    primary_adapter: str | None = None
     sync_strategy: SyncStrategy = SyncStrategy.PRIMARY_SOURCE
 
     def to_dict(self) -> dict[str, Any]:
@@ -172,7 +172,7 @@ class TicketerConfig:
     default_adapter: str = "aitrackdown"
     project_configs: dict[str, ProjectConfig] = field(default_factory=dict)
     adapters: dict[str, AdapterConfig] = field(default_factory=dict)
-    hybrid_mode: Optional[HybridConfig] = None
+    hybrid_mode: HybridConfig | None = None
 
     def to_dict(self) -> dict[str, Any]:
         """Convert to dictionary for JSON serialization."""
@@ -219,7 +219,7 @@ class ConfigValidator:
     """Validate adapter configurations."""
 
     @staticmethod
-    def validate_linear_config(config: dict[str, Any]) -> tuple[bool, Optional[str]]:
+    def validate_linear_config(config: dict[str, Any]) -> tuple[bool, str | None]:
         """Validate Linear adapter configuration.
 
         Returns:
@@ -241,7 +241,7 @@ class ConfigValidator:
         return True, None
 
     @staticmethod
-    def validate_github_config(config: dict[str, Any]) -> tuple[bool, Optional[str]]:
+    def validate_github_config(config: dict[str, Any]) -> tuple[bool, str | None]:
         """Validate GitHub adapter configuration.
 
         Returns:
@@ -270,7 +270,7 @@ class ConfigValidator:
         return True, None
 
     @staticmethod
-    def validate_jira_config(config: dict[str, Any]) -> tuple[bool, Optional[str]]:
+    def validate_jira_config(config: dict[str, Any]) -> tuple[bool, str | None]:
         """Validate JIRA adapter configuration.
 
         Returns:
@@ -292,7 +292,7 @@ class ConfigValidator:
     @staticmethod
     def validate_aitrackdown_config(
         config: dict[str, Any],
-    ) -> tuple[bool, Optional[str]]:
+    ) -> tuple[bool, str | None]:
         """Validate AITrackdown adapter configuration.
 
         Returns:
@@ -306,7 +306,7 @@ class ConfigValidator:
     @classmethod
     def validate(
         cls, adapter_type: str, config: dict[str, Any]
-    ) -> tuple[bool, Optional[str]]:
+    ) -> tuple[bool, str | None]:
         """Validate configuration for any adapter type.
 
         Args:
@@ -350,7 +350,7 @@ class ConfigResolver:
     PROJECT_CONFIG_SUBPATH = ".mcp-ticketer" / Path("config.json")
 
     def __init__(
-        self, project_path: Optional[Path] = None, enable_env_discovery: bool = True
+        self, project_path: Path | None = None, enable_env_discovery: bool = True
     ):
         """Initialize config resolver.
 
@@ -361,8 +361,8 @@ class ConfigResolver:
         """
         self.project_path = project_path or Path.cwd()
         self.enable_env_discovery = enable_env_discovery
-        self._project_config: Optional[TicketerConfig] = None
-        self._discovered_config: Optional[DiscoveryResult] = None
+        self._project_config: TicketerConfig | None = None
+        self._discovered_config: DiscoveryResult | None = None
 
     def load_global_config(self) -> TicketerConfig:
         """Load default configuration (global config loading removed for security).
@@ -382,8 +382,8 @@ class ConfigResolver:
         return default_config
 
     def load_project_config(
-        self, project_path: Optional[Path] = None
-    ) -> Optional[TicketerConfig]:
+        self, project_path: Path | None = None
+    ) -> TicketerConfig | None:
         """Load project-specific configuration.
 
         Args:
@@ -424,7 +424,7 @@ class ConfigResolver:
         self.save_project_config(config)
 
     def save_project_config(
-        self, config: TicketerConfig, project_path: Optional[Path] = None
+        self, config: TicketerConfig, project_path: Path | None = None
     ) -> None:
         """Save project-specific configuration.
 
@@ -461,8 +461,8 @@ class ConfigResolver:
 
     def resolve_adapter_config(
         self,
-        adapter_name: Optional[str] = None,
-        cli_overrides: Optional[dict[str, Any]] = None,
+        adapter_name: str | None = None,
+        cli_overrides: dict[str, Any] | None = None,
     ) -> dict[str, Any]:
         """Resolve adapter configuration with hierarchical precedence.
 
@@ -582,6 +582,12 @@ class ConfigResolver:
                 overrides["team_id"] = os.getenv("MCP_TICKETER_LINEAR_TEAM_ID")
             if os.getenv("LINEAR_API_KEY"):
                 overrides["api_key"] = os.getenv("LINEAR_API_KEY")
+            if os.getenv("LINEAR_TEAM_ID"):
+                overrides["team_id"] = os.getenv("LINEAR_TEAM_ID")
+            if os.getenv("LINEAR_TEAM_KEY"):
+                overrides["team_key"] = os.getenv("LINEAR_TEAM_KEY")
+            if os.getenv("MCP_TICKETER_LINEAR_TEAM_KEY"):
+                overrides["team_key"] = os.getenv("MCP_TICKETER_LINEAR_TEAM_KEY")
 
         elif adapter_type == AdapterType.GITHUB.value:
             if os.getenv("MCP_TICKETER_GITHUB_TOKEN"):
@@ -623,7 +629,7 @@ class ConfigResolver:
 
         return overrides
 
-    def get_hybrid_config(self) -> Optional[HybridConfig]:
+    def get_hybrid_config(self) -> HybridConfig | None:
         """Get hybrid mode configuration if enabled.
 
         Returns:
@@ -655,10 +661,10 @@ class ConfigResolver:
 
 
 # Singleton instance for global access
-_default_resolver: Optional[ConfigResolver] = None
+_default_resolver: ConfigResolver | None = None
 
 
-def get_config_resolver(project_path: Optional[Path] = None) -> ConfigResolver:
+def get_config_resolver(project_path: Path | None = None) -> ConfigResolver:
     """Get the global config resolver instance.
 
     Args:

mcp_ticketer/core/registry.py

@@ -1,6 +1,6 @@
 """Adapter registry for dynamic adapter management."""
 
-from typing import Any, Optional
+from typing import Any
 
 from .adapter import BaseAdapter
 
@@ -37,7 +37,7 @@ class AdapterRegistry:
 
     @classmethod
     def get_adapter(
-        cls, name: str, config: Optional[dict[str, Any]] = None, force_new: bool = False
+        cls, name: str, config: dict[str, Any] | None = None, force_new: bool = False
     ) -> BaseAdapter:
         """Get or create an adapter instance.
 

mcp_ticketer/mcp/dto.py

@@ -1,6 +1,6 @@
 """Data Transfer Objects for MCP requests and responses."""
 
-from typing import Any, Optional
+from typing import Any
 
 from pydantic import BaseModel, Field
 
@@ -10,32 +10,32 @@ class CreateTicketRequest(BaseModel):
     """Request to create a ticket."""
 
     title: str = Field(..., min_length=1, description="Ticket title")
-    description: Optional[str] = Field(None, description="Ticket description")
+    description: str | None = Field(None, description="Ticket description")
     priority: str = Field("medium", description="Ticket priority")
     tags: list[str] = Field(default_factory=list, description="Ticket tags")
-    assignee: Optional[str] = Field(None, description="Ticket assignee")
+    assignee: str | None = Field(None, description="Ticket assignee")
 
 
 class CreateEpicRequest(BaseModel):
     """Request to create an epic."""
 
     title: str = Field(..., min_length=1, description="Epic title")
-    description: Optional[str] = Field(None, description="Epic description")
+    description: str | None = Field(None, description="Epic description")
     child_issues: list[str] = Field(default_factory=list, description="Child issue IDs")
-    target_date: Optional[str] = Field(None, description="Target completion date")
-    lead_id: Optional[str] = Field(None, description="Epic lead/owner ID")
+    target_date: str | None = Field(None, description="Target completion date")
+    lead_id: str | None = Field(None, description="Epic lead/owner ID")
 
 
 class CreateIssueRequest(BaseModel):
     """Request to create an issue."""
 
     title: str = Field(..., min_length=1, description="Issue title")
-    description: Optional[str] = Field(None, description="Issue description")
-    epic_id: Optional[str] = Field(None, description="Parent epic ID")
+    description: str | None = Field(None, description="Issue description")
+    epic_id: str | None = Field(None, description="Parent epic ID")
     priority: str = Field("medium", description="Issue priority")
-    assignee: Optional[str] = Field(None, description="Issue assignee")
+    assignee: str | None = Field(None, description="Issue assignee")
     tags: list[str] = Field(default_factory=list, description="Issue tags")
-    estimated_hours: Optional[float] = Field(
+    estimated_hours: float | None = Field(
         None, description="Estimated hours to complete"
     )
 
@@ -45,11 +45,11 @@ class CreateTaskRequest(BaseModel):
 
     title: str = Field(..., min_length=1, description="Task title")
     parent_id: str = Field(..., description="Parent issue ID")
-    description: Optional[str] = Field(None, description="Task description")
+    description: str | None = Field(None, description="Task description")
     priority: str = Field("medium", description="Task priority")
-    assignee: Optional[str] = Field(None, description="Task assignee")
+    assignee: str | None = Field(None, description="Task assignee")
     tags: list[str] = Field(default_factory=list, description="Task tags")
-    estimated_hours: Optional[float] = Field(
+    estimated_hours: float | None = Field(
         None, description="Estimated hours to complete"
     )
 
@@ -77,11 +77,11 @@ class TransitionRequest(BaseModel):
 class SearchRequest(BaseModel):
     """Request to search tickets."""
 
-    query: Optional[str] = Field(None, description="Search query text")
-    state: Optional[str] = Field(None, description="Filter by ticket state")
-    priority: Optional[str] = Field(None, description="Filter by priority")
-    assignee: Optional[str] = Field(None, description="Filter by assignee")
-    tags: Optional[list[str]] = Field(None, description="Filter by tags")
+    query: str | None = Field(None, description="Search query text")
+    state: str | None = Field(None, description="Filter by ticket state")
+    priority: str | None = Field(None, description="Filter by priority")
+    assignee: str | None = Field(None, description="Filter by assignee")
+    tags: list[str] | None = Field(None, description="Filter by tags")
     limit: int = Field(10, description="Maximum number of results")
 
 
@@ -90,7 +90,7 @@ class ListRequest(BaseModel):
 
     limit: int = Field(10, description="Maximum number of tickets to return")
     offset: int = Field(0, description="Number of tickets to skip")
-    filters: Optional[dict[str, Any]] = Field(None, description="Additional filters")
+    filters: dict[str, Any] | None = Field(None, description="Additional filters")
 
 
 class DeleteTicketRequest(BaseModel):
@@ -104,8 +104,8 @@ class CommentRequest(BaseModel):
 
     operation: str = Field("add", description="Operation: 'add' or 'list'")
     ticket_id: str = Field(..., description="Ticket ID")
-    content: Optional[str] = Field(None, description="Comment content (for add)")
-    author: Optional[str] = Field(None, description="Comment author (for add)")
+    content: str | None = Field(None, description="Comment content (for add)")
+    author: str | None = Field(None, description="Comment author (for add)")
     limit: int = Field(10, description="Max comments to return (for list)")
     offset: int = Field(0, description="Number of comments to skip (for list)")
 
@@ -115,12 +115,12 @@ class CreatePRRequest(BaseModel):
 
     ticket_id: str = Field(..., description="Ticket ID")
     base_branch: str = Field("main", description="Base branch")
-    head_branch: Optional[str] = Field(None, description="Head branch")
-    title: Optional[str] = Field(None, description="PR title")
-    body: Optional[str] = Field(None, description="PR body")
+    head_branch: str | None = Field(None, description="Head branch")
+    title: str | None = Field(None, description="PR title")
+    body: str | None = Field(None, description="PR body")
     draft: bool = Field(False, description="Create as draft PR")
-    github_owner: Optional[str] = Field(None, description="GitHub owner (for Linear)")
-    github_repo: Optional[str] = Field(None, description="GitHub repo (for Linear)")
+    github_owner: str | None = Field(None, description="GitHub owner (for Linear)")
+    github_repo: str | None = Field(None, description="GitHub repo (for Linear)")
 
 
 class LinkPRRequest(BaseModel):
@@ -152,7 +152,7 @@ class IssueTasksRequest(BaseModel):
 class HierarchyTreeRequest(BaseModel):
     """Request to get hierarchy tree."""
 
-    epic_id: Optional[str] = Field(None, description="Specific epic ID (optional)")
+    epic_id: str | None = Field(None, description="Specific epic ID (optional)")
     max_depth: int = Field(3, description="Maximum depth of tree")
     limit: int = Field(10, description="Max epics to return (if no epic_id)")
 
@@ -173,8 +173,8 @@ class SearchHierarchyRequest(BaseModel):
     """Request to search with hierarchy context."""
 
     query: str = Field("", description="Search query")
-    state: Optional[str] = Field(None, description="Filter by state")
-    priority: Optional[str] = Field(None, description="Filter by priority")
+    state: str | None = Field(None, description="Filter by state")
+    priority: str | None = Field(None, description="Filter by priority")
     include_children: bool = Field(True, description="Include child tickets")
     include_parents: bool = Field(True, description="Include parent tickets")
     limit: int = Field(50, description="Maximum number of results")
@@ -184,9 +184,9 @@ class AttachRequest(BaseModel):
     """Request to attach file to ticket."""
 
     ticket_id: str = Field(..., description="Ticket ID")
-    file_path: Optional[str] = Field(None, description="File path to attach")
-    file_content: Optional[str] = Field(None, description="File content (base64)")
-    file_name: Optional[str] = Field(None, description="File name")
+    file_path: str | None = Field(None, description="File path to attach")
+    file_content: str | None = Field(None, description="File content (base64)")
+    file_name: str | None = Field(None, description="File name")
 
 
 class ListAttachmentsRequest(BaseModel):

mcp_ticketer/mcp/response_builder.py

@@ -1,6 +1,6 @@
 """Response builder utility for consistent MCP responses."""
 
-from typing import Any, Optional
+from typing import Any
 
 from .constants import JSONRPC_VERSION, STATUS_COMPLETED
 
@@ -36,7 +36,7 @@ class ResponseBuilder:
         request_id: Any,
         code: int,
         message: str,
-        data: Optional[dict[str, Any]] = None,
+        data: dict[str, Any] | None = None,
     ) -> dict[str, Any]:
         """Build error response.
 

mcp_ticketer/mcp/server.py

@@ -4,7 +4,7 @@ import asyncio
 import json
 import sys
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 from dotenv import load_dotenv
 
@@ -12,40 +12,20 @@ from dotenv import load_dotenv
 import mcp_ticketer.adapters  # noqa: F401
 
 from ..core import AdapterRegistry
-from ..core.models import Comment, Epic, Priority, SearchQuery, Task, TicketState
-from .constants import (
-    DEFAULT_BASE_PATH,
-    DEFAULT_LIMIT,
-    DEFAULT_MAX_DEPTH,
-    DEFAULT_OFFSET,
-    ERROR_INTERNAL,
-    ERROR_METHOD_NOT_FOUND,
-    ERROR_PARSE,
-    JSONRPC_VERSION,
-    MCP_PROTOCOL_VERSION,
-    MSG_EPIC_NOT_FOUND,
-    MSG_INTERNAL_ERROR,
-    MSG_MISSING_TICKET_ID,
-    MSG_MISSING_TITLE,
-    MSG_NO_TICKETS_PROVIDED,
-    MSG_NO_UPDATES_PROVIDED,
-    MSG_TICKET_NOT_FOUND,
-    MSG_TRANSITION_FAILED,
-    MSG_UNKNOWN_METHOD,
-    MSG_UNKNOWN_OPERATION,
-    MSG_UPDATE_FAILED,
-    SERVER_NAME,
-    SERVER_VERSION,
-    STATUS_COMPLETED,
-    STATUS_ERROR,
-)
-from .dto import (
-    CreateEpicRequest,
-    CreateIssueRequest,
-    CreateTaskRequest,
-    CreateTicketRequest,
-    ReadTicketRequest,
-)
+from ..core.models import (Comment, Epic, Priority, SearchQuery, Task,
+                           TicketState)
+from .constants import (DEFAULT_BASE_PATH, DEFAULT_LIMIT, DEFAULT_MAX_DEPTH,
+                        DEFAULT_OFFSET, ERROR_INTERNAL, ERROR_METHOD_NOT_FOUND,
+                        ERROR_PARSE, JSONRPC_VERSION, MCP_PROTOCOL_VERSION,
+                        MSG_EPIC_NOT_FOUND, MSG_INTERNAL_ERROR,
+                        MSG_MISSING_TICKET_ID, MSG_MISSING_TITLE,
+                        MSG_NO_TICKETS_PROVIDED, MSG_NO_UPDATES_PROVIDED,
+                        MSG_TICKET_NOT_FOUND, MSG_TRANSITION_FAILED,
+                        MSG_UNKNOWN_METHOD, MSG_UNKNOWN_OPERATION,
+                        MSG_UPDATE_FAILED, SERVER_NAME, SERVER_VERSION,
+                        STATUS_COMPLETED, STATUS_ERROR)
+from .dto import (CreateEpicRequest, CreateIssueRequest, CreateTaskRequest,
+                  CreateTicketRequest, ReadTicketRequest)
 from .response_builder import ResponseBuilder
 
 # Load environment variables early (prioritize .env.local)
@@ -70,7 +50,7 @@ class MCPTicketServer:
     """MCP server for ticket operations over stdio - synchronous implementation."""
 
     def __init__(
-        self, adapter_type: str = "aitrackdown", config: Optional[dict[str, Any]] = None
+        self, adapter_type: str = "aitrackdown", config: dict[str, Any] | None = None
     ):
         """Initialize MCP server.
 
@@ -1129,7 +1109,7 @@ async def main():
     await server.run()
 
 
-def _load_env_configuration() -> Optional[dict[str, Any]]:
+def _load_env_configuration() -> dict[str, Any] | None:
     """Load adapter configuration from .env files.
 
     Checks .env.local first (highest priority), then .env.

mcp_ticketer/mcp/server_sdk.py

@@ -0,0 +1,93 @@
+"""FastMCP-based MCP server implementation.
+
+This module implements the MCP server using the official FastMCP SDK,
+replacing the custom JSON-RPC implementation. It provides a cleaner,
+more maintainable approach with automatic schema generation and
+better error handling.
+
+The server manages a global adapter instance that is configured at
+startup and used by all tool implementations.
+"""
+
+import logging
+from typing import Any
+
+from mcp.server.fastmcp import FastMCP
+
+from ..core.adapter import BaseAdapter
+from ..core.registry import AdapterRegistry
+
+# Initialize FastMCP server
+mcp = FastMCP("mcp-ticketer")
+
+# Global adapter instance
+_adapter: BaseAdapter | None = None
+
+# Configure logging
+logger = logging.getLogger(__name__)
+
+
+def configure_adapter(adapter_type: str, config: dict[str, Any]) -> None:
+    """Configure the global adapter instance.
+
+    This must be called before starting the server to initialize the
+    adapter that will handle all ticket operations.
+
+    Args:
+        adapter_type: Type of adapter to create (e.g., "linear", "jira", "github")
+        config: Configuration dictionary for the adapter
+
+    Raises:
+        ValueError: If adapter type is not registered
+        RuntimeError: If adapter configuration fails
+
+    """
+    global _adapter
+
+    try:
+        # Get adapter from registry
+        _adapter = AdapterRegistry.get_adapter(adapter_type, config)
+        logger.info(f"Configured {adapter_type} adapter for MCP server")
+    except Exception as e:
+        logger.error(f"Failed to configure adapter: {e}")
+        raise RuntimeError(f"Adapter configuration failed: {e}") from e
+
+
+def get_adapter() -> BaseAdapter:
+    """Get the configured adapter instance.
+
+    Returns:
+        The global adapter instance
+
+    Raises:
+        RuntimeError: If adapter has not been configured
+
+    """
+    if _adapter is None:
+        raise RuntimeError(
+            "Adapter not configured. Call configure_adapter() before starting server."
+        )
+    return _adapter
+
+
+# Import all tool modules to register them with FastMCP
+# These imports must come after mcp is initialized but before main()
+from . import tools  # noqa: E402, F401
+
+
+def main() -> None:
+    """Run the FastMCP server.
+
+    This function starts the server using stdio transport for
+    JSON-RPC communication with Claude Desktop/Code.
+
+    The adapter must be configured via configure_adapter() before
+    calling this function.
+
+    """
+    # Run the server with stdio transport
+    mcp.run(transport="stdio")
+
+
+if __name__ == "__main__":
+    main()

mcp_ticketer/mcp/tools/__init__.py

@@ -0,0 +1,36 @@
+"""MCP tool modules for ticket operations.
+
+This package contains all FastMCP tool implementations organized by
+functional area. Tools are automatically registered with the FastMCP
+server when imported.
+
+Modules:
+    ticket_tools: Basic CRUD operations for tickets
+    hierarchy_tools: Epic/Issue/Task hierarchy management
+    search_tools: Search and query operations
+    bulk_tools: Bulk create and update operations
+    comment_tools: Comment management
+    pr_tools: Pull request integration
+    attachment_tools: File attachment handling
+
+"""
+
+# Import all tool modules to register them with FastMCP
+# Order matters - import core functionality first
+from . import attachment_tools  # noqa: F401
+from . import bulk_tools  # noqa: F401
+from . import comment_tools  # noqa: F401
+from . import hierarchy_tools  # noqa: F401
+from . import pr_tools  # noqa: F401
+from . import search_tools  # noqa: F401
+from . import ticket_tools  # noqa: F401
+
+__all__ = [
+    "ticket_tools",
+    "hierarchy_tools",
+    "search_tools",
+    "bulk_tools",
+    "comment_tools",
+    "pr_tools",
+    "attachment_tools",
+]