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

mcp_ticketer/cli/adapter_diagnostics.py

@@ -1,14 +1,10 @@
 """Adapter diagnostics and configuration validation."""
 
-import os
-import sys
 from pathlib import Path
-from typing import Any, Dict, List, Optional, Tuple
+from typing import Any
 
 from rich.console import Console
-from rich.panel import Panel
 from rich.table import Table
-from rich.text import Text
 
 from ..core import AdapterRegistry
 from ..core.env_discovery import discover_config
@@ -16,24 +12,28 @@ from ..core.env_discovery import discover_config
 
 def diagnose_adapter_configuration(console: Console) -> None:
     """Diagnose adapter configuration and provide recommendations.
-    
+
     Args:
+    ----
         console: Rich console for output
+
     """
-    console.print("\n[bold blue]🔍 MCP Ticketer Adapter Configuration Diagnostics[/bold blue]\n")
+    console.print(
+        "\n[bold blue]🔍 MCP Ticketer Adapter Configuration Diagnostics[/bold blue]\n"
+    )
 
     # 1. Check .env files
     _check_env_files(console)
-    
+
     # 2. Check configuration files
     _check_configuration_files(console)
-    
+
     # 3. Check adapter discovery
     _check_adapter_discovery(console)
-    
+
     # 4. Test adapter instantiation
     _test_adapter_instantiation(console)
-    
+
     # 5. Provide recommendations
     _provide_recommendations(console)
 
@@ -44,6 +44,7 @@ def _check_env_files(console: Console) -> None:
 
     # Load .env files
     from ..mcp.server import _load_env_configuration
+
     env_config = _load_env_configuration()
 
     # Check for .env files
@@ -60,10 +61,10 @@ def _check_env_files(console: Console) -> None:
             try:
                 # Count variables in file
                 var_count = 0
-                with open(env_path, 'r') as f:
+                with open(env_path) as f:
                     for line in f:
                         line = line.strip()
-                        if line and not line.startswith('#') and '=' in line:
+                        if line and not line.startswith("#") and "=" in line:
                             var_count += 1
 
                 status = "✅ Found"
@@ -81,11 +82,15 @@ def _check_env_files(console: Console) -> None:
 
     # Show discovered configuration
     if env_config:
-        console.print(f"\n[green]✅ Discovered adapter: {env_config['adapter_type']}[/green]")
-        config_keys = list(env_config['adapter_config'].keys())
+        console.print(
+            f"\n[green]✅ Discovered adapter: {env_config['adapter_type']}[/green]"
+        )
+        config_keys = list(env_config["adapter_config"].keys())
         console.print(f"[dim]Configuration keys: {config_keys}[/dim]")
     else:
-        console.print("\n[yellow]⚠️ No adapter configuration found in .env files[/yellow]")
+        console.print(
+            "\n[yellow]⚠️ No adapter configuration found in .env files[/yellow]"
+        )
 
     console.print()
 
@@ -93,20 +98,20 @@ def _check_env_files(console: Console) -> None:
 def _check_configuration_files(console: Console) -> None:
     """Check configuration files."""
     console.print("[bold]2. Configuration Files[/bold]")
-    
+
     config_files = [
         (".env.local", "Local environment file (highest priority)"),
         (".env", "Environment file"),
         (".mcp-ticketer/config.json", "Project configuration"),
         (str(Path.home() / ".mcp-ticketer" / "config.json"), "Global configuration"),
     ]
-    
+
     table = Table(show_header=True, header_style="bold magenta")
     table.add_column("File", style="cyan")
     table.add_column("Description", style="white")
     table.add_column("Status", style="green")
     table.add_column("Size", style="yellow")
-    
+
     for file_path, description in config_files:
         path = Path(file_path)
         if path.exists():
@@ -120,9 +125,9 @@ def _check_configuration_files(console: Console) -> None:
         else:
             status = "❌ Missing"
             size_str = "N/A"
