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

mcp_ticketer/cli/main.py

@@ -5,7 +5,6 @@ import json
 import os
 from enum import Enum
 from pathlib import Path
-from typing import Optional
 
 import typer
 from dotenv import load_dotenv
@@ -21,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
@@ -84,7 +84,7 @@ class AdapterType(str, Enum):
     GITHUB = "github"
 
 
-def load_config(project_dir: Optional[Path] = None) -> dict:
+def load_config(project_dir: Path | None = None) -> dict:
     """Load configuration from project-local config file ONLY.
 
     SECURITY: This method ONLY reads from the current project directory
@@ -146,7 +146,7 @@ def load_config(project_dir: Optional[Path] = None) -> dict:
     return {"adapter": "aitrackdown", "config": {"base_path": ".aitrackdown"}}
 
 
-def _discover_from_env_files() -> Optional[str]:
+def _discover_from_env_files() -> str | None:
     """Discover adapter configuration from .env or .env.local files.
 
     Returns:
@@ -270,7 +270,7 @@ def merge_config(updates: dict) -> dict:
 
 
 def get_adapter(
-    override_adapter: Optional[str] = None, override_config: Optional[dict] = None
+    override_adapter: str | None = None, override_config: dict | None = None
 ):
     """Get configured adapter instance.
 
@@ -387,13 +387,13 @@ def _prompt_for_adapter_selection(console: Console) -> str:
 
 @app.command()
 def setup(
-    adapter: Optional[str] = typer.Option(
+    adapter: str | None = typer.Option(
         None,
         "--adapter",
         "-a",
         help="Adapter type to use (interactive prompt if not specified)",
     ),
-    project_path: Optional[str] = typer.Option(
+    project_path: str | None = typer.Option(
         None, "--path", help="Project path (default: current directory)"
     ),
     global_config: bool = typer.Option(
@@ -402,36 +402,36 @@ def setup(
         "-g",
         help="Save to global config instead of project-specific",
     ),
-    base_path: Optional[str] = typer.Option(
+    base_path: str | None = typer.Option(
         None,
         "--base-path",
         "-p",
         help="Base path for ticket storage (AITrackdown only)",
     ),
-    api_key: Optional[str] = typer.Option(
+    api_key: str | None = typer.Option(
         None, "--api-key", help="API key for Linear or API token for JIRA"
     ),
-    team_id: Optional[str] = typer.Option(
+    team_id: str | None = typer.Option(
         None, "--team-id", help="Linear team ID (required for Linear adapter)"
     ),
-    jira_server: Optional[str] = typer.Option(
+    jira_server: str | None = typer.Option(
         None,
         "--jira-server",
         help="JIRA server URL (e.g., https://company.atlassian.net)",
     ),
-    jira_email: Optional[str] = typer.Option(
+    jira_email: str | None = typer.Option(
         None, "--jira-email", help="JIRA user email for authentication"
     ),
-    jira_project: Optional[str] = typer.Option(
+    jira_project: str | None = typer.Option(
         None, "--jira-project", help="Default JIRA project key"
     ),
-    github_owner: Optional[str] = typer.Option(
+    github_owner: str | None = typer.Option(
         None, "--github-owner", help="GitHub repository owner"
     ),
-    github_repo: Optional[str] = typer.Option(
+    github_repo: str | None = typer.Option(
         None, "--github-repo", help="GitHub repository name"
     ),
-    github_token: Optional[str] = typer.Option(
+    github_token: str | None = typer.Option(
         None, "--github-token", help="GitHub Personal Access Token"
     ),
 ) -> None:
@@ -471,13 +471,13 @@ def setup(
 
 @app.command()
 def init(
-    adapter: Optional[str] = typer.Option(
+    adapter: str | None = typer.Option(
         None,
         "--adapter",
         "-a",
         help="Adapter type to use (interactive prompt if not specified)",
     ),
-    project_path: Optional[str] = typer.Option(
+    project_path: str | None = typer.Option(
         None, "--path", help="Project path (default: current directory)"
     ),
     global_config: bool = typer.Option(
@@ -486,40 +486,40 @@ def init(
         "-g",
         help="Save to global config instead of project-specific",
     ),
-    base_path: Optional[str] = typer.Option(
+    base_path: str | None = typer.Option(
         None,
         "--base-path",
         "-p",
         help="Base path for ticket storage (AITrackdown only)",
     ),
-    api_key: Optional[str] = typer.Option(
+    api_key: str | None = typer.Option(
         None, "--api-key", help="API key for Linear or API token for JIRA"
     ),
-    team_id: Optional[str] = typer.Option(
+    team_id: str | None = typer.Option(
         None, "--team-id", help="Linear team ID (required for Linear adapter)"
     ),
-    jira_server: Optional[str] = typer.Option(
+    jira_server: str | None = typer.Option(
         None,
         "--jira-server",
         help="JIRA server URL (e.g., https://company.atlassian.net)",
     ),
-    jira_email: Optional[str] = typer.Option(
+    jira_email: str | None = typer.Option(
         None, "--jira-email", help="JIRA user email for authentication"
     ),
-    jira_project: Optional[str] = typer.Option(
+    jira_project: str | None = typer.Option(
         None, "--jira-project", help="Default JIRA project key"
     ),
-    github_owner: Optional[str] = typer.Option(
+    github_owner: str | None = typer.Option(
         None, "--github-owner", help="GitHub repository owner"
     ),
-    github_repo: Optional[str] = typer.Option(
+    github_repo: str | None = typer.Option(
         None, "--github-repo", help="GitHub repository name"
     ),
-    github_token: Optional[str] = typer.Option(
+    github_token: str | None = typer.Option(
         None, "--github-token", help="GitHub Personal Access Token"
     ),
 ) -> None:
-    """Initialize mcp-ticketer for the current project.
+    """Initialize mcp-ticketer for the current project (synonymous with 'install' and 'setup').
 
     This command sets up MCP Ticketer configuration with interactive prompts
     to guide you through the process. It auto-detects adapter configuration
@@ -528,11 +528,13 @@ def init(
     Creates .mcp-ticketer/config.json in the current directory with
     auto-detected or specified adapter configuration.
 
-    Note: 'setup' and 'install' are synonyms for this command.
+    Note: 'init', 'install', and 'setup' are all synonyms - use whichever feels natural.
 
     Examples:
-        # Interactive setup (same as 'setup' and 'install')
+        # Interactive setup (all three commands are identical)
         mcp-ticketer init
+        mcp-ticketer install
+        mcp-ticketer setup
 
         # Force specific adapter
         mcp-ticketer init --adapter linear
@@ -669,20 +671,29 @@ def init(
             if linear_api_key:
                 linear_config["api_key"] = linear_api_key
 
-            # Team ID
+            # Team ID or Team Key
+            # Try environment variables first
+            linear_team_key = os.getenv("LINEAR_TEAM_KEY")
             linear_team_id = team_id or os.getenv("LINEAR_TEAM_ID")
-            if not linear_team_id and not discovered:
-                console.print("\nYou need your Linear team ID.")
-                console.print("[dim]Find it in Linear settings or team URL[/dim]\n")
 
-                linear_team_id = typer.prompt("Enter your Linear team ID")
+            if not linear_team_key and not linear_team_id and not discovered:
+                console.print("\n[bold]Linear Team Configuration[/bold]")
+                console.print("Enter your team key (e.g., 'ENG', 'DESIGN', 'PRODUCT')")
+                console.print("[dim]Find it in: Linear Settings → Teams → Your Team → Key field[/dim]\n")
+
+                linear_team_key = typer.prompt("Team key")
 
+            # Save whichever was provided
+            if linear_team_key:
+                linear_config["team_key"] = linear_team_key
             if linear_team_id:
                 linear_config["team_id"] = linear_team_id
 
-            if not linear_config.get("api_key") or not linear_config.get("team_id"):
+            if not linear_config.get("api_key") or (
+                not linear_config.get("team_id") and not linear_config.get("team_key")
+            ):
                 console.print(
-                    "[red]Error:[/red] Linear requires both API key and team ID"
+                    "[red]Error:[/red] Linear requires both API key and team ID/key"
                 )
                 console.print(
                     "Run 'mcp-ticketer init --adapter linear' with proper credentials"
@@ -891,98 +902,20 @@ def _show_next_steps(
     console.print("[dim]Run 'mcp-ticketer --help' for more commands[/dim]")
 
 
-# Keep the old install command as deprecated alias to init
-@app.command(deprecated=True, hidden=True)
-def install(
-    adapter: Optional[str] = typer.Option(
-        None,
-        "--adapter",
-        "-a",
-        help="Adapter type to use (auto-detected from .env if not specified)",
-    ),
-    project_path: Optional[str] = typer.Option(
-        None, "--path", help="Project path (default: current directory)"
-    ),
-    global_config: bool = typer.Option(
-        False,
-        "--global",
-        "-g",
-        help="Save to global config instead of project-specific",
-    ),
-    base_path: Optional[str] = typer.Option(
-        None,
-        "--base-path",
-        "-p",
-        help="Base path for ticket storage (AITrackdown only)",
-    ),
-    api_key: Optional[str] = typer.Option(
-        None, "--api-key", help="API key for Linear or API token for JIRA"
-    ),
-    team_id: Optional[str] = typer.Option(
-        None, "--team-id", help="Linear team ID (required for Linear adapter)"
-    ),
-    jira_server: Optional[str] = typer.Option(
-        None,
-        "--jira-server",
-        help="JIRA server URL (e.g., https://company.atlassian.net)",
-    ),
-    jira_email: Optional[str] = typer.Option(
-        None, "--jira-email", help="JIRA user email for authentication"
-    ),
-    jira_project: Optional[str] = typer.Option(
-        None, "--jira-project", help="Default JIRA project key"
-    ),
-    github_owner: Optional[str] = typer.Option(
-        None, "--github-owner", help="GitHub repository owner"
-    ),
-    github_repo: Optional[str] = typer.Option(
-        None, "--github-repo", help="GitHub repository name"
-    ),
-    github_token: Optional[str] = typer.Option(
-        None, "--github-token", help="GitHub Personal Access Token"
-    ),
-) -> None:
-    """DEPRECATED: Use 'mcp-ticketer init' instead.
-
-    This command is deprecated. Use 'mcp-ticketer init' for project initialization.
-
-    """
-    console.print(
-        "[yellow]⚠️  'install' is deprecated. Use 'mcp-ticketer init' instead.[/yellow]\n"
-    )
-    # Call init with all parameters
-    init(
-        adapter=adapter,
-        project_path=project_path,
-        global_config=global_config,
-        base_path=base_path,
-        api_key=api_key,
-        team_id=team_id,
-        jira_server=jira_server,
-        jira_email=jira_email,
-        jira_project=jira_project,
-        github_owner=github_owner,
-        github_repo=github_repo,
-        github_token=github_token,
-    )
-
-
 @app.command("set")
 def set_config(
-    adapter: Optional[AdapterType] = typer.Option(
+    adapter: AdapterType | None = typer.Option(
         None, "--adapter", "-a", help="Set default adapter"
     ),
-    team_key: Optional[str] = typer.Option(
+    team_key: str | None = typer.Option(
         None, "--team-key", help="Linear team key (e.g., BTA)"
     ),
-    team_id: Optional[str] = typer.Option(None, "--team-id", help="Linear team ID"),
-    owner: Optional[str] = typer.Option(
-        None, "--owner", help="GitHub repository owner"
-    ),
-    repo: Optional[str] = typer.Option(None, "--repo", help="GitHub repository name"),
-    server: Optional[str] = typer.Option(None, "--server", help="JIRA server URL"),
-    project: Optional[str] = typer.Option(None, "--project", help="JIRA project key"),
-    base_path: Optional[str] = typer.Option(
+    team_id: str | None = typer.Option(None, "--team-id", help="Linear team ID"),
+    owner: str | None = typer.Option(None, "--owner", help="GitHub repository owner"),
+    repo: str | None = typer.Option(None, "--repo", help="GitHub repository name"),
+    server: str | None = typer.Option(None, "--server", help="JIRA server URL"),
+    project: str | None = typer.Option(None, "--project", help="JIRA project key"),
+    base_path: str | None = typer.Option(
         None, "--base-path", help="AITrackdown base path"
     ),
 ) -> None:
@@ -1072,16 +1005,12 @@ def set_config(
 @app.command("configure")
 def configure_command(
     show: bool = typer.Option(False, "--show", help="Show current configuration"),
-    adapter: Optional[str] = typer.Option(
+    adapter: str | None = typer.Option(
         None, "--adapter", help="Set default adapter type"
     ),
-    api_key: Optional[str] = typer.Option(None, "--api-key", help="Set API key/token"),
-    project_id: Optional[str] = typer.Option(
-        None, "--project-id", help="Set project ID"
-    ),
-    team_id: Optional[str] = typer.Option(
-        None, "--team-id", help="Set team ID (Linear)"
-    ),
+    api_key: str | None = typer.Option(None, "--api-key", help="Set API key/token"),
+    project_id: str | None = typer.Option(None, "--project-id", help="Set project ID"),
+    team_id: str | None = typer.Option(None, "--team-id", help="Set team ID (Linear)"),
     global_scope: bool = typer.Option(
         False,
         "--global",
@@ -1257,29 +1186,29 @@ def old_queue_health_command(
 @app.command(deprecated=True, hidden=True)
 def create(
     title: str = typer.Argument(..., help="Ticket title"),
-    description: Optional[str] = typer.Option(
+    description: str | None = typer.Option(
         None, "--description", "-d", help="Ticket description"
     ),
     priority: Priority = typer.Option(
         Priority.MEDIUM, "--priority", "-p", help="Priority level"
     ),
-    tags: Optional[list[str]] = typer.Option(
+    tags: list[str] | None = typer.Option(
         None, "--tag", "-t", help="Tags (can be specified multiple times)"
     ),
-    assignee: Optional[str] = typer.Option(
+    assignee: str | None = typer.Option(
         None, "--assignee", "-a", help="Assignee username"
     ),
-    project: Optional[str] = typer.Option(
+    project: str | None = typer.Option(
         None,
         "--project",
         help="Parent project/epic ID (synonym for --epic)",
     ),
-    epic: Optional[str] = typer.Option(
+    epic: str | None = typer.Option(
         None,
         "--epic",
         help="Parent epic/project ID (synonym for --project)",
     ),
-    adapter: Optional[AdapterType] = typer.Option(
+    adapter: AdapterType | None = typer.Option(
         None, "--adapter", help="Override default adapter"
     ),
 ) -> None:
@@ -1488,14 +1417,14 @@ def create(
 
 @app.command("list", deprecated=True, hidden=True)
 def list_tickets(
-    state: Optional[TicketState] = typer.Option(
+    state: TicketState | None = typer.Option(
         None, "--state", "-s", help="Filter by state"
     ),
-    priority: Optional[Priority] = typer.Option(
+    priority: Priority | None = typer.Option(
         None, "--priority", "-p", help="Filter by priority"
     ),
     limit: int = typer.Option(10, "--limit", "-l", help="Maximum number of tickets"),
-    adapter: Optional[AdapterType] = typer.Option(
+    adapter: AdapterType | None = typer.Option(
         None, "--adapter", help="Override default adapter"
     ),
 ) -> None:
@@ -1551,7 +1480,7 @@ def list_tickets(
 def show(
     ticket_id: str = typer.Argument(..., help="Ticket ID"),
     comments: bool = typer.Option(False, "--comments", "-c", help="Show comments"),
-    adapter: Optional[AdapterType] = typer.Option(
+    adapter: AdapterType | None = typer.Option(
         None, "--adapter", help="Override default adapter"
     ),
 ) -> None:
@@ -1607,7 +1536,7 @@ def show(
 def comment(
     ticket_id: str = typer.Argument(..., help="Ticket ID"),
     content: str = typer.Argument(..., help="Comment content"),
-    adapter: Optional[AdapterType] = typer.Option(
+    adapter: AdapterType | None = typer.Option(
         None, "--adapter", help="Override default adapter"
     ),
 ) -> None:
@@ -1648,17 +1577,15 @@ def comment(
 @app.command(deprecated=True, hidden=True)
 def update(
     ticket_id: str = typer.Argument(..., help="Ticket ID"),
-    title: Optional[str] = typer.Option(None, "--title", help="New title"),
-    description: Optional[str] = typer.Option(
+    title: str | None = typer.Option(None, "--title", help="New title"),
+    description: str | None = typer.Option(
         None, "--description", "-d", help="New description"
     ),
-    priority: Optional[Priority] = typer.Option(
+    priority: Priority | None = typer.Option(
         None, "--priority", "-p", help="New priority"
     ),
-    assignee: Optional[str] = typer.Option(
-        None, "--assignee", "-a", help="New assignee"
-    ),
-    adapter: Optional[AdapterType] = typer.Option(
+    assignee: str | None = typer.Option(None, "--assignee", "-a", help="New assignee"),
+    adapter: AdapterType | None = typer.Option(
         None, "--adapter", help="Override default adapter"
     ),
 ) -> None:
@@ -1718,13 +1645,13 @@ def update(
 @app.command(deprecated=True, hidden=True)
 def transition(
     ticket_id: str = typer.Argument(..., help="Ticket ID"),
-    state_positional: Optional[TicketState] = typer.Argument(
+    state_positional: TicketState | None = typer.Argument(
         None, help="Target state (positional - deprecated, use --state instead)"
     ),
-    state: Optional[TicketState] = typer.Option(
+    state: TicketState | None = typer.Option(
         None, "--state", "-s", help="Target state (recommended)"
     ),
-    adapter: Optional[AdapterType] = typer.Option(
+    adapter: AdapterType | None = typer.Option(
         None, "--adapter", help="Override default adapter"
     ),
 ) -> None:
@@ -1789,12 +1716,12 @@ def transition(
 
 @app.command(deprecated=True, hidden=True)
 def search(
-    query: Optional[str] = typer.Argument(None, help="Search query"),
-    state: Optional[TicketState] = typer.Option(None, "--state", "-s"),
-    priority: Optional[Priority] = typer.Option(None, "--priority", "-p"),
-    assignee: Optional[str] = typer.Option(None, "--assignee", "-a"),
+    query: str | None = typer.Argument(None, help="Search query"),
+    state: TicketState | None = typer.Option(None, "--state", "-s"),
+    priority: Priority | None = typer.Option(None, "--priority", "-p"),
+    assignee: str | None = typer.Option(None, "--assignee", "-a"),
     limit: int = typer.Option(10, "--limit", "-l"),
-    adapter: Optional[AdapterType] = typer.Option(
+    adapter: AdapterType | None = typer.Option(
         None, "--adapter", help="Override default adapter"
     ),
 ) -> None:
@@ -1852,7 +1779,7 @@ app.add_typer(discover_app, name="discover")
 # Add diagnostics command
 @app.command("diagnose")
 def diagnose_command(
-    output_file: Optional[str] = typer.Option(
+    output_file: str | None = typer.Option(
         None, "--output", "-o", help="Save full report to file"
     ),
     json_output: bool = typer.Option(
@@ -1899,7 +1826,7 @@ def diagnose_command(
 
 @app.command("doctor")
 def doctor_alias(
-    output_file: Optional[str] = typer.Option(
+    output_file: str | None = typer.Option(
         None, "--output", "-o", help="Save full report to file"
     ),
     json_output: bool = typer.Option(
@@ -1941,50 +1868,229 @@ mcp_app = typer.Typer(
     add_completion=False,
 )
 
-# Create install command group (like kuzu-memory)
-install_app = typer.Typer(
-    name="install",
-    help="Manage AI system integrations",
-    add_completion=False,
-)
-
 
-@install_app.command(name="add")
-def install_add(
-    platform: str = typer.Argument(
-        ..., help="Platform to install (claude-code, claude-desktop, etc.)"
+@app.command()
+def install(
+    adapter: str | None = typer.Option(
+        None,
+        "--adapter",
+        "-a",
+        help="Adapter type to use (interactive prompt if not specified)",
+    ),
+    project_path: str | None = typer.Option(
+        None, "--path", help="Project path (default: current directory)"
     ),
-    project_path: Optional[str] = typer.Option(
-        None, "--project", help="Project directory"
+    global_config: bool = typer.Option(
+        False,
+        "--global",
+        "-g",
+        help="Save to global config instead of project-specific",
+    ),
+    base_path: str | None = typer.Option(
+        None,
+        "--base-path",
+        "-p",
+        help="Base path for ticket storage (AITrackdown only)",
+    ),
+    api_key: str | None = typer.Option(
+        None, "--api-key", help="API key for Linear or API token for JIRA"
+    ),
+    team_id: str | None = typer.Option(
+        None, "--team-id", help="Linear team ID (required for Linear adapter)"
+    ),
+    jira_server: str | None = typer.Option(
+        None,
+        "--jira-server",
+        help="JIRA server URL (e.g., https://company.atlassian.net)",
+    ),
+    jira_email: str | None = typer.Option(
+        None, "--jira-email", help="JIRA user email for authentication"
+    ),
+    jira_project: str | None = typer.Option(
+        None, "--jira-project", help="Default JIRA project key"
+    ),
+    github_owner: str | None = typer.Option(
+        None, "--github-owner", help="GitHub repository owner"
+    ),
+    github_repo: str | None = typer.Option(
+        None, "--github-repo", help="GitHub repository name"
+    ),
+    github_token: str | None = typer.Option(
+        None, "--github-token", help="GitHub Personal Access Token"
+    ),
+    platform: str | None = typer.Option(
+        None,
+        "--platform",
+        help="Platform to configure MCP for (claude-code, claude-desktop, auggie, gemini, codex)",
+    ),
+    dry_run: bool = typer.Option(
+        False,
+        "--dry-run",
+        help="Show what would be done without making changes (for platform installation)",
+    ),
+) -> None:
+    """Install and initialize mcp-ticketer (synonymous with 'init' and 'setup').
+
+    Without arguments, runs interactive setup wizard to configure your ticket adapter.
+    With --platform, installs MCP configuration for AI platforms.
+
+    This command serves two purposes:
+    1. Adapter initialization (same as 'init' and 'setup')
+    2. Platform MCP configuration (when using --platform flag)
+
+    Examples:
+        # Interactive setup (same as 'init' and 'setup')
+        mcp-ticketer install
+
+        # Setup with specific adapter
+        mcp-ticketer install --adapter linear
+
+        # Install MCP for Claude Code
+        mcp-ticketer install --platform claude-code
+
+        # Install MCP for Claude Desktop
+        mcp-ticketer install --platform claude-desktop
+
+    """
+    # If platform flag is provided, handle MCP platform installation
+    if platform is not None:
+        # Import configuration functions
+        from .auggie_configure import configure_auggie_mcp
+        from .codex_configure import configure_codex_mcp
+        from .gemini_configure import configure_gemini_mcp
+        from .mcp_configure import configure_claude_mcp
+
+        # Map platform names to configuration functions
+        platform_mapping = {
+            "claude-code": {
+                "func": lambda: configure_claude_mcp(global_config=False, force=True),
+                "name": "Claude Code",
+            },
+            "claude-desktop": {
+                "func": lambda: configure_claude_mcp(global_config=True, force=True),
+                "name": "Claude Desktop",
+            },
+            "auggie": {
+                "func": lambda: configure_auggie_mcp(force=True),
+                "name": "Auggie",
+            },
+            "gemini": {
+                "func": lambda: configure_gemini_mcp(scope="project", force=True),
+                "name": "Gemini CLI",
+            },
+            "codex": {
+                "func": lambda: configure_codex_mcp(force=True),
+                "name": "Codex",
+            },
+        }
+
+        if platform not in platform_mapping:
+            console.print(f"[red]Unknown platform: {platform}[/red]")
+            console.print("\n[bold]Available platforms:[/bold]")
+            for p in platform_mapping.keys():
+                console.print(f"  • {p}")
+            raise typer.Exit(1)
+
+        config = platform_mapping[platform]
+
+        if dry_run:
+            console.print(f"[cyan]DRY RUN - Would install for {config['name']}[/cyan]")
+            return
+
+        try:
+            config["func"]()
+        except Exception as e:
+            console.print(f"[red]Installation failed: {e}[/red]")
+            raise typer.Exit(1)
+        return
+
+    # Otherwise, delegate to init for adapter initialization
+    # This makes 'install' and 'init' synonymous when called without --platform
+    init(
+        adapter=adapter,
+        project_path=project_path,
+        global_config=global_config,
+        base_path=base_path,
+        api_key=api_key,
+        team_id=team_id,
+        jira_server=jira_server,
+        jira_email=jira_email,
+        jira_project=jira_project,
+        github_owner=github_owner,
+        github_repo=github_repo,
+        github_token=github_token,
+    )
+
+
+@app.command()
+def remove(
+    platform: str | None = typer.Argument(
+        None,
+        help="Platform to remove (claude-code, claude-desktop, auggie, gemini, codex)",
     ),
     dry_run: bool = typer.Option(
         False, "--dry-run", help="Show what would be done without making changes"
     ),
-    verbose: bool = typer.Option(False, "--verbose", help="Enable verbose output"),
 ) -> None:
-    """Install mcp-ticketer integration for an AI platform.
+    """Remove mcp-ticketer from AI platforms.
 
-    Each platform gets the right configuration automatically:
-      - claude-code: Project-level MCP server
-      - claude-desktop: Global MCP server
+    Without arguments, shows help and available platforms.
+    With a platform argument, removes MCP configuration for that platform.
 
     Examples:
-        # Install for Claude Code (project-level)
-        mcp-ticketer install add claude-code
+        # Remove from Claude Code (project-level)
+        mcp-ticketer remove claude-code
+
+        # Remove from Claude Desktop (global)
+        mcp-ticketer remove claude-desktop
 
-        # Install for Claude Desktop (global)
-        mcp-ticketer install add claude-desktop
+        # Remove from Auggie
+        mcp-ticketer remove auggie
 
         # Dry run to preview changes
-        mcp-ticketer install add claude-code --dry-run
+        mcp-ticketer remove claude-code --dry-run
 
     """
