okstra 0.186.4 → 0.186.6

package/runtime/validators/validate_session_conformance.py

@@ -47,6 +47,7 @@ from okstra_ctl.lead_events import (  # noqa: E402
 )
 from okstra_ctl.agent_activity import ACTIVITY_FIELDS  # noqa: E402
 from okstra_ctl.domain.host import HostNotRegistered  # noqa: E402
+from okstra_ctl.final_report_paths import final_report_data_path  # noqa: E402
 from okstra_ctl.registry.host_registry import default_host_registry  # noqa: E402
 from okstra_ctl.wrapper_status import read_wrapper_status  # noqa: E402
 
@@ -624,16 +625,7 @@ def _plan_body_state_path(run_dir: Path, suffix: str) -> Path:
 
 def _ids_reported_as_asked(report_path: Path) -> list[str]:
     """리포트가 "사용자에게 물었다"고 기록한 열린 승인 차단 행의 id."""
-    name = report_path.name
-    if not name.endswith(".md"):
-        return []
-    data_path = report_path.with_name(name.removesuffix(".md") + ".data.json")
-    try:
-        doc = json.loads(data_path.read_text())
-    except (OSError, json.JSONDecodeError):
-        return []
-    if not isinstance(doc, dict):
-        return []
+    doc = _read_report_data(report_path)
     asked: list[str] = []
     for row in doc.get("clarificationItems") or []:
         if not isinstance(row, dict):
@@ -666,12 +658,13 @@ def _activity_index(events: list[LeadEvent]) -> dict[str, list[LeadEvent]]:
 
 
 def _read_report_data(report_path: Path) -> Mapping[str, Any]:
-    name = report_path.name
-    if not name.endswith(".md"):
-        return {}
-    data_path = report_path.with_name(name.removesuffix(".md") + ".data.json")
+    """`--report` 가 data.json · markdown · html 이어도 같은 레코드를 연다.
+
+    Phase 7 는 data.json 을 넘긴다. `.md` 만 받던 동안 투영과 self-fix 횟수가
+    빈 객체에서 나와 `projected=<missing>` / `selfFixRoundsApplied=0` 이 됐다.
+    """
     try:
-        data = json.loads(data_path.read_text(encoding="utf-8"))
+        data = json.loads(final_report_data_path(report_path).read_text(encoding="utf-8"))
     except (OSError, json.JSONDecodeError):
         return {}
     return data if isinstance(data, Mapping) else {}
@@ -758,7 +751,16 @@ def _check_projected_agent_activity(
         {field: event.details.get(field) for field in ACTIVITY_FIELDS}
         for event in events
     ]
-    projected = report_data.get("agentActivity")
+    raw_projected = report_data.get("agentActivity")
+    projected = (
+        [
+            {field: row.get(field) for field in ACTIVITY_FIELDS}
+            for row in raw_projected
+            if isinstance(row, Mapping)
+        ]
+        if isinstance(raw_projected, list)
+        else raw_projected
+    )
     if projected == expected:
         return
     mismatch = "length"
@@ -850,6 +852,43 @@ def _allowed_automatic_rounds(self_fix_rounds: int, *, gating: bool = True) -> i
     return 2 + max(self_fix_rounds, 0)
 
 
+def _self_fix_rounds_from_state(run_dir: Path, suffix: str | None) -> int | None:
+    """이번 런 상태 파일의 자가수정 횟수. 없으면 None — 호출자가 리포트로 폴백.
+
+    리포트 칸은 이어진 seq 의 누적이라, 이번 창의 `self-fix-applied` 건수와
+    비교하면 어긋난다.
+    """
+    if not suffix:
+        return None
+    try:
+        doc = json.loads(_plan_body_state_path(run_dir, suffix).read_text())
+    except (OSError, json.JSONDecodeError):
+        return None
+    if not isinstance(doc, dict):
+        return None
+    projection = doc.get("planBodyVerification")
+    value = (
+        projection.get("selfFixRoundsApplied")
+        if isinstance(projection, dict)
+        else None
+    )
+    if isinstance(value, int) and value >= 0:
+        return value
+    value = doc.get("selfFixRoundsApplied")
+    return value if isinstance(value, int) and value >= 0 else None
+
+
+def _is_plan_body_verification_activity(event: LeadEvent) -> bool:
+    """`verification-round-completed` 가 계획 본문 배치인지.
+
+    같은 kind 로 적대 재검증 라운드도 남는다. 그 건을 본문 라운드에 넣으면
+    recorded 가 roundCount 보다 커진다. 요약이 `adversarial reverify` 이면
+    본문이 아니다. 픽스처 요약(`verification-round-completed for …`)은 본문이다.
+    """
+    summary = str(event.details.get("summary") or "").lower()
+    return "adversarial reverify" not in summary and "adversarial re-verify" not in summary
+
+
 def _plan_body_verification(report_data: Mapping[str, Any]) -> Mapping[str, Any] | None:
     planning = report_data.get("implementationPlanning")
     verification = (
@@ -970,14 +1009,23 @@ def _check_activity_round_counts(
     errors: list[str],
 ) -> None:
     verification_rounds = _plan_body_rounds_ran(run_dir, suffix)
-    recorded_verifications = len(indexed.get("verification-round-completed", []))
+    recorded_verifications = len([
+        event
+        for event in indexed.get("verification-round-completed", [])
+        if _is_plan_body_verification_activity(event)
+    ])
     user_reverification_rounds = _resolved_correctness_reverification_rounds(
         indexed,
         report_data,
         verification_rounds,
     )
     automatic_rounds = verification_rounds - len(user_reverification_rounds)
-    self_fix_rounds = _self_fix_rounds_applied(report_data)
+    state_self_fix = _self_fix_rounds_from_state(run_dir, suffix)
+    self_fix_rounds = (
+        state_self_fix
+        if state_self_fix is not None
+        else _self_fix_rounds_applied(report_data)
+    )
     allowed_rounds = _allowed_automatic_rounds(
         self_fix_rounds, gating=_plan_body_gating(report_data),
     )
@@ -1435,6 +1483,11 @@ def _check_cmux_adapter_read(
         return
     if evidence.sidecar_reads.get(CMUX_ADAPTER_BASENAME):
         return
+    dispatch_mode = str(team_state.get("dispatchMode", "")).strip()
+    if dispatch_mode in _WORKER_DISPATCH_MODES:
+        # grok 같은 artifact-only 호스트는 Read 도구 기록이 없다. 워커가
+        # okstra 디스패치로 나갔으면 어댑터가 가리키는 경로를 탄 것이다.
+        return
     errors.append(
         f"cmux adapter: no read of `{CMUX_ADAPTER_BASENAME}` (a `Read` call or a "
         f"shell command naming it) found in the "