-            
+
         table.add_row(str(path), description, status, size_str)
-    
+
     console.print(table)
     console.print()
 
@@ -130,35 +135,34 @@ def _check_configuration_files(console: Console) -> None:
 def _check_adapter_discovery(console: Console) -> None:
     """Check adapter discovery from configuration."""
     console.print("[bold]3. Adapter Discovery[/bold]")
-    
+
     try:
         # Discover configuration
         discovered = discover_config(Path.cwd())
-        
+
         if discovered and discovered.adapters:
             primary = discovered.get_primary_adapter()
-            
+
             table = Table(show_header=True, header_style="bold magenta")
             table.add_column("Adapter", style="cyan")
             table.add_column("Confidence", style="white")
             table.add_column("Source", style="green")
             table.add_column("Status", style="yellow")
-            
+
             for adapter_info in discovered.adapters:
                 confidence = f"{adapter_info.confidence:.0%}"
                 status = "✅ Primary" if adapter_info == primary else "⚪ Available"
-                
+
                 table.add_row(
-                    adapter_info.adapter_type,
-                    confidence,
-                    adapter_info.found_in,
-                    status
+                    adapter_info.adapter_type, confidence, adapter_info.found_in, status
                 )
-            
+
             console.print(table)
-            
+
             if primary:
-                console.print(f"\n[green]✅ Primary adapter detected: {primary.adapter_type}[/green]")
+                console.print(
+                    f"\n[green]✅ Primary adapter detected: {primary.adapter_type}[/green]"
+                )
                 console.print(f"[dim]Source: {primary.found_in}[/dim]")
                 console.print(f"[dim]Confidence: {primary.confidence:.0%}[/dim]")
             else:
@@ -166,10 +170,10 @@ def _check_adapter_discovery(console: Console) -> None:
         else:
             console.print("[red]❌ No adapters discovered[/red]")
             console.print("[dim]This usually means no credentials are configured[/dim]")
-    
+
     except Exception as e:
         console.print(f"[red]❌ Error during discovery: {e}[/red]")
-    
+
     console.print()
 
 
@@ -179,6 +183,7 @@ def _test_adapter_instantiation(console: Console) -> None:
 
     # Determine which adapter to test from .env files
     from ..mcp.server import _load_env_configuration
+
     env_config = _load_env_configuration()
 
     if env_config:
@@ -194,6 +199,7 @@ def _test_adapter_instantiation(console: Console) -> None:
                     adapter_type = primary.adapter_type
                     # Build config from discovery
                     from ..mcp.server import _build_adapter_config_from_env_vars
+
                     config = _build_adapter_config_from_env_vars(adapter_type, {})
                 else:
                     adapter_type = "aitrackdown"
@@ -212,16 +218,20 @@ def _test_adapter_instantiation(console: Console) -> None:
         # Try to instantiate adapter
         adapter = AdapterRegistry.get_adapter(adapter_type, config)
 
-        console.print(f"[green]✅ Adapter instantiated successfully: {adapter.__class__.__name__}[/green]")
+        console.print(
+            f"[green]✅ Adapter instantiated successfully: {adapter.__class__.__name__}[/green]"
+        )
 
         # Test basic functionality
-        if hasattr(adapter, 'validate_credentials'):
+        if hasattr(adapter, "validate_credentials"):
             try:
                 is_valid, error_msg = adapter.validate_credentials()
                 if is_valid:
                     console.print("[green]✅ Credentials validation passed[/green]")
                 else:
-                    console.print(f"[red]❌ Credentials validation failed: {error_msg}[/red]")
+                    console.print(
+                        f"[red]❌ Credentials validation failed: {error_msg}[/red]"
+                    )
             except Exception as e:
                 console.print(f"[yellow]⚠️ Credentials validation error: {e}[/yellow]")
 