-    from .mcp_configure import configure_claude_mcp
+    # If no platform specified, show help message
+    if platform is None:
+        console.print("[bold]Remove mcp-ticketer from AI platforms[/bold]\n")
+        console.print("Usage: mcp-ticketer remove <platform>\n")
+        console.print("[bold]Available platforms:[/bold]")
+        console.print("  • claude-code     - Claude Code (project-level)")
+        console.print("  • claude-desktop  - Claude Desktop (global)")
+        console.print("  • auggie          - Auggie (global)")
+        console.print("  • gemini          - Gemini CLI (project-level by default)")
+        console.print("  • codex           - Codex (global)")
+        return
+
+    # Import removal functions
+    from .auggie_configure import remove_auggie_mcp
+    from .codex_configure import remove_codex_mcp
+    from .gemini_configure import remove_gemini_mcp
+    from .mcp_configure import remove_claude_mcp
 
-    # Map platform names to configuration
+    # Map platform names to removal functions
     platform_mapping = {
-        "claude-code": {"global": False, "name": "Claude Code"},
-        "claude-desktop": {"global": True, "name": "Claude Desktop"},
+        "claude-code": {
+            "func": lambda: remove_claude_mcp(global_config=False, dry_run=dry_run),
+            "name": "Claude Code",
+        },
+        "claude-desktop": {
+            "func": lambda: remove_claude_mcp(global_config=True, dry_run=dry_run),
+            "name": "Claude Desktop",
+        },
+        "auggie": {
+            "func": lambda: remove_auggie_mcp(dry_run=dry_run),
+            "name": "Auggie",
+        },
+        "gemini": {
+            "func": lambda: remove_gemini_mcp(scope="project", dry_run=dry_run),
+            "name": "Gemini CLI",
+        },
+        "codex": {
+            "func": lambda: remove_codex_mcp(dry_run=dry_run),
+            "name": "Codex",
+        },
     }
 
     if platform not in platform_mapping:
