mirror of
https://github.com/rennf93/roboco.git
synced 2026-08-03 07:23:24 +02:00
* feat(gateway): claim-scoped context briefing — heavy sections only on context-acquisition verbs
* feat(gateway): cap unbounded LLM-facing payloads — embedded diffs, notification bodies, handoff journal content, north star
* feat(mcp): role-scope the optimal server's tool groups; index management becomes dev/test-only
* feat(mcp): cap per-result content on kb/error/learning search, mentor sources, rag citations
* refactor(gateway): extract heavy-briefing sections + clip helper to keep xenon ranks
* feat(orchestrator): cross-tick cooldown for notification-triggered spawns
* feat(usage,orchestrator): scope spawn-waste to anthropic sessions; cap agent Bash output via settings env
* docs: claim-scoped briefing, payload caps, optimal role-scoping, notification-spawn cooldown
* test(mcp): type the mixed-item cap fixture explicitly
* fix(orchestrator): lazy-init the notification-spawn cooldown store
* fix(lifecycle): admin-override claim reconciliation + PM request_changes verb (S6 postmortem B3+B4)
B3 — admin_set_status now reconciles claim ownership when leaving BLOCKED:
review/queue targets clear claimed_by/claimed_at/active_claimant_id and
consume the pre-block snapshot (a stale escalation claim was stranding the
next claimant: give_me_work handed the task out while note() bounced
not_authorized — the live b8fe0494 wedge). The pending/in_progress restore
path also syncs active_claimant_id, and a REST PATCH unassign releases the
claim with it.
B4 — new PM verb request_changes: awaiting_pm_review -> needs_revision with
concrete issues. The PM previously had no reject at merge review (only
complete/escalate), so an AC/scope violation looped i_am_blocked->escalate
4x live. Full vertical: lifecycle transition + ActionSpec + IntentSpec,
TaskService.request_changes (routes like a QA fail — original dev for a
leaf, revision PM for assembled; issues appended to dev_notes), verb-runner
compose, choreographer verb (spec gate + non-empty issues + soup check +
a2a delivery of the reject reason), HTTP routes on both PM flows, MCP tool,
journal:decision tracing, PM prompts, regenerated lifecycle artifacts.
* fix(panel): stop scorecard fetches for fallback-roster placeholder ids
useAgents() serves the static AGENT_ROSTER (ids "1".."22") while agent
definitions load; the Scorecards tab fetched a member scorecard per row
immediately, firing 22 guaranteed-422 requests per refetch cycle. Through
the browser's per-origin connection limit those queued every metrics-page
query behind them (~10s of skeletons on every tab). Gate the fetch on a
real member id (agent UUID or the "ceo" alias).
* Upgraded uv.lock
* fix(sequencing): declared deps become real edges + full loop-breaker coverage + assembled-branch freshness (S6 postmortem B1/B2/B6 + breaker)
B1a — code delegations REQUIRE a collision surface: new TASK_AT_DELEGATE
completeness spec (conditional FieldRequirement, when=('task_type','code'))
enforced at the gateway delegate gate. A no-surface code sibling is
'parallel to everything' by analyzer design, which is how two devs ran the
CEO's explicitly-ordered work out of order (f3e1afc5: seq#1 started before
seq#0, zero dependency edges). PM prompts updated; REST/manual creation
(TASK_AT_CREATE) unchanged.
B1b — the CEO's declared 'Depends on' lists become real edges: DraftSurface
gains declared_depends_on; SequencingService.analyze unions declared edges
(validated: self/out-of-range rejected) with the derived collision rules,
cycle-checked by the existing toposort. confirm_live_batch/preview_batch
map each draft's depends_on through (string indices coerced); intake tool
doc + prompter role prompt instruct verbatim copying. The live S6 root got
1 of its 3 declared in-batch edges and started alongside still-running R3.
Breaker coverage — the progress-aware respawn circuit breaker
(_pm_respawn_should_gate: strike counting, status-advance reset,
tracing-gap budget, DB durability, one-shot CEO notification) was consulted
by only 3 spawn paths; the doc/QA/dev/PR-review/PR-gate/revision/board
paths spawned unguarded at fixed cadence (the 26-respawn fe-doc loop,
~$7.20). Now consulted at every task-keyed spawn site (14 total).
B2 — assembled-branch freshness: submit_up/submit_root auto-sync the
assembled branch when it has fallen behind its base (children are terminal
at submit time, so the rebase is safe; master is never written). A rebase
conflict is a hard reject naming the files instead of a blind re-review —
kills the needs_revision↔awaiting_pr_review ping-pong of re-submitting a
stale head. Leaf i_am_done already had the behind-base gate; claim-time
fetch-fresh cut already existed.
B6 — documenter revision-pass loop: the awaiting_documentation bail
rejections (i_am_blocked/unclaim) now name the actual exit (i_documented
re-affirm) and the documenter prompt gets an explicit revision-pass rule.
* fix(orchestration): assembly-integrity gate + dispatcher heartbeat (incidents #11, #1)
Assembly integrity — submit_up/submit_root refuse when a completed child's
commits are not patch-present in the assembled branch (git cherry —
rebase-safe; branch pruned after merge or any git error fails open). Live
incident #11: a completed revert subtask's merge was lost from the cell
branch and the review gate re-flagged the exact violation the revert fixed,
spawning another revision cycle.
Dispatcher heartbeat — a dispatcher.alive audit row every 5 minutes from
the dispatch loop. The 2026-07-01 outage was 4h25m of fleet-wide silence
with no way to distinguish 'loop dead' from 'no work'; the loop's stdout
died with the container while audit_log survives. CHANGELOG for tonight's
full sweep included.
* style: ruff format for the orchestration sweep
* refactor(gateway): fold the assembled-submit guards + trim complexity under the xenon gate
_assembled_submit_guards combines the #11 integrity check and B2 freshen for
submit_up/submit_root; lifecycle's invalid-source remediate and git's
per-child cherry probe extracted into helpers. Test harnesses built via
__new__ stub the respawn tracker (the breaker now runs on their paths).
---------
Co-authored-by: Renn F <rennf93@users.noreply.github.com>
165 lines
6.2 KiB
Python
165 lines
6.2 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,
|
|
# delegate obligates the PM's quick_context resumption section.
|
|
quick_context="Decomposition planned; cells implement their slice next.",
|
|
)
|
|
|
|
|
|
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)
|