@@ -230,16 +240,24 @@ def _test_adapter_instantiation(console: Console) -> None:
 
         # Provide specific guidance based on adapter type
         if adapter_type == "linear":
-            console.print("\n[yellow]Linear adapter requires in .env/.env.local:[/yellow]")
+            console.print(
+                "\n[yellow]Linear adapter requires in .env/.env.local:[/yellow]"
+            )
             console.print("• LINEAR_API_KEY=your_api_key")
-            console.print("• LINEAR_TEAM_ID=your_team_id (or LINEAR_TEAM_KEY=your_team_key)")
+            console.print(
+                "• LINEAR_TEAM_ID=your_team_id (or LINEAR_TEAM_KEY=your_team_key)"
+            )
         elif adapter_type == "github":
-            console.print("\n[yellow]GitHub adapter requires in .env/.env.local:[/yellow]")
+            console.print(
+                "\n[yellow]GitHub adapter requires in .env/.env.local:[/yellow]"
+            )
             console.print("• GITHUB_TOKEN=your_token")
             console.print("• GITHUB_OWNER=your_username")
             console.print("• GITHUB_REPO=your_repository")
         elif adapter_type == "jira":
-            console.print("\n[yellow]JIRA adapter requires in .env/.env.local:[/yellow]")
+            console.print(
+                "\n[yellow]JIRA adapter requires in .env/.env.local:[/yellow]"
+            )
             console.print("• JIRA_SERVER=your_server_url")
             console.print("• JIRA_EMAIL=your_email")
             console.print("• JIRA_API_TOKEN=your_token")
@@ -253,6 +271,7 @@ def _provide_recommendations(console: Console) -> None:
 
     # Check .env configuration
     from ..mcp.server import _load_env_configuration
+
     env_config = _load_env_configuration()
 
     recommendations = []
@@ -273,7 +292,9 @@ def _provide_recommendations(console: Console) -> None:
             if not config.get("api_key"):
                 recommendations.append("Add LINEAR_API_KEY to .env file")
             if not config.get("team_id") and not config.get("team_key"):
-                recommendations.append("Add LINEAR_TEAM_ID or LINEAR_TEAM_KEY to .env file")
+                recommendations.append(
+                    "Add LINEAR_TEAM_ID or LINEAR_TEAM_KEY to .env file"
+                )
 
         elif adapter_type == "github":
             missing = []
@@ -284,7 +305,9 @@ def _provide_recommendations(console: Console) -> None:
             if not config.get("repo"):
                 missing.append("GITHUB_REPO")
             if missing:
-                recommendations.append(f"Add missing GitHub variables to .env: {', '.join(missing)}")
+                recommendations.append(
+                    f"Add missing GitHub variables to .env: {', '.join(missing)}"
+                )
 
         elif adapter_type == "jira":
             missing = []
@@ -295,7 +318,9 @@ def _provide_recommendations(console: Console) -> None:
             if not config.get("api_token"):
                 missing.append("JIRA_API_TOKEN")
             if missing:
-                recommendations.append(f"Add missing JIRA variables to .env: {', '.join(missing)}")
+                recommendations.append(
+                    f"Add missing JIRA variables to .env: {', '.join(missing)}"
+                )
 
     if recommendations:
         for i, rec in enumerate(recommendations, 1):
@@ -305,8 +330,12 @@ def _provide_recommendations(console: Console) -> None:
 
     # Show .env file examples
     console.print("\n[bold].env File Examples:[/bold]")