@@ -1996,17 +2102,48 @@ def install_add(
 
     config = platform_mapping[platform]
 
-    if dry_run:
-        console.print(f"[cyan]DRY RUN - Would install for {config['name']}[/cyan]")
-        return
-
     try:
-        configure_claude_mcp(global_config=config["global"], force=True)
+        config["func"]()
     except Exception as e:
-        console.print(f"[red]Installation failed: {e}[/red]")
+        console.print(f"[red]Removal failed: {e}[/red]")
         raise typer.Exit(1)
 
 
+@app.command()
+def uninstall(
+    platform: str | None = typer.Argument(
+        None,
+        help="Platform to uninstall (claude-code, claude-desktop, auggie, gemini, codex)",
+    ),
+    dry_run: bool = typer.Option(
+        False, "--dry-run", help="Show what would be done without making changes"
+    ),
+) -> None:
+    """Uninstall mcp-ticketer from AI platforms (alias for remove).
+
+    This is an alias for the 'remove' command.
+
+    Without arguments, shows help and available platforms.
+    With a platform argument, removes MCP configuration for that platform.
+
+    Examples:
+        # Uninstall from Claude Code (project-level)
+        mcp-ticketer uninstall claude-code
+
+        # Uninstall from Claude Desktop (global)
+        mcp-ticketer uninstall claude-desktop
+
+        # Uninstall from Auggie
+        mcp-ticketer uninstall auggie
+
+        # Dry run to preview changes
+        mcp-ticketer uninstall claude-code --dry-run
+
+    """
+    # Call the remove command with the same parameters
+    remove(platform=platform, dry_run=dry_run)
+
+
 @app.command(deprecated=True, hidden=True)
 def check(queue_id: str = typer.Argument(..., help="Queue ID to check")):
     """Check status of a queued operation.
@@ -2057,10 +2194,10 @@ def check(queue_id: str = typer.Argument(..., help="Queue ID to check")):
 
 @mcp_app.command(name="serve")
 def mcp_serve(
-    adapter: Optional[AdapterType] = typer.Option(
+    adapter: AdapterType | None = typer.Option(
         None, "--adapter", "-a", help="Override default adapter type"
     ),
-    base_path: Optional[str] = typer.Option(
+    base_path: str | None = typer.Option(
         None, "--base-path", help="Base path for AITrackdown adapter"
     ),
 ):
@@ -2077,7 +2214,8 @@ def mcp_serve(
       2. Global: ~/.mcp-ticketer/config.json
       3. Default: aitrackdown adapter with .aitrackdown base path
     """
-    from ..mcp.server import MCPTicketServer
+    from ..mcp.server_sdk import configure_adapter
+    from ..mcp.server_sdk import main as sdk_main
 
     # Load configuration (respects project-specific config in cwd)
     config = load_config()
@@ -2118,21 +2256,22 @@ def mcp_serve(
     if sys.stderr.isatty():
         # Only print if stderr is a terminal (not redirected)
         console.file = sys.stderr
-        console.print(f"[green]Starting MCP server[/green] with {adapter_type} adapter")
+        console.print(
+            f"[green]Starting MCP SDK server[/green] with {adapter_type} adapter"
+        )
         console.print(
             "[dim]Server running on stdio. Send JSON-RPC requests via stdin.[/dim]"
         )
 
-    # Create and run server
+    # Configure adapter and run SDK server
     try:
-        server = MCPTicketServer(adapter_type, adapter_config)
-        asyncio.run(server.run())
+        configure_adapter(adapter_type, adapter_config)
+        sdk_main()
     except KeyboardInterrupt:
-        # Also send this to stderr
+        # Send this to stderr
         if sys.stderr.isatty():
             console.print("\n[yellow]Server stopped by user[/yellow]")
-        if "server" in locals():
-            asyncio.run(server.stop())
+        sys.exit(0)
     except Exception as e:
         # Log error to stderr
         sys.stderr.write(f"MCP server error: {e}\n")
@@ -2292,7 +2431,6 @@ def mcp_auggie(
 
 # Add command groups to main app (must be after all subcommands are defined)
 app.add_typer(mcp_app, name="mcp")
-app.add_typer(install_app, name="install")
 
 
 def main():