devs-webhook 3.3.6__tar.gz → 3.4.1__tar.gz

{devs_webhook-3.3.6 → devs_webhook-3.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devs-webhook
-Version: 3.3.6
+Version: 3.4.1
 Summary: GitHub webhook handler for automated devcontainer operations with Claude Code
 Author: Dan Lester
 License-Expression: MIT
@@ -107,7 +107,6 @@ export AUTHORIZED_TRIGGER_USERS="danlester,admin"  # Users who can trigger proce
 # Optional settings (with defaults)
 export CONTAINER_POOL="eamonn,harry,darren"
 export CONTAINER_TIMEOUT_MINUTES="30"
-export MAX_CONCURRENT_TASKS="3"
 export WEBHOOK_HOST="0.0.0.0"
 export WEBHOOK_PORT="8000"
 ```
@@ -446,7 +445,6 @@ The webhook handler automatically detects and uses these settings when processin
 | `AUTHORIZED_TRIGGER_USERS`  | (empty - allows all)         | Comma-separated list of users who can trigger events |
 | `CONTAINER_POOL`            | `eamonn,harry,darren`        | Container names                          |
 | `CONTAINER_TIMEOUT_MINUTES` | `30`                         | Container timeout                        |
-| `MAX_CONCURRENT_TASKS`      | `3`                          | Max parallel tasks                       |
 | `REPO_CACHE_DIR`            | `~/.devs-webhook/repos`      | Repository cache                         |
 | `WORKSPACE_DIR`             | `~/.devs-webhook/workspaces` | Container workspaces                     |
 | `WEBHOOK_HOST`              | `0.0.0.0`                    | Server host                              |

{devs_webhook-3.3.6 → devs_webhook-3.4.1}/README.md

@@ -50,7 +50,6 @@ export AUTHORIZED_TRIGGER_USERS="danlester,admin"  # Users who can trigger proce
 # Optional settings (with defaults)
 export CONTAINER_POOL="eamonn,harry,darren"
 export CONTAINER_TIMEOUT_MINUTES="30"
-export MAX_CONCURRENT_TASKS="3"
 export WEBHOOK_HOST="0.0.0.0"
 export WEBHOOK_PORT="8000"
 ```
@@ -389,7 +388,6 @@ The webhook handler automatically detects and uses these settings when processin
 | `AUTHORIZED_TRIGGER_USERS`  | (empty - allows all)         | Comma-separated list of users who can trigger events |
 | `CONTAINER_POOL`            | `eamonn,harry,darren`        | Container names                          |
 | `CONTAINER_TIMEOUT_MINUTES` | `30`                         | Container timeout                        |
-| `MAX_CONCURRENT_TASKS`      | `3`                          | Max parallel tasks                       |
 | `REPO_CACHE_DIR`            | `~/.devs-webhook/repos`      | Repository cache                         |
 | `WORKSPACE_DIR`             | `~/.devs-webhook/workspaces` | Container workspaces                     |
 | `WEBHOOK_HOST`              | `0.0.0.0`                    | Server host                              |

{devs_webhook-3.3.6 → devs_webhook-3.4.1}/devs_webhook/config.py

@@ -90,8 +90,6 @@ class WebhookConfig(BaseSettings, BaseConfig):
                     "This ensures only one running container per dev name at any time, "
                     "reducing RAM usage when multiple repos are in play."
     )
-    max_concurrent_tasks: int = Field(default=3, description="Maximum concurrent tasks")
-    
     # Repository settings
     repo_cache_dir: Path = Field(
         default_factory=lambda: Path.home() / ".devs" / "repocache",
@@ -279,18 +277,16 @@ class WebhookConfig(BaseSettings, BaseConfig):
             missing.append("github_webhook_secret (GITHUB_WEBHOOK_SECRET) - required for signature verification")
 
         # Task source specific validations
-        if self.task_source == "webhook":
-            # Require admin password in production mode
-            if not self.dev_mode and not self.admin_password:
-                missing.append("admin_password (ADMIN_PASSWORD) - required in production mode")
-
-        elif self.task_source == "sqs":
+        if self.task_source == "sqs":
             # SQS source requires queue URL
             if not self.aws_sqs_queue_url:
                 missing.append("aws_sqs_queue_url (AWS_SQS_QUEUE_URL) - required for SQS source")
 
-        else:
+        elif self.task_source != "webhook":
             missing.append(f"task_source must be 'webhook' or 'sqs', got '{self.task_source}'")
+        # admin_password is only enforced when actually starting the FastAPI server
+        # (see main_cli.serve). It's not required for SQS-source operation or for
+        # read-only commands like `devs-webhook config`.
 
         # Raise error if any required settings are missing
         if missing:

{devs_webhook-3.3.6 → devs_webhook-3.4.1}/devs_webhook/core/claude_dispatcher.py

@@ -176,8 +176,25 @@ class ClaudeDispatcher(BaseDispatcher):
                 logger.info("Created new workspace",
                            container=dev_name,
                            workspace_dir=str(workspace_dir))
-            
-            # 3. Build Claude prompt
+
+            # 3. Ensure container is running with environment variables from DEVS.yml.
+            # check_rebuild defaults to True so the image is rebuilt when devcontainer
+            # files change. Safe here because the per-devname queue is serial — a rebuild
+            # only happens between tasks, never mid-task.
+            extra_env = None
+            if devs_options:
+                extra_env = devs_options.get_env_vars(dev_name)
+
+            if not container_manager.ensure_container_running(
+                dev_name=dev_name,
+                workspace_dir=workspace_dir,
+                force_rebuild=False,
+                debug=self.config.dev_mode,
+                extra_env=extra_env,
+            ):
+                return False, "", f"Failed to start container for {dev_name}", 1
+
+            # 4. Build Claude prompt
             workspace_name = project.get_workspace_name(dev_name)
             workspace_path = f"/workspaces/{workspace_name}"
             repo_name = event.repository.full_name
@@ -277,14 +294,10 @@ Always remember to PUSH your work to origin!
                        prompt_length=len(prompt),
                        event_type="PR" if is_pr else "Issue")
             
