Files
roboco/tests/unit/api/test_correlation_id.py
T
Renn F 4829f93a68 fix(gateway): unblock task claim; full Phase 0/1/2 remediation
Resolves the 100% claim-failure rate introduced by the gateway rewrite
  (commit 62bda0c plus 78 follow-ups). Live smoke runs hit
  `404 /api/v2/flow/developer/...` on every dev verb plus a manifest
  fallback that silently exposed off-role verbs to PMs — confirmed
  firing simultaneously in NAS agent logs (be-dev-1, be-pm, main-pm).

  Audit reports under docs/internal/audit_2026_05_04/ catalogue 49
  defects across gateway, services, prompts, MCP transport, substrate,
  and tests (8 detail reports + master synthesis). Six smoking guns;
  three proven in production logs.

  Phase 0 — unblock claim:
  - URL prefix /api/v2/flow/dev → /developer; slug-map board roles
    (product_owner, head_marketing) → /board (D-01)
  - _i_will_work_on AttributeError on None across pending /
    needs_revision / claimed re-entry branches (D-02)
  - Seed last_heartbeat_at in _qa_or_doc_claim (D-03)
  - Drop misleading i_have_committed verb; dev flow uses commit() (D-04)
  - Manifest mount via compose; flow_server + do_server fail loud
    instead of exposing all-verbs fallback (D-12)
  - MCP _post() surfaces envelope body on 4xx so agents see remediate
    hints (D-13)
    on git failure so retries aren't blocked by half-state (S-01)

  Phase 1 — lifecycle stability:
  - _resolve_skill falls back to AgentTable.capabilities (D-06)
  - main_pm_complete uses kwargs for escalate_to_ceo (D-07)
  - i_am_done auto-runs submit_verification when in_progress (D-08)
  - active_claimant_id wired in claim/unclaim paths — single-claimant
    invariant now functional (D-05)
  - qa_pass/qa_fail assert claimed_by parity with qa_agent_id (D-18)
  - Prompt-drift sweep: fail() shape, i_am_done(task_id, notes),
    subtask cap (12 hard / 8 soft), error-code symbology rewritten in
    base.md + per-role anti-patterns (D-10/11/29/30/31, D-37)

  Phase 2 — invariants + architecture:
  - Real-DB integration test exercising claim → in_progress → commit
    → submit_for_qa → i_am_done → awaiting_qa (P2-1)
  - choreographer.py → package; 3 of 6 role mixins extracted
    (board, doc, qa). _impl.py 2,526 → 2,080 lines (-18%). Continuation
    plan in docs/internal/audit_2026_05_04/p2_2_decompose_plan.md (P2-2)
  - Closure guards consolidated via _subtasks_not_terminal_envelope (P2-3)
  - TaskService.unclaim_for_reaper routed through canonical
    _validate_and_set_status; in_progress → pending added to
    VALID_TRANSITIONS (P2-4)
  - Dead code removed: i_am_done_with_catchup verb, _run_catch_up helper
    (P2-5)
  - 6 state-machine invariants asserted via property test (P2-6)
  - attempt_id (uuid4) stamped on every gateway.rejected audit row (P2-7)
  - _reconcile_orphan_claims_on_startup rolls back tasks left CLAIMED
    with branch_name=NULL from prior crashes (P2-8)
  - scripts/regenerate_verb_tables.py introspects Pydantic schemas +
    role_config; compose_prompt injects per-role tables as a layer.
    Eliminates the prompt-drift class structurally (P2-9)

  Other:
  - D-48: orchestrator mounts host's ~/.claude.json when present so
    agents don't boot from backup recovery on every spawn
  - D-49: dev dispatcher rejects role-mismatched spawns (e.g. doc task
    assigned to dev agent)

  Tests: 553 pass · ruff + mypy clean. Live NAS smoke verification
  pending — needs the stack brought back up.
2026-05-04 23:43:55 +02:00

277 lines
9.7 KiB
Python

