okstra 0.209.6 → 0.211.0

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

@@ -147,6 +147,74 @@
       "deferred": "Deferred",
       "not-applicable": "Not applicable",
       "blocked": "Blocked"
+    },
+    "clarificationKind": {
+      "material": "Missing information",
+      "decision": "Your decision",
+      "data-point": "A fact to confirm"
+    },
+    "clarificationStatus": {
+      "open": "Open",
+      "answered": "Answered",
+      "resolved": "Resolved",
+      "obsolete": "No longer relevant"
+    },
+    "approvalDisposition": {
+      "select": "Choose this option",
+      "accept-risk": "Accept the risk",
+      "request-revision": "Request a revision",
+      "reject": "Reject"
+    },
+    "approvalClassification": {
+      "user-decision": "Needs your decision",
+      "noncritical-dissent": "Non-critical disagreement",
+      "correctness-critical": "Affects correctness"
+    },
+    "clarificationScope": {
+      "in-repo": "This repository only",
+      "cross-repo": "Other repositories too",
+      "new-schema": "New schema",
+      "deferrable": "Can be deferred"
+    },
+    "executionRole": {
+      "leader": "Lead",
+      "analyser": "Analyser",
+      "critic": "Critic",
+      "designer": "Designer",
+      "implementer": "Implementer",
+      "planner": "Planner",
+      "report-writer": "Report writer",
+      "translator": "Translator",
+      "verifier": "Verifier"
+    },
+    "requirementStatus": {
+      "covered": "Covered",
+      "gap": "Not covered",
+      "documented-deviation": "Approved deviation",
+      "blocked": "Blocked"
+    },
+    "rollbackCategory": {
+      "Pure code": "Code only",
+      "Feature-flag-gated": "Behind a feature flag",
+      "Schema/config/stateful": "Schema, config or stored state"
+    },
+    "rollbackResult": {
+      "ok": "Passed",
+      "not-applicable": "Not applicable",
+      "advisory — human-run": "Advisory: a person runs it"
+    },
+    "businessFlowMode": {
+      "pre": "Before the change",
+      "contribute": "This phase's contribution",
+      "post": "After the change",
+      "unknown": "Unknown phase"
+    },
+    "businessFlowStatus": {
+      "prepared": "Prepared",
+      "running": "Running",
+      "failed": "Failed",
+      "partial": "Partly explained",
+      "complete": "Explained"
     }
   },
   "enumHint": {
@@ -194,7 +262,12 @@
     "agent-activity": "Agent activity",
     "agent-activity-intro": "What each agent was asked to do in this run and how it ended. Decision cards and prose cite these rows by id.",
     "agent": "Agent",
-    "activity": "Activity"
+    "activity": "Activity",
+    "business-flow": "Business flow explanations",
+    "business-flow-failed-count": "{count} business flow explanations failed",
+    "business-flow-failure-details": "Failure details and rerun commands",
+    "business-flow-error": "Error:",
+    "business-flow-rerun": "Rerun:"
   },
   "runUsage": {
     "heading": "What this run cost",
@@ -214,7 +287,8 @@
     "row-total": "Total",
     "row-cli": "CLI calls (billed separately)",
     "cache-read-tokens": "Cache re-reads",
-    "row-task-cumulative": "This task so far ({runs} runs)"
+    "row-task-cumulative": "This task so far ({runs} runs)",
+    "row-total-with-cli": "Total including CLI calls"
   },
   "macros": {
     "forms": {
@@ -585,6 +659,21 @@
       "result": "Result",
       "no-rollback-check-was-recorded": "No rollback check was recorded.",
       "stage-carry-over": "Stage carry-over",
+      "carry-sidecar": "Sidecar",
+      "carry-commit-range": "Commit range",
+      "carry-steps": "Steps",
+      "carry-files-changed": "Files changed",
+      "carry-raw": "Sidecar JSON as written",
+      "file": "File",
+      "change": "Change",
+      "lines": "Lines",
+      "plan-step": "Plan step",
+      "action-created": "Created",
+      "action-modified": "Modified",
+      "action-deleted": "Deleted",
+      "what-it-does": "What it does",
+      "advisory": "advisory",
+      "entry-count": "{count} entries",
       "manual-user-test": "Manual user test",
       "environment": "Environment:",
       "expected": "Expected:",

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

@@ -147,6 +147,74 @@
       "deferred": "보류",
       "not-applicable": "해당 없음",
       "blocked": "차단"
+    },
+    "clarificationKind": {
+      "material": "빠진 정보",
+      "decision": "결정 필요",
+      "data-point": "확인할 사실"
+    },
+    "clarificationStatus": {
+      "open": "답변 대기",
+      "answered": "답변함",
+      "resolved": "해결됨",
+      "obsolete": "더 이상 해당 없음"
+    },
+    "approvalDisposition": {
+      "select": "이 선택지 채택",
+      "accept-risk": "위험 감수",
+      "request-revision": "수정 요청",
+      "reject": "반려"
+    },
+    "approvalClassification": {
+      "user-decision": "사용자 결정 필요",
+      "noncritical-dissent": "치명적이지 않은 이견",
+      "correctness-critical": "정확성에 영향"
+    },
+    "clarificationScope": {
+      "in-repo": "이 저장소 안",
+      "cross-repo": "다른 저장소까지",
+      "new-schema": "새 스키마",
+      "deferrable": "미룰 수 있음"
+    },
+    "executionRole": {
+      "leader": "리드",
+      "analyser": "분석",
+      "critic": "비평",
+      "designer": "설계",
+      "implementer": "구현",
+      "planner": "계획",
+      "report-writer": "리포트 작성",
+      "translator": "번역",
+      "verifier": "검증"
+    },
+    "requirementStatus": {
+      "covered": "충족",
+      "gap": "미충족",
+      "documented-deviation": "승인된 이탈",
+      "blocked": "차단"
+    },
+    "rollbackCategory": {
+      "Pure code": "코드만",
+      "Feature-flag-gated": "기능 플래그로 제어",
+      "Schema/config/stateful": "스키마·설정·저장 상태"
+    },
+    "rollbackResult": {
+      "ok": "통과",
+      "not-applicable": "해당 없음",
+      "advisory — human-run": "권고: 사람이 직접 실행"
+    },
+    "businessFlowMode": {
+      "pre": "변경 전",
+      "contribute": "이번 단계 기여",
+      "post": "변경 후",
+      "unknown": "알 수 없는 단계"
+    },
+    "businessFlowStatus": {
+      "prepared": "준비됨",
+      "running": "실행 중",
+      "failed": "실패",
+      "partial": "일부 설명",
+      "complete": "설명 완료"
     }
   },
   "enumHint": {
@@ -194,7 +262,12 @@
     "agent-activity": "에이전트 활동",
     "agent-activity-intro": "이번 run 에서 각 에이전트가 맡은 일과 그 결과입니다. 결정 카드와 본문이 이 행을 아이디로 인용합니다.",
     "agent": "에이전트",
-    "activity": "활동"
+    "activity": "활동",
+    "business-flow": "업무 흐름 설명",
+    "business-flow-failed-count": "업무 흐름 설명 생성 실패 {count}건",
+    "business-flow-failure-details": "실패 내역과 재실행 명령",
+    "business-flow-error": "오류:",
+    "business-flow-rerun": "재실행:"
   },
   "runUsage": {
     "heading": "이번 실행에 든 비용",
@@ -214,7 +287,8 @@
     "row-total": "합계",
     "row-cli": "CLI 호출 (별도 청구)",
     "cache-read-tokens": "캐시 재읽기",
-    "row-task-cumulative": "이 태스크 누적 (run {runs}회)"
+    "row-task-cumulative": "이 태스크 누적 (run {runs}회)",
+    "row-total-with-cli": "CLI 호출 포함 합계"
   },
   "macros": {
     "forms": {
@@ -585,6 +659,21 @@
       "result": "결과",
       "no-rollback-check-was-recorded": "롤백 확인 기록이 없습니다.",
       "stage-carry-over": "stage 인계",
+      "carry-sidecar": "인계 파일",
+      "carry-commit-range": "commit 범위",
+      "carry-steps": "단계",
+      "carry-files-changed": "바뀐 파일 수",
+      "carry-raw": "인계 JSON 원문",
+      "file": "파일",
+      "change": "변경",
+      "lines": "줄 수",
+      "plan-step": "계획 단계",
+      "action-created": "추가",
+      "action-modified": "수정",
+      "action-deleted": "삭제",
+      "what-it-does": "하는 일",
+      "advisory": "권고",
+      "entry-count": "{count}개 항목",
       "manual-user-test": "수동 사용자 테스트",
       "environment": "환경:",
       "expected": "기대 결과:",

package/runtime/templates/reports/html/macros/forms.html

@@ -57,18 +57,18 @@
 {%- endmacro %}
 
 {% macro clarification_article(row, compact=false) -%}
-{% set is_closed = row.status in ['resolved', 'obsolete'] %}
+{% set is_closed = compact or row.status in ['resolved', 'obsolete'] %}
 {% set approval_context = row.approvalContext | default(None) %}
 {% set resolution = row.resolution | default(None) %}
 {% set options = row.options | default([]) %}
 <article class="clarification-item{% if compact %} is-closed{% endif %}" id="id-{{ row.id }}" data-response-id="{{ row.id }}" data-kind="{{ row.kind }}" data-status="{{ row.status }}">
-  {% if compact %}<details><summary>{{ row.id | inline_code }} · {{ row.status }}</summary>{% endif %}
-  <p class="eyebrow">{{ row.id | inline_code }} · {{ row.kind }}</p>
+  {% if compact %}<details><summary>{{ row.id | inline_code }} · {{ row.status | enum_label('clarificationStatus') }}</summary>{% endif %}
+  <p class="eyebrow">{{ row.id | inline_code }} · {{ row.kind | enum_label('clarificationKind') }}</p>
   {{ row.statement | paragraphs }}
   <dl class="clarification-expected"><dt>{{ t('macros.forms.answer-as') }}</dt><dd>{{ row.expectedForm | inline_code }}</dd></dl>
   {% if approval_context %}
   <div class="approval-context" data-approval-classification="{{ approval_context.classification }}">
-    <p class="eyebrow">{{ approval_context.classification }}</p>
+    <p class="eyebrow">{{ approval_context.classification | enum_label('approvalClassification') }}</p>
     <p><strong>{{ t('tasks.implementation-planning.unblock-condition') }}</strong> {{ approval_context.unblockCondition | inline_code }}</p>
     {% set check_refs = resolution.checkRefs if resolution else approval_context.activityIds | default([]) %}
     {% if check_refs %}<p><strong>{{ t('tasks.implementation-planning.agent-evidence') }}</strong>
@@ -81,10 +81,10 @@
     {% for option in options %}
     <li class="clarification-option{% if option.role == 'recommended' %} is-recommended{% endif %}" data-option-value="{{ option.answer }}">
       <p class="clarification-option-answer">{{ option.answer | inline_code }}{% if option.role == 'recommended' %} <span class="badge">{{ t('macros.forms.recommended') }}</span>{% endif %}</p>
-      {% if option.disposition | default(None) %}<p class="clarification-option-disposition"><code>{{ option.disposition }}</code></p>{% endif %}
+      {% if option.disposition | default(None) %}<p class="clarification-option-disposition">{{ option.disposition | enum_label('approvalDisposition') }}</p>{% endif %}
       <p class="clarification-option-rationale">{{ option.rationale | inline_code }}</p>
       <dl class="clarification-option-impact">
-        <dt>{{ t('macros.forms.scope-impact') }}</dt><dd>{% if option.reach | default(None) %}{{ option.reach }}{% if option.scopeEffects | default([]) %}, {{ option.scopeEffects | join(', ') }}{% endif %}{% else %}{{ option.scopeImpact | join(', ') }}{% endif %}</dd>
+        <dt>{{ t('macros.forms.scope-impact') }}</dt><dd>{% if option.reach | default(None) %}{{ option.reach | enum_label('clarificationScope') }}{% if option.scopeEffects | default([]) %}, {{ option.scopeEffects | map('enum_label', 'clarificationScope') | join(', ') }}{% endif %}{% else %}{{ option.scopeImpact | map('enum_label', 'clarificationScope') | join(', ') }}{% endif %}</dd>
         <dt>{{ t('macros.forms.added-work') }}</dt><dd>{{ option.addedWork | inline_code }}</dd>
         <dt>{{ t('macros.forms.direction-change') }}</dt><dd>{{ option.directionChange | inline_code }}</dd>
       </dl>
@@ -114,7 +114,8 @@
 {% if items %}
 {% set ns = namespace(open=[], closed=[]) %}
 {% for row in items %}
-  {% if row.status in ['open', 'answered'] %}
+  {# 답이 실린 answered 행은 기다리는 질문이 아니다 — 닫힌 목록으로 간다. #}
+  {% if row.status == 'open' or (row.status == 'answered' and not row.userInput | default('')) %}
     {% set ns.open = ns.open + [row] %}
   {% else %}
     {% set ns.closed = ns.closed + [row] %}

package/runtime/validators/validate-implementation-plan-stages.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-"""S1–S13 checks for the Stage Map structure of an approved
+"""S1–S14 checks for the Stage Map structure of an approved
 implementation-planning final-report.md. Run from prepare_task_bundle
 of `implementation` task or standalone."""
 
@@ -35,6 +35,7 @@ from okstra_ctl.stage_map import (  # noqa: E402
     parse_stage_map_text,
     schema_v2_report,
     stage_number_gap_message,
+    stage_row_is_cancelled,
 )
 
 HARD_STEP_CAP = 8
@@ -68,9 +69,14 @@ BARE_GIT_STATUS = re.compile(r"\bgit\b[^&|;]*?\bstatus\b[^&|;]*?--(?:porcelain|s
 CLEAN_GATE_COMMAND = "okstra worktree-status --check-clean"
 
 
+# S14 — 취소 stage 가 될 수 없는 상태. 이미 착수했거나 끝난 stage 는 통합 기준선의
+# 일부라 취소하면 그 위에 쌓인 브랜치와 갈라진다(ADR-0015); 고치려면 max+1 보정 stage.
+_UNCANCELLABLE_STATUSES = ("done", "active")
+
+
 @dataclass
 class ValidationError:
-    code: str   # S1..S13
+    code: str   # S1..S14
     stage: int  # 0 = global
     message: str
 
@@ -380,13 +386,19 @@ def _check_conformance_declaration(
     return errs
 
 
-def _check_depends_on(stages: List[StageMapStage]) -> List[ValidationError]:
+def _check_depends_on(
+    stages: List[StageMapStage], cancelled: frozenset[int] = frozenset(),
+) -> List[ValidationError]:
     errs: List[ValidationError] = []
     valid = {s.stage_number for s in stages}
     for s in stages:
         for d in s.depends_on:
             if d == s.stage_number:
                 errs.append(ValidationError("S8", s.stage_number, "self depends-on"))
+            elif d in cancelled:
+                errs.append(ValidationError("S14", s.stage_number,
+                    f"depends-on {d}, which this plan cancels — a cancelled stage "
+                    "is never executed; depend on the stage that replaces it"))
             elif d not in valid:
                 errs.append(ValidationError("S6", s.stage_number,
                     f"depends-on {d} does not exist"))
@@ -495,6 +507,7 @@ def _data_stage_metas(
             depends = parse_stage_dependencies(
                 str(row.get("dependsOn") or ""), row_number, ""
             )
+            cancelled = stage_row_is_cancelled(row, row_number)
         except StageMapError as exc:
             errors.append(ValidationError("S2", row["stage"], exc.reason))
             continue
@@ -504,6 +517,7 @@ def _data_stage_metas(
             depends,
             row.get("stepCount") if isinstance(row.get("stepCount"), int) else -1,
             str(row.get("exitContractSummary") or ""),
+            cancelled,
         ))
     return rows, errors or _stage_numbers_monotonic(rows)
 
@@ -670,6 +684,28 @@ def _check_data_stage_identities(
     return errs
 
 
+def _check_cancelled_stage_ledger(
+    stage_map: List[StageMapStage], planning: dict,
+) -> List[ValidationError]:
+    """S14: 원장이 이미 착수했거나 끝났다고 기록한 stage 는 취소할 수 없다."""
+    verification = planning.get("planBodyVerification")
+    ledger = (
+        verification.get("stageLedger") if isinstance(verification, dict) else None
+    )
+    if not isinstance(ledger, dict):
+        return []
+    return [
+        ValidationError("S14", meta.stage_number,
+            f"stage {meta.stage_number} is cancelled but the Stage Ledger records "
+            f"it {ledger[str(meta.stage_number)]!r}; only a ready or blocked stage "
+            "may be cancelled — keep it and add a correction stage numbered after "
+            "the highest stage instead")
+        for meta in stage_map
+        if meta.cancelled
+        and ledger.get(str(meta.stage_number)) in _UNCANCELLABLE_STATUSES
+    ]
+
+
 def collect_data_validation_errors(
     planning: dict, user_bypassed: frozenset[int] = frozenset(),
 ) -> List[ValidationError]:
@@ -703,14 +739,19 @@ def collect_data_validation_errors(
     if identity_errors:
         return errors
     errors.extend(_check_data_step_counts(stage_map, stages))
-    errors.extend(_check_depends_on(stage_map))
+    # 번호(S2)·대응(S3)·스텝 수는 모든 행에, 의존(S6/S8)·병렬 안전(S9)은 실행될
+    # 행에만 건다 — 취소 stage 와 그 대체 stage 는 같은 파일을 예측하기 마련이다.
+    active = [meta for meta in stage_map if not meta.cancelled]
+    cancelled = frozenset(meta.stage_number for meta in stage_map if meta.cancelled)
+    errors.extend(_check_depends_on(active, cancelled))
+    errors.extend(_check_cancelled_stage_ledger(stage_map, planning))
     errors.extend(_report_shared_parallel_files({
         meta.stage_number: set(PATH_TOKEN.findall(
             str((next(
                 (s for s in stages if s.get("stage") == meta.stage_number), {}
             )).get("exitContract") or "")
         ))
-        for meta in stage_map
+        for meta in active
         if not meta.depends_on
     }))
     for stage in stages: