okstra 0.148.0 → 0.149.0

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

@@ -1,7 +1,7 @@
-{% macro narrative(value, field_name, evidence_index={}) -%}
+{% macro narrative(value, field_name) -%}
 <div class="narrative" data-report-field="{{ field_name }}">
   {{ value.text | paragraphs }}
-  <p class="evidence-refs">근거: {{ value.evidenceRefs | evidence_refs(evidence_index) }}</p>
+  <p class="evidence-refs">Evidence: {{ value.evidenceRefs | evidence_refs }}</p>
 </div>
 {%- endmacro %}
 
@@ -11,9 +11,22 @@
 </ol>
 {%- endmacro %}
 
-{% macro summary_card(title, body, tone='neutral') -%}
-<article class="summary-card tone-{{ tone }}">
-  <h3>{{ title }}</h3>
+{# The values that identify a row — id, name, kind, owner, status — as one
+   cell, one labelled value per line. Given a column each they took roughly
+   half the table's width to carry a handful of characters, and the prose
+   columns beside them were squeezed to the point of stacking. Merging them
+   costs the column headings, so every value carries its own name here:
+   `pairs` is a list of (name, value), and the status keeps its pill. #}
+{% macro row_key(pairs=[], status_name='', status_raw='', status_text='') -%}
+<td class="row-key"><dl>
+  {%- for name, value in pairs %}{% if value %}<div><dt>{{ name }}</dt><dd>{{ value | inline_code }}</dd></div>{% endif %}{% endfor -%}
+  {%- if status_text %}<div><dt>{{ status_name }}</dt><dd><span class="status status-{{ status_raw }}">{{ status_text }}</span></dd></div>{% endif -%}
+</dl></td>
+{%- endmacro %}
+
+{% macro summary_card(title, body, tone='neutral', anchor='') -%}
+<article class="summary-card tone-{{ tone }}"{% if anchor %} id="id-{{ anchor }}"{% endif %}>
+  {% if title %}<h3>{{ title }}</h3>{% endif %}
   <p>{{ body | inline_code }}</p>
 </article>
 {%- endmacro %}

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

@@ -1,24 +1,26 @@
-{% macro figure(model) -%}
+{% from "html/macros/layout.html" import row_key %}
+{% macro figure(model, anchor_nodes=false) -%}
 <figure data-figure-kind="{{ model.kind }}" aria-labelledby="{{ model.figure_id }}-title" aria-describedby="{{ model.figure_id }}-summary">
   <figcaption>
     <strong id="{{ model.figure_id }}-title">{{ model.title }}</strong>
     <span id="{{ model.figure_id }}-summary">{{ model.summary }}</span>
   </figcaption>
   <div class="visualization" aria-hidden="true">{{ model.svg | safe }}</div>
+  {% set show_paths = model.nodes | selectattr("paths") | first is defined %}
   <table class="visualization-fallback">
-    <thead><tr><th>ID</th><th>이름</th><th>그룹</th><th>상태</th><th>설명</th></tr></thead>
+    <thead><tr><th>Component</th><th>What it does</th>{% if show_paths %}<th>Paths</th>{% endif %}</tr></thead>
     <tbody>
       {% for node in model.nodes %}
-      <tr data-fallback-id="{{ node.id }}"><td>{{ node.id }}</td><td>{{ node.label | inline_code }}</td><td>{{ node.group | inline_code }}</td><td>{{ node.status }}</td><td>{{ node.detail | inline_code }}</td></tr>
+      <tr{% if anchor_nodes %} id="id-{{ node.id }}"{% endif %} data-fallback-id="{{ node.id }}">{{ row_key(pairs=[("ID", node.id), ("Name", node.label), ("Kind", node.note)]) }}<td>{{ node.detail | inline_code }}</td>{% if show_paths %}<td>{% for path in node.paths %}<code>{{ path }}</code>{% if not loop.last %} {% endif %}{% endfor %}</td>{% endif %}</tr>
       {% endfor %}
     </tbody>
   </table>
   {% if model.edges %}
   <table class="visualization-fallback visualization-edges">
-    <thead><tr><th>출발</th><th>도착</th><th>관계</th></tr></thead>
+    <thead><tr><th>From</th><th>To</th><th>Relation</th></tr></thead>
     <tbody>
       {% for edge in model.edges %}
-      <tr data-fallback-edge="{{ edge.source }}-{{ edge.target }}"><td>{{ edge.source }}</td><td>{{ edge.target }}</td><td>{{ edge.label | inline_code }}</td></tr>
+      <tr data-fallback-edge="{{ edge.source }}-{{ edge.target }}"><td>{{ edge.source | inline_code }}</td><td>{{ edge.target | inline_code }}</td><td>{{ edge.label | inline_code }}</td></tr>
       {% endfor %}
     </tbody>
   </table>

package/runtime/templates/reports/html/tasks/change-impact-analysis.template.html

@@ -5,35 +5,50 @@
 
 {% block human_content %}
 <section data-report-section="change-overview">
-  <h2>변경 개요</h2>
-  {{ render_narrative(narrative.changeExplanation, "changeImpactAnalysis.userNarrative.changeExplanation", evidenceIndex) }}
+  <h2>Change overview</h2>
+  {{ render_narrative(narrative.changeExplanation, "changeImpactAnalysis.userNarrative.changeExplanation") }}
   <p>{{ change.changeRequest.summary | inline_code }}</p>
 </section>
 
 <section data-report-section="affected-and-unaffected">
-  <h2>영향받는 영역과 영향 없는 경계</h2>
-  {{ render_narrative(narrative.impactExplanation, "changeImpactAnalysis.userNarrative.impactExplanation", evidenceIndex) }}
-  <div data-report-field="changeImpactAnalysis.impactItems"><h3>영향받는 영역</h3>{% for row in change.impactItems %}{{ summary_card(row.id ~ " · " ~ (row.target | inline_code), row.impactKind ~ " / 영향 " ~ row.level ~ " / 신뢰 " ~ row.confidence) }}{% endfor %}</div>
-  <div data-report-field="changeImpactAnalysis.unaffectedBoundaries"><h3>영향 없는 경계</h3>{{ render_narrative(narrative.unaffectedExplanation, "changeImpactAnalysis.userNarrative.unaffectedExplanation", evidenceIndex) }}<ul>{% for row in change.unaffectedBoundaries %}<li>{{ row.summary | inline_code }}</li>{% endfor %}</ul></div>
+  <h2>What the change touches, and where it stops</h2>
+  {{ render_narrative(narrative.impactExplanation, "changeImpactAnalysis.userNarrative.impactExplanation") }}
+  <div data-report-field="changeImpactAnalysis.impactItems"><h3>What it touches</h3>{% for row in change.impactItems %}{{ summary_card(row.id ~ " · " ~ (row.target | inline_code), row.impactKind ~ " / Impact " ~ row.level ~ " / Confidence " ~ row.confidence, anchor=row.id) }}{% endfor %}</div>
+  <div data-report-field="changeImpactAnalysis.unaffectedBoundaries"><h3>Where the change stops</h3>{{ render_narrative(narrative.unaffectedExplanation, "changeImpactAnalysis.userNarrative.unaffectedExplanation") }}<ul>{% for row in change.unaffectedBoundaries %}<li>{{ row.summary | inline_code }}</li>{% endfor %}</ul></div>
 </section>
 
 <section data-report-section="blast-radius" data-report-field="changeImpactAnalysis.dependencyBlastRadius">
-  <h2>파급 범위</h2>
+  <h2>Blast radius</h2>
   {{ figure(blastRadiusFigure) }}
 </section>
 
 <section data-report-section="test-and-operations">
-  <h2>테스트·운영·호환성</h2>
-  <div data-report-field="changeImpactAnalysis.compatibilityImpact"><h3>호환성</h3><ul>{% for row in change.compatibilityImpact %}<li>{{ row.summary | inline_code }}</li>{% endfor %}</ul></div>
-  <div data-report-field="changeImpactAnalysis.migrationImpact"><h3>마이그레이션</h3><ul>{% for row in change.migrationImpact %}<li>{{ row.summary | inline_code }}</li>{% endfor %}</ul></div>
-  <div data-report-field="changeImpactAnalysis.rollbackImpact"><h3>롤백</h3><ul>{% for row in change.rollbackImpact %}<li>{{ row.summary | inline_code }}</li>{% endfor %}</ul></div>
-  <div data-report-field="changeImpactAnalysis.securityAndPerformanceImpact"><h3>보안과 성능</h3><ul>{% for row in change.securityAndPerformanceImpact %}<li>{{ row.summary | inline_code }}</li>{% endfor %}</ul></div>
+  <h2>Tests, operations, compatibility</h2>
+  <div data-report-field="changeImpactAnalysis.compatibilityImpact"><h3>Compatibility</h3><ul>{% for row in change.compatibilityImpact %}<li>{{ row.summary | inline_code }}</li>{% endfor %}</ul></div>
+  <div data-report-field="changeImpactAnalysis.migrationImpact"><h3>Migration</h3><ul>{% for row in change.migrationImpact %}<li>{{ row.summary | inline_code }}</li>{% endfor %}</ul></div>
+  <div data-report-field="changeImpactAnalysis.rollbackImpact"><h3>Rollback</h3><ul>{% for row in change.rollbackImpact %}<li>{{ row.summary | inline_code }}</li>{% endfor %}</ul></div>
+  <div data-report-field="changeImpactAnalysis.securityAndPerformanceImpact"><h3>Security and performance</h3><ul>{% for row in change.securityAndPerformanceImpact %}<li>{{ row.summary | inline_code }}</li>{% endfor %}</ul></div>
 </section>
 
 <section data-report-section="planning-readiness" data-report-field="changeImpactAnalysis.planningInputs">
-  <h2>계획 준비도</h2>
-  {{ render_narrative(narrative.planningReadiness, "changeImpactAnalysis.userNarrative.planningReadiness", evidenceIndex) }}
-  <ul>{% for row in change.planningInputs %}<li>{{ row.constraint | inline_code }}{% if row.unknown %} — 미확정{% endif %}</li>{% endfor %}</ul>
+  <h2>Plan readiness</h2>
+  {{ render_narrative(narrative.planningReadiness, "changeImpactAnalysis.userNarrative.planningReadiness") }}
+  <ul>{% for row in change.planningInputs %}<li>{{ row.constraint | inline_code }}{% if row.unknown %} — Unsettled{% endif %}</li>{% endfor %}</ul>
+</section>
+
+<section data-report-section="preserved-behaviors" data-report-field="changeImpactAnalysis.preservedBehaviors">
+  <h2>Behaviour that must not change</h2>
+  <table><thead><tr><th>Body</th><th>Evidence</th></tr></thead><tbody>{% for row in change.preservedBehaviors %}<tr><td>{{ row.statement | inline_code }}</td><td>{{ row.currentCodeEvidence | code_evidence }}</td></tr>{% else %}<tr><td colspan="2">No behaviour is pinned.</td></tr>{% endfor %}</tbody></table>
+</section>
+
+<section data-report-section="test-impact" data-report-field="changeImpactAnalysis.testImpact">
+  <h2>What this does to the tests</h2>
+  <table><thead><tr><th>Scope</th><th>Action needed</th><th>Tests targeted</th><th>Evidence</th></tr></thead><tbody>{% for row in change.testImpact %}<tr><td>{{ row.scope | inline_code }}</td><td>{{ row.action | inline_code }}</td><td>{% for path in row.testPaths %}<code>{{ path }}</code>{% if not loop.last %} {% endif %}{% endfor %}</td><td>{{ row.currentCodeEvidence | code_evidence }}</td></tr>{% else %}<tr><td colspan="4">No test is affected.</td></tr>{% endfor %}</tbody></table>
+</section>
+
+<section data-report-section="operational-impact" data-report-field="changeImpactAnalysis.operationalImpact">
+  <h2>What this does to operations</h2>
+  <table><thead><tr><th>Area</th><th>Impact</th><th>Evidence</th></tr></thead><tbody>{% for row in change.operationalImpact %}<tr><td>{{ row.area | inline_code }}</td><td>{{ row.impact | inline_code }}</td><td>{{ row.currentCodeEvidence | code_evidence }}</td></tr>{% else %}<tr><td colspan="3">There is no operational impact.</td></tr>{% endfor %}</tbody></table>
 </section>
 
 {{ analysis_review(analysisReviewIds) }}

package/runtime/templates/reports/html/tasks/error-analysis.template.html

@@ -4,37 +4,44 @@
 
 {% block human_content %}
 <section data-report-section="symptom">
-  <h2>사용자가 겪은 증상</h2>
-  {{ render_narrative(narrative.symptomExplanation, "errorAnalysis.userNarrative.symptomExplanation", evidenceIndex) }}
+  <h2>What you saw</h2>
+  {{ render_narrative(narrative.symptomExplanation, "errorAnalysis.userNarrative.symptomExplanation") }}
   <blockquote data-report-field="errorAnalysis.symptomVerbatim">{{ error.symptomVerbatim | inline_code }}</blockquote>
   <p data-report-field="errorAnalysis.observableFailure">{{ error.observableFailure | inline_code }}</p>
 </section>
 
 <section data-report-section="reproduction">
-  <h2>재현 상태</h2>
+  <h2>Reproduction</h2>
   <p><span class="status status-{{ error.reproduction.status }}">{{ error.reproduction.status }}</span></p>
-  <ul>{% for item in error.reproduction.evidence %}<li>{{ [item] | evidence_refs(evidenceIndex) }}</li>{% endfor %}</ul>
+  <ul>{% for item in error.reproduction.evidence %}<li>{{ [item] | evidence_refs }}</li>{% endfor %}</ul>
   {% if error.reproduction.blockedReason %}<p>{{ error.reproduction.blockedReason | inline_code }}</p>{% endif %}
 </section>
 
 <section data-report-section="causes">
-  <h2>원인 후보</h2>
-  {{ render_narrative(narrative.causeExplanation, "errorAnalysis.userNarrative.causeExplanation", evidenceIndex) }}
+  <h2>Cause candidates</h2>
+  {{ render_narrative(narrative.causeExplanation, "errorAnalysis.userNarrative.causeExplanation") }}
   {{ figure(causeFigure) }}
-  <div class="summary-grid">{% for row in error.causeCandidates %}<article class="summary-card tone-{{ row.confidence }}"><p class="eyebrow">{{ row.id }} · 신뢰도 {{ row.confidence }}</p><h3>{{ row.statement | inline_code }}</h3><p class="evidence-refs">지지 근거: {{ row.supportingEvidence | evidence_refs(evidenceIndex) }}</p></article>{% else %}<p>현재 확인된 원인 후보가 없습니다.</p>{% endfor %}</div>
+  <div class="summary-grid">{% for row in error.causeCandidates %}<article class="summary-card tone-{{ row.confidence }}" id="id-{{ row.id }}"><p class="eyebrow">{{ row.id }} · Confidence {{ row.confidence }}</p><h3>{{ row.statement | inline_code }}</h3><p class="evidence-refs">Supporting evidence: {{ row.supportingEvidence | evidence_refs }}</p></article>{% else %}<p>No cause candidate has been established yet.</p>{% endfor %}</div>
 </section>
 
 <section data-report-section="uncertainty">
-  <h2>아직 확정할 수 없는 부분</h2>
-  {{ render_narrative(narrative.uncertaintyExplanation, "errorAnalysis.userNarrative.uncertaintyExplanation", evidenceIndex) }}
-  {% for row in error.causeCandidates %}<article class="summary-card"><h3>{{ row.id }}</h3><p data-report-field="errorAnalysis.causeCandidates.confidence"><strong>현재 신뢰도:</strong> {{ row.confidence }}</p><p data-report-field="errorAnalysis.causeCandidates.falsifyingEvidenceChecked"><strong>확인한 반증:</strong> {{ row.falsifyingEvidenceChecked | join(', ') | inline_code }}</p><p data-report-field="errorAnalysis.causeCandidates.disproveWith"><strong>이 가설을 기각하는 방법:</strong> {{ row.disproveWith | inline_code }}</p></article>{% endfor %}
+  <h2>What cannot be settled yet</h2>
+  {{ render_narrative(narrative.uncertaintyExplanation, "errorAnalysis.userNarrative.uncertaintyExplanation") }}
+  {% for row in error.causeCandidates %}<article class="summary-card" id="id-{{ row.id }}-detail"><h3>{{ row.id }}</h3><p data-report-field="errorAnalysis.causeCandidates.confidence"><strong>Confidence now:</strong> {{ row.confidence }}</p><p data-report-field="errorAnalysis.causeCandidates.falsifyingEvidenceChecked"><strong>Disproof attempted:</strong> {{ row.falsifyingEvidenceChecked | join(', ') | inline_code }}</p><p data-report-field="errorAnalysis.causeCandidates.disproveWith"><strong>How to disprove this:</strong> {{ row.disproveWith | inline_code }}</p></article>{% endfor %}
 </section>
 
 <section data-report-section="next-diagnostic">
-  <h2>다음 진단 한 가지</h2>
-  {{ render_narrative(narrative.diagnosticGuidance, "errorAnalysis.userNarrative.diagnosticGuidance", evidenceIndex) }}
-  {{ summary_card("실행", error.nextDiagnostic.action, "important") }}
-  <p><strong>확인 신호:</strong> {{ error.nextDiagnostic.confirmingSignal | inline_code }}</p>
-  <p><strong>기각 신호:</strong> {{ error.nextDiagnostic.rejectingSignal | inline_code }}</p>
+  <h2>The one diagnostic to run next</h2>
+  {{ render_narrative(narrative.diagnosticGuidance, "errorAnalysis.userNarrative.diagnosticGuidance") }}
+  {{ summary_card("Run", error.nextDiagnostic.action, "important") }}
+  <p><strong>Signal to check:</strong> {{ error.nextDiagnostic.confirmingSignal | inline_code }}</p>
+  <p><strong>Signal that rejects it:</strong> {{ error.nextDiagnostic.rejectingSignal | inline_code }}</p>
+</section>
+
+<section data-report-section="routing" data-report-field="errorAnalysis.routing">
+  <h2>Next step</h2>
+  <p><strong>Recommended task</strong> — <code>{{ error.routing.nextTaskType }}</code></p>
+  <p><strong>The cause this rests on</strong> — {{ error.routing.leadingCauseId | inline_code }}</p>
+  <p>{{ error.routing.rationale | inline_code }}</p>
 </section>
 {% endblock %}

package/runtime/templates/reports/html/tasks/feature-analysis.template.html

@@ -5,35 +5,55 @@
 
 {% block human_content %}
 <section data-report-section="feature-overview">
-  <h2>기능 개요</h2>
-  {{ render_narrative(narrative.userBehaviorExplanation, "featureAnalysis.userNarrative.userBehaviorExplanation", evidenceIndex) }}
-  <p><strong>대상:</strong> {{ feature.target.requestedValue | inline_code }}</p>
+  <h2>Feature overview</h2>
+  {{ render_narrative(narrative.userBehaviorExplanation, "featureAnalysis.userNarrative.userBehaviorExplanation") }}
+  <p><strong>Subject:</strong> {{ feature.target.requestedValue | inline_code }}</p>
   <ul>{% for row in feature.actors %}<li>{{ row.description | inline_code }}</li>{% endfor %}</ul>
 </section>
 
 <section data-report-section="behavior-flow" data-report-field="featureAnalysis.flows">
-  <h2>사용자 행동 흐름</h2>
-  {{ render_narrative(narrative.flowExplanation, "featureAnalysis.userNarrative.flowExplanation", evidenceIndex) }}
+  <h2>How a user moves through it</h2>
+  {{ render_narrative(narrative.flowExplanation, "featureAnalysis.userNarrative.flowExplanation") }}
   {{ figure(flowFigure) }}
-  <div class="summary-grid">{% for row in feature.flows %}<article class="summary-card" data-flow-kind="{{ 'alternate' if row.kind == 'alternative' else row.kind }}"><p class="eyebrow">{{ row.id }} · {{ row.kind }}</p><ol>{% for step in row.steps %}<li>{{ step.action | inline_code }}</li>{% endfor %}</ol></article>{% endfor %}</div>
+  <div class="summary-grid">{% for row in feature.flows %}<article class="summary-card" id="id-{{ row.id }}" data-flow-kind="{{ 'alternate' if row.kind == 'alternative' else row.kind }}"><p class="eyebrow">{{ row.id }} · {{ row.kind }}</p><ol>{% for step in row.steps %}<li>{{ step.action | inline_code }}</li>{% endfor %}</ol></article>{% endfor %}</div>
 </section>
 
 <section data-report-section="rules-and-state">
-  <h2>규칙과 상태 변경</h2>
-  {{ render_narrative(narrative.rulesAndStateExplanation, "featureAnalysis.userNarrative.rulesAndStateExplanation", evidenceIndex) }}
-  <div data-report-field="featureAnalysis.domainRules"><h3>도메인 규칙</h3>{% for row in feature.domainRules %}{{ summary_card(row.id ~ " · " ~ (row.condition | inline_code), row.outcome) }}{% endfor %}</div>
-  <div data-report-field="featureAnalysis.stateChanges"><h3>상태 변경</h3>{% for row in feature.stateChanges %}{{ summary_card(row.id ~ " · " ~ row.field, row.change) }}{% endfor %}</div>
+  <h2>Rules and state changes</h2>
+  {{ render_narrative(narrative.rulesAndStateExplanation, "featureAnalysis.userNarrative.rulesAndStateExplanation") }}
+  <div data-report-field="featureAnalysis.domainRules"><h3>Domain rules</h3>{% for row in feature.domainRules %}{{ summary_card(row.id ~ " · " ~ (row.condition | inline_code), row.outcome, anchor=row.id) }}{% endfor %}</div>
+  <div data-report-field="featureAnalysis.stateChanges"><h3>State change</h3>{% for row in feature.stateChanges %}{{ summary_card(row.id ~ " · " ~ row.field, row.change, anchor=row.id) }}{% endfor %}</div>
 </section>
 
 <section data-report-section="external-interactions" data-report-field="featureAnalysis.externalInteractions">
-  <h2>외부 상호작용</h2>
-  {% for row in feature.externalInteractions %}{{ summary_card(row.target | inline_code, row.input ~ " → " ~ row.output ~ ". 실패 시: " ~ row.failureHandling) }}{% endfor %}
+  <h2>External interactions</h2>
+  {% for row in feature.externalInteractions %}{{ summary_card(row.target | inline_code, row.input ~ " → " ~ row.output ~ ". On failure: " ~ row.failureHandling) }}{% endfor %}
 </section>
 
 <section data-report-section="test-gaps" data-report-field="featureAnalysis.testCoverage">
-  <h2>테스트와 공백</h2>
-  {{ render_narrative(narrative.testGapExplanation, "featureAnalysis.userNarrative.testGapExplanation", evidenceIndex) }}
-  {% for row in feature.testCoverage %}{{ summary_card(row.id, "테스트: " ~ (row.testPaths | join(', ')) ~ "; 공백: " ~ ((row.gaps | join(', ')) or '없음')) }}{% endfor %}
+  <h2>Tests and gaps</h2>
+  {{ render_narrative(narrative.testGapExplanation, "featureAnalysis.userNarrative.testGapExplanation") }}
+  {% for row in feature.testCoverage %}{{ summary_card(row.id, "Tests: " ~ (row.testPaths | join(', ')) ~ "; Gaps: " ~ ((row.gaps | join(', ')) or 'none'), anchor=row.id) }}{% endfor %}
+</section>
+
+<section data-report-section="preconditions" data-report-field="featureAnalysis.preconditions">
+  <h2>Precondition</h2>
+  <table><thead><tr><th>Body</th><th>Evidence</th></tr></thead><tbody>{% for row in feature.preconditions %}<tr><td>{{ row.description | inline_code }}</td><td>{{ row.currentCodeEvidence | code_evidence }}</td></tr>{% else %}<tr><td colspan="2">Nothing was recorded.</td></tr>{% endfor %}</tbody></table>
+</section>
+
+<section data-report-section="postconditions" data-report-field="featureAnalysis.postconditions">
+  <h2>State once it is done</h2>
+  <table><thead><tr><th>Body</th><th>Evidence</th></tr></thead><tbody>{% for row in feature.postconditions %}<tr><td>{{ row.description | inline_code }}</td><td>{{ row.currentCodeEvidence | code_evidence }}</td></tr>{% else %}<tr><td colspan="2">Nothing was recorded.</td></tr>{% endfor %}</tbody></table>
+</section>
+
+<section data-report-section="permissions-and-flags" data-report-field="featureAnalysis.permissionsAndFlags">
+  <h2>Permissions and flags</h2>
+  <table><thead><tr><th>Body</th><th>Evidence</th></tr></thead><tbody>{% for row in feature.permissionsAndFlags %}<tr><td>{{ row.description | inline_code }}</td><td>{{ row.currentCodeEvidence | code_evidence }}</td></tr>{% else %}<tr><td colspan="2">Nothing was recorded.</td></tr>{% endfor %}</tbody></table>
+</section>
+
+<section data-report-section="non-functional" data-report-field="featureAnalysis.nonFunctionalConcerns">
+  <h2>Non-functional concerns</h2>
+  <table><thead><tr><th>Body</th><th>Evidence</th></tr></thead><tbody>{% for row in feature.nonFunctionalConcerns %}<tr><td>{{ row.description | inline_code }}</td><td>{{ row.currentCodeEvidence | code_evidence }}</td></tr>{% else %}<tr><td colspan="2">Nothing was recorded.</td></tr>{% endfor %}</tbody></table>
 </section>
 
 {{ analysis_review(analysisReviewIds) }}

package/runtime/templates/reports/html/tasks/final-verification.template.html

@@ -4,36 +4,43 @@
 
 {% block human_content %}
 <section data-report-section="verification-verdict">
-  <h2>검증 판정</h2>
+  <h2>Verification verdict</h2>
   <p><span class="status status-{{ verdict.verdictToken }}">{{ verdict.verdictToken }}</span></p>
-  {{ render_narrative(narrative.verdictExplanation, "finalVerification.userNarrative.verdictExplanation", evidenceIndex) }}
+  {{ render_narrative(narrative.verdictExplanation, "finalVerification.userNarrative.verdictExplanation") }}
 </section>
 
 <section data-report-section="requirement-results" data-report-field="finalVerification.validationEvidence">
-  <h2>요구사항별 결과</h2>
-  {{ render_narrative(narrative.coverageExplanation, "finalVerification.userNarrative.coverageExplanation", evidenceIndex) }}
-  {{ figure(coverageFigure) }}
+  <h2>Result per requirement</h2>
+  {{ render_narrative(narrative.coverageExplanation, "finalVerification.userNarrative.coverageExplanation") }}
+  {{ figure(coverageFigure, anchor_nodes=true) }}
 </section>
 
 <section data-report-section="blockers" data-report-field="finalVerification.acceptanceBlockers">
-  <h2>수락 차단 항목</h2>
-  {{ render_narrative(narrative.blockerExplanation, "finalVerification.userNarrative.blockerExplanation", evidenceIndex) }}
-  <div class="summary-grid">{% for row in final.acceptanceBlockers %}{{ summary_card(row.id ~ " · " ~ row.severity, row.statement, "important") }}{% else %}<p>수락을 막는 항목이 없습니다.</p>{% endfor %}</div>
+  <h2>What blocks acceptance</h2>
+  {{ render_narrative(narrative.blockerExplanation, "finalVerification.userNarrative.blockerExplanation") }}
+  <div class="summary-grid">{% for row in final.acceptanceBlockers %}{{ summary_card(row.id ~ " · " ~ row.severity, row.statement, "important", anchor=row.id) }}{% else %}<p>Nothing is holding acceptance.</p>{% endfor %}</div>
 </section>
 
 <section data-report-section="residual-risk" data-report-field="finalVerification.residualRisk">
-  <h2>잔여 위험</h2>
-  <div class="summary-grid">{% for row in final.residualRisk %}<article class="summary-card"><h3>{{ row.id }}</h3><p>{{ row.item | inline_code }}</p><p><strong>담당:</strong> {{ row.owner | inline_code }}</p><p><strong>상향 조건:</strong> {{ row.escalationTrigger | inline_code }}</p></article>{% else %}<p>기록된 잔여 위험이 없습니다.</p>{% endfor %}</div>
+  <h2>Residual risk</h2>
+  <div class="summary-grid">{% for row in final.residualRisk %}<article class="summary-card" id="id-{{ row.id }}"><h3>{{ row.id }}</h3><p>{{ row.item | inline_code }}</p><p><strong>Owner:</strong> {{ row.owner | inline_code }}</p><p><strong>Escalation condition:</strong> {{ row.escalationTrigger | inline_code }}</p></article>{% else %}<p>No residual risk was recorded.</p>{% endfor %}</div>
 </section>
 
 <section data-report-section="manual-results" data-report-field="finalVerification.manualUserTest">
-  <h2>수동 사용자 테스트 결과</h2>
+  <h2>Manual user test results</h2>
   {% if final.manualUserTest.applicable %}{% for row in final.manualUserTest.results %}<article class="summary-card tone-{{ row.result }}"><h3>{{ row.target | inline_code }} · {{ row.result }}</h3><p>{{ row.performed | inline_code }}</p><p>{{ row.observed | inline_code }}</p></article>{% endfor %}{% else %}<p>{{ final.manualUserTest.exemptionReaffirm | inline_code }}</p>{% endif %}
 </section>
 
+<section data-report-section="verified-source" data-report-field="finalVerification.sourceImplementationReport">
+  <h2>What was verified</h2>
+  <table><tbody><tr><th>Implementation report</th><td><code>{{ final.sourceImplementationReport.path }}</code></td></tr><tr><th>Worktree</th><td><code>{{ final.sourceImplementationReport.worktreePath }}</code></td></tr><tr><th>Base commit</th><td><code>{{ final.sourceImplementationReport.implementationBaseRef }}</code> → <code>{{ final.sourceImplementationReport.capturedHeadSha }}</code></td></tr><tr><th>Diff summary</th><td>{{ final.sourceImplementationReport.diffSummaryQuote | inline_code }}</td></tr><tr><th>Uncommitted state</th><td>{{ final.sourceImplementationReport.gitStatusShort | inline_code }}</td></tr></tbody></table>
+  {% if final.get("stageReports") %}<h3>Per-stage reports</h3>
+  <ul data-report-field="finalVerification.stageReports">{% for row in final.stageReports %}<li>Stage {{ row.stage }} — <code>{{ row.reportPath }}</code></li>{% endfor %}</ul>{% endif %}
+</section>
+
 <section data-report-section="release-route">
-  <h2>릴리스 경로</h2>
-  {{ render_narrative(narrative.releaseReadiness, "finalVerification.userNarrative.releaseReadiness", evidenceIndex) }}
-  {% if releaseAllowed %}<p>{{ final.routingRecommendation | inline_code }}</p>{% else %}<p>현재 판정으로는 release-handoff를 시작할 수 없습니다. 차단 또는 조건을 먼저 해소하세요.</p>{% endif %}
+  <h2>Release path</h2>
+  {{ render_narrative(narrative.releaseReadiness, "finalVerification.userNarrative.releaseReadiness") }}
+  {% if releaseAllowed %}<p>{{ final.routingRecommendation | inline_code }}</p>{% else %}<p>The current verdict does not allow release-handoff to start. Clear the blocker or the condition first.</p>{% endif %}
 </section>
 {% endblock %}

package/runtime/templates/reports/html/tasks/implementation-planning.template.html

@@ -1,45 +1,104 @@
 {% extends "html/base.template.html" %}
 {% from "html/macros/forms.html" import plan_approval %}
-{% from "html/macros/layout.html" import narrative as render_narrative, action_list, summary_card %}
+{% from "html/macros/layout.html" import narrative as render_narrative, action_list, summary_card, row_key %}
 {% from "html/macros/visualizations.html" import figure %}
 
 {% block human_content %}
 <section data-report-section="planning-goal">
-  <h2>계획 목표</h2>
+  <h2>What the plan is for</h2>
   <p>{{ humanSummary.outcome | inline_code }}</p>
-  <div class="summary-grid">{% for reason in humanSummary.whyItMatters %}{{ summary_card("왜 중요한가 " ~ loop.index, reason, "important") }}{% endfor %}</div>
+  <div class="summary-grid">{% for reason in humanSummary.whyItMatters %}{{ summary_card("", reason, "important") }}{% endfor %}</div>
 </section>
 
 <section data-report-section="option-comparison">
-  <h2>구현 대안 비교</h2>
-  {{ render_narrative(narrative.optionExplanation, "implementationPlanning.userNarrative.optionExplanation", evidenceIndex) }}
-  <div class="summary-grid" data-report-field="implementationPlanning.optionCandidates">{% for row in planning.optionCandidates %}<article class="summary-card"><h3>{{ row.name | inline_code }}</h3><p><strong>인터페이스:</strong> {{ row.interfaces | inline_code }}</p><p><strong>영향 범위:</strong> {{ row.blastRadius | inline_code }}</p><ul>{% for file in row.fileStructure %}<li>{{ file.action }} <code>{{ file.path }}</code> — {{ file.summary | inline_code }}</li>{% endfor %}</ul></article>{% endfor %}</div>
-  <table data-report-field="implementationPlanning.tradeoffMatrix"><thead><tr><th>옵션</th><th>복잡도</th><th>위험</th><th>가역성</th><th>테스트 비용</th><th>배포 비용</th></tr></thead><tbody>{% for row in planning.tradeoffMatrix %}<tr><td>{{ row.option | inline_code }}</td><td>{{ row.complexity | inline_code }}</td><td>{{ row.risk | inline_code }}</td><td>{{ row.reversibility | inline_code }}</td><td>{{ row.testCoverageCost | inline_code }}</td><td>{{ row.rolloutCost | inline_code }}</td></tr>{% endfor %}</tbody></table>
+  <h2>Implementation options compared</h2>
+  {{ render_narrative(narrative.optionExplanation, "implementationPlanning.userNarrative.optionExplanation") }}
+  <div class="summary-grid" data-report-field="implementationPlanning.optionCandidates">{% for row in planning.optionCandidates %}<article class="summary-card"><h3>{{ row.name | inline_code }}</h3><p><strong>Interface:</strong> {{ row.interfaces | inline_code }}</p><p><strong>Blast radius:</strong> {{ row.blastRadius | inline_code }}</p><ul>{% for file in row.fileStructure %}<li id="id-{{ file.id }}">{{ file.action }} <code>{{ file.path }}</code> — {{ file.summary | inline_code }}</li>{% endfor %}</ul></article>{% endfor %}</div>
+  <table data-report-field="implementationPlanning.tradeoffMatrix"><thead><tr><th>Option</th><th>Complexity</th><th>Risk</th><th>Reversibility</th><th>Test cost</th><th>Rollout cost</th></tr></thead><tbody>{% for row in planning.tradeoffMatrix %}<tr><td>{{ row.option | inline_code }}</td><td>{{ row.complexity | inline_code }}</td><td>{{ row.risk | inline_code }}</td><td>{{ row.reversibility | inline_code }}</td><td>{{ row.testCoverageCost | inline_code }}</td><td>{{ row.rolloutCost | inline_code }}</td></tr>{% endfor %}</tbody></table>
 </section>
 
 <section data-report-section="recommendation" data-report-field="implementationPlanning.recommendedOption">
-  <h2>권장안</h2>
-  {{ render_narrative(narrative.recommendationExplanation, "implementationPlanning.userNarrative.recommendationExplanation", evidenceIndex) }}
-  <article class="summary-card tone-important"><h3>{{ planning.recommendedOption.name | inline_code }}</h3><p>{{ planning.recommendedOption.coreReason | inline_code }}</p><p>{{ planning.recommendedOption.rationale | inline_code }}</p><p><strong>선택하지 않은 안:</strong> {{ planning.recommendedOption.rejectedSummary | inline_code }}</p></article>
+  <h2>Recommended</h2>
+  {{ render_narrative(narrative.recommendationExplanation, "implementationPlanning.userNarrative.recommendationExplanation") }}
+  <article class="summary-card tone-important"><h3>{{ planning.recommendedOption.name | inline_code }}</h3><p>{{ planning.recommendedOption.coreReason | inline_code }}</p><p>{{ planning.recommendedOption.rationale | inline_code }}</p><p><strong>Options not taken:</strong> {{ planning.recommendedOption.rejectedSummary | inline_code }}</p></article>
 </section>
 
 <section data-report-section="stage-map" data-report-field="implementationPlanning.stageMap">
-  <h2>단계별 실행 지도</h2>
-  {{ render_narrative(narrative.stageStrategy, "implementationPlanning.userNarrative.stageStrategy", evidenceIndex) }}
+  <h2>Stage map</h2>
+  {{ render_narrative(narrative.stageStrategy, "implementationPlanning.userNarrative.stageStrategy") }}
   {{ figure(stageFigure) }}
-  <div class="summary-grid">{% for row in planning.stages %}<article class="summary-card"><h3>Stage {{ row.stage }} · {{ row.title | inline_code }}</h3><p>{{ row.sliceValue | inline_code }}</p><p><strong>완료 조건:</strong> {{ row.acceptance | inline_code }}</p><p><strong>검증:</strong> {{ row.stageValidation | inline_code }}</p></article>{% endfor %}</div>
+  <div class="summary-grid">{% for row in planning.stages %}<article class="summary-card"><h3>Stage {{ row.stage }} · {{ row.title | inline_code }}</h3><p>{{ row.sliceValue | inline_code }}</p><p><strong>Exit contract:</strong> {{ row.acceptance | inline_code }}</p><p><strong>Verification:</strong> {{ row.stageValidation | inline_code }}</p></article>{% endfor %}</div>
 </section>
 
+{% if planning.get("designPreparation") %}
+<section data-report-section="design-preparation" data-report-field="implementationPlanning.designPreparation">
+  <h2>Design preparation</h2>
+  {% if planning.designPreparation.mode == "no-design-inputs" %}
+  <p>{{ planning.designPreparation.reason | inline_code }}</p>
+  {% else %}
+  <table><thead><tr><th>Design item</th><th>What it needs</th><th>Open questions</th></tr></thead><tbody>{% for row in planning.designPreparation["items"] %}<tr id="id-{{ row.id }}">{{ row_key(pairs=[("ID", row.id), ("Subject", row.title), ("Kind", row.kind)], status_name="Status", status_raw=row.status, status_text=row.status) }}<td>{{ row.need | inline_code }}</td><td>{{ row.openQuestions | default([]) | join(" · ") | inline_code }}</td></tr>{% endfor %}</tbody></table>
+  {% endif %}
+</section>
+{% endif %}
+
+<section data-report-section="variation-points" data-report-field="implementationPlanning.variationPointAnalysis">
+  <h2>Where implementations diverge</h2>
+  {% if planning.variationPointAnalysis.hasMultipleImplementations %}
+  <table><thead><tr><th>Action</th><th>Implementations</th><th>Extraction call</th><th>Evidence</th></tr></thead><tbody>{% for row in planning.variationPointAnalysis.points %}<tr><td>{{ row.behavior | inline_code }}</td><td>{{ row.implementations | default([]) | join(" · ") | inline_code }}</td><td>{{ row.extractionDecision | inline_code }}</td><td>{{ row.evidence | inline_code }}</td></tr>{% endfor %}</tbody></table>
+  {% else %}<p>{{ planning.variationPointAnalysis.noVariationRationale | inline_code }}</p>{% endif %}
+</section>
+
+{% if planning.get("stepwiseExecution") %}
+<section data-report-section="stepwise-execution" data-report-field="implementationPlanning.stepwiseExecution">
+  <h2>Step-by-step execution</h2>
+  <table><thead><tr><th>#</th><th>Action</th><th>Files</th><th>Command / test</th><th>Expected</th></tr></thead><tbody>{% for row in planning.stepwiseExecution %}<tr><td>{{ row.step }}</td><td>{{ row.action | inline_code }}</td><td>{% for file in row.files %}<code>{{ file }}</code>{% if not loop.last %} {% endif %}{% endfor %}</td><td><code>{{ row.commandOrTest }}</code></td><td>{{ row.expectedOutcome | inline_code }}</td></tr>{% endfor %}</tbody></table>
+</section>
+{% endif %}
+
 <section data-report-section="validation-and-rollback">
-  <h2>검증과 롤백</h2>
-  {{ render_narrative(narrative.validationAndRollback, "implementationPlanning.userNarrative.validationAndRollback", evidenceIndex) }}
-  <h3>검증 체크리스트</h3><table data-report-field="implementationPlanning.validationChecklist"><thead><tr><th>ID</th><th>시점</th><th>확인</th><th>명령</th><th>기대 결과</th></tr></thead><tbody>{% for row in planning.validationChecklist %}<tr><td>{{ row.id }}</td><td>{{ row.phase }}</td><td>{{ row.check | inline_code }}</td><td><code>{{ row.commandOrObservation }}</code></td><td>{{ row.expectedOutcome | inline_code }}</td></tr>{% endfor %}</tbody></table>
-  <h3>롤백 전략</h3><div class="summary-grid" data-report-field="implementationPlanning.rollbackStrategy">{% for row in planning.rollbackStrategy %}{{ summary_card(row.id ~ " · " ~ (row.triggerSignal | inline_code), row.action, "important") }}{% endfor %}</div>
+  <h2>Verification and rollback</h2>
+  {{ render_narrative(narrative.validationAndRollback, "implementationPlanning.userNarrative.validationAndRollback") }}
+  <h3>Validation checklist</h3><table data-report-field="implementationPlanning.validationChecklist"><thead><tr><th>Check</th><th>Check</th><th>Command</th><th>Expected</th></tr></thead><tbody>{% for row in planning.validationChecklist %}<tr id="id-{{ row.id }}">{{ row_key(pairs=[("ID", row.id), ("Phase", row.phase)]) }}<td>{{ row.check | inline_code }}</td><td><code>{{ row.commandOrObservation }}</code></td><td>{{ row.expectedOutcome | inline_code }}</td></tr>{% endfor %}</tbody></table>
+  <h3>How each requirement gets met</h3><table data-report-field="implementationPlanning.requirementCoverage"><thead><tr><th>Requirement</th><th>Body</th><th>Covered by</th></tr></thead><tbody>{% for row in planning.requirementCoverage %}<tr id="id-{{ row.id }}">{{ row_key(pairs=[("ID", row.id), ("Source", row.source)], status_name="Status", status_raw=row.status, status_text=row.status) }}<td>{{ row.requirement | inline_code }}</td><td>{{ row.coveredBy | inline_code }}</td></tr>{% endfor %}</tbody></table>
+  <h3>Cross-project dependencies</h3><table data-report-field="implementationPlanning.crossProjectDependencies"><thead><tr><th>Dependency</th><th>Work needed</th><th>Signal to check</th><th>How to start</th></tr></thead><tbody>{% for row in planning.crossProjectDependencies %}<tr id="id-{{ row.id }}">{{ row_key(pairs=[("ID", row.id), ("Project", row.project), ("Direction", row.direction)]) }}<td>{{ row.requiredWork | inline_code }}</td><td>{{ row.verificationSignal | inline_code }}</td><td>{{ row.howToStart | inline_code }}</td></tr>{% endfor %}</tbody></table>
+  <h3>Dependency and migration risk</h3><table data-report-field="implementationPlanning.dependencyMigrationRisk"><thead><tr><th>Item</th><th>Impact</th><th>Mitigation</th></tr></thead><tbody>{% for row in planning.dependencyMigrationRisk %}<tr id="id-{{ row.id }}">{{ row_key(pairs=[("ID", row.id), ("Item", row.item), ("Kind", row.kind)]) }}<td>{{ row.impact | inline_code }}</td><td>{{ row.mitigation | inline_code }}</td></tr>{% endfor %}</tbody></table>
+  <h3>Rollback strategy</h3><div class="summary-grid" data-report-field="implementationPlanning.rollbackStrategy">{% for row in planning.rollbackStrategy %}{{ summary_card(row.id ~ " · " ~ (row.triggerSignal | inline_code), row.action, "important", anchor=row.id) }}{% endfor %}</div>
+</section>
+
+<section data-report-section="plan-verification" data-report-field="implementationPlanning.planBodyVerification">
+  <h2>Plan body verification</h2>
+  <p><strong>Verdict</strong> — {{ planning.planBodyVerification.gateResult | inline_code }} ({{ planning.planBodyVerification.roundCount }} rounds{% if planning.planBodyVerification.get("selfFixRoundsApplied") is not none %}, {{ planning.planBodyVerification.selfFixRoundsApplied }} self-fix rounds{% if planning.planBodyVerification.get("selfFixStopReason") %} · {{ planning.planBodyVerification.selfFixStopReason | inline_code }}{% endif %}{% endif %})</p>
+  {% if planning.planBodyVerification.get("gateBlockedBy") %}<p><strong>What it blocked</strong> — {{ planning.planBodyVerification.gateBlockedBy | join(", ") | inline_code }}</p>{% endif %}
+  <table><thead><tr><th>Plan item</th><th>Subject</th></tr></thead><tbody>{% for row in planning.planBodyVerification.planItems %}<tr id="id-{{ row.id }}">{{ row_key(pairs=[("ID", row.id), ("Source section", row.sourceSection)]) }}<td>{{ row.subject | inline_code }}</td></tr>{% endfor %}</tbody></table>
+  {% if planning.planBodyVerification.get("dissentLog") %}<h3>Dissent left standing</h3>
+  <table><thead><tr><th>Subject</th><th>Body</th></tr></thead><tbody>{% for row in planning.planBodyVerification.dissentLog %}<tr>{{ row_key(pairs=[("Subject", row.planItem), ("Worker", row.workerRole)]) }}<td>{{ row.body | inline_code }}</td></tr>{% endfor %}</tbody></table>{% endif %}
+</section>
+
+{% if planning.get("supersessionLedger") is not none %}
+<section data-report-section="superseded" data-report-field="implementationPlanning.supersessionLedger">
+  <h2>What your answers overturned</h2>
+  <table><thead><tr><th>Answer</th><th>Statement overturned</th><th>Replaced with</th></tr></thead><tbody>{% for row in planning.supersessionLedger %}<tr>{{ row_key(pairs=[("Answer", row.clarificationId), ("Disposition", row.disposition)]) }}<td>{{ row.supersededStatement | inline_code }}</td><td>{{ row.replacedWith | inline_code }}</td></tr>{% else %}<tr><td colspan="4">No answer overturned anything.</td></tr>{% endfor %}</tbody></table>
+</section>
+{% endif %}
+
+{% if planning.get("incrementalDecision") %}<section data-report-section="replan-scope" data-report-field="implementationPlanning.incrementalDecision">
+  <h2>Scope, restated</h2>
+  <p><strong>{{ planning.incrementalDecision.mode | inline_code }}</strong> — {{ planning.incrementalDecision.reason | inline_code }}</p>
+  <p><strong>Stages verified again</strong> — {{ planning.incrementalDecision.reverifyStages | default([]) | join(", ") | inline_code }} · <strong>Stages carried over as they were</strong> — {{ planning.incrementalDecision.carryStages | default([]) | join(", ") | inline_code }}</p>
+</section>{% endif %}
+
+<section data-report-section="decision-drafts" data-report-field="implementationPlanning.decisionDrafts">
+  <h2>Decision record draft</h2>
+  {% for row in planning.decisionDrafts %}
+  <article class="summary-card"><h3>{{ row.number }} · {{ row.slug | inline_code }} ({{ row.status | inline_code }})</h3><p><strong>Context</strong> — {{ row.context | inline_code }}</p><p><strong>Decision</strong> — {{ row.decision | inline_code }}</p><p><strong>Result</strong> — {{ row.consequences | inline_code }}</p></article>
+  {% else %}<p>There is no decision draft to record.</p>{% endfor %}
+  {% if planning.get("skippedAdrCandidates") %}<h3>What was deliberately not recorded</h3>
+  <table data-report-field="implementationPlanning.skippedAdrCandidates"><thead><tr><th>Topic</th><th>Why</th></tr></thead><tbody>{% for row in planning.skippedAdrCandidates %}<tr><td>{{ row.topic | inline_code }}</td><td>{{ row.reason | inline_code }}</td></tr>{% endfor %}</tbody></table>{% endif %}
 </section>
 
 <section data-report-section="open-decisions">
-  <h2>승인 전 열린 결정</h2>
-  <div class="summary-grid">{% for row in openDecisions %}{{ summary_card(row.id ~ " · " ~ row.kind, row.statement, "important") }}{% else %}<p>승인을 막는 열린 결정이 없습니다.</p>{% endfor %}</div>
+  <h2>Open decisions before approval</h2>
+  <div class="summary-grid">{% for row in openDecisions %}{{ summary_card(row.id ~ " · " ~ row.kind, row.statement, "important", anchor=row.id) }}{% else %}<p>No open decision is holding approval.</p>{% endfor %}</div>
   {{ action_list(humanSummary.actions) }}
 </section>
 

package/runtime/templates/reports/html/tasks/implementation.template.html

@@ -1,40 +1,58 @@
 {% extends "html/base.template.html" %}
-{% from "html/macros/layout.html" import narrative as render_narrative, summary_card %}
+{% from "html/macros/layout.html" import narrative as render_narrative, summary_card, row_key %}
 {% from "html/macros/visualizations.html" import figure %}
 
 {% block human_content %}
 <section data-report-section="delivered-outcome">
-  <h2>전달된 결과</h2>
-  {{ render_narrative(narrative.deliveredOutcome, "implementation.userNarrative.deliveredOutcome", evidenceIndex) }}
+  <h2>What was delivered</h2>
+  {{ render_narrative(narrative.deliveredOutcome, "implementation.userNarrative.deliveredOutcome") }}
   <p>{{ humanSummary.outcome | inline_code }}</p>
 </section>
 
 <section data-report-section="change-map" data-report-field="implementation.diffSummary">
-  <h2>무엇이 달라졌는가</h2>
-  {{ render_narrative(narrative.changeExplanation, "implementation.userNarrative.changeExplanation", evidenceIndex) }}
+  <h2>What changed</h2>
+  {{ render_narrative(narrative.changeExplanation, "implementation.userNarrative.changeExplanation") }}
   {{ figure(changeFigure) }}
 </section>
 
 <section data-report-section="requirement-coverage">
-  <h2>요구사항 충족</h2>
-  <table data-report-field="implementation.requirementCoverage"><thead><tr><th>ID</th><th>요구사항</th><th>구현·증거</th><th>상태</th></tr></thead><tbody>{% for row in implementation.requirementCoverage %}<tr><td>{{ row.id }}</td><td>{{ row.requirement | inline_code }}</td><td>{{ row.coveredBy | inline_code }}</td><td><span class="status status-{{ row.status }}">{{ row.status }}</span></td></tr>{% endfor %}</tbody></table>
+  <h2>Requirement coverage</h2>
+  <table data-report-field="implementation.requirementCoverage"><thead><tr><th>Requirement</th><th>Body</th><th>Implemented by</th></tr></thead><tbody>{% for row in implementation.requirementCoverage %}<tr id="id-{{ row.id }}">{{ row_key(pairs=[("ID", row.id)], status_name="Status", status_raw=row.status, status_text=row.status) }}<td>{{ row.requirement | inline_code }}</td><td>{{ row.coveredBy | inline_code }}</td></tr>{% endfor %}</tbody></table>
 </section>
 
 <section data-report-section="validation" data-report-field="implementation.validationEvidence">
-  <h2>검증 결과</h2>
-  {{ render_narrative(narrative.validationExplanation, "implementation.userNarrative.validationExplanation", evidenceIndex) }}
-  <div class="summary-grid">{% for row in implementation.validationEvidence %}{{ summary_card(row.phase ~ " · 종료 코드 " ~ row.exitCode, row.outputTail, "important" if row.exitCode else "neutral") }}{% endfor %}</div>
-  <p><strong>독립 검증:</strong> {% for row in implementation.verifierResults %}<span class="status status-{{ row.verdict | lower }}">{{ row.verdict }}</span>{% if not loop.last %}, {% endif %}{% endfor %}</p>
+  <h2>Verification result</h2>
+  {{ render_narrative(narrative.validationExplanation, "implementation.userNarrative.validationExplanation") }}
+  <div class="summary-grid">{% for row in implementation.validationEvidence %}{{ summary_card(row.phase ~ " · exit code " ~ row.exitCode, row.outputTail, "important" if row.exitCode else "neutral") }}{% endfor %}</div>
+  <p><strong>Independent check:</strong> {% for row in implementation.verifierResults %}<span class="status status-{{ row.verdict | lower }}">{{ row.verdict }}</span>{% if not loop.last %}, {% endif %}{% endfor %}</p>
 </section>
 
 <section data-report-section="remaining-issues">
-  <h2>남은 문제</h2>
-  {{ render_narrative(narrative.remainingIssues, "implementation.userNarrative.remainingIssues", evidenceIndex) }}
-  <div class="summary-grid">{% for row in implementation.outOfPlanEdits %}{{ summary_card(row.id ~ " · " ~ row.file, row.rationale, "important") }}{% else %}<p>계획 밖 수정 사항이 없습니다.</p>{% endfor %}</div>
+  <h2>What is left</h2>
+  {{ render_narrative(narrative.remainingIssues, "implementation.userNarrative.remainingIssues") }}
+  <div class="summary-grid">{% for row in implementation.outOfPlanEdits %}{{ summary_card(row.id ~ " · " ~ row.file, row.rationale, "important", anchor=row.id) }}{% else %}<p>Nothing was changed outside the plan.</p>{% endfor %}</div>
+</section>
+
+<section data-report-section="shipped-commits" data-report-field="implementation.commitList">
+  <h2>Commits delivered</h2>
+  {% if implementation.commitList is mapping %}<p>There are no commits.</p>{% else %}
+  <table><thead><tr><th>Commit</th><th>Subject</th><th>Files</th></tr></thead><tbody>{% for row in implementation.commitList %}<tr>{{ row_key(pairs=[("SHA", row.shortSha), ("Order", row.number), ("Plan step", row.planStep)]) }}<td>{{ row.subject | inline_code }}</td><td>{% for file in row.files %}<code>{{ file }}</code>{% if not loop.last %} {% endif %}{% endfor %}</td></tr>{% endfor %}</tbody></table>{% endif %}
+  <table data-report-field="implementation.approvedPlanReference"><tbody><tr><th>Approved plan</th><td><code>{{ implementation.approvedPlanReference.planFile }}</code></td></tr><tr><th>Approval evidence</th><td>{{ implementation.approvedPlanReference.approvalEvidence | inline_code }}</td></tr><tr><th>Worktree</th><td><code>{{ implementation.approvedPlanReference.executorWorktreePath }}</code> @ <code>{{ implementation.approvedPlanReference.baseRefSha }}</code></td></tr></tbody></table>
+</section>
+
+<section data-report-section="rollback" data-report-field="implementation.rollbackVerification">
+  <h2>Can this be rolled back</h2>
+  <table><thead><tr><th>Subject</th><th>Rollback command</th><th>How to verify</th><th>Result</th></tr></thead><tbody>{% for row in implementation.rollbackVerification %}<tr><td>{{ row.category | inline_code }}</td><td><code>{{ row.rollbackCommand }}</code></td><td>{{ row.verification | inline_code }}</td><td>{{ row.result | inline_code }}</td></tr>{% else %}<tr><td colspan="4">No rollback check was recorded.</td></tr>{% endfor %}</tbody></table>
+  {% if implementation.stageSidecarEvidence %}<p data-report-field="implementation.stageSidecarEvidence"><strong>Stage carry-over</strong> — Stage {{ implementation.stageSidecarEvidence.stageNumber }} {{ implementation.stageSidecarEvidence.stageTitle | inline_code }} · <code>{{ implementation.stageSidecarEvidence.carryJson }}</code></p>{% endif %}
 </section>
 
 <section data-report-section="manual-test" data-report-field="implementation.manualUserTest">
-  <h2>수동 사용자 테스트</h2>
-  {% if implementation.manualUserTest.applicable %}{% for row in implementation.manualUserTest["items"] %}<article class="summary-card"><h3>{{ row.target | inline_code }}</h3><p><strong>환경:</strong> {{ row.environmentSetup | inline_code }}</p><ol>{% for step in row.steps %}<li>{{ step | inline_code }}</li>{% endfor %}</ol><p><strong>기대 결과:</strong> {{ row.expectedResult | inline_code }}</p></article>{% endfor %}{% else %}<p>{{ implementation.manualUserTest.exemptionReason | inline_code }}</p>{% endif %}
+  <h2>Manual user test</h2>
+  {% if implementation.manualUserTest.applicable %}{% for row in implementation.manualUserTest["items"] %}<article class="summary-card"><h3>{{ row.target | inline_code }}</h3><p><strong>Environment:</strong> {{ row.environmentSetup | inline_code }}</p><ol>{% for step in row.steps %}<li>{{ step | inline_code }}</li>{% endfor %}</ol><p><strong>Expected:</strong> {{ row.expectedResult | inline_code }}</p></article>{% endfor %}{% else %}<p>{{ implementation.manualUserTest.exemptionReason | inline_code }}</p>{% endif %}
+</section>
+
+<section data-report-section="next-step" data-report-field="implementation.routingRecommendation">
+  <h2>Next step</h2>
+  <p>{{ implementation.routingRecommendation | inline_code }}</p>
 </section>
 {% endblock %}