Files
roboco/tests/unit/gateway/test_delegate_parent_lock.py
T
e9ca7d4036 Delegation detail-fidelity + PM-loop hardening (#541)
* feat(gateway): delegation detail-fidelity — details survive hand-off, both directions

Details thinned out at every delegation hop: a PM child task mapped to no
parent criterion was legal (coverage only surfaced at submit_up, after the
whole wave ran — a 12-subtask docs tree grew through 8 review rounds that
way, one child titled 'docs page and route wrapper' shipping only the
page), and QA could pass work on a gestalt read (a 4-scene video brief
shipped 3 scenes past every gate because the features existed only in
prose). Three chokepoint gates:

- delegate (down): every child must declare covers_parent_criteria
  resolving against the parent's real acceptance criteria — no mapping or
  an unresolvable ref rejects naming every offending child and the valid
  criteria; the success envelope carries parent_ac_coverage
  {covered, uncovered} so a wave-planning PM sees remaining gaps in the
  same turn. Full coverage stays enforced at submit_up (waves stay legal).
- pass_review (up): mandatory criteria_verified — one {criterion,
  evidence} entry per task AC, matched by the findings ledger's
  id-or-exact-text matcher, evidence soup-checked and capped; rejects
  naming the unverified criteria; entries render deterministically into
  qa_notes as '[AC] <criterion> — verified: <evidence>' lines. The old
  count-only ac_verdicts gate is superseded (arg kept for back-compat).
- video briefs (structured detail at origination): an enumerable feature
  list (release highlights, or input_props.highlights carried onto a
  reject re-author) becomes its own scene acceptance criterion, bounded to
  the AC caps; a re-author without highlights carries the
  feedback-addressed criterion instead.

Extracted findings.py's criterion matcher into shared unmatched_criteria /
uncovered_acceptance_criteria instead of duplicating it; criteria_verified
joins the WAF free-text exclusion set like findings/issues.

* fix(gateway): break the block/unblock wedge — four hardening fixes from the live PM loop

A cell task looped fe-pm/main-pm block/unblock for hours (10 cycles, 43
spawns): a transient GitHub API error resolving CI became an unwaivable
blocker finding whose own fix text said no code change was required, the
submit freshness guard then demanded a commit no finding called for,
escalate_up auto-blocked, and main-pm's correct recovery plan 422'd on
the approach length cap, degrading it to a bare unblock. Four fixes:

- pr_pass CI-unresolvable refusal is now explicitly transient-worded:
  retry pr_pass shortly, do NOT pr_fail over a CI-status lookup error —
  a platform blip is not a code finding
- submit freshness guard grants ONE unchanged-head resubmission per
  head sha when the findings ledger has zero open rows (all addressed
  without code changes) — stamped via the resubmit_unchanged_head
  marker so the same head can never loop a second time
- unblock carries a flip breaker: block_flip_count marker, and at the
  third flip a one-shot CEO notification flags the task as structurally
  wedged (unblock itself still succeeds — the breaker signals, it does
  not wedge recovery)
- i_will_plan's approach cap truncates at 800 chars instead of
  rejecting — an over-detailed plan must never cost the PM its turn

---------

Co-authored-by: Renn F <rennf93@users.noreply.github.com>
2026-07-17 01:52:33 +02:00

168 lines
6.3 KiB
Python

"""The delegate sibling-dedup guard is serialized by a PostgreSQL
transaction-scoped advisory lock keyed by the parent task id, acquired at the
TOP of the delegate body (before the first ``get_subtasks`` read) and held
through ``create_subtask``'s flush + the outer request commit. Different
parents hash to different keys (seed ``1``, disjoint from the per-agent claim
lock's seed ``0``) so cross-parent delegates are not serialized.
CRITICAL regression guard: the lock is per-PARENT, not per-agent. A per-agent
lock would serialize all of a coordinator PM's delegates and regress
coordinator concurrency; the dedup invariant is per-parent, so only same-parent
delegates serialize.
"""
from __future__ import annotations
from datetime import UTC, datetime
from typing import Any
from unittest.mock import AsyncMock, MagicMock
from uuid import uuid4
import pytest
from roboco.services.gateway.choreographer import (
Choreographer,
ChoreographerDeps,
DelegateInputs,
)
def _make_deps(task: AsyncMock) -> ChoreographerDeps:
base: dict[str, Any] = {
"task": task,
"work_session": AsyncMock(),
"git": AsyncMock(),
"a2a": AsyncMock(),
"journal": AsyncMock(),
"audit": AsyncMock(),
"evidence_repo": AsyncMock(),
}
repo = base["evidence_repo"]
for m in (
"list_unread_a2a",
"list_unread_mentions",
"list_pending_notifications",
"task_metadata_gaps",
"recent_team_activity",
"blockers_in_lane",
"journal_highlights_for_task",
):
getattr(repo, m).return_value = []
# A fresh decision within the recency window so the delegate tracing gate
# (journal:decision required) passes without a separate write.
base["journal"].latest_decision_at.return_value = datetime.now(UTC)
return ChoreographerDeps(**base)
def _parent(pm_id: object) -> MagicMock:
return MagicMock(
id=uuid4(),
project_id=uuid4(),
product_id=None,
status="in_progress",
assigned_to=pm_id,
team="backend",
# delegate obligates the PM's quick_context resumption section.
quick_context="Decomposition planned; cells implement their slice next.",
# These tests are about the parent-lock ordering, not AC coverage.
acceptance_criteria=[],
)
def _inputs() -> DelegateInputs:
return DelegateInputs(
title="Implement endpoint",
description="Add /v1/foo endpoint with tests",
assigned_to="be-dev-1",
team="backend",
task_type="code",
nature="technical",
acceptance_criteria=["GET /v1/foo returns 200 with body"],
intends_to_touch=["backend/api/routers/foo.py"],
)
@pytest.mark.asyncio
async def test_delegate_acquires_parent_lock_before_sibling_read() -> None:
"""The per-parent advisory lock MUST be acquired before the first
``get_subtasks`` read (the briefing's context read, which precedes the
dedup guard's sibling read) and held through ``create_subtask``. This is
the ordering that closes the TOCTOU: the second concurrent same-parent
delegate blocks on the lock before it can read siblings, so its dedup read
sees the first's committed subtask and is rejected. A lock acquired AFTER
the dedup read but before the create would NOT close the race (the read
already missed the concurrent insert) — so 'lock before create' alone is
insufficient; the lock must precede the read."""
pm_id = uuid4()
parent = _parent(pm_id)
task_svc = AsyncMock()
task_svc.get.return_value = parent
task_svc.agent_for.return_value = MagicMock(role="cell_pm", team="backend")
task_svc.create_subtask.return_value = MagicMock(id=uuid4())
# Shared call-order recorder: the lock must precede every get_subtasks
# read (briefing context + dedup siblings) and the create.
calls: list[str] = []
async def _lock(_pid: object) -> None:
calls.append("lock")
async def _read_subtasks(_pid: object) -> list[Any]:
calls.append("get_subtasks")
return []
async def _create_subtask(_req: object) -> Any:
calls.append("create")
return MagicMock(id=uuid4())
task_svc.acquire_delegate_parent_lock = _lock
task_svc.get_subtasks.side_effect = _read_subtasks
task_svc.create_subtask.side_effect = _create_subtask
deps = _make_deps(task_svc)
c = Choreographer(deps)
env = await c.delegate(pm_id, parent.id, _inputs())
assert env.error is None, env.as_dict()
# The flow reached the create (otherwise the lock-ordering assertion would
# pass for the wrong reason — a short-circuit before the create).
assert "create" in calls, calls
# The lock was acquired exactly once, before the first sibling read, and
# before the create — so it spans the dedup read -> create critical section.
assert calls.count("lock") == 1, calls
first_lock = calls.index("lock")
first_read = calls.index("get_subtasks")
first_create = calls.index("create")
assert first_lock < first_read, (
f"parent lock must be acquired before the first get_subtasks read; "
f"order was {calls}"
)
assert first_lock < first_create, (
f"parent lock must be held through create_subtask; order was {calls}"
)
@pytest.mark.asyncio
async def test_delegate_still_creates_subtask_with_parent_lock() -> None:
"""No-regression: acquiring the per-parent lock must not break the normal
delegate path — the subtask is still created (env.error is None,
create_subtask awaited once). The lock is transparent to the happy path."""
pm_id = uuid4()
parent = _parent(pm_id)
task_svc = AsyncMock()
task_svc.get.return_value = parent
task_svc.agent_for.return_value = MagicMock(role="cell_pm", team="backend")
task_svc.get_subtasks.return_value = []
task_svc.create_subtask.return_value = MagicMock(id=uuid4())
# Leave the default AsyncMock for acquire_delegate_parent_lock so we can
# assert it was awaited with the parent id (the lock is transparent to the
# happy path — the create still runs).
deps = _make_deps(task_svc)
c = Choreographer(deps)
env = await c.delegate(pm_id, parent.id, _inputs())
assert env.error is None, env.as_dict()
task_svc.create_subtask.assert_awaited_once()
task_svc.acquire_delegate_parent_lock.assert_awaited_once_with(parent.id)