mirror of
https://github.com/rennf93/roboco.git
synced 2026-08-03 07:23:24 +02:00
Reject cancelled the proposal's status but never moved it out of the held-proposal set, so the one-open-proposal dedup blocked the release manager from ever re-assessing — a rejected proposal deadlocked the cycle. reject() now sets CANCELLED (mirroring video_post_service), which list_open_release_proposals already excludes, so a fresh proposal can originate next cycle. A failed ~40min background execute (gate red, CI red, or an unexpected crash) left the proposal silently PENDING with no signal to the CEO. _run_approve_background now writes a release_execute_outcome marker (status + detail) on every terminal outcome, and an 'error' marker on an unhandled exception. GET /proposal surfaces execute_status / execute_detail / execute_in_flight (derived from the in-memory _INFLIGHT_APPROVES registry) so the panel can show a running badge, a failure block with the reason, and a Retry-approve label instead of a silent wait. Co-authored-by: Renn F <rennf93@users.noreply.github.com>
400 lines
15 KiB
Python
400 lines
15 KiB
Python
"""Release-manager route coverage — CEO-only GET / approve / reject."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import asyncio
|
|
import contextlib
|
|
from http import HTTPStatus
|
|
from typing import TYPE_CHECKING
|
|
from unittest.mock import AsyncMock, patch
|
|
from uuid import UUID, uuid4
|
|
|
|
import pytest
|
|
import pytest_asyncio
|
|
import roboco.services.release_proposal as rp
|
|
from fastapi import FastAPI
|
|
from httpx import ASGITransport, AsyncClient
|
|
from roboco.api.deps import get_agent_context, get_db
|
|
from roboco.api.routes import release as release_route
|
|
from roboco.api.routes.release import router as release_router
|
|
from roboco.db.tables import AgentTable, ProjectTable, TaskTable
|
|
from roboco.foundation.policy.content import markers
|
|
from roboco.models import AgentRole, AgentStatus, Team
|
|
from roboco.models.base import TaskNature, TaskStatus, TaskType
|
|
from roboco.models.permissions import AgentContext
|
|
from roboco.services.release_executor import ReleaseResult
|
|
from roboco.services.release_proposal import ReleaseProposalService
|
|
from roboco.services.release_readiness import ReleaseReadinessReport, report_to_dict
|
|
from roboco.services.task import RELEASE_MANAGER_SOURCE, TaskService
|
|
from sqlalchemy import delete
|
|
|
|
if TYPE_CHECKING:
|
|
from collections.abc import AsyncIterator
|
|
from typing import Any
|
|
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
_VERSION = "0.13.0"
|
|
|
|
|
|
def _report() -> ReleaseReadinessReport:
|
|
return ReleaseReadinessReport(
|
|
proposed_version=_VERSION,
|
|
bump_kind="minor",
|
|
change_summary=["feat: a thing"],
|
|
drafted_changelog=f"## [{_VERSION}] - 2026-06-25\n\n### Added\n- a thing\n",
|
|
version_bump_plan=["pyproject.toml"],
|
|
gaps=[],
|
|
migration_notes=[],
|
|
gate_state="green",
|
|
)
|
|
|
|
|
|
async def _seed_agent(session: AsyncSession, role: AgentRole, slug: str) -> AgentTable:
|
|
agent = AgentTable(
|
|
id=uuid4(),
|
|
name=slug,
|
|
slug=f"{slug}-{uuid4().hex[:6]}",
|
|
role=role,
|
|
team=None,
|
|
status=AgentStatus.ACTIVE,
|
|
model_config={},
|
|
system_prompt="x",
|
|
capabilities=[],
|
|
permissions={},
|
|
metrics={},
|
|
)
|
|
session.add(agent)
|
|
await session.flush()
|
|
return agent
|
|
|
|
|
|
async def _seed_proposal(session: AsyncSession) -> TaskTable:
|
|
system = await _seed_agent(session, AgentRole.SYSTEM, "system")
|
|
secretary = await _seed_agent(session, AgentRole.SECRETARY, "secretary")
|
|
project = ProjectTable(
|
|
id=uuid4(),
|
|
name="RoboCo",
|
|
slug=f"roboco-{uuid4().hex[:6]}",
|
|
git_url="https://example.com/roboco.git",
|
|
assigned_cell=Team.BACKEND,
|
|
created_by=system.id,
|
|
)
|
|
session.add(project)
|
|
await session.flush()
|
|
task = TaskTable(
|
|
id=uuid4(),
|
|
title=f"Release proposal: v{_VERSION}",
|
|
description="proposal body",
|
|
acceptance_criteria=["CEO approves"],
|
|
status=TaskStatus.PENDING,
|
|
priority=2,
|
|
task_type=TaskType.ADMINISTRATIVE,
|
|
nature=TaskNature.NON_TECHNICAL,
|
|
project_id=project.id,
|
|
created_by=system.id,
|
|
assigned_to=secretary.id,
|
|
team=Team.MAIN_PM,
|
|
source=RELEASE_MANAGER_SOURCE,
|
|
confirmed_by_human=False,
|
|
orchestration_markers={"release_report": report_to_dict(_report())},
|
|
)
|
|
session.add(task)
|
|
await session.flush()
|
|
return task
|
|
|
|
|
|
def _build_app(db_session: AsyncSession, role: AgentRole, agent_id: UUID) -> FastAPI:
|
|
app = FastAPI()
|
|
app.include_router(release_router, prefix="/api/release")
|
|
|
|
async def _override_db() -> AsyncIterator[AsyncSession]:
|
|
yield db_session
|
|
|
|
async def _override_agent() -> AgentContext:
|
|
return AgentContext(agent_id=agent_id, role=role, team=None)
|
|
|
|
app.dependency_overrides[get_db] = _override_db
|
|
app.dependency_overrides[get_agent_context] = _override_agent
|
|
return app
|
|
|
|
|
|
@pytest_asyncio.fixture
|
|
async def ceo_client(db_session: AsyncSession) -> AsyncIterator[AsyncClient]:
|
|
app = _build_app(db_session, AgentRole.CEO, uuid4())
|
|
transport = ASGITransport(app=app)
|
|
async with AsyncClient(transport=transport, base_url="http://test") as client:
|
|
yield client
|
|
# The approve/reject routes call db.commit() (real behavior), so a held
|
|
# proposal persists past the per-test rollback. list_open_release_proposals()
|
|
# is global (source-scoped, all projects), so clean up to avoid leaking into
|
|
# the engine tests that assert on it.
|
|
await db_session.execute(
|
|
delete(TaskTable).where(TaskTable.source == RELEASE_MANAGER_SOURCE)
|
|
)
|
|
await db_session.commit()
|
|
app.dependency_overrides.clear()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_get_proposal_returns_open_proposal(
|
|
db_session: AsyncSession, ceo_client: AsyncClient
|
|
) -> None:
|
|
await _seed_proposal(db_session)
|
|
resp = await ceo_client.get("/api/release/proposal")
|
|
assert resp.status_code == HTTPStatus.OK
|
|
body = resp.json()
|
|
assert body["report"]["proposed_version"] == _VERSION
|
|
assert body["report"]["bump_kind"] == "minor"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_get_proposal_404_when_none(ceo_client: AsyncClient) -> None:
|
|
resp = await ceo_client.get("/api/release/proposal")
|
|
assert resp.status_code == HTTPStatus.NOT_FOUND
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_approve_dispatches_async_and_completes(
|
|
db_session: AsyncSession, ceo_client: AsyncClient
|
|
) -> None:
|
|
"""#324: the approve route dispatches the ~40min execute in a background
|
|
task and returns 202 immediately (a synchronous request would 504 at nginx
|
|
before the fail-closed gate/CI/publish finished). The panel polls
|
|
GET /proposal for the final status; here we await the dispatched task and
|
|
assert the proposal transitions to COMPLETED once the (faked) publish
|
|
succeeds."""
|
|
task = await _seed_proposal(db_session)
|
|
published = ReleaseResult(
|
|
status="published",
|
|
version=_VERSION,
|
|
files_changed=["pyproject.toml"],
|
|
commit_sha="abc123",
|
|
release_url=f"https://github.com/x/roboco/releases/tag/v{_VERSION}",
|
|
detail="ok",
|
|
)
|
|
fake_executor = AsyncMock()
|
|
fake_executor.execute = AsyncMock(return_value=published)
|
|
captured: dict[str, asyncio.Task[None]] = {}
|
|
real_dispatch = release_route.dispatch_approve
|
|
|
|
def _capturing_dispatch(task_id: UUID, factory: Any) -> asyncio.Task[None]:
|
|
bg = real_dispatch(task_id, factory)
|
|
captured["task"] = bg
|
|
return bg
|
|
|
|
with (
|
|
patch(
|
|
"roboco.services.release_proposal.get_release_executor",
|
|
AsyncMock(return_value=fake_executor),
|
|
),
|
|
patch(
|
|
"roboco.api.routes.release.dispatch_approve",
|
|
side_effect=_capturing_dispatch,
|
|
),
|
|
patch.object(
|
|
ReleaseProposalService, "_acquire_release_lock", AsyncMock(return_value="t")
|
|
),
|
|
patch.object(
|
|
ReleaseProposalService,
|
|
"_release_release_lock",
|
|
AsyncMock(return_value=None),
|
|
),
|
|
patch.object(
|
|
ReleaseProposalService,
|
|
"_heartbeat_release_lock",
|
|
AsyncMock(return_value=True),
|
|
),
|
|
):
|
|
resp = await ceo_client.post("/api/release/proposal/approve")
|
|
assert resp.status_code == HTTPStatus.ACCEPTED
|
|
assert resp.json()["status"] == "accepted"
|
|
# Await the background execute WHILE the executor patch is still active
|
|
# (the dispatched task runs the faked publish).
|
|
bg = captured["task"]
|
|
await bg
|
|
fake_executor.execute.assert_awaited_once()
|
|
await db_session.refresh(task)
|
|
assert task.status == TaskStatus.COMPLETED
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_approve_gate_failure_keeps_proposal_open_async(
|
|
db_session: AsyncSession, ceo_client: AsyncClient
|
|
) -> None:
|
|
"""A gate failure in the background execute leaves the proposal open (the
|
|
CEO retries after the cause is fixed); the route still returned 202."""
|
|
task = await _seed_proposal(db_session)
|
|
failed = ReleaseResult(
|
|
status="gate_failed",
|
|
version=_VERSION,
|
|
files_changed=["pyproject.toml"],
|
|
commit_sha=None,
|
|
release_url=None,
|
|
detail="make quality failed",
|
|
)
|
|
fake_executor = AsyncMock()
|
|
fake_executor.execute = AsyncMock(return_value=failed)
|
|
captured: dict[str, asyncio.Task[None]] = {}
|
|
real_dispatch = release_route.dispatch_approve
|
|
|
|
def _capturing_dispatch(task_id: UUID, factory: Any) -> asyncio.Task[None]:
|
|
bg = real_dispatch(task_id, factory)
|
|
captured["task"] = bg
|
|
return bg
|
|
|
|
with (
|
|
patch(
|
|
"roboco.services.release_proposal.get_release_executor",
|
|
AsyncMock(return_value=fake_executor),
|
|
),
|
|
patch(
|
|
"roboco.api.routes.release.dispatch_approve",
|
|
side_effect=_capturing_dispatch,
|
|
),
|
|
patch.object(
|
|
ReleaseProposalService, "_acquire_release_lock", AsyncMock(return_value="t")
|
|
),
|
|
patch.object(
|
|
ReleaseProposalService,
|
|
"_release_release_lock",
|
|
AsyncMock(return_value=None),
|
|
),
|
|
patch.object(
|
|
ReleaseProposalService,
|
|
"_heartbeat_release_lock",
|
|
AsyncMock(return_value=True),
|
|
),
|
|
):
|
|
resp = await ceo_client.post("/api/release/proposal/approve")
|
|
assert resp.status_code == HTTPStatus.ACCEPTED
|
|
assert resp.json()["status"] == "accepted"
|
|
await captured["task"]
|
|
await db_session.refresh(task)
|
|
assert task.status == TaskStatus.PENDING # still held for retry
|
|
# The failure reason is persisted as a marker + surfaced via GET /proposal
|
|
# so a failed ~40min execute isn't a silent PENDING.
|
|
outcome = markers.get_release_execute_outcome(task)
|
|
assert outcome is not None
|
|
assert outcome[0] == "gate_failed"
|
|
assert "make quality failed" in outcome[1]
|
|
poll = await ceo_client.get("/api/release/proposal")
|
|
assert poll.status_code == HTTPStatus.OK
|
|
body = poll.json()
|
|
assert body["execute_status"] == "gate_failed"
|
|
assert "make quality failed" in (body["execute_detail"] or "")
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_approve_exception_records_error_marker(
|
|
db_session: AsyncSession, ceo_client: AsyncClient
|
|
) -> None:
|
|
"""An unexpected crash in the background execute (not a structured
|
|
ReleaseResult failure) is recorded as an ``error`` marker so the CEO sees a
|
|
reason instead of a silent PENDING."""
|
|
task = await _seed_proposal(db_session)
|
|
fake_executor = AsyncMock()
|
|
fake_executor.execute = AsyncMock(side_effect=RuntimeError("boom"))
|
|
captured: dict[str, asyncio.Task[None]] = {}
|
|
real_dispatch = release_route.dispatch_approve
|
|
|
|
def _capturing_dispatch(task_id: UUID, factory: Any) -> asyncio.Task[None]:
|
|
bg = real_dispatch(task_id, factory)
|
|
captured["task"] = bg
|
|
return bg
|
|
|
|
with (
|
|
patch(
|
|
"roboco.services.release_proposal.get_release_executor",
|
|
AsyncMock(return_value=fake_executor),
|
|
),
|
|
patch(
|
|
"roboco.api.routes.release.dispatch_approve",
|
|
side_effect=_capturing_dispatch,
|
|
),
|
|
patch.object(
|
|
ReleaseProposalService, "_acquire_release_lock", AsyncMock(return_value="t")
|
|
),
|
|
patch.object(
|
|
ReleaseProposalService,
|
|
"_release_release_lock",
|
|
AsyncMock(return_value=None),
|
|
),
|
|
patch.object(
|
|
ReleaseProposalService,
|
|
"_heartbeat_release_lock",
|
|
AsyncMock(return_value=True),
|
|
),
|
|
):
|
|
await ceo_client.post("/api/release/proposal/approve")
|
|
await captured["task"]
|
|
await db_session.refresh(task)
|
|
assert task.status == TaskStatus.PENDING # still held for retry
|
|
outcome = markers.get_release_execute_outcome(task)
|
|
assert outcome is not None
|
|
assert outcome[0] == "error"
|
|
assert "boom" in outcome[1]
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_get_proposal_surfaces_in_flight(
|
|
db_session: AsyncSession, ceo_client: AsyncClient
|
|
) -> None:
|
|
"""execute_in_flight is derived from the in-memory _INFLIGHT_APPROVES
|
|
registry — True while a background execute is registered."""
|
|
await _seed_proposal(db_session)
|
|
resp = await ceo_client.get("/api/release/proposal")
|
|
tid = UUID(resp.json()["task_id"])
|
|
# Register a real pending task under the proposal id, as dispatch_approve does.
|
|
sentinel = asyncio.create_task(asyncio.sleep(3600))
|
|
rp._INFLIGHT_APPROVES[tid] = sentinel
|
|
try:
|
|
in_flight_resp = await ceo_client.get("/api/release/proposal")
|
|
assert in_flight_resp.json()["execute_in_flight"] is True
|
|
finally:
|
|
rp._INFLIGHT_APPROVES.pop(tid, None)
|
|
sentinel.cancel()
|
|
with contextlib.suppress(asyncio.CancelledError):
|
|
await sentinel
|
|
idle_resp = await ceo_client.get("/api/release/proposal")
|
|
assert idle_resp.json()["execute_in_flight"] is False
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_reject_records_changes_and_cancels_frees_dedup(
|
|
db_session: AsyncSession, ceo_client: AsyncClient
|
|
) -> None:
|
|
"""Reject cancels the proposal (not holds it) so the one-open-proposal dedup
|
|
frees and the release manager can re-assess next cycle. The required-changes
|
|
marker stays on the cancelled row for history."""
|
|
task = await _seed_proposal(db_session)
|
|
resp = await ceo_client.post(
|
|
"/api/release/proposal/reject",
|
|
json={"required_changes": "Tighten the CHANGELOG wording for the API change."},
|
|
)
|
|
assert resp.status_code == HTTPStatus.OK
|
|
assert "Tighten the CHANGELOG" in (resp.json()["required_changes"] or "")
|
|
refreshed = await db_session.get(TaskTable, task.id)
|
|
assert refreshed is not None
|
|
assert refreshed.status == TaskStatus.CANCELLED # cancelled, not held
|
|
# The dedup no longer counts it as open — a fresh proposal can originate.
|
|
open_proposals = await TaskService(db_session).list_open_release_proposals()
|
|
assert task.id not in {t.id for t in open_proposals}
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_non_ceo_is_forbidden(db_session: AsyncSession) -> None:
|
|
await _seed_proposal(db_session)
|
|
app = _build_app(db_session, AgentRole.DEVELOPER, uuid4())
|
|
transport = ASGITransport(app=app)
|
|
async with AsyncClient(transport=transport, base_url="http://test") as client:
|
|
get_resp = await client.get("/api/release/proposal")
|
|
approve_resp = await client.post("/api/release/proposal/approve")
|
|
reject_resp = await client.post(
|
|
"/api/release/proposal/reject", json={"required_changes": "x" * 20}
|
|
)
|
|
assert get_resp.status_code == HTTPStatus.FORBIDDEN
|
|
assert approve_resp.status_code == HTTPStatus.FORBIDDEN
|
|
assert reject_resp.status_code == HTTPStatus.FORBIDDEN
|
|
app.dependency_overrides.clear()
|