steerdev 1.0.58__tar.gz → 1.0.59__tar.gz

{steerdev-1.0.58 → steerdev-1.0.59}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: steerdev
-Version: 1.0.58
+Version: 1.0.59
 Summary: Backend task runner for steerdev.com - orchestrates CLI coding agents with activity reporting
 Project-URL: Homepage, https://github.com/pentoai/steerdev-agent
 Project-URL: Repository, https://github.com/pentoai/steerdev-agent

{steerdev-1.0.58 → steerdev-1.0.59}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "steerdev"
-version = "1.0.58"
+version = "1.0.59"
 description = "Backend task runner for steerdev.com - orchestrates CLI coding agents with activity reporting"
 readme = "README.md"
 authors = [

{steerdev-1.0.58 → steerdev-1.0.59}/src/steerdev_agent/agent_loop.py

@@ -126,6 +126,8 @@ class CommandExecutor:
                 await self._execute_task_command(command, project_id, working_directory)
             elif command.command_type == "prompt":
                 await self._execute_prompt_command(command, project_id, working_directory)
+            elif command.command_type == "merger":
+                await self._execute_merger_command(command, project_id, working_directory)
             else:
                 await self._commands_client.mark_failed(
                     command.id, error=f"Unknown command type: {command.command_type}"
@@ -403,6 +405,59 @@ class CommandExecutor:
         finally:
             await events_client.close()
 
+    async def _execute_merger_command(
+        self,
+        command: CommandResponse,
+        project_id: str,
+        working_directory: Path,
+    ) -> None:
+        """Execute a merger command - triggers merger run and polls for completion."""
+        from steerdev_agent.api.merger import MergerClient
+
+        assert self._commands_client is not None
+
+        merger_run_id = command.metadata.get("mergerRunId")
+        if not merger_run_id:
+            raise ValueError("merger command missing mergerRunId in metadata")
+
+        merger_client = MergerClient(api_key=self._api_key)
+
+        logger.info(f"Starting merger run: {merger_run_id}")
+
+        # Mark command as executing
+        await self._commands_client.mark_executing(command.id)
+
+        # Trigger execution
+        result = merger_client.execute_merger_run(merger_run_id)
+        if not result:
+            raise RuntimeError(f"Failed to trigger merger run {merger_run_id}")
+
+        # Poll for completion
+        max_polls = 60  # 30 minutes at 30s intervals
+        for _ in range(max_polls):
+            run = merger_client.get_merger_run(merger_run_id)
+            if not run:
+                raise RuntimeError("Failed to get merger run status")
+
+            if run.status in ("completed", "failed", "partial"):
+                logger.info(f"Merger run {merger_run_id} finished: {run.status}")
+                if run.status == "failed":
+                    raise RuntimeError(f"Merger run failed: {run.error_message}")
+                await self._commands_client.mark_completed(
+                    command.id,
+                    result=f"Merger run {merger_run_id} {run.status}",
+                )
+                self._commands_succeeded += 1
+                return
+
+            if self._shutdown_event.is_set():
+                logger.info("Shutdown during merger polling, aborting")
+                raise RuntimeError("Shutdown requested during merger run")
+
+            await asyncio.sleep(30)
+
+        raise RuntimeError(f"Merger run {merger_run_id} timed out")
+
 
 # ---------------------------------------------------------------------------
 # Project-scoped agent (original)

{steerdev-1.0.58 → steerdev-1.0.59}/src/steerdev_agent/api/commands.py

@@ -13,7 +13,7 @@ from steerdev_agent.api.client import get_agent_id, get_api_endpoint, get_api_ke
 
 console = Console()
 
-CommandType = Literal["task", "prompt", "control"]
+CommandType = Literal["task", "prompt", "control", "merger"]
 CommandStatus = Literal[
     "pending", "claimed", "executing", "completed", "failed", "cancelled", "expired"
 ]

steerdev-1.0.59/src/steerdev_agent/api/merger.py

@@ -0,0 +1,71 @@
+"""Merger API client for merger agent operations."""
+
+from typing import Any
+
+from pydantic import BaseModel
+
+from steerdev_agent.api.client import SteerDevClient
+
+
+class MergerRunResponse(BaseModel):
+    id: str
+    status: str
+    wave_ids: list[str] = []
+    task_ids: list[str] = []
+    pr_ids: list[str] = []
+    evidence_report_ids: list[str] = []
+    summary: str | None = None
+    merged_branches: list[str] | None = None
+    error_message: str | None = None
+    started_at: str | None = None
+    completed_at: str | None = None
+
+
+class GateResponse(BaseModel):
+    id: str
+    merger_run_id: str
+    canal_id: str
+    gate_number: int
+    status: str
+    started_at: str | None = None
+    completed_at: str | None = None
+    details: dict[str, Any] | None = None
+    error_message: str | None = None
+
+
+class MergerClient(SteerDevClient):
+    """Client for merger agent API operations."""
+
+    def execute_merger_run(self, merger_run_id: str) -> dict[str, Any] | None:
+        """Trigger execution of a full merger run."""
+        response = self.post(f"/merger-runs/{merger_run_id}/execute")
+        if response and response.status_code == 200:
+            return response.json()
+        return None
+
+    def get_merger_run(self, merger_run_id: str) -> MergerRunResponse | None:
+        """Get merger run status."""
+        response = self.get(f"/merger-runs/{merger_run_id}")
+        if response and response.status_code == 200:
+            return MergerRunResponse(**response.json())
+        return None
+
+    def get_merger_gates(self, merger_run_id: str) -> list[GateResponse]:
+        """Get gate statuses for a merger run."""
+        response = self.get(f"/merger-runs/{merger_run_id}/gates")
+        if response and response.status_code == 200:
+            data = response.json()
+            return [GateResponse(**g) for g in data.get("gates", [])]
+        return []
+
+    def execute_gate(
+        self, canal_id: str, gate_number: int, merger_run_id: str, merge_id: str | None = None
+    ) -> dict[str, Any] | None:
+        """Trigger execution of a specific gate."""
+        payload: dict[str, Any] = {"merger_run_id": merger_run_id}
+        if merge_id:
+            payload["merge_id"] = merge_id
+        response = self.post(f"/canals/{canal_id}/gates/{gate_number}", json=payload)
+        if response and response.status_code == 200:
+            return response.json()
+        return None