-    console.print("• Linear: [cyan]echo 'MCP_TICKETER_ADAPTER=linear\\nLINEAR_API_KEY=your_key\\nLINEAR_TEAM_ID=your_team' > .env.local[/cyan]")
-    console.print("• GitHub: [cyan]echo 'MCP_TICKETER_ADAPTER=github\\nGITHUB_TOKEN=your_token\\nGITHUB_OWNER=user\\nGITHUB_REPO=repo' > .env.local[/cyan]")
+    console.print(
+        "• Linear: [cyan]echo 'MCP_TICKETER_ADAPTER=linear\\nLINEAR_API_KEY=your_key\\nLINEAR_TEAM_ID=your_team' > .env.local[/cyan]"
+    )
+    console.print(
+        "• GitHub: [cyan]echo 'MCP_TICKETER_ADAPTER=github\\nGITHUB_TOKEN=your_token\\nGITHUB_OWNER=user\\nGITHUB_REPO=repo' > .env.local[/cyan]"
+    )
 
     console.print("\n[bold]Quick Setup Commands:[/bold]")
     console.print("• For Linear: [cyan]mcp-ticketer init linear[/cyan]")
@@ -315,28 +344,33 @@ def _provide_recommendations(console: Console) -> None:
     console.print("• For local files: [cyan]mcp-ticketer init aitrackdown[/cyan]")
 
     console.print("\n[bold]Test Configuration:[/bold]")
-    console.print("• Run diagnostics: [cyan]mcp-ticketer diagnose[/cyan]")
-    console.print("• Test ticket creation: [cyan]mcp-ticketer create 'Test ticket'[/cyan]")
+    console.print("• Run diagnostics: [cyan]mcp-ticketer doctor[/cyan]")
+    console.print(
+        "• Test ticket creation: [cyan]mcp-ticketer create 'Test ticket'[/cyan]"
+    )
     console.print("• List tickets: [cyan]mcp-ticketer list[/cyan]")
 
 
-def get_adapter_status() -> Dict[str, Any]:
+def get_adapter_status() -> dict[str, Any]:
     """Get current adapter status for programmatic use.
 
     Returns:
+    -------
         Dictionary with adapter status information
+
     """
