mirror of
https://github.com/rennf93/roboco.git
synced 2026-08-03 07:23:24 +02:00
* refactor(analytics): reduce cyclomatic complexity in usage/pricing/rollup
Collapse the three near-identical get_by_* aggregation methods in
UsageService into a shared _aggregate_by helper parameterized by group
column and key name, and centralize token null-coalescing in a
_row_tokens helper. Extract the per-row upsert in _sweep_daily_rollup
into _upsert_rollup_row, and the pricing-table lookup into
_lookup_prices. All blocks now rank <= B and both modules rank A, so the
xenon gate passes; behavior is unchanged and existing tests stay green.
* feat(billing): make token pricing provider-aware
Distinguish three cases when a model has no per-token rate: a non-Anthropic
model (local Ollama, or an Ollama Cloud ":cloud" model billed by flat
subscription / GPU-time) legitimately has no per-token cost and returns 0.0
silently; an unpriced Anthropic ("claude"-named) model also returns 0.0 but
logs a warning, since that is real spend being undercounted and catches new or
renamed Claude models missing from the table. Folds the old ollama/ prefix
special-case into the general non-Anthropic path so there is one code path,
and replaces the blanket 'no pricing data' warning that fired even for
self-hosted models.
* fix(tasks): preserve ownership when force-unclaiming to pending
The stale-claim reaper and the dependency-blocked release both routed through
_force_unclaim_to_pending, which nulled assigned_to and left the task in a
pending state owned by nobody — no dispatcher re-spawns an ownerless pending
task, so it went dormant. The dispatcher-side claimed_by fallback only masked
half the cases.
Capture the owner before releasing the claim and keep both assigned_to and
claimed_by pointed at it (mirroring the unblock restore), releasing only the
live claim (active_claimant_id + heartbeat) and the WorkSession. The same agent
now resumes the task once it re-dispatches. Updates the reaper test that
asserted the old orphaning behavior and adds owner-preservation coverage for
both the reaper and dependency-release paths.
* fix(tasks): unblock restores the owner into both ownership fields
Audit follow-up to the force-unclaim ownership fix. unblock() only restored
assigned_to from blocker_raised_by, which block() stashes solely from
assigned_to. A task claimed via give_me_work (claimed_by set, assigned_to null)
therefore unblocked into a split-owner state — assigned_to null but claimed_by
set — that both the dev dispatcher and the PM pool-router race to pick up. It
also left claimed_by pointing at the resolver PM after an escalation.
Resolve the owner as blocker_raised_by or assigned_to or claimed_by and write
it to both fields, matching the force-unclaim and reassign convention so the
original worker resumes cleanly. Adds coverage for the give_me_work-claim case
and asserts owner restoration on the existing in_progress-resume test.
* test(orchestrator): cover dev owner resolution and the claimed_by fallback
_resolve_dev_owner_uuid had no coverage. Add the status-dependent precedence
(claimed/blocked prefer the live claimant; other statuses prefer the
PM-assigned owner) and the half-reap fallback where a pending task with
assigned_to nulled still resolves its owner from claimed_by instead of going
dormant.
* fix(tasks): wire the pre-block snapshot so unblock(restore=True) works
The restore=True path on a PM unblock was a no-op: pre_block_state /
pre_block_assignee (migration 006) were read by unblock_with_restore but never
written, so it always fell through to legacy unblock() and the restore flag did
nothing.
Snapshot the resting status + owner at every block entry (dependency block,
soft block, escalation) before mutating, capturing only the first block in a
chain so a re-block doesn't overwrite the original state. Escalation snapshots
the outgoing owner, not the escalation target, so restore returns the original
worker. The restore path applies the same branchless guard legacy unblock()
relies on — a snapshotted in_progress with no branch diverts to pending instead
of looping the dispatcher — and is extracted into _apply_pre_block_restore to
keep complexity under the gate. Adds coverage for snapshot capture, restore,
the branchless divert, and escalation owner restoration.
* test(tasks): update orphan-reconciler and dependency-release tests for owner preservation
Both the startup orphan reconciler and the dependency-blocked claim release
route through unclaim_for_reaper / _force_unclaim_to_pending, which now preserve
the owner instead of nulling assigned_to. Update the two tests that asserted the
old orphaning behavior to assert the owner is kept (so the same agent resumes)
while the live claim is released.
* chore(tests): scrub internal work-item labels from test names, docstrings, comments
Rename four test files that carried audit work-item IDs in their filenames
(test_p0_7_branch_atomicity, test_p2_8_orphan_reconciler,
test_p2_9_autogen_prompt_layer, test_p2_7_attempt_id) to describe what they
test, and strip the matching P-/D-/S- cluster labels from docstrings, comments,
and assertion messages across the test suite and two orchestrator comments.
These are internal references with no meaning in the codebase; behavior is
unchanged.
* style: reformat assertion line shortened by the internal-ref scrub
* build: waive unreachable torch CVE-2025-3000 in pip-audit gate
torch is a transitive CPU-pinned dep (piragi / sentence-transformers) never
loaded at runtime — the stack uses Ollama over HTTP for all embeddings/LLM, so
the vulnerable torch.jit.script path is unreachable. CVE-2025-3000 is MEDIUM,
local-only, with no published fix. Documented --ignore-vuln waiver; revisit when
a fixed torch ships.
* fix(orchestrator): route unplaceable pending tasks to main-pm instead of dropping them
_get_routing_target returned None when a 'dev'-classified task had no cell
agent (no team, or a non-cell team like fullstack/system) or when the routing
classification was unrecognized. _route_unassigned_pm_task logged 'no routing
target found' and returned, leaving the task ownerless and pending — and no
dispatcher re-spawns an unrouted pending task, so it went dormant for 10+ min
until the stuck-task detector caught it.
Fall back to main-pm (the same default cell_pm routing and escalation already
use) so the task is always owned and triaged, never stranded. Logs the fallback
so unplaceable tasks stay visible. Adds a test asserting no (routing, team)
combination ever resolves to None.
* fix(panel): make intake chat markdown inherit the bubble's text color
MarkdownBody is shared by the assistant (text-foreground) and user
(text-primary-foreground) bubbles. [&_*]:!text-inherit only colored the prose
div's descendants, so the prose div itself kept the prose typography body color
(gray) and children inherited that — unreadable on the muted assistant bubble.
Add !text-inherit on the prose div itself so it inherits the bubble's color
too; descendants then inherit the correct foreground. Fixes both bubbles without
hardcoding a color.
* fix(prompter): keep a board-reviewed product on the board team so Approve & Start shows
A product coordination root confirmed via 'Board review & Start' is assigned to
a board reviewer (product-owner) for review, but create_task_from_draft set
team=main_pm for every product unconditionally. The CEO's Approve & Start gate
keys on team=board, so the button never appeared — and because the owner stayed
a board agent while the team said main_pm, the dispatcher routed it to the board
path (nothing left to do after review) and the task stranded at pending, with
the board agent fruitlessly trying to escalate it up.
Route a product by its assignee: a board reviewer keeps it team=board (so the
gate appears and approve_and_start later hands it to Main PM), while a main-pm
assignee — the 'Approve & Start' straight-through path — is team=main_pm. Adds
_assignee_is_board mirroring TaskService's board-role check, and a test.
---------
Co-authored-by: Renn F <rennf93@users.noreply.github.com>
150 lines
5.1 KiB
Python
150 lines
5.1 KiB
Python
"""MCP _post() surfaces envelope body on 4xx.
|
|
|
|
The pre-fix path called ``response.raise_for_status()`` then ``.json()``,
|
|
which discarded the body on any 4xx — agents saw a Python
|
|
``httpx.HTTPStatusError`` traceback instead of the orchestrator's
|
|
``{error, message, remediate, missing}`` envelope. These tests pin the
|
|
fixed contract: 2xx and 4xx both return the parsed JSON; only an
|
|
unparseable body produces a synthetic ``transport_error`` envelope.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import importlib
|
|
import json
|
|
import tempfile
|
|
from pathlib import Path
|
|
from typing import TYPE_CHECKING, Any
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
import pytest
|
|
|
|
if TYPE_CHECKING:
|
|
import types
|
|
|
|
|
|
_MANIFEST = {
|
|
"agent_id": "00000000-0000-0000-0000-000000000001",
|
|
"role": "developer",
|
|
"team": "backend",
|
|
"workspace_path": "/tmp/test",
|
|
"flow_tools": ["give_me_work", "i_will_work_on", "i_am_done"],
|
|
"do_tools": ["commit", "note"],
|
|
"read_tools": [],
|
|
"write_tools": [],
|
|
"bash_allowed": True,
|
|
"subagent_allowed": False,
|
|
"subagent_model": None,
|
|
"env": {},
|
|
}
|
|
|
|
|
|
def _seed_env(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
manifest_path = Path(tempfile.mkdtemp()) / "tool-manifest.json"
|
|
manifest_path.write_text(json.dumps(_MANIFEST))
|
|
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")
|
|
monkeypatch.setenv("ROBOCO_TOOL_MANIFEST_PATH", str(manifest_path))
|
|
|
|
|
|
def _fake_client_with(status: int, body: Any) -> MagicMock:
|
|
"""httpx.Client context-manager whose post() returns the given response."""
|
|
fake_response = MagicMock()
|
|
fake_response.status_code = status
|
|
if isinstance(body, dict):
|
|
fake_response.json.return_value = body
|
|
else:
|
|
fake_response.json.side_effect = ValueError("not json")
|
|
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
|
|
|
|
|
|
@pytest.fixture
|
|
def flow_module(monkeypatch: pytest.MonkeyPatch) -> types.ModuleType:
|
|
_seed_env(monkeypatch)
|
|
import roboco.mcp.flow_server as srv
|
|
|
|
importlib.reload(srv)
|
|
return srv
|
|
|
|
|
|
@pytest.fixture
|
|
def do_module(monkeypatch: pytest.MonkeyPatch) -> types.ModuleType:
|
|
_seed_env(monkeypatch)
|
|
import roboco.mcp.do_server as srv
|
|
|
|
importlib.reload(srv)
|
|
return srv
|
|
|
|
|
|
def test_flow_post_returns_envelope_on_422(flow_module: types.ModuleType) -> None:
|
|
"""422 with envelope body must surface as the envelope, not raise."""
|
|
envelope_body = {
|
|
"error": "tracing_gap",
|
|
"message": "missing plan",
|
|
"remediate": "call i_will_work_on(task_id=..., plan='...')",
|
|
"missing": ["plan"],
|
|
}
|
|
client = _fake_client_with(422, envelope_body)
|
|
with patch("httpx.Client", return_value=client):
|
|
result = flow_module.give_me_work()
|
|
assert result == envelope_body
|
|
|
|
|
|
def test_flow_post_returns_envelope_on_400(flow_module: types.ModuleType) -> None:
|
|
"""400 with envelope body (e.g. role-gate rejection from do_server)."""
|
|
body = {
|
|
"error": "not_authorized",
|
|
"message": "role 'cell_pm' may not commit code",
|
|
"remediate": "PMs delegate; use delegate(...)",
|
|
"missing": [],
|
|
}
|
|
client = _fake_client_with(400, body)
|
|
with patch("httpx.Client", return_value=client):
|
|
result = flow_module.i_will_work_on("task-id", plan="x")
|
|
assert result["error"] == "not_authorized"
|
|
|
|
|
|
def test_flow_post_returns_envelope_on_404(flow_module: types.ModuleType) -> None:
|
|
"""Even 404 must surface body; only the body's content matters to the agent."""
|
|
body = {
|
|
"error": "not_found",
|
|
"message": "task abc not found",
|
|
"remediate": "call give_me_work() to find an actionable task",
|
|
"missing": [],
|
|
}
|
|
client = _fake_client_with(404, body)
|
|
with patch("httpx.Client", return_value=client):
|
|
result = flow_module.i_am_done("task-abc", notes="done")
|
|
assert result["error"] == "not_found"
|
|
|
|
|
|
def test_flow_post_synthesizes_transport_error_when_body_unparseable(
|
|
flow_module: types.ModuleType,
|
|
) -> None:
|
|
"""No JSON body → synthetic transport_error envelope (NOT a raise)."""
|
|
client = _fake_client_with(502, body=None) # body=None → ValueError on .json()
|
|
with patch("httpx.Client", return_value=client):
|
|
result = flow_module.give_me_work()
|
|
assert result["error"] == "transport_error"
|
|
assert "502" in result["message"]
|
|
assert "remediate" in result
|
|
|
|
|
|
def test_do_post_returns_envelope_on_400(do_module: types.ModuleType) -> None:
|
|
"""do_server mirrors flow_server: envelope surfaces on rejection."""
|
|
body = {
|
|
"error": "not_authorized",
|
|
"message": "role 'cell_pm' may not commit",
|
|
"remediate": "PMs delegate via delegate()",
|
|
"missing": [],
|
|
}
|
|
client = _fake_client_with(400, body)
|
|
with patch("httpx.Client", return_value=client):
|
|
result = do_module.commit("any message")
|
|
assert result["error"] == "not_authorized"
|