quickcall-integrations 0.3.5__py3-none-any.whl → 0.3.6__py3-none-any.whl

mcp_server/resources/github_resources.py

@@ -5,50 +5,14 @@ Resources are automatically available in Claude's context when connected.
 """
 
 import logging
-from typing import Any, Dict, Optional
 
-import yaml
 from fastmcp import FastMCP
 
 from mcp_server.auth import get_credential_store, get_github_pat
-from mcp_server.auth.credentials import _find_project_root, _parse_env_file
 
 logger = logging.getLogger(__name__)
 
 
-def _load_issue_templates_config() -> Optional[Dict[str, Any]]:
-    """
-    Load issue templates from ISSUE_TEMPLATE_PATH in .quickcall.env.
-    Returns None if not configured or file doesn't exist.
-    """
-    import os
-    from pathlib import Path
-
-    template_path = os.getenv("ISSUE_TEMPLATE_PATH")
-
-    # Check .quickcall.env in project root
-    if not template_path:
-        project_root = _find_project_root()
-        if project_root:
-            config_path = project_root / ".quickcall.env"
-            if config_path.exists():
-                env_vars = _parse_env_file(config_path)
-                if "ISSUE_TEMPLATE_PATH" in env_vars:
-                    template_path = env_vars["ISSUE_TEMPLATE_PATH"]
-                    if not Path(template_path).is_absolute():
-                        template_path = str(project_root / template_path)
-
-    if not template_path:
-        return None
-
-    try:
-        with open(template_path) as f:
-            return yaml.safe_load(f) or {}
-    except Exception as e:
-        logger.warning(f"Failed to load issue templates: {e}")
-        return None
-
-
 def create_github_resources(mcp: FastMCP) -> None:
     """Add GitHub resources to the MCP server."""
 
@@ -107,41 +71,46 @@ def create_github_resources(mcp: FastMCP) -> None:
         """
         Available issue templates from project configuration.
 
