016b348117
Phase 0 (foundation):
- Cause enum (controller_events.cause) for action attribution
- Schema: grooming_decisions audit table; workflows gains
grooming_evaluated_at + deferred_reason + deferred_at +
deferred_target_workflow_id; pulls gains touched_files
- audit_comments: CLOSE / DEFER templates + render_comment_template
- forgejo_writes: close_issue + defer_issue 5-step crash-safe protocol
(fingerprint dedup, error matrix, dry-run)
- patch_pr_state callback in forgejo_http
- grooming_config: 22-env-var frozen-dataclass config + log_effective
- pulls.touched_files cache extension (_pipeline_cache.py schema v8)
- reaper.reap_grooming_decisions audit-retention sweep
- reconciliation RESUME guard (deferred_reason)
Phase 1 (worker-queue shape, 2026-05-25):
- New state: GROOMING. New events: grooming_started, groom_verdict_
{proceed,defer,close}. 5 new transitions; all invariants still clean
- GroomingInputV1 + GroomingOutputV1 Pydantic contracts
- outcomes._map_grooming_outcome routes verdicts to state-machine events
- prefetch.build_grooming_stage_b_input + list_open_prs callback
- scheduler GROOMING -> grooming_stage_b role
- promote: cfg-gated DISCOVERED -> GROOMING when CONTROLLER_GROOMING_
ENABLED=true; issues skip grooming
- forgejo_writes decomposed: close_act/defer_act (Forgejo writes only;
state-machine already transitioned) + close_decide_and_act/
defer_decide_and_act (Phase 0 callers); _apply_workflow_transition
is underscore-private
- grooming.py library: tokenization, suspicion scoring (Jaccard +
weighted overlap), deterministic checks, action -> verdict mapping
- mcp/grooming_builder.py: 14-tool FastMCP server emits GroomingOutputV1
- .opencode/agents/grooming-stage-b.md: duplicate-detection agent
prompt (claude-haiku-4-5)
- grooming_side_effects.run_grooming_side_effects_tick: per-state tick
performs Forgejo writes after groom_verdict_{defer,close} fires.
Filters on event_type='transition' + payload.event (centralizes the
convention pending Phase 2's latest_transition_event helper)
- GroomingCallbacks frozen dataclass; loop.py + __main__.py wired
Worker role registry (single source of truth):
- worker/roles.py: WORKER_ROLES + WorkerRoleSpec + default_roles_csv
+ output_filename_for. agent_runner.ROLE_TO_MCP_MODULE / ROLE_TO_
OUTPUT_MODEL derive from it; opencode_session.agent_name_for reads
it for flat cases; all 6 prompt builders use output_filename_for;
worker --roles default = default_roles_csv(); launcher script
derives --roles via shell substitution. Cross-site invariant test
enforces alignment across 5 sites + opencode.json MCP registry.
Phase 0 silent-bug fix:
- reconciliation.py RESUME guard SELECT now includes deferred_reason
(was missing since Phase 0; guard was a silent no-op). Tightened
from getattr to attribute access to fail fast on future omissions.
Tests (1456 total, +91 grooming-specific):
- test_grooming_phase0.py: 34 tests (orchestrator matrix, crash
recovery, idempotency, dry-run)
- test_grooming_phase1.py: 60 tests (library, contracts, state
machine, outcomes, scheduler, promote, prefetch, act-variants
with signature parity, side-effect tick incl. natural-idempotency
+ executed-flag-skip + verdict-mismatch + reconciliation RESUME)
- test_mcp_builders.py TestGroomingBuilder: 29 tests (happy paths
+ 22 validation rules + Pydantic round-trip + master-tick-read-
path companion)
- test_worker_agent_runner.py TestRoleMaps: cross-role wiring
alignment + agent-prompt-vs-worker-fallback filename contract +
inspect.signature equality (close_act/defer_act vs
close_issue/defer_issue)
- test_state_machine.py: transition count 51 -> 56 +
events_from_grooming
Live-validated end-to-end on 4 staged sentinel PRs (#55-#58) in
dry_run: agent emits verdicts via MCP, state-machine transitions
fire, side-effect tick writes audit row, deferred_reason gates
reconciliation RESUME correctly.
Deferred refinements + Phase 2 prerequisite (latest_transition_event
helper) tracked in .drew/regressions-plan.md "Phase 1 follow-up
backlog".
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
277 lines
11 KiB
Python
277 lines
11 KiB
Python
"""OpenCode session adapter — wraps the existing
|
|
``_opencode_worker.run_session_blocking`` into the
|
|
``run_opencode_session`` protocol the controller's
|
|
``production_agent_runner`` expects.
|
|
|
|
Per plan v9: each attempt spawns a per-attempt MCP subprocess +
|
|
drives the LLM via OpenCode pointed at the matching agent. The
|
|
controller's responsibility is to map (role, tier) → agent name
|
|
and to build the prompt that tells the LLM "use the response-builder
|
|
MCP to construct your output."
|
|
|
|
Role-to-agent mapping for the simple/flat cases is read from
|
|
``roles.WORKER_ROLES`` (single source of truth). Two roles have
|
|
input-dependent agent names that are handled here:
|
|
|
|
- ``implementer``: tier-suffixed → ``task-implementor-tier-<tier>``
|
|
- ``reviewer``: dispute-aware → ``pr-review-worker-dispute`` when
|
|
``input_payload['implementer_claim']['outcome'] == 'dispute-reviewer'``,
|
|
else the registry default (``pr-review-worker``)
|
|
|
|
This module is the wiring layer; the prompt-assembly logic itself
|
|
(turning input_payload + role into a worker-friendly text prompt
|
|
that instructs the LLM to use the MCP tools) lives in a follow-up
|
|
since it requires per-role prompt templates.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
import os
|
|
import sys
|
|
import time
|
|
from collections.abc import Callable
|
|
from pathlib import Path
|
|
from typing import Any
|
|
|
|
from .runner import WorkerError, WorkerLostLock
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
# Plan v9: role+tier → OpenCode agent name. Tier-aware for the
|
|
# implementer; flat for the rest.
|
|
#
|
|
# T5-4 (2026-05-19): reviewer routing branches on the input_payload's
|
|
# ``implementer_claim``. When the prior implementer attempt emitted
|
|
# ``outcome=dispute-reviewer``, the next reviewer attempt is a
|
|
# re-examination and must be at least as capable as the disputer
|
|
# (which is opus at tier-2). The dispute variant uses the
|
|
# ``pr-review-worker-dispute`` agent (also opus); the normal path
|
|
# uses ``pr-review-worker`` (sonnet baseline).
|
|
def agent_name_for(
|
|
role: str,
|
|
tier: int | None,
|
|
input_payload: dict[str, Any] | None = None,
|
|
) -> str:
|
|
"""Resolve ``role`` (and optional context) to an OpenCode agent
|
|
name. The flat mapping comes from ``roles.WORKER_ROLES``; tier-
|
|
or input-dependent roles override the registry default below."""
|
|
from .roles import WORKER_ROLES
|
|
|
|
if role not in WORKER_ROLES:
|
|
raise ValueError(
|
|
f"unknown role {role!r}; expected one of {sorted(WORKER_ROLES)}"
|
|
)
|
|
spec = WORKER_ROLES[role]
|
|
|
|
# Implementer: tier-suffixed.
|
|
if role == "implementer":
|
|
if tier is None:
|
|
raise ValueError("implementer role requires tier")
|
|
if tier not in {0, 1, 2}:
|
|
raise ValueError(f"invalid tier {tier!r}; must be 0/1/2")
|
|
return f"{spec.agent_name}-tier-{tier}"
|
|
|
|
# Reviewer: dispute variant for re-examination after T5-4
|
|
# implementer dispute.
|
|
if role == "reviewer":
|
|
if _is_dispute_reexamination(input_payload):
|
|
return f"{spec.agent_name}-dispute"
|
|
return spec.agent_name
|
|
|
|
# Everything else: flat lookup from the registry.
|
|
return spec.agent_name
|
|
|
|
|
|
def _is_dispute_reexamination(input_payload: dict[str, Any] | None) -> bool:
|
|
"""Return True iff the reviewer's input_payload signals this attempt
|
|
is a re-examination of a prior implementer's dispute.
|
|
|
|
Cheap, defensive: ``input_payload`` may be None during test setup
|
|
or for early-init paths; either way, default to the non-dispute
|
|
branch.
|
|
"""
|
|
if not isinstance(input_payload, dict):
|
|
return False
|
|
claim = input_payload.get("implementer_claim")
|
|
if not isinstance(claim, dict):
|
|
return False
|
|
return claim.get("outcome") == "dispute-reviewer"
|
|
|
|
|
|
def _default_prompt_for(
|
|
role: str, tier: int | None, input_payload: dict[str, Any]
|
|
) -> str:
|
|
"""Per-role prompt builder; delegates to ``prompts.build_prompt``."""
|
|
from .prompts import build_prompt
|
|
|
|
return build_prompt(role, tier, input_payload)
|
|
|
|
|
|
# Default tier wallclock budgets (seconds). Per plan v9. Operator
|
|
# tunes via env at worker startup.
|
|
DEFAULT_TIER_TIMEOUT_S: dict[int | None, int] = {
|
|
0: int(os.environ.get("CONTROLLER_TIER_0_TIMEOUT_S", "600")),
|
|
1: int(os.environ.get("CONTROLLER_TIER_1_TIMEOUT_S", "1200")),
|
|
2: int(os.environ.get("CONTROLLER_TIER_2_TIMEOUT_S", "1800")),
|
|
None: int(os.environ.get("CONTROLLER_DEFAULT_AGENT_TIMEOUT_S", "600")),
|
|
}
|
|
|
|
|
|
def wire_opencode_session(
|
|
*,
|
|
opencode_server_url: str,
|
|
tag_prefix: str = "controller",
|
|
prompt_builder: Callable[[str, int | None, dict], str] | None = None,
|
|
run_session_blocking: Callable | None = None,
|
|
lost_lock_poll_interval_s: float = 5.0,
|
|
) -> Callable:
|
|
"""Returns a callable matching the production_agent_runner's
|
|
``run_opencode_session`` contract.
|
|
|
|
Args:
|
|
opencode_server_url: e.g. "http://localhost:4096".
|
|
tag_prefix: prefix for the OpenCode session title (operator-
|
|
visible in OpenCode's session list).
|
|
prompt_builder: function (role, tier, input_payload) → prompt
|
|
text. None uses the default ``_default_prompt_for``.
|
|
run_session_blocking: dependency-injection for the real
|
|
``_opencode_worker.run_session_blocking``. None uses the
|
|
real function. Tests inject a stub.
|
|
lost_lock_poll_interval_s: how often the OpenCode polling
|
|
callback checks lost_lock_check.
|
|
"""
|
|
if run_session_blocking is None:
|
|
# Lazy-import the real one. Done only when wire_opencode_session
|
|
# is called without an override (i.e., in production).
|
|
repo_root = Path(__file__).resolve().parents[3]
|
|
if str(repo_root) not in sys.path:
|
|
sys.path.insert(0, str(repo_root))
|
|
tools_dir = repo_root / "tools"
|
|
sys.path.insert(0, str(tools_dir))
|
|
from _opencode_worker import run_session_blocking as _real # type: ignore[import-not-found]
|
|
|
|
run_session_blocking = _real
|
|
|
|
builder = prompt_builder or _default_prompt_for
|
|
|
|
def run_opencode_session(
|
|
*,
|
|
role: str,
|
|
tier: int | None,
|
|
input_payload: dict[str, Any],
|
|
mcp_process,
|
|
attempt_id: int,
|
|
instance_id: str,
|
|
lost_lock_check: Callable[[], bool],
|
|
inline_output_callback: Callable[[dict[str, Any]], None] | None = None,
|
|
) -> None:
|
|
"""The injected callable. Drives the OpenCode session +
|
|
propagates lost_lock_check via the on_poll callback."""
|
|
agent = agent_name_for(role, tier, input_payload)
|
|
prompt = builder(role, tier, input_payload)
|
|
tag = f"{tag_prefix}-{role}-{attempt_id}"
|
|
# Append the PR component when this attempt is PR-bound. The
|
|
# session archive carries the tag verbatim, and the
|
|
# llm_activity scraper parses ``-pr-<n>`` out of it to attribute
|
|
# token cost to a PR in the telemetry cost dashboard. Without
|
|
# the suffix every controller turn lands as "unattributed".
|
|
# An estimator running on a pre-PR issue has no pr_number — the
|
|
# suffix is simply omitted and that row carries NULL, which is
|
|
# the correct "no PR to attribute to" outcome.
|
|
pr_number = (
|
|
input_payload.get("pr_number") if isinstance(input_payload, dict) else None
|
|
)
|
|
if isinstance(pr_number, int) and not isinstance(pr_number, bool):
|
|
tag = f"{tag}-pr-{pr_number}"
|
|
timeout = DEFAULT_TIER_TIMEOUT_S.get(tier, DEFAULT_TIER_TIMEOUT_S[None])
|
|
|
|
# The on_poll hook lets us bail out early if the heartbeat
|
|
# thread detects the lock has been reaped. Polling happens
|
|
# every poll_interval_seconds inside run_session_blocking.
|
|
def on_poll() -> None:
|
|
if lost_lock_check():
|
|
# Raise so run_session_blocking unwinds; the runner
|
|
# catches WorkerLostLock and aborts silently.
|
|
raise WorkerLostLock(
|
|
f"lost lock for attempt {attempt_id} during OpenCode poll"
|
|
)
|
|
|
|
try:
|
|
result = run_session_blocking(
|
|
server_url=opencode_server_url,
|
|
agent=agent,
|
|
tag=tag,
|
|
prompt=prompt,
|
|
timeout_seconds=timeout,
|
|
poll_interval_seconds=lost_lock_poll_interval_s,
|
|
on_poll=on_poll,
|
|
)
|
|
except WorkerLostLock:
|
|
raise
|
|
except Exception as exc:
|
|
raise WorkerError(
|
|
f"OpenCode run_session_blocking raised: {exc}",
|
|
outcome="worker-internal-error",
|
|
) from exc
|
|
|
|
# Phase 1k++++ trial-path: harvest the inline JSON the agent
|
|
# emitted as its final response. Legacy pipeline agents emit a
|
|
# single JSON object as their final message; OpenCode worker
|
|
# extracts it into ``SessionResult.parsed_json``. Since
|
|
# Phase 1m the response-builder MCPs ARE registered in
|
|
# opencode.json, so this inline channel is a fallback for
|
|
# agents that still emit chat-JSON. The agent_runner's
|
|
# callback skips the write if the MCP already wrote
|
|
# canonical V1 to the same path.
|
|
#
|
|
# PD16: re-raise WorkerLostLock from the callback so the
|
|
# runner's outer handler aborts properly. Other exceptions are
|
|
# converted to WorkerError so they classify as
|
|
# ``worker-internal-error`` instead of silently letting the
|
|
# canonical poller time out 30s later with no root cause.
|
|
parsed = getattr(result, "parsed_json", None)
|
|
if parsed is not None and inline_output_callback is not None:
|
|
try:
|
|
inline_output_callback(parsed)
|
|
except WorkerLostLock:
|
|
raise
|
|
except Exception as exc:
|
|
raise WorkerError(
|
|
f"inline_output_callback raised: {exc}",
|
|
outcome="worker-internal-error",
|
|
) from exc
|
|
|
|
# Inspect SessionResult.status.
|
|
status = getattr(result, "status", None)
|
|
if status == "completed":
|
|
# MCP's finalize emitted to the canonical-output file;
|
|
# production_agent_runner reads it after we return.
|
|
return
|
|
if status == "timeout":
|
|
raise WorkerError(
|
|
f"OpenCode session timed out after {timeout}s",
|
|
outcome="worker-internal-error",
|
|
)
|
|
if status == "transport-error":
|
|
error_kind = getattr(result, "error_kind", "transport-error")
|
|
raise WorkerError(
|
|
f"OpenCode transport error: {error_kind}",
|
|
outcome="worker-internal-error",
|
|
)
|
|
# Unknown status — be defensive.
|
|
raise WorkerError(
|
|
f"OpenCode session returned unexpected status: {status!r}",
|
|
outcome="worker-internal-error",
|
|
)
|
|
|
|
return run_opencode_session
|
|
|
|
|
|
__all__ = [
|
|
"DEFAULT_TIER_TIMEOUT_S",
|
|
"agent_name_for",
|
|
"wire_opencode_session",
|
|
]
|