mcp-ticketer 0.1.22__py3-none-any.whl → 0.1.24__py3-none-any.whl

mcp_ticketer/cli/main.py

@@ -5,7 +5,7 @@ import json
 import os
 from enum import Enum
 from pathlib import Path
-from typing import List, Optional
+from typing import Optional
 
 import typer
 from dotenv import load_dotenv
@@ -59,8 +59,7 @@ def main_callback(
         help="Show version and exit",
     ),
 ):
-    """MCP Ticketer - Universal ticket management interface.
-    """
+    """MCP Ticketer - Universal ticket management interface."""
     pass
 
 
@@ -801,7 +800,7 @@ def create(
     priority: Priority = typer.Option(
         Priority.MEDIUM, "--priority", "-p", help="Priority level"
     ),
-    tags: Optional[List[str]] = typer.Option(
+    tags: Optional[list[str]] = typer.Option(
         None, "--tag", "-t", help="Tags (can be specified multiple times)"
     ),
     assignee: Optional[str] = typer.Option(
@@ -1008,12 +1007,39 @@ def update(
 @app.command()
 def transition(
     ticket_id: str = typer.Argument(..., help="Ticket ID"),
-    state: TicketState = typer.Argument(..., help="Target state"),
+    state_positional: Optional[TicketState] = typer.Argument(
+        None, help="Target state (positional - deprecated, use --state instead)"
+    ),
+    state: Optional[TicketState] = typer.Option(
+        None, "--state", "-s", help="Target state (recommended)"
+    ),
     adapter: Optional[AdapterType] = typer.Option(
         None, "--adapter", help="Override default adapter"
     ),
 ) -> None:
-    """Change ticket state with validation."""
+    """Change ticket state with validation.
+
+    Examples:
+        # Recommended syntax with flag:
+        mcp-ticketer transition BTA-215 --state done
+        mcp-ticketer transition BTA-215 -s in_progress
+
+        # Legacy positional syntax (still supported):
+        mcp-ticketer transition BTA-215 done
+
+    """
+    # Determine which state to use (prefer flag over positional)
+    target_state = state if state is not None else state_positional
+
+    if target_state is None:
+        console.print("[red]Error: State is required[/red]")
+        console.print(
+            "Use either:\n"
+            "  - Flag syntax (recommended): mcp-ticketer transition TICKET-ID --state STATE\n"
+            "  - Positional syntax: mcp-ticketer transition TICKET-ID STATE"
+        )
+        raise typer.Exit(1)
+
     # Get the adapter name
     config = load_config()
     adapter_name = (
@@ -1025,14 +1051,16 @@ def transition(
     queue_id = queue.add(
         ticket_data={
             "ticket_id": ticket_id,
-            "state": state.value if hasattr(state, "value") else state,
+            "state": (
+                target_state.value if hasattr(target_state, "value") else target_state
+            ),
         },
         adapter=adapter_name,
         operation="transition",
     )
 
     console.print(f"[green]✓[/green] Queued state transition: {queue_id}")
-    console.print(f"  Ticket: {ticket_id} → {state}")
+    console.print(f"  Ticket: {ticket_id} → {target_state}")
     console.print("[dim]Use 'mcp-ticketer status {queue_id}' to check progress[/dim]")
 
     # Start worker if needed
@@ -1090,6 +1118,13 @@ app.add_typer(queue_app, name="queue")
 # Add discover command to main app
 app.add_typer(discover_app, name="discover")
 
+# Create MCP configuration command group
+mcp_app = typer.Typer(
+    name="mcp",
+    help="Configure MCP integration for AI clients (Claude, Gemini, Codex, Auggie)",
+    add_completion=False,
+)
+
 
 @app.command()
 def check(queue_id: str = typer.Argument(..., help="Queue ID to check")):
@@ -1205,8 +1240,8 @@ def serve(
         sys.exit(1)
 
 
-@app.command()
-def mcp(
+@mcp_app.command(name="claude")
+def mcp_claude(
     global_config: bool = typer.Option(
         False,
         "--global",
@@ -1224,6 +1259,17 @@ def mcp(
 
     By default, configures project-level (.mcp/config.json).
     Use --global to configure Claude Desktop instead.
+
+    Examples:
+        # Configure for current project (default)
+        mcp-ticketer mcp claude
+
+        # Configure Claude Desktop globally
+        mcp-ticketer mcp claude --global
+
+        # Force overwrite existing configuration
+        mcp-ticketer mcp claude --force
+
     """
     from ..cli.mcp_configure import configure_claude_mcp
 
@@ -1234,6 +1280,121 @@ def mcp(
         raise typer.Exit(1)
 
 
+@mcp_app.command(name="gemini")
+def mcp_gemini(
+    scope: str = typer.Option(
+        "project",
+        "--scope",
+        "-s",
+        help="Configuration scope: 'project' (default) or 'user'",
+    ),
+    force: bool = typer.Option(
+        False, "--force", "-f", help="Overwrite existing configuration"
+    ),
+):
+    """Configure Gemini CLI to use mcp-ticketer MCP server.
+
+    Reads configuration from .mcp-ticketer/config.json and creates
+    Gemini CLI settings file with mcp-ticketer configuration.
+
+    By default, configures project-level (.gemini/settings.json).
+    Use --scope user to configure user-level (~/.gemini/settings.json).
+
+    Examples:
+        # Configure for current project (default)
+        mcp-ticketer mcp gemini
+
+        # Configure at user level
+        mcp-ticketer mcp gemini --scope user
+
+        # Force overwrite existing configuration
+        mcp-ticketer mcp gemini --force
+
+    """
+    from ..cli.gemini_configure import configure_gemini_mcp
+
+    # Validate scope parameter
+    if scope not in ["project", "user"]:
+        console.print(
+            f"[red]✗ Invalid scope:[/red] '{scope}'. Must be 'project' or 'user'"
+        )
+        raise typer.Exit(1)
+
+    try:
+        configure_gemini_mcp(scope=scope, force=force)  # type: ignore
+    except Exception as e:
+        console.print(f"[red]✗ Configuration failed:[/red] {e}")
+        raise typer.Exit(1)
+
+
+@mcp_app.command(name="codex")
+def mcp_codex(
+    force: bool = typer.Option(
+        False, "--force", "-f", help="Overwrite existing configuration"
+    ),
+):
+    """Configure Codex CLI to use mcp-ticketer MCP server.
+
+    Reads configuration from .mcp-ticketer/config.json and creates
+    Codex CLI config.toml with mcp-ticketer configuration.
+
+    IMPORTANT: Codex CLI ONLY supports global configuration at ~/.codex/config.toml.
+    There is no project-level configuration support. After configuration,
+    you must restart Codex CLI for changes to take effect.
+
+    Examples:
+        # Configure Codex CLI globally
+        mcp-ticketer mcp codex
+
+        # Force overwrite existing configuration
+        mcp-ticketer mcp codex --force
+
+    """
+    from ..cli.codex_configure import configure_codex_mcp
+
+    try:
+        configure_codex_mcp(force=force)
+    except Exception as e:
+        console.print(f"[red]✗ Configuration failed:[/red] {e}")
+        raise typer.Exit(1)
+
+
+@mcp_app.command(name="auggie")
+def mcp_auggie(
+    force: bool = typer.Option(
+        False, "--force", "-f", help="Overwrite existing configuration"
+    ),
+):
+    """Configure Auggie CLI to use mcp-ticketer MCP server.
+
+    Reads configuration from .mcp-ticketer/config.json and creates
+    Auggie CLI settings.json with mcp-ticketer configuration.
+
+    IMPORTANT: Auggie CLI ONLY supports global configuration at ~/.augment/settings.json.
+    There is no project-level configuration support. After configuration,
+    you must restart Auggie CLI for changes to take effect.
+
+    Examples:
+        # Configure Auggie CLI globally
+        mcp-ticketer mcp auggie
+
+        # Force overwrite existing configuration
+        mcp-ticketer mcp auggie --force
+
+    """
+    from ..cli.auggie_configure import configure_auggie_mcp
+
+    try:
+        configure_auggie_mcp(force=force)
+    except Exception as e:
+        console.print(f"[red]✗ Configuration failed:[/red] {e}")
+        raise typer.Exit(1)
+
+
+# Add MCP command group to main app (must be after all subcommands are defined)
+app.add_typer(mcp_app, name="mcp")
+
+
 def main():
     """Main entry point."""
     app()

mcp_ticketer/cli/migrate_config.py

@@ -3,16 +3,12 @@
 import json
 import shutil
 from datetime import datetime
-from typing import Any, Dict
+from typing import Any
 
 from rich.console import Console
 from rich.prompt import Confirm
 
-from ..core.project_config import (
-    AdapterConfig,
-    ConfigResolver,
-    TicketerConfig,
-)
+from ..core.project_config import AdapterConfig, ConfigResolver, TicketerConfig
 
 console = Console()
 
@@ -96,7 +92,7 @@ def migrate_config_command(dry_run: bool = False) -> None:
         console.print(f"[yellow]Old config backed up at: {backup_path}[/yellow]")
 
 
-def _migrate_old_to_new(old_config: Dict[str, Any]) -> TicketerConfig:
+def _migrate_old_to_new(old_config: dict[str, Any]) -> TicketerConfig:
     """Migrate old configuration format to new format.
 
     Old format examples:

mcp_ticketer/cli/utils.py

@@ -6,7 +6,7 @@ import logging
 import os
 from functools import wraps
 from pathlib import Path
-from typing import Any, Callable, Dict, List, Optional, TypeVar
+from typing import Any, Callable, Optional, TypeVar
 
 import typer
 from rich.console import Console
@@ -166,7 +166,7 @@ class CommonPatterns:
 
     @staticmethod
     def queue_operation(
-        ticket_data: Dict[str, Any],
+        ticket_data: dict[str, Any],
         operation: str,
         adapter_name: Optional[str] = None,
         show_progress: bool = True,
@@ -197,7 +197,7 @@ class CommonPatterns:
         return queue_id
 
     @staticmethod
-    def display_ticket_table(tickets: List[Task], title: str = "Tickets") -> None:
+    def display_ticket_table(tickets: list[Task], title: str = "Tickets") -> None:
         """Display tickets in a formatted table."""
         if not tickets:
             console.print("[yellow]No tickets found[/yellow]")
@@ -222,7 +222,7 @@ class CommonPatterns:
         console.print(table)
 
     @staticmethod
-    def display_ticket_details(ticket: Task, comments: Optional[List] = None) -> None:
+    def display_ticket_details(ticket: Task, comments: Optional[list] = None) -> None:
         """Display detailed ticket information."""
         console.print(f"\n[bold]Ticket: {ticket.id}[/bold]")
         console.print(f"Title: {ticket.title}")
@@ -367,7 +367,7 @@ class ConfigValidator:
     """Configuration validation utilities."""
 
     @staticmethod
-    def validate_adapter_config(adapter_type: str, config: dict) -> List[str]:
+    def validate_adapter_config(adapter_type: str, config: dict) -> list[str]:
         """Validate adapter configuration and return list of issues."""
         issues = []
 
@@ -483,7 +483,7 @@ def create_standard_ticket_command(operation: str):
         priority: Optional[Priority] = None,
         state: Optional[TicketState] = None,
         assignee: Optional[str] = None,
-        tags: Optional[List[str]] = None,
+        tags: Optional[list[str]] = None,
         adapter: Optional[str] = None,
     ):
         """Template for ticket commands."""
@@ -562,7 +562,7 @@ class TicketCommands:
         title: str,
         description: Optional[str] = None,
         priority: Priority = Priority.MEDIUM,
-        tags: Optional[List[str]] = None,
+        tags: Optional[list[str]] = None,
         assignee: Optional[str] = None,
         adapter: Optional[str] = None,
     ) -> str:
@@ -579,7 +579,7 @@ class TicketCommands:
 
     @staticmethod
     def update_ticket(
-        ticket_id: str, updates: Dict[str, Any], adapter: Optional[str] = None
+        ticket_id: str, updates: dict[str, Any], adapter: Optional[str] = None
     ) -> str:
         """Update a ticket."""
         if not updates:

mcp_ticketer/core/adapter.py

@@ -1,7 +1,8 @@
 """Base adapter abstract class for ticket systems."""
 
+import builtins
 from abc import ABC, abstractmethod
-from typing import Any, Dict, Generic, List, Optional, TypeVar
+from typing import Any, Generic, Optional, TypeVar
 
 from .models import Comment, Epic, SearchQuery, Task, TicketState, TicketType
 
@@ -12,7 +13,7 @@ T = TypeVar("T", Epic, Task)
 class BaseAdapter(ABC, Generic[T]):
     """Abstract base class for all ticket system adapters."""
 
-    def __init__(self, config: Dict[str, Any]):
+    def __init__(self, config: dict[str, Any]):
         """Initialize adapter with configuration.
 
         Args:
@@ -23,7 +24,7 @@ class BaseAdapter(ABC, Generic[T]):
         self._state_mapping = self._get_state_mapping()
 
     @abstractmethod
-    def _get_state_mapping(self) -> Dict[TicketState, str]:
+    def _get_state_mapping(self) -> dict[TicketState, str]:
         """Get mapping from universal states to system-specific states.
 
         Returns:
@@ -69,7 +70,7 @@ class BaseAdapter(ABC, Generic[T]):
         pass
 
     @abstractmethod
-    async def update(self, ticket_id: str, updates: Dict[str, Any]) -> Optional[T]:
+    async def update(self, ticket_id: str, updates: dict[str, Any]) -> Optional[T]:
         """Update a ticket.
 
         Args:
@@ -97,8 +98,8 @@ class BaseAdapter(ABC, Generic[T]):
 
     @abstractmethod
     async def list(
-        self, limit: int = 10, offset: int = 0, filters: Optional[Dict[str, Any]] = None
-    ) -> List[T]:
+        self, limit: int = 10, offset: int = 0, filters: Optional[dict[str, Any]] = None
+    ) -> list[T]:
         """List tickets with pagination and filters.
 
         Args:
@@ -113,7 +114,7 @@ class BaseAdapter(ABC, Generic[T]):
         pass
 
     @abstractmethod
-    async def search(self, query: SearchQuery) -> List[T]:
+    async def search(self, query: SearchQuery) -> builtins.list[T]:
         """Search tickets using advanced query.
 
         Args:
@@ -157,7 +158,7 @@ class BaseAdapter(ABC, Generic[T]):
     @abstractmethod
     async def get_comments(
         self, ticket_id: str, limit: int = 10, offset: int = 0
-    ) -> List[Comment]:
+    ) -> builtins.list[Comment]:
         """Get comments for a ticket.
 
         Args:
@@ -264,7 +265,7 @@ class BaseAdapter(ABC, Generic[T]):
             return result
         return None
 
-    async def list_epics(self, **kwargs) -> List[Epic]:
+    async def list_epics(self, **kwargs) -> builtins.list[Epic]:
         """List all epics.
 
         Args:
@@ -308,7 +309,7 @@ class BaseAdapter(ABC, Generic[T]):
         )
         return await self.create(task)
 
-    async def list_issues_by_epic(self, epic_id: str) -> List[Task]:
+    async def list_issues_by_epic(self, epic_id: str) -> builtins.list[Task]:
         """List all issues in epic.
 
         Args:
@@ -359,7 +360,7 @@ class BaseAdapter(ABC, Generic[T]):
 
         return await self.create(task)
 
-    async def list_tasks_by_issue(self, issue_id: str) -> List[Task]:
+    async def list_tasks_by_issue(self, issue_id: str) -> builtins.list[Task]:
         """List all tasks under an issue.
 
         Args:

mcp_ticketer/core/config.py

@@ -6,7 +6,7 @@ import os
 from enum import Enum
 from functools import lru_cache
 from pathlib import Path
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Optional, Union
 
 import yaml
 from pydantic import BaseModel, Field, root_validator, validator
@@ -31,7 +31,7 @@ class BaseAdapterConfig(BaseModel):
     enabled: bool = True
     timeout: float = 30.0
     max_retries: int = 3
-    rate_limit: Optional[Dict[str, Any]] = None
+    rate_limit: Optional[dict[str, Any]] = None
 
 
 class GitHubConfig(BaseAdapterConfig):
@@ -43,10 +43,10 @@ class GitHubConfig(BaseAdapterConfig):
     repo: Optional[str] = Field(None, env="GITHUB_REPO")
     api_url: str = "https://api.github.com"
     use_projects_v2: bool = False
-    custom_priority_scheme: Optional[Dict[str, List[str]]] = None
+    custom_priority_scheme: Optional[dict[str, list[str]]] = None
 
     @validator("token", pre=True, always=True)
-    def validate_token(cls, v):
+    def validate_token(self, v):
         if not v:
             v = os.getenv("GITHUB_TOKEN")
         if not v:
@@ -54,7 +54,7 @@ class GitHubConfig(BaseAdapterConfig):
         return v
 
     @validator("owner", pre=True, always=True)
-    def validate_owner(cls, v):
+    def validate_owner(self, v):
         if not v:
             v = os.getenv("GITHUB_OWNER")
         if not v:
@@ -62,7 +62,7 @@ class GitHubConfig(BaseAdapterConfig):
         return v
 
     @validator("repo", pre=True, always=True)
-    def validate_repo(cls, v):
+    def validate_repo(self, v):
         if not v:
             v = os.getenv("GITHUB_REPO")
         if not v:
@@ -82,7 +82,7 @@ class JiraConfig(BaseAdapterConfig):
     verify_ssl: bool = True
 
     @validator("server", pre=True, always=True)
-    def validate_server(cls, v):
+    def validate_server(self, v):
         if not v:
             v = os.getenv("JIRA_SERVER")
         if not v:
@@ -90,7 +90,7 @@ class JiraConfig(BaseAdapterConfig):
         return v.rstrip("/")
 
     @validator("email", pre=True, always=True)
-    def validate_email(cls, v):
+    def validate_email(self, v):
         if not v:
             v = os.getenv("JIRA_EMAIL")
         if not v:
@@ -98,7 +98,7 @@ class JiraConfig(BaseAdapterConfig):
         return v
 
     @validator("api_token", pre=True, always=True)
-    def validate_api_token(cls, v):
+    def validate_api_token(self, v):
         if not v:
             v = os.getenv("JIRA_API_TOKEN")
         if not v:
@@ -116,7 +116,7 @@ class LinearConfig(BaseAdapterConfig):
     api_url: str = "https://api.linear.app/graphql"
 
     @validator("api_key", pre=True, always=True)
-    def validate_api_key(cls, v):
+    def validate_api_key(self, v):
         if not v:
             v = os.getenv("LINEAR_API_KEY")
         if not v:
@@ -155,7 +155,7 @@ class LoggingConfig(BaseModel):
 class AppConfig(BaseModel):
     """Main application configuration."""
 
-    adapters: Dict[
+    adapters: dict[
         str, Union[GitHubConfig, JiraConfig, LinearConfig, AITrackdownConfig]
     ] = {}
     queue: QueueConfig = QueueConfig()
@@ -164,7 +164,7 @@ class AppConfig(BaseModel):
     default_adapter: Optional[str] = None
 
     @root_validator(skip_on_failure=True)
-    def validate_adapters(cls, values):
+    def validate_adapters(self, values):
         """Validate adapter configurations."""
         adapters = values.get("adapters", {})
 
@@ -185,7 +185,7 @@ class AppConfig(BaseModel):
         """Get configuration for a specific adapter."""
         return self.adapters.get(adapter_name)
 
-    def get_enabled_adapters(self) -> Dict[str, BaseAdapterConfig]:
+    def get_enabled_adapters(self) -> dict[str, BaseAdapterConfig]:
         """Get all enabled adapters."""
         return {
             name: config for name, config in self.adapters.items() if config.enabled
@@ -197,7 +197,7 @@ class ConfigurationManager:
 
     _instance: Optional["ConfigurationManager"] = None
     _config: Optional[AppConfig] = None
-    _config_file_paths: List[Path] = []
+    _config_file_paths: list[Path] = []
 
     def __new__(cls) -> "ConfigurationManager":
         """Singleton pattern for global config access."""
@@ -209,7 +209,7 @@ class ConfigurationManager:
         """Initialize configuration manager."""
         if not hasattr(self, "_initialized"):
             self._initialized = True
-            self._config_cache: Dict[str, Any] = {}
+            self._config_cache: dict[str, Any] = {}
             self._find_config_files()
 
     def _find_config_files(self) -> None:
@@ -302,7 +302,7 @@ class ConfigurationManager:
         self._config = AppConfig(**config_data)
         return self._config
 
-    def _load_config_file(self, config_path: Path) -> Dict[str, Any]:
+    def _load_config_file(self, config_path: Path) -> dict[str, Any]:
         """Load configuration from YAML or JSON file."""
         try:
             with open(config_path, encoding="utf-8") as file:
@@ -332,7 +332,7 @@ class ConfigurationManager:
         config = self.get_config()
         return config.get_adapter_config(adapter_name)
 
-    def get_enabled_adapters(self) -> Dict[str, BaseAdapterConfig]:
+    def get_enabled_adapters(self) -> dict[str, BaseAdapterConfig]:
         """Get all enabled adapter configurations."""
         config = self.get_config()
         return config.get_enabled_adapters()