"""End-to-end correlation_id propagation: header -> envelope -> audit row.
Audit F20 surfaced that ``X-Correlation-ID`` was bound to structlog by the
``CorrelationIdMiddleware`` but never travelled past the API boundary:
* The MCP shims (``flow_server`` / ``do_server``) didn't forward it, so
every MCP -> API hop got a fresh server-generated UUID.
* The Envelope returned to the agent had no slot to carry the id back.
* The ``audit_log`` rows the choreographer writes had no correlation_id
field, so post-mortem joins across logs and audit trail were impossible.
These tests pin the contract:
1. Envelope holds an optional ``correlation_id`` and round-trips it via
``as_dict()``.
2. The v2 flow route reads ``request.state.correlation_id`` (set by
``CorrelationIdMiddleware``) and stamps it onto the envelope before
returning.
3. Both MCP shims attach an ``X-Correlation-ID`` header on every POST,
mirroring how they attach ``X-Agent-ID`` / ``X-Agent-Role``.
4. The choreographer's ``_emit_rejection`` audit writer pulls the
correlation_id from the structlog contextvars (where the middleware
binds it) and stuffs it into the audit row's ``details`` dict.
"""
from __future__ import annotations
import asyncio
import importlib
import json
import tempfile
from pathlib import Path
from typing import TYPE_CHECKING, Any
from unittest.mock import AsyncMock, MagicMock, patch
from uuid import UUID
import pytest
import structlog
from fastapi import FastAPI
from fastapi.testclient import TestClient
from roboco.api.deps import get_choreographer
from roboco.api.middleware import CorrelationIdMiddleware
from roboco.api.routes.v2.flow_dev import router as flow_dev_router
from roboco.services.gateway.choreographer import Choreographer, ChoreographerDeps
from roboco.services.gateway.envelope import Envelope
if TYPE_CHECKING:
from types import ModuleType
_HTTP_200 = 200
_DEV_AGENT_HEADERS = {
"X-Agent-ID": "00000000-0000-0000-0000-000000000001",
"X-Agent-Role": "developer",
}
# --- Envelope ----------------------------------------------------------------
def test_envelope_ok_carries_correlation_id_when_stamped() -> None:
"""correlation_id is set post-construction by the transport layer."""
env = Envelope.ok(status="idle", next="call i_am_idle()")
env.correlation_id = "test-id-123"
assert env.correlation_id == "test-id-123"
assert env.as_dict()["correlation_id"] == "test-id-123"
def test_envelope_error_carries_correlation_id_when_stamped() -> None:
env = Envelope.invalid_state(message="bad state", remediate="do X first")
env.correlation_id = "abc"
assert env.correlation_id == "abc"
assert env.as_dict()["correlation_id"] == "abc"
def test_envelope_correlation_id_defaults_to_none() -> None:
env = Envelope.ok(status="idle", next="call i_am_idle()")
assert env.correlation_id is None
# When None we still emit the key so consumers don't have to special-case.
assert env.as_dict()["correlation_id"] is None
# --- Route -> Envelope wiring ------------------------------------------------
def _build_app() -> tuple[FastAPI, MagicMock]:
app = FastAPI()
app.add_middleware(CorrelationIdMiddleware)
app.include_router(flow_dev_router)
mock_chore = MagicMock()
mock_envelope = Envelope.ok(status="idle", next="...")
mock_chore.give_me_work = AsyncMock(return_value=mock_envelope)
app.dependency_overrides[get_choreographer] = lambda: mock_chore
return app, mock_chore
def test_route_stamps_request_correlation_id_onto_envelope() -> None:
app, _ = _build_app()
client = TestClient(app)
r = client.post(
"/api/v2/flow/developer/give_me_work",
json={},
headers={**_DEV_AGENT_HEADERS, "X-Correlation-ID": "trace-xyz"},
)
assert r.status_code == _HTTP_200
assert r.json()["correlation_id"] == "trace-xyz"
# Middleware also echoes the header back, so ops can grep for it.
assert r.headers["X-Correlation-ID"] == "trace-xyz"
def test_route_stamps_generated_correlation_id_when_header_missing() -> None:
app, _ = _build_app()
client = TestClient(app)
r = client.post(
"/api/v2/flow/developer/give_me_work",
json={},
headers=_DEV_AGENT_HEADERS,
)
assert r.status_code == _HTTP_200
body_id = r.json()["correlation_id"]
header_id = r.headers["X-Correlation-ID"]
# Middleware generates a UUID and binds it. The route must read the
# SAME id back from request.state and stamp it onto the envelope.
assert body_id is not None
assert body_id == header_id
# --- MCP shims ---------------------------------------------------------------
def _reload_mcp_module(monkeypatch: pytest.MonkeyPatch, dotted: str) -> ModuleType:
"""Set the env vars MCP servers expect at import-time and reload the module.
Both servers read AGENT_ID / AGENT_ROLE / ORCHESTRATOR_URL once at
import; we have to re-import after monkey-patching so the test sees
the patched values. The reload itself is the lazy import — keeping
importlib at the top-level keeps PLC0415 happy.
Also writes a stub manifest file and points the MCP server at it,
since both servers now refuse to register any tools without one
(audit P0-5 / D-12).
"""
monkeypatch.setenv("ROBOCO_AGENT_ID", "00000000-0000-0000-0000-000000000001")
monkeypatch.setenv("ROBOCO_AGENT_ROLE", "developer")
monkeypatch.setenv("ROBOCO_ORCHESTRATOR_URL", "http://test-orchestrator:8000")
manifest_path = Path(tempfile.mkdtemp()) / "tool-manifest.json"
manifest_path.write_text(
json.dumps(
{
"agent_id": "00000000-0000-0000-0000-000000000001",
"role": "developer",
"team": "backend",
"workspace_path": "/tmp/test",
"flow_tools": [
"give_me_work",
"i_will_work_on",
"submit_for_qa",
"i_am_done",
"i_am_blocked",
"unclaim",
"resume",
"i_am_idle",
],
"do_tools": ["commit", "note", "say", "dm", "evidence"],
"read_tools": [],
"write_tools": [],
"bash_allowed": True,
"subagent_allowed": False,
"subagent_model": None,
"env": {},
}
)
)
monkeypatch.setenv("ROBOCO_TOOL_MANIFEST_PATH", str(manifest_path))
module = importlib.import_module(dotted)
return importlib.reload(module)
@pytest.fixture
def flow_module(monkeypatch: pytest.MonkeyPatch) -> ModuleType:
return _reload_mcp_module(monkeypatch, "roboco.mcp.flow_server")
@pytest.fixture
def do_module(monkeypatch: pytest.MonkeyPatch) -> ModuleType:
return _reload_mcp_module(monkeypatch, "roboco.mcp.do_server")
def _fake_client(payload: dict[str, Any]) -> MagicMock:
fake_response = MagicMock()
fake_response.json.return_value = payload
fake_client = MagicMock()
fake_client.__enter__ = MagicMock(return_value=fake_client)
fake_client.__exit__ = MagicMock(return_value=False)
fake_client.post.return_value = fake_response
return fake_client
def test_flow_server_attaches_correlation_id_header(
flow_module: ModuleType,
) -> None:
fake = _fake_client({"status": "idle"})
with patch("httpx.Client", return_value=fake):
flow_module.give_me_work()
_args, kwargs = fake.post.call_args
headers = kwargs["headers"]
assert headers["X-Agent-ID"] == "00000000-0000-0000-0000-000000000001"
assert headers["X-Agent-Role"] == "developer"
assert "X-Correlation-ID" in headers
assert headers["X-Correlation-ID"] # non-empty
def test_flow_server_generates_unique_correlation_id_per_call(
flow_module: ModuleType,
) -> None:
fake = _fake_client({"status": "idle"})
with patch("httpx.Client", return_value=fake):
flow_module.give_me_work()
flow_module.give_me_work()
first = fake.post.call_args_list[0].kwargs["headers"]["X-Correlation-ID"]
second = fake.post.call_args_list[1].kwargs["headers"]["X-Correlation-ID"]
assert first != second
def test_do_server_attaches_correlation_id_header(
do_module: ModuleType,
) -> None:
fake = _fake_client({"status": "noted"})
with patch("httpx.Client", return_value=fake):
do_module.note("hi")
_args, kwargs = fake.post.call_args
headers = kwargs["headers"]
assert headers["X-Agent-ID"] == "00000000-0000-0000-0000-000000000001"
assert headers["X-Agent-Role"] == "developer"
assert "X-Correlation-ID" in headers
assert headers["X-Correlation-ID"]
# --- Audit-row stash ---------------------------------------------------------
def test_choreographer_emit_rejection_includes_correlation_id_in_details() -> None:
"""Audit row's `details` dict carries correlation_id from contextvars."""
audit = MagicMock()
audit.log_event = AsyncMock()
deps = ChoreographerDeps(
task=MagicMock(),
work_session=MagicMock(),
git=MagicMock(),
a2a=MagicMock(),
journal=MagicMock(),
audit=audit,
evidence_repo=MagicMock(),
)
chore = Choreographer(deps)
bad_env = Envelope.invalid_state(message="oops", remediate="do X")
structlog.contextvars.clear_contextvars()
structlog.contextvars.bind_contextvars(correlation_id="cid-9")
try:
asyncio.run(
chore._emit_rejection(
bad_env,
agent_id=UUID("00000000-0000-0000-0000-000000000001"),
task_id=None,
verb="i_will_work_on",
)
)
finally:
structlog.contextvars.clear_contextvars()
audit.log_event.assert_awaited_once()
kwargs = audit.log_event.await_args.kwargs
assert kwargs["details"]["correlation_id"] == "cid-9"