okstra 0.221.0 → 0.222.0

package/runtime/python/okstra_ctl/report_assembly.py

@@ -18,6 +18,7 @@ from .clarification_items import (
 )
 from .final_report_schema import load_schema_version, validate
 from .report_inputs import ReportInputPath, report_input_paths, uses_report_contract_v3
+from .correction_round import correction_convergence_states, correction_round
 from .json_boundary import JsonBoundaryError, load_owned_object, serialize_owned_object
 from .report_narrative import parse_narrative, task_narrative_errors
 from .report_synthesis_packet import (
@@ -98,6 +99,32 @@ def _read_json(row: ReportInputPath) -> dict[str, Any]:
     return value
 
 
+def _correction_round_convergence(
+    initial: ReportInputPath, cross: Mapping[str, Any],
+) -> tuple[list[dict[str, Any]], list[tuple[str, Mapping[str, Any]]]]:
+    """Each correction round's re-convergence, projected like the initial one, and the
+    evidence it promotes labelled `convergence <scope>`."""
+    rows: list[dict[str, Any]] = []
+    promoted: list[tuple[str, Mapping[str, Any]]] = []
+    consensus = len(cross["consensus"])
+    differences = len(cross["differences"])
+    for scope, path in correction_convergence_states(initial.path):
+        row = ReportInputPath(initial.key, initial.owner, path)
+        try:
+            result = project_convergence(
+                _read_json(row),
+                first_consensus=consensus + 1, first_difference=differences + 1,
+            )
+        except ReportProjectionError as exc:
+            _fail(row.owner, path, "$", exc)
+        projected = result["crossVerification"]
+        consensus += len(projected["consensus"])
+        differences += len(projected["differences"])
+        rows.append({"round": correction_round(scope), **projected})
+        promoted.extend((f"convergence {scope}", item) for item in result["promotedEvidence"])
+    return rows, promoted
+
+
 def _input_map(project_root: Path, manifest: Mapping[str, Any]) -> dict[str, ReportInputPath]:
     try:
         return {row.key: row for row in report_input_paths(project_root, manifest)}
@@ -488,6 +515,11 @@ def _compose(
     data = {"schemaVersion": "3.0", **narrative, **execution}
     data["tokenUsage"] = usage
     data["crossVerification"] = convergence_data["crossVerification"]
+    rounds, round_evidence = _correction_round_convergence(
+        inputs["convergence"], data["crossVerification"]
+    )
+    if rounds:
+        data["crossVerification"]["correctionRounds"] = rounds
     data["clarificationItems"] = _clarifications(ledger, activities, inputs["approval-decisions"].path)
     # 작성자의 사실 분류와 리드 원장의 질문 연결은 양쪽 입력을 합친 뒤 검사한다.
     for reason in validate_blocked_answer_channel(data):
@@ -504,8 +536,13 @@ def _compose(
     if scope:
         data["verificationScope"] = scope
     data["agentActivity"] = activities
-    data["evidence"] = {"primary": _promoted_evidence(convergence_data)}
-    data["missingInformation"] = _census_missing_information(project_root, manifest)
+    data["evidence"] = {"primary": _promoted_evidence([
+        *(("convergence", item) for item in convergence_data["promotedEvidence"]),
+        *round_evidence,
+    ])}
+    data["missingInformation"] = _missing_information(
+        project_root, manifest, convergence_data["criticUnverified"],
+    )
     # 스냅샷 복사가 _attach_metadata 보다 먼저다 — frontmatter 가
     # selectedDirectionRef.snapshotPath 를 읽는다.
     _apply_selected_direction_snapshot(data, project_root, manifest)
@@ -529,16 +566,16 @@ def _attach_discussion(data: dict[str, Any], project_root: Path, manifest: Mappi
         _fail("discussion-record", store.records_path, "discussion", exc)
 
 
-def _census_missing_information(
-    project_root: Path, manifest: Mapping[str, Any],
+def _missing_information(
+    project_root: Path, manifest: Mapping[str, Any], critic_unverified: list[dict[str, Any]],
 ) -> list[dict[str, Any]]:
-    """Coverage-census warnings are the only rows this field carries under the
-    v3 contract, so they number from `R-001`."""
-    state = read_census_state(project_root, manifest)
-    if state is None:
-        return []
+    """Coverage-census warnings and unjudged critic gaps are the only rows this
+    field carries under the v3 contract, so they number from `R-001`."""
     _project_id, _task_group, task_id = _identity(manifest)
-    rows = census_warning_rows(state, ticket_id=task_id or "unknown")
+    ticket_id = task_id or "unknown"
+    state = read_census_state(project_root, manifest)
+    rows = [] if state is None else census_warning_rows(state, ticket_id=ticket_id)
+    rows += [{**row, "ticketId": row["ticketId"] or ticket_id} for row in critic_unverified]
     return [{"id": f"R-{index:03d}", **row} for index, row in enumerate(rows, start=1)]
 
 
@@ -717,16 +754,16 @@ def _attach_metadata(data: dict[str, Any], manifest: Mapping[str, Any]) -> None:
     }
 
 
-def _promoted_evidence(convergence: Mapping[str, Any]) -> list[dict[str, Any]]:
+def _promoted_evidence(rows: list[tuple[str, Mapping[str, Any]]]) -> list[dict[str, Any]]:
     return [
         {
             "id": f"E-{index:03d}",
             "ticketId": row["ticketId"],
             "evidence": row["evidence"],
             "sourceItems": row["sourceItems"],
-            "source": "convergence",
+            "source": source,
         }
-        for index, row in enumerate(convergence.get("promotedEvidence") or [], start=1)
+        for index, (source, row) in enumerate(rows, start=1)
     ]
 
 

package/runtime/python/okstra_ctl/report_html/common.py

@@ -403,8 +403,10 @@ def anchor_index(
         for row_id in sorted(found)
         if isinstance(row_id, str) and _anchorable(row_id)
     }
+    cross = data.get("crossVerification") if isinstance(data.get("crossVerification"), dict) else {}
+    rounds = [cross, *(r for r in cross.get("correctionRounds") or [] if isinstance(r, dict))]
     for block in ("consensus", "differences"):
-        for row in _dig(data, ("crossVerification", block)):
+        for row in (row for scope in rounds for row in scope.get(block) or []):
             row_id = row.get("id") if isinstance(row, dict) else None
             if isinstance(row_id, str) and _anchorable(row_id) and row_id not in index:
                 index[row_id] = f"id-xv-{row_id}"

package/runtime/python/okstra_ctl/report_projections.py

@@ -261,8 +261,14 @@ def _source_items(finding: Mapping[str, Any]) -> list[str]:
     return [f"{_text(worker, 'worker').removesuffix('-worker')}:{finding_id}" for worker in workers]
 
 
-def project_convergence(state: Mapping[str, Any]) -> dict[str, Any]:
-    """수렴 상태에서 독자용 합의·이견과 공개 근거만 승격한다."""
+def project_convergence(
+    state: Mapping[str, Any], *, first_consensus: int = 1, first_difference: int = 1,
+) -> dict[str, Any]:
+    """수렴 상태에서 독자용 합의·이견과 공개 근거만 승격한다.
+
+    정정 라운드 재수렴은 초기 행 다음 번호부터 매긴다 — 행 id 가 리포트 앵커라 한 리포트
+    안에서 겹치면 안 된다.
+    """
     consensus = []
     differences = []
     promoted = []
@@ -274,7 +280,7 @@ def project_convergence(state: Mapping[str, Any]) -> dict[str, Any]:
         ticket_id = _text(ticket_ids[0] if ticket_ids else "unknown", "unknown")
         if finding.get("classification") in {"full-consensus", "partial-consensus"}:
             row = {
-                "id": f"CV-{len(consensus) + 1:03d}",
+                "id": f"CV-{len(consensus) + first_consensus:03d}",
                 "ticketId": ticket_id,
                 "statement": _text(finding.get("summary"), "Converged finding"),
                 "sourceItems": _source_items(finding),
@@ -298,7 +304,7 @@ def project_convergence(state: Mapping[str, Any]) -> dict[str, Any]:
                         "position": "origin" if worker == finding.get("originWorker") else "dissent",
                     })
             differences.append({
-                "id": f"D-{len(differences) + 1:03d}",
+                "id": f"D-{len(differences) + first_difference:03d}",
                 "ticketId": ticket_id,
                 "disagreement": _text(finding.get("summary"), "Unresolved difference"),
                 "workersPosition": positions or [{"worker": "unknown", "itemId": "", "position": "unresolved"}],
@@ -311,5 +317,40 @@ def project_convergence(state: Mapping[str, Any]) -> dict[str, Any]:
             "differences": differences,
         },
         "promotedEvidence": promoted,
+        "criticUnverified": _critic_unverified(state),
     }
+    critic = (state.get("config") or {}).get("critic")
+    if isinstance(critic, Mapping):
+        result["crossVerification"]["criticGaps"] = {
+            "proposed": critic.get("gapsProposed", 0),
+            "merged": critic.get("gapsMerged", 0),
+            "unverified": critic.get("gapsUnverified", 0),
+        }
     return result
+
+
+def _critic_unverified(state: Mapping[str, Any]) -> list[dict[str, Any]]:
+    """미판정 gap 하나당 Missing Information 행 하나 — id 와 기본 ticket 은 조립이 채운다."""
+    ledger = (state.get("criticVerification") or {}).get("gaps") or []
+    tickets = {
+        gap.get("gapId"): (gap.get("ticketIds") or [None])[0]
+        for gap in ledger
+        if isinstance(gap, Mapping)
+    }
+    rows = []
+    for gap in state.get("unverifiedGaps") or []:
+        if not isinstance(gap, Mapping):
+            continue
+        gap_id = _text(gap.get("gapId"), "unknown")
+        rows.append({
+            "ticketId": tickets.get(gap_id),
+            "item": f"Coverage critic gap `{gap_id}` was never verified: "
+                    f"{_text(gap.get('summary'), 'no summary')}",
+            "risk": (
+                f"Verification did not complete ({_text(gap.get('reason'), 'unknown reason')}), "
+                "so no analyser has judged this gap; it is neither a finding nor a rejection."
+            ),
+            "owner": "Okstra lead",
+            "source": "critic-unverified",
+        })
+    return rows

package/runtime/python/okstra_ctl/report_synthesis_packet.py

@@ -14,6 +14,7 @@ from typing import Any, Mapping
 from okstra_token_usage.blocks import accounting_workers
 
 from .analysis_packet import reference_source_extracts
+from .correction_round import correction_convergence_states
 from .json_boundary import JsonBoundaryError, load_owned_object, write_owned_object_atomic
 from .phases.implementation_option_selection.authoring import (
     requirement_instructions as selection_requirement_instructions,
@@ -251,6 +252,17 @@ class ReportSynthesisPacket:
             ]
         if self.task_type == "implementation-planning":
             return self._planning_requirement_instructions()
+        if self.task_type == "implementation" and any(
+            source.label.startswith(f"{CONVERGENCE_STATE_LABEL} (correction-r")
+            for source in self.sources
+        ):
+            return [
+                "Each `Convergence state (correction-r<N>)` source is correction round N's "
+                "re-convergence of the verifiers' re-verification; the plain `Convergence "
+                "state` is the initial round's. Describe the stage's open findings from the "
+                "last round's re-convergence, not the initial one; report what each round "
+                "fixed through `implementation.correctionRounds`.",
+            ]
         if self.task_type != "implementation-option-selection":
             return []
         return selection_requirement_instructions(
@@ -371,6 +383,7 @@ _SOURCE_FIELDS = (
     ("Final report schema", "orchestrator", "instructionSet", "finalReportSchemaPath", True),
     ("Convergence state", "convergence", "run", "convergenceStatePath", True),
 )
+CONVERGENCE_STATE_LABEL = "Convergence state"
 
 
 _READ_CHUNK_BYTES = 16_000
@@ -514,7 +527,7 @@ def _source_markdown(
         brief = next((item.content.strip() for item in sources if item.label == "Task brief"), "")
         if len(brief.encode("utf-8")) >= _SHARED_TEXT_MIN_BYTES:
             content = content.replace(brief, 'Read the complete "Source: Task brief" above.')
-    if source.label == "Convergence state":
+    if source.label.startswith(CONVERGENCE_STATE_LABEL):
         content = _convergence_view(content)
         if content != source.content.rstrip("\n"):
             view = [
@@ -815,6 +828,14 @@ def _source_specs(
                 path = str(Path(instruction_set) / "final-report-schema.json")
         if path or required:
             specs.append((label, owner, path, required))
+        if label == CONVERGENCE_STATE_LABEL and path:
+            specs.extend(
+                (f"{CONVERGENCE_STATE_LABEL} ({scope})", owner,
+                 _relative(project_root, round_final), True)
+                for scope, round_final in correction_convergence_states(
+                    _resolve(project_root, path)
+                )
+            )
     if carried_source:
         specs.append((CARRIED_STAGES_LABEL, "orchestrator", carried_source, True))
     specs.extend(_user_response_specs(project_root, narrative_path))

package/runtime/python/okstra_ctl/run.py

@@ -3370,10 +3370,11 @@ def _maybe_open_fix_cycle(inp: PrepareInputs, task_root: Path, existing: dict,
             f"{', '.join(fix_cycles.FIX_CYCLE_ENTRY_PHASES)})에서만 허용됩니다: "
             f"{inp.task_type}")
     workflow = existing.get("workflow") or {}
-    if workflow.get("lastCompletedPhase") != "release-handoff":
+    if not fix_cycles.delivery_completed(workflow):
         raise PrepareError(
-            "--fix-cycle yes 는 release-handoff 까지 완료된 task 에만 허용됩니다 "
-            "(workflow.lastCompletedPhase 확인)")
+            "--fix-cycle yes 는 release-handoff 로 전달까지 끝난 task 에만 허용됩니다 "
+            "(workflow.lastCompletedPhase 가 release-handoff 이고, skip·미전달 stage 로 "
+            "다음 phase 가 release-handoff 로 남아 있지 않아야 함)")
     brief_text = Path(inp.brief_path).read_text(encoding="utf-8")
     fix_cycles.append_opened(
         task_root, target_report=str(existing.get("latestReportRecordPath", "")),
@@ -3385,7 +3386,8 @@ def _record_fix_cycle_events(inp: PrepareInputs, ctx: dict) -> str:
     """fix-cycles.jsonl 의 lazy-close → opened → run 기록. cycle id 반환.
 
     - lazy-close: open cycle 에 release-handoff run 이 부착됐고 디스크 manifest 의
-      lastCompletedPhase 가 release-handoff 면 닫는다. manifest 는 prepare 가
+      lastCompletedPhase 가 release-handoff 면 닫는다. 다음 phase 포인터가 다시
+      release-handoff 를 가리키면(skip·미전달 stage) 닫지 않는다. manifest 는 prepare 가
       이번 run 으로 재작성하기 *전* 값이어야 하므로 finalize 직전에 호출한다.
     - opened: --fix-cycle yes 일 때만. 완료 task + entry phase 미충족이면
       PrepareError.
@@ -3398,7 +3400,7 @@ def _record_fix_cycle_events(inp: PrepareInputs, ctx: dict) -> str:
 
     open_c = fix_cycles.open_cycle(fix_cycles.read_rows(task_root))
 
-    if open_c and workflow.get("lastCompletedPhase") == "release-handoff":
+    if open_c and fix_cycles.delivery_completed(workflow):
         rows = fix_cycles.read_rows(task_root)
         handoff_attached = any(
             r.get("event") == "run" and r.get("cycle") == open_c["cycle"]

package/runtime/python/okstra_ctl/stage_reconcile.py

@@ -1,4 +1,4 @@
-"""Best-effort git reconciliation shared by stage prepare flows."""
+"""Git reconciliation shared by stage prepare flows."""
 from __future__ import annotations
 
 import sys
@@ -31,3 +31,51 @@ def auto_reconcile_best_effort(inp: Any, plan_run_root: Path) -> None:
             )
     except Exception as exc:
         print(f"git-reconcile skipped: {exc}", file=sys.stderr)
+
+
+class StaleStageRecordsError(RuntimeError):
+    """A recorded stage SHA no longer matches git and only the user can say which commit counts."""
+
+
+def require_reconciled_stages(
+    inp: Any, plan_run_root: Path, *, stage: int | None = None,
+) -> None:
+    """Apply auto items, then refuse while a confirm item remains.
+
+    A prepare that restores, rebases or merges stage branches calls this first:
+    building on a recorded commit the branch no longer carries integrates work
+    nobody verified. ``stage`` narrows the check to that stage's done row.
+    """
+    from .git_reconcile import _git, classify_task, guidance
+
+    auto_reconcile_best_effort(inp, plan_run_root)
+    # A project prepared without git (worktree status skipped-not-git) has no
+    # history the recorded SHAs could disagree with.
+    if _git(Path(inp.project_root), "rev-parse", "--git-dir").returncode != 0:
+        return
+    coordinates = dict(
+        project_id=inp.project_id,
+        task_group=inp.task_group,
+        task_id=inp.task_id,
+        work_category=inp.work_category,
+    )
+    pending = [
+        item
+        for item in classify_task(
+            project_root=Path(inp.project_root),
+            plan_run_root=plan_run_root,
+            **coordinates,
+        )
+        if item.classification == "confirm"
+        and (stage is None or item.stage == stage)
+    ]
+    if not pending:
+        return
+    lines = "\n".join(
+        f"  {f'stage {item.stage}' if item.kind == 'done' else 'anchor'}: "
+        f"{item.reason} (recorded {item.recorded})"
+        for item in pending
+    )
+    raise StaleStageRecordsError(
+        f"{lines}\n{guidance(plan_run_root=plan_run_root, **coordinates)}"
+    )

package/runtime/python/okstra_ctl/wizard/steps_plan.py

@@ -215,14 +215,14 @@ def _stage_plan_for_confirmation(
 
 
 def _fix_cycle_confirm_required(state: WizardState) -> bool:
-    """완료(release-handoff) task 에 entry phase 로 재진입하고, 아직 열린 fix
-    cycle 이 없을 때만 묻는다."""
+    """전달까지 끝난(release-handoff) task 에 entry phase 로 재진입하고, 아직
+    열린 fix cycle 이 없을 때만 묻는다."""
     if state.task_type not in fix_cycles.FIX_CYCLE_ENTRY_PHASES:
         return False
     task_root = task_dir(Path(state.project_root),
                          state.task_group, state.task_id)
     workflow = (read_task_manifest(task_root) or {}).get("workflow") or {}
-    if workflow.get("lastCompletedPhase") != "release-handoff":
+    if not fix_cycles.delivery_completed(workflow):
         return False
     return fix_cycles.open_cycle(fix_cycles.read_rows(task_root)) is None
 

package/runtime/schemas/final-report-v3.0.schema.json

@@ -480,6 +480,42 @@
             }
           ]
         },
+        "correctionRounds": {
+          "type": "array",
+          "maxItems": 2,
+          "description": "Each implementation correction round's re-convergence of the verifiers' re-verification, projected from `convergence-correction-r<N>-<task-type>-<seq>.json`. Row ids continue the initial round's numbering so every row keeps its own anchor.",
+          "items": {
+            "type": "object",
+            "required": [
+              "round",
+              "consensus",
+              "differences"
+            ],
+            "additionalProperties": false,
+            "properties": {
+              "round": {
+                "type": "integer",
+                "minimum": 1,
+                "maximum": 2
+              },
+              "roundHistory": {
+                "$ref": "#/properties/crossVerification/properties/roundHistory"
+              },
+              "consensus": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/$defs/ConsensusRow"
+                }
+              },
+              "differences": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/$defs/DifferenceRow"
+                }
+              }
+            }
+          }
+        },
         "criticGaps": {
           "type": "object",
           "description": "Coverage-critic gap accounting. `proposed - merged - unverified` is the count the voters judged and rejected, so a gap that vanished shows up as a mismatch instead of as nothing. Every `unverified` gap needs a matching `missingInformation` row with source `critic-unverified` (prompts/lead/convergence.md \"Gap verification\").",

package/runtime/skills/okstra-run/SKILL.md

@@ -439,6 +439,7 @@ If `render-bundle` fails with a `PrepareError` containing `Recorded stage SHAs n
    - **Enter a different ref directly** — the user names a commit/branch/tag.
    - **Abort** — stop the run without recovering.
 3. Run `okstra git-reconcile … --apply --stage <N> --use-ref <ref>` with the chosen ref, then retry the failed `render-bundle` with the same arguments.
+   If that output carries a `Warning` naming the implementation anchor, the chosen head no longer contains the anchor: show the warning to the user and run its printed `--reset-anchor` command only after they confirm the new base, before the retry.
 
 If the anchor (`implementation_base_commit`) is reported unresolvable, run the same command's `--reset-anchor <ref>` after user confirmation. Correcting a confirm item without the picker is forbidden — the runtime also rejects a confirm correction without `--use-ref`.
 

package/runtime/templates/reports/html/base.template.html

@@ -70,7 +70,7 @@
     </section>
     {% endif %}
     {% set no_cross_model_check = taskType != "release-handoff" and (crossVerification.get("roundHistory") or {}).get("round2SkippedReason") == "single-analyser-only" %}
-    {% if crossVerification.get("consensus") or crossVerification.get("differences") or no_cross_model_check %}
+    {% if crossVerification.get("consensus") or crossVerification.get("differences") or crossVerification.get("correctionRounds") or no_cross_model_check %}
     <section data-report-section="cross-check">
       <h2>{{ t('base.cross-check') }}</h2>
       {% if no_cross_model_check %}<p class="section-lede">{{ t('base.no-cross-model-check') }}</p>{% endif %}
@@ -82,6 +82,11 @@
       <h3>{{ t('base.workers-disagreed') }}</h3>
       <div class="summary-grid">{% for row in crossVerification.differences %}<article class="summary-card tone-important" id="id-xv-{{ row.id }}"><p class="eyebrow">{{ row.id | inline_code }}</p><h3>{{ row.disagreement | inline_code }}</h3><p>{% for pos in row.get("workersPosition", []) %}{{ pos.worker | inline_code }} · {{ pos.position | inline_code }}{% if not loop.last %} · {% endif %}{% endfor %}</p><p class="evidence-refs">{{ t('macros.layout.evidence') }} {{ row.evidence | inline_code }}</p></article>{% endfor %}</div>
       {% endif %}
+      {% for correction in crossVerification.get("correctionRounds", []) %}
+      <h3>{{ t('base.cross-check-correction-round') | replace('{round}', correction.round | string) }}</h3>
+      {% if correction.consensus %}<div class="summary-grid">{% for row in correction.consensus %}<article class="summary-card" id="id-xv-{{ row.id }}"><p class="eyebrow">{{ row.id | inline_code }} · {{ t('base.agreed-across-workers') }}</p><h3>{{ row.statement | inline_code }}</h3><p class="evidence-refs">{{ t('macros.layout.evidence') }} {{ row.evidence | inline_code }}</p></article>{% endfor %}</div>{% endif %}
+      {% if correction.differences %}<div class="summary-grid">{% for row in correction.differences %}<article class="summary-card tone-important" id="id-xv-{{ row.id }}"><p class="eyebrow">{{ row.id | inline_code }} · {{ t('base.workers-disagreed') }}</p><h3>{{ row.disagreement | inline_code }}</h3><p>{% for pos in row.get("workersPosition", []) %}{{ pos.worker | inline_code }} · {{ pos.position | inline_code }}{% if not loop.last %} · {% endif %}{% endfor %}</p><p class="evidence-refs">{{ t('macros.layout.evidence') }} {{ row.evidence | inline_code }}</p></article>{% endfor %}</div>{% endif %}
+      {% endfor %}
     </section>
     {% endif %}
     {% if agentActivity %}

package/runtime/templates/reports/html/i18n/en.json

@@ -242,6 +242,7 @@
     "no-cross-model-check": "No cross-model check ran: fewer than two analysis workers were selected, so no other model verified these findings.",
     "agreed-across-workers": "Agreed across workers",
     "workers-disagreed": "Workers disagreed",
+    "cross-check-correction-round": "Re-converged after correction round {round}",
     "source": "Source",
     "confidence": "Confidence",
     "export-my-answers": "Export my answers",

package/runtime/templates/reports/html/i18n/ko.json

@@ -242,6 +242,7 @@
     "no-cross-model-check": "교차 모델 검증을 하지 않았습니다. 분석 작업자를 두 명 미만으로 골라 다른 모델이 이 결과를 검증하지 않았습니다.",
     "agreed-across-workers": "작업자 간 합의",
     "workers-disagreed": "작업자 간 이견",
+    "cross-check-correction-round": "수정 라운드 {round} 뒤 재수렴",
     "source": "출처",
     "confidence": "확신도",
     "export-my-answers": "내 답변 내보내기",

package/runtime/validators/validate-run.py

@@ -4854,8 +4854,10 @@ def _validate_convergence_group_provenance(run_dir, failures, suffix=None) -> No
 # provider token (`claude` vs `claude-worker`), depending on how the roster was
 # seeded — worker resolution below accepts both. `-reverify-r` never occurs
 # inside a slug, so the non-greedy slug capture stops at that literal anchor.
+# A correction round's re-convergence puts `correction-r<N>-` before
+# `reverify-r`, and its plans carry the same token before `<task-type>`.
 _REVERIFY_PROMPT_BASENAME_RE = re.compile(
-    r"^(?P<slug>[a-z][a-z0-9-]*?)-reverify-r(?P<round>\d+)"
+    r"^(?P<slug>[a-z][a-z0-9-]*?)(?:-(?P<scope>correction-r\d+))?-reverify-r(?P<round>\d+)"
     r"-(?P<task_type>[a-z][a-z-]*?)-(?P<seq>\d{3})\.md$"
 )
 
@@ -5318,8 +5320,9 @@ def _validate_reverify_prompt_matches_plan(run_dir, failures, suffix=None) -> No
         if match is None:
             continue
         round_n = match.group("round")
+        scope = f"{match.group('scope')}-" if match.group("scope") else ""
         plan_path = state_dir / (
-            f"convergence-round-{round_n}-plan-"
+            f"convergence-round-{round_n}-plan-{scope}"
             f"{match.group('task_type')}-{match.group('seq')}.json"
         )
         if not plan_path.is_file():

package/runtime/validators/validate_session_conformance.py

@@ -298,6 +298,18 @@ def _analysis_workers(team_state: Mapping[str, Any]) -> list[dict]:
     return [worker for worker in workers if not _is_report_writer(worker)]
 
 
+def _critic_worker_ids(team_state: Mapping[str, Any]) -> set[str]:
+    """`critic/*` 배정이 로스터에 남기는 행의 workerId (`render._critic_role_rows`)."""
+    assignments = team_state.get("invocationAssignments")
+    if not isinstance(assignments, Mapping):
+        return set()
+    return {
+        str(ref).rsplit("/", 1)[-1]
+        for ref in assignments
+        if str(ref).startswith("critic/")
+    }
+
+
 def _scan_one_jsonl(
     path: Path, since: str | None, until: str | None
 ) -> tuple[list[tuple[str, str, str]], dict[str, list[str]], str | None]:
@@ -1686,7 +1698,13 @@ def _check_progress_checkpoints(
         "`using implicit team` line, or the "
         "`skipped (concurrent-run)` variant in the concurrent-run path",
     )
-    _check_worker_checkpoint_lines(by_phase, analysis_workers, narration)
+    # critic 은 `critic` dispatch 로만 뜨고 `phase-5.6-critic` 으로 알린다.
+    critic_ids = _critic_worker_ids(team_state)
+    _check_worker_checkpoint_lines(
+        by_phase,
+        [w for w in analysis_workers if str(w.get("workerId", "")) not in critic_ids],
+        narration,
+    )
     convergence_ran = _convergence_rounds_ran(run_dir, suffix)
     require(
         "phase-5.5-convergence",