devs-webhook 0.1.0__tar.gz → 0.1.2__tar.gz

{devs_webhook-0.1.0 → devs_webhook-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devs-webhook
-Version: 0.1.0
+Version: 0.1.2
 Summary: GitHub webhook handler for automated devcontainer operations with Claude Code
 Author: Dan Lester
 License-Expression: MIT
@@ -156,6 +156,25 @@ export AWS_SQS_QUEUE_URL="https://sqs.us-east-1.amazonaws.com/..."
 devs-webhook serve --source sqs
 ```
 
+#### Burst Mode
+
+For batch processing or scheduled jobs, use `--burst` to process all available messages and exit:
+
+```bash
+# Process all messages in queue then exit
+devs-webhook serve --source sqs --burst
+```
+
+Exit codes:
+- **0**: Successfully processed one or more messages
+- **42**: Queue was empty (no messages to process)
+- **Other**: Error occurred
+
+This is useful for:
+- Scheduled cron jobs that drain the queue periodically
+- Lambda-triggered batch processing
+- Testing and debugging SQS integration
+
 **Security**: Both modes validate GitHub webhook signatures for defense-in-depth security.
 
 For detailed configuration and deployment guides, see:
@@ -365,7 +384,7 @@ Available options:
 - **`ci_test_command`**: Command to run for CI tests
   - Shell command executed in container for CI test runs
   - Should exit with code 0 for success, non-zero for failure
-  - Default: `runtests.sh`
+  - Default: `./runtests.sh`
 
 - **`ci_branches`**: Branches to run CI on for push events
   - List of branch names to trigger CI for push events

{devs_webhook-0.1.0 → devs_webhook-0.1.2}/README.md

@@ -99,6 +99,25 @@ export AWS_SQS_QUEUE_URL="https://sqs.us-east-1.amazonaws.com/..."
 devs-webhook serve --source sqs
 ```
 
+#### Burst Mode
+
+For batch processing or scheduled jobs, use `--burst` to process all available messages and exit:
+
+```bash
+# Process all messages in queue then exit
+devs-webhook serve --source sqs --burst
+```
+
+Exit codes:
+- **0**: Successfully processed one or more messages
+- **42**: Queue was empty (no messages to process)
+- **Other**: Error occurred
+
+This is useful for:
+- Scheduled cron jobs that drain the queue periodically
+- Lambda-triggered batch processing
+- Testing and debugging SQS integration
+
 **Security**: Both modes validate GitHub webhook signatures for defense-in-depth security.
 
 For detailed configuration and deployment guides, see:
@@ -308,7 +327,7 @@ Available options:
 - **`ci_test_command`**: Command to run for CI tests
   - Shell command executed in container for CI test runs
   - Should exit with code 0 for success, non-zero for failure
-  - Default: `runtests.sh`
+  - Default: `./runtests.sh`
 
 - **`ci_branches`**: Branches to run CI on for push events
   - List of branch names to trigger CI for push events

{devs_webhook-0.1.0 → devs_webhook-0.1.2}/devs_webhook/__init__.py

@@ -11,6 +11,8 @@ from .core.webhook_handler import WebhookHandler
 from .core.container_pool import ContainerPool
 from .core.repository_manager import RepositoryManager
 from .core.claude_dispatcher import ClaudeDispatcher
+from .core.test_dispatcher import TestDispatcher
+from .core.base_dispatcher import TaskResult
 
 __all__ = [
     "WebhookConfig",
@@ -18,4 +20,6 @@ __all__ = [
     "ContainerPool", 
     "RepositoryManager",
     "ClaudeDispatcher",
+    "TestDispatcher",
+    "TaskResult",
 ]

{devs_webhook-0.1.0 → devs_webhook-0.1.2}/devs_webhook/cli/worker.py

@@ -16,7 +16,8 @@ from devs_common.core.project import Project
 from ..config import get_config
 from ..core.claude_dispatcher import ClaudeDispatcher
 from ..core.test_dispatcher import TestDispatcher
-from ..github.models import AnyWebhookEvent, DevsOptions
+from ..github.models import AnyWebhookEvent
+from devs_common.devs_config import DevsOptions
 
 logger = structlog.get_logger()
 
@@ -217,38 +218,26 @@ def _process_task_subprocess(
         # Initialize appropriate dispatcher based on task type
         if task_type == 'tests':
             dispatcher = TestDispatcher()
-            logger.info("Executing task with Test dispatcher",
-                       task_id=task_id,
-                       dev_name=dev_name,
-                       workspace_name=workspace_name)
-            
-            # Execute tests
-            result = asyncio.run(dispatcher.execute_tests(
-                dev_name=dev_name,
-                repo_path=repo_path,
-                event=event,
-                devs_options=devs_options
-            ))
         else:
             # Default to Claude execution
             dispatcher = ClaudeDispatcher()
-            logger.info("Executing task with Claude dispatcher",
-                       task_id=task_id,
-                       dev_name=dev_name,
-                       workspace_name=workspace_name)
             
             # Ensure task_description is provided for Claude tasks
             if not task_description:
                 raise ValueError("task_description is required for Claude tasks")
-            
-            # Execute Claude task
-            result = asyncio.run(dispatcher.execute_task(
-                dev_name=dev_name,
-                repo_path=repo_path,
-                task_description=task_description,
-                event=event,
-                devs_options=devs_options
-            ))
+        
+        logger.info(f"Executing task with {dispatcher.dispatcher_name} dispatcher",
+                   task_id=task_id,
+                   dev_name=dev_name,
+                   workspace_name=workspace_name)
+        
+        result = asyncio.run(dispatcher.execute_task(
+            dev_name=dev_name,
+            repo_path=repo_path,
+            event=event,
+            devs_options=devs_options,
+            task_description=task_description
+        ))
         
         if result.success:
             logger.info("Task execution completed successfully",

{devs_webhook-0.1.0 → devs_webhook-0.1.2}/devs_webhook/config.py

@@ -236,7 +236,11 @@ class WebhookConfig(BaseSettings, BaseConfig):
     def get_default_workspaces_dir(self) -> Path:
         """Get default workspaces directory for webhook package."""
         return Path.home() / ".devs" / "workspaces"
-    
+
+    def get_default_bridge_dir(self) -> Path:
+        """Get default bridge directory for webhook package."""
+        return Path.home() / ".devs" / "bridge"
+
     def get_default_project_prefix(self) -> str:
         """Get default project prefix for webhook package."""
         return "dev"

devs_webhook-0.1.2/devs_webhook/core/base_dispatcher.py

@@ -0,0 +1,57 @@
+"""Base dispatcher class with shared functionality."""
+
+from typing import NamedTuple, Optional
+import structlog
+from pathlib import Path
+
+from ..config import get_config
+from ..github.models import WebhookEvent
+from ..github.client import GitHubClient
+from devs_common.devs_config import DevsOptions
+
+logger = structlog.get_logger()
+
+
+class TaskResult(NamedTuple):
+    """Result of a task execution (consolidates TestResult and TaskResult)."""
+    success: bool
+    output: str
+    error: Optional[str] = None
+    exit_code: Optional[int] = None
+
+
+class BaseDispatcher:
+    """Base class for dispatchers with common functionality."""
+    
+    def __init__(self, dispatcher_type: str = "base"):
+        """Initialize dispatcher with common setup.
+        
+        Args:
+            dispatcher_type: Type of dispatcher for logging
+        """
+        self.config = get_config()
+        self.github_client = GitHubClient(self.config)
+        
+        logger.info(f"{dispatcher_type.title()} dispatcher initialized")
+    
+    async def execute_task(
+        self,
+        dev_name: str,
+        repo_path: Path,
+        event: WebhookEvent,
+        devs_options: Optional[DevsOptions] = None,
+        task_description: Optional[str] = None
+    ) -> TaskResult:
+        """Execute operation in container - to be implemented by subclasses.
+        
+        Args:
+            dev_name: Name of dev container (e.g., eamonn)
+            repo_path: Path to repository on host
+            event: Original webhook event
+            devs_options: Options from DEVS.yml file
+            task_description: Task description
+            
+        Returns:
+            Task execution result
+        """
+        raise NotImplementedError("Subclasses must implement execute_task")

{devs_webhook-0.1.0 → devs_webhook-0.1.2}/devs_webhook/core/claude_dispatcher.py

@@ -1,44 +1,35 @@
 """Claude Code CLI integration for executing tasks in containers."""
 
-from typing import NamedTuple, Optional
+from typing import Optional
 import structlog
 from pathlib import Path
 
 from devs_common.core.project import Project
 from devs_common.core.container import ContainerManager
 from devs_common.core.workspace import WorkspaceManager
-from ..config import get_config
-from ..github.models import WebhookEvent, IssueEvent, PullRequestEvent, CommentEvent, DevsOptions
-from ..github.client import GitHubClient
+from ..github.models import WebhookEvent, IssueEvent, PullRequestEvent, CommentEvent
+from devs_common.devs_config import DevsOptions
+from .base_dispatcher import BaseDispatcher, TaskResult
 
 logger = structlog.get_logger()
 
 
-class TaskResult(NamedTuple):
-    """Result of a Claude Code task execution."""
-    success: bool
-    output: str
-    error: Optional[str] = None
-
-
-class ClaudeDispatcher:
+class ClaudeDispatcher(BaseDispatcher):
     """Dispatches tasks to Claude Code CLI running in containers."""
     
+    dispatcher_name = "Claude"
+    
     def __init__(self):
         """Initialize Claude dispatcher."""
-        self.config = get_config()
-        
-        self.github_client = GitHubClient(self.config)
-        
-        logger.info("Claude dispatcher initialized")
+        super().__init__("Claude")
     
     async def execute_task(
         self,
         dev_name: str,
         repo_path: Path,
-        task_description: str,
         event: WebhookEvent,
-        devs_options: Optional[DevsOptions] = None
+        devs_options: Optional[DevsOptions] = None,
+        task_description: Optional[str] = None
     ) -> TaskResult:
         """Execute a task using Claude Code CLI in a container.
         
@@ -59,10 +50,13 @@ class ClaudeDispatcher:
                        repo_path=str(repo_path))
             
             # Execute Claude directly - prompt building, workspace setup, container startup, Claude execution
+            # Use task_description if provided, otherwise extract from event
+            task_desc = task_description or "Process webhook event"
+            
             success, output, error = self._execute_claude_sync(
                 repo_path,
                 dev_name,
-                task_description,
+                task_desc,
                 event,
                 devs_options
             )
@@ -78,7 +72,8 @@ class ClaudeDispatcher:
             result = TaskResult(
                 success=success,
                 output=output,
-                error=error if not success else None
+                error=error if not success else None,
+                exit_code=None  # Claude doesn't provide exit codes
             )
             
             if result.success:
@@ -104,7 +99,7 @@ class ClaudeDispatcher:
                         exc_info=True)
             
             await self._handle_task_failure(event, error_msg)
-            return TaskResult(success=False, output="", error=error_msg)
+            return TaskResult(success=False, output="", error=error_msg, exit_code=None)
     
     def _execute_claude_sync(
         self,

{devs_webhook-0.1.0 → devs_webhook-0.1.2}/devs_webhook/core/container_pool.py

@@ -9,15 +9,15 @@ from datetime import datetime, timedelta, timezone
 from typing import Dict, Optional, Any, NamedTuple
 from pathlib import Path
 import structlog
-import yaml
 
 from devs_common.core.project import Project
 from devs_common.core.container import ContainerManager
 from devs_common.core.workspace import WorkspaceManager
+from devs_common.devs_config import DevsConfigLoader, DevsOptions
 
 from ..config import get_config
-from ..github.models import WebhookEvent, DevsOptions, IssueEvent, PullRequestEvent, CommentEvent
-from .claude_dispatcher import ClaudeDispatcher, TaskResult
+from ..github.models import WebhookEvent, IssueEvent, PullRequestEvent, CommentEvent
+from .base_dispatcher import TaskResult
 from ..github.client import GitHubClient
 
 logger = structlog.get_logger()
@@ -39,7 +39,6 @@ class ContainerPool:
     def __init__(self):
         """Initialize container pool."""
         self.config = get_config()
-        self.claude_dispatcher = ClaudeDispatcher()
 
         # Track running containers for idle cleanup
         self.running_containers: Dict[str, Dict[str, Any]] = {}
@@ -140,21 +139,6 @@ class ContainerPool:
         Returns:
             DevsOptions if user-specific config exists, None otherwise
         """
-        def _load_devs_yml(file_path: Path) -> dict:
-            """Load and parse a DEVS.yml file, returning empty dict if not found."""
-            if not file_path.exists():
-                return {}
-            
-            try:
-                with open(file_path, 'r') as f:
-                    data = yaml.safe_load(f)
-                    return data if data else {}
-            except Exception as e:
-                logger.warning("Failed to parse user DEVS.yml",
-                              file_path=str(file_path),
-                              error=str(e))
-                return {}
-        
         # Check for user-specific configuration files
         user_envs_dir = Path.home() / ".devs" / "envs"
         default_devs_yml = user_envs_dir / "default" / "DEVS.yml"
@@ -165,69 +149,26 @@ class ContainerPool:
         if not default_devs_yml.exists() and not project_devs_yml.exists():
             return None
         
-        # Load user configuration
-        devs_options = DevsOptions()  # Start with defaults
+        # Load configuration without repository files (user configs only)
+        # Create a fake path that doesn't exist to skip repository DEVS.yml
+        fake_repo_path = Path("/dev/null/fake_repo_path")
+        devs_options = DevsConfigLoader.load(project_name=project_name, repo_path=fake_repo_path)
         
-        # 1. Load user default DEVS.yml
-        default_data = _load_devs_yml(default_devs_yml)
-        
-        # 2. Load user project-specific DEVS.yml (higher priority)
-        project_data = _load_devs_yml(project_devs_yml)
-        
-        # Merge data in priority order
-        all_data = {}
-        all_data.update(default_data)
-        all_data.update(project_data)
-        
-        # Update devs_options with merged values
-        if all_data:
-            if 'default_branch' in all_data:
-                devs_options.default_branch = all_data['default_branch']
-            if 'prompt_extra' in all_data:
-                devs_options.prompt_extra = all_data['prompt_extra']
-            if 'prompt_override' in all_data:
-                devs_options.prompt_override = all_data['prompt_override']
-            if 'direct_commit' in all_data:
-                devs_options.direct_commit = all_data['direct_commit']
-            if 'single_queue' in all_data:
-                devs_options.single_queue = all_data['single_queue']
-            if 'ci_enabled' in all_data:
-                devs_options.ci_enabled = all_data['ci_enabled']
-            if 'ci_test_command' in all_data:
-                devs_options.ci_test_command = all_data['ci_test_command']
-            if 'ci_branches' in all_data:
-                devs_options.ci_branches = all_data['ci_branches']
-            
-            # Merge env_vars from both sources
-            merged_env_vars = {}
-            for source_data in [default_data, project_data]:
-                if 'env_vars' in source_data and source_data['env_vars']:
-                    for container_name, env_dict in source_data['env_vars'].items():
-                        if container_name not in merged_env_vars:
-                            merged_env_vars[container_name] = {}
-                        merged_env_vars[container_name].update(env_dict)
-            
-            if merged_env_vars:
-                devs_options.env_vars = merged_env_vars
-            
-            logger.info("Loaded user-specific DEVS.yml configuration",
-                       repo=repo_name,
-                       default_file_exists=default_devs_yml.exists(),
-                       project_file_exists=project_devs_yml.exists(),
-                       default_branch=devs_options.default_branch,
-                       single_queue=devs_options.single_queue,
-                       ci_enabled=devs_options.ci_enabled,
-                       env_vars_containers=list(devs_options.env_vars.keys()) if devs_options.env_vars else [])
-            
-            return devs_options
+        logger.info("Loaded user-specific DEVS.yml configuration",
+                   repo=repo_name,
+                   default_file_exists=default_devs_yml.exists(),
+                   project_file_exists=project_devs_yml.exists(),
+                   default_branch=devs_options.default_branch,
+                   single_queue=devs_options.single_queue,
+                   ci_enabled=devs_options.ci_enabled,
+                   env_vars_containers=list(devs_options.env_vars.keys()) if devs_options.env_vars else [])
         
-        # No meaningful configuration found
-        return None
+        return devs_options
     
     def _read_devs_options(self, repo_path: Path, repo_name: str) -> DevsOptions:
         """Read and parse DEVS.yml options from multiple sources.
         
-        Loads from multiple sources in priority order:
+        Uses the shared DevsConfigLoader to load from:
         1. ~/.devs/envs/{org-repo}/DEVS.yml (user-specific overrides)
         2. ~/.devs/envs/default/DEVS.yml (user defaults)  
         3. {repo_path}/DEVS.yml (repository configuration)
@@ -239,87 +180,29 @@ class ContainerPool:
         Returns:
             DevsOptions with values from DEVS.yml files or defaults
         """
-        devs_options = DevsOptions()  # Start with defaults
-        
-        def _load_devs_yml(file_path: Path) -> dict:
-            """Load and parse a DEVS.yml file, returning empty dict if not found."""
-            if not file_path.exists():
-                return {}
-            
-            try:
-                with open(file_path, 'r') as f:
-                    data = yaml.safe_load(f)
-                    return data if data else {}
-            except Exception as e:
-                logger.warning("Failed to parse DEVS.yml",
-                              file_path=str(file_path),
-                              error=str(e))
-                return {}
-        
-        # 1. Load repository DEVS.yml (lowest priority)
-        repo_devs_yml = repo_path / "DEVS.yml"
-        repo_data = _load_devs_yml(repo_devs_yml)
+        project_name = repo_name.replace('/', '-')  # Convert org/repo to org-repo
+        devs_options = DevsConfigLoader.load(project_name=project_name, repo_path=repo_path)
         
-        # 2. Load user default DEVS.yml 
+        # Check which files exist for logging
         user_envs_dir = Path.home() / ".devs" / "envs"
+        repo_devs_yml = repo_path / "DEVS.yml"
         default_devs_yml = user_envs_dir / "default" / "DEVS.yml"
-        default_data = _load_devs_yml(default_devs_yml)
-        
-        # 3. Load user project-specific DEVS.yml (highest priority)
-        project_name = repo_name.replace('/', '-')  # Convert org/repo to org-repo
         project_devs_yml = user_envs_dir / project_name / "DEVS.yml"
-        project_data = _load_devs_yml(project_devs_yml)
-        
-        # Merge data in priority order (later updates override earlier ones)
-        all_data = {}
-        for source_data in [repo_data, default_data, project_data]:
-            all_data.update(source_data)
         
-        # Update devs_options with merged values
-        if all_data:
-            if 'default_branch' in all_data:
-                devs_options.default_branch = all_data['default_branch']
-            if 'prompt_extra' in all_data:
-                devs_options.prompt_extra = all_data['prompt_extra']
-            if 'prompt_override' in all_data:
-                devs_options.prompt_override = all_data['prompt_override']
-            if 'direct_commit' in all_data:
-                devs_options.direct_commit = all_data['direct_commit']
-            if 'single_queue' in all_data:
-                devs_options.single_queue = all_data['single_queue']
-            if 'ci_enabled' in all_data:
-                devs_options.ci_enabled = all_data['ci_enabled']
-            if 'ci_test_command' in all_data:
-                devs_options.ci_test_command = all_data['ci_test_command']
-            if 'ci_branches' in all_data:
-                devs_options.ci_branches = all_data['ci_branches']
-            
-            # Merge env_vars from all sources (repository < default < project)
-            merged_env_vars = {}
-            for source_data in [repo_data, default_data, project_data]:
-                if 'env_vars' in source_data and source_data['env_vars']:
-                    for container_name, env_dict in source_data['env_vars'].items():
-                        if container_name not in merged_env_vars:
-                            merged_env_vars[container_name] = {}
-                        merged_env_vars[container_name].update(env_dict)
-            
-            if merged_env_vars:
-                devs_options.env_vars = merged_env_vars
-            
-            logger.info("Loaded DEVS.yml configuration from multiple sources",
-                       repo=repo_name,
-                       repo_file_exists=repo_devs_yml.exists(),
-                       default_file_exists=default_devs_yml.exists(),
-                       project_file_exists=project_devs_yml.exists(),
-                       default_branch=devs_options.default_branch,
-                       has_prompt_extra=bool(devs_options.prompt_extra),
-                       has_prompt_override=bool(devs_options.prompt_override),
-                       direct_commit=devs_options.direct_commit,
-                       single_queue=devs_options.single_queue,
-                       ci_enabled=devs_options.ci_enabled,
-                       ci_test_command=devs_options.ci_test_command,
-                       ci_branches=devs_options.ci_branches,
-                       env_vars_containers=list(devs_options.env_vars.keys()) if devs_options.env_vars else [])
+        logger.info("Loaded DEVS.yml configuration from multiple sources",
+                   repo=repo_name,
+                   repo_file_exists=repo_devs_yml.exists(),
+                   default_file_exists=default_devs_yml.exists(),
+                   project_file_exists=project_devs_yml.exists(),
+                   default_branch=devs_options.default_branch,
+                   has_prompt_extra=bool(devs_options.prompt_extra),
+                   has_prompt_override=bool(devs_options.prompt_override),
+                   direct_commit=devs_options.direct_commit,
+                   single_queue=devs_options.single_queue,
+                   ci_enabled=devs_options.ci_enabled,
+                   ci_test_command=devs_options.ci_test_command,
+                   ci_branches=devs_options.ci_branches,
+                   env_vars_containers=list(devs_options.env_vars.keys()) if devs_options.env_vars else [])
         
         return devs_options