Files
cleveragents-core/tools/controller/worker/opencode_session.py
T
drew bcc59d38af fix(controller): trial-path output channel — harvest inline JSON + legacy-shape adapter
Trial run-1 surfaced the real failure mode: the existing agent
prompts emit their result as a single JSON object in the FINAL
assistant message (the legacy dispatch_implementer/dispatch_review
contract). They DON'T call the controller's response-builder MCPs
(not registered in opencode.json) and they DON'T write a file. The
worker's canonical-output poller timed out every attempt.

Fix (two pieces):

1. INLINE JSON HARVEST
   ``_opencode_worker.run_session_blocking`` already extracts the
   last JSON object from the agent's final response into
   ``SessionResult.parsed_json``. The controller's opencode_session
   adapter was ignoring it.
   - ``opencode_session.py:run_opencode_session`` now accepts an
     ``inline_output_callback`` kwarg. After the session completes,
     if parsed_json is set, the callback fires.
   - ``agent_runner.py`` provides the callback: writes the parsed
     JSON to the canonical-output path so the existing poller picks
     it up uniformly with the MCP + file-write channels.

2. LEGACY → V1 SHAPE ADAPTER (``worker/legacy_adapter.py``)
   The legacy JSON shape doesn't match V1 contracts:
   - estimator: legacy {recommended_tier, is_confident, reasoning}
     vs V1 {output_version, recommended_tier, is_metadata_only,
     confidence, reasoning, wallclock_seconds}
   - implementer: legacy {outcome: resolved|unresolved, ...} vs V1
     {outcome: resolved|rebase-failed|blocked|noop|competence-failure,
     commit_shas, blockers, used_tier, ...}
   - reviewer: legacy {verdict, ...} vs V1 {output_version, verdict,
     blocking_issues, suggested_next_action, ...}

   ``adapt_to_v1(role, payload, tier, wallclock_seconds)`` normalizes
   each role's legacy shape into the corresponding V1 dict:
   - adds ``output_version="V1"``
   - maps outcome enums (``unresolved`` → ``blocked``)
   - synthesizes missing required fields with sensible defaults
   - coerces singular commit_sha → list[commit_shas]
   - converts legacy is_confident bool → confidence string

   Already-V1 payloads pass through unchanged. The agent_runner
   wraps the inline_output_callback to run the adapter before
   writing to the canonical path.

Tests (+12 in test_legacy_adapter.py):
- Each role's adapt: legacy in, V1-validating-via-strict_parse out
- Already-V1 passthrough
- Outcome enum mappings + invalid-outcome fallback
- Singular commit_sha normalization
- Non-dict / unknown-role passthrough (lets strict_parse raise)

Total: 738 controller tests pass (+12 net), 0 regressions.

Long-term: update agent prompts to emit V1 directly, register the
MCPs in opencode.json. For the trial, this adapter lets the existing
agents flow through the new controller unchanged.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-18 17:56:47 -04:00

203 lines
8.1 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-and-tier-to-agent mapping (matches existing pipeline names):
- implementer + tier 0 → task-implementor-tier-0
- implementer + tier 1 → task-implementor-tier-1
- implementer + tier 2 → task-implementor-tier-2
- reviewer → pr-review-worker
- estimator → estimator-implementation
- conflict_resolver → conflict-resolver-worker
- summarizer → controller-summarizer (new agent name; defined elsewhere)
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.
def agent_name_for(role: str, tier: int | None) -> str:
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"task-implementor-tier-{tier}"
if role == "reviewer":
return "pr-review-worker"
if role == "estimator":
return "estimator-implementation"
if role == "conflict_resolver":
return "conflict-resolver-worker"
if role == "summarizer":
return "controller-summarizer"
raise ValueError(f"unknown role {role!r}")
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)
prompt = builder(role, tier, input_payload)
tag = f"{tag_prefix}-{role}-{attempt_id}"
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. The existing legacy pipeline's
# agent prompts (.opencode/agents/*.md) all instruct the agent
# to emit a single JSON object as the LAST machine-readable
# artifact — ``_opencode_worker.run_session_blocking`` extracts
# it into ``SessionResult.parsed_json`` via
# ``_extract_last_json_object``. The controller's MCP-builder
# path isn't reachable from OpenCode (MCPs not registered in
# opencode.json); this inline channel IS the working path.
parsed = getattr(result, "parsed_json", None)
if parsed is not None and inline_output_callback is not None:
try:
inline_output_callback(parsed)
except Exception:
logger.exception(
"inline_output_callback raised for attempt_id=%s",
attempt_id,
)
# 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",
]