mcp-ticketer 0.1.33__py3-none-any.whl → 0.1.34__py3-none-any.whl

mcp_ticketer/__version__.py

@@ -1,6 +1,6 @@
 """Version information for mcp-ticketer package."""
 
-__version__ = "0.1.33"
+__version__ = "0.1.34"
 __version_info__ = tuple(int(part) for part in __version__.split("."))
 
 # Package metadata

mcp_ticketer/cli/diagnostics.py

@@ -252,7 +252,9 @@ class SystemDiagnostics:
             for name, adapter_config in adapters.items():
                 try:
                     adapter_class = AdapterRegistry.get_adapter(adapter_config.type.value)
-                    adapter = adapter_class(adapter_config.dict())
+                    # Convert Pydantic model to dict, excluding None values
+                    config_dict = adapter_config.model_dump(exclude_none=False)
+                    adapter = adapter_class(config_dict)
                     
                     # Test adapter validation if available
                     if hasattr(adapter, 'validate_credentials'):
@@ -305,7 +307,13 @@ class SystemDiagnostics:
                     config_dict = adapter_config
                 else:
                     adapter_type = adapter_config.type.value if hasattr(adapter_config, 'type') else "unknown"
-                    config_dict = adapter_config.dict() if hasattr(adapter_config, 'dict') else adapter_config
+                    # Use model_dump for Pydantic v2 compatibility
+                    if hasattr(adapter_config, 'model_dump'):
+                        config_dict = adapter_config.model_dump(exclude_none=False)
+                    elif hasattr(adapter_config, 'dict'):
+                        config_dict = adapter_config.dict()
+                    else:
+                        config_dict = adapter_config
 
                 details = {
                     "type": adapter_type,

mcp_ticketer/cli/main.py

@@ -144,6 +144,83 @@ def load_config(project_dir: Optional[Path] = None) -> dict:
     return {"adapter": "aitrackdown", "config": {"base_path": ".aitrackdown"}}
 
 
+def _discover_from_env_files() -> Optional[str]:
+    """Discover adapter configuration from .env or .env.local files.
+
+    Returns:
+        Adapter name if discovered, None otherwise
+    """
+    import os
+    import logging
+    from pathlib import Path
+
+    logger = logging.getLogger(__name__)
+
+    # Check .env.local first, then .env
+    env_files = [".env.local", ".env"]
+
+    for env_file in env_files:
+        env_path = Path.cwd() / env_file
+        if env_path.exists():
+            try:
+                # Simple .env parsing (key=value format)
+                env_vars = {}
+                with open(env_path, 'r') as f:
+                    for line in f:
+                        line = line.strip()
+                        if line and not line.startswith('#') and '=' in line:
+                            key, value = line.split('=', 1)
+                            env_vars[key.strip()] = value.strip().strip('"\'')
+
+                # Check for adapter-specific variables
+                if env_vars.get("LINEAR_API_KEY"):
+                    logger.info(f"Discovered Linear configuration in {env_file}")
+                    return "linear"
+                elif env_vars.get("GITHUB_TOKEN"):
+                    logger.info(f"Discovered GitHub configuration in {env_file}")
+                    return "github"
+                elif env_vars.get("JIRA_SERVER"):
+                    logger.info(f"Discovered JIRA configuration in {env_file}")
+                    return "jira"
+
+            except Exception as e:
+                logger.warning(f"Could not read {env_file}: {e}")
+
+    return None
+
+
+def _save_adapter_to_config(adapter_name: str) -> None:
+    """Save adapter configuration to config file.
+
+    Args:
+        adapter_name: Name of the adapter to save as default
+    """
+    import logging
+
+    logger = logging.getLogger(__name__)
+
+    try:
+        config = load_config()
+        config["default_adapter"] = adapter_name
+
+        # Ensure adapters section exists
+        if "adapters" not in config:
+            config["adapters"] = {}
+
+        # Add basic adapter config if not exists
+        if adapter_name not in config["adapters"]:
+            if adapter_name == "aitrackdown":
+                config["adapters"][adapter_name] = {"base_path": ".aitrackdown"}
+            else:
+                config["adapters"][adapter_name] = {"type": adapter_name}
+
+        save_config(config)
+        logger.info(f"Saved {adapter_name} as default adapter")
+
+    except Exception as e:
+        logger.warning(f"Could not save adapter configuration: {e}")
+
+
 def save_config(config: dict) -> None:
     """Save configuration to project-local config file ONLY.
 
@@ -926,11 +1003,25 @@ def create(
                 console.print(f"[yellow]  • {alert['message']}[/yellow]")
         console.print("[yellow]Proceeding with ticket creation...[/yellow]")
 
-    # Get the adapter name
-    config = load_config()
-    adapter_name = (
-        adapter.value if adapter else config.get("default_adapter", "aitrackdown")
-    )
+    # Get the adapter name with priority: 1) argument, 2) config, 3) .env files, 4) default
+    if adapter:
+        # Priority 1: Command-line argument - save to config for future use
+        adapter_name = adapter.value
+        _save_adapter_to_config(adapter_name)
+    else:
+        # Priority 2: Check existing config
+        config = load_config()
+        adapter_name = config.get("default_adapter")
+
+        if not adapter_name or adapter_name == "aitrackdown":
+            # Priority 3: Check .env files and save if found
+            env_adapter = _discover_from_env_files()
+            if env_adapter:
+                adapter_name = env_adapter
+                _save_adapter_to_config(adapter_name)
+            else:
+                # Priority 4: Default
+                adapter_name = "aitrackdown"
 
     # Create task data
     task_data = {

mcp_ticketer/cli/utils.py

@@ -31,7 +31,7 @@ class CommonPatterns:
 
     @staticmethod
     def load_config() -> dict:
-        """Load configuration from project-local config file ONLY.
+        """Load configuration from project-local config file with environment discovery fallback.
 
         SECURITY: This method ONLY reads from the current project directory
         to prevent configuration leakage across projects. It will NEVER read
@@ -39,7 +39,8 @@ class CommonPatterns:
 
         Resolution order:
         1. Project-specific config (.mcp-ticketer/config.json in cwd)
-        2. Default to aitrackdown adapter
+        2. Environment discovery (environment variables and .env files in cwd)
+        3. Default to aitrackdown adapter
 
         Returns:
             Configuration dictionary with adapter and config keys.
@@ -77,6 +78,39 @@ class CommonPatterns:
                     f"[yellow]Warning: Could not load project config: {e}[/yellow]"
                 )
 
+        # Try environment discovery as fallback
+        try:
+            from ..core.config import ConfigurationManager
+            config_manager = ConfigurationManager()
+            app_config = config_manager.load_config()
+
+            # Convert AppConfig to legacy dict format for CLI compatibility
+            enabled_adapters = app_config.get_enabled_adapters()
+            if enabled_adapters:
+                # Use the first enabled adapter as default
+                default_adapter = app_config.default_adapter or list(enabled_adapters.keys())[0]
+
+                # Convert to legacy format
+                legacy_config = {
+                    "default_adapter": default_adapter,
+                    "adapters": {}
+                }
+
+                # Convert adapter configs to dict format
+                for name, adapter_config in enabled_adapters.items():
+                    if hasattr(adapter_config, 'model_dump'):
+                        legacy_config["adapters"][name] = adapter_config.model_dump(exclude_none=False)
+                    elif hasattr(adapter_config, 'dict'):
+                        legacy_config["adapters"][name] = adapter_config.dict()
+                    else:
+                        legacy_config["adapters"][name] = adapter_config
+
+                logger.info(f"Loaded configuration from environment discovery: {list(enabled_adapters.keys())}")
+                return legacy_config
+
+        except Exception as e:
+            logger.warning(f"Environment discovery failed: {e}")
+
         # Default to aitrackdown with local base path
         logger.info("No project-local config found, defaulting to aitrackdown adapter")
         return {"adapter": "aitrackdown", "config": {"base_path": ".aitrackdown"}}

mcp_ticketer/core/config.py

@@ -118,9 +118,17 @@ class LinearConfig(BaseAdapterConfig):
     type: AdapterType = AdapterType.LINEAR
     api_key: Optional[str] = Field(None, env="LINEAR_API_KEY")
     workspace: Optional[str] = None
-    team_key: str
+    team_key: Optional[str] = None  # Short team key like "BTA"
+    team_id: Optional[str] = None   # UUID team identifier
     api_url: str = "https://api.linear.app/graphql"
 
+    @model_validator(mode="after")
+    def validate_team_identifier(self):
+        """Ensure either team_key or team_id is provided."""
+        if not self.team_key and not self.team_id:
+            raise ValueError("Either team_key or team_id is required")
+        return self
+
     @field_validator("api_key", mode="before")
     @classmethod
     def validate_api_key(cls, v):
@@ -284,9 +292,27 @@ class ConfigurationManager:
             config_data = self._load_config_file(self._config_file_paths[0])
             logger.info(f"Loaded configuration from: {self._config_file_paths[0]}")
         else:
-            # No config file found - try environment discovery
-            logger.info("No configuration file found, attempting environment discovery")
-            config_data = self._discover_from_environment()
+            # No config file found - use empty config
+            config_data = {"adapters": {}, "default_adapter": None}
+
+        # Always try environment discovery and merge with file-based config
+        logger.info("Attempting environment discovery to supplement configuration")
+        env_config_data = self._discover_from_environment()
+
+        # Merge environment-discovered adapters with file-based config
+        if env_config_data and "adapters" in env_config_data:
+            if "adapters" not in config_data:
+                config_data["adapters"] = {}
+
+            # Add discovered adapters that aren't already configured
+            for adapter_name, adapter_config in env_config_data["adapters"].items():
+                if adapter_name not in config_data["adapters"]:
+                    config_data["adapters"][adapter_name] = adapter_config
+                    logger.info(f"Added environment-discovered adapter: {adapter_name}")
+
+            # Set default adapter if not already set
+            if not config_data.get("default_adapter") and env_config_data.get("default_adapter"):
+                config_data["default_adapter"] = env_config_data["default_adapter"]
 
         # Parse adapter configurations
         if "adapters" in config_data:
@@ -294,13 +320,21 @@ class ConfigurationManager:
             for name, adapter_config in config_data["adapters"].items():
                 adapter_type = adapter_config.get("type", "").lower()
 
+                # If no type specified, try to infer from adapter name
+                if not adapter_type:
+                    adapter_type = name.lower()
+
                 if adapter_type == "github":
+                    adapter_config["type"] = "github"
                     parsed_adapters[name] = GitHubConfig(**adapter_config)
                 elif adapter_type == "jira":
+                    adapter_config["type"] = "jira"
                     parsed_adapters[name] = JiraConfig(**adapter_config)
                 elif adapter_type == "linear":
+                    adapter_config["type"] = "linear"
                     parsed_adapters[name] = LinearConfig(**adapter_config)
                 elif adapter_type == "aitrackdown":
+                    adapter_config["type"] = "aitrackdown"
                     parsed_adapters[name] = AITrackdownConfig(**adapter_config)
                 else:
                     logger.warning(
@@ -335,10 +369,10 @@ class ConfigurationManager:
     def _discover_from_environment(self) -> dict[str, Any]:
         """Discover configuration from environment variables."""
         try:
-            from .env_discovery import EnvironmentDiscovery
+            from .env_discovery import EnvDiscovery
 
-            discovery = EnvironmentDiscovery()
-            discovered = discovery.discover_all()
+            discovery = EnvDiscovery()
+            discovered = discovery.discover()
 
             if not discovered.adapters:
                 logger.info("No adapters discovered from environment variables")
@@ -362,36 +396,24 @@ class ConfigurationManager:
 
             for adapter in discovered.adapters:
                 adapter_config = {
-                    "type": adapter.type.value,
+                    "type": adapter.adapter_type,
                     "enabled": True
                 }
 
-                # Add adapter-specific configuration
-                if adapter.type.value == "linear":
-                    adapter_config.update({
-                        "api_key": adapter.credentials.get("api_key"),
-                        "team_id": adapter.credentials.get("team_id"),
-                        "project_id": adapter.credentials.get("project_id")
-                    })
-                elif adapter.type.value == "github":
-                    adapter_config.update({
-                        "token": adapter.credentials.get("token"),
-                        "repo": adapter.credentials.get("repo"),
-                        "owner": adapter.credentials.get("owner")
-                    })
-                elif adapter.type.value == "jira":
-                    adapter_config.update({
-                        "server": adapter.credentials.get("server"),
-                        "email": adapter.credentials.get("email"),
-                        "api_token": adapter.credentials.get("api_token"),
-                        "project_key": adapter.credentials.get("project_key")
-                    })
-
-                config_data["adapters"][adapter.name] = adapter_config
+                # Add adapter-specific configuration from discovered config
+                adapter_config.update(adapter.config)
+
+                # Ensure type is set correctly (remove 'adapter' key if present)
+                if 'adapter' in adapter_config:
+                    del adapter_config['adapter']
+
+                # Use adapter type as the key name
+                adapter_name = adapter.adapter_type
+                config_data["adapters"][adapter_name] = adapter_config
 
                 # Set first discovered adapter as default
                 if config_data["default_adapter"] is None:
-                    config_data["default_adapter"] = adapter.name
+                    config_data["default_adapter"] = adapter.adapter_type
 
             logger.info(f"Discovered {len(config_data['adapters'])} adapter(s) from environment")
             return config_data

mcp_ticketer/core/env_discovery.py

@@ -30,8 +30,10 @@ LINEAR_KEY_PATTERNS = [
 
 LINEAR_TEAM_PATTERNS = [
     "LINEAR_TEAM_ID",
+    "LINEAR_TEAM_KEY",  # Added support for team key (e.g., "BTA")
     "LINEAR_TEAM",
     "MCP_TICKETER_LINEAR_TEAM_ID",
+    "MCP_TICKETER_LINEAR_TEAM_KEY",
 ]
 
 LINEAR_PROJECT_PATTERNS = [
@@ -210,7 +212,11 @@ class EnvDiscovery:
         return result
 
     def _load_env_files(self, result: DiscoveryResult) -> dict[str, str]:
-        """Load environment variables from files.
+        """Load environment variables from files and actual environment.
+
+        Priority order (highest to lowest):
+        1. .env files (highest priority)
+        2. Environment variables (lowest priority)
 
         Args:
             result: DiscoveryResult to update with found files
@@ -221,7 +227,15 @@ class EnvDiscovery:
         """
         merged_env: dict[str, str] = {}
 
-        # Load files in reverse order (lowest priority first)
+        # First, load from actual environment variables (lowest priority)
+        import os
+        actual_env = {k: v for k, v in os.environ.items() if v}
+        merged_env.update(actual_env)
+        if actual_env:
+            result.env_files_found.append("environment")
+            logger.debug(f"Loaded {len(actual_env)} variables from environment")
+
+        # Load files in reverse order (higher priority than environment)
         for env_file in reversed(self.ENV_FILE_ORDER):
             file_path = self.project_path / env_file
             if file_path.exists():
@@ -282,13 +296,19 @@ class EnvDiscovery:
         missing_fields: list[str] = []
         confidence = 0.6  # Has API key
 
-        # Extract team ID (recommended but not required)
-        team_id = self._find_key_value(env_vars, LINEAR_TEAM_PATTERNS)
-        if team_id:
-            config["team_id"] = team_id
+        # Extract team identifier (either team_id or team_key is required)
+        team_identifier = self._find_key_value(env_vars, LINEAR_TEAM_PATTERNS)
+        if team_identifier:
+            # Determine if it's a team_id (UUID format) or team_key (short string)
+            if len(team_identifier) > 20 and '-' in team_identifier:
+                # Looks like a UUID (team_id)
+                config["team_id"] = team_identifier
+            else:
+                # Looks like a short key (team_key)
+                config["team_key"] = team_identifier
             confidence += 0.3
         else:
-            missing_fields.append("team_id (recommended)")
+            missing_fields.append("team_id or team_key (required)")
 
         # Extract project ID (optional)
         project_id = self._find_key_value(env_vars, LINEAR_PROJECT_PATTERNS)

{mcp_ticketer-0.1.33.dist-info → mcp_ticketer-0.1.34.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-ticketer
-Version: 0.1.33
+Version: 0.1.34
 Summary: Universal ticket management interface for AI agents with MCP support
 Author-email: MCP Ticketer Team <support@mcp-ticketer.io>
 Maintainer-email: MCP Ticketer Team <support@mcp-ticketer.io>

{mcp_ticketer-0.1.33.dist-info → mcp_ticketer-0.1.34.dist-info}/RECORD

@@ -1,5 +1,5 @@
 mcp_ticketer/__init__.py,sha256=Xx4WaprO5PXhVPbYi1L6tBmwmJMkYS-lMyG4ieN6QP0,717
-mcp_ticketer/__version__.py,sha256=YbtZf8fo9cJTUcdyWdoua2cQU5TJHm7vQ3mwfSr7-mI,1118
+mcp_ticketer/__version__.py,sha256=NKKpxMKtYBzkS7DVcj0AKzeO_ZpeIyXvB1W2qzW1TS4,1118
 mcp_ticketer/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_ticketer/adapters/__init__.py,sha256=B5DFllWn23hkhmrLykNO5uMMSdcFuuPHXyLw_jyFzuE,358
 mcp_ticketer/adapters/aitrackdown.py,sha256=stlbge8K6w-EyQkw_vEQNSXQgCOWN5tOlQUgGWZQNMQ,17936
@@ -13,19 +13,19 @@ mcp_ticketer/cli/__init__.py,sha256=l9Q8iKmfGkTu0cssHBVqNZTsL4eAtFzOB25AED_0G6g,
 mcp_ticketer/cli/auggie_configure.py,sha256=MXKzLtqe3K_UTQ2GacHAWbvf_B0779KL325smiAKE0Q,8212
 mcp_ticketer/cli/codex_configure.py,sha256=xDppHouT6_-cYXswyAggoPX5bSlRXMvCoM_x9PQ-42A,9086
 mcp_ticketer/cli/configure.py,sha256=BsA_pSHQMQS0t1bJO_wMM8LWsd5sWJDASjEPRHvwC18,16198
-mcp_ticketer/cli/diagnostics.py,sha256=FaxlcaHAj3eep_h8Bzv8ktPCeZ5r7SgJG25QOqK3gm4,31095
+mcp_ticketer/cli/diagnostics.py,sha256=V4b6qD_eHG1K6QLBi3-y4JIqzqnJdSWaH6k96NPZiB8,31540
 mcp_ticketer/cli/discover.py,sha256=AF_qlQc1Oo0UkWayoF5pmRChS5J3fJjH6f2YZzd_k8w,13188
 mcp_ticketer/cli/gemini_configure.py,sha256=ZNSA1lBW-itVToza-JxW95Po7daVXKiZAh7lp6pmXMU,9343
-mcp_ticketer/cli/main.py,sha256=TxhCdmEi97rrDkCd0nT4KYRtZSboTfPSrw7SL607goA,54970
+mcp_ticketer/cli/main.py,sha256=pzwjcXCbUFQCvTM5sN-dKZcnMruSImuYPcC7__DEYZg,58182
 mcp_ticketer/cli/mcp_configure.py,sha256=RzV50UjXgOmvMp-9S0zS39psuvjffVByaMrqrUaAGAM,9594
 mcp_ticketer/cli/migrate_config.py,sha256=MYsr_C5ZxsGg0P13etWTWNrJ_lc6ElRCkzfQADYr3DM,5956
 mcp_ticketer/cli/queue_commands.py,sha256=mm-3H6jmkUGJDyU_E46o9iRpek8tvFCm77F19OtHiZI,7884
 mcp_ticketer/cli/simple_health.py,sha256=FIMHbrSNHpNJHXx7wtH8HzQXmPlcF9HQE9ngxTbxhMM,8035
-mcp_ticketer/cli/utils.py,sha256=2ptUrp2ELZsox0kSxAI5DFrHonOU999qh4MxbLv6VBQ,21155
+mcp_ticketer/cli/utils.py,sha256=RRoUMJbw0isyzlRhZwPcbmYQXl1PGYDx9dy1zRctljA,22789
 mcp_ticketer/core/__init__.py,sha256=eXovsaJymQRP2AwOBuOy6mFtI3I68D7gGenZ5V-IMqo,349
 mcp_ticketer/core/adapter.py,sha256=q64LxOInIno7EIbmuxItf8KEsd-g9grCs__Z4uwZHto,10273
-mcp_ticketer/core/config.py,sha256=A3K2JXn65qwpI80_J05oA-6DRjcONi6ZqemU02O4L8U,19120
-mcp_ticketer/core/env_discovery.py,sha256=wKp2Pi5vQMGOTrM1690IBv_eoABly-pD8ah7n1zSWDc,17710
+mcp_ticketer/core/config.py,sha256=P6Y_i6xmcLb9xtD3VHkXfujIU6VlQlUoteDdS2d0C-w,20144
+mcp_ticketer/core/env_discovery.py,sha256=It62C97UBt96CgVbZCql5NQtONmCHMkX3c8W2kEl-Qk,18716
 mcp_ticketer/core/http_client.py,sha256=s5ikMiwEJ8TJjNn73wu3gv3OdAtyBEpAqPnSroRMW2k,13971
 mcp_ticketer/core/mappers.py,sha256=1aG1jFsHTCwmGRVgOlXW-VOSTGzc86gv7qjDfiR1ups,17462
 mcp_ticketer/core/models.py,sha256=DRuJoYbjp9fcPV9GwQfhVcNUB0XmwQB3vuqW8hQWZ_k,6491
@@ -41,9 +41,9 @@ mcp_ticketer/queue/queue.py,sha256=jSAkYNEIbNH1cbYuF8s6eFuZmXqn8WHXx3mbfMU2Ud8,1
 mcp_ticketer/queue/run_worker.py,sha256=_IBezjvhbJJ7gn0evTBIMbSPjvfFZwxEdT-1DLo_bRk,799
 mcp_ticketer/queue/ticket_registry.py,sha256=k8FYg2cFYsI4POb94-o-fTrIVr-ttfi60r0O5YhJYck,15321
 mcp_ticketer/queue/worker.py,sha256=TLXXXTAQT1k9Oiw2WjSd8bzT3rr8TQ8NLt9JBovGQEA,18679
-mcp_ticketer-0.1.33.dist-info/licenses/LICENSE,sha256=KOVrunjtILSzY-2N8Lqa3-Q8dMaZIG4LrlLTr9UqL08,1073
-mcp_ticketer-0.1.33.dist-info/METADATA,sha256=gla674ca9CyqLOSch1ZYZMN_7l-6wnymrS0ODYrhkR4,13191
-mcp_ticketer-0.1.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcp_ticketer-0.1.33.dist-info/entry_points.txt,sha256=o1IxVhnHnBNG7FZzbFq-Whcs1Djbofs0qMjiUYBLx2s,60
-mcp_ticketer-0.1.33.dist-info/top_level.txt,sha256=WnAG4SOT1Vm9tIwl70AbGG_nA217YyV3aWFhxLH2rxw,13
-mcp_ticketer-0.1.33.dist-info/RECORD,,
+mcp_ticketer-0.1.34.dist-info/licenses/LICENSE,sha256=KOVrunjtILSzY-2N8Lqa3-Q8dMaZIG4LrlLTr9UqL08,1073
+mcp_ticketer-0.1.34.dist-info/METADATA,sha256=kKvvgMiqCmqPceTqnhV-InFn1jkNcvZfM_-yoKHyzR4,13191
+mcp_ticketer-0.1.34.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcp_ticketer-0.1.34.dist-info/entry_points.txt,sha256=o1IxVhnHnBNG7FZzbFq-Whcs1Djbofs0qMjiUYBLx2s,60
+mcp_ticketer-0.1.34.dist-info/top_level.txt,sha256=WnAG4SOT1Vm9tIwl70AbGG_nA217YyV3aWFhxLH2rxw,13
+mcp_ticketer-0.1.34.dist-info/RECORD,,