-    status = {
+    status: dict[str, Any] = {
         "adapter_type": None,
         "configuration_source": None,
         "credentials_valid": False,
         "error_message": None,
-        "recommendations": []
+        "recommendations": [],
     }
 
     try:
         # Check .env files first
         from ..mcp.server import _load_env_configuration
+
         env_config = _load_env_configuration()
 
         if env_config:
@@ -353,6 +387,7 @@ def get_adapter_status() -> Dict[str, Any]:
                     status["configuration_source"] = primary.found_in
                     # Build basic config
                     from ..mcp.server import _build_adapter_config_from_env_vars
+
                     config = _build_adapter_config_from_env_vars(adapter_type, {})
                 else:
                     adapter_type = "aitrackdown"
@@ -369,7 +404,7 @@ def get_adapter_status() -> Dict[str, Any]:
         adapter = AdapterRegistry.get_adapter(adapter_type, config)
 
         # Test credentials if possible
-        if hasattr(adapter, 'validate_credentials'):
+        if hasattr(adapter, "validate_credentials"):
             is_valid, error_msg = adapter.validate_credentials()
             status["credentials_valid"] = is_valid
             if not is_valid:
@@ -379,6 +414,8 @@ def get_adapter_status() -> Dict[str, Any]:
 
     except Exception as e:
         status["error_message"] = str(e)
-        status["recommendations"].append("Check .env file configuration and credentials")
+        status["recommendations"].append(
+            "Check .env file configuration and credentials"
+        )
 
     return status

mcp_ticketer/cli/auggie_configure.py

@@ -10,7 +10,8 @@ from typing import Any
 
 from rich.console import Console
 
-from .mcp_configure import find_mcp_ticketer_binary, load_project_config
+from .mcp_configure import load_project_config
+from .python_detection import get_mcp_ticketer_python
 
 console = Console()
 
@@ -71,18 +72,27 @@ def save_auggie_config(config_path: Path, config: dict[str, Any]) -> None:
 
 
 def create_auggie_server_config(
-    binary_path: str, project_config: dict[str, Any]
+    python_path: str, project_config: dict[str, Any], project_path: str | None = None
 ) -> dict[str, Any]:
     """Create Auggie MCP server configuration for mcp-ticketer.
 
+    Uses the CLI command (mcp-ticketer mcp) which implements proper
+    Content-Length framing via FastMCP SDK, required for modern MCP clients.
+
     Args:
-        binary_path: Path to mcp-ticketer binary
+        python_path: Path to Python executable in mcp-ticketer venv
         project_config: Project configuration from .mcp-ticketer/config.json
+        project_path: Project directory path (optional)
 
     Returns:
         Auggie MCP server configuration dict
 
     """
+    # IMPORTANT: Use CLI command, NOT Python module invocation
+    # The CLI uses FastMCP SDK which implements proper Content-Length framing
+    # Legacy python -m mcp_ticketer.mcp.server uses line-delimited JSON (incompatible)
+    from pathlib import Path
+
     # Get adapter configuration
     adapter = project_config.get("default_adapter", "aitrackdown")
     adapters_config = project_config.get("adapters", {})
@@ -91,6 +101,10 @@ def create_auggie_server_config(
     # Build environment variables
     env_vars = {}
 
+    # Add PYTHONPATH for project context
+    if project_path:
+        env_vars["PYTHONPATH"] = project_path
+
     # Add adapter type
     env_vars["MCP_TICKETER_ADAPTER"] = adapter
 
@@ -128,16 +142,94 @@ def create_auggie_server_config(
         if "project_key" in adapter_config:
             env_vars["JIRA_PROJECT_KEY"] = adapter_config["project_key"]
 
+    # Get mcp-ticketer CLI path from Python path
+    # If python_path is /path/to/venv/bin/python, CLI is /path/to/venv/bin/mcp-ticketer
+    python_dir = Path(python_path).parent
+    cli_path = str(python_dir / "mcp-ticketer")
+
+    # Build CLI arguments
+    args = ["mcp"]
+    if project_path:
+        args.extend(["--path", project_path])
+
     # Create server configuration (simpler than Gemini - no timeout/trust)
+    # NOTE: Environment variables below are optional fallbacks
+    # The CLI loads config from .mcp-ticketer/config.json
     config = {
-        "command": binary_path,
-        "args": ["serve"],
+        "command": cli_path,
+        "args": args,
         "env": env_vars,
     }
 
     return config
 
 
+def remove_auggie_mcp(dry_run: bool = False) -> None:
+    """Remove mcp-ticketer from Auggie CLI configuration.
+
+    IMPORTANT: Auggie CLI ONLY supports global configuration.
+    This will remove mcp-ticketer from ~/.augment/settings.json.
+
+    Args:
+        dry_run: Show what would be removed without making changes
+
+    """
+    # Step 1: Find Auggie config location
+    console.print("[cyan]🔍 Removing Auggie CLI global configuration...[/cyan]")
+    console.print(
+        "[yellow]⚠ NOTE: Auggie only supports global configuration (affects all projects)[/yellow]"
+    )
+
+    auggie_config_path = find_auggie_config()
+    console.print(f"[dim]Config location: {auggie_config_path}[/dim]")
+
+    # Step 2: Check if config file exists
+    if not auggie_config_path.exists():
+        console.print(
+            f"[yellow]⚠ No configuration found at {auggie_config_path}[/yellow]"
+        )
+        console.print("[dim]mcp-ticketer is not configured for Auggie[/dim]")
+        return
+
+    # Step 3: Load existing Auggie configuration
+    auggie_config = load_auggie_config(auggie_config_path)
+
+    # Step 4: Check if mcp-ticketer is configured
+    if "mcp-ticketer" not in auggie_config.get("mcpServers", {}):
+        console.print("[yellow]⚠ mcp-ticketer is not configured[/yellow]")
+        console.print(f"[dim]No mcp-ticketer entry found in {auggie_config_path}[/dim]")
+        return
+
+    # Step 5: Show what would be removed (dry run or actual removal)
+    if dry_run:
+        console.print("\n[cyan]DRY RUN - Would remove:[/cyan]")
+        console.print("  Server name: mcp-ticketer")
+        console.print(f"  From: {auggie_config_path}")
+        console.print("  Scope: Global (all projects)")
+        return
+
+    # Step 6: Remove mcp-ticketer from configuration
+    del auggie_config["mcpServers"]["mcp-ticketer"]
+
+    # Step 7: Save updated configuration
+    try:
+        save_auggie_config(auggie_config_path, auggie_config)
+        console.print("\n[green]✓ Successfully removed mcp-ticketer[/green]")
+        console.print(f"[dim]Configuration updated: {auggie_config_path}[/dim]")
+
+        # Next steps
+        console.print("\n[bold cyan]Next Steps:[/bold cyan]")
+        console.print("1. Restart Auggie CLI for changes to take effect")
+        console.print("2. mcp-ticketer will no longer be available via MCP")
+        console.print(
+            "\n[yellow]⚠ Note: This removes global configuration affecting all projects[/yellow]"
+        )
+
+    except Exception as e:
+        console.print(f"\n[red]✗ Failed to update configuration:[/red] {e}")
+        raise
+
+
 def configure_auggie_mcp(force: bool = False) -> None:
     """Configure Auggie CLI to use mcp-ticketer.
 
@@ -148,18 +240,22 @@ def configure_auggie_mcp(force: bool = False) -> None:
         force: Overwrite existing configuration
 
     Raises:
-        FileNotFoundError: If binary or project config not found
+        FileNotFoundError: If Python executable or project config not found
         ValueError: If configuration is invalid
 
     """
-    # Step 1: Find mcp-ticketer binary
-    console.print("[cyan]🔍 Finding mcp-ticketer binary...[/cyan]")
+    # Step 1: Find Python executable
+    console.print("[cyan]🔍 Finding mcp-ticketer Python executable...[/cyan]")
     try:
-        binary_path = find_mcp_ticketer_binary()
-        console.print(f"[green]✓[/green] Found: {binary_path}")
-    except FileNotFoundError as e:
-        console.print(f"[red]✗[/red] {e}")
-        raise
+        python_path = get_mcp_ticketer_python()
+        console.print(f"[green]✓[/green] Found: {python_path}")
+    except Exception as e:
+        console.print(f"[red]✗[/red] Could not find Python executable: {e}")
+        raise FileNotFoundError(
+            "Could not find mcp-ticketer Python executable. "
+            "Please ensure mcp-ticketer is installed.\n"
+            "Install with: pip install mcp-ticketer or pipx install mcp-ticketer"
+        ) from e
 
     # Step 2: Load project configuration
     console.print("\n[cyan]📖 Reading project configuration...[/cyan]")
@@ -193,8 +289,11 @@ def configure_auggie_mcp(force: bool = False) -> None:
             console.print("[yellow]⚠ Overwriting existing configuration[/yellow]")
 
     # Step 6: Create mcp-ticketer server config
+    project_path = str(Path.cwd())
     server_config = create_auggie_server_config(
-        binary_path=binary_path, project_config=project_config
+        python_path=python_path,
+        project_config=project_config,
+        project_path=project_path,
     )
 
     # Step 7: Update Auggie configuration
@@ -213,8 +312,10 @@ def configure_auggie_mcp(force: bool = False) -> None:
         console.print("\n[bold]Configuration Details:[/bold]")
         console.print("  Server name: mcp-ticketer")
         console.print(f"  Adapter: {adapter}")
-        console.print(f"  Binary: {binary_path}")
+        console.print(f"  Python: {python_path}")
+        console.print("  Command: python -m mcp_ticketer.mcp.server")
         console.print("  Scope: Global (affects all projects)")
+        console.print(f"  Project path: {project_path}")
         if "env" in server_config:
             console.print(
                 f"  Environment variables: {list(server_config['env'].keys())}"