okstra 0.49.0 → 0.50.0

package/runtime/skills/okstra-team-contract/SKILL.md

@@ -213,7 +213,7 @@ Every item in sections 1–5 MUST be tagged with the ticket(s) it relates to. Th
 
 - **Table-form items**: include a `Ticket ID` column. The column is placed immediately after the row-ID column (e.g. after `F-001`, `M-001`).
 - **Bullet / numbered-list items**: prepend `[TICKETID: <id>]` to the item title, immediately after the row ID and before the body text. Example: `- F-001 [TICKETID: TICKET-123] — <summary> (path:line)`.
-- **Section headers in the final report** (e.g. `### 4.5.3 Recommended Option`): append `[TICKETID: <id>]` to the header when the section is scoped to a specific ticket. Headers that span all tickets in the run omit the tag.
+- **Section headers in the final report** (e.g. `### 5.5.3 Recommended Option`): append `[TICKETID: <id>]` to the header when the section is scoped to a specific ticket. Headers that span all tickets in the run omit the tag.
 
 Ticket ID fill rule (in order):
 

package/runtime/templates/reports/final-report.template.md

@@ -42,128 +42,34 @@ approved: {{ frontmatter.approved | yaml_scalar }}
 | Approval Required? | `{% if verdictCard.approvalRequired %}yes — {{ t("verdictCard.approvalRequiredSuffix") }}{% else %}no{% endif %}` |
 | Next Step | {{ verdictCard.nextStep }} |
 
-{% if clarificationCarryIn and clarificationCarryIn.sourceFile %}
-## 0. Clarification Response Carried In From Previous Run
-
-- Source file: `{{ clarificationCarryIn.sourceFile }}`
-- {{ t("sectionIntro.clarificationCarryIn") }}
-
-{% endif %}
-## Summary of the Problem or Verification Target
-
-{{ t("sectionIntro.ticketCoverage") }}
+## 1. Clarification Items
 
