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

mcp_ticketer/mcp/server/tools/comment_tools.py

@@ -3,10 +3,43 @@
 This module implements tools for adding and retrieving comments on tickets.
 """
 
+import logging
 from typing import Any
 
+from ....core.adapter import BaseAdapter
 from ....core.models import Comment
-from ..server_sdk import get_adapter, mcp
+from ....core.url_parser import is_url
+from ..server_sdk import get_adapter, get_router, has_router, mcp
+
+
+def _build_adapter_metadata(
+    adapter: BaseAdapter,
+    ticket_id: str | None = None,
+    is_routed: bool = False,
+) -> dict[str, Any]:
+    """Build adapter metadata for MCP responses.
+
+    Args:
+        adapter: The adapter that handled the operation
+        ticket_id: Optional ticket ID to include in metadata
+        is_routed: Whether this was routed via URL detection
+
+    Returns:
+        Dictionary with adapter metadata fields
+
+    """
+    metadata = {
+        "adapter": adapter.adapter_type,
+        "adapter_name": adapter.adapter_display_name,
+    }
+
+    if ticket_id:
+        metadata["ticket_id"] = ticket_id
+
+    if is_routed:
+        metadata["routed_from_url"] = True
+
+    return metadata
 
 
 @mcp.tool()
@@ -17,14 +50,17 @@ async def ticket_comment(
     limit: int = 10,
     offset: int = 0,
 ) -> dict[str, Any]:
-    """Add or list comments on a ticket.
+    """Add or list comments on a ticket using ID or URL.
 
     This tool supports two operations:
     - 'add': Add a new comment to a ticket (requires 'text' parameter)
     - 'list': Retrieve comments from a ticket (supports pagination)
 
+    Supports both plain ticket IDs and full URLs from multiple platforms.
+    See ticket_read for supported URL formats.
+
     Args:
-        ticket_id: Unique identifier of the ticket
+        ticket_id: Ticket ID or URL
         operation: Operation to perform - must be 'add' or 'list'
         text: Comment text (required when operation='add')
         limit: Maximum number of comments to return (used when operation='list', default: 10)
@@ -35,8 +71,6 @@ async def ticket_comment(
 
     """
     try:
-        adapter = get_adapter()
-
         # Validate operation
         if operation not in ["add", "list"]:
             return {
@@ -54,29 +88,57 @@ async def ticket_comment(
 
             # Create comment object
             comment = Comment(
-                ticket_id=ticket_id,
+                ticket_id=ticket_id,  # Will be normalized by router if URL
                 content=text,
             )
 
-            # Add comment via adapter
-            created = await adapter.add_comment(comment)
+            # Route to appropriate adapter
+            is_routed = False
+            if is_url(ticket_id) and has_router():
+                router = get_router()
+                logging.info(f"Routing add_comment for URL: {ticket_id}")
+                created = await router.route_add_comment(ticket_id, comment)
+                is_routed = True
+                normalized_id, _, _ = router._normalize_ticket_id(ticket_id)
+                adapter = router._get_adapter(
+                    router._detect_adapter_from_url(ticket_id)
+                )
+            else:
+                adapter = get_adapter()
+                created = await adapter.add_comment(comment)
 
             return {
                 "status": "completed",
+                **_build_adapter_metadata(adapter, created.ticket_id, is_routed),
                 "operation": "add",
                 "comment": created.model_dump(),
             }
 
         else:  # operation == "list"
             # List comments operation
-            comments = await adapter.get_comments(
-                ticket_id=ticket_id, limit=limit, offset=offset
-            )
+            # Route to appropriate adapter
+            is_routed = False
+            if is_url(ticket_id) and has_router():
+                router = get_router()
+                logging.info(f"Routing get_comments for URL: {ticket_id}")
+                comments = await router.route_get_comments(
+                    ticket_id, limit=limit, offset=offset
+                )
+                is_routed = True
+                normalized_id, _, _ = router._normalize_ticket_id(ticket_id)
+                adapter = router._get_adapter(
+                    router._detect_adapter_from_url(ticket_id)
+                )
+            else:
+                adapter = get_adapter()
+                comments = await adapter.get_comments(
+                    ticket_id=ticket_id, limit=limit, offset=offset
+                )
 
             return {
                 "status": "completed",
+                **_build_adapter_metadata(adapter, ticket_id, is_routed),
                 "operation": "list",
-                "ticket_id": ticket_id,
                 "comments": [comment.model_dump() for comment in comments],
                 "count": len(comments),
                 "limit": limit,