+        Supports both:
+        - GitHub native templates (.github/ISSUE_TEMPLATE/*.yml)
+        - Custom templates (ISSUE_TEMPLATE_PATH in .quickcall.env)
+
         Use template names when creating issues with manage_issues.
         """
-        config = _load_issue_templates_config()
-
-        if not config:
-            return "No issue templates configured.\n\nTo configure:\n1. Create a YAML file with your templates\n2. Add ISSUE_TEMPLATE_PATH=/path/to/templates.yaml to .quickcall.env"
+        # Import here to avoid circular imports
+        from mcp_server.tools.github_tools import _get_all_templates
 
-        templates = config.get("templates", {})
-        defaults = config.get("defaults", {})
+        templates = _get_all_templates()
 
         if not templates:
-            lines = ["Issue Templates:", ""]
-            if defaults:
-                labels = defaults.get("labels", [])
-                lines.append("Default template:")
-                if labels:
-                    lines.append(f"  Labels: {', '.join(labels)}")
-                if defaults.get("body"):
-                    lines.append(f"  Body template: {defaults['body'][:100]}...")
-            return "\n".join(lines)
+            return (
+                "No issue templates found.\n\n"
+                "Supported sources:\n"
+                "1. GitHub native: .github/ISSUE_TEMPLATE/*.yml\n"
+                "2. Custom: Add ISSUE_TEMPLATE_PATH to .quickcall.env"
+            )
 
         lines = ["Available Issue Templates:", ""]
 
-        for name, template in templates.items():
+        for key, template in templates.items():
+            name = template.get("name", key)
+            description = template.get("description", "")
             labels = template.get("labels", [])
-            body_preview = template.get("body", "")[:80]
-            lines.append(f"- {name}")
+            title_prefix = template.get("title_prefix", "")
+
+            lines.append(f"- {key}")
+            if name != key:
+                lines.append(f"    Name: {name}")
+            if description:
+                lines.append(f"    Description: {description}")
             if labels:
                 lines.append(f"    Labels: {', '.join(labels)}")
-            if body_preview:
-                lines.append(f"    Body: {body_preview}...")
+            if title_prefix:
+                lines.append(f"    Title prefix: {title_prefix}")
 
         lines.append("")
         lines.append(
-            "Usage: manage_issues(action='create', title='...', template='<name>')"
+            "Usage: manage_issues(action='create', title='...', template='<key>')"
         )
 
         return "\n".join(lines)

mcp_server/tools/github_tools.py

@@ -44,14 +44,85 @@ DEFAULT_ISSUE_TEMPLATE: Dict[str, Any] = {
 }
 
 
-def _load_issue_template(template_type: Optional[str] = None) -> Dict[str, Any]:
+def _load_github_native_templates() -> Dict[str, Dict[str, Any]]:
     """
-    Load issue template from ISSUE_TEMPLATE_PATH in .quickcall.env.
-    Returns defaults if not configured.
+    Load GitHub native issue templates from .github/ISSUE_TEMPLATE/*.yml.
+    Returns dict of template_name -> template_config.
     """
-    template_path = os.getenv("ISSUE_TEMPLATE_PATH")
+    project_root = _find_project_root()
+    if not project_root:
+        return {}
+
+    template_dir = project_root / ".github" / "ISSUE_TEMPLATE"
+    if not template_dir.exists():
+        return {}
+
+    templates = {}
+    for template_file in template_dir.glob("*.yml"):
+        try:
+            with open(template_file) as f:
+                config = yaml.safe_load(f) or {}
+
+            # Extract template name (use filename without extension as fallback)
+            name = config.get("name", template_file.stem)
+            # Use filename stem as key for easier matching
+            key = template_file.stem
+
+            # Convert GitHub template format to our format
+            templates[key] = {
+                "name": name,
+                "description": config.get("description", ""),
+                "title_prefix": config.get("title", ""),
+                "labels": config.get("labels", []),
+                "assignees": config.get("assignees", []),
+                "body": _github_template_body_to_markdown(config.get("body", [])),
+            }
+        except Exception as e:
+            logger.warning(f"Failed to load GitHub template {template_file}: {e}")
+
+    return templates
+
+
+def _github_template_body_to_markdown(body: List[Dict[str, Any]]) -> str:
+    """Convert GitHub issue template body fields to markdown."""
+    if not body:
+        return ""
+
+    lines = []
+    for field in body:
+        field_type = field.get("type", "")
+        attrs = field.get("attributes", {})
+        label = attrs.get("label", "")
+
+        if field_type in ("textarea", "input"):
+            if label:
+                lines.append(f"## {label}")
+                lines.append("")
+            placeholder = attrs.get("placeholder", "")
+            if placeholder:
+                lines.append(placeholder)
+                lines.append("")
+        elif field_type == "markdown":
+            value = attrs.get("value", "")
+            if value:
+                lines.append(value)
+                lines.append("")
+
+    return "\n".join(lines)
+
+
+def _get_all_templates() -> Dict[str, Dict[str, Any]]:
+    """
+    Get all available issue templates from both sources.
+    Priority: Custom templates (.quickcall.env) > GitHub native templates
+    """
+    templates = {}
 
-    # Check .quickcall.env in project root
+    # 1. Load GitHub native templates first (lower priority)
+    templates.update(_load_github_native_templates())
+
+    # 2. Load custom templates (higher priority, can override)
+    template_path = os.getenv("ISSUE_TEMPLATE_PATH")
     if not template_path:
         project_root = _find_project_root()
         if project_root:
@@ -63,24 +134,52 @@ def _load_issue_template(template_type: Optional[str] = None) -> Dict[str, Any]:
                     if not Path(template_path).is_absolute():
                         template_path = str(project_root / template_path)
 
-    if not template_path:
-        return DEFAULT_ISSUE_TEMPLATE
+    if template_path:
+        try:
+            with open(template_path) as f:
+                config = yaml.safe_load(f) or {}
+            custom_templates = config.get("templates", {})
+            for key, tpl in custom_templates.items():
+                templates[key] = {
+                    "name": key,
+                    "description": "",
+                    "title_prefix": "",
+                    "labels": tpl.get("labels", []),
+                    "assignees": tpl.get("assignees", []),
+                    "body": tpl.get("body", ""),
+                }
+        except Exception as e:
+            logger.warning(f"Failed to load custom templates: {e}")
 
-    try:
-        with open(template_path) as f:
-            config = yaml.safe_load(f) or {}
+    return templates
 
-        # If template_type specified, look for it in templates section
-        if template_type and "templates" in config:
-            return config["templates"].get(
-                template_type, config.get("defaults", DEFAULT_ISSUE_TEMPLATE)
-            )
 
-        return config.get("defaults", DEFAULT_ISSUE_TEMPLATE)
-    except Exception as e:
-        logger.warning(f"Failed to load issue template: {e}")
+def _load_issue_template(template_type: Optional[str] = None) -> Dict[str, Any]:
+    """
+    Load issue template from available sources.
+
+    Sources (in priority order):
+    1. Custom templates from ISSUE_TEMPLATE_PATH in .quickcall.env
+    2. GitHub native templates from .github/ISSUE_TEMPLATE/*.yml
+
+    Returns defaults if no template found.
+    """
+    if not template_type:
         return DEFAULT_ISSUE_TEMPLATE
 
+    all_templates = _get_all_templates()
+
+    if template_type in all_templates:
+        tpl = all_templates[template_type]
+        return {
+            "labels": tpl.get("labels", []),
+            "assignees": tpl.get("assignees", []),
+            "body": tpl.get("body", ""),
+            "title_prefix": tpl.get("title_prefix", ""),
+        }
+
+    return DEFAULT_ISSUE_TEMPLATE
+
 
 # Track whether we're using PAT mode for status reporting
 _using_pat_mode: bool = False

{quickcall_integrations-0.3.5.dist-info → quickcall_integrations-0.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quickcall-integrations
-Version: 0.3.5
+Version: 0.3.6
 Summary: MCP server with developer integrations for Claude Code and Cursor
 Requires-Python: >=3.10
 Requires-Dist: fastmcp>=2.13.0

{quickcall_integrations-0.3.5.dist-info → quickcall_integrations-0.3.6.dist-info}/RECORD

@@ -7,15 +7,15 @@ mcp_server/auth/__init__.py,sha256=D-JS0Qe7FkeJjYx92u_AqPx8ZRoB3dKMowzzJXlX6cc,7
 mcp_server/auth/credentials.py,sha256=sDS0W5c16i_UGvhG8Sh1RO93FxRn-hHVAdI9hlWuhx0,20011
 mcp_server/auth/device_flow.py,sha256=NXNWHzd-CA4dlhEVCgUhwfpe9TpMKpLSJuyFCh70xKs,8371
 mcp_server/resources/__init__.py,sha256=JrMa3Kf-DmeCB4GwVNfmfw9OGnxF9pJJxCw9Y7u7ujQ,35
-mcp_server/resources/github_resources.py,sha256=gS0mTe7UHySAKiD4AqsFZ6pf7ua8Cq9dDrUqRu72_QM,5180
+mcp_server/resources/github_resources.py,sha256=sXE06j9jrSDODxH2832fiCtY9n1lKBQR8QZ8U5wYbJY,4030
 mcp_server/resources/slack_resources.py,sha256=b_CPxAicwkF3PsBXIat4QoLbDUHM2g_iPzgzvVpwjaw,1687
 mcp_server/tools/__init__.py,sha256=vIR2ujAaTXm2DgpTsVNz3brI4G34p-Jeg44Qe0uvWc0,405
 mcp_server/tools/auth_tools.py,sha256=kCPjPC1jrVz0XaRAwPea-ue8ybjLLTxyILplBDJ9Mv4,24477
 mcp_server/tools/git_tools.py,sha256=jyCTQR2eSzUFXMt0Y8x66758-VY8YCY14DDUJt7GY2U,13957
-mcp_server/tools/github_tools.py,sha256=x6aRg03QQd6QV-PePHLUZyOSuKDv06LIVUUCE5qXycU,29951
+mcp_server/tools/github_tools.py,sha256=iQvVuhWwVsKSPI7Ue6Eu0gYJcMKjWBAoo4U2Is9eIUI,33241
 mcp_server/tools/slack_tools.py,sha256=-HVE_x3Z1KMeYGi1xhyppEwz5ZF-I-ZD0-Up8yBeoYE,11796
 mcp_server/tools/utility_tools.py,sha256=oxAXpdqtPeB5Ug5dvk54V504r-8v1AO4_px-sO6LFOw,3910
-quickcall_integrations-0.3.5.dist-info/METADATA,sha256=T5g_OrKJJtEX_xfntDbj8tlcSWTIDTDyT74uW4xf4Rg,7070
-quickcall_integrations-0.3.5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-quickcall_integrations-0.3.5.dist-info/entry_points.txt,sha256=kkcunmJUzncYvQ1rOR35V2LPm2HcFTKzdI2l3n7NwiM,66
-quickcall_integrations-0.3.5.dist-info/RECORD,,
+quickcall_integrations-0.3.6.dist-info/METADATA,sha256=tt1WubqnaF5Yjq9mE-8HDIsDqCYXO4vaXGSw5ZKKV2Q,7070
+quickcall_integrations-0.3.6.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+quickcall_integrations-0.3.6.dist-info/entry_points.txt,sha256=kkcunmJUzncYvQ1rOR35V2LPm2HcFTKzdI2l3n7NwiM,66
+quickcall_integrations-0.3.6.dist-info/RECORD,,