-| {{ t("columns.recordMeta") }} | {{ t("columns.summary") }} |
-|--------|------------|
-{% for row in summary -%}
-| **{{ row.id }}**<br>Ticket: `{{ row.ticketId }}`<br>{{ t("columns.source") }}: {{ row.source }} | {{ row.summary }} |
-{% endfor %}
-
-{% if ticketCoverage.omit %}
-{# Ticket Coverage omitted entirely — release-handoff / final-verification #}
-{%- else %}
-## Ticket Coverage
-
-{{ t("ticketCoverage.intro") }}
+{{ t("sectionIntro.clarificationItems") }}
 
-{% if ticketCoverage.singleTicket -%}
-- Single ticket run: {{ ticketCoverage.singleTicket }}
+{% if clarificationItems | length == 0 -%}
+{{ t("emptyState.noClarification") }}
 {%- else %}
-| Ticket ID | {{ t("ticketCoverage.columnSections") }} | {{ t("ticketCoverage.columnRelatedIds") }} |
-|-----------|-----------|---------------|
-{% for row in ticketCoverage.rows -%}
-| `{{ row.ticketId }}` | `{{ row.sections }}` | `{{ row.relatedIds }}` |
-{% endfor %}
-{%- endif %}
-
-{% endif %}
-## Execution Status by Agent
-
-{{ t("sectionIntro.executionStatus") }}
-
-| {{ t("columns.recordMeta") }} | Summary of Key Findings |
-|--------|-------------------------|
-{% for row in executionStatus -%}
-| **{{ row.agent }}**<br>Role: {{ row.role }}<br>Model: {{ row.model }}<br>Status: {{ row.status }}<br>{{ t("columns.rawTokens") }}: {{ row.totalTokens | format_int }}{% if row.cliTotalTokens %} (CLI: {{ row.cliTotalTokens | format_int }}){% endif %}<br>{{ t("columns.billableTokens") }}: {{ row.billableTokens | format_int }}<br>{{ t("columns.cost") }}: {{ row.costUsd | format_usd }}{% if row.cliCostUsd %} (+ CLI {{ row.cliCostUsd | format_usd }}){% endif %}<br>Duration: {{ row.durationMs | format_duration_ms }} | {{ row.summary }} |
-{% endfor %}
-
-## {{ t("tokenSummary.heading") }}
-
-| {{ t("tokenSummary.tableHeaderItem") }} | {{ t("columns.rawTokens") }} | {{ t("columns.billableTokensInputEquiv") }} | {{ t("columns.cost") }} |
-|------|-----------|------------------------|------------|
-| {{ t("tokenSummary.rowLead") }} | `{{ tokenUsage.lead.totalTokens | format_int }}` | `{{ tokenUsage.lead.billableTokens | format_int }}` | `{{ tokenUsage.lead.costUsd | format_usd }}` |
-| {{ t("tokenSummary.rowWorkerTotal") }} | `{{ tokenUsage.worker.totalTokens | format_int }}` | `{{ tokenUsage.worker.billableTokens | format_int }}` | `{{ tokenUsage.worker.costUsd | format_usd }}` |
-| {{ t("tokenSummary.rowGrandTotal") }} | **`{{ tokenUsage.grand.totalTokens | format_int }}`** | **`{{ tokenUsage.grand.billableTokens | format_int }}`** | **`{{ tokenUsage.grand.costUsd | format_usd }}`** |
-{% if tokenUsage.cli and tokenUsage.cli.costUsd is not none and tokenUsage.cli.costUsd > 0 -%}
-| {{ t("tokenSummary.rowCliExtra") }} |  |  | `{{ tokenUsage.cli.costUsd | format_usd }}` |
-{% endif %}
-
-{# At Phase 6 numeric cells are null and render as `--`.
-   Phase 7's okstra-token-usage.py populates tokenUsage in data.json then
-   re-invokes this renderer to produce the final markdown. #}
-
-## 1. Cross Verification Results
-
-{% if crossVerification.roundHistory and not crossVerification.roundHistory.disabled -%}
-### 1.0 Round History
-
-{% if crossVerification.roundHistory.rounds | length > 1 -%}
-| Round | inputQueueSize | resolvedCount | carriedForwardCount | dispatches (worker:status:durationMs) | skippedWorkers (worker:reason) |
-|-------|----------------|---------------|----------------------|----------------------------------------|---------------------------------|
-{% for row in crossVerification.roundHistory.rounds -%}
-| {{ row.round }} | {{ row.inputQueueSize }} | {{ row.resolvedCount }} | {{ row.carriedForwardCount }} | {{ row.dispatches }} | {{ row.skippedWorkers }} |
-{% endfor %}
-
-- `round2SkippedReason`: `{{ crossVerification.roundHistory.round2SkippedReason }}`  ← {{ t("roundHistory.round2SkippedReasonNote") }}
-{% elif crossVerification.roundHistory.rounds | length == 1 -%}
-{% set r = crossVerification.roundHistory.rounds[0] -%}
-- {{ t("roundHistory.singleRoundPrefix") }} resolved={{ r.resolvedCount }}, carriedForward={{ r.carriedForwardCount }}, round2SkippedReason=`{{ crossVerification.roundHistory.round2SkippedReason }}`
-{% else -%}
-- {{ t("roundHistory.noRoundsNote") }} round2SkippedReason=`{{ crossVerification.roundHistory.round2SkippedReason }}`
-{% endif %}
+{{ t("clarification.fillAndRerun") }}
 
-{% endif %}
-### 1.1 Consensus
+- Claude Code: `/okstra-run resume-clarification task-key={{ header.taskKey }}`
+- {{ t("clarification.separateTerminalLabel") }}: `scripts/okstra.sh --resume-clarification --task-key {{ header.taskKey }}`
 
-{% if crossVerification.consensus | length == 0 -%}
-{{ t("emptyState.consensusItems") }}
-{%- else %}
-| {{ t("columns.recordMeta") }} | Statement | Evidence (path:line / log / worker report) |
-|--------|-----------|---------------------------------------------|
-{% for row in crossVerification.consensus -%}
-| **{{ row.id }}**<br>Ticket: `{{ row.ticketId }}`<br>Source items: {{ row.sourceItems | join(', ') }} | {{ row.statement }} | {{ row.evidence }} |
+| ID | Ticket ID | Kind | Statement | Expected form | Blocks | Status | User input |
+|----|-----------|------|-----------|---------------|--------|--------|-----------|
+{% for row in clarificationItems -%}
+| {{ row.id }} | `{{ row.ticketId }}` | `{{ row.kind }}` | {{ row.statement }} | {{ row.expectedForm }} | `{{ row.blocks }}` | {{ row.status }} | {{ row.userInput or '' }} |
 {% endfor %}
-{%- endif %}
-
-{{ t("sectionIntro.sourceItemsRule") }}
 
-### 1.2 Differences
+{{ t("clarification.columnGuide") }}
 
-{% if crossVerification.differences | length == 0 -%}
-{{ t("emptyState.differences") }}
-{%- else %}
-| {{ t("columns.recordMeta") }} | Disagreement | Evidence |
-|--------|--------------|----------|
-{% for row in crossVerification.differences -%}
-| **{{ row.id }}**<br>Ticket: `{{ row.ticketId }}`<br>Workers: {% for w in row.workersPosition %}{{ w.worker }}:{{ w.itemId }} ({{ w.position }}){% if not loop.last %} / {% endif %}{% endfor %} | {{ row.disagreement }} | {{ row.evidence }} |
-{% endfor %}
+- **`Kind`** ∈ `{material, decision, data-point}`.
+- **`Blocks`** ∈ `{approval, next-phase, none}`.
+- **`Status`** ∈ `{open, answered, resolved, obsolete}`.
 {%- endif %}
 
-## 2. Final Verdict
+## 2. Evidence and Detailed Analysis
 
-{{ t("finalVerdict.intro") }}
-
-| {{ t("verdictCard.tableHeaderLabel") }} | {{ t("verdictCard.tableHeaderValue") }} |
-|------|----|
-| Final Conclusion | {{ finalVerdict.finalConclusion }} |
-| Verdict Token | `{{ finalVerdict.verdictToken }}` |
-| Direction | `{{ finalVerdict.direction }}` |
-| {{ t("verdictCard.rationaleLabel") }} | {{ finalVerdict.rationaleRowIds | join(', ') }} |
-| {{ t("verdictCard.nextStepLabel") }} | {{ finalVerdict.nextStep }} |
-
-## 3. Evidence and Detailed Analysis
-
-### 3.1 Primary Evidence
+### 2.1 Primary Evidence
 
 {% if evidence.primary | length == 0 -%}
 {{ t("emptyState.primaryEvidence") }}
@@ -177,7 +83,7 @@ approved: {{ frontmatter.approved | yaml_scalar }}
 
 {{ t("evidence.sourceItemsColumnNote") }}
 
-### 3.2 Secondary Evidence or Alternate Interpretations
+### 2.2 Secondary Evidence or Alternate Interpretations
 
 {% if not evidence.secondary or evidence.secondary | length == 0 -%}
 {{ t("emptyState.secondaryEvidence") }}
@@ -189,7 +95,36 @@ approved: {{ frontmatter.approved | yaml_scalar }}
 {% endfor %}
 {%- endif %}
 
-## 4. Missing Information and Risks
+## 3. Recommended Next Steps
+
+{% if recommendedNextSteps | length == 0 -%}
+- No further action required. Final verdict in section 7 stands.
+{%- else %}
+{% for step in recommendedNextSteps -%}
+{{ loop.index }}. {{ step.text }}
+{% if step.commands -%}
+{% for cmd in step.commands %}
+   - {{ cmd.label }}:
+     - Claude Code: `{{ cmd.claudeCode }}`
+     - {{ t("clarification.separateTerminalLabel") }}: `{{ cmd.terminal }}`
+{% endfor -%}
+{%- endif %}
+{% endfor %}
+{%- endif %}
+
+## 4. Follow-up Tasks{% if t("followUpTasks.headingAside") != "Follow-up Tasks" %} ({{ t("followUpTasks.headingAside") }}){% endif %}
+
+{% if followUpTasks | length == 0 -%}
+{{ t("emptyState.noFollowUp") }}
+{%- else %}
+| {{ t("columns.recordMeta") }} | Title | Scope (files/areas) | Reason / Why deferred |
+|--------|-------|---------------------|------------------------|
+{% for row in followUpTasks -%}
+| **{{ row.id }}**<br>Ticket: `{{ row.ticketId }}`<br>Origin: `{{ row.origin }}`<br>New Task ID: `{{ row.newTaskId }}`<br>Type: `{{ row.suggestedTaskType }}`<br>Priority: `{{ row.priority }}`<br>Auto-spawn: `{{ row.autoSpawn }}` | {{ row.title }} | {{ row.scope }} | {{ row.reason }} |
+{% endfor %}
+{%- endif %}
+
+## 5. Missing Information and Risks
 
 {% if missingInformation | length == 0 -%}
 {{ t("emptyState.risks") }}
@@ -202,9 +137,9 @@ approved: {{ frontmatter.approved | yaml_scalar }}
 {%- endif %}
 
 {% if header.taskType == 'implementation-planning' %}
-## 4.5 Implementation Plan Deliverables
+## 5.5 Implementation Plan Deliverables
 
-### 4.5.1 Option Candidates{% if t("sectionAside.optionCandidates") != "Option Candidates" %} ({{ t("sectionAside.optionCandidates") }}){% endif %}
+### 5.5.1 Option Candidates{% if t("sectionAside.optionCandidates") != "Option Candidates" %} ({{ t("sectionAside.optionCandidates") }}){% endif %}
 
 {% for opt in implementationPlanning.optionCandidates %}
 **{{ opt.name }}**
@@ -222,7 +157,7 @@ approved: {{ frontmatter.approved | yaml_scalar }}
 
 {% endfor %}
 
-### 4.5.2 Trade-off Matrix{% if t("sectionAside.tradeOffMatrix") != "Trade-off Matrix" %} ({{ t("sectionAside.tradeOffMatrix") }}){% endif %}
+### 5.5.2 Trade-off Matrix{% if t("sectionAside.tradeOffMatrix") != "Trade-off Matrix" %} ({{ t("sectionAside.tradeOffMatrix") }}){% endif %}
 
 | Option | Complexity | Risk | Reversibility | Test Coverage Cost | Rollout Cost |
 |--------|-----------|------|---------------|--------------------|--------------|
@@ -230,7 +165,7 @@ approved: {{ frontmatter.approved | yaml_scalar }}
 | {{ row.option }} | {{ row.complexity }} | {{ row.risk }} | {{ row.reversibility }} | {{ row.testCoverageCost }} | {{ row.rolloutCost }} |
 {% endfor %}
 
-### 4.5.3 Recommended Option{% if t("sectionAside.recommendedOption") != "Recommended Option" %} ({{ t("sectionAside.recommendedOption") }}){% endif %}
+### 5.5.3 Recommended Option{% if t("sectionAside.recommendedOption") != "Recommended Option" %} ({{ t("sectionAside.recommendedOption") }}){% endif %}
 
 | {{ t("implementationPlanning.recommendedTableHeaderLabel") }} | {{ t("implementationPlanning.recommendedTableHeaderValue") }} |
 |------|----|
@@ -239,7 +174,7 @@ approved: {{ frontmatter.approved | yaml_scalar }}
 | {{ t("implementationPlanning.rationaleLabel") }} | {{ implementationPlanning.recommendedOption.rationale }} |
 | {{ t("implementationPlanning.rejectedSummaryLabel") }} | {{ implementationPlanning.recommendedOption.rejectedSummary }} |
 
-### 4.5.4 Stepwise Execution Order{% if t("sectionAside.stepwiseExecutionOrder") != "Stepwise Execution Order" %} ({{ t("sectionAside.stepwiseExecutionOrder") }}){% endif %}
+### 5.5.4 Stepwise Execution Order{% if t("sectionAside.stepwiseExecutionOrder") != "Stepwise Execution Order" %} ({{ t("sectionAside.stepwiseExecutionOrder") }}){% endif %}
 
 | Step | Ticket ID | Action (≤ 5min) | Files | Command / Test | Expected outcome |
 |------|-----------|------------------|-------|----------------|-------------------|
@@ -247,7 +182,7 @@ approved: {{ frontmatter.approved | yaml_scalar }}
 | {{ row.step }} | `{{ row.ticketId }}` | {{ row.action }} | `{{ row.files }}` | `{{ row.commandOrTest }}` | {{ row.expectedOutcome }} |
 {% endfor %}
 
-### 4.5.5 Dependency / Migration Risk{% if t("sectionAside.dependencyRisk") != "Dependency / Migration Risk" %} ({{ t("sectionAside.dependencyRisk") }}){% endif %}
+### 5.5.5 Dependency / Migration Risk{% if t("sectionAside.dependencyRisk") != "Dependency / Migration Risk" %} ({{ t("sectionAside.dependencyRisk") }}){% endif %}
 
 {% if implementationPlanning.dependencyMigrationRisk | length == 0 -%}
 {{ t("emptyState.dependencyRisk") }}
@@ -259,7 +194,7 @@ approved: {{ frontmatter.approved | yaml_scalar }}
 {% endfor %}
 {%- endif %}
 
-### 4.5.6 Validation Checklist{% if t("sectionAside.validationChecklist") != "Validation Checklist" %} ({{ t("sectionAside.validationChecklist") }}){% endif %}
+### 5.5.6 Validation Checklist{% if t("sectionAside.validationChecklist") != "Validation Checklist" %} ({{ t("sectionAside.validationChecklist") }}){% endif %}
 
 | Phase | Ticket ID | Check | Command / Observation | Expected outcome |
 |-------|-----------|-------|------------------------|-------------------|
@@ -267,7 +202,7 @@ approved: {{ frontmatter.approved | yaml_scalar }}
 | {{ row.phase }} | `{{ row.ticketId }}` | {{ row.check }} | `{{ row.commandOrObservation }}` | {{ row.expectedOutcome }} |
 {% endfor %}
 
-### 4.5.7 Rollback Strategy{% if t("sectionAside.rollbackStrategy") != "Rollback Strategy" %} ({{ t("sectionAside.rollbackStrategy") }}){% endif %}
+### 5.5.7 Rollback Strategy{% if t("sectionAside.rollbackStrategy") != "Rollback Strategy" %} ({{ t("sectionAside.rollbackStrategy") }}){% endif %}
 
 | ID | Step | Action | Trigger signal | {{ t("columns.checkMethod") }} |
 |----|------|--------|----------------|-----------|
@@ -275,7 +210,7 @@ approved: {{ frontmatter.approved | yaml_scalar }}
 | {{ row.id }} | {{ row.step }} | `{{ row.action }}` | {{ row.triggerSignal }} | `{{ row.verificationMethod }}` |
 {% endfor %}
 
-### 4.5.9 Plan Body Verification{% if t("sectionAside.planBodyVerification") != "Plan Body Verification" %} ({{ t("sectionAside.planBodyVerification") }}){% endif %}
+### 5.5.9 Plan Body Verification{% if t("sectionAside.planBodyVerification") != "Plan Body Verification" %} ({{ t("sectionAside.planBodyVerification") }}){% endif %}
 
 {{ t("sectionIntro.planBodyVerification") }}
 
@@ -302,17 +237,17 @@ approved: {{ frontmatter.approved | yaml_scalar }}
 
 {% endif %}
 {% if header.taskType == 'release-handoff' %}
-## 4.6 Release Handoff Deliverables
+## 5.6 Release Handoff Deliverables
 
 {{ t("releaseHandoff.auditNote") }}
 
-### 4.6.1 Source Verification Report
+### 5.6.1 Source Verification Report
 
 - Path (project-relative): `{{ releaseHandoff.sourceVerificationReport.path }}`
-- Quoted `Verdict Token` row from that report's `## 2.` table:
+- Quoted `Verdict Token` row from that report's `## 7.` table:
   > {{ releaseHandoff.sourceVerificationReport.verdictTokenQuote }}
 
-### 4.6.2 Feature Branch & Working-Tree State{% if t("releaseHandoff.branchStateAside") != "captured at run start" %} ({{ t("releaseHandoff.branchStateAside") }}){% endif %}
+### 5.6.2 Feature Branch & Working-Tree State{% if t("releaseHandoff.branchStateAside") != "captured at run start" %} ({{ t("releaseHandoff.branchStateAside") }}){% endif %}
 
 - Feature branch: `{{ releaseHandoff.featureBranchState.branchName }}`
 - {{ t("releaseHandoff.gitStatusShortLabel") }}:
@@ -321,7 +256,7 @@ approved: {{ frontmatter.approved | yaml_scalar }}
   ```
 - {{ t("releaseHandoff.existingPrLabel") }}: `{{ releaseHandoff.featureBranchState.existingPrUrl or '(none)' }}`
 
-### 4.6.3 User Selections{% if t("releaseHandoff.userSelectionsAside") != "menu response log" %} ({{ t("releaseHandoff.userSelectionsAside") }}){% endif %}
+### 5.6.3 User Selections{% if t("releaseHandoff.userSelectionsAside") != "menu response log" %} ({{ t("releaseHandoff.userSelectionsAside") }}){% endif %}
 
 | {{ t("releaseHandoff.questionsTableHeader.questionId") }} | {{ t("releaseHandoff.questionsTableHeader.questionBody") }} | {{ t("releaseHandoff.questionsTableHeader.userResponse") }} | {{ t("releaseHandoff.questionsTableHeader.allowedOptions") }} |
 |---------|-----------|--------------------|--------------------|
@@ -329,7 +264,7 @@ approved: {{ frontmatter.approved | yaml_scalar }}
 | H2 | {{ t("releaseHandoff.h2Body") }} | `{{ releaseHandoff.userSelections.h2 or t("releaseHandoff.h2DefaultLabel") }}` | {{ t("releaseHandoff.h2OptionsLabel") }} |
 | H3 | {{ t("releaseHandoff.h3Body") }} | `{{ releaseHandoff.userSelections.h3 }}` | `use as-is` / `edit then proceed` / `cancel` |
 
-### 4.6.4 Executed Commands
+### 5.6.4 Executed Commands
 
 {% if releaseHandoff.executedCommands | length == 0 -%}
 - {{ t("releaseHandoff.noMutationNote") }}
@@ -341,7 +276,7 @@ approved: {{ frontmatter.approved | yaml_scalar }}
 {% endfor %}
 {%- endif %}
 
-### 4.6.5 Commit List
+### 5.6.5 Commit List
 
 {% if releaseHandoff.commitList.empty -%}
 - No implementation commits found; release-handoff is blocked.
@@ -353,7 +288,7 @@ approved: {{ frontmatter.approved | yaml_scalar }}
 {% endfor %}
 {%- endif %}
 
-### 4.6.6 Merge Conflict Probe
+### 5.6.6 Merge Conflict Probe
 
 {% if releaseHandoff.mergeConflictProbe.kind == 'not-run' -%}
 - Not run (user picked local only or skip).
@@ -363,7 +298,7 @@ approved: {{ frontmatter.approved | yaml_scalar }}
 - Conflicts detected against {{ releaseHandoff.mergeConflictProbe.baseBranch }} at {{ releaseHandoff.mergeConflictProbe.baseSha }}; user chose {{ releaseHandoff.mergeConflictProbe.userChoice }}. Conflicting paths: {{ releaseHandoff.mergeConflictProbe.conflictingPaths | join(', ') }}.
 {%- endif %}
 
-### 4.6.7 Pull Request Outcome
+### 5.6.7 Pull Request Outcome
 
 {% if releaseHandoff.pullRequestOutcome.kind == 'no-action' -%}
 - No PR action requested.
@@ -375,15 +310,15 @@ approved: {{ frontmatter.approved | yaml_scalar }}
 - PR creation skipped: {{ releaseHandoff.pullRequestOutcome.reason }}
 {%- endif %}
 
-### 4.6.8 Routing Recommendation
+### 5.6.8 Routing Recommendation
 
 {{ releaseHandoff.routingRecommendation }}
 
 {% endif %}
 {% if header.taskType == 'implementation' %}
-## 4.7 Implementation Deliverables
+## 5.7 Implementation Deliverables
 
-### 4.7.1 Approved Plan Reference
+### 5.7.1 Approved Plan Reference
 
 - Plan file (project-relative): `{{ implementation.approvedPlanReference.planFile }}`
 - Approval evidence:
@@ -391,7 +326,7 @@ approved: {{ frontmatter.approved | yaml_scalar }}
 - {{ t("executionMeta.runExecutorWorktreePath") }}: `{{ implementation.approvedPlanReference.executorWorktreePath }}`
 - {{ t("executionMeta.runBaseRef") }}: `{{ implementation.approvedPlanReference.baseRefSha }}`
 
-### 4.7.2 Commit List
+### 5.7.2 Commit List
 
 {% if implementation.commitList | length == 0 -%}
 - No implementation commits produced; routing recommendation must be back to implementation-planning.
@@ -403,7 +338,7 @@ approved: {{ frontmatter.approved | yaml_scalar }}
 {% endfor %}
 {%- endif %}
 
-### 4.7.3 Diff Summary
+### 5.7.3 Diff Summary
 
 ```
 {{ implementation.diffSummary.rawStat }}
@@ -415,7 +350,7 @@ approved: {{ frontmatter.approved | yaml_scalar }}
 | `{{ row.file }}` | {{ row.action }} | `{{ row.lines }}` | {{ row.planStep }} |
 {% endfor %}
 
-### 4.7.4 Out-of-plan Edits
+### 5.7.4 Out-of-plan Edits
 
 {% if implementation.outOfPlanEdits | length == 0 -%}
 {{ t("emptyState.outOfPlanEdits") }}
@@ -427,7 +362,7 @@ approved: {{ frontmatter.approved | yaml_scalar }}
 {% endfor %}
 {%- endif %}
 
-### 4.7.5 Validation Evidence
+### 5.7.5 Validation Evidence
 
 | Phase | Command | Exit code | Output tail | TDD evidence |
 |-------|---------|-----------|-------------|--------------|
@@ -435,7 +370,7 @@ approved: {{ frontmatter.approved | yaml_scalar }}
 | {{ row.phase }} | `{{ row.command }}` | `{{ row.exitCode }}` | {{ row.outputTail }} | {{ row.tddEvidence or '--' }} |
 {% endfor %}
 
-### 4.7.6 Verifier Results
+### 5.7.6 Verifier Results
 
 {% for block in implementation.verifierResults %}
 - **{{ block.verifier }}** — Verdict: `{{ block.verdict }}`
@@ -446,7 +381,7 @@ approved: {{ frontmatter.approved | yaml_scalar }}
   - Discrepancy: {{ block.discrepancy or t("emptyState.discrepancy") }}
 {% endfor %}
 
-### 4.7.7 Rollback Verification
+### 5.7.7 Rollback Verification
 
 | Category | Rollback command | Verification | Result |
 |----------|-------------------|---------------|--------|
@@ -454,15 +389,15 @@ approved: {{ frontmatter.approved | yaml_scalar }}
 | {{ row.category }} | `{{ row.rollbackCommand }}` | {{ row.verification }} | `{{ row.result }}` |
 {% endfor %}
 
-### 4.7.8 Routing Recommendation
+### 5.7.8 Routing Recommendation
 
 {{ implementation.routingRecommendation }}
 
 {% endif %}
 {% if header.taskType == 'final-verification' %}
-## 4.8 Final Verification Deliverables
+## 5.8 Final Verification Deliverables
 
-### 4.8.1 Source Implementation Report
+### 5.8.1 Source Implementation Report
 
 - Path (project-relative): `{{ finalVerification.sourceImplementationReport.path }}`
 - {{ t("evidenceMeta.commitListSummary") }}:
@@ -481,7 +416,7 @@ approved: {{ frontmatter.approved | yaml_scalar }}
   {{ finalVerification.sourceImplementationReport.gitDiffStat }}
   ```
 
-### 4.8.2 Acceptance Blockers
+### 5.8.2 Acceptance Blockers
 
 {% if finalVerification.acceptanceBlockers | length == 0 -%}
 - No acceptance blockers found.
@@ -493,7 +428,7 @@ approved: {{ frontmatter.approved | yaml_scalar }}
 {% endfor %}
 {%- endif %}
 
-### 4.8.3 Residual Risk
+### 5.8.3 Residual Risk
 
 {% if finalVerification.residualRisk | length == 0 -%}
 {{ t("emptyState.lingeringRisks") }}
@@ -505,7 +440,7 @@ approved: {{ frontmatter.approved | yaml_scalar }}
 {% endfor %}
 {%- endif %}
 
-### 4.8.4 Validation Evidence{% if t("finalVerification.validationEvidenceAside") != "requirements coverage" %} ({{ t("finalVerification.validationEvidenceAside") }}){% endif %}
+### 5.8.4 Validation Evidence{% if t("finalVerification.validationEvidenceAside") != "requirements coverage" %} ({{ t("finalVerification.validationEvidenceAside") }}){% endif %}
 
 | ID | {{ t("finalVerification.columnRequirement") }} | Artifact | Status |
 |----|--------------------------------|----------|--------|
@@ -513,7 +448,7 @@ approved: {{ frontmatter.approved | yaml_scalar }}
 | {{ row.id }} | {{ row.requirement }} | `{{ row.artifact }}` | {{ row.status }} |
 {% endfor %}
 
-### 4.8.5 Read-only Command Log
+### 5.8.5 Read-only Command Log
 
 | # | Tier | Command (verbatim) | Status | Exit code | Output tail |
 |---|------|---------------------|--------|-----------|-------------|
@@ -521,7 +456,7 @@ approved: {{ frontmatter.approved | yaml_scalar }}
 | {{ row.number }} | {{ row.tier }} | `{{ row.command }}` | `{{ row.status }}` | {{ row.exitCode if row.exitCode is not none else '—' }} | {{ row.rejectionReason if row.status == 'rejected' else row.outputTail }} |
 {% endfor %}
 
-### 4.8.6 Conditional Acceptance Conditions
+### 5.8.6 Conditional Acceptance Conditions
 
 {% if not finalVerdict.conditionalAcceptanceConditions -%}
 - Not applicable (verdict is not `conditional-accept`).
@@ -533,13 +468,13 @@ approved: {{ frontmatter.approved | yaml_scalar }}
 {% endfor %}
 {%- endif %}
 
-### 4.8.7 Routing Recommendation
+### 5.8.7 Routing Recommendation
 
 {{ finalVerification.routingRecommendation }}
 
 {% endif %}
 {% if header.taskType == 'improvement-discovery' %}
-## 4.9 Improvement Candidates
+## 5.9 Improvement Candidates
 
 > Lens whitelist and column schema enforced by `validators/validate-improvement-report.py`. Row count is bounded by the brief's `candidate-cap` (default 8, absolute max 12).
 
@@ -547,56 +482,121 @@ approved: {{ frontmatter.approved | yaml_scalar }}
 |---------|------|-------|-------|----------|--------|-----------|----------------|------------------------|----------|
 
 {% endif %}
-## 5. Clarification Items
-
-{{ t("sectionIntro.clarificationItems") }}
+## 6. Cross Verification Results
 
-{% if clarificationItems | length == 0 -%}
-{{ t("emptyState.noClarification") }}
-{%- else %}
-{{ t("clarification.fillAndRerun") }}
-
-- Claude Code: `/okstra-run resume-clarification task-key={{ header.taskKey }}`
-- {{ t("clarification.separateTerminalLabel") }}: `scripts/okstra.sh --resume-clarification --task-key {{ header.taskKey }}`
+{% if crossVerification.roundHistory and not crossVerification.roundHistory.disabled -%}
+### 6.0 Round History
 
-| ID | Ticket ID | Kind | Statement | Expected form | Blocks | Status | User input |
-|----|-----------|------|-----------|---------------|--------|--------|-----------|
-{% for row in clarificationItems -%}
-| {{ row.id }} | `{{ row.ticketId }}` | `{{ row.kind }}` | {{ row.statement }} | {{ row.expectedForm }} | `{{ row.blocks }}` | {{ row.status }} | {{ row.userInput or '' }} |
+{% if crossVerification.roundHistory.rounds | length > 1 -%}
+| Round | inputQueueSize | resolvedCount | carriedForwardCount | dispatches (worker:status:durationMs) | skippedWorkers (worker:reason) |
+|-------|----------------|---------------|----------------------|----------------------------------------|---------------------------------|
+{% for row in crossVerification.roundHistory.rounds -%}
+| {{ row.round }} | {{ row.inputQueueSize }} | {{ row.resolvedCount }} | {{ row.carriedForwardCount }} | {{ row.dispatches }} | {{ row.skippedWorkers }} |
 {% endfor %}
 
-{{ t("clarification.columnGuide") }}
+- `round2SkippedReason`: `{{ crossVerification.roundHistory.round2SkippedReason }}`  ← {{ t("roundHistory.round2SkippedReasonNote") }}
+{% elif crossVerification.roundHistory.rounds | length == 1 -%}
+{% set r = crossVerification.roundHistory.rounds[0] -%}
+- {{ t("roundHistory.singleRoundPrefix") }} resolved={{ r.resolvedCount }}, carriedForward={{ r.carriedForwardCount }}, round2SkippedReason=`{{ crossVerification.roundHistory.round2SkippedReason }}`
+{% else -%}
+- {{ t("roundHistory.noRoundsNote") }} round2SkippedReason=`{{ crossVerification.roundHistory.round2SkippedReason }}`
+{% endif %}
 
-- **`Kind`** ∈ `{material, decision, data-point}`.
-- **`Blocks`** ∈ `{approval, next-phase, none}`.
-- **`Status`** ∈ `{open, answered, resolved, obsolete}`.
+{% endif %}
+### 6.1 Consensus
+
+{% if crossVerification.consensus | length == 0 -%}
+{{ t("emptyState.consensusItems") }}
+{%- else %}
+| {{ t("columns.recordMeta") }} | Statement | Evidence (path:line / log / worker report) |
+|--------|-----------|---------------------------------------------|
+{% for row in crossVerification.consensus -%}
+| **{{ row.id }}**<br>Ticket: `{{ row.ticketId }}`<br>Source items: {{ row.sourceItems | join(', ') }} | {{ row.statement }} | {{ row.evidence }} |
+{% endfor %}
 {%- endif %}
 
-## 6. Recommended Next Steps
+{{ t("sectionIntro.sourceItemsRule") }}
+
+### 6.2 Differences
 
-{% if recommendedNextSteps | length == 0 -%}
-- No further action required. Final verdict in section 2 stands.
+{% if crossVerification.differences | length == 0 -%}
+{{ t("emptyState.differences") }}
 {%- else %}
-{% for step in recommendedNextSteps -%}
-{{ loop.index }}. {{ step.text }}
-{% if step.commands -%}
-{% for cmd in step.commands %}
-   - {{ cmd.label }}:
-     - Claude Code: `{{ cmd.claudeCode }}`
-     - {{ t("clarification.separateTerminalLabel") }}: `{{ cmd.terminal }}`
-{% endfor -%}
-{%- endif %}
+| {{ t("columns.recordMeta") }} | Disagreement | Evidence |
+|--------|--------------|----------|
+{% for row in crossVerification.differences -%}
+| **{{ row.id }}**<br>Ticket: `{{ row.ticketId }}`<br>Workers: {% for w in row.workersPosition %}{{ w.worker }}:{{ w.itemId }} ({{ w.position }}){% if not loop.last %} / {% endif %}{% endfor %} | {{ row.disagreement }} | {{ row.evidence }} |
 {% endfor %}
 {%- endif %}
 
-## 7. Follow-up Tasks{% if t("followUpTasks.headingAside") != "Follow-up Tasks" %} ({{ t("followUpTasks.headingAside") }}){% endif %}
+## 7. Final Verdict
 
-{% if followUpTasks | length == 0 -%}
-{{ t("emptyState.noFollowUp") }}
+{{ t("finalVerdict.intro") }}
+
+| {{ t("verdictCard.tableHeaderLabel") }} | {{ t("verdictCard.tableHeaderValue") }} |
+|------|----|
+| Final Conclusion | {{ finalVerdict.finalConclusion }} |
+| Verdict Token | `{{ finalVerdict.verdictToken }}` |
+| Direction | `{{ finalVerdict.direction }}` |
+| {{ t("verdictCard.rationaleLabel") }} | {{ finalVerdict.rationaleRowIds | join(', ') }} |
+| {{ t("verdictCard.nextStepLabel") }} | {{ finalVerdict.nextStep }} |
+
+{% if clarificationCarryIn and clarificationCarryIn.sourceFile %}
+## 0. Clarification Response Carried In From Previous Run
+
+- Source file: `{{ clarificationCarryIn.sourceFile }}`
+- {{ t("sectionIntro.clarificationCarryIn") }}
+
+{% endif %}
+## Summary of the Problem or Verification Target
+
+{{ t("sectionIntro.ticketCoverage") }}
+
+| {{ t("columns.recordMeta") }} | {{ t("columns.summary") }} |
+|--------|------------|
+{% for row in summary -%}
+| **{{ row.id }}**<br>Ticket: `{{ row.ticketId }}`<br>{{ t("columns.source") }}: {{ row.source }} | {{ row.summary }} |
+{% endfor %}
+
+{% if ticketCoverage.omit %}
+{# Ticket Coverage omitted entirely — release-handoff / final-verification #}
 {%- else %}
-| {{ t("columns.recordMeta") }} | Title | Scope (files/areas) | Reason / Why deferred |
-|--------|-------|---------------------|------------------------|
-{% for row in followUpTasks -%}
-| **{{ row.id }}**<br>Ticket: `{{ row.ticketId }}`<br>Origin: `{{ row.origin }}`<br>New Task ID: `{{ row.newTaskId }}`<br>Type: `{{ row.suggestedTaskType }}`<br>Priority: `{{ row.priority }}`<br>Auto-spawn: `{{ row.autoSpawn }}` | {{ row.title }} | {{ row.scope }} | {{ row.reason }} |
+## Ticket Coverage
+
+{{ t("ticketCoverage.intro") }}
+
+{% if ticketCoverage.singleTicket -%}
+- Single ticket run: {{ ticketCoverage.singleTicket }}
+{%- else %}
+| Ticket ID | {{ t("ticketCoverage.columnSections") }} | {{ t("ticketCoverage.columnRelatedIds") }} |
+|-----------|-----------|---------------|
+{% for row in ticketCoverage.rows -%}
+| `{{ row.ticketId }}` | `{{ row.sections }}` | `{{ row.relatedIds }}` |
 {% endfor %}
 {%- endif %}
+
+{% endif %}
+## Execution Status by Agent
+
+{{ t("sectionIntro.executionStatus") }}
+
+| {{ t("columns.recordMeta") }} | Summary of Key Findings |
+|--------|-------------------------|
+{% for row in executionStatus -%}
+| **{{ row.agent }}**<br>Role: {{ row.role }}<br>Model: {{ row.model }}<br>Status: {{ row.status }}<br>{{ t("columns.rawTokens") }}: {{ row.totalTokens | format_int }}{% if row.cliTotalTokens %} (CLI: {{ row.cliTotalTokens | format_int }}){% endif %}<br>{{ t("columns.billableTokens") }}: {{ row.billableTokens | format_int }}<br>{{ t("columns.cost") }}: {{ row.costUsd | format_usd }}{% if row.cliCostUsd %} (+ CLI {{ row.cliCostUsd | format_usd }}){% endif %}<br>Duration: {{ row.durationMs | format_duration_ms }} | {{ row.summary }} |
+{% endfor %}
+
+## {{ t("tokenSummary.heading") }}
+
+| {{ t("tokenSummary.tableHeaderItem") }} | {{ t("columns.rawTokens") }} | {{ t("columns.billableTokensInputEquiv") }} | {{ t("columns.cost") }} |
+|------|-----------|------------------------|------------|
+| {{ t("tokenSummary.rowLead") }} | `{{ tokenUsage.lead.totalTokens | format_int }}` | `{{ tokenUsage.lead.billableTokens | format_int }}` | `{{ tokenUsage.lead.costUsd | format_usd }}` |
+| {{ t("tokenSummary.rowWorkerTotal") }} | `{{ tokenUsage.worker.totalTokens | format_int }}` | `{{ tokenUsage.worker.billableTokens | format_int }}` | `{{ tokenUsage.worker.costUsd | format_usd }}` |
+| {{ t("tokenSummary.rowGrandTotal") }} | **`{{ tokenUsage.grand.totalTokens | format_int }}`** | **`{{ tokenUsage.grand.billableTokens | format_int }}`** | **`{{ tokenUsage.grand.costUsd | format_usd }}`** |
+{% if tokenUsage.cli and tokenUsage.cli.costUsd is not none and tokenUsage.cli.costUsd > 0 -%}
+| {{ t("tokenSummary.rowCliExtra") }} |  |  | `{{ tokenUsage.cli.costUsd | format_usd }}` |
+{% endif %}
+
+{# At Phase 6 numeric cells are null and render as `--`.
+   Phase 7's okstra-token-usage.py populates tokenUsage in data.json then
+   re-invokes this renderer to produce the final markdown. #}