mirror of
https://github.com/rennf93/roboco.git
synced 2026-08-03 07:23:24 +02:00
* [4baffaa3] refactor(api): relocate route-layer helpers out of batch-A files into services/schemas/deps
Move every non-@router-decorated top-level function out of
roboco/api/routes/{tasks,a2a,orchestrator,video,v1/_role_dep,roadmap,prompter_live}.py
(journals.py had none) into the module that owns its kind of concern:
- DB/side-effecting logic -> the paired roboco/services module
(task.py, a2a.py, video_engine.py, video_post_service.py, prompter.py)
- DTO-conversion helpers -> roboco/api/schemas/{tasks,video,roadmap}.py,
matching tasks.py's existing task_to_response pattern
- small HTTP-layer auth guards -> roboco/api/deps.py, matching its
existing require_ceo_role/require_pm_or_above pattern
Redundant per-file _require_ceo(agent) wrappers (a2a/orchestrator/video/
roadmap) that just partial-applied an already-existing deps.py function
were inlined to direct require_ceo_role(...) calls instead of duplicated
across services. v1/_role_dep.py keeps its per-role frozenset variable
bindings since those are assignments, not function definitions, and
aren't flagged by the architectural-conventions classifier.
Route paths, schemas, and observable behavior are unchanged. Updated 5
existing test files whose imports or monkeypatch targets pointed at the
old private route-module names.
* [4baffaa3] test(conventions): pin batch-A route files already free of helper findings
* [4baffaa3] fix(api): restore fail-closed _auth_required() fallback (GHSA-4f7g-w95g-5q2c)
The batch-A route-helper relocation accidentally narrowed
_auth_required() to a truthy-only check, dropping the unset-value
fallback to settings.environment == "production". An unconfigured
production deploy would then always return False, silently accepting
unauthenticated X-Agent-Role: ceo header spoofing. Restore the
three-branch logic (explicit true/false honored, unset falls back to
the production check) and the GHSA docstring paragraph explaining it.
* [4baffaa3] fix(services): restore missing Board-Program/X-engine source-tag constants in task.py
The batch-A route-helper relocation's task.py edits had dropped ~24
module-level source-tag constants (BARFLY_SOURCE, CORONER_SOURCE,
DOGFOOD_SOURCE, LIBRARIAN_SOURCE, MEGAPHONE_SOURCE, MIRROR_SOURCE,
PERISCOPE_SOURCE, PEST_CONTROL_SOURCE, SCALES_SOURCE, SENTINEL_SOURCE,
SPACKLE_SOURCE, WAR_ROOM_SOURCE, their *_ITEM_SOURCE materialized-task
counterparts, ENV_SYNC_SOURCE, EVAL_BENCH_SOURCE, and the later X-engine
held-draft tags X_EDITORIAL_SOURCE/X_CAMPAIGN_SOURCE/X_BARFLY_SOURCE)
that ~20 downstream service/engine modules and orchestrator.py's
dispatch table import, breaking the whole FastAPI app's import chain
(deps.py -> AgentOrchestrator -> orchestrator.py -> task.py) and
failing collection on 7 test files.
Restored every missing constant in the same style/location as the
existing block, values cross-checked against board_programs.py's
PROGRAMS registry and hardcoded-string test assertions. Folded the
three new X-engine tags into X_SOURCES (x_post_service.py's
task.source not in X_SOURCES membership check gates their
approve/reject).
Also closes a pre-existing PLR0917 (too-many-positional-args) gap in
pyproject.toml's per-file-ignores for roboco/api/routes/*.py,
roboco/api/deps.py, and roboco/services/prompter.py: these files
already carry an established PLR0913 ignore with a documented
FastAPI-DI-contract / MegaTask-contract rationale that applies equally
to PLR0917, which ruff was flagging on the same pre-existing
signatures (get_current_agent_id, get_current_agent_slug,
_cloud_auth_agent_context, get_agent_context, list_tasks_summary,
_rewrite_batch_children).
* [4baffaa3] fix(api): restore verb-rejection logging and fix stale monkeypatch target in orchestrator auth tests
Two regressions surfaced by re-running the full unit test suite after
restoring task.py's import chain (previously masked because the whole
app failed to import):
1. envelope_to_response() (relocated into roboco/api/deps.py from
v1/_role_dep.py during the batch-A helper extraction) dropped the
"verb rejected" structlog event an error envelope must leave — a
rejected envelope rides a 200, so without this the access log can't
distinguish a verb an agent couldn't satisfy from one that worked
(four Board Programs died that way on 2026-07-25 with no
recoverable reason, per tests/unit/api/routes/v1/
test_verb_rejection_logging.py's docstring). Restored the log call:
verb name from the request path, error/detail/remediate from the
envelope, agent_id/agent_role from the request headers.
2. tests/unit/api/test_orchestrator_auth.py's two cloud-auth session
tests monkeypatched "roboco.api.routes.orchestrator.
resolve_session_user", the pre-relocation location. The guard that
actually calls resolve_session_user (require_orchestrator_ceo) now
lives in roboco/api/deps.py, same as the other route auth test
files' already-updated pattern (test_deps.py); repointed both
patches there.
Verified via a full tests/unit/api/ + tests/unit/conventions/
test_route_helper_placement_batch_a.py run: 605 passed, 18 skipped
(Postgres-gated), 1 pre-existing failure unrelated to this diff
(test_cloud_auth.py's oauth2-form test needs a live production DB
connection, not available in this sandboxed workspace).
* [4baffaa3] docs(api-routes-schemas): reflect batch-A route-helper relocation into services/schemas/deps
---------
Co-authored-by: Backend Developer 1 <be-dev-1@roboco.tech>
Co-authored-by: Backend Documenter <be-doc@roboco.tech>
278 lines
9.2 KiB
Python
278 lines
9.2 KiB
Python
"""Manual (panel) spawn: task-aware prompt helper + already-running signaling.
|
|
|
|
Covers the CEO-facing spawn-refusal / double-fire triage: a task-aware
|
|
initial prompt built server-side for a manual spawn (mirroring
|
|
``_build_pr_review_prompt``'s tone), an ``AgentReadinessError`` refusal
|
|
mapped to 409 (not an opaque 500) so the panel can show the real reason, and
|
|
an ``already_running`` marker so a no-op spawn (agent already active) is
|
|
distinguishable from a genuine new spawn.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from datetime import UTC, datetime
|
|
from http import HTTPStatus
|
|
from types import SimpleNamespace
|
|
from typing import TYPE_CHECKING, cast
|
|
from unittest.mock import AsyncMock, MagicMock
|
|
from uuid import uuid4
|
|
|
|
import pytest
|
|
import pytest_asyncio
|
|
import roboco.services.task as task_service_module
|
|
from fastapi import FastAPI
|
|
from httpx import ASGITransport, AsyncClient
|
|
from roboco.api.deps import _ServiceHolder, set_orchestrator
|
|
from roboco.api.routes.orchestrator import (
|
|
router as orch_router,
|
|
)
|
|
from roboco.runtime.orchestrator import AgentReadinessError, AgentState
|
|
from roboco.services.task import (
|
|
build_manual_spawn_prompt,
|
|
resolve_manual_spawn_prompt,
|
|
)
|
|
|
|
if TYPE_CHECKING:
|
|
from collections.abc import AsyncIterator
|
|
|
|
from roboco.db.tables import TaskTable
|
|
|
|
_HDR = {"X-Agent-ID": str(uuid4()), "X-Agent-Role": "ceo"}
|
|
|
|
|
|
def _fake_task(status_value: str = "pending") -> TaskTable:
|
|
# SimpleNamespace duck-types TaskTable's 3 fields the helper reads
|
|
# (id/title/status.value) without a real ORM row.
|
|
return cast(
|
|
"TaskTable",
|
|
SimpleNamespace(
|
|
id="task-123",
|
|
title="Fix the thing",
|
|
status=SimpleNamespace(value=status_value),
|
|
),
|
|
)
|
|
|
|
|
|
class _FakeDbCtx:
|
|
async def __aenter__(self) -> str:
|
|
return "fake-db"
|
|
|
|
async def __aexit__(self, *exc: object) -> bool:
|
|
return False
|
|
|
|
|
|
class _FakeTaskService:
|
|
def __init__(self, task: object | None = None, error: Exception | None = None):
|
|
self._task = task
|
|
self._error = error
|
|
|
|
async def get(self, _task_id: object) -> object | None:
|
|
if self._error:
|
|
raise self._error
|
|
return self._task
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# build_manual_spawn_prompt — pure formatting
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def test_build_manual_spawn_prompt_includes_task_fields() -> None:
|
|
prompt = build_manual_spawn_prompt(_fake_task("awaiting_qa"), None)
|
|
assert "TASK ID: task-123" in prompt
|
|
assert "TITLE: Fix the thing" in prompt
|
|
assert "STATUS: awaiting_qa" in prompt
|
|
assert "claim verb" in prompt.lower()
|
|
assert "CEO NOTE" not in prompt
|
|
|
|
|
|
def test_build_manual_spawn_prompt_appends_ceo_note() -> None:
|
|
prompt = build_manual_spawn_prompt(_fake_task(), "Please prioritize this.")
|
|
assert "== CEO NOTE ==" in prompt
|
|
assert "Please prioritize this." in prompt
|
|
# CEO note comes after the task framing, not instead of it.
|
|
assert prompt.index("TASK ID") < prompt.index("CEO NOTE")
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# resolve_manual_spawn_prompt — best-effort enrichment
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_resolve_prompt_no_task_id_returns_message_unchanged() -> None:
|
|
result = await resolve_manual_spawn_prompt(None, "hello")
|
|
assert result == "hello"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_resolve_prompt_enriches_when_task_found(
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
) -> None:
|
|
monkeypatch.setattr(task_service_module, "get_db_context", _FakeDbCtx)
|
|
monkeypatch.setattr(
|
|
task_service_module,
|
|
"get_task_service",
|
|
lambda _db: _FakeTaskService(task=_fake_task("verifying")),
|
|
)
|
|
result = await resolve_manual_spawn_prompt(str(uuid4()), "Ship it")
|
|
assert result is not None
|
|
assert "STATUS: verifying" in result
|
|
assert "Ship it" in result
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_resolve_prompt_falls_back_when_task_not_found(
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
) -> None:
|
|
monkeypatch.setattr(task_service_module, "get_db_context", _FakeDbCtx)
|
|
monkeypatch.setattr(
|
|
task_service_module, "get_task_service", lambda _db: _FakeTaskService(task=None)
|
|
)
|
|
result = await resolve_manual_spawn_prompt(str(uuid4()), "hello")
|
|
assert result == "hello"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_resolve_prompt_falls_back_on_bad_task_id() -> None:
|
|
# Not a valid UUID — must not raise, must fall back unchanged.
|
|
result = await resolve_manual_spawn_prompt("not-a-uuid", "hello")
|
|
assert result == "hello"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_resolve_prompt_falls_back_on_db_error(
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
) -> None:
|
|
monkeypatch.setattr(task_service_module, "get_db_context", _FakeDbCtx)
|
|
monkeypatch.setattr(
|
|
task_service_module,
|
|
"get_task_service",
|
|
lambda _db: _FakeTaskService(error=RuntimeError("db down")),
|
|
)
|
|
result = await resolve_manual_spawn_prompt(str(uuid4()), "hello")
|
|
assert result == "hello"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_resolve_prompt_no_message_no_task_returns_none() -> None:
|
|
result = await resolve_manual_spawn_prompt(None, None)
|
|
assert result is None
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Route: AgentReadinessError -> 409, already_running signaling
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
@pytest_asyncio.fixture
|
|
async def orch_client() -> AsyncIterator[tuple[AsyncClient, MagicMock]]:
|
|
app = FastAPI()
|
|
app.include_router(orch_router, prefix="/api/orchestrator")
|
|
orchestrator = MagicMock()
|
|
set_orchestrator(orchestrator)
|
|
transport = ASGITransport(app=app)
|
|
async with AsyncClient(transport=transport, base_url="http://test") as client:
|
|
yield client, orchestrator
|
|
_ServiceHolder.orchestrator = None
|
|
app.dependency_overrides.clear()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_spawn_readiness_refusal_maps_to_409(
|
|
orch_client: tuple[AsyncClient, MagicMock],
|
|
) -> None:
|
|
client, orch = orch_client
|
|
orch.get_instance = MagicMock(return_value=None)
|
|
orch.spawn_agent = AsyncMock(
|
|
side_effect=AgentReadinessError(
|
|
"spawn refused for fe-dev-2 (task=t1): state=awaiting_qa requires "
|
|
"role in {'qa'} but agent fe-dev-2 is 'developer'"
|
|
)
|
|
)
|
|
response = await client.post(
|
|
"/api/orchestrator/agents/fe-dev-2/spawn",
|
|
json={"agent_id": "fe-dev-2", "task_id": "t1"},
|
|
headers=_HDR,
|
|
)
|
|
assert response.status_code == HTTPStatus.CONFLICT
|
|
assert "requires role in" in response.json()["detail"]
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_spawn_new_agent_not_flagged_already_running(
|
|
orch_client: tuple[AsyncClient, MagicMock],
|
|
) -> None:
|
|
client, orch = orch_client
|
|
orch.get_instance = MagicMock(return_value=None)
|
|
instance = SimpleNamespace(
|
|
id=uuid4(),
|
|
agent_id="be-dev-1",
|
|
state=AgentState.STARTING,
|
|
current_task_id=None,
|
|
error_count=0,
|
|
started_at=datetime.now(UTC),
|
|
)
|
|
orch.spawn_agent = AsyncMock(return_value=instance)
|
|
response = await client.post(
|
|
"/api/orchestrator/agents/be-dev-1/spawn", headers=_HDR
|
|
)
|
|
assert response.status_code == HTTPStatus.CREATED
|
|
assert response.json()["already_running"] is False
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_spawn_already_running_agent_is_flagged(
|
|
orch_client: tuple[AsyncClient, MagicMock],
|
|
) -> None:
|
|
client, orch = orch_client
|
|
shared_id = uuid4()
|
|
existing = SimpleNamespace(
|
|
id=shared_id,
|
|
agent_id="ux-pm",
|
|
state=AgentState.STARTING,
|
|
current_task_id=None,
|
|
error_count=0,
|
|
started_at=datetime.now(UTC),
|
|
)
|
|
orch.get_instance = MagicMock(return_value=existing)
|
|
# spawn_agent's own no-op contract: hands back the SAME instance.
|
|
orch.spawn_agent = AsyncMock(return_value=existing)
|
|
response = await client.post("/api/orchestrator/agents/ux-pm/spawn", headers=_HDR)
|
|
assert response.status_code == HTTPStatus.CREATED
|
|
body = response.json()
|
|
assert body["already_running"] is True
|
|
assert body["state"] == "starting"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_spawn_offline_agent_not_flagged_already_running(
|
|
orch_client: tuple[AsyncClient, MagicMock],
|
|
) -> None:
|
|
"""A pre-existing OFFLINE instance is not "running" — a fresh spawn on top
|
|
of it must not be reported as a no-op."""
|
|
client, orch = orch_client
|
|
offline = SimpleNamespace(
|
|
id=uuid4(),
|
|
agent_id="be-dev-1",
|
|
state=AgentState.OFFLINE,
|
|
current_task_id=None,
|
|
error_count=0,
|
|
started_at=datetime.now(UTC),
|
|
)
|
|
orch.get_instance = MagicMock(return_value=offline)
|
|
new_instance = SimpleNamespace(
|
|
id=uuid4(),
|
|
agent_id="be-dev-1",
|
|
state=AgentState.STARTING,
|
|
current_task_id=None,
|
|
error_count=0,
|
|
started_at=datetime.now(UTC),
|
|
)
|
|
orch.spawn_agent = AsyncMock(return_value=new_instance)
|
|
response = await client.post(
|
|
"/api/orchestrator/agents/be-dev-1/spawn", headers=_HDR
|
|
)
|
|
assert response.status_code == HTTPStatus.CREATED
|
|
assert response.json()["already_running"] is False
|