mirror of
https://github.com/rennf93/roboco.git
synced 2026-08-03 07:23:24 +02:00
* fix(gateway): push the branch before QA handoff so reviewers see the latest commits The commit content tool commits locally without pushing; only open_pr pushed the branch. On the first submission that was fine, but a fix committed while addressing needs_revision never reached origin (open_pr is skipped once the PR exists), so QA — which reviews the remote PR branch — re-reviewed the stale remote and re-failed the task on every cycle, a loop that never converged. i_am_done now pushes the task branch (idempotent; a no-op when nothing is unpushed) as part of the shared submit gate, covering both the normal and resume-from-verifying paths. A push failure blocks the handoff with a clear remediation rather than parking the task in awaiting_qa with commits that exist only in the developer's local workspace. * fix(orchestrator): don't reap a stale claim while the agent's container is alive The stale-claim reaper released any claimed/in_progress task whose last_heartbeat_at exceeded the TTL. The heartbeat only updates on certain gateway calls, so a developer deep in a long edit/test cycle outran the TTL and had its claim reaped mid-work — churning the task and risking a double spawn against the still-running container. The reaper now skips a task whose assignee still holds a live (ACTIVE) agent instance, trusting container liveness — the ground truth — over the heartbeat proxy. The check is defensive on missing fields so a heartbeat-only caller (and the reaper's existing unit tests) behave exactly as before. * fix(gateway): refuse to unblock a task while a dependency is unfinished A PM unblock on a dependency-gated task moved it straight to in_progress, overriding the dependency — letting a dependent proceed without its upstream's work (e.g. a frontend task built before its UX design lands). A dependency block is meant to clear on its own via _unblock_dependents the moment the upstream reaches a terminal state. unblock now refuses while any dependency is still non-terminal, returning a clear remediation that the block resolves automatically. Manual unblock remains available for genuine, non-dependency blockers. * fix(gateway): release a dependency-blocked claim to pending instead of looping A task that reached claimed/in_progress with an unfinished dependency was left in that state when the claim guard rejected, so the orchestrator's respawn loop kept reviving its assignee — which could make no progress — burning work for nothing. The claim guard now releases such a task back to pending. claimed -> blocked is not a legal transition, so pending — held by the dispatch dependency filter — is the lifecycle-correct resting state: the respawn loop ignores pending tasks, and _unblock_dependents re-dispatches it once the upstream reaches a terminal state. release_dependency_blocked_claim shares a _force_unclaim_to_pending core with unclaim_for_reaper so both record a truthful work-session abandon reason. * feat(security): warn at startup in header-trust mode + document the auth posture When ROBOCO_AGENT_AUTH_REQUIRED is not enabled the API accepts the X-Agent-Id / X-Agent-Role headers without a signed token, so any client that can reach it may act as any role (including 'ceo'). The API now logs a clear warning at startup in this mode, and the README gains a Security section documenting the auth posture and how to harden it. Acceptable only on a trusted private network — do not expose the API to untrusted networks. * fix(workspace): scope the refresh fetch to current + default branch ensure_workspace's healthy short-circuit ran an all-refs 'git fetch origin' to keep every origin/<branch> ref current. On a monorepo with many accumulated feature/* branches that exceeds the refresh timeout, the fetch silently fails, and the workspace keeps a stale base — so an agent builds on an out-of-date branch. The refresh now fetches only the workspace's current branch and the repo's default branch (resolved via origin/HEAD), with --no-tags --prune: it transfers near-nothing and can't time out. Readers need their own branch and the default; the integration branch is refreshed at branch-creation time. * fix(git): refresh a dependency-blocked task's branch off the current integration tip A cross-cell dependent (e.g. a frontend task waiting on the UX design) was branched off a base captured before its upstream merged into the integration branch, and the branch was never re-synced — so the agent built on a stale snapshot with none of the upstream's work. Two changes close the gap: - release_dependency_blocked_claim now clears branch_name, so the re-claim (after the dependency clears) re-runs branch creation. - create_branch, when the branch is already on disk with no commits of its own, resets it onto the freshly-pulled base — the dependent now builds on the current integration tip. A branch carrying real commits is left untouched, so no work is discarded; the cell->leaf cascade carries the upstream down to the dev branch automatically. * refactor(gateway): drop the sibling-sequence claim guard Sibling sequence no longer gates a claim. Cross-cell ordering is enforced by task dependencies — a cell task that depends on another is held until its upstream reaches a terminal state, a stronger, status-aware gate than the sequence-number check. That check was dormant in practice anyway: every fan-out child carries sequence 0, on which the guard short-circuited. `sequence` stays a sibling-ordering / dispatch-priority field (list_pending ordering and the panel). Removes sibling_sequence_guard and its _earlier_blocking_sibling helper, the now-unused skip_sequence parameter threaded through the claim verbs, and the sibling fetch that fed it. * feat(gateway): sort a cross-cell dependent after its upstream When the frontend cell task is wired to depend on its UX/UI sibling, set its sequence to the upstream's sequence + 1 so it sorts after the design it waits on — list_pending ordering and the panel now show UX ahead of the implementation it gates, in either delegation order. Adds TaskService.set_sequence (the sibling-ordering field is a service write; it carries no claim-gating semantics — dependencies gate claims). * feat(gateway): make the backend cell depend on UX too UX/UI design defines the screens and API contracts both implementation cells build against, so the backend cell — not just the frontend — waits on the UX/UI cell task in a product fan-out and sorts after it. Wires in either delegation order: a backend task delegated after UX gets the dependency directly; a UX task delegated after a still-pending backend sibling retro-wires it. Mirrors the existing frontend wiring (_depend_backend_on_ux and _depend_pending_backends_on_ux). Backend is held by the same dependency gate, so it costs no extra dispatch churn. * fix(websocket): forward notification acks instead of logging them incomplete The bridge handler serves both notification.sent and notification.acked, but acked events carry `agent_id` (the acking agent) rather than `recipient_id`, so every acknowledgement tripped the missing-field guard and logged "Incomplete notification event" instead of reaching the panel. Accept either field as the recipient. * feat(api): hint the full UUID when a truncated task id fails validation Agents copy the 8-character task prefix the system shows them (the commit prefix, task summaries) and send it as task_id, which fails UUID validation with an opaque "invalid length" 422 and wastes a call. The request-validation handler now detects a task_id UUID error and attaches a `remediate` hint telling the agent to retry with the full 36-character UUID from its task envelope. * fix(audit): record the blocked transition when a task is escalated Escalation sets a task to blocked by writing task.status directly, which bypassed the validated transition helper and so never emitted a task.blocked audit row — the lifecycle moved but the Auditor saw nothing. Extract the audit emit from the central transition helper into _emit_status_transition_audit and call it from the escalate path, capturing the prior status and outgoing owner before reassignment so the row is attributed correctly. * fix(docs): stop doubling the docs path so design specs index into RAG The documenter sometimes hands a doc path already rooted at docs/, and joining it onto DOCS_BASE_PATH (/app/docs) produced /app/docs/docs/..., so the file was never found and the spec never indexed — the frontend cell could not retrieve the UX design over RAG. Normalize the path before joining: trust an absolute path, otherwise strip a single redundant leading docs/ segment. * feat(security): let the control panel authenticate in secure mode With ROBOCO_AGENT_AUTH_REQUIRED=true every request must carry a valid HMAC token, which locked the human control panel out — it sends role headers but no token. nginx, the only trusted hop between the browser and the API, now injects the CEO token on /api and /ws, so the browser never holds the signing secret. The injected value is just the existing per-agent token issued for the CEO identity (issue_panel_token), so the token-verification path is unchanged. An empty value (dev/header-trust mode) renders to no header. `make panel-token` prints the value; set it as ROBOCO_PANEL_AGENT_TOKEN in .env before enabling secure mode. .env.example and the README Security section document the flow. * chore(compose): consolidate the two compose files into one docker-compose.yml and docker-compose.yaml had diverged: .yml — the file Docker actually uses — carried ROBOCO_PUBLIC_BASE_URL but was missing the /app/manifests bind-mount, while .yaml had the manifests mount but not the base URL. Merge the union into docker-compose.yml and delete the duplicate so there is one source of truth and no "multiple config files" warning. This activates the manifests mount in the deployed file: without it the orchestrator writes per-agent tool manifests to its ephemeral container fs, they never reach the host for the daemon to bind-mount, and agents fall back to all-verbs registration. Drop the stale .yaml reference from the config.py docstring, the labeler, and the CI path filters. --------- Co-authored-by: Renn F <rennf93@users.noreply.github.com>
257 lines
8.9 KiB
Python
257 lines
8.9 KiB
Python
"""Unit tests for `WorkspaceService.ensure_workspace` refresh behavior.
|
|
|
|
Audit H26: when a PM/Doc is respawned and re-enters `ensure_workspace`
|
|
on an already-healthy clone, the previous implementation short-circuited
|
|
with no fetch — leaving the agent looking at arbitrarily stale refs.
|
|
These tests pin the new behavior: every healthy short-circuit MUST run
|
|
`git fetch origin` (best-effort).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import subprocess
|
|
from typing import TYPE_CHECKING
|
|
from unittest.mock import AsyncMock, MagicMock, patch
|
|
from uuid import uuid4
|
|
|
|
import pytest
|
|
from roboco.services.workspace import WorkspaceService
|
|
|
|
if TYPE_CHECKING:
|
|
from collections.abc import Iterator
|
|
from pathlib import Path
|
|
|
|
# Minimum tokens in a valid `git fetch origin [...]` argv (`git`, `fetch`,
|
|
# `origin`). Named to satisfy ruff PLR2004 — magic-value comparison.
|
|
_MIN_GIT_FETCH_ARGC = 3
|
|
|
|
# Healthy short-circuit chowns BEFORE fetch (repair pre-existing root
|
|
# ownership) AND AFTER fetch (repair root-owned pack/refs the fetch
|
|
# just wrote). Named to satisfy ruff PLR2004.
|
|
_MIN_CHOWN_CALLS_AROUND_FETCH = 2
|
|
|
|
|
|
def _service() -> WorkspaceService:
|
|
"""Build a WorkspaceService over a MagicMock session."""
|
|
session = MagicMock()
|
|
session.execute = AsyncMock()
|
|
return WorkspaceService(session)
|
|
|
|
|
|
def _bind(svc: WorkspaceService, name: str, value: object) -> None:
|
|
"""Stub `name` on `svc` without tripping mypy's method-assign check."""
|
|
object.__setattr__(svc, name, value)
|
|
|
|
|
|
def _fake_agent(slug: str = "be-pm") -> MagicMock:
|
|
"""Build a MagicMock that satisfies the AgentTable surface used here."""
|
|
agent = MagicMock()
|
|
agent.id = uuid4()
|
|
agent.slug = slug
|
|
# WorkspaceService reads .team and falls back to BACKEND if falsy.
|
|
agent.team = None
|
|
return agent
|
|
|
|
|
|
@pytest.fixture
|
|
def healthy_workspace(tmp_path: Path) -> Iterator[Path]:
|
|
"""Materialize a directory that passes `_is_workspace_healthy`."""
|
|
workspace = tmp_path / "roboco" / "backend" / "be-pm"
|
|
git_dir = workspace / ".git"
|
|
(git_dir / "objects").mkdir(parents=True)
|
|
(git_dir / "HEAD").write_text("ref: refs/heads/main\n")
|
|
yield workspace
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_ensure_workspace_fetches_origin_on_healthy_short_circuit(
|
|
healthy_workspace: Path,
|
|
) -> None:
|
|
"""Healthy-clone re-entry must invoke `git fetch origin`.
|
|
|
|
Without this, a respawned PM/Doc reads stale refs and reviews a diff
|
|
that no longer matches the dev's pushed branch.
|
|
"""
|
|
svc = _service()
|
|
agent = _fake_agent()
|
|
_bind(svc, "_lookup_agent_or_raise", AsyncMock(return_value=agent))
|
|
_bind(svc, "get_workspace_path", MagicMock(return_value=healthy_workspace))
|
|
|
|
captured: list[list[str]] = []
|
|
|
|
def _fake_run(
|
|
args: list[str], **_kwargs: object
|
|
) -> subprocess.CompletedProcess[str]:
|
|
captured.append(args)
|
|
return subprocess.CompletedProcess(
|
|
args=args, returncode=0, stdout="", stderr=""
|
|
)
|
|
|
|
with (
|
|
patch("roboco.services.workspace.subprocess.run", side_effect=_fake_run),
|
|
patch("roboco.services.workspace._ensure_agent_owned"),
|
|
):
|
|
result = await svc.ensure_workspace(
|
|
project_slug="roboco",
|
|
agent_id=agent.id,
|
|
)
|
|
|
|
assert result == healthy_workspace
|
|
fetch_calls = [
|
|
a
|
|
for a in captured
|
|
if len(a) >= _MIN_GIT_FETCH_ARGC and a[0] == "git" and "fetch" in a
|
|
]
|
|
assert fetch_calls, (
|
|
f"Expected `git fetch origin` on healthy short-circuit, "
|
|
f"got subprocess calls: {captured}"
|
|
)
|
|
# Specifically: a SCOPED `git fetch --no-tags --prune origin <ref...>` with
|
|
# NO `-c` flag. The fetch is scoped to the workspace's branches (current +
|
|
# default) rather than all refs so it can't time out on a monorepo with many
|
|
# accumulated feature/* branches. The `-c` check protects the docstring's
|
|
# no-token-injection invariant — a future refactor that added
|
|
# `git -c http.extraheader=...` must not slip in unnoticed.
|
|
assert any(
|
|
a[0] == "git"
|
|
and "-c" not in a
|
|
and "fetch" in a
|
|
and "--no-tags" in a
|
|
and "--prune" in a
|
|
and "origin" in a
|
|
and a.index("origin") < len(a) - 1 # ≥1 ref after origin → scoped
|
|
for a in fetch_calls
|
|
), f"Expected scoped `git fetch --no-tags --prune origin <ref>`, got: {fetch_calls}"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_refresh_fetch_is_scoped_to_current_and_default_branch(
|
|
healthy_workspace: Path,
|
|
) -> None:
|
|
"""The refresh fetch targets only the current branch + default, not all refs.
|
|
|
|
An all-refs fetch times out on a monorepo with many accumulated feature/*
|
|
branches, leaving the workspace silently stale.
|
|
"""
|
|
svc = _service()
|
|
agent = _fake_agent()
|
|
_bind(svc, "_lookup_agent_or_raise", AsyncMock(return_value=agent))
|
|
_bind(svc, "get_workspace_path", MagicMock(return_value=healthy_workspace))
|
|
|
|
captured: list[list[str]] = []
|
|
|
|
def _fake_run(
|
|
args: list[str], **_kwargs: object
|
|
) -> subprocess.CompletedProcess[str]:
|
|
captured.append(args)
|
|
out = ""
|
|
if "rev-parse" in args:
|
|
out = "feature/frontend/abc12345"
|
|
elif "symbolic-ref" in args:
|
|
out = "origin/master"
|
|
return subprocess.CompletedProcess(
|
|
args=args, returncode=0, stdout=out, stderr=""
|
|
)
|
|
|
|
with (
|
|
patch("roboco.services.workspace.subprocess.run", side_effect=_fake_run),
|
|
patch("roboco.services.workspace._ensure_agent_owned"),
|
|
):
|
|
await svc.ensure_workspace(project_slug="roboco", agent_id=agent.id)
|
|
|
|
fetch = next(a for a in captured if a[0] == "git" and "fetch" in a)
|
|
after_origin = fetch[fetch.index("origin") + 1 :]
|
|
assert "feature/frontend/abc12345" in after_origin, (
|
|
f"current branch must be fetched, got: {fetch}"
|
|
)
|
|
assert "master" in after_origin, f"default branch must be fetched, got: {fetch}"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_ensure_workspace_rechowns_after_refresh_fetch(
|
|
healthy_workspace: Path,
|
|
) -> None:
|
|
"""Healthy-clone re-entry MUST chown again AFTER `git fetch origin`.
|
|
|
|
The orchestrator runs as root, so `git fetch` writes new pack files
|
|
under `.git/objects/pack/` and updates refs under
|
|
`.git/refs/remotes/origin/` — those land root-owned, undoing the
|
|
pre-fetch chown. Without a post-fetch chown, the next agent-side
|
|
write (.git/index.lock, packed-refs, etc.) hits Permission denied.
|
|
|
|
This mirrors the pattern in `fetch_branch_for_inspection`.
|
|
"""
|
|
svc = _service()
|
|
agent = _fake_agent()
|
|
_bind(svc, "_lookup_agent_or_raise", AsyncMock(return_value=agent))
|
|
_bind(svc, "get_workspace_path", MagicMock(return_value=healthy_workspace))
|
|
|
|
call_log: list[str] = []
|
|
|
|
def _fake_run(
|
|
args: list[str], **_kwargs: object
|
|
) -> subprocess.CompletedProcess[str]:
|
|
if "fetch" in args:
|
|
call_log.append("fetch")
|
|
return subprocess.CompletedProcess(
|
|
args=args, returncode=0, stdout="", stderr=""
|
|
)
|
|
|
|
def _fake_chown(_workspace: object) -> None:
|
|
call_log.append("chown")
|
|
|
|
with (
|
|
patch("roboco.services.workspace.subprocess.run", side_effect=_fake_run),
|
|
patch(
|
|
"roboco.services.workspace._ensure_agent_owned",
|
|
side_effect=_fake_chown,
|
|
),
|
|
):
|
|
await svc.ensure_workspace(
|
|
project_slug="roboco",
|
|
agent_id=agent.id,
|
|
)
|
|
|
|
# Expect at least: chown (pre-fetch) -> fetch -> chown (post-fetch).
|
|
# The post-fetch chown is the load-bearing one — it repairs ownership
|
|
# of objects/refs the root-side fetch just wrote.
|
|
assert call_log.count("chown") >= _MIN_CHOWN_CALLS_AROUND_FETCH, (
|
|
f"Expected at least two chown calls (pre + post fetch), got: {call_log}"
|
|
)
|
|
fetch_idx = call_log.index("fetch")
|
|
assert "chown" in call_log[fetch_idx + 1 :], (
|
|
f"Expected a chown AFTER the fetch, got: {call_log}"
|
|
)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_ensure_workspace_fetch_failure_does_not_abort(
|
|
healthy_workspace: Path,
|
|
) -> None:
|
|
"""Fetch is best-effort: a non-zero return code logs but does NOT raise.
|
|
|
|
Network blips and offline-mode CI must not break workspace setup.
|
|
"""
|
|
svc = _service()
|
|
agent = _fake_agent()
|
|
_bind(svc, "_lookup_agent_or_raise", AsyncMock(return_value=agent))
|
|
_bind(svc, "get_workspace_path", MagicMock(return_value=healthy_workspace))
|
|
|
|
def _fake_run(
|
|
args: list[str], **_kwargs: object
|
|
) -> subprocess.CompletedProcess[str]:
|
|
return subprocess.CompletedProcess(
|
|
args=args, returncode=128, stdout="", stderr="fatal: unable to access"
|
|
)
|
|
|
|
with (
|
|
patch("roboco.services.workspace.subprocess.run", side_effect=_fake_run),
|
|
patch("roboco.services.workspace._ensure_agent_owned"),
|
|
):
|
|
result = await svc.ensure_workspace(
|
|
project_slug="roboco",
|
|
agent_id=agent.id,
|
|
)
|
|
|
|
assert result == healthy_workspace
|