-            # 4. Execute Claude (like CLI pattern) with environment variables from DEVS.yml
+            # 5. Execute Claude (like CLI pattern) with environment variables from DEVS.yml
             logger.info("Executing Claude via ContainerManager (like CLI)",
                        container=dev_name)
 
-            extra_env = None
-            if devs_options:
-                extra_env = devs_options.get_env_vars(dev_name)
-
             # Start container logging if enabled
             if container_log:
                 container_log.start(prompt=prompt, workspace_dir=str(workspace_dir))

{devs_webhook-3.3.6 → devs_webhook-3.4.1}/devs_webhook/core/container_pool.py

@@ -369,6 +369,16 @@ class ContainerPool:
             # Determine which container to use
             best_container = None
 
+            # Load score = queued tasks + 1 if a task is currently running on the
+            # container. Without the running-task term, qsize() reads 0 for a
+            # busy-but-not-backlogged container (the worker pulls off the queue
+            # immediately) and the first item in target_pool wins every tie,
+            # pinning all traffic to one devname.
+            def _load(dev_name: str) -> int:
+                queued = self.container_queues[dev_name].qsize()
+                running = 1 if dev_name in self.running_containers else 0
+                return queued + running
+
             if single_queue_required:
                 # Use the previously assigned container for this single-queue repo
                 if repo_name in self.single_queue_assignments:
@@ -389,12 +399,7 @@ class ContainerPool:
 
                 if best_container is None:
                     # First time for this single-queue repo or need reassignment
-                    min_queue_size = float('inf')
-                    for dev_name in target_pool:
-                        queue_size = self.container_queues[dev_name].qsize()
-                        if queue_size < min_queue_size:
-                            min_queue_size = queue_size
-                            best_container = dev_name
+                    best_container = min(target_pool, key=_load)
 
                     if best_container:
                         self.single_queue_assignments[repo_name] = best_container
@@ -403,13 +408,8 @@ class ContainerPool:
                                    container=best_container,
                                    task_type=task_type)
             else:
-                # Normal load balancing - find container with shortest queue in target pool
-                min_queue_size = float('inf')
-                for dev_name in target_pool:
-                    queue_size = self.container_queues[dev_name].qsize()
-                    if queue_size < min_queue_size:
-                        min_queue_size = queue_size
-                        best_container = dev_name
+                # Normal load balancing - lowest queued+running count in target pool
+                best_container = min(target_pool, key=_load) if target_pool else None
 
             if best_container is None:
                 logger.error("No containers available for task queuing",

{devs_webhook-3.3.6 → devs_webhook-3.4.1}/devs_webhook/main_cli.py

@@ -124,6 +124,15 @@ def serve(host: str, port: int, reload: bool, env_file: Path, dev: bool, source:
 
     # Start the appropriate task source
     if config.task_source == "webhook":
+        # admin_password is required only when actually serving the FastAPI app
+        # (the admin endpoints use BasicAuth). SQS-source operation doesn't need it.
+        if not config.dev_mode and not config.admin_password:
+            click.echo(
+                "❌ ADMIN_PASSWORD is required when serving the webhook FastAPI app "
+                "in production mode (set ADMIN_PASSWORD or enable DEV_MODE=true)."
+            )
+            exit(1)
+
         # Override config with CLI options
         actual_host = host or config.webhook_host
         actual_port = port or config.webhook_port

{devs_webhook-3.3.6 → devs_webhook-3.4.1}/devs_webhook.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devs-webhook
-Version: 3.3.6
+Version: 3.4.1
 Summary: GitHub webhook handler for automated devcontainer operations with Claude Code
 Author: Dan Lester
 License-Expression: MIT
@@ -107,7 +107,6 @@ export AUTHORIZED_TRIGGER_USERS="danlester,admin"  # Users who can trigger proce
 # Optional settings (with defaults)
 export CONTAINER_POOL="eamonn,harry,darren"
 export CONTAINER_TIMEOUT_MINUTES="30"
-export MAX_CONCURRENT_TASKS="3"
 export WEBHOOK_HOST="0.0.0.0"
 export WEBHOOK_PORT="8000"
 ```
@@ -446,7 +445,6 @@ The webhook handler automatically detects and uses these settings when processin
 | `AUTHORIZED_TRIGGER_USERS`  | (empty - allows all)         | Comma-separated list of users who can trigger events |
 | `CONTAINER_POOL`            | `eamonn,harry,darren`        | Container names                          |
 | `CONTAINER_TIMEOUT_MINUTES` | `30`                         | Container timeout                        |
-| `MAX_CONCURRENT_TASKS`      | `3`                          | Max parallel tasks                       |
 | `REPO_CACHE_DIR`            | `~/.devs-webhook/repos`      | Repository cache                         |
 | `WORKSPACE_DIR`             | `~/.devs-webhook/workspaces` | Container workspaces                     |
 | `WEBHOOK_HOST`              | `0.0.0.0`                    | Server host                              |

{devs_webhook-3.3.6 → devs_webhook-3.4.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "devs-webhook"
-version = "3.3.6"
+version = "3.4.1"
 description = "GitHub webhook handler for automated devcontainer operations with Claude Code"
 readme = "README.md"
 requires-python = ">=3.8"