okstra 0.186.1 → 0.186.3

package/runtime/templates/reports/report.js

@@ -274,6 +274,38 @@
     }
   }
 
+  // 선택 카드는 보여 주기만 하면 고른 것처럼 보이지만 값이 안 실린다.
+  // 카드를 누르면 같은 칸의 select 를 맞춘다.
+  function bindOptionCardPicks() {
+    var articles = document.querySelectorAll("article[data-response-id]");
+    for (var i = 0; i < articles.length; i++) {
+      (function (article) {
+        var sel = article.querySelector("select[data-response-id]");
+        if (!sel) return;
+        var cards = article.querySelectorAll(".clarification-option[data-option-value]");
+        var sync = function () {
+          for (var c = 0; c < cards.length; c++) {
+            cards[c].classList.toggle(
+              "is-selected",
+              cards[c].getAttribute("data-option-value") === sel.value
+            );
+          }
+        };
+        for (var c = 0; c < cards.length; c++) {
+          cards[c].addEventListener("click", function (event) {
+            if (sel.disabled) return;
+            if (event.target.closest && event.target.closest("a")) return;
+            sel.value = event.currentTarget.getAttribute("data-option-value") || "";
+            sel.dispatchEvent(new Event("change"));
+            sync();
+          });
+        }
+        sel.addEventListener("change", sync);
+        sync();
+      })(articles[i]);
+    }
+  }
+
   function quotedReviewField(label, value) {
     var cleaned = trimMultiline(value);
     if (!cleaned) return "- " + label + ":\n";
@@ -547,6 +579,7 @@
       setReaderMode("action");
     }
     bindOtherInputToggle();
+    bindOptionCardPicks();
   }
 
   if (typeof window !== "undefined") {

package/runtime/validators/validate-run.py

@@ -88,6 +88,13 @@ from okstra_ctl.incremental_scope import (  # noqa: E402
     stages_for_clarification,
 )
 from okstra_ctl import next_phase  # noqa: E402
+from okstra_ctl.clarification_items import (  # noqa: E402
+    APPROVAL_BLOCKS,
+    PROCEEDING_DISPOSITIONS,
+    clarification_disposition,
+    progress_blocking_ids,
+    row_blocks_progress,
+)
 from okstra_ctl.workflow import (  # noqa: E402
     ERROR_ANALYSIS_ROUTING_DIRECTIONS,
     PHASE_SEQUENCE,
@@ -4117,34 +4124,102 @@ def _state_classification(item: dict, gate_class: str) -> str:
     return "dissent-isolated" if dissenting == 1 else "partial-consensus"
 
 
-def _resolved_noncritical_dissent_ids(data: dict) -> set[str]:
-    """Plan items whose remaining dissent the user explicitly accepted."""
+def _clarification_resolution(row: dict, context: dict) -> dict | None:
+    """계약 3.0 은 행의 `resolution`, 2.0 은 `approvalContext.resolution`."""
+    for candidate in (row.get("resolution"), context.get("resolution")):
+        if isinstance(candidate, dict):
+            return candidate
+    return None
+
+
+def _clarification_ids_on_activity(activity: dict) -> set[str]:
+    refs: set[str] = set()
+    for key in ("clarificationRefs", "evidenceRefs"):
+        for value in activity.get(key) or []:
+            if isinstance(value, str) and _APPROVAL_CLARIFICATION_ID_RE.fullmatch(value):
+                refs.add(value)
+    return refs
+
+
+def _plan_item_ids_for_clarification(
+    row: dict, context: dict, data: dict,
+) -> list[str]:
+    """이 C 행이 가리키는 계획 항목.
+
+    계약 3.0 `approvalContext` 는 `planItemIds` 를 갖지 않는다. 활동
+    `evidenceRefs` / `clarificationRefs` 와 `planItems[].clarificationRefs` 가
+    역추적이다. 이 C 만 인용한 활동을 묶음 활동보다 앞세운다.
+    """
+    linked = [
+        item_id
+        for item_id in (context.get("planItemIds") or [])
+        if isinstance(item_id, str) and item_id
+    ]
+    if linked:
+        return linked
+    row_id = str(row.get("id") or "")
+    if not row_id:
+        return []
+    singleton: list[str] = []
+    bulk: list[str] = []
+    for activity in data.get("agentActivity") or []:
+        if not isinstance(activity, dict):
+            continue
+        refs = _clarification_ids_on_activity(activity)
+        if row_id not in refs:
+            continue
+        ids = [
+            item_id
+            for item_id in (activity.get("planItemIds") or [])
+            if isinstance(item_id, str) and item_id
+        ]
+        if refs == {row_id}:
+            singleton.extend(ids)
+        else:
+            bulk.extend(ids)
+    if singleton or bulk:
+        return singleton or bulk
+    items = (
+        ((data.get("implementationPlanning") or {}).get("planBodyVerification")
+         or {}).get("planItems") or []
+    )
+    return [
+        str(item.get("id") or "")
+        for item in items
+        if isinstance(item, dict)
+        and row_id in {
+            ref for ref in (item.get("clarificationRefs") or [])
+            if isinstance(ref, str)
+        }
+        and item.get("id")
+    ]
+
+
+def _user_accepted_plan_item_ids(data: dict) -> set[str]:
+    """사용자가 진행 처분을 고른 승인 행이 가리키는 계획 항목.
+
+    DISAGREE 표는 그대로 남는다. 게이트만 `has-dissent` 로 내린다.
+    """
     accepted: set[str] = set()
     for row in data.get("clarificationItems") or []:
         if not isinstance(row, dict) or row.get("blocks") != "approval":
             continue
+        if row_blocks_progress(
+            str(row.get("status") or ""), clarification_disposition(row)
+        ):
+            continue
         context = row.get("approvalContext")
         if not isinstance(context, dict):
-            continue
-        resolution = context.get("resolution")
-        if (
-            row.get("status") == "resolved"
-            and context.get("classification") == "noncritical-dissent"
-            and isinstance(resolution, dict)
-            and resolution.get("disposition") == "accept-risk"
-            and str(resolution.get("userText") or "").strip()
-            and _approval_context_activity_refs_exist(
-                data, str(row.get("id") or ""), context, resolution
-            )
-        ):
-            accepted.update(
-                item_id
-                for item_id in context.get("planItemIds") or []
-                if isinstance(item_id, str)
-            )
+            context = {}
+        accepted.update(_plan_item_ids_for_clarification(row, context, data))
     return accepted
 
 
+def _resolved_noncritical_dissent_ids(data: dict) -> set[str]:
+    """호환 별칭. 새 코드는 `_user_accepted_plan_item_ids` 를 쓴다."""
+    return _user_accepted_plan_item_ids(data)
+
+
 def _is_dissent_downgraded(
     item: dict,
     pbv: dict,
@@ -4152,16 +4227,11 @@ def _is_dissent_downgraded(
 ) -> bool:
     """Whether a surviving `majority-disagree` item stops blocking approval.
 
-    Exhausting the automatic self-fix budget records the unresolved dissent but
-    does not accept it. Only an explicit, resolved noncritical risk-acceptance
-    row can lower the item to `has-dissent`. Correctness-critical defects remain
-    blocking regardless of the user's selected disposition.
+    사용자 진행 처분(`accept-risk` / `select` / `answer`)이 있으면 표는 남기고
+    게이트만 `has-dissent` 로 내린다. 분류와 자가수정 소진 여부는 보지 않는다.
     """
     return (
         _classify_plan_item_gate(item) == "majority-disagree"
-        and not _is_correctness_critical(item)
-        and _has_planner_fixable_majority(item)
-        and _self_fix_budget_exhausted(pbv)
         and str(item.get("id") or "") in accepted_item_ids
     )
 
@@ -4477,11 +4547,15 @@ def _gate_blocking_causes(
 
 
 _APPROVAL_DISPOSITIONS_BY_CLASSIFICATION = {
-    "user-decision": frozenset({"select", "request-revision", "reject"}),
+    "user-decision": frozenset(
+        {"select", "accept-risk", "request-revision", "reject"}
+    ),
     "noncritical-dissent": frozenset(
         {"accept-risk", "request-revision", "reject"}
     ),
-    "correctness-critical": frozenset({"request-revision", "reject"}),
+    "correctness-critical": frozenset(
+        {"accept-risk", "request-revision", "reject"}
+    ),
 }
 
 
@@ -4949,6 +5023,8 @@ def _validate_resolved_approval(
             f"final-report data.json: resolved approval clarification `{row_id}` "
             "requires non-empty resolution.userText."
         )
+    if str(resolution.get("disposition") or "") in PROCEEDING_DISPOSITIONS:
+        return
     check_refs = resolution.get("checkRefs")
     if not isinstance(check_refs, list) or not any(
         isinstance(value, str) and value for value in check_refs
@@ -5097,6 +5173,7 @@ def _validate_correctness_resolution(
     if (
         context.get("classification") != "correctness-critical"
         or row.get("status") != "resolved"
+        or clarification_disposition(row) in PROCEEDING_DISPOSITIONS
     ):
         return
     row_id = str(row.get("id") or "<unknown>")
@@ -5349,11 +5426,13 @@ def _validate_approval_context(
             activity_timestamps,
             failures,
         )
-        if report_approved and row.get("status") in {"open", "answered"}:
+        if report_approved and row_blocks_progress(
+            str(row.get("status") or ""), clarification_disposition(row)
+        ):
             failures.append(
                 f"final-report data.json: approval is true while clarification `{row_id}` "
-                f"has status `{row.get('status')}`; open and answered approval "
-                "rows remain blocking."
+                f"has status `{row.get('status')}`; open and return-disposition "
+                "approval rows remain blocking."
             )
 
 
@@ -5425,7 +5504,9 @@ def _validate_v3_approval_context(data: dict, failures: list[str]) -> None:
             row, context, failures, schema_version="3.0"
         )
         _validate_v3_resolution_links(row, activities, failures)
-        if approved and row.get("status") in {"open", "answered"}:
+        if approved and row_blocks_progress(
+            str(row.get("status") or ""), clarification_disposition(row)
+        ):
             failures.append(
                 f"final-report data.json: approval is true while clarification "
                 f"`{row.get('id')}` remains `{row.get('status')}`."
@@ -6165,6 +6246,7 @@ def _validate_approval_clarification_backtrace(
 
 
 _RERUN_FLAG = "--answered-clarifications"
+_USER_RESPONSE_HINT = re.compile(r"okstra-user-response", re.IGNORECASE)
 _APPROVE_HINT = re.compile(r"--approve|\bapprov", re.IGNORECASE)
 
 
@@ -6182,10 +6264,9 @@ def _next_step_texts(steps: object) -> list[str]:
     return texts
 
 
-def _has_blocks_approval_row(data: dict) -> bool:
-    return any(
-        isinstance(row, dict) and row.get("blocks") == "approval"
-        for row in data.get("clarificationItems") or []
+def _has_unresolved_approval_blocker(data: dict) -> bool:
+    return bool(
+        progress_blocking_ids(data.get("clarificationItems"), APPROVAL_BLOCKS)
     )
 
 
@@ -6197,7 +6278,14 @@ def _planning_gate_blocks_approval(data: dict) -> bool:
     if not isinstance(verification, dict):
         return False
     gate = str(verification.get("gateResult") or "").strip().lower()
-    return gate in {"blocked-by-disagreement", "aborted-non-result"}
+    if gate == "aborted-non-result":
+        return True
+    if gate != "blocked-by-disagreement":
+        return False
+    return _has_unresolved_approval_blocker(data) or not any(
+        isinstance(row, dict) and row.get("blocks") == "approval"
+        for row in data.get("clarificationItems") or []
+    )
 
 
 def _validate_rerun_guidance(data: dict, failures: list[str]) -> None:
@@ -6212,19 +6300,20 @@ def _validate_rerun_guidance(data: dict, failures: list[str]) -> None:
     """
     if (data.get("header") or {}).get("taskType") != "implementation-planning":
         return
-    has_blocker = _has_blocks_approval_row(data)
-    if not has_blocker:
+    if not _has_unresolved_approval_blocker(data):
         return
-    if any(_RERUN_FLAG in text for text in _next_step_texts(
-        data.get("recommendedNextSteps")
-    )):
+    texts = _next_step_texts(data.get("recommendedNextSteps"))
+    if any(_RERUN_FLAG in text for text in texts) and any(
+        _USER_RESPONSE_HINT.search(text) for text in texts
+    ):
         return
     failures.append(
-        "final-report data.json: this plan withholds approval on a "
+        "final-report data.json: this plan withholds approval on an unresolved "
         "`blocks: approval` clarification, but no `recommendedNextSteps` entry "
-        f"tells the reader how to resume — name the `{_RERUN_FLAG}` re-run in a "
-        "step's `text` or one of its `commands`. `okstra recap assemble` "
-        "prints the exact ids and flag value once the answers are recorded."
+        "tells the reader the command to run now — name `/okstra-user-response` "
+        f"and the `{_RERUN_FLAG}` re-run in a step's `text` or one of its "
+        "`commands`. `okstra recap assemble` prints the exact ids and flag "
+        "value once the answers are recorded."
     )
 
 
@@ -6239,7 +6328,7 @@ def _validate_approval_guidance(data: dict, failures: list[str]) -> None:
     planning = data.get("implementationPlanning")
     if not isinstance(planning, dict) or planning.get("outcome") != "plan-ready":
         return
-    if _has_blocks_approval_row(data) or _planning_gate_blocks_approval(data):
+    if _has_unresolved_approval_blocker(data) or _planning_gate_blocks_approval(data):
         return
     if _report_already_approved(data):
         return
@@ -7265,11 +7354,13 @@ def _validate_tie_received_extra_vote(
     pbv = ip.get("planBodyVerification")
     if not isinstance(pbv, dict):
         return
+    accepted = _resolved_noncritical_dissent_ids(data)
     missing = sorted({
         str(item.get("id") or "").strip()
         for item in pbv.get("planItems") or []
         if isinstance(item, dict)
         and not item.get("carriedForwardFromSeq")
+        and str(item.get("id") or "").strip() not in accepted
         and _stage_scope_bucket(item, pbv) == "in-scope"
         and _is_even_blocking_split(item)
         and _distinct_verdict_workers(item) < 3

package/runtime/validators/validate_analysis_report.py

@@ -54,11 +54,12 @@ _ANALYSIS_PARENT_KEYS = {
     "feature-analysis": "featureAnalysis",
     "change-impact-analysis": "changeImpactAnalysis",
 }
-_ANALYSIS_WORKER_ROLES = {
-    "Claude worker",
-    "Codex worker",
-    "Antigravity worker",
-}
+
+
+def _is_report_writer_role(role: str) -> bool:
+    return "reportwriter" in re.sub(r"[^a-z0-9]", "", role.lower())
+
+
 _FINAL_ANALYSIS_REPORT_RE = re.compile(
     r"^final-report-(?P<task_type>project-analysis|feature-analysis|"
     r"change-impact-analysis)-(?P<seq>\d{3})\.md$"
@@ -467,7 +468,7 @@ def validate_analysis_semantics(
 ) -> None:
     required_roles = _required_worker_roles(run_manifest, errors)
     analysis_worker_roles = tuple(
-        role for role in required_roles if role in _ANALYSIS_WORKER_ROLES
+        role for role in required_roles if not _is_report_writer_role(role)
     )
     verdict_roles_unambiguous = _validate_execution_status_roles(
         data, analysis_worker_roles, errors

package/runtime/validators/validate_session_conformance.py

@@ -235,8 +235,24 @@ def _worker_role(value: str) -> str | None:
 
 
 def _worker_roles(worker: dict) -> set[str]:
-    role = _worker_role(str(worker.get("role") or ""))
-    return {role, role.replace(" ", "-")} if role else set()
+    """명단 `role` 과 `workerId` 를 활동 `agent` 가 쓸 수 있는 별칭으로 펼친다.
+
+    활동은 `codex` / `codex-worker` 를 쓰고 명단은 `Codex worker` 를 쓴다.
+    역할 문자열만 보면 둘은 다른 사람이 된다.
+    """
+    roles: set[str] = set()
+    for raw in (worker.get("role"), worker.get("workerId")):
+        role = _worker_role(str(raw or ""))
+        if not role:
+            continue
+        compact = role.replace(" ", "-")
+        roles.add(role)
+        roles.add(compact)
+        if role.endswith(" worker"):
+            roles.add(role[: -len(" worker")])
+        if compact.endswith("-worker"):
+            roles.add(compact[: -len("-worker")])
+    return roles
 
 
 def _analysis_workers(team_state: Mapping[str, Any]) -> list[dict]:
@@ -1036,12 +1052,17 @@ def _check_activity_contract(
     if not _is_activity_contract_v1_planning(run_manifest):
         return
     indexed = _activity_index(evidence.activities)
+    workers = [
+        worker
+        for worker in (team_state.get("workers") or [])
+        if isinstance(worker, dict)
+    ]
     analysis_workers = _analysis_workers(team_state)
     report_data = _read_report_data(report_path)
     _check_activity_id_order(evidence.activities, errors)
     _check_projected_agent_activity(evidence.activities, report_data, errors)
     _check_activity_worker_pairs(evidence, indexed, analysis_workers, errors)
-    _check_activity_worker_agents(indexed, analysis_workers, errors)
+    _check_activity_worker_agents(indexed, workers, errors)
     _check_activity_round_counts(indexed, report_data, run_dir, suffix, errors)
     _check_activity_user_decisions(indexed